diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 16c27abd73..0000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright © OsmAnd 2010–2014
-### Credits to all major contributors/developers:
- * Victor Shcherb – all parts of the project, originator
- * Pavol Zibrita – first contributor and developer of some utilities
- * Dusan Kazik – one of the first contributors
- * Andre Van Atten – project supporter, active forum participant, one of the first users.
- * Dr. Hardy Mueller – map appearance concept and base renderers, international consistency and testing, usability, app scoping, concepts, documentation, wiki, market research.
- * Yvecai – main contributor to Contour Lines and Hillshade maps
- * Alexey Pelykh – C++ developer, created native library and made application much snappier.
- * Max (Zahnstocher) – Java contributor, active forum participant.
- * Harry van der Wolf – contributor to country boundaries, configuration files, address files, and much else; active forum participant.
- * Robin ‘ypid’ Schneider – opening hours contributor
-
-### Other Pull requests
-Copyright © All authors of translations and pull requests could be found in commits history:
- - Translations are under special “contributor” name ‘weblate’
- - Pull requests have two committers, first is original contributor and second is project maintainer
diff --git a/AUTHORS.md b/AUTHORS.md
new file mode 100644
index 0000000000..c418f81d10
--- /dev/null
+++ b/AUTHORS.md
@@ -0,0 +1,7 @@
+### Credits to all major contributors/developers:
+Major contributors /developers listed here https://github.com/osmandapp/osmandapp.github.io/blob/master/website/help/about.html#L8
+
+### Other Pull requests
+Copyright © All authors of translations and pull requests could be found in commits history:
+ - Translations are under special “contributor” name ‘weblate’
+ - Pull requests have two committers, first is original contributor and second is project maintainer
diff --git a/OsmAnd-java/build.gradle b/OsmAnd-java/build.gradle
index 093c9747e9..827b63393b 100644
--- a/OsmAnd-java/build.gradle
+++ b/OsmAnd-java/build.gradle
@@ -40,9 +40,15 @@ task collectRegionsInfoResources(type: Copy) {
 }
 
 task collectTestResources(type: Copy) {
-	from "../../resources/test-resources"
 	into "src/test/resources/"
-	include "*"
+	from("../../resources/test-resources") {
+		include "*"
+	}
+	from("../../resources/poi") {
+		include "poi_types.xml"
+		include "/phrases/en/*"
+		//include "/phrases/ru/*"
+	}
 }
 
 
diff --git a/OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java b/OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java
index d6011c6209..693be4bd82 100644
--- a/OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java
+++ b/OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java
@@ -124,6 +124,9 @@ public class CollatorStringMatcher implements StringMatcher {
 	public static boolean cstartsWith(Collator collator, String searchInParam, String theStart, 
 			boolean checkBeginning, boolean checkSpaces, boolean equals, boolean trim) {
 		String searchIn = searchInParam.toLowerCase(Locale.getDefault());
+		if (trim && searchIn.length() > 0) {
+			searchIn += " ";
+		}
 		int searchInLength = searchIn.length();
 		if (trim && searchInLength > 0 && theStart.length() > searchInLength) {
 			theStart = theStart.substring(0, searchInLength);
diff --git a/OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java b/OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java
index 3eaebd56e5..ed2ed17c17 100644
--- a/OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java
+++ b/OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java
@@ -130,10 +130,10 @@ public class NativeLibrary {
 
 	public RouteSegmentResult[] runNativeRouting(int sx31, int sy31, int ex31, int ey31, RoutingConfiguration config,
 			RouteRegion[] regions, RouteCalculationProgress progress, PrecalculatedRouteDirection precalculatedRouteDirection, 
-			boolean basemap) {
+			boolean basemap, boolean publicTransport, boolean startTransportStop, boolean targetTransportStop) {
 //		config.router.printRules(System.out);
 		return nativeRouting(new int[] { sx31, sy31, ex31, ey31 }, config, config.initialDirection == null ? -360 : config.initialDirection.floatValue(),
-				regions, progress, precalculatedRouteDirection, basemap);
+				regions, progress, precalculatedRouteDirection, basemap, publicTransport, startTransportStop, targetTransportStop);
 	}
 
 
@@ -156,7 +156,9 @@ public class NativeLibrary {
 	protected static native RouteDataObject[] getRouteDataObjects(RouteRegion reg, long rs, int x31, int y31);
 
 	protected static native RouteSegmentResult[] nativeRouting(int[] coordinates, RoutingConfiguration r,
-			float initDirection, RouteRegion[] regions, RouteCalculationProgress progress, PrecalculatedRouteDirection precalculatedRouteDirection, boolean basemap);
+															   float initDirection, RouteRegion[] regions, RouteCalculationProgress progress,
+															   PrecalculatedRouteDirection precalculatedRouteDirection, boolean basemap,
+															   boolean publicTransport, boolean startTransportStop, boolean targetTransportStop);
 
 	protected static native void deleteSearchResult(long searchResultHandle);
 
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
index 964f714865..65493a75ed 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
@@ -1,37 +1,9 @@
 package net.osmand.binary;
 
 
-import gnu.trove.list.array.TIntArrayList;
-import gnu.trove.map.TIntObjectMap;
-import gnu.trove.map.hash.TIntObjectHashMap;
-import gnu.trove.map.hash.TLongObjectHashMap;
-import gnu.trove.set.hash.TIntHashSet;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.RandomAccessFile;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+import com.google.protobuf.CodedInputStream;
+import com.google.protobuf.CodedOutputStream;
+import com.google.protobuf.WireFormat;
 
 import net.osmand.Collator;
 import net.osmand.CollatorStringMatcher;
@@ -72,9 +44,37 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import com.google.protobuf.CodedInputStream;
-import com.google.protobuf.CodedOutputStream;
-import com.google.protobuf.WireFormat;
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.RandomAccessFile;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.map.TIntObjectMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
+import gnu.trove.map.hash.TLongObjectHashMap;
+import gnu.trove.set.hash.TIntHashSet;
 
 public class BinaryMapIndexReader {
 
@@ -130,7 +130,7 @@ public class BinaryMapIndexReader {
 		init();
 	}
 
-	/*private */BinaryMapIndexReader(final RandomAccessFile raf, File file, boolean init) throws IOException {
+	public BinaryMapIndexReader(final RandomAccessFile raf, File file, boolean init) throws IOException {
 		this.raf = raf;
 		this.file = file;
 		codedIS = CodedInputStream.newInstance(raf);
@@ -554,13 +554,15 @@ public class BinaryMapIndexReader {
 		}
 		return false;
 	}
-
 	public List<TransportStop> searchTransportIndex(SearchRequest<TransportStop> req) throws IOException {
 		for (TransportIndex index : transportIndexes) {
 			if (index.stopsFileLength == 0 || index.right < req.left || index.left > req.right || index.top > req.bottom
 					|| index.bottom < req.top) {
 				continue;
 			}
+			if (req.stringTable != null) {
+				req.stringTable.clear();
+			}
 			codedIS.seek(index.stopsFileOffset);
 			int oldLimit = codedIS.pushLimit(index.stopsFileLength);
 			int offset = req.searchResults.size();
@@ -875,6 +877,8 @@ public class BinaryMapIndexReader {
 						continue;
 					}
 
+
+
 					// lazy initializing trees
 					if (index.trees == null) {
 						index.trees = new ArrayList<MapTree>();
@@ -2074,14 +2078,14 @@ public class BinaryMapIndexReader {
 	private static boolean testAddressSearch = false;
 	private static boolean testAddressSearchName = false;
 	private static boolean testAddressJustifySearch = false;
-	private static boolean testPoiSearch = true;
+	private static boolean testPoiSearch = false;
 	private static boolean testPoiSearchOnPath = false;
 	private static boolean testTransportSearch = true;
 	
-	private static int sleft = MapUtils.get31TileNumberX(4.7495);
-	private static int sright = MapUtils.get31TileNumberX(4.8608);
-	private static int stop = MapUtils.get31TileNumberY(52.3395);
-	private static int sbottom = MapUtils.get31TileNumberY(52.2589);
+	private static int sleft = MapUtils.get31TileNumberX(27.55079);
+	private static int sright = MapUtils.get31TileNumberX(27.55317);
+	private static int stop = MapUtils.get31TileNumberY(53.89378);
+	private static int sbottom = MapUtils.get31TileNumberY(53.89276);
 	private static int szoom = 15;
 
 	private static void println(String s) {
@@ -2090,7 +2094,7 @@ public class BinaryMapIndexReader {
 
 	public static void main(String[] args) throws IOException {
 		File fl = new File(System.getProperty("maps") + "/Synthetic_test_rendering.obf");
-		fl = new File(System.getProperty("maps") + "/Map.obf");
+		fl = new File(System.getProperty("maps") + "/Belarus_europe_2.obf");
 		
 		RandomAccessFile raf = new RandomAccessFile(fl, "r");
 
@@ -2280,6 +2284,9 @@ public class BinaryMapIndexReader {
 				println(" " + route.getRef() + " " + route.getName() + " " + route.getDistance() + " "
 						+ route.getAvgBothDistance());
 				StringBuilder b = new StringBuilder();
+				if(route.getForwardWays() == null) {
+					continue;
+				}
 				for(Way w : route.getForwardWays()) {
 					b.append(w.getNodes()).append(" ");
 				}
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapTransportReaderAdapter.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapTransportReaderAdapter.java
index 3cf386843c..fce39c5c55 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapTransportReaderAdapter.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapTransportReaderAdapter.java
@@ -5,17 +5,20 @@ import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
-import net.osmand.binary.OsmandOdb.TransportRouteSchedule;
 import net.osmand.data.TransportSchedule;
 import net.osmand.data.TransportStop;
+import net.osmand.data.TransportStopExit;
 import net.osmand.osm.edit.Node;
 import net.osmand.osm.edit.Way;
 import net.osmand.util.MapUtils;
 import net.sf.junidecode.Junidecode;
 
-import com.google.protobuf.ByteString;
 import com.google.protobuf.CodedInputStream;
 import com.google.protobuf.WireFormat;
 
@@ -238,6 +241,11 @@ public class BinaryMapTransportReaderAdapter {
 		stringTable.putIfAbsent(i, "");
 		return ((char) i)+"";
 	}
+
+	private String regStr(TIntObjectHashMap<String> stringTable, int i) throws IOException{
+		stringTable.putIfAbsent(i, "");
+		return ((char) i)+"";
+	}
 	
 	public net.osmand.data.TransportRoute getTransportRoute(int filePointer, TIntObjectHashMap<String> stringTable,
 			boolean onlyDescription) throws IOException {
@@ -394,12 +402,12 @@ public class BinaryMapTransportReaderAdapter {
 		int oldLimit = codedIS.pushLimit(ind.stringTable.length);
 		int current = 0;
 		int i = 0;
-		while (i < values.length) {
+		while (i < values.length && codedIS.getBytesUntilLimit() > 0) {
 			int t = codedIS.readTag();
 			int tag = WireFormat.getTagFieldNumber(t);
 			switch (tag) {
 			case 0:
-				break;
+				return;
 			case OsmandOdb.StringTable.S_FIELD_NUMBER:
 				if (current == values[i]) {
 					String value = codedIS.readString();
@@ -446,12 +454,26 @@ public class BinaryMapTransportReaderAdapter {
 	}
 
 	protected void initializeNames(TIntObjectHashMap<String> stringTable, TransportStop s) {
+		for (TransportStopExit exit : s.getExits())	{
+			if (exit.getRef().length() > 0) {
+				exit.setRef(stringTable.get(exit.getRef().charAt(0)));
+			}
+		}
 		if (s.getName().length() > 0) {
 			s.setName(stringTable.get(s.getName().charAt(0)));
 		}
 		if (s.getEnName(false).length() > 0) {
 			s.setEnName(stringTable.get(s.getEnName(false).charAt(0)));
 		}
+		Map<String, String> namesMap = new HashMap<>(s.getNamesMap(false));
+		if (!s.getNamesMap(false).isEmpty()) {
+			s.getNamesMap(false).clear();
+		}
+		Iterator<Map.Entry<String, String>> it = namesMap.entrySet().iterator();
+		while (it.hasNext()) {
+			Map.Entry<String, String> e = it.next();
+			s.setName(stringTable.get(e.getKey().charAt(0)), stringTable.get(e.getValue().charAt(0)));
+		}
 	}
 
 	
@@ -517,6 +539,7 @@ public class BinaryMapTransportReaderAdapter {
 		TransportStop dataObject = new TransportStop();
 		dataObject.setLocation(BinaryMapIndexReader.TRANSPORT_STOP_ZOOM, x, y);
 		dataObject.setFileOffset(shift);
+		List<String> names = null;
 		while(true){
 			int t = codedIS.readTag();
 			tag = WireFormat.getTagFieldNumber(t);
@@ -543,16 +566,76 @@ public class BinaryMapTransportReaderAdapter {
 				} else {
 					skipUnknownField(t);
 				}
-				
+				break;
+			case OsmandOdb.TransportStop.ADDITIONALNAMEPAIRS_FIELD_NUMBER :
+				if (req.stringTable != null) {
+					int sizeL = codedIS.readRawVarint32();
+					int oldRef = codedIS.pushLimit(sizeL);
+					while (codedIS.getBytesUntilLimit() > 0) {
+						dataObject.setName(regStr(req.stringTable,codedIS.readRawVarint32()),
+								regStr(req.stringTable,codedIS.readRawVarint32()));
+					}
+					codedIS.popLimit(oldRef);
+				} else {
+					skipUnknownField(t);
+				}
 				break;
 			case OsmandOdb.TransportStop.ID_FIELD_NUMBER :
 				dataObject.setId(codedIS.readSInt64());
 				break;
+			case OsmandOdb.TransportStop.EXITS_FIELD_NUMBER :
+				int length = codedIS.readRawVarint32();
+				int oldLimit = codedIS.pushLimit(length);
+
+				TransportStopExit transportStopExit = readTransportStopExit(cleft, ctop, req);
+				dataObject.addExit(transportStopExit);
+				codedIS.popLimit(oldLimit);
+				break;
 			default:
 				skipUnknownField(t);
 				break;
 			}
 		}
 	}
-	
+
+	private TransportStopExit readTransportStopExit(int cleft, int ctop, SearchRequest<TransportStop> req) throws IOException {
+
+		TransportStopExit dataObject = new TransportStopExit();
+		int x = 0;
+		int y = 0;
+
+		while (true) {
+			int t = codedIS.readTag();
+			int tag = WireFormat.getTagFieldNumber(t);
+
+			switch (tag) {
+				case 0:
+					if (dataObject.getName("en").length() == 0) {
+						dataObject.setEnName(Junidecode.unidecode(dataObject.getName()));
+					}
+					if (x != 0 || y != 0) {
+						dataObject.setLocation(BinaryMapIndexReader.TRANSPORT_STOP_ZOOM, x, y);
+					}
+					return dataObject;
+				case OsmandOdb.TransportStopExit.REF_FIELD_NUMBER:
+					if (req.stringTable != null) {
+						dataObject.setRef(regStr(req.stringTable));
+					} else {
+						skipUnknownField(t);
+					}
+					break;
+				case OsmandOdb.TransportStopExit.DX_FIELD_NUMBER:
+					x = codedIS.readSInt32() + cleft;
+					break;
+				case OsmandOdb.TransportStopExit.DY_FIELD_NUMBER:
+					y = codedIS.readSInt32() + ctop;
+					break;
+				default:
+					skipUnknownField(t);
+					break;
+			}
+		}
+	}
+
+
 }
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/CommonWords.java b/OsmAnd-java/src/main/java/net/osmand/binary/CommonWords.java
index d73c3f083a..55d7461573 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/CommonWords.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/CommonWords.java
@@ -28,7 +28,7 @@ public class CommonWords {
 
 	public static int getCommonSearch(String name) {
 		Integer i = commonWordsDictionary.get(name);
-		return i == null ? getFrequentlyUsed(name) : i.intValue();
+		return i == null ? getFrequentlyUsed(name) : i.intValue() + frequentlyUsedWordsDictionary.size();
 	}
 	
 	public static int getCommonGeocoding(String name) {
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/OsmandOdb.java b/OsmAnd-java/src/main/java/net/osmand/binary/OsmandOdb.java
index 4a29912436..36237c73d4 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/OsmandOdb.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/OsmandOdb.java
@@ -35628,6 +35628,49 @@ public final class OsmandOdb {
      */
     int getNameEn();
 
+    // optional bytes additionalNamePairs = 8;
+    /**
+     * <code>optional bytes additionalNamePairs = 8;</code>
+     *
+     * <pre>
+     * array of bytes (array of pairs &lt;raw var int&gt;)
+     * </pre>
+     */
+    boolean hasAdditionalNamePairs();
+    /**
+     * <code>optional bytes additionalNamePairs = 8;</code>
+     *
+     * <pre>
+     * array of bytes (array of pairs &lt;raw var int&gt;)
+     * </pre>
+     */
+    com.google.protobuf.ByteString getAdditionalNamePairs();
+
+    // repeated .OsmAnd.OBF.TransportStopExit exits = 9;
+    /**
+     * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+     */
+    java.util.List<net.osmand.binary.OsmandOdb.TransportStopExit> 
+        getExitsList();
+    /**
+     * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+     */
+    net.osmand.binary.OsmandOdb.TransportStopExit getExits(int index);
+    /**
+     * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+     */
+    int getExitsCount();
+    /**
+     * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+     */
+    java.util.List<? extends net.osmand.binary.OsmandOdb.TransportStopExitOrBuilder> 
+        getExitsOrBuilderList();
+    /**
+     * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+     */
+    net.osmand.binary.OsmandOdb.TransportStopExitOrBuilder getExitsOrBuilder(
+        int index);
+
     // repeated uint32 routes = 16;
     /**
      * <code>repeated uint32 routes = 16;</code>
@@ -35730,10 +35773,23 @@ public final class OsmandOdb {
               nameEn_ = input.readUInt32();
               break;
             }
+            case 66: {
+              bitField0_ |= 0x00000020;
+              additionalNamePairs_ = input.readBytes();
+              break;
+            }
+            case 74: {
+              if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
+                exits_ = new java.util.ArrayList<net.osmand.binary.OsmandOdb.TransportStopExit>();
+                mutable_bitField0_ |= 0x00000040;
+              }
+              exits_.add(input.readMessage(net.osmand.binary.OsmandOdb.TransportStopExit.PARSER, extensionRegistry));
+              break;
+            }
             case 128: {
-              if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+              if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
                 routes_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000020;
+                mutable_bitField0_ |= 0x00000080;
               }
               routes_.add(input.readUInt32());
               break;
@@ -35741,9 +35797,9 @@ public final class OsmandOdb {
             case 130: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000020) == 0x00000020) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000080) == 0x00000080) && input.getBytesUntilLimit() > 0) {
                 routes_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000020;
+                mutable_bitField0_ |= 0x00000080;
               }
               while (input.getBytesUntilLimit() > 0) {
                 routes_.add(input.readUInt32());
@@ -35759,7 +35815,10 @@ public final class OsmandOdb {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e.getMessage()).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+        if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
+          exits_ = java.util.Collections.unmodifiableList(exits_);
+        }
+        if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
           routes_ = java.util.Collections.unmodifiableList(routes_);
         }
         this.unknownFields = unknownFields.build();
@@ -35914,6 +35973,66 @@ public final class OsmandOdb {
       return nameEn_;
     }
 
+    // optional bytes additionalNamePairs = 8;
+    public static final int ADDITIONALNAMEPAIRS_FIELD_NUMBER = 8;
+    private com.google.protobuf.ByteString additionalNamePairs_;
+    /**
+     * <code>optional bytes additionalNamePairs = 8;</code>
+     *
+     * <pre>
+     * array of bytes (array of pairs &lt;raw var int&gt;)
+     * </pre>
+     */
+    public boolean hasAdditionalNamePairs() {
+      return ((bitField0_ & 0x00000020) == 0x00000020);
+    }
+    /**
+     * <code>optional bytes additionalNamePairs = 8;</code>
+     *
+     * <pre>
+     * array of bytes (array of pairs &lt;raw var int&gt;)
+     * </pre>
+     */
+    public com.google.protobuf.ByteString getAdditionalNamePairs() {
+      return additionalNamePairs_;
+    }
+
+    // repeated .OsmAnd.OBF.TransportStopExit exits = 9;
+    public static final int EXITS_FIELD_NUMBER = 9;
+    private java.util.List<net.osmand.binary.OsmandOdb.TransportStopExit> exits_;
+    /**
+     * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+     */
+    public java.util.List<net.osmand.binary.OsmandOdb.TransportStopExit> getExitsList() {
+      return exits_;
+    }
+    /**
+     * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+     */
+    public java.util.List<? extends net.osmand.binary.OsmandOdb.TransportStopExitOrBuilder> 
+        getExitsOrBuilderList() {
+      return exits_;
+    }
+    /**
+     * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+     */
+    public int getExitsCount() {
+      return exits_.size();
+    }
+    /**
+     * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+     */
+    public net.osmand.binary.OsmandOdb.TransportStopExit getExits(int index) {
+      return exits_.get(index);
+    }
+    /**
+     * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+     */
+    public net.osmand.binary.OsmandOdb.TransportStopExitOrBuilder getExitsOrBuilder(
+        int index) {
+      return exits_.get(index);
+    }
+
     // repeated uint32 routes = 16;
     public static final int ROUTES_FIELD_NUMBER = 16;
     private java.util.List<java.lang.Integer> routes_;
@@ -35955,6 +36074,8 @@ public final class OsmandOdb {
       id_ = 0L;
       name_ = 0;
       nameEn_ = 0;
+      additionalNamePairs_ = com.google.protobuf.ByteString.EMPTY;
+      exits_ = java.util.Collections.emptyList();
       routes_ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
@@ -35978,6 +36099,12 @@ public final class OsmandOdb {
         memoizedIsInitialized = 0;
         return false;
       }
+      for (int i = 0; i < getExitsCount(); i++) {
+        if (!getExits(i).isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
       memoizedIsInitialized = 1;
       return true;
     }
@@ -36000,6 +36127,12 @@ public final class OsmandOdb {
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         output.writeUInt32(7, nameEn_);
       }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        output.writeBytes(8, additionalNamePairs_);
+      }
+      for (int i = 0; i < exits_.size(); i++) {
+        output.writeMessage(9, exits_.get(i));
+      }
       for (int i = 0; i < routes_.size(); i++) {
         output.writeUInt32(16, routes_.get(i));
       }
@@ -36032,6 +36165,14 @@ public final class OsmandOdb {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(7, nameEn_);
       }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(8, additionalNamePairs_);
+      }
+      for (int i = 0; i < exits_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(9, exits_.get(i));
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < routes_.size(); i++) {
@@ -36149,6 +36290,7 @@ public final class OsmandOdb {
       }
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+          getExitsFieldBuilder();
         }
       }
       private static Builder create() {
@@ -36167,8 +36309,16 @@ public final class OsmandOdb {
         bitField0_ = (bitField0_ & ~0x00000008);
         nameEn_ = 0;
         bitField0_ = (bitField0_ & ~0x00000010);
-        routes_ = java.util.Collections.emptyList();
+        additionalNamePairs_ = com.google.protobuf.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000020);
+        if (exitsBuilder_ == null) {
+          exits_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000040);
+        } else {
+          exitsBuilder_.clear();
+        }
+        routes_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000080);
         return this;
       }
 
@@ -36217,9 +36367,22 @@ public final class OsmandOdb {
           to_bitField0_ |= 0x00000010;
         }
         result.nameEn_ = nameEn_;
-        if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+          to_bitField0_ |= 0x00000020;
+        }
+        result.additionalNamePairs_ = additionalNamePairs_;
+        if (exitsBuilder_ == null) {
+          if (((bitField0_ & 0x00000040) == 0x00000040)) {
+            exits_ = java.util.Collections.unmodifiableList(exits_);
+            bitField0_ = (bitField0_ & ~0x00000040);
+          }
+          result.exits_ = exits_;
+        } else {
+          result.exits_ = exitsBuilder_.build();
+        }
+        if (((bitField0_ & 0x00000080) == 0x00000080)) {
           routes_ = java.util.Collections.unmodifiableList(routes_);
-          bitField0_ = (bitField0_ & ~0x00000020);
+          bitField0_ = (bitField0_ & ~0x00000080);
         }
         result.routes_ = routes_;
         result.bitField0_ = to_bitField0_;
@@ -36253,10 +36416,39 @@ public final class OsmandOdb {
         if (other.hasNameEn()) {
           setNameEn(other.getNameEn());
         }
+        if (other.hasAdditionalNamePairs()) {
+          setAdditionalNamePairs(other.getAdditionalNamePairs());
+        }
+        if (exitsBuilder_ == null) {
+          if (!other.exits_.isEmpty()) {
+            if (exits_.isEmpty()) {
+              exits_ = other.exits_;
+              bitField0_ = (bitField0_ & ~0x00000040);
+            } else {
+              ensureExitsIsMutable();
+              exits_.addAll(other.exits_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.exits_.isEmpty()) {
+            if (exitsBuilder_.isEmpty()) {
+              exitsBuilder_.dispose();
+              exitsBuilder_ = null;
+              exits_ = other.exits_;
+              bitField0_ = (bitField0_ & ~0x00000040);
+              exitsBuilder_ = 
+                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                   getExitsFieldBuilder() : null;
+            } else {
+              exitsBuilder_.addAllMessages(other.exits_);
+            }
+          }
+        }
         if (!other.routes_.isEmpty()) {
           if (routes_.isEmpty()) {
             routes_ = other.routes_;
-            bitField0_ = (bitField0_ & ~0x00000020);
+            bitField0_ = (bitField0_ & ~0x00000080);
           } else {
             ensureRoutesIsMutable();
             routes_.addAll(other.routes_);
@@ -36284,6 +36476,12 @@ public final class OsmandOdb {
           
           return false;
         }
+        for (int i = 0; i < getExitsCount(); i++) {
+          if (!getExits(i).isInitialized()) {
+            
+            return false;
+          }
+        }
         return true;
       }
 
@@ -36551,12 +36749,304 @@ public final class OsmandOdb {
         return this;
       }
 
+      // optional bytes additionalNamePairs = 8;
+      private com.google.protobuf.ByteString additionalNamePairs_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>optional bytes additionalNamePairs = 8;</code>
+       *
+       * <pre>
+       * array of bytes (array of pairs &lt;raw var int&gt;)
+       * </pre>
+       */
+      public boolean hasAdditionalNamePairs() {
+        return ((bitField0_ & 0x00000020) == 0x00000020);
+      }
+      /**
+       * <code>optional bytes additionalNamePairs = 8;</code>
+       *
+       * <pre>
+       * array of bytes (array of pairs &lt;raw var int&gt;)
+       * </pre>
+       */
+      public com.google.protobuf.ByteString getAdditionalNamePairs() {
+        return additionalNamePairs_;
+      }
+      /**
+       * <code>optional bytes additionalNamePairs = 8;</code>
+       *
+       * <pre>
+       * array of bytes (array of pairs &lt;raw var int&gt;)
+       * </pre>
+       */
+      public Builder setAdditionalNamePairs(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000020;
+        additionalNamePairs_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bytes additionalNamePairs = 8;</code>
+       *
+       * <pre>
+       * array of bytes (array of pairs &lt;raw var int&gt;)
+       * </pre>
+       */
+      public Builder clearAdditionalNamePairs() {
+        bitField0_ = (bitField0_ & ~0x00000020);
+        additionalNamePairs_ = getDefaultInstance().getAdditionalNamePairs();
+        onChanged();
+        return this;
+      }
+
+      // repeated .OsmAnd.OBF.TransportStopExit exits = 9;
+      private java.util.List<net.osmand.binary.OsmandOdb.TransportStopExit> exits_ =
+        java.util.Collections.emptyList();
+      private void ensureExitsIsMutable() {
+        if (!((bitField0_ & 0x00000040) == 0x00000040)) {
+          exits_ = new java.util.ArrayList<net.osmand.binary.OsmandOdb.TransportStopExit>(exits_);
+          bitField0_ |= 0x00000040;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilder<
+          net.osmand.binary.OsmandOdb.TransportStopExit, net.osmand.binary.OsmandOdb.TransportStopExit.Builder, net.osmand.binary.OsmandOdb.TransportStopExitOrBuilder> exitsBuilder_;
+
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public java.util.List<net.osmand.binary.OsmandOdb.TransportStopExit> getExitsList() {
+        if (exitsBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(exits_);
+        } else {
+          return exitsBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public int getExitsCount() {
+        if (exitsBuilder_ == null) {
+          return exits_.size();
+        } else {
+          return exitsBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public net.osmand.binary.OsmandOdb.TransportStopExit getExits(int index) {
+        if (exitsBuilder_ == null) {
+          return exits_.get(index);
+        } else {
+          return exitsBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public Builder setExits(
+          int index, net.osmand.binary.OsmandOdb.TransportStopExit value) {
+        if (exitsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureExitsIsMutable();
+          exits_.set(index, value);
+          onChanged();
+        } else {
+          exitsBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public Builder setExits(
+          int index, net.osmand.binary.OsmandOdb.TransportStopExit.Builder builderForValue) {
+        if (exitsBuilder_ == null) {
+          ensureExitsIsMutable();
+          exits_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          exitsBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public Builder addExits(net.osmand.binary.OsmandOdb.TransportStopExit value) {
+        if (exitsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureExitsIsMutable();
+          exits_.add(value);
+          onChanged();
+        } else {
+          exitsBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public Builder addExits(
+          int index, net.osmand.binary.OsmandOdb.TransportStopExit value) {
+        if (exitsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureExitsIsMutable();
+          exits_.add(index, value);
+          onChanged();
+        } else {
+          exitsBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public Builder addExits(
+          net.osmand.binary.OsmandOdb.TransportStopExit.Builder builderForValue) {
+        if (exitsBuilder_ == null) {
+          ensureExitsIsMutable();
+          exits_.add(builderForValue.build());
+          onChanged();
+        } else {
+          exitsBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public Builder addExits(
+          int index, net.osmand.binary.OsmandOdb.TransportStopExit.Builder builderForValue) {
+        if (exitsBuilder_ == null) {
+          ensureExitsIsMutable();
+          exits_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          exitsBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public Builder addAllExits(
+          java.lang.Iterable<? extends net.osmand.binary.OsmandOdb.TransportStopExit> values) {
+        if (exitsBuilder_ == null) {
+          ensureExitsIsMutable();
+          super.addAll(values, exits_);
+          onChanged();
+        } else {
+          exitsBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public Builder clearExits() {
+        if (exitsBuilder_ == null) {
+          exits_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000040);
+          onChanged();
+        } else {
+          exitsBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public Builder removeExits(int index) {
+        if (exitsBuilder_ == null) {
+          ensureExitsIsMutable();
+          exits_.remove(index);
+          onChanged();
+        } else {
+          exitsBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public net.osmand.binary.OsmandOdb.TransportStopExit.Builder getExitsBuilder(
+          int index) {
+        return getExitsFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public net.osmand.binary.OsmandOdb.TransportStopExitOrBuilder getExitsOrBuilder(
+          int index) {
+        if (exitsBuilder_ == null) {
+          return exits_.get(index);  } else {
+          return exitsBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public java.util.List<? extends net.osmand.binary.OsmandOdb.TransportStopExitOrBuilder> 
+           getExitsOrBuilderList() {
+        if (exitsBuilder_ != null) {
+          return exitsBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(exits_);
+        }
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public net.osmand.binary.OsmandOdb.TransportStopExit.Builder addExitsBuilder() {
+        return getExitsFieldBuilder().addBuilder(
+            net.osmand.binary.OsmandOdb.TransportStopExit.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public net.osmand.binary.OsmandOdb.TransportStopExit.Builder addExitsBuilder(
+          int index) {
+        return getExitsFieldBuilder().addBuilder(
+            index, net.osmand.binary.OsmandOdb.TransportStopExit.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.TransportStopExit exits = 9;</code>
+       */
+      public java.util.List<net.osmand.binary.OsmandOdb.TransportStopExit.Builder> 
+           getExitsBuilderList() {
+        return getExitsFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilder<
+          net.osmand.binary.OsmandOdb.TransportStopExit, net.osmand.binary.OsmandOdb.TransportStopExit.Builder, net.osmand.binary.OsmandOdb.TransportStopExitOrBuilder> 
+          getExitsFieldBuilder() {
+        if (exitsBuilder_ == null) {
+          exitsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+              net.osmand.binary.OsmandOdb.TransportStopExit, net.osmand.binary.OsmandOdb.TransportStopExit.Builder, net.osmand.binary.OsmandOdb.TransportStopExitOrBuilder>(
+                  exits_,
+                  ((bitField0_ & 0x00000040) == 0x00000040),
+                  getParentForChildren(),
+                  isClean());
+          exits_ = null;
+        }
+        return exitsBuilder_;
+      }
+
       // repeated uint32 routes = 16;
       private java.util.List<java.lang.Integer> routes_ = java.util.Collections.emptyList();
       private void ensureRoutesIsMutable() {
-        if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+        if (!((bitField0_ & 0x00000080) == 0x00000080)) {
           routes_ = new java.util.ArrayList<java.lang.Integer>(routes_);
-          bitField0_ |= 0x00000020;
+          bitField0_ |= 0x00000080;
          }
       }
       /**
@@ -36640,7 +37130,7 @@ public final class OsmandOdb {
        */
       public Builder clearRoutes() {
         routes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000020);
+        bitField0_ = (bitField0_ & ~0x00000080);
         onChanged();
         return this;
       }
@@ -36656,6 +37146,652 @@ public final class OsmandOdb {
     // @@protoc_insertion_point(class_scope:OsmAnd.OBF.TransportStop)
   }
 
+  public interface TransportStopExitOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // required sint32 dx = 1;
+    /**
+     * <code>required sint32 dx = 1;</code>
+     *
+     * <pre>
+     * delta x
+     * </pre>
+     */
+    boolean hasDx();
+    /**
+     * <code>required sint32 dx = 1;</code>
+     *
+     * <pre>
+     * delta x
+     * </pre>
+     */
+    int getDx();
+
+    // required sint32 dy = 2;
+    /**
+     * <code>required sint32 dy = 2;</code>
+     *
+     * <pre>
+     * delta y
+     * </pre>
+     */
+    boolean hasDy();
+    /**
+     * <code>required sint32 dy = 2;</code>
+     *
+     * <pre>
+     * delta y
+     * </pre>
+     */
+    int getDy();
+
+    // required uint32 ref = 3;
+    /**
+     * <code>required uint32 ref = 3;</code>
+     */
+    boolean hasRef();
+    /**
+     * <code>required uint32 ref = 3;</code>
+     */
+    int getRef();
+  }
+  /**
+   * Protobuf type {@code OsmAnd.OBF.TransportStopExit}
+   */
+  public static final class TransportStopExit extends
+      com.google.protobuf.GeneratedMessage
+      implements TransportStopExitOrBuilder {
+    // Use TransportStopExit.newBuilder() to construct.
+    private TransportStopExit(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private TransportStopExit(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final TransportStopExit defaultInstance;
+    public static TransportStopExit getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public TransportStopExit getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private TransportStopExit(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              dx_ = input.readSInt32();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              dy_ = input.readSInt32();
+              break;
+            }
+            case 24: {
+              bitField0_ |= 0x00000004;
+              ref_ = input.readUInt32();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_TransportStopExit_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_TransportStopExit_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              net.osmand.binary.OsmandOdb.TransportStopExit.class, net.osmand.binary.OsmandOdb.TransportStopExit.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<TransportStopExit> PARSER =
+        new com.google.protobuf.AbstractParser<TransportStopExit>() {
+      public TransportStopExit parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new TransportStopExit(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TransportStopExit> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // required sint32 dx = 1;
+    public static final int DX_FIELD_NUMBER = 1;
+    private int dx_;
+    /**
+     * <code>required sint32 dx = 1;</code>
+     *
+     * <pre>
+     * delta x
+     * </pre>
+     */
+    public boolean hasDx() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>required sint32 dx = 1;</code>
+     *
+     * <pre>
+     * delta x
+     * </pre>
+     */
+    public int getDx() {
+      return dx_;
+    }
+
+    // required sint32 dy = 2;
+    public static final int DY_FIELD_NUMBER = 2;
+    private int dy_;
+    /**
+     * <code>required sint32 dy = 2;</code>
+     *
+     * <pre>
+     * delta y
+     * </pre>
+     */
+    public boolean hasDy() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>required sint32 dy = 2;</code>
+     *
+     * <pre>
+     * delta y
+     * </pre>
+     */
+    public int getDy() {
+      return dy_;
+    }
+
+    // required uint32 ref = 3;
+    public static final int REF_FIELD_NUMBER = 3;
+    private int ref_;
+    /**
+     * <code>required uint32 ref = 3;</code>
+     */
+    public boolean hasRef() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <code>required uint32 ref = 3;</code>
+     */
+    public int getRef() {
+      return ref_;
+    }
+
+    private void initFields() {
+      dx_ = 0;
+      dy_ = 0;
+      ref_ = 0;
+    }
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized != -1) return isInitialized == 1;
+
+      if (!hasDx()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      if (!hasDy()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      if (!hasRef()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeSInt32(1, dx_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeSInt32(2, dy_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeUInt32(3, ref_);
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    private int memoizedSerializedSize = -1;
+    public int getSerializedSize() {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeSInt32Size(1, dx_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeSInt32Size(2, dy_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, ref_);
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSerializedSize = size;
+      return size;
+    }
+
+    private static final long serialVersionUID = 0L;
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
+        throws java.io.ObjectStreamException {
+      return super.writeReplace();
+    }
+
+    public static net.osmand.binary.OsmandOdb.TransportStopExit parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static net.osmand.binary.OsmandOdb.TransportStopExit parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static net.osmand.binary.OsmandOdb.TransportStopExit parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static net.osmand.binary.OsmandOdb.TransportStopExit parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static net.osmand.binary.OsmandOdb.TransportStopExit parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static net.osmand.binary.OsmandOdb.TransportStopExit parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static net.osmand.binary.OsmandOdb.TransportStopExit parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static net.osmand.binary.OsmandOdb.TransportStopExit parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static net.osmand.binary.OsmandOdb.TransportStopExit parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static net.osmand.binary.OsmandOdb.TransportStopExit parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder(net.osmand.binary.OsmandOdb.TransportStopExit prototype) {
+      return newBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() { return newBuilder(this); }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code OsmAnd.OBF.TransportStopExit}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements net.osmand.binary.OsmandOdb.TransportStopExitOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_TransportStopExit_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_TransportStopExit_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                net.osmand.binary.OsmandOdb.TransportStopExit.class, net.osmand.binary.OsmandOdb.TransportStopExit.Builder.class);
+      }
+
+      // Construct using net.osmand.binary.OsmandOdb.TransportStopExit.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+
+      public Builder clear() {
+        super.clear();
+        dx_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        dy_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        ref_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_TransportStopExit_descriptor;
+      }
+
+      public net.osmand.binary.OsmandOdb.TransportStopExit getDefaultInstanceForType() {
+        return net.osmand.binary.OsmandOdb.TransportStopExit.getDefaultInstance();
+      }
+
+      public net.osmand.binary.OsmandOdb.TransportStopExit build() {
+        net.osmand.binary.OsmandOdb.TransportStopExit result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public net.osmand.binary.OsmandOdb.TransportStopExit buildPartial() {
+        net.osmand.binary.OsmandOdb.TransportStopExit result = new net.osmand.binary.OsmandOdb.TransportStopExit(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.dx_ = dx_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.dy_ = dy_;
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.ref_ = ref_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof net.osmand.binary.OsmandOdb.TransportStopExit) {
+          return mergeFrom((net.osmand.binary.OsmandOdb.TransportStopExit)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(net.osmand.binary.OsmandOdb.TransportStopExit other) {
+        if (other == net.osmand.binary.OsmandOdb.TransportStopExit.getDefaultInstance()) return this;
+        if (other.hasDx()) {
+          setDx(other.getDx());
+        }
+        if (other.hasDy()) {
+          setDy(other.getDy());
+        }
+        if (other.hasRef()) {
+          setRef(other.getRef());
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        return this;
+      }
+
+      public final boolean isInitialized() {
+        if (!hasDx()) {
+          
+          return false;
+        }
+        if (!hasDy()) {
+          
+          return false;
+        }
+        if (!hasRef()) {
+          
+          return false;
+        }
+        return true;
+      }
+
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        net.osmand.binary.OsmandOdb.TransportStopExit parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (net.osmand.binary.OsmandOdb.TransportStopExit) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // required sint32 dx = 1;
+      private int dx_ ;
+      /**
+       * <code>required sint32 dx = 1;</code>
+       *
+       * <pre>
+       * delta x
+       * </pre>
+       */
+      public boolean hasDx() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>required sint32 dx = 1;</code>
+       *
+       * <pre>
+       * delta x
+       * </pre>
+       */
+      public int getDx() {
+        return dx_;
+      }
+      /**
+       * <code>required sint32 dx = 1;</code>
+       *
+       * <pre>
+       * delta x
+       * </pre>
+       */
+      public Builder setDx(int value) {
+        bitField0_ |= 0x00000001;
+        dx_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>required sint32 dx = 1;</code>
+       *
+       * <pre>
+       * delta x
+       * </pre>
+       */
+      public Builder clearDx() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        dx_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // required sint32 dy = 2;
+      private int dy_ ;
+      /**
+       * <code>required sint32 dy = 2;</code>
+       *
+       * <pre>
+       * delta y
+       * </pre>
+       */
+      public boolean hasDy() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>required sint32 dy = 2;</code>
+       *
+       * <pre>
+       * delta y
+       * </pre>
+       */
+      public int getDy() {
+        return dy_;
+      }
+      /**
+       * <code>required sint32 dy = 2;</code>
+       *
+       * <pre>
+       * delta y
+       * </pre>
+       */
+      public Builder setDy(int value) {
+        bitField0_ |= 0x00000002;
+        dy_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>required sint32 dy = 2;</code>
+       *
+       * <pre>
+       * delta y
+       * </pre>
+       */
+      public Builder clearDy() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        dy_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // required uint32 ref = 3;
+      private int ref_ ;
+      /**
+       * <code>required uint32 ref = 3;</code>
+       */
+      public boolean hasRef() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      /**
+       * <code>required uint32 ref = 3;</code>
+       */
+      public int getRef() {
+        return ref_;
+      }
+      /**
+       * <code>required uint32 ref = 3;</code>
+       */
+      public Builder setRef(int value) {
+        bitField0_ |= 0x00000004;
+        ref_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>required uint32 ref = 3;</code>
+       */
+      public Builder clearRef() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        ref_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:OsmAnd.OBF.TransportStopExit)
+    }
+
+    static {
+      defaultInstance = new TransportStopExit(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:OsmAnd.OBF.TransportStopExit)
+  }
+
   public interface TransportStopsTreeOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
@@ -61027,6 +62163,11 @@ public final class OsmandOdb {
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_OsmAnd_OBF_TransportStop_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_OsmAnd_OBF_TransportStopExit_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_OsmAnd_OBF_TransportStopExit_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
     internal_static_OsmAnd_OBF_TransportStopsTree_descriptor;
   private static
@@ -61240,80 +62381,84 @@ public final class OsmandOdb {
       "ayOfWeekRestriction\030\007 \003(\r\022\034\n\024dayOfYearRe" +
       "striction\030\010 \003(\r\"W\n\022TransportRouteStop\022\n\n" +
       "\002id\030\001 \002(\022\022\n\n\002dx\030\002 \002(\021\022\n\n\002dy\030\003 \002(\021\022\014\n\004nam" +
-      "e\030\006 \002(\r\022\017\n\007name_en\030\007 \001(\r\"b\n\rTransportSto" +
-      "p\022\n\n\002dx\030\001 \002(\021\022\n\n\002dy\030\002 \002(\021\022\n\n\002id\030\005 \002(\022\022\014\n" +
-      "\004name\030\006 \002(\r\022\017\n\007name_en\030\007 \001(\r\022\016\n\006routes\030\020" +
-      " \003(\r\"\272\001\n\022TransportStopsTree\022\014\n\004left\030\001 \002(" +
-      "\021\022\r\n\005right\030\002 \002(\021\022\013\n\003top\030\003 \002(\021\022\016\n\006bottom\030" +
-      "\004 \002(\021\0220\n\010subtrees\030\007 \003(\0132\036.OsmAnd.OBF.Tra",
-      "nsportStopsTree\022(\n\005leafs\030\010 \003(\0132\031.OsmAnd." +
-      "OBF.TransportStop\022\016\n\006baseId\030\020 \001(\004\"\256\001\n\024Os" +
-      "mAndTransportIndex\022\014\n\004name\030\001 \001(\t\022+\n\006rout" +
-      "es\030\003 \001(\0132\033.OsmAnd.OBF.TransportRoutes\022-\n" +
-      "\005stops\030\006 \001(\0132\036.OsmAnd.OBF.TransportStops" +
-      "Tree\022,\n\013stringTable\030\t \002(\0132\027.OsmAnd.OBF.S" +
-      "tringTable\"\312\002\n\016OsmAndPoiIndex\022\014\n\004name\030\001 " +
-      "\002(\t\022-\n\nboundaries\030\002 \002(\0132\031.OsmAnd.OBF.Osm" +
-      "AndTileBox\0228\n\017categoriesTable\030\003 \003(\0132\037.Os" +
-      "mAnd.OBF.OsmAndCategoryTable\0221\n\tnameInde",
-      "x\030\004 \001(\0132\036.OsmAnd.OBF.OsmAndPoiNameIndex\022" +
-      "6\n\rsubtypesTable\030\005 \001(\0132\037.OsmAnd.OBF.OsmA" +
-      "ndSubtypesTable\022\'\n\005boxes\030\006 \003(\0132\030.OsmAnd." +
-      "OBF.OsmAndPoiBox\022-\n\007poiData\030\t \003(\0132\034.OsmA" +
-      "nd.OBF.OsmAndPoiBoxData\"\331\001\n\022OsmAndPoiNam" +
-      "eIndex\022-\n\005table\030\003 \002(\0132\036.OsmAnd.OBF.Index" +
-      "edStringTable\022C\n\004data\030\005 \003(\01325.OsmAnd.OBF" +
-      ".OsmAndPoiNameIndex.OsmAndPoiNameIndexDa" +
-      "ta\032O\n\026OsmAndPoiNameIndexData\0225\n\005atoms\030\003 " +
-      "\003(\0132&.OsmAnd.OBF.OsmAndPoiNameIndexDataA",
-      "tom\"Q\n\032OsmAndPoiNameIndexDataAtom\022\014\n\004zoo" +
-      "m\030\002 \001(\r\022\t\n\001x\030\003 \001(\r\022\t\n\001y\030\004 \001(\r\022\017\n\007shiftTo" +
-      "\030\016 \001(\007\">\n\023OsmAndCategoryTable\022\020\n\010categor" +
-      "y\030\001 \002(\t\022\025\n\rsubcategories\030\003 \003(\t\"E\n\023OsmAnd" +
-      "SubtypesTable\022.\n\010subtypes\030\004 \003(\0132\034.OsmAnd" +
-      ".OBF.OsmAndPoiSubtype\"\205\001\n\020OsmAndPoiSubty" +
-      "pe\022\014\n\004name\030\001 \002(\t\022\017\n\007tagname\030\002 \001(\t\022\016\n\006isT" +
-      "ext\030\003 \002(\010\022\021\n\tfrequency\030\005 \001(\r\022\031\n\021subtypeV" +
-      "aluesSize\030\006 \001(\r\022\024\n\014subtypeValue\030\010 \003(\t\"\255\001" +
-      "\n\014OsmAndPoiBox\022\014\n\004zoom\030\001 \002(\r\022\014\n\004left\030\002 \002",
-      "(\021\022\013\n\003top\030\003 \002(\021\0223\n\ncategories\030\004 \001(\0132\037.Os" +
-      "mAnd.OBF.OsmAndPoiCategories\022*\n\010subBoxes" +
-      "\030\n \003(\0132\030.OsmAnd.OBF.OsmAndPoiBox\022\023\n\013shif" +
-      "tToData\030\016 \001(\007\"@\n\023OsmAndPoiCategories\022\022\n\n" +
-      "categories\030\003 \003(\r\022\025\n\rsubcategories\030\005 \003(\r\"" +
-      "i\n\020OsmAndPoiBoxData\022\014\n\004zoom\030\001 \001(\r\022\t\n\001x\030\002" +
-      " \001(\r\022\t\n\001y\030\003 \001(\r\0221\n\007poiData\030\005 \003(\0132 .OsmAn" +
-      "d.OBF.OsmAndPoiBoxDataAtom\"\360\001\n\024OsmAndPoi" +
-      "BoxDataAtom\022\n\n\002dx\030\002 \002(\021\022\n\n\002dy\030\003 \002(\021\022\022\n\nc" +
-      "ategories\030\004 \003(\r\022\025\n\rsubcategories\030\005 \003(\r\022\014",
-      "\n\004name\030\006 \001(\t\022\016\n\006nameEn\030\007 \001(\t\022\n\n\002id\030\010 \001(\004" +
-      "\022\024\n\014openingHours\030\n \001(\t\022\014\n\004site\030\013 \001(\t\022\r\n\005" +
-      "phone\030\014 \001(\t\022\014\n\004note\030\r \001(\t\022\026\n\016textCategor" +
-      "ies\030\016 \003(\r\022\022\n\ntextValues\030\017 \003(\t\"\032\n\007IdTable" +
-      "\022\017\n\007routeId\030\001 \003(\022\"F\n\017RestrictionData\022\014\n\004" +
-      "type\030\001 \002(\005\022\014\n\004from\030\002 \002(\005\022\n\n\002to\030\003 \002(\005\022\013\n\003" +
-      "via\030\004 \001(\005\"x\n\tRouteData\022\016\n\006points\030\001 \002(\014\022\022" +
-      "\n\npointTypes\030\004 \001(\014\022\022\n\npointNames\030\005 \001(\014\022\r" +
-      "\n\005types\030\007 \002(\014\022\017\n\007routeId\030\014 \002(\005\022\023\n\013string" +
-      "Names\030\016 \001(\014\"\304\005\n\022OsmAndRoutingIndex\022\014\n\004na",
-      "me\030\001 \002(\t\022?\n\005rules\030\002 \003(\01320.OsmAnd.OBF.Osm" +
-      "AndRoutingIndex.RouteEncodingRule\022>\n\troo" +
-      "tBoxes\030\003 \003(\0132+.OsmAnd.OBF.OsmAndRoutingI" +
-      "ndex.RouteDataBox\022A\n\014basemapBoxes\030\004 \003(\0132" +
-      "+.OsmAnd.OBF.OsmAndRoutingIndex.RouteDat" +
-      "aBox\022=\n\006blocks\030\005 \003(\0132-.OsmAnd.OBF.OsmAnd" +
-      "RoutingIndex.RouteDataBlock\032;\n\021RouteEnco" +
-      "dingRule\022\013\n\003tag\030\003 \002(\t\022\r\n\005value\030\005 \002(\t\022\n\n\002" +
-      "id\030\007 \001(\r\032\231\001\n\014RouteDataBox\022\014\n\004left\030\001 \002(\021\022" +
-      "\r\n\005right\030\002 \002(\021\022\013\n\003top\030\003 \002(\021\022\016\n\006bottom\030\004 ",
-      "\002(\021\022\023\n\013shiftToData\030\005 \001(\007\022:\n\005boxes\030\007 \003(\0132" +
-      "+.OsmAnd.OBF.OsmAndRoutingIndex.RouteDat" +
-      "aBox\032\303\001\n\016RouteDataBlock\022$\n\007idTable\030\005 \001(\013" +
-      "2\023.OsmAnd.OBF.IdTable\022*\n\013dataObjects\030\006 \003" +
-      "(\0132\025.OsmAnd.OBF.RouteData\0221\n\014restriction" +
-      "s\030\007 \003(\0132\033.OsmAnd.OBF.RestrictionData\022,\n\013" +
-      "stringTable\030\010 \001(\0132\027.OsmAnd.OBF.StringTab" +
-      "leB\036\n\021net.osmand.binaryB\tOsmandOdb"
+      "e\030\006 \002(\r\022\017\n\007name_en\030\007 \001(\r\"\255\001\n\rTransportSt" +
+      "op\022\n\n\002dx\030\001 \002(\021\022\n\n\002dy\030\002 \002(\021\022\n\n\002id\030\005 \002(\022\022\014" +
+      "\n\004name\030\006 \002(\r\022\017\n\007name_en\030\007 \001(\r\022\033\n\023additio" +
+      "nalNamePairs\030\010 \001(\014\022,\n\005exits\030\t \003(\0132\035.OsmA" +
+      "nd.OBF.TransportStopExit\022\016\n\006routes\030\020 \003(\r" +
+      "\"8\n\021TransportStopExit\022\n\n\002dx\030\001 \002(\021\022\n\n\002dy\030",
+      "\002 \002(\021\022\013\n\003ref\030\003 \002(\r\"\272\001\n\022TransportStopsTre" +
+      "e\022\014\n\004left\030\001 \002(\021\022\r\n\005right\030\002 \002(\021\022\013\n\003top\030\003 " +
+      "\002(\021\022\016\n\006bottom\030\004 \002(\021\0220\n\010subtrees\030\007 \003(\0132\036." +
+      "OsmAnd.OBF.TransportStopsTree\022(\n\005leafs\030\010" +
+      " \003(\0132\031.OsmAnd.OBF.TransportStop\022\016\n\006baseI" +
+      "d\030\020 \001(\004\"\256\001\n\024OsmAndTransportIndex\022\014\n\004name" +
+      "\030\001 \001(\t\022+\n\006routes\030\003 \001(\0132\033.OsmAnd.OBF.Tran" +
+      "sportRoutes\022-\n\005stops\030\006 \001(\0132\036.OsmAnd.OBF." +
+      "TransportStopsTree\022,\n\013stringTable\030\t \002(\0132" +
+      "\027.OsmAnd.OBF.StringTable\"\312\002\n\016OsmAndPoiIn",
+      "dex\022\014\n\004name\030\001 \002(\t\022-\n\nboundaries\030\002 \002(\0132\031." +
+      "OsmAnd.OBF.OsmAndTileBox\0228\n\017categoriesTa" +
+      "ble\030\003 \003(\0132\037.OsmAnd.OBF.OsmAndCategoryTab" +
+      "le\0221\n\tnameIndex\030\004 \001(\0132\036.OsmAnd.OBF.OsmAn" +
+      "dPoiNameIndex\0226\n\rsubtypesTable\030\005 \001(\0132\037.O" +
+      "smAnd.OBF.OsmAndSubtypesTable\022\'\n\005boxes\030\006" +
+      " \003(\0132\030.OsmAnd.OBF.OsmAndPoiBox\022-\n\007poiDat" +
+      "a\030\t \003(\0132\034.OsmAnd.OBF.OsmAndPoiBoxData\"\331\001" +
+      "\n\022OsmAndPoiNameIndex\022-\n\005table\030\003 \002(\0132\036.Os" +
+      "mAnd.OBF.IndexedStringTable\022C\n\004data\030\005 \003(",
+      "\01325.OsmAnd.OBF.OsmAndPoiNameIndex.OsmAnd" +
+      "PoiNameIndexData\032O\n\026OsmAndPoiNameIndexDa" +
+      "ta\0225\n\005atoms\030\003 \003(\0132&.OsmAnd.OBF.OsmAndPoi" +
+      "NameIndexDataAtom\"Q\n\032OsmAndPoiNameIndexD" +
+      "ataAtom\022\014\n\004zoom\030\002 \001(\r\022\t\n\001x\030\003 \001(\r\022\t\n\001y\030\004 " +
+      "\001(\r\022\017\n\007shiftTo\030\016 \001(\007\">\n\023OsmAndCategoryTa" +
+      "ble\022\020\n\010category\030\001 \002(\t\022\025\n\rsubcategories\030\003" +
+      " \003(\t\"E\n\023OsmAndSubtypesTable\022.\n\010subtypes\030" +
+      "\004 \003(\0132\034.OsmAnd.OBF.OsmAndPoiSubtype\"\205\001\n\020" +
+      "OsmAndPoiSubtype\022\014\n\004name\030\001 \002(\t\022\017\n\007tagnam",
+      "e\030\002 \001(\t\022\016\n\006isText\030\003 \002(\010\022\021\n\tfrequency\030\005 \001" +
+      "(\r\022\031\n\021subtypeValuesSize\030\006 \001(\r\022\024\n\014subtype" +
+      "Value\030\010 \003(\t\"\255\001\n\014OsmAndPoiBox\022\014\n\004zoom\030\001 \002" +
+      "(\r\022\014\n\004left\030\002 \002(\021\022\013\n\003top\030\003 \002(\021\0223\n\ncategor" +
+      "ies\030\004 \001(\0132\037.OsmAnd.OBF.OsmAndPoiCategori" +
+      "es\022*\n\010subBoxes\030\n \003(\0132\030.OsmAnd.OBF.OsmAnd" +
+      "PoiBox\022\023\n\013shiftToData\030\016 \001(\007\"@\n\023OsmAndPoi" +
+      "Categories\022\022\n\ncategories\030\003 \003(\r\022\025\n\rsubcat" +
+      "egories\030\005 \003(\r\"i\n\020OsmAndPoiBoxData\022\014\n\004zoo" +
+      "m\030\001 \001(\r\022\t\n\001x\030\002 \001(\r\022\t\n\001y\030\003 \001(\r\0221\n\007poiData",
+      "\030\005 \003(\0132 .OsmAnd.OBF.OsmAndPoiBoxDataAtom" +
+      "\"\360\001\n\024OsmAndPoiBoxDataAtom\022\n\n\002dx\030\002 \002(\021\022\n\n" +
+      "\002dy\030\003 \002(\021\022\022\n\ncategories\030\004 \003(\r\022\025\n\rsubcate" +
+      "gories\030\005 \003(\r\022\014\n\004name\030\006 \001(\t\022\016\n\006nameEn\030\007 \001" +
+      "(\t\022\n\n\002id\030\010 \001(\004\022\024\n\014openingHours\030\n \001(\t\022\014\n\004" +
+      "site\030\013 \001(\t\022\r\n\005phone\030\014 \001(\t\022\014\n\004note\030\r \001(\t\022" +
+      "\026\n\016textCategories\030\016 \003(\r\022\022\n\ntextValues\030\017 " +
+      "\003(\t\"\032\n\007IdTable\022\017\n\007routeId\030\001 \003(\022\"F\n\017Restr" +
+      "ictionData\022\014\n\004type\030\001 \002(\005\022\014\n\004from\030\002 \002(\005\022\n" +
+      "\n\002to\030\003 \002(\005\022\013\n\003via\030\004 \001(\005\"x\n\tRouteData\022\016\n\006",
+      "points\030\001 \002(\014\022\022\n\npointTypes\030\004 \001(\014\022\022\n\npoin" +
+      "tNames\030\005 \001(\014\022\r\n\005types\030\007 \002(\014\022\017\n\007routeId\030\014" +
+      " \002(\005\022\023\n\013stringNames\030\016 \001(\014\"\304\005\n\022OsmAndRout" +
+      "ingIndex\022\014\n\004name\030\001 \002(\t\022?\n\005rules\030\002 \003(\01320." +
+      "OsmAnd.OBF.OsmAndRoutingIndex.RouteEncod" +
+      "ingRule\022>\n\trootBoxes\030\003 \003(\0132+.OsmAnd.OBF." +
+      "OsmAndRoutingIndex.RouteDataBox\022A\n\014basem" +
+      "apBoxes\030\004 \003(\0132+.OsmAnd.OBF.OsmAndRouting" +
+      "Index.RouteDataBox\022=\n\006blocks\030\005 \003(\0132-.Osm" +
+      "And.OBF.OsmAndRoutingIndex.RouteDataBloc",
+      "k\032;\n\021RouteEncodingRule\022\013\n\003tag\030\003 \002(\t\022\r\n\005v" +
+      "alue\030\005 \002(\t\022\n\n\002id\030\007 \001(\r\032\231\001\n\014RouteDataBox\022" +
+      "\014\n\004left\030\001 \002(\021\022\r\n\005right\030\002 \002(\021\022\013\n\003top\030\003 \002(" +
+      "\021\022\016\n\006bottom\030\004 \002(\021\022\023\n\013shiftToData\030\005 \001(\007\022:" +
+      "\n\005boxes\030\007 \003(\0132+.OsmAnd.OBF.OsmAndRouting" +
+      "Index.RouteDataBox\032\303\001\n\016RouteDataBlock\022$\n" +
+      "\007idTable\030\005 \001(\0132\023.OsmAnd.OBF.IdTable\022*\n\013d" +
+      "ataObjects\030\006 \003(\0132\025.OsmAnd.OBF.RouteData\022" +
+      "1\n\014restrictions\030\007 \003(\0132\033.OsmAnd.OBF.Restr" +
+      "ictionData\022,\n\013stringTable\030\010 \001(\0132\027.OsmAnd",
+      ".OBF.StringTableB\036\n\021net.osmand.binaryB\tO" +
+      "smandOdb"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -61475,27 +62620,33 @@ public final class OsmandOdb {
           internal_static_OsmAnd_OBF_TransportStop_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_TransportStop_descriptor,
-              new java.lang.String[] { "Dx", "Dy", "Id", "Name", "NameEn", "Routes", });
-          internal_static_OsmAnd_OBF_TransportStopsTree_descriptor =
+              new java.lang.String[] { "Dx", "Dy", "Id", "Name", "NameEn", "AdditionalNamePairs", "Exits", "Routes", });
+          internal_static_OsmAnd_OBF_TransportStopExit_descriptor =
             getDescriptor().getMessageTypes().get(21);
+          internal_static_OsmAnd_OBF_TransportStopExit_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_OsmAnd_OBF_TransportStopExit_descriptor,
+              new java.lang.String[] { "Dx", "Dy", "Ref", });
+          internal_static_OsmAnd_OBF_TransportStopsTree_descriptor =
+            getDescriptor().getMessageTypes().get(22);
           internal_static_OsmAnd_OBF_TransportStopsTree_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_TransportStopsTree_descriptor,
               new java.lang.String[] { "Left", "Right", "Top", "Bottom", "Subtrees", "Leafs", "BaseId", });
           internal_static_OsmAnd_OBF_OsmAndTransportIndex_descriptor =
-            getDescriptor().getMessageTypes().get(22);
+            getDescriptor().getMessageTypes().get(23);
           internal_static_OsmAnd_OBF_OsmAndTransportIndex_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_OsmAndTransportIndex_descriptor,
               new java.lang.String[] { "Name", "Routes", "Stops", "StringTable", });
           internal_static_OsmAnd_OBF_OsmAndPoiIndex_descriptor =
-            getDescriptor().getMessageTypes().get(23);
+            getDescriptor().getMessageTypes().get(24);
           internal_static_OsmAnd_OBF_OsmAndPoiIndex_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_OsmAndPoiIndex_descriptor,
               new java.lang.String[] { "Name", "Boundaries", "CategoriesTable", "NameIndex", "SubtypesTable", "Boxes", "PoiData", });
           internal_static_OsmAnd_OBF_OsmAndPoiNameIndex_descriptor =
-            getDescriptor().getMessageTypes().get(24);
+            getDescriptor().getMessageTypes().get(25);
           internal_static_OsmAnd_OBF_OsmAndPoiNameIndex_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_OsmAndPoiNameIndex_descriptor,
@@ -61507,73 +62658,73 @@ public final class OsmandOdb {
               internal_static_OsmAnd_OBF_OsmAndPoiNameIndex_OsmAndPoiNameIndexData_descriptor,
               new java.lang.String[] { "Atoms", });
           internal_static_OsmAnd_OBF_OsmAndPoiNameIndexDataAtom_descriptor =
-            getDescriptor().getMessageTypes().get(25);
+            getDescriptor().getMessageTypes().get(26);
           internal_static_OsmAnd_OBF_OsmAndPoiNameIndexDataAtom_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_OsmAndPoiNameIndexDataAtom_descriptor,
               new java.lang.String[] { "Zoom", "X", "Y", "ShiftTo", });
           internal_static_OsmAnd_OBF_OsmAndCategoryTable_descriptor =
-            getDescriptor().getMessageTypes().get(26);
+            getDescriptor().getMessageTypes().get(27);
           internal_static_OsmAnd_OBF_OsmAndCategoryTable_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_OsmAndCategoryTable_descriptor,
               new java.lang.String[] { "Category", "Subcategories", });
           internal_static_OsmAnd_OBF_OsmAndSubtypesTable_descriptor =
-            getDescriptor().getMessageTypes().get(27);
+            getDescriptor().getMessageTypes().get(28);
           internal_static_OsmAnd_OBF_OsmAndSubtypesTable_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_OsmAndSubtypesTable_descriptor,
               new java.lang.String[] { "Subtypes", });
           internal_static_OsmAnd_OBF_OsmAndPoiSubtype_descriptor =
-            getDescriptor().getMessageTypes().get(28);
+            getDescriptor().getMessageTypes().get(29);
           internal_static_OsmAnd_OBF_OsmAndPoiSubtype_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_OsmAndPoiSubtype_descriptor,
               new java.lang.String[] { "Name", "Tagname", "IsText", "Frequency", "SubtypeValuesSize", "SubtypeValue", });
           internal_static_OsmAnd_OBF_OsmAndPoiBox_descriptor =
-            getDescriptor().getMessageTypes().get(29);
+            getDescriptor().getMessageTypes().get(30);
           internal_static_OsmAnd_OBF_OsmAndPoiBox_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_OsmAndPoiBox_descriptor,
               new java.lang.String[] { "Zoom", "Left", "Top", "Categories", "SubBoxes", "ShiftToData", });
           internal_static_OsmAnd_OBF_OsmAndPoiCategories_descriptor =
-            getDescriptor().getMessageTypes().get(30);
+            getDescriptor().getMessageTypes().get(31);
           internal_static_OsmAnd_OBF_OsmAndPoiCategories_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_OsmAndPoiCategories_descriptor,
               new java.lang.String[] { "Categories", "Subcategories", });
           internal_static_OsmAnd_OBF_OsmAndPoiBoxData_descriptor =
-            getDescriptor().getMessageTypes().get(31);
+            getDescriptor().getMessageTypes().get(32);
           internal_static_OsmAnd_OBF_OsmAndPoiBoxData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_OsmAndPoiBoxData_descriptor,
               new java.lang.String[] { "Zoom", "X", "Y", "PoiData", });
           internal_static_OsmAnd_OBF_OsmAndPoiBoxDataAtom_descriptor =
-            getDescriptor().getMessageTypes().get(32);
+            getDescriptor().getMessageTypes().get(33);
           internal_static_OsmAnd_OBF_OsmAndPoiBoxDataAtom_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_OsmAndPoiBoxDataAtom_descriptor,
               new java.lang.String[] { "Dx", "Dy", "Categories", "Subcategories", "Name", "NameEn", "Id", "OpeningHours", "Site", "Phone", "Note", "TextCategories", "TextValues", });
           internal_static_OsmAnd_OBF_IdTable_descriptor =
-            getDescriptor().getMessageTypes().get(33);
+            getDescriptor().getMessageTypes().get(34);
           internal_static_OsmAnd_OBF_IdTable_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_IdTable_descriptor,
               new java.lang.String[] { "RouteId", });
           internal_static_OsmAnd_OBF_RestrictionData_descriptor =
-            getDescriptor().getMessageTypes().get(34);
+            getDescriptor().getMessageTypes().get(35);
           internal_static_OsmAnd_OBF_RestrictionData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_RestrictionData_descriptor,
               new java.lang.String[] { "Type", "From", "To", "Via", });
           internal_static_OsmAnd_OBF_RouteData_descriptor =
-            getDescriptor().getMessageTypes().get(35);
+            getDescriptor().getMessageTypes().get(36);
           internal_static_OsmAnd_OBF_RouteData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_RouteData_descriptor,
               new java.lang.String[] { "Points", "PointTypes", "PointNames", "Types", "RouteId", "StringNames", });
           internal_static_OsmAnd_OBF_OsmAndRoutingIndex_descriptor =
-            getDescriptor().getMessageTypes().get(36);
+            getDescriptor().getMessageTypes().get(37);
           internal_static_OsmAnd_OBF_OsmAndRoutingIndex_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_OsmAndRoutingIndex_descriptor,
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java b/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java
index a1e10eae7a..5cbb1cd0cc 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java
@@ -578,7 +578,21 @@ public class RouteDataObject {
 	public boolean loop(){
 		return pointsX[0] == pointsX[pointsX.length - 1] && pointsY[0] == pointsY[pointsY.length - 1] ; 
 	}
-	
+
+	public boolean platform(){
+		int sz = types.length;
+		for(int i=0; i<sz; i++) {
+			RouteTypeRule r = region.quickGetEncodingRule(types[i]);
+			if(r.getTag().equals("railway") && r.getValue().equals("platform")) {
+				return true;
+			}
+			if(r.getTag().equals("public_transport") && r.getValue().equals("platform")) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	public boolean roundabout(){
 		int sz = types.length;
 		for(int i=0; i<sz; i++) {
diff --git a/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java b/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java
index c0b20007f6..bd284ba474 100644
--- a/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java
+++ b/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java
@@ -1,16 +1,19 @@
 package net.osmand.data;
 
 import net.osmand.Location;
+import net.osmand.osm.MapPoiTypes;
 import net.osmand.osm.PoiCategory;
-import net.osmand.osm.edit.Node;
 import net.osmand.util.Algorithms;
 
+import org.json.JSONObject;
+
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -317,4 +320,49 @@ public class Amenity extends MapObject {
 	public boolean isClosed() {
 		return OSM_DELETE_VALUE.equals(getAdditionalInfo(OSM_DELETE_TAG));
 	}
+
+	public JSONObject toJSON() {
+		JSONObject json = super.toJSON();
+		json.put("subType", subType);
+		json.put("type", type.getKeyName());
+		json.put("openingHours", openingHours);
+		if (additionalInfo != null && additionalInfo.size() > 0) {
+			JSONObject additionalInfoObj = new JSONObject();
+			for (Entry<String, String> e : additionalInfo.entrySet()) {
+				additionalInfoObj.put(e.getKey(), e.getValue());
+			}
+			json.put("additionalInfo", additionalInfoObj);
+		}
+
+		return json;
+	}
+
+	public static Amenity parseJSON(JSONObject json) {
+		Amenity a = new Amenity();
+		MapObject.parseJSON(json, a);
+
+		if (json.has("subType")) {
+			a.subType = json.getString("subType");
+		}
+		if (json.has("type")) {
+			String categoryName = json.getString("type");
+			a.setType(MapPoiTypes.getDefault().getPoiCategoryByName(categoryName));
+		} else {
+			a.setType(MapPoiTypes.getDefault().getOtherPoiCategory());
+		}
+		if (json.has("openingHours")) {
+			a.openingHours = json.getString("openingHours");
+		}
+		if (json.has("additionalInfo")) {
+			JSONObject namesObj = json.getJSONObject("additionalInfo");
+			a.additionalInfo = new HashMap<>();
+			Iterator<String> iterator = namesObj.keys();
+			while (iterator.hasNext()) {
+				String key = iterator.next();
+				String value = namesObj.getString(key);
+				a.additionalInfo.put(key, value);
+			}
+		}
+		return a;
+	}
 }
diff --git a/OsmAnd-java/src/main/java/net/osmand/data/Building.java b/OsmAnd-java/src/main/java/net/osmand/data/Building.java
index a025e755ff..7668d16a30 100644
--- a/OsmAnd-java/src/main/java/net/osmand/data/Building.java
+++ b/OsmAnd-java/src/main/java/net/osmand/data/Building.java
@@ -1,12 +1,15 @@
 package net.osmand.data;
 
 
+import net.osmand.util.Algorithms;
+
+import org.json.JSONObject;
+
 import java.util.Collections;
 import java.util.LinkedHashMap;
+import java.util.Locale;
 import java.util.Map;
 
-import net.osmand.util.Algorithms;
-
 public class Building extends MapObject {
 	
 	private String postcode;
@@ -216,4 +219,43 @@ public class Building extends MapObject {
 		return "";
 	}
 
+	public JSONObject toJSON() {
+		JSONObject json = super.toJSON();
+		json.put("postcode", postcode);
+		if (latLon2 != null) {
+			json.put("lat2", String.format(Locale.US, "%.5f", latLon2.getLatitude()));
+			json.put("lon2", String.format(Locale.US, "%.5f", latLon2.getLongitude()));
+		}
+		if (interpolationType != null) {
+			json.put("interpolationType", interpolationType.name());
+		}
+		if (interpolationInterval != 0) {
+			json.put("interpolationInterval", interpolationInterval);
+		}
+		json.put("name2", name2);
+
+		return json;
+	}
+
+	public static Building parseJSON(JSONObject json) throws IllegalArgumentException {
+		Building b = new Building();
+		MapObject.parseJSON(json, b);
+
+		if (json.has("postcode")) {
+			b.postcode = json.getString("postcode");
+		}
+		if (json.has("lat2") && json.has("lon2")) {
+			b.latLon2 = new LatLon(json.getDouble("lat2"), json.getDouble("lon2"));
+		}
+		if (json.has("interpolationType")) {
+			b.interpolationType = BuildingInterpolation.valueOf(json.getString("interpolationType"));
+		}
+		if (json.has("interpolationInterval")) {
+			b.interpolationInterval = json.getInt("interpolationInterval");
+		}
+		if (json.has("name2")) {
+			b.name2 = json.getString("name2");
+		}
+		return b;
+	}
 }
diff --git a/OsmAnd-java/src/main/java/net/osmand/data/City.java b/OsmAnd-java/src/main/java/net/osmand/data/City.java
index 264fc455b6..d534d1a63b 100644
--- a/OsmAnd-java/src/main/java/net/osmand/data/City.java
+++ b/OsmAnd-java/src/main/java/net/osmand/data/City.java
@@ -1,5 +1,8 @@
 package net.osmand.data;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -55,7 +58,6 @@ public class City extends MapObject {
 		return new City(postcode, POSTCODE_INTERNAL_ID--);
 	}
 
-
 	public City(CityType type) {
 		if (type == null) {
 			throw new NullPointerException();
@@ -156,4 +158,47 @@ public class City extends MapObject {
 		return m;
 	}
 
+	public JSONObject toJSON() {
+		return toJSON(true);
+	}
+
+	public JSONObject toJSON(boolean includingBuildings) {
+		JSONObject json = super.toJSON();
+		json.put("type", type.name());
+		json.put("postcode", postcode);
+		JSONArray listOfStreetsArr = new JSONArray();
+		for (Street s : listOfStreets) {
+			listOfStreetsArr.put(s.toJSON(includingBuildings));
+		}
+		json.put("listOfStreets", listOfStreetsArr);
+
+		return json;
+	}
+
+	public static City parseJSON(JSONObject json) throws IllegalArgumentException {
+		CityType type;
+		if (json.has("type")) {
+			type = CityType.valueOf(json.getString("type"));
+		} else {
+			throw new IllegalArgumentException();
+		}
+		City c = new City(type);
+		MapObject.parseJSON(json, c);
+
+		if (json.has("postcode")) {
+			c.postcode = json.getString("postcode");
+		}
+		if (json.has("listOfStreets")) {
+			JSONArray streetsArr = json.getJSONArray("listOfStreets");
+			c.listOfStreets = new ArrayList<>();
+			for (int i = 0; i < streetsArr.length(); i++) {
+				JSONObject streetObj = streetsArr.getJSONObject(i);
+				Street street = Street.parseJSON(c, streetObj);
+				if (street != null) {
+					c.listOfStreets.add(street);
+				}
+			}
+		}
+		return c;
+	}
 }
diff --git a/OsmAnd-java/src/main/java/net/osmand/data/MapObject.java b/OsmAnd-java/src/main/java/net/osmand/data/MapObject.java
index 8c345239d6..f59fb006ab 100644
--- a/OsmAnd-java/src/main/java/net/osmand/data/MapObject.java
+++ b/OsmAnd-java/src/main/java/net/osmand/data/MapObject.java
@@ -1,19 +1,23 @@
 package net.osmand.data;
 
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import net.osmand.Collator;
 import net.osmand.OsmAndCollator;
 import net.osmand.util.Algorithms;
 import net.sf.junidecode.Junidecode;
 
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+
 
 public abstract class MapObject implements Comparable<MapObject> {
 
@@ -73,6 +77,15 @@ public abstract class MapObject implements Comparable<MapObject> {
 		}
 	}
 
+	public void setNames(Map<String, String> name) {
+		if (name != null) {
+			if (names == null) {
+				names = new HashMap<String, String>();
+			}
+			names.putAll(name);
+		}
+	}
+
 	public Map<String, String> getNamesMap(boolean includeEn) {
 		if (!includeEn || Algorithms.isEmpty(enName)) {
 			if (names == null) {
@@ -289,4 +302,48 @@ public abstract class MapObject implements Comparable<MapObject> {
 		return referenceFile;
 	}
 
+	public JSONObject toJSON() {
+		JSONObject json = new JSONObject();
+		json.put("name", name);
+		json.put("enName", enName);
+		if (names != null && names.size() > 0) {
+			JSONObject namesObj = new JSONObject();
+			for (Entry<String, String> e : names.entrySet()) {
+				namesObj.put(e.getKey(), e.getValue());
+			}
+			json.put("names", namesObj);
+		}
+		if (location != null) {
+			json.put("lat", String.format(Locale.US, "%.5f", location.getLatitude()));
+			json.put("lon", String.format(Locale.US, "%.5f", location.getLongitude()));
+		}
+		json.put("id", id);
+
+		return json;
+	}
+
+	protected static void parseJSON(JSONObject json, MapObject o) {
+		if (json.has("name")) {
+			o.name = json.getString("name");
+		}
+		if (json.has("enName")) {
+			o.enName = json.getString("enName");
+		}
+		if (json.has("names")) {
+			JSONObject namesObj = json.getJSONObject("names");
+			o.names = new HashMap<>();
+			Iterator<String> iterator = namesObj.keys();
+			while (iterator.hasNext()) {
+				String key = iterator.next();
+				String value = namesObj.getString(key);
+				o.names.put(key, value);
+			}
+		}
+		if (json.has("lat") && json.has("lon")) {
+			o.location = new LatLon(json.getDouble("lat"), json.getDouble("lon"));
+		}
+		if (json.has("id")) {
+			o.id = json.getLong("id");
+		}
+	}
 }
diff --git a/OsmAnd-java/src/main/java/net/osmand/data/Street.java b/OsmAnd-java/src/main/java/net/osmand/data/Street.java
index 7e45370578..7ccfa3d8b0 100644
--- a/OsmAnd-java/src/main/java/net/osmand/data/Street.java
+++ b/OsmAnd-java/src/main/java/net/osmand/data/Street.java
@@ -1,12 +1,15 @@
 package net.osmand.data;
 
+import net.osmand.util.Algorithms;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import net.osmand.util.Algorithms;
-
 
 public class Street extends MapObject {
 
@@ -86,4 +89,57 @@ public class Street extends MapObject {
 		}
 		return nm;
 	}
+
+	public JSONObject toJSON() {
+		return toJSON(true);
+	}
+
+	public JSONObject toJSON(boolean includingBuildings) {
+		JSONObject json = super.toJSON();
+		if (buildings.size() > 0 && includingBuildings) {
+			JSONArray buildingsArr = new JSONArray();
+			for (Building b : buildings) {
+				buildingsArr.put(b.toJSON());
+			}
+			json.put("buildings", buildingsArr);
+		}
+		if (intersectedStreets != null) {
+			JSONArray intersectedStreetsArr = new JSONArray();
+			for (Street s : intersectedStreets) {
+				intersectedStreetsArr.put(s.toJSON());
+			}
+			json.put("intersectedStreets", intersectedStreetsArr);
+		}
+
+		return json;
+	}
+
+	public static Street parseJSON(City city, JSONObject json) throws IllegalArgumentException {
+		Street s = new Street(city);
+		MapObject.parseJSON(json, s);
+
+		if (json.has("buildings")) {
+			JSONArray buildingsArr = json.getJSONArray("buildings");
+			s.buildings = new ArrayList<>();
+			for (int i = 0; i < buildingsArr.length(); i++) {
+				JSONObject buildingObj = buildingsArr.getJSONObject(i);
+				Building building = Building.parseJSON(buildingObj);
+				if (building != null) {
+					s.buildings.add(building);
+				}
+			}
+		}
+		if (json.has("intersectedStreets")) {
+			JSONArray streetsArr = json.getJSONArray("intersectedStreets");
+			s.intersectedStreets = new ArrayList<>();
+			for (int i = 0; i < streetsArr.length(); i++) {
+				JSONObject streetObj = streetsArr.getJSONObject(i);
+				Street street = parseJSON(city, streetObj);
+				if (street != null) {
+					s.intersectedStreets.add(street);
+				}
+			}
+		}
+		return s;
+	}
 }
diff --git a/OsmAnd-java/src/main/java/net/osmand/data/TransportRoute.java b/OsmAnd-java/src/main/java/net/osmand/data/TransportRoute.java
index 70997955f5..d995c811e4 100644
--- a/OsmAnd-java/src/main/java/net/osmand/data/TransportRoute.java
+++ b/OsmAnd-java/src/main/java/net/osmand/data/TransportRoute.java
@@ -1,5 +1,9 @@
 package net.osmand.data;
 
+import net.osmand.osm.edit.Node;
+import net.osmand.osm.edit.Way;
+import net.osmand.util.MapUtils;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -8,10 +12,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import net.osmand.osm.edit.Node;
-import net.osmand.osm.edit.Way;
-import net.osmand.util.MapUtils;
-
 public class TransportRoute extends MapObject {
 	private List<TransportStop> forwardStops = new ArrayList<TransportStop>();
 	private String ref;
@@ -209,4 +209,16 @@ public class TransportRoute extends MapObject {
 		return d;
 	}
 
+	public String getAdjustedRouteRef() {
+		if (ref != null) {
+			int charPos = ref.lastIndexOf(':');
+			if (charPos != -1) {
+				ref = ref.substring(0, charPos);
+			}
+			if (ref.length() > 4) {
+				ref = ref.substring(0, 4);
+			}
+		}
+		return ref;
+	}
 }
\ No newline at end of file
diff --git a/OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java b/OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java
index 981b182a63..eeaad172cf 100644
--- a/OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java
+++ b/OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java
@@ -2,13 +2,20 @@ package net.osmand.data;
 
 import net.osmand.util.MapUtils;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class TransportStop extends MapObject {
 	private int[] referencesToRoutes = null;
 	private Amenity amenity;
 	public int distance;
 	public int x31;
 	public int y31;
-	
+	private List<TransportStopExit> exits;
+	private HashMap<String,String> names;
 
 	public TransportStop(){
 	}
@@ -39,4 +46,35 @@ public class TransportStop extends MapObject {
 		y31 = dy << (31 - zoom);
 		setLocation(MapUtils.getLatitudeFromTile(zoom, dy), MapUtils.getLongitudeFromTile(zoom, dx));
 	}
+
+	public void addExit(TransportStopExit transportStopExit) {
+		if (exits == null) {
+			exits = new ArrayList<>();
+		}
+		exits.add(transportStopExit);
+	}
+
+	public List<TransportStopExit> getExits () {
+		if (exits == null) {
+			return Collections.emptyList();
+		}
+		return this.exits;
+	}
+
+	public String getExitsString () {
+		String exitsString = "";
+		String refString = "";
+		if (this.exits != null) {
+			int i = 1;
+			exitsString = exitsString +  " Exits: [";
+			for (TransportStopExit e : this.exits ) {
+				if (e.getRef() != null) {
+					refString = " [ref:" + e.getRef() + "] ";
+				}
+				exitsString = exitsString + " " + i + ")" + refString + e.getName() + " " + e.getLocation() + " ]";
+				i++;
+			}
+		}
+		return exitsString;
+	}
 }
diff --git a/OsmAnd-java/src/main/java/net/osmand/data/TransportStopExit.java b/OsmAnd-java/src/main/java/net/osmand/data/TransportStopExit.java
new file mode 100644
index 0000000000..2c4d6a2a68
--- /dev/null
+++ b/OsmAnd-java/src/main/java/net/osmand/data/TransportStopExit.java
@@ -0,0 +1,27 @@
+package net.osmand.data;
+
+import net.osmand.util.MapUtils;
+
+public class TransportStopExit extends MapObject {
+	public int x31;
+	public int y31;
+	public String ref = null;
+	@Override
+	public void setLocation(double latitude, double longitude) {
+		super.setLocation(latitude, longitude);
+	}
+	public void setLocation(int zoom, int dx, int dy) {
+		x31 = dx << (31 - zoom);
+		y31 = dy << (31 - zoom);
+		setLocation(MapUtils.getLatitudeFromTile(zoom, dy), MapUtils.getLongitudeFromTile(zoom, dx));
+	}
+	public void setRef (String ref) {
+		this.ref = ref;
+	}
+	public String getRef() {
+		if (ref != null) {
+			return ref;
+		}
+		return "";
+	}
+}
diff --git a/OsmAnd-java/src/main/java/net/osmand/map/TileSourceManager.java b/OsmAnd-java/src/main/java/net/osmand/map/TileSourceManager.java
index d464f881f4..409b188b93 100644
--- a/OsmAnd-java/src/main/java/net/osmand/map/TileSourceManager.java
+++ b/OsmAnd-java/src/main/java/net/osmand/map/TileSourceManager.java
@@ -435,7 +435,6 @@ public class TileSourceManager {
 	public static java.util.List<TileSourceTemplate> getKnownSourceTemplates() {
 		java.util.List<TileSourceTemplate> list = new ArrayList<TileSourceTemplate>();
 		list.add(getMapnikSource());
-		list.add(getCycleMapSource());
 		list.add(getMapillaryRasterSource());
 		list.add(getMapillaryVectorSource());
 		return list;
@@ -445,9 +444,6 @@ public class TileSourceManager {
 		return MAPNIK_SOURCE;
 	}
 
-	public static TileSourceTemplate getCycleMapSource(){
-		return CYCLE_MAP_SOURCE;
-	}
 
 	public static TileSourceTemplate getMapillaryRasterSource() {
 		return MAPILLARY_RASTER_SOURCE;
diff --git a/OsmAnd-java/src/main/java/net/osmand/osm/edit/OSMSettings.java b/OsmAnd-java/src/main/java/net/osmand/osm/edit/OSMSettings.java
index fd506c7291..87b9c755a1 100644
--- a/OsmAnd-java/src/main/java/net/osmand/osm/edit/OSMSettings.java
+++ b/OsmAnd-java/src/main/java/net/osmand/osm/edit/OSMSettings.java
@@ -13,6 +13,7 @@ public class OSMSettings {
 		BOUNDARY("boundary"), //$NON-NLS-1$
 		POSTAL_CODE("postal_code"), //$NON-NLS-1$
 		RAILWAY("railway"), //$NON-NLS-1$
+		STATION("subway"), //$NON-NLS-1$
 		ONEWAY("oneway"), //$NON-NLS-1$
 		LAYER("layer"), //$NON-NLS-1$
 		BRIDGE("bridge"), //$NON-NLS-1$
diff --git a/OsmAnd-java/src/main/java/net/osmand/osm/edit/Way.java b/OsmAnd-java/src/main/java/net/osmand/osm/edit/Way.java
index f55667b1ed..ba71f7645a 100644
--- a/OsmAnd-java/src/main/java/net/osmand/osm/edit/Way.java
+++ b/OsmAnd-java/src/main/java/net/osmand/osm/edit/Way.java
@@ -194,7 +194,6 @@ public class Way extends Entity {
 		}
 		if (nodeIds != null) {
 			nodeIds.reverse();
-			;
 		}
 	}
 }
diff --git a/OsmAnd-java/src/main/java/net/osmand/router/GeneralRouter.java b/OsmAnd-java/src/main/java/net/osmand/router/GeneralRouter.java
index b1ebbc9b30..e195c42d42 100644
--- a/OsmAnd-java/src/main/java/net/osmand/router/GeneralRouter.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/GeneralRouter.java
@@ -32,6 +32,7 @@ public class GeneralRouter implements VehicleRouter {
 	public static final String AVOID_UNPAVED = "avoid_unpaved";
 	public static final String PREFER_MOTORWAYS = "prefer_motorway";
 	public static final String ALLOW_PRIVATE = "allow_private";
+	public static final String ALLOW_MOTORWAYS = "allow_motorway";
 
 	private final RouteAttributeContext[] objectAttributes;
 	public final Map<String, String> attributes;
diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java b/OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java
index cad29d75e3..c2d5776de4 100644
--- a/OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java
@@ -55,6 +55,10 @@ public class RoutePlannerFrontEnd {
 	}
 
 	public RouteSegmentPoint findRouteSegment(double lat, double lon, RoutingContext ctx, List<RouteSegmentPoint> list) throws IOException {
+		return findRouteSegment(lat, lon, ctx, list, false);
+	}
+
+	public RouteSegmentPoint findRouteSegment(double lat, double lon, RoutingContext ctx, List<RouteSegmentPoint> list, boolean transportStop) throws IOException {
 		int px = MapUtils.get31TileNumberX(lon);
 		int py = MapUtils.get31TileNumberY(lat);
 		ArrayList<RouteDataObject> dataObjects = new ArrayList<RouteDataObject>();
@@ -92,7 +96,26 @@ public class RoutePlannerFrontEnd {
 			}
 		});
 		if (list.size() > 0) {
-			RouteSegmentPoint ps = list.get(0);
+			RouteSegmentPoint ps = null;
+			if (ctx.publicTransport) {
+				for (RouteSegmentPoint p : list) {
+					if (transportStop && p.distSquare > 100) {
+						break;
+					}
+					boolean platform = p.road.platform();
+					if (transportStop && platform) {
+						ps = p;
+						break;
+					}
+					if (!transportStop && !platform) {
+						ps = p;
+						break;
+					}
+				}
+			}
+			if (ps == null) {
+				ps = list.get(0);
+			}
 			ps.others = list;
 			return ps;
 		}
@@ -185,17 +208,17 @@ public class RoutePlannerFrontEnd {
 		}
 		int indexNotFound = 0;
 		List<RouteSegmentPoint> points = new ArrayList<RouteSegmentPoint>();
-		if (!addSegment(start, ctx, indexNotFound++, points)) {
+		if (!addSegment(start, ctx, indexNotFound++, points, ctx.startTransportStop)) {
 			return null;
 		}
 		if (intermediates != null) {
 			for (LatLon l : intermediates) {
-				if (!addSegment(l, ctx, indexNotFound++, points)) {
+				if (!addSegment(l, ctx, indexNotFound++, points, false)) {
 					return null;
 				}
 			}
 		}
-		if (!addSegment(end, ctx, indexNotFound++, points)) {
+		if (!addSegment(end, ctx, indexNotFound++, points, ctx.targetTransportStop)) {
 			return null;
 		}
 		ctx.calculationProgress.nextIteration();
@@ -315,8 +338,8 @@ public class RoutePlannerFrontEnd {
 
 	}
 
-	private boolean addSegment(LatLon s, RoutingContext ctx, int indexNotFound, List<RouteSegmentPoint> res) throws IOException {
-		RouteSegmentPoint f = findRouteSegment(s.getLatitude(), s.getLongitude(), ctx, null);
+	private boolean addSegment(LatLon s, RoutingContext ctx, int indexNotFound, List<RouteSegmentPoint> res, boolean transportStop) throws IOException {
+		RouteSegmentPoint f = findRouteSegment(s.getLatitude(), s.getLongitude(), ctx, null, transportStop);
 		if (f == null) {
 			ctx.calculationProgress.segmentNotFound = indexNotFound;
 			return false;
@@ -405,7 +428,8 @@ public class RoutePlannerFrontEnd {
 
 		long time = System.currentTimeMillis();
 		RouteSegmentResult[] res = ctx.nativeLib.runNativeRouting(ctx.startX, ctx.startY, ctx.targetX, ctx.targetY,
-				ctx.config, regions, ctx.calculationProgress, ctx.precalculatedRouteDirection, ctx.calculationMode == RouteCalculationMode.BASE);
+				ctx.config, regions, ctx.calculationProgress, ctx.precalculatedRouteDirection, ctx.calculationMode == RouteCalculationMode.BASE,
+				ctx.publicTransport, ctx.startTransportStop, ctx.targetTransportStop);
 		log.info("Native routing took " + (System.currentTimeMillis() - time) / 1000f + " seconds");
 		ArrayList<RouteSegmentResult> result = new ArrayList<RouteSegmentResult>(Arrays.asList(res));
 		if (recalculationEnd != null) {
diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java b/OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java
index 46996428e1..167dfbebe9 100644
--- a/OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java
@@ -41,7 +41,6 @@ public class RouteResultPreparation {
 	 */
 	List<RouteSegmentResult> prepareResult(RoutingContext ctx, FinalRouteSegment finalSegment) throws IOException {
 		List<RouteSegmentResult> result  = convertFinalSegmentToResults(ctx, finalSegment);
-		combineWayPointsForAreaRouting(ctx, result);
 		prepareResult(ctx, result);
 		return result;
 	}
@@ -158,6 +157,7 @@ public class RouteResultPreparation {
 	}
 
 	List<RouteSegmentResult> prepareResult(RoutingContext ctx, List<RouteSegmentResult> result) throws IOException {
+		combineWayPointsForAreaRouting(ctx, result);
 		validateAllPointsConnected(result);
 		splitRoadsAndAttachRoadSegments(ctx, result);
 		calculateTimeSpeed(ctx, result);
diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java b/OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java
index ddd44e738c..91a4fd0eff 100644
--- a/OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java
@@ -57,8 +57,11 @@ public class RoutingContext {
 	// 1. Initial variables
 	public int startX;
 	public int startY;
+	public boolean startTransportStop;
 	public int targetX;
 	public int targetY;
+	public boolean targetTransportStop;
+	public boolean publicTransport;
 	// deprecated
 	public long firstRoadId;
 	public int firstRoadDirection;
diff --git a/OsmAnd-java/src/main/java/net/osmand/router/TransportRoutePlanner.java b/OsmAnd-java/src/main/java/net/osmand/router/TransportRoutePlanner.java
index d93665ffca..8d022254d5 100644
--- a/OsmAnd-java/src/main/java/net/osmand/router/TransportRoutePlanner.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/TransportRoutePlanner.java
@@ -1,19 +1,5 @@
 package net.osmand.router;
 
-import gnu.trove.iterator.TIntIterator;
-import gnu.trove.list.array.TIntArrayList;
-import gnu.trove.map.hash.TIntObjectHashMap;
-import gnu.trove.map.hash.TLongObjectHashMap;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.PriorityQueue;
-
 import net.osmand.binary.BinaryMapIndexReader;
 import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
 import net.osmand.data.LatLon;
@@ -24,11 +10,25 @@ import net.osmand.osm.edit.Node;
 import net.osmand.osm.edit.Way;
 import net.osmand.util.MapUtils;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.PriorityQueue;
+
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.map.hash.TIntObjectHashMap;
+import gnu.trove.map.hash.TLongObjectHashMap;
+
 public class TransportRoutePlanner {
 	
 
 
-	public List<TransportRouteResult> buildRoute(TransportRoutingContext ctx, LatLon start, LatLon end) throws IOException {
+	public List<TransportRouteResult> buildRoute(TransportRoutingContext ctx, LatLon start, LatLon end) throws IOException, InterruptedException {
 		ctx.startCalcTime = System.currentTimeMillis();
 		List<TransportRouteSegment> startStops = ctx.getTransportStops(start);
 		List<TransportRouteSegment> endStops = ctx.getTransportStops(end);
@@ -45,8 +45,11 @@ public class TransportRoutePlanner {
 		}
 		double finishTime = ctx.cfg.maxRouteTime;
 		List<TransportRouteSegment> results = new ArrayList<TransportRouteSegment>();
-		
+		initProgressBar(ctx, start, end);
 		while (!queue.isEmpty()) {
+			if (ctx.calculationProgress != null && ctx.calculationProgress.isCancelled) {
+				return null;
+			}
 			TransportRouteSegment segment = queue.poll();
 			TransportRouteSegment ex = ctx.visitedSegments.get(segment.getId());
 			if(ex != null) {
@@ -56,7 +59,6 @@ public class TransportRoutePlanner {
 				continue;
 			}
 			ctx.visitedRoutesCount++;
-			System.out.println(segment);
 			ctx.visitedSegments.put(segment.getId(), segment);
 			if (segment.getDepth() > ctx.cfg.maxNumberOfChanges) {
 				continue;
@@ -72,7 +74,10 @@ public class TransportRoutePlanner {
 			TransportStop prevStop = segment.getStop(segment.segStart);
 			List<TransportRouteSegment> sgms = new ArrayList<TransportRouteSegment>();
 			for (int ind = 1 + segment.segStart; ind < segment.getLength(); ind++) {
-				segmentId ++; 
+				if (ctx.calculationProgress != null && ctx.calculationProgress.isCancelled) {
+					return null;
+				}
+				segmentId ++;
 				ctx.visitedSegments.put(segmentId, segment);
 				TransportStop stop = segment.getStop(ind);
 				// could be geometry size
@@ -88,6 +93,9 @@ public class TransportRoutePlanner {
 				sgms.clear();
 				sgms = ctx.getTransportStops(stop.x31, stop.y31, true, sgms);
 				for (TransportRouteSegment sgm : sgms) {
+					if (ctx.calculationProgress != null && ctx.calculationProgress.isCancelled) {
+						return null;
+					}
 					if (segment.wasVisited(sgm)) {
 						continue;
 					}
@@ -137,10 +145,36 @@ public class TransportRoutePlanner {
 					results.add(finish);
 				}
 			}
+			
+			if (ctx.calculationProgress != null && ctx.calculationProgress.isCancelled) {
+				throw new InterruptedException("Route calculation interrupted");
+			}
+			updateCalculationProgress(ctx, queue);
+			
 		}
 		
 		return prepareResults(ctx, results);
 	}
+	
+	private void initProgressBar(TransportRoutingContext ctx, LatLon start, LatLon end) {
+		ctx.calculationProgress.distanceFromEnd = 0;
+		ctx.calculationProgress.reverseSegmentQueueSize = 0;
+		ctx.calculationProgress.directSegmentQueueSize = 0;
+		float speed = (float) ctx.cfg.travelSpeed + 1; // assume 
+		ctx.calculationProgress.totalEstimatedDistance = (float) (MapUtils.getDistance(start, end)/ speed);
+	}
+
+	private void updateCalculationProgress(TransportRoutingContext ctx, PriorityQueue<TransportRouteSegment> queue) {
+		if (ctx.calculationProgress != null) {
+			ctx.calculationProgress.directSegmentQueueSize = queue.size();
+			if (queue.size() > 0) {
+				TransportRouteSegment peek = queue.peek();
+				ctx.calculationProgress.distanceFromBegin = (float) Math.max(peek.distFromStart,
+						ctx.calculationProgress.distanceFromBegin);
+			}
+		}		
+	}
+
 
 	private List<TransportRouteResult> prepareResults(TransportRoutingContext ctx, List<TransportRouteSegment> results) {
 		Collections.sort(results, new SegmentsComparator(ctx));
@@ -149,11 +183,17 @@ public class TransportRoutePlanner {
 				(System.currentTimeMillis() - ctx.startCalcTime) / 1000.0, results.size(), ctx.visitedRoutesCount, 
 				ctx.quadTree.size(), ctx.readTime / (1000 * 1000), ctx.loadTime / (1000 * 1000)));
 		for(TransportRouteSegment res : results) {
+			if (ctx.calculationProgress != null && ctx.calculationProgress.isCancelled) {
+				return null;
+			}
 			TransportRouteResult route = new TransportRouteResult(ctx);
 			route.routeTime = res.distFromStart;
 			route.finishWalkDist = res.walkDist;
 			TransportRouteSegment p = res;
 			while (p != null) {
+				if (ctx.calculationProgress != null && ctx.calculationProgress.isCancelled) {
+					return null;
+				}
 				if (p.parentRoute != null) {
 					TransportRouteResultSegment sg = new TransportRouteResultSegment(p.parentRoute.road, 
 							p.parentRoute.segStart, p.parentStop, p.parentRoute.walkDist, 
@@ -165,6 +205,9 @@ public class TransportRoutePlanner {
 			// test if faster routes fully included
 			boolean include = false;
 			for(TransportRouteResult s : lst) {
+				if (ctx.calculationProgress != null && ctx.calculationProgress.isCancelled) {
+					return null;
+				}
 				if(includeRoute(s, route)) {
 					include = true;
 					break;
@@ -255,7 +298,16 @@ public class TransportRoutePlanner {
 		public TransportStop getEnd() {
 			return route.getForwardStops().get(end);
 		}
-		
+
+		public List<Node> getNodes() {
+			List<Node> nodes = new ArrayList<>();
+			List<Way> ways = getGeometry();
+			for (Way way : ways) {
+				nodes.addAll(way.getNodes());
+			}
+			return nodes;
+		}
+
 		public List<Way> getGeometry() {
 			List<Way> list = new ArrayList<Way>();
 			route.mergeForwardWays();
@@ -327,7 +379,7 @@ public class TransportRoutePlanner {
 		public List<TransportRouteResultSegment> getSegments() {
 			return segments;
 		}
-		
+
 		public double getWalkDist() {
 			double d = finishWalkDist;
 			for (TransportRouteResultSegment s : segments) {
@@ -335,7 +387,15 @@ public class TransportRoutePlanner {
 			}
 			return d;
 		}
-		
+
+		public double getFinishWalkDist() {
+			return finishWalkDist;
+		}
+
+		public double getWalkSpeed() {
+			return  cfg.walkSpeed;
+		}
+
 		public double getRouteTime() {
 			return routeTime;
 		}
diff --git a/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java b/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java
index 5e3a62c05d..f6379410fa 100644
--- a/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java
+++ b/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java
@@ -6,7 +6,9 @@ import net.osmand.PlatformUtil;
 import net.osmand.ResultMatcher;
 import net.osmand.binary.BinaryMapIndexReader;
 import net.osmand.data.Amenity;
+import net.osmand.data.City;
 import net.osmand.data.LatLon;
+import net.osmand.data.MapObject;
 import net.osmand.data.Street;
 import net.osmand.osm.MapPoiTypes;
 import net.osmand.search.core.CustomSearchPoiFilter;
@@ -16,6 +18,7 @@ import net.osmand.search.core.SearchCoreFactory;
 import net.osmand.search.core.SearchCoreFactory.SearchAmenityTypesAPI;
 import net.osmand.search.core.SearchCoreFactory.SearchBuildingAndIntersectionsByStreetAPI;
 import net.osmand.search.core.SearchCoreFactory.SearchStreetByCityAPI;
+import net.osmand.search.core.SearchExportSettings;
 import net.osmand.search.core.SearchPhrase;
 import net.osmand.search.core.SearchPhrase.NameStringMatcher;
 import net.osmand.search.core.SearchResult;
@@ -25,14 +28,18 @@ import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
 import org.apache.commons.logging.Log;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -312,7 +319,7 @@ public class SearchUICore {
 		SearchAmenityTypesAPI searchAmenityTypesAPI = new SearchAmenityTypesAPI(poiTypes);
 		apis.add(searchAmenityTypesAPI);
 		apis.add(new SearchCoreFactory.SearchAmenityByTypeAPI(poiTypes, searchAmenityTypesAPI));
-		apis.add(new SearchCoreFactory.SearchAmenityByNameAPI(searchAmenityTypesAPI));
+		apis.add(new SearchCoreFactory.SearchAmenityByNameAPI());
 		SearchBuildingAndIntersectionsByStreetAPI streetsApi =
 				new SearchCoreFactory.SearchBuildingAndIntersectionsByStreetAPI();
 		apis.add(streetsApi);
@@ -480,7 +487,7 @@ public class SearchUICore {
 						}
 						return;
 					}
-					searchInBackground(phrase, rm);
+					searchInternal(phrase, rm);
 					if (!rm.isCancelled()) {
 						SearchResultCollection collection = new SearchResultCollection(
 								phrase);
@@ -492,6 +499,9 @@ public class SearchUICore {
 							LOG.info("Finishing search <" + phrase + "> Results=" + rm.getRequestResults().size());
 						}
 						currentSearchResult = collection;
+						if (phrase.getSettings().isExportObjects()) {
+							//rm.createTestJSON(collection);
+						}
 						rm.searchFinished(phrase);
 						if (onResultsComplete != null) {
 							onResultsComplete.run();
@@ -548,7 +558,7 @@ public class SearchUICore {
 		return radius;
 	}
 
-	private void searchInBackground(final SearchPhrase phrase, SearchResultMatcher matcher) {
+	void searchInternal(final SearchPhrase phrase, SearchResultMatcher matcher) {
 		preparePhrase(phrase);
 		ArrayList<SearchCoreAPI> lst = new ArrayList<>(apis);
 		Collections.sort(lst, new Comparator<SearchCoreAPI>() {
@@ -600,10 +610,7 @@ public class SearchUICore {
 		}
 	}
 
-
-
-
-	public static class SearchResultMatcher implements  ResultMatcher<SearchResult>{
+	public static class SearchResultMatcher implements ResultMatcher<SearchResult>{
 		private final List<SearchResult> requestResults = new ArrayList<>();
 		private final ResultMatcher<SearchResult> matcher;
 		private final int request;
@@ -612,7 +619,8 @@ public class SearchUICore {
 		private final AtomicInteger requestNumber;
 		int count = 0;
 		private SearchPhrase phrase;
-
+		private List<MapObject> exportedObjects;
+		private List<City> exportedCities;
 
 		public SearchResultMatcher(ResultMatcher<SearchResult> matcher, SearchPhrase phrase, int request,
 								   AtomicInteger requestNumber, int totalLimit) {
@@ -714,6 +722,108 @@ public class SearchUICore {
 			boolean cancelled = request != requestNumber.get();
 			return cancelled || (matcher != null && matcher.isCancelled());
 		}
+
+		public List<MapObject> getExportedObjects() {
+			return exportedObjects;
+		}
+
+		public List<City> getExportedCities() {
+			return exportedCities;
+		}
+
+		public void exportObject(MapObject object) {
+			if (exportedObjects == null) {
+				exportedObjects = new ArrayList<>();
+			}
+			exportedObjects.add(object);
+		}
+
+		public void exportCity(City city) {
+			if (exportedCities == null) {
+				exportedCities = new ArrayList<>();
+			}
+			exportedCities.add(city);
+		}
+
+		public JSONObject createTestJSON(SearchResultCollection searchResult) {
+			JSONObject json = new JSONObject();
+
+			Set<Amenity> amenities = new HashSet<>();
+			Set<City> cities;
+			Set<City> matchedCities = new HashSet<>();
+			Set<City> streetCities = new HashSet<>();
+			if (exportedCities != null) {
+				cities = new HashSet<>(exportedCities);
+			} else {
+				cities = new HashSet<>();
+			}
+			Set<Street> streets = new HashSet<>();
+
+			for (MapObject obj : exportedObjects) {
+				if (obj instanceof Amenity) {
+					amenities.add((Amenity) obj);
+				} else if (obj instanceof Street) {
+					Street street = (Street) obj;
+					streets.add(street);
+					if (street.getCity() != null) {
+						final City city = street.getCity();
+						cities.add(city);
+						streetCities.add(city);
+					}
+				} else if (obj instanceof City) {
+					City city = (City) obj;
+					cities.add(city);
+					matchedCities.add(city);
+				}
+			}
+			for (City city : cities) {
+				List<Street> cityStreets = city.getStreets();
+				for (Street street : streets) {
+					if (city.equals(street.getCity()) && !cityStreets.contains(street)) {
+						cityStreets.add(street);
+					}
+				}
+			}
+
+			SearchExportSettings exportSettings = phrase.getSettings().getExportSettings();
+			json.put("settings", phrase.getSettings().toJSON());
+			json.put("phrase", phrase.getRawUnknownSearchPhrase());
+			if (searchResult.searchResults != null && searchResult.searchResults.size() > 0) {
+				JSONArray resultsArr = new JSONArray();
+				for (SearchResult r : searchResult.searchResults) {
+					resultsArr.put(r.toString());
+				}
+				json.put("results", resultsArr);
+			}
+			if (amenities.size() > 0) {
+				JSONArray amenitiesArr = new JSONArray();
+				for (Amenity amenity : amenities) {
+					amenitiesArr.put(amenity.toJSON());
+				}
+				json.put("amenities", amenitiesArr);
+			}
+			if (cities.size() > 0) {
+				JSONArray citiesArr = new JSONArray();
+				for (City city : cities) {
+					final JSONObject cityObj = city.toJSON(exportSettings.isExportBuildings());
+					if (exportedCities.contains(city)) {
+						if (!exportSettings.isExportEmptyCities()) {
+							continue;
+						}
+						cityObj.put("init", 1);
+					}
+					if (matchedCities.contains(city)) {
+						cityObj.put("matchCity", 1);
+					}
+					if (streetCities.contains(city)) {
+						cityObj.put("matchStreet", 1);
+					}
+					citiesArr.put(cityObj);
+				}
+				json.put("cities", citiesArr);
+			}
+			return json;
+		}
 	}
 
 	public static class SearchResultComparator implements Comparator<SearchResult> {
@@ -731,8 +841,14 @@ public class SearchUICore {
 
 		@Override
 		public int compare(SearchResult o1, SearchResult o2) {
-			if (o1.getFoundWordCount() != o2.getFoundWordCount()) {
-				return -Algorithms.compare(o1.getFoundWordCount(), o2.getFoundWordCount());
+			boolean topVisible1 = ObjectType.isTopVisible(o1.objectType);
+			boolean topVisible2 = ObjectType.isTopVisible(o2.objectType);
+			if ((!topVisible1 && !topVisible2) || (topVisible1 && topVisible2)) {
+				if (o1.isUnknownPhraseMatches() != o2.isUnknownPhraseMatches()) {
+					return o1.isUnknownPhraseMatches() ? -1 : 1;
+				} else if (o1.getFoundWordCount() != o2.getFoundWordCount()) {
+					return -Algorithms.compare(o1.getFoundWordCount(), o2.getFoundWordCount());
+				}
 			}
 			if (!sortByName) {
 				double s1 = o1.getSearchDistance(loc);
@@ -747,6 +863,17 @@ public class SearchUICore {
 			if (st1 != st2) {
 				return Algorithms.compare(st1, st2);
 			}
+			if (o1.parentSearchResult != null && o2.parentSearchResult != null) {
+				if (o1.parentSearchResult == o2.parentSearchResult) {
+					int cmp = collator.compare(o1.localeName, o2.localeName);
+					if (cmp != 0) {
+						return cmp;
+					}
+				}
+				double s1 = o1.getSearchDistance(loc, 1);
+				double s2 = o2.getSearchDistance(loc, 1);
+				return Double.compare(s1, s2);
+			}
 			int cmp = collator.compare(o1.localeName, o2.localeName);
 			if (cmp != 0) {
 				return cmp;
diff --git a/OsmAnd-java/src/main/java/net/osmand/search/core/ObjectType.java b/OsmAnd-java/src/main/java/net/osmand/search/core/ObjectType.java
index 564c46d61a..399fa4011e 100644
--- a/OsmAnd-java/src/main/java/net/osmand/search/core/ObjectType.java
+++ b/OsmAnd-java/src/main/java/net/osmand/search/core/ObjectType.java
@@ -34,6 +34,10 @@ public enum ObjectType {
 		return t == CITY || t == VILLAGE || t == POSTCODE || t == STREET || t == HOUSE || t == STREET_INTERSECTION;
 	}
 
+	public static boolean isTopVisible(ObjectType t) {
+		return t == POI_TYPE || t == FAVORITE || t == FAVORITE_GROUP || t == WPT || t == LOCATION || t == PARTIAL_LOCATION;
+	}
+
 	public static ObjectType getExclusiveSearchType(ObjectType t) {
 		if (t == FAVORITE_GROUP) {
 			return FAVORITE;
diff --git a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java
index ae8d81cd68..035f106989 100644
--- a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java
+++ b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java
@@ -226,8 +226,6 @@ public class SearchCoreFactory {
 		return retName;
 	}
 
-
-
 	public static class SearchAddressByNameAPI extends SearchBaseAPI {
 
 		private static final int DEFAULT_ADDRESS_BBOX_RADIUS = 100 * 1000;
@@ -315,18 +313,17 @@ public class SearchCoreFactory {
 			if (phrase.isNoSelectedType() && bbox != null
 					&& (phrase.isUnknownSearchWordPresent() || phrase.isEmptyQueryAllowed())
 					&& phrase.isSearchTypeAllowed(ObjectType.CITY)) {
-				String wrd = phrase.getUnknownWordToSearch();
-				NameStringMatcher nm = phrase.getNameStringMatcher(wrd, phrase.isUnknownSearchWordComplete());
-				String unknownSearchPhrase = phrase.getUnknownSearchPhrase().trim();
-				NameStringMatcher phraseMatcher = null;
-				if (!Algorithms.isEmpty(unknownSearchPhrase)) {
-					phraseMatcher = new NameStringMatcher(unknownSearchPhrase, StringMatcherMode.CHECK_EQUALS);
-				}
-				// NameStringMatcher nm = phrase.getNameStringMatcher();
+				String word = phrase.getUnknownWordToSearch();
+				NameStringMatcher nm = phrase.getNameStringMatcher(word, phrase.isUnknownSearchWordComplete());
+				NameStringMatcher wordEqualsMatcher = phrase.getNameStringMatcher(word, true);
+				boolean firstUnknownWordMatches = word.equals(phrase.getUnknownSearchWord());
 				resArray.clear();
 				resArray = townCitiesQR.queryInBox(bbox, resArray);
 				int limit = 0;
 				for (City c : resArray) {
+					if (phrase.getSettings().isExportObjects()) {
+						resultMatcher.exportCity(c);
+					}
 					SearchResult res = new SearchResult(phrase);
 					res.object = c;
 					res.file = (BinaryMapIndexReader) c.getReferenceFile();
@@ -341,10 +338,8 @@ public class SearchCoreFactory {
 					if (phrase.isEmptyQueryAllowed() && phrase.isEmpty()) {
 						resultMatcher.publish(res);
 					} else if (nm.matches(res.localeName) || nm.matches(res.otherNames)) {
-						res.firstUnknownWordMatches = wrd.equals(phrase.getUnknownSearchWord());
-						if (phraseMatcher != null) {
-							res.unknownPhraseMatches = phraseMatcher.matches(res.localeName) || phraseMatcher.matches(res.otherNames);
-						}
+						res.firstUnknownWordMatches = firstUnknownWordMatches;
+						res.unknownPhraseMatches = wordEqualsMatcher.matches(res.localeName);
 						subSearchApiOrPublish(phrase, resultMatcher, res, cityApi);
 					}
 					if (limit++ > LIMIT * phrase.getRadiusLevel()) {
@@ -354,7 +349,6 @@ public class SearchCoreFactory {
 			}
 		}
 
-
 		private void searchByName(final SearchPhrase phrase, final SearchResultMatcher resultMatcher)
 				throws IOException {
 			if (phrase.getRadiusLevel() > 1 || phrase.getUnknownSearchWordLength() > 3 || phrase.getUnknownSearchWords().size() > 0) {
@@ -368,12 +362,14 @@ public class SearchCoreFactory {
 				final int priority = phrase.isNoSelectedType() ?
 						SEARCH_ADDRESS_BY_NAME_PRIORITY : SEARCH_ADDRESS_BY_NAME_PRIORITY_RADIUS2;
 				final BinaryMapIndexReader[] currentFile = new BinaryMapIndexReader[1];
-				
-				
+
 				ResultMatcher<MapObject> rm = new ResultMatcher<MapObject>() {
 					int limit = 0;
 					@Override
 					public boolean publish(MapObject object) {
+						if (phrase.getSettings().isExportObjects()) {
+							resultMatcher.exportObject(object);
+						}
 						if (isCancelled()) {
 							return false;
 						}
@@ -415,7 +411,6 @@ public class SearchCoreFactory {
 										|| !phrase.isSearchTypeAllowed(ObjectType.CITY)) {
 									return false;
 								}
-
 								sr.objectType = ObjectType.CITY;
 								sr.priorityDistance = 0.1;
 							} else if (((City)object).isPostcode()) {
@@ -425,7 +420,7 @@ public class SearchCoreFactory {
 								}
 								sr.objectType = ObjectType.POSTCODE;
 								sr.priorityDistance = 0;
-							}  else {
+							} else {
 								if ((locSpecified && !villagesBbox.contains(x, y, x, y))
 										|| !phrase.isSearchTypeAllowed(ObjectType.VILLAGE)) {
 									return false;
@@ -460,8 +455,6 @@ public class SearchCoreFactory {
 						return false;
 					}
 
-
-
 					@Override
 					public boolean isCancelled() {
 						return limit > LIMIT * phrase.getRadiusLevel() ||
@@ -472,11 +465,8 @@ public class SearchCoreFactory {
 						SearchPhraseDataType.ADDRESS);
 				
 				String wordToSearch = phrase.getUnknownWordToSearch();
-				String unknownSearchPhrase = phrase.getUnknownSearchPhrase().trim();
-				NameStringMatcher phraseMatcher = null;
-				if (!Algorithms.isEmpty(unknownSearchPhrase)) {
-					phraseMatcher = new NameStringMatcher(unknownSearchPhrase, StringMatcherMode.CHECK_EQUALS);
-				}
+				NameStringMatcher wordEqualsMatcher = phrase.getNameStringMatcher(wordToSearch, true);
+				boolean firstUnknownWordMatches = wordToSearch.equals(phrase.getUnknownSearchWord());
 				while (offlineIterator.hasNext() && wordToSearch.length() > 0) {
 					BinaryMapIndexReader r = offlineIterator.next();
 					currentFile[0] = r;
@@ -490,10 +480,8 @@ public class SearchCoreFactory {
 					}
 					r.searchAddressDataByName(req);
 					for (SearchResult res : immediateResults) {
-						res.firstUnknownWordMatches = wordToSearch.equals(phrase.getUnknownSearchWord());
-						if (phraseMatcher != null) {
-							res.unknownPhraseMatches = phraseMatcher.matches(res.localeName) || phraseMatcher.matches(res.otherNames);
-						}
+						res.firstUnknownWordMatches = firstUnknownWordMatches;
+						res.unknownPhraseMatches = wordEqualsMatcher.matches(res.localeName);
 						if (res.objectType == ObjectType.STREET) {
 							City ct = ((Street) res.object).getCity();
 							phrase.countUnknownWordsMatch(res, 
@@ -510,18 +498,14 @@ public class SearchCoreFactory {
 		}
 	}
 
-
-
 	public static class SearchAmenityByNameAPI extends SearchBaseAPI {
 		private static final int LIMIT = 10000;
 		private static final int BBOX_RADIUS = 500 * 1000;
 		private static final int BBOX_RADIUS_INSIDE = 10000 * 1000; // to support city search for basemap
 		private static final int FIRST_WORD_MIN_LENGTH = 3;
-		private SearchAmenityTypesAPI searchAmenityTypesAPI;
 
-		public SearchAmenityByNameAPI(SearchAmenityTypesAPI searchAmenityTypesAPI) {
+		public SearchAmenityByNameAPI() {
 			super(ObjectType.POI);
-			this.searchAmenityTypesAPI = searchAmenityTypesAPI;
 		}
 
 		@Override
@@ -530,7 +514,7 @@ public class SearchCoreFactory {
 				return false;
 			}
 			if (phrase.isNoSelectedType() && phrase.isUnknownSearchWordPresent()
-					&& phrase.isUnknownSearchWordComplete() && searchAmenityTypesAPI.hasFoundPoiTypes()) {
+					&& phrase.isUnknownSearchWordComplete() && phrase.hasUnknownSearchWordPoiTypes()) {
 				return false;
 			}
 			final BinaryMapIndexReader[] currentFile = new BinaryMapIndexReader[1];
@@ -556,6 +540,9 @@ public class SearchCoreFactory {
 						int limit = 0;
 						@Override
 						public boolean publish(Amenity object) {
+							if (phrase.getSettings().isExportObjects()) {
+								resultMatcher.exportObject(object);
+							}
 							if (limit ++ > LIMIT) {
 								return false;
 							}
@@ -587,7 +574,7 @@ public class SearchCoreFactory {
 							}
 							sr.priority = SEARCH_AMENITY_BY_NAME_PRIORITY;
 							if (phraseMatcher != null) {
-								sr.unknownPhraseMatches = phraseMatcher.matches(sr.localeName) || phraseMatcher.matches(sr.otherNames);
+								sr.unknownPhraseMatches = phraseMatcher.matches(sr.localeName);
 							}
 							phrase.countUnknownWordsMatch(sr);
 							sr.objectType = ObjectType.POI;
@@ -643,8 +630,6 @@ public class SearchCoreFactory {
 		}
 	}
 
-
-
 	public static class SearchAmenityTypesAPI extends SearchBaseAPI {
 
 		private Map<String, PoiType> translatedNames = new LinkedHashMap<>();
@@ -653,30 +638,12 @@ public class SearchCoreFactory {
 		private List<CustomSearchPoiFilter> customPoiFilters = new ArrayList<>();
 		private TIntArrayList customPoiFiltersPriorites = new TIntArrayList();
 		private MapPoiTypes types;
-		private List<AbstractPoiType> foundPoiTypes = new ArrayList<>();
-		private SearchPhrase lastSearchedPhrase;
 
 		public SearchAmenityTypesAPI(MapPoiTypes types) {
 			super(ObjectType.POI_TYPE);
 			this.types = types;
 		}
 
-		public List<AbstractPoiType> getFoundPoiTypes() {
-			return foundPoiTypes;
-		}
-
-		public boolean hasFoundPoiTypes() {
-			return foundPoiTypes.size() > 0;
-		}
-
-		public SearchPhrase getLastSearchedPhrase() {
-			return lastSearchedPhrase;
-		}
-
-		public void setLastSearchedPhrase(SearchPhrase lastSearchedPhrase) {
-			this.lastSearchedPhrase = lastSearchedPhrase;
-		}
-
 		public void clearCustomFilters() {
 			this.customPoiFilters.clear();
 			this.customPoiFiltersPriorites.clear();
@@ -695,8 +662,13 @@ public class SearchCoreFactory {
 				categories = types.getCategories(false);
 			}
 			List<AbstractPoiType> results = new ArrayList<AbstractPoiType>();
-			NameStringMatcher nm =
-					new NameStringMatcher(phrase.getUnknownSearchPhrase(), StringMatcherMode.CHECK_ONLY_STARTS_WITH_TRIM);
+			NameStringMatcher nm;
+			String unknownSearchPhrase = phrase.getUnknownSearchPhrase();
+			if (phrase.getUnknownSearchWord().length() < unknownSearchPhrase.length()) {
+				nm = new NameStringMatcher(unknownSearchPhrase, StringMatcherMode.CHECK_ONLY_STARTS_WITH_TRIM);
+			} else {
+				nm = new NameStringMatcher(unknownSearchPhrase, StringMatcherMode.CHECK_STARTS_FROM_SPACE);
+			}
 			for (AbstractPoiType pf : topVisibleFilters) {
 				if (!phrase.isUnknownSearchWordPresent()
 						|| nm.matches(pf.getTranslation())
@@ -728,21 +700,23 @@ public class SearchCoreFactory {
 						List<PoiType> additionals = pt.getPoiAdditionals();
 						if (additionals != null) {
 							for (PoiType a : additionals) {
-								if (!a.isReference() && !results.contains(a)
-										&& (nm.matches(a.getEnTranslation())
-										|| nm.matches(a.getTranslation())
-										|| nm.matches(a.getSynonyms()))) {
-									results.add(a);
+								if (!a.isReference() && !results.contains(a)) {
+									String enTranslation = a.getEnTranslation().toLowerCase();
+									if (!"yes".equals(enTranslation) && !"no".equals(enTranslation)
+											&& (nm.matches(enTranslation) || nm.matches(a.getTranslation()) || nm.matches(a.getSynonyms()))) {
+										results.add(a);
+									}
 								}
 							}
 						}
 					}
 				}
 			}
-			foundPoiTypes = new ArrayList<>(results);
-			lastSearchedPhrase = phrase;
+			phrase.setUnknownSearchWordPoiTypes(new ArrayList<>(results));
 
 			if (resultMatcher != null) {
+				String word = phrase.getUnknownSearchWord();
+				NameStringMatcher startMatch = new NameStringMatcher(word, StringMatcherMode.CHECK_ONLY_STARTS_WITH);
 				for (AbstractPoiType pt : results) {
 					SearchResult res = new SearchResult(phrase);
 					res.localeName = pt.getTranslation();
@@ -750,6 +724,7 @@ public class SearchCoreFactory {
 					res.priority = SEARCH_AMENITY_TYPE_PRIORITY;
 					res.priorityDistance = 0;
 					res.objectType = ObjectType.POI_TYPE;
+					res.firstUnknownWordMatches = startMatch.matches(res.localeName);
 					resultMatcher.publish(res);
 				}
 				for (int i = 0; i < customPoiFilters.size(); i++) {
@@ -781,12 +756,14 @@ public class SearchCoreFactory {
 			if (!p.isNoSelectedType() && !p.isUnknownSearchWordPresent()) {
 				return -1;
 			}
+			SearchWord lastSelectedWord = p.getLastSelectedWord();
+			if (lastSelectedWord != null && ObjectType.isAddress(lastSelectedWord.getType())) {
+				return -1;
+			}
 			return SEARCH_AMENITY_TYPE_API_PRIORITY;
 		}
 	}
 
-
-
 	public static class SearchAmenityByTypeAPI extends SearchBaseAPI {
 		private static final int BBOX_RADIUS = 10000;
 		private SearchAmenityTypesAPI searchAmenityTypesAPI;
@@ -852,18 +829,16 @@ public class SearchCoreFactory {
 				}
 				searchPoi(phrase, resultMatcher, obj, null, ptf);
 			} else if (searchAmenityTypesAPI != null) {
-				if (searchAmenityTypesAPI.lastSearchedPhrase == null
-						|| !searchAmenityTypesAPI.lastSearchedPhrase.getUnknownSearchPhrase().equals(phrase.getUnknownSearchPhrase())) {
+				if (phrase.getUnknownSearchWordPoiTypes() == null) {
 					searchAmenityTypesAPI.search(phrase, null);
 				}
-				List<AbstractPoiType> poiTypes = searchAmenityTypesAPI.getFoundPoiTypes();
-				for (AbstractPoiType pt : poiTypes) {
-					SearchPoiTypeFilter ptf = getPoiTypeFilter(pt);
-					String customName = phrase.getPoiNameFilter(pt);
+				AbstractPoiType poiType = phrase.getUnknownSearchWordPoiType();
+				if (poiType != null) {
+					SearchPoiTypeFilter ptf = getPoiTypeFilter(poiType);
+					String customName = phrase.getPoiNameFilter(poiType);
 					if (customName != null) {
-						phrase.setUnknownSearchWordPoiType(pt);
-						searchPoi(phrase, resultMatcher, null, customName, ptf);
-						break;
+						phrase.setUnknownSearchWordPoiType(poiType);
+						searchPoi(phrase, resultMatcher, null, customName.length() == 0 ? null : customName, ptf);
 					}
 				}
 			}
@@ -909,6 +884,9 @@ public class SearchCoreFactory {
 
 				@Override
 				public boolean publish(Amenity object) {
+					if (phrase.getSettings().isExportObjects()) {
+						resultMatcher.exportObject(object);
+					}
 					SearchResult res = new SearchResult(phrase);
 					String poiID = object.getType().getKeyName() + "_" + object.getId();
 					if(!searchedPois.add(poiID)) {
@@ -939,7 +917,14 @@ public class SearchCoreFactory {
 					res.priority = SEARCH_AMENITY_BY_TYPE_PRIORITY;
 					res.priorityDistance = 1;
 					if (phraseMatcher != null) {
-						res.unknownPhraseMatches = phraseMatcher.matches(res.localeName) || phraseMatcher.matches(res.otherNames);
+						boolean unknownPhraseMatches = phraseMatcher.matches(res.localeName);
+						AbstractPoiType unknownSearchWordPoiType = phrase.getUnknownSearchWordPoiType();
+						if (unknownPhraseMatches && unknownSearchWordPoiType != null) {
+							unknownPhraseMatches = !phraseMatcher.matches(unknownSearchWordPoiType.getTranslation())
+									&& !phraseMatcher.matches(unknownSearchWordPoiType.getEnTranslation())
+									&& !phraseMatcher.matches(unknownSearchWordPoiType.getSynonyms());
+						}
+						res.unknownPhraseMatches = unknownPhraseMatches;
 					}
 					res.objectType = ObjectType.POI;
 					resultMatcher.publish(res);
@@ -988,15 +973,13 @@ public class SearchCoreFactory {
 		@Override
 		public int getSearchPriority(SearchPhrase p) {
 			if ((p.isLastWord(ObjectType.POI_TYPE) && p.getLastTokenLocation() != null)
-					|| (p.isNoSelectedType() && p.isUnknownSearchWordComplete())) {
+					|| (p.isNoSelectedType())) {
 				return SEARCH_AMENITY_BY_TYPE_PRIORITY;
 			}
 			return -1;
 		}
 	}
 
-
-
 	public static class SearchStreetByCityAPI extends SearchBaseAPI {
 		private static final int DEFAULT_ADDRESS_BBOX_RADIUS = 100 * 1000;
 
@@ -1058,7 +1041,7 @@ public class SearchCoreFactory {
 							phrase.getNameStringMatcher().matches(res.localeName) || 
 							phrase.getNameStringMatcher().matches(res.otherNames);
 					if (phraseMatcher != null) {
-						res.unknownPhraseMatches = phraseMatcher.matches(res.localeName) || phraseMatcher.matches(res.otherNames);
+						res.unknownPhraseMatches = phraseMatcher.matches(res.localeName);
 					}
 					res.localeRelatedObjectName = c.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate());
 					res.object = object;
@@ -1094,8 +1077,6 @@ public class SearchCoreFactory {
 				p.isLastWord(ObjectType.VILLAGE);
 	}
 
-
-
 	public static class SearchBuildingAndIntersectionsByStreetAPI extends SearchBaseAPI {
 		Street cacheBuilding;
 
@@ -1169,6 +1150,7 @@ public class SearchCoreFactory {
 				}
 				String lw = phrase.getUnknownWordToSearchBuilding();
 				NameStringMatcher buildingMatch = phrase.getNameStringMatcher(lw, phrase.isLastUnknownSearchWordComplete());
+				NameStringMatcher startMatch = new NameStringMatcher(lw, StringMatcherMode.CHECK_ONLY_STARTS_WITH);
 				for (Building b : s.getBuildings()) {
 					SearchResult res = new SearchResult(phrase);
 					boolean interpolation = b.belongsToInterpolation(lw);
@@ -1182,6 +1164,7 @@ public class SearchCoreFactory {
 					res.file = file;
 					res.priority = priority;
 					res.priorityDistance = 0;
+					res.firstUnknownWordMatches = startMatch.matches(res.localeName);
 					res.relatedObject = s;
 					res.localeRelatedObjectName = s.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate());
 					res.objectType = ObjectType.HOUSE;
@@ -1235,8 +1218,6 @@ public class SearchCoreFactory {
 		}
 	}
 
-
-
 	public static class SearchLocationAndUrlAPI extends SearchBaseAPI {
 
 		public SearchLocationAndUrlAPI() {
@@ -1355,9 +1336,10 @@ public class SearchCoreFactory {
 
 		@Override
 		public int getSearchPriority(SearchPhrase p) {
+			if (!p.isNoSelectedType() || !p.isUnknownSearchWordPresent()) {
+				return -1;
+			}
 			return SEARCH_LOCATION_PRIORITY;
 		}
 	}
-	
-	
 }
diff --git a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchExportSettings.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchExportSettings.java
new file mode 100644
index 0000000000..2519d12edc
--- /dev/null
+++ b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchExportSettings.java
@@ -0,0 +1,32 @@
+package net.osmand.search.core;
+
+public class SearchExportSettings {
+	private boolean exportEmptyCities;
+	private boolean exportBuildings;
+
+	public SearchExportSettings() {
+		exportEmptyCities = true;
+		exportBuildings = true;
+	}
+
+	public SearchExportSettings(boolean exportEmptyCities, boolean exportBuildings) {
+		this.exportEmptyCities = exportEmptyCities;
+		this.exportBuildings = exportBuildings;
+	}
+
+	public boolean isExportEmptyCities() {
+		return exportEmptyCities;
+	}
+
+	public void setExportEmptyCities(boolean exportEmptyCities) {
+		this.exportEmptyCities = exportEmptyCities;
+	}
+
+	public boolean isExportBuildings() {
+		return exportBuildings;
+	}
+
+	public void setExportBuildings(boolean exportBuildings) {
+		this.exportBuildings = exportBuildings;
+	}
+}
diff --git a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchPhrase.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchPhrase.java
index 884ea96b7c..dc1a9d7b75 100644
--- a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchPhrase.java
+++ b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchPhrase.java
@@ -36,6 +36,7 @@ public class SearchPhrase {
 	private String rawUnknownSearchPhrase = "";
 	private String unknownSearchPhrase = "";
 	private AbstractPoiType unknownSearchWordPoiType;
+	private List<AbstractPoiType> unknownSearchWordPoiTypes = null;
 
 	private NameStringMatcher sm;
 	private SearchSettings settings;
@@ -47,7 +48,8 @@ public class SearchPhrase {
 	private static final String ALLDELIMITERS = "\\s|,";
 	private static final Pattern reg = Pattern.compile(ALLDELIMITERS);
 	private Collator clt;
-	
+	private static Comparator<String> commonWordsComparator;
+
 	private static Set<String> conjunctions = new TreeSet<>();
 	static {
 		// the
@@ -110,6 +112,20 @@ public class SearchPhrase {
 		conjunctions.add("den");
 		conjunctions.add("dr");
 		conjunctions.add("y");
+
+		commonWordsComparator = new Comparator<String>() {
+
+			@Override
+			public int compare(String o1, String o2) {
+				int i1 = CommonWords.getCommonSearch(o1.toLowerCase());
+				int i2 = CommonWords.getCommonSearch(o2.toLowerCase());
+				if (i1 != i2) {
+					return icompare(i1, i2);
+				}
+				// compare length without numbers to not include house numbers
+				return -icompare(lengthWithoutNumbers(o1), lengthWithoutNumbers(o2));
+			}
+		};
 	}
 	
 	
@@ -141,7 +157,7 @@ public class SearchPhrase {
 		for(SearchWord w : leftWords) {
 			if(restText.startsWith(w.getWord() + DELIMITER)) {
 				sp.words.add(w);
-				restText = restText.substring(w.getWord().length() + DELIMITER.length()).trim();
+				restText = restText.substring(w.getWord().length() + DELIMITER.length());
 			} else {
 				break;
 			}
@@ -186,7 +202,7 @@ public class SearchPhrase {
 	
 
 	public boolean isUnknownSearchWordComplete() {
-		return lastUnknownSearchWordComplete || unknownWords.size() > 0;
+		return lastUnknownSearchWordComplete || unknownWords.size() > 0 || unknownSearchWordPoiType != null;
 	}
 	
 	public boolean isLastUnknownSearchWordComplete() {
@@ -248,6 +264,24 @@ public class SearchPhrase {
 		return getPoiNameFilter(unknownSearchWordPoiType);
 	}
 
+	public boolean hasUnknownSearchWordPoiTypes() {
+		return unknownSearchWordPoiTypes != null && unknownSearchWordPoiTypes.size() > 0;
+	}
+
+	public List<AbstractPoiType> getUnknownSearchWordPoiTypes() {
+		return unknownSearchWordPoiTypes;
+	}
+
+	public void setUnknownSearchWordPoiTypes(List<AbstractPoiType> unknownSearchWordPoiTypes) {
+		this.unknownSearchWordPoiTypes = unknownSearchWordPoiTypes;
+		for (AbstractPoiType pt : unknownSearchWordPoiTypes) {
+			if (getPoiNameFilter(pt) != null) {
+				setUnknownSearchWordPoiType(pt);
+				break;
+			}
+		}
+	}
+
 	public String getPoiNameFilter(AbstractPoiType pt) {
 		String nameFilter = null;
 		if (pt != null) {
@@ -256,11 +290,11 @@ public class SearchPhrase {
 			String enTranslation = pt.getEnTranslation();
 			String translation = pt.getTranslation();
 			String synonyms = pt.getSynonyms();
-			if (unknownSearchPhrase.length() > enTranslation.length() && nm.matches(enTranslation)) {
+			if (unknownSearchPhrase.length() >= enTranslation.length() && nm.matches(enTranslation)) {
 				nameFilter = unknownSearchPhrase.substring(enTranslation.length()).trim();
-			} else if (unknownSearchPhrase.length() > translation.length() && nm.matches(translation)) {
+			} else if (unknownSearchPhrase.length() >= translation.length() && nm.matches(translation)) {
 				nameFilter = unknownSearchPhrase.substring(translation.length()).trim();
-			} else if (unknownSearchPhrase.length() > synonyms.length() && nm.matches(synonyms)) {
+			} else if (unknownSearchPhrase.length() >= synonyms.length() && nm.matches(synonyms)) {
 				nameFilter = unknownSearchPhrase.substring(synonyms.length()).trim();
 			}
 		}
@@ -727,42 +761,32 @@ public class SearchPhrase {
 		}
 		return getUnknownSearchWord();
 	}
-	
+
+	private static int lengthWithoutNumbers(String s) {
+		int len = 0;
+		for(int k = 0; k < s.length(); k++) {
+			if (s.charAt(k) >= '0' && s.charAt(k) <= '9') {
+
+			} else {
+				len++;
+			}
+		}
+		return len;
+	}
+
 	public String getUnknownWordToSearch() {
 		List<String> unknownSearchWords = getUnknownSearchWords();
-		
 		String wordToSearch = getUnknownSearchWord();
 		if (unknownSearchWords.size() > 0) {
 			List<String> searchWords = new ArrayList<>(unknownSearchWords);
 			searchWords.add(0, getUnknownSearchWord());
-			Collections.sort(searchWords, new Comparator<String>() {
-
-				private int lengthWithoutNumbers(String s) {
-					int len = 0;
-					for(int k = 0; k < s.length(); k++) {
-						if(s.charAt(k) >= '0' && s.charAt(k) <= '9') {
-							
-						} else {
-							len++;
-						}
-					}
-					return len;
+			Collections.sort(searchWords, commonWordsComparator);
+			for (String s : searchWords) {
+				if (s.length() > 0 && !Character.isDigit(s.charAt(0))) {
+					return s;
 				}
-				
-				@Override
-				public int compare(String o1, String o2) {
-					int i1 = CommonWords.getCommonSearch(o1.toLowerCase());
-					int i2 = CommonWords.getCommonSearch(o2.toLowerCase());
-					if (i1 != i2) {
-						return icompare(i1, i2);
-					}
-					// compare length without numbers to not include house numbers
-					return -icompare(lengthWithoutNumbers(o1), lengthWithoutNumbers(o2));
-				}
-			});						
-			wordToSearch = searchWords.get(0);
+			}
 		}
-
 		return wordToSearch;
 	}
 
diff --git a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchResult.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchResult.java
index 03294e6e8a..7ae713aee7 100644
--- a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchResult.java
+++ b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchResult.java
@@ -1,11 +1,19 @@
 package net.osmand.search.core;
 
-import java.util.Collection;
-
 import net.osmand.binary.BinaryMapIndexReader;
+import net.osmand.data.Amenity;
+import net.osmand.data.City;
 import net.osmand.data.LatLon;
+import net.osmand.data.Street;
+import net.osmand.osm.AbstractPoiType;
+import net.osmand.osm.PoiCategory;
+import net.osmand.osm.PoiFilter;
+import net.osmand.osm.PoiType;
+import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
+import java.util.Collection;
+
 public class SearchResult {
 	// search phrase that makes search result valid 
 	public SearchPhrase requiredSearchPhrase;
@@ -21,24 +29,28 @@ public class SearchResult {
 	public Collection<String> otherWordsMatch = null;
 	public boolean firstUnknownWordMatches = true;
 	public boolean unknownPhraseMatches = false;
-	
-	
+
+	public boolean isUnknownPhraseMatches() {
+		boolean res = unknownPhraseMatches;
+		if (!res && parentSearchResult != null) {
+			res = parentSearchResult.unknownPhraseMatches;
+		}
+		return res;
+	}
+
 	public SearchResult(SearchPhrase sp) {
 		this.requiredSearchPhrase = sp;
 	}
 	
 	public int getFoundWordCount() {
 		int inc = 0;
-		if(firstUnknownWordMatches) {
+		if (firstUnknownWordMatches) {
 			inc = 1;
 		}
-		if (unknownPhraseMatches) {
-			inc += 1000;
-		}
-		if(otherWordsMatch != null) {
+		if (otherWordsMatch != null) {
 			inc += otherWordsMatch.size();
 		}
-		if(parentSearchResult != null) {
+		if (parentSearchResult != null) {
 			inc += parentSearchResult.getFoundWordCount();
 		}
 		return inc;
@@ -70,11 +82,64 @@ public class SearchResult {
 	public String localeRelatedObjectName;
 	public Object relatedObject;
 	public double distRelatedObjectName;
-	
-	
-	
-
-	
-	
 
+	@Override
+	public String toString() {
+		StringBuilder b = new StringBuilder();
+		if (!Algorithms.isEmpty(localeName)) {
+			b.append(localeName);
+		}
+		if (!Algorithms.isEmpty(localeRelatedObjectName)) {
+			if (b.length() > 0) {
+				b.append(", ");
+			}
+			b.append(localeRelatedObjectName);
+			if (relatedObject instanceof Street) {
+				Street street = (Street) relatedObject;
+				City city = street.getCity();
+				if (city != null) {
+					b.append(", ").append(city.getName(requiredSearchPhrase.getSettings().getLang(),
+							requiredSearchPhrase.getSettings().isTransliterate()));
+				}
+			}
+		} else if (object instanceof AbstractPoiType) {
+			if (b.length() > 0) {
+				b.append(" ");
+			}
+			AbstractPoiType poiType = (AbstractPoiType) object;
+			if (poiType instanceof PoiCategory) {
+				b.append("(Category)");
+			} else if (poiType instanceof PoiFilter) {
+				b.append("(Filter)");
+			} else if (poiType instanceof PoiType) {
+				PoiType p = (PoiType) poiType;
+				final AbstractPoiType parentType = p.getParentType();
+				if (parentType != null) {
+					final String translation = parentType.getTranslation();
+					b.append("(").append(translation);
+					if (parentType instanceof PoiCategory) {
+						b.append(" / Category)");
+					} else if (parentType instanceof PoiFilter) {
+						b.append(" / Filter)");
+					} else if (parentType instanceof PoiType) {
+						PoiType pp = (PoiType) poiType;
+						PoiFilter filter = pp.getFilter();
+						PoiCategory category = pp.getCategory();
+						if (filter != null && !filter.getTranslation().equals(translation)) {
+							b.append(" / ").append(filter.getTranslation()).append(")");
+						} else if (category != null && !category.getTranslation().equals(translation)) {
+							b.append(" / ").append(category.getTranslation()).append(")");
+						} else {
+							b.append(")");
+						}
+					}
+				} else if (p.getFilter() != null) {
+					b.append("(").append(p.getFilter().getTranslation()).append(")");
+				} else if (p.getCategory() != null) {
+					b.append("(").append(p.getCategory().getTranslation()).append(")");
+				}
+			}
+		}
+		return b.toString();
+	}
 }
diff --git a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchSettings.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchSettings.java
index 186a75ed30..3779bb801a 100644
--- a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchSettings.java
+++ b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchSettings.java
@@ -3,9 +3,13 @@ package net.osmand.search.core;
 import net.osmand.binary.BinaryMapIndexReader;
 import net.osmand.data.LatLon;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 
 // immutable object
 public class SearchSettings {
@@ -19,30 +23,33 @@ public class SearchSettings {
 	private ObjectType[] searchTypes;
 	private boolean emptyQueryAllowed;
 	private boolean sortByName;
+	private SearchExportSettings exportSettings;
+	//private SearchExportSettings exportSettings = new SearchExportSettings(false, false);
 
 	public SearchSettings(SearchSettings s) {
 		if(s != null) {
 			this.radiusLevel = s.radiusLevel;
 			this.lang = s.lang;
+			this.transliterateIfMissing = s.transliterateIfMissing;
 			this.totalLimit = s.totalLimit;
 			this.offlineIndexes = s.offlineIndexes;
 			this.originalLocation = s.originalLocation;
 			this.searchTypes = s.searchTypes;
 			this.emptyQueryAllowed = s.emptyQueryAllowed;
 			this.sortByName = s.sortByName;
+			this.exportSettings = s.exportSettings;
 		}
 	}
 	
-	public SearchSettings(List<BinaryMapIndexReader> offlineIndexes) {
+	public SearchSettings(List<? extends BinaryMapIndexReader> offlineIndexes) {
 		this.offlineIndexes = Collections.unmodifiableList(offlineIndexes);
 	}
-	
-	
+
 	public List<BinaryMapIndexReader> getOfflineIndexes() {
 		return offlineIndexes;
 	}
 
-	public void setOfflineIndexes(List<BinaryMapIndexReader> offlineIndexes) {
+	public void setOfflineIndexes(List<? extends BinaryMapIndexReader> offlineIndexes) {
 		this.offlineIndexes = Collections.unmodifiableList(offlineIndexes);
 	}
 
@@ -131,6 +138,20 @@ public class SearchSettings {
 		return s;
 	}
 
+	public SearchExportSettings getExportSettings() {
+		return exportSettings;
+	}
+
+	public SearchSettings setExportSettings(SearchExportSettings exportSettings) {
+		SearchSettings s = new SearchSettings(this);
+		this.exportSettings = exportSettings;
+		return s;
+	}
+
+	public boolean isExportObjects() {
+		return exportSettings != null;
+	}
+
 	public boolean hasCustomSearchType(ObjectType type) {
 		if (searchTypes != null) {
 			for (ObjectType t : searchTypes) {
@@ -141,4 +162,52 @@ public class SearchSettings {
 		}
 		return false;
 	}
+
+	public JSONObject toJSON() {
+		JSONObject json = new JSONObject();
+		if (originalLocation != null) {
+			json.put("lat", String.format(Locale.US, "%.5f", originalLocation.getLatitude()));
+			json.put("lon", String.format(Locale.US, "%.5f", originalLocation.getLongitude()));
+		}
+		json.put("radiusLevel", radiusLevel);
+		json.put("totalLimit", totalLimit);
+		json.put("lang", lang);
+		json.put("transliterateIfMissing", transliterateIfMissing);
+		json.put("emptyQueryAllowed", emptyQueryAllowed);
+		json.put("sortByName", sortByName);
+		if (searchTypes != null && searchTypes.length > 0) {
+			JSONArray searchTypesArr = new JSONArray();
+			for (ObjectType type : searchTypes) {
+				searchTypesArr.put(type.name());
+			}
+			json.put("searchTypes", searchTypes);
+		}
+
+		return json;
+	}
+
+	public static SearchSettings parseJSON(JSONObject json) {
+		SearchSettings s = new SearchSettings(new ArrayList<BinaryMapIndexReader>());
+		if (json.has("lat") && json.has("lon")) {
+			s.originalLocation = new LatLon(json.getDouble("lat"), json.getDouble("lon"));
+		}
+		s.radiusLevel = json.optInt("radiusLevel", 1);
+		s.totalLimit = json.optInt("totalLimit", -1);
+		s.transliterateIfMissing = json.optBoolean("transliterateIfMissing", false);
+		s.emptyQueryAllowed = json.optBoolean("emptyQueryAllowed", false);
+		s.sortByName = json.optBoolean("sortByName", false);
+		if (json.has("lang")) {
+			s.lang = json.getString("lang");
+		}
+		if (json.has("searchTypes")) {
+			JSONArray searchTypesArr = json.getJSONArray("searchTypes");
+			ObjectType[] searchTypes = new ObjectType[searchTypesArr.length()];
+			for (int i = 0; i < searchTypesArr.length(); i++) {
+				String name = searchTypesArr.getString(i);
+				searchTypes[i] = ObjectType.valueOf(name);
+			}
+			s.searchTypes = searchTypes;
+		}
+		return s;
+	}
 }
diff --git a/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java b/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java
index b3bba64e41..dcf6082a7f 100644
--- a/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java
+++ b/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java
@@ -2,8 +2,12 @@ package net.osmand.util;
 
 import net.osmand.IProgress;
 import net.osmand.PlatformUtil;
+import net.osmand.router.GeneralRouter;
+import net.osmand.router.RoutingConfiguration;
 
 import org.apache.commons.logging.Log;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -27,6 +31,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.Stack;
 import java.util.zip.GZIPInputStream;
 
 
@@ -691,4 +696,54 @@ public class Algorithms {
         return str1.compareTo(str2);
     }
 
+	public static String getFileAsString(File file) {
+		try {
+			FileInputStream fin = new FileInputStream(file);
+			BufferedReader reader = new BufferedReader(new InputStreamReader(fin, "UTF-8"));
+			StringBuilder sb = new StringBuilder();
+			String line;
+			while ((line = reader.readLine()) != null) {
+				if (sb.length() > 0) {
+					sb.append("\n");
+				}
+				sb.append(line);
+			}
+			reader.close();
+			fin.close();
+			return sb.toString();
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+	public static Map<String, String> parseStringsXml(File file) throws IOException, XmlPullParserException {
+		InputStream is = new FileInputStream(file);
+		XmlPullParser parser = PlatformUtil.newXMLPullParser();
+		Map<String, String> map = new HashMap<>();
+		parser.setInput(is, "UTF-8");
+		int tok;
+		String key = null;
+		StringBuilder text = null;
+		while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
+			if (tok == XmlPullParser.START_TAG) {
+				text = new StringBuilder();
+				String name = parser.getName();
+				if ("string".equals(name)) {
+					key = parser.getAttributeValue("", "name");
+				}
+			} else if (tok == XmlPullParser.TEXT) {
+				if (text != null) {
+					text.append(parser.getText());
+				}
+			} else if (tok == XmlPullParser.END_TAG) {
+				if (key != null) {
+					map.put(key, text.toString());
+				}
+				key = null;
+				text = null;
+			}
+		}
+		is.close();
+		return map;
+	}
 }
\ No newline at end of file
diff --git a/OsmAnd-java/src/main/java/net/osmand/util/GeoPointParserUtil.java b/OsmAnd-java/src/main/java/net/osmand/util/GeoPointParserUtil.java
index 9eea38d32e..f6ac336605 100644
--- a/OsmAnd-java/src/main/java/net/osmand/util/GeoPointParserUtil.java
+++ b/OsmAnd-java/src/main/java/net/osmand/util/GeoPointParserUtil.java
@@ -526,11 +526,20 @@ public class GeoPointParserUtil {
 		if (params.containsKey("z")) {
 			zmPart = params.get("z");
 		}
-		String[] vls = silentSplit(path, ",");
+		String[] vls = null;
+		if(path.contains("@")) {
+			path = path.substring(path.indexOf("@") + 1);
+			if(path.contains(",")) {
+				vls = silentSplit(path, ",");
+			}
+		}
+		if(vls == null) {
+			vls = silentSplit(path, ",");
+		}
 
 		if (vls.length >= 2) {
-			double lat = parseSilentDouble(vls[0]);
-			double lon = parseSilentDouble(vls[1]);
+			double lat = parseSilentDouble(vls[0], Double.NaN);
+			double lon = parseSilentDouble(vls[1], Double.NaN);
 			int zoom = GeoParsedPoint.NO_ZOOM;
 			if (vls.length >= 3 || zmPart.length() > 0) {
 				if (zmPart.length() == 0) {
@@ -543,7 +552,9 @@ public class GeoPointParserUtil {
 				}
 				zoom = parseZoom(zmPart);
 			}
-			return new GeoParsedPoint(lat, lon, zoom);
+			if(!Double.isNaN(lat) && !Double.isNaN(lon)) {
+				return new GeoParsedPoint(lat, lon, zoom);
+			}
 		}
 		return new GeoParsedPoint(URLDecoder.decode(opath));
 	}
@@ -566,13 +577,17 @@ public class GeoPointParserUtil {
 	}
 
 	private static double parseSilentDouble(String zoom) {
+		return parseSilentDouble(zoom, 0);
+	}
+	
+	private static double parseSilentDouble(String zoom, double vl) {
 		try {
 			if (zoom != null) {
 				return Double.valueOf(zoom);
 			}
 		} catch (NumberFormatException e) {
 		}
-		return 0;
+		return vl;
 	}
 
 	private static int parseSilentInt(String zoom) {
@@ -739,8 +754,9 @@ public class GeoPointParserUtil {
 
 		@Override
 		public String toString() {
-			return isGeoPoint() ? "GeoParsedPoint [lat=" + lat + ", lon=" + lon + ", zoom=" + zoom
-					+ ", label=" + label + "]" : "GeoParsedPoint [query=" + query;
+			return isGeoPoint() ? 
+					String.format("GeoParsedPoint [lat=%.5f, lon=%.5f, zoom=%d, label=%s]", lat, lon, zoom, label) : 
+						String.format("GeoParsedPoint [query=%s]",query);
 		}
 	}
 }
diff --git a/OsmAnd-java/src/test/java/net/osmand/search/SearchCoreUITest.java b/OsmAnd-java/src/test/java/net/osmand/search/SearchCoreUITest.java
index f596b44879..a130e8b65c 100644
--- a/OsmAnd-java/src/test/java/net/osmand/search/SearchCoreUITest.java
+++ b/OsmAnd-java/src/test/java/net/osmand/search/SearchCoreUITest.java
@@ -1,22 +1,133 @@
 package net.osmand.search;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
 import net.osmand.OsmAndCollator;
+import net.osmand.ResultMatcher;
+import net.osmand.binary.BinaryMapIndexReader;
+import net.osmand.data.Amenity;
+import net.osmand.data.Building;
+import net.osmand.data.City;
 import net.osmand.data.LatLon;
+import net.osmand.data.MapObject;
+import net.osmand.data.Street;
+import net.osmand.osm.AbstractPoiType;
+import net.osmand.osm.MapPoiTypes;
 import net.osmand.search.SearchUICore.SearchResultCollection;
+import net.osmand.search.SearchUICore.SearchResultMatcher;
 import net.osmand.search.core.SearchPhrase;
 import net.osmand.search.core.SearchResult;
 import net.osmand.search.core.SearchSettings;
+import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Test;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class SearchCoreUITest {
 
+	private static final String SEARCH_RESOURCES_PATH = "src/test/resources/search/";
+	private static Map<String, String> enPhrases = new HashMap<>();
+	private static Map<String, String> phrases = new HashMap<>();
+
+	static {
+		MapPoiTypes.setDefault(new MapPoiTypes("src/test/resources/poi_types.xml"));
+		MapPoiTypes poiTypes = MapPoiTypes.getDefault();
+
+		try {
+			enPhrases = Algorithms.parseStringsXml(new File("src/test/resources/phrases/en/phrases.xml"));
+			//phrases = Algorithms.parseStringsXml(new File("src/test/resources/phrases/ru/phrases.xml"));
+			phrases = enPhrases;
+		} catch (IOException e) {
+			e.printStackTrace();
+		} catch (XmlPullParserException e) {
+			e.printStackTrace();
+		}
+
+		poiTypes.setPoiTranslator(new MapPoiTypes.PoiTranslator() {
+
+			@Override
+			public String getTranslation(AbstractPoiType type) {
+				AbstractPoiType baseLangType = type.getBaseLangType();
+				if (baseLangType != null) {
+					return getTranslation(baseLangType) + " (" + type.getLang().toLowerCase() + ")";
+				}
+				return getTranslation(type.getIconKeyName());
+			}
+
+			@Override
+			public String getTranslation(String keyName) {
+				String val = phrases.get("poi_" + keyName);
+				if (val != null) {
+					int ind = val.indexOf(';');
+					if (ind > 0) {
+						return val.substring(0, ind);
+					}
+				}
+				return val;
+			}
+
+			@Override
+			public String getSynonyms(AbstractPoiType type) {
+				AbstractPoiType baseLangType = type.getBaseLangType();
+				if (baseLangType != null) {
+					return getSynonyms(baseLangType);
+				}
+				return getSynonyms(type.getIconKeyName());
+			}
+
+
+			@Override
+			public String getSynonyms(String keyName) {
+				String val = phrases.get("poi_" + keyName);
+				if (val != null) {
+					int ind = val.indexOf(';');
+					if (ind > 0) {
+						return val.substring(ind + 1);
+					}
+					return "";
+				}
+				return null;
+			}
+
+			@Override
+			public String getEnTranslation(AbstractPoiType type) {
+				AbstractPoiType baseLangType = type.getBaseLangType();
+				if (baseLangType != null) {
+					return getEnTranslation(baseLangType) + " (" + type.getLang().toLowerCase() + ")";
+				}
+				return getEnTranslation(type.getIconKeyName());
+			}
+
+			@Override
+			public String getEnTranslation(String keyName) {
+				if (enPhrases.isEmpty()) {
+					return Algorithms.capitalizeFirstLetter(keyName.replace('_', ' '));
+				}
+				String val = enPhrases.get("poi_" + keyName);
+				if (val != null) {
+					int ind = val.indexOf(';');
+					if (ind > 0) {
+						return val.substring(0, ind);
+					}
+				}
+				return val;
+			}
+		});
+	}
+
 	@Test
 	public void testDuplicates() throws IOException {
 		SearchSettings ss = new SearchSettings((SearchSettings)null);
@@ -100,4 +211,220 @@ public class SearchCoreUITest {
 		rs.add(res);
 		return res;
 	}
+
+	@Test
+	public void testSearchJsons() throws IOException {
+		final File[] files = new File(SEARCH_RESOURCES_PATH).listFiles(new FilenameFilter() {
+			@Override
+			public boolean accept(File dir, String filename) {
+				return filename.endsWith(".json");
+			}
+		});
+		if (files != null) {
+			for (File f : files) {
+				//testSearchImpl(f);
+			}
+		}
+	}
+
+	private void testSearchImpl(File jsonFile) throws IOException, JSONException {
+		String sourceJsonText = Algorithms.getFileAsString(jsonFile);
+		Assert.assertNotNull(sourceJsonText);
+		Assert.assertTrue(sourceJsonText.length() > 0);
+
+		BinaryMapIndexReaderTest reader = new BinaryMapIndexReaderTest();
+		JSONObject sourceJson = new JSONObject(sourceJsonText);
+		String phraseText = sourceJson.getString("phrase");
+		JSONObject settingsJson = sourceJson.getJSONObject("settings");
+		if (sourceJson.has("amenities")) {
+			JSONArray amenitiesArr = sourceJson.getJSONArray("amenities");
+			List<Amenity> amenities = new ArrayList<>();
+			for (int i = 0; i < amenitiesArr.length(); i++) {
+				JSONObject amenityObj = amenitiesArr.getJSONObject(i);
+				amenities.add(Amenity.parseJSON(amenityObj));
+			}
+			reader.amenities = amenities;
+		}
+		if (sourceJson.has("cities")) {
+			JSONArray citiesArr = sourceJson.getJSONArray("cities");
+			List<City> cities = new ArrayList<>();
+			List<City> initCities = new ArrayList<>();
+			List<City> matchedCities = new ArrayList<>();
+			List<City> streetCities = new ArrayList<>();
+			for (int i = 0; i < citiesArr.length(); i++) {
+				JSONObject cityObj = citiesArr.getJSONObject(i);
+				final City city = City.parseJSON(cityObj);
+				cities.add(city);
+				if (cityObj.has("init")) {
+					initCities.add(city);
+				}
+				if (cityObj.has("matchCity")) {
+					matchedCities.add(city);
+				}
+				if (cityObj.has("matchStreet")) {
+					streetCities.add(city);
+				}
+			}
+			reader.cities = cities;
+			reader.initCities = initCities;
+			reader.matchedCities = matchedCities;
+			reader.streetCities = streetCities;
+		}
+		List<String> results = new ArrayList<>();
+		if (sourceJson.has("results")) {
+			JSONArray resultsArr = sourceJson.getJSONArray("results");
+			for (int i = 0; i < resultsArr.length(); i++) {
+				results.add(resultsArr.getString(i));
+			}
+		}
+
+		SearchSettings s = SearchSettings.parseJSON(settingsJson);
+		s.setOfflineIndexes(Collections.singletonList(reader));
+
+		SearchPhrase phrase = new SearchPhrase(s, OsmAndCollator.primaryCollator());
+		phrase = phrase.generateNewPhrase(phraseText, s);
+
+		final SearchUICore core = new SearchUICore(MapPoiTypes.getDefault(), "en", false);
+		core.init();
+
+		ResultMatcher<SearchResult> rm = new ResultMatcher<SearchResult>() {
+			@Override
+			public boolean publish(SearchResult object) {
+				return true;
+			}
+
+			@Override
+			public boolean isCancelled() {
+				return false;
+			}
+		};
+		SearchResultMatcher matcher = new SearchResultMatcher(rm, phrase, 1, new AtomicInteger(1), -1);
+		core.searchInternal(phrase, matcher);
+
+		SearchResultCollection collection = new SearchResultCollection(phrase);
+		collection.addSearchResults(matcher.getRequestResults(), true, true);
+		List<SearchResult> searchResults = collection.getCurrentSearchResults();
+		int i = 0;
+		for (SearchResult result : searchResults) {
+			String expected = results.get(i++);
+			String present = result.toString();
+			//System.out.println(present);
+			Assert.assertEquals(expected, present);
+			if (i >= results.size()) {
+				break;
+			}
+		}
+	}
+
+	private static class BinaryMapIndexReaderTest extends BinaryMapIndexReader {
+
+		List<Amenity> amenities = Collections.emptyList();
+		List<City> cities = Collections.emptyList();
+		List<City> initCities = Collections.emptyList();
+		List<City> matchedCities = Collections.emptyList();
+		List<City> streetCities = Collections.emptyList();
+
+		BinaryMapIndexReaderTest() throws IOException {
+			super(null, null, false);
+		}
+
+		@Override
+		public List<Amenity> searchPoiByName(SearchRequest<Amenity> req) throws IOException {
+			for (Amenity amenity : amenities) {
+				req.publish(amenity);
+			}
+			return req.getSearchResults();
+		}
+
+		@Override
+		public List<Amenity> searchPoi(SearchRequest<Amenity> req) throws IOException {
+			for (Amenity amenity : amenities) {
+				req.publish(amenity);
+			}
+			return req.getSearchResults();
+		}
+
+		@Override
+		public List<City> getCities(SearchRequest<City> resultMatcher, int cityType) throws IOException {
+			for (City city : initCities) {
+				if (resultMatcher != null) {
+					resultMatcher.publish(city);
+				}
+			}
+			return initCities;
+		}
+
+		@Override
+		public int preloadStreets(City c, SearchRequest<Street> resultMatcher) throws IOException {
+			return 0;
+		}
+
+		@Override
+		public void preloadBuildings(Street s, SearchRequest<Building> resultMatcher) throws IOException {
+			// cities must be filled with streets and buildings
+		}
+
+		@Override
+		public List<MapObject> searchAddressDataByName(SearchRequest<MapObject> req) throws IOException {
+			for (City city : streetCities) {
+				for (Street street : city.getStreets()) {
+					req.publish(street);
+				}
+			}
+			for (City city : matchedCities) {
+				req.publish(city);
+			}
+			return req.getSearchResults();
+		}
+
+		@Override
+		public String getRegionName() {
+			return "Test region";
+		}
+
+		@Override
+		public boolean containsPoiData(int left31x, int top31y, int right31x, int bottom31y) {
+			return true;
+		}
+
+		@Override
+		public boolean containsMapData() {
+			return true;
+		}
+
+		@Override
+		public boolean containsPoiData() {
+			return true;
+		}
+
+		@Override
+		public boolean containsRouteData() {
+			return true;
+		}
+
+		@Override
+		public boolean containsRouteData(int left31x, int top31y, int right31x, int bottom31y, int zoom) {
+			return true;
+		}
+
+		@Override
+		public boolean containsAddressData(int left31x, int top31y, int right31x, int bottom31y) {
+			return true;
+		}
+
+		@Override
+		public boolean containsMapData(int tile31x, int tile31y, int zoom) {
+			return true;
+		}
+
+		@Override
+		public boolean containsMapData(int left31x, int top31y, int right31x, int bottom31y, int zoom) {
+			return true;
+		}
+
+		@Override
+		public boolean containsAddressData() {
+			return true;
+		}
+	}
 }
diff --git a/OsmAnd-java/src/test/java/net/osmand/util/GeoPointParserUtilTest.java b/OsmAnd-java/src/test/java/net/osmand/util/GeoPointParserUtilTest.java
index 14c76a0f2b..05138ea91e 100644
--- a/OsmAnd-java/src/test/java/net/osmand/util/GeoPointParserUtilTest.java
+++ b/OsmAnd-java/src/test/java/net/osmand/util/GeoPointParserUtilTest.java
@@ -19,6 +19,19 @@ public class GeoPointParserUtilTest {
 		GeoParsedPoint test = GeoPointParserUtil.parse("geo:0,0?q=86HJV99P%2B29");
 		Assert.assertEquals(test.getQuery(), "86HJV99P+29");
 	}
+	
+	@Test
+	public void testGoogleMaps() {
+		// https://www.google.com/maps?daddr=Bahnhofplatz+3,+7000+Chur@46.853582,9.529903
+		GeoParsedPoint actual = GeoPointParserUtil.parse(
+				"https://www.google.com/maps?daddr=Bahnhofplatz+3,+7000+Chur");
+		assertGeoPoint(actual, new GeoParsedPoint("Bahnhofplatz 3, 7000 Chur"));
+		
+		actual = GeoPointParserUtil.parse(
+				"https://www.google.com/maps?daddr=Bahnhofplatz+3,+7000+Chur@46.853582,9.529903");
+		System.out.println(actual);
+		assertGeoPoint(actual, new GeoParsedPoint(46.853582, 9.529903));
+	}
 
 	@Test
 	public void testGeoPoint() {
diff --git a/OsmAnd-java/src/test/resources/.gitignore b/OsmAnd-java/src/test/resources/.gitignore
index 30b9836a2b..079e13cfb2 100644
--- a/OsmAnd-java/src/test/resources/.gitignore
+++ b/OsmAnd-java/src/test/resources/.gitignore
@@ -1,3 +1,5 @@
-*.json
+/*.json
+/osm_live/*.json
 *.obf
 *.osm
+phrases.xml
\ No newline at end of file
diff --git a/OsmAnd-java/src/test/resources/search/double_parking.json b/OsmAnd-java/src/test/resources/search/double_parking.json
new file mode 100644
index 0000000000..0c23cebe3d
--- /dev/null
+++ b/OsmAnd-java/src/test/resources/search/double_parking.json
@@ -0,0 +1,699 @@
+{
+  "settings": {
+    "lat": "55.28666",
+    "lon": "52.00556",
+    "radiusLevel": 1,
+    "totalLimit": -1,
+    "lang": "",
+    "transliterateIfMissing": false,
+    "emptyQueryAllowed": false,
+    "sortByName": false
+  },
+  "phrase": "parking",
+  "results": [
+    "Parking (Personal transport)",
+    "Parking entrance (Personal transport)",
+    "Parking fee (Charging station / Transportation)",
+    "Parking fee: no (Charging station / Transportation)",
+    "Parking fee: yes (Charging station / Transportation)",
+    "Parking lot (Fire hydrant / Emergency infrastructure)",
+    "Parking tickets (Vending machine / Store)",
+    "Parking tickets (Vending machine / Store)",
+    "Parking time limit (Parking / Personal transport)",
+    "Bicycle parking (Bicycle transport)",
+    "Motorcycle parking (Personal transport)",
+    "Parking",
+    "Parking",
+    "Parking",
+    "Parking"
+  ],
+  "amenities": [
+    {
+      "lat": "55.29801",
+      "lon": "51.99100",
+      "id": 881010149,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.29481",
+      "lon": "51.98964",
+      "id": 803545283,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "name": "Заинская ГРЭС",
+      "lat": "55.28492",
+      "lon": "52.02125",
+      "id": 481494555,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_yes": "yes",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.29105",
+      "lon": "51.99531",
+      "id": 540237721,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.28683",
+      "lon": "52.01479",
+      "id": 888343263,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_unpaved": "unpaved",
+        "access_permissive": "permissive",
+        "supervised_yes": "yes"
+      }
+    },
+    {
+      "lat": "55.30317",
+      "lon": "52.00192",
+      "id": 1161722765,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "parking_surface": "surface",
+        "operator": "cахарный завод"
+      }
+    },
+    {
+      "name": "для техосмотра",
+      "lat": "55.30439",
+      "lon": "52.01634",
+      "id": 484385195,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.28615",
+      "lon": "52.00702",
+      "id": 1040771455,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.28582",
+      "lon": "52.00758",
+      "id": 535925577,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.30950",
+      "lon": "51.96954",
+      "id": 1228158833,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.29345",
+      "lon": "51.99385",
+      "id": 535897911,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.30957",
+      "lon": "52.00374",
+      "id": 897019441,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.28602",
+      "lon": "52.00908",
+      "id": 268235957,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.28777",
+      "lon": "51.99608",
+      "id": 4410403520512,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "surface_unpaved": "unpaved",
+        "supervised_yes": "yes",
+        "parking_surface": "surface",
+        "fee_yes": "yes",
+        "capacity": "70"
+      }
+    },
+    {
+      "lat": "55.34092",
+      "lon": "52.05172",
+      "id": 2136388576,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no"
+      }
+    },
+    {
+      "lat": "55.28271",
+      "lon": "52.00248",
+      "id": 536030271,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.28391",
+      "lon": "52.00273",
+      "id": 536035007,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "name": "Служебная",
+      "lat": "55.28615",
+      "lon": "52.02350",
+      "id": 481491939,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "surface_asphalt": "asphalt",
+        "fee_no": "no",
+        "access_permissive": "permissive",
+        "supervised_yes": "yes",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.30969",
+      "lon": "51.96917",
+      "id": 1228158821,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.31022",
+      "lon": "51.97104",
+      "id": 1228158819,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.29275",
+      "lon": "51.99355",
+      "id": 892959215,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "name": "для посетителей",
+      "lat": "55.28688",
+      "lon": "52.00578",
+      "id": 11390213698,
+      "subType": "parking",
+      "type": "transportation"
+    },
+    {
+      "lat": "55.30838",
+      "lon": "51.96767",
+      "id": 1164434353,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "name": "Южная",
+      "lat": "55.27739",
+      "lon": "52.00544",
+      "id": 641567205,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "surface_unpaved": "unpaved",
+        "supervised_yes": "yes",
+        "parking_surface": "surface",
+        "fee_yes": "yes"
+      }
+    },
+    {
+      "lat": "55.28045",
+      "lon": "51.99550",
+      "id": 478137507,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "supervised_yes": "yes",
+        "parking_surface": "surface",
+        "fee_yes": "yes"
+      }
+    },
+    {
+      "name": "Автостоянка №1",
+      "lat": "55.29028",
+      "lon": "51.99934",
+      "id": 502948005,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "surface_gravel": "gravel",
+        "supervised_yes": "yes",
+        "parking_surface": "surface",
+        "fee_yes": "yes"
+      }
+    },
+    {
+      "lat": "55.27839",
+      "lon": "52.00301",
+      "id": 1168315587,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "parking_surface": "surface",
+        "operator": "Заинская ЦРБ"
+      }
+    },
+    {
+      "lat": "55.30468",
+      "lon": "52.01335",
+      "id": 897014805,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.32509",
+      "lon": "51.99930",
+      "id": 1172111487,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "name": "Штрафстоянка (Эвакуатор)",
+      "lat": "55.30439",
+      "lon": "52.01346",
+      "id": 5153530824,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "supervised_yes": "yes",
+        "parking_surface": "surface",
+        "fee_yes": "yes",
+        "phone": "+7 (85558) 7-77-01"
+      }
+    },
+    {
+      "name": "Три тополя",
+      "lat": "55.29666",
+      "lon": "51.99048",
+      "id": 642175341,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "surface_unpaved": "unpaved",
+        "supervised_yes": "yes",
+        "parking_surface": "surface",
+        "fee_yes": "yes"
+      }
+    },
+    {
+      "lat": "55.29077",
+      "lon": "52.00812",
+      "id": 1168356553,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "surface_asphalt": "asphalt",
+        "supervised_yes": "yes",
+        "parking_surface": "surface",
+        "fee_yes": "yes"
+      }
+    },
+    {
+      "lat": "55.29429",
+      "lon": "51.99190",
+      "id": 893048919,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.29959",
+      "lon": "52.00516",
+      "id": 1022216961,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.28355",
+      "lon": "51.99881",
+      "id": 943827057,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.28651",
+      "lon": "52.00479",
+      "id": 905757839,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.28928",
+      "lon": "52.00977",
+      "id": 190467181,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_gravel": "gravel",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.28674",
+      "lon": "52.00282",
+      "id": 1168411743,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "name": "для клиентов",
+      "lat": "55.29116",
+      "lon": "51.99394",
+      "id": 821840897,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "surface_asphalt": "asphalt",
+        "parking_surface": "surface",
+        "access_customers": "customers"
+      }
+    },
+    {
+      "lat": "55.29068",
+      "lon": "51.99490",
+      "id": 540238031,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.28982",
+      "lon": "51.98911",
+      "id": 190489189,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.29341",
+      "lon": "51.99072",
+      "id": 806562897,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no"
+      }
+    },
+    {
+      "lat": "55.28042",
+      "lon": "52.00155",
+      "id": 1159734951,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.30493",
+      "lon": "52.01007",
+      "id": 1172110357,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.30500",
+      "lon": "52.01108",
+      "id": 1172110359,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface",
+        "capacity": "13"
+      }
+    },
+    {
+      "lat": "55.29816",
+      "lon": "51.99222",
+      "id": 1160388645,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.29015",
+      "lon": "51.99366",
+      "id": 503278061,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.30624",
+      "lon": "52.00475",
+      "id": 691494051,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface",
+        "operator": "ЗЗМК - Тимер"
+      }
+    },
+    {
+      "name": "для регистрации в ГИБДД",
+      "lat": "55.30438",
+      "lon": "52.01483",
+      "id": 484385289,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    },
+    {
+      "lat": "55.29258",
+      "lon": "51.99188",
+      "id": 892959265,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no"
+      }
+    },
+    {
+      "lat": "55.28050",
+      "lon": "52.00200",
+      "id": 1159662915,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface",
+        "capacity": "10"
+      }
+    },
+    {
+      "lat": "55.29845",
+      "lon": "51.99057",
+      "id": 881010015,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "fee_no": "no",
+        "surface_asphalt": "asphalt",
+        "supervised_no": "no",
+        "parking_surface": "surface"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/OsmAnd-java/src/test/resources/search/poi_biergarten.json b/OsmAnd-java/src/test/resources/search/poi_biergarten.json
new file mode 100644
index 0000000000..362e58f4d7
--- /dev/null
+++ b/OsmAnd-java/src/test/resources/search/poi_biergarten.json
@@ -0,0 +1,662 @@
+{
+  "settings": {
+    "lat": "51.04933",
+    "lon": "13.73815",
+    "radiusLevel": 1,
+    "totalLimit": -1,
+    "lang": "",
+    "transliterateIfMissing": false,
+    "emptyQueryAllowed": false,
+    "sortByName": false
+  },
+  "phrase": "Biergarten",
+  "results": [
+    "Biergarten (Food)",
+    "Biergarten Italienisches Dörfchen",
+    "Biergarten Narrenhäus'l",
+    "Biergarten Elbsegler",
+    "Biergarten Elbsegler",
+    "Biergarten",
+    "Biergarten",
+    "Biergarten",
+    "Biergarten",
+    "Biergarten"
+  ],
+  "amenities": [
+    {
+      "lat": "51.02489",
+      "lon": "13.69860",
+      "id": 244538865,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "surface_fine_gravel": "fine_gravel"
+      }
+    },
+    {
+      "lat": "51.09478",
+      "lon": "13.84153",
+      "id": 865332598,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "operator": "Einkehr"
+      }
+    },
+    {
+      "lat": "51.01123",
+      "lon": "13.67918",
+      "id": 9712288200,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "website": "http://www.zur-linde-freital.de/",
+        "operator": "Zur Linde",
+        "image": "http://commons.wikimedia.org/wiki/File:Hotel_und_Gasthaus_Zur_Linde_Freital-Birkigt.jpg"
+      }
+    },
+    {
+      "name": "Altes Wettbüro",
+      "lat": "51.06472",
+      "lon": "13.74467",
+      "id": 11451975032,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "Tu-Sa 17:00-22:00",
+      "additionalInfo": {
+        "wheelchair_limited": "limited",
+        "outdoor_seating_yes": "yes",
+        "outdoor_seating_filter_yes": "yes",
+        "opening_hours": "Tu-Sa 17:00-22:00",
+        "website": "http://www.altes-wettbuero.de",
+        "phone": "+49 351 6588983",
+        "operator": "Falk Gruß"
+      }
+    },
+    {
+      "name": "Carolaschlösschen",
+      "lat": "51.03341",
+      "lon": "13.76392",
+      "id": 3704353318,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "Mo-Su 11:00-24:00",
+      "additionalInfo": {
+        "wheelchair_limited": "limited",
+        "opening_hours": "Mo-Su 11:00-24:00",
+        "facebook": "https://www.facebook.com/carolaschloesschen/"
+      }
+    },
+    {
+      "lat": "51.01251",
+      "lon": "13.69407",
+      "id": 562115695,
+      "subType": "biergarten",
+      "type": "sustenance"
+    },
+    {
+      "name": "Torwirtschaft",
+      "lat": "51.04156",
+      "lon": "13.75139",
+      "id": 517007905,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "wheelchair_yes": "yes",
+        "website": "http://www.torwirtschaft-dresden.de",
+        "facebook": "https://www.facebook.com/Torwirtschaft-der-Biergarten-f%C3%BCr-alle-Dynamofans-168677023169963/"
+      }
+    },
+    {
+      "name": "Biergarten Italienisches Dörfchen",
+      "lat": "51.05429",
+      "lon": "13.73759",
+      "id": 486232011,
+      "subType": "biergarten",
+      "type": "sustenance"
+    },
+    {
+      "lat": "51.04261",
+      "lon": "13.75229",
+      "id": 98518191,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "wheelchair_yes": "yes"
+      }
+    },
+    {
+      "name": "Körnergarten",
+      "names": {
+        "prefix": "Biergarten"
+      },
+      "lat": "51.05316",
+      "lon": "13.81192",
+      "id": 3704353594,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "Mo-Su 11:00-24:00",
+      "additionalInfo": {
+        "wheelchair_limited": "limited",
+        "opening_hours": "Mo-Su 11:00-24:00",
+        "website": "http://www.koernergarten.de/"
+      }
+    },
+    {
+      "lat": "51.06397",
+      "lon": "13.79748",
+      "id": 670742479,
+      "subType": "biergarten",
+      "type": "sustenance"
+    },
+    {
+      "name": "Weingut Seifert",
+      "lat": "51.11134",
+      "lon": "13.66701",
+      "id": 789740008,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "note": "not really a 'biergarten' :)"
+      }
+    },
+    {
+      "lat": "50.98710",
+      "lon": "13.65086",
+      "id": 9037536542,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "operator": "Zum Gründl"
+      }
+    },
+    {
+      "lat": "51.10538",
+      "lon": "13.62622",
+      "id": 9289210778,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "operator": "Zum Bürgergarten"
+      }
+    },
+    {
+      "lat": "51.09459",
+      "lon": "13.84170",
+      "id": 5598697742,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "operator": "Einkehr"
+      }
+    },
+    {
+      "name": "Trobischhof",
+      "lat": "51.08649",
+      "lon": "13.71338",
+      "id": 409847251,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "wheelchair_limited": "limited"
+      }
+    },
+    {
+      "name": "Demnitz Elbegarten",
+      "lat": "51.05328",
+      "lon": "13.81175",
+      "id": 771102016,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "wheelchair_no": "no",
+        "cuisine_german": "german",
+        "website": "http://www.elbegarten.de"
+      }
+    },
+    {
+      "name": "Augustus Garten am Narrenhäusl",
+      "lat": "51.05697",
+      "lon": "13.74166",
+      "id": 465538291,
+      "subType": "biergarten",
+      "type": "sustenance"
+    },
+    {
+      "lat": "51.01529",
+      "lon": "13.65107",
+      "id": 7482890514,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "operator": "Burgwartschänke"
+      }
+    },
+    {
+      "name": "el Horst",
+      "lat": "51.04361",
+      "lon": "13.78979",
+      "id": 559979958,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "Oct-Apr: Mo-Fr 17:00-18:00+, Oct-Apr: Sa,PH 11:30-18:00+, May-Sep: Mo-Fr 15:00-18:00+, May-Sep: Sa,PH 11:30-18:00+",
+      "additionalInfo": {
+        "opening_hours": "Oct-Apr: Mo-Fr 17:00-18:00+, Oct-Apr: Sa,PH 11:30-18:00+, May-Sep: Mo-Fr 15:00-18:00+, May-Sep: Sa,PH 11:30-18:00+"
+      }
+    },
+    {
+      "lat": "51.07376",
+      "lon": "13.70135",
+      "id": 553613482,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "operator": "Wirtshaus Lindenschänke"
+      }
+    },
+    {
+      "name": "Wachstube",
+      "lat": "51.04254",
+      "lon": "13.75222",
+      "id": 46060263,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "11:00+",
+      "additionalInfo": {
+        "wheelchair_no": "no",
+        "opening_hours": "11:00+",
+        "website": "https://www.torwirtschaft-dresden.de/wachstube/restaurant.php",
+        "phone": "+49 351 4466975",
+        "image": "https://commons.wikimedia.org/wiki/File:Torhaus_N_Grosser_Garten_Dresden-2.jpg",
+        "wheelchair_description:de": "Zugang ins Gebäude nur über Stufen",
+        "height": "5.7",
+        "facebook": "https://www.facebook.com/Wachstube-im-Gro%C3%9Fen-Garten-Dresden-144180698984577/",
+        "email": "info@wachstube-dresden.de"
+      }
+    },
+    {
+      "lat": "51.09050",
+      "lon": "13.70555",
+      "id": 6300849046,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "operator": "Bäckerei Werner"
+      }
+    },
+    {
+      "name": "Biergarten Elbsegler",
+      "lat": "51.05731",
+      "lon": "13.73973",
+      "id": 465318113,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "wheelchair_limited": "limited"
+      }
+    },
+    {
+      "name": "Straußenwirtschaft Weingut Pesterwitz",
+      "lat": "51.02883",
+      "lon": "13.64144",
+      "id": 478369183,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "website": "https://www.gut-pesterwitz.de/"
+      }
+    },
+    {
+      "name": "Schillergarten",
+      "lat": "51.05228",
+      "lon": "13.80908",
+      "id": 493702544,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "Mo-Su 11:00-01:00",
+      "additionalInfo": {
+        "wheelchair_yes": "yes",
+        "opening_hours": "Mo-Su 11:00-01:00"
+      }
+    },
+    {
+      "lat": "51.04111",
+      "lon": "13.80554",
+      "id": 5837244174,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "operator": "Astloch"
+      }
+    },
+    {
+      "name": "Spitzwegerich",
+      "lat": "51.07767",
+      "lon": "13.70757",
+      "id": 412610355,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "wheelchair_yes": "yes",
+        "toilets_wheelchair_no": "no"
+      }
+    },
+    {
+      "name": "Biergarten Goldener Anker",
+      "lat": "51.10399",
+      "lon": "13.62850",
+      "id": 143015201,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "Tu-Su,PH 11:00-21:00",
+      "additionalInfo": {
+        "wheelchair_yes": "yes",
+        "opening_hours": "Tu-Su,PH 11:00-21:00"
+      }
+    },
+    {
+      "name": "Bottoms Up",
+      "lat": "51.06516",
+      "lon": "13.75615",
+      "id": 1394136626,
+      "subType": "biergarten",
+      "type": "sustenance"
+    },
+    {
+      "name": "Biergarten Narrenhäus'l",
+      "lat": "51.05666",
+      "lon": "13.74130",
+      "id": 466763007,
+      "subType": "biergarten",
+      "type": "sustenance"
+    },
+    {
+      "name": "Zum Schießhaus",
+      "lat": "51.05464",
+      "lon": "13.72727",
+      "id": 326416539,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "Mo-Su,PH 11:00-23:00",
+      "additionalInfo": {
+        "wheelchair_yes": "yes",
+        "toilets_wheelchair_no": "no",
+        "opening_hours": "Mo-Su,PH 11:00-23:00"
+      }
+    },
+    {
+      "name": "Palais Bistro",
+      "lat": "51.05182",
+      "lon": "13.73682",
+      "id": 501015667,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "Apr-Oct: Mo-Su 11:00-24:00, Nov-Mar: Mo-Th 12:00-14:30,17:30-24:00, Nov-Mar: Fr-Su 12:00-24:00",
+      "additionalInfo": {
+        "wheelchair_yes": "yes",
+        "opening_hours": "Apr-Oct: Mo-Su 11:00-24:00, Nov-Mar: Mo-Th 12:00-14:30,17:30-24:00, Nov-Mar: Fr-Su 12:00-24:00"
+      }
+    },
+    {
+      "name": "Brauhaus am Waldschlößchen",
+      "lat": "51.06778",
+      "lon": "13.77786",
+      "id": 594989978,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "Mo-Su 11:00-01:00",
+      "additionalInfo": {
+        "wheelchair_limited": "limited",
+        "opening_hours": "Mo-Su 11:00-01:00"
+      }
+    },
+    {
+      "lat": "51.00222",
+      "lon": "13.68504",
+      "id": 2469999180,
+      "subType": "biergarten",
+      "type": "sustenance"
+    },
+    {
+      "name": "Biergarten Elbsegler",
+      "lat": "51.05738",
+      "lon": "13.73913",
+      "id": 466539133,
+      "subType": "biergarten",
+      "type": "sustenance"
+    },
+    {
+      "lat": "51.01010",
+      "lon": "13.66208",
+      "id": 7987508388,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "wheelchair_yes": "yes",
+        "operator": "Zum goldenen Löwen"
+      }
+    },
+    {
+      "lat": "50.99476",
+      "lon": "13.72701",
+      "id": 6765029580,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "operator": "Eutschützer Mühle"
+      }
+    },
+    {
+      "lat": "50.99295",
+      "lon": "13.64362",
+      "id": 6065174964,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "operator": "Alte Schmiede"
+      }
+    },
+    {
+      "name": "Louisengarten",
+      "lat": "51.06681",
+      "lon": "13.75278",
+      "id": 68516655,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "Apr-Sep Su-Th 16:00+; Apr-Sep Fr,Sa 15:00+ || off \"Bei unfreundlichem Wetter\"",
+      "additionalInfo": {
+        "wheelchair_no": "no",
+        "opening_hours": "Apr-Sep Su-Th 16:00+; Apr-Sep Fr,Sa 15:00+ || off \"Bei unfreundlichem Wetter\"",
+        "website": "http://www.biergarten-dresden.de",
+        "note": "Neustädter Winter Hüttn von Oktober-Dezember",
+        "alt_name": "Neustädter Winter Hüttn"
+      }
+    },
+    {
+      "lat": "51.00871",
+      "lon": "13.65959",
+      "id": 9237211698,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "wheelchair_yes": "yes",
+        "operator": "Akropolis"
+      }
+    },
+    {
+      "lat": "51.03435",
+      "lon": "13.76042",
+      "id": 595971770,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "Apr-Oct: Mo-Fr 11:00-19:00; Sa-Su 10:00-19:00; PH 10:00-19:00",
+      "additionalInfo": {
+        "wheelchair_yes": "yes",
+        "opening_hours": "Apr-Oct: Mo-Fr 11:00-19:00; Sa-Su 10:00-19:00; PH 10:00-19:00",
+        "website": "https://www.grosser-garten-dresden.de/de/gaesteservice/gastronomie-shop/",
+        "phone": "+49 152 37 00 67 53"
+      }
+    },
+    {
+      "name": "Landgut Hofewiese",
+      "lat": "51.10989",
+      "lon": "13.83207",
+      "id": 8455509378,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "wheelchair_yes": "yes"
+      }
+    },
+    {
+      "name": "Café & Restaurant Saite",
+      "lat": "51.07636",
+      "lon": "13.74825",
+      "id": 577481323,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "Mo-Fr 18:00-24:00, Su 10:00-15:00",
+      "additionalInfo": {
+        "wheelchair_limited": "limited",
+        "opening_hours": "Mo-Fr 18:00-24:00, Su 10:00-15:00"
+      }
+    },
+    {
+      "name": "Alt-Dresden",
+      "lat": "51.04977",
+      "lon": "13.69881",
+      "id": 970594717,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "wheelchair_limited": "limited",
+        "phone": "0351 4135133"
+      }
+    },
+    {
+      "lat": "51.08677",
+      "lon": "13.70081",
+      "id": 413620001,
+      "subType": "biergarten",
+      "type": "sustenance"
+    },
+    {
+      "lat": "50.98618",
+      "lon": "13.63208",
+      "id": 10355747978,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "operator": "Hirschbergschenke"
+      }
+    },
+    {
+      "name": "Fährgarten Johannstadt",
+      "lat": "51.06151",
+      "lon": "13.76679",
+      "id": 4415013507072,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "wheelchair_yes": "yes",
+        "outdoor_seating_yes": "yes",
+        "outdoor_seating_filter_yes": "yes",
+        "website": "http://www.faehrgarten.de/",
+        "phone": "+49 351 4596262",
+        "brewery_additional": "Radeberger",
+        "email": "info@faehrgarten.de"
+      }
+    },
+    {
+      "lat": "51.02343",
+      "lon": "13.73347",
+      "id": 4563637454,
+      "subType": "biergarten",
+      "type": "sustenance"
+    },
+    {
+      "name": "Besenwirtschaft Steinrücken",
+      "lat": "51.11590",
+      "lon": "13.62457",
+      "id": 7474665554,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "website": "http://www.besenwirtschaft-steinruecken.de/index.html"
+      }
+    },
+    {
+      "lat": "51.05181",
+      "lon": "13.81396",
+      "id": 9819148822,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "operator": "WSV \"Am Blauen Wunder\""
+      }
+    },
+    {
+      "name": "Zacke",
+      "lat": "51.01300",
+      "lon": "13.63618",
+      "id": 7498805230,
+      "subType": "biergarten",
+      "type": "sustenance"
+    },
+    {
+      "name": "Klotzscher Sommerwirtschaft",
+      "lat": "51.11072",
+      "lon": "13.76879",
+      "id": 717794449,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "Mo-Fr 17:00-23:00; Sa-Su 11:00-23:00; Nov-Mar off",
+      "additionalInfo": {
+        "opening_hours": "Mo-Fr 17:00-23:00; Sa-Su 11:00-23:00; Nov-Mar off",
+        "website": "http://klotzschersommerwirtschaft.de",
+        "phone": "+49 351 8804570",
+        "fax": "+49 351 8902050",
+        "email": "Kontakt@klotzscher-sommerwirtschaft.de",
+        "capacity": "20"
+      }
+    },
+    {
+      "name": "Brauhaus Watzke",
+      "lat": "51.07744",
+      "lon": "13.71540",
+      "id": 397976739,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "additionalInfo": {
+        "wheelchair_limited": "limited",
+        "toilets_wheelchair_no": "no"
+      }
+    },
+    {
+      "name": "Trachauer Sommergarten",
+      "lat": "51.09166",
+      "lon": "13.70289",
+      "id": 1822089672,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "Mo-Su 17:00-21:00",
+      "additionalInfo": {
+        "opening_hours": "Mo-Su 17:00-21:00",
+        "note": "Auch im Winter geöffnet"
+      }
+    },
+    {
+      "lat": "51.06520",
+      "lon": "13.82406",
+      "id": 11565282314,
+      "subType": "biergarten",
+      "type": "sustenance",
+      "openingHours": "seasonal",
+      "additionalInfo": {
+        "outdoor_seating_yes": "yes",
+        "outdoor_seating_filter_yes": "yes",
+        "opening_hours": "seasonal"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/OsmAnd-java/src/test/resources/search/street_komsomolskaya.json b/OsmAnd-java/src/test/resources/search/street_komsomolskaya.json
new file mode 100644
index 0000000000..525aee1b12
--- /dev/null
+++ b/OsmAnd-java/src/test/resources/search/street_komsomolskaya.json
@@ -0,0 +1,2897 @@
+{
+  "settings": {
+    "lat": "55.28666",
+    "lon": "52.00558",
+    "radiusLevel": 1,
+    "totalLimit": -1,
+    "lang": "",
+    "transliterateIfMissing": false,
+    "emptyQueryAllowed": false,
+    "sortByName": false
+  },
+  "phrase": "комсомольская",
+  "results": [
+    "Комсомольская улица, Заинск",
+    "Комсомольская улица, Чукмарлы",
+    "Комсомольская улица, Русский Акташ",
+    "Комсомольская улица, Альметьевск",
+    "Комсомольская набережная, Набережные Челны",
+    "Комсомольская улица, Новое Надырово",
+    "Комсомольская улица, Тарловка"
+  ],
+  "amenities": [
+    {
+      "name": "Комсомольская средняя общеобразовательная школа",
+      "lat": "55.58591",
+      "lon": "52.49345",
+      "id": 408464669,
+      "subType": "school",
+      "type": "education"
+    },
+    {
+      "name": "ПС Комсомольская",
+      "lat": "55.34627",
+      "lon": "49.28010",
+      "id": 549500069,
+      "subType": "power_substation",
+      "type": "man_made"
+    }
+  ],
+  "cities": [
+    {
+      "name": "Тараща",
+      "enName": "Tarascha",
+      "names": {
+        "de": "Taraschtscha",
+        "ru": "Тараща",
+        "uk": "Тараща",
+        "prefix": "місто",
+        "pl": "Taraszcza"
+      },
+      "lat": "49.55550",
+      "lon": "30.50234",
+      "id": 620750304,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Сарманово",
+      "enName": "Sarmanovo",
+      "names": {
+        "tt": "Сарман",
+        "de": "Sarmanowo",
+        "ru": "Сарманово",
+        "ja": "サルマノヴォ"
+      },
+      "lat": "55.25225",
+      "lon": "52.58872",
+      "id": 337839105,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Богатые Сабы",
+      "enName": "Bogatye Saby",
+      "names": {
+        "tt": "Байлар Сабасы",
+        "ru": "Богатые Сабы",
+        "ja": "ボガートィエ・サブィ"
+      },
+      "lat": "56.01062",
+      "lon": "50.44677",
+      "id": 701847474,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Прип’ять",
+      "enName": "Pripyat",
+      "names": {
+        "de": "Prypjat",
+        "no": "Pripjat",
+        "be": "Прып'яць",
+        "fi": "Prypjat",
+        "ru": "Припять",
+        "pt": "Pripyat",
+        "bg": "Припя̀т",
+        "prefix": "місто",
+        "lt": "Pripetė",
+        "hr": "Prėpetė",
+        "fr": "Pripiat",
+        "hu": "Pripjaty",
+        "uk": "Прип’ять",
+        "sk": "Pripjať",
+        "sl": "Pripjat",
+        "id": "Prypiat",
+        "pam": "Prypiat",
+        "ca": "Pripyat",
+        "sr": "Припјат",
+        "sv": "Pripjat",
+        "ko": "프리피야티",
+        "eo": "Pripjat",
+        "it": "Pripjat",
+        "es": "Prípiat",
+        "zh": "普里皮亚特",
+        "et": "Prõpjat",
+        "cs": "Pripjať",
+        "ja": "プリピャチ",
+        "pl": "Prypeć",
+        "da": "Prypiat",
+        "ro": "Pripiat",
+        "nl": "Prypjat"
+      },
+      "lat": "51.40613",
+      "lon": "30.05711",
+      "id": 127835001,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Актаныш",
+      "enName": "Aktanysh",
+      "names": {
+        "tt": "Актаныш",
+        "ru": "Актаныш",
+        "ja": "アクタヌィシ"
+      },
+      "lat": "55.72218",
+      "lon": "54.05773",
+      "id": 606106631,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.72131",
+          "lon": "54.05469",
+          "id": 7710
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Баришівка",
+      "enName": "Baryshivka",
+      "names": {
+        "de": "Baryschiwka",
+        "ru": "Барышевка",
+        "uk": "Баришівка",
+        "prefix": "селище міського типу",
+        "pl": "Baryszówka"
+      },
+      "lat": "50.36453",
+      "lon": "31.32567",
+      "id": 337523450,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Старые Алгаши",
+      "enName": "Staryye Algashi",
+      "names": {
+        "cv": "Кивӗ Улхаш",
+        "ru": "Старые Алгаши"
+      },
+      "lat": "54.66233",
+      "lon": "47.73995",
+      "id": 336525031,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.66400",
+          "lon": "47.73695",
+          "id": 11319
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Чорнобиль",
+      "enName": "Chornobyl",
+      "names": {
+        "nn": "Tsjernobyl",
+        "de": "Tschornobyl",
+        "no": "Tsjernobyl",
+        "be": "Чарнобыль",
+        "fi": "Tšernobyl",
+        "ru": "Чернобыль",
+        "pt": "Chernobyl",
+        "prefix": "місто",
+        "lt": "Černobylis",
+        "hr": "Černobil",
+        "fr": "Tchernobyl",
+        "hu": "Csernobil",
+        "yi": "טשערנאבל",
+        "oc": "Chornobyl",
+        "uk": "Чорнобиль",
+        "sk": "Černobyľ",
+        "sl": "Černobil",
+        "id": "Chernobyl",
+        "ca": "Txernòbil",
+        "scn": "Chernobyl",
+        "sr": "Černobilj",
+        "sv": "Tjernobyl",
+        "ko": "초르노빌",
+        "af": "Černobylis",
+        "ms": "Chernobyl",
+        "eo": "Ĉernobilo",
+        "it": "Černobyl",
+        "es": "Chernóbil",
+        "zh": "切尔诺贝利",
+        "et": "Tšornobõl",
+        "cs": "Černobyl",
+        "eu": "Txernobyl",
+        "ar": "تشيرنوبيل",
+        "vi": "Chernobyl",
+        "lb": "Tschernobyl",
+        "ja": "チョルノーブィリ",
+        "pl": "Czarnobyl",
+        "da": "Tjernobyl",
+        "he": "צ'רנוביל",
+        "ro": "Cernobîl",
+        "nl": "Tsjernobyl",
+        "tr": "Çernobil"
+      },
+      "lat": "51.27053",
+      "lon": "30.21944",
+      "id": 127834997,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Новое Надырово",
+      "names": {
+        "tt": "Яңа Нəдер"
+      },
+      "lat": "54.89366",
+      "lon": "52.47019",
+      "id": 1504453249,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.89767",
+          "lon": "52.46710",
+          "id": 7941
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Узин",
+      "enName": "Uzyn",
+      "names": {
+        "ru": "Узин",
+        "uk": "Узин",
+        "prefix": "місто",
+        "eo": "Uzin",
+        "fr": "Ouzyn",
+        "pl": "Uzyn"
+      },
+      "lat": "49.82847",
+      "lon": "30.41973",
+      "id": 337543666,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Камские Поляны",
+      "enName": "Kamskiye Polyani",
+      "names": {
+        "tt": "Кама Аланы",
+        "de": "Kamskije Poljany",
+        "ru": "Камские Поляны",
+        "ja": "カムスキエ・ポリャヌィ"
+      },
+      "lat": "55.42550",
+      "lon": "51.41016",
+      "id": 587614698,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Большие Ключи",
+      "names": {
+        "tt": "Большие Ключи"
+      },
+      "lat": "55.98296",
+      "lon": "48.80483",
+      "id": 652108458,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.98220",
+          "lon": "48.79005",
+          "id": 5779
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Бабинці",
+      "enName": "Babyntsi",
+      "names": {
+        "ru": "Бабинцы",
+        "uk": "Бабинці",
+        "prefix": "селище міського типу",
+        "pl": "Babyntsi"
+      },
+      "lat": "50.64241",
+      "lon": "30.02907",
+      "id": 1668578377,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Славутич",
+      "enName": "Slavutych",
+      "names": {
+        "de": "Slawutytsch",
+        "ru": "Славутич",
+        "uk": "Славутич",
+        "prefix": "місто",
+        "lt": "Slavutičius",
+        "pl": "Sławutycz"
+      },
+      "lat": "51.52014",
+      "lon": "30.75623",
+      "id": 337507300,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Иннополис",
+      "enName": "Innopolis",
+      "names": {
+        "tt": "Иннополис",
+        "ru": "Иннополис"
+      },
+      "lat": "55.75226",
+      "lon": "48.74458",
+      "id": 2294499518,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Лащ-Таяба",
+      "names": {
+        "cv": "Лаш Таяпа",
+        "ru": "Лащ-Таяба"
+      },
+      "lat": "55.03009",
+      "lon": "47.99935",
+      "id": 795358551,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.03201",
+          "lon": "47.99221",
+          "id": 10729
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Вишневе",
+      "enName": "Vyshneve",
+      "names": {
+        "de": "Wyschnewe",
+        "ru": "Вишнёвое",
+        "uk": "Вишневе",
+        "prefix": "місто",
+        "pl": "Wysznewe",
+        "hu": "Vyshneve"
+      },
+      "lat": "50.39175",
+      "lon": "30.36791",
+      "id": 36507630,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Боярка",
+      "enName": "Boiarka",
+      "names": {
+        "ru": "Боярка",
+        "uk": "Боярка",
+        "prefix": "місто",
+        "pl": "Bojarka",
+        "hu": "Boiarka"
+      },
+      "lat": "50.33567",
+      "lon": "30.28476",
+      "id": 36507632,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Васильево",
+      "enName": "Vasilyevo",
+      "names": {
+        "tt": "Васильево",
+        "de": "Wassiljewo",
+        "ru": "Васильево",
+        "ja": "ヴァシーリエヴォ"
+      },
+      "lat": "55.83729",
+      "lon": "48.67924",
+      "id": 336524045,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.83829",
+          "lon": "48.66132",
+          "id": 2221
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Волжск",
+      "enName": "Volzhsk",
+      "names": {
+        "tt": "Волжск",
+        "de": "Wolschsk",
+        "ru": "Волжск",
+        "chm": "Юлсер-Ола",
+        "eo": "Volĵsk",
+        "it": "Volžsk",
+        "fr": "Voljsk",
+        "cs": "Volžsk",
+        "cv": "Волжск",
+        "uk": "Волзьк",
+        "mhr": "Юлсер-Ола",
+        "ja": "ヴォルシスク",
+        "pl": "Wołżsk",
+        "tr": "Voljsk"
+      },
+      "lat": "55.86366",
+      "lon": "48.36186",
+      "id": 336523790,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "names": {
+            "ru": "Комсомольская улица"
+          },
+          "lat": "55.86639",
+          "lon": "48.36347",
+          "id": 1897
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Бориспіль",
+      "enName": "Boryspil",
+      "names": {
+        "de": "Boryspil",
+        "ru": "Борисполь",
+        "uk": "Бориспіль",
+        "prefix": "місто",
+        "eo": "Borispilo",
+        "fr": "Boryspil",
+        "pl": "Boryspol",
+        "hu": "Boryspil"
+      },
+      "lat": "50.35121",
+      "lon": "30.95076",
+      "id": 26150796,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Атабаево",
+      "names": {
+        "tt": "Атабай"
+      },
+      "lat": "55.28842",
+      "lon": "49.35494",
+      "id": 703108525,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.28848",
+          "lon": "49.34872",
+          "id": 2636
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Клавдієво-Тарасове",
+      "enName": "Klavdiievo-Tarasove",
+      "names": {
+        "ru": "Клавдиево-Тарасово",
+        "uk": "Клавдієво-Тарасове",
+        "prefix": "селище міського типу",
+        "pl": "Klavdiievo-Tarasove"
+      },
+      "lat": "50.58414",
+      "lon": "30.00950",
+      "id": 337519388,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Гребінки",
+      "enName": "Hrebinky",
+      "names": {
+        "ru": "Гребёнки",
+        "uk": "Гребінки",
+        "prefix": "селище міського типу",
+        "pl": "Hrebinky"
+      },
+      "lat": "49.95346",
+      "lon": "30.17635",
+      "id": 337539356,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Чистополь",
+      "enName": "Chistopol",
+      "names": {
+        "tt": "Чистай",
+        "de": "Tschistopol",
+        "cv": "Чистай",
+        "ru": "Чистополь",
+        "ja": "チストポリ"
+      },
+      "lat": "55.37148",
+      "lon": "50.63674",
+      "id": 295864677,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.37373",
+          "lon": "50.65916",
+          "id": 4322
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Ірпінь",
+      "enName": "Irpin",
+      "names": {
+        "de": "Irpin",
+        "ru": "Ирпень",
+        "uk": "Ірпінь",
+        "prefix": "місто",
+        "fr": "Irpine",
+        "pl": "Irpień",
+        "hu": "Irpin"
+      },
+      "lat": "50.51665",
+      "lon": "30.25004",
+      "id": 36505064,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Тарловка",
+      "enName": "Tarlovka",
+      "lat": "55.75428",
+      "lon": "52.32179",
+      "id": 573214945,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.75495",
+          "lon": "52.32159",
+          "id": 11794
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Заинск",
+      "enName": "Zainsk",
+      "names": {
+        "tt": "Зәй",
+        "de": "Sainsk",
+        "ru": "Заинск",
+        "ja": "ザインスク"
+      },
+      "lat": "55.28665",
+      "lon": "52.00561",
+      "id": 337839081,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.28014",
+          "lon": "52.00160",
+          "id": 729
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Яготин",
+      "enName": "Yahotyn",
+      "names": {
+        "de": "Jahotyn",
+        "ru": "Яготин",
+        "uk": "Яготин",
+        "prefix": "місто",
+        "pl": "Jagodzin"
+      },
+      "lat": "50.27589",
+      "lon": "31.76349",
+      "id": 337525267,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Лесная Хмелёвка",
+      "lat": "54.52728",
+      "lon": "49.66655",
+      "id": 28349988061,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.52387",
+          "lon": "49.66524",
+          "id": 9249
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Немішаєве",
+      "enName": "Nemishaieve",
+      "names": {
+        "ru": "Немешаево",
+        "uk": "Немішаєве",
+        "prefix": "селище міського типу",
+        "fr": "Nemishayeve"
+      },
+      "lat": "50.56801",
+      "lon": "30.10151",
+      "id": 337519630,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Кагарлик",
+      "enName": "Kaharlyk",
+      "names": {
+        "de": "Kaharlyk",
+        "ru": "Кагарлык",
+        "uk": "Кагарлик",
+        "prefix": "місто",
+        "pl": "Kaharłyk"
+      },
+      "lat": "49.86507",
+      "lon": "30.82268",
+      "id": 1819209275,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Муслюмово",
+      "enName": "Muslyumovo",
+      "names": {
+        "tt": "Мөслим",
+        "ru": "Муслюмово",
+        "ja": "ムスリュモヴォ"
+      },
+      "lat": "55.30593",
+      "lon": "53.19415",
+      "id": 337839100,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.30712",
+          "lon": "53.18859",
+          "id": 7660
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Менделеевск",
+      "enName": "Mendeleyevsk",
+      "names": {
+        "tt": "Менделеевск",
+        "de": "Mendelejewsk",
+        "ru": "Менделеевск",
+        "ja": "メンデリェーエフスク"
+      },
+      "lat": "55.88787",
+      "lon": "52.30844",
+      "id": 321322750,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Верхний Услон",
+      "enName": "Verhnij Uslon",
+      "names": {
+        "tt": "Югары Ослан",
+        "de": "Werchni Uslonn",
+        "ru": "Верхний Услон",
+        "ja": "ヴェルフニー・ウスロン",
+        "ba": "Үрге Ослан"
+      },
+      "lat": "55.76855",
+      "lon": "48.98293",
+      "id": 703197622,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Зеленодольск",
+      "enName": "Zelenodol'sk",
+      "names": {
+        "tt": "Яшел Үзән",
+        "de": "Selenodolsk",
+        "ru": "Зеленодольск",
+        "ko": "젤레노돌스크",
+        "uk": "Зеленодольськ",
+        "mhr": "Парат",
+        "ja": "ゼレノドリスク",
+        "eo": "Zelenodolsk",
+        "fa": "زلنودولسک، روسیه",
+        "pl": "Zielonodolsk",
+        "ro": "Zelenodolsk",
+        "sr": "Зеленодољск"
+      },
+      "lat": "55.84776",
+      "lon": "48.50970",
+      "id": 336524051,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "names": {
+            "ru": "Комсомольская улица"
+          },
+          "lat": "55.84713",
+          "lon": "48.49792",
+          "id": 1958
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Вятские Поляны",
+      "enName": "Vyatskiye Polyany",
+      "names": {
+        "tt": "Нократ Аланы",
+        "de": "Wjatskije Poljany",
+        "ja": "ヴャーツキエ・ポリャーヌィ"
+      },
+      "lat": "56.23101",
+      "lon": "51.02939",
+      "id": 3237869,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Глеваха",
+      "enName": "Hlevakha",
+      "names": {
+        "kk": "Glevaha",
+        "de": "Hlewacha",
+        "ceb": "Hlevakha",
+        "be": "Глэваха",
+        "ru": "Глеваха",
+        "prefix": "селище міського типу",
+        "fr": "Hlevakha",
+        "cs": "Hlevacha",
+        "ar": "هليفاخا",
+        "hy": "Հլեվահա",
+        "uk": "Глеваха",
+        "pl": "Hłewacha",
+        "tr": "Glevaha",
+        "rmy": "Hlevaha"
+      },
+      "lat": "50.25968",
+      "lon": "30.30591",
+      "id": 337525824,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Казань",
+      "enName": "Kazan",
+      "names": {
+        "tt": "Казан",
+        "de": "Kasan",
+        "hi": "काज़ान",
+        "fi": "Kazan",
+        "ru": "Казань",
+        "pt": "Cazã",
+        "lt": "Kazanė",
+        "lv": "Kazaņa",
+        "fr": "Kazan",
+        "hu": "Kazany",
+        "hy": "Կազան",
+        "oc": "Kazan",
+        "ka": "ყაზანი",
+        "uk": "Казань",
+        "sk": "Kazaň",
+        "sr": "Казањ",
+        "kn": "ಕಾಜಾ಼ನ್",
+        "os": "Хъазан",
+        "chm": "Озаҥ",
+        "it": "Kazan'",
+        "kv": "Казан",
+        "es": "Kazán",
+        "zh": "喀山",
+        "cs": "Kazaň",
+        "ar": "قازان",
+        "cv": "Хусан",
+        "mhr": "Озаҥ",
+        "ja": "カザン",
+        "pl": "Kazań",
+        "da": "Kazan",
+        "he": "קאזאן",
+        "ro": "Kazan",
+        "nl": "Kazan",
+        "ba": "Ҡаҙан",
+        "udm": "Кузон"
+      },
+      "lat": "55.78235",
+      "lon": "49.12423",
+      "id": 27504067,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица (Козья слобода)",
+          "lat": "55.81106",
+          "lon": "49.09485",
+          "id": 2013
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Володарка",
+      "enName": "Volodarka",
+      "names": {
+        "de": "Wolodarka",
+        "ru": "Володарка",
+        "uk": "Володарка",
+        "prefix": "селище міського типу",
+        "pl": "Wołodarka"
+      },
+      "lat": "49.52250",
+      "lon": "29.92805",
+      "id": 337556285,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Старое Дрожжаное",
+      "enName": "Staroye Drozhzhanoye",
+      "names": {
+        "tt": "Иске Чүпрәле",
+        "ru": "Старое Дрожжаное",
+        "ja": "スターロエ・ドロジジャノエ"
+      },
+      "lat": "54.72499",
+      "lon": "47.56454",
+      "id": 336525099,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Ворзель",
+      "enName": "Vorzel",
+      "names": {
+        "ru": "Ворзель",
+        "uk": "Ворзель",
+        "prefix": "селище міського типу",
+        "pl": "Vorzel"
+      },
+      "lat": "50.54573",
+      "lon": "30.15629",
+      "id": 337519932,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Джалиль",
+      "names": {
+        "tt": "Җәлил",
+        "ja": "ジャリリ"
+      },
+      "lat": "55.02197",
+      "lon": "52.73899",
+      "id": 371194680,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Городок",
+      "names": {
+        "ru": "Городок",
+        "uk": "Городок",
+        "prefix": "селище міського типу",
+        "pl": "Gródek"
+      },
+      "lat": "50.58336",
+      "lon": "29.47816",
+      "id": 6726413,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Біла Церква",
+      "enName": "Bila Tserkva",
+      "names": {
+        "de": "Bila Zerkwa",
+        "be": "Белая Царква",
+        "ru": "Белая Церковь",
+        "prefix": "місто",
+        "lt": "Bila Cerkva",
+        "eo": "Bila-Cerkva",
+        "fr": "Bila Tserkva",
+        "hu": "Bila Cerkva",
+        "et": "Bila Tserkva",
+        "cs": "Bila Cerkva",
+        "uk": "Біла Церква",
+        "pl": "Biała Cerkiew",
+        "ro": "Bila Țerkva",
+        "sr": "Била Церква"
+      },
+      "lat": "49.80382",
+      "lon": "30.11170",
+      "id": 255259998,
+      "type": "CITY",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Старая Майна",
+      "enName": "Staraya Mayna",
+      "names": {
+        "ru": "Старая Майна",
+        "ja": "スターラヤ・マイナ"
+      },
+      "lat": "54.61114",
+      "lon": "48.92349",
+      "id": 11135157981,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.60671",
+          "lon": "48.91229",
+          "id": 8342
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Высокая Гора",
+      "names": {
+        "tt": "Биектау",
+        "ja": "ヴイソーカヤ・ゴラー"
+      },
+      "lat": "55.91018",
+      "lon": "49.30720",
+      "id": 704304024,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Агидель",
+      "enName": "Agidel",
+      "names": {
+        "tt": "Агыйдел",
+        "ru": "Агидель",
+        "ja": "アギデーリ",
+        "ba": "Ағиҙел",
+        "et": "Agidel"
+      },
+      "lat": "55.89928",
+      "lon": "53.93742",
+      "id": 251071107,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Большая Атня",
+      "enName": "Bolshaya Atnya",
+      "names": {
+        "tt": "Олы Әтнә",
+        "ru": "Большая Атня",
+        "ja": "ボリシャヤ・アトニャ"
+      },
+      "lat": "56.24947",
+      "lon": "49.45390",
+      "id": 698459097,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "56.24843",
+          "lon": "49.45315",
+          "id": 7008
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Болгар",
+      "enName": "Bolgar",
+      "names": {
+        "tt": "Болгар",
+        "cv": "Пӑлхар",
+        "ru": "Болгар",
+        "ja": "ボルガル"
+      },
+      "lat": "54.97474",
+      "lon": "49.03020",
+      "id": 599924350,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.96961",
+          "lon": "49.02911",
+          "id": 7480
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Челно-Вершины",
+      "lat": "54.41588",
+      "lon": "51.08582",
+      "id": 8519359,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Бородянка",
+      "enName": "Borodianka",
+      "names": {
+        "de": "Borodjanka",
+        "ru": "Бородянка",
+        "uk": "Бородянка",
+        "prefix": "селище міського типу",
+        "pl": "Borodzianka"
+      },
+      "lat": "50.64657",
+      "lon": "29.92558",
+      "id": 295809953,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Красятичі",
+      "enName": "Krasiatychi",
+      "names": {
+        "de": "Krasjatytschi",
+        "ru": "Красятичи",
+        "uk": "Красятичі",
+        "prefix": "селище міського типу",
+        "pl": "Krasiatyczi"
+      },
+      "lat": "51.07829",
+      "lon": "29.63779",
+      "id": 337512030,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Іванків",
+      "enName": "Ivankiv",
+      "names": {
+        "de": "Iwankiw",
+        "ru": "Иванков",
+        "uk": "Іванків",
+        "prefix": "селище міського типу",
+        "pl": "Iwanków"
+      },
+      "lat": "50.93300",
+      "lon": "29.90463",
+      "id": 337513819,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Русский Акташ",
+      "enName": "Russkiy Aktash",
+      "names": {
+        "tt": "Рус Акташы",
+        "ru": "Русский Акташ",
+        "ja": "ルースキー・アクタシ"
+      },
+      "lat": "55.04037",
+      "lon": "52.11699",
+      "id": 337839143,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.04117",
+          "lon": "52.11530",
+          "id": 148
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Данилкино",
+      "lat": "56.07810",
+      "lon": "48.79013",
+      "id": 661092578,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "56.07952",
+          "lon": "48.79226",
+          "id": 2271
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Ставище",
+      "enName": "Stavysche",
+      "names": {
+        "de": "Stawyschtsche",
+        "ru": "Ставище",
+        "uk": "Ставище",
+        "prefix": "селище міського типу",
+        "pl": "Stawyszcze"
+      },
+      "lat": "49.38620",
+      "lon": "30.18316",
+      "id": 337560920,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Новошешминск",
+      "enName": "Novosheshminsk",
+      "names": {
+        "tt": "Яңа Чишмә",
+        "de": "Nowoscheschminsk",
+        "ru": "Новошешминск",
+        "ja": "ノヴォシェシミンスク"
+      },
+      "lat": "55.06165",
+      "lon": "51.22489",
+      "id": 337839146,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Нырья",
+      "names": {
+        "tt": "Нырья"
+      },
+      "lat": "56.19929",
+      "lon": "50.58311",
+      "id": 796778738,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "56.20261",
+          "lon": "50.58084",
+          "id": 12056
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Малтабарово",
+      "names": {
+        "tt": "Малтабар"
+      },
+      "lat": "55.79553",
+      "lon": "52.78860",
+      "id": 593611502,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Комсомольская",
+          "lat": "55.79264",
+          "lon": "52.78630",
+          "id": 12145
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Билярск",
+      "names": {
+        "tt": "Биләр"
+      },
+      "lat": "54.98370",
+      "lon": "50.38888",
+      "id": 336524609,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.98580",
+          "lon": "50.39718",
+          "id": 199
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Кузкеево",
+      "names": {
+        "tt": "Күзкәй"
+      },
+      "lat": "55.77079",
+      "lon": "52.80849",
+      "id": 593611503,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.77212",
+          "lon": "52.79931",
+          "id": 8524
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Актюбинский",
+      "names": {
+        "tt": "Актүбә",
+        "ru": "Актюбинский",
+        "ja": "アクチュビンスキー"
+      },
+      "lat": "54.81319",
+      "lon": "52.80257",
+      "id": 445771973,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.81157",
+          "lon": "52.81645",
+          "id": 4525
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Яльчики",
+      "names": {
+        "de": "Jaltschiki",
+        "cv": "Елчӗк",
+        "ru": "Яльчики",
+        "ja": "ヤリチキ"
+      },
+      "lat": "55.16287",
+      "lon": "48.00334",
+      "id": 850408359,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Азнакаево",
+      "enName": "Aznakayevo",
+      "names": {
+        "tt": "Азнакай",
+        "de": "Asnakajewo",
+        "cv": "Аснакай",
+        "ru": "Азнакаево",
+        "ja": "アズナカエヴォ"
+      },
+      "lat": "54.86296",
+      "lon": "53.07922",
+      "id": 337839164,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Карабаш",
+      "enName": "Karabash",
+      "names": {
+        "tt": "Карабаш",
+        "ja": "カラバシ"
+      },
+      "lat": "54.69440",
+      "lon": "52.58739",
+      "id": 2406531050,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.69694",
+          "lon": "52.58593",
+          "id": 7913
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Переяслав-Хмельницький",
+      "enName": "Pereiaslav-Khmelnytskyi",
+      "names": {
+        "de": "Perejaslaw-Chmelnyzkyj",
+        "be": "Пераяслаў-Хмяльніцкі",
+        "ru": "Переяслав-Хмельницкий",
+        "uk": "Переяслав-Хмельницький",
+        "prefix": "місто",
+        "eo": "Perejaslav-Ĥmelnickij",
+        "pl": "Perejasław Chmielnicki"
+      },
+      "lat": "50.06440",
+      "lon": "31.44474",
+      "id": 337535557,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Нижнекамск",
+      "enName": "Nizhnekamsk",
+      "names": {
+        "cs": "Nižněkamsk",
+        "tt": "Түбән Кама",
+        "de": "Nischnekamsk",
+        "ru": "Нижнекамск",
+        "uk": "Нижньокамськ",
+        "ja": "ニジネカムスク",
+        "lt": "Nižnekamskas",
+        "fr": "Nijnekamsk",
+        "pl": "Niżniekamsk",
+        "es": "Nizhnekamsk"
+      },
+      "lat": "55.64129",
+      "lon": "51.81603",
+      "id": 553037933,
+      "type": "CITY",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Малая Пурга",
+      "enName": "Malaya Purga",
+      "names": {
+        "ja": "マラヤ・プルガ",
+        "udm": "Пичи Пурга"
+      },
+      "lat": "56.54955",
+      "lon": "53.00551",
+      "id": 621090917,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Шемурша",
+      "names": {
+        "de": "Schemurscha",
+        "cv": "Шӑмӑршӑ",
+        "ja": "シェムルシャー"
+      },
+      "lat": "54.88548",
+      "lon": "47.51651",
+      "id": 855192927,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Агрыз",
+      "enName": "Agryz",
+      "names": {
+        "tt": "Әгерҗе",
+        "ru": "Агрыз",
+        "ja": "アグルイズ"
+      },
+      "lat": "56.52546",
+      "lon": "52.99725",
+      "id": 1773881620,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "56.53128",
+          "lon": "53.00704",
+          "id": 7971
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Лениногорск",
+      "enName": "Leninogorsk",
+      "names": {
+        "tt": "Лениногорск",
+        "de": "Leninogorsk",
+        "cv": "Ҫӗнӗ Пӗҫмен",
+        "ru": "Лениногорск",
+        "ja": "レニノゴルスク"
+      },
+      "lat": "54.59943",
+      "lon": "52.44691",
+      "id": 273310116,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.60837",
+          "lon": "52.46062",
+          "id": 1038
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Аксубаево",
+      "enName": "Aksubayevo",
+      "names": {
+        "tt": "Аксубай",
+        "de": "Aksubajewo",
+        "cv": "Аксу",
+        "ru": "Аксубаево",
+        "ja": "アクスバエヴォ"
+      },
+      "lat": "54.84635",
+      "lon": "50.80554",
+      "id": 336524899,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.85470",
+          "lon": "50.81432",
+          "id": 7569
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Нурлат",
+      "enName": "Nurlat",
+      "names": {
+        "tt": "Нурлат",
+        "de": "Nurlat",
+        "cv": "Нурлат",
+        "ru": "Нурлат",
+        "ja": "ヌルラート"
+      },
+      "lat": "54.42973",
+      "lon": "50.80196",
+      "id": 336525410,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.41543",
+          "lon": "50.80589",
+          "id": 1717
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Пісківка",
+      "enName": "Piskivka",
+      "names": {
+        "ru": "Песковка",
+        "uk": "Пісківка",
+        "prefix": "селище міського типу",
+        "pl": "Piskivka"
+      },
+      "lat": "50.69686",
+      "lon": "29.59311",
+      "id": 337517677,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Октябрьский",
+      "enName": "Oktjabrski",
+      "names": {
+        "tt": "Октябрьски",
+        "de": "Oktjabrski",
+        "ru": "Октябрьский",
+        "ja": "オクチャブリスキー",
+        "lt": "Oktiabrskis",
+        "ba": "Октябрьский",
+        "et": "Oktjabrski"
+      },
+      "lat": "54.48097",
+      "lon": "53.46600",
+      "id": 191901380,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "names": {
+            "ru": "Комсомольская улица"
+          },
+          "lat": "54.48629",
+          "lon": "53.44462",
+          "id": 1564
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Куйбышевский Затон",
+      "names": {
+        "tt": "Куйбышев Затоны",
+        "ja": "クイビシェフスキー・ザトン"
+      },
+      "lat": "55.15645",
+      "lon": "49.16940",
+      "id": 697269501,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.16218",
+          "lon": "49.17156",
+          "id": 10632
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Буча",
+      "enName": "Bucha",
+      "names": {
+        "de": "Butscha",
+        "ru": "Буча",
+        "prefix": "місто",
+        "uk": "Буча",
+        "fr": "Boutcha",
+        "pl": "Bucza"
+      },
+      "lat": "50.54858",
+      "lon": "30.22071",
+      "id": 312987923,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Базарные Матаки",
+      "enName": "Bazarnyye Mataki",
+      "names": {
+        "tt": "Базарлы Матак",
+        "ja": "バザールヌイエ・マターキ"
+      },
+      "lat": "54.90349",
+      "lon": "49.92754",
+      "id": 336524666,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Борова",
+      "enName": "Borova",
+      "names": {
+        "ru": "Боровая",
+        "uk": "Борова",
+        "prefix": "селище міського типу",
+        "pl": "Borowa"
+      },
+      "lat": "50.17834",
+      "lon": "30.10254",
+      "id": 337527400,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Нижняя Мактама",
+      "names": {
+        "tt": "Түбəн Мактама",
+        "ja": "ニジニャヤ・マクタマ"
+      },
+      "lat": "54.86247",
+      "lon": "52.42313",
+      "id": 1804405492,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Велика Димерка",
+      "enName": "Velyka Dymerka",
+      "names": {
+        "ru": "Великая Дымерка",
+        "uk": "Велика Димерка",
+        "prefix": "селище міського типу",
+        "pl": "Wielka Dymirka"
+      },
+      "lat": "50.59183",
+      "lon": "30.90109",
+      "id": 337519261,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Вишгород",
+      "enName": "Vyshhorod",
+      "names": {
+        "de": "Wyschhorod",
+        "ru": "Вышгород",
+        "uk": "Вишгород",
+        "prefix": "місто",
+        "fr": "Vychhorod",
+        "pl": "Wyszogród"
+      },
+      "lat": "50.58243",
+      "lon": "30.48513",
+      "id": 289308798,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Обухів",
+      "enName": "Obukhiv",
+      "names": {
+        "de": "Obuchiw",
+        "ru": "Обухов",
+        "uk": "Обухів",
+        "prefix": "місто",
+        "fr": "Oboukhiv",
+        "pl": "Obuchów",
+        "hu": "Obukhiv"
+      },
+      "lat": "50.11020",
+      "lon": "30.62675",
+      "id": 337534108,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Черемшан",
+      "enName": "Cheremshan",
+      "names": {
+        "tt": "Чирмешән",
+        "cv": "Ҫарӑмсан",
+        "ru": "Черемшан",
+        "ja": "チェレムシャン"
+      },
+      "lat": "54.66110",
+      "lon": "51.50532",
+      "id": 337839206,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Українка",
+      "enName": "Ukrainka",
+      "names": {
+        "ru": "Украинка",
+        "uk": "Українка",
+        "prefix": "місто",
+        "pl": "Ukrajinka"
+      },
+      "lat": "50.15372",
+      "lon": "30.74206",
+      "id": 337528474,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Калинівка",
+      "enName": "Kalynivka",
+      "names": {
+        "kk": "Kalyni'vka",
+        "de": "Kalyniwka (Wassylkiw)",
+        "hy": "Կալյնիվկա",
+        "ru": "Калиновка",
+        "vi": "Kalynivka",
+        "prefix": "селище міського типу",
+        "uk": "Калинівка",
+        "ja": "カルィーニウカ",
+        "fr": "Kalynivka",
+        "pl": "Kalinówka",
+        "ro": "Kalînivka, Vasîlkiv",
+        "tr": "Kalınivka"
+      },
+      "lat": "50.22573",
+      "lon": "30.22618",
+      "id": 337526421,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Фастів",
+      "enName": "Fastiv",
+      "names": {
+        "de": "Fastiw",
+        "ru": "Фастов",
+        "uk": "Фастів",
+        "prefix": "місто",
+        "eo": "Fastiv",
+        "fr": "Fastiv",
+        "pl": "Fastów",
+        "hu": "Fastiv"
+      },
+      "lat": "50.07993",
+      "lon": "29.91629",
+      "id": 337535126,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Уруссу",
+      "enName": "Urussu",
+      "names": {
+        "tt": "Урыссу",
+        "ru": "Уруссу",
+        "ja": "ウルスー"
+      },
+      "lat": "54.59933",
+      "lon": "53.46632",
+      "id": 337839216,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.60163",
+          "lon": "53.44535",
+          "id": 2599
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Елабуга",
+      "enName": "Elabuga",
+      "names": {
+        "tt": "Алабуга",
+        "ar": "ييلابوغا",
+        "de": "Jelabuga",
+        "cv": "Алапӳ",
+        "ru": "Елабуга",
+        "uk": "Єлабуга",
+        "ja": "エラブガ",
+        "tt-lat": "Alabuğa",
+        "fa": "یلابوگا",
+        "tr": "Alabuga",
+        "ba": "Алабуға"
+      },
+      "lat": "55.75771",
+      "lon": "52.05400",
+      "id": 153568874,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Ютаза",
+      "enName": "Yutaza",
+      "names": {
+        "tt": "Ютазы",
+        "ru": "Ютаза"
+      },
+      "lat": "54.58879",
+      "lon": "53.27073",
+      "id": 337839220,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.59253",
+          "lon": "53.26195",
+          "id": 2683
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Макарів",
+      "enName": "Makariv",
+      "names": {
+        "de": "Makariw",
+        "ru": "Макаров",
+        "uk": "Макарів",
+        "prefix": "селище міського типу",
+        "pl": "Makarow"
+      },
+      "lat": "50.46399",
+      "lon": "29.80690",
+      "id": 1494035871,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Кукмор",
+      "enName": "Kukmor",
+      "names": {
+        "tt": "Кукмара",
+        "de": "Kukmor",
+        "ru": "Кукмор",
+        "ja": "クークモル"
+      },
+      "lat": "56.18653",
+      "lon": "50.89721",
+      "id": 409487025,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "56.18861",
+          "lon": "50.88569",
+          "id": 10547
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Київ",
+      "enName": "Kyiv",
+      "names": {
+        "hi": "कीव",
+        "pt": "Kiev",
+        "prefix": "місто",
+        "hr": "Kijev",
+        "ht": "Kyèv",
+        "hu": "Kijev",
+        "lmo": "Kiev",
+        "xmf": "კიევი",
+        "yi": "קיעוו",
+        "hy": "Կիև",
+        "bar": "Kiew",
+        "nah": "Kiev",
+        "yo": "Kiev",
+        "pms": "Kijv",
+        "ia": "Kyiv",
+        "nan": "Kyyiv",
+        "id": "Kyiv",
+        "ie": "Kyiv",
+        "sco": "Kiev",
+        "scn": "Kiev",
+        "ext": "Kyiv",
+        "ab": "Кыив",
+        "qu": "Kiyiw",
+        "af": "Kiëf",
+        "pnb": "کیف",
+        "io": "Kyiv",
+        "frr": "Kyiv",
+        "is": "Kænugarður",
+        "it": "Kyiv",
+        "am": "ኪየቭ",
+        "an": "Kiev",
+        "zh": "基輔",
+        "ar": "كييف",
+        "jbo": "kiev",
+        "mhr": "Киев",
+        "ja": "キエフ",
+        "az": "Kiyev",
+        "zu": "IKiyevi",
+        "ro": "Kiev",
+        "ba": "Киев",
+        "be": "Кіеў",
+        "ru": "Киев",
+        "bg": "Киев",
+        "bi": "Kyiv",
+        "myv": "Киев ош",
+        "bn": "কিয়েভ",
+        "jv": "Kyiv",
+        "bo": "ཀིབ།",
+        "br": "Kyiv",
+        "sc": "Kiev",
+        "bs": "Kijev",
+        "se": "Kiova",
+        "sh": "Kijev",
+        "ka": "კიევი",
+        "sk": "Kyjev",
+        "roa-rup": "Kiev",
+        "sl": "Kijev",
+        "ca": "Kyiv",
+        "sq": "Kievi",
+        "sr": "Кијев",
+        "kk": "Киев",
+        "kl": "Kyiv",
+        "kn": "ಕೀವ್",
+        "sv": "Kiev",
+        "ko": "키예프",
+        "mrj": "Киев",
+        "sw": "Kiev",
+        "arz": "كييف",
+        "ku": "Kîev",
+        "kv": "Киев",
+        "ta": "கீவ்",
+        "ky": "Киев",
+        "cs": "Kyjev",
+        "te": "క్యివ్",
+        "cu": "Кꙑѥвъ",
+        "cv": "Кийӳ",
+        "tg": "Киев",
+        "th": "เคียฟ",
+        "la": "Kiovia",
+        "cy": "Kyiv",
+        "lb": "Kiew",
+        "tl": "Kiev",
+        "nds": "Kiew",
+        "da": "Kyiv",
+        "tr": "Kiev",
+        "tt": "Киев",
+        "be-tarask": "Кіеў",
+        "de": "Kiew",
+        "ln": "Kyjiw",
+        "ast": "Kiev",
+        "rue": "Київ",
+        "tw": "Kiev",
+        "hif": "Kiev",
+        "koi": "Киев",
+        "lt": "Kijevas",
+        "lv": "Kijeva",
+        "lij": "Kiev",
+        "lad": "Kyiv",
+        "ug": "كىيېۋ",
+        "roa-tara": "Kiev",
+        "vec": "Kiev",
+        "uk": "Київ",
+        "fiu-vro": "Kiiova",
+        "mi": "Kieu",
+        "ur": "کیف",
+        "mk": "Киев",
+        "pap": "Kiev",
+        "ml": "കീവ്",
+        "rmy": "Kiev",
+        "vep": "Kijev",
+        "mn": "Киев",
+        "mr": "क्यीव",
+        "uz": "Kiyev",
+        "ms": "Kiev",
+        "el": "Κίεβο",
+        "mt": "Kjiv",
+        "tzl": "Kíiv",
+        "als": "Kiew",
+        "eo": "Kievo",
+        "my": "ကီးယက်မြို့",
+        "ilo": "Kyiv",
+        "es": "Kyiv",
+        "mdf": "Киев",
+        "et": "Kiiev",
+        "eu": "Kyiv",
+        "dsb": "Kijew",
+        "vi": "Kiev",
+        "bat-smg": "Kijevs",
+        "hsb": "Kijew",
+        "vo": "Küyiv",
+        "fa": "کی‌یف",
+        "nl": "Kiev",
+        "udm": "Киев",
+        "nn": "Kiev",
+        "no": "Kiev",
+        "fi": "Kiova",
+        "yue": "基輔",
+        "fo": "Kyiv",
+        "fr": "Kyiv",
+        "gag": "Kyiv",
+        "fy": "Kiev",
+        "nov": "Kiyev",
+        "oc": "Kyiiv",
+        "crh": "Kiyev",
+        "wo": "Kiyew",
+        "ga": "Cív",
+        "ang": "Cænugeard",
+        "sah": "Киев",
+        "bxr": "Киев",
+        "gd": "Kyiv",
+        "os": "Киев",
+        "szl": "Kijůw",
+        "gl": "Kiev",
+        "war": "Kiev",
+        "bpy": "কিয়েভ",
+        "gv": "Kyiv",
+        "pa": "ਕੀਵ",
+        "csb": "Kyiv",
+        "cbk-zam": "Kyiv",
+        "ckb": "کیێڤ",
+        "pl": "Kijów",
+        "he": "קייב"
+      },
+      "lat": "50.45011",
+      "lon": "30.52405",
+      "id": 26150422,
+      "type": "CITY",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Тетіїв",
+      "enName": "Tetiiv",
+      "names": {
+        "de": "Tetijiw",
+        "ru": "Тетиев",
+        "uk": "Тетіїв",
+        "prefix": "місто",
+        "pl": "Tetyjów"
+      },
+      "lat": "49.36862",
+      "lon": "29.67712",
+      "id": 337561478,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Тетюши",
+      "enName": "Tetyushi",
+      "names": {
+        "tt": "Тәтеш",
+        "de": "Tetjuschi",
+        "cv": "Теччӗ",
+        "ru": "Тетюши",
+        "ja": "テチューシ"
+      },
+      "lat": "54.93431",
+      "lon": "48.83168",
+      "id": 336524694,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.94122",
+          "lon": "48.81528",
+          "id": 6044
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Лаишево",
+      "enName": "Laishevo",
+      "names": {
+        "tt": "Лаеш",
+        "de": "Laischewo",
+        "cv": "Лаиш",
+        "ru": "Лаишево",
+        "ja": "ライシェヴォ",
+        "lt": "Laiševas"
+      },
+      "lat": "55.40434",
+      "lon": "49.54684",
+      "id": 336524182,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.40922",
+          "lon": "49.54424",
+          "id": 2631
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Куркуль",
+      "names": {
+        "tt": "Кыркүл"
+      },
+      "lat": "55.19469",
+      "lon": "50.10916",
+      "id": 826359259,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.19516",
+          "lon": "50.11581",
+          "id": 6495
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Ржищів",
+      "enName": "Rzhyschiv",
+      "names": {
+        "de": "Rschyschtschiw",
+        "ru": "Ржищев",
+        "uk": "Ржищів",
+        "prefix": "місто",
+        "pl": "Rzyszczów"
+      },
+      "lat": "49.96822",
+      "lon": "31.04118",
+      "id": 337538749,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Миронівка",
+      "enName": "Myronivka",
+      "names": {
+        "de": "Myroniwka",
+        "ru": "Мироновка",
+        "uk": "Миронівка",
+        "prefix": "місто",
+        "pl": "Mironówka"
+      },
+      "lat": "49.65834",
+      "lon": "30.98250",
+      "id": 5119801550,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Березань",
+      "enName": "Berezan",
+      "names": {
+        "de": "Beresan",
+        "ru": "Березань",
+        "uk": "Березань",
+        "prefix": "місто",
+        "lt": "Berezanė",
+        "pl": "Berezań"
+      },
+      "lat": "50.31327",
+      "lon": "31.46892",
+      "id": 337524664,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Чукмарлы",
+      "names": {
+        "tt": "Чукмарлы"
+      },
+      "lat": "55.28447",
+      "lon": "52.43184",
+      "id": 583375597,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.28066",
+          "lon": "52.42903",
+          "id": 10262
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Нижние Вязовые",
+      "enName": "Nizhniye Vyazovye",
+      "names": {
+        "tt": "Карамалы Тау",
+        "ja": "ニジニエ・ヴャゾヴイエ"
+      },
+      "lat": "55.79963",
+      "lon": "48.52238",
+      "id": 752193024,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.79462",
+          "lon": "48.52856",
+          "id": 7858
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Вахоткино",
+      "lat": "56.00524",
+      "lon": "48.65201",
+      "id": 660899983,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "56.00694",
+          "lon": "48.64604",
+          "id": 11576
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Осиново",
+      "names": {
+        "tt": "Осиново"
+      },
+      "lat": "55.87730",
+      "lon": "48.89103",
+      "id": 722796219,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.87905",
+          "lon": "48.88858",
+          "id": 3983
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Альметьевск",
+      "enName": "Almetyevsk",
+      "names": {
+        "tt": "Әлмәт",
+        "de": "Almetjewsk",
+        "be": "Альмецьеўск",
+        "ru": "Альметьевск",
+        "ko": "알메티옙스크",
+        "lt": "Almetjevskas",
+        "it": "Al'met'evsk",
+        "fr": "Almetievsk",
+        "es": "Almétievsk",
+        "zh": "阿尔梅季耶夫斯克",
+        "ar": "ألميتيفسك",
+        "cv": "Элмет",
+        "uk": "Альметьєвськ",
+        "hsb": "Almetjewsk",
+        "ja": "アリメチエフスク",
+        "az": "Əlmət",
+        "fa": "آلماتیفسک",
+        "pl": "Almietjewsk",
+        "ro": "Almetievsk",
+        "ba": "Әлмәт"
+      },
+      "lat": "54.89965",
+      "lon": "52.30149",
+      "id": 2173235770,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.91562",
+          "lon": "52.33893",
+          "id": 6097
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Апастово",
+      "enName": "Apastovo",
+      "names": {
+        "tt": "Апас",
+        "ar": "أباستوفو",
+        "de": "Apastowo",
+        "cv": "Апас",
+        "ru": "Апастово",
+        "ja": "アパソトヴォ",
+        "ca": "Apàstovo",
+        "ba": "Апас"
+      },
+      "lat": "55.20267",
+      "lon": "48.50687",
+      "id": 703166491,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Балтаси",
+      "enName": "Baltasi",
+      "names": {
+        "tt": "Балтач",
+        "ru": "Балтаси",
+        "ja": "バルタシ"
+      },
+      "lat": "56.34462",
+      "lon": "50.21142",
+      "id": 701721057,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Камское Устье",
+      "enName": "Kamskoye Ustye",
+      "names": {
+        "tt": "Кама Тамагы",
+        "cv": "Кама Вӑрри",
+        "ru": "Камское Устье",
+        "ja": "カムスコエ・ウスチエ"
+      },
+      "lat": "55.20157",
+      "lon": "49.26802",
+      "id": 336524471,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.20141",
+          "lon": "49.26975",
+          "id": 7501
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Кагарлик",
+      "lat": "49.85635",
+      "lon": "30.74794",
+      "id": 6629021,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Коцюбинське",
+      "enName": "Kotsiubynske",
+      "names": {
+        "ru": "Коцюбинское",
+        "uk": "Коцюбинське",
+        "prefix": "селище міського типу",
+        "pl": "Kotsiubynske"
+      },
+      "lat": "50.49047",
+      "lon": "30.33379",
+      "id": 337520861,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Рокитне",
+      "enName": "Rokytne",
+      "names": {
+        "de": "Rokytne",
+        "ru": "Ракитное",
+        "uk": "Рокитне",
+        "prefix": "селище міського типу",
+        "pl": "Rokitna"
+      },
+      "lat": "49.68673",
+      "lon": "30.47303",
+      "id": 337549274,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Богуслав",
+      "enName": "Bohuslav",
+      "names": {
+        "de": "Bohuslaw",
+        "ru": "Богуслав",
+        "uk": "Богуслав",
+        "prefix": "місто",
+        "pl": "Bohusław"
+      },
+      "lat": "49.54765",
+      "lon": "30.87330",
+      "id": 337555159,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Пестрецы",
+      "enName": "Pestretsy",
+      "names": {
+        "tt": "Питрәч",
+        "ru": "Пестрецы",
+        "ja": "ペストレツィ",
+        "lt": "Pestrecai"
+      },
+      "lat": "55.75021",
+      "lon": "49.65709",
+      "id": 697241159,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.75617",
+          "lon": "49.64662",
+          "id": 2581
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Алексеевское",
+      "enName": "Alexeyevskoye",
+      "names": {
+        "tt": "Алексеевск",
+        "de": "Alexejewskoje",
+        "ru": "Алексеевское",
+        "ja": "アレクセーエフスコエ",
+        "lt": "Aleksėjevskojė"
+      },
+      "lat": "55.30496",
+      "lon": "50.11289",
+      "id": 336524229,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "names": {
+            "tt": "Комсомоллар урамы"
+          },
+          "lat": "55.30439",
+          "lon": "50.10965",
+          "id": 6105
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Мензелинск",
+      "enName": "Menzelinsk",
+      "names": {
+        "tt": "Минзәлә",
+        "de": "Menselinsk",
+        "ru": "Мензелинск",
+        "ja": "メンゼリンスク"
+      },
+      "lat": "55.72556",
+      "lon": "53.10718",
+      "id": 337839017,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.72125",
+          "lon": "53.11864",
+          "id": 3881
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Бугульма",
+      "enName": "Bugulma",
+      "names": {
+        "tt": "Бөгелмә",
+        "de": "Bugulma",
+        "ru": "Бугульма",
+        "ja": "ブグリマ"
+      },
+      "lat": "54.53841",
+      "lon": "52.79559",
+      "id": 1707207947,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.54021",
+          "lon": "52.76684",
+          "id": 2055
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Мамадыш",
+      "enName": "Mamadysh",
+      "names": {
+        "tt": "Мамадыш",
+        "de": "Mamadysch",
+        "ru": "Мамадыш",
+        "ja": "ママドィシ",
+        "az": "Mamadış"
+      },
+      "lat": "55.70908",
+      "lon": "51.40891",
+      "id": 337839024,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.72513",
+          "lon": "51.40426",
+          "id": 8919
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Бавлы",
+      "enName": "Bavly",
+      "names": {
+        "tt": "Баулы",
+        "de": "Bawly",
+        "ru": "Бавлы",
+        "ja": "バヴルィ",
+        "et": "Bavlõ"
+      },
+      "lat": "54.40309",
+      "lon": "53.23571",
+      "id": 337839279,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.40355",
+          "lon": "53.24687",
+          "id": 7026
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Згурівка",
+      "enName": "Zghurivka",
+      "names": {
+        "de": "Shuriwka",
+        "ru": "Згуровка",
+        "prefix": "селище міського типу",
+        "uk": "Згурівка",
+        "pl": "Zhuriwka"
+      },
+      "lat": "50.49506",
+      "lon": "31.76918",
+      "id": 337520849,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Буинск",
+      "enName": "Buinsk",
+      "names": {
+        "tt": "Буа",
+        "de": "Buinsk",
+        "cv": "Пӑва",
+        "ru": "Буинск",
+        "ja": "ブインスク"
+      },
+      "lat": "54.97229",
+      "lon": "48.29289",
+      "id": 295862317,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.98741",
+          "lon": "48.29586",
+          "id": 5979
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Гостомель",
+      "enName": "Hostomel",
+      "names": {
+        "ru": "Гостомель",
+        "uk": "Гостомель",
+        "prefix": "селище міського типу",
+        "pl": "Hostomel"
+      },
+      "lat": "50.58826",
+      "lon": "30.25909",
+      "id": 337519314,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Бровари",
+      "enName": "Brovary",
+      "names": {
+        "de": "Browary",
+        "ru": "Бровары",
+        "prefix": "місто",
+        "uk": "Бровари",
+        "eo": "Brovari",
+        "fr": "Brovary",
+        "pl": "Browary",
+        "hu": "Brovari",
+        "et": "Brovarõ",
+        "sr": "Бровари"
+      },
+      "lat": "50.51111",
+      "lon": "30.79004",
+      "id": 3673183717,
+      "type": "CITY",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Победа",
+      "names": {
+        "tt": "Победа"
+      },
+      "lat": "54.67300",
+      "lon": "52.66657",
+      "id": 783002941,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "54.67386",
+          "lon": "52.66232",
+          "id": 4542
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Димер",
+      "enName": "Dymer",
+      "names": {
+        "ru": "Дымер",
+        "uk": "Димер",
+        "prefix": "селище міського типу",
+        "pl": "Dymer"
+      },
+      "lat": "50.78355",
+      "lon": "30.30780",
+      "id": 1585808480,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Набережные Челны",
+      "enName": "Naberezhnye Chelny",
+      "names": {
+        "tt": "Яр Чаллы",
+        "de": "Nabereschnyje Tschelny",
+        "no": "Naberezjnyje Tsjelny",
+        "be": "Наберажныя Чалны",
+        "fi": "Naberežnyje Tšelny",
+        "ru": "Набережные Челны",
+        "pt": "Naberejnye Chelny",
+        "bg": "Набережние Челни",
+        "lt": "Naberežnyje Čelnai",
+        "hr": "Naberežnye Čelny",
+        "lv": "Naberežnije Čelni",
+        "fr": "Naberejnye Tchelny",
+        "ka": "ნაბერეჟნიე ჩელნი",
+        "uk": "Набережні Човни",
+        "ca": "Nàberejnie_Txelní",
+        "sr": "Набережније Челни",
+        "sv": "Naberezjnyje Tjelny",
+        "ko": "나베레즈니예첼니",
+        "it": "Naberežnye Čelny",
+        "es": "Náberezhnye Chelny",
+        "zh": "卡马河畔切尔尼",
+        "et": "Naberežnõje Tšelnõ",
+        "cs": "Naberežnyje Čelny",
+        "ar": "نابريجناي تشلني",
+        "cv": "Чаллă",
+        "ja": "ナベレジヌイェ・チェルヌイ",
+        "az": "Naberejnıye Çelnı",
+        "fa": "نابرژنیه چلنی",
+        "pl": "Nabierieżnyje Czełny",
+        "ro": "Naberejnîe Celnî",
+        "nl": "Naberezjnye Tsjelny",
+        "tr": "Yarçallı",
+        "ba": "Яр Саллы"
+      },
+      "lat": "55.74201",
+      "lon": "52.39923",
+      "id": 191749240,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская набережная",
+          "lat": "55.69179",
+          "lon": "52.29220",
+          "id": 1022
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Сквира",
+      "enName": "Skvyra",
+      "names": {
+        "kk": "Skvyra",
+        "de": "Skwyra",
+        "ceb": "Skvyra",
+        "be": "Сквыра",
+        "ru": "Сквира",
+        "sv": "Skvyra",
+        "prefix": "місто",
+        "it": "Skvyra",
+        "fr": "Skvyra",
+        "cs": "Skvyra",
+        "hy": "Սկվյրա",
+        "vi": "Skvyra",
+        "uk": "Сквира",
+        "sk": "Skvyra",
+        "fa": "اسکویرا",
+        "pl": "Skwyra",
+        "ro": "Skvîra"
+      },
+      "lat": "49.73370",
+      "lon": "29.66266",
+      "id": 337547206,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Рыбная Слобода",
+      "enName": "Rybnaya Sloboda",
+      "names": {
+        "tt": "Балык Бистәсе",
+        "ru": "Рыбная Слобода",
+        "ja": "ルィブナヤ・スロボーダ"
+      },
+      "lat": "55.46442",
+      "lon": "50.14061",
+      "id": 703680750,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "55.45858",
+          "lon": "50.13169",
+          "id": 10141
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Арск",
+      "enName": "Arsk",
+      "names": {
+        "tt": "Арча",
+        "de": "Arsk",
+        "ru": "Арск",
+        "ja": "アルスク"
+      },
+      "lat": "56.09099",
+      "lon": "49.87718",
+      "id": 295868224,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Комсомольская улица",
+          "lat": "56.08784",
+          "lon": "49.86229",
+          "id": 6776
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Тюлячи",
+      "enName": "Tyulyachi",
+      "names": {
+        "tt": "Теләче",
+        "ru": "Тюлячи",
+        "ja": "チュリャチ"
+      },
+      "lat": "55.89188",
+      "lon": "50.23350",
+      "id": 697241170,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Васильків",
+      "enName": "Vasylkiv",
+      "names": {
+        "de": "Wassylkiw",
+        "ru": "Васильков",
+        "uk": "Васильків",
+        "prefix": "місто",
+        "fr": "Vassylkiv",
+        "pl": "Wasilków",
+        "hu": "Vasylkiv"
+      },
+      "lat": "50.17387",
+      "lon": "30.32158",
+      "id": 337527490,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Красный Ключ",
+      "enName": "Krasny Klyuch",
+      "names": {
+        "tt": "Красный Ключ",
+        "ja": "クラスヌイ・クリューチ"
+      },
+      "lat": "55.68249",
+      "lon": "51.81914",
+      "id": 585272830,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    }
+  ]
+}
\ No newline at end of file
diff --git a/OsmAnd-java/src/test/resources/search/street_lenina_30.json b/OsmAnd-java/src/test/resources/search/street_lenina_30.json
new file mode 100644
index 0000000000..2c510ea1e0
--- /dev/null
+++ b/OsmAnd-java/src/test/resources/search/street_lenina_30.json
@@ -0,0 +1,8626 @@
+{
+  "settings": {
+    "lat": "55.28666",
+    "lon": "52.00558",
+    "radiusLevel": 1,
+    "totalLimit": -1,
+    "lang": "",
+    "transliterateIfMissing": false,
+    "emptyQueryAllowed": false,
+    "sortByName": false
+  },
+  "phrase": "ленина 30",
+  "results": [
+    "30А, улица Ленина, Заинск",
+    "30Б, улица Ленина, Заинск",
+    "30, улица Ленина, Сарманово",
+    "30, улица Ленина, Большое Афанасово",
+    "30, улица Ленина, Альметьевск",
+    "30А, улица Ленина, Альметьевск",
+    "улица Ленина, Заинск",
+    "улица Ленина, Аксарино",
+    "улица Ленина, Светлое Озеро"
+  ],
+  "amenities": [
+    {
+      "name": "улица Ленина",
+      "names": {
+        "tt": "Ленин урамы",
+        "de": "Leninstraße",
+        "ru": "улица Ленина",
+        "be": "вулiца Ленiна",
+        "mrj": "Ленин öлицä",
+        "fr": "Rue Lénine",
+        "ba": "Ленин урамы"
+      },
+      "lat": "56.26804",
+      "lon": "50.85634",
+      "id": 712954141,
+      "subType": "bridge",
+      "type": "man_made",
+      "additionalInfo": {
+        "bridge_car": "yes"
+      }
+    },
+    {
+      "name": "улица Ленина",
+      "lat": "55.25628",
+      "lon": "51.75138",
+      "id": 1168759757,
+      "subType": "bridge",
+      "type": "man_made",
+      "additionalInfo": {
+        "surface_gravel": "gravel",
+        "bridge_car": "yes"
+      }
+    },
+    {
+      "name": "Дом-музей В.И.Ленина",
+      "lat": "55.78690",
+      "lon": "49.13873",
+      "id": 345097079,
+      "subType": "museum",
+      "type": "tourism"
+    },
+    {
+      "name": "Дом-музей В.И.Ленина",
+      "lat": "55.78690",
+      "lon": "49.13873",
+      "id": 345097079,
+      "subType": "building",
+      "type": "man_made"
+    },
+    {
+      "name": "улица Ленина",
+      "names": {
+        "tt": "Ленин урамы",
+        "de": "Leninstraße",
+        "ru": "улица Ленина",
+        "be": "вулiца Ленiна",
+        "mrj": "Ленин öлицä",
+        "fr": "Rue Lénine",
+        "ba": "Ленин урамы"
+      },
+      "lat": "56.33029",
+      "lon": "50.80344",
+      "id": 714393277,
+      "subType": "bridge",
+      "type": "man_made",
+      "additionalInfo": {
+        "bridge_car": "yes",
+        "ref": "16К-1014"
+      }
+    },
+    {
+      "name": "Ленина 148",
+      "lat": "56.34420",
+      "lon": "50.23104",
+      "id": 10550243242,
+      "subType": "wilderness_hut",
+      "type": "tourism"
+    },
+    {
+      "name": "совхоза имени Ленина",
+      "enName": "Sovkhoza imeni Lenina",
+      "names": {
+        "ru": "совхоза имени Ленина"
+      },
+      "lat": "55.58691",
+      "lon": "37.73102",
+      "id": -627450,
+      "subType": "town",
+      "type": "administrative",
+      "additionalInfo": {
+        "population": "4742"
+      }
+    },
+    {
+      "name": "улица Ленина",
+      "names": {
+        "tt": "Ленин урамы",
+        "de": "Leninstraße",
+        "ru": "улица Ленина",
+        "be": "вулiца Ленiна",
+        "mrj": "Ленин öлицä",
+        "fr": "Rue Lénine",
+        "ba": "Ленин урамы"
+      },
+      "lat": "55.30894",
+      "lon": "50.10678",
+      "id": 346283479,
+      "subType": "bridge",
+      "type": "man_made",
+      "additionalInfo": {
+        "bridge_car": "yes"
+      }
+    },
+    {
+      "name": "улица Ленина",
+      "names": {
+        "tt": "Ленин урамы",
+        "de": "Leninstraße",
+        "ru": "улица Ленина",
+        "be": "вулiца Ленiна",
+        "mrj": "Ленин öлицä",
+        "fr": "Rue Lénine",
+        "ba": "Ленин урамы"
+      },
+      "lat": "55.51206",
+      "lon": "51.81751",
+      "id": 482839291,
+      "subType": "bridge",
+      "type": "man_made",
+      "additionalInfo": {
+        "bridge_car": "yes"
+      }
+    },
+    {
+      "name": "улица Ленина",
+      "lat": "54.89796",
+      "lon": "52.28482",
+      "id": 9047976566,
+      "subType": "clock",
+      "type": "tourism",
+      "additionalInfo": {
+        "date_yes": "yes",
+        "support_pole": "pole",
+        "display_digital_yes": "yes",
+        "visibility_street": "street",
+        "start_date": "2016"
+      }
+    },
+    {
+      "name": "улица Ленина",
+      "lat": "54.89796",
+      "lon": "52.28482",
+      "id": 9047976566,
+      "subType": "monitoring_station",
+      "type": "man_made",
+      "additionalInfo": {
+        "date_yes": "yes",
+        "support_pole": "pole",
+        "display_digital_yes": "yes",
+        "visibility_street": "street",
+        "start_date": "2016"
+      }
+    },
+    {
+      "name": "улица Ленина",
+      "names": {
+        "tt": "Ленин урамы",
+        "de": "Leninstraße",
+        "ru": "улица Ленина",
+        "be": "вулiца Ленiна",
+        "mrj": "Ленин öлицä",
+        "fr": "Rue Lénine",
+        "ba": "Ленин урамы"
+      },
+      "lat": "55.21664",
+      "lon": "48.36718",
+      "id": 311139765,
+      "subType": "bridge",
+      "type": "man_made",
+      "additionalInfo": {
+        "bridge_car": "yes"
+      }
+    },
+    {
+      "name": "улица Ленина",
+      "names": {
+        "tt": "Ленин урамы",
+        "de": "Leninstraße",
+        "ru": "улица Ленина",
+        "be": "вулiца Ленiна",
+        "mrj": "Ленин öлицä",
+        "fr": "Rue Lénine",
+        "ba": "Ленин урамы"
+      },
+      "lat": "54.98256",
+      "lon": "50.38562",
+      "id": 603647995,
+      "subType": "bridge",
+      "type": "man_made",
+      "additionalInfo": {
+        "bridge_car": "yes"
+      }
+    },
+    {
+      "name": "ДК им.Ленина",
+      "names": {
+        "tt": "Ленин исемендәге мәдәният һәм ял комплексы"
+      },
+      "lat": "55.85446",
+      "lon": "49.08569",
+      "id": 1981869798,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "6, 18, 42, 60, 76",
+        "operator": "ПАТП-2, ПАТП-4"
+      }
+    },
+    {
+      "name": "Парк «Крылья Советов»",
+      "names": {
+        "tt": "«Крылья Советов» паркы",
+        "ru": "Парк «Крылья Советов»"
+      },
+      "lat": "55.85330",
+      "lon": "49.09005",
+      "id": 81482207,
+      "subType": "park",
+      "type": "entertainment",
+      "additionalInfo": {
+        "wikipedia": "http://ru.wikipedia.org/wiki/Крылья Советов (парк)",
+        "old_name": "Парк Ленина"
+      }
+    },
+    {
+      "name": "Культурно-досуговый комплекс им. В.И.Ленина",
+      "lat": "55.85390",
+      "lon": "49.08687",
+      "id": 145151087,
+      "subType": "community_centre",
+      "type": "entertainment",
+      "additionalInfo": {
+        "website": "https://vk.com/kdklenin"
+      }
+    },
+    {
+      "name": "Культурно-досуговый комплекс им. В.И.Ленина",
+      "lat": "55.85390",
+      "lon": "49.08687",
+      "id": 145151087,
+      "subType": "building",
+      "type": "man_made",
+      "additionalInfo": {
+        "website": "https://vk.com/kdklenin"
+      }
+    },
+    {
+      "name": "Ленина",
+      "lat": "55.83146",
+      "lon": "48.66248",
+      "id": 899597590,
+      "subType": "public_transport_stop_position",
+      "type": "transportation"
+    },
+    {
+      "name": "улица Ленина",
+      "names": {
+        "tt": "Ленин урамы",
+        "de": "Leninstraße",
+        "ru": "улица Ленина",
+        "be": "вулiца Ленiна",
+        "mrj": "Ленин öлицä",
+        "fr": "Rue Lénine",
+        "ba": "Ленин урамы"
+      },
+      "lat": "56.51247",
+      "lon": "52.99594",
+      "id": 620696879,
+      "subType": "bridge",
+      "type": "man_made",
+      "additionalInfo": {
+        "bridge_car": "yes"
+      }
+    },
+    {
+      "name": "НПО им. Ленина",
+      "lat": "55.86587",
+      "lon": "48.86088",
+      "id": 4776241786,
+      "subType": "suburb",
+      "type": "administrative"
+    },
+    {
+      "name": "Ул Ленина",
+      "lat": "55.93939",
+      "lon": "52.25632",
+      "id": 10608626446,
+      "subType": "bus_stop",
+      "type": "transportation"
+    },
+    {
+      "name": "НПО им. Ленина",
+      "lat": "55.86505",
+      "lon": "48.86116",
+      "id": 116563497,
+      "subType": "suburb",
+      "type": "administrative",
+      "additionalInfo": {
+        "rural": "rural"
+      }
+    },
+    {
+      "name": "НПО им. Ленина",
+      "lat": "55.86505",
+      "lon": "48.86116",
+      "id": 116563497,
+      "subType": "residential",
+      "type": "administrative",
+      "additionalInfo": {
+        "rural": "rural"
+      }
+    },
+    {
+      "name": "Леніна",
+      "enName": "Lenina",
+      "names": {
+        "ru": "Ленина",
+        "uk": "Леніна"
+      },
+      "lat": "48.43517",
+      "lon": "39.14890",
+      "id": -707666,
+      "subType": "town",
+      "type": "administrative",
+      "additionalInfo": {
+        "population": "1083"
+      }
+    },
+    {
+      "name": "Санаторий имени В.И. Ленина",
+      "lat": "54.59147",
+      "lon": "48.40525",
+      "id": 399567309,
+      "subType": "resort",
+      "type": "tourism",
+      "additionalInfo": {
+        "sanatorium": "sanatorium",
+        "operator": "ОАО \"Ульяновсккурорт\""
+      }
+    },
+    {
+      "name": "ДК им.Ленина",
+      "names": {
+        "tt": "Ленин исемендәге мәдәният һәм ял комплексы"
+      },
+      "lat": "55.85434",
+      "lon": "49.08668",
+      "id": 1981869822,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "42, 93",
+        "operator": "ПАТП-4"
+      }
+    },
+    {
+      "name": "Парк Ленина",
+      "lat": "56.18713",
+      "lon": "50.89041",
+      "id": 705187927,
+      "subType": "park",
+      "type": "entertainment"
+    }
+  ],
+  "cities": [
+    {
+      "name": "Тараща",
+      "enName": "Tarascha",
+      "names": {
+        "de": "Taraschtscha",
+        "ru": "Тараща",
+        "uk": "Тараща",
+        "prefix": "місто",
+        "pl": "Taraszcza"
+      },
+      "lat": "49.55550",
+      "lon": "30.50234",
+      "id": 620750304,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Сарманово",
+      "enName": "Sarmanovo",
+      "names": {
+        "tt": "Сарман",
+        "de": "Sarmanowo",
+        "ru": "Сарманово",
+        "ja": "サルマノヴォ"
+      },
+      "lat": "55.25225",
+      "lon": "52.58872",
+      "id": 337839105,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.24364",
+          "lon": "52.57943",
+          "id": 1777,
+          "buildings": [
+            {
+              "name": "1",
+              "lat": "55.24647",
+              "lon": "52.58063"
+            },
+            {
+              "name": "2В",
+              "lat": "55.24580",
+              "lon": "52.58254"
+            },
+            {
+              "name": "12А",
+              "lat": "55.24959",
+              "lon": "52.58672"
+            },
+            {
+              "name": "17",
+              "lat": "55.24952",
+              "lon": "52.58473"
+            },
+            {
+              "name": "20",
+              "lat": "55.25097",
+              "lon": "52.58722"
+            },
+            {
+              "name": "22",
+              "lat": "55.25134",
+              "lon": "52.58775"
+            },
+            {
+              "name": "24",
+              "lat": "55.25156",
+              "lon": "52.58810"
+            },
+            {
+              "name": "26",
+              "lat": "55.25185",
+              "lon": "52.58900"
+            },
+            {
+              "name": "28Б",
+              "lat": "55.25162",
+              "lon": "52.59093"
+            },
+            {
+              "name": "28Б",
+              "lat": "55.25192",
+              "lon": "52.59042"
+            },
+            {
+              "name": "30",
+              "lat": "55.25225",
+              "lon": "52.58949"
+            },
+            {
+              "name": "31",
+              "lat": "55.25155",
+              "lon": "52.58679"
+            },
+            {
+              "name": "32",
+              "lat": "55.25298",
+              "lon": "52.58996"
+            },
+            {
+              "name": "33",
+              "lat": "55.25203",
+              "lon": "52.58741"
+            },
+            {
+              "name": "34",
+              "lat": "55.25328",
+              "lon": "52.59018"
+            },
+            {
+              "name": "35",
+              "lat": "55.25260",
+              "lon": "52.58801"
+            },
+            {
+              "name": "37",
+              "lat": "55.25320",
+              "lon": "52.58840"
+            },
+            {
+              "name": "40",
+              "lat": "55.25361",
+              "lon": "52.59050",
+              "postcode": "423350"
+            },
+            {
+              "name": "42",
+              "lat": "55.25394",
+              "lon": "52.59091",
+              "postcode": "423350"
+            },
+            {
+              "name": "44",
+              "lat": "55.25435",
+              "lon": "52.59149",
+              "postcode": "423350"
+            },
+            {
+              "name": "46",
+              "lat": "55.25449",
+              "lon": "52.59181",
+              "postcode": "423350"
+            },
+            {
+              "name": "48",
+              "lat": "55.25470",
+              "lon": "52.59190"
+            },
+            {
+              "name": "50",
+              "lat": "55.25491",
+              "lon": "52.59228"
+            },
+            {
+              "name": "52",
+              "lat": "55.25532",
+              "lon": "52.59275"
+            },
+            {
+              "name": "58",
+              "lat": "55.25519",
+              "lon": "52.59449"
+            },
+            {
+              "name": "60",
+              "lat": "55.25554",
+              "lon": "52.59404"
+            },
+            {
+              "name": "62",
+              "lat": "55.25602",
+              "lon": "52.59359"
+            },
+            {
+              "name": "63",
+              "lat": "55.25674",
+              "lon": "52.59177"
+            },
+            {
+              "name": "65",
+              "lat": "55.25629",
+              "lon": "52.59282"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "улица Хайруллина",
+              "lat": "55.23851",
+              "lon": "52.57400"
+            },
+            {
+              "name": "улица Рафикова",
+              "lat": "55.23939",
+              "lon": "52.57497"
+            },
+            {
+              "name": "улица Татарстана",
+              "names": {
+                "tt": "Татарстан урамы"
+              },
+              "lat": "55.24022",
+              "lon": "52.57587"
+            },
+            {
+              "name": "улица Х. Туфана",
+              "lat": "55.24104",
+              "lon": "52.57673"
+            },
+            {
+              "name": "улица З. Хасана",
+              "lat": "55.24187",
+              "lon": "52.57756"
+            },
+            {
+              "name": "улица М. Тинчурина",
+              "lat": "55.24281",
+              "lon": "52.57855"
+            },
+            {
+              "name": "улица Гаяза Исхаки",
+              "lat": "55.24364",
+              "lon": "52.57943"
+            },
+            {
+              "name": "Советская улица",
+              "lat": "55.24519",
+              "lon": "52.58100"
+            },
+            {
+              "name": "улица Строителей",
+              "lat": "55.24686",
+              "lon": "52.58256"
+            },
+            {
+              "name": "улица Яруллина",
+              "lat": "55.24874",
+              "lon": "52.58439"
+            },
+            {
+              "name": "улица Терешковой",
+              "lat": "55.25358",
+              "lon": "52.59007"
+            },
+            {
+              "name": "улица Мусы Джалиля",
+              "lat": "55.26035",
+              "lon": "52.60063"
+            },
+            {
+              "name": "улица Ямашева",
+              "lat": "55.26347",
+              "lon": "52.60303"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Богатые Сабы",
+      "enName": "Bogatye Saby",
+      "names": {
+        "tt": "Байлар Сабасы",
+        "ru": "Богатые Сабы",
+        "ja": "ボガートィエ・サブィ"
+      },
+      "lat": "56.01062",
+      "lon": "50.44677",
+      "id": 701847474,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.01590",
+          "lon": "50.46038",
+          "id": 8825
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Прип’ять",
+      "enName": "Pripyat",
+      "names": {
+        "de": "Prypjat",
+        "no": "Pripjat",
+        "be": "Прып'яць",
+        "fi": "Prypjat",
+        "ru": "Припять",
+        "pt": "Pripyat",
+        "bg": "Припя̀т",
+        "prefix": "місто",
+        "lt": "Pripetė",
+        "hr": "Prėpetė",
+        "fr": "Pripiat",
+        "hu": "Pripjaty",
+        "uk": "Прип’ять",
+        "sk": "Pripjať",
+        "sl": "Pripjat",
+        "id": "Prypiat",
+        "pam": "Prypiat",
+        "ca": "Pripyat",
+        "sr": "Припјат",
+        "sv": "Pripjat",
+        "ko": "프리피야티",
+        "eo": "Pripjat",
+        "it": "Pripjat",
+        "es": "Prípiat",
+        "zh": "普里皮亚特",
+        "et": "Prõpjat",
+        "cs": "Pripjať",
+        "ja": "プリピャチ",
+        "pl": "Prypeć",
+        "da": "Prypiat",
+        "ro": "Pripiat",
+        "nl": "Prypjat"
+      },
+      "lat": "51.40613",
+      "lon": "30.05711",
+      "id": 127835001,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Актаныш",
+      "enName": "Aktanysh",
+      "names": {
+        "tt": "Актаныш",
+        "ru": "Актаныш",
+        "ja": "アクタヌィシ"
+      },
+      "lat": "55.72218",
+      "lon": "54.05773",
+      "id": 606106631,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "проспект Ленина",
+          "lat": "55.72025",
+          "lon": "54.06795",
+          "id": 681
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Баришівка",
+      "enName": "Baryshivka",
+      "names": {
+        "de": "Baryschiwka",
+        "ru": "Барышевка",
+        "uk": "Баришівка",
+        "prefix": "селище міського типу",
+        "pl": "Baryszówka"
+      },
+      "lat": "50.36453",
+      "lon": "31.32567",
+      "id": 337523450,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Чорнобиль",
+      "enName": "Chornobyl",
+      "names": {
+        "nn": "Tsjernobyl",
+        "de": "Tschornobyl",
+        "no": "Tsjernobyl",
+        "be": "Чарнобыль",
+        "fi": "Tšernobyl",
+        "ru": "Чернобыль",
+        "pt": "Chernobyl",
+        "prefix": "місто",
+        "lt": "Černobylis",
+        "hr": "Černobil",
+        "fr": "Tchernobyl",
+        "hu": "Csernobil",
+        "yi": "טשערנאבל",
+        "oc": "Chornobyl",
+        "uk": "Чорнобиль",
+        "sk": "Černobyľ",
+        "sl": "Černobil",
+        "id": "Chernobyl",
+        "ca": "Txernòbil",
+        "scn": "Chernobyl",
+        "sr": "Černobilj",
+        "sv": "Tjernobyl",
+        "ko": "초르노빌",
+        "af": "Černobylis",
+        "ms": "Chernobyl",
+        "eo": "Ĉernobilo",
+        "it": "Černobyl",
+        "es": "Chernóbil",
+        "zh": "切尔诺贝利",
+        "et": "Tšornobõl",
+        "cs": "Černobyl",
+        "eu": "Txernobyl",
+        "ar": "تشيرنوبيل",
+        "vi": "Chernobyl",
+        "lb": "Tschernobyl",
+        "ja": "チョルノーブィリ",
+        "pl": "Czarnobyl",
+        "da": "Tjernobyl",
+        "he": "צ'רנוביל",
+        "ro": "Cernobîl",
+        "nl": "Tsjernobyl",
+        "tr": "Çernobil"
+      },
+      "lat": "51.27053",
+      "lon": "30.21944",
+      "id": 127834997,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "НПО им. Ленина",
+      "lat": "55.86587",
+      "lon": "48.86088",
+      "id": 2388120893,
+      "type": "SUBURB",
+      "listOfStreets": [],
+      "matchCity": 1
+    },
+    {
+      "name": "Узин",
+      "enName": "Uzyn",
+      "names": {
+        "ru": "Узин",
+        "uk": "Узин",
+        "prefix": "місто",
+        "eo": "Uzin",
+        "fr": "Ouzyn",
+        "pl": "Uzyn"
+      },
+      "lat": "49.82847",
+      "lon": "30.41973",
+      "id": 337543666,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Камские Поляны",
+      "enName": "Kamskiye Polyani",
+      "names": {
+        "tt": "Кама Аланы",
+        "de": "Kamskije Poljany",
+        "ru": "Камские Поляны",
+        "ja": "カムスキエ・ポリャヌィ"
+      },
+      "lat": "55.42550",
+      "lon": "51.41016",
+      "id": 587614698,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Малая Шильна",
+      "names": {
+        "tt": "Кече Шилнә"
+      },
+      "lat": "55.80199",
+      "lon": "52.53396",
+      "id": 593611093,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.80198",
+          "lon": "52.53385",
+          "id": 8882,
+          "buildings": [
+            {
+              "name": "10",
+              "lat": "55.80697",
+              "lon": "52.53375"
+            },
+            {
+              "name": "23",
+              "lat": "55.80428",
+              "lon": "52.53360"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "Солнечная улица",
+              "lat": "55.79622",
+              "lon": "52.53536"
+            },
+            {
+              "name": "Родниковая улица",
+              "lat": "55.79746",
+              "lon": "52.53497"
+            },
+            {
+              "name": "Центральная улица",
+              "lat": "55.80198",
+              "lon": "52.53385"
+            },
+            {
+              "name": "улица Карла Маркса",
+              "lat": "55.80718",
+              "lon": "52.53402"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Малая Цильна",
+      "names": {
+        "tt": "Кече Чынлы"
+      },
+      "lat": "54.76570",
+      "lon": "47.86951",
+      "id": 761955165,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.76848",
+          "lon": "47.85664",
+          "id": 10999
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Бабинці",
+      "enName": "Babyntsi",
+      "names": {
+        "ru": "Бабинцы",
+        "uk": "Бабинці",
+        "prefix": "селище міського типу",
+        "pl": "Babyntsi"
+      },
+      "lat": "50.64241",
+      "lon": "30.02907",
+      "id": 1668578377,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Славутич",
+      "enName": "Slavutych",
+      "names": {
+        "de": "Slawutytsch",
+        "ru": "Славутич",
+        "uk": "Славутич",
+        "prefix": "місто",
+        "lt": "Slavutičius",
+        "pl": "Sławutycz"
+      },
+      "lat": "51.52014",
+      "lon": "30.75623",
+      "id": 337507300,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Иннополис",
+      "enName": "Innopolis",
+      "names": {
+        "tt": "Иннополис",
+        "ru": "Иннополис"
+      },
+      "lat": "55.75226",
+      "lon": "48.74458",
+      "id": 2294499518,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Измери",
+      "names": {
+        "tt": "Әҗмәр"
+      },
+      "lat": "55.13665",
+      "lon": "49.53504",
+      "id": 787285204,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы"
+          },
+          "lat": "55.13857",
+          "lon": "49.53388",
+          "id": 11882
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Лащ-Таяба",
+      "names": {
+        "cv": "Лаш Таяпа",
+        "ru": "Лащ-Таяба"
+      },
+      "lat": "55.03009",
+      "lon": "47.99935",
+      "id": 795358551,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "lat": "55.03053",
+          "lon": "47.99341",
+          "id": 11865
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Вишневе",
+      "enName": "Vyshneve",
+      "names": {
+        "de": "Wyschnewe",
+        "ru": "Вишнёвое",
+        "uk": "Вишневе",
+        "prefix": "місто",
+        "pl": "Wysznewe",
+        "hu": "Vyshneve"
+      },
+      "lat": "50.39175",
+      "lon": "30.36791",
+      "id": 36507630,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Боярка",
+      "enName": "Boiarka",
+      "names": {
+        "ru": "Боярка",
+        "uk": "Боярка",
+        "prefix": "місто",
+        "pl": "Bojarka",
+        "hu": "Boiarka"
+      },
+      "lat": "50.33567",
+      "lon": "30.28476",
+      "id": 36507632,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Васильево",
+      "enName": "Vasilyevo",
+      "names": {
+        "tt": "Васильево",
+        "de": "Wassiljewo",
+        "ru": "Васильево",
+        "ja": "ヴァシーリエヴォ"
+      },
+      "lat": "55.83729",
+      "lon": "48.67924",
+      "id": 336524045,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.83157",
+          "lon": "48.65047",
+          "id": 71
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Волжск",
+      "enName": "Volzhsk",
+      "names": {
+        "tt": "Волжск",
+        "de": "Wolschsk",
+        "ru": "Волжск",
+        "chm": "Юлсер-Ола",
+        "eo": "Volĵsk",
+        "it": "Volžsk",
+        "fr": "Voljsk",
+        "cs": "Volžsk",
+        "cv": "Волжск",
+        "uk": "Волзьк",
+        "mhr": "Юлсер-Ола",
+        "ja": "ヴォルシスク",
+        "pl": "Wołżsk",
+        "tr": "Voljsk"
+      },
+      "lat": "55.86366",
+      "lon": "48.36186",
+      "id": 336523790,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.86402",
+          "lon": "48.35956",
+          "id": 14
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Бориспіль",
+      "enName": "Boryspil",
+      "names": {
+        "de": "Boryspil",
+        "ru": "Борисполь",
+        "uk": "Бориспіль",
+        "prefix": "місто",
+        "eo": "Borispilo",
+        "fr": "Boryspil",
+        "pl": "Boryspol",
+        "hu": "Boryspil"
+      },
+      "lat": "50.35121",
+      "lon": "30.95076",
+      "id": 26150796,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Клавдієво-Тарасове",
+      "enName": "Klavdiievo-Tarasove",
+      "names": {
+        "ru": "Клавдиево-Тарасово",
+        "uk": "Клавдієво-Тарасове",
+        "prefix": "селище міського типу",
+        "pl": "Klavdiievo-Tarasove"
+      },
+      "lat": "50.58414",
+      "lon": "30.00950",
+      "id": 337519388,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Гребінки",
+      "enName": "Hrebinky",
+      "names": {
+        "ru": "Гребёнки",
+        "uk": "Гребінки",
+        "prefix": "селище міського типу",
+        "pl": "Hrebinky"
+      },
+      "lat": "49.95346",
+      "lon": "30.17635",
+      "id": 337539356,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Большое Мереткозино",
+      "names": {
+        "tt": "Олы Мәрәтхуҗа"
+      },
+      "lat": "55.23953",
+      "lon": "49.07874",
+      "id": 723847137,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы"
+          },
+          "lat": "55.23875",
+          "lon": "49.08286",
+          "id": 11838
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Чистополь",
+      "enName": "Chistopol",
+      "names": {
+        "tt": "Чистай",
+        "de": "Tschistopol",
+        "cv": "Чистай",
+        "ru": "Чистополь",
+        "ja": "チストポリ"
+      },
+      "lat": "55.37148",
+      "lon": "50.63674",
+      "id": 295864677,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.37059",
+          "lon": "50.64558",
+          "id": 234
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Чупаево",
+      "names": {
+        "tt": "Чупай"
+      },
+      "lat": "54.79709",
+      "lon": "52.13289",
+      "id": 867304315,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.79555",
+          "lon": "52.12682",
+          "id": 6365,
+          "intersectedStreets": [
+            {
+              "name": "улица Кирова",
+              "names": {
+                "tt": "Киров урамы"
+              },
+              "lat": "54.79539",
+              "lon": "52.12725"
+            },
+            {
+              "name": "Советская улица",
+              "lat": "54.79425",
+              "lon": "52.13004"
+            },
+            {
+              "name": "улица Тукая",
+              "lat": "54.79326",
+              "lon": "52.13470"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Малые Кабаны",
+      "names": {
+        "tt": "Кече Кабан"
+      },
+      "lat": "55.65275",
+      "lon": "49.28042",
+      "id": 760312409,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.64963",
+          "lon": "49.27699",
+          "id": 10859
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Ірпінь",
+      "enName": "Irpin",
+      "names": {
+        "de": "Irpin",
+        "ru": "Ирпень",
+        "uk": "Ірпінь",
+        "prefix": "місто",
+        "fr": "Irpine",
+        "pl": "Irpień",
+        "hu": "Irpin"
+      },
+      "lat": "50.51665",
+      "lon": "30.25004",
+      "id": 36505064,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Починок Сутер",
+      "names": {
+        "tt": "Пүчинкә-Сутер"
+      },
+      "lat": "56.06771",
+      "lon": "51.02679",
+      "id": 797048460,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.06966",
+          "lon": "51.03001",
+          "id": 6864
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Заинск",
+      "enName": "Zainsk",
+      "names": {
+        "tt": "Зәй",
+        "de": "Sainsk",
+        "ru": "Заинск",
+        "ja": "ザインスク"
+      },
+      "lat": "55.28665",
+      "lon": "52.00561",
+      "id": 337839081,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.28712",
+          "lon": "51.99900",
+          "id": 730,
+          "buildings": [
+            {
+              "name": "1",
+              "lat": "55.28849",
+              "lon": "52.00003",
+              "postcode": "423520"
+            },
+            {
+              "name": "1А",
+              "lat": "55.29061",
+              "lon": "52.00093",
+              "postcode": "423520"
+            },
+            {
+              "name": "1Б",
+              "lat": "55.29008",
+              "lon": "52.00082",
+              "postcode": "423520"
+            },
+            {
+              "name": "1В",
+              "lat": "55.28956",
+              "lon": "52.00072"
+            },
+            {
+              "name": "1Г",
+              "lat": "55.28980",
+              "lon": "52.00022",
+              "postcode": "423520"
+            },
+            {
+              "name": "2",
+              "lat": "55.28615",
+              "lon": "51.99898",
+              "postcode": "423520"
+            },
+            {
+              "name": "2А",
+              "lat": "55.28889",
+              "lon": "51.99926",
+              "postcode": "423520"
+            },
+            {
+              "name": "2Б",
+              "lat": "55.28988",
+              "lon": "51.99958"
+            },
+            {
+              "name": "2Г",
+              "lat": "55.28738",
+              "lon": "51.99911"
+            },
+            {
+              "name": "2Д",
+              "lat": "55.28712",
+              "lon": "51.99900"
+            },
+            {
+              "name": "2Д",
+              "lat": "55.28713",
+              "lon": "51.99900"
+            },
+            {
+              "name": "3",
+              "lat": "55.28769",
+              "lon": "52.00014"
+            },
+            {
+              "name": "4",
+              "lat": "55.28574",
+              "lon": "51.99887",
+              "postcode": "423520"
+            },
+            {
+              "name": "5",
+              "lat": "55.28701",
+              "lon": "51.99973"
+            },
+            {
+              "name": "6",
+              "lat": "55.28530",
+              "lon": "51.99878",
+              "postcode": "423520"
+            },
+            {
+              "name": "6А",
+              "lat": "55.28503",
+              "lon": "51.99799"
+            },
+            {
+              "name": "7",
+              "lat": "55.28578",
+              "lon": "51.99947",
+              "postcode": "423520"
+            },
+            {
+              "name": "7А",
+              "lat": "55.28545",
+              "lon": "52.00011",
+              "postcode": "423520"
+            },
+            {
+              "name": "7Б",
+              "lat": "55.28551",
+              "lon": "51.99945",
+              "postcode": "423520"
+            },
+            {
+              "name": "8",
+              "lat": "55.28470",
+              "lon": "51.99859",
+              "postcode": "423520"
+            },
+            {
+              "name": "9",
+              "lat": "55.28487",
+              "lon": "51.99930",
+              "postcode": "423520"
+            },
+            {
+              "name": "9А",
+              "lat": "55.28508",
+              "lon": "52.00005"
+            },
+            {
+              "name": "9Б",
+              "lat": "55.28364",
+              "lon": "51.99941"
+            },
+            {
+              "name": "9Б",
+              "lat": "55.28354",
+              "lon": "51.99913",
+              "postcode": "423520"
+            },
+            {
+              "name": "10",
+              "lat": "55.28427",
+              "lon": "51.99855",
+              "postcode": "423520"
+            },
+            {
+              "name": "10А",
+              "lat": "55.28413",
+              "lon": "51.99821"
+            },
+            {
+              "name": "10Б",
+              "lat": "55.28436",
+              "lon": "51.99818"
+            },
+            {
+              "name": "11",
+              "lat": "55.28221",
+              "lon": "51.99876",
+              "postcode": "423520"
+            },
+            {
+              "name": "11А",
+              "lat": "55.28189",
+              "lon": "51.99941"
+            },
+            {
+              "name": "12",
+              "lat": "55.28384",
+              "lon": "51.99846",
+              "postcode": "423520"
+            },
+            {
+              "name": "13",
+              "lat": "55.28167",
+              "lon": "51.99868",
+              "postcode": "423520"
+            },
+            {
+              "name": "14",
+              "lat": "55.28331",
+              "lon": "51.99838",
+              "postcode": "423520"
+            },
+            {
+              "name": "15",
+              "lat": "55.28129",
+              "lon": "51.99857",
+              "postcode": "423520"
+            },
+            {
+              "name": "15А",
+              "lat": "55.28151",
+              "lon": "51.99934"
+            },
+            {
+              "name": "16А",
+              "lat": "55.28289",
+              "lon": "51.99814"
+            },
+            {
+              "name": "17",
+              "lat": "55.28023",
+              "lon": "51.99823",
+              "postcode": "423520"
+            },
+            {
+              "name": "18",
+              "lat": "55.28245",
+              "lon": "51.99823",
+              "postcode": "423520"
+            },
+            {
+              "name": "18А",
+              "lat": "55.28217",
+              "lon": "51.99743"
+            },
+            {
+              "name": "19",
+              "lat": "55.27951",
+              "lon": "51.99827",
+              "postcode": "423520"
+            },
+            {
+              "name": "19А",
+              "lat": "55.27863",
+              "lon": "51.99808",
+              "postcode": "423520"
+            },
+            {
+              "name": "19А",
+              "lat": "55.27892",
+              "lon": "51.99821"
+            },
+            {
+              "name": "19Б",
+              "lat": "55.27912",
+              "lon": "51.99816",
+              "postcode": "423520"
+            },
+            {
+              "name": "20",
+              "lat": "55.28185",
+              "lon": "51.99810",
+              "postcode": "423520"
+            },
+            {
+              "name": "21",
+              "lat": "55.27742",
+              "lon": "51.99795"
+            },
+            {
+              "name": "22",
+              "lat": "55.28143",
+              "lon": "51.99801"
+            },
+            {
+              "name": "23",
+              "lat": "55.27684",
+              "lon": "51.99771"
+            },
+            {
+              "name": "23А",
+              "lat": "55.27714",
+              "lon": "51.99893"
+            },
+            {
+              "name": "24",
+              "lat": "55.28099",
+              "lon": "51.99793"
+            },
+            {
+              "name": "25",
+              "lat": "55.27600",
+              "lon": "51.99754"
+            },
+            {
+              "name": "25А",
+              "lat": "55.27632",
+              "lon": "51.99866"
+            },
+            {
+              "name": "26",
+              "lat": "55.28037",
+              "lon": "51.99778"
+            },
+            {
+              "name": "26А",
+              "lat": "55.27968",
+              "lon": "51.99715"
+            },
+            {
+              "name": "26Г/1",
+              "lat": "55.27982",
+              "lon": "51.99602"
+            },
+            {
+              "name": "26Г/2",
+              "lat": "55.28017",
+              "lon": "51.99600",
+              "postcode": "423520"
+            },
+            {
+              "name": "27",
+              "lat": "55.27534",
+              "lon": "51.99859"
+            },
+            {
+              "name": "27А",
+              "lat": "55.27566",
+              "lon": "52.00093"
+            },
+            {
+              "name": "27Б",
+              "lat": "55.27607",
+              "lon": "52.00200"
+            },
+            {
+              "name": "28",
+              "lat": "55.27761",
+              "lon": "51.99718"
+            },
+            {
+              "name": "28А",
+              "lat": "55.27859",
+              "lon": "51.99737"
+            },
+            {
+              "name": "29",
+              "lat": "55.27486",
+              "lon": "51.99735"
+            },
+            {
+              "name": "29А",
+              "lat": "55.27511",
+              "lon": "51.99840"
+            },
+            {
+              "name": "29Б",
+              "lat": "55.27492",
+              "lon": "51.99930"
+            },
+            {
+              "name": "30Б",
+              "lat": "55.27657",
+              "lon": "51.99698"
+            },
+            {
+              "name": "30А",
+              "lat": "55.27579",
+              "lon": "51.99679",
+              "postcode": "423520"
+            },
+            {
+              "name": "31",
+              "lat": "55.27457",
+              "lon": "51.99833"
+            },
+            {
+              "name": "32",
+              "lat": "55.27589",
+              "lon": "51.99524"
+            },
+            {
+              "name": "34",
+              "lat": "55.27500",
+              "lon": "51.99664"
+            },
+            {
+              "name": "34А",
+              "lat": "55.27530",
+              "lon": "51.99503"
+            },
+            {
+              "name": "36",
+              "lat": "55.27461",
+              "lon": "51.99533"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "проспект Нефтяников",
+              "lat": "55.28642",
+              "lon": "51.99932"
+            },
+            {
+              "name": "улица Лобачевского",
+              "lat": "55.28428",
+              "lon": "51.99887"
+            },
+            {
+              "name": "улица Островского",
+              "lat": "55.28356",
+              "lon": "51.99872"
+            },
+            {
+              "name": "улица Крупской",
+              "lat": "55.28284",
+              "lon": "51.99857"
+            },
+            {
+              "name": "переулок Строителей",
+              "lat": "55.28265",
+              "lon": "51.99853"
+            },
+            {
+              "name": "Комсомольская улица",
+              "lat": "55.28069",
+              "lon": "51.99812"
+            },
+            {
+              "name": "Казанская улица",
+              "names": {
+                "tt": "Казан урамы",
+                "tt-lat": "Qazan uramı"
+              },
+              "lat": "55.28885",
+              "lon": "51.99975"
+            },
+            {
+              "name": "улица Никифорова",
+              "lat": "55.27815",
+              "lon": "51.99763"
+            },
+            {
+              "name": "улица Гагарина",
+              "names": {
+                "tt": "Гагарин урамы"
+              },
+              "lat": "55.27597",
+              "lon": "51.99720"
+            },
+            {
+              "name": "улица Надежды",
+              "lat": "55.27431",
+              "lon": "51.99685"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Яготин",
+      "enName": "Yahotyn",
+      "names": {
+        "de": "Jahotyn",
+        "ru": "Яготин",
+        "uk": "Яготин",
+        "prefix": "місто",
+        "pl": "Jagodzin"
+      },
+      "lat": "50.27589",
+      "lon": "31.76349",
+      "id": 337525267,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Немішаєве",
+      "enName": "Nemishaieve",
+      "names": {
+        "ru": "Немешаево",
+        "uk": "Немішаєве",
+        "prefix": "селище міського типу",
+        "fr": "Nemishayeve"
+      },
+      "lat": "50.56801",
+      "lon": "30.10151",
+      "id": 337519630,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Кагарлик",
+      "enName": "Kaharlyk",
+      "names": {
+        "de": "Kaharlyk",
+        "ru": "Кагарлык",
+        "uk": "Кагарлик",
+        "prefix": "місто",
+        "pl": "Kaharłyk"
+      },
+      "lat": "49.86507",
+      "lon": "30.82268",
+      "id": 1819209275,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Буденовец",
+      "lat": "55.35224",
+      "lon": "51.14801",
+      "id": 19254633849,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.35043",
+          "lon": "51.15277",
+          "id": 10672,
+          "intersectedStreets": [
+            {
+              "name": "улица Кирова",
+              "lat": "55.35478",
+              "lon": "51.15217"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Маметьево",
+      "names": {
+        "tt": "Мəмəт"
+      },
+      "lat": "54.81426",
+      "lon": "52.08193",
+      "id": 867306598,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.81923",
+          "lon": "52.08590",
+          "id": 6914,
+          "intersectedStreets": [
+            {
+              "name": "улица Шайдулина",
+              "lat": "54.81661",
+              "lon": "52.08882"
+            },
+            {
+              "name": "Советская улица",
+              "lat": "54.81721",
+              "lon": "52.08775"
+            },
+            {
+              "name": "улица Октября",
+              "lat": "54.81923",
+              "lon": "52.08590"
+            },
+            {
+              "name": "улица Калинина",
+              "lat": "54.81973",
+              "lon": "52.08423"
+            },
+            {
+              "name": "улица Куйбышева",
+              "lat": "54.81974",
+              "lon": "52.08234"
+            },
+            {
+              "name": "улица Мириханова",
+              "lat": "54.82012",
+              "lon": "52.07936"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Шимкусы",
+      "lat": "55.54700",
+      "lon": "47.95491",
+      "id": 4058603,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "lat": "55.54616",
+          "lon": "47.94449",
+          "id": 11767
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Муслюмово",
+      "enName": "Muslyumovo",
+      "names": {
+        "tt": "Мөслим",
+        "ru": "Муслюмово",
+        "ja": "ムスリュモヴォ"
+      },
+      "lat": "55.30593",
+      "lon": "53.19415",
+      "id": 337839100,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Кудаш",
+      "names": {
+        "tt": "Кодаш"
+      },
+      "lat": "56.13616",
+      "lon": "49.01430",
+      "id": 825450987,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "lat": "56.13677",
+          "lon": "49.01705",
+          "id": 8539
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Менделеевск",
+      "enName": "Mendeleyevsk",
+      "names": {
+        "tt": "Менделеевск",
+        "de": "Mendelejewsk",
+        "ru": "Менделеевск",
+        "ja": "メンデリェーエフスク"
+      },
+      "lat": "55.88787",
+      "lon": "52.30844",
+      "id": 321322750,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.91167",
+          "lon": "52.29029",
+          "id": 9263
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Нижний Услон",
+      "enName": "Nignij Uslon",
+      "names": {
+        "tt": "Түбән Ослан",
+        "ru": "Нижний Услон"
+      },
+      "lat": "55.69507",
+      "lon": "48.96694",
+      "id": 703197619,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы"
+          },
+          "lat": "55.70412",
+          "lon": "48.97227",
+          "id": 12012
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Верхний Услон",
+      "enName": "Verhnij Uslon",
+      "names": {
+        "tt": "Югары Ослан",
+        "de": "Werchni Uslonn",
+        "ru": "Верхний Услон",
+        "ja": "ヴェルフニー・ウスロン",
+        "ba": "Үрге Ослан"
+      },
+      "lat": "55.76855",
+      "lon": "48.98293",
+      "id": 703197622,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.77954",
+          "lon": "48.97984",
+          "id": 6158
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Зеленодольск",
+      "enName": "Zelenodol'sk",
+      "names": {
+        "tt": "Яшел Үзән",
+        "de": "Selenodolsk",
+        "ru": "Зеленодольск",
+        "ko": "젤레노돌스크",
+        "uk": "Зеленодольськ",
+        "mhr": "Парат",
+        "ja": "ゼレノドリスク",
+        "eo": "Zelenodolsk",
+        "fa": "زلنودولسک، روسیه",
+        "pl": "Zielonodolsk",
+        "ro": "Zelenodolsk",
+        "sr": "Зеленодољск"
+      },
+      "lat": "55.84776",
+      "lon": "48.50970",
+      "id": 336524051,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.84548",
+          "lon": "48.51730",
+          "id": 504
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Вятские Поляны",
+      "enName": "Vyatskiye Polyany",
+      "names": {
+        "tt": "Нократ Аланы",
+        "de": "Wjatskije Poljany",
+        "ja": "ヴャーツキエ・ポリャーヌィ"
+      },
+      "lat": "56.23101",
+      "lon": "51.02939",
+      "id": 3237869,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.21668",
+          "lon": "51.03392",
+          "id": 9799
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Чирша",
+      "names": {
+        "tt": "Чыршы"
+      },
+      "lat": "56.08640",
+      "lon": "49.22040",
+      "id": 816440693,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Ленина",
+          "lat": "56.08601",
+          "lon": "49.18292",
+          "id": 867
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Глеваха",
+      "enName": "Hlevakha",
+      "names": {
+        "kk": "Glevaha",
+        "de": "Hlewacha",
+        "ceb": "Hlevakha",
+        "be": "Глэваха",
+        "ru": "Глеваха",
+        "prefix": "селище міського типу",
+        "fr": "Hlevakha",
+        "cs": "Hlevacha",
+        "ar": "هليفاخا",
+        "hy": "Հլեվահա",
+        "uk": "Глеваха",
+        "pl": "Hłewacha",
+        "tr": "Glevaha",
+        "rmy": "Hlevaha"
+      },
+      "lat": "50.25968",
+      "lon": "30.30591",
+      "id": 337525824,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Казань",
+      "enName": "Kazan",
+      "names": {
+        "tt": "Казан",
+        "de": "Kasan",
+        "hi": "काज़ान",
+        "fi": "Kazan",
+        "ru": "Казань",
+        "pt": "Cazã",
+        "lt": "Kazanė",
+        "lv": "Kazaņa",
+        "fr": "Kazan",
+        "hu": "Kazany",
+        "hy": "Կազան",
+        "oc": "Kazan",
+        "ka": "ყაზანი",
+        "uk": "Казань",
+        "sk": "Kazaň",
+        "sr": "Казањ",
+        "kn": "ಕಾಜಾ಼ನ್",
+        "os": "Хъазан",
+        "chm": "Озаҥ",
+        "it": "Kazan'",
+        "kv": "Казан",
+        "es": "Kazán",
+        "zh": "喀山",
+        "cs": "Kazaň",
+        "ar": "قازان",
+        "cv": "Хусан",
+        "mhr": "Озаҥ",
+        "ja": "カザン",
+        "pl": "Kazań",
+        "da": "Kazan",
+        "he": "קאזאן",
+        "ro": "Kazan",
+        "nl": "Kazan",
+        "ba": "Ҡаҙан",
+        "udm": "Кузон"
+      },
+      "lat": "55.78235",
+      "lon": "49.12423",
+      "id": 27504067,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "улица Ульянова-Ленина",
+          "enName": "Ulyanova-Lenina Street",
+          "names": {
+            "tt": "Ульянов-Ленин урамы",
+            "ru": "улица Ульянова-Ленина"
+          },
+          "lat": "55.78637",
+          "lon": "49.13541",
+          "id": 1292
+        },
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.88035",
+          "lon": "49.15122",
+          "id": 3396
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Лебяжье",
+      "names": {
+        "tt": "Лебяжье"
+      },
+      "lat": "55.32639",
+      "lon": "50.15632",
+      "id": 824088896,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "ru": "улица Ленина"
+          },
+          "lat": "55.32475",
+          "lon": "50.15757",
+          "id": 4071
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Красная Кадка",
+      "names": {
+        "tt": "Кызыл Чапчак"
+      },
+      "lat": "55.41651",
+      "lon": "51.79221",
+      "id": 585272708,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.41732",
+          "lon": "51.79011",
+          "id": 9827,
+          "buildings": [
+            {
+              "name": "60",
+              "lat": "55.41483",
+              "lon": "51.79412"
+            },
+            {
+              "name": "66",
+              "lat": "55.41433",
+              "lon": "51.79492"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "«Чистополь — Нижнекамск» — Красная Кадка — Верхние Челны",
+              "lat": "55.41961",
+              "lon": "51.78045"
+            },
+            {
+              "name": "Пионерская улица",
+              "lat": "55.41997",
+              "lon": "51.78163"
+            },
+            {
+              "name": "Двор тыкрыгы",
+              "lat": "55.41844",
+              "lon": "51.78794"
+            },
+            {
+              "name": "Садовая улица",
+              "lat": "55.41732",
+              "lon": "51.79011"
+            },
+            {
+              "name": "Рамазанова улица",
+              "lat": "55.41596",
+              "lon": "51.79264"
+            },
+            {
+              "name": "Кооперативная улица",
+              "lat": "55.41475",
+              "lon": "51.79464"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Володарка",
+      "enName": "Volodarka",
+      "names": {
+        "de": "Wolodarka",
+        "ru": "Володарка",
+        "uk": "Володарка",
+        "prefix": "селище міського типу",
+        "pl": "Wołodarka"
+      },
+      "lat": "49.52250",
+      "lon": "29.92805",
+      "id": 337556285,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Старое Дрожжаное",
+      "enName": "Staroye Drozhzhanoye",
+      "names": {
+        "tt": "Иске Чүпрәле",
+        "ru": "Старое Дрожжаное",
+        "ja": "スターロエ・ドロジジャノエ"
+      },
+      "lat": "54.72499",
+      "lon": "47.56454",
+      "id": 336525099,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "переулок Ленина",
+          "lat": "54.72970",
+          "lon": "47.55649",
+          "id": 7047
+        },
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.73008",
+          "lon": "47.55971",
+          "id": 7048
+        },
+        {
+          "name": "2-й переулок Ленина",
+          "lat": "54.72928",
+          "lon": "47.55312",
+          "id": 7073
+        },
+        {
+          "name": "3-й переулок Ленина",
+          "lat": "54.72663",
+          "lon": "47.54844",
+          "id": 7074
+        },
+        {
+          "name": "4-й переулок Ленина",
+          "lat": "54.72586",
+          "lon": "47.54608",
+          "id": 7075
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Ворзель",
+      "enName": "Vorzel",
+      "names": {
+        "ru": "Ворзель",
+        "uk": "Ворзель",
+        "prefix": "селище міського типу",
+        "pl": "Vorzel"
+      },
+      "lat": "50.54573",
+      "lon": "30.15629",
+      "id": 337519932,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Джалиль",
+      "names": {
+        "tt": "Җәлил",
+        "ja": "ジャリリ"
+      },
+      "lat": "55.02197",
+      "lon": "52.73899",
+      "id": 371194680,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.02426",
+          "lon": "52.73854",
+          "id": 5778,
+          "buildings": [
+            {
+              "name": "1",
+              "lat": "55.02287",
+              "lon": "52.73862"
+            },
+            {
+              "name": "2",
+              "lat": "55.02377",
+              "lon": "52.74038"
+            },
+            {
+              "name": "3",
+              "lat": "55.02330",
+              "lon": "52.73824"
+            },
+            {
+              "name": "4",
+              "lat": "55.02401",
+              "lon": "52.73993"
+            },
+            {
+              "name": "5",
+              "lat": "55.02362",
+              "lon": "52.73777"
+            },
+            {
+              "name": "6",
+              "lat": "55.02414",
+              "lon": "52.73914"
+            },
+            {
+              "name": "7",
+              "lat": "55.02310",
+              "lon": "52.73725"
+            },
+            {
+              "name": "8",
+              "lat": "55.02468",
+              "lon": "52.73993"
+            },
+            {
+              "name": "9",
+              "lat": "55.02351",
+              "lon": "52.73680"
+            },
+            {
+              "name": "10",
+              "lat": "55.02468",
+              "lon": "52.73867"
+            },
+            {
+              "name": "11",
+              "lat": "55.02405",
+              "lon": "52.73738"
+            },
+            {
+              "name": "12",
+              "lat": "55.02508",
+              "lon": "52.73822"
+            },
+            {
+              "name": "13",
+              "lat": "55.02436",
+              "lon": "52.73691"
+            },
+            {
+              "name": "14",
+              "lat": "55.02560",
+              "lon": "52.73749"
+            },
+            {
+              "name": "15",
+              "lat": "55.02480",
+              "lon": "52.73654"
+            },
+            {
+              "name": "15/2",
+              "lat": "55.02484",
+              "lon": "52.73691"
+            },
+            {
+              "name": "16",
+              "lat": "55.02597",
+              "lon": "52.73830"
+            },
+            {
+              "name": "17",
+              "lat": "55.02458",
+              "lon": "52.73560"
+            },
+            {
+              "name": "18",
+              "lat": "55.02545",
+              "lon": "52.73948"
+            },
+            {
+              "name": "19",
+              "lat": "55.02402",
+              "lon": "52.73622"
+            },
+            {
+              "name": "21",
+              "lat": "55.02366",
+              "lon": "52.73502"
+            },
+            {
+              "name": "23",
+              "lat": "55.02309",
+              "lon": "52.73579"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "улица Ветеранов",
+              "lat": "55.02276",
+              "lon": "52.74023"
+            },
+            {
+              "name": "улица 30 лет Победы",
+              "lat": "55.02614",
+              "lon": "52.73637"
+            },
+            {
+              "name": "улица Ахмадиева",
+              "lat": "55.02262",
+              "lon": "52.73985"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Шугурово",
+      "enName": "Shugurovo",
+      "names": {
+        "tt": "Шөгер",
+        "ja": "シュグロヴォ"
+      },
+      "lat": "54.50877",
+      "lon": "52.13047",
+      "id": 779202585,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.50936",
+          "lon": "52.13549",
+          "id": 6724
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Камышлы-Куль",
+      "names": {
+        "tt": "Камышлы Күл"
+      },
+      "lat": "54.77764",
+      "lon": "53.07253",
+      "id": 587988771,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "enName": "Lenina Street",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.77790",
+          "lon": "53.07214",
+          "id": 4498
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Городок",
+      "names": {
+        "ru": "Городок",
+        "uk": "Городок",
+        "prefix": "селище міського типу",
+        "pl": "Gródek"
+      },
+      "lat": "50.58336",
+      "lon": "29.47816",
+      "id": 6726413,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Біла Церква",
+      "enName": "Bila Tserkva",
+      "names": {
+        "de": "Bila Zerkwa",
+        "be": "Белая Царква",
+        "ru": "Белая Церковь",
+        "prefix": "місто",
+        "lt": "Bila Cerkva",
+        "eo": "Bila-Cerkva",
+        "fr": "Bila Tserkva",
+        "hu": "Bila Cerkva",
+        "et": "Bila Tserkva",
+        "cs": "Bila Cerkva",
+        "uk": "Біла Церква",
+        "pl": "Biała Cerkiew",
+        "ro": "Bila Țerkva",
+        "sr": "Била Церква"
+      },
+      "lat": "49.80382",
+      "lon": "30.11170",
+      "id": 255259998,
+      "type": "CITY",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Старая Майна",
+      "enName": "Staraya Mayna",
+      "names": {
+        "ru": "Старая Майна",
+        "ja": "スターラヤ・マイナ"
+      },
+      "lat": "54.61114",
+      "lon": "48.92349",
+      "id": 11135157981,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Туба",
+      "names": {
+        "tt": "Тоба"
+      },
+      "lat": "55.46819",
+      "lon": "51.74410",
+      "id": 585272714,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.46972",
+          "lon": "51.74447",
+          "id": 10598,
+          "buildings": [
+            {
+              "name": "19",
+              "lat": "55.47337",
+              "lon": "51.74342"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "улица Зая",
+              "lat": "55.46627",
+              "lon": "51.74625"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Дым-Тамак",
+      "names": {
+        "tt": "Димтамак"
+      },
+      "lat": "54.52695",
+      "lon": "53.35881",
+      "id": 566546537,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "lat": "54.52743",
+          "lon": "53.35989",
+          "id": 563
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Исергапово",
+      "names": {
+        "tt": "Исергәп"
+      },
+      "lat": "54.33162",
+      "lon": "53.38497",
+      "id": 750057945,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "lat": "54.33273",
+          "lon": "53.39147",
+          "id": 12219
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Высокая Гора",
+      "names": {
+        "tt": "Биектау",
+        "ja": "ヴイソーカヤ・ゴラー"
+      },
+      "lat": "55.91018",
+      "lon": "49.30720",
+      "id": 704304024,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Дубъязы",
+      "names": {
+        "tt": "Дөбьяз"
+      },
+      "lat": "56.11974",
+      "lon": "49.20088",
+      "id": 698423501,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Ленина",
+          "lat": "56.12148",
+          "lon": "49.19356",
+          "id": 11793
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Большие Яльчики",
+      "names": {
+        "cv": "Аслӑ Елчӗк",
+        "ru": "Большие Яльчики"
+      },
+      "lat": "55.17187",
+      "lon": "48.05579",
+      "id": 733535693,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.16625",
+          "lon": "48.05624",
+          "id": 6274
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Агидель",
+      "enName": "Agidel",
+      "names": {
+        "tt": "Агыйдел",
+        "ru": "Агидель",
+        "ja": "アギデーリ",
+        "ba": "Ағиҙел",
+        "et": "Agidel"
+      },
+      "lat": "55.89928",
+      "lon": "53.93742",
+      "id": 251071107,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Бегишево",
+      "names": {
+        "tt": "Бигеш"
+      },
+      "lat": "55.48721",
+      "lon": "52.03453",
+      "id": 586094745,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "lat": "55.48693",
+          "lon": "52.03743",
+          "id": 9484,
+          "buildings": [
+            {
+              "name": "7А",
+              "lat": "55.48501",
+              "lon": "52.04438"
+            },
+            {
+              "name": "10",
+              "lat": "55.48424",
+              "lon": "52.04204"
+            },
+            {
+              "name": "28",
+              "lat": "55.48666",
+              "lon": "52.04213"
+            },
+            {
+              "name": "90",
+              "lat": "55.49077",
+              "lon": "52.03061"
+            },
+            {
+              "name": "99",
+              "lat": "55.48989",
+              "lon": "52.02859"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "Клубная улица",
+              "lat": "55.48871",
+              "lon": "52.03440"
+            },
+            {
+              "name": "Молодёжная улица",
+              "lat": "55.48749",
+              "lon": "52.03649"
+            },
+            {
+              "name": "улица Гагарина",
+              "lat": "55.49010",
+              "lon": "52.02825"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Большая Атня",
+      "enName": "Bolshaya Atnya",
+      "names": {
+        "tt": "Олы Әтнә",
+        "ru": "Большая Атня",
+        "ja": "ボリシャヤ・アトニャ"
+      },
+      "lat": "56.24947",
+      "lon": "49.45390",
+      "id": 698459097,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Енабердино",
+      "names": {
+        "tt": "Енабердино"
+      },
+      "lat": "55.97809",
+      "lon": "52.32820",
+      "id": 775959290,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "lat": "55.98322",
+          "lon": "52.33127",
+          "id": 12140
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Лубяны",
+      "names": {
+        "tt": "Лубян",
+        "ja": "ルビャヌイ"
+      },
+      "lat": "56.03798",
+      "lon": "51.39806",
+      "id": 797805233,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.03292",
+          "lon": "51.39512",
+          "id": 9489
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Верхняя Ошторма",
+      "names": {
+        "tt": "Югары Оштырма"
+      },
+      "lat": "56.08485",
+      "lon": "50.72480",
+      "id": 797012416,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы"
+          },
+          "lat": "56.08551",
+          "lon": "50.72538",
+          "id": 12081
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Болгар",
+      "enName": "Bolgar",
+      "names": {
+        "tt": "Болгар",
+        "cv": "Пӑлхар",
+        "ru": "Болгар",
+        "ja": "ボルガル"
+      },
+      "lat": "54.97474",
+      "lon": "49.03020",
+      "id": 599924350,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.98034",
+          "lon": "49.03321",
+          "id": 469
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Челно-Вершины",
+      "lat": "54.41588",
+      "lon": "51.08582",
+      "id": 8519359,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Старые Челны",
+      "lat": "55.69735",
+      "lon": "52.30569",
+      "id": 3312654093,
+      "type": "SUBURB",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.69949",
+          "lon": "52.31056",
+          "id": 1335,
+          "intersectedStreets": [
+            {
+              "name": "Полевая улица",
+              "lat": "55.69823",
+              "lon": "52.30951"
+            },
+            {
+              "name": "улица Фрунзе",
+              "names": {
+                "tt": "Фрунзе урамы"
+              },
+              "lat": "55.69823",
+              "lon": "52.30951"
+            },
+            {
+              "name": "улица Карла Маркса",
+              "names": {
+                "tt": "Карл Маркс урамы"
+              },
+              "lat": "55.69994",
+              "lon": "52.31026"
+            },
+            {
+              "name": "Красногвардейская улица",
+              "lat": "55.70028",
+              "lon": "52.31007"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Бородянка",
+      "enName": "Borodianka",
+      "names": {
+        "de": "Borodjanka",
+        "ru": "Бородянка",
+        "uk": "Бородянка",
+        "prefix": "селище міського типу",
+        "pl": "Borodzianka"
+      },
+      "lat": "50.64657",
+      "lon": "29.92558",
+      "id": 295809953,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Красятичі",
+      "enName": "Krasiatychi",
+      "names": {
+        "de": "Krasjatytschi",
+        "ru": "Красятичи",
+        "uk": "Красятичі",
+        "prefix": "селище міського типу",
+        "pl": "Krasiatyczi"
+      },
+      "lat": "51.07829",
+      "lon": "29.63779",
+      "id": 337512030,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Черемушка",
+      "names": {
+        "tt": "Шомыртлы"
+      },
+      "lat": "54.96081",
+      "lon": "50.54108",
+      "id": 1071321497,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы"
+          },
+          "lat": "54.96309",
+          "lon": "50.54505",
+          "id": 11100
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Іванків",
+      "enName": "Ivankiv",
+      "names": {
+        "de": "Iwankiw",
+        "ru": "Иванков",
+        "uk": "Іванків",
+        "prefix": "селище міського типу",
+        "pl": "Iwanków"
+      },
+      "lat": "50.93300",
+      "lon": "29.90463",
+      "id": 337513819,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Березняк",
+      "names": {
+        "tt": "Березняк"
+      },
+      "lat": "56.11196",
+      "lon": "50.79986",
+      "id": 797026502,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.10540",
+          "lon": "50.79771",
+          "id": 2940
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Русский Акташ",
+      "enName": "Russkiy Aktash",
+      "names": {
+        "tt": "Рус Акташы",
+        "ru": "Русский Акташ",
+        "ja": "ルースキー・アクタシ"
+      },
+      "lat": "55.04037",
+      "lon": "52.11699",
+      "id": 337839143,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.04846",
+          "lon": "52.11421",
+          "id": 5590,
+          "intersectedStreets": [
+            {
+              "name": "Советская улица",
+              "lat": "55.04574",
+              "lon": "52.11766"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Большие Аты",
+      "names": {
+        "tt": "Олы Аты"
+      },
+      "lat": "55.39833",
+      "lon": "51.74820",
+      "id": 585272678,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.39935",
+          "lon": "51.74031",
+          "id": 9314,
+          "buildings": [
+            {
+              "name": "26",
+              "lat": "55.40090",
+              "lon": "51.74322"
+            },
+            {
+              "name": "41",
+              "lat": "55.40116",
+              "lon": "51.74269"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "Заинск — Сухарево",
+              "names": {
+                "alt_name": "Нижнекамск — Заинск"
+              },
+              "lat": "55.40197",
+              "lon": "51.74412"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Ставище",
+      "enName": "Stavysche",
+      "names": {
+        "de": "Stawyschtsche",
+        "ru": "Ставище",
+        "uk": "Ставище",
+        "prefix": "селище міського типу",
+        "pl": "Stawyszcze"
+      },
+      "lat": "49.38620",
+      "lon": "30.18316",
+      "id": 337560920,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Тямле Чишма",
+      "names": {
+        "tt": "Тәмле Чишмә"
+      },
+      "lat": "56.07587",
+      "lon": "50.74705",
+      "id": 797012425,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы"
+          },
+          "lat": "56.07592",
+          "lon": "50.74641",
+          "id": 12080
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Новошешминск",
+      "enName": "Novosheshminsk",
+      "names": {
+        "tt": "Яңа Чишмә",
+        "de": "Nowoscheschminsk",
+        "ru": "Новошешминск",
+        "ja": "ノヴォシェシミンスク"
+      },
+      "lat": "55.06165",
+      "lon": "51.22489",
+      "id": 337839146,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.06093",
+          "lon": "51.21983",
+          "id": 7527,
+          "buildings": [
+            {
+              "name": "6",
+              "lat": "55.06695",
+              "lon": "51.24049"
+            },
+            {
+              "name": "19",
+              "lat": "55.06512",
+              "lon": "51.23646"
+            },
+            {
+              "name": "25",
+              "lat": "55.06461",
+              "lon": "51.23500"
+            },
+            {
+              "name": "28",
+              "lat": "55.06566",
+              "lon": "51.23423"
+            },
+            {
+              "name": "39",
+              "lat": "55.06280",
+              "lon": "51.22768"
+            },
+            {
+              "name": "42",
+              "lat": "55.06424",
+              "lon": "51.23133"
+            },
+            {
+              "name": "48",
+              "lat": "55.06362",
+              "lon": "51.22912"
+            },
+            {
+              "name": "49",
+              "lat": "55.06209",
+              "lon": "51.22509"
+            },
+            {
+              "name": "53",
+              "lat": "55.06176",
+              "lon": "51.22466"
+            },
+            {
+              "name": "93",
+              "lat": "55.05897",
+              "lon": "51.21352"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "Чистополь - Новошешминск",
+              "lat": "55.05613",
+              "lon": "51.21116"
+            },
+            {
+              "name": "Полевая улица",
+              "lat": "55.05843",
+              "lon": "51.21255"
+            },
+            {
+              "name": "Лесная улица",
+              "lat": "55.05935",
+              "lon": "51.21395"
+            },
+            {
+              "name": "улица Мира",
+              "lat": "55.05980",
+              "lon": "51.21564"
+            },
+            {
+              "name": "Молодёжная улица",
+              "lat": "55.06026",
+              "lon": "51.21736"
+            },
+            {
+              "name": "улица Дружбы",
+              "lat": "55.06095",
+              "lon": "51.21983"
+            },
+            {
+              "name": "улица Юности",
+              "lat": "55.06158",
+              "lon": "51.22219"
+            },
+            {
+              "name": "Солнечная улица",
+              "lat": "55.06300",
+              "lon": "51.22736"
+            },
+            {
+              "name": "Заливная улица",
+              "lat": "55.06372",
+              "lon": "51.23006"
+            },
+            {
+              "name": "Набережная улица",
+              "lat": "55.06641",
+              "lon": "51.24369"
+            },
+            {
+              "name": "Объездная улица",
+              "lat": "55.06641",
+              "lon": "51.24369"
+            },
+            {
+              "name": "улица Чернышевского",
+              "names": {
+                "tt": "Чернышевский урамы"
+              },
+              "lat": "55.06641",
+              "lon": "51.24369"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Починок Кучук",
+      "names": {
+        "tt": "Пүчинкә-Кучук",
+        "ru": "Починок Кучук",
+        "mhr": "Уял",
+        "chm": "Уял"
+      },
+      "lat": "56.08026",
+      "lon": "50.87539",
+      "id": 797026508,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.07401",
+          "lon": "50.87515",
+          "id": 10463
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Протопоповка",
+      "names": {
+        "tt": "Протопоповка"
+      },
+      "lat": "55.77319",
+      "lon": "48.52170",
+      "id": 752193178,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.77312",
+          "lon": "48.51820",
+          "id": 5053
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Билярск",
+      "names": {
+        "tt": "Биләр"
+      },
+      "lat": "54.98370",
+      "lon": "50.38888",
+      "id": 336524609,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.98858",
+          "lon": "50.37849",
+          "id": 156
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Верхняя Уратьма",
+      "names": {
+        "tt": "Югары Уратма"
+      },
+      "lat": "55.25698",
+      "lon": "51.75228",
+      "id": 2523940608,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.26365",
+          "lon": "51.74078",
+          "id": 479,
+          "buildings": [
+            {
+              "name": "1",
+              "lat": "55.25603",
+              "lon": "51.75028"
+            },
+            {
+              "name": "3",
+              "lat": "55.25630",
+              "lon": "51.75003"
+            },
+            {
+              "name": "12",
+              "lat": "55.25808",
+              "lon": "51.74936"
+            },
+            {
+              "name": "17",
+              "lat": "55.25799",
+              "lon": "51.74861"
+            },
+            {
+              "name": "44",
+              "lat": "55.26177",
+              "lon": "51.74588"
+            },
+            {
+              "name": "55",
+              "lat": "55.26365",
+              "lon": "51.74078",
+              "postcode": "423568"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "Нагорная улица",
+              "lat": "55.25847",
+              "lon": "51.74870"
+            },
+            {
+              "name": "Верхняя Уратьма — Благодатная",
+              "names": {
+                "alt_name": "Новошешминск - Заинск"
+              },
+              "lat": "55.26590",
+              "lon": "51.73762"
+            },
+            {
+              "name": "Заинск — Верхняя Уратьма — Шереметьевка",
+              "lat": "55.26287",
+              "lon": "51.74331"
+            },
+            {
+              "name": "улица Гагарина",
+              "lat": "55.25618",
+              "lon": "51.75144"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Чувашский Чикилдым",
+      "names": {
+        "tt": "Чуаш Чагылдымы"
+      },
+      "lat": "54.77986",
+      "lon": "48.41053",
+      "id": 787139174,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.78001",
+          "lon": "48.41117",
+          "id": 7544
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Актюбинский",
+      "names": {
+        "tt": "Актүбә",
+        "ru": "Актюбинский",
+        "ja": "アクチュビンスキー"
+      },
+      "lat": "54.81319",
+      "lon": "52.80257",
+      "id": 445771973,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.81508",
+          "lon": "52.80750",
+          "id": 4528,
+          "buildings": [
+            {
+              "name": "4",
+              "lat": "54.81439",
+              "lon": "52.80778"
+            },
+            {
+              "name": "6",
+              "lat": "54.81412",
+              "lon": "52.80795"
+            },
+            {
+              "name": "6А",
+              "lat": "54.81413",
+              "lon": "52.80843"
+            },
+            {
+              "name": "6Б",
+              "lat": "54.81412",
+              "lon": "52.80896"
+            },
+            {
+              "name": "7",
+              "lat": "54.81365",
+              "lon": "52.80707"
+            },
+            {
+              "name": "8",
+              "lat": "54.81366",
+              "lon": "52.80806"
+            },
+            {
+              "name": "8А",
+              "lat": "54.81373",
+              "lon": "52.80909"
+            },
+            {
+              "name": "9",
+              "lat": "54.81320",
+              "lon": "52.80622"
+            },
+            {
+              "name": "10",
+              "lat": "54.81326",
+              "lon": "52.80806"
+            },
+            {
+              "name": "12",
+              "lat": "54.81299",
+              "lon": "52.80778"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "Лесная улица",
+              "lat": "54.81508",
+              "lon": "52.80750"
+            },
+            {
+              "name": "улица Губкина",
+              "lat": "54.81237",
+              "lon": "52.80748"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Емелькино",
+      "names": {
+        "tt": "Емелькино",
+        "cv": "Емелккел (Кивӗ Этемшӳ)"
+      },
+      "lat": "54.96785",
+      "lon": "50.55872",
+      "id": 854660709,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы"
+          },
+          "lat": "54.96861",
+          "lon": "50.55687",
+          "id": 11986
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Яльчики",
+      "names": {
+        "de": "Jaltschiki",
+        "cv": "Елчӗк",
+        "ru": "Яльчики",
+        "ja": "ヤリチキ"
+      },
+      "lat": "55.16287",
+      "lon": "48.00334",
+      "id": 850408359,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Азнакаево",
+      "enName": "Aznakayevo",
+      "names": {
+        "tt": "Азнакай",
+        "de": "Asnakajewo",
+        "cv": "Аснакай",
+        "ru": "Азнакаево",
+        "ja": "アズナカエヴォ"
+      },
+      "lat": "54.86296",
+      "lon": "53.07922",
+      "id": 337839164,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "enName": "Lenina Street",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.86173",
+          "lon": "53.08068",
+          "id": 1562
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Карабаш",
+      "enName": "Karabash",
+      "names": {
+        "tt": "Карабаш",
+        "ja": "カラバシ"
+      },
+      "lat": "54.69440",
+      "lon": "52.58739",
+      "id": 2406531050,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.69158",
+          "lon": "52.58031",
+          "id": 6794,
+          "intersectedStreets": [
+            {
+              "name": "улица Аклима Мухаметзянова",
+              "lat": "54.69106",
+              "lon": "52.57904"
+            },
+            {
+              "name": "улица Тукая",
+              "lat": "54.69313",
+              "lon": "52.58501"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Переяслав-Хмельницький",
+      "enName": "Pereiaslav-Khmelnytskyi",
+      "names": {
+        "de": "Perejaslaw-Chmelnyzkyj",
+        "be": "Пераяслаў-Хмяльніцкі",
+        "ru": "Переяслав-Хмельницкий",
+        "uk": "Переяслав-Хмельницький",
+        "prefix": "місто",
+        "eo": "Perejaslav-Ĥmelnickij",
+        "pl": "Perejasław Chmielnicki"
+      },
+      "lat": "50.06440",
+      "lon": "31.44474",
+      "id": 337535557,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Нижнекамск",
+      "enName": "Nizhnekamsk",
+      "names": {
+        "cs": "Nižněkamsk",
+        "tt": "Түбән Кама",
+        "de": "Nischnekamsk",
+        "ru": "Нижнекамск",
+        "uk": "Нижньокамськ",
+        "ja": "ニジネカムスク",
+        "lt": "Nižnekamskas",
+        "fr": "Nijnekamsk",
+        "pl": "Niżniekamsk",
+        "es": "Nizhnekamsk"
+      },
+      "lat": "55.64129",
+      "lon": "51.81603",
+      "id": 553037933,
+      "type": "CITY",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Красная Горка",
+      "names": {
+        "tt": "Красная Горка",
+        "ja": "クラスナヤ・ゴールカ"
+      },
+      "lat": "55.70776",
+      "lon": "51.36656",
+      "id": 798213322,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.70766",
+          "lon": "51.36832",
+          "id": 8924,
+          "buildings": [
+            {
+              "name": "5",
+              "lat": "55.70650",
+              "lon": "51.36649"
+            },
+            {
+              "name": "7",
+              "lat": "55.70674",
+              "lon": "51.36698"
+            },
+            {
+              "name": "9",
+              "lat": "55.70686",
+              "lon": "51.36716"
+            },
+            {
+              "name": "11",
+              "lat": "55.70714",
+              "lon": "51.36769"
+            },
+            {
+              "name": "13",
+              "lat": "55.70747",
+              "lon": "51.36834"
+            },
+            {
+              "name": "13А",
+              "lat": "55.70726",
+              "lon": "51.36795"
+            },
+            {
+              "name": "15",
+              "lat": "55.70882",
+              "lon": "51.37078"
+            },
+            {
+              "name": "17",
+              "lat": "55.70899",
+              "lon": "51.37113"
+            },
+            {
+              "name": "18",
+              "lat": "55.70925",
+              "lon": "51.37061"
+            },
+            {
+              "name": "19",
+              "lat": "55.70929",
+              "lon": "51.37173"
+            },
+            {
+              "name": "20",
+              "lat": "55.70936",
+              "lon": "51.37098"
+            },
+            {
+              "name": "21",
+              "lat": "55.70946",
+              "lon": "51.37207"
+            },
+            {
+              "name": "22",
+              "lat": "55.70946",
+              "lon": "51.37132"
+            },
+            {
+              "name": "23",
+              "lat": "55.70967",
+              "lon": "51.37269"
+            },
+            {
+              "name": "24",
+              "lat": "55.70967",
+              "lon": "51.37177"
+            },
+            {
+              "name": "25",
+              "lat": "55.70979",
+              "lon": "51.37291"
+            },
+            {
+              "name": "26",
+              "lat": "55.70983",
+              "lon": "51.37209"
+            },
+            {
+              "name": "27",
+              "lat": "55.70989",
+              "lon": "51.37321"
+            },
+            {
+              "name": "28",
+              "lat": "55.70996",
+              "lon": "51.37244"
+            },
+            {
+              "name": "29",
+              "lat": "55.71009",
+              "lon": "51.37370"
+            },
+            {
+              "name": "31",
+              "lat": "55.71021",
+              "lon": "51.37400"
+            },
+            {
+              "name": "32",
+              "lat": "55.71049",
+              "lon": "51.37349"
+            },
+            {
+              "name": "33",
+              "lat": "55.71038",
+              "lon": "51.37434"
+            },
+            {
+              "name": "35",
+              "lat": "55.71053",
+              "lon": "51.37456"
+            },
+            {
+              "name": "36",
+              "lat": "55.71061",
+              "lon": "51.37465"
+            },
+            {
+              "name": "37",
+              "lat": "55.71076",
+              "lon": "51.37480"
+            },
+            {
+              "name": "38",
+              "lat": "55.71087",
+              "lon": "51.37497"
+            },
+            {
+              "name": "39",
+              "lat": "55.71096",
+              "lon": "51.37510"
+            },
+            {
+              "name": "40",
+              "lat": "55.71106",
+              "lon": "51.37522"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "переулок Жданова",
+              "lat": "55.70766",
+              "lon": "51.36832"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Карай",
+      "lat": "56.04267",
+      "lon": "48.64798",
+      "id": 660900089,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.04220",
+          "lon": "48.65244",
+          "id": 11363
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Старый Чувашский Адам",
+      "names": {
+        "tt": "Иске Чуаш Әдәмсуы"
+      },
+      "lat": "54.94203",
+      "lon": "50.54104",
+      "id": 854660718,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "lat": "54.94502",
+          "lon": "50.54084",
+          "id": 10677
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Малая Пурга",
+      "enName": "Malaya Purga",
+      "names": {
+        "ja": "マラヤ・プルガ",
+        "udm": "Пичи Пурга"
+      },
+      "lat": "56.54955",
+      "lon": "53.00551",
+      "id": 621090917,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Шемурша",
+      "names": {
+        "de": "Schemurscha",
+        "cv": "Шӑмӑршӑ",
+        "ja": "シェムルシャー"
+      },
+      "lat": "54.88548",
+      "lon": "47.51651",
+      "id": 855192927,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "lat": "54.88690",
+          "lon": "47.52984",
+          "id": 4027
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Агрыз",
+      "enName": "Agryz",
+      "names": {
+        "tt": "Әгерҗе",
+        "ru": "Агрыз",
+        "ja": "アグルイズ"
+      },
+      "lat": "56.52546",
+      "lon": "52.99725",
+      "id": 1773881620,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.51014",
+          "lon": "52.99230",
+          "id": 7268
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Лениногорск",
+      "enName": "Leninogorsk",
+      "names": {
+        "tt": "Лениногорск",
+        "de": "Leninogorsk",
+        "cv": "Ҫӗнӗ Пӗҫмен",
+        "ru": "Лениногорск",
+        "ja": "レニノゴルスク"
+      },
+      "lat": "54.59943",
+      "lon": "52.44691",
+      "id": 273310116,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "проспект Ленина",
+          "lat": "54.60202",
+          "lon": "52.44837",
+          "id": 787
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Кичкеево",
+      "names": {
+        "cv": "Киччӗ",
+        "ru": "Кичкеево"
+      },
+      "lat": "55.46093",
+      "lon": "47.90395",
+      "id": 1297116347,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.45797",
+          "lon": "47.90161",
+          "id": 8973
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Аксубаево",
+      "enName": "Aksubayevo",
+      "names": {
+        "tt": "Аксубай",
+        "de": "Aksubajewo",
+        "cv": "Аксу",
+        "ru": "Аксубаево",
+        "ja": "アクスバエヴォ"
+      },
+      "lat": "54.84635",
+      "lon": "50.80554",
+      "id": 336524899,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "cv": "Ленин",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.84658",
+          "lon": "50.80338",
+          "id": 7551
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Нурлат",
+      "enName": "Nurlat",
+      "names": {
+        "tt": "Нурлат",
+        "de": "Nurlat",
+        "cv": "Нурлат",
+        "ru": "Нурлат",
+        "ja": "ヌルラート"
+      },
+      "lat": "54.42973",
+      "lon": "50.80196",
+      "id": 336525410,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.42106",
+          "lon": "50.82743",
+          "id": 1727
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Пісківка",
+      "enName": "Piskivka",
+      "names": {
+        "ru": "Песковка",
+        "uk": "Пісківка",
+        "prefix": "селище міського типу",
+        "pl": "Piskivka"
+      },
+      "lat": "50.69686",
+      "lon": "29.59311",
+      "id": 337517677,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Верхние Тимерсяны",
+      "enName": "Verkhniye Timersyany",
+      "names": {
+        "cv": "Ирҫел",
+        "ru": "Верхние Тимерсяны"
+      },
+      "lat": "54.54342",
+      "lon": "47.65577",
+      "id": 336525181,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "lat": "54.53880",
+          "lon": "47.65507",
+          "id": 8893
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Октябрьский",
+      "enName": "Oktjabrski",
+      "names": {
+        "tt": "Октябрьски",
+        "de": "Oktjabrski",
+        "ru": "Октябрьский",
+        "ja": "オクチャブリスキー",
+        "lt": "Oktiabrskis",
+        "ba": "Октябрьский",
+        "et": "Oktjabrski"
+      },
+      "lat": "54.48097",
+      "lon": "53.46600",
+      "id": 191901380,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "проспект Ленина",
+          "lat": "54.48212",
+          "lon": "53.46630",
+          "id": 107
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Куйбышевский Затон",
+      "names": {
+        "tt": "Куйбышев Затоны",
+        "ja": "クイビシェフスキー・ザトン"
+      },
+      "lat": "55.15645",
+      "lon": "49.16940",
+      "id": 697269501,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.15673",
+          "lon": "49.17463",
+          "id": 10637
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Буча",
+      "enName": "Bucha",
+      "names": {
+        "de": "Butscha",
+        "ru": "Буча",
+        "prefix": "місто",
+        "uk": "Буча",
+        "fr": "Boutcha",
+        "pl": "Bucza"
+      },
+      "lat": "50.54858",
+      "lon": "30.22071",
+      "id": 312987923,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Имянлебаш",
+      "names": {
+        "tt": "Имәнлебаш",
+        "ru": "Имянлебаш"
+      },
+      "lat": "55.34954",
+      "lon": "51.82646",
+      "id": 585272661,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.34489",
+          "lon": "51.81624",
+          "id": 9304
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Шингальчи",
+      "names": {
+        "tt": "Шәңгәлче"
+      },
+      "lat": "55.51315",
+      "lon": "51.82206",
+      "id": 705268096,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.51207",
+          "lon": "51.81751",
+          "id": 9819,
+          "intersectedStreets": [
+            {
+              "name": "улица Механизаторов",
+              "lat": "55.51141",
+              "lon": "51.81652"
+            },
+            {
+              "name": "улица Гагарина",
+              "lat": "55.51520",
+              "lon": "51.82588"
+            },
+            {
+              "name": "Новая улица",
+              "lat": "55.51673",
+              "lon": "51.82717"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Базарные Матаки",
+      "enName": "Bazarnyye Mataki",
+      "names": {
+        "tt": "Базарлы Матак",
+        "ja": "バザールヌイエ・マターキ"
+      },
+      "lat": "54.90349",
+      "lon": "49.92754",
+      "id": 336524666,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.90183",
+          "lon": "49.92110",
+          "id": 2732
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Борова",
+      "enName": "Borova",
+      "names": {
+        "ru": "Боровая",
+        "uk": "Борова",
+        "prefix": "селище міського типу",
+        "pl": "Borowa"
+      },
+      "lat": "50.17834",
+      "lon": "30.10254",
+      "id": 337527400,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Аксарино",
+      "names": {
+        "tt": "Аксар"
+      },
+      "lat": "55.33954",
+      "lon": "51.91351",
+      "id": 585272665,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.34291",
+          "lon": "51.90720",
+          "id": 514,
+          "buildings": [
+            {
+              "name": "1",
+              "lat": "55.34168",
+              "lon": "51.91549",
+              "postcode": "423501"
+            },
+            {
+              "name": "2",
+              "lat": "55.34207",
+              "lon": "51.91523",
+              "postcode": "423501"
+            },
+            {
+              "name": "29",
+              "lat": "55.34157",
+              "lon": "51.91092",
+              "postcode": "423501"
+            },
+            {
+              "name": "36",
+              "lat": "55.34223",
+              "lon": "51.91001"
+            },
+            {
+              "name": "38",
+              "lat": "55.34237",
+              "lon": "51.90939",
+              "postcode": "423501"
+            },
+            {
+              "name": "40",
+              "lat": "55.34250",
+              "lon": "51.90858",
+              "postcode": "423501"
+            },
+            {
+              "name": "40",
+              "lat": "55.34250",
+              "lon": "51.90858",
+              "postcode": "423501"
+            },
+            {
+              "name": "41",
+              "lat": "55.34228",
+              "lon": "51.90783",
+              "postcode": "423501"
+            },
+            {
+              "name": "42",
+              "lat": "55.34291",
+              "lon": "51.90720",
+              "postcode": "423501"
+            },
+            {
+              "name": "42",
+              "lat": "55.34294",
+              "lon": "51.90720",
+              "postcode": "423501"
+            },
+            {
+              "name": "46",
+              "lat": "55.34318",
+              "lon": "51.90613",
+              "postcode": "423501"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "Молодёжная улица",
+              "lat": "55.34181",
+              "lon": "51.91592"
+            },
+            {
+              "name": "Колхозная улица",
+              "lat": "55.34197",
+              "lon": "51.91119"
+            },
+            {
+              "name": "улица Вахитова",
+              "lat": "55.34261",
+              "lon": "51.90737"
+            },
+            {
+              "name": "улица Тукая",
+              "lat": "55.34261",
+              "lon": "51.90737"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Кармалы",
+      "names": {
+        "tt": "Кармалы"
+      },
+      "lat": "55.30420",
+      "lon": "51.17732",
+      "id": 779172045,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.30562",
+          "lon": "51.18112",
+          "id": 10574
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Нижняя Мактама",
+      "names": {
+        "tt": "Түбəн Мактама",
+        "ja": "ニジニャヤ・マクタマ"
+      },
+      "lat": "54.86247",
+      "lon": "52.42313",
+      "id": 1804405492,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Велика Димерка",
+      "enName": "Velyka Dymerka",
+      "names": {
+        "ru": "Великая Дымерка",
+        "uk": "Велика Димерка",
+        "prefix": "селище міського типу",
+        "pl": "Wielka Dymirka"
+      },
+      "lat": "50.59183",
+      "lon": "30.90109",
+      "id": 337519261,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Вишгород",
+      "enName": "Vyshhorod",
+      "names": {
+        "de": "Wyschhorod",
+        "ru": "Вышгород",
+        "uk": "Вишгород",
+        "prefix": "місто",
+        "fr": "Vychhorod",
+        "pl": "Wyszogród"
+      },
+      "lat": "50.58243",
+      "lon": "30.48513",
+      "id": 289308798,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Старый Токмак",
+      "names": {
+        "tt": "Иске Тәкмәк"
+      },
+      "lat": "55.39208",
+      "lon": "51.98147",
+      "id": 586094637,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "lat": "55.39715",
+          "lon": "51.99192",
+          "id": 2837,
+          "intersectedStreets": [
+            {
+              "name": "улица Речная",
+              "lat": "55.39594",
+              "lon": "51.98954"
+            },
+            {
+              "name": "улица Луговая",
+              "lat": "55.39715",
+              "lon": "51.99192"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Орловка",
+      "enName": "Orlovka",
+      "names": {
+        "ru": "Орловка"
+      },
+      "lat": "55.71491",
+      "lon": "52.37174",
+      "id": 568525857,
+      "type": "SUBURB",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "lat": "55.71641",
+          "lon": "52.38245",
+          "id": 5664,
+          "buildings": [
+            {
+              "name": "9",
+              "lat": "55.71641",
+              "lon": "52.38245"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Мунайка",
+      "names": {
+        "tt": "Монай"
+      },
+      "lat": "55.89279",
+      "lon": "52.26012",
+      "id": 775959237,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.89364",
+          "lon": "52.26132",
+          "id": 4125
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Обухів",
+      "enName": "Obukhiv",
+      "names": {
+        "de": "Obuchiw",
+        "ru": "Обухов",
+        "uk": "Обухів",
+        "prefix": "місто",
+        "fr": "Oboukhiv",
+        "pl": "Obuchów",
+        "hu": "Obukhiv"
+      },
+      "lat": "50.11020",
+      "lon": "30.62675",
+      "id": 337534108,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Черемшан",
+      "enName": "Cheremshan",
+      "names": {
+        "tt": "Чирмешән",
+        "cv": "Ҫарӑмсан",
+        "ru": "Черемшан",
+        "ja": "チェレムシャン"
+      },
+      "lat": "54.66110",
+      "lon": "51.50532",
+      "id": 337839206,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Ядыгерь",
+      "names": {
+        "tt": "Ядегәр"
+      },
+      "lat": "56.23022",
+      "lon": "50.50930",
+      "id": 796777404,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.22996",
+          "lon": "50.51228",
+          "id": 11226
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Українка",
+      "enName": "Ukrainka",
+      "names": {
+        "ru": "Украинка",
+        "uk": "Українка",
+        "prefix": "місто",
+        "pl": "Ukrajinka"
+      },
+      "lat": "50.15372",
+      "lon": "30.74206",
+      "id": 337528474,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Подгорный Дрюш",
+      "names": {
+        "tt": "Таулы Дөреш"
+      },
+      "lat": "55.50122",
+      "lon": "52.55138",
+      "id": 594677179,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "ru": "улица Ленина"
+          },
+          "lat": "55.50009",
+          "lon": "52.55241",
+          "id": 9785
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Калинівка",
+      "enName": "Kalynivka",
+      "names": {
+        "kk": "Kalyni'vka",
+        "de": "Kalyniwka (Wassylkiw)",
+        "hy": "Կալյնիվկա",
+        "ru": "Калиновка",
+        "vi": "Kalynivka",
+        "prefix": "селище міського типу",
+        "uk": "Калинівка",
+        "ja": "カルィーニウカ",
+        "fr": "Kalynivka",
+        "pl": "Kalinówka",
+        "ro": "Kalînivka, Vasîlkiv",
+        "tr": "Kalınivka"
+      },
+      "lat": "50.22573",
+      "lon": "30.22618",
+      "id": 337526421,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Фастів",
+      "enName": "Fastiv",
+      "names": {
+        "de": "Fastiw",
+        "ru": "Фастов",
+        "uk": "Фастів",
+        "prefix": "місто",
+        "eo": "Fastiv",
+        "fr": "Fastiv",
+        "pl": "Fastów",
+        "hu": "Fastiv"
+      },
+      "lat": "50.07993",
+      "lon": "29.91629",
+      "id": 337535126,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Тамаево",
+      "names": {
+        "tt": "Тәмәй"
+      },
+      "lat": "56.35173",
+      "lon": "50.83694",
+      "id": 797083146,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.35513",
+          "lon": "50.83874",
+          "id": 10747
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Уруссу",
+      "enName": "Urussu",
+      "names": {
+        "tt": "Урыссу",
+        "ru": "Уруссу",
+        "ja": "ウルスー"
+      },
+      "lat": "54.59933",
+      "lon": "53.46632",
+      "id": 337839216,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "enName": "Lenina Street",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.59502",
+          "lon": "53.46949",
+          "id": 2587
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Туембаш",
+      "names": {
+        "tt": "Туембаш"
+      },
+      "lat": "56.26669",
+      "lon": "50.86387",
+      "id": 797083152,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.26702",
+          "lon": "50.86209",
+          "id": 11179
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Елабуга",
+      "enName": "Elabuga",
+      "names": {
+        "tt": "Алабуга",
+        "ar": "ييلابوغا",
+        "de": "Jelabuga",
+        "cv": "Алапӳ",
+        "ru": "Елабуга",
+        "uk": "Єлабуга",
+        "ja": "エラブガ",
+        "tt-lat": "Alabuğa",
+        "fa": "یلابوگا",
+        "tr": "Alabuga",
+        "ba": "Алабуға"
+      },
+      "lat": "55.75771",
+      "lon": "52.05400",
+      "id": 153568874,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Ютаза",
+      "enName": "Yutaza",
+      "names": {
+        "tt": "Ютазы",
+        "ru": "Ютаза"
+      },
+      "lat": "54.58879",
+      "lon": "53.27073",
+      "id": 337839220,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "enName": "Lenina Street",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.58895",
+          "lon": "53.26753",
+          "id": 2688
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Петровский Завод",
+      "enName": "Petrovsky Zavod",
+      "names": {
+        "tt": "Петровский Завод"
+      },
+      "lat": "55.31827",
+      "lon": "52.49617",
+      "id": 582997231,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.31683",
+          "lon": "52.49512",
+          "id": 10260,
+          "buildings": [
+            {
+              "name": "1",
+              "lat": "55.31623",
+              "lon": "52.49484",
+              "postcode": "423364"
+            },
+            {
+              "name": "2",
+              "lat": "55.31657",
+              "lon": "52.49416",
+              "postcode": "423364"
+            },
+            {
+              "name": "3",
+              "lat": "55.31661",
+              "lon": "52.49512",
+              "postcode": "423364"
+            },
+            {
+              "name": "4",
+              "lat": "55.31719",
+              "lon": "52.49471",
+              "postcode": "423364"
+            },
+            {
+              "name": "5",
+              "lat": "55.31701",
+              "lon": "52.49544",
+              "postcode": "423364"
+            },
+            {
+              "name": "6",
+              "lat": "55.31691",
+              "lon": "52.49416",
+              "postcode": "423364"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "Заводская улица",
+              "lat": "55.31604",
+              "lon": "52.49452"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Макарів",
+      "enName": "Makariv",
+      "names": {
+        "de": "Makariw",
+        "ru": "Макаров",
+        "uk": "Макарів",
+        "prefix": "селище міського типу",
+        "pl": "Makarow"
+      },
+      "lat": "50.46399",
+      "lon": "29.80690",
+      "id": 1494035871,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Комаровка",
+      "names": {
+        "tt": "Комаровка"
+      },
+      "lat": "55.89661",
+      "lon": "50.26097",
+      "id": 801827934,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.89504",
+          "lon": "50.25857",
+          "id": 10199
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Кукмор",
+      "enName": "Kukmor",
+      "names": {
+        "tt": "Кукмара",
+        "de": "Kukmor",
+        "ru": "Кукмор",
+        "ja": "クークモル"
+      },
+      "lat": "56.18653",
+      "lon": "50.89721",
+      "id": 409487025,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.18256",
+          "lon": "50.90891",
+          "id": 748
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Київ",
+      "enName": "Kyiv",
+      "names": {
+        "hi": "कीव",
+        "pt": "Kiev",
+        "prefix": "місто",
+        "hr": "Kijev",
+        "ht": "Kyèv",
+        "hu": "Kijev",
+        "lmo": "Kiev",
+        "xmf": "კიევი",
+        "yi": "קיעוו",
+        "hy": "Կիև",
+        "bar": "Kiew",
+        "nah": "Kiev",
+        "yo": "Kiev",
+        "pms": "Kijv",
+        "ia": "Kyiv",
+        "nan": "Kyyiv",
+        "id": "Kyiv",
+        "ie": "Kyiv",
+        "sco": "Kiev",
+        "scn": "Kiev",
+        "ext": "Kyiv",
+        "ab": "Кыив",
+        "qu": "Kiyiw",
+        "af": "Kiëf",
+        "pnb": "کیف",
+        "io": "Kyiv",
+        "frr": "Kyiv",
+        "is": "Kænugarður",
+        "it": "Kyiv",
+        "am": "ኪየቭ",
+        "an": "Kiev",
+        "zh": "基輔",
+        "ar": "كييف",
+        "jbo": "kiev",
+        "mhr": "Киев",
+        "ja": "キエフ",
+        "az": "Kiyev",
+        "zu": "IKiyevi",
+        "ro": "Kiev",
+        "ba": "Киев",
+        "be": "Кіеў",
+        "ru": "Киев",
+        "bg": "Киев",
+        "bi": "Kyiv",
+        "myv": "Киев ош",
+        "bn": "কিয়েভ",
+        "jv": "Kyiv",
+        "bo": "ཀིབ།",
+        "br": "Kyiv",
+        "sc": "Kiev",
+        "bs": "Kijev",
+        "se": "Kiova",
+        "sh": "Kijev",
+        "ka": "კიევი",
+        "sk": "Kyjev",
+        "roa-rup": "Kiev",
+        "sl": "Kijev",
+        "ca": "Kyiv",
+        "sq": "Kievi",
+        "sr": "Кијев",
+        "kk": "Киев",
+        "kl": "Kyiv",
+        "kn": "ಕೀವ್",
+        "sv": "Kiev",
+        "ko": "키예프",
+        "mrj": "Киев",
+        "sw": "Kiev",
+        "arz": "كييف",
+        "ku": "Kîev",
+        "kv": "Киев",
+        "ta": "கீவ்",
+        "ky": "Киев",
+        "cs": "Kyjev",
+        "te": "క్యివ్",
+        "cu": "Кꙑѥвъ",
+        "cv": "Кийӳ",
+        "tg": "Киев",
+        "th": "เคียฟ",
+        "la": "Kiovia",
+        "cy": "Kyiv",
+        "lb": "Kiew",
+        "tl": "Kiev",
+        "nds": "Kiew",
+        "da": "Kyiv",
+        "tr": "Kiev",
+        "tt": "Киев",
+        "be-tarask": "Кіеў",
+        "de": "Kiew",
+        "ln": "Kyjiw",
+        "ast": "Kiev",
+        "rue": "Київ",
+        "tw": "Kiev",
+        "hif": "Kiev",
+        "koi": "Киев",
+        "lt": "Kijevas",
+        "lv": "Kijeva",
+        "lij": "Kiev",
+        "lad": "Kyiv",
+        "ug": "كىيېۋ",
+        "roa-tara": "Kiev",
+        "vec": "Kiev",
+        "uk": "Київ",
+        "fiu-vro": "Kiiova",
+        "mi": "Kieu",
+        "ur": "کیف",
+        "mk": "Киев",
+        "pap": "Kiev",
+        "ml": "കീവ്",
+        "rmy": "Kiev",
+        "vep": "Kijev",
+        "mn": "Киев",
+        "mr": "क्यीव",
+        "uz": "Kiyev",
+        "ms": "Kiev",
+        "el": "Κίεβο",
+        "mt": "Kjiv",
+        "tzl": "Kíiv",
+        "als": "Kiew",
+        "eo": "Kievo",
+        "my": "ကီးယက်မြို့",
+        "ilo": "Kyiv",
+        "es": "Kyiv",
+        "mdf": "Киев",
+        "et": "Kiiev",
+        "eu": "Kyiv",
+        "dsb": "Kijew",
+        "vi": "Kiev",
+        "bat-smg": "Kijevs",
+        "hsb": "Kijew",
+        "vo": "Küyiv",
+        "fa": "کی‌یف",
+        "nl": "Kiev",
+        "udm": "Киев",
+        "nn": "Kiev",
+        "no": "Kiev",
+        "fi": "Kiova",
+        "yue": "基輔",
+        "fo": "Kyiv",
+        "fr": "Kyiv",
+        "gag": "Kyiv",
+        "fy": "Kiev",
+        "nov": "Kiyev",
+        "oc": "Kyiiv",
+        "crh": "Kiyev",
+        "wo": "Kiyew",
+        "ga": "Cív",
+        "ang": "Cænugeard",
+        "sah": "Киев",
+        "bxr": "Киев",
+        "gd": "Kyiv",
+        "os": "Киев",
+        "szl": "Kijůw",
+        "gl": "Kiev",
+        "war": "Kiev",
+        "bpy": "কিয়েভ",
+        "gv": "Kyiv",
+        "pa": "ਕੀਵ",
+        "csb": "Kyiv",
+        "cbk-zam": "Kyiv",
+        "ckb": "کیێڤ",
+        "pl": "Kijów",
+        "he": "קייב"
+      },
+      "lat": "50.45011",
+      "lon": "30.52405",
+      "id": 26150422,
+      "type": "CITY",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Тетіїв",
+      "enName": "Tetiiv",
+      "names": {
+        "de": "Tetijiw",
+        "ru": "Тетиев",
+        "uk": "Тетіїв",
+        "prefix": "місто",
+        "pl": "Tetyjów"
+      },
+      "lat": "49.36862",
+      "lon": "29.67712",
+      "id": 337561478,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Тетюши",
+      "enName": "Tetyushi",
+      "names": {
+        "tt": "Тәтеш",
+        "de": "Tetjuschi",
+        "cv": "Теччӗ",
+        "ru": "Тетюши",
+        "ja": "テチューシ"
+      },
+      "lat": "54.93431",
+      "lon": "48.83168",
+      "id": 336524694,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.93456",
+          "lon": "48.83687",
+          "id": 261
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Лаишево",
+      "enName": "Laishevo",
+      "names": {
+        "tt": "Лаеш",
+        "de": "Laischewo",
+        "cv": "Лаиш",
+        "ru": "Лаишево",
+        "ja": "ライシェヴォ",
+        "lt": "Laiševas"
+      },
+      "lat": "55.40434",
+      "lon": "49.54684",
+      "id": 336524182,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.39917",
+          "lon": "49.55297",
+          "id": 8277
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Кошкино",
+      "names": {
+        "tt": "Күкшел"
+      },
+      "lat": "56.33042",
+      "lon": "50.80158",
+      "id": 797079071,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.33087",
+          "lon": "50.80482",
+          "id": 11218
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Малая Бугульма",
+      "names": {
+        "tt": "Кече Бөгелмә"
+      },
+      "lat": "54.50524",
+      "lon": "52.87763",
+      "id": 445814288,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "lat": "54.51180",
+          "lon": "52.85812",
+          "id": 4576
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Ржищів",
+      "enName": "Rzhyschiv",
+      "names": {
+        "de": "Rschyschtschiw",
+        "ru": "Ржищев",
+        "uk": "Ржищів",
+        "prefix": "місто",
+        "pl": "Rzyszczów"
+      },
+      "lat": "49.96822",
+      "lon": "31.04118",
+      "id": 337538749,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Мамашир",
+      "names": {
+        "tt": "Мәмәшир"
+      },
+      "lat": "56.36733",
+      "lon": "50.84810",
+      "id": 797079080,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.36595",
+          "lon": "50.85237",
+          "id": 10619
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Миронівка",
+      "enName": "Myronivka",
+      "names": {
+        "de": "Myroniwka",
+        "ru": "Мироновка",
+        "uk": "Миронівка",
+        "prefix": "місто",
+        "pl": "Mironówka"
+      },
+      "lat": "49.65834",
+      "lon": "30.98250",
+      "id": 5119801550,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Березань",
+      "enName": "Berezan",
+      "names": {
+        "de": "Beresan",
+        "ru": "Березань",
+        "uk": "Березань",
+        "prefix": "місто",
+        "lt": "Berezanė",
+        "pl": "Berezań"
+      },
+      "lat": "50.31327",
+      "lon": "31.46892",
+      "id": 337524664,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Нижние Вязовые",
+      "enName": "Nizhniye Vyazovye",
+      "names": {
+        "tt": "Карамалы Тау",
+        "ja": "ニジニエ・ヴャゾヴイエ"
+      },
+      "lat": "55.79963",
+      "lon": "48.52238",
+      "id": 752193024,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.81148",
+          "lon": "48.51114",
+          "id": 5094
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Осиново",
+      "names": {
+        "tt": "Осиново"
+      },
+      "lat": "55.87730",
+      "lon": "48.89103",
+      "id": 722796219,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.87683",
+          "lon": "48.89710",
+          "id": 3975
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Альметьевск",
+      "enName": "Almetyevsk",
+      "names": {
+        "tt": "Әлмәт",
+        "de": "Almetjewsk",
+        "be": "Альмецьеўск",
+        "ru": "Альметьевск",
+        "ko": "알메티옙스크",
+        "lt": "Almetjevskas",
+        "it": "Al'met'evsk",
+        "fr": "Almetievsk",
+        "es": "Almétievsk",
+        "zh": "阿尔梅季耶夫斯克",
+        "ar": "ألميتيفسك",
+        "cv": "Элмет",
+        "uk": "Альметьєвськ",
+        "hsb": "Almetjewsk",
+        "ja": "アリメチエフスク",
+        "az": "Əlmət",
+        "fa": "آلماتیفسک",
+        "pl": "Almietjewsk",
+        "ro": "Almetievsk",
+        "ba": "Әлмәт"
+      },
+      "lat": "54.89965",
+      "lon": "52.30149",
+      "id": 2173235770,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.89948",
+          "lon": "52.27471",
+          "id": 70,
+          "buildings": [
+            {
+              "name": "1",
+              "lat": "54.90372",
+              "lon": "52.31715"
+            },
+            {
+              "name": "1А",
+              "lat": "54.90288",
+              "lon": "52.31537"
+            },
+            {
+              "name": "1А/1",
+              "lat": "54.90344",
+              "lon": "52.31443"
+            },
+            {
+              "name": "1Б",
+              "lat": "54.90368",
+              "lon": "52.31606"
+            },
+            {
+              "name": "1В",
+              "lat": "54.90384",
+              "lon": "52.31443"
+            },
+            {
+              "name": "2",
+              "lat": "54.90476",
+              "lon": "52.31224"
+            },
+            {
+              "name": "2А",
+              "lat": "54.90430",
+              "lon": "52.31679"
+            },
+            {
+              "name": "2А",
+              "lat": "54.90432",
+              "lon": "52.31745"
+            },
+            {
+              "name": "2А/1",
+              "lat": "54.90467",
+              "lon": "52.31466"
+            },
+            {
+              "name": "3",
+              "lat": "54.90367",
+              "lon": "52.31243"
+            },
+            {
+              "name": "4",
+              "lat": "54.90456",
+              "lon": "52.31011"
+            },
+            {
+              "name": "5",
+              "lat": "54.90392",
+              "lon": "52.31194"
+            },
+            {
+              "name": "6",
+              "lat": "54.90477",
+              "lon": "52.30921"
+            },
+            {
+              "name": "7",
+              "lat": "54.90370",
+              "lon": "52.31125"
+            },
+            {
+              "name": "8",
+              "lat": "54.90450",
+              "lon": "52.30904"
+            },
+            {
+              "name": "10",
+              "lat": "54.90507",
+              "lon": "52.30741"
+            },
+            {
+              "name": "11",
+              "lat": "54.90395",
+              "lon": "52.31001"
+            },
+            {
+              "name": "12",
+              "lat": "54.90473",
+              "lon": "52.30795"
+            },
+            {
+              "name": "13",
+              "lat": "54.90404",
+              "lon": "52.30872"
+            },
+            {
+              "name": "14",
+              "lat": "54.90505",
+              "lon": "52.30778"
+            },
+            {
+              "name": "15",
+              "lat": "54.90375",
+              "lon": "52.30795"
+            },
+            {
+              "name": "15Б",
+              "lat": "54.90367",
+              "lon": "52.30904"
+            },
+            {
+              "name": "16",
+              "lat": "54.90457",
+              "lon": "52.30679"
+            },
+            {
+              "name": "17",
+              "lat": "54.90412",
+              "lon": "52.30726"
+            },
+            {
+              "name": "18",
+              "lat": "54.90508",
+              "lon": "52.30666"
+            },
+            {
+              "name": "19",
+              "lat": "54.90413",
+              "lon": "52.30606"
+            },
+            {
+              "name": "20",
+              "lat": "54.90467",
+              "lon": "52.30544"
+            },
+            {
+              "name": "21",
+              "lat": "54.90366",
+              "lon": "52.30445"
+            },
+            {
+              "name": "21А",
+              "lat": "54.90400",
+              "lon": "52.30544"
+            },
+            {
+              "name": "22",
+              "lat": "54.90456",
+              "lon": "52.30438"
+            },
+            {
+              "name": "23",
+              "lat": "54.90340",
+              "lon": "52.30288"
+            },
+            {
+              "name": "23",
+              "lat": "54.90338",
+              "lon": "52.30314"
+            },
+            {
+              "name": "24",
+              "lat": "54.90416",
+              "lon": "52.30342"
+            },
+            {
+              "name": "25",
+              "lat": "54.90307",
+              "lon": "52.30215"
+            },
+            {
+              "name": "26",
+              "lat": "54.90384",
+              "lon": "52.30263"
+            },
+            {
+              "name": "27",
+              "lat": "54.90276",
+              "lon": "52.30136"
+            },
+            {
+              "name": "28",
+              "lat": "54.90350",
+              "lon": "52.30179"
+            },
+            {
+              "name": "29",
+              "lat": "54.90238",
+              "lon": "52.30048"
+            },
+            {
+              "name": "30",
+              "lat": "54.90354",
+              "lon": "52.30104"
+            },
+            {
+              "name": "30А",
+              "lat": "54.90408",
+              "lon": "52.30106"
+            },
+            {
+              "name": "31",
+              "lat": "54.90205",
+              "lon": "52.29984"
+            },
+            {
+              "name": "32",
+              "lat": "54.90310",
+              "lon": "52.30080"
+            },
+            {
+              "name": "32А",
+              "lat": "54.90376",
+              "lon": "52.30022"
+            },
+            {
+              "name": "33",
+              "lat": "54.90183",
+              "lon": "52.29928"
+            },
+            {
+              "name": "33А",
+              "lat": "54.90162",
+              "lon": "52.29960"
+            },
+            {
+              "name": "33Б",
+              "lat": "54.90205",
+              "lon": "52.29947"
+            },
+            {
+              "name": "34",
+              "lat": "54.90282",
+              "lon": "52.29992"
+            },
+            {
+              "name": "35",
+              "lat": "54.90134",
+              "lon": "52.29872"
+            },
+            {
+              "name": "36",
+              "lat": "54.90247",
+              "lon": "52.29908"
+            },
+            {
+              "name": "37",
+              "names": {
+                "tt": "Әлмәт татар дәүләт драма театры",
+                "hy": "Ալմետևսկի թաթարական պետական դրամատիկական թատրոն"
+              },
+              "lat": "54.90051",
+              "lon": "52.29799"
+            },
+            {
+              "name": "38",
+              "lat": "54.90265",
+              "lon": "52.29818"
+            },
+            {
+              "name": "39",
+              "lat": "54.90046",
+              "lon": "52.29627"
+            },
+            {
+              "name": "40",
+              "lat": "54.90213",
+              "lon": "52.29829"
+            },
+            {
+              "name": "41",
+              "lat": "54.90033",
+              "lon": "52.29539"
+            },
+            {
+              "name": "41А",
+              "lat": "54.89985",
+              "lon": "52.29634"
+            },
+            {
+              "name": "42",
+              "lat": "54.90188",
+              "lon": "52.29720"
+            },
+            {
+              "name": "42А",
+              "lat": "54.90173",
+              "lon": "52.29760"
+            },
+            {
+              "name": "43",
+              "lat": "54.90009",
+              "lon": "52.29477"
+            },
+            {
+              "name": "44",
+              "lat": "54.90246",
+              "lon": "52.29733"
+            },
+            {
+              "name": "46",
+              "lat": "54.90134",
+              "lon": "52.29619"
+            },
+            {
+              "name": "47",
+              "lat": "54.89972",
+              "lon": "52.29363"
+            },
+            {
+              "name": "48",
+              "lat": "54.90099",
+              "lon": "52.29529"
+            },
+            {
+              "name": "49",
+              "lat": "54.89932",
+              "lon": "52.29342"
+            },
+            {
+              "name": "49А",
+              "lat": "54.89929",
+              "lon": "52.29290"
+            },
+            {
+              "name": "50",
+              "lat": "54.90071",
+              "lon": "52.29411"
+            },
+            {
+              "name": "51",
+              "lat": "54.89903",
+              "lon": "52.29271"
+            },
+            {
+              "name": "51А",
+              "lat": "54.89869",
+              "lon": "52.29363"
+            },
+            {
+              "name": "52",
+              "lat": "54.90170",
+              "lon": "52.29443"
+            },
+            {
+              "name": "53",
+              "lat": "54.89912",
+              "lon": "52.29209"
+            },
+            {
+              "name": "55",
+              "lat": "54.89876",
+              "lon": "52.29117"
+            },
+            {
+              "name": "55А",
+              "lat": "54.89859",
+              "lon": "52.29067"
+            },
+            {
+              "name": "56",
+              "lat": "54.90022",
+              "lon": "52.29327"
+            },
+            {
+              "name": "57",
+              "lat": "54.89858",
+              "lon": "52.29258"
+            },
+            {
+              "name": "58",
+              "lat": "54.90020",
+              "lon": "52.29260"
+            },
+            {
+              "name": "59",
+              "lat": "54.89828",
+              "lon": "52.29295"
+            },
+            {
+              "name": "60",
+              "lat": "54.89986",
+              "lon": "52.29198",
+              "postcode": "423450"
+            },
+            {
+              "name": "61",
+              "lat": "54.89797",
+              "lon": "52.29331"
+            },
+            {
+              "name": "62",
+              "lat": "54.89964",
+              "lon": "52.29119"
+            },
+            {
+              "name": "63",
+              "lat": "54.89765",
+              "lon": "52.29366"
+            },
+            {
+              "name": "64",
+              "lat": "54.90030",
+              "lon": "52.29095"
+            },
+            {
+              "name": "65",
+              "lat": "54.89740",
+              "lon": "52.29462"
+            },
+            {
+              "name": "66",
+              "lat": "54.90013",
+              "lon": "52.29016"
+            },
+            {
+              "name": "67",
+              "lat": "54.89718",
+              "lon": "52.29391"
+            },
+            {
+              "name": "68",
+              "lat": "54.89924",
+              "lon": "52.29072"
+            },
+            {
+              "name": "68А",
+              "lat": "54.89914",
+              "lon": "52.29082"
+            },
+            {
+              "name": "69А",
+              "lat": "54.89788",
+              "lon": "52.28943"
+            },
+            {
+              "name": "70",
+              "lat": "54.89946",
+              "lon": "52.28988"
+            },
+            {
+              "name": "70А",
+              "lat": "54.89999",
+              "lon": "52.28924"
+            },
+            {
+              "name": "71",
+              "lat": "54.89739",
+              "lon": "52.28887"
+            },
+            {
+              "name": "72",
+              "lat": "54.89900",
+              "lon": "52.28975"
+            },
+            {
+              "name": "72А",
+              "lat": "54.89877",
+              "lon": "52.28960"
+            },
+            {
+              "name": "73",
+              "lat": "54.89677",
+              "lon": "52.28700"
+            },
+            {
+              "name": "74",
+              "lat": "54.89909",
+              "lon": "52.28891"
+            },
+            {
+              "name": "74А",
+              "lat": "54.89965",
+              "lon": "52.28836"
+            },
+            {
+              "name": "75",
+              "lat": "54.89716",
+              "lon": "52.28722"
+            },
+            {
+              "name": "75",
+              "lat": "54.89719",
+              "lon": "52.28651"
+            },
+            {
+              "name": "75",
+              "lat": "54.89733",
+              "lon": "52.28683"
+            },
+            {
+              "name": "75",
+              "lat": "54.89733",
+              "lon": "52.28632"
+            },
+            {
+              "name": "75",
+              "lat": "54.89740",
+              "lon": "52.28673"
+            },
+            {
+              "name": "75",
+              "lat": "54.89767",
+              "lon": "52.28683"
+            },
+            {
+              "name": "76",
+              "lat": "54.89856",
+              "lon": "52.28900"
+            },
+            {
+              "name": "77",
+              "lat": "54.89772",
+              "lon": "52.28589"
+            },
+            {
+              "name": "78",
+              "lat": "54.89911",
+              "lon": "52.28795"
+            },
+            {
+              "name": "80",
+              "lat": "54.89865",
+              "lon": "52.28745"
+            },
+            {
+              "name": "82",
+              "lat": "54.89834",
+              "lon": "52.28795"
+            },
+            {
+              "name": "82А",
+              "lat": "54.89842",
+              "lon": "52.28696"
+            },
+            {
+              "name": "83",
+              "lat": "54.89712",
+              "lon": "52.28164"
+            },
+            {
+              "name": "85",
+              "lat": "54.89790",
+              "lon": "52.28112"
+            },
+            {
+              "name": "85",
+              "lat": "54.89777",
+              "lon": "52.28115"
+            },
+            {
+              "name": "86",
+              "lat": "54.89866",
+              "lon": "52.28649"
+            },
+            {
+              "name": "87",
+              "lat": "54.89693",
+              "lon": "52.28061"
+            },
+            {
+              "name": "88",
+              "lat": "54.89838",
+              "lon": "52.28608"
+            },
+            {
+              "name": "89",
+              "lat": "54.89756",
+              "lon": "52.27986"
+            },
+            {
+              "name": "90",
+              "lat": "54.89865",
+              "lon": "52.28565"
+            },
+            {
+              "name": "91",
+              "lat": "54.89700",
+              "lon": "52.27898"
+            },
+            {
+              "name": "92",
+              "lat": "54.89923",
+              "lon": "52.28597"
+            },
+            {
+              "name": "93",
+              "lat": "54.89785",
+              "lon": "52.27864"
+            },
+            {
+              "name": "94",
+              "lat": "54.89999",
+              "lon": "52.28123"
+            },
+            {
+              "name": "95",
+              "lat": "54.89703",
+              "lon": "52.27812"
+            },
+            {
+              "name": "97",
+              "lat": "54.89764",
+              "lon": "52.27737"
+            },
+            {
+              "name": "98",
+              "lat": "54.89920",
+              "lon": "52.27746"
+            },
+            {
+              "name": "99",
+              "lat": "54.89708",
+              "lon": "52.27651"
+            },
+            {
+              "name": "100",
+              "lat": "54.89948",
+              "lon": "52.27471"
+            },
+            {
+              "name": "100",
+              "lat": "54.89941",
+              "lon": "52.27391"
+            },
+            {
+              "name": "101",
+              "lat": "54.89790",
+              "lon": "52.27615"
+            },
+            {
+              "name": "103",
+              "lat": "54.89713",
+              "lon": "52.27565"
+            },
+            {
+              "name": "104А",
+              "lat": "54.90096",
+              "lon": "52.26671"
+            },
+            {
+              "name": "104Б",
+              "lat": "54.90123",
+              "lon": "52.26572"
+            },
+            {
+              "name": "104Б",
+              "lat": "54.90134",
+              "lon": "52.26632"
+            },
+            {
+              "name": "105",
+              "lat": "54.89772",
+              "lon": "52.27490"
+            },
+            {
+              "name": "106",
+              "lat": "54.90203",
+              "lon": "52.26681"
+            },
+            {
+              "name": "107",
+              "lat": "54.89718",
+              "lon": "52.27404"
+            },
+            {
+              "name": "108",
+              "lat": "54.90261",
+              "lon": "52.26694"
+            },
+            {
+              "name": "109",
+              "lat": "54.89804",
+              "lon": "52.27370"
+            },
+            {
+              "name": "110",
+              "lat": "54.90314",
+              "lon": "52.26709"
+            },
+            {
+              "name": "110А",
+              "lat": "54.90367",
+              "lon": "52.26735"
+            },
+            {
+              "name": "111",
+              "lat": "54.89718",
+              "lon": "52.27316"
+            },
+            {
+              "name": "112",
+              "lat": "54.90187",
+              "lon": "52.26507"
+            },
+            {
+              "name": "112",
+              "lat": "54.90208",
+              "lon": "52.26417"
+            },
+            {
+              "name": "112А",
+              "lat": "54.90164",
+              "lon": "52.26495"
+            },
+            {
+              "name": "113",
+              "lat": "54.89780",
+              "lon": "52.27243"
+            },
+            {
+              "name": "113А",
+              "lat": "54.89817",
+              "lon": "52.27250"
+            },
+            {
+              "name": "114А",
+              "lat": "54.90235",
+              "lon": "52.26383"
+            },
+            {
+              "name": "114Б",
+              "lat": "54.90261",
+              "lon": "52.26357"
+            },
+            {
+              "name": "115",
+              "lat": "54.89722",
+              "lon": "52.27153"
+            },
+            {
+              "name": "115А",
+              "lat": "54.89707",
+              "lon": "52.27235"
+            },
+            {
+              "name": "116",
+              "lat": "54.90312",
+              "lon": "52.26297"
+            },
+            {
+              "name": "117",
+              "lat": "54.89809",
+              "lon": "52.27119"
+            },
+            {
+              "name": "118",
+              "lat": "54.90373",
+              "lon": "52.26385"
+            },
+            {
+              "name": "119",
+              "lat": "54.89750",
+              "lon": "52.27067"
+            },
+            {
+              "name": "119А",
+              "lat": "54.89767",
+              "lon": "52.27046"
+            },
+            {
+              "name": "120",
+              "lat": "54.90373",
+              "lon": "52.26222"
+            },
+            {
+              "name": "121",
+              "lat": "54.90097",
+              "lon": "52.26434"
+            },
+            {
+              "name": "121А",
+              "lat": "54.89927",
+              "lon": "52.26720"
+            },
+            {
+              "name": "121Б",
+              "lat": "54.89908",
+              "lon": "52.26810"
+            },
+            {
+              "name": "121В",
+              "lat": "54.89887",
+              "lon": "52.26666"
+            },
+            {
+              "name": "122",
+              "lat": "54.90333",
+              "lon": "52.26179"
+            },
+            {
+              "name": "122",
+              "lat": "54.90325",
+              "lon": "52.26166"
+            },
+            {
+              "name": "123",
+              "lat": "54.89999",
+              "lon": "52.26572"
+            },
+            {
+              "name": "123Б",
+              "lat": "54.89927",
+              "lon": "52.26617"
+            },
+            {
+              "name": "123В",
+              "lat": "54.89956",
+              "lon": "52.26664"
+            },
+            {
+              "name": "124",
+              "lat": "54.90527",
+              "lon": "52.26482"
+            },
+            {
+              "name": "124 с1",
+              "lat": "54.90573",
+              "lon": "52.25909"
+            },
+            {
+              "name": "124 с2",
+              "lat": "54.90595",
+              "lon": "52.25939"
+            },
+            {
+              "name": "125",
+              "lat": "54.89923",
+              "lon": "52.26499"
+            },
+            {
+              "name": "126",
+              "lat": "54.90662",
+              "lon": "52.25707"
+            },
+            {
+              "name": "127",
+              "lat": "54.89859",
+              "lon": "52.26495"
+            },
+            {
+              "name": "128",
+              "lat": "54.90627",
+              "lon": "52.25585"
+            },
+            {
+              "name": "129",
+              "lat": "54.89812",
+              "lon": "52.26460"
+            },
+            {
+              "name": "129А",
+              "lat": "54.89823",
+              "lon": "52.26400"
+            },
+            {
+              "name": "131",
+              "lat": "54.89891",
+              "lon": "52.26377"
+            },
+            {
+              "name": "132",
+              "lat": "54.90779",
+              "lon": "52.25540"
+            },
+            {
+              "name": "135",
+              "lat": "54.90069",
+              "lon": "52.26252"
+            },
+            {
+              "name": "137",
+              "lat": "54.89929",
+              "lon": "52.26304"
+            },
+            {
+              "name": "139",
+              "lat": "54.89920",
+              "lon": "52.26183"
+            },
+            {
+              "name": "139Б",
+              "lat": "54.89953",
+              "lon": "52.26179"
+            },
+            {
+              "name": "140",
+              "lat": "54.90801",
+              "lon": "52.25224",
+              "postcode": "423455"
+            },
+            {
+              "name": "140",
+              "lat": "54.90851",
+              "lon": "52.25256",
+              "postcode": "423455"
+            },
+            {
+              "name": "141",
+              "lat": "54.89976",
+              "lon": "52.26070"
+            },
+            {
+              "name": "143",
+              "lat": "54.90057",
+              "lon": "52.26031"
+            },
+            {
+              "name": "145",
+              "lat": "54.90143",
+              "lon": "52.26072"
+            },
+            {
+              "name": "147",
+              "lat": "54.90157",
+              "lon": "52.26005"
+            },
+            {
+              "name": "149",
+              "lat": "54.90129",
+              "lon": "52.26237"
+            },
+            {
+              "name": "151",
+              "lat": "54.90185",
+              "lon": "52.26243"
+            },
+            {
+              "name": "153",
+              "lat": "54.90223",
+              "lon": "52.26138"
+            },
+            {
+              "name": "157",
+              "lat": "54.90117",
+              "lon": "52.25885"
+            },
+            {
+              "name": "157А",
+              "lat": "54.90057",
+              "lon": "52.25909"
+            },
+            {
+              "name": "171",
+              "lat": "54.90199",
+              "lon": "52.25671"
+            },
+            {
+              "name": "187",
+              "lat": "54.90302",
+              "lon": "52.25544"
+            },
+            {
+              "name": "189",
+              "lat": "54.90335",
+              "lon": "52.25385"
+            },
+            {
+              "name": "193",
+              "lat": "54.90488",
+              "lon": "52.25400"
+            },
+            {
+              "name": "195",
+              "lat": "54.90462",
+              "lon": "52.25572"
+            },
+            {
+              "name": "195",
+              "lat": "54.90418",
+              "lon": "52.25679"
+            },
+            {
+              "name": "195",
+              "lat": "54.90451",
+              "lon": "52.25647"
+            },
+            {
+              "name": "197",
+              "lat": "54.90426",
+              "lon": "52.25340"
+            },
+            {
+              "name": "199",
+              "lat": "54.90487",
+              "lon": "52.25209"
+            },
+            {
+              "name": "201",
+              "lat": "54.90619",
+              "lon": "52.25250"
+            },
+            {
+              "name": "203",
+              "lat": "54.90720",
+              "lon": "52.25070"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "улица Герцена",
+              "names": {
+                "tt": "Герцен урамы"
+              },
+              "lat": "54.90398",
+              "lon": "52.31797"
+            },
+            {
+              "name": "улица Ризы Фахретдина",
+              "names": {
+                "tt": "Риза Фәхреддин урамы"
+              },
+              "lat": "54.90398",
+              "lon": "52.31797"
+            },
+            {
+              "name": "проспект Тукая",
+              "names": {
+                "tt": "Тукай проспекты",
+                "ru": "проспект Тукая"
+              },
+              "lat": "54.90412",
+              "lon": "52.31383"
+            },
+            {
+              "name": "проспект Зарипова",
+              "lat": "54.90766",
+              "lon": "52.25008"
+            },
+            {
+              "name": "улица Аминова",
+              "lat": "54.90362",
+              "lon": "52.25967"
+            },
+            {
+              "name": "улица Зифы Балакиной",
+              "lat": "54.89988",
+              "lon": "52.26761"
+            },
+            {
+              "name": "улица Марджани",
+              "lat": "54.89816",
+              "lon": "52.28522"
+            },
+            {
+              "name": "улица Чехова",
+              "names": {
+                "tt": "Чехов урамы",
+                "tt-lat": "Çexov uramı"
+              },
+              "lat": "54.90434",
+              "lon": "52.30475"
+            },
+            {
+              "name": "улица Пушкина",
+              "names": {
+                "tt": "Пушкин урамы"
+              },
+              "lat": "54.90378",
+              "lon": "52.30331"
+            },
+            {
+              "name": "улица Маяковского",
+              "names": {
+                "tt": "Маяковский урамы"
+              },
+              "lat": "54.90423",
+              "lon": "52.31044"
+            },
+            {
+              "name": "улица Островского",
+              "names": {
+                "tt": "Островский урамы"
+              },
+              "lat": "54.90437",
+              "lon": "52.30589"
+            },
+            {
+              "name": "улица Радищева",
+              "names": {
+                "tt": "Радищев урамы"
+              },
+              "lat": "54.90244",
+              "lon": "52.29984"
+            },
+            {
+              "name": "улица Гагарина",
+              "lat": "54.90141",
+              "lon": "52.29720"
+            },
+            {
+              "name": "улица Джалиля",
+              "names": {
+                "tt": "Җәлил урамы"
+              },
+              "lat": "54.90024",
+              "lon": "52.29413"
+            },
+            {
+              "name": "улица Заслонова",
+              "names": {
+                "tt": "Заслонов урамы"
+              },
+              "lat": "54.89871",
+              "lon": "52.29014"
+            }
+          ]
+        },
+        {
+          "name": "Ленина",
+          "lat": "54.90885",
+          "lon": "52.25265",
+          "id": 726,
+          "buildings": [
+            {
+              "name": "140",
+              "lat": "54.90885",
+              "lon": "52.25265"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Давликеево",
+      "names": {
+        "tt": "Дәүләки"
+      },
+      "lat": "55.21625",
+      "lon": "48.36310",
+      "id": 703166489,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.21762",
+          "lon": "48.36134",
+          "id": 6609
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Большая Цильна",
+      "names": {
+        "tt": "Зур Чынлы"
+      },
+      "lat": "54.68808",
+      "lon": "47.85389",
+      "id": 762000538,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.69761",
+          "lon": "47.85312",
+          "id": 10335
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Апастово",
+      "enName": "Apastovo",
+      "names": {
+        "tt": "Апас",
+        "ar": "أباستوفو",
+        "de": "Apastowo",
+        "cv": "Апас",
+        "ru": "Апастово",
+        "ja": "アパソトヴォ",
+        "ca": "Apàstovo",
+        "ba": "Апас"
+      },
+      "lat": "55.20267",
+      "lon": "48.50687",
+      "id": 703166491,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "enName": "Lenina Street",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "uliza Lenina",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.20401",
+          "lon": "48.51266",
+          "id": 2565
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Балтаси",
+      "enName": "Baltasi",
+      "names": {
+        "tt": "Балтач",
+        "ru": "Балтаси",
+        "ja": "バルタシ"
+      },
+      "lat": "56.34462",
+      "lon": "50.21142",
+      "id": 701721057,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "56.34680",
+          "lon": "50.20677",
+          "id": 275
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Светлое Озеро",
+      "names": {
+        "tt": "Яктыкүл"
+      },
+      "lat": "55.18347",
+      "lon": "52.01205",
+      "id": 586094617,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.17911",
+          "lon": "52.01449",
+          "id": 525,
+          "buildings": [
+            {
+              "name": "1",
+              "lat": "55.19065",
+              "lon": "52.00960"
+            },
+            {
+              "name": "2",
+              "lat": "55.19073",
+              "lon": "52.00889"
+            },
+            {
+              "name": "45",
+              "lat": "55.18594",
+              "lon": "52.01245"
+            },
+            {
+              "name": "77",
+              "lat": "55.18224",
+              "lon": "52.01449"
+            },
+            {
+              "name": "79",
+              "lat": "55.18177",
+              "lon": "52.01473"
+            },
+            {
+              "name": "81",
+              "lat": "55.18094",
+              "lon": "52.01533",
+              "postcode": "423538"
+            },
+            {
+              "name": "83",
+              "lat": "55.18046",
+              "lon": "52.01499"
+            },
+            {
+              "name": "94",
+              "lat": "55.17950",
+              "lon": "52.01449",
+              "postcode": "423538"
+            },
+            {
+              "name": "96",
+              "lat": "55.17911",
+              "lon": "52.01449",
+              "postcode": "423538"
+            },
+            {
+              "name": "96",
+              "lat": "55.17912",
+              "lon": "52.01449",
+              "postcode": "423538"
+            },
+            {
+              "name": "98",
+              "lat": "55.17871",
+              "lon": "52.01451"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "улица Академика Акатьева",
+              "lat": "55.18053",
+              "lon": "52.01464"
+            },
+            {
+              "name": "переулок Вахитова",
+              "lat": "55.17898",
+              "lon": "52.01479"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Камское Устье",
+      "enName": "Kamskoye Ustye",
+      "names": {
+        "tt": "Кама Тамагы",
+        "cv": "Кама Вӑрри",
+        "ru": "Камское Устье",
+        "ja": "カムスコエ・ウスチエ"
+      },
+      "lat": "55.20157",
+      "lon": "49.26802",
+      "id": 336524471,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.20416",
+          "lon": "49.26960",
+          "id": 7493
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Кагарлик",
+      "lat": "49.85635",
+      "lon": "30.74794",
+      "id": 6629021,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Старое Клянчино",
+      "names": {
+        "tt": "Иске Теләнче",
+        "ru": "Старое Клянчино"
+      },
+      "lat": "55.47022",
+      "lon": "52.52591",
+      "id": 582997319,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "ru": "улица Ленина"
+          },
+          "lat": "55.46914",
+          "lon": "52.52182",
+          "id": 11253
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Заря",
+      "names": {
+        "tt": "Заря",
+        "ja": "ザリャー"
+      },
+      "lat": "54.99205",
+      "lon": "50.84252",
+      "id": 854647311,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы"
+          },
+          "lat": "54.99286",
+          "lon": "50.84267",
+          "id": 12004
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Коцюбинське",
+      "enName": "Kotsiubynske",
+      "names": {
+        "ru": "Коцюбинское",
+        "uk": "Коцюбинське",
+        "prefix": "селище міського типу",
+        "pl": "Kotsiubynske"
+      },
+      "lat": "50.49047",
+      "lon": "30.33379",
+      "id": 337520861,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Большое Афанасово",
+      "names": {
+        "tt": "Олы Афанас",
+        "ru": "Большое Афанасово"
+      },
+      "lat": "55.59972",
+      "lon": "51.77507",
+      "id": 2463557141,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.60991",
+          "lon": "51.79354",
+          "id": 9734,
+          "buildings": [
+            {
+              "name": "1",
+              "lat": "55.60995",
+              "lon": "51.79442"
+            },
+            {
+              "name": "2",
+              "lat": "55.61010",
+              "lon": "51.79384"
+            },
+            {
+              "name": "2А",
+              "lat": "55.61071",
+              "lon": "51.79333"
+            },
+            {
+              "name": "3",
+              "lat": "55.60971",
+              "lon": "51.79416"
+            },
+            {
+              "name": "4",
+              "lat": "55.60991",
+              "lon": "51.79354"
+            },
+            {
+              "name": "5",
+              "lat": "55.60952",
+              "lon": "51.79393"
+            },
+            {
+              "name": "6",
+              "lat": "55.60972",
+              "lon": "51.79331"
+            },
+            {
+              "name": "7",
+              "lat": "55.60934",
+              "lon": "51.79361"
+            },
+            {
+              "name": "8",
+              "lat": "55.60953",
+              "lon": "51.79305"
+            },
+            {
+              "name": "9",
+              "lat": "55.60920",
+              "lon": "51.79339"
+            },
+            {
+              "name": "10",
+              "lat": "55.60929",
+              "lon": "51.79264"
+            },
+            {
+              "name": "11",
+              "lat": "55.60898",
+              "lon": "51.79307"
+            },
+            {
+              "name": "12",
+              "lat": "55.60909",
+              "lon": "51.79225"
+            },
+            {
+              "name": "13",
+              "lat": "55.60884",
+              "lon": "51.79283"
+            },
+            {
+              "name": "14",
+              "lat": "55.60894",
+              "lon": "51.79200"
+            },
+            {
+              "name": "15",
+              "lat": "55.60872",
+              "lon": "51.79266"
+            },
+            {
+              "name": "16",
+              "lat": "55.60881",
+              "lon": "51.79183"
+            },
+            {
+              "name": "17",
+              "lat": "55.60862",
+              "lon": "51.79247"
+            },
+            {
+              "name": "18",
+              "lat": "55.60869",
+              "lon": "51.79163"
+            },
+            {
+              "name": "19",
+              "lat": "55.60843",
+              "lon": "51.79217"
+            },
+            {
+              "name": "20",
+              "lat": "55.60849",
+              "lon": "51.79144"
+            },
+            {
+              "name": "21",
+              "lat": "55.60827",
+              "lon": "51.79189"
+            },
+            {
+              "name": "22",
+              "lat": "55.60834",
+              "lon": "51.79116"
+            },
+            {
+              "name": "23",
+              "lat": "55.60805",
+              "lon": "51.79155"
+            },
+            {
+              "name": "24",
+              "lat": "55.60820",
+              "lon": "51.79095"
+            },
+            {
+              "name": "25",
+              "lat": "55.60791",
+              "lon": "51.79133"
+            },
+            {
+              "name": "26",
+              "lat": "55.60808",
+              "lon": "51.79075"
+            },
+            {
+              "name": "27",
+              "lat": "55.60778",
+              "lon": "51.79114"
+            },
+            {
+              "name": "27А",
+              "lat": "55.60766",
+              "lon": "51.79092"
+            },
+            {
+              "name": "28",
+              "lat": "55.60795",
+              "lon": "51.79054"
+            },
+            {
+              "name": "29",
+              "lat": "55.60752",
+              "lon": "51.79067"
+            },
+            {
+              "name": "30",
+              "lat": "55.60780",
+              "lon": "51.79028"
+            },
+            {
+              "name": "31",
+              "lat": "55.60735",
+              "lon": "51.79043"
+            },
+            {
+              "name": "32",
+              "lat": "55.60778",
+              "lon": "51.78938"
+            },
+            {
+              "name": "33",
+              "lat": "55.60718",
+              "lon": "51.79017"
+            },
+            {
+              "name": "34",
+              "lat": "55.60743",
+              "lon": "51.78949"
+            },
+            {
+              "name": "35",
+              "lat": "55.60703",
+              "lon": "51.78994"
+            },
+            {
+              "name": "36",
+              "lat": "55.60721",
+              "lon": "51.78949"
+            },
+            {
+              "name": "37",
+              "lat": "55.60686",
+              "lon": "51.78966"
+            },
+            {
+              "name": "39",
+              "lat": "55.60672",
+              "lon": "51.78942"
+            },
+            {
+              "name": "39А",
+              "lat": "55.60652",
+              "lon": "51.78884"
+            },
+            {
+              "name": "41",
+              "lat": "55.60662",
+              "lon": "51.78848"
+            },
+            {
+              "name": "42",
+              "lat": "55.60683",
+              "lon": "51.78846"
+            },
+            {
+              "name": "42Б",
+              "lat": "55.60658",
+              "lon": "51.78747"
+            },
+            {
+              "name": "45",
+              "lat": "55.60627",
+              "lon": "51.78783"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Саклов-Баш",
+      "names": {
+        "tt": "Саклаубаш"
+      },
+      "lat": "55.37935",
+      "lon": "52.88140",
+      "id": 593610600,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "tt-lat": "Lenin uramı"
+          },
+          "lat": "55.37916",
+          "lon": "52.88016",
+          "id": 1816
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Рокитне",
+      "enName": "Rokytne",
+      "names": {
+        "de": "Rokytne",
+        "ru": "Ракитное",
+        "uk": "Рокитне",
+        "prefix": "селище міського типу",
+        "pl": "Rokitna"
+      },
+      "lat": "49.68673",
+      "lon": "30.47303",
+      "id": 337549274,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Богуслав",
+      "enName": "Bohuslav",
+      "names": {
+        "de": "Bohuslaw",
+        "ru": "Богуслав",
+        "uk": "Богуслав",
+        "prefix": "місто",
+        "pl": "Bohusław"
+      },
+      "lat": "49.54765",
+      "lon": "30.87330",
+      "id": 337555159,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Пестрецы",
+      "enName": "Pestretsy",
+      "names": {
+        "tt": "Питрәч",
+        "ru": "Пестрецы",
+        "ja": "ペストレツィ",
+        "lt": "Pestrecai"
+      },
+      "lat": "55.75021",
+      "lon": "49.65709",
+      "id": 697241159,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Алексеевское",
+      "enName": "Alexeyevskoye",
+      "names": {
+        "tt": "Алексеевск",
+        "de": "Alexejewskoje",
+        "ru": "Алексеевское",
+        "ja": "アレクセーエフスコエ",
+        "lt": "Aleksėjevskojė"
+      },
+      "lat": "55.30496",
+      "lon": "50.11289",
+      "id": 336524229,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "enName": "Lenina Street",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "uliza Lenina",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.30730",
+          "lon": "50.12300",
+          "id": 6508
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Мензелинск",
+      "enName": "Menzelinsk",
+      "names": {
+        "tt": "Минзәлә",
+        "de": "Menselinsk",
+        "ru": "Мензелинск",
+        "ja": "メンゼリンスク"
+      },
+      "lat": "55.72556",
+      "lon": "53.10718",
+      "id": 337839017,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "enName": "Lenina Street",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.72411",
+          "lon": "53.10192",
+          "id": 3916
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Бугульма",
+      "enName": "Bugulma",
+      "names": {
+        "tt": "Бөгелмә",
+        "de": "Bugulma",
+        "ru": "Бугульма",
+        "ja": "ブグリマ"
+      },
+      "lat": "54.53841",
+      "lon": "52.79559",
+      "id": 1707207947,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.54633",
+          "lon": "52.78989",
+          "id": 595
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Мамадыш",
+      "enName": "Mamadysh",
+      "names": {
+        "tt": "Мамадыш",
+        "de": "Mamadysch",
+        "ru": "Мамадыш",
+        "ja": "ママドィシ",
+        "az": "Mamadış"
+      },
+      "lat": "55.70908",
+      "lon": "51.40891",
+      "id": 337839024,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица В. И. Ленина",
+          "lat": "55.71813",
+          "lon": "51.42443",
+          "id": 1740,
+          "buildings": [
+            {
+              "name": "1/22",
+              "lat": "55.71805",
+              "lon": "51.42372",
+              "postcode": "422190"
+            },
+            {
+              "name": "2",
+              "lat": "55.71847",
+              "lon": "51.42376"
+            },
+            {
+              "name": "16",
+              "lat": "55.71888",
+              "lon": "51.42202"
+            },
+            {
+              "name": "18/26",
+              "lat": "55.71893",
+              "lon": "51.42172"
+            },
+            {
+              "name": "19",
+              "lat": "55.71890",
+              "lon": "51.41992"
+            },
+            {
+              "name": "23",
+              "lat": "55.71911",
+              "lon": "51.41926"
+            },
+            {
+              "name": "70",
+              "lat": "55.72104",
+              "lon": "51.41293"
+            },
+            {
+              "name": "73",
+              "lat": "55.72167",
+              "lon": "51.40851"
+            },
+            {
+              "name": "74",
+              "lat": "55.72127",
+              "lon": "51.41194"
+            },
+            {
+              "name": "75А",
+              "lat": "55.72172",
+              "lon": "51.40578"
+            },
+            {
+              "name": "75В",
+              "lat": "55.72161",
+              "lon": "51.40640"
+            },
+            {
+              "name": "80",
+              "lat": "55.72155",
+              "lon": "51.41087"
+            },
+            {
+              "name": "85А",
+              "lat": "55.72338",
+              "lon": "51.40188"
+            },
+            {
+              "name": "94Б",
+              "lat": "55.72255",
+              "lon": "51.40617"
+            },
+            {
+              "name": "96",
+              "lat": "55.72326",
+              "lon": "51.40492"
+            },
+            {
+              "name": "104",
+              "lat": "55.72411",
+              "lon": "51.40293"
+            },
+            {
+              "name": "105",
+              "lat": "55.72850",
+              "lon": "51.39870"
+            },
+            {
+              "name": "107",
+              "lat": "55.72903",
+              "lon": "51.39891"
+            },
+            {
+              "name": "107А",
+              "lat": "55.72898",
+              "lon": "51.39791"
+            },
+            {
+              "name": "108",
+              "lat": "55.72640",
+              "lon": "51.40123",
+              "postcode": "422190"
+            },
+            {
+              "name": "110",
+              "lat": "55.72655",
+              "lon": "51.40100",
+              "postcode": "422190"
+            },
+            {
+              "name": "118",
+              "lat": "55.72943",
+              "lon": "51.39990",
+              "postcode": "422190"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "улица Толстого",
+              "lat": "55.71882",
+              "lon": "51.42155"
+            },
+            {
+              "name": "улица Галактионова",
+              "lat": "55.71814",
+              "lon": "51.42443"
+            },
+            {
+              "name": "улица Максимова",
+              "lat": "55.73760",
+              "lon": "51.39655"
+            },
+            {
+              "name": "улица Абсалямова",
+              "names": {
+                "tt": "Әпсәләмов урамы"
+              },
+              "lat": "55.73633",
+              "lon": "51.39705"
+            },
+            {
+              "name": "Ипподромная улица",
+              "lat": "55.73581",
+              "lon": "51.39722"
+            },
+            {
+              "name": "Товарищеская улица",
+              "lat": "55.73557",
+              "lon": "51.39728"
+            },
+            {
+              "name": "улица Р. Нуриева",
+              "lat": "55.73485",
+              "lon": "51.39763"
+            },
+            {
+              "name": "Вишнёвая улица",
+              "lat": "55.73407",
+              "lon": "51.39801"
+            },
+            {
+              "name": "улица Энергетиков",
+              "lat": "55.73401",
+              "lon": "51.39803"
+            },
+            {
+              "name": "улица Х. Такташ",
+              "lat": "55.73389",
+              "lon": "51.39810"
+            },
+            {
+              "name": "Радужная улица",
+              "lat": "55.73326",
+              "lon": "51.39842"
+            },
+            {
+              "name": "улица Дружбы",
+              "lat": "55.73326",
+              "lon": "51.39842"
+            },
+            {
+              "name": "улица 50 лет Победы",
+              "lat": "55.73045",
+              "lon": "51.39947"
+            },
+            {
+              "name": "улица Ш. Маннура",
+              "lat": "55.73006",
+              "lon": "51.39956"
+            },
+            {
+              "name": "Майская улица",
+              "lat": "55.72997",
+              "lon": "51.39956"
+            },
+            {
+              "name": "улица Нигматуллина",
+              "lat": "55.72785",
+              "lon": "51.40001"
+            },
+            {
+              "name": "переулок Нигматуллина",
+              "lat": "55.72776",
+              "lon": "51.40003"
+            },
+            {
+              "name": "улица Мичурина",
+              "lat": "55.72707",
+              "lon": "51.40037"
+            },
+            {
+              "name": "Школьная улица",
+              "lat": "55.72677",
+              "lon": "51.40059"
+            },
+            {
+              "name": "улица Ф. Энгельса",
+              "lat": "55.72602",
+              "lon": "51.40110"
+            },
+            {
+              "name": "Садовая улица",
+              "lat": "55.72500",
+              "lon": "51.40188"
+            },
+            {
+              "name": "Комсомольская улица",
+              "lat": "55.72367",
+              "lon": "51.40290"
+            },
+            {
+              "name": "Союзная улица",
+              "lat": "55.72246",
+              "lon": "51.40591"
+            },
+            {
+              "name": "улица Тукая",
+              "lat": "55.72201",
+              "lon": "51.40795"
+            },
+            {
+              "name": "улица Азина",
+              "names": {
+                "tt": "Азин урамы"
+              },
+              "lat": "55.72148",
+              "lon": "51.41020"
+            },
+            {
+              "name": "Красноармейская улица",
+              "lat": "55.72093",
+              "lon": "51.41252"
+            },
+            {
+              "name": "улица Гагарина",
+              "names": {
+                "tt": "Гагарин урамы"
+              },
+              "lat": "55.72043",
+              "lon": "51.41469"
+            },
+            {
+              "name": "улица М. Джалиля",
+              "lat": "55.71993",
+              "lon": "51.41677"
+            },
+            {
+              "name": "улица К. Маркса",
+              "lat": "55.71946",
+              "lon": "51.41889"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Болгар",
+      "names": {
+        "tt": "Болгар",
+        "ja": "ボルガル"
+      },
+      "lat": "55.41516",
+      "lon": "51.60141",
+      "id": 705268166,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.41721",
+          "lon": "51.59851",
+          "id": 9311,
+          "intersectedStreets": [
+            {
+              "name": "улица Гагарина",
+              "lat": "55.41721",
+              "lon": "51.59851"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Бавлы",
+      "enName": "Bavly",
+      "names": {
+        "tt": "Баулы",
+        "de": "Bawly",
+        "ru": "Бавлы",
+        "ja": "バヴルィ",
+        "et": "Bavlõ"
+      },
+      "lat": "54.40309",
+      "lon": "53.23571",
+      "id": 337839279,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "enName": "Lenina Street",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.40419",
+          "lon": "53.23696",
+          "id": 6957
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Згурівка",
+      "enName": "Zghurivka",
+      "names": {
+        "de": "Shuriwka",
+        "ru": "Згуровка",
+        "prefix": "селище міського типу",
+        "uk": "Згурівка",
+        "pl": "Zhuriwka"
+      },
+      "lat": "50.49506",
+      "lon": "31.76918",
+      "id": 337520849,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Буинск",
+      "enName": "Buinsk",
+      "names": {
+        "tt": "Буа",
+        "de": "Buinsk",
+        "cv": "Пӑва",
+        "ru": "Буинск",
+        "ja": "ブインスク"
+      },
+      "lat": "54.97229",
+      "lon": "48.29289",
+      "id": 295862317,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.96690",
+          "lon": "48.29476",
+          "id": 5936
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Гостомель",
+      "enName": "Hostomel",
+      "names": {
+        "ru": "Гостомель",
+        "uk": "Гостомель",
+        "prefix": "селище міського типу",
+        "pl": "Hostomel"
+      },
+      "lat": "50.58826",
+      "lon": "30.25909",
+      "id": 337519314,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Бровари",
+      "enName": "Brovary",
+      "names": {
+        "de": "Browary",
+        "ru": "Бровары",
+        "prefix": "місто",
+        "uk": "Бровари",
+        "eo": "Brovari",
+        "fr": "Brovary",
+        "pl": "Browary",
+        "hu": "Brovari",
+        "et": "Brovarõ",
+        "sr": "Бровари"
+      },
+      "lat": "50.51111",
+      "lon": "30.79004",
+      "id": 3673183717,
+      "type": "CITY",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Победа",
+      "names": {
+        "tt": "Победа"
+      },
+      "lat": "54.67300",
+      "lon": "52.66657",
+      "id": 783002941,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "54.67386",
+          "lon": "52.66232",
+          "id": 4552
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Димер",
+      "enName": "Dymer",
+      "names": {
+        "ru": "Дымер",
+        "uk": "Димер",
+        "prefix": "селище міського типу",
+        "pl": "Dymer"
+      },
+      "lat": "50.78355",
+      "lon": "30.30780",
+      "id": 1585808480,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Набережные Челны",
+      "enName": "Naberezhnye Chelny",
+      "names": {
+        "tt": "Яр Чаллы",
+        "de": "Nabereschnyje Tschelny",
+        "no": "Naberezjnyje Tsjelny",
+        "be": "Наберажныя Чалны",
+        "fi": "Naberežnyje Tšelny",
+        "ru": "Набережные Челны",
+        "pt": "Naberejnye Chelny",
+        "bg": "Набережние Челни",
+        "lt": "Naberežnyje Čelnai",
+        "hr": "Naberežnye Čelny",
+        "lv": "Naberežnije Čelni",
+        "fr": "Naberejnye Tchelny",
+        "ka": "ნაბერეჟნიე ჩელნი",
+        "uk": "Набережні Човни",
+        "ca": "Nàberejnie_Txelní",
+        "sr": "Набережније Челни",
+        "sv": "Naberezjnyje Tjelny",
+        "ko": "나베레즈니예첼니",
+        "it": "Naberežnye Čelny",
+        "es": "Náberezhnye Chelny",
+        "zh": "卡马河畔切尔尼",
+        "et": "Naberežnõje Tšelnõ",
+        "cs": "Naberežnyje Čelny",
+        "ar": "نابريجناي تشلني",
+        "cv": "Чаллă",
+        "ja": "ナベレジヌイェ・チェルヌイ",
+        "az": "Naberejnıye Çelnı",
+        "fa": "نابرژنیه چلنی",
+        "pl": "Nabierieżnyje Czełny",
+        "ro": "Naberejnîe Celnî",
+        "nl": "Naberezjnye Tsjelny",
+        "tr": "Yarçallı",
+        "ba": "Яр Саллы"
+      },
+      "lat": "55.74201",
+      "lon": "52.39923",
+      "id": 191749240,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.69950",
+          "lon": "52.31059",
+          "id": 1334,
+          "buildings": [
+            {
+              "name": "9",
+              "lat": "55.71643",
+              "lon": "52.38245"
+            }
+          ],
+          "intersectedStreets": [
+            {
+              "name": "Полевая улица",
+              "lat": "55.69824",
+              "lon": "52.30953"
+            },
+            {
+              "name": "улица Фрунзе",
+              "names": {
+                "tt": "Фрунзе урамы"
+              },
+              "lat": "55.69824",
+              "lon": "52.30953"
+            },
+            {
+              "name": "улица Карла Маркса",
+              "names": {
+                "tt": "Карл Маркс урамы"
+              },
+              "lat": "55.69995",
+              "lon": "52.31029"
+            },
+            {
+              "name": "Красногвардейская улица",
+              "lat": "55.70029",
+              "lon": "52.31009"
+            },
+            {
+              "name": "Комсомольская набережная",
+              "lat": "55.70193",
+              "lon": "52.30900"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Богдашкино",
+      "enName": "Bogdashkino",
+      "names": {
+        "cv": "Пухтел",
+        "ru": "Богдашкино"
+      },
+      "lat": "54.61321",
+      "lon": "47.67519",
+      "id": 336525269,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "переулок Ленина",
+          "lat": "54.61380",
+          "lon": "47.67824",
+          "id": 10951
+        },
+        {
+          "name": "улица Ленина",
+          "lat": "54.60684",
+          "lon": "47.67318",
+          "id": 9171
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Сквира",
+      "enName": "Skvyra",
+      "names": {
+        "kk": "Skvyra",
+        "de": "Skwyra",
+        "ceb": "Skvyra",
+        "be": "Сквыра",
+        "ru": "Сквира",
+        "sv": "Skvyra",
+        "prefix": "місто",
+        "it": "Skvyra",
+        "fr": "Skvyra",
+        "cs": "Skvyra",
+        "hy": "Սկվյրա",
+        "vi": "Skvyra",
+        "uk": "Сквира",
+        "sk": "Skvyra",
+        "fa": "اسکویرا",
+        "pl": "Skwyra",
+        "ro": "Skvîra"
+      },
+      "lat": "49.73370",
+      "lon": "29.66266",
+      "id": 337547206,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Рыбная Слобода",
+      "enName": "Rybnaya Sloboda",
+      "names": {
+        "tt": "Балык Бистәсе",
+        "ru": "Рыбная Слобода",
+        "ja": "ルィブナヤ・スロボーダ"
+      },
+      "lat": "55.46442",
+      "lon": "50.14061",
+      "id": 703680750,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "tt-lat": "Lenin uramı",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.46726",
+          "lon": "50.14763",
+          "id": 2637
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Арск",
+      "enName": "Arsk",
+      "names": {
+        "tt": "Арча",
+        "de": "Arsk",
+        "ru": "Арск",
+        "ja": "アルスク"
+      },
+      "lat": "56.09099",
+      "lon": "49.87718",
+      "id": 295868224,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Каркаусь",
+      "names": {
+        "tt": "Кәркәүч"
+      },
+      "lat": "56.10411",
+      "lon": "51.14129",
+      "id": 797051488,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "lat": "56.10492",
+          "lon": "51.14228",
+          "id": 7812
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Мусабай-Завод",
+      "names": {
+        "tt": "Мусабай-Завод",
+        "ru": "Мусабай-Завод"
+      },
+      "lat": "55.51024",
+      "lon": "52.40260",
+      "id": 582657576,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.51051",
+          "lon": "52.40217",
+          "id": 7928,
+          "buildings": [
+            {
+              "name": "29",
+              "lat": "55.51133",
+              "lon": "52.40182"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Тюлячи",
+      "enName": "Tyulyachi",
+      "names": {
+        "tt": "Теләче",
+        "ru": "Тюлячи",
+        "ja": "チュリャチ"
+      },
+      "lat": "55.89188",
+      "lon": "50.23350",
+      "id": 697241170,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "улица Ленина",
+          "names": {
+            "tt": "Ленин урамы",
+            "de": "Leninstraße",
+            "be": "вулiца Ленiна",
+            "ru": "улица Ленина",
+            "mrj": "Ленин öлицä",
+            "fr": "Rue Lénine",
+            "ba": "Ленин урамы"
+          },
+          "lat": "55.89223",
+          "lon": "50.24659",
+          "id": 3195
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Васильків",
+      "enName": "Vasylkiv",
+      "names": {
+        "de": "Wassylkiw",
+        "ru": "Васильков",
+        "uk": "Васильків",
+        "prefix": "місто",
+        "fr": "Vassylkiv",
+        "pl": "Wasilków",
+        "hu": "Vasylkiv"
+      },
+      "lat": "50.17387",
+      "lon": "30.32158",
+      "id": 337527490,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    },
+    {
+      "name": "Красный Ключ",
+      "enName": "Krasny Klyuch",
+      "names": {
+        "tt": "Красный Ключ",
+        "ja": "クラスヌイ・クリューチ"
+      },
+      "lat": "55.68249",
+      "lon": "51.81914",
+      "id": 585272830,
+      "type": "TOWN",
+      "listOfStreets": [],
+      "init": 1
+    }
+  ]
+}
\ No newline at end of file
diff --git a/OsmAnd-java/src/test/resources/search/street_rue_emile.json b/OsmAnd-java/src/test/resources/search/street_rue_emile.json
new file mode 100644
index 0000000000..74c6541b34
--- /dev/null
+++ b/OsmAnd-java/src/test/resources/search/street_rue_emile.json
@@ -0,0 +1,8178 @@
+{
+  "settings": {
+    "lat": "50.64514",
+    "lon": "5.57342",
+    "radiusLevel": 1,
+    "totalLimit": -1,
+    "lang": "",
+    "transliterateIfMissing": false,
+    "emptyQueryAllowed": false,
+    "sortByName": false
+  },
+  "phrase": "rue émile",
+  "results": [
+    "Rue Émile Gérard, Liège",
+    "Rue Emile Vandervelde, Liège",
+    "Rue Emile Vandervelde - Rue Sainte-Marguerite, Liège",
+    "Rue Émile Zola (Laveu), Liège",
+    "Rue Émile Collard, Liège",
+    "Rue Emile Vandervelde, Vottem",
+    "Rue Emile Vandervelde (Vottem), Herstal",
+    "Rue Émile Verhaeren, Liège",
+    "Rue Émile Jeanne, Saint-Nicolas",
+    "Rue Emile Muraille, Herstal",
+    "Rue Emile Verhaeren, Grâce-Hollogne",
+    "Rue Emile Vinck, Herstal"
+  ],
+  "amenities": [
+    {
+      "name": "Soye Rue Émile Lorent 252",
+      "lat": "50.44816",
+      "lon": "4.74122",
+      "id": 6096184636,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "bench_yes": "yes",
+        "covered_yes": "yes",
+        "network": "TECN",
+        "operator": "TEC"
+      }
+    },
+    {
+      "name": "Rue Émile Pirson",
+      "lat": "50.50419",
+      "lon": "4.66955",
+      "id": 147817647,
+      "subType": "bridge",
+      "type": "man_made",
+      "additionalInfo": {
+        "bridge_car": "yes"
+      }
+    },
+    {
+      "name": "Soye Rue Émile Lorent 252",
+      "lat": "50.44883",
+      "lon": "4.74009",
+      "id": 6096184638,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "network": "TECN",
+        "operator": "TEC"
+      }
+    },
+    {
+      "name": "4b",
+      "names": {
+        "fr": "Avenue Gabriel Emile Lebon",
+        "nl": "Gabriel Emile Lebonlaan"
+      },
+      "lat": "50.82338",
+      "lon": "4.40886",
+      "id": 1222411455,
+      "subType": "lcn_ref",
+      "type": "transportation",
+      "additionalInfo": {
+        "network": "lcn",
+        "operator": "Brussels Mobility"
+      }
+    },
+    {
+      "name": "Liège Avenue Emile Jenissen",
+      "lat": "50.64078",
+      "lon": "5.54797",
+      "id": 6057259982,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "network": "TECL",
+        "operator": "TEC"
+      }
+    },
+    {
+      "name": "Orp-le-Grand Rue Emile Vandervelde",
+      "lat": "50.70772",
+      "lon": "4.99284",
+      "id": 4085539138,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "26",
+        "network": "TECB",
+        "operator": "TEC"
+      }
+    },
+    {
+      "name": "Rue Emile Vandervelde",
+      "lat": "50.64840",
+      "lon": "5.54513",
+      "id": 57311075,
+      "subType": "bridge",
+      "type": "man_made",
+      "additionalInfo": {
+        "bridge_car": "yes",
+        "ref": "N637"
+      }
+    },
+    {
+      "name": "Namur Rue Émile Cuvelier",
+      "names": {
+        "etymology:wikidata": "Q2997972"
+      },
+      "lat": "50.46461",
+      "lon": "4.86632",
+      "id": 3425215930,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "5, 8, 9",
+        "network": "TECN",
+        "operator": "TEC"
+      }
+    },
+    {
+      "name": "Fleurus Rue Emile Vandervelde",
+      "lat": "50.47870",
+      "lon": "4.54611",
+      "id": 5994274194,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "network": "TECC",
+        "operator": "TEC"
+      }
+    },
+    {
+      "name": "Fleurus Rue Emile Vandervelde",
+      "lat": "50.47895",
+      "lon": "4.54617",
+      "id": 5994274196,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "network": "TECC",
+        "operator": "TEC"
+      }
+    },
+    {
+      "name": "Jezuïetencollege, heden stedelijke Emile Brauschool",
+      "lat": "51.05209",
+      "lon": "3.72417",
+      "id": 5252836298,
+      "subType": "building",
+      "type": "man_made",
+      "additionalInfo": {
+        "description": "Jezuïetencollege, heden stedelijke Emile Brauschool"
+      }
+    },
+    {
+      "name": "Glain Rue Emile Vandervelde",
+      "lat": "50.64830",
+      "lon": "5.54829",
+      "id": 5838175460,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "network": "TECL",
+        "operator": "TEC"
+      }
+    }
+  ],
+  "cities": [
+    {
+      "name": "Farciennes",
+      "names": {
+        "ru": "Фарсьен"
+      },
+      "lat": "50.42732",
+      "lon": "4.55304",
+      "id": 357148969,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Vandervelde (Pironchamps)",
+          "lat": "50.42581",
+          "lon": "4.52991",
+          "id": 148287
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Dour",
+      "names": {
+        "ru": "Дур"
+      },
+      "lat": "50.39788",
+      "lon": "3.78069",
+      "id": 477168724,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Estièvenart",
+          "lat": "50.39535",
+          "lon": "3.77756",
+          "id": 120332
+        },
+        {
+          "name": "Rue Emile Cornez",
+          "lat": "50.40150",
+          "lon": "3.77275",
+          "id": 122499
+        },
+        {
+          "name": "Place Emile Vandervelde",
+          "lat": "50.39892",
+          "lon": "3.78561",
+          "id": 228077
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Wanze",
+      "names": {
+        "ru": "Ванз",
+        "wa": "Wônse",
+        "fr": "Wanze"
+      },
+      "lat": "50.53326",
+      "lon": "5.21666",
+      "id": 353175792,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Rorive",
+          "lat": "50.54438",
+          "lon": "5.22288",
+          "id": 118883
+        },
+        {
+          "name": "Rue Emile Vandervelde (Vinalmont)",
+          "lat": "50.55988",
+          "lon": "5.23185",
+          "id": 196957
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Wavre",
+      "names": {
+        "ru": "Вавр",
+        "wa": "Wåve",
+        "fr": "Wavre",
+        "nl": "Waver"
+      },
+      "lat": "50.71624",
+      "lon": "4.60844",
+      "id": 60284787,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Avenue Emile Verhaeren",
+          "lat": "50.70723",
+          "lon": "4.63664",
+          "id": 238410,
+          "intersectedStreets": [
+            {
+              "name": "Avenue Maupassant",
+              "lat": "50.70711",
+              "lon": "4.63584"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Gingelom",
+      "lat": "50.75003",
+      "lon": "5.13321",
+      "id": 1736682348,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Emile Beauduinstraat (Jeuk)",
+          "lat": "50.71964",
+          "lon": "5.18898",
+          "id": 201151,
+          "intersectedStreets": [
+            {
+              "name": "Kasteelstraat (Jeuk)",
+              "lat": "50.72168",
+              "lon": "5.18810"
+            },
+            {
+              "name": "Spoorwegstraat (Jeuk)",
+              "lat": "50.72168",
+              "lon": "5.18810"
+            },
+            {
+              "name": "Kustrijkstraat (Jeuk)",
+              "lat": "50.72407",
+              "lon": "5.18711"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Visé",
+      "names": {
+        "de": "Weset",
+        "ru": "Визе",
+        "wa": "Vizé",
+        "fr": "Visé",
+        "nl": "Wezet"
+      },
+      "lat": "50.73366",
+      "lon": "5.69553",
+      "id": 79453332,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Verhaeren",
+          "lat": "50.74042",
+          "lon": "5.68075",
+          "id": 236252
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Wauthier-Braine",
+      "names": {
+        "fr": "Wauthier-Braine",
+        "nl": "Woutersbrakel"
+      },
+      "lat": "50.67974",
+      "lon": "4.30123",
+      "id": 294066552,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Schampaert (La Cantine)",
+          "lat": "50.68466",
+          "lon": "4.29962",
+          "id": 43680
+        },
+        {
+          "name": "Rue Emile Vandervelde (La Cantine)",
+          "lat": "50.68732",
+          "lon": "4.30550",
+          "id": 43683
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Koksijde",
+      "names": {
+        "ru": "Коксейде",
+        "fr": "Coxyde",
+        "vls": "Koksyde",
+        "nl": "Koksijde"
+      },
+      "lat": "51.10642",
+      "lon": "2.65002",
+      "id": 720858823,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Verhaerenlaan (Oostduinkerke)",
+          "names": {
+            "alt_name": "Verhaerenlaan (Oostduinkerke)"
+          },
+          "lat": "51.12650",
+          "lon": "2.69611",
+          "id": 132769
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Sint-Jozef",
+      "names": {
+        "fr": "Saint-Joseph",
+        "vls": "Sint-Jozef",
+        "nl": "Sint-Jozef"
+      },
+      "lat": "51.22561",
+      "lon": "3.23163",
+      "id": 1677380553,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Emile en Dora Rommelaerestraat",
+          "lat": "51.22929",
+          "lon": "3.24316",
+          "id": 132717
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Guillemins",
+      "lat": "50.62513",
+      "lon": "5.57138",
+      "id": 23620263899,
+      "type": "SUBURB",
+      "listOfStreets": [
+        {
+          "name": "Avenue Emile Digneffe",
+          "lat": "50.61993",
+          "lon": "5.57415",
+          "id": 188340,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Place du Général Leman",
+              "lat": "50.61993",
+              "lon": "5.57415"
+            },
+            {
+              "name": "Rue Ernest Solvay",
+              "lat": "50.61982",
+              "lon": "5.57425"
+            },
+            {
+              "name": "Quai de Rome",
+              "lat": "50.62054",
+              "lon": "5.57756"
+            },
+            {
+              "name": "Rue de Fétinne",
+              "lat": "50.62054",
+              "lon": "5.57756"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Saint-Gilles - Sint-Gillis",
+      "names": {
+        "ru": "Сен-Жиль",
+        "fr": "Saint-Gilles",
+        "nl": "Sint-Gillis"
+      },
+      "lat": "50.82674",
+      "lon": "4.34567",
+      "id": 26032499,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Feron - Émile Feronstraat",
+          "names": {
+            "old_name:fr": "Rue de Constantinople",
+            "old_name": "Rue de Constantinople - Konstantinopelstraat",
+            "old_name:nl": "Konstantinopelstraat",
+            "fr": "Rue Émile Feron",
+            "nl": "Émile Feronstraat"
+          },
+          "lat": "50.83070",
+          "lon": "4.33595",
+          "id": 13792
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Mouscron",
+      "names": {
+        "pcd": "Moucron",
+        "ru": "Мускрон",
+        "lt": "Mukronas",
+        "fr": "Mouscron",
+        "vls": "Meschroên",
+        "nl": "Moeskroen"
+      },
+      "lat": "50.74333",
+      "lon": "3.21391",
+      "id": 539515887,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Cité Émile Vinck",
+          "lat": "50.72855",
+          "lon": "3.20155",
+          "id": 113891
+        },
+        {
+          "name": "Rue Émile Zola",
+          "lat": "50.74942",
+          "lon": "3.18342",
+          "id": 105815
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Dilbeek",
+      "names": {
+        "ru": "Дилбек"
+      },
+      "lat": "50.84807",
+      "lon": "4.26626",
+      "id": 251470517,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Eylenboschstraat",
+          "lat": "50.83394",
+          "lon": "4.19261",
+          "id": 166356
+        },
+        {
+          "name": "Emile de Blutslaan",
+          "lat": "50.86510",
+          "lon": "4.26488",
+          "id": 58170
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Baelen",
+      "names": {
+        "ru": "Бален",
+        "wa": "Bailou",
+        "fr": "Baelen"
+      },
+      "lat": "50.63119",
+      "lon": "5.97150",
+      "id": 240115271,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Schmuck",
+          "lat": "50.63143",
+          "lon": "5.97678",
+          "id": 103467
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Montignies-sur-Sambre",
+      "lat": "50.40068",
+      "lon": "4.48036",
+      "id": 2603284194,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Dutrieux",
+          "lat": "50.40027",
+          "lon": "4.48126",
+          "id": 123422
+        },
+        {
+          "name": "Rue Émile Tumelaire",
+          "lat": "50.40861",
+          "lon": "4.45315",
+          "id": 245342
+        },
+        {
+          "name": "Place Emile Vandevelde",
+          "lat": "50.41527",
+          "lon": "4.46157",
+          "id": 122634
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Oupeye",
+      "names": {
+        "ru": "Упей",
+        "wa": "Oûpêye",
+        "fr": "Oupeye"
+      },
+      "lat": "50.70919",
+      "lon": "5.64506",
+      "id": 1690252401,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vinck",
+          "lat": "50.70865",
+          "lon": "5.64131",
+          "id": 117951
+        },
+        {
+          "name": "Rue Emile Vandervelde (Vivegnis)",
+          "lat": "50.70251",
+          "lon": "5.64957",
+          "id": 117273
+        },
+        {
+          "name": "Rue Emile de Laveleye",
+          "lat": "50.70558",
+          "lon": "5.67530",
+          "id": 190178
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Seraing",
+      "names": {
+        "ru": "Серен",
+        "lt": "Serenas",
+        "wa": "Serè",
+        "fr": "Seraing"
+      },
+      "lat": "50.59664",
+      "lon": "5.50833",
+      "id": 79443055,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Royer (Jemeppe-Sur-Meuse)",
+          "lat": "50.61251",
+          "lon": "5.49261",
+          "id": 53325
+        },
+        {
+          "name": "Rue Émile Zola",
+          "lat": "50.58117",
+          "lon": "5.50091",
+          "id": 34019
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Onhaye",
+      "names": {
+        "ru": "Оне",
+        "wa": "Onhaye",
+        "fr": "Onhaye"
+      },
+      "lat": "50.24357",
+      "lon": "4.84087",
+      "id": 247722706,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Collard",
+          "lat": "50.23974",
+          "lon": "4.75824",
+          "id": 151309
+        },
+        {
+          "name": "Rue Emile Toussaint",
+          "lat": "50.25029",
+          "lon": "4.78133",
+          "id": 167850
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Weerde",
+      "lat": "50.97228",
+      "lon": "4.47987",
+      "id": 270762994,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Emile Verbruggestraat",
+          "lat": "50.97490",
+          "lon": "4.47656",
+          "id": 49036
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "La Louvière",
+      "names": {
+        "ru": "Ла-Лувьер"
+      },
+      "lat": "50.47949",
+      "lon": "4.18528",
+      "id": 64850883,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Nève",
+          "lat": "50.47104",
+          "lon": "4.19873",
+          "id": 158756
+        },
+        {
+          "name": "Rue Emile Cambier",
+          "lat": "50.45727",
+          "lon": "4.19678",
+          "id": 159836
+        },
+        {
+          "name": "Rue Emile Tilmant",
+          "lat": "50.47594",
+          "lon": "4.21787",
+          "id": 158867
+        },
+        {
+          "name": "Rue Émile Urbain",
+          "lat": "50.46547",
+          "lon": "4.16828",
+          "id": 238032
+        },
+        {
+          "name": "Rue Emile Malbecq",
+          "lat": "50.47704",
+          "lon": "4.18886",
+          "id": 82488
+        },
+        {
+          "name": "Rue Emile Cornez (Trivières)",
+          "lat": "50.44985",
+          "lon": "4.14556",
+          "id": 159486
+        },
+        {
+          "name": "Rue Emile Latteur (Saint-Vaast)",
+          "lat": "50.45186",
+          "lon": "4.15521",
+          "id": 219057
+        },
+        {
+          "name": "rue Emile Verhaeren",
+          "lat": "50.47018",
+          "lon": "4.17577",
+          "id": 158681
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Braine-le-Comte",
+      "names": {
+        "ru": "Брен-ле-Конт",
+        "fr": "Braine-Le-Comte",
+        "nl": "'s-Gravenbrakel"
+      },
+      "lat": "50.61235",
+      "lon": "4.14251",
+      "id": 476260354,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Émile Herman",
+          "lat": "50.60729",
+          "lon": "4.13861",
+          "id": 23680
+        },
+        {
+          "name": "Rue Emile Heuchon",
+          "lat": "50.60741",
+          "lon": "4.14037",
+          "id": 36681
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Fontenoy",
+      "lat": "50.56789",
+      "lon": "3.47337",
+      "id": 257106680,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Vandervelde",
+          "lat": "50.56195",
+          "lon": "3.47696",
+          "id": 236155
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Verviers",
+      "names": {
+        "ru": "Вервье",
+        "lt": "Vervjė",
+        "wa": "Vervî",
+        "fr": "Verviers"
+      },
+      "lat": "50.59323",
+      "lon": "5.86385",
+      "id": 79451344,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Lelarge",
+          "lat": "50.58766",
+          "lon": "5.88348",
+          "id": 123640
+        },
+        {
+          "name": "Avenue Emile Jouret",
+          "lat": "50.59029",
+          "lon": "5.88942",
+          "id": 123665,
+          "intersectedStreets": [
+            {
+              "name": "Rue de Julien Jardon",
+              "lat": "50.59029",
+              "lon": "5.88942"
+            },
+            {
+              "name": "Avenue Fernand Desonay",
+              "lat": "50.59013",
+              "lon": "5.89043"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Faimes",
+      "names": {
+        "wa": "Faime",
+        "fr": "Faimes"
+      },
+      "lat": "50.66525",
+      "lon": "5.26232",
+      "id": 734852986,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Vandervelde (Borlez)",
+          "lat": "50.63138",
+          "lon": "5.24486",
+          "id": 149458
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Antwerpen",
+      "enName": "Antwerp",
+      "names": {
+        "de": "Antwerpen",
+        "fi": "Antwerpen",
+        "ru": "Антверпен",
+        "pt": "Antuérpia",
+        "lt": "Antverpenas",
+        "hr": "Antwerpen",
+        "lv": "Antverpene",
+        "wa": "Anverse",
+        "fr": "Anvers",
+        "hy": "Անտվերպեն",
+        "ka": "ანტვერპენი",
+        "uk": "Антверпен",
+        "sk": "Antverpy",
+        "ca": "Anvers",
+        "sr": "Антверпен",
+        "kn": "ಆಂಟ್ವೆರ್ಪ್",
+        "el": "Αμβέρσα",
+        "it": "Anversa",
+        "es": "Amberes",
+        "zh": "安特卫普",
+        "cs": "Antverpy",
+        "ar": "أنتويرب",
+        "la": "Antverpia",
+        "ja": "アントワープ",
+        "nds": "Antwarp",
+        "pl": "Antwerpia",
+        "he": "אנטוורפן",
+        "nl": "Antwerpen"
+      },
+      "lat": "51.22111",
+      "lon": "4.39970",
+      "id": 1765433658,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Emile Verhaerenlaan (Linkeroever)",
+          "lat": "51.22387",
+          "lon": "4.37848",
+          "id": 61594
+        },
+        {
+          "name": "Emile Dancolaan",
+          "lat": "51.21936",
+          "lon": "4.36685",
+          "id": 206033
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Heysel - Heizel",
+      "names": {
+        "fr": "Heysel",
+        "nl": "Heizel"
+      },
+      "lat": "50.88888",
+      "lon": "4.34072",
+      "id": 1866455868,
+      "type": "SUBURB",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Wauters - Emile Wautersstraat",
+          "lat": "50.88866",
+          "lon": "4.34254",
+          "id": 247336
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Nethen",
+      "lat": "50.78382",
+      "lon": "4.67550",
+      "id": 293576951,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.78205",
+          "lon": "4.69024",
+          "id": 137436
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Halluin",
+      "names": {
+        "nl": "Halewijn"
+      },
+      "lat": "50.78319",
+      "lon": "3.12722",
+      "id": 26692038,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Zola",
+          "lat": "50.78361",
+          "lon": "3.12263",
+          "id": 121895
+        },
+        {
+          "name": "Cité Émile Verroye",
+          "lat": "50.78419",
+          "lon": "3.13293",
+          "id": 121914
+        },
+        {
+          "name": "rue Emile Bostoen",
+          "lat": "50.78495",
+          "lon": "3.13166",
+          "id": 247260
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Vieille-Maison",
+      "lat": "50.53932",
+      "lon": "4.61679",
+      "id": 642194961,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Pirson",
+          "lat": "50.53963",
+          "lon": "4.61565",
+          "id": 39356
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Genappe",
+      "names": {
+        "ru": "Женап",
+        "fr": "Genappe",
+        "nl": "Genepiën"
+      },
+      "lat": "50.61087",
+      "lon": "4.45107",
+      "id": 60115919,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Hecq",
+          "lat": "50.61219",
+          "lon": "4.46828",
+          "id": 30825
+        },
+        {
+          "name": "Rue Emile Boucqueau",
+          "lat": "50.61158",
+          "lon": "4.46599",
+          "id": 179591
+        },
+        {
+          "name": "Rue Emile François",
+          "lat": "50.64939",
+          "lon": "4.48094",
+          "id": 64147
+        },
+        {
+          "name": "Rue Émile Marcq",
+          "lat": "50.61772",
+          "lon": "4.44925",
+          "id": 87922
+        },
+        {
+          "name": "Rue Emile Vandevandel",
+          "lat": "50.61272",
+          "lon": "4.44888",
+          "id": 43911
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Ath",
+      "names": {
+        "ru": "Ат",
+        "fr": "Ath",
+        "nl": "Aat"
+      },
+      "lat": "50.63114",
+      "lon": "3.77696",
+      "id": 33372516,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Carlier (Irchonwelz)",
+          "lat": "50.61832",
+          "lon": "3.77217",
+          "id": 135237
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Corbais",
+      "names": {
+        "ru": "Корбе",
+        "wa": "Côrbåy"
+      },
+      "lat": "50.64565",
+      "lon": "4.65552",
+      "id": 293578193,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Emile Francqui",
+          "lat": "50.65690",
+          "lon": "4.62379",
+          "id": 12455,
+          "buildings": []
+        },
+        {
+          "name": "Rue Emile Francqui",
+          "lat": "50.65896",
+          "lon": "4.62312",
+          "id": 14520
+        },
+        {
+          "name": "Clos Émile Fabry",
+          "lat": "50.64845",
+          "lon": "4.66016",
+          "id": 81198,
+          "intersectedStreets": [
+            {
+              "name": "Rue de la Dîme",
+              "lat": "50.64780",
+              "lon": "4.65837"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Grand-Hallet",
+      "lat": "50.69412",
+      "lon": "5.03406",
+      "id": 719039029,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Duchesne",
+          "lat": "50.69487",
+          "lon": "5.03067",
+          "id": 22848
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Quaregnon",
+      "names": {
+        "pcd": "Cwargnon",
+        "ru": "Кареньон",
+        "fr": "Quaregnon"
+      },
+      "lat": "50.44218",
+      "lon": "3.86369",
+      "id": 1144636557,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Vandervelde (Les Six Chemins)",
+          "lat": "50.43075",
+          "lon": "3.86841",
+          "id": 167416
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Nivelles",
+      "names": {
+        "ru": "Нивель",
+        "fr": "Nivelles",
+        "nl": "Nijvel"
+      },
+      "lat": "50.59769",
+      "lon": "4.32359",
+      "id": 60285677,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.59572",
+          "lon": "4.33134",
+          "id": 35277
+        },
+        {
+          "name": "Place Émile de Lalieux",
+          "lat": "50.59849",
+          "lon": "4.32797",
+          "id": 76307
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Honnelles",
+      "names": {
+        "pcd": "Onele",
+        "fr": "Honnelles"
+      },
+      "lat": "50.35209",
+      "lon": "3.73102",
+      "id": 670209871,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Cornez",
+          "lat": "50.36936",
+          "lon": "3.69823",
+          "id": 172060
+        },
+        {
+          "name": "Rue Emile Delgrange",
+          "lat": "50.35636",
+          "lon": "3.77730",
+          "id": 164479
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Colpach-Haut",
+      "names": {
+        "de": "Obercolpach",
+        "lb": "Uewerkolpech",
+        "fr": "Colpach-Haut"
+      },
+      "lat": "49.76739",
+      "lon": "5.81979",
+      "id": 267038552,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Aline an Émile Mayrischstrooss",
+          "lat": "49.76605",
+          "lon": "5.82065",
+          "id": 23032
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Huy",
+      "names": {
+        "ar": "هوي",
+        "ru": "Юи",
+        "bg": "Юи",
+        "uk": "Юї",
+        "ja": "ユイ",
+        "wa": "Hu",
+        "fa": "اویی",
+        "fr": "Huy",
+        "li": "Hoei",
+        "nl": "Hoei",
+        "zh": "于伊"
+      },
+      "lat": "50.52154",
+      "lon": "5.23574",
+      "id": 60287767,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Cité Émile Vierset",
+          "lat": "50.52932",
+          "lon": "5.24544",
+          "id": 175075,
+          "intersectedStreets": [
+            {
+              "name": "Rue des Vergiers",
+              "lat": "50.52850",
+              "lon": "5.24689"
+            }
+          ]
+        },
+        {
+          "name": "Rue Emile Vandervelde (Gives)",
+          "lat": "50.50630",
+          "lon": "5.15381",
+          "id": 75650
+        },
+        {
+          "name": "Rue Emile Delperée",
+          "lat": "50.52569",
+          "lon": "5.24541",
+          "id": 47016
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Gussignies",
+      "lat": "50.33709",
+      "lon": "3.74125",
+      "id": 315908694,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Sohier",
+          "lat": "50.33745",
+          "lon": "3.74218",
+          "id": 119435
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Lodelinsart",
+      "lat": "50.43186",
+      "lon": "4.44895",
+      "id": 674001006,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Vandervelde",
+          "lat": "50.42566",
+          "lon": "4.42751",
+          "id": 123273
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Carlsbourg",
+      "names": {
+        "ru": "Карльсбур"
+      },
+      "lat": "49.89476",
+      "lon": "5.08304",
+      "id": 416323675,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Gardez",
+          "lat": "49.89426",
+          "lon": "5.08167",
+          "id": 182691
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Schaerbeek - Schaarbeek",
+      "names": {
+        "ru": "Схарбек",
+        "fr": "Schaerbeek",
+        "nl": "Schaarbeek"
+      },
+      "lat": "50.86761",
+      "lon": "4.37372",
+      "id": 66169638,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Square Emile Duployé - Emile Duployésquare",
+          "names": {
+            "fr": "Square Emile Duployé",
+            "nl": "Emile Duployésquare"
+          },
+          "lat": "50.85861",
+          "lon": "4.37925",
+          "id": 3201
+        },
+        {
+          "name": "Avenue Emile Zola - Emile Zolalaan",
+          "names": {
+            "fr": "Avenue Emile Zola",
+            "nl": "Emile Zolalaan"
+          },
+          "lat": "50.87717",
+          "lon": "4.38000",
+          "id": 3385
+        },
+        {
+          "name": "Avenue Emile Verhaeren - Emile Verhaerenlaan",
+          "names": {
+            "fr": "Avenue Emile Verhaeren",
+            "nl": "Emile Verhaerenlaan"
+          },
+          "lat": "50.87493",
+          "lon": "4.37827",
+          "id": 3443
+        },
+        {
+          "name": "Avenue Emile Max - Emile Maxlaan",
+          "names": {
+            "fr": "Avenue Emile Max",
+            "nl": "Emile Maxlaan"
+          },
+          "lat": "50.85170",
+          "lon": "4.39951",
+          "id": 2675
+        },
+        {
+          "name": "Rue Emile Wittmann - Emile Wittmannstraat",
+          "names": {
+            "fr": "Rue Emile Wittmann",
+            "nl": "Emile Wittmannstraat"
+          },
+          "lat": "50.85478",
+          "lon": "4.39033",
+          "id": 3039
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Lambusart",
+      "names": {
+        "ru": "Ламбюзар"
+      },
+      "lat": "50.45729",
+      "lon": "4.55214",
+      "id": 359135665,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Hautem",
+          "lat": "50.46283",
+          "lon": "4.55437",
+          "id": 128219
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Nieuwpoort",
+      "names": {
+        "ru": "Ньивпорт",
+        "fr": "Nieuport"
+      },
+      "lat": "51.13039",
+      "lon": "2.75167",
+      "id": 1651552938,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Verhaerenlaan (Nieuwpoort-Bad)",
+          "lat": "51.14557",
+          "lon": "2.72343",
+          "id": 102070
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Houplines",
+      "lat": "50.69046",
+      "lon": "2.91041",
+      "id": 26694926,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Zola",
+          "lat": "50.69754",
+          "lon": "2.91324",
+          "id": 132629
+        },
+        {
+          "name": "Rue Émile Verhaeren",
+          "lat": "50.69593",
+          "lon": "2.91936",
+          "id": 132643
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Trivières",
+      "names": {
+        "ru": "Тривьер"
+      },
+      "lat": "50.45174",
+      "lon": "4.14760",
+      "id": 1678307480,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Cornez",
+          "lat": "50.44985",
+          "lon": "4.14556",
+          "id": 159487
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Juprelle",
+      "names": {
+        "ru": "Жюпрель",
+        "wa": "Djouprele",
+        "fr": "Juprelle"
+      },
+      "lat": "50.71069",
+      "lon": "5.52906",
+      "id": 305244882,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Grisard",
+          "lat": "50.72704",
+          "lon": "5.50870",
+          "id": 242688
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Boussu",
+      "names": {
+        "pcd": "Boussu-dlé-Mont",
+        "ru": "Буссю",
+        "wa": "Boussu-dlé-Mont",
+        "fr": "Boussu"
+      },
+      "lat": "50.43313",
+      "lon": "3.79610",
+      "id": 476259459,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde (Hornu)",
+          "lat": "50.42739",
+          "lon": "3.83114",
+          "id": 203654
+        },
+        {
+          "name": "Rue Emile Verhaeren (Boussu-Bois)",
+          "lat": "50.41341",
+          "lon": "3.79129",
+          "id": 121818
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Chaudfontaine",
+      "names": {
+        "ru": "Шофонтен",
+        "wa": "Tchôfontinne",
+        "fr": "Chaudfontaine"
+      },
+      "lat": "50.58479",
+      "lon": "5.64697",
+      "id": 360038808,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Vandervelde (Vaux-sous-Chèvremont)",
+          "lat": "50.59878",
+          "lon": "5.63187",
+          "id": 65468
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Beuzet",
+      "names": {
+        "ru": "Бовес",
+        "wa": "Beuzet",
+        "fr": "Beuzet",
+        "nl": "Beuzet"
+      },
+      "lat": "50.53298",
+      "lon": "4.74815",
+      "id": 310104730,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Dewez (Ferooz)",
+          "lat": "50.54048",
+          "lon": "4.73045",
+          "id": 62989
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Halle",
+      "names": {
+        "ru": "Халле",
+        "fr": "Hal",
+        "nl": "Halle"
+      },
+      "lat": "50.73605",
+      "lon": "4.23744",
+      "id": 1677365023,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Dr. Emile Gallemaertstraat",
+          "lat": "50.74064",
+          "lon": "4.22903",
+          "id": 42042
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Serville",
+      "names": {
+        "wa": "Serveye"
+      },
+      "lat": "50.25007",
+      "lon": "4.78066",
+      "id": 518834700,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Toussaint",
+          "lat": "50.25028",
+          "lon": "4.78133",
+          "id": 167851
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Châtelet",
+      "names": {
+        "ru": "Шатле"
+      },
+      "lat": "50.40461",
+      "lon": "4.52435",
+      "id": 64619244,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Hermant",
+          "lat": "50.38974",
+          "lon": "4.51598",
+          "id": 124065
+        },
+        {
+          "name": "Rue Saint-François - Rue Émile Vandervelde",
+          "names": {
+            "left": "Rue Émile Vandervelde",
+            "right": "Rue Saint-François"
+          },
+          "lat": "50.43105",
+          "lon": "4.52036",
+          "id": 148295
+        },
+        {
+          "name": "Rue Émile Vandervelde (Bouffioulx)",
+          "lat": "50.39502",
+          "lon": "4.51879",
+          "id": 123784
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Queue-du-Bois",
+      "lat": "50.63715",
+      "lon": "5.67858",
+      "id": 746916917,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.63814",
+          "lon": "5.67654",
+          "id": 104874
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Woluwe-Saint-Pierre - Sint-Pieters-Woluwe",
+      "names": {
+        "ru": "Волюве-Сен-Пьер",
+        "fr": "Woluwe-Saint-Pierre",
+        "nl": "Sint-Pieters-Woluwe"
+      },
+      "lat": "50.82925",
+      "lon": "4.44330",
+      "id": 66508549,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Avenue Gabriel Emile Lebon - Gabriel Emile Lebonlaan",
+          "lat": "50.82654",
+          "lon": "4.40603",
+          "id": 14772
+        },
+        {
+          "name": "Avenue Emile Laine - Emile Lainelaan",
+          "names": {
+            "fr": "Avenue Emile Laine",
+            "nl": "Emile Lainelaan"
+          },
+          "lat": "50.82515",
+          "lon": "4.42507",
+          "id": 36359
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Soumagne",
+      "names": {
+        "ru": "Сумань",
+        "wa": "Soûmagne",
+        "fr": "Soumagne"
+      },
+      "lat": "50.61477",
+      "lon": "5.73995",
+      "id": 457067470,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Clos Emile Herman",
+          "lat": "50.65572",
+          "lon": "5.71647",
+          "id": 243685,
+          "intersectedStreets": [
+            {
+              "name": "Rue Joly (Heuseux)",
+              "lat": "50.65545",
+              "lon": "5.71727"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Fontaine-l'Évêque",
+      "names": {
+        "ru": "Фонтен-л’Эвек"
+      },
+      "lat": "50.41178",
+      "lon": "4.32462",
+      "id": 64804585,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Marcq",
+          "lat": "50.39729",
+          "lon": "4.33018",
+          "id": 173806
+        },
+        {
+          "name": "Rue Émile Vandervelde (Forchies-la-Marche)",
+          "lat": "50.43091",
+          "lon": "4.32445",
+          "id": 91952
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Beyne-Heusay",
+      "names": {
+        "ru": "Бен-Эзе",
+        "wa": "Binne-Heuzea",
+        "fr": "Beyne-Heusay"
+      },
+      "lat": "50.62206",
+      "lon": "5.65341",
+      "id": 746916916,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde (Queue-du-Bois)",
+          "lat": "50.63814",
+          "lon": "5.67654",
+          "id": 104873
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Montigny-le-Tilleul",
+      "names": {
+        "ru": "Монтиньи-ле-Тийёль"
+      },
+      "lat": "50.37916",
+      "lon": "4.37968",
+      "id": 1024116145,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Vandervelde",
+          "lat": "50.38083",
+          "lon": "4.38329",
+          "id": 122642
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Hensies",
+      "names": {
+        "pcd": "Inzî",
+        "ru": "Анси",
+        "fr": "Hensies"
+      },
+      "lat": "50.43284",
+      "lon": "3.68471",
+      "id": 481030226,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde (Thulin)",
+          "lat": "50.42997",
+          "lon": "3.74215",
+          "id": 176291
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "De Panne",
+      "names": {
+        "ru": "Де-Панне",
+        "fr": "La Panne",
+        "nl": "De Panne"
+      },
+      "lat": "51.09883",
+      "lon": "2.59241",
+      "id": 79395891,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Emile Verhaerenlaan",
+          "lat": "51.09528",
+          "lon": "2.56979",
+          "id": 162787
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Bouffioulx",
+      "lat": "50.39021",
+      "lon": "4.51519",
+      "id": 673961151,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Hermant",
+          "lat": "50.38972",
+          "lon": "4.51598",
+          "id": 124066
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Saint-Nicolas",
+      "names": {
+        "ru": "Сен-Никола",
+        "wa": "Sint-Nicolêye",
+        "fr": "Saint-Nicolas"
+      },
+      "lat": "50.63053",
+      "lon": "5.53943",
+      "id": 469371619,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Vandervelde (Montegnée)",
+          "lat": "50.63682",
+          "lon": "5.51670",
+          "id": 53314,
+          "intersectedStreets": [
+            {
+              "name": "Rue François Cloes",
+              "lat": "50.63694",
+              "lon": "5.51702"
+            },
+            {
+              "name": "Rue Xhavée (Montegnée)",
+              "lat": "50.63706",
+              "lon": "5.51681"
+            },
+            {
+              "name": "Rue Chantraine (Montegnée)",
+              "lat": "50.63655",
+              "lon": "5.51642"
+            },
+            {
+              "name": "Rue Fays (Montegnée)",
+              "lat": "50.63686",
+              "lon": "5.51705"
+            }
+          ]
+        },
+        {
+          "name": "Rue Émile Jeanne",
+          "lat": "50.63388",
+          "lon": "5.51915",
+          "id": 33528
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Ham-sur-Sambre",
+      "names": {
+        "wa": "Han-so-Sambe",
+        "nl": "Ham-sur-Sambre"
+      },
+      "lat": "50.44449",
+      "lon": "4.67348",
+      "id": 688355304,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.44396",
+          "lon": "4.67666",
+          "id": 136393
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Tamines",
+      "names": {
+        "ru": "Тамин",
+        "wa": "Tamène",
+        "nl": "Tamines"
+      },
+      "lat": "50.43410",
+      "lon": "4.60758",
+      "id": 482112928,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Duculot",
+          "lat": "50.43542",
+          "lon": "4.60885",
+          "id": 245797
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Mornimont",
+      "names": {
+        "wa": "Mornîmont",
+        "nl": "Mornimont"
+      },
+      "lat": "50.45552",
+      "lon": "4.70434",
+      "id": 688355309,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Carrefour Emile Stasse",
+          "lat": "50.44918",
+          "lon": "4.70290",
+          "id": 173136,
+          "intersectedStreets": [
+            {
+              "name": "Rue du Longwez",
+              "lat": "50.44920",
+              "lon": "4.70290"
+            }
+          ]
+        },
+        {
+          "name": "Rue Emile Tréfois",
+          "lat": "50.45629",
+          "lon": "4.70507",
+          "id": 200222
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Jemeppe-sur-Sambre",
+      "names": {
+        "ru": "Жемеп-сюр-Самбр",
+        "wa": "Djimepe-so-Sambe",
+        "fr": "Jemeppe-sur-Sambre",
+        "nl": "Jemeppe-sur-Sambre"
+      },
+      "lat": "50.46564",
+      "lon": "4.66867",
+      "id": 688355308,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrefour Emile Stasse",
+          "lat": "50.44917",
+          "lon": "4.70288",
+          "id": 173135,
+          "intersectedStreets": [
+            {
+              "name": "Rue du Longwez",
+              "lat": "50.44917",
+              "lon": "4.70288"
+            }
+          ]
+        },
+        {
+          "name": "Rue Emile Vandervelde (Ham-sur-Sambre)",
+          "lat": "50.44395",
+          "lon": "4.67666",
+          "id": 136392
+        },
+        {
+          "name": "Rue Emile Matelart (Saint-Martin)",
+          "lat": "50.50458",
+          "lon": "4.65080",
+          "id": 66955
+        },
+        {
+          "name": "Rue Emile Tréfois",
+          "lat": "50.45627",
+          "lon": "4.70507",
+          "id": 200221
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Flémalle",
+      "names": {
+        "ru": "Флемаль",
+        "wa": "Flémåle",
+        "fr": "Flémalle"
+      },
+      "lat": "50.60228",
+      "lon": "5.45808",
+      "id": 746110293,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Zola",
+          "lat": "50.56853",
+          "lon": "5.45342",
+          "id": 49266,
+          "intersectedStreets": [
+            {
+              "name": "Avenue du Gros Chêne",
+              "lat": "50.56829",
+              "lon": "5.45325"
+            },
+            {
+              "name": "Rue Bois des Galants",
+              "lat": "50.56819",
+              "lon": "5.45377"
+            },
+            {
+              "name": "Rue des Penseurs",
+              "lat": "50.56819",
+              "lon": "5.45377"
+            }
+          ]
+        },
+        {
+          "name": "Rue Paul-Emile Janson",
+          "lat": "50.60171",
+          "lon": "5.47859",
+          "id": 33226
+        },
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.60092",
+          "lon": "5.47216",
+          "id": 49620
+        },
+        {
+          "name": "Place Emile Vinck",
+          "lat": "50.60218",
+          "lon": "5.44673",
+          "id": 49639,
+          "intersectedStreets": [
+            {
+              "name": "Avenue de la Chapelle (Flémalle-Haute)",
+              "lat": "50.60160",
+              "lon": "5.44546"
+            },
+            {
+              "name": "Chemin des Maisons",
+              "lat": "50.60160",
+              "lon": "5.44546"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Saint-Martin",
+      "names": {
+        "wa": "Sint-Mårtén",
+        "nl": "Saint-Martin"
+      },
+      "lat": "50.50084",
+      "lon": "4.64726",
+      "id": 688355307,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Matelart",
+          "lat": "50.50192",
+          "lon": "4.64945",
+          "id": 232330
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Paliseul",
+      "names": {
+        "wa": "Palijhoû",
+        "fr": "Paliseul"
+      },
+      "lat": "49.90353",
+      "lon": "5.13491",
+      "id": 416323008,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Gardez",
+          "lat": "49.89144",
+          "lon": "5.08169",
+          "id": 182678
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Flémalle-Haute",
+      "names": {
+        "ru": "Флемаль-От",
+        "wa": "Li Hôte Flémåle",
+        "fr": "Flémalle-Haute"
+      },
+      "lat": "50.60184",
+      "lon": "5.44746",
+      "id": 309278555,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Vinck",
+          "lat": "50.60218",
+          "lon": "5.44673",
+          "id": 49640,
+          "intersectedStreets": [
+            {
+              "name": "Avenue de la Chapelle",
+              "lat": "50.60160",
+              "lon": "5.44546"
+            },
+            {
+              "name": "Chemin des Maisons",
+              "lat": "50.60160",
+              "lon": "5.44546"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Lincent",
+      "names": {
+        "ru": "Ленсан",
+        "wa": "Lîssin",
+        "fr": "Lincent",
+        "nl": "Lijsem"
+      },
+      "lat": "50.71161",
+      "lon": "5.03182",
+      "id": 470229233,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Looze (Pellaines)",
+          "lat": "50.71582",
+          "lon": "4.99895",
+          "id": 225610
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Waterloo",
+      "names": {
+        "ru": "Ватерлоо"
+      },
+      "lat": "50.71736",
+      "lon": "4.39781",
+      "id": 130692807,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Avenue Émile Theys",
+          "lat": "50.71709",
+          "lon": "4.38814",
+          "id": 35338
+        },
+        {
+          "name": "Rue Émile Dury",
+          "lat": "50.70628",
+          "lon": "4.37805",
+          "id": 9738
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Bomal",
+      "lat": "50.66814",
+      "lon": "4.87353",
+      "id": 293436466,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Laurent",
+          "lat": "50.66652",
+          "lon": "4.87368",
+          "id": 232187,
+          "intersectedStreets": [
+            {
+              "name": "Rue de Laloux",
+              "lat": "50.66685",
+              "lon": "4.87426"
+            },
+            {
+              "name": "Rue de l'Abyme",
+              "lat": "50.66645",
+              "lon": "4.87342"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Liège",
+      "names": {
+        "de": "Lüttich",
+        "ru": "Льеж",
+        "ast": "Liex",
+        "bg": "Льеж",
+        "lt": "Lježas",
+        "lv": "Lježa",
+        "wa": "Lîdje",
+        "fr": "Liège",
+        "fy": "Luik",
+        "oc": "Lièja",
+        "uk": "Льєж",
+        "ca": "Lieja",
+        "sr": "Лијеж",
+        "kk": "Льеж",
+        "ko": "리에주",
+        "gl": "Liexa",
+        "mr": "लीज",
+        "pnb": "لیج",
+        "el": "Λιέγη",
+        "eo": "Lieĝo",
+        "it": "Liegi",
+        "es": "Lieja",
+        "zh": "列日",
+        "cs": "Lutych",
+        "eu": "Lieja",
+        "ar": "لييج",
+        "th": "ลีแยฌ",
+        "la": "Leodium",
+        "lb": "Léck",
+        "ja": "リエージュ",
+        "fa": "لیژ",
+        "nds": "Lüttich",
+        "vls": "Luuk",
+        "he": "לייז'",
+        "li": "Luuk",
+        "nl": "Luik"
+      },
+      "lat": "50.64514",
+      "lon": "5.57342",
+      "id": 1689207163,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Gérard",
+          "lat": "50.64807",
+          "lon": "5.55378",
+          "id": 30816
+        },
+        {
+          "name": "Rue Émile Zola (Laveu)",
+          "lat": "50.63302",
+          "lon": "5.55286",
+          "id": 163988
+        },
+        {
+          "name": "Rue Emile Vandervelde - Rue Sainte-Marguerite",
+          "lat": "50.64814",
+          "lon": "5.54915",
+          "id": 242972
+        },
+        {
+          "name": "Place Emile Dupont",
+          "lat": "50.63685",
+          "lon": "5.57138",
+          "id": 209271,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Rue Eugène Ysaye",
+              "lat": "50.63632",
+              "lon": "5.56998"
+            },
+            {
+              "name": "Rue Rouveroy",
+              "lat": "50.63666",
+              "lon": "5.57127"
+            },
+            {
+              "name": "Rue du Vertbois",
+              "lat": "50.63745",
+              "lon": "5.57084"
+            }
+          ]
+        },
+        {
+          "name": "Rue Émile Verhaeren",
+          "lat": "50.61385",
+          "lon": "5.58541",
+          "id": 72063
+        },
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.64809",
+          "lon": "5.55037",
+          "id": 217495
+        },
+        {
+          "name": "Boulevard Emile de Laveleye",
+          "lat": "50.61904",
+          "lon": "5.59133",
+          "id": 32322,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Quai des Ardennes",
+              "lat": "50.61897",
+              "lon": "5.59133"
+            },
+            {
+              "name": "Avenue Reine Élisabeth",
+              "lat": "50.61971",
+              "lon": "5.59131"
+            },
+            {
+              "name": "Rue Paul-Joseph Delcloche",
+              "lat": "50.61846",
+              "lon": "5.59303"
+            },
+            {
+              "name": "Rue Stappers",
+              "lat": "50.62049",
+              "lon": "5.59120"
+            },
+            {
+              "name": "Rue de Weltzar",
+              "lat": "50.62096",
+              "lon": "5.59110"
+            },
+            {
+              "name": "Rue de Stavelot",
+              "lat": "50.62193",
+              "lon": "5.59058"
+            },
+            {
+              "name": "Avenue du Luxembourg",
+              "lat": "50.62242",
+              "lon": "5.59026"
+            },
+            {
+              "name": "Quai Mativa",
+              "lat": "50.62298",
+              "lon": "5.58108"
+            },
+            {
+              "name": "Rue des Vennes",
+              "lat": "50.62388",
+              "lon": "5.58895"
+            },
+            {
+              "name": "Rue Joseph Delboeuf",
+              "lat": "50.62398",
+              "lon": "5.58846"
+            },
+            {
+              "name": "Rue de Londres",
+              "lat": "50.62439",
+              "lon": "5.58708"
+            },
+            {
+              "name": "Rue Saint-Vincent (Vennes)",
+              "lat": "50.62441",
+              "lon": "5.58614"
+            },
+            {
+              "name": "Rue de Paris (Vennes)",
+              "lat": "50.62441",
+              "lon": "5.58614"
+            },
+            {
+              "name": "Avenue Albert Mahiels",
+              "lat": "50.62345",
+              "lon": "5.58376"
+            },
+            {
+              "name": "Rue de Verviers (Vennes)",
+              "lat": "50.62355",
+              "lon": "5.58391"
+            },
+            {
+              "name": "Rue de Spa (Vennes)",
+              "lat": "50.62343",
+              "lon": "5.58872"
+            },
+            {
+              "name": "Rue de Fétinne",
+              "lat": "50.62371",
+              "lon": "5.58324"
+            }
+          ]
+        },
+        {
+          "name": "Avenue Emile Jenissen",
+          "lat": "50.64056",
+          "lon": "5.54822",
+          "id": 33433,
+          "intersectedStreets": [
+            {
+              "name": "Rue de Burenville",
+              "lat": "50.64085",
+              "lon": "5.54777"
+            },
+            {
+              "name": "Avenue Olympe Gilbart",
+              "lat": "50.64056",
+              "lon": "5.54822"
+            }
+          ]
+        },
+        {
+          "name": "Rue du Couvent - Rue Emile Vandervelde",
+          "lat": "50.64343",
+          "lon": "5.65472",
+          "id": 205563
+        },
+        {
+          "name": "Rue Émile Collard",
+          "lat": "50.62739",
+          "lon": "5.59498",
+          "id": 88893
+        },
+        {
+          "name": "Avenue Emile Digneffe",
+          "lat": "50.61993",
+          "lon": "5.57412",
+          "id": 188339,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Place du Général Leman",
+              "lat": "50.61993",
+              "lon": "5.57412"
+            },
+            {
+              "name": "Rue Ernest Solvay",
+              "lat": "50.61982",
+              "lon": "5.57423"
+            },
+            {
+              "name": "Quai de Rome",
+              "lat": "50.62054",
+              "lon": "5.57754"
+            },
+            {
+              "name": "Rue de Fétinne",
+              "lat": "50.62054",
+              "lon": "5.57754"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Grand-Manil",
+      "names": {
+        "wa": "Grand-Mayni-dlé-Djiblou",
+        "nl": "Grand-Manil"
+      },
+      "lat": "50.55692",
+      "lon": "4.68303",
+      "id": 301317281,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Somville",
+          "lat": "50.55672",
+          "lon": "4.67608",
+          "id": 66935
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Limbourg",
+      "names": {
+        "de": "Limburg an der Weser",
+        "uk": "Лімбур",
+        "wa": "Limbôr",
+        "it": "Limburgo",
+        "fr": "Limbourg",
+        "nl": "Limburg"
+      },
+      "lat": "50.61228",
+      "lon": "5.94030",
+      "id": 1690226019,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Colette",
+          "lat": "50.62151",
+          "lon": "5.93918",
+          "id": 104509
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Seilles",
+      "names": {
+        "ru": "Сей",
+        "wa": "Seye",
+        "nl": "Seilles"
+      },
+      "lat": "50.49842",
+      "lon": "5.08055",
+      "id": 689778689,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Godfrind",
+          "lat": "50.49403",
+          "lon": "5.08547",
+          "id": 238169
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Leuven",
+      "enName": "Leuven",
+      "names": {
+        "de": "Löwen",
+        "ru": "Лёвен",
+        "pt": "Lovaina",
+        "bg": "Льовен",
+        "el": "Λέουβεν",
+        "lt": "Leuvenas",
+        "it": "Lovanio",
+        "fr": "Louvain",
+        "es": "Lovaina",
+        "zh": "鲁汶",
+        "cs": "Lovaň",
+        "eu": "Lovaina",
+        "ar": "لوفان",
+        "la": "Lovanium",
+        "lb": "Léiwen",
+        "ja": "ルーヴェン",
+        "sk": "Leuven",
+        "sr-latn": "Luven",
+        "he": "לוון",
+        "ro": "Louvain",
+        "ca": "Lovaina",
+        "nl": "Leuven",
+        "sr": "Левен"
+      },
+      "lat": "50.87920",
+      "lon": "4.70116",
+      "id": 1448497912,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Emile Mathieustraat",
+          "lat": "50.86931",
+          "lon": "4.70114",
+          "id": 26638,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Constantin Meunierstraat (Nieuw Kwartier)",
+              "lat": "50.86930",
+              "lon": "4.70097"
+            },
+            {
+              "name": "De Bayostraat",
+              "lat": "50.86949",
+              "lon": "4.70271"
+            },
+            {
+              "name": "Gerard Vander Lindenstraat",
+              "lat": "50.86949",
+              "lon": "4.70271"
+            },
+            {
+              "name": "J.P. Verhaghenstraat",
+              "lat": "50.86949",
+              "lon": "4.70271"
+            }
+          ]
+        },
+        {
+          "name": "Emile Van Arenberghstraat",
+          "lat": "50.87090",
+          "lon": "4.70071",
+          "id": 26647,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Hendrik Consciencestraat (Nieuw Kwartier)",
+              "names": {
+                "etymology:wikidata": "Q378133 (Nieuw Kwartier)"
+              },
+              "lat": "50.87152",
+              "lon": "4.70037"
+            },
+            {
+              "name": "Albert Giraudstraat",
+              "lat": "50.87090",
+              "lon": "4.70071"
+            },
+            {
+              "name": "Constantin Meunierstraat (Nieuw Kwartier)",
+              "lat": "50.87019",
+              "lon": "4.70172"
+            },
+            {
+              "name": "J.P. Verhaghenstraat",
+              "lat": "50.87019",
+              "lon": "4.70172"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Frasnes-lez-Buissenal",
+      "lat": "50.66776",
+      "lon": "3.61944",
+      "id": 61961943,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Résidence Émile Lesaffre",
+          "lat": "50.67330",
+          "lon": "3.61506",
+          "id": 104698
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Vedrin",
+      "names": {
+        "ru": "Ведрен",
+        "wa": "Vedrén",
+        "fr": "Vedrin"
+      },
+      "lat": "50.50196",
+      "lon": "4.87424",
+      "id": 348113363,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Marnach",
+          "lat": "50.50648",
+          "lon": "4.86759",
+          "id": 76931
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Francorchamps",
+      "names": {
+        "ru": "Франкоршан"
+      },
+      "lat": "50.45316",
+      "lon": "5.95283",
+      "id": 258600476,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Jamar",
+          "lat": "50.45480",
+          "lon": "5.95144",
+          "id": 222864,
+          "buildings": []
+        },
+        {
+          "name": "Rue Emile Goedert",
+          "lat": "50.45446",
+          "lon": "5.95199",
+          "id": 43728
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Ways",
+      "lat": "50.61002",
+      "lon": "4.46247",
+      "id": 293583883,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Hecq",
+          "lat": "50.61221",
+          "lon": "4.46828",
+          "id": 30826
+        },
+        {
+          "name": "Rue Emile Boucqueau",
+          "lat": "50.61159",
+          "lon": "4.46599",
+          "id": 179592
+        },
+        {
+          "name": "Rue Emile François",
+          "lat": "50.64939",
+          "lon": "4.48094",
+          "id": 64148
+        },
+        {
+          "name": "Rue Émile Marcq",
+          "lat": "50.61772",
+          "lon": "4.44925",
+          "id": 87923
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Villers-le-Bouillet",
+      "names": {
+        "wa": "Viyé-l'Boulet",
+        "fr": "Villers-le-Bouillet"
+      },
+      "lat": "50.57503",
+      "lon": "5.26191",
+      "id": 734877303,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Docteur Emile Neuville",
+          "lat": "50.60963",
+          "lon": "5.24078",
+          "id": 133166
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Calonne",
+      "lat": "50.57832",
+      "lon": "3.43718",
+      "id": 668024429,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Royer",
+          "lat": "50.57686",
+          "lon": "3.43383",
+          "id": 81707
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Aulne",
+      "lat": "50.36670",
+      "lon": "4.33252",
+      "id": 4217285089,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Vandervelde",
+          "lat": "50.36683",
+          "lon": "4.33241",
+          "id": 13744
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Woluwe-Saint-Lambert - Sint-Lambrechts-Woluwe",
+      "names": {
+        "ru": "Синт-Ламрехтс-Волюве",
+        "fr": "Woluwe-Saint-Lambert",
+        "nl": "Sint-Lambrechts-Woluwe"
+      },
+      "lat": "50.84669",
+      "lon": "4.42848",
+      "id": 66503288,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Avenue Émile Vandervelde - Émile Vanderveldelaan",
+          "names": {
+            "fr": "Avenue Émile Vandervelde",
+            "nl": "Émile Vanderveldelaan"
+          },
+          "lat": "50.84691",
+          "lon": "4.44088",
+          "id": 3453
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Colfontaine",
+      "names": {
+        "pcd": "Colfontinne",
+        "ru": "Кольфонтен",
+        "fr": "Colfontaine"
+      },
+      "lat": "50.40567",
+      "lon": "3.85139",
+      "id": 476285157,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Place Émile Zola",
+          "lat": "50.41749",
+          "lon": "3.85938",
+          "id": 165465
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Mont-Saint-Guibert",
+      "names": {
+        "wa": "Mont-Sint-Gubiet",
+        "fr": "Mont-Saint-Guibert"
+      },
+      "lat": "50.63656",
+      "lon": "4.61269",
+      "id": 1684787428,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Emile Francqui",
+          "lat": "50.65690",
+          "lon": "4.62376",
+          "id": 12456,
+          "buildings": []
+        },
+        {
+          "name": "Rue Emile Francqui (Corbais)",
+          "lat": "50.65896",
+          "lon": "4.62310",
+          "id": 14521
+        },
+        {
+          "name": "Clos Émile Fabry",
+          "lat": "50.64845",
+          "lon": "4.66013",
+          "id": 81199,
+          "intersectedStreets": [
+            {
+              "name": "Rue de la Dîme (Corbais)",
+              "lat": "50.64780",
+              "lon": "4.65835"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Liers",
+      "lat": "50.69338",
+      "lon": "5.56376",
+      "id": 746914256,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Lerousseau",
+          "lat": "50.69402",
+          "lon": "5.56762",
+          "id": 226389
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Braine-le-Château",
+      "names": {
+        "ru": "Брен-ле-Шато",
+        "fr": "Braine-le-Château",
+        "nl": "Kasteelbrakel"
+      },
+      "lat": "50.68279",
+      "lon": "4.26699",
+      "id": 253363794,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Schampaert (Wauthier-Braine)",
+          "lat": "50.68467",
+          "lon": "4.29962",
+          "id": 43679
+        },
+        {
+          "name": "Rue Emile Vandervelde (Wauthier-Braine)",
+          "lat": "50.68732",
+          "lon": "4.30550",
+          "id": 43682
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Saint-Servais",
+      "names": {
+        "wa": "Sint-Serwai",
+        "fr": "Saint-Servais"
+      },
+      "lat": "50.47787",
+      "lon": "4.84525",
+      "id": 685354387,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Melchior",
+          "lat": "50.47283",
+          "lon": "4.83909",
+          "id": 82158
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Bernissart",
+      "names": {
+        "ru": "Бернисар"
+      },
+      "lat": "50.47550",
+      "lon": "3.65047",
+      "id": 476258543,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Cité Emile Carlier",
+          "lat": "50.48119",
+          "lon": "3.65941",
+          "id": 165947
+        },
+        {
+          "name": "Rue Emile Carlier (Blaton)",
+          "lat": "50.49776",
+          "lon": "3.66885",
+          "id": 14487
+        },
+        {
+          "name": "Place Emile Vandervelde (Harchies)",
+          "lat": "50.47653",
+          "lon": "3.68988",
+          "id": 99894
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Sint-Denijs-Westrem",
+      "names": {
+        "ru": "Синт-Денейс-Вестрем"
+      },
+      "lat": "51.01994",
+      "lon": "3.66767",
+      "id": 2428597649,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Emile Andelhofstraat",
+          "lat": "51.02353",
+          "lon": "3.67094",
+          "id": 107334
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Watermael-Boitsfort - Watermaal-Bosvoorde",
+      "names": {
+        "ru": "Ватермаль-Буафор",
+        "fr": "Watermael-Boitsfort",
+        "nl": "Watermaal-Bosvoorde"
+      },
+      "lat": "50.79939",
+      "lon": "4.41582",
+      "id": 66501221,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Avenue Emile Van Becelaere - Emile Van Becelaerelaan",
+          "names": {
+            "fr": "Avenue Emile Van Becelaere",
+            "nl": "Emile Van Becelaerelaan"
+          },
+          "lat": "50.79995",
+          "lon": "4.40575",
+          "id": 14039
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Frameries",
+      "names": {
+        "ru": "Фрамри"
+      },
+      "lat": "50.40876",
+      "lon": "3.89055",
+      "id": 480959936,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Verhaeren (Cité Louis Piérard)",
+          "lat": "50.39666",
+          "lon": "3.90251",
+          "id": 170289
+        },
+        {
+          "name": "Rue Émile Vandervelde",
+          "lat": "50.40457",
+          "lon": "3.89570",
+          "id": 170295
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Ixelles - Elsene",
+      "names": {
+        "ru": "Иксель",
+        "fr": "Ixelles",
+        "nl": "Elsene"
+      },
+      "lat": "50.82229",
+      "lon": "4.38157",
+      "id": 66498145,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Avenue Emile Duray - Emile Duraylaan",
+          "names": {
+            "fr": "Avenue Émile Duray",
+            "nl": "Émile Duraylaan"
+          },
+          "lat": "50.81661",
+          "lon": "4.37644",
+          "id": 216093
+        },
+        {
+          "name": "Rue Émile Banning - Émile Banningstraat",
+          "names": {
+            "fr": "Rue Émile Banning",
+            "nl": "Émile Banningstraat"
+          },
+          "lat": "50.81856",
+          "lon": "4.38204",
+          "id": 4408
+        },
+        {
+          "name": "Rue Paul Émile Janson - Paul Émile Jansonstraat",
+          "names": {
+            "fr": "Rue Paul Émile Janson",
+            "nl": "Paul Émile Jansonstraat"
+          },
+          "lat": "50.82715",
+          "lon": "4.35960",
+          "id": 14656
+        },
+        {
+          "name": "Avenue Émile De Mot - Émile De Motlaan",
+          "names": {
+            "fr": "Avenue Émile De Mot",
+            "nl": "Émile De Motlaan"
+          },
+          "lat": "50.81842",
+          "lon": "4.37434",
+          "id": 14662
+        },
+        {
+          "name": "Avenue Émile de Beco - Émile de Becolaan",
+          "names": {
+            "fr": "Avenue Émile de Beco",
+            "nl": "Émile de Becolaan"
+          },
+          "lat": "50.82363",
+          "lon": "4.38043",
+          "id": 4429
+        },
+        {
+          "name": "Rue Èmile Bouilliot - Èmile Bouilliotstraat",
+          "names": {
+            "fr": "Rue Émile Bouilliot",
+            "nl": "Émile Bouilliotstraat"
+          },
+          "lat": "50.81831",
+          "lon": "4.35483",
+          "id": 247324
+        },
+        {
+          "name": "Rue Émile Claus - Émile Clausstraat",
+          "names": {
+            "fr": "Rue Émile Claus",
+            "nl": "Émile Clausstraat"
+          },
+          "lat": "50.81633",
+          "lon": "4.37001",
+          "id": 13970
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Sambreville",
+      "names": {
+        "ru": "Самбрвиль"
+      },
+      "lat": "50.44098",
+      "lon": "4.61967",
+      "id": 482112931,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Duculot",
+          "lat": "50.43541",
+          "lon": "4.60887",
+          "id": 245796
+        },
+        {
+          "name": "Rue Émile Vandervelde (Moignelée)",
+          "lat": "50.44242",
+          "lon": "4.58203",
+          "id": 136359
+        },
+        {
+          "name": "Rue Émile Zola (Keumiée)",
+          "lat": "50.46324",
+          "lon": "4.59050",
+          "id": 129957
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Vottem",
+      "names": {
+        "ru": "Воттем"
+      },
+      "lat": "50.67265",
+      "lon": "5.58462",
+      "id": 746914268,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Vandervelde",
+          "lat": "50.67292",
+          "lon": "5.58367",
+          "id": 202077,
+          "intersectedStreets": [
+            {
+              "name": "Rue Emile Vandervelde",
+              "lat": "50.67294",
+              "lon": "5.58367"
+            }
+          ]
+        },
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.67347",
+          "lon": "5.58311",
+          "id": 32523
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Zaventem",
+      "names": {
+        "ru": "Завентем"
+      },
+      "lat": "50.88044",
+      "lon": "4.47455",
+      "id": 60166648,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile De Muncklaan",
+          "lat": "50.87625",
+          "lon": "4.48416",
+          "id": 67248
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Sint-Amands",
+      "names": {
+        "ru": "Синт-Амандс",
+        "fr": "Saint-Amand"
+      },
+      "lat": "51.05571",
+      "lon": "4.20182",
+      "id": 73769421,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Verhaerenstraat",
+          "names": {
+            "old_name": "Palingstraat",
+            "etymology:wikidata": "Q193680"
+          },
+          "lat": "51.05816",
+          "lon": "4.20229",
+          "id": 15140
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Orp-le-Grand",
+      "names": {
+        "fr": "Orp-le-Grand"
+      },
+      "lat": "50.70348",
+      "lon": "4.99129",
+      "id": 293416149,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Avenue Emile Vandervelde",
+          "lat": "50.70560",
+          "lon": "4.99155",
+          "id": 205965,
+          "intersectedStreets": [
+            {
+              "name": "Place du 11e Dragons Français",
+              "lat": "50.70381",
+              "lon": "4.99071"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Wihogne",
+      "lat": "50.72774",
+      "lon": "5.50640",
+      "id": 305240961,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Grisard",
+          "lat": "50.72704",
+          "lon": "5.50870",
+          "id": 242689
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Anderlecht",
+      "names": {
+        "ru": "Андерлехт",
+        "uk": "Андерлехт",
+        "wa": "Anderlek",
+        "fr": "Anderlecht",
+        "li": "Anderlech",
+        "nl": "Anderlecht"
+      },
+      "lat": "50.83814",
+      "lon": "4.31235",
+      "id": 66163274,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Hellebaut - Emile Hellebautstraat",
+          "names": {
+            "fr": "Rue Emile Hellebaut",
+            "nl": "Emile Hellebautstraat"
+          },
+          "lat": "50.84036",
+          "lon": "4.29834",
+          "id": 6114
+        },
+        {
+          "name": "Square Emile Vandervelde - Emile Vanderveldesquare",
+          "names": {
+            "language": "fr - nl",
+            "fr": "Square Emile Vandervelde",
+            "nl": "Emile Vanderveldesquare"
+          },
+          "lat": "50.83665",
+          "lon": "4.31763",
+          "id": 233781
+        },
+        {
+          "name": "Square Émile Vandder Bruggen - Emile Vander Bruggensquare",
+          "names": {
+            "fr": "Square Émile Vandder Bruggen",
+            "nl": "Emile Vander Bruggensquare"
+          },
+          "lat": "50.83875",
+          "lon": "4.31291",
+          "id": 31149
+        },
+        {
+          "name": "Avenue Émile Gryson - Emile Grysonlaan",
+          "names": {
+            "fr": "Avenue Émile Gryson",
+            "nl": "Emile Grysonlaan"
+          },
+          "lat": "50.81513",
+          "lon": "4.29417",
+          "id": 96046
+        },
+        {
+          "name": "Rue Emile Versé - Emile Verséstraat",
+          "names": {
+            "fr": "Rue Emile Versé",
+            "nl": "Emile Verséstraat"
+          },
+          "lat": "50.83474",
+          "lon": "4.29713",
+          "id": 4959
+        },
+        {
+          "name": "Rue Émile Carpentier - Emile Carpentierstraat",
+          "names": {
+            "fr": "Rue Émile Carpentier",
+            "nl": "Emile Carpentierstraat"
+          },
+          "lat": "50.83736",
+          "lon": "4.31909",
+          "id": 35758
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Geer",
+      "names": {
+        "ru": "Жер"
+      },
+      "lat": "50.66849",
+      "lon": "5.17106",
+      "id": 351518028,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Lejeune",
+          "lat": "50.66932",
+          "lon": "5.17327",
+          "id": 229594
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Saint-Georges-sur-Meuse",
+      "names": {
+        "wa": "Sint-Djôr-so-Mouze",
+        "fr": "Saint-Georges-sur-Meuse"
+      },
+      "lat": "50.60007",
+      "lon": "5.35789",
+      "id": 258889426,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Delcour",
+          "lat": "50.59882",
+          "lon": "5.37440",
+          "id": 30543
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Saint-Sauveur",
+      "lat": "50.70618",
+      "lon": "3.59774",
+      "id": 672610712,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Deltenre",
+          "lat": "50.70835",
+          "lon": "3.59772",
+          "id": 66048
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Gerpinnes",
+      "names": {
+        "ru": "Жерпинн"
+      },
+      "lat": "50.33782",
+      "lon": "4.52768",
+      "id": 331350597,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Genard",
+          "lat": "50.33990",
+          "lon": "4.53188",
+          "id": 145060
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Cité de Saint-Vaast",
+      "lat": "50.46528",
+      "lon": "4.16659",
+      "id": 4543339338,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Urbain",
+          "lat": "50.46545",
+          "lon": "4.16828",
+          "id": 238033
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Gives",
+      "lat": "50.50750",
+      "lon": "5.15452",
+      "id": 317234977,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.50630",
+          "lon": "5.15383",
+          "id": 75651
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Overijse",
+      "names": {
+        "ru": "Оверейсе"
+      },
+      "lat": "50.77292",
+      "lon": "4.53851",
+      "id": 362632215,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Carelsstraat",
+          "lat": "50.77114",
+          "lon": "4.54023",
+          "id": 98877,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Terhulpensesteenweg",
+              "lat": "50.77128",
+              "lon": "4.54107"
+            },
+            {
+              "name": "Jan-Baptist Dekeyserstraat",
+              "lat": "50.77109",
+              "lon": "4.53997"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Gozée",
+      "names": {
+        "ru": "Гозе"
+      },
+      "lat": "50.33323",
+      "lon": "4.35155",
+      "id": 671657349,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Vandervelde (Aulne)",
+          "lat": "50.36585",
+          "lon": "4.33003",
+          "id": 24229
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Groot-Bijgaarden",
+      "names": {
+        "fr": "Grand-Bigard"
+      },
+      "lat": "50.87071",
+      "lon": "4.26514",
+      "id": 251470642,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Emile de Blutslaan",
+          "lat": "50.86510",
+          "lon": "4.26488",
+          "id": 58171
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Roux",
+      "lat": "50.44278",
+      "lon": "4.39485",
+      "id": 335460915,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Saint Emile",
+          "lat": "50.42680",
+          "lon": "4.40307",
+          "id": 222517
+        },
+        {
+          "name": "Rue Émile Vandervelde",
+          "lat": "50.43981",
+          "lon": "4.37539",
+          "id": 149938
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Waremme",
+      "names": {
+        "ru": "Варем",
+        "wa": "Wareme",
+        "fr": "Waremme",
+        "nl": "Borgworm"
+      },
+      "lat": "50.69769",
+      "lon": "5.25462",
+      "id": 79454553,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Avenue Emile Vandervelde",
+          "lat": "50.69662",
+          "lon": "5.25754",
+          "id": 69790,
+          "intersectedStreets": [
+            {
+              "name": "Avenue Guillaume Joachim",
+              "lat": "50.69662",
+              "lon": "5.25754"
+            },
+            {
+              "name": "Rue Ernest Malvoz",
+              "lat": "50.69566",
+              "lon": "5.25889"
+            },
+            {
+              "name": "Rue du Tram",
+              "lat": "50.69540",
+              "lon": "5.25953"
+            },
+            {
+              "name": "Chemin des Hirondelles",
+              "lat": "50.69540",
+              "lon": "5.25953"
+            },
+            {
+              "name": "Rue du Fond d'Or",
+              "lat": "50.69389",
+              "lon": "5.26340"
+            }
+          ]
+        },
+        {
+          "name": "Rue Emile Marchoul",
+          "lat": "50.67932",
+          "lon": "5.23426",
+          "id": 142039
+        },
+        {
+          "name": "Rue Emile Hallet",
+          "lat": "50.69644",
+          "lon": "5.25142",
+          "id": 151281
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Niel",
+      "names": {
+        "ru": "Нил"
+      },
+      "lat": "51.10987",
+      "lon": "4.33033",
+      "id": 262508108,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Emile Vanderveldelaan",
+          "lat": "51.10700",
+          "lon": "4.32760",
+          "id": 204779
+        },
+        {
+          "name": "Emile Vinckstraat",
+          "lat": "51.11018",
+          "lon": "4.33492",
+          "id": 61081
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Koekelberg",
+      "names": {
+        "ar": "كوكلبرغ",
+        "ru": "Кукельберг"
+      },
+      "lat": "50.86226",
+      "lon": "4.32572",
+      "id": 66192903,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Sergijsels - Emile Sergijselsstraat",
+          "names": {
+            "fr": "Rue Emile Sergijsels",
+            "nl": "Emile Sergijselsstraat"
+          },
+          "lat": "50.86073",
+          "lon": "4.33230",
+          "id": 4708
+        },
+        {
+          "name": "Avenue Émile Bossaert - Émile Bossaertlaan",
+          "names": {
+            "fr": "Avenue Émile Bossaert",
+            "nl": "Émile Bossaertlaan"
+          },
+          "lat": "50.86502",
+          "lon": "4.31844",
+          "id": 4752
+        },
+        {
+          "name": "Rue Emile Deroover - Emile Derooverstraat",
+          "names": {
+            "fr": "Rue Emile Deroover",
+            "nl": "Emile Derooverstraat"
+          },
+          "lat": "50.86513",
+          "lon": "4.31518",
+          "id": 4771
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Marchin",
+      "names": {
+        "ru": "Маршен",
+        "wa": "Mårcin",
+        "fr": "Marchin"
+      },
+      "lat": "50.48020",
+      "lon": "5.22634",
+      "id": 1884725616,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.47648",
+          "lon": "5.21368",
+          "id": 122172
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Ottignies-Louvain-la-Neuve",
+      "names": {
+        "ru": "Оттиньи-Лувен-ла-Нёв"
+      },
+      "lat": "50.66542",
+      "lon": "4.56742",
+      "id": 292453525,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Goes (Louvain-la-Neuve)",
+          "lat": "50.66461",
+          "lon": "4.61765",
+          "id": 94547
+        },
+        {
+          "name": "Avenue Émile Verhaeren (Louvain-la-Neuve)",
+          "lat": "50.66147",
+          "lon": "4.60889",
+          "id": 94577,
+          "intersectedStreets": [
+            {
+              "name": "Avenue des Arts (Louvain-la-Neuve)",
+              "lat": "50.66256",
+              "lon": "4.60750"
+            },
+            {
+              "name": "Rue Victor Horta (Louvain-la-Neuve)",
+              "lat": "50.66256",
+              "lon": "4.60750"
+            },
+            {
+              "name": "Rue Achille Chavée (Louvain-la-Neuve)",
+              "lat": "50.66187",
+              "lon": "4.60840"
+            },
+            {
+              "name": "Rue Marie Gevers (Louvain-la-Neuve)",
+              "lat": "50.66187",
+              "lon": "4.60840"
+            },
+            {
+              "name": "Rue Albert Mockel (Louvain-la-Neuve)",
+              "lat": "50.66140",
+              "lon": "4.60900"
+            },
+            {
+              "name": "Parvis de la Cantilène (Louvain-la-Neuve)",
+              "lat": "50.66160",
+              "lon": "4.61001"
+            }
+          ]
+        },
+        {
+          "name": "Rue Émile Mathéi",
+          "lat": "50.68482",
+          "lon": "4.56971",
+          "id": 64255
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Gosselies",
+      "names": {
+        "ru": "Госли",
+        "ro": "cazare"
+      },
+      "lat": "50.46539",
+      "lon": "4.43017",
+      "id": 335461892,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Place Émile Bertaux",
+          "lat": "50.46686",
+          "lon": "4.43161",
+          "id": 208149
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Pepinster",
+      "names": {
+        "wa": "Pepinster",
+        "fr": "Pepinster"
+      },
+      "lat": "50.56752",
+      "lon": "5.80370",
+      "id": 534717923,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde (Wegnez)",
+          "lat": "50.57757",
+          "lon": "5.82593",
+          "id": 74909
+        },
+        {
+          "name": "Rue Émile Fairon",
+          "lat": "50.56534",
+          "lon": "5.80997",
+          "id": 117609
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Berloz",
+      "names": {
+        "wa": "Bierlô",
+        "fr": "Berloz"
+      },
+      "lat": "50.69774",
+      "lon": "5.21462",
+      "id": 734838286,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Muselle",
+          "lat": "50.70177",
+          "lon": "5.21074",
+          "id": 151433
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Herstal",
+      "names": {
+        "ru": "Эрсталь",
+        "wa": "Hèsta",
+        "fr": "Herstal"
+      },
+      "lat": "50.67019",
+      "lon": "5.64039",
+      "id": 1933469358,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Vandervelde (Vottem)",
+          "lat": "50.67292",
+          "lon": "5.58369",
+          "id": 202076,
+          "intersectedStreets": [
+            {
+              "name": "Rue Emile Vandervelde (Vottem)",
+              "lat": "50.67294",
+              "lon": "5.58369"
+            }
+          ]
+        },
+        {
+          "name": "Rue Emile Tilman",
+          "lat": "50.66988",
+          "lon": "5.63575",
+          "id": 136537
+        },
+        {
+          "name": "Rue Emile Muraille",
+          "lat": "50.67570",
+          "lon": "5.61944",
+          "id": 19991
+        },
+        {
+          "name": "Rue Emile Vinck",
+          "lat": "50.67687",
+          "lon": "5.61777",
+          "id": 117284
+        },
+        {
+          "name": "Rue Émile Lerousseau (Liers)",
+          "lat": "50.69761",
+          "lon": "5.56833",
+          "id": 32506
+        },
+        {
+          "name": "Rue Emile Vandervelde (Vottem)",
+          "lat": "50.67348",
+          "lon": "5.58314",
+          "id": 32522
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Fléron",
+      "names": {
+        "ru": "Флерон",
+        "wa": "Fléron",
+        "fr": "Fléron"
+      },
+      "lat": "50.61684",
+      "lon": "5.68321",
+      "id": 358184078,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandevelde",
+          "lat": "50.61052",
+          "lon": "5.66495",
+          "id": 64913
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Oostende",
+      "enName": "Ostend",
+      "names": {
+        "de": "Ostende",
+        "ru": "Остенде",
+        "uk": "Остенде",
+        "lt": "Ostendė",
+        "it": "Ostenda",
+        "fr": "Ostende",
+        "pl": "Ostenda",
+        "vls": "Ostende",
+        "he": "אוסטנדה",
+        "es": "Ostende",
+        "nl": "Oostende"
+      },
+      "lat": "51.23032",
+      "lon": "2.92032",
+      "id": 1651555409,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Roosestraat",
+          "lat": "51.20905",
+          "lon": "2.89129",
+          "id": 25720
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Knokke",
+      "names": {
+        "ru": "Кнокке",
+        "fr": "Knocke",
+        "vls": "Knokke-Heist"
+      },
+      "lat": "51.34645",
+      "lon": "3.28764",
+      "id": 1395162377,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Verhaerenlaan (Het Zoute)",
+          "lat": "51.35296",
+          "lon": "3.30388",
+          "id": 162982
+        },
+        {
+          "name": "Emile Raespad",
+          "lat": "51.33845",
+          "lon": "3.28395",
+          "id": 222497
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Borlez",
+      "lat": "50.63298",
+      "lon": "5.24507",
+      "id": 734856622,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Vandervelde",
+          "lat": "50.63138",
+          "lon": "5.24486",
+          "id": 149459
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Antoing",
+      "names": {
+        "ru": "Антуан"
+      },
+      "lat": "50.56591",
+      "lon": "3.45132",
+      "id": 1766146864,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Vandervelde (Fontenoy)",
+          "lat": "50.56195",
+          "lon": "3.47696",
+          "id": 236156
+        },
+        {
+          "name": "Rue Emile Royer (Calonne)",
+          "lat": "50.57686",
+          "lon": "3.43383",
+          "id": 81708
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Les Bons Villers",
+      "names": {
+        "ru": "Ле-Бон-Виллер"
+      },
+      "lat": "50.52264",
+      "lon": "4.47635",
+      "id": 138133013,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Gossiaux (Villers-Perwin)",
+          "lat": "50.52373",
+          "lon": "4.47738",
+          "id": 182271
+        },
+        {
+          "name": "Avenue Emile Stassart",
+          "lat": "50.50304",
+          "lon": "4.46519",
+          "id": 40547
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Jumet",
+      "lat": "50.44213",
+      "lon": "4.43502",
+      "id": 2603357469,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Ruiters",
+          "lat": "50.45205",
+          "lon": "4.41494",
+          "id": 160226
+        },
+        {
+          "name": "Rue Émile Strimelle",
+          "lat": "50.43507",
+          "lon": "4.42573",
+          "id": 160335
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Mellet",
+      "names": {
+        "ru": "Мелле"
+      },
+      "lat": "50.50412",
+      "lon": "4.47626",
+      "id": 138138122,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Avenue Emile Stassart",
+          "lat": "50.50303",
+          "lon": "4.46519",
+          "id": 40548
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Villers-Perwin",
+      "lat": "50.52620",
+      "lon": "4.47839",
+      "id": 138133008,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Gossiaux (Les Bons Villers)",
+          "lat": "50.52373",
+          "lon": "4.47740",
+          "id": 182272
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Namur",
+      "enName": "Namur",
+      "names": {
+        "de": "Namur",
+        "ru": "Намюр",
+        "lt": "Namiūras",
+        "eo": "Namuro",
+        "wa": "Nameur",
+        "it": "Namur",
+        "fr": "Namur",
+        "es": "Namur",
+        "zh": "那慕爾",
+        "ar": "نامور",
+        "la": "Namurcum",
+        "lb": "Namouer",
+        "uk": "Намюр",
+        "nl": "Namen",
+        "sr": "Намир"
+      },
+      "lat": "50.46653",
+      "lon": "4.86619",
+      "id": 1765500676,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde (Flawinne)",
+          "lat": "50.45842",
+          "lon": "4.80437",
+          "id": 157799
+        },
+        {
+          "name": "Rue Emile Marnach",
+          "lat": "50.50648",
+          "lon": "4.86759",
+          "id": 76930
+        },
+        {
+          "name": "Rue Emile Dessenius",
+          "lat": "50.46167",
+          "lon": "4.81248",
+          "id": 72888
+        },
+        {
+          "name": "Rue Emile Melchior",
+          "lat": "50.47283",
+          "lon": "4.83909",
+          "id": 82157
+        },
+        {
+          "name": "Rue Emile Mazy (Flawinne)",
+          "lat": "50.45895",
+          "lon": "4.79390",
+          "id": 147807
+        },
+        {
+          "name": "Rue Émile Cuvelier",
+          "names": {
+            "etymology:wikidata": "Q2997972"
+          },
+          "lat": "50.46492",
+          "lon": "4.86514",
+          "id": 10017
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Wattrelos",
+      "lat": "50.70086",
+      "lon": "3.22226",
+      "id": 26692462,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Allée Emile Verhaeren",
+          "lat": "50.70615",
+          "lon": "3.24101",
+          "id": 226514
+        },
+        {
+          "name": "Rangée Émile Brelle",
+          "lat": "50.71548",
+          "lon": "3.20790",
+          "id": 137707
+        },
+        {
+          "name": "Rue Émile Basly",
+          "lat": "50.70266",
+          "lon": "3.21674",
+          "id": 112449
+        },
+        {
+          "name": "Rue Émile Zola",
+          "lat": "50.71085",
+          "lon": "3.19385",
+          "id": 203632
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Estinnes",
+      "lat": "50.39767",
+      "lon": "4.09758",
+      "id": 477197902,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Heulers",
+          "lat": "50.34939",
+          "lon": "4.11794",
+          "id": 162196
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Marche-en-Famenne",
+      "names": {
+        "ru": "Марш-ан-Фамен",
+        "wa": "Måtche-el-Famene",
+        "fr": "Marche-en-Famenne"
+      },
+      "lat": "50.22408",
+      "lon": "5.34287",
+      "id": 30103479,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Herman",
+          "lat": "50.16806",
+          "lon": "5.28498",
+          "id": 156848
+        },
+        {
+          "name": "Rue Émile Demelenne",
+          "lat": "50.23417",
+          "lon": "5.34292",
+          "id": 113077
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Mazy",
+      "names": {
+        "ru": "Мази",
+        "wa": "Mazi",
+        "fr": "Mazy",
+        "nl": "Mazy"
+      },
+      "lat": "50.51276",
+      "lon": "4.67451",
+      "id": 61146471,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Pirson",
+          "lat": "50.50823",
+          "lon": "4.67378",
+          "id": 32208
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Le Rœulx",
+      "names": {
+        "ru": "Рё"
+      },
+      "lat": "50.50340",
+      "lon": "4.11223",
+      "id": 77821552,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde (Mignault)",
+          "lat": "50.53572",
+          "lon": "4.16749",
+          "id": 95629
+        },
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.50345",
+          "lon": "4.10972",
+          "id": 97740
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Péruwelz",
+      "names": {
+        "ru": "Перювельз"
+      },
+      "lat": "50.50979",
+      "lon": "3.59088",
+      "id": 79427177,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Baijot",
+          "lat": "50.49678",
+          "lon": "3.60371",
+          "id": 158665
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Flawinne",
+      "names": {
+        "ru": "Флавин",
+        "wa": "Flawene",
+        "fr": "Flawinne"
+      },
+      "lat": "50.45660",
+      "lon": "4.81208",
+      "id": 685352654,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.45842",
+          "lon": "4.80435",
+          "id": 157800
+        },
+        {
+          "name": "Rue Emile Dessenius",
+          "lat": "50.46166",
+          "lon": "4.81248",
+          "id": 72889
+        },
+        {
+          "name": "Rue Emile Mazy",
+          "lat": "50.45895",
+          "lon": "4.79388",
+          "id": 147808
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Comblain-au-Pont",
+      "names": {
+        "wa": "Comblin-å-Pont",
+        "fr": "Comblain-au-Pont"
+      },
+      "lat": "50.47570",
+      "lon": "5.57485",
+      "id": 611164729,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.47286",
+          "lon": "5.57914",
+          "id": 163087
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Goutroux",
+      "lat": "50.41286",
+      "lon": "4.35754",
+      "id": 672056852,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Moureau",
+          "lat": "50.41287",
+          "lon": "4.35713",
+          "id": 204394
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Uccle - Ukkel",
+      "names": {
+        "ru": "Юккел-Юкль",
+        "fr": "Uccle",
+        "nl": "Ukkel"
+      },
+      "lat": "50.80182",
+      "lon": "4.33724",
+      "id": 66199982,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Regard - Emile Regardstraat",
+          "names": {
+            "fr": "Rue Emile Regard",
+            "nl": "Emile Regardstraat"
+          },
+          "lat": "50.81250",
+          "lon": "4.33823",
+          "id": 14572
+        },
+        {
+          "name": "Rue Émile Claus - Émile Clausstraat",
+          "names": {
+            "fr": "Rue Émile Claus",
+            "nl": "Émile Clausstraat"
+          },
+          "lat": "50.81563",
+          "lon": "4.36741",
+          "id": 14658
+        },
+        {
+          "name": "Rue Emile Lecomte - Emile Lecomtestraat",
+          "names": {
+            "fr": "Rue Emile Lecomte",
+            "nl": "Emile Lecomtestraat"
+          },
+          "lat": "50.81137",
+          "lon": "4.34413",
+          "id": 13867
+        },
+        {
+          "name": "Place Emile Danco - Emile Dancoplein",
+          "names": {
+            "fr": "Place Émile Danco",
+            "nl": "Émile Dancoplein"
+          },
+          "lat": "50.80058",
+          "lon": "4.33775",
+          "id": 14910
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Isnes",
+      "names": {
+        "wa": "Les Înes",
+        "fr": "Isnes",
+        "nl": "Isnes"
+      },
+      "lat": "50.51052",
+      "lon": "4.74069",
+      "id": 310110233,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Marchal",
+          "lat": "50.50341",
+          "lon": "4.71610",
+          "id": 221783
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Brugge",
+      "enName": "Bruges",
+      "names": {
+        "de": "Brügge",
+        "ru": "Брюгге",
+        "sv": "Brygge",
+        "pt": "Bruges",
+        "el": "Βρύγη",
+        "lt": "Briugė",
+        "eo": "Bruĝo",
+        "lv": "Brige",
+        "it": "Bruges",
+        "fr": "Bruges",
+        "es": "Brujas",
+        "zh": "布魯日",
+        "cs": "Bruggy",
+        "ar": "بروج",
+        "la": "Brugae",
+        "lb": "Bruges",
+        "sk": "Bruggy",
+        "pl": "Brugia",
+        "ca": "Bruges",
+        "nl": "Brugge",
+        "tr": "Brüj",
+        "sr": "Бриж"
+      },
+      "lat": "51.20855",
+      "lon": "3.22676",
+      "id": 1651558422,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Emile Bethuynelaan",
+          "lat": "51.16468",
+          "lon": "3.18908",
+          "id": 205073
+        },
+        {
+          "name": "Emile en Dora Rommelaerestraat",
+          "lat": "51.22929",
+          "lon": "3.24313",
+          "id": 132716
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Bruxelles - Brussel",
+      "enName": "Brussels",
+      "names": {
+        "pt": "Bruxelas",
+        "hr": "Brisel",
+        "ht": "Briksèl",
+        "hu": "Brüsszel",
+        "yi": "בריסל",
+        "hy": "Բրյուսել",
+        "nah": "Brusel",
+        "pms": "Brussel",
+        "ia": "Brussel",
+        "id": "Brussel",
+        "nap": "Bruxelles",
+        "scn": "Bruxelles",
+        "ext": "Brusselas",
+        "qu": "Brussel",
+        "af": "Brussel",
+        "frp": "Brussèles",
+        "pnb": "برسلز",
+        "io": "Bruxel",
+        "is": "Brussel",
+        "it": "Bruxelles",
+        "am": "ብሩክሴል",
+        "an": "Bruselas",
+        "zh": "布魯塞爾",
+        "ar": "بروكسل",
+        "stq": "Brussel",
+        "ja": "ブリュッセル",
+        "zh-min-nan": "Brussels",
+        "ro": "Bruxelles",
+        "be": "Брусель",
+        "ru": "Брюссель",
+        "bg": "Брюксел",
+        "jv": "Brussel",
+        "bo": "པུའུ་ལུའུ་སེལ​།",
+        "br": "Brusel",
+        "bs": "Brisel",
+        "arc": "ܒܪܘܟܣܠ",
+        "sh": "Bruxelles",
+        "ka": "ბრიუსელი",
+        "wuu": "布鲁塞尔",
+        "sk": "Brusel",
+        "sl": "Bruselj",
+        "ca": "Brussel·les",
+        "sq": "Brukseli",
+        "sr": "Брисел",
+        "kk": "Бруссел",
+        "kl": "Bruxelles",
+        "ce": "Бруссель",
+        "kn": "ಬ್ರಸೆಲ್ಸ್",
+        "sv": "Bryssel",
+        "ko": "브뤼셀",
+        "sw": "Brussels",
+        "ku": "Bruksel",
+        "kv": "Брюссель",
+        "kw": "Brusselas",
+        "tpi": "Brussels",
+        "ta": "பிரசெல்சு",
+        "cs": "Brusel",
+        "tg": "Брюссел",
+        "th": "บรัสเซลส์",
+        "la": "Bruxellae",
+        "cy": "Brwsel",
+        "lb": "Bréissel",
+        "nds": "Brüssel",
+        "vls": "Brussel",
+        "da": "Bruxelles",
+        "li": "Brussel",
+        "tr": "Brüksel",
+        "be-tarask": "Брусэль",
+        "de": "Brüssel",
+        "ln": "Bruxelles",
+        "ast": "Bruxeles",
+        "rue": "Брусел",
+        "lt": "Briuselis",
+        "lv": "Brisele",
+        "simple": "Brussels",
+        "lij": "Bruxelles",
+        "diq": "Bruksel",
+        "lad": "Bruselas",
+        "ug": "Bryussél",
+        "vec": "Borseła",
+        "uk": "Брюссель",
+        "zea": "Brussel",
+        "mg": "Brussel",
+        "mi": "Parahara",
+        "ur": "برسلز",
+        "mk": "Брисел",
+        "pap": "Brusela",
+        "vep": "Brüssel'",
+        "mn": "Брюссель",
+        "mr": "ब्रसेल्स",
+        "ms": "Brussels",
+        "el": "Βρυξέλλες",
+        "mt": "Brussell",
+        "tzl": "Brüxell",
+        "eo": "Bruselo",
+        "my": "ဘရပ်ဆဲလ်မြို့",
+        "es": "Bruselas",
+        "et": "Brüssel",
+        "eu": "Brusela",
+        "na": "Brussels",
+        "vi": "Bruxelles",
+        "bat-smg": "Briuselis",
+        "fa": "بروکسل",
+        "nl": "Brussel",
+        "nn": "Brussel",
+        "no": "Brussel",
+        "fi": "Bryssel",
+        "yue": "布魯塞爾",
+        "fo": "Brussel",
+        "wa": "Brussele",
+        "fr": "Bruxelles",
+        "kab": "Bruxelles",
+        "fy": "Brussel",
+        "nov": "Bruxelles",
+        "oc": "Brussèlas",
+        "crh": "Brüksel",
+        "ga": "An Bhruiséil",
+        "ang": "Brysel",
+        "sah": "Брүссель",
+        "gd": "A' Bhruiseal",
+        "os": "Брюссель",
+        "szl": "Bruksela",
+        "gl": "Bruxelas",
+        "gv": "Yn Vrussyl",
+        "ckb": "برۆکسل",
+        "pl": "Bruksela",
+        "sr-latn": "Brisel",
+        "he": "בריסל"
+      },
+      "lat": "50.84656",
+      "lon": "4.35170",
+      "id": 1635651356,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Rue Paul Émile Janson - Paul Émile Jansonstraat",
+          "names": {
+            "fr": "Rue Paul Émile Janson",
+            "nl": "Paul Émile Jansonstraat"
+          },
+          "lat": "50.82820",
+          "lon": "4.36217",
+          "id": 14608
+        },
+        {
+          "name": "Boulevard Emile Jacqmain - Emile Jacqmainlaan",
+          "names": {
+            "old_name:fr": "Boulevard de la Senne",
+            "old_name": "Boulevard de la Senne - Zennelaan",
+            "old_name:nl": "Zennelaan",
+            "fr": "Boulevard Emile Jacqmain",
+            "nl": "Emile Jacqmainlaan"
+          },
+          "lat": "50.85455",
+          "lon": "4.35417",
+          "id": 14844
+        },
+        {
+          "name": "Avenue Emile Van Ermengem - Emile Van Ermengemlaan",
+          "lat": "50.89206",
+          "lon": "4.33132",
+          "id": 5934
+        },
+        {
+          "name": "Rue Emile Wauters - Emile Wautersstraat",
+          "lat": "50.88702",
+          "lon": "4.34290",
+          "id": 5985
+        },
+        {
+          "name": "Boulevard Émile Bockstael - Emile Bockstaellaan",
+          "names": {
+            "fr": "Boulevard Émile Bockstael",
+            "nl": "Emile Bockstaellaan"
+          },
+          "lat": "50.87194",
+          "lon": "4.34466",
+          "id": 5992
+        },
+        {
+          "name": "Rue Émile Delva - Émile Delvastraat",
+          "lat": "50.88260",
+          "lon": "4.34142",
+          "id": 5999
+        },
+        {
+          "name": "Place Émile Bockstael - Emile Bockstaelplein",
+          "names": {
+            "fr": "Place Émile Bockstael",
+            "nl": "Emile Bockstaelplein"
+          },
+          "lat": "50.87761",
+          "lon": "4.34683",
+          "id": 6065
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Merbes-le-Château",
+      "lat": "50.32340",
+      "lon": "4.16448",
+      "id": 256130286,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde (Fontaine-Valmont)",
+          "lat": "50.32034",
+          "lon": "4.21564",
+          "id": 224568
+        },
+        {
+          "name": "Rue Emile Pourbaix",
+          "lat": "50.31596",
+          "lon": "4.21682",
+          "id": 224570
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Ernage",
+      "names": {
+        "wa": "Ernadje",
+        "nl": "Ernage"
+      },
+      "lat": "50.59420",
+      "lon": "4.67400",
+      "id": 365967231,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Labarre",
+          "lat": "50.59404",
+          "lon": "4.66848",
+          "id": 62537
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Diest",
+      "names": {
+        "ru": "Дист"
+      },
+      "lat": "50.98451",
+      "lon": "5.05034",
+      "id": 64670063,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Vanderveldestraat",
+          "lat": "50.97764",
+          "lon": "5.05472",
+          "id": 124265,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Kloosterbergstraat",
+              "lat": "50.97747",
+              "lon": "5.05448"
+            },
+            {
+              "name": "Montgommerystraat",
+              "lat": "50.97826",
+              "lon": "5.05523"
+            },
+            {
+              "name": "Bloemenlaan",
+              "lat": "50.97871",
+              "lon": "5.05157"
+            },
+            {
+              "name": "Speelhofstraat",
+              "lat": "50.97899",
+              "lon": "5.05032"
+            },
+            {
+              "name": "Frankenstraat",
+              "lat": "50.97952",
+              "lon": "5.04961"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Pironchamps",
+      "lat": "50.42860",
+      "lon": "4.52605",
+      "id": 449218688,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Vandervelde",
+          "lat": "50.42859",
+          "lon": "4.52431",
+          "id": 236378
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Jeuk",
+      "names": {
+        "ru": "Йёк",
+        "fr": "Goyer",
+        "nl": "Jeuk"
+      },
+      "lat": "50.73424",
+      "lon": "5.20969",
+      "id": 1484663298,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Emile Beauduinstraat (Klein-Jeuk)",
+          "lat": "50.71964",
+          "lon": "5.18898",
+          "id": 201150,
+          "intersectedStreets": [
+            {
+              "name": "Kasteelstraat (Klein-Jeuk)",
+              "lat": "50.72168",
+              "lon": "5.18810"
+            },
+            {
+              "name": "Spoorwegstraat (Klein-Jeuk)",
+              "lat": "50.72168",
+              "lon": "5.18810"
+            },
+            {
+              "name": "Kustrijkstraat (Klein-Jeuk)",
+              "lat": "50.72407",
+              "lon": "5.18711"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Dinant",
+      "names": {
+        "ru": "Динан"
+      },
+      "lat": "50.26081",
+      "lon": "4.91241",
+      "id": 2850062184,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Wauthy",
+          "lat": "50.23241",
+          "lon": "4.90563",
+          "id": 242396
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Leernes",
+      "lat": "50.39744",
+      "lon": "4.33078",
+      "id": 427112190,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Marcq",
+          "lat": "50.39730",
+          "lon": "4.33018",
+          "id": 173807
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Marcinelle",
+      "lat": "50.39773",
+      "lon": "4.44425",
+      "id": 674001446,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Avenue Emile Rousseaux",
+          "lat": "50.40260",
+          "lon": "4.42674",
+          "id": 129026
+        },
+        {
+          "name": "Square Émile Buisset",
+          "lat": "50.38316",
+          "lon": "4.45341",
+          "id": 130207
+        },
+        {
+          "name": "Rue Émile Nonnon",
+          "lat": "50.40142",
+          "lon": "4.44266",
+          "id": 127157
+        },
+        {
+          "name": "Rue Émile Vandervelde",
+          "lat": "50.39180",
+          "lon": "4.44043",
+          "id": 140478
+        },
+        {
+          "name": "Rue Émile Cliquet",
+          "lat": "50.39904",
+          "lon": "4.44820",
+          "id": 127182
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Jette",
+      "names": {
+        "ru": "Жет",
+        "fr": "Jette",
+        "nl": "Jette"
+      },
+      "lat": "50.87776",
+      "lon": "4.32608",
+      "id": 66513277,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Delva - Émile Delvastraat",
+          "names": {
+            "fr": "Rue Émile Delva",
+            "nl": "Émile Delvastraat"
+          },
+          "lat": "50.87861",
+          "lon": "4.34252",
+          "id": 52212
+        },
+        {
+          "name": "Avenue Emile Van Ermengem - Emile Van Ermengemlaan",
+          "names": {
+            "fr": "Avenue Emile Van Ermengem",
+            "nl": "Emile Van Ermengemlaan"
+          },
+          "lat": "50.89294",
+          "lon": "4.32524",
+          "id": 2586
+        },
+        {
+          "name": "Rue Emile Wauters - Emile Wautersstraat",
+          "names": {
+            "fr": "Rue Emile Wauters",
+            "nl": "Emile Wautersstraat"
+          },
+          "lat": "50.88702",
+          "lon": "4.34288",
+          "id": 70372
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Manage",
+      "names": {
+        "ru": "Манаж"
+      },
+      "lat": "50.50402",
+      "lon": "4.23555",
+      "id": 673954341,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde (Petit-Bois-d'Haine)",
+          "lat": "50.48205",
+          "lon": "4.21242",
+          "id": 158850
+        },
+        {
+          "name": "Avenue Emile Herman",
+          "lat": "50.48448",
+          "lon": "4.22750",
+          "id": 98455
+        },
+        {
+          "name": "Rue Emile Rousseau",
+          "lat": "50.48409",
+          "lon": "4.23098",
+          "id": 184764
+        },
+        {
+          "name": "Chaussée de Jolimont - Avenue Emile Herman",
+          "lat": "50.47769",
+          "lon": "4.22336",
+          "id": 245605
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Stambruges",
+      "names": {
+        "ru": "Стамбрюж"
+      },
+      "lat": "50.50835",
+      "lon": "3.72025",
+      "id": 203844147,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Paul-Emile Janson",
+          "lat": "50.50981",
+          "lon": "3.71883",
+          "id": 194950
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Couillet",
+      "names": {
+        "ru": "Куйе"
+      },
+      "lat": "50.39122",
+      "lon": "4.46862",
+      "id": 673999413,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Vandervelde",
+          "lat": "50.39197",
+          "lon": "4.46837",
+          "id": 165791
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Blaton",
+      "lat": "50.50117",
+      "lon": "3.66117",
+      "id": 506142776,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Carlier",
+          "lat": "50.50109",
+          "lon": "3.66302",
+          "id": 194078
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Gedinne",
+      "names": {
+        "ru": "Жедин",
+        "wa": "Djedene",
+        "fr": "Gedinne",
+        "nl": "Gedinne"
+      },
+      "lat": "49.97927",
+      "lon": "4.93889",
+      "id": 73813704,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Montreuil",
+          "lat": "49.99511",
+          "lon": "4.88739",
+          "id": 128056
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "La Bifurcation",
+      "lat": "50.47777",
+      "lon": "4.22366",
+      "id": 1799772584,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Chaussée de Jolimont - Avenue Emile Herman",
+          "lat": "50.47769",
+          "lon": "4.22336",
+          "id": 245606
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Hotton",
+      "names": {
+        "ru": "Оттон",
+        "wa": "Houton",
+        "fr": "Hotton"
+      },
+      "lat": "50.26880",
+      "lon": "5.44632",
+      "id": 292660179,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Parfonry",
+          "lat": "50.26187",
+          "lon": "5.43482",
+          "id": 93151
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Perwez",
+      "names": {
+        "ru": "Первез",
+        "wa": "Perwé",
+        "fr": "Perwez",
+        "nl": "Perwijs"
+      },
+      "lat": "50.62345",
+      "lon": "4.81347",
+      "id": 571286635,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Crebeyck",
+          "lat": "50.62351",
+          "lon": "4.81705",
+          "id": 159822
+        },
+        {
+          "name": "Rue Emile Masset",
+          "lat": "50.66123",
+          "lon": "4.82128",
+          "id": 90345
+        },
+        {
+          "name": "Rue Emile de Brabant",
+          "lat": "50.62409",
+          "lon": "4.81448",
+          "id": 128923
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Maret",
+      "lat": "50.71458",
+      "lon": "4.99367",
+      "id": 2084148886,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Avenue Emile Vandervelde",
+          "lat": "50.71393",
+          "lon": "4.99307",
+          "id": 135837,
+          "intersectedStreets": [
+            {
+              "name": "Place de Maret",
+              "lat": "50.71423",
+              "lon": "4.99305"
+            },
+            {
+              "name": "Rue Eugène Malevé",
+              "lat": "50.71423",
+              "lon": "4.99305"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Chapelle-lez-Herlaimont",
+      "names": {
+        "ru": "Шапель-лез-Эрлемон"
+      },
+      "lat": "50.47133",
+      "lon": "4.28042",
+      "id": 348312112,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Duhoux",
+          "lat": "50.44041",
+          "lon": "4.30098",
+          "id": 143585
+        },
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.47635",
+          "lon": "4.28714",
+          "id": 199968
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Pousset",
+      "lat": "50.69564",
+      "lon": "5.30346",
+      "id": 734893372,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Dans",
+          "lat": "50.69519",
+          "lon": "5.30292",
+          "id": 242744,
+          "intersectedStreets": [
+            {
+              "name": "Rue de l'Arbre",
+              "lat": "50.69526",
+              "lon": "5.30311"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Couvin",
+      "names": {
+        "ru": "Кувен",
+        "wa": "Couvén",
+        "nl": "Couvin"
+      },
+      "lat": "50.05249",
+      "lon": "4.49551",
+      "id": 60561637,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Résidence Emile Donnay",
+          "lat": "50.04311",
+          "lon": "4.50246",
+          "id": 107449
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Mettet",
+      "names": {
+        "ru": "Мете",
+        "wa": "Metet",
+        "nl": "Mettet"
+      },
+      "lat": "50.32121",
+      "lon": "4.65850",
+      "id": 252141952,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "rue Emile de Clercq",
+          "lat": "50.27572",
+          "lon": "4.65722",
+          "id": 139160
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Dolhain",
+      "lat": "50.61971",
+      "lon": "5.94126",
+      "id": 207241892,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Colette",
+          "lat": "50.62151",
+          "lon": "5.93918",
+          "id": 104510
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Remicourt",
+      "names": {
+        "ru": "Ремикур",
+        "wa": "Remicoû",
+        "fr": "Remicourt"
+      },
+      "lat": "50.68072",
+      "lon": "5.32672",
+      "id": 734893368,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Dans",
+          "lat": "50.69519",
+          "lon": "5.30292",
+          "id": 242743,
+          "intersectedStreets": [
+            {
+              "name": "Rue de l'Arbre (Pousset)",
+              "lat": "50.69526",
+              "lon": "5.30311"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Messancy",
+      "names": {
+        "de": "Metzig",
+        "lb": "Miezeg",
+        "wa": "Messanceye",
+        "nl": "Messancy"
+      },
+      "lat": "49.59691",
+      "lon": "5.81694",
+      "id": 270800544,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Kirsch",
+          "lat": "49.58565",
+          "lon": "5.81775",
+          "id": 225321
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Rebecq",
+      "names": {
+        "fr": "Rebecq"
+      },
+      "lat": "50.66459",
+      "lon": "4.13554",
+      "id": 675995339,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Avenue Emile Geerts",
+          "lat": "50.66048",
+          "lon": "4.14343",
+          "id": 69947
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Comines-Warneton",
+      "names": {
+        "pcd": "Comène-Warneuton",
+        "ru": "Комин-Варнетон",
+        "fr": "Comines-Warneton",
+        "nl": "Komen-Waasten"
+      },
+      "lat": "50.76830",
+      "lon": "3.00013",
+      "id": 1719301306,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Cauche",
+          "names": {
+            "fr": "Emile Cauchestraat"
+          },
+          "lat": "50.75431",
+          "lon": "2.94603",
+          "id": 140514
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Rendeux",
+      "names": {
+        "ru": "Рандё"
+      },
+      "lat": "50.23305",
+      "lon": "5.50432",
+      "id": 697215753,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Dupont",
+          "lat": "50.23418",
+          "lon": "5.50254",
+          "id": 125533
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Ans",
+      "names": {
+        "ru": "Анс"
+      },
+      "lat": "50.66243",
+      "lon": "5.51906",
+      "id": 481371644,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde (Loncin)",
+          "lat": "50.65930",
+          "lon": "5.50353",
+          "id": 69794
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Ciney",
+      "names": {
+        "ru": "Сине",
+        "wa": "Cînè",
+        "fr": "Ciney",
+        "nl": "Ciney"
+      },
+      "lat": "50.29495",
+      "lon": "5.09742",
+      "id": 64666967,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Impasse Émile Romnée",
+          "lat": "50.31254",
+          "lon": "5.06431",
+          "id": 152600,
+          "intersectedStreets": [
+            {
+              "name": "Rue d'Yvoir (Halloy)",
+              "lat": "50.31248",
+              "lon": "5.06435"
+            }
+          ]
+        },
+        {
+          "name": "Place Emile Vandervelde",
+          "lat": "50.29112",
+          "lon": "5.09193",
+          "id": 213270,
+          "intersectedStreets": [
+            {
+              "name": "Rue Piervenne",
+              "lat": "50.29153",
+              "lon": "5.09161"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Hermalle-sous-Argenteau",
+      "lat": "50.71054",
+      "lon": "5.68088",
+      "id": 747888133,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile de Laveleye",
+          "lat": "50.70408",
+          "lon": "5.67433",
+          "id": 242607
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Amay",
+      "names": {
+        "ru": "Аме",
+        "wa": "Ama",
+        "fr": "Amay"
+      },
+      "lat": "50.54978",
+      "lon": "5.32410",
+      "id": 258880948,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.54795",
+          "lon": "5.32107",
+          "id": 47785
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Leuze-en-Hainaut",
+      "names": {
+        "ru": "Лёз-ан-Эно"
+      },
+      "lat": "50.59882",
+      "lon": "3.61673",
+      "id": 34078889,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Albot",
+          "lat": "50.62961",
+          "lon": "3.65310",
+          "id": 195230
+        },
+        {
+          "name": "Rue Emile Fontaine",
+          "lat": "50.62438",
+          "lon": "3.63158",
+          "id": 104184
+        },
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.59941",
+          "lon": "3.61714",
+          "id": 101230
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Thuin",
+      "names": {
+        "ru": "Тюэн"
+      },
+      "lat": "50.33974",
+      "lon": "4.28705",
+      "id": 79447645,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Vandervelde (Aulne)",
+          "lat": "50.36683",
+          "lon": "4.33241",
+          "id": 13743
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Ittre",
+      "names": {
+        "ru": "Итр",
+        "fr": "Ittre",
+        "nl": "Itter"
+      },
+      "lat": "50.65020",
+      "lon": "4.26370",
+      "id": 156632951,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Montoisy",
+          "lat": "50.64780",
+          "lon": "4.25881",
+          "id": 36262
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Arlon",
+      "names": {
+        "de": "Arel",
+        "ru": "Арлон",
+        "la": "Orolaunum",
+        "lb": "Arel",
+        "wa": "Årlon",
+        "fr": "Arlon",
+        "nl": "Aarlen"
+      },
+      "lat": "49.68276",
+      "lon": "5.81192",
+      "id": 63111399,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Tandel (Quatre Vents)",
+          "lat": "49.69696",
+          "lon": "5.81016",
+          "id": 227645
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Stavelot",
+      "names": {
+        "de": "Stablo",
+        "ru": "Ставло",
+        "wa": "Ståvleu",
+        "fr": "Stavelot"
+      },
+      "lat": "50.39409",
+      "lon": "5.93084",
+      "id": 79445596,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Jamar",
+          "lat": "50.45480",
+          "lon": "5.95144",
+          "id": 222863,
+          "buildings": []
+        },
+        {
+          "name": "Rue Emile Goedert",
+          "lat": "50.45446",
+          "lon": "5.95199",
+          "id": 43727
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Mons",
+      "names": {
+        "ar": "مونس",
+        "de": "Bergen",
+        "ru": "Монс",
+        "la": "Montes",
+        "fr": "Mons",
+        "nl": "Bergen",
+        "sr": "Монс"
+      },
+      "lat": "50.45496",
+      "lon": "3.95197",
+      "id": 893278148,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Limauge",
+          "lat": "50.47297",
+          "lon": "3.92139",
+          "id": 164192
+        },
+        {
+          "name": "Rue Emile Blairon",
+          "lat": "50.40774",
+          "lon": "4.01100",
+          "id": 208242
+        },
+        {
+          "name": "Rue Émile Vandervelde (Bertaimont)",
+          "lat": "50.44018",
+          "lon": "3.94135",
+          "id": 26027
+        },
+        {
+          "name": "Rue Émile Wauquier (Nouvelles)",
+          "lat": "50.40366",
+          "lon": "3.96287",
+          "id": 245331
+        },
+        {
+          "name": "Rue Émile Jambe",
+          "lat": "50.46453",
+          "lon": "4.04595",
+          "id": 87736
+        },
+        {
+          "name": "Avenue du Gouverneur Émile Cornez",
+          "lat": "50.44856",
+          "lon": "3.96207",
+          "id": 202622
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Thulin",
+      "names": {
+        "ru": "Тюлен"
+      },
+      "lat": "50.42929",
+      "lon": "3.73932",
+      "id": 1376491703,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.42997",
+          "lon": "3.74218",
+          "id": 176292
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Forest - Vorst",
+      "names": {
+        "ru": "Форе-Ворст",
+        "fr": "Forest",
+        "nl": "Vorst"
+      },
+      "lat": "50.80914",
+      "lon": "4.31776",
+      "id": 66197751,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Square Emile des Grées du Loû - Emile des Grées du Loû Square",
+          "names": {
+            "fr": "Square Emile des Grées du Loû",
+            "nl": "Emile des Grées du Loû Square"
+          },
+          "lat": "50.80530",
+          "lon": "4.31123",
+          "id": 7267
+        },
+        {
+          "name": "Rue Emile Pathé - Emile Pathéstraat",
+          "names": {
+            "fr": "Rue Emile Pathé",
+            "nl": "Emile Pathéstraat"
+          },
+          "lat": "50.79933",
+          "lon": "4.30452",
+          "id": 135409
+        },
+        {
+          "name": "Rue Émile Feron - Émile Feronstraat",
+          "lat": "50.82974",
+          "lon": "4.33477",
+          "id": 222734
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Hoeilaart",
+      "names": {
+        "ru": "Хуларт",
+        "fr": "Hoeilaert"
+      },
+      "lat": "50.76748",
+      "lon": "4.47440",
+      "id": 252608972,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Vandenbroeckstraat",
+          "lat": "50.76750",
+          "lon": "4.47626",
+          "id": 76849
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Angre",
+      "names": {
+        "ru": "Ангр"
+      },
+      "lat": "50.36698",
+      "lon": "3.69544",
+      "id": 248076301,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Cornez",
+          "lat": "50.36827",
+          "lon": "3.69413",
+          "id": 172066
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Habay-la-Neuve",
+      "names": {
+        "de": "Neu-Habich",
+        "lb": "Neihabech",
+        "wa": "Hâbâ-la-Niëf",
+        "fr": "Habay-la-Neuve"
+      },
+      "lat": "49.72861",
+      "lon": "5.65038",
+      "id": 292129645,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Baudrux",
+          "names": {
+            "etymology:wikidata": "Q3588328"
+          },
+          "lat": "49.72792",
+          "lon": "5.64650",
+          "id": 12787
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Quévy",
+      "lat": "50.36672",
+      "lon": "3.94390",
+      "id": 662071665,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Wauquier (Asquillies)",
+          "lat": "50.40050",
+          "lon": "3.96312",
+          "id": 136588
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Chièvres",
+      "lat": "50.58798",
+      "lon": "3.80569",
+      "id": 64619788,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Dooms",
+          "lat": "50.58670",
+          "lon": "3.80520",
+          "id": 198153
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Court-Saint-Etienne",
+      "names": {
+        "ru": "Кур-Сен-Этьен",
+        "wa": "Coû-Sint-Stiene"
+      },
+      "lat": "50.64432",
+      "lon": "4.56857",
+      "id": 292551547,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Henricot",
+          "lat": "50.64566",
+          "lon": "4.56684",
+          "id": 9739
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Hastière-Lavaux",
+      "names": {
+        "ru": "Астьер-Лаво",
+        "wa": "Li Vå-dlé-Astire"
+      },
+      "lat": "50.21654",
+      "lon": "4.82424",
+      "id": 664657228,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Binet",
+          "lat": "50.21627",
+          "lon": "4.82517",
+          "id": 127767,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Rue des Vignes",
+              "lat": "50.21627",
+              "lon": "4.82517"
+            },
+            {
+              "name": "Rue Marcel Lespagne",
+              "lat": "50.21640",
+              "lon": "4.82476"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Gaillemarde",
+      "lat": "50.72232",
+      "lon": "4.44423",
+      "id": 2508733269,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Semal",
+          "lat": "50.72241",
+          "lon": "4.44262",
+          "id": 61341
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Braibant",
+      "names": {
+        "wa": "Braibant",
+        "nl": "Braibant"
+      },
+      "lat": "50.31291",
+      "lon": "5.06296",
+      "id": 366511807,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Impasse Émile Romnée",
+          "lat": "50.31254",
+          "lon": "5.06431",
+          "id": 152601,
+          "intersectedStreets": [
+            {
+              "name": "Rue d'Yvoir",
+              "lat": "50.31248",
+              "lon": "5.06435"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Lessines",
+      "names": {
+        "ru": "Лесин",
+        "fr": "Lessines",
+        "nl": "Lessen"
+      },
+      "lat": "50.71230",
+      "lon": "3.83011",
+      "id": 31353523,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde (Ollignies)",
+          "lat": "50.68658",
+          "lon": "3.86146",
+          "id": 37258
+        },
+        {
+          "name": "Boulevard Emile Schevenels",
+          "lat": "50.71260",
+          "lon": "3.82474",
+          "id": 28492
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Zemst",
+      "names": {
+        "ru": "Земст"
+      },
+      "lat": "50.98421",
+      "lon": "4.46508",
+      "id": 270762769,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Verbruggestraat",
+          "lat": "50.97490",
+          "lon": "4.47656",
+          "id": 49035
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Dampremy",
+      "lat": "50.41862",
+      "lon": "4.43225",
+      "id": 673999641,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Fourcault",
+          "names": {
+            "old_name": "Rue Frison"
+          },
+          "lat": "50.42237",
+          "lon": "4.43419",
+          "id": 208181
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Vilvoorde",
+      "names": {
+        "ru": "Вилворде",
+        "fr": "Vilvorde",
+        "nl": "Vilvoorde"
+      },
+      "lat": "50.93089",
+      "lon": "4.43195",
+      "id": 1677252814,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Verhaerenstraat",
+          "lat": "50.93782",
+          "lon": "4.43243",
+          "id": 51153
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Sint-Pieters-Leeuw",
+      "names": {
+        "ru": "Синт-Питерс-Леув",
+        "fr": "Leeuw-Saint-Pierre",
+        "nl": "Sint-Pieters-Leeuw"
+      },
+      "lat": "50.78003",
+      "lon": "4.24437",
+      "id": 251471298,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Vandersteenenstraat",
+          "lat": "50.78189",
+          "lon": "4.27173",
+          "id": 46231
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Erquelinnes",
+      "names": {
+        "ru": "Эркелин"
+      },
+      "lat": "50.31022",
+      "lon": "4.12414",
+      "id": 477193038,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Bosseaux",
+          "lat": "50.30627",
+          "lon": "4.15260",
+          "id": 214086
+        },
+        {
+          "name": "Rue Émile Vandervelde (Solre-sur-Sambre)",
+          "lat": "50.30862",
+          "lon": "4.15785",
+          "id": 212044
+        },
+        {
+          "name": "Rue Émile-Zola",
+          "lat": "50.29086",
+          "lon": "4.11382",
+          "id": 661
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Schepdaal",
+      "names": {
+        "ru": "Схепдал",
+        "fr": "Schepdael"
+      },
+      "lat": "50.83486",
+      "lon": "4.19197",
+      "id": 251471297,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Emile Eylenboschstraat",
+          "lat": "50.83394",
+          "lon": "4.19261",
+          "id": 166357
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Grez-Doiceau",
+      "names": {
+        "ru": "Грес-Дуасо",
+        "wa": "Gré",
+        "fr": "Grez-Doiceau",
+        "nl": "Graven"
+      },
+      "lat": "50.73862",
+      "lon": "4.69623",
+      "id": 292561459,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde (Nethen)",
+          "lat": "50.78206",
+          "lon": "4.69022",
+          "id": 137435
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Piéton",
+      "lat": "50.44096",
+      "lon": "4.29816",
+      "id": 449287621,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Duhoux",
+          "lat": "50.44041",
+          "lon": "4.30098",
+          "id": 143586
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Solre-sur-Sambre",
+      "names": {
+        "ru": "Сольр-сюр-Самбр"
+      },
+      "lat": "50.30677",
+      "lon": "4.15584",
+      "id": 669804720,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Bosseaux",
+          "lat": "50.30625",
+          "lon": "4.15262",
+          "id": 214087
+        },
+        {
+          "name": "Rue Émile Vandervelde",
+          "lat": "50.30861",
+          "lon": "4.15785",
+          "id": 212045
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Menen",
+      "names": {
+        "ru": "Менен",
+        "fr": "Menin",
+        "vls": "Mjinde"
+      },
+      "lat": "50.79699",
+      "lon": "3.11565",
+      "id": 1678309134,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Em. Zolastraat",
+          "lat": "50.80668",
+          "lon": "3.10827",
+          "id": 237572
+        },
+        {
+          "name": "Em. Vanderveldestraat",
+          "lat": "50.80741",
+          "lon": "3.11544",
+          "id": 237394
+        },
+        {
+          "name": "Em. Vandeveldestraat",
+          "lat": "50.80726",
+          "lon": "3.11570",
+          "id": 178656
+        },
+        {
+          "name": "Emile Zolastraat",
+          "lat": "50.80649",
+          "lon": "3.10802",
+          "id": 149312
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "La Cantine",
+      "lat": "50.68406",
+      "lon": "4.29746",
+      "id": 5443456831,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Schampaert",
+          "lat": "50.68466",
+          "lon": "4.29962",
+          "id": 43681
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Sirault",
+      "names": {
+        "ru": "Сиро"
+      },
+      "lat": "50.50606",
+      "lon": "3.78812",
+      "id": 189249614,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Lété",
+          "lat": "50.50407",
+          "lon": "3.78936",
+          "id": 9232
+        },
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.50506",
+          "lon": "3.78528",
+          "id": 9012
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Ramillies",
+      "names": {
+        "ru": "Рамийи"
+      },
+      "lat": "50.63669",
+      "lon": "4.91490",
+      "id": 292561468,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Laurent",
+          "lat": "50.66652",
+          "lon": "4.87368",
+          "id": 232186,
+          "intersectedStreets": [
+            {
+              "name": "Rue de Laloux",
+              "lat": "50.66685",
+              "lon": "4.87426"
+            },
+            {
+              "name": "Rue de L'Abyme",
+              "lat": "50.66645",
+              "lon": "4.87342"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Orp-Jauche",
+      "names": {
+        "ru": "Орп-Жош",
+        "wa": "Oû-Djåce",
+        "fr": "Orp-Jauche"
+      },
+      "lat": "50.70010",
+      "lon": "4.98899",
+      "id": 292561469,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Landeut",
+          "lat": "50.72373",
+          "lon": "4.96571",
+          "id": 150104
+        },
+        {
+          "name": "Avenue Emile Vandervelde (Maret)",
+          "lat": "50.71392",
+          "lon": "4.99309",
+          "id": 135836,
+          "intersectedStreets": [
+            {
+              "name": "Place de Maret",
+              "lat": "50.71422",
+              "lon": "4.99307"
+            },
+            {
+              "name": "Rue Eugène Malevé",
+              "lat": "50.71422",
+              "lon": "4.99307"
+            },
+            {
+              "name": "Rue Léon Jacquemin",
+              "lat": "50.70751",
+              "lon": "4.99264"
+            },
+            {
+              "name": "Rue du Bonsopre",
+              "lat": "50.71243",
+              "lon": "4.99324"
+            },
+            {
+              "name": "Place du 11e Dragons Français",
+              "lat": "50.70381",
+              "lon": "4.99071"
+            },
+            {
+              "name": "Rue Sainte-Barbe (Orp-le-Grand)",
+              "lat": "50.70560",
+              "lon": "4.99153"
+            }
+          ]
+        },
+        {
+          "name": "Rue Emile Looze (Maret)",
+          "lat": "50.71415",
+          "lon": "4.99912",
+          "id": 135833
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Gent",
+      "enName": "Ghent",
+      "names": {
+        "de": "Gent",
+        "hi": "खेंट",
+        "be": "Гент",
+        "ru": "Гент",
+        "ast": "Gante",
+        "pt": "Gante",
+        "bg": "Гент",
+        "lt": "Gentas",
+        "lv": "Ģente",
+        "fr": "Gand",
+        "ug": "Gant",
+        "fy": "Gint",
+        "oc": "Gant",
+        "ka": "გენტი",
+        "uk": "Гент",
+        "ca": "Gant",
+        "sr": "Гент",
+        "mn": "Гент",
+        "ko": "헨트",
+        "os": "Гент",
+        "gl": "Gante - Gent",
+        "mr": "गेंट",
+        "el": "Γάνδη",
+        "eo": "Gento",
+        "it": "Gand",
+        "my": "ဂင့်မြို့",
+        "es": "Gante",
+        "zh": "根特",
+        "eu": "Gante",
+        "ar": "غنت",
+        "na": "Ghent",
+        "th": "เกนต์",
+        "la": "Gandavum",
+        "ja": "ヘント",
+        "tl": "Gante",
+        "vo": "Ghent",
+        "fa": "گنت",
+        "pl": "Gandawa",
+        "he": "גנט",
+        "nl": "Gent"
+      },
+      "lat": "51.05383",
+      "lon": "3.72501",
+      "id": 1668655163,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Emile Braunplein",
+          "names": {
+            "alt_name": "Braunplein"
+          },
+          "lat": "51.05389",
+          "lon": "3.72445",
+          "id": 13411
+        },
+        {
+          "name": "Emile Clauslaan",
+          "lat": "51.03656",
+          "lon": "3.72211",
+          "id": 174215
+        },
+        {
+          "name": "Emile Moysonlaan",
+          "lat": "51.04872",
+          "lon": "3.74722",
+          "id": 193683
+        },
+        {
+          "name": "Emile Andelhofstraat",
+          "lat": "51.02353",
+          "lon": "3.67094",
+          "id": 107333
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Louvain-la-Neuve",
+      "names": {
+        "de": "Neu-Löwen",
+        "ru": "Лувен-ла-Нёв"
+      },
+      "lat": "50.66820",
+      "lon": "4.61288",
+      "id": 60172442,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Francqui",
+          "lat": "50.65896",
+          "lon": "4.62312",
+          "id": 14519
+        },
+        {
+          "name": "Rue Émile Goes (Biéreau)",
+          "lat": "50.66461",
+          "lon": "4.61765",
+          "id": 94546
+        },
+        {
+          "name": "Avenue Émile Verhaeren (Bruyères)",
+          "lat": "50.66147",
+          "lon": "4.60887",
+          "id": 94576,
+          "intersectedStreets": [
+            {
+              "name": "Avenue des Arts (Bruyères)",
+              "lat": "50.66256",
+              "lon": "4.60748"
+            },
+            {
+              "name": "Rue Victor Horta (Bruyères)",
+              "lat": "50.66256",
+              "lon": "4.60748"
+            },
+            {
+              "name": "Rue Achille Chavée (Bruyères)",
+              "lat": "50.66187",
+              "lon": "4.60838"
+            },
+            {
+              "name": "Rue Marie Gevers (Bruyères)",
+              "lat": "50.66187",
+              "lon": "4.60838"
+            },
+            {
+              "name": "Rue Albert Mockel (Bruyères)",
+              "lat": "50.66140",
+              "lon": "4.60898"
+            },
+            {
+              "name": "Parvis de la Cantilène (Bruyères)",
+              "lat": "50.66160",
+              "lon": "4.60999"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Thiméon",
+      "lat": "50.49035",
+      "lon": "4.42813",
+      "id": 673982201,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Vandervelde",
+          "names": {
+            "alt_name": "Rue Emile Vandervelde"
+          },
+          "lat": "50.48106",
+          "lon": "4.43007",
+          "id": 138442
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Saint-Ghislain",
+      "names": {
+        "ru": "Сен-Гилен",
+        "bg": "Сен Гислен",
+        "fa": "سن-گیزلن"
+      },
+      "lat": "50.44775",
+      "lon": "3.81953",
+      "id": 79435626,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Lenoir",
+          "lat": "50.50740",
+          "lon": "3.77146",
+          "id": 9540
+        },
+        {
+          "name": "Rue Emile Lété",
+          "lat": "50.51858",
+          "lon": "3.82215",
+          "id": 177700
+        },
+        {
+          "name": "Rue Emile Vandervelde (Sirault)",
+          "lat": "50.50506",
+          "lon": "3.78531",
+          "id": 9011
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Sombreffe",
+      "names": {
+        "ru": "Сомбреф",
+        "wa": "Sombrefe",
+        "nl": "Sombreffe"
+      },
+      "lat": "50.52466",
+      "lon": "4.60258",
+      "id": 187197428,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Pirson",
+          "lat": "50.53964",
+          "lon": "4.61565",
+          "id": 39355
+        },
+        {
+          "name": "Rue Émile Vandervelde (Ligny)",
+          "lat": "50.50950",
+          "lon": "4.56746",
+          "id": 24483
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Monceau-sur-Sambre",
+      "lat": "50.41702",
+      "lon": "4.38241",
+      "id": 450191735,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Cité Emile Demoulin",
+          "lat": "50.42151",
+          "lon": "4.38084",
+          "id": 206924
+        },
+        {
+          "name": "Rue Émile Constant",
+          "lat": "50.41615",
+          "lon": "4.38816",
+          "id": 160847
+        },
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.41590",
+          "lon": "4.37561",
+          "id": 212071
+        },
+        {
+          "name": "Rue Emile Leclercq",
+          "lat": "50.41668",
+          "lon": "4.37161",
+          "id": 219791
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Vielsalm",
+      "names": {
+        "ru": "Вьельсальм"
+      },
+      "lat": "50.28837",
+      "lon": "5.91702",
+      "id": 251707435,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Tromme",
+          "lat": "50.32363",
+          "lon": "5.90940",
+          "id": 20007
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Marchienne-au-Pont",
+      "lat": "50.40671",
+      "lon": "4.39601",
+      "id": 450191739,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Brunet",
+          "lat": "50.39479",
+          "lon": "4.39303",
+          "id": 207018
+        },
+        {
+          "name": "Rue des Bateliers",
+          "names": {
+            "old_name": "Rue Émile Vandervelde"
+          },
+          "lat": "50.40809",
+          "lon": "4.39500",
+          "id": 207281
+        },
+        {
+          "name": "Rue Saint Emile",
+          "lat": "50.42439",
+          "lon": "4.40146",
+          "id": 160353
+        },
+        {
+          "name": "Rue Émile Royer",
+          "lat": "50.42276",
+          "lon": "4.41992",
+          "id": 142975
+        },
+        {
+          "name": "Rue Émile Gantois",
+          "lat": "50.42129",
+          "lon": "4.41455",
+          "id": 142985
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Landen",
+      "names": {
+        "ru": "Ланден"
+      },
+      "lat": "50.75301",
+      "lon": "5.08131",
+      "id": 77802451,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Moyaertslaan",
+          "lat": "50.74737",
+          "lon": "5.08620",
+          "id": 203470,
+          "intersectedStreets": [
+            {
+              "name": "Ernest Pitonlaan",
+              "lat": "50.74710",
+              "lon": "5.08491"
+            },
+            {
+              "name": "Filips de Goedelaan",
+              "lat": "50.74737",
+              "lon": "5.08620"
+            },
+            {
+              "name": "Philips de Goedelaan",
+              "lat": "50.74737",
+              "lon": "5.08620"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Berchem-Sainte-Agathe - Sint-Agatha-Berchem",
+      "names": {
+        "ru": "Беркем-Сент-Агат",
+        "fr": "Berchem-Sainte-Agathe",
+        "li": "Sint-Agatha-Berchem",
+        "nl": "Sint-Agatha-Berchem"
+      },
+      "lat": "50.86398",
+      "lon": "4.29269",
+      "id": 66194565,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Van Overstraeten - Emile Van Overstraetenstraat",
+          "names": {
+            "fr": "Rue Emile Van Overstraeten",
+            "nl": "Emile Van Overstraetenstraat"
+          },
+          "lat": "50.86218",
+          "lon": "4.29003",
+          "id": 4997
+        },
+        {
+          "name": "Rue Emile Heylens - Emile Heylensstraat",
+          "names": {
+            "fr": "Rue Emile Heylens",
+            "nl": "Emile Heylensstraat"
+          },
+          "lat": "50.85681",
+          "lon": "4.29291",
+          "id": 5001
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Binche",
+      "names": {
+        "ru": "Бенш"
+      },
+      "lat": "50.41030",
+      "lon": "4.16517",
+      "id": 428181182,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Zola (Péronnes-lez-Binche)",
+          "lat": "50.43840",
+          "lon": "4.15277",
+          "id": 186773
+        },
+        {
+          "name": "Rue Emile Vinck (Péronnes-lez-Binche)",
+          "lat": "50.43954",
+          "lon": "4.15137",
+          "id": 159548
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Bois-de-Villers",
+      "names": {
+        "wa": "Li Bwès-d'-Vilé"
+      },
+      "lat": "50.38997",
+      "lon": "4.82338",
+      "id": 686149534,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Mazy",
+          "lat": "50.39042",
+          "lon": "4.80824",
+          "id": 185944
+        },
+        {
+          "name": "Rue Emile Mahaux",
+          "lat": "50.37429",
+          "lon": "4.83752",
+          "id": 186072
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Boom",
+      "names": {
+        "ru": "Бом",
+        "lt": "Bomas"
+      },
+      "lat": "51.08738",
+      "lon": "4.36672",
+      "id": 173252843,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Van Reethstraat",
+          "lat": "51.10022",
+          "lon": "4.36734",
+          "id": 67959
+        },
+        {
+          "name": "Emile Vanderveldestraat",
+          "lat": "51.08684",
+          "lon": "4.36149",
+          "id": 25994
+        },
+        {
+          "name": "Emile Verhaerenstraat",
+          "lat": "51.09917",
+          "lon": "4.37475",
+          "id": 418
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "La Hulpe",
+      "names": {
+        "ru": "Ла-Юльп",
+        "fr": "La Hulpe",
+        "nl": "Terhulpen"
+      },
+      "lat": "50.73150",
+      "lon": "4.47965",
+      "id": 138160966,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Semal",
+          "lat": "50.72241",
+          "lon": "4.44262",
+          "id": 61340
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Leugnies",
+      "lat": "50.22464",
+      "lon": "4.19616",
+      "id": 668473443,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Damien",
+          "lat": "50.22574",
+          "lon": "4.19371",
+          "id": 236891
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Ollignies",
+      "names": {
+        "ru": "Оллиньи",
+        "fr": "Ollignies",
+        "nl": "Woelingen"
+      },
+      "lat": "50.68742",
+      "lon": "3.85987",
+      "id": 33540734,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.68656",
+          "lon": "3.86144",
+          "id": 37259
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Hannut",
+      "names": {
+        "ru": "Анню",
+        "wa": "Haneù",
+        "fr": "Hannut",
+        "nl": "Hannuit"
+      },
+      "lat": "50.67246",
+      "lon": "5.07800",
+      "id": 64817311,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Duchesne",
+          "lat": "50.69487",
+          "lon": "5.03067",
+          "id": 22847
+        },
+        {
+          "name": "Rue Emile Roder",
+          "lat": "50.65424",
+          "lon": "5.12933",
+          "id": 141974
+        },
+        {
+          "name": "Rue Emile Martin",
+          "lat": "50.66500",
+          "lon": "5.07957",
+          "id": 138950
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Soignies",
+      "names": {
+        "de": "Söglingen",
+        "ru": "Суаньи",
+        "fr": "Soignies",
+        "nl": "Zinnik"
+      },
+      "lat": "50.57753",
+      "lon": "4.07329",
+      "id": 79443904,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde (Carrières)",
+          "lat": "50.57085",
+          "lon": "4.07908",
+          "id": 90219
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Awans",
+      "lat": "50.66697",
+      "lon": "5.46201",
+      "id": 260096196,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Paul Emile Janson",
+          "lat": "50.66370",
+          "lon": "5.47374",
+          "id": 32565
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Grâce-Hollogne",
+      "names": {
+        "ru": "Грас-Олонь",
+        "wa": "Gråce-Hologne",
+        "fr": "Grâce-Hollogne"
+      },
+      "lat": "50.64496",
+      "lon": "5.50314",
+      "id": 746136317,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Verhaeren",
+          "lat": "50.64134",
+          "lon": "5.50685",
+          "id": 137402
+        },
+        {
+          "name": "Avenue Emile Vandervelde",
+          "lat": "50.64817",
+          "lon": "5.50625",
+          "id": 82303,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Avenue Joseph Wauters",
+              "lat": "50.64641",
+              "lon": "5.50630"
+            },
+            {
+              "name": "Rue Mathieu de Lexhy",
+              "lat": "50.64817",
+              "lon": "5.50625"
+            }
+          ]
+        },
+        {
+          "name": "Rue Emile Wiket",
+          "lat": "50.63685",
+          "lon": "5.50756",
+          "id": 33491
+        },
+        {
+          "name": "Rue Émile Zola (Grâce-Berleur)",
+          "lat": "50.63152",
+          "lon": "5.50366",
+          "id": 85835
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Auderghem - Oudergem",
+      "names": {
+        "ru": "Одергем",
+        "fr": "Auderghem",
+        "nl": "Oudergem"
+      },
+      "lat": "50.81566",
+      "lon": "4.43313",
+      "id": 66509952,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Steeno - Emile Steenostraat",
+          "names": {
+            "fr": "Rue Emile Steeno",
+            "nl": "Emile Steenostraat"
+          },
+          "lat": "50.81825",
+          "lon": "4.42961",
+          "id": 85219
+        },
+        {
+          "name": "Rue Emile Idiers - Emile Idiersstraat",
+          "names": {
+            "fr": "Rue Émile Idiers",
+            "nl": "Émile Idiersstraat"
+          },
+          "lat": "50.81685",
+          "lon": "4.42775",
+          "id": 14698
+        },
+        {
+          "name": "Avenue Emile Laine - Emile Lainelaan",
+          "names": {
+            "fr": "Avenue Emile Laine",
+            "nl": "Emile Lainelaan"
+          },
+          "lat": "50.82567",
+          "lon": "4.42886",
+          "id": 242481
+        },
+        {
+          "name": "Avenue Gabriel Emile Lebon - Gabriel Emile Lebonlaan",
+          "names": {
+            "fr": "Avenue Gabriel Emile Lebon",
+            "nl": "Gabriel Emile Lebonlaan"
+          },
+          "lat": "50.82135",
+          "lon": "4.40947",
+          "id": 2942
+        },
+        {
+          "name": "Rue Jules Emile Raymond - Jules Emile Raymondstraat",
+          "names": {
+            "fr": "Rue Jules Emile Raymond",
+            "nl": "Jules Emile Raymondstraat"
+          },
+          "lat": "50.82436",
+          "lon": "4.40706",
+          "id": 2943
+        },
+        {
+          "name": "Rue Emile Rotiers - Emile Rotiersstraat",
+          "names": {
+            "fr": "Rue Emile Rotiers",
+            "nl": "Emile Rotiersstraat"
+          },
+          "lat": "50.80706",
+          "lon": "4.43371",
+          "id": 35715
+        },
+        {
+          "name": "Rue Paul Emile Lessire - Paul Emile Lessirestraat",
+          "names": {
+            "fr": "Rue Paul Emile Lessire",
+            "nl": "Paul Emile Lessirestraat"
+          },
+          "lat": "50.80486",
+          "lon": "4.43676",
+          "id": 35723
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Grâce-Berleur",
+      "lat": "50.63233",
+      "lon": "5.50119",
+      "id": 746136310,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Zola",
+          "lat": "50.63152",
+          "lon": "5.50368",
+          "id": 85836
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Fontaine-Valmont",
+      "lat": "50.32047",
+      "lon": "4.21396",
+      "id": 673921851,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.32034",
+          "lon": "4.21564",
+          "id": 224569
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Havré",
+      "names": {
+        "ru": "Авре",
+        "fr": "Havré"
+      },
+      "lat": "50.46435",
+      "lon": "4.04539",
+      "id": 480286655,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Jambe",
+          "lat": "50.46451",
+          "lon": "4.04593",
+          "id": 87737
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Courcelles",
+      "names": {
+        "ru": "Курсель"
+      },
+      "lat": "50.46015",
+      "lon": "4.37634",
+      "id": 331198493,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Bronchain",
+          "lat": "50.46448",
+          "lon": "4.37855",
+          "id": 146474
+        },
+        {
+          "name": "Rue Emile Thilmans",
+          "lat": "50.44884",
+          "lon": "4.34926",
+          "id": 153834
+        },
+        {
+          "name": "Rue Émile Duployé",
+          "lat": "50.46152",
+          "lon": "4.38764",
+          "id": 209170
+        },
+        {
+          "name": "Rue Émile Vandervelde (Souvret)",
+          "lat": "50.44548",
+          "lon": "4.35496",
+          "id": 209247
+        },
+        {
+          "name": "Rue Émile Turlot",
+          "lat": "50.45805",
+          "lon": "4.38674",
+          "id": 131615
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Villers-la-Ville",
+      "names": {
+        "ru": "Виллер-ла-Виль"
+      },
+      "lat": "50.57903",
+      "lon": "4.53242",
+      "id": 130610211,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Leger",
+          "lat": "50.57619",
+          "lon": "4.52744",
+          "id": 58261
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Charleroi",
+      "names": {
+        "ar": "شارلوروا",
+        "de": "Charleroi",
+        "ru": "Шарлеруа",
+        "la": "Caroloregium",
+        "lt": "Šarlerua",
+        "wa": "Tchålerwè",
+        "fr": "Charleroi",
+        "hu": "Charleroi",
+        "nl": "Charleroi",
+        "sr": "Шарлроа"
+      },
+      "lat": "50.41203",
+      "lon": "4.44363",
+      "id": 9002746,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Boulevard Emile Devreux",
+          "lat": "50.40749",
+          "lon": "4.45041",
+          "id": 240623
+        },
+        {
+          "name": "Rue Jules Ruhl",
+          "names": {
+            "old_name": "Rue Emile Vandervelde"
+          },
+          "lat": "50.40380",
+          "lon": "4.40932",
+          "id": 129009
+        },
+        {
+          "name": "Avenue Emile Rousseaux",
+          "lat": "50.40260",
+          "lon": "4.42676",
+          "id": 129025
+        },
+        {
+          "name": "Cité Emile Demoulin",
+          "lat": "50.42149",
+          "lon": "4.38084",
+          "id": 206923
+        },
+        {
+          "name": "Rue Émile Constant",
+          "lat": "50.41613",
+          "lon": "4.38814",
+          "id": 160846
+        },
+        {
+          "name": "Rue Emile Vandervelde (Monceau-sur-Sambre)",
+          "lat": "50.41589",
+          "lon": "4.37561",
+          "id": 212070
+        },
+        {
+          "name": "Rue Émile Vandervelde (Lodelinsart)",
+          "lat": "50.42318",
+          "lon": "4.45680",
+          "id": 121979
+        },
+        {
+          "name": "Square Émile Buisset",
+          "lat": "50.38316",
+          "lon": "4.45341",
+          "id": 130206
+        },
+        {
+          "name": "Rue Emile Brunet",
+          "lat": "50.39479",
+          "lon": "4.39303",
+          "id": 207017
+        },
+        {
+          "name": "Rue Émile Nonnon",
+          "lat": "50.40142",
+          "lon": "4.44266",
+          "id": 127156
+        },
+        {
+          "name": "Rue Émile Vandervelde (Marcinelle)",
+          "lat": "50.39180",
+          "lon": "4.44043",
+          "id": 140477
+        },
+        {
+          "name": "Rue Émile Cliquet",
+          "lat": "50.39904",
+          "lon": "4.44820",
+          "id": 127181
+        },
+        {
+          "name": "Place Émile Bertaux",
+          "lat": "50.46685",
+          "lon": "4.43161",
+          "id": 208148
+        },
+        {
+          "name": "Rue Emile Fourcault",
+          "names": {
+            "old_name": "Rue Frison"
+          },
+          "lat": "50.42237",
+          "lon": "4.43419",
+          "id": 208180
+        },
+        {
+          "name": "Rue Émile Servais",
+          "lat": "50.36865",
+          "lon": "4.40698",
+          "id": 184629
+        },
+        {
+          "name": "Rue des Bateliers (Marchienne-au-Pont)",
+          "names": {
+            "old_name": "Rue Émile Vandervelde (Marchienne-au-Pont)"
+          },
+          "lat": "50.40809",
+          "lon": "4.39500",
+          "id": 207280
+        },
+        {
+          "name": "Rue Émile Vandervelde (Roux)",
+          "lat": "50.43980",
+          "lon": "4.37539",
+          "id": 149937
+        },
+        {
+          "name": "Rue Emile Ruiters",
+          "lat": "50.45205",
+          "lon": "4.41494",
+          "id": 160225
+        },
+        {
+          "name": "Rue Émile Tumelaire",
+          "lat": "50.41058",
+          "lon": "4.44852",
+          "id": 111096
+        },
+        {
+          "name": "Rue Émile Dutrieux",
+          "lat": "50.40027",
+          "lon": "4.48126",
+          "id": 123421
+        },
+        {
+          "name": "Place Emile Buisset",
+          "lat": "50.40651",
+          "lon": "4.43918",
+          "id": 223781
+        },
+        {
+          "name": "Rue Émile Strimelle",
+          "lat": "50.43507",
+          "lon": "4.42573",
+          "id": 160334
+        },
+        {
+          "name": "Rue Saint Emile (Marchienne-au-Pont)",
+          "lat": "50.42439",
+          "lon": "4.40146",
+          "id": 160352
+        },
+        {
+          "name": "Place Emile Moureau",
+          "lat": "50.41287",
+          "lon": "4.35713",
+          "id": 204393
+        },
+        {
+          "name": "Rue Émile Royer",
+          "lat": "50.42276",
+          "lon": "4.41992",
+          "id": 142974
+        },
+        {
+          "name": "Rue Émile Gantois",
+          "lat": "50.42129",
+          "lon": "4.41455",
+          "id": 142984
+        },
+        {
+          "name": "Rue Emile Leclercq",
+          "lat": "50.41667",
+          "lon": "4.37159",
+          "id": 219790
+        },
+        {
+          "name": "Place Emile Vandevelde",
+          "lat": "50.41526",
+          "lon": "4.46159",
+          "id": 122633
+        },
+        {
+          "name": "Rue Émile Thibaut",
+          "lat": "50.39336",
+          "lon": "4.40567",
+          "id": 140119
+        },
+        {
+          "name": "Rue Émile Vandervelde (Couillet)",
+          "lat": "50.39195",
+          "lon": "4.46837",
+          "id": 165790
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Morlanwelz",
+      "names": {
+        "ru": "Морланве"
+      },
+      "lat": "50.45099",
+      "lon": "4.25235",
+      "id": 470539132,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.44815",
+          "lon": "4.25810",
+          "id": 143911
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Longdoz",
+      "lat": "50.63006",
+      "lon": "5.58065",
+      "id": 5483428,
+      "type": "SUBURB",
+      "listOfStreets": [
+        {
+          "name": "Boulevard Emile de Laveleye",
+          "lat": "50.62324",
+          "lon": "5.58245",
+          "id": 32336,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Quai Mativa",
+              "lat": "50.62296",
+              "lon": "5.58110"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Mont-sur-Marchienne",
+      "lat": "50.39020",
+      "lon": "4.40464",
+      "id": 674001818,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Jules Ruhl",
+          "names": {
+            "old_name": "Rue Emile Vandervelde"
+          },
+          "lat": "50.40380",
+          "lon": "4.40932",
+          "id": 129010
+        },
+        {
+          "name": "Rue Émile Servais",
+          "lat": "50.36865",
+          "lon": "4.40698",
+          "id": 184630
+        },
+        {
+          "name": "Rue Émile Thibaut",
+          "lat": "50.39336",
+          "lon": "4.40567",
+          "id": 140120
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Anderlues",
+      "names": {
+        "ru": "Андерлю"
+      },
+      "lat": "50.40800",
+      "lon": "4.26960",
+      "id": 470539134,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.40499",
+          "lon": "4.27040",
+          "id": 142366
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Puhain",
+      "lat": "50.66048",
+      "lon": "4.14069",
+      "id": 3052047966,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Avenue Emile Geerts",
+          "lat": "50.66049",
+          "lon": "4.14343",
+          "id": 69948
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Fleurus",
+      "names": {
+        "ru": "Флёрюс"
+      },
+      "lat": "50.48235",
+      "lon": "4.55051",
+      "id": 64802854,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Hautem",
+          "lat": "50.46282",
+          "lon": "4.55439",
+          "id": 128218
+        },
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.48091",
+          "lon": "4.54828",
+          "id": 86932
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Tournai",
+      "names": {
+        "ru": "Турне",
+        "nl": "Doornik"
+      },
+      "lat": "50.60566",
+      "lon": "3.38782",
+      "id": 36162975,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Place Paul-Emile Janson",
+          "lat": "50.60707",
+          "lon": "3.38933",
+          "id": 115117
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Beaumont",
+      "names": {
+        "ru": "Бомон"
+      },
+      "lat": "50.23553",
+      "lon": "4.23832",
+      "id": 64608294,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Culot (Leval-Chaudeville)",
+          "lat": "50.23679",
+          "lon": "4.19663",
+          "id": 164130
+        },
+        {
+          "name": "Rue Emile Damien",
+          "lat": "50.22589",
+          "lon": "4.19246",
+          "id": 109463
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Pont-à-Celles",
+      "names": {
+        "ru": "Понт-а-Сель"
+      },
+      "lat": "50.51225",
+      "lon": "4.36174",
+      "id": 325851346,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Vandervelde (Thiméon)",
+          "names": {
+            "alt_name": "Rue Emile Vandervelde (Thiméon)"
+          },
+          "lat": "50.48105",
+          "lon": "4.43007",
+          "id": 138441
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Andenne",
+      "names": {
+        "ru": "Анден",
+        "wa": "Andene",
+        "fr": "Andenne",
+        "nl": "Andenne"
+      },
+      "lat": "50.49009",
+      "lon": "5.10439",
+      "id": 29827642,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde (Namêche)",
+          "lat": "50.47495",
+          "lon": "4.99771",
+          "id": 214053
+        },
+        {
+          "name": "Rue Emile Godfrind",
+          "lat": "50.49564",
+          "lon": "5.08858",
+          "id": 60504
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Gembloux",
+      "names": {
+        "ru": "Жамблу",
+        "wa": "Djiblou",
+        "fr": "Gembloux",
+        "nl": "Gembloers"
+      },
+      "lat": "50.56055",
+      "lon": "4.69215",
+      "id": 60302311,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Labarre",
+          "lat": "50.59404",
+          "lon": "4.66848",
+          "id": 62536
+        },
+        {
+          "name": "Rue Émile Somville",
+          "lat": "50.55672",
+          "lon": "4.67608",
+          "id": 66934
+        },
+        {
+          "name": "Rue Émile Pirson",
+          "lat": "50.50821",
+          "lon": "4.67378",
+          "id": 32207
+        },
+        {
+          "name": "Rue Emile Dewez (Beuzet)",
+          "lat": "50.54048",
+          "lon": "4.73045",
+          "id": 62988
+        },
+        {
+          "name": "Rue Emile Marchal",
+          "lat": "50.50341",
+          "lon": "4.71610",
+          "id": 221782
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Nieuwpoort-Bad",
+      "names": {
+        "ru": "Ньивпорт-Бад",
+        "fr": "Nieuport-Bains"
+      },
+      "lat": "51.14781",
+      "lon": "2.71566",
+      "id": 61337572,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Emile Verhaerenlaan",
+          "lat": "51.14655",
+          "lon": "2.71811",
+          "id": 216019
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Oostduinkerke",
+      "names": {
+        "de": "Ostdünkirchen",
+        "ru": "Остдёйнкерке",
+        "fr": "Ostdunkerque"
+      },
+      "lat": "51.11563",
+      "lon": "2.68126",
+      "id": 720863546,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Emile Verhaerenlaan",
+          "names": {
+            "alt_name": "Verhaerenlaan"
+          },
+          "lat": "51.12650",
+          "lon": "2.69611",
+          "id": 132770
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Sint-Michiels",
+      "names": {
+        "fr": "Saint-Michel",
+        "vls": "Sinte-Machiels"
+      },
+      "lat": "51.18846",
+      "lon": "3.21116",
+      "id": 1646090638,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Emile Bethuynelaan",
+          "lat": "51.16468",
+          "lon": "3.18908",
+          "id": 205074
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Knokke-Heist",
+      "names": {
+        "ru": "Кнокке-Хейст",
+        "fr": "Knocke-Heist",
+        "vls": "Knokke-Heist"
+      },
+      "lat": "51.33961",
+      "lon": "3.27021",
+      "id": 79387375,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Emile Verhaerenlaan (Knokke)",
+          "lat": "51.35294",
+          "lon": "3.30388",
+          "id": 162981
+        },
+        {
+          "name": "Emile Raespad",
+          "lat": "51.33845",
+          "lon": "3.28395",
+          "id": 222496
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Floreffe",
+      "names": {
+        "ru": "Флореф",
+        "wa": "Florefe",
+        "nl": "Floreffe"
+      },
+      "lat": "50.43481",
+      "lon": "4.75888",
+      "id": 414028537,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Lessire",
+          "lat": "50.42733",
+          "lon": "4.75584",
+          "id": 221823
+        },
+        {
+          "name": "Rue Émile Lorent",
+          "lat": "50.44791",
+          "lon": "4.74305",
+          "id": 93851
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Limelette",
+      "names": {
+        "wa": "Limlete"
+      },
+      "lat": "50.68050",
+      "lon": "4.57319",
+      "id": 294064658,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Mathéi",
+          "lat": "50.68481",
+          "lon": "4.56971",
+          "id": 64256
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Vinalmont",
+      "names": {
+        "ru": "Винальмон"
+      },
+      "lat": "50.56275",
+      "lon": "5.22614",
+      "id": 725298285,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde",
+          "lat": "50.55759",
+          "lon": "5.23247",
+          "id": 220734
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Anthée",
+      "names": {
+        "wa": "Antêye"
+      },
+      "lat": "50.23953",
+      "lon": "4.76041",
+      "id": 348123981,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Collard",
+          "lat": "50.23974",
+          "lon": "4.75822",
+          "id": 151310
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Belœil",
+      "names": {
+        "ru": "Белёй"
+      },
+      "lat": "50.54792",
+      "lon": "3.73612",
+      "id": 71013315,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Paul-Emile Janson (Stambruges)",
+          "lat": "50.50982",
+          "lon": "3.71883",
+          "id": 194949
+        },
+        {
+          "name": "Rue Emile Carlier (Grandglise)",
+          "lat": "50.49852",
+          "lon": "3.70664",
+          "id": 19932
+        },
+        {
+          "name": "Rue Emile Royer (Quevaucamps)",
+          "lat": "50.53023",
+          "lon": "3.69550",
+          "id": 228141
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "La Glanerie",
+      "names": {
+        "ru": "Ла-Гланри"
+      },
+      "lat": "50.52984",
+      "lon": "3.30103",
+      "id": 661173394,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Clainquart",
+          "lat": "50.51826",
+          "lon": "3.29965",
+          "id": 225871
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Laeken - Laken",
+      "names": {
+        "de": "Laken",
+        "ru": "Лакен",
+        "fr": "Laeken",
+        "nl": "Laken"
+      },
+      "lat": "50.88339",
+      "lon": "4.34872",
+      "id": 17428149,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Boulevard Émile Bockstael - Emile Bockstaellaan",
+          "names": {
+            "fr": "Boulevard Émile Bockstael",
+            "nl": "Emile Bockstaellaan"
+          },
+          "lat": "50.87971",
+          "lon": "4.34777",
+          "id": 52214
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Haaltert",
+      "names": {
+        "ru": "Халтерт"
+      },
+      "lat": "50.90225",
+      "lon": "4.00576",
+      "id": 1630177961,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Burgemeester Emile De Saedeleerstraat",
+          "lat": "50.89614",
+          "lon": "3.99982",
+          "id": 155778
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Nessonvaux",
+      "names": {
+        "ru": "Несонво",
+        "wa": "Nessonvå",
+        "fr": "Nessonvaux"
+      },
+      "lat": "50.57367",
+      "lon": "5.73714",
+      "id": 618759919,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Vandervelde",
+          "lat": "50.57363",
+          "lon": "5.73654",
+          "id": 162359,
+          "intersectedStreets": [
+            {
+              "name": "Rue du Général de Gaulle",
+              "lat": "50.57381",
+              "lon": "5.73622"
+            },
+            {
+              "name": "rue du Ruisseau",
+              "lat": "50.57373",
+              "lon": "5.73645"
+            },
+            {
+              "name": "Grand Ventail",
+              "lat": "50.57386",
+              "lon": "5.73883"
+            },
+            {
+              "name": "Rue Bourgmestre Aimé Meunier",
+              "lat": "50.57386",
+              "lon": "5.73883"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Profondeville",
+      "names": {
+        "ru": "Профондвиль",
+        "wa": "Parfondveye"
+      },
+      "lat": "50.37765",
+      "lon": "4.86943",
+      "id": 265779208,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Mazy (Bois-de-Villers)",
+          "lat": "50.39044",
+          "lon": "4.80824",
+          "id": 185943
+        },
+        {
+          "name": "Rue Emile Mahaux",
+          "lat": "50.37430",
+          "lon": "4.83750",
+          "id": 186071
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Rienne",
+      "names": {
+        "ru": "Рьен",
+        "wa": "Riene",
+        "nl": "Rienne"
+      },
+      "lat": "49.99226",
+      "lon": "4.88477",
+      "id": 678992750,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Rue Émile Montreuil",
+          "lat": "49.99320",
+          "lon": "4.88578",
+          "id": 160767
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Écaussinnes",
+      "names": {
+        "ru": "Экоссинн"
+      },
+      "lat": "50.56961",
+      "lon": "4.17526",
+      "id": 190299276,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Rue Emile Vandervelde (Cité Pro-Déo)",
+          "lat": "50.54214",
+          "lon": "4.17335",
+          "id": 67705
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Trooz",
+      "names": {
+        "ru": "Троз",
+        "wa": "Li Trô",
+        "fr": "Trooz"
+      },
+      "lat": "50.57281",
+      "lon": "5.68836",
+      "id": 748734269,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Place Emile Vandervelde (Nessonvaux)",
+          "lat": "50.57363",
+          "lon": "5.73652",
+          "id": 162358,
+          "intersectedStreets": [
+            {
+              "name": "Rue du Général de Gaulle (Nessonvaux)",
+              "lat": "50.57381",
+              "lon": "5.73619"
+            },
+            {
+              "name": "rue du Ruisseau",
+              "lat": "50.57373",
+              "lon": "5.73643"
+            },
+            {
+              "name": "Grand Ventail",
+              "lat": "50.57386",
+              "lon": "5.73881"
+            },
+            {
+              "name": "Rue Bourgmestre Aimé Meunier",
+              "lat": "50.57386",
+              "lon": "5.73881"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    }
+  ]
+}
\ No newline at end of file
diff --git a/OsmAnd-java/src/test/resources/search/street_santa_clara.json b/OsmAnd-java/src/test/resources/search/street_santa_clara.json
new file mode 100644
index 0000000000..959745ebc6
--- /dev/null
+++ b/OsmAnd-java/src/test/resources/search/street_santa_clara.json
@@ -0,0 +1,3946 @@
+{
+  "settings": {
+    "lat": "41.60200",
+    "lon": "2.62258",
+    "radiusLevel": 1,
+    "totalLimit": -1,
+    "lang": "",
+    "transliterateIfMissing": false,
+    "emptyQueryAllowed": false,
+    "sortByName": false
+  },
+  "phrase": "santa clara",
+  "results": [
+    "Carrer de Santa Clara, Sant Pol de Mar",
+    "Santa Clara, Sant Pol de Mar",
+    "Carrer Santa Clara, Sant Pol de Mar",
+    "Plaça Santa Clara, Santa Coloma de Farners",
+    "Carrer del Comte de Santa Clara, Barcelona",
+    "Carrer del Comte de Santa Clara, la Barceloneta",
+    "Passatge de Santa Clara, Barcelona",
+    "Passatge de Santa Clara, Barri Gòtic",
+    "Baixada de Santa Clara, Barcelona",
+    "Baixada de Santa Clara, Barri Gòtic",
+    "Carrer de Santa Clara, Girona",
+    "Plaça de Santa Clara, Vic",
+    "Carrer de Santa Clara, Poble Nou",
+    "Carrer de Santa Clara (Poble Nou), Sant Vicenç dels Horts",
+    "Carrer Vell de Santa Clara, Manresa",
+    "Carrer Nou de Santa Clara, Centre Històric",
+    "Carrer Nou de Santa Clara (Les Escodines), Manresa",
+    "Carrer de Santa Clara, Masquefa",
+    "Carrer Santa Clara, Castelló d'Empúries",
+    "Carrer de Santa Clara, Vilafranca del Penedès",
+    "Carrer de Santa Clara, Castelló d'Empúries",
+    "Carrer Clara Campoamor, Santa Coloma de Gramenet",
+    "Santa Clara"
+  ],
+  "amenities": [
+    {
+      "name": "Pastisseria Santa Clara",
+      "lat": "41.38344",
+      "lon": "2.17755",
+      "id": 5954544846,
+      "subType": "confectionery",
+      "type": "shop"
+    },
+    {
+      "name": "Santa Clara del Mullol",
+      "lat": "42.13905",
+      "lon": "1.12200",
+      "id": 865048681,
+      "subType": "place_of_worship",
+      "type": "tourism",
+      "additionalInfo": {
+        "religion_christian": "christian",
+        "building_type_church": "church",
+        "denomination_catholic": "catholic",
+        "wikipedia": "http://ca.wikipedia.org/wiki/Santa Clara del Mullol"
+      }
+    },
+    {
+      "name": "Santa Clara del Mullol",
+      "lat": "42.13905",
+      "lon": "1.12200",
+      "id": 865048681,
+      "subType": "building",
+      "type": "man_made",
+      "additionalInfo": {
+        "religion_christian": "christian",
+        "building_type_church": "church",
+        "denomination_catholic": "catholic",
+        "wikipedia": "http://ca.wikipedia.org/wiki/Santa Clara del Mullol"
+      }
+    },
+    {
+      "name": "Camping Clarà",
+      "lat": "41.14908",
+      "lon": "1.42003",
+      "id": 8654455984,
+      "subType": "camp_site",
+      "type": "tourism",
+      "additionalInfo": {
+        "internet_access_type_wlan": "wlan",
+        "phone": "977643480"
+      }
+    },
+    {
+      "name": "Santa Clara / Muralla de Sant Magí",
+      "lat": "41.34637",
+      "lon": "1.70142",
+      "id": 5640608030,
+      "subType": "bus_stop",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "L1",
+        "operator": "Hispano Igualadina"
+      }
+    },
+    {
+      "name": "Santa Clara / Muralla de Sant Magí",
+      "lat": "41.34637",
+      "lon": "1.70142",
+      "id": 5640608030,
+      "subType": "public_transport_stop_position",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "L1",
+        "operator": "Hispano Igualadina"
+      }
+    },
+    {
+      "name": "Clarà",
+      "lat": "41.15131",
+      "lon": "1.41687",
+      "id": 8058100256,
+      "subType": "bus_stop",
+      "type": "transportation",
+      "additionalInfo": {
+        "covered_no": "no",
+        "bench_no": "no",
+        "operator": "Autocars del Penedès"
+      }
+    },
+    {
+      "name": "Serra d'en Clarà",
+      "lat": "42.41337",
+      "lon": "2.97249",
+      "id": 2483176176,
+      "subType": "locality",
+      "type": "administrative"
+    },
+    {
+      "name": "Jardins de Villa Clara",
+      "lat": "41.42300",
+      "lon": "2.18370",
+      "id": 567550629,
+      "subType": "park",
+      "type": "entertainment"
+    },
+    {
+      "name": "la Vinya de Clarà",
+      "lat": "42.06712",
+      "lon": "1.80026",
+      "id": 740434451,
+      "subType": "building",
+      "type": "man_made"
+    },
+    {
+      "name": "Santa Clara",
+      "names": {
+        "ru": "Санта-Клара",
+        "hu": "Santa Clara"
+      },
+      "lat": "22.40658",
+      "lon": "-79.96517",
+      "id": -715772,
+      "subType": "city",
+      "type": "administrative",
+      "additionalInfo": {
+        "population": "216056"
+      }
+    },
+    {
+      "name": "Santa Clara",
+      "lat": "21.37340",
+      "lon": "-89.01346",
+      "id": -625402,
+      "subType": "town",
+      "type": "administrative"
+    },
+    {
+      "name": "Sas - Claramunt",
+      "lat": "41.43774",
+      "lon": "2.20424",
+      "id": 2727197818,
+      "subType": "bus_stop",
+      "type": "transportation",
+      "additionalInfo": {
+        "covered_yes": "yes",
+        "bench_yes": "yes",
+        "ref": "13",
+        "route_bus_ref": "N8, V33",
+        "operator": "TMB, TUSGSAL"
+      }
+    },
+    {
+      "name": "Sas - Claramunt",
+      "lat": "41.43774",
+      "lon": "2.20424",
+      "id": 2727197818,
+      "subType": "public_transport_stop_position",
+      "type": "transportation",
+      "additionalInfo": {
+        "covered_yes": "yes",
+        "bench_yes": "yes",
+        "ref": "13",
+        "route_bus_ref": "N8, V33",
+        "operator": "TMB, TUSGSAL"
+      }
+    },
+    {
+      "name": "Enric Clarassó - Collserola",
+      "lat": "41.41824",
+      "lon": "2.13394",
+      "id": 10753200842,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "124",
+        "operator": "TMB",
+        "ref": "2446"
+      }
+    },
+    {
+      "name": "Castell de Clarà",
+      "lat": "41.82026",
+      "lon": "2.08015",
+      "id": 835556795,
+      "subType": "castle",
+      "type": "tourism",
+      "additionalInfo": {
+        "wikipedia": "http://ca.wikipedia.org/wiki/Castell de Clarà (Moià)"
+      }
+    },
+    {
+      "name": "Castell de Clarà",
+      "lat": "41.82026",
+      "lon": "2.08015",
+      "id": 835556795,
+      "subType": "building",
+      "type": "man_made",
+      "additionalInfo": {
+        "wikipedia": "http://ca.wikipedia.org/wiki/Castell de Clarà (Moià)"
+      }
+    },
+    {
+      "name": "Convent de Santa Clara",
+      "lat": "41.14429",
+      "lon": "1.09586",
+      "id": 632415625,
+      "subType": "place_of_worship",
+      "type": "tourism"
+    },
+    {
+      "name": "Convent de Santa Clara",
+      "lat": "41.14429",
+      "lon": "1.09586",
+      "id": 632415625,
+      "subType": "building",
+      "type": "man_made"
+    },
+    {
+      "name": "Riera de Clarà",
+      "lat": "41.56767",
+      "lon": "2.39547",
+      "id": 121597699,
+      "subType": "stream",
+      "type": "natural",
+      "additionalInfo": {
+        "intermittent": "yes"
+      }
+    },
+    {
+      "name": "La Pobla;de Claramunt;Capellades (industrial);La Torre;de Claramunt",
+      "lat": "41.54382",
+      "lon": "1.69177",
+      "id": 3811621392,
+      "subType": "motorway_junction",
+      "type": "transportation",
+      "additionalInfo": {
+        "operator": "Generalitat de Catalunya"
+      }
+    },
+    {
+      "name": "la Torre de Claramunt",
+      "lat": "41.53529",
+      "lon": "1.66093",
+      "id": 2920956646,
+      "subType": "village",
+      "type": "administrative",
+      "additionalInfo": {
+        "ele": "363",
+        "population": "1534",
+        "loc_name": "la Torre Alta"
+      }
+    },
+    {
+      "name": "Can Claramunt",
+      "lat": "41.50662",
+      "lon": "1.75584",
+      "id": 730043780,
+      "subType": "hamlet",
+      "type": "administrative",
+      "additionalInfo": {
+        "ele": "338",
+        "population": "1284"
+      }
+    },
+    {
+      "name": "Portell de Claramunt",
+      "lat": "42.03669",
+      "lon": "0.72096",
+      "id": 3934995340,
+      "subType": "saddle",
+      "type": "natural"
+    },
+    {
+      "name": "Portell de Claramunt",
+      "lat": "42.03669",
+      "lon": "0.72096",
+      "id": 3934995340,
+      "subType": "mountain_pass",
+      "type": "transportation"
+    },
+    {
+      "name": "La Serenitat",
+      "enName": "The Serenity",
+      "names": {
+        "ca": "La Serenitat",
+        "es": "La Serenidad"
+      },
+      "lat": "41.37051",
+      "lon": "2.17235",
+      "id": 8255820054,
+      "subType": "artwork",
+      "type": "tourism",
+      "additionalInfo": {
+        "artwork_type_sculpture": "sculpture",
+        "artist_name": "Josep Clarà"
+      }
+    },
+    {
+      "name": "Pujada de Santa Clara",
+      "lat": "40.81249",
+      "lon": "0.52438",
+      "id": 293763975,
+      "subType": "highway_steps",
+      "type": "transportation"
+    },
+    {
+      "name": "CAP SANTA CLARA",
+      "lat": "41.98415",
+      "lon": "2.82312",
+      "id": 9695589798,
+      "subType": "clinic",
+      "type": "healthcare",
+      "openingHours": "Mo-Fr 08:00-13:45",
+      "additionalInfo": {
+        "wheelchair_yes": "yes",
+        "opening_hours": "Mo-Fr 08:00-13:45"
+      }
+    },
+    {
+      "name": "CAP SANTA CLARA",
+      "lat": "41.98415",
+      "lon": "2.82312",
+      "id": 9695589798,
+      "subType": "building",
+      "type": "man_made",
+      "openingHours": "Mo-Fr 08:00-13:45",
+      "additionalInfo": {
+        "wheelchair_yes": "yes",
+        "opening_hours": "Mo-Fr 08:00-13:45"
+      }
+    },
+    {
+      "name": "Clarà",
+      "lat": "41.98377",
+      "lon": "1.15425",
+      "id": 1248480557,
+      "subType": "isolated_dwelling",
+      "type": "administrative"
+    },
+    {
+      "name": "Clarà",
+      "lat": "41.98377",
+      "lon": "1.15425",
+      "id": 1248480557,
+      "subType": "building",
+      "type": "man_made"
+    },
+    {
+      "name": "Riera de Clarà",
+      "lat": "41.56762",
+      "lon": "2.39513",
+      "id": 121597689,
+      "subType": "stream",
+      "type": "natural",
+      "additionalInfo": {
+        "intermittent": "yes",
+        "tunnel_waterway": "yes"
+      }
+    },
+    {
+      "name": "Riera de Clarà",
+      "lat": "41.56762",
+      "lon": "2.39513",
+      "id": 121597689,
+      "subType": "tunnel",
+      "type": "man_made",
+      "additionalInfo": {
+        "intermittent": "yes",
+        "tunnel_waterway": "yes"
+      }
+    },
+    {
+      "name": "Roca Clara",
+      "lat": "42.00205",
+      "lon": "0.78469",
+      "id": 2483269388,
+      "subType": "locality",
+      "type": "administrative"
+    },
+    {
+      "name": "Av. Catalana - Clara Campoamor",
+      "lat": "41.42416",
+      "lon": "2.22098",
+      "id": 10508165730,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "covered_no": "no",
+        "bench_no": "no",
+        "ref": "109706",
+        "route_bus_ref": "B20",
+        "operator": "Tusgsal"
+      }
+    },
+    {
+      "name": "La Pobla;de Claramunt;Capellades (industrial);La Torre;de Claramunt",
+      "lat": "41.53981",
+      "lon": "1.69119",
+      "id": 3811620860,
+      "subType": "motorway_junction",
+      "type": "transportation",
+      "additionalInfo": {
+        "operator": "Generalitat de Catalunya"
+      }
+    },
+    {
+      "name": "lo Camí de Claravalls",
+      "lat": "41.69330",
+      "lon": "1.13166",
+      "id": 4676221044,
+      "subType": "locality",
+      "type": "administrative"
+    },
+    {
+      "name": "Água Clara",
+      "lat": "-20.43857",
+      "lon": "-52.87975",
+      "id": -668935,
+      "subType": "town",
+      "type": "administrative",
+      "additionalInfo": {
+        "population": "13623"
+      }
+    },
+    {
+      "name": "L11 - Santa Clara",
+      "lat": "41.98301",
+      "lon": "2.82286",
+      "id": 1845638164,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "covered_no": "no",
+        "route_bus_ref": "L11",
+        "operator": "TMG"
+      }
+    },
+    {
+      "name": "Plaça de Teresa Claramunt",
+      "lat": "41.27961",
+      "lon": "1.98256",
+      "id": 833025909,
+      "subType": "garden",
+      "type": "entertainment"
+    },
+    {
+      "name": "Monument a Clara Campoamor",
+      "lat": "41.20150",
+      "lon": "1.63014",
+      "id": 4861882840,
+      "subType": "memorial",
+      "type": "tourism"
+    },
+    {
+      "name": "la Pobla de Claramunt",
+      "lat": "41.55458",
+      "lon": "1.67782",
+      "id": 1109971453,
+      "subType": "railway_station",
+      "type": "transportation",
+      "additionalInfo": {
+        "operator": "FGC Ferrocarrils de la Generalitat de Catalunya"
+      }
+    },
+    {
+      "name": "la Pobla de Claramunt",
+      "lat": "41.55458",
+      "lon": "1.67782",
+      "id": 1109971453,
+      "subType": "public_transport_station",
+      "type": "transportation",
+      "additionalInfo": {
+        "operator": "FGC Ferrocarrils de la Generalitat de Catalunya"
+      }
+    },
+    {
+      "name": "la Pobla de Claramunt",
+      "lat": "41.55458",
+      "lon": "1.67782",
+      "id": 1109971453,
+      "subType": "building",
+      "type": "man_made",
+      "additionalInfo": {
+        "operator": "FGC Ferrocarrils de la Generalitat de Catalunya"
+      }
+    },
+    {
+      "name": "Barranc de l'Aigua Clara",
+      "lat": "42.00002",
+      "lon": "0.81614",
+      "id": 464152703,
+      "subType": "stream",
+      "type": "natural"
+    },
+    {
+      "name": "los Claramunts",
+      "lat": "42.02462",
+      "lon": "0.69776",
+      "id": 2483230744,
+      "subType": "locality",
+      "type": "administrative"
+    },
+    {
+      "name": "Cal Claramunt",
+      "lat": "41.30367",
+      "lon": "1.64282",
+      "id": 433901515,
+      "subType": "residential",
+      "type": "administrative"
+    },
+    {
+      "name": "Escola Santa Clara",
+      "lat": "41.55969",
+      "lon": "2.08839",
+      "id": 442494019,
+      "subType": "school",
+      "type": "education"
+    },
+    {
+      "name": "Escola Santa Clara",
+      "lat": "41.55969",
+      "lon": "2.08839",
+      "id": 442494019,
+      "subType": "building",
+      "type": "man_made"
+    },
+    {
+      "name": "Plana de Claravalls",
+      "lat": "41.68302",
+      "lon": "1.07932",
+      "id": 2483359270,
+      "subType": "locality",
+      "type": "administrative"
+    },
+    {
+      "name": "Claramunt",
+      "lat": "41.55494",
+      "lon": "1.66915",
+      "id": 1897419834,
+      "subType": "survey_point",
+      "type": "man_made",
+      "additionalInfo": {
+        "ele": "460.80",
+        "note": "This is a point from an official geodetic network. Use it as a reference, but do NOT move it.",
+        "ref": "39163"
+      }
+    },
+    {
+      "name": "Mas Clarà",
+      "lat": "42.04368",
+      "lon": "2.78355",
+      "id": 731046577,
+      "subType": "building",
+      "type": "man_made"
+    },
+    {
+      "name": "Santa Clara",
+      "lat": "41.40345",
+      "lon": "2.16128",
+      "id": 2737036116,
+      "subType": "bakery",
+      "type": "shop"
+    },
+    {
+      "name": "Riera de Clarà",
+      "lat": "41.55697",
+      "lon": "2.37290",
+      "id": 1274625417,
+      "subType": "stream",
+      "type": "natural"
+    },
+    {
+      "name": "Santa Clara",
+      "lat": "41.72151",
+      "lon": "1.83532",
+      "id": 3935268030,
+      "subType": "bus_stop",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "L1"
+      }
+    },
+    {
+      "name": "Santa Clara",
+      "lat": "41.72151",
+      "lon": "1.83532",
+      "id": 3935268030,
+      "subType": "public_transport_stop_position",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "L1"
+      }
+    },
+    {
+      "name": "Riera de Clarà",
+      "lat": "41.55677",
+      "lon": "2.37273",
+      "id": 1274625421,
+      "subType": "stream",
+      "type": "natural",
+      "additionalInfo": {
+        "tunnel_waterway": "yes"
+      }
+    },
+    {
+      "name": "Riera de Clarà",
+      "lat": "41.55677",
+      "lon": "2.37273",
+      "id": 1274625421,
+      "subType": "tunnel",
+      "type": "man_made",
+      "additionalInfo": {
+        "tunnel_waterway": "yes"
+      }
+    },
+    {
+      "name": "Santa Clara de Olimar",
+      "lat": "-32.92369",
+      "lon": "-54.94452",
+      "id": -628542,
+      "subType": "town",
+      "type": "administrative",
+      "additionalInfo": {
+        "population": "2341"
+      }
+    },
+    {
+      "name": "La Fertilitat",
+      "enName": "The Fertility",
+      "names": {
+        "ca": "La Fertilitat",
+        "es": "La Fertilidad"
+      },
+      "lat": "41.36990",
+      "lon": "2.17212",
+      "id": 10612950182,
+      "subType": "artwork",
+      "type": "tourism",
+      "additionalInfo": {
+        "artist_name": "Josep Clarà"
+      }
+    },
+    {
+      "name": "Escola Guillem de Claramunt",
+      "lat": "41.20296",
+      "lon": "1.27761",
+      "id": 525583849,
+      "subType": "school",
+      "type": "education"
+    },
+    {
+      "name": "Torrent de Clarà",
+      "lat": "42.20050",
+      "lon": "1.73588",
+      "id": 385833345,
+      "subType": "stream",
+      "type": "natural"
+    },
+    {
+      "name": "Collada de Clarà",
+      "lat": "42.01660",
+      "lon": "1.46380",
+      "id": 528127750,
+      "subType": "saddle",
+      "type": "natural",
+      "additionalInfo": {
+        "ele": "880"
+      }
+    },
+    {
+      "name": "Collada de Clarà",
+      "lat": "42.01660",
+      "lon": "1.46380",
+      "id": 528127750,
+      "subType": "mountain_pass",
+      "type": "transportation",
+      "additionalInfo": {
+        "ele": "880"
+      }
+    },
+    {
+      "name": "la Pobla de Claramunt",
+      "lat": "41.55458",
+      "lon": "1.67514",
+      "id": 4413636960256,
+      "subType": "village",
+      "type": "administrative"
+    },
+    {
+      "name": "la Pobla de Claramunt",
+      "lat": "41.55458",
+      "lon": "1.67514",
+      "id": 4413636960256,
+      "subType": "residential",
+      "type": "administrative"
+    },
+    {
+      "name": "CAP Santa Clara",
+      "lat": "41.98420",
+      "lon": "2.82297",
+      "id": 4400118235136,
+      "subType": "clinic",
+      "type": "healthcare"
+    },
+    {
+      "name": "CAP Santa Clara",
+      "lat": "41.98420",
+      "lon": "2.82297",
+      "id": 4400118235136,
+      "subType": "building",
+      "type": "man_made"
+    },
+    {
+      "name": "Claverol / Santa Clara",
+      "lat": "41.38642",
+      "lon": "2.01052",
+      "id": 6861741690,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "e20",
+        "operator": "Soler i Sauret, Soler i Sauret, S.A."
+      }
+    },
+    {
+      "name": "Santa Clara",
+      "lat": "41.98238",
+      "lon": "2.82278",
+      "id": 6879115086,
+      "subType": "florist",
+      "type": "shop"
+    },
+    {
+      "name": "Estany de Clarà",
+      "lat": "41.14817",
+      "lon": "1.42067",
+      "id": 463745197,
+      "subType": "water",
+      "type": "natural"
+    },
+    {
+      "name": "Convent de Santa Clara",
+      "lat": "42.25891",
+      "lon": "3.07639",
+      "id": 4413972850688,
+      "subType": "monument",
+      "type": "tourism"
+    },
+    {
+      "name": "Convent de Santa Clara",
+      "lat": "42.25891",
+      "lon": "3.07639",
+      "id": 4413972850688,
+      "subType": "building",
+      "type": "man_made"
+    },
+    {
+      "name": "Claverol / Santa Clara",
+      "lat": "41.38644",
+      "lon": "2.01056",
+      "id": 11175822636,
+      "subType": "bus_stop",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "e20",
+        "operator": "Soler i Sauret"
+      }
+    },
+    {
+      "name": "Claverol / Santa Clara",
+      "lat": "41.38644",
+      "lon": "2.01056",
+      "id": 11175822636,
+      "subType": "public_transport_stop_position",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "e20",
+        "operator": "Soler i Sauret"
+      }
+    },
+    {
+      "name": "Plaça de Clara Campoamor",
+      "lat": "41.20141",
+      "lon": "1.63029",
+      "id": 410285817,
+      "subType": "park",
+      "type": "entertainment"
+    },
+    {
+      "name": "Clarà",
+      "lat": "41.15118",
+      "lon": "1.41700",
+      "id": 8058100254,
+      "subType": "bus_stop",
+      "type": "transportation",
+      "additionalInfo": {
+        "covered_no": "no",
+        "bench_no": "no",
+        "operator": "Autocars del Penedès"
+      }
+    },
+    {
+      "name": "Santa Clara",
+      "lat": "41.73371",
+      "lon": "2.95099",
+      "id": 11732311074,
+      "subType": "cafe",
+      "type": "sustenance"
+    },
+    {
+      "name": "Casa Clara",
+      "lat": "41.45725",
+      "lon": "2.25224",
+      "id": 187813925,
+      "subType": "building",
+      "type": "man_made"
+    },
+    {
+      "name": "Parcel·les Clarasó",
+      "lat": "41.14796",
+      "lon": "1.09232",
+      "id": 803598451,
+      "subType": "residential",
+      "type": "administrative"
+    },
+    {
+      "name": "Rosa Leveroni - Teresa Claramunt",
+      "lat": "41.38594",
+      "lon": "2.05929",
+      "id": 10829545194,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "L30",
+        "operator": "Rosanbus",
+        "ref": "109953"
+      }
+    },
+    {
+      "name": "Sas - Claramunt",
+      "lat": "41.43774",
+      "lon": "2.20415",
+      "id": 10510567904,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "covered_yes": "yes",
+        "bench_yes": "yes",
+        "ref": "13",
+        "route_bus_ref": "V33",
+        "operator": "TMB"
+      }
+    },
+    {
+      "name": "Pont de Clarà",
+      "lat": "42.06679",
+      "lon": "1.79620",
+      "id": 716008887,
+      "subType": "bridge",
+      "type": "man_made",
+      "additionalInfo": {
+        "bridge_car": "yes",
+        "route_bus_ref": "777",
+        "ref": "C-26"
+      }
+    },
+    {
+      "name": "L11 - Santa Clara",
+      "lat": "41.98503",
+      "lon": "2.82342",
+      "id": 1404566956,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "covered_no": "no",
+        "tactile_paving_no": "no",
+        "bench_no": "no",
+        "route_bus_ref": "L11",
+        "operator": "TMG"
+      }
+    },
+    {
+      "name": "Clarà",
+      "lat": "42.34992",
+      "lon": "3.12125",
+      "id": 2483196000,
+      "subType": "locality",
+      "type": "administrative"
+    },
+    {
+      "name": "Plaça del Claramunt",
+      "lat": "41.57170",
+      "lon": "1.64291",
+      "id": 1053371799,
+      "subType": "park",
+      "type": "entertainment"
+    },
+    {
+      "name": "Casa Clara",
+      "lat": "42.25887",
+      "lon": "3.07606",
+      "id": 3419684236,
+      "subType": "guest_house",
+      "type": "tourism"
+    },
+    {
+      "name": "Ca la Clara",
+      "lat": "41.39185",
+      "lon": "1.67001",
+      "id": 8283628062,
+      "subType": "isolated_dwelling",
+      "type": "administrative"
+    },
+    {
+      "name": "Clara-Hilda-Felsen",
+      "lat": "50.14099",
+      "lon": "8.38184",
+      "id": -168805,
+      "subType": "locality",
+      "type": "administrative"
+    },
+    {
+      "name": "Plans de Can Claramunt",
+      "lat": "41.53155",
+      "lon": "1.89094",
+      "id": 2483099238,
+      "subType": "locality",
+      "type": "administrative"
+    },
+    {
+      "name": "Passatge de Mossén Félix Clara",
+      "lat": "41.23632",
+      "lon": "1.81004",
+      "id": 476380099,
+      "subType": "highway_steps",
+      "type": "transportation"
+    },
+    {
+      "name": "Escultor Clarà",
+      "lat": "41.44922",
+      "lon": "2.22662",
+      "id": 747927549,
+      "subType": "parking",
+      "type": "transportation",
+      "additionalInfo": {
+        "operator": "Engestur"
+      }
+    },
+    {
+      "name": "Biblioteca Clarà",
+      "lat": "41.39977",
+      "lon": "2.12959",
+      "id": 339649943,
+      "subType": "library",
+      "type": "education",
+      "openingHours": "Mo-Tu 15:30-20:30; We-Th 10:00-14:00, 15:30-20:30; Fr 15:30-20:30; Sa 10:00-14:00",
+      "additionalInfo": {
+        "opening_hours": "Mo-Tu 15:30-20:30; We-Th 10:00-14:00, 15:30-20:30; Fr 15:30-20:30; Sa 10:00-14:00",
+        "website": "http://www.barcelona.cat/bibclara",
+        "phone": "+34932801547",
+        "email": "b.barcelona.cl@diba.cat"
+      }
+    },
+    {
+      "name": "Juan Rodríguez Clara",
+      "lat": "17.99275",
+      "lon": "-95.40399",
+      "id": -649830,
+      "subType": "town",
+      "type": "administrative"
+    },
+    {
+      "name": "Pujada de Santa Clara",
+      "lat": "40.81243",
+      "lon": "0.52430",
+      "id": 293754605,
+      "subType": "highway_steps",
+      "type": "transportation"
+    },
+    {
+      "name": "Castell de Claravalls",
+      "lat": "41.70273",
+      "lon": "1.12633",
+      "id": 4654764994,
+      "subType": "castle",
+      "type": "tourism"
+    },
+    {
+      "name": "Camí de Can Claramunt",
+      "lat": "41.30515",
+      "lon": "1.64327",
+      "id": 304550037,
+      "subType": "bridge",
+      "type": "man_made",
+      "additionalInfo": {
+        "bicycle_yes": "yes",
+        "bridge_car": "yes"
+      }
+    },
+    {
+      "name": "Claramunt",
+      "lat": "42.17865",
+      "lon": "0.78269",
+      "id": 1803024068,
+      "subType": "village",
+      "type": "administrative",
+      "additionalInfo": {
+        "website": "http://www.ajuntamentdetremp.cat/ca/viure-a-tremp/nuclis-agregats/claramunt",
+        "ele": "1095",
+        "population": "1",
+        "wikipedia": "http://ca.wikipedia.org/wiki/Claramunt"
+      }
+    },
+    {
+      "name": "Plaça Beatriu de Claramunt",
+      "lat": "41.22341",
+      "lon": "1.71415",
+      "id": 238406017,
+      "subType": "square",
+      "type": "man_made",
+      "additionalInfo": {
+        "lit_yes": "yes"
+      }
+    },
+    {
+      "name": "Biblioteca Clarà",
+      "lat": "41.39967",
+      "lon": "2.12967",
+      "id": 339649929,
+      "subType": "building",
+      "type": "man_made"
+    },
+    {
+      "name": "Claravalls",
+      "lat": "41.70230",
+      "lon": "1.12676",
+      "id": 4654765000,
+      "subType": "village",
+      "type": "administrative",
+      "additionalInfo": {
+        "website": "http://www.tarrega.cat/m_claravalls.html",
+        "population": "149",
+        "wikipedia": "http://ca.wikipedia.org/wiki/Claravalls"
+      }
+    },
+    {
+      "name": "Av. de la Roureda - Escultor Clarà",
+      "lat": "41.31998",
+      "lon": "2.00782",
+      "id": 10450149214,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "L86, N14",
+        "operator": "Mohn",
+        "ref": "104769"
+      }
+    },
+    {
+      "name": "Sant Andreu de Clarà",
+      "lat": "42.00152",
+      "lon": "1.45356",
+      "id": 627599319,
+      "subType": "place_of_worship",
+      "type": "tourism",
+      "additionalInfo": {
+        "religion_christian": "christian",
+        "denomination_roman_catholic": "roman_catholic"
+      }
+    },
+    {
+      "name": "Sant Andreu de Clarà",
+      "lat": "42.00152",
+      "lon": "1.45356",
+      "id": 627599319,
+      "subType": "building",
+      "type": "man_made",
+      "additionalInfo": {
+        "religion_christian": "christian",
+        "denomination_roman_catholic": "roman_catholic"
+      }
+    },
+    {
+      "name": "Monestir de Santa Clara",
+      "lat": "42.26054",
+      "lon": "3.04780",
+      "id": 1058163091,
+      "subType": "place_of_worship",
+      "type": "tourism",
+      "additionalInfo": {
+        "religion_christian": "christian",
+        "denomination_catholic": "catholic",
+        "website": "http://www.clarissesfortia.cat/"
+      }
+    },
+    {
+      "name": "Monestir de Santa Clara",
+      "lat": "42.26054",
+      "lon": "3.04780",
+      "id": 1058163091,
+      "subType": "building",
+      "type": "man_made",
+      "additionalInfo": {
+        "religion_christian": "christian",
+        "denomination_catholic": "catholic",
+        "website": "http://www.clarissesfortia.cat/"
+      }
+    },
+    {
+      "name": "Masia de Clara",
+      "lat": "41.99348",
+      "lon": "0.77533",
+      "id": 6794112822,
+      "subType": "isolated_dwelling",
+      "type": "administrative"
+    },
+    {
+      "name": "Sas - Claramunt",
+      "lat": "41.43769",
+      "lon": "2.20417",
+      "id": 10318316416,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "N8, 60",
+        "operator": "TMB, TUSGSAL",
+        "ref": "13"
+      }
+    },
+    {
+      "name": "Fruites Claramunt",
+      "lat": "41.23362",
+      "lon": "1.73809",
+      "id": 8593845122,
+      "subType": "greengrocer",
+      "type": "shop",
+      "additionalInfo": {
+        "website": "http://www.fruitesclaramunt.com",
+        "phone": "938932704",
+        "email": "gerencia@fruitesclaramunt.com"
+      }
+    },
+    {
+      "name": "Águas Claras",
+      "lat": "-15.84199",
+      "lon": "-48.02813",
+      "id": -695185,
+      "subType": "city",
+      "type": "administrative",
+      "additionalInfo": {
+        "population": "135685"
+      }
+    },
+    {
+      "name": "Puig Clarà",
+      "lat": "42.13279",
+      "lon": "2.73828",
+      "id": 6418222344,
+      "subType": "peak",
+      "type": "natural",
+      "additionalInfo": {
+        "ele": "315",
+        "wikipedia": "http://ca.wikipedia.org/wiki/Puig Clarà"
+      }
+    },
+    {
+      "name": "Riera de Clarà",
+      "lat": "41.56343",
+      "lon": "2.38547",
+      "id": 401272355,
+      "subType": "stream",
+      "type": "natural"
+    },
+    {
+      "name": "Puig Clarà (Panoràmica del Pirineu)",
+      "lat": "42.13286",
+      "lon": "2.73828",
+      "id": 6418222342,
+      "subType": "viewpoint",
+      "type": "tourism"
+    },
+    {
+      "name": "Puig Clarà (Panoràmica de l'Estany)",
+      "lat": "42.13262",
+      "lon": "2.73871",
+      "id": 6418222340,
+      "subType": "viewpoint",
+      "type": "tourism"
+    },
+    {
+      "name": "Castell de Claramunt",
+      "lat": "41.55502",
+      "lon": "1.66924",
+      "id": 526389675,
+      "subType": "castle",
+      "type": "tourism",
+      "additionalInfo": {
+        "wikipedia": "http://ca.wikipedia.org/wiki/Castell de Claramunt"
+      }
+    },
+    {
+      "name": "Castell de Claramunt",
+      "lat": "41.55502",
+      "lon": "1.66924",
+      "id": 526389675,
+      "subType": "building",
+      "type": "man_made",
+      "additionalInfo": {
+        "wikipedia": "http://ca.wikipedia.org/wiki/Castell de Claramunt"
+      }
+    },
+    {
+      "name": "Xiringuito Clara",
+      "lat": "41.11885",
+      "lon": "1.27422",
+      "id": 1722045680,
+      "subType": "bar",
+      "type": "sustenance"
+    },
+    {
+      "name": "Pl. Santa Clara",
+      "lat": "41.93107",
+      "lon": "2.25542",
+      "id": 6442740362,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "covered_yes": "yes",
+        "bench_yes": "yes",
+        "route_bus_ref": "L-1, L-2, L3, L8",
+        "operator": "Sagalés"
+      }
+    },
+    {
+      "name": "Av. Catalana - Clara Campoamor",
+      "lat": "41.42434",
+      "lon": "2.22087",
+      "id": 11219586540,
+      "subType": "bus_stop",
+      "type": "transportation",
+      "additionalInfo": {
+        "covered_no": "no",
+        "bench_no": "no",
+        "ref": "109700",
+        "route_bus_ref": "B20",
+        "operator": "Tusgsal"
+      }
+    },
+    {
+      "name": "Av. Catalana - Clara Campoamor",
+      "lat": "41.42434",
+      "lon": "2.22087",
+      "id": 11219586540,
+      "subType": "public_transport_stop_position",
+      "type": "transportation",
+      "additionalInfo": {
+        "covered_no": "no",
+        "bench_no": "no",
+        "ref": "109700",
+        "route_bus_ref": "B20",
+        "operator": "Tusgsal"
+      }
+    },
+    {
+      "name": "Clarassó",
+      "lat": "41.14754",
+      "lon": "1.09185",
+      "id": 6797558650,
+      "subType": "bus_stop",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "L20",
+        "operator": "Reus Transport",
+        "ref": "32"
+      }
+    },
+    {
+      "name": "Clarassó",
+      "lat": "41.14754",
+      "lon": "1.09185",
+      "id": 6797558650,
+      "subType": "public_transport_stop_position",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "L20",
+        "operator": "Reus Transport",
+        "ref": "32"
+      }
+    },
+    {
+      "name": "Serra d'en Clarà",
+      "lat": "41.29833",
+      "lon": "1.11417",
+      "id": 2483582362,
+      "subType": "locality",
+      "type": "administrative"
+    },
+    {
+      "name": "Av. Catalana - Clara Campoamor",
+      "lat": "41.42421",
+      "lon": "2.22102",
+      "id": 11194748624,
+      "subType": "bus_stop",
+      "type": "transportation",
+      "additionalInfo": {
+        "covered_no": "no",
+        "bench_no": "no",
+        "ref": "109706",
+        "route_bus_ref": "B20",
+        "operator": "Tusgsal"
+      }
+    },
+    {
+      "name": "Av. Catalana - Clara Campoamor",
+      "lat": "41.42421",
+      "lon": "2.22102",
+      "id": 11194748624,
+      "subType": "public_transport_stop_position",
+      "type": "transportation",
+      "additionalInfo": {
+        "covered_no": "no",
+        "bench_no": "no",
+        "ref": "109706",
+        "route_bus_ref": "B20",
+        "operator": "Tusgsal"
+      }
+    },
+    {
+      "name": "Restaurant Santa Clara",
+      "lat": "42.05465",
+      "lon": "3.20520",
+      "id": 6547212138,
+      "subType": "restaurant",
+      "type": "sustenance",
+      "additionalInfo": {
+        "cuisine_regional": "regional"
+      }
+    },
+    {
+      "name": "Clarà",
+      "lat": "42.11861",
+      "lon": "2.12013",
+      "id": 11086621508,
+      "subType": "historic_ruins",
+      "type": "tourism"
+    },
+    {
+      "name": "Apartaments Rosa Clara",
+      "lat": "41.70132",
+      "lon": "2.84823",
+      "id": 8424184200,
+      "subType": "guest_house",
+      "type": "tourism"
+    },
+    {
+      "name": "Carrer Nou de Santa Clara",
+      "lat": "40.81219",
+      "lon": "0.52340",
+      "id": 293754645,
+      "subType": "highway_steps",
+      "type": "transportation"
+    },
+    {
+      "name": "Hostal Santa Clara",
+      "lat": "42.05473",
+      "lon": "3.20522",
+      "id": 641447779,
+      "subType": "guest_house",
+      "type": "tourism",
+      "additionalInfo": {
+        "internet_access_fee_no": "no",
+        "internet_access_type_wlan": "wlan",
+        "website": "http://www.hostalsantaclara.com/"
+      }
+    },
+    {
+      "name": "Hostal Santa Clara",
+      "lat": "42.05473",
+      "lon": "3.20522",
+      "id": 641447779,
+      "subType": "building",
+      "type": "man_made",
+      "additionalInfo": {
+        "internet_access_fee_no": "no",
+        "internet_access_type_wlan": "wlan",
+        "website": "http://www.hostalsantaclara.com/"
+      }
+    },
+    {
+      "name": "Clarà",
+      "lat": "42.00280",
+      "lon": "1.45721",
+      "id": 3352724304,
+      "subType": "hamlet",
+      "type": "administrative",
+      "additionalInfo": {
+        "wikipedia": "http://ca.wikipedia.org/wiki/Clarà (Castellar de la Ribera)"
+      }
+    },
+    {
+      "name": "Molí de Clarà",
+      "lat": "42.11685",
+      "lon": "2.11622",
+      "id": 11086126678,
+      "subType": "building",
+      "type": "man_made"
+    },
+    {
+      "name": "Clot de Claravalls",
+      "lat": "41.70515",
+      "lon": "1.14762",
+      "id": 4675833070,
+      "subType": "locality",
+      "type": "administrative"
+    },
+    {
+      "name": "M. Clara Pujadas i Gil",
+      "lat": "41.44168",
+      "lon": "2.22111",
+      "id": 5903020870,
+      "subType": "pharmacy",
+      "type": "healthcare",
+      "openingHours": "Mo-Fr 09:00-14:00,16:30-20:30;Sa 09:00-14:00",
+      "additionalInfo": {
+        "wheelchair_limited": "limited",
+        "opening_hours": "Mo-Fr 09:00-14:00,16:30-20:30;Sa 09:00-14:00",
+        "phone": "+34933882482",
+        "wheelchair_description": "Porta no adaptada"
+      }
+    },
+    {
+      "name": "Monestir de Santa Clara",
+      "lat": "41.72034",
+      "lon": "1.83555",
+      "id": 4404046389248,
+      "subType": "place_of_worship",
+      "type": "tourism",
+      "additionalInfo": {
+        "religion_christian": "christian",
+        "denomination_catholic": "catholic"
+      }
+    },
+    {
+      "name": "Monestir de Santa Clara",
+      "lat": "41.72034",
+      "lon": "1.83555",
+      "id": 4404046389248,
+      "subType": "building",
+      "type": "man_made",
+      "additionalInfo": {
+        "religion_christian": "christian",
+        "denomination_catholic": "catholic"
+      }
+    },
+    {
+      "name": "Balma Clara",
+      "lat": "41.64691",
+      "lon": "2.02335",
+      "id": 3527915368,
+      "subType": "cave_entrance",
+      "type": "natural"
+    },
+    {
+      "name": "Iglesia de San Sadurní de Clará",
+      "names": {
+        "ca": "Església de Sant Serni de Clarà",
+        "es": "Iglesia de San Sadurní de Clará"
+      },
+      "lat": "42.06500",
+      "lon": "1.80122",
+      "id": 1184780863,
+      "subType": "place_of_worship",
+      "type": "tourism",
+      "additionalInfo": {
+        "religion_christian": "christian",
+        "denomination_roman_catholic": "roman_catholic",
+        "wikipedia": "http://es.wikipedia.org/wiki/Es:Iglesia_de_San_Sadurní_de_Clará"
+      }
+    },
+    {
+      "name": "Iglesia de San Sadurní de Clará",
+      "names": {
+        "ca": "Església de Sant Serni de Clarà",
+        "es": "Iglesia de San Sadurní de Clará"
+      },
+      "lat": "42.06500",
+      "lon": "1.80122",
+      "id": 1184780863,
+      "subType": "building",
+      "type": "man_made",
+      "additionalInfo": {
+        "religion_christian": "christian",
+        "denomination_roman_catholic": "roman_catholic",
+        "wikipedia": "http://es.wikipedia.org/wiki/Es:Iglesia_de_San_Sadurní_de_Clará"
+      }
+    },
+    {
+      "name": "Mas Clarà",
+      "lat": "41.98880",
+      "lon": "2.79967",
+      "id": 4400107862016,
+      "subType": "building",
+      "type": "man_made"
+    },
+    {
+      "name": "Plaça de Teresa Claramunt",
+      "lat": "41.36288",
+      "lon": "2.13974",
+      "id": 562546723,
+      "subType": "park",
+      "type": "entertainment"
+    },
+    {
+      "name": "Riera de Clarà",
+      "lat": "41.55540",
+      "lon": "2.36700",
+      "id": 457500271,
+      "subType": "stream",
+      "type": "natural"
+    },
+    {
+      "name": "Claravalls",
+      "lat": "41.70268",
+      "lon": "1.12573",
+      "id": 447769179,
+      "subType": "residential",
+      "type": "administrative"
+    },
+    {
+      "name": "Ateneu Carme Claramunt",
+      "lat": "41.44236",
+      "lon": "2.22598",
+      "id": 7112179200,
+      "subType": "political_party",
+      "type": "office",
+      "additionalInfo": {
+        "wheelchair_no": "no"
+      }
+    },
+    {
+      "name": "Av. Catalana - Clara Campoamor",
+      "lat": "41.42437",
+      "lon": "2.22093",
+      "id": 10508165732,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "covered_no": "no",
+        "bench_no": "no",
+        "ref": "109700",
+        "route_bus_ref": "B20",
+        "operator": "Tusgsal"
+      }
+    },
+    {
+      "name": "Mare de Déu del Port - Pl Teresa Claramunt",
+      "lat": "41.36228",
+      "lon": "2.13952",
+      "id": 10686664968,
+      "subType": "public_transport_platform",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "125",
+        "operator": "TMB",
+        "ref": "2493"
+      }
+    },
+    {
+      "name": "Clara",
+      "names": {
+        "ru": "Клара",
+        "ga": "Clóirtheach"
+      },
+      "lat": "53.34251",
+      "lon": "-7.61389",
+      "id": -695482,
+      "subType": "town",
+      "type": "administrative",
+      "additionalInfo": {
+        "population": "3242"
+      }
+    },
+    {
+      "name": "Plaça de la Mare Santa Clara",
+      "lat": "41.61315",
+      "lon": "0.62223",
+      "id": 673912799,
+      "subType": "square",
+      "type": "man_made"
+    },
+    {
+      "name": "Panteón Silva Pérez y Antonio Leal Da Rosa",
+      "names": {
+        "es": "Panteón Silva Pérez y Antonio Leal Da Rosa"
+      },
+      "lat": "41.35270",
+      "lon": "2.15235",
+      "id": 9767364056,
+      "subType": "memorial",
+      "type": "tourism",
+      "additionalInfo": {
+        "architecture_modern": "modern",
+        "architect_name": "Leandre Albareda i Petit; Enric Clarasó i Daudí"
+      }
+    },
+    {
+      "name": "La Sínia de Santa Clara",
+      "lat": "41.72186",
+      "lon": "1.83470",
+      "id": 8135269918,
+      "subType": "cafe",
+      "type": "sustenance"
+    },
+    {
+      "name": "Av. Navarra - Av. Clarasó",
+      "lat": "41.23141",
+      "lon": "1.78897",
+      "id": 4912393974,
+      "subType": "bus_stop",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "L2",
+        "operator": "TCC"
+      }
+    },
+    {
+      "name": "Av. Navarra - Av. Clarasó",
+      "lat": "41.23141",
+      "lon": "1.78897",
+      "id": 4912393974,
+      "subType": "public_transport_stop_position",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_bus_ref": "L2",
+        "operator": "TCC"
+      }
+    },
+    {
+      "name": "La Deessa",
+      "enName": "The Goddess",
+      "names": {
+        "it": "La Dea",
+        "fr": "La Déesse",
+        "pdc": "Die Göttin",
+        "ca": "La Deessa",
+        "es": "La Diosa"
+      },
+      "lat": "41.38644",
+      "lon": "2.17010",
+      "id": 10809276276,
+      "subType": "artwork",
+      "type": "tourism",
+      "additionalInfo": {
+        "artwork_type_sculpture": "sculpture",
+        "start_date": "1927",
+        "artist_name": "Josep Clarà i Ayats",
+        "alt_name": "L'enigma"
+      }
+    },
+    {
+      "name": "Panteón Lluisa Denís i Reverter y Santiago Rusiñol",
+      "names": {
+        "es": "Panteón Lluisa Denís i Reverter y Santiago Rusiñol"
+      },
+      "lat": "41.35275",
+      "lon": "2.15197",
+      "id": 9767364054,
+      "subType": "memorial",
+      "type": "tourism",
+      "additionalInfo": {
+        "architect_name": "Enric Clarasó i Daudí; Miquel Font\""
+      }
+    },
+    {
+      "name": "345 - Pl. Teresa de Claramunt",
+      "lat": "41.36312",
+      "lon": "2.13976",
+      "id": 7719459490,
+      "subType": "bicycle_rental",
+      "type": "service",
+      "additionalInfo": {
+        "ele": "48",
+        "ref": "345",
+        "capacity": "31",
+        "operator": "Clear Channel",
+        "network": "bicing"
+      }
+    },
+    {
+      "name": "Clarà",
+      "lat": "42.12143",
+      "lon": "1.05763",
+      "id": 2483255490,
+      "subType": "locality",
+      "type": "administrative"
+    },
+    {
+      "name": "Pla de Clarà",
+      "lat": "42.13981",
+      "lon": "1.88411",
+      "id": 2483106502,
+      "subType": "locality",
+      "type": "administrative"
+    },
+    {
+      "name": "la Pobla de Claramunt",
+      "lat": "41.55519",
+      "lon": "1.67473",
+      "id": 2920956126,
+      "subType": "village",
+      "type": "administrative",
+      "additionalInfo": {
+        "website": "http://www.lapobladeclaramunt.cat",
+        "ele": "265",
+        "population": "2295",
+        "wikipedia": "http://ca.wikipedia.org/wiki/La Pobla de Claramunt"
+      }
+    },
+    {
+      "name": "la Pobla de Claramunt",
+      "lat": "41.55465",
+      "lon": "1.67790",
+      "id": 781818710,
+      "subType": "public_transport_stop_position",
+      "type": "transportation",
+      "additionalInfo": {
+        "route_train_ref": "R6, R60",
+        "operator": "FGC Ferrocarrils de la Generalitat de Catalunya"
+      }
+    },
+    {
+      "name": "Cementiri de la Pobla de Claramunt",
+      "lat": "41.56495",
+      "lon": "1.66977",
+      "id": 467279127,
+      "subType": "grave_yard",
+      "type": "tourism"
+    },
+    {
+      "name": "Santa Maria del Castell de Claramunt",
+      "lat": "41.55487",
+      "lon": "1.66960",
+      "id": 526389869,
+      "subType": "historic_ruins",
+      "type": "tourism"
+    },
+    {
+      "name": "Santa Maria del Castell de Claramunt",
+      "lat": "41.55487",
+      "lon": "1.66960",
+      "id": 526389869,
+      "subType": "building",
+      "type": "man_made"
+    },
+    {
+      "name": "Plaça de Santa Clara",
+      "lat": "41.93107",
+      "lon": "2.25546",
+      "id": 92686665,
+      "subType": "square",
+      "type": "man_made"
+    },
+    {
+      "name": "Plaça de Clara Campoamor",
+      "lat": "41.62731",
+      "lon": "0.63287",
+      "id": 672301789,
+      "subType": "square",
+      "type": "man_made"
+    },
+    {
+      "name": "Santa Clara",
+      "lat": "13.70230",
+      "lon": "-88.72792",
+      "id": -639707,
+      "subType": "town",
+      "type": "administrative"
+    },
+    {
+      "name": "Càmping Clarà",
+      "lat": "41.14895",
+      "lon": "1.41998",
+      "id": 463775793,
+      "subType": "camp_site",
+      "type": "tourism"
+    },
+    {
+      "name": "Riera de Clarà",
+      "lat": "42.04000",
+      "lon": "1.82551",
+      "id": 568585721,
+      "subType": "stream",
+      "type": "natural"
+    },
+    {
+      "name": "Passatge de Santa Clara",
+      "lat": "41.38389",
+      "lon": "2.17735",
+      "id": 109689429,
+      "subType": "tunnel",
+      "type": "man_made",
+      "additionalInfo": {
+        "access_private": "private",
+        "tunnel_pedestrian": "yes"
+      }
+    },
+    {
+      "name": "Josep Clarà",
+      "lat": "41.35363",
+      "lon": "2.15429",
+      "id": 4696518130,
+      "subType": "memorial",
+      "type": "tourism"
+    }
+  ],
+  "cities": [
+    {
+      "name": "Sant Quintí de Mediona",
+      "lat": "41.46279",
+      "lon": "1.66522",
+      "id": 387428854,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Clara Campoamor",
+          "lat": "41.46545",
+          "lon": "1.66245",
+          "id": 83553,
+          "intersectedStreets": [
+            {
+              "name": "Carrer de la Cova",
+              "lat": "41.46545",
+              "lon": "1.66245"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "la Barceloneta",
+      "names": {
+        "ru": "Барселонета"
+      },
+      "lat": "41.38066",
+      "lon": "2.18993",
+      "id": 1433944928,
+      "type": "SUBURB",
+      "listOfStreets": [
+        {
+          "name": "Carrer del Comte de Santa Clara",
+          "lat": "41.37831",
+          "lon": "2.18928",
+          "id": 13101
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Cambrils",
+      "lat": "41.06794",
+      "lon": "1.06576",
+      "id": 1470838172,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Josep Clarà",
+          "lat": "41.08060",
+          "lon": "1.09483",
+          "id": 68695
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "la Bisbal d'Empordà",
+      "lat": "41.95987",
+      "lon": "3.03961",
+      "id": 1470838432,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer Josep Vila Clara",
+          "lat": "41.95585",
+          "lon": "3.04461",
+          "id": 60290,
+          "intersectedStreets": [
+            {
+              "name": "Avinguda de Josep Irla",
+              "lat": "41.95675",
+              "lon": "3.04429"
+            },
+            {
+              "name": "Carrer de Ramon Muntaner",
+              "lat": "41.95587",
+              "lon": "3.04461"
+            },
+            {
+              "name": "Camí de Guardiola",
+              "lat": "41.95501",
+              "lon": "3.04491"
+            }
+          ]
+        },
+        {
+          "name": "Carrer Mas Clara",
+          "lat": "41.96522",
+          "lon": "3.03965",
+          "id": 82833,
+          "intersectedStreets": [
+            {
+              "name": "Carrer Agustí Font",
+              "lat": "41.96468",
+              "lon": "3.03847"
+            },
+            {
+              "name": "Carrer Paral·lel",
+              "lat": "41.96468",
+              "lon": "3.03847"
+            },
+            {
+              "name": "Carrer Jofre el Pilós",
+              "lat": "41.96522",
+              "lon": "3.03965"
+            },
+            {
+              "name": "Carrer Jaume II",
+              "lat": "41.96568",
+              "lon": "3.04057"
+            },
+            {
+              "name": "Carretera Castell d'Empordà",
+              "lat": "41.96568",
+              "lon": "3.04057"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Sitges",
+      "lat": "41.23667",
+      "lon": "1.82281",
+      "id": 1470839456,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Passatge de Mossèn Fèlix Clarà",
+          "lat": "41.23587",
+          "lon": "1.80989",
+          "id": 3637,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Carrer d'en Pau Barrabeig",
+              "lat": "41.23567",
+              "lon": "1.80995"
+            },
+            {
+              "name": "Carrer de la Carreta",
+              "lat": "41.23562",
+              "lon": "1.81013"
+            },
+            {
+              "name": "Carrer Major",
+              "lat": "41.23633",
+              "lon": "1.81004"
+            },
+            {
+              "name": "Carrer de l'Hort de Can Falç",
+              "lat": "41.23612",
+              "lon": "1.80993"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Montbau",
+      "lat": "41.43190",
+      "lon": "2.14160",
+      "id": 3170159053,
+      "type": "SUBURB",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Clarà Ayats",
+          "lat": "41.43085",
+          "lon": "2.14128",
+          "id": 73840,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Roig i Solé",
+              "lat": "41.43087",
+              "lon": "2.14094"
+            },
+            {
+              "name": "Carrer de la Pintura",
+              "lat": "41.43085",
+              "lon": "2.14128"
+            },
+            {
+              "name": "Carrer de la Música",
+              "lat": "41.43176",
+              "lon": "2.14167"
+            },
+            {
+              "name": "Carrer de la Poesia",
+              "lat": "41.43254",
+              "lon": "2.14203"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Lliçà d'Amunt",
+      "lat": "41.61049",
+      "lon": "2.23971",
+      "id": 395368558,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Josep Clarà (Ca l'Esteper)",
+          "lat": "41.61095",
+          "lon": "2.22164",
+          "id": 33511,
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Frederic Marès (Ca l'Esteper)",
+              "lat": "41.61057",
+              "lon": "2.22136"
+            },
+            {
+              "name": "Carrer de Marià Fortuny (Ca l'Esteper)",
+              "lat": "41.61196",
+              "lon": "2.22297"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Girona",
+      "names": {
+        "be": "Херона",
+        "ru": "Жирона",
+        "ko": "지로나",
+        "pt": "Gerunda",
+        "gl": "Xirona",
+        "el": "Ζιρόνα",
+        "lt": "Cherona",
+        "fr": "Gérone",
+        "an": "Chirona",
+        "es": "Gerona",
+        "zh": "赫罗纳",
+        "eu": "Girona",
+        "ar": "جرندة",
+        "uk": "Жірона",
+        "ja": "ジローナ",
+        "fa": "خرنا",
+        "he": "ז'ירונה",
+        "ca": "Girona",
+        "nl": "Gerona",
+        "sr": "Ђирона"
+      },
+      "lat": "41.97930",
+      "lon": "2.81995",
+      "id": 30894545,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Josep Clarà i Ayats",
+          "names": {
+            "ca": "Carrer de Josep Clarà i Ayats"
+          },
+          "lat": "41.97162",
+          "lon": "2.82853",
+          "id": 8256,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Carles de Bolós",
+              "names": {
+                "ca": "Carrer de Carles de Bolós"
+              },
+              "lat": "41.97168",
+              "lon": "2.82846"
+            },
+            {
+              "name": "Carrer de Joan Coromines i Vigneaux (Disseminat de Montilivi)",
+              "names": {
+                "ca": "Carrer de Joan Coromines i Vigneaux (Disseminat de Montilivi)"
+              },
+              "lat": "41.97168",
+              "lon": "2.82846"
+            }
+          ]
+        },
+        {
+          "name": "Carrer de Santa Clara",
+          "names": {
+            "ca": "Carrer de Santa Clara"
+          },
+          "lat": "41.98495",
+          "lon": "2.82336",
+          "id": 586
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Roquetes",
+      "names": {
+        "ca": "Roquetes",
+        "es": "Roquetas"
+      },
+      "lat": "40.82037",
+      "lon": "0.50344",
+      "id": 1460477958,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Carrer Santa Clara",
+          "lat": "40.82056",
+          "lon": "0.50520",
+          "id": 11644
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Palafrugell",
+      "lat": "41.91837",
+      "lon": "3.16198",
+      "id": 1470838631,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Josep Clarà (Tamariu)",
+          "lat": "41.91745",
+          "lon": "3.20432",
+          "id": 69144,
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Berruguete",
+              "lat": "41.91750",
+              "lon": "3.20427"
+            },
+            {
+              "name": "Carrer de Carles Buïgas (Tamariu)",
+              "lat": "41.91750",
+              "lon": "3.20427"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Esparreguera",
+      "lat": "41.54065",
+      "lon": "1.86924",
+      "id": 1460478465,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Josep Clarà",
+          "lat": "41.52710",
+          "lon": "1.84793",
+          "id": 111053,
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Carles Buïgas",
+              "lat": "41.52803",
+              "lon": "1.84725"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Sant Just Desvern",
+      "names": {
+        "es": "San Justo Desvern"
+      },
+      "lat": "41.38158",
+      "lon": "2.07506",
+      "id": 1470838887,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Clara Campoamor",
+          "lat": "41.38657",
+          "lon": "2.06114",
+          "id": 73250,
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Rosa Leveroni",
+              "lat": "41.38657",
+              "lon": "2.06114"
+            },
+            {
+              "name": "carrer d'Emília Guàrdia",
+              "lat": "41.38657",
+              "lon": "2.06114"
+            },
+            {
+              "name": "Passeig del Camí de Can Gelabert",
+              "lat": "41.38581",
+              "lon": "2.06163"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Santa Coloma de Gramenet",
+      "names": {
+        "ru": "Санта-Колома-де-Граменет"
+      },
+      "lat": "41.45156",
+      "lon": "2.20834",
+      "id": 346353020,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer Clara Campoamor",
+          "lat": "41.45813",
+          "lon": "2.19546",
+          "id": 113362
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Tarragona",
+      "names": {
+        "be": "Тарагона",
+        "ru": "Таррагона",
+        "ko": "타라고나",
+        "el": "Ταρραγόνα",
+        "lt": "Taragona",
+        "fr": "Tarragone",
+        "es": "Tarragona",
+        "zh": "塔拉戈纳",
+        "ar": "طراغونة",
+        "la": "Tarraco",
+        "uk": "Таррагона",
+        "ja": "タラゴナ",
+        "fa": "تاراگونا",
+        "he": "טרגונה",
+        "sr": "Тарагона"
+      },
+      "lat": "41.11724",
+      "lon": "1.25461",
+      "id": 152377920,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Clara Campoamor Rodríguez",
+          "lat": "41.13584",
+          "lon": "1.29675",
+          "id": 38178
+        },
+        {
+          "name": "Carrer de Santa Clara",
+          "lat": "41.11554",
+          "lon": "1.25678",
+          "id": 16454
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Viladecans",
+      "lat": "41.31631",
+      "lon": "2.01560",
+      "id": 2375518653,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer de l'Escultor Clarà",
+          "lat": "41.31940",
+          "lon": "2.00788",
+          "id": 41627,
+          "intersectedStreets": [
+            {
+              "name": "Avinguda Roureda",
+              "lat": "41.31970",
+              "lon": "2.00749"
+            },
+            {
+              "name": "Carrer Joaquim Mir",
+              "lat": "41.31940",
+              "lon": "2.00788"
+            },
+            {
+              "name": "Carrer Pere Sala",
+              "lat": "41.31908",
+              "lon": "2.00827"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Ca l'Esteper",
+      "lat": "41.61069",
+      "lon": "2.22201",
+      "id": 926958321,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Josep Clarà",
+          "lat": "41.61097",
+          "lon": "2.22164",
+          "id": 33512,
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Frederic Marès",
+              "lat": "41.61058",
+              "lon": "2.22136"
+            },
+            {
+              "name": "Carrer de Marià Fortuny",
+              "lat": "41.61198",
+              "lon": "2.22297"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Tàrrega",
+      "names": {
+        "es": "Tárrega"
+      },
+      "lat": "41.64728",
+      "lon": "1.14090",
+      "id": 1470839515,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Santa Clara",
+          "lat": "41.64622",
+          "lon": "1.13550",
+          "id": 40000
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Santa Coloma de Farners",
+      "lat": "41.86031",
+      "lon": "2.66590",
+      "id": 1470839251,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Plaça Santa Clara",
+          "lat": "41.86809",
+          "lon": "2.65985",
+          "id": 22434
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Tortosa",
+      "lat": "40.81102",
+      "lon": "0.52093",
+      "id": 1470839509,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Santa Clara",
+          "lat": "40.81201",
+          "lon": "0.52355",
+          "id": 11129
+        },
+        {
+          "name": "Carrer Nou de Santa Clara",
+          "lat": "40.81220",
+          "lon": "0.52365",
+          "id": 11130
+        },
+        {
+          "name": "Pujada de Santa Clara",
+          "lat": "40.81243",
+          "lon": "0.52430",
+          "id": 54874
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Cardedeu",
+      "names": {
+        "ar": "كارديديو",
+        "uk": "Кардазеу",
+        "el": "Καρδεδέου"
+      },
+      "lat": "41.63851",
+      "lon": "2.35584",
+      "id": 1470838185,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer del Escultor Clarà",
+          "lat": "41.64439",
+          "lon": "2.35545",
+          "id": 46009,
+          "intersectedStreets": [
+            {
+              "name": "Passeig Font dels Oms",
+              "lat": "41.64450",
+              "lon": "2.35502"
+            },
+            {
+              "name": "Carrer de la Penya",
+              "lat": "41.64439",
+              "lon": "2.35545"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Sant Vicenç dels Horts",
+      "lat": "41.39342",
+      "lon": "2.00994",
+      "id": 1470839216,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Santa Clara (Poble Nou)",
+          "lat": "41.38636",
+          "lon": "2.01183",
+          "id": 52370
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "l'Aldea",
+      "lat": "40.74451",
+      "lon": "0.61882",
+      "id": 4642519995,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Raval de Clara",
+          "lat": "40.75054",
+          "lon": "0.62440",
+          "id": 10707
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Reus",
+      "names": {
+        "ru": "Реус",
+        "uk": "Реус",
+        "el": "Ρέους",
+        "lt": "Reusas"
+      },
+      "lat": "41.15555",
+      "lon": "1.10762",
+      "id": 152377926,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Santa Clara",
+          "lat": "41.15378",
+          "lon": "1.11140",
+          "id": 88423
+        },
+        {
+          "name": "Carrer de l'advocada Clara Campoamor",
+          "lat": "41.14903",
+          "lon": "1.09717",
+          "id": 34460
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Torredembarra",
+      "lat": "41.14615",
+      "lon": "1.39595",
+      "id": 1460478559,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Avinguda de Clarà",
+          "lat": "41.15148",
+          "lon": "1.41867",
+          "id": 90162
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Badalona",
+      "names": {
+        "kk": "Бадалона",
+        "be": "Бадалона",
+        "ru": "Бадалона",
+        "ko": "바달로나",
+        "bg": "Бадалона",
+        "el": "Μπαδαλόνα",
+        "sa": "बाडालोना",
+        "zh": "巴达洛纳",
+        "ar": "بادالونا",
+        "hy": "Բադալոնա",
+        "th": "บาดาโลนา",
+        "ka": "ბადალონა",
+        "uk": "Бадалона",
+        "ja": "バダロナ",
+        "fa": "بادالونا",
+        "sr": "Бадалона"
+      },
+      "lat": "41.44935",
+      "lon": "2.24825",
+      "id": 52228684,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "carrer de l'Escultor Clarà",
+          "lat": "41.44884",
+          "lon": "2.22741",
+          "id": 28836,
+          "intersectedStreets": [
+            {
+              "name": "carrer de l'Estrella",
+              "lat": "41.44869",
+              "lon": "2.22550"
+            },
+            {
+              "name": "carrer del General Moragues",
+              "lat": "41.44869",
+              "lon": "2.22550"
+            },
+            {
+              "name": "carrer del Cid Campeador",
+              "lat": "41.44852",
+              "lon": "2.22857"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Garraf",
+      "lat": "41.25274",
+      "lon": "1.90248",
+      "id": 5025041121,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Passatge de Mossèn Fèlix Clarà",
+          "lat": "41.23587",
+          "lon": "1.80989",
+          "id": 3638,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Carrer d'en Pau Barrabeig",
+              "lat": "41.23567",
+              "lon": "1.80995"
+            },
+            {
+              "name": "Carrer de la Carreta",
+              "lat": "41.23562",
+              "lon": "1.81013"
+            },
+            {
+              "name": "Carrer Major (Sitges)",
+              "lat": "41.23633",
+              "lon": "1.81004"
+            },
+            {
+              "name": "Carrer de l'Hort de Can Falç",
+              "lat": "41.23612",
+              "lon": "1.80993"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Terrassa",
+      "names": {
+        "ar": "تاراسا",
+        "ru": "Террасса",
+        "el": "Τεράσα",
+        "lt": "Terasa",
+        "ca": "Terrassa",
+        "es": "Tarrasa",
+        "sr": "Тараса"
+      },
+      "lat": "41.56973",
+      "lon": "2.01320",
+      "id": 288139569,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Carrer de l'Escultor Clarà (La Maurina)",
+          "lat": "41.56165",
+          "lon": "1.99511",
+          "id": 23480,
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Felip II (La Maurina)",
+              "lat": "41.56139",
+              "lon": "1.99488"
+            },
+            {
+              "name": "Carrer d'Orà",
+              "lat": "41.56139",
+              "lon": "1.99488"
+            },
+            {
+              "name": "Carrer de Gandia",
+              "lat": "41.56279",
+              "lon": "1.99524"
+            }
+          ]
+        },
+        {
+          "name": "Carrer de Clara Campoamor (Can Roca)",
+          "lat": "41.58287",
+          "lon": "2.01108",
+          "id": 15310,
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Sabadell (Pla del Bon Aire)",
+              "lat": "41.58263",
+              "lon": "2.01157"
+            },
+            {
+              "name": "Carrer de l'Estatut (Can Roca)",
+              "lat": "41.58263",
+              "lon": "2.01157"
+            },
+            {
+              "name": "Passatge de Mercè Rodoreda",
+              "lat": "41.58287",
+              "lon": "2.01108"
+            },
+            {
+              "name": "Carrer de Ferran Casablancas (Can Roca)",
+              "lat": "41.58301",
+              "lon": "2.01078"
+            },
+            {
+              "name": "Carrer d'Anna Frank (Can Roca)",
+              "lat": "41.58340",
+              "lon": "2.00998"
+            }
+          ]
+        },
+        {
+          "name": "Carrer de la poetessa Clarà",
+          "lat": "41.57231",
+          "lon": "2.02453",
+          "id": 23007,
+          "intersectedStreets": [
+            {
+              "name": "Avinguda de Jaume I (Ègara)",
+              "lat": "41.57150",
+              "lon": "2.02256"
+            },
+            {
+              "name": "Carrer de Prat de la Riba (Sant Pere Nord)",
+              "lat": "41.57150",
+              "lon": "2.02256"
+            },
+            {
+              "name": "Carrer de Girona (Sant Pere Nord)",
+              "lat": "41.57223",
+              "lon": "2.02352"
+            },
+            {
+              "name": "Carrer de Josep Maria Palau (Sant Pere Nord)",
+              "lat": "41.57224",
+              "lon": "2.02376"
+            },
+            {
+              "name": "Carrer de Pompeu Fabra (Can Tusell)",
+              "lat": "41.57234",
+              "lon": "2.02472"
+            },
+            {
+              "name": "Carrer del pintor Huguet",
+              "lat": "41.57234",
+              "lon": "2.02472"
+            },
+            {
+              "name": "Carrer de Miguel Palomares",
+              "lat": "41.57237",
+              "lon": "2.02511"
+            },
+            {
+              "name": "Carrer del Doctor Ferran (Sant Pere Nord)",
+              "lat": "41.57174",
+              "lon": "2.02271"
+            },
+            {
+              "name": "Carrer de Provença (Can Tusell)",
+              "lat": "41.57250",
+              "lon": "2.02552"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Poble Nou",
+      "lat": "41.38736",
+      "lon": "2.01179",
+      "id": 3179930069,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Santa Clara",
+          "lat": "41.38636",
+          "lon": "2.01185",
+          "id": 52371
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Sant Pol de Mar",
+      "names": {
+        "ca": "Sant Pol de Mar",
+        "es": "San Pol de Mar"
+      },
+      "lat": "41.60302",
+      "lon": "2.62380",
+      "id": 571251818,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Santa Clara",
+          "lat": "41.60197",
+          "lon": "2.62189",
+          "id": 10520
+        },
+        {
+          "name": "Carrer Santa Clara",
+          "lat": "41.60294",
+          "lon": "2.62316",
+          "id": 43715
+        },
+        {
+          "name": "Carrer de Santa Clara",
+          "lat": "41.60221",
+          "lon": "2.62241",
+          "id": 43725
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "el Catllar",
+      "lat": "41.17479",
+      "lon": "1.32559",
+      "id": 886148666,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Camí del Mas de Clarà",
+          "lat": "41.15447",
+          "lon": "1.31885",
+          "id": 80732
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Lleida",
+      "names": {
+        "ar": "لاردة",
+        "ru": "Ллейда",
+        "el": "Λιέιδα",
+        "lt": "Lerida",
+        "fr": "Lérida",
+        "ca": "Lleida",
+        "es": "Lérida",
+        "sr": "Љеида"
+      },
+      "lat": "41.61476",
+      "lon": "0.62678",
+      "id": 124083658,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Plaça de Clara Campoamor",
+          "lat": "41.62731",
+          "lon": "0.63285",
+          "id": 102127
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Gavà",
+      "lat": "41.30509",
+      "lon": "2.00631",
+      "id": 1470838298,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Clara Campoamor",
+          "lat": "41.30860",
+          "lon": "1.98805",
+          "id": 14336,
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Montserrat Roig",
+              "lat": "41.30899",
+              "lon": "1.98657"
+            },
+            {
+              "name": "Rambla Pompeu Fabra",
+              "names": {
+                "ca": "rambla Pompeu Fabra"
+              },
+              "lat": "41.30868",
+              "lon": "1.99097"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Moià",
+      "lat": "41.81304",
+      "lon": "2.09783",
+      "id": 269726056,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Carrer del Castell de Clarà",
+          "lat": "41.81331",
+          "lon": "2.08854",
+          "id": 34334,
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Jacint Icart",
+              "lat": "41.81375",
+              "lon": "2.08770"
+            },
+            {
+              "name": "Carrer de Sant Andreu",
+              "lat": "41.81278",
+              "lon": "2.08929"
+            },
+            {
+              "name": "Carrer de Sant Pere",
+              "lat": "41.81278",
+              "lon": "2.08929"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Cabrera de Mar",
+      "lat": "41.52770",
+      "lon": "2.39251",
+      "id": 523051419,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "carrer de Clarà",
+          "lat": "41.52795",
+          "lon": "2.39953",
+          "id": 68176,
+          "intersectedStreets": [
+            {
+              "name": "carrer de Sant Sebastià",
+              "lat": "41.52839",
+              "lon": "2.40019"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Vilafant",
+      "lat": "42.25153",
+      "lon": "2.94180",
+      "id": 1460478326,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Carrer de les Closes d'en Clarà",
+          "lat": "42.25254",
+          "lon": "2.95376",
+          "id": 37851,
+          "intersectedStreets": [
+            {
+              "name": "Carretera de les Forques",
+              "lat": "42.25247",
+              "lon": "2.95380"
+            },
+            {
+              "name": "Avinguda de Maria Torres",
+              "lat": "42.25285",
+              "lon": "2.95511"
+            },
+            {
+              "name": "Cami del Puig Martí",
+              "lat": "42.25285",
+              "lon": "2.95511"
+            },
+            {
+              "name": "Carrer de la Muga",
+              "lat": "42.25265",
+              "lon": "2.95412"
+            },
+            {
+              "name": "Avinguda de les Mèlies",
+              "lat": "42.25239",
+              "lon": "2.95077"
+            },
+            {
+              "name": "Carrer Anyet",
+              "lat": "42.25243",
+              "lon": "2.95092"
+            },
+            {
+              "name": "Carrer Llierca",
+              "lat": "42.25257",
+              "lon": "2.95172"
+            },
+            {
+              "name": "Carrer Arnera",
+              "lat": "42.25257",
+              "lon": "2.95255"
+            },
+            {
+              "name": "Carrer del Fluvià",
+              "lat": "42.25257",
+              "lon": "2.95339"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Manresa",
+      "names": {
+        "ru": "Манреса",
+        "ja": "マンレザ"
+      },
+      "lat": "41.72890",
+      "lon": "1.82867",
+      "id": 1470838508,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer Vell de Santa Clara",
+          "lat": "41.72146",
+          "lon": "1.83283",
+          "id": 92484
+        },
+        {
+          "name": "Carrer Nou de Santa Clara (Les Escodines)",
+          "lat": "41.72235",
+          "lon": "1.83070",
+          "id": 74567
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "les Peces",
+      "lat": "41.25500",
+      "lon": "1.50148",
+      "id": 388127073,
+      "type": "HAMLET",
+      "listOfStreets": [
+        {
+          "name": "Carrer Josep Clarà",
+          "lat": "41.25371",
+          "lon": "1.50272",
+          "id": 73976
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Vic",
+      "enName": "Vic",
+      "names": {
+        "ca": "Vic",
+        "es": "Vic",
+        "zh": "比克"
+      },
+      "lat": "41.93020",
+      "lon": "2.25460",
+      "id": 1470839536,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer del Molí d'en Clarà",
+          "lat": "41.91336",
+          "lon": "2.22297",
+          "id": 64436,
+          "intersectedStreets": [
+            {
+              "name": "Carrer del 2 de Novembre de 1930",
+              "lat": "41.91294",
+              "lon": "2.22321"
+            },
+            {
+              "name": "Carrer d'Antoni Vila i Benet",
+              "lat": "41.91336",
+              "lon": "2.22297"
+            },
+            {
+              "name": "Carrer de l'Ermita de Sant Sebastià",
+              "lat": "41.91379",
+              "lon": "2.22269"
+            }
+          ]
+        },
+        {
+          "name": "Plaça de Santa Clara",
+          "lat": "41.93107",
+          "lon": "2.25546",
+          "id": 27214
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Sant Llorenç Savall",
+      "lat": "41.67947",
+      "lon": "2.05796",
+      "id": 540818296,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Carrer Josep Clara",
+          "lat": "41.68389",
+          "lon": "2.05298",
+          "id": 41474,
+          "intersectedStreets": [
+            {
+              "name": "Avinguda de Sant Llorenç",
+              "lat": "41.68294",
+              "lon": "2.05296"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Barcelona",
+      "names": {
+        "de": "Barcelona",
+        "hi": "बार्सॆलोना",
+        "be": "Барселона",
+        "kn": "ಬಾರ್ಸೆಲೋನಾ",
+        "ru": "Барселона",
+        "pt": "Barcelona",
+        "el": "Βαρκελώνη",
+        "lt": "Barselona",
+        "it": "Barcellona",
+        "fr": "Barcelone",
+        "es": "Barcelona",
+        "zh": "巴塞罗那",
+        "eu": "Bartzelona",
+        "ar": "برشلونة",
+        "oc": "Barcelona",
+        "uk": "Барселона",
+        "ja": "バルセロナ",
+        "ckb": "بارسێلۆنا",
+        "ca": "Barcelona",
+        "sr": "Барселона"
+      },
+      "lat": "41.38289",
+      "lon": "2.17744",
+      "id": 152364165,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Clarà Ayats",
+          "lat": "41.43085",
+          "lon": "2.14128",
+          "id": 73839,
+          "buildings": [],
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Roig i Solé",
+              "lat": "41.43087",
+              "lon": "2.14094"
+            },
+            {
+              "name": "Carrer de la Pintura",
+              "lat": "41.43085",
+              "lon": "2.14128"
+            },
+            {
+              "name": "Carrer de la Música (Montbau)",
+              "lat": "41.43176",
+              "lon": "2.14167"
+            },
+            {
+              "name": "Carrer de la Poesia (Montbau)",
+              "lat": "41.43254",
+              "lon": "2.14203"
+            }
+          ]
+        },
+        {
+          "name": "Passatge de Santa Clara",
+          "lat": "41.38386",
+          "lon": "2.17744",
+          "id": 29833
+        },
+        {
+          "name": "Carrer del Comte de Santa Clara",
+          "lat": "41.37831",
+          "lon": "2.18930",
+          "id": 13100
+        },
+        {
+          "name": "Baixada de Santa Clara",
+          "lat": "41.38381",
+          "lon": "2.17731",
+          "id": 2733
+        },
+        {
+          "name": "Carrer de Clara Zetkin",
+          "lat": "41.42394",
+          "lon": "2.19173",
+          "id": 95176,
+          "intersectedStreets": [
+            {
+              "name": "Carrer Gran de la Sagrera",
+              "names": {
+                "alt_name": "Carrer de la Sagrera"
+              },
+              "lat": "41.42394",
+              "lon": "2.19109"
+            },
+            {
+              "name": "Carrer de Martí Molins",
+              "lat": "41.42394",
+              "lon": "2.19109"
+            },
+            {
+              "name": "Carrer de Berenguer de Palou (la Sagrera)",
+              "lat": "41.42394",
+              "lon": "2.19173"
+            },
+            {
+              "name": "Carrer del Pont del Treball Digne (Sant Martí de Provençals)",
+              "lat": "41.42394",
+              "lon": "2.19173"
+            }
+          ]
+        },
+        {
+          "name": "Carrer de Clarà",
+          "lat": "41.44683",
+          "lon": "2.19926",
+          "id": 27484,
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Campins (Baró de Viver)",
+              "lat": "41.44720",
+              "lon": "2.19903"
+            },
+            {
+              "name": "Carrer de Clariana (Baró de Viver)",
+              "lat": "41.44683",
+              "lon": "2.19926"
+            },
+            {
+              "name": "Carrer de Quito",
+              "lat": "41.44617",
+              "lon": "2.19965"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Vilafranca del Penedès",
+      "names": {
+        "ca": "Vilafranca del Penedès",
+        "es": "Villafranca del Panadés"
+      },
+      "lat": "41.34639",
+      "lon": "1.69951",
+      "id": 1470839547,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Santa Clara",
+          "lat": "41.34637",
+          "lon": "1.70142",
+          "id": 94174
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Alella",
+      "names": {
+        "ru": "Алелья",
+        "ca": "Alella",
+        "es": "Alella"
+      },
+      "lat": "41.49529",
+      "lon": "2.29428",
+      "id": 523051389,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "riera Coma Clara",
+          "lat": "41.50716",
+          "lon": "2.29975",
+          "id": 67640,
+          "intersectedStreets": [
+            {
+              "name": "avinguda de Sant Mateu",
+              "lat": "41.50422",
+              "lon": "2.29730"
+            },
+            {
+              "name": "Carretera de Granollers al Masnou",
+              "lat": "41.50315",
+              "lon": "2.29524"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "el Prat de Llobregat",
+      "names": {
+        "ru": "Эль-Прат-де-Льобрегат",
+        "ca": "el Prat de Llobregat",
+        "es": "El Prat de Llobregat"
+      },
+      "lat": "41.32464",
+      "lon": "2.09526",
+      "id": 1470838266,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Passatge de Clara Campoamor",
+          "lat": "41.31949",
+          "lon": "2.09474",
+          "id": 95379,
+          "intersectedStreets": [
+            {
+              "name": "Avinguda de l'Onze de Setembre",
+              "lat": "41.31956",
+              "lon": "2.09470"
+            },
+            {
+              "name": "Carrer de Jaume Codina (les Cases de La Seda)",
+              "lat": "41.31895",
+              "lon": "2.09502"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Argentona",
+      "lat": "41.55543",
+      "lon": "2.40028",
+      "id": 1470838014,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer de la Riera de Clarà",
+          "lat": "41.56730",
+          "lon": "2.39326",
+          "id": 30303
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Arenys de Mar",
+      "lat": "41.57971",
+      "lon": "2.54915",
+      "id": 1470838013,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer Sta. Clara",
+          "lat": "41.58398",
+          "lon": "2.54647",
+          "id": 47937,
+          "intersectedStreets": [
+            {
+              "name": "Riera de Pare Fita",
+              "lat": "41.58406",
+              "lon": "2.54698"
+            },
+            {
+              "name": "Pujada de Lourdes",
+              "names": {
+                "alt_name": "Pujada de Lourdes"
+              },
+              "lat": "41.58487",
+              "lon": "2.54516"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "el Vendrell",
+      "names": {
+        "ca": "el Vendrell"
+      },
+      "lat": "41.21997",
+      "lon": "1.53487",
+      "id": 1470838269,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer Josep Clarà",
+          "lat": "41.18406",
+          "lon": "1.53461",
+          "id": 42024
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "la Sagrera",
+      "lat": "41.42375",
+      "lon": "2.18958",
+      "id": 2875927736,
+      "type": "SUBURB",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Clara Zetkin",
+          "lat": "41.42395",
+          "lon": "2.19173",
+          "id": 95177,
+          "intersectedStreets": [
+            {
+              "name": "Carrer Gran de la Sagrera",
+              "names": {
+                "alt_name": "Carrer de la Sagrera"
+              },
+              "lat": "41.42397",
+              "lon": "2.19109"
+            },
+            {
+              "name": "Carrer de Martí Molins",
+              "lat": "41.42397",
+              "lon": "2.19109"
+            },
+            {
+              "name": "Carrer de Berenguer de Palou",
+              "lat": "41.42397",
+              "lon": "2.19173"
+            },
+            {
+              "name": "Carrer del Pont del Treball Digne",
+              "lat": "41.42397",
+              "lon": "2.19173"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Castelló d'Empuries",
+      "lat": "42.25973",
+      "lon": "3.07411",
+      "id": 1949049715,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Santa Clara (Castelló d'Empúries)",
+          "lat": "42.25630",
+          "lon": "3.07744",
+          "id": 1505
+        },
+        {
+          "name": "Carrer Santa Clara (Castelló d'Empúries)",
+          "lat": "42.25503",
+          "lon": "3.07317",
+          "id": 17837
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Olot",
+      "lat": "42.18222",
+      "lon": "2.48903",
+      "id": 1470838619,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Plaça de Clarà",
+          "lat": "42.18109",
+          "lon": "2.48503",
+          "id": 115438,
+          "intersectedStreets": [
+            {
+              "name": "Carrer del Pare Roca",
+              "lat": "42.18109",
+              "lon": "2.48503"
+            },
+            {
+              "name": "Carrer del Pintor Galwey",
+              "lat": "42.18109",
+              "lon": "2.48503"
+            },
+            {
+              "name": "Avinguda dels Reis Catòlics (Malagrida)",
+              "lat": "42.18023",
+              "lon": "2.48428"
+            },
+            {
+              "name": "Carrer de la Verge de Fàtima (Desemparats)",
+              "lat": "42.18023",
+              "lon": "2.48428"
+            },
+            {
+              "name": "Carrer de l'Escultor Josep Clarà",
+              "lat": "42.18023",
+              "lon": "2.48428"
+            }
+          ]
+        },
+        {
+          "name": "Carrer de l'Escultor Josep Clarà",
+          "lat": "42.18010",
+          "lon": "2.48454",
+          "id": 115439,
+          "intersectedStreets": [
+            {
+              "name": "Avinguda dels Reis Catòlics (Malagrida)",
+              "lat": "42.18023",
+              "lon": "2.48428"
+            },
+            {
+              "name": "Carrer de la Verge de Fàtima (Desemparats)",
+              "lat": "42.18023",
+              "lon": "2.48428"
+            },
+            {
+              "name": "Plaça de Clarà",
+              "lat": "42.18023",
+              "lon": "2.48428"
+            },
+            {
+              "name": "Eix Diagonal (Malagrida)",
+              "names": {
+                "es": "eje diagonal (Malagrida)"
+              },
+              "lat": "42.17985",
+              "lon": "2.48510"
+            },
+            {
+              "name": "Carrer del Bisbe Vilanova",
+              "lat": "42.17985",
+              "lon": "2.48510"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Casserres",
+      "names": {
+        "es": "Casserres"
+      },
+      "lat": "42.01382",
+      "lon": "1.84304",
+      "id": 303713456,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Carrer Riera de Clarà",
+          "lat": "42.01364",
+          "lon": "1.83839",
+          "id": 27572,
+          "intersectedStreets": [
+            {
+              "name": "carrer Bisbe Comelles",
+              "lat": "42.01329",
+              "lon": "1.83843"
+            },
+            {
+              "name": "Carrer de Sant Rafel",
+              "lat": "42.01364",
+              "lon": "1.83839"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Malgrat de Mar",
+      "lat": "41.64592",
+      "lon": "2.74141",
+      "id": 1460478645,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Carrer de l'Escultor Clarà",
+          "lat": "41.64515",
+          "lon": "2.73362",
+          "id": 85646,
+          "intersectedStreets": [
+            {
+              "name": "Avinguda dels Països Catalans",
+              "lat": "41.64418",
+              "lon": "2.73021"
+            },
+            {
+              "name": "Carrer d'Enric Borràs",
+              "lat": "41.64446",
+              "lon": "2.73111"
+            },
+            {
+              "name": "Carrer de Joan Esquena i Torró",
+              "lat": "41.64455",
+              "lon": "2.73150"
+            },
+            {
+              "name": "Carrer de Manuel de Falla",
+              "lat": "41.64487",
+              "lon": "2.73266"
+            },
+            {
+              "name": "Avinguda de la Costa Brava",
+              "lat": "41.64523",
+              "lon": "2.73508"
+            },
+            {
+              "name": "Avinguda de la Verge de Montserrat",
+              "lat": "41.64523",
+              "lon": "2.73508"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Berga",
+      "lat": "42.10114",
+      "lon": "1.84547",
+      "id": 1470838103,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "Pont de Clarà",
+          "lat": "42.06680",
+          "lon": "1.79620",
+          "id": 103909
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Sant Cugat del Vallès",
+      "names": {
+        "es": "San Cugat del Vallés"
+      },
+      "lat": "41.47285",
+      "lon": "2.08178",
+      "id": 1470838828,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "carrer de Josep Clarà",
+          "lat": "41.47341",
+          "lon": "2.07253",
+          "id": 47376,
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Domènec Oristrell",
+              "lat": "41.47304",
+              "lon": "2.07208"
+            },
+            {
+              "name": "Carrer de Manel Farrés",
+              "lat": "41.47341",
+              "lon": "2.07253"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Barri Gòtic",
+      "enName": "Gothic Quarter",
+      "names": {
+        "de": "Gotisches Viertel",
+        "ru": "Готический квартал",
+        "uk": "Готичний квартал",
+        "he": "הרובע הגותי",
+        "es": "Barrio Gótico"
+      },
+      "lat": "41.38339",
+      "lon": "2.17690",
+      "id": 1433947776,
+      "type": "SUBURB",
+      "listOfStreets": [
+        {
+          "name": "Passatge de Santa Clara",
+          "lat": "41.38384",
+          "lon": "2.17742",
+          "id": 29834
+        },
+        {
+          "name": "Baixada de Santa Clara",
+          "lat": "41.38381",
+          "lon": "2.17729",
+          "id": 2734
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Sant Adrià de Besòs",
+      "names": {
+        "ca": "Sant Adrià de Besòs",
+        "es": "San Adrián de Besós"
+      },
+      "lat": "41.43048",
+      "lon": "2.21827",
+      "id": 1470838823,
+      "type": "TOWN",
+      "listOfStreets": [
+        {
+          "name": "carrer de Clara Campoamor",
+          "lat": "41.42384",
+          "lon": "2.21958",
+          "id": 37759,
+          "intersectedStreets": [
+            {
+              "name": "Ronda del Barcelonés",
+              "lat": "41.42344",
+              "lon": "2.21900"
+            },
+            {
+              "name": "Carrer de Vicenç Ferrer (la Catalana)",
+              "lat": "41.42384",
+              "lon": "2.21958"
+            },
+            {
+              "name": "Avinguda de la Catalana",
+              "lat": "41.42453",
+              "lon": "2.22050"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Masquefa",
+      "lat": "41.50263",
+      "lon": "1.81107",
+      "id": 1460478685,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Santa Clara",
+          "lat": "41.49762",
+          "lon": "1.81457",
+          "id": 48462
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Albinyana",
+      "lat": "41.24547",
+      "lon": "1.48674",
+      "id": 395228508,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Carrer Josep Clarà (les Peces)",
+          "lat": "41.25373",
+          "lon": "1.50272",
+          "id": 73975
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "l'Hospitalet de Llobregat",
+      "names": {
+        "ru": "Оспиталет-де-Льобрегат",
+        "el": "Οσπιταλέτ ντε Λιοβρεγάτ",
+        "ca": "l'Hospitalet de Llobregat",
+        "es": "Hospitalet de Llobregat",
+        "sr": "Лоспиталет де Љобрегат"
+      },
+      "lat": "41.35986",
+      "lon": "2.09978",
+      "id": 939880925,
+      "type": "CITY",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Clara Campoamor (la Torrassa)",
+          "lat": "41.36687",
+          "lon": "2.12330",
+          "id": 92544,
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Santa Eulàlia",
+              "lat": "41.36657",
+              "lon": "2.12341"
+            },
+            {
+              "name": "Carrer d'Àngel Guimerà (Santa Eulàlia)",
+              "lat": "41.36657",
+              "lon": "2.12341"
+            },
+            {
+              "name": "Passatge de Salvadors",
+              "lat": "41.36752",
+              "lon": "2.12304"
+            }
+          ]
+        },
+        {
+          "name": "Carrer de Clara Campoamor (el Gornal)",
+          "lat": "41.35671",
+          "lon": "2.11513",
+          "id": 36260,
+          "intersectedStreets": [
+            {
+              "name": "Travessia Industrial",
+              "lat": "41.35819",
+              "lon": "2.11397"
+            },
+            {
+              "name": "Carrer de Colom (el Gornal)",
+              "lat": "41.35768",
+              "lon": "2.11437"
+            },
+            {
+              "name": "Carrer de Caterina Albert (el Gornal)",
+              "lat": "41.35671",
+              "lon": "2.11513"
+            },
+            {
+              "name": "Avinguda d'Amèrica",
+              "lat": "41.35666",
+              "lon": "2.11517"
+            }
+          ]
+        }
+      ],
+      "init": 1,
+      "matchStreet": 1
+    },
+    {
+      "name": "Castelló d'Empúries",
+      "names": {
+        "es": "Castellón de Ampurias"
+      },
+      "lat": "42.25910",
+      "lon": "3.07465",
+      "id": 130118172,
+      "type": "VILLAGE",
+      "listOfStreets": [
+        {
+          "name": "Carrer de Santa Clara",
+          "lat": "42.25630",
+          "lon": "3.07744",
+          "id": 1506
+        },
+        {
+          "name": "Carrer Santa Clara",
+          "lat": "42.25503",
+          "lon": "3.07317",
+          "id": 17838
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "Centre Històric",
+      "lat": "41.72340",
+      "lon": "1.82701",
+      "id": 4356132667,
+      "type": "SUBURB",
+      "listOfStreets": [
+        {
+          "name": "Carrer Nou de Santa Clara",
+          "lat": "41.72235",
+          "lon": "1.83073",
+          "id": 74569
+        }
+      ],
+      "matchStreet": 1
+    },
+    {
+      "name": "La Maurina",
+      "lat": "41.56081",
+      "lon": "1.99582",
+      "id": 3427894669,
+      "type": "SUBURB",
+      "listOfStreets": [
+        {
+          "name": "Carrer de l'Escultor Clarà",
+          "lat": "41.56163",
+          "lon": "1.99511",
+          "id": 23481,
+          "intersectedStreets": [
+            {
+              "name": "Carrer de Felip II",
+              "lat": "41.56137",
+              "lon": "1.99488"
+            },
+            {
+              "name": "Carrer d'Orà",
+              "lat": "41.56137",
+              "lon": "1.99488"
+            },
+            {
+              "name": "Carrer de Gandia",
+              "lat": "41.56277",
+              "lon": "1.99524"
+            }
+          ]
+        }
+      ],
+      "matchStreet": 1
+    }
+  ]
+}
\ No newline at end of file
diff --git a/OsmAnd-telegram/build.gradle b/OsmAnd-telegram/build.gradle
index 57141c4238..aa13df28b0 100644
--- a/OsmAnd-telegram/build.gradle
+++ b/OsmAnd-telegram/build.gradle
@@ -135,7 +135,9 @@ dependencies {
 	implementation project(path: ':OsmAnd-java', configuration: 'android')
 	implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-	implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+	implementation( "org.jetbrains.kotlin:kotlin-stdlib:1.2.71") {
+		exclude group: 'org.jetbrains', module: 'annotations'
+	}
 	implementation 'com.android.support:appcompat-v7:28.0.0-rc01'
 	implementation 'com.android.support:design:28.0.0-rc01'
 	implementation 'com.android.support:customtabs:28.0.0-rc01'
@@ -146,4 +148,5 @@ dependencies {
 	implementation("com.github.HITGIF:TextFieldBoxes:1.4.4") {
 		exclude group: 'com.android.support'
 	}
+	implementation 'org.jetbrains:annotations-java5:15.0'
 }
diff --git a/OsmAnd-telegram/res/drawable-hdpi/ic_action_altitude_range.png b/OsmAnd-telegram/res/drawable-hdpi/ic_action_altitude_range.png
new file mode 100644
index 0000000000..d3c1ff597b
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-hdpi/ic_action_altitude_range.png differ
diff --git a/OsmAnd-telegram/res/drawable-hdpi/ic_action_date_add.png b/OsmAnd-telegram/res/drawable-hdpi/ic_action_date_add.png
new file mode 100644
index 0000000000..f7e9962a63
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-hdpi/ic_action_date_add.png differ
diff --git a/OsmAnd-telegram/res/drawable-hdpi/ic_action_date_end.png b/OsmAnd-telegram/res/drawable-hdpi/ic_action_date_end.png
new file mode 100644
index 0000000000..0af2e77948
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-hdpi/ic_action_date_end.png differ
diff --git a/OsmAnd-telegram/res/drawable-hdpi/ic_action_date_start.png b/OsmAnd-telegram/res/drawable-hdpi/ic_action_date_start.png
new file mode 100644
index 0000000000..f27db2f105
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-hdpi/ic_action_date_start.png differ
diff --git a/OsmAnd-telegram/res/drawable-hdpi/ic_action_distance_16dp.png b/OsmAnd-telegram/res/drawable-hdpi/ic_action_distance_16dp.png
new file mode 100644
index 0000000000..bebd1402c4
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-hdpi/ic_action_distance_16dp.png differ
diff --git a/OsmAnd-telegram/res/drawable-hdpi/ic_action_share.png b/OsmAnd-telegram/res/drawable-hdpi/ic_action_share.png
new file mode 100644
index 0000000000..b5219f938a
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-hdpi/ic_action_share.png differ
diff --git a/OsmAnd-telegram/res/drawable-hdpi/ic_action_speed_average.png b/OsmAnd-telegram/res/drawable-hdpi/ic_action_speed_average.png
new file mode 100644
index 0000000000..d514a54ffb
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-hdpi/ic_action_speed_average.png differ
diff --git a/OsmAnd-telegram/res/drawable-hdpi/ic_action_timeline.png b/OsmAnd-telegram/res/drawable-hdpi/ic_action_timeline.png
new file mode 100644
index 0000000000..5cc366eec5
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-hdpi/ic_action_timeline.png differ
diff --git a/OsmAnd-telegram/res/drawable-mdpi/ic_action_altitude_range.png b/OsmAnd-telegram/res/drawable-mdpi/ic_action_altitude_range.png
new file mode 100644
index 0000000000..82a122006f
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-mdpi/ic_action_altitude_range.png differ
diff --git a/OsmAnd-telegram/res/drawable-mdpi/ic_action_date_add.png b/OsmAnd-telegram/res/drawable-mdpi/ic_action_date_add.png
new file mode 100644
index 0000000000..ee38eab5bd
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-mdpi/ic_action_date_add.png differ
diff --git a/OsmAnd-telegram/res/drawable-mdpi/ic_action_date_end.png b/OsmAnd-telegram/res/drawable-mdpi/ic_action_date_end.png
new file mode 100644
index 0000000000..f342cde0cd
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-mdpi/ic_action_date_end.png differ
diff --git a/OsmAnd-telegram/res/drawable-mdpi/ic_action_date_start.png b/OsmAnd-telegram/res/drawable-mdpi/ic_action_date_start.png
new file mode 100644
index 0000000000..c15212f4c0
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-mdpi/ic_action_date_start.png differ
diff --git a/OsmAnd-telegram/res/drawable-mdpi/ic_action_distance_16dp.png b/OsmAnd-telegram/res/drawable-mdpi/ic_action_distance_16dp.png
new file mode 100644
index 0000000000..1c91ed322b
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-mdpi/ic_action_distance_16dp.png differ
diff --git a/OsmAnd-telegram/res/drawable-mdpi/ic_action_share.png b/OsmAnd-telegram/res/drawable-mdpi/ic_action_share.png
new file mode 100644
index 0000000000..9acdb7b3b6
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-mdpi/ic_action_share.png differ
diff --git a/OsmAnd-telegram/res/drawable-mdpi/ic_action_speed_average.png b/OsmAnd-telegram/res/drawable-mdpi/ic_action_speed_average.png
new file mode 100644
index 0000000000..55220303a2
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-mdpi/ic_action_speed_average.png differ
diff --git a/OsmAnd-telegram/res/drawable-mdpi/ic_action_timeline.png b/OsmAnd-telegram/res/drawable-mdpi/ic_action_timeline.png
new file mode 100644
index 0000000000..a5ef5bd4fe
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-mdpi/ic_action_timeline.png differ
diff --git a/OsmAnd-telegram/res/drawable-xhdpi/ic_action_altitude_range.png b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_altitude_range.png
new file mode 100644
index 0000000000..b96be7510f
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_altitude_range.png differ
diff --git a/OsmAnd-telegram/res/drawable-xhdpi/ic_action_date_add.png b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_date_add.png
new file mode 100644
index 0000000000..61f43922ce
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_date_add.png differ
diff --git a/OsmAnd-telegram/res/drawable-xhdpi/ic_action_date_end.png b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_date_end.png
new file mode 100644
index 0000000000..4de11b71f3
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_date_end.png differ
diff --git a/OsmAnd-telegram/res/drawable-xhdpi/ic_action_date_start.png b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_date_start.png
new file mode 100644
index 0000000000..c2032d5c18
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_date_start.png differ
diff --git a/OsmAnd-telegram/res/drawable-xhdpi/ic_action_distance_16dp.png b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_distance_16dp.png
new file mode 100644
index 0000000000..578af8e5eb
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_distance_16dp.png differ
diff --git a/OsmAnd-telegram/res/drawable-xhdpi/ic_action_share.png b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_share.png
new file mode 100644
index 0000000000..ddcde8ddfb
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_share.png differ
diff --git a/OsmAnd-telegram/res/drawable-xhdpi/ic_action_speed_average.png b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_speed_average.png
new file mode 100644
index 0000000000..9de62628f5
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_speed_average.png differ
diff --git a/OsmAnd-telegram/res/drawable-xhdpi/ic_action_timeline.png b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_timeline.png
new file mode 100644
index 0000000000..2eb0d10d2a
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xhdpi/ic_action_timeline.png differ
diff --git a/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_altitude_range.png b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_altitude_range.png
new file mode 100644
index 0000000000..073ca37a2d
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_altitude_range.png differ
diff --git a/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_date_add.png b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_date_add.png
new file mode 100644
index 0000000000..e46425373d
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_date_add.png differ
diff --git a/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_date_end.png b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_date_end.png
new file mode 100644
index 0000000000..ae6ea10cf3
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_date_end.png differ
diff --git a/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_date_start.png b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_date_start.png
new file mode 100644
index 0000000000..11748b8ace
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_date_start.png differ
diff --git a/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_distance_16dp.png b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_distance_16dp.png
new file mode 100644
index 0000000000..817e0f9559
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_distance_16dp.png differ
diff --git a/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_share.png b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_share.png
new file mode 100644
index 0000000000..191e70da0e
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_share.png differ
diff --git a/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_speed_average.png b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_speed_average.png
new file mode 100644
index 0000000000..82d5b48cf9
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_speed_average.png differ
diff --git a/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_timeline.png b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_timeline.png
new file mode 100644
index 0000000000..452d6879bc
Binary files /dev/null and b/OsmAnd-telegram/res/drawable-xxhdpi/ic_action_timeline.png differ
diff --git a/OsmAnd-telegram/res/drawable/btn_round_border.xml b/OsmAnd-telegram/res/drawable/btn_round_border.xml
new file mode 100644
index 0000000000..ae932320c8
--- /dev/null
+++ b/OsmAnd-telegram/res/drawable/btn_round_border.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/ctrl_active_light" />
+			<corners android:radius="@dimen/dialog_button_radius" />
+		</shape>
+	</item>
+	<item android:state_enabled="false">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/ctrl_light" />
+			<corners android:radius="@dimen/dialog_button_radius" />
+		</shape>
+	</item>
+	<item>
+		<shape android:shape="rectangle">
+			<solid android:color="@null" />
+			<corners android:radius="@dimen/dialog_button_radius" />
+			<stroke android:width="1dp" android:color="@color/app_bar_divider" />
+		</shape>
+	</item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/layout/bottom_sheet_add_new_device.xml b/OsmAnd-telegram/res/layout/bottom_sheet_add_new_device.xml
new file mode 100644
index 0000000000..f719ee2af8
--- /dev/null
+++ b/OsmAnd-telegram/res/layout/bottom_sheet_add_new_device.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	tools:layout_gravity="bottom">
+
+	<android.support.design.widget.CoordinatorLayout
+		android:id="@+id/scroll_view_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<android.support.v4.widget.NestedScrollView
+			android:id="@+id/scroll_view"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			app:behavior_hideable="true"
+			app:behavior_peekHeight="@dimen/bottom_sheet_peek_height"
+			app:layout_behavior="@string/bottom_sheet_behavior">
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="?attr/card_bg_color"
+				android:orientation="vertical">
+
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:paddingLeft="@dimen/content_padding_standard"
+					android:paddingRight="@dimen/content_padding_standard"
+					android:text="@string/add_device"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="@dimen/list_item_title_text_size"
+					app:firstBaselineToTopHeight="28sp"
+					app:typeface="@string/font_roboto_medium" />
+
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:id="@+id/description"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:paddingLeft="@dimen/content_padding_standard"
+					android:paddingRight="@dimen/content_padding_standard"
+					android:text="@string/enter_device_name_description"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/list_item_description_text_size"
+					app:firstBaselineToTopHeight="28sp"
+					app:lastBaselineToBottomHeight="16sp"
+					app:typeface="@string/font_roboto_regular" />
+
+				<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:paddingLeft="@dimen/content_padding_standard"
+					android:paddingRight="@dimen/content_padding_standard"
+					app:hasClearButton="true"
+					app:labelText="@string/device_name">
+
+					<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+						android:id="@+id/edit_text"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:inputType="text" />
+
+				</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+
+				<TextView
+					android:id="@+id/error_text_descr"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginLeft="@dimen/content_padding_standard"
+					android:layout_marginRight="@dimen/content_padding_standard"
+					android:layout_marginTop="@dimen/content_padding_half"
+					android:letterSpacing="@dimen/text_description_letter_spacing"
+					android:lineSpacingMultiplier="@dimen/text_description_line_spacing_multiplier"
+					android:textSize="@dimen/hint_text_size"
+					android:visibility="invisible"
+					tools:text="@string/device_name_cannot_be_empty" />
+
+			</LinearLayout>
+
+		</android.support.v4.widget.NestedScrollView>
+
+	</android.support.design.widget.CoordinatorLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/buttons_bottom_bar_height"
+		android:background="?attr/card_bg_color"
+		android:gravity="center_vertical"
+		android:paddingLeft="@dimen/content_padding_half"
+		android:paddingRight="@dimen/content_padding_half">
+
+		<include
+			layout="@layout/secondary_btn"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" />
+
+		<View
+			android:layout_width="@dimen/content_padding_half"
+			android:layout_height="match_parent" />
+
+		<FrameLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1">
+
+			<include
+				layout="@layout/primary_btn"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content" />
+
+			<ProgressBar
+				android:id="@+id/progressBar"
+				android:layout_width="@dimen/progress_bar_size_small"
+				android:layout_height="@dimen/progress_bar_size_small"
+				android:layout_gravity="center"
+				android:visibility="gone"/>
+
+		</FrameLayout>
+
+	</LinearLayout>
+
+</LinearLayout>
diff --git a/OsmAnd-telegram/res/layout/fragement_settings_dialog.xml b/OsmAnd-telegram/res/layout/fragement_settings_dialog.xml
index b196c0372b..5d2bacf752 100644
--- a/OsmAnd-telegram/res/layout/fragement_settings_dialog.xml
+++ b/OsmAnd-telegram/res/layout/fragement_settings_dialog.xml
@@ -95,11 +95,13 @@
 					app:typeface="@string/font_roboto_medium" />
 
 				<net.osmand.telegram.ui.views.TextViewEx
+					android:id="@+id/share_as_description"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
+					android:background="?attr/selectableItemBackground"
 					android:paddingLeft="@dimen/content_padding_standard"
 					android:paddingRight="@dimen/content_padding_standard"
-					android:text="@string/share_location_as_descr"
+					android:text="@string/share_location_as_description"
 					android:textColor="?android:attr/textColorSecondary"
 					android:textSize="@dimen/list_item_description_text_size"
 					app:firstBaselineToTopHeight="20sp"
@@ -120,6 +122,38 @@
 					android:layout_height="wrap_content"
 					android:orientation="vertical" />
 
+				<LinearLayout
+					android:id="@+id/add_new_device_btn"
+					android:layout_width="match_parent"
+					android:layout_height="@dimen/dialog_button_height"
+					android:layout_marginBottom="@dimen/content_padding_standard"
+					android:layout_marginLeft="@dimen/content_padding_half"
+					android:layout_marginRight="@dimen/content_padding_half"
+					android:background="@drawable/btn_round"
+					android:gravity="center_vertical"
+					android:paddingLeft="@dimen/content_padding_half"
+					android:paddingRight="@dimen/content_padding_half">
+
+					<ImageView
+						android:id="@+id/add_new_device_icon"
+						android:layout_width="@dimen/list_item_icon_size"
+						android:layout_height="@dimen/list_item_icon_size"
+						tools:src="@drawable/ic_action_add"
+						tools:tint="@color/icon_light" />
+
+					<net.osmand.telegram.ui.views.TextViewEx
+						android:id="@+id/add_new_device_title"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="@dimen/content_padding_big"
+						android:layout_marginRight="@dimen/content_padding_big"
+						android:text="@string/add_device"
+						android:textColor="?android:textColorPrimary"
+						android:textSize="@dimen/list_item_title_text_size"
+						app:typeface="@string/font_roboto_medium" />
+
+				</LinearLayout>
+
 			</LinearLayout>
 
 			<include layout="@layout/list_item_divider" />
diff --git a/OsmAnd-telegram/res/layout/fragment_live_now_tab.xml b/OsmAnd-telegram/res/layout/fragment_live_now_tab.xml
index 9dc5cd5b08..b23ed65e33 100644
--- a/OsmAnd-telegram/res/layout/fragment_live_now_tab.xml
+++ b/OsmAnd-telegram/res/layout/fragment_live_now_tab.xml
@@ -117,13 +117,32 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent">
 
-		<android.support.v7.widget.RecyclerView
-			android:id="@+id/recycler_view"
+		<net.osmand.telegram.ui.views.TextViewEx
+			android:id="@+id/last_telegram_update_time"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="top|center_horizontal"
+			android:gravity="center"
+			android:paddingTop="@dimen/content_padding_half"
+			android:textColor="?android:attr/textColorSecondary"
+			android:textSize="@dimen/list_item_description_text_size"
+			android:visibility="gone"
+			app:typeface="@string/font_roboto_regular" />
+
+		<android.support.v4.widget.SwipeRefreshLayout
+			android:id="@+id/swipe_refresh"
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:clipToPadding="false"
-			android:paddingBottom="@dimen/list_view_bottom_padding"
-			android:scrollbars="vertical"/>
+			android:layout_height="match_parent">
+
+			<android.support.v7.widget.RecyclerView
+				android:id="@+id/recycler_view"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:clipToPadding="false"
+				android:paddingBottom="@dimen/list_item_content_margin"
+				android:scrollbars="vertical" />
+
+		</android.support.v4.widget.SwipeRefreshLayout>
 
 		<net.osmand.telegram.ui.views.TextViewEx
 			android:id="@+id/open_osmand_btn"
diff --git a/OsmAnd-telegram/res/layout/fragment_timeline_tab.xml b/OsmAnd-telegram/res/layout/fragment_timeline_tab.xml
new file mode 100644
index 0000000000..a26a995ccb
--- /dev/null
+++ b/OsmAnd-telegram/res/layout/fragment_timeline_tab.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<android.support.design.widget.AppBarLayout
+		android:id="@+id/app_bar_layout"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/card_bg_color">
+
+		<net.osmand.telegram.ui.views.TextViewEx
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:ellipsize="end"
+			android:gravity="center_vertical"
+			android:letterSpacing="@dimen/title_letter_spacing"
+			android:maxLines="1"
+			android:paddingLeft="@dimen/content_padding_standard"
+			android:paddingRight="@dimen/content_padding_standard"
+			android:text="@string/timeline"
+			android:textColor="@color/app_bar_title_light"
+			android:paddingTop="@dimen/content_padding_standard"
+			android:paddingBottom="12dp"
+			android:textSize="@dimen/title_text_size"
+			app:typeface="@string/font_roboto_mono_bold" />
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:paddingLeft="@dimen/content_padding_standard"
+			android:paddingRight="@dimen/content_padding_standard"
+			android:text="@string/timeline_description"
+			android:textColor="?android:attr/textColorSecondary"
+			android:textSize="@dimen/descr_text_size" />
+
+		<FrameLayout
+			android:id="@+id/monitoring_container"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/action_bar_height"
+			android:background="?attr/selectableItemBackground"
+			android:orientation="horizontal"
+			android:paddingLeft="@dimen/content_padding_standard"
+			android:paddingRight="@dimen/content_padding_standard">
+
+			<net.osmand.telegram.ui.views.TextViewEx
+				android:id="@+id/monitoring_title"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:layout_gravity="center_vertical|start"
+				android:ellipsize="end"
+				android:gravity="center_vertical"
+				android:maxLines="1"
+				android:text="@string/monitoring_is_enabled"
+				android:textColor="@color/ctrl_active_light"
+				android:textSize="@dimen/descr_text_size"
+				app:typeface="@string/font_roboto_medium" />
+
+			<Switch
+				android:id="@+id/monitoring_switcher"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="end|center_vertical"
+				android:background="@null"
+				android:clickable="false"
+				android:focusable="false" />
+
+		</FrameLayout>
+
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:background="@color/app_bar_divider" />
+
+		<FrameLayout
+			android:id="@+id/date_row"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/timeline_time_buttons_height"
+			android:background="@color/screen_bg_light"
+			android:orientation="horizontal"
+			android:paddingLeft="@dimen/content_padding_standard"
+			android:paddingRight="@dimen/content_padding_standard">
+
+			<net.osmand.telegram.ui.views.TextViewEx
+				android:id="@+id/date_btn"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/dialog_button_height"
+				android:layout_gravity="center"
+				android:layout_marginEnd="@dimen/content_padding_half"
+				android:layout_marginRight="@dimen/content_padding_half"
+				android:background="@drawable/btn_round_border"
+				android:drawablePadding="@dimen/content_padding_half"
+				android:ellipsize="end"
+				android:gravity="start|center_vertical"
+				android:maxLines="1"
+				android:paddingLeft="@dimen/image_button_padding"
+				android:paddingRight="@dimen/image_button_padding"
+				android:text="@string/shared_string_date"
+				android:textColor="?attr/ctrl_active_color"
+				android:textSize="@dimen/text_button_text_size"
+				app:typeface="@string/font_roboto_medium" />
+
+		</FrameLayout>
+
+	</android.support.design.widget.AppBarLayout>
+
+	<android.support.v4.widget.SwipeRefreshLayout
+		android:id="@+id/swipe_refresh"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
+
+		<android.support.v7.widget.RecyclerView
+			android:id="@+id/recycler_view"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:clipToPadding="false"
+			android:paddingBottom="@dimen/list_item_content_margin"
+			android:scrollbars="vertical" />
+
+	</android.support.v4.widget.SwipeRefreshLayout>
+
+</LinearLayout>
diff --git a/OsmAnd-telegram/res/layout/fragment_user_gpx_info.xml b/OsmAnd-telegram/res/layout/fragment_user_gpx_info.xml
new file mode 100644
index 0000000000..4d7636dc1b
--- /dev/null
+++ b/OsmAnd-telegram/res/layout/fragment_user_gpx_info.xml
@@ -0,0 +1,526 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/card_bg_color">
+
+	<ScrollView
+		android:id="@+id/scroll_view"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<FrameLayout
+			android:id="@+id/image_container"
+			android:layout_width="match_parent"
+			android:layout_height="102dp"
+			app:layout_scrollFlags="scroll">
+
+			<ImageView
+				android:id="@+id/back_button"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="start"
+				android:background="?attr/selectableItemBackgroundBorderless"
+				android:contentDescription="@string/shared_string_back"
+				android:padding="@dimen/content_padding_standard"
+				tools:src="@drawable/ic_arrow_back"
+				tools:tint="@color/icon_light" />
+
+			<ImageView
+				android:id="@+id/user_icon"
+				android:layout_width="@dimen/timeline_user_icon_size"
+				android:layout_height="@dimen/timeline_user_icon_size"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginTop="@dimen/content_padding_half"
+				tools:src="@drawable/img_user_picture" />
+
+			<net.osmand.telegram.ui.views.TextViewEx
+				android:id="@+id/title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="bottom|center_horizontal"
+				android:ellipsize="end"
+				android:gravity="center"
+				android:maxLines="1"
+				android:text="@string/start_location_sharing"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="@dimen/title_text_size"
+				app:typeface="@string/font_roboto_mono_bold" />
+
+		</FrameLayout>
+
+		<LinearLayout
+			android:id="@+id/interval_row"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:paddingLeft="@dimen/content_padding_standard"
+			android:paddingRight="@dimen/content_padding_standard">
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:id="@+id/start_descr"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginEnd="@dimen/content_padding_standard"
+					android:layout_marginRight="@dimen/content_padding_standard"
+					android:layout_weight="1"
+					android:ellipsize="end"
+					android:maxLines="1"
+					android:text="@string/start_date"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/list_item_description_text_size"
+					app:firstBaselineToTopHeight="@dimen/list_item_baseline_to_top_height"
+					app:typeface="@string/font_roboto_regular" />
+
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:id="@+id/end_descr"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center"
+					android:layout_marginStart="@dimen/content_padding_standard"
+					android:layout_marginLeft="@dimen/content_padding_standard"
+					android:layout_weight="1"
+					android:ellipsize="end"
+					android:maxLines="1"
+					android:text="@string/end_date"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/list_item_description_text_size"
+					app:firstBaselineToTopHeight="@dimen/list_item_baseline_to_top_height"
+					app:typeface="@string/font_roboto_regular" />
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingTop="@dimen/card_divider_bottom_margin"
+				android:paddingBottom="@dimen/content_padding_half"
+				android:orientation="horizontal">
+
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:id="@+id/date_start_btn"
+					android:layout_width="0dp"
+					android:layout_height="@dimen/dialog_button_height"
+					android:layout_gravity="center_vertical"
+					android:layout_marginEnd="@dimen/content_padding_half"
+					android:layout_marginRight="@dimen/content_padding_half"
+					android:layout_weight="1"
+					android:background="@drawable/btn_round"
+					android:ellipsize="end"
+					android:gravity="center_vertical"
+					android:maxLines="1"
+					android:paddingLeft="@dimen/image_button_padding"
+					android:paddingRight="@dimen/image_button_padding"
+					android:textSize="@dimen/text_button_text_size"
+					app:typeface="@string/font_roboto_medium"
+					tools:textColor="?attr/ctrl_active_color"
+					tools:visibility="visible" />
+
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:id="@+id/time_start_btn"
+					android:layout_width="wrap_content"
+					android:layout_height="@dimen/dialog_button_height"
+					android:layout_gravity="center_vertical"
+					android:background="@drawable/btn_round"
+					android:ellipsize="end"
+					android:gravity="center"
+					android:maxLines="1"
+					android:paddingLeft="@dimen/image_button_padding"
+					android:paddingRight="@dimen/image_button_padding"
+					android:textSize="@dimen/text_button_text_size"
+					app:typeface="@string/font_roboto_medium"
+					tools:textColor="?attr/ctrl_active_color"
+					tools:visibility="visible" />
+
+				<View
+					android:layout_width="16dp"
+					android:layout_height="1dp"
+					android:layout_gravity="center_vertical"
+					android:layout_marginLeft="@dimen/content_padding_half"
+					android:layout_marginRight="@dimen/content_padding_half"
+					android:background="@color/card_divider_light" />
+
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:id="@+id/date_end_btn"
+					android:layout_width="0dp"
+					android:layout_height="@dimen/dialog_button_height"
+					android:layout_gravity="center_vertical"
+					android:layout_marginEnd="@dimen/content_padding_half"
+					android:layout_marginRight="@dimen/content_padding_half"
+					android:layout_weight="1"
+					android:background="@drawable/btn_round"
+					android:ellipsize="end"
+					android:gravity="center"
+					android:maxLines="1"
+					android:paddingLeft="@dimen/image_button_padding"
+					android:paddingRight="@dimen/image_button_padding"
+					android:textSize="@dimen/text_button_text_size"
+					app:typeface="@string/font_roboto_medium"
+					tools:textColor="?attr/ctrl_active_color"
+					tools:visibility="visible" />
+
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:id="@+id/time_end_btn"
+					android:layout_width="wrap_content"
+					android:layout_height="@dimen/dialog_button_height"
+					android:layout_gravity="center_vertical"
+					android:background="@drawable/btn_round"
+					android:ellipsize="end"
+					android:gravity="center"
+					android:maxLines="1"
+					android:paddingLeft="@dimen/image_button_padding"
+					android:paddingRight="@dimen/image_button_padding"
+					android:textSize="@dimen/text_button_text_size"
+					app:typeface="@string/font_roboto_medium"
+					tools:textColor="?attr/ctrl_active_color"
+					tools:visibility="visible" />
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+		<FrameLayout
+			android:id="@+id/map_container"
+			android:layout_width="match_parent"
+			android:layout_height="152dp"
+			android:layout_marginLeft="@dimen/content_padding_standard"
+			android:layout_marginRight="@dimen/content_padding_standard">
+
+			<ImageView
+				android:id="@+id/gpx_map"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:contentDescription="@string/shared_string_map" />
+
+		</FrameLayout>
+
+		<LinearLayout
+			android:id="@+id/gpx_statistic"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+			<LinearLayout
+				android:id="@+id/distance_time_span"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal"
+				android:paddingBottom="11dp"
+				android:paddingTop="13dp">
+
+				<LinearLayout
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:orientation="horizontal"
+					android:paddingLeft="16dp">
+
+					<ImageView
+						android:id="@+id/distance_icon"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginTop="5dp"
+						android:src="@drawable/ic_action_sort_by_distance" />
+
+					<LinearLayout
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="18dp"
+						android:orientation="vertical">
+
+						<net.osmand.telegram.ui.views.TextViewEx
+							android:id="@+id/distance_desc"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginTop="3dp"
+							android:layout_marginBottom="6dp"
+							android:background="@null"
+							android:text="@string/shared_string_distance"
+							android:textColor="?android:attr/textColorSecondary"
+							android:textSize="@dimen/list_item_description_text_size"
+							app:typeface="@string/font_roboto_regular" />
+
+						<net.osmand.telegram.ui.views.TextViewEx
+							android:id="@+id/distance_text"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:background="@null"
+							android:textColor="?android:attr/textColorPrimary"
+							android:textSize="@dimen/descr_text_size"
+							app:typeface="@string/font_roboto_mono_bold"
+							tools:text="40 km" />
+
+					</LinearLayout>
+
+				</LinearLayout>
+
+				<LinearLayout
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:orientation="horizontal"
+					android:paddingLeft="16dp">
+
+					<ImageView
+						android:id="@+id/duration_icon"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginTop="5dp"
+						android:src="@drawable/ic_action_share_location" />
+
+					<LinearLayout
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="18dp"
+						android:orientation="vertical">
+
+						<net.osmand.telegram.ui.views.TextViewEx
+							android:id="@+id/duration_desc"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginTop="3dp"
+							android:layout_marginBottom="6dp"
+							android:background="@null"
+							android:text="@string/time_on_the_move"
+							android:textColor="?android:attr/textColorSecondary"
+							android:textSize="@dimen/list_item_description_text_size"
+							app:typeface="@string/font_roboto_regular" />
+
+						<net.osmand.telegram.ui.views.TextViewEx
+							android:id="@+id/duration_text"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:background="@null"
+							android:textColor="?android:attr/textColorPrimary"
+							android:textSize="@dimen/descr_text_size"
+							app:typeface="@string/font_roboto_mono_bold"
+							tools:text="3:32:44" />
+
+					</LinearLayout>
+
+				</LinearLayout>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/list_divider"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal">
+
+				<LinearLayout
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:orientation="horizontal"
+					android:paddingLeft="16dp"
+					android:paddingRight="8dp">
+
+					<View
+						android:layout_width="match_parent"
+						android:layout_height="1dp"
+						android:background="@color/card_divider_light" />
+
+				</LinearLayout>
+
+				<LinearLayout
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:orientation="horizontal"
+					android:paddingLeft="8dp"
+					android:paddingRight="16dp">
+
+					<View
+						android:layout_width="match_parent"
+						android:layout_height="1dp"
+						android:background="@color/card_divider_light" />
+
+				</LinearLayout>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/start_end_time"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal"
+				android:paddingTop="13dp"
+				android:paddingBottom="11dp">
+
+				<LinearLayout
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:orientation="horizontal"
+					android:paddingLeft="16dp">
+
+					<ImageView
+						android:id="@+id/average_speed_icon"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginTop="5dp"
+						android:src="@drawable/ic_action_speed_average" />
+
+					<LinearLayout
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="18dp"
+						android:orientation="vertical">
+
+						<net.osmand.telegram.ui.views.TextViewEx
+							android:id="@+id/average_speed_desc"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginTop="8dp"
+							android:layout_marginBottom="6dp"
+							android:background="@null"
+							android:text="@string/average_speed"
+							android:textColor="?android:attr/textColorSecondary"
+							android:textSize="@dimen/list_item_description_text_size"
+							app:typeface="@string/font_roboto_regular" />
+
+						<net.osmand.telegram.ui.views.TextViewEx
+							android:id="@+id/average_speed_text"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:background="@null"
+							android:textColor="?android:attr/textColorPrimary"
+							android:textSize="@dimen/descr_text_size"
+							app:typeface="@string/font_roboto_mono_bold"
+							tools:text="15:04:58" />
+
+					</LinearLayout>
+
+				</LinearLayout>
+
+				<LinearLayout
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:orientation="horizontal"
+					android:paddingLeft="16dp">
+
+					<ImageView
+						android:id="@+id/average_altitude_icon"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginTop="5dp"
+						android:src="@drawable/ic_action_share_location" />
+
+					<LinearLayout
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="18dp"
+						android:orientation="vertical">
+
+						<net.osmand.telegram.ui.views.TextViewEx
+							android:id="@+id/average_altitude_desc"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginTop="8dp"
+							android:layout_marginBottom="6dp"
+							android:background="@null"
+							android:text="@string/average_altitude"
+							android:textColor="?android:attr/textColorSecondary"
+							android:textSize="@dimen/list_item_description_text_size"
+							app:typeface="@string/font_roboto_regular" />
+
+						<net.osmand.telegram.ui.views.TextViewEx
+							android:id="@+id/average_altitude_text"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:background="@null"
+							android:textColor="?android:attr/textColorPrimary"
+							android:textSize="@dimen/descr_text_size"
+							app:typeface="@string/font_roboto_mono_bold"
+							tools:text="20:58:00" />
+
+					</LinearLayout>
+
+				</LinearLayout>
+
+			</LinearLayout>
+
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/open_in_osmand_btn"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/list_item_height_min"
+			android:layout_marginLeft="@dimen/content_padding_standard"
+			android:layout_marginRight="@dimen/content_padding_standard"
+			android:layout_marginBottom="@dimen/image_button_padding"
+			android:background="@drawable/btn_round"
+			android:gravity="center_vertical"
+			android:paddingLeft="@dimen/content_padding_standard"
+			android:paddingRight="@dimen/content_padding_standard">
+
+			<ImageView
+				android:id="@+id/open_in_osmand_icon"
+				android:layout_width="@dimen/list_item_icon_size"
+				android:layout_height="@dimen/list_item_icon_size"
+				android:src="@drawable/ic_logo_osmand_free" />
+
+			<net.osmand.telegram.ui.views.TextViewEx
+				android:id="@+id/open_in_osmand_title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="@dimen/content_padding_big"
+				android:layout_marginRight="@dimen/content_padding_big"
+				android:text="@string/open_in_osmand"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="@dimen/list_item_title_text_size"
+				app:typeface="@string/font_roboto_regular" />
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/share_gpx_btn"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/list_item_height_min"
+			android:layout_marginLeft="@dimen/content_padding_standard"
+			android:layout_marginRight="@dimen/content_padding_standard"
+			android:layout_marginBottom="@dimen/content_padding_standard"
+			android:background="@drawable/btn_round"
+			android:gravity="center_vertical"
+			android:paddingLeft="@dimen/content_padding_standard"
+			android:paddingRight="@dimen/content_padding_standard">
+
+			<ImageView
+				android:id="@+id/share_gpx_icon"
+				android:layout_width="@dimen/list_item_icon_size"
+				android:layout_height="@dimen/list_item_icon_size"
+				tools:src="@drawable/ic_action_share"
+				tools:tint="@color/ctrl_active_light" />
+
+			<net.osmand.telegram.ui.views.TextViewEx
+				android:id="@+id/share_gpx_title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="@dimen/content_padding_big"
+				android:layout_marginRight="@dimen/content_padding_big"
+				android:text="@string/shared_string_share"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="@dimen/list_item_title_text_size"
+				app:typeface="@string/font_roboto_regular" />
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+	</ScrollView>
+
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/layout/live_now_chat_card.xml b/OsmAnd-telegram/res/layout/live_now_chat_card.xml
index f8609ce72b..a72f3a80fe 100644
--- a/OsmAnd-telegram/res/layout/live_now_chat_card.xml
+++ b/OsmAnd-telegram/res/layout/live_now_chat_card.xml
@@ -40,7 +40,8 @@
 				android:layout_marginEnd="@dimen/content_padding_standard"
 				android:layout_marginRight="@dimen/content_padding_standard"
 				android:layout_weight="1"
-				android:orientation="vertical">
+				android:orientation="vertical"
+				android:paddingBottom="@dimen/content_padding_half">
 
 				<net.osmand.telegram.ui.views.TextViewEx
 					android:id="@+id/title"
@@ -55,40 +56,78 @@
 					tools:text="Share location"/>
 
 				<LinearLayout
-					android:id="@+id/group_container"
+					android:id="@+id/details_container"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:gravity="center_vertical"
-					android:visibility="gone"
-					tools:visibility="visible">
+					android:gravity="center_vertical">
 
-					<ImageView
-						android:id="@+id/group_icon"
-						android:layout_width="@dimen/list_item_icon_size_small"
-						android:layout_height="@dimen/list_item_icon_size_small"
-						android:layout_gravity="bottom"
-						android:layout_marginEnd="@dimen/content_padding_small"
-						android:layout_marginRight="@dimen/content_padding_small"
-						tools:src="@drawable/img_group_picture" />
-
-					<net.osmand.telegram.ui.views.TextViewEx
-						android:id="@+id/group_title"
+					<LinearLayout
+						android:id="@+id/distance_and_points_container"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:ellipsize="end"
-						android:maxLines="1"
-						android:textColor="?attr/android:textColorSecondary"
-						android:textSize="@dimen/list_item_description_text_size"
-						app:firstBaselineToTopHeight="@dimen/list_item_baseline_to_top_height"
-						app:typeface="@string/font_roboto_regular"
-						tools:text="@string/shared_string_group" />
+						android:orientation="horizontal"
+						android:visibility="gone"
+						tools:visibility="visible">
+
+						<ImageView
+							android:id="@+id/distance_icon"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_gravity="bottom"
+							android:layout_marginEnd="@dimen/content_padding_small"
+							android:layout_marginRight="@dimen/content_padding_small"
+							tools:src="@drawable/ic_action_distance_16dp"
+							tools:tint="@color/icon_light" />
+
+						<net.osmand.telegram.ui.views.TextViewEx
+							android:id="@+id/distance_and_points_text"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:maxLines="1"
+							android:textColor="?android:textColorSecondary"
+							android:textSize="@dimen/list_item_description_text_size"
+							app:firstBaselineToTopHeight="@dimen/list_item_baseline_to_top_height"
+							app:typeface="@string/font_roboto_regular"
+							tools:text="213 m" />
+
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/group_container"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:visibility="gone"
+						tools:visibility="visible">
+
+						<ImageView
+							android:id="@+id/group_icon"
+							android:layout_width="@dimen/list_item_icon_size_small"
+							android:layout_height="@dimen/list_item_icon_size_small"
+							android:layout_gravity="bottom"
+							android:layout_marginEnd="@dimen/content_padding_small"
+							android:layout_marginRight="@dimen/content_padding_small"
+							tools:src="@drawable/img_group_picture" />
+
+						<net.osmand.telegram.ui.views.TextViewEx
+							android:id="@+id/group_title"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:ellipsize="end"
+							android:maxLines="1"
+							android:textColor="?android:textColorSecondary"
+							android:textSize="@dimen/list_item_description_text_size"
+							app:firstBaselineToTopHeight="@dimen/list_item_baseline_to_top_height"
+							app:typeface="@string/font_roboto_regular"
+							tools:text="@string/shared_string_group" />
+
+					</LinearLayout>
 
 				</LinearLayout>
 
 				<LinearLayout
+					android:id="@+id/location_with_descr_container"
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:paddingBottom="@dimen/content_padding_half">
+					android:layout_height="wrap_content">
 
 					<LinearLayout
 						android:id="@+id/location_view_container"
@@ -211,4 +250,16 @@
 		android:id="@+id/bottom_shadow"
 		layout="@layout/card_bottom_divider"/>
 
+	<net.osmand.telegram.ui.views.TextViewEx
+		android:id="@+id/last_telegram_update_time"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom|center_horizontal"
+		android:gravity="center"
+		android:paddingTop="@dimen/content_padding_half"
+		android:textColor="?android:attr/textColorSecondary"
+		android:textSize="@dimen/list_item_description_text_size"
+		android:visibility="gone"
+		app:typeface="@string/font_roboto_regular" />
+
 </LinearLayout>
diff --git a/OsmAnd-telegram/res/layout/my_location_sharing_chat.xml b/OsmAnd-telegram/res/layout/my_location_sharing_chat.xml
index 08d8a25c1d..baf007cc7c 100644
--- a/OsmAnd-telegram/res/layout/my_location_sharing_chat.xml
+++ b/OsmAnd-telegram/res/layout/my_location_sharing_chat.xml
@@ -171,6 +171,44 @@
 
 				</LinearLayout>
 
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:orientation="horizontal">
+
+					<net.osmand.telegram.ui.views.TextViewEx
+						android:id="@+id/gps_points"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:textColor="?android:attr/textColorSecondary"
+						android:textSize="@dimen/hint_text_size"
+						app:typeface="@string/font_roboto_regular"
+						android:text="@string/gps_points" />
+
+					<net.osmand.telegram.ui.views.TextViewEx
+						android:id="@+id/gps_points_collected"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:layout_marginLeft="4dp"
+						android:layout_marginRight="4dp"
+						android:textColor="?android:attr/textColorPrimary"
+						android:textSize="@dimen/hint_text_size"
+						app:typeface="@string/font_roboto_mono_bold" />
+
+					<net.osmand.telegram.ui.views.TextViewEx
+						android:layout_width="wrap_content"
+						android:id="@+id/gps_points_in_buffer_txt"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:textColor="?android:attr/textColorSecondary"
+						android:textSize="@dimen/hint_text_size"
+						android:text="@string/gps_points_in_buffer"
+						app:typeface="@string/font_roboto_regular" />
+
+				</LinearLayout>
+
 			</LinearLayout>
 
 			<Switch
diff --git a/OsmAnd-telegram/res/layout/user_list_item.xml b/OsmAnd-telegram/res/layout/user_list_item.xml
index d9cec851a1..3ec45fd1d9 100644
--- a/OsmAnd-telegram/res/layout/user_list_item.xml
+++ b/OsmAnd-telegram/res/layout/user_list_item.xml
@@ -144,4 +144,16 @@
 		android:id="@+id/bottom_shadow"
 		layout="@layout/card_bottom_divider"/>
 
+	<net.osmand.telegram.ui.views.TextViewEx
+		android:id="@+id/last_telegram_update_time"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom|center_horizontal"
+		android:gravity="center"
+		android:paddingTop="@dimen/content_padding_half"
+		android:textColor="?android:attr/textColorSecondary"
+		android:textSize="@dimen/list_item_description_text_size"
+		android:visibility="gone"
+		app:typeface="@string/font_roboto_regular" />
+
 </LinearLayout>
diff --git a/OsmAnd-telegram/res/menu/bottom_navigation_menu.xml b/OsmAnd-telegram/res/menu/bottom_navigation_menu.xml
index ba71c44bc8..d12e0981d5 100644
--- a/OsmAnd-telegram/res/menu/bottom_navigation_menu.xml
+++ b/OsmAnd-telegram/res/menu/bottom_navigation_menu.xml
@@ -9,4 +9,9 @@
 		android:id="@+id/action_live_now"
 		android:icon="@drawable/ic_action_live_now"
 		android:title="@string/live_now"/>
+
+	<item
+		android:id="@+id/action_timeline"
+		android:icon="@drawable/ic_action_timeline"
+		android:title="@string/timeline"/>
 </menu>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-ast/strings.xml b/OsmAnd-telegram/res/values-ast/strings.xml
new file mode 100644
index 0000000000..1d419eb73c
--- /dev/null
+++ b/OsmAnd-telegram/res/values-ast/strings.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="average_altitude">Altitú media</string>
+    <string name="average_speed">Velocidá media</string>
+    <string name="shared_string_map">Mapa</string>
+    <string name="shared_string_add">Amestar</string>
+    <string name="shared_string_hide">Anubrir</string>
+    <string name="shared_string_status">Estáu</string>
+    <string name="shared_string_disable">Desactivar</string>
+    <string name="shared_string_save">Guardar</string>
+    <string name="shared_string_name">Nome</string>
+    <string name="shared_string_exit">Colar</string>
+    <string name="shared_string_close">Zarrar</string>
+    <string name="shared_string_off">Non</string>
+    <string name="shared_string_install">Instalar</string>
+    <string name="shared_string_share">Compartir</string>
+    <string name="shared_string_back">Atrás</string>
+    <string name="shared_string_continue">Siguir</string>
+    <string name="shared_string_cancel">Encaboxar</string>
+    <string name="shared_string_settings">Axustes</string>
+    <string name="yard">yd</string>
+    <string name="foot">ft</string>
+    <string name="mile">mi</string>
+    <string name="km">km</string>
+    <string name="m">m</string>
+    <string name="nm">nmi</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="m_s">m/s</string>
+    <string name="km_h">km/h</string>
+    <string name="mile_per_hour">mph</string>
+    <string name="si_kmh">Quilómetros per hora</string>
+    <string name="si_mph">Milles per hora</string>
+    <string name="si_m_s">Metros per segundu</string>
+    <string name="si_min_km">Minutos per quilómetru</string>
+    <string name="si_min_m">Minutos per milla</string>
+    <string name="si_mi_feet">Milles/pies</string>
+    <string name="si_mi_yard">Milles/yardes</string>
+    <string name="si_km_m">Quilómetros/metros</string>
+    <string name="si_nm">Milles náutiques</string>
+    <string name="si_mi_meters">Milles/metros</string>
+    <string name="monitoring_is_enabled">La supervisión ta activada</string>
+    <string name="monitoring_is_disabled">La supervisión ta desactivada</string>
+    <string name="end_date">Data de fin</string>
+    <string name="start_date">Data d\'aniciu</string>
+    <string name="timeline_description">Activa la supervisión pa recoyer en segundu planu los datos de la movición.</string>
+    <string name="send_location_as">Unviar l\'allugamientu como</string>
+    <string name="send_location_as_descr">Escueyi cómo van vese los mensaxes col to allugamientu.</string>
+    <string name="shared_string_text">Testu</string>
+    <string name="map_and_text">Mapa y testu</string>
+    <string name="last_update_from_telegram">L\'últimu anovamientu dende Telegram</string>
+    <string name="enter_another_device_name">Escueyi un nome que nun usares yá</string>
+    <string name="device_added_successfully">Amestóse %1$s.</string>
+    <string name="error_adding_new_device">Nun pudo amestase\'l preséu nuevu</string>
+    <string name="enter_device_name_description">El nome del preséu nuevu, 200 caráuteres como máximu.</string>
+    <string name="device_name_is_too_long">El nome del preséu ye perllargu</string>
+    <string name="device_name_cannot_be_empty">El nome del preséu nun pue tar baleru</string>
+    <string name="device_name">Nome del preséu</string>
+    <string name="share_location_as_description_second_line">Pues crear y ver la ID del preséu nun veceru pa Telegram usando la charra col robó %1$s .%2$s</string>
+    <string name="share_location_as_description">Si quies coneutar munchos preseos a una cuenta de Telegram, precises usar un preséu diferente al compartir l\'allugamientu.</string>
+    <string name="waiting_for_response_from_telegram">Esperando pola rempuesta de Telegram</string>
+    <string name="initializing">Aniciando</string>
+    <string name="searching_for_gps">Posicionando…</string>
+    <string name="background_work_description">Camuda los axustes de la optimización de la batería pa estabilizar la compartición del allugamientu.</string>
+    <string name="background_work">Trabayu en segundu planu</string>
+    <string name="sharing_in_background">Compartición en segundu planu</string>
+    <string name="go_to_settings">Dir a Axustes</string>
+    <string name="shared_string_later">Más sero</string>
+    <string name="sharing_enabled">Compartición: Activada</string>
+    <string name="no_gps_connection">Nun hai conexón al GPS</string>
+    <string name="no_internet_connection">Nun hai conexón a internet</string>
+    <string name="add_device">Amestar un preséu</string>
+    <string name="live_now_description">Contautos y grupos que tán compartiendo l\'allugamientu contigo.</string>
+    <string name="logout_from_osmand_telegram_descr">¿De xuru que quies zarrar sesión n\'OsmAnd Telegram pa que nun pueas compartir l\'allugamientu nin ver el d\'otros\?</string>
+    <string name="logout_from_osmand_telegram">¿Zarrar la sesión d\'OsmAnd Telegram\?</string>
+    <string name="by_distance">pola distancia</string>
+    <string name="by_name">pol nome</string>
+    <string name="by_group">pol grupu</string>
+    <string name="shared_string_sort_by">Ordenar por</string>
+    <string name="choose_osmand_desc">Esbilla la versión d\'OsmAnd onde van amosase los contautos nel mapa.</string>
+    <string name="disable_all_sharing_desc">Desactiva la compartición del allugamientu en toles charres esbillaes ((%1$d).</string>
+    <string name="disable_all_sharing">Desactivar toles comparticiones</string>
+    <string name="turn_off_all">Desactivar too</string>
+    <string name="shared_string_group">Grupu</string>
+    <string name="disconnect_from_telegram_desc">Pa revocar l\'accesu a la compartición del allugamientu. Abri Telegram, vete a Axustes → Privacidá y seguranza → Sesiones y zarra la sesión d\'OsmAnd Telegram.</string>
+    <string name="disconnect_from_telegram">Cómo desactivar la compartición del allugamientu con OsmAnd dende Telegram</string>
+    <string name="logout_help_desc">Cómo desactivar la compartición del allugamientu con OsmAnd dende Telegram</string>
+    <string name="connected_account">Cuenta coneutada</string>
+    <string name="shared_string_account">Cuenta</string>
+    <string name="in_time">en %1$s</string>
+    <string name="osmand_connect_desc">Escueyi la versión d\'OsmAnd qu\'OsmAnd Telegram va usar p\'amosar les posiciones.</string>
+    <string name="osmand_connect">Conexón a OsmAnd</string>
+    <string name="location_history_desc">Anubre los contautos que nun se movieren nel tiempu apurríu.</string>
+    <string name="location_history">Historial d\'allugamientos</string>
+    <string name="stale_location_desc">La última vez qu\'un contautu se movió.</string>
+    <string name="stale_location">Ausencia de movición</string>
+    <string name="send_my_location_desc">Afita l\'intervalu mínimu pa la compartición del allugamientu.</string>
+    <string name="send_my_location">Unviar el mio allugamientu</string>
+    <string name="gps_and_location">Posición</string>
+    <string name="sharing_time">Tiempu de la compartición</string>
+    <string name="expire_at">Caduca a les</string>
+    <string name="turn_off_location_sharing">Desactivar la compartición del allugamientu</string>
+    <string name="open_osmand">Abrir OsmAnd</string>
+    <string name="shared_string_live">En direuto</string>
+    <string name="shared_string_bot">Robó</string>
+    <string name="get_telegram_title">Rexistru en Telegram</string>
+    <string name="get_telegram_account_first">Precises una cuenta de Telegram pa usar la compartición d\'allugamientuos.</string>
+    <string name="get_telegram_description_continue">Instala Telegram y configura una cuenta.</string>
+    <string name="get_telegram_after_creating_account">Darréu vas poder usar esta aplicación.</string>
+    <string name="shared_string_all">Too</string>
+    <string name="do_not_have_telegram">Nun teo una cuenta de Telegram</string>
+    <string name="enter_phone_number">Introduz el númberu telefónicu</string>
+    <string name="enter_authentication_code">Introduz el códigu d\'autentación</string>
+    <string name="hours_and_minutes_format">%1$d h %2$d m</string>
+    <string name="minutes_format">%1$d m</string>
+    <string name="hours_format">%1$d h</string>
+    <string name="visible_time_for_all">Visibilidá xeneral demientres</string>
+    <string name="set_time">Afitamientu del tiempu</string>
+    <string name="location_sharing_description">Esbilla los contautos y grupos colos que quies compartir el to allugamientu.</string>
+    <string name="app_name">OsmAnd Telegram</string>
+    <string name="phone_number_title">Númberu telefónicu</string>
+    <string name="phone_number_descr">Númberu telefónicu nel formatu internacional</string>
+    <string name="shared_string_password">Contraseña</string>
+    <string name="authentication_code">Códigu d\'autenticación</string>
+    <string name="authentication_code_descr">Telegram unvióte un códigu pa OsmAnd pa qu\'anicies sesión na to cuenta.</string>
+    <string name="enter_password">Introduz la contraseña</string>
+    <string name="password_descr">Contraseña de Telegram</string>
+    <string name="shared_string_logout">Zarrar sesión</string>
+    <string name="gps_network_not_enabled">¿Activar «Allugamientu»\?</string>
+    <string name="not_logged_in">Nun aniciesti sesión</string>
+    <string name="gps_not_available">Activa «Allugamientu» nos axustes del sistema</string>
+    <string name="osmand_service_descr">OsmAnd Telegram execútase en segundu planu cola pantalla apagada.</string>
+    <string name="shared_string_distance">Distancia</string>
+    <string name="sharing_location">Compartiendo l\'allugamientu</string>
+    <string name="process_service">Serviciu d\'OsmAnd Telegram</string>
+    <string name="osmand_logo">Logu d\'OsmAnd</string>
+    <string name="install_osmand_dialog_message">Primero precises instalar la versión de baldre o de pagu d\'OsmAnd</string>
+    <string name="install_osmand">Instalación d\'OsmAnd</string>
+    <string name="shared_string_authorization">Autorización</string>
+    <string name="shared_string_authorization_descr">Introduz el to númberu telefónicu de Telegram nel formatu internacional</string>
+    <string name="shared_string_welcome">Afáyate</string>
+    <string name="nm_h">nmi/h</string>
+    <string name="si_nm_h">Milles náutiques per hora (nuedos)</string>
+    <string name="shared_string_hour_short">h</string>
+    <string name="shared_string_minute_short">m</string>
+    <string name="shared_string_second_short">s</string>
+    <string name="welcome_descr">La <b>compartición del allugamientu con OsmAnd</b> déxate compartir el to allugamientu y ver el d\'otros n\'OsmAnd.<br/><br/>L\'aplicación usa l\'API de Telegram y vas precisar una cuenta de Telegram.</string>
+    <string name="my_location">El mio allugamientu</string>
+    <string name="live_now">En direuto</string>
+    <string name="timeline">Llinia temporal</string>
+    <string name="last_available_location">L\'últimu allugamientu disponible</string>
+    <string name="sharing_status">Estáu de la compartición</string>
+    <string name="set_time_description">Afita\'l tiempu nel que los contautos y grupos esbillaos van ver el to allugamientu en tiempu real.</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-be/strings.xml b/OsmAnd-telegram/res/values-be/strings.xml
new file mode 100644
index 0000000000..84837b8480
--- /dev/null
+++ b/OsmAnd-telegram/res/values-be/strings.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="last_update_from_telegram">Апошняе абнаўленне з Telegram</string>
+	<string name="enter_another_device_name">Абярыце імя, якое вы яшчэ не выкарыстоўвалі</string>
+	<string name="device_added_successfully">%1$s дададзена.</string>
+	<string name="shared_string_add">Дадаць</string>
+	<string name="error_adding_new_device">Не атрымалася дадаць новую прыладу</string>
+	<string name="enter_device_name_description">Максімальная даўжыня назвы новай прылады - 200 сімвалаў.</string>
+	<string name="device_name_is_too_long">Назва прылады занадта доўгая</string>
+	<string name="device_name_cannot_be_empty">Назва прылады не можа быць пустой</string>
+	<string name="device_name">Назва прылады</string>
+	<string name="shared_string_hide">Схаваць</string>
+	<string name="share_location_as_description_second_line">Вы можаце стварыць і праглядзець ідэнтыфікатар прылады ў кліенце Тэлеграма, выкарыстоўваючы %1$s бота. %2$s</string>
+	<string name="share_location_as_description">Калі вы хочаце падлучыць некалькі прылад да аднаго акаўнта тэлеграм, то вам неабходна выкарыстаць розныя прылады, каб падзяліцца месцазнаходжаннем.</string>
+	<string name="last_updated_location">Апошняе абнаўленне месцазнаходжання:</string>
+	<string name="successfully_sent_and_updated">Паспяхова адпраўлена і абноўлена</string>
+	<string name="not_possible_to_send_to_telegram_chats">Немагчыма адправіць у размову Тэлеграм:</string>
+	<string name="waiting_for_response_from_telegram">Чаканне адказу ад Тэлеграм</string>
+	<string name="sending_location_messages">Адпраўленне месцазнаходжання</string>
+	<string name="initializing">Запуск</string>
+	<string name="searching_for_gps">Пазіцыянаванне…</string>
+	<string name="connecting_to_the_internet">Злучэнне з Інтэрнэтам</string>
+	<string name="background_work_description">Змена параметраў аптымізацыі батарэі для стабілізацыі абмену інфармацыяй аб месцазнаходжанні.</string>
+	<string name="background_work">Праца ў фонавым рэжыме</string>
+	<string name="battery_optimization_description">Выключыць аптымізацыю батарэі для OsmAnd Telegram, каб прадухіліць нечаканае выключэнне фонавага рэжыму.</string>
+	<string name="sharing_in_background">Абмен у фонавым рэжыме</string>
+	<string name="go_to_settings">Перайсці ў налады</string>
+	<string name="shared_string_later">Пазней</string>
+	<string name="not_sent_yet">Яшчэ не адпраўлена</string>
+	<string name="not_found_yet">Яшчэ не знойдзена</string>
+	<string name="re_send_location">Пераадправіць звесткі аб месцазнаходжанні</string>
+	<string name="last_available_location">Апошняе даступнае месца</string>
+	<string name="sharing_status">"Статус абмену "</string>
+	<string name="sharing_enabled">Абмен: Уключаны</string>
+	<string name="shared_string_status">Статус</string>
+	<string name="no_gps_connection">Злучэнне з GPS адсутнічае</string>
+	<string name="no_internet_connection">Злучэнне з Інтэрнэтам адсутнічае</string>
+	<string name="shared_string_disable">Выключыць</string>
+	<string name="shared_string_save">Захаваць</string>
+	<string name="add_device">Дадаць прыладу</string>
+	<string name="share_location_as">Падзяліцца месцазнаходжаннем як</string>
+	<string name="live_now_description">Кантакты і групы для абмену месцазнаходжаннем.</string>
+	<string name="logout_from_osmand_telegram_descr">Вы не зможаце падзяліцца сваім месцазнаходжаннем і ўбачыць месцазнаходжанне іншых. Сапраўды выйсці з OsmAnd Telegram\?</string>
+	<string name="logout_from_osmand_telegram">Выйсці з OsmAnd Telegram\?</string>
+	<string name="shared_string_name">Імя</string>
+	<string name="by_distance">Па адлегласці</string>
+	<string name="by_name">Па імёнах</string>
+	<string name="by_group">Па групе</string>
+	<string name="shared_string_sort">Упарадкаваць</string>
+	<string name="shared_string_sort_by">Упарадкаваць па</string>
+	<string name="choose_osmand_desc">Абярыце версію OsmAnd, у якой кантакты будуць адлюстроўвацца на мапе.</string>
+	<string name="choose_osmand">Абярыце версію OsmAnd для выкарыстання</string>
+	<string name="disable_all_sharing_desc">Выключыць абмен для ўсіх абраных размоў (%1$d).</string>
+	<string name="disable_all_sharing">Выключыць усе абмены</string>
+	<string name="turn_off_all">Выключыце ўсе</string>
+	<string name="shared_string_exit">Выйсці</string>
+	<string name="time_ago">таму</string>
+	<string name="last_response">Апошні адказ</string>
+	<string name="shared_string_group">Група</string>
+	<string name="logout_no_internet_msg">Падлучыцеся да Інтэрнэту, каб карэктна выйсці з Тэлеграм.</string>
+	<string name="shared_string_close">Закрыць</string>
+	<string name="disconnect_from_telegram_desc">Для таго, каб скасаваць абмен месцазнаходжаннем, адкрыйце Тэлеграм, перайдзіце ў Налады → Прыватнасць і бяспека → Сеансы і спыніце сеанс OsmAnd Telegram.</string>
+	<string name="disconnect_from_telegram">Як выключыць абмен месцазнаходжаннем у OsmAnd праз Тэлеграм</string>
+	<string name="logout_help_desc">Як выключыць абмен месцазнаходжаннем у OsmAnd праз Тэлеграм</string>
+	<string name="connected_account">Падлучаны акаўнт</string>
+	<string name="shared_string_account">Рахунак</string>
+	<string name="in_time">у %1$s</string>
+	<string name="osmand_connect_desc">Абраць версію OsmAnd, якую OsmAnd Telegram будзе выкарыстоўваць для адлюстравання пазіцыі.</string>
+	<string name="osmand_connect">Злучэнне з OsmAnd</string>
+	<string name="location_history_desc">Схаваць кантакты, якія не перамяшчаліся пэўны час.</string>
+	<string name="location_history">Гісторыя месцазнаходжанняў</string>
+	<string name="stale_location_desc">Апошні раз кантакт рухаўся.</string>
+	<string name="stale_location">Не рухаецца</string>
+	<string name="send_my_location_desc">Вызначыць мінімальны інтэрвал для абмену інфармацыяй аб месцазнаходжанні.</string>
+	<string name="send_my_location">Адправіць маё месцазнаходжанне</string>
+	<string name="gps_and_location">Пазіцыя</string>
+	<string name="sharing_time">"Час абмену "</string>
+        <string name="expire_at">Сыходзіць</string>
+	<string name="stop_sharing_all">Абмен уключаны (выключыць)</string>
+	<string name="turn_off_location_sharing">Выключыць абмен</string>
+	<string name="open_osmand">Адкрыць OsmAnd</string>
+	<string name="shared_string_live">Дзейных</string>
+	<string name="shared_string_bot">Бот</string>
+	<string name="get_telegram_title">Рэгістрацыя ў Telegram</string>
+	<string name="get_telegram_account_first">Для абмену вам неабходны акаўнт Тэлеграм.</string>
+	<string name="get_telegram_description_continue">Калі ласка, ўсталюйце Тэлеграм і наладзьце акаўнт.</string>
+	<string name="get_telegram_after_creating_account">Пасля гэтага вы зможаце выкарыстоўваць дадатак.</string>
+	<string name="shared_string_all">Усе</string>
+	<string name="shared_string_off">Выкл</string>
+	<string name="already_registered_in_telegram">Вам неабходна мець акаўнт Тэлеграм і нумар тэлефона</string>
+	<string name="do_not_have_telegram">У мяне няма акаўнта Тэлеграм</string>
+	<string name="enter_phone_number">Увядзіце нумар тэлефона</string>
+	<string name="enter_authentication_code">Увядзіце код аўтарызацыі</string>
+	<string name="set_visible_time_for_all">Вызначце бачны час для ўсіх</string>
+	<string name="hours_and_minutes_format">%1$d г %2$d хв</string>
+	<string name="minutes_format">%1$d хв</string>
+	<string name="hours_format">%1$d г</string>
+	<string name="shared_string_install">Усталяваць</string>
+	<string name="shared_string_share">Падзяліцца</string>
+	<string name="shared_string_back">Назад</string>
+	<string name="visible_time_for_all">Бачны для ўсіх час</string>
+	<string name="set_time_description">Задайце час, што будуць бачыць абраныя вамі кантакты і групы ў рэжыме рэальнага часу.</string>
+	<string name="set_time">Задаць час</string>
+	<string name="location_sharing_description">Абярыце кантакты і групы, з якімі хочаце абменьвацца вашым месцазнаходжаннем.</string>
+	<string name="my_location_search_hint">Пошук: група альбо кантакт</string>
+	<string name="start_location_sharing">Падзяліцца месцазнаходжаннем</string>
+	<string name="show_on_map">Паказаць на мапе</string>
+	<string name="app_name">ОsmAnd Telegram</string>
+	<string name="phone_number_title">Нумар тэлефона</string>
+	<string name="phone_number_descr">Нумар тэлефона ў міжнародным фармаце</string>
+	<string name="shared_string_password">Пароль</string>
+	<string name="enter_code">Увядзіце код</string>
+	<string name="authentication_code">Код аўтэнтыфікацыі</string>
+	<string name="authentication_code_descr">Тэлеграм адправіў вам код для OsmAnd для ўваходу ў акаўнт.</string>
+	<string name="enter_password">Увядзіце пароль</string>
+	<string name="password_descr">Пароль Тэлеграм</string>
+	<string name="shared_string_login">Увайсці</string>
+	<string name="shared_string_logout">Выйсці</string>
+	<string name="initialization">Запуск</string>
+	<string name="logging_out">Выхад</string>
+	<string name="closing">Закрыццё</string>
+	<string name="gps_network_not_enabled">Уключыць \"Месцазнаходжанне\"\?</string>
+	<string name="not_logged_in">Вы не ўвайшлі</string>
+	<string name="shared_string_continue">Працягнуць</string>
+	<string name="shared_string_cancel">Скасаваць</string>
+	<string name="shared_string_settings">Налады</string>
+	<string name="no_location_permission">Дадатак не мае дазволу на доступ да даных аб месцазнаходжанні.</string>
+	<string name="gps_not_available">Калі ласка, ўключыце \"Месцазнаходжанне\" ў сістэмных наладах</string>
+	<string name="location_service_no_gps_available">Абярыце аднаго пастаўшчыка месцазнаходжання, каб падзяліцца сваім месцазнаходжаннем.</string>
+	<string name="osmand_service">Фонавы рэжым</string>
+	<string name="osmand_service_descr">OsmAnd Telegram працуе ў фонавым рэжыме з выключаным экранам.</string>
+	<string name="shared_string_distance">Адлегласць</string>
+	<string name="share_location">Падзяліцца месцазнаходжаннем</string>
+	<string name="sharing_location">Абмен данымі аб месцазнаходжанні</string>
+	<string name="process_service">Сэрвіс OsmAnd Telegram</string>
+	<string name="osmand_logo">Лагатып OsmAnd</string>
+	<string name="install_osmand_dialog_message">Спачатку вам неабходна ўсталяваць бясплатную ці платную версію OsmAnd</string>
+	<string name="install_osmand">Усталяваць OsmAnd</string>
+	<string name="show_users_on_map">Паказаць карыстальнікаў на мапе</string>
+	<string name="active_chats">Актыўныя размовы</string>
+	<string name="shared_string_authorization">Аўтарызацыя</string>
+	<string name="shared_string_authorization_descr">Калі ласка, увядзіце ваш нумар тэлефона, звязаны з Тэлеграм, ў міжнародным фармаце</string>
+	<string name="shared_string_welcome">Вітаем</string>
+
+	<string name="yard">ярд</string>
+	<string name="foot">фут</string>
+	<string name="mile">міл</string>
+	<string name="km">км</string>
+	<string name="m">м</string>
+	<string name="nm">м.мілі</string>
+	<string name="min_mile">хв/м</string>
+	<string name="min_km">хв/км</string>
+	<string name="nm_h">м.міль/г</string>
+	<string name="m_s">м/с</string>
+	<string name="km_h">км/г</string>
+	<string name="mile_per_hour">м/г</string>
+	<string name="si_kmh">Кіламетраў за гадзіну</string>
+	<string name="si_mph">Міляў за гадзіну</string>
+	<string name="si_m_s">Метраў за секунду</string>
+	<string name="si_min_km">Хвілін на кіламетар</string>
+	<string name="si_min_m">Хвілін на мілю</string>
+	<string name="si_nm_h">Марскіх міль за гадзіну (вузлоў)</string>
+	<string name="si_mi_feet">Мілі/футы</string>
+	<string name="si_mi_yard">Мілі/ярды</string>
+	<string name="si_km_m">Кіламетры/метры</string>
+	<string name="si_nm">Марскія мілі</string>
+	<string name="si_mi_meters">Мілі/метры</string>
+	<string name="shared_string_hour_short">г</string>
+	<string name="shared_string_minute_short">хвіл</string>
+	<string name="shared_string_second_short">сек</string>
+	<string name="welcome_descr"><b>Абмен месцазнаходжаннем OsmAnd</b> Дае магчымасць дзяліцца сваім месцазнаходжаннем і бачыць месцазнаходжанне іншых у OsmAnd.<br/><br/> Дадатак выкарыстоўвае Telegram API, таму вам неабходны акаўнт Тэлеграм.</string>
+	<string name="my_location">Маё месцазнаходжанне</string>
+	<string name="live_now">Зараз дзейнічае</string>
+
+
+<string name="send_location_as">Адправіць месцазнаходжанне як</string>
+	<string name="send_location_as_descr">Абярыце як будуць выглядаць паведамленні з вашым месцазнаходжаннем.</string>
+	<string name="shared_string_map">Мапа</string>
+	<string name="shared_string_text">Тэкст</string>
+	<string name="map_and_text">Мапа і тэкст</string>
+    <string name="monitoring_is_enabled">Маніторынг уключаны</string>
+    <string name="monitoring_is_disabled">Маніторынг адключаны</string>
+    <string name="time_on_the_move">час руху</string>
+    <string name="average_altitude">Сярэдняя вышыня</string>
+    <string name="average_speed">Сярэдняя хуткасць</string>
+    <string name="open_in_osmand">Адкрыць у OsmAnd</string>
+    <string name="end_date">Дата закрыцця</string>
+    <string name="start_date">Час адкрыцця</string>
+    <string name="timeline_description">Уключаць маніторынг для збору данных руху ў фоне.</string>
+    <string name="timeline">Храналогія</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-cs/strings.xml b/OsmAnd-telegram/res/values-cs/strings.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/OsmAnd-telegram/res/values-cs/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-da/strings.xml b/OsmAnd-telegram/res/values-da/strings.xml
index 9dcf1ad420..cfc4bb1a31 100644
--- a/OsmAnd-telegram/res/values-da/strings.xml
+++ b/OsmAnd-telegram/res/values-da/strings.xml
@@ -1,28 +1,21 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="background_work_description">Skift indstillinger for batterioptimering, for stabil deling af placering</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="background_work_description">Skift indstillinger for batterioptimering, for stabil deling af placering.</string>
 	<string name="background_work">Baggrundstilstand</string>
-	<string name="battery_optimization_description">Sluk for batterioptimering af OsmAnd Telegram, så det ikke pludselig slukker, når i baggrunden.</string>
+	<string name="battery_optimization_description">Sluk for batterioptimering af OsmAnd Telegram, så det ikke pludseligt bliver slukket, når det er i baggrunden.</string>
 	<string name="sharing_in_background">Deling i baggrunden</string>
 	<string name="go_to_settings">Gå til indstillinger</string>
 	<string name="shared_string_later">Senere</string>
 	<string name="not_sent_yet">Ikke sendt endnu</string>
 	<string name="not_found_yet">Ikke fundet endnu</string>
 	<string name="re_send_location">Send placering igen</string>
-	<string name="last_sent_location">Sidst sendte placering</string>
 	<string name="last_available_location">Sidste tilgængelige placering</string>
 	<string name="sharing_status">Delingsstatus</string>
 	<string name="sharing_enabled">Deling: aktiveret</string>
 	<string name="shared_string_status">Status</string>
 	<string name="no_gps_connection">Ingen GPS-forbindelse</string>
-	<string name="sharing_success">Sendt korrekt og opdateret</string>
-	<string name="not_possible_to_send_to_chats">Ikke muligt at sende til samtaler:</string>
 	<string name="no_internet_connection">Ingen internetforbindelse</string>
 	<string name="shared_string_disable">Deaktiver</string>
-	<string name="shared_string_save">Gem</string>
-	<string name="add_device_descr">Indtast enheds-id, som kan findes på https://live.osmand.net/device/ID</string>
-	<string name="device_id">Enheds-id</string>
 	<string name="add_device">Tilføj enhed</string>
-	<string name="share_location_as_descr">Giver mulighed for at dele enhedens placering, eller placering af brugerdefinerede enheder det tilføjes via API.</string>
 	<string name="share_location_as">Del placering som</string>
 	<string name="live_now_description">Kontakter og grupper som der deles placering med.</string>
 	<string name="logout_from_osmand_telegram_descr">Er du sikker på at du vil logge ud af OsmAnd Telegram, så du ikke kan dele din placering eller se placeringen af andre\?</string>
@@ -33,16 +26,16 @@
 	<string name="by_group">Efter gruppe</string>
 	<string name="shared_string_sort">Sorter</string>
 	<string name="shared_string_sort_by">Sorter efter</string>
-	<string name="choose_osmand_desc">Vælg OsmAnd version, hvor kontakter skal vises på kortet.</string>
-	<string name="choose_osmand">Vælg en OsmAnd-version</string>
-	<string name="disable_all_sharing_desc">Deaktiverer deling af placering for alle de valgte samtaler (%1$d).</string>
+	<string name="choose_osmand_desc">Vælg den OsmAnd version, der skal vise kontakter på kortet.</string>
+	<string name="choose_osmand">Vælg OsmAnd-version der skal bruges</string>
+	<string name="disable_all_sharing_desc">Slukker for placeringsdeling for alle de valgte samtaler (%1$d).</string>
 	<string name="disable_all_sharing">Deaktiver al deling</string>
 	<string name="turn_off_all">Sluk alt</string>
 	<string name="shared_string_exit">Afslut</string>
 	<string name="time_ago">siden</string>
 	<string name="last_response">Sidste svar</string>
 	<string name="shared_string_group">Gruppe</string>
-	<string name="logout_no_internet_msg">Opret forbindelse til internettet for at logge ud af Telegram.</string>
+	<string name="logout_no_internet_msg">Opret forbindelse til Internettet for at logge ud af Telegram.</string>
 	<string name="shared_string_close">Luk</string>
 	<string name="disconnect_from_telegram_desc">"Sådan tilbagekaldes adgang til placeringsdeling. Åbn Telegram, gå til Settings - Privacy and Security - Sessions og afslut OsmAnd Telegram session. "</string>
 	<string name="disconnect_from_telegram">Hvordan afbrydes OsmAnd placeringsdeling fra Telegram</string>
@@ -51,29 +44,28 @@
 	<string name="shared_string_account">Konto</string>
 	<string name="in_time">i %1$s</string>
 	<string name="osmand_connect_desc">Vælg den OsmAnd version, som OsmAnd Telegram bruger til vise placeringer på kortet.</string>
-	<string name="osmand_connect">OsmAnd forbindelse</string>
-	<string name="location_history_desc">Skjul de kontaktpersoner, der ikke har opdateret placering i et givet tidsrum.</string>
+	<string name="osmand_connect">Tilslut OsmAnd</string>
+	<string name="location_history_desc">Skjul kontakter, der ikke har bevæget sig i en given tid.</string>
 	<string name="location_history">Placeringshistorik</string>
-	<string name="stale_location_desc">Sidste gang en kontakt har sendt en placering.</string>
-	<string name="stale_location">Uaktuel placering</string>
+	<string name="stale_location_desc">Sidste gang en kontakt har bevæget sig.</string>
+	<string name="stale_location">Bevæger sig ikke</string>
 	<string name="send_my_location_desc">Angiv den mindste interval for deling af placering.</string>
 	<string name="send_my_location">Send placering</string>
-	<string name="gps_and_location">GPS og placering</string>
-	<string name="sharing_time">Delingstidsrum</string>
+	<string name="gps_and_location">Placering</string>
+	<string name="sharing_time">Delingstid</string>
 	<string name="expire_at">Udløber</string>
-	<string name="stop_sharing_all">Deling er aktiveret (deaktiver)</string>
 	<string name="turn_off_location_sharing">Sluk for deling af placering</string>
 	<string name="open_osmand">Åbn OsmAnd</string>
 	<string name="shared_string_live">Live</string>
 	<string name="shared_string_bot">Bot</string>
 	<string name="get_telegram_title">Registrering i Telegram</string>
-	<string name="get_telegram_account_first">Det er nødvendigt med en Telegram-konto for at bruge OsmAnd placeringsdeling.</string>
-	<string name="get_telegram_description_continue">Installer Telegram fra Google Play, og opret en konto.</string>
-	<string name="get_telegram_after_creating_account">Når konto er oprettet, kan programmet bruges.</string>
+	<string name="get_telegram_account_first">Det er nødvendigt med en Telegram-konto for at bruge placeringsdeling.</string>
+	<string name="get_telegram_description_continue">Installer Telegram og opret en konto.</string>
+	<string name="get_telegram_after_creating_account">Så kan programmet bruges.</string>
 	<string name="shared_string_all">Alle</string>
 	<string name="shared_string_off">Fra</string>
 	<string name="already_registered_in_telegram">Der er brug for en registreret Telegram-konto og telefonnummer</string>
-	<string name="do_not_have_telegram">Jeg har ikke Telegram konto</string>
+	<string name="do_not_have_telegram">Har ikke Telegram konto</string>
 	<string name="enter_phone_number">Indtast telefonnummer</string>
 	<string name="enter_authentication_code">Indtast autentificeringskode</string>
 	<string name="set_visible_time_for_all">Sæt synlige tid for alle</string>
@@ -83,12 +75,12 @@
 	<string name="shared_string_install">Installer</string>
 	<string name="shared_string_share">Del</string>
 	<string name="shared_string_back">Tilbage</string>
-	<string name="visible_time_for_all">Synlige tid for alle</string>
-	<string name="set_time_description">Sæt tidrummet hvor de valgte kontaktpersoner og grupper kan placering i realtid.</string>
+	<string name="visible_time_for_all">Synlig tid for alle</string>
+	<string name="set_time_description">Sæt tiden hvor de valgte kontakter og grupper kan se placering i realtid.</string>
 	<string name="set_time">Sæt tid</string>
-	<string name="location_sharing_description">Vælg de kontaktpersoner og grupper, som placeringen skal deles med.</string>
+	<string name="location_sharing_description">Vælg de kontakter og grupper, som placeringen skal deles med.</string>
 	<string name="my_location_search_hint">Søg: gruppe eller kontakt</string>
-	<string name="start_location_sharing">Start deling af placering</string>
+	<string name="start_location_sharing">Del placering</string>
 	<string name="show_on_map">Vis på kort</string>
 	<string name="app_name">OsmAnd Telegram</string>
 	<string name="phone_number_title">Telefonnummer</string>
@@ -98,30 +90,21 @@
 	<string name="authentication_code">Autentificeringkode</string>
 	<string name="authentication_code_descr">Telegram har sendt en kode. Den vil blive brugt af OsmAnd som konto log ind.</string>
 	<string name="enter_password">Indtast adgangskode</string>
-	<string name="password_descr">Indtast adgangskode til Telegram-konto</string>
+	<string name="password_descr">Telegram adgangskode</string>
 	<string name="shared_string_login">Log ind</string>
 	<string name="shared_string_logout">Log ud</string>
 	<string name="not_logged_in">Ikke logget ind</string>
-	<string name="initialization">Initialisering</string>
-	<string name="logging_out">Logger ud</string>
-	<string name="closing">Lukker</string>
 	<string name="shared_string_continue">Fortsæt</string>
 	<string name="shared_string_cancel">Annuller</string>
-	<string name="gps_network_not_enabled">Placeringtjenesten er ikke aktiveret. Aktiver\?</string>
 	<string name="shared_string_settings">Indstillinger</string>
 	<string name="no_location_permission">Mangler tilladelse til at bruge placeringsdata.</string>
-	<string name="gps_not_available">Aktiver GPS i indstillinger</string>
+	<string name="gps_not_available">Tænd for \"Placering\" i systemindstillinger</string>
 	<string name="location_service_no_gps_available">Vælg en af placeringsudbyderne til at dele placering.</string>
 	<string name="osmand_service">Baggrundstilstand</string>
 	<string name="osmand_service_descr">OsmAnd Telegram kører i baggrunden med skærmen slukket.</string>
 	<string name="shared_string_distance">Afstand</string>
 	<string name="share_location">Del placering</string>
 	<string name="sharing_location">Deler placering</string>
-	<string name="shared_string_paused">Pauset</string>
-	<string name="shared_string_no_data">Ingen data</string>
-	<string name="shared_string_pause">Pause</string>
-	<string name="shared_string_start">Start</string>
-	<string name="shared_string_stop">Stop</string>
 	<string name="process_service">OsmAnd Telegram tjeneste</string>
 	<string name="osmand_logo">OsmAnd logo</string>
 	<string name="install_osmand_dialog_message">Det er nødvendigt at installere en gratis eller betalt version af OsmAnd</string>
@@ -129,7 +112,7 @@
 	<string name="show_users_on_map">Vis brugere på kortet</string>
 	<string name="active_chats">Aktive samtaler</string>
 	<string name="shared_string_authorization">Autorisation</string>
-	<string name="shared_string_authorization_descr">Indtast telefonnummer på Telegram-konto i internationalt format</string>
+	<string name="shared_string_authorization_descr">Indtast Telegram telefonnummer i internationalt format</string>
 	<string name="shared_string_welcome">Velkommen</string>
 
 	<string name="yard">yd</string>
@@ -158,18 +141,48 @@
 	<string name="shared_string_hour_short">t</string>
 	<string name="shared_string_minute_short">min</string>
 	<string name="shared_string_second_short">sek</string>
-	<string name="plus">+</string>
-	<string name="welcome_descr"><b>OsmAnd placeringsdeling</b> giver mulighed for at dele placering og se placering af andre i OsmAnd.<br/><br/>Programmet bruger Telegram API og skal have en Telegram konto.</string>
+	<string name="welcome_descr"><b>OsmAnd placeringsdeling</b> giver mulighed for at dele placering og se placering af andre i OsmAnd.<br/><br/>Programmet bruger Telegram API og skal bruge en Telegram konto.</string>
 	<string name="my_location">Placering</string>
-	<string name="live_now">Sender nu</string>
+	
 
-
-<string name="last_updated_location">Sidste ajourførte placering:</string>
+	<string name="last_updated_location">Sidste ajourførte placering:</string>
 	<string name="successfully_sent_and_updated">Sendt korrekt og opdateret</string>
 	<string name="not_possible_to_send_to_telegram_chats">Ikke muligt at sende til Telegram samtaler:</string>
 	<string name="waiting_for_response_from_telegram">Venter på svar fra Telegram</string>
-	<string name="sending_location_messages">Sender placeringsmeddelelser</string>
-	<string name="initializing">Initialiserer</string>
-	<string name="searching_for_gps">Søger efter GPS</string>
-	<string name="connecting_to_the_internet">Forbinder til internettet</string>
-	</resources>
+	<string name="sending_location_messages">Sender placering</string>
+	<string name="initializing">Starter</string>
+	<string name="searching_for_gps">Positionering…</string>
+	<string name="connecting_to_the_internet">Forbinder til Internettet</string>
+	<string name="enter_another_device_name">Vælg et navn der ikke allerede er brugt</string>
+	<string name="device_added_successfully">%1$s tilføjet.</string>
+	<string name="shared_string_add">Tilføj</string>
+	<string name="error_adding_new_device">Kunne ikke tilføje ny enhed</string>
+	<string name="enter_device_name_description">Indtast et navn til den nye enhed. Max 200 tegn.</string>
+	<string name="device_name_is_too_long">Enhedsnavn er for langt</string>
+	<string name="device_name_cannot_be_empty">Enhedsnavn må ikke være tomt</string>
+	<string name="device_name">Enhedsnavn</string>
+	<string name="shared_string_hide">Skjul</string>
+	<string name="share_location_as_description_second_line">Opret og få vist enhedens-id i Telegram-klienten ved hjælp af %1$s chat-bot. %2$s</string>
+	<string name="share_location_as_description">Hvis der skal tilsluttes flere enheder til en Telegram-konto, er det nødvendigt til at bruge forskellige enheder til at dele placeringen.</string>
+	<string name="shared_string_save">Gem</string>
+	<string name="stop_sharing_all">Deling er aktiv (sluk)</string>
+	<string name="initialization">Starter</string>
+	<string name="logging_out">Logger ud</string>
+	<string name="closing">Lukker</string>
+	<string name="gps_network_not_enabled">Tænd for \"Placering\"\?</string>
+	<string name="live_now">Live now</string>
+
+
+<string name="last_update_from_telegram">Sidste opdatering fra Telegram</string>
+	<string name="send_location_as">Send placering som</string>
+	<string name="send_location_as_descr">Vælg hvordan beskeder med placering skal se ud.</string>
+	<string name="shared_string_map">Kort</string>
+	<string name="shared_string_text">Tekst</string>
+	<string name="map_and_text">Kort og tekst</string>
+    <string name="average_altitude">Gennemsnitshøjde</string>
+    <string name="average_speed">Gennemsnitshastighed</string>
+    <string name="open_in_osmand">Åbn i OsmAnd</string>
+    <string name="end_date">Slutdato</string>
+    <string name="start_date">Startdato</string>
+    <string name="timeline">Tidslinje</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-de/strings.xml b/OsmAnd-telegram/res/values-de/strings.xml
index 9904a15b68..5c83236784 100644
--- a/OsmAnd-telegram/res/values-de/strings.xml
+++ b/OsmAnd-telegram/res/values-de/strings.xml
@@ -1,21 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="sharing_in_background">Teilen im Hintergrund</string>
 	<string name="go_to_settings">Einstellungen öffnen</string>
 	<string name="not_sent_yet">Noch nicht gesendet</string>
 	<string name="not_found_yet">Noch nicht gefunden</string>
 	<string name="re_send_location">Position neu senden</string>
-	<string name="last_sent_location">Letzter gesendeter Standort</string>
 	<string name="sharing_status">Freigabestatus</string>
 	<string name="sharing_enabled">Teilen: Aktiviert</string>
 	<string name="shared_string_status">Status</string>
 	<string name="no_gps_connection">Kein GPS-Signal</string>
-	<string name="sharing_success">Gesendet und aktualisiert</string>
-	<string name="not_possible_to_send_to_chats">Konnte nicht an Chats senden:</string>
 	<string name="no_internet_connection">Keine Internetverbindung</string>
 	<string name="shared_string_disable">Deaktivieren</string>
-	<string name="shared_string_save">Speichern</string>
-	<string name="add_device_descr">Finden Sie Ihre Geräte-ID unter https://live.osmand.net/device/ID</string>
-	<string name="device_id">Geräte-ID</string>
 	<string name="add_device">Gerät hinzufügen</string>
 	<string name="shared_string_later">Später</string>
 	<string name="last_available_location">Letzter verfügbarer Standort</string>
@@ -28,7 +22,7 @@
 	<string name="by_group">Nach Gruppe</string>
 	<string name="shared_string_sort">Sortieren</string>
 	<string name="shared_string_sort_by">Sortieren nach</string>
-	<string name="choose_osmand_desc">Wählen Sie die OsmAnd-Version, in der die Kontakte auf der Karte angezeigt werden.</string>
+	<string name="choose_osmand_desc">Wählen Sie die OsmAnd-Version, in der Kontakte auf der Karte angezeigt werden.</string>
 	<string name="choose_osmand">Zu verwendende OsmAnd-Version auswählen</string>
 	<string name="turn_off_all">Alle ausschalten</string>
 	<string name="shared_string_exit">Beenden</string>
@@ -40,19 +34,19 @@
 	<string name="connected_account">Verbundenes Konto</string>
 	<string name="shared_string_account">Konto</string>
 	<string name="in_time">"in %1$s "</string>
-	<string name="osmand_connect_desc">Wählen Sie die OsmAnd-Version, die OsmAnd Telegram verwendet, um Positionen auf der Karte anzuzeigen.</string>
+	<string name="osmand_connect_desc">Wählen Sie die OsmAnd-Version, die OsmAnd Telegram verwendet, um Positionen anzuzeigen.</string>
 	<string name="osmand_connect">OsmAnd verbinden</string>
-	<string name="location_history_desc">Blenden Sie die Kontakte aus, die ihren Standort in einer vorgegebenen Zeitspanne nicht aktualisiert haben.</string>
+	<string name="location_history_desc">Blendet Kontakte aus, die sich eine bestimmte Zeit lang nicht bewegt haben.</string>
 	<string name="location_history">Standortverlauf</string>
-	<string name="stale_location_desc">Das letzte Mal, dass ein Kontakt seinen Standort gesendet hat.</string>
+	<string name="stale_location_desc">Das letzte Mal, dass sich ein Kontakt bewegt hat.</string>
 	<string name="send_my_location">Meinen Standort senden</string>
-	<string name="gps_and_location">GPS &amp; Standort</string>
+	<string name="gps_and_location">Position</string>
 	<string name="open_osmand">OsmAnd öffnen</string>
 	<string name="shared_string_live">"Live "</string>
 	<string name="get_telegram_title">Registrierung in Telegram</string>
-	<string name="get_telegram_account_first">Sie benötigen ein Telegram-Konto, um die OsmAnd Standortfreigabe nutzen zu können.</string>
-	<string name="get_telegram_description_continue">Bitte installieren Sie Telegram von Google Play und registrieren Sie dazu ein Konto.</string>
-	<string name="get_telegram_after_creating_account">Nach der Erstellung des Kontos können Sie diese App nutzen.</string>
+	<string name="get_telegram_account_first">Sie benötigen ein Telegram-Konto, um die Standortfreigabe nutzen zu können.</string>
+	<string name="get_telegram_description_continue">Bitte installieren Sie Telegram und richten Sie ein Konto ein.</string>
+	<string name="get_telegram_after_creating_account">Dann können Sie diese App nutzen.</string>
 	<string name="shared_string_all">Alle</string>
 	<string name="shared_string_off">Aus</string>
 	<string name="already_registered_in_telegram">Sie benötigen ein registriertes Telegram-Konto und eine Telefonnummer</string>
@@ -71,33 +65,24 @@
 	<string name="show_on_map">Auf Karte anzeigen</string>
 	<string name="app_name">"OsmAnd Telegram "</string>
 	<string name="phone_number_title">Telefonnummer</string>
-	<string name="phone_number_descr">Telefonnummer im internationalen Format</string>
+	<string name="phone_number_descr">Telefonnummer in internationalem Format</string>
 	<string name="shared_string_password">Passwort</string>
 	<string name="enter_code">Code eingeben</string>
 	<string name="authentication_code">Authentifizierungscode</string>
 	<string name="authentication_code_descr">Telegram hat Ihnen einen Code für OsmAnd zur Anmeldung an Ihrem Konto gesendet.</string>
 	<string name="enter_password">Passwort eingeben</string>
 	<string name="shared_string_login">Anmelden</string>
-	<string name="shared_string_logout">Abmeldung</string>
+	<string name="shared_string_logout">Abmelden</string>
 	<string name="not_logged_in">Sie sind nicht angemeldet</string>
-	<string name="initialization">Initialisierung</string>
-	<string name="logging_out">Abmeldung</string>
-	<string name="closing">Schließen</string>
 	<string name="shared_string_continue">Fortfahren</string>
 	<string name="shared_string_cancel">Abbrechen</string>
-	<string name="gps_network_not_enabled">Standortdienst einschalten\?</string>
 	<string name="shared_string_settings">Einstellungen</string>
 	<string name="no_location_permission">Der App fehlt die Berechtigung, auf Standortdaten zuzugreifen.</string>
-	<string name="gps_not_available">Bitte aktivieren Sie GPS in den Einstellungen</string>
+	<string name="gps_not_available">Bitte schalten Sie \"Standort\" in den Systemeinstellungen ein</string>
 	<string name="osmand_service">Hintergrundmodus</string>
 	<string name="osmand_service_descr">OsmAnd Telegram läuft im Hintergrund bei ausgeschaltetem Bildschirm.</string>
 	<string name="shared_string_distance">Distanz</string>
 	<string name="share_location">Standort teilen</string>
-	<string name="shared_string_paused">Pausiert</string>
-	<string name="shared_string_no_data">Keine Daten</string>
-	<string name="shared_string_pause">"Pause "</string>
-	<string name="shared_string_start">"Start "</string>
-	<string name="shared_string_stop">"Stop "</string>
 	<string name="process_service">OsmAnd Telegram-Service</string>
 	<string name="osmand_logo">OsmAnd-Logo</string>
 	<string name="install_osmand_dialog_message">Sie müssen zuerst die kostenlose oder kostenpflichtige Version von OsmAnd installieren</string>
@@ -132,44 +117,76 @@
 	<string name="shared_string_hour_short">h</string>
 	<string name="shared_string_minute_short">min</string>
 	<string name="shared_string_second_short">s</string>
-	<string name="plus">+</string>
 	<string name="my_location">Mein Standort</string>
-	<string name="live_now">Sende gerade</string>
 
 
 <string name="background_work">Hintergrundbetrieb</string>
 	<string name="successfully_sent_and_updated">Erfolgreich gesendet und aktualisiert</string>
 	<string name="waiting_for_response_from_telegram">Warten auf Antwort von Telegram</string>
-	<string name="sending_location_messages">Versand von Standortmitteilungen</string>
-	<string name="initializing">Initialisierung</string>
-	<string name="searching_for_gps">Suche nach GPS-Signal</string>
+	<string name="sending_location_messages">Sende Standort</string>
+	<string name="initializing">Startet</string>
+	<string name="searching_for_gps">Positioniere..…</string>
 	<string name="connecting_to_the_internet">Verbindung zum Internet</string>
-	<string name="background_work_description">Akkuoptimierungseinstellungen für eine dauerhafte Standortfreigabe ändern</string>
-	<string name="password_descr">Bitte Passwort für Ihr Telegram-Konto eingeben</string>
+	<string name="background_work_description">Akkuoptimierungseinstellungen, um die Standortfreigabe zu stabilisieren.</string>
+	<string name="password_descr">Telegram-Passwort</string>
 	<string name="nm">kn</string>
 	<string name="nm_h">kn/h</string>
 	<string name="last_updated_location">Zuletzt aktualisierter Ort:</string>
 	<string name="not_possible_to_send_to_telegram_chats">Es ist nicht möglich, an Telegram-Chats zu senden:</string>
 	<string name="battery_optimization_description">Schalten Sie die Batterieoptimierung für OsmAnd Telegram aus, damit es nicht plötzlich im Hintergrund ausgeschaltet wird.</string>
-	<string name="share_location_as_descr">Die gemeinsame Nutzung Ihres Geräte-Standorts oder des Standorts benutzerdefinierter Geräte erlauben, die über die API hinzugefügt wurden.</string>
 	<string name="logout_from_osmand_telegram_descr">Sind Sie sicher, dass Sie sich von OsmAnd Telegram abmelden möchten, so dass Sie den Standort nicht teilen oder den Standort anderer sehen können\?</string>
 	<string name="disable_all_sharing_desc">Schaltet die Standortfreigabe für alle ausgewählten Chats aus (%1$d).</string>
 	<string name="disable_all_sharing">Alle Freigaben deaktivieren</string>
-	<string name="disconnect_from_telegram_desc">Um den Zugriff auf die Standortfreigabe zu widerrufen, öffnen Sie Telegram, gehen zu Einstellungen - Datenschutz und Sicherheit - Sitzungen und beenden die OsmAnd Telegram-Sitzung.</string>
+	<string name="disconnect_from_telegram_desc">Um den Zugriff auf die Standortfreigabe zu widerrufen, öffnen Sie Telegram, gehen zu Einstellungen → Datenschutz und Sicherheit → Sitzungen und beenden die OsmAnd Telegram-Sitzung.</string>
 	<string name="disconnect_from_telegram">So deaktivieren Sie OsmAnd Standortfreigabe von Telegram aus</string>
 	<string name="logout_help_desc">So deaktivieren Sie OsmAnd Standortfreigabe von Telegram aus</string>
-	<string name="stale_location">Veralteter Standort</string>
+	<string name="stale_location">Keine Bewegung</string>
 	<string name="send_my_location_desc">Legen Sie das Mindestintervall für die Standortfreigabe fest.</string>
 	<string name="sharing_time">Freigabezeit</string>
-	<string name="expire_at">Verfällt um</string>
-	<string name="stop_sharing_all">Freigabe ist aktiviert (deaktivieren)</string>
+	<string name="expire_at">Verfällt</string>
 	<string name="turn_off_location_sharing">Standortfreigabe ausschalten</string>
 	<string name="shared_string_bot">Bot</string>
 	<string name="set_visible_time_for_all">Für alle sichtbare Zeit einstellen</string>
 	<string name="set_time_description">Zeit einstellen, zu der Ihren Kontakten und Gruppen Ihr Standorts in Echtzeit angezeigt wird.</string>
-	<string name="location_sharing_description">Kontakte und Gruppen wählen, für die Sie Ihren Standort freigeben möchten.</string>
-	<string name="start_location_sharing">Standortfreigabe starten</string>
-	<string name="location_service_no_gps_available">Wählen Sie einen der Standortprovider aus, um Ihren Standort freizugeben.</string>
+	<string name="location_sharing_description">Kontakte und Gruppen wählen, denen Sie Ihren Standort freigeben möchten.</string>
+	<string name="start_location_sharing">Standort freigeben</string>
+	<string name="location_service_no_gps_available">Wählen Sie einen der Standortanbieter aus, um Ihren Standort freizugeben.</string>
 	<string name="sharing_location">Standort teilen</string>
 	<string name="welcome_descr"><b>OsmAnd Standortfreigabe</b> ermöglicht es Ihnen, Ihren Standort zu teilen und den anderer in OsmAnd zu sehen.<br/><br/>Die App verwendet die API von Telegram und Sie benötigen ein Telegram-Konto.</string>
-	</resources>
+	<string name="enter_another_device_name">Wählen Sie einen Namen, den Sie noch nicht benutzt haben</string>
+	<string name="device_added_successfully">%1$s hinzugefügt.</string>
+	<string name="shared_string_add">Hinzufügen</string>
+	<string name="error_adding_new_device">Neues Gerät konnte nicht hinzugefügt werden</string>
+	<string name="enter_device_name_description">Benennen Sie Ihr neues Gerät mit max. 200 Symbolen.</string>
+	<string name="device_name_is_too_long">Gerätename ist zu lang</string>
+	<string name="device_name_cannot_be_empty">Der Gerätename darf nicht leer sein</string>
+	<string name="device_name">Gerätename</string>
+	<string name="shared_string_hide">Verbergen</string>
+	<string name="share_location_as_description_second_line">Sie können die Geräte-ID im Telegram-Client mit dem Chat-Bot %1$s erstellen und anzeigen. %2$s</string>
+	<string name="share_location_as_description">Wenn Sie mehrere Geräte mit einem Telegram-Konto verbinden möchten, müssen Sie ein anderes Gerät verwenden, um Ihren Standort zu teilen.</string>
+	<string name="shared_string_save">Speichern</string>
+	<string name="stop_sharing_all">Die Freigabe ist eingeschaltet (ausschalten)</string>
+	<string name="initialization">Startet</string>
+	<string name="logging_out">Abmeldevorgang</string>
+	<string name="closing">Schliesst</string>
+	<string name="gps_network_not_enabled">\"Standort\" einschalten\?</string>
+	<string name="live_now">Jetzt live</string>
+
+
+<string name="last_update_from_telegram">Letztes Update von Telegram</string>
+    <string name="send_location_as">Senden Standort als</string>
+    <string name="send_location_as_descr">Wählen Sie, wie Nachrichten mit Ihrem Standort aussehen sollen.</string>
+    <string name="shared_string_map">Karte</string>
+    <string name="shared_string_text">Text</string>
+    <string name="map_and_text">Karte und Text</string>
+    <string name="monitoring_is_enabled">Überwachung aktiviert</string>
+    <string name="monitoring_is_disabled">Überwachung deaktiviert</string>
+    <string name="time_on_the_move">Zeit in Bewegung</string>
+    <string name="average_altitude">Durchschnittliche Höhe</string>
+    <string name="average_speed">Durchschnittliche Geschwindigkeit</string>
+    <string name="open_in_osmand">In OsmAnd öffnen</string>
+    <string name="end_date">Endzeit</string>
+    <string name="start_date">Startzeit</string>
+    <string name="timeline_description">Überwachung aktivieren, um Bewegungsdaten im Hintergrund zu erfassen.</string>
+    <string name="timeline">Zeitachse</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-es-rUS/strings.xml b/OsmAnd-telegram/res/values-es-rUS/strings.xml
index d3937cbc72..3c6782d1c2 100644
--- a/OsmAnd-telegram/res/values-es-rUS/strings.xml
+++ b/OsmAnd-telegram/res/values-es-rUS/strings.xml
@@ -1,34 +1,26 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="background_work_description">Cambiar los ajustes de optimización de la batería, para compartir una ubicación estable</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="background_work_description">Cambiar los ajustes de optimización de la batería para estabilizar la ubicación compartida.</string>
 	<string name="background_work">Funcionamiento en segundo plano</string>
-	<string name="battery_optimization_description">Para un uso compartido estable de su posición en segundo plano, es aconsejable desactivar la optimización de la batería para OsmAnd Telegram.
-\n
-\nSi la optimización está activada, el sistema puede desactivar automáticamente la aplicación que se está ejecutando en segundo plano (con la pantalla bloqueada y/o la aplicación minimizada). Esto sucede sin notificación y hace que la transmisión de la posición geográfica se detenga.</string>
+	<string name="battery_optimization_description">Desactivar la optimización de la batería para OsmAnd Telegram de modo que no se desconecte repentinamente cuando esté en segundo plano.</string>
 	<string name="sharing_in_background">Compartir en segundo plano</string>
 	<string name="go_to_settings">Ir a los ajustes</string>
 	<string name="shared_string_later">Luego</string>
 	<string name="not_sent_yet">No enviado aún</string>
 	<string name="not_found_yet">Aún no encontrada</string>
 	<string name="re_send_location">Reenviar ubicación</string>
-	<string name="last_sent_location">Última ubicación enviada</string>
 	<string name="last_available_location">Última ubicación disponible</string>
 	<string name="sharing_status">Estado de compartición</string>
 	<string name="sharing_enabled">Compartir: Activado</string>
 	<string name="shared_string_status">Estado</string>
 	<string name="no_gps_connection">Sin conexión GPS</string>
-	<string name="sharing_success">Enviado y actualizado con éxito</string>
-	<string name="not_possible_to_send_to_chats">Imposible enviar a los chats:</string>
 	<string name="no_internet_connection">Sin conexión a Internet</string>
 	<string name="shared_string_disable">Desactivar</string>
 	<string name="shared_string_save">Guardar</string>
-	<string name="add_device_descr">Ingrese su ID de dispositivo que puede encontrar en https://live.osmand.net/device/ID</string>
-	<string name="device_id">Id. del dispositivo</string>
 	<string name="add_device">Añadir dispositivo</string>
-	<string name="share_location_as_descr">Permite compartir la ubicación de este dispositivo o la ubicación del dispositivo personalizado añadido a través de dispositivos API.</string>
 	<string name="share_location_as">Compartir ubicación como</string>
-	<string name="live_now_description">Contactos y grupos que comparten su ubicación con usted.</string>
-	<string name="logout_from_osmand_telegram_descr">Si cierra sesión en OsmAnd Telegram, no podrá enviar su posición ni ver la ubicación de sus contactos en el mapa de OsmAnd.</string>
-	<string name="logout_from_osmand_telegram">¿Cerrar sesión en OsmAnd Telegram\?</string>
+	<string name="live_now_description">Contactos y grupos que comparten la ubicación contigo.</string>
+	<string name="logout_from_osmand_telegram_descr">¿Cerrar sesión en OsmAnd Telegram\? No podrá compartir la ubicación o ver la ubicación de otros</string>
+	<string name="logout_from_osmand_telegram">¿Cerrar sesión de OsmAnd Telegram\?</string>
 	<string name="shared_string_name">Nombre</string>
 	<string name="by_distance">Por distancia</string>
 	<string name="by_name">Por nombre</string>
@@ -37,44 +29,43 @@
 	<string name="shared_string_sort_by">Ordenar por</string>
 	<string name="choose_osmand_desc">Seleccione la versión de OsmAnd donde los contactos se mostrarán en el mapa.</string>
 	<string name="choose_osmand">Seleccione la versión de OsmAnd para usar</string>
-	<string name="disable_all_sharing_desc">Dejará de compartir la ubicación con todos los chats seleccionados (%1$d).</string>
+	<string name="disable_all_sharing_desc">Desactivar la ubicación compartida en todos los chats seleccionados (%1$d).</string>
 	<string name="disable_all_sharing">Desactivar el uso compartido</string>
 	<string name="turn_off_all">Apagar todos</string>
 	<string name="shared_string_exit">Salir</string>
 	<string name="time_ago">hace</string>
 	<string name="last_response">Última respuesta</string>
 	<string name="shared_string_group">Grupo</string>
-	<string name="logout_no_internet_msg">Para desconectarse correctamente de su cuenta de Telegram, se necesita Internet.</string>
+	<string name="logout_no_internet_msg">Conéctese a Internet para cerrar sesión en Telegram correctamente.</string>
 	<string name="shared_string_close">Cerrar</string>
-	<string name="disconnect_from_telegram_desc">Para revocar el acceso a su cuenta de Telegram desde OsmAnd, abra Telegram, vaya a «Ajustes - Privacidad y Seguridad - Sesiones» y termine la sesión de Telegram de OsmAnd. Después de eso, «OsmAnd Location Sharing» ya no tendrá acceso a su cuenta y no podrá utilizar esta aplicación hasta que vuelva a iniciar sesión.</string>
-	<string name="disconnect_from_telegram">Cómo desconectar «OsmAnd Location Sharing» de la cuenta de Telegram</string>
-	<string name="logout_help_desc">Cómo desconectar «OsmAnd Location Sharing» de la cuenta de Telegram</string>
+	<string name="disconnect_from_telegram_desc">Para revocar el acceso a la ubicación compartida. Abra Telegram, vaya a «Ajustes → Privacidad y Seguridad → Sesiones» y cierre sesión de OsmAnd Telegram.</string>
+	<string name="disconnect_from_telegram">Cómo desactivar la «Ubicación Compartida de OsmAnd» desde Telegram</string>
+	<string name="logout_help_desc">Cómo desactivar la «Ubicación Compartida de OsmAnd» desde Telegram</string>
 	<string name="connected_account">Cuenta conectada</string>
 	<string name="shared_string_account">Cuenta</string>
 	<string name="in_time">en %1$s</string>
-	<string name="osmand_connect_desc">Elija la versión de OsmAnd a la que se referirá «OsmAnd Telegram» para mostrar la ubicación en el mapa.</string>
+	<string name="osmand_connect_desc">Elija la versión de OsmAnd el cual «OsmAnd Telegram» utilizará para mostrar las ubicaciones.</string>
 	<string name="osmand_connect">Conectar OsmAnd</string>
-	<string name="location_history_desc">Ocultar los contactos que no hayan actualizado su ubicación después del período de tiempo especificado.</string>
+	<string name="location_history_desc">Ocultar los contactos que no se han movido en un tiempo determinado.</string>
 	<string name="location_history">Historial de ubicación</string>
-	<string name="stale_location_desc">La última vez que un contacto envió una actualización a su ubicación.</string>
-	<string name="stale_location">Ubicación obsoleta</string>
+	<string name="stale_location_desc">La última vez que un contacto se movió.</string>
+	<string name="stale_location">Sin movimiento</string>
 	<string name="send_my_location_desc">Fijar el intervalo mínimo para compartir la ubicación.</string>
 	<string name="send_my_location">Enviar mi ubicación</string>
-	<string name="gps_and_location">GPS y ubicación</string>
+	<string name="gps_and_location">Ubicación</string>
 	<string name="sharing_time">Tiempo compartido</string>
 	<string name="expire_at">Expira en</string>
-	<string name="stop_sharing_all">El uso compartido está activado (desactivar)</string>
-	<string name="turn_off_location_sharing">Desactivar el uso compartido de ubicaciones</string>
+	<string name="turn_off_location_sharing">Desactivar la ubicación compartida</string>
 	<string name="open_osmand">Abrir OsmAnd</string>
 	<string name="shared_string_live">En vivo</string>
 	<string name="shared_string_bot">Bot</string>
 	<string name="get_telegram_title">Registro en Telegram</string>
-	<string name="get_telegram_account_first">Necesita una cuenta en Telegram para utilizar las capacidades de «OsmAnd Location Sharing».</string>
-	<string name="get_telegram_description_continue">Si desea continuar, instale Telegram de Google Play y registre su cuenta.</string>
-	<string name="get_telegram_after_creating_account">Después de crear una cuenta, puede utilizar esta aplicación.</string>
+	<string name="get_telegram_account_first">Necesita una cuenta en Telegram para utilizar la ubicación compartida.</string>
+	<string name="get_telegram_description_continue">Instale Telegram y cree una cuenta.</string>
+	<string name="get_telegram_after_creating_account">Después podrá utilizar esta aplicación.</string>
 	<string name="shared_string_all">Todos</string>
 	<string name="shared_string_off">No</string>
-	<string name="already_registered_in_telegram">Necesita una cuenta ya registrada y un número de teléfono en Telegram</string>
+	<string name="already_registered_in_telegram">Necesita una cuenta registrada en Telegram y un número de teléfono</string>
 	<string name="do_not_have_telegram">No tengo cuenta de Telegram</string>
 	<string name="enter_phone_number">Ingrese el número de teléfono</string>
 	<string name="enter_authentication_code">Ingrese el código de autenticación</string>
@@ -89,8 +80,8 @@
 	<string name="set_time_description">Ajustar la hora en que los contactos y grupos marcados verán la ubicación en tiempo real.</string>
 	<string name="set_time">Fijar la hora</string>
 	<string name="location_sharing_description">Marque los contactos y grupos con los que desea compartir su ubicación.</string>
-	<string name="my_location_search_hint">Buscar: grupo o contacto</string>
-	<string name="start_location_sharing">Iniciar el uso compartido de ubicaciones</string>
+	<string name="my_location_search_hint">Buscar: Grupo o contacto</string>
+	<string name="start_location_sharing">Compartir ubicación</string>
 	<string name="show_on_map">Mostrar en el mapa</string>
 	<string name="app_name">OsmAnd Telegram</string>
 	<string name="phone_number_title">Número de teléfono</string>
@@ -98,40 +89,32 @@
 	<string name="shared_string_password">Contraseña</string>
 	<string name="enter_code">Ingresar código</string>
 	<string name="authentication_code">Código de autenticación</string>
-	<string name="authentication_code_descr">Se ha enviado un código a Telegram. Será utilizado por OsmAnd para acceder a su cuenta.</string>
+	<string name="authentication_code_descr">Telegram ha enviado un código para que OsmAnd inicie sesión en su cuenta.</string>
 	<string name="enter_password">Ingresar contraseña</string>
-	<string name="password_descr">Por favor, ingrese la contraseña de su cuenta de Telegram para finalizar la autorización</string>
+	<string name="password_descr">Contraseña de Telegram</string>
 	<string name="shared_string_login">Iniciar sesión</string>
 	<string name="shared_string_logout">Cerrar sesión</string>
 	<string name="not_logged_in">No ha iniciado sesión</string>
-	<string name="initialization">Inicialización</string>
-	<string name="logging_out">Cerrar sesión</string>
-	<string name="closing">Cerrando</string>
 	<string name="shared_string_continue">Continuar</string>
 	<string name="shared_string_cancel">Cancelar</string>
-	<string name="gps_network_not_enabled">Servicio de ubicación desactivado. ¿Quieres activarlo\?</string>
+	<string name="gps_network_not_enabled">¿Activar «Ubicación»\?</string>
 	<string name="shared_string_settings">Ajustes</string>
-	<string name="no_location_permission">La aplicación no tiene permiso de acceso a los datos de ubicación.</string>
-	<string name="gps_not_available">Activa el GPS en ajustes</string>
-	<string name="location_service_no_gps_available">El servicio de ubicación compartida requiere que se active un proveedor de ubicación.</string>
+	<string name="no_location_permission">La aplicación no tiene permiso para acceder a los datos de ubicación.</string>
+	<string name="gps_not_available">Activar «Ubicación» en los ajustes del sistema</string>
+	<string name="location_service_no_gps_available">Elija uno de los proveedores de ubicación para compartir su ubicación.</string>
 	<string name="osmand_service">Modo reposo</string>
 	<string name="osmand_service_descr">OsmAnd Telegram se ejecuta en modo reposo con la pantalla apagada.</string>
 	<string name="shared_string_distance">Distancia</string>
 	<string name="share_location">Compartir ubicación</string>
 	<string name="sharing_location">Compartir ubicación</string>
-	<string name="shared_string_paused">Pausado</string>
-	<string name="shared_string_no_data">Sin datos</string>
-	<string name="shared_string_pause">Pausar</string>
-	<string name="shared_string_start">Iniciar</string>
-	<string name="shared_string_stop">Parar</string>
 	<string name="process_service">Servicio de OsmAnd Telegram</string>
 	<string name="osmand_logo">Logotipo de OsmAnd</string>
-	<string name="install_osmand_dialog_message">Necesita instalar primero una versión gratuita o de pago de OsmAnd</string>
+	<string name="install_osmand_dialog_message">Necesita instalar primero la versión gratuita o de pago de OsmAnd</string>
 	<string name="install_osmand">Instalar OsmAnd</string>
 	<string name="show_users_on_map">Mostrar usuarios en el mapa</string>
 	<string name="active_chats">Chats activos</string>
 	<string name="shared_string_authorization">Autorización</string>
-	<string name="shared_string_authorization_descr">Por favor, introduzca el número de teléfono de su cuenta de Telegram en el formato internacional</string>
+	<string name="shared_string_authorization_descr">Ingrese el número de teléfono de Telegram en el formato internacional</string>
 	<string name="shared_string_welcome">Bienvenido</string>
 
 	<string name="yard">yd</string>
@@ -160,10 +143,54 @@
 	<string name="shared_string_hour_short">h</string>
 	<string name="shared_string_minute_short">min</string>
 	<string name="shared_string_second_short">seg</string>
-	<string name="plus">+</string>
-	<string name="welcome_descr"><b>OsmAnd Location Sharing</b> permite compartir su ubicación y ver las ubicaciones de otras personas en OsmAnd.<br/><br/>La aplicación funciona sobre la base de Telegram API. Para utilizar esta aplicación debe tener una cuenta de Telegram.</string>
+	<string name="welcome_descr">La <b>Ubicación Compartida de OsmAnd</b> (en inglés, «OsmAnd Location Sharing») permite compartir su ubicación y ver las ubicaciones de otras personas en OsmAnd.<br/><br/>La aplicación funciona sobre la base de Telegram API. Para utilizar esta aplicación debe tener una cuenta de Telegram.</string>
 	<string name="my_location">Mi ubicación</string>
 	<string name="live_now">En vivo ahora</string>
 
 
-</resources>
+<string name="enter_another_device_name">Elige un nombre que no se haya usado</string>
+	<string name="device_added_successfully">%1$s añadido(s).</string>
+	<string name="shared_string_add">Añadir</string>
+	<string name="error_adding_new_device">No se pudo añadir el dispositivo</string>
+	<string name="enter_device_name_description">El nombre del dispositivo nuevo (máx. 200 símbolos).</string>
+	<string name="device_name_is_too_long">Nombre del dispositivo demasiado largo</string>
+	<string name="device_name_cannot_be_empty">El nombre del dispositivo no debe estar vacío</string>
+	<string name="device_name">Nombre del dispositivo</string>
+	<string name="shared_string_hide">Ocultar</string>
+	<string name="share_location_as_description_second_line">Puede crear y ver el ID de dispositivo en el cliente de Telegram usando el chat bot %1$s. %2$s</string>
+	<string name="share_location_as_description">Si desea conectar varios dispositivos a una cuenta de Telegram, debe utilizar un dispositivo diferente para compartir su ubicación.</string>
+	<string name="last_updated_location">Última ubicación actualizada:</string>
+	<string name="successfully_sent_and_updated">Enviado y actualizado con éxito</string>
+	<string name="not_possible_to_send_to_telegram_chats">Imposible enviar a los chats de Telegram:</string>
+	<string name="waiting_for_response_from_telegram">Esperando la respuesta de Telegram</string>
+	<string name="sending_location_messages">Ubicación de envío</string>
+	<string name="initializing">Iniciando</string>
+	<string name="searching_for_gps">Ubicando…</string>
+	<string name="connecting_to_the_internet">Conexión a Internet</string>
+	<string name="last_update_from_telegram">Última actualización de Telegram</string>
+	<string name="stop_sharing_all">Compartir está activado (desactivar)</string>
+	<string name="initialization">Iniciando</string>
+	<string name="logging_out">Cerrar sesión</string>
+	<string name="closing">Cerrando</string>
+    <string name="send_location_as">Enviar ubicación como</string>
+    <string name="send_location_as_descr">Elige cómo se verán los mensajes con tu ubicación.</string>
+    <string name="shared_string_map">Mapa</string>
+    <string name="shared_string_text">Texto</string>
+    <string name="map_and_text">Mapa y texto</string>
+    <string name="monitoring_is_enabled">Monitorización activada</string>
+    <string name="monitoring_is_disabled">Monitorización desactivada</string>
+    <string name="time_on_the_move">tiempo en movimiento</string>
+    <string name="average_altitude">Altitud media</string>
+    <string name="average_speed">Velocidad media</string>
+    <string name="open_in_osmand">Abrir en OsmAnd</string>
+    <string name="end_date">Fecha de finalización</string>
+    <string name="start_date">Fecha de inicio</string>
+    <string name="timeline_description">Activar la monitorización para recopilar datos de movimiento en segundo plano.</string>
+    <string name="timeline">Línea de tiempo</string>
+    <string name="gps_points_in_buffer">enviado (%1$d en búfer)</string>
+    <string name="points_size">%1$d puntos</string>
+    <string name="shared_string_date">Fecha</string>
+    <string name="shared_string_collected">Recolectados</string>
+    <string name="gps_points">Puntos de GPS</string>
+    <string name="shared_string_sent">Enviado</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-es/strings.xml b/OsmAnd-telegram/res/values-es/strings.xml
index efa62e32db..ec447a77ab 100644
--- a/OsmAnd-telegram/res/values-es/strings.xml
+++ b/OsmAnd-telegram/res/values-es/strings.xml
@@ -1,34 +1,25 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="background_work_description">Cambiar los ajustes de optimización de la batería, para compartir una ubicación estable</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="background_work_description">Cambiar los ajustes de optimización de la batería para estabilizar la ubicación compartida.</string>
 	<string name="background_work">Funcionamiento en segundo plano</string>
-	<string name="battery_optimization_description">Para un uso compartido estable de su posición en segundo plano, es aconsejable desactivar la optimización de la batería para OsmAnd Telegram.
-\n
-\nSi la optimización está activada, el sistema puede desactivar automáticamente la aplicación que se está ejecutando en segundo plano (con la pantalla bloqueada y/o la aplicación minimizada). Esto sucede sin notificación y hace que la transmisión de la posición geográfica se detenga.</string>
+	<string name="battery_optimization_description">Desactivar la optimización de la batería para OsmAnd Telegram de modo que no se desconecte repentinamente cuando esté en segundo plano.</string>
 	<string name="sharing_in_background">Compartir en segundo plano</string>
 	<string name="go_to_settings">Ir a los ajustes</string>
 	<string name="shared_string_later">Luego</string>
 	<string name="not_sent_yet">No enviado aún</string>
 	<string name="not_found_yet">Aún no encontrada</string>
 	<string name="re_send_location">Reenviar ubicación</string>
-	<string name="last_sent_location">Última ubicación enviada</string>
 	<string name="last_available_location">Última ubicación disponible</string>
 	<string name="sharing_status">Estado de compartición</string>
 	<string name="sharing_enabled">Compartir: Activado</string>
 	<string name="shared_string_status">Estado</string>
 	<string name="no_gps_connection">Sin conexión GPS</string>
-	<string name="sharing_success">Enviado y actualizado con éxito</string>
-	<string name="not_possible_to_send_to_chats">Imposible enviar a los chats:</string>
 	<string name="no_internet_connection">Sin conexión a Internet</string>
 	<string name="shared_string_disable">Desactivar</string>
-	<string name="shared_string_save">Guardar</string>
-	<string name="add_device_descr">Ingrese su ID de dispositivo que puede encontrar en https://live.osmand.net/device/ID</string>
-	<string name="device_id">Id. del dispositivo</string>
 	<string name="add_device">Añadir dispositivo</string>
-	<string name="share_location_as_descr">Permite compartir la ubicación de este dispositivo o la ubicación del dispositivo personalizado añadido a través de dispositivos API.</string>
 	<string name="share_location_as">Compartir ubicación como</string>
-	<string name="live_now_description">Contactos y grupos que comparten su ubicación con usted.</string>
-	<string name="logout_from_osmand_telegram_descr">Si cierra sesión en OsmAnd Telegram, no podrá enviar su posición ni ver la ubicación de sus contactos en el mapa de OsmAnd.</string>
-	<string name="logout_from_osmand_telegram">¿Cerrar sesión en OsmAnd Telegram\?</string>
+	<string name="live_now_description">Contactos y grupos que comparten la ubicación contigo.</string>
+	<string name="logout_from_osmand_telegram_descr">¿Cerrar sesión en OsmAnd Telegram\? No podrá compartir la ubicación o ver la ubicación de otros</string>
+	<string name="logout_from_osmand_telegram">¿Cerrar sesión de OsmAnd Telegram\?</string>
 	<string name="shared_string_name">Nombre</string>
 	<string name="by_distance">Por distancia</string>
 	<string name="by_name">Por nombre</string>
@@ -37,44 +28,43 @@
 	<string name="shared_string_sort_by">Ordenar por</string>
 	<string name="choose_osmand_desc">Seleccione la versión de OsmAnd donde los contactos se mostrarán en el mapa.</string>
 	<string name="choose_osmand">Seleccione la versión de OsmAnd para usar</string>
-	<string name="disable_all_sharing_desc">Dejará de compartir la ubicación con todos los chats seleccionados (%1$d).</string>
+	<string name="disable_all_sharing_desc">Desactivar la ubicación compartida en todos los chats seleccionados (%1$d).</string>
 	<string name="disable_all_sharing">Desactivar el uso compartido</string>
 	<string name="turn_off_all">Apagar todos</string>
 	<string name="shared_string_exit">Salir</string>
 	<string name="time_ago">hace</string>
 	<string name="last_response">Última respuesta</string>
 	<string name="shared_string_group">Grupo</string>
-	<string name="logout_no_internet_msg">Para desconectarse correctamente de su cuenta de Telegram, se necesita Internet.</string>
+	<string name="logout_no_internet_msg">Conéctese a Internet para cerrar sesión en Telegram correctamente.</string>
 	<string name="shared_string_close">Cerrar</string>
-	<string name="disconnect_from_telegram_desc">Para revocar el acceso a su cuenta de Telegram desde OsmAnd, abra Telegram, vaya a «Ajustes - Privacidad y Seguridad - Sesiones» y termine la sesión de Telegram de OsmAnd. Después de eso, «OsmAnd Location Sharing» ya no tendrá acceso a su cuenta y no podrá utilizar esta aplicación hasta que vuelva a iniciar sesión.</string>
-	<string name="disconnect_from_telegram">Cómo desconectar «OsmAnd Location Sharing» de la cuenta de Telegram</string>
-	<string name="logout_help_desc">Cómo desconectar «OsmAnd Location Sharing» de la cuenta de Telegram</string>
+	<string name="disconnect_from_telegram_desc">Para revocar el acceso a la ubicación compartida. Abra Telegram, vaya a «Ajustes → Privacidad y Seguridad → Sesiones» y cierre sesión de OsmAnd Telegram.</string>
+	<string name="disconnect_from_telegram">Cómo desactivar la «Ubicación Compartida de OsmAnd» desde Telegram</string>
+	<string name="logout_help_desc">Cómo desactivar la «Ubicación Compartida de OsmAnd» desde Telegram</string>
 	<string name="connected_account">Cuenta conectada</string>
 	<string name="shared_string_account">Cuenta</string>
 	<string name="in_time">en %1$s</string>
-	<string name="osmand_connect_desc">Elija la versión de OsmAnd a la que se referirá «OsmAnd Telegram» para mostrar la ubicación en el mapa.</string>
+	<string name="osmand_connect_desc">Elija la versión de OsmAnd el cual «OsmAnd Telegram» utilizará para mostrar las ubicaciones.</string>
 	<string name="osmand_connect">Conectar OsmAnd</string>
-	<string name="location_history_desc">Ocultar los contactos que no hayan actualizado su ubicación después del período de tiempo especificado.</string>
+	<string name="location_history_desc">Ocultar los contactos que no se han movido en un tiempo determinado.</string>
 	<string name="location_history">Historial de ubicación</string>
-	<string name="stale_location_desc">La última vez que un contacto envió una actualización a su ubicación.</string>
-	<string name="stale_location">Ubicación obsoleta</string>
+	<string name="stale_location_desc">La última vez que un contacto se movió.</string>
+	<string name="stale_location">Sin movimiento</string>
 	<string name="send_my_location_desc">Fijar el intervalo mínimo para compartir la ubicación.</string>
 	<string name="send_my_location">Enviar mi ubicación</string>
-	<string name="gps_and_location">GPS y ubicación</string>
+	<string name="gps_and_location">Ubicación</string>
 	<string name="sharing_time">Tiempo compartido</string>
 	<string name="expire_at">Expira en</string>
-	<string name="stop_sharing_all">El uso compartido está activado (desactivar)</string>
-	<string name="turn_off_location_sharing">Desactivar el uso compartido de ubicaciones</string>
+	<string name="turn_off_location_sharing">Desactivar la ubicación compartida</string>
 	<string name="open_osmand">Abrir OsmAnd</string>
 	<string name="shared_string_live">En vivo</string>
 	<string name="shared_string_bot">Bot</string>
 	<string name="get_telegram_title">Registro en Telegram</string>
-	<string name="get_telegram_account_first">Necesita una cuenta en Telegram para utilizar las capacidades de «OsmAnd Location Sharing».</string>
-	<string name="get_telegram_description_continue">Si desea continuar, instale Telegram de Google Play y registre su cuenta.</string>
-	<string name="get_telegram_after_creating_account">Después de crear una cuenta, puede utilizar esta aplicación.</string>
+	<string name="get_telegram_account_first">Necesita una cuenta en Telegram para utilizar la ubicación compartida.</string>
+	<string name="get_telegram_description_continue">Instale Telegram y cree una cuenta.</string>
+	<string name="get_telegram_after_creating_account">Después podrá utilizar esta aplicación.</string>
 	<string name="shared_string_all">Todos</string>
 	<string name="shared_string_off">No</string>
-	<string name="already_registered_in_telegram">Necesita una cuenta ya registrada y un número de teléfono en Telegram</string>
+	<string name="already_registered_in_telegram">Necesita una cuenta registrada en Telegram y un número de teléfono</string>
 	<string name="do_not_have_telegram">No tengo cuenta de Telegram</string>
 	<string name="enter_phone_number">Ingrese el número de teléfono</string>
 	<string name="enter_authentication_code">Ingrese el código de autenticación</string>
@@ -89,8 +79,8 @@
 	<string name="set_time_description">Ajustar la hora en que los contactos y grupos marcados verán la ubicación en tiempo real.</string>
 	<string name="set_time">Fijar la hora</string>
 	<string name="location_sharing_description">Marque los contactos y grupos con los que desea compartir su ubicación.</string>
-	<string name="my_location_search_hint">Buscar: grupo o contacto</string>
-	<string name="start_location_sharing">Iniciar el uso compartido de ubicaciones</string>
+	<string name="my_location_search_hint">Buscar: Grupo o contacto</string>
+	<string name="start_location_sharing">Compartir ubicación</string>
 	<string name="show_on_map">Mostrar en el mapa</string>
 	<string name="app_name">OsmAnd Telegram</string>
 	<string name="phone_number_title">Número de teléfono</string>
@@ -98,40 +88,31 @@
 	<string name="shared_string_password">Contraseña</string>
 	<string name="enter_code">Ingresar código</string>
 	<string name="authentication_code">Código de autenticación</string>
-	<string name="authentication_code_descr">Se ha enviado un código a Telegram. Será utilizado por OsmAnd para acceder a su cuenta.</string>
+	<string name="authentication_code_descr">Telegram ha enviado un código para que OsmAnd inicie sesión en su cuenta.</string>
 	<string name="enter_password">Ingresar contraseña</string>
-	<string name="password_descr">Por favor, ingrese la contraseña de su cuenta de Telegram para finalizar la autorización</string>
+	<string name="password_descr">Contraseña de Telegram</string>
 	<string name="shared_string_login">Iniciar sesión</string>
 	<string name="shared_string_logout">Cerrar sesión</string>
 	<string name="not_logged_in">No ha iniciado sesión</string>
-	<string name="initialization">Inicialización</string>
-	<string name="logging_out">Cerrar sesión</string>
-	<string name="closing">Cerrando</string>
 	<string name="shared_string_continue">Continuar</string>
 	<string name="shared_string_cancel">Cancelar</string>
-	<string name="gps_network_not_enabled">Servicio de ubicación desactivado. ¿Quieres activarlo\?</string>
 	<string name="shared_string_settings">Ajustes</string>
-	<string name="no_location_permission">La aplicación no tiene permiso de acceso a los datos de ubicación.</string>
-	<string name="gps_not_available">Active el GPS en los ajustes</string>
-	<string name="location_service_no_gps_available">El servicio de ubicación compartida requiere que se active un proveedor de ubicación.</string>
+	<string name="no_location_permission">La aplicación no tiene permiso para acceder a los datos de ubicación.</string>
+	<string name="gps_not_available">Activar «Ubicación» en los ajustes del sistema</string>
+	<string name="location_service_no_gps_available">Elija uno de los proveedores de ubicación para compartir su ubicación.</string>
 	<string name="osmand_service">Modo en segundo plano</string>
 	<string name="osmand_service_descr">OsmAnd Telegram se ejecuta en modo reposo con la pantalla apagada.</string>
 	<string name="shared_string_distance">Distancia</string>
 	<string name="share_location">Compartir ubicación</string>
 	<string name="sharing_location">Compartir ubicación</string>
-	<string name="shared_string_paused">Pausado</string>
-	<string name="shared_string_no_data">Sin datos</string>
-	<string name="shared_string_pause">Pausar</string>
-	<string name="shared_string_start">Iniciar</string>
-	<string name="shared_string_stop">Parar</string>
 	<string name="process_service">Servicio de OsmAnd Telegram</string>
 	<string name="osmand_logo">Logotipo de OsmAnd</string>
-	<string name="install_osmand_dialog_message">Necesita instalar primero una versión gratuita o de pago de OsmAnd</string>
+	<string name="install_osmand_dialog_message">Necesita instalar primero la versión gratuita o de pago de OsmAnd</string>
 	<string name="install_osmand">Instalar OsmAnd</string>
 	<string name="show_users_on_map">Mostrar usuarios en el mapa</string>
 	<string name="active_chats">Chats activos</string>
 	<string name="shared_string_authorization">Autorización</string>
-	<string name="shared_string_authorization_descr">Por favor, introduzca el número de teléfono de su cuenta de Telegram en el formato internacional</string>
+	<string name="shared_string_authorization_descr">Ingrese el número de teléfono de Telegram en el formato internacional</string>
 	<string name="shared_string_welcome">Bienvenido</string>
 
 	<string name="yard">yd</string>
@@ -160,10 +141,56 @@
 	<string name="shared_string_hour_short">h</string>
 	<string name="shared_string_minute_short">min</string>
 	<string name="shared_string_second_short">seg</string>
-	<string name="plus">+</string>
-	<string name="welcome_descr"><b>OsmAnd Location Sharing</b> permite compartir su ubicación y ver las ubicaciones de otras personas en OsmAnd.<br/><br/>La aplicación funciona sobre la base de Telegram API. Para utilizar esta aplicación debe tener una cuenta de Telegram.</string>
+	<string name="welcome_descr">La <b>Ubicación Compartida de OsmAnd</b> (en inglés, «OsmAnd Location Sharing») permite compartir su ubicación y ver las ubicaciones de otras personas en OsmAnd.<br/><br/>La aplicación funciona sobre la base de Telegram API. Para utilizar esta aplicación debe tener una cuenta de Telegram.</string>
 	<string name="my_location">Mi ubicación</string>
 	<string name="live_now">En vivo ahora</string>
 
 
-</resources>
+<string name="enter_another_device_name">Elige un nombre que no se haya usado</string>
+	<string name="device_added_successfully">%1$s añadido(s).</string>
+	<string name="shared_string_add">Añadir</string>
+	<string name="error_adding_new_device">No se pudo añadir el dispositivo</string>
+	<string name="enter_device_name_description">El nombre del dispositivo nuevo (máx. 200 símbolos).</string>
+	<string name="device_name_is_too_long">Nombre del dispositivo demasiado largo</string>
+	<string name="device_name_cannot_be_empty">El nombre del dispositivo no debe estar vacío</string>
+	<string name="device_name">Nombre del dispositivo</string>
+	<string name="shared_string_hide">Ocultar</string>
+	<string name="share_location_as_description_second_line">Puede crear y ver el ID de dispositivo en el cliente de Telegram usando el chat bot %1$s. %2$s</string>
+	<string name="share_location_as_description">Si desea conectar varios dispositivos a una cuenta de Telegram, debe utilizar un dispositivo diferente para compartir su ubicación.</string>
+	<string name="last_updated_location">Última ubicación actualizada:</string>
+	<string name="successfully_sent_and_updated">Enviado y actualizado con éxito</string>
+	<string name="shared_string_save">Guardar</string>
+	<string name="last_update_from_telegram">Última actualización de Telegram</string>
+	<string name="not_possible_to_send_to_telegram_chats">Imposible enviar a los chats de Telegram:</string>
+	<string name="waiting_for_response_from_telegram">Esperando la respuesta de Telegram</string>
+	<string name="sending_location_messages">Ubicación de envío</string>
+	<string name="initializing">Iniciando</string>
+	<string name="searching_for_gps">Ubicando…</string>
+	<string name="connecting_to_the_internet">Conexión a Internet</string>
+	<string name="stop_sharing_all">Compartir está activado (desactivar)</string>
+	<string name="initialization">Iniciando</string>
+	<string name="logging_out">Cerrar sesión</string>
+	<string name="closing">Cerrando</string>
+	<string name="gps_network_not_enabled">¿Activar «Ubicación»\?</string>
+    <string name="send_location_as">Enviar ubicación como</string>
+    <string name="send_location_as_descr">Elija cómo se verán los mensajes con su ubicación.</string>
+    <string name="shared_string_map">Mapa</string>
+    <string name="shared_string_text">Texto</string>
+    <string name="map_and_text">Mapa y texto</string>
+    <string name="monitoring_is_enabled">Monitorización activada</string>
+    <string name="monitoring_is_disabled">Monitorización desactivada</string>
+    <string name="time_on_the_move">tiempo en movimiento</string>
+    <string name="average_altitude">Altitud media</string>
+    <string name="average_speed">Velocidad media</string>
+    <string name="open_in_osmand">Abrir en OsmAnd</string>
+    <string name="end_date">Fecha de fin</string>
+    <string name="start_date">Fecha de inicio</string>
+    <string name="timeline_description">Activar la monitorización para recopilar datos de movimiento en segundo plano.</string>
+    <string name="timeline">Línea de tiempo</string>
+    <string name="gps_points_in_buffer">enviado (%1$d en búfer)</string>
+    <string name="points_size">%1$d puntos</string>
+    <string name="shared_string_date">Fecha</string>
+    <string name="shared_string_collected">Recolectados</string>
+    <string name="gps_points">Puntos de GPS</string>
+    <string name="shared_string_sent">Enviado</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-fa/strings.xml b/OsmAnd-telegram/res/values-fa/strings.xml
new file mode 100644
index 0000000000..302ffb89d8
--- /dev/null
+++ b/OsmAnd-telegram/res/values-fa/strings.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="last_update_from_telegram">آخرین به‌روزرسانی نسخهٔ تلگرام</string>
+	<string name="device_added_successfully">%1$s اضافه شد.</string>
+	<string name="shared_string_add">افزودن</string>
+	<string name="error_adding_new_device">نمی‌توان دستگاه جدید اضافه کرد</string>
+	<string name="enter_device_name_description">نام دستگاه جدید خود را با حداکثر ۲۰۰ نویسه بنویسید.</string>
+	<string name="device_name_is_too_long">نام دستگاه خیلی طولانی است</string>
+	<string name="device_name_cannot_be_empty">نام دستگاه نباید خالی باشد</string>
+	<string name="device_name">نام دستگاه</string>
+	<string name="share_location_as_description">اگر بخواهید چندین دستگاه را به یک حساب تلگرامی متصل کنید، باید موقعیت خود را با دستگاه دیگری به‌اشتراک بگذارید.</string>
+	<string name="successfully_sent_and_updated">با موفقیت ارسال و به‌روز شد</string>
+	<string name="waiting_for_response_from_telegram">در انتظار پاسخ از تلگرام</string>
+	<string name="searching_for_gps">در حال موقعیت‌یابی…</string>
+	<string name="battery_optimization_description">بهینه‌سازی باتری را برای OsmAnd Telegram غیرفعال کنید تا هنگامی که در پس‌زمینه کار می‌کند ناگهان بسته نشود.</string>
+	<string name="go_to_settings">برو به تنظیمات</string>
+	<string name="shared_string_later">بعداً</string>
+	<string name="not_sent_yet">هنوز ارسال نشده</string>
+	<string name="not_found_yet">هنوز پیدا نشده</string>
+	<string name="re_send_location">بازفرستی موقعیت</string>
+	<string name="sharing_enabled">اشتراک‌گذاری: فعال</string>
+	<string name="shared_string_status">وضعیت</string>
+	<string name="shared_string_close">بستن</string>
+	</resources>
diff --git a/OsmAnd-telegram/res/values-gl/strings.xml b/OsmAnd-telegram/res/values-gl/strings.xml
index cecc5d9028..4abcdc0a85 100644
--- a/OsmAnd-telegram/res/values-gl/strings.xml
+++ b/OsmAnd-telegram/res/values-gl/strings.xml
@@ -1,30 +1,25 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="background_work_description">Muda-los axustes de optimización da batería, para poñer a funciona-la ubicación de xeito estábel</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="background_work_description">Muda-los axustes de optimización da batería, para estabilizares a ubicación compartillada.</string>
 	<string name="background_work">Funcionamento no segundo plano</string>
-	<string name="sharing_in_background">Partillar ou compartir no segundo plano</string>
+	<string name="sharing_in_background">Compartillar no segundo plano</string>
 	<string name="go_to_settings">Ir ós axustes</string>
 	<string name="shared_string_later">Máis tarde</string>
 	<string name="not_sent_yet">Aínda non enviado</string>
 	<string name="not_found_yet">Aínda non atopado</string>
 	<string name="re_send_location">Voltar a enviar ubicación</string>
-	<string name="last_sent_location">Derradeira ubicación enviada</string>
-	<string name="last_available_location">Derradeira ubicación dispoñíbel</string>
-	<string name="sharing_status">Estado de emprego partillado ou compartido</string>
-	<string name="sharing_enabled">Partillar ou compartir: Activado</string>
+	<string name="last_available_location">Última ubicación dispoñíbel</string>
+	<string name="sharing_status">Estado do compartillamento</string>
+	<string name="sharing_enabled">Compartillar: Activado</string>
 	<string name="shared_string_status">Estado</string>
 	<string name="no_gps_connection">Sen unha conexión GPS</string>
-	<string name="sharing_success">Enviado e actualizado de xeito correcto</string>
-	<string name="not_possible_to_send_to_chats">Non é posíbel enviar ás parolas:</string>
-	<string name="no_internet_connection">Sen conexión á Internet</string>
+	<string name="no_internet_connection">Sen unha conexión á Internet</string>
 	<string name="shared_string_disable">Desactivar</string>
 	<string name="shared_string_save">Gardar</string>
-	<string name="add_device_descr">Insira o seu ID do dispositivo que pode atopar en https://live.osmand.net/device/ID</string>
-	<string name="device_id">Identificador do dispositivo</string>
 	<string name="add_device">Engadir dispositivo</string>
-	<string name="share_location_as">Partillar ou compartir ubicación coma</string>
-	<string name="live_now_description">Contactos e grupos que partillan ou comparten a súa ubicación con vostede.</string>
-	<string name="logout_from_osmand_telegram_descr">Se pecha a sesión no Telegram do OsmAnd, non poderá envia-la súa ubicación nin olla-las localizacións dos seus contactos no mapa do OsmAnd.</string>
-	<string name="logout_from_osmand_telegram">Pechar sesión do Telegram do OsmAnd\?</string>
+	<string name="share_location_as">Compartillar ubicación coma</string>
+	<string name="live_now_description">Contactos e grupos que están a compartilla-la súa ubicación para vostede.</string>
+	<string name="logout_from_osmand_telegram_descr">Está na certeza de que desexa desconectarse do Telegram OsmAnd para non poder compartilla-la ubicación ou olla-la ubicación doutros\?</string>
+	<string name="logout_from_osmand_telegram">Pecha-la sesión do Telegram OsmAnd\?</string>
 	<string name="shared_string_name">Nome</string>
 	<string name="by_distance">Pola distancia</string>
 	<string name="by_name">Polo nome</string>
@@ -33,32 +28,163 @@
 	<string name="shared_string_sort_by">Ordenar polo</string>
 	<string name="choose_osmand_desc">Escolle a versión do OsmAnd onde os contactos amosaranse no mapa.</string>
 	<string name="choose_osmand">Escolle a versión do OsmAnd para empregar</string>
-	<string name="disable_all_sharing_desc">Deixarás de partillar ou comparti-la ubicación con tódalas parolas elixidas (%1$d).</string>
-	<string name="disable_all_sharing">Desactiva-lo emprego partillado ou compartido</string>
+	<string name="disable_all_sharing_desc">Desactiva a ubicación compartillada en tódalas conversas elixidas (%1$d).</string>
+	<string name="disable_all_sharing">Desactiva-lo emprego compartillado</string>
 	<string name="turn_off_all">Desactivar todos</string>
 	<string name="shared_string_exit">Saír</string>
 	<string name="time_ago">hai</string>
-	<string name="last_response">Derradeira resposta</string>
+	<string name="last_response">Última resposta</string>
 	<string name="shared_string_group">Grupo</string>
 	<string name="shared_string_close">Pechar</string>
 	<string name="connected_account">Conta conectada</string>
 	<string name="shared_string_account">Conta</string>
 	<string name="in_time">en %1$s</string>
-	<string name="location_history">Historial da localización</string>
+	<string name="location_history">Historial da ubicación</string>
 	<string name="send_my_location">Envia-la miña localización</string>
-	<string name="gps_and_location">GPS e localización</string>
+	<string name="gps_and_location">Ubicación</string>
 	<string name="open_osmand">Abri-lo OsmAnd</string>
 	<string name="shared_string_live">Ao vivo</string>
 	<string name="get_telegram_title">Rexistro no Telegram</string>
 	<string name="shared_string_all">Todo</string>
-	<string name="shared_string_off">Desactivado</string>
-	<string name="do_not_have_telegram">Non tes unha conta do Telegram</string>
-	<string name="enter_phone_number">Insire o número de teléfono móbil</string>
-	<string name="enter_authentication_code">Insire o código de autenticación</string>
+	<string name="shared_string_off">Non</string>
+	<string name="do_not_have_telegram">Non teño unha conta do Telegram</string>
+	<string name="enter_phone_number">Insira o número do teléfono móbil</string>
+	<string name="enter_authentication_code">Insira o código da autentificación</string>
 	<string name="hours_and_minutes_format">%1$d h %2$d min</string>
 	<string name="minutes_format">%1$d min</string>
 	<string name="hours_format">%1$d h</string>
 	<string name="shared_string_install">Instalar</string>
-	<string name="shared_string_share">Partillar ou compartir</string>
+	<string name="shared_string_share">Compartillar</string>
 	<string name="shared_string_back">Voltar</string>
-	</resources>
+	<string name="shared_string_add">Engadir</string>
+	<string name="enter_another_device_name">Escolle un nome que aínda non está a ser empregado</string>
+	<string name="device_added_successfully">%1$s engadido.</string>
+	<string name="shared_string_cancel">Desbotar</string>
+	<string name="nm">nmi</string>
+	<string name="si_kmh">Quilómetros por hora</string>
+	<string name="si_mph">Millas por hora</string>
+	<string name="si_m_s">Metros por segundo</string>
+	<string name="si_min_km">Minutos por quilómetro</string>
+	<string name="si_min_m">Minutos por milla</string>
+	<string name="si_mi_feet">Millas/pés</string>
+	<string name="si_mi_yard">Millas/iardas</string>
+	<string name="si_km_m">Quilómetros/metros</string>
+	<string name="si_nm">Millas náuticas</string>
+	<string name="si_mi_meters">Millas/metros</string>
+	<string name="last_update_from_telegram">Última actualización do Telegram</string>
+	<string name="error_adding_new_device">Non foi posíbel engadi-lo dispositivo</string>
+	<string name="enter_device_name_description">O nome do novo dispositivo (máx. 200 símbolos).</string>
+	<string name="device_name_is_too_long">Nome do dispositivo moi longo</string>
+	<string name="device_name_cannot_be_empty">O nome do dispositivo non pode ficar baleiro</string>
+	<string name="device_name">Nome do dispositivo</string>
+	<string name="shared_string_hide">Agochar</string>
+	<string name="share_location_as_description_second_line">Pode xerar e olla-lo ID do dispositivo no cliente do Telegram empregando o chat bot %1$s. %2$s</string>
+	<string name="share_location_as_description">Se desexa conectar varios dispositivos a unha conta do Telegram, ten que empregar un dispositivo diferente para compartilla-la súa ubicación.</string>
+	<string name="last_updated_location">Última ubicación actualizada:</string>
+	<string name="successfully_sent_and_updated">Enviado e actualizado de xeito correcto</string>
+	<string name="not_possible_to_send_to_telegram_chats">Non é posíbel enviar ás converas do Telegram:</string>
+	<string name="waiting_for_response_from_telegram">Estase a agarda-la resposta do Telegram</string>
+	<string name="sending_location_messages">Ubicación do envío</string>
+	<string name="initializing">Estase a iniciar</string>
+	<string name="searching_for_gps">Estase a posicionar…</string>
+	<string name="connecting_to_the_internet">Estase a conectar á Internet</string>
+	<string name="battery_optimization_description">Desactiva-la optimización da batería para o OsmAnd Telegram de xeito que non se desconecte de xeito súbito cando esté no segundo plano.</string>
+	<string name="logout_no_internet_msg">Conéctese á Internet para pecha-la sesión no Telegram de xeito correcto.</string>
+	<string name="disconnect_from_telegram_desc">Para revoga-lo acceso á ubicación compartillada. Abra o Telegram, vaia cara ós «Axustes → Privacidade e Seguranza → Sesións» e peche a sesión do OsmAnd Telegram.</string>
+	<string name="disconnect_from_telegram">De que xeito desactiva-la «Ubicación compartillada do OsmAnd» dende o Telegram</string>
+	<string name="logout_help_desc">De que xeito desactiva-la «Ubicación compartillada do OsmAnd» dende o Telegram</string>
+	<string name="osmand_connect_desc">Escolla a versión do OsmAnd na cal o «OsmAnd Telegram» empregará para amosa-las ubicacións.</string>
+	<string name="osmand_connect">Conecta-lo OsmAnd</string>
+	<string name="location_history_desc">Agocha-los contactos que non se moveron nun tempo determinado.</string>
+	<string name="stale_location_desc">A última vez que un contacto se moveu.</string>
+	<string name="stale_location">Sen movemento</string>
+	<string name="send_my_location_desc">Fixar intre mínimo para compartilla-la ubicación.</string>
+	<string name="sharing_time">Hora compartillada</string>
+        <string name="expire_at">Remata en</string>
+	<string name="stop_sharing_all">O compartillamento fica activado (desactivar)</string>
+	<string name="turn_off_location_sharing">Desactiva-la ubicación compartillada</string>
+	<string name="shared_string_bot">Bot</string>
+	<string name="get_telegram_account_first">Precisa dunha conta no Telegram para emprega-la ubicación compartillada.</string>
+	<string name="get_telegram_description_continue">Instale o Telegram e cree unha conta.</string>
+	<string name="get_telegram_after_creating_account">Despois poderá empregar esta aplicación.</string>
+	<string name="already_registered_in_telegram">Precisa dunha conta rexistrada no Telegram e dun número de teléfono móbil</string>
+	<string name="set_visible_time_for_all">Axusta-la hora visíbel para todos</string>
+	<string name="visible_time_for_all">Hora visíbel para todos</string>
+	<string name="set_time_description">Axusta-la hora na que os contactos e grupos marcados ollarán a ubicación en tempo real.</string>
+	<string name="set_time">Fixar hora</string>
+	<string name="location_sharing_description">Escolla os contactos e grupos cos que desexa compartilla-la súa ubicación.</string>
+	<string name="my_location_search_hint">Procurar: Grupo ou contacto</string>
+	<string name="start_location_sharing">Compartillar ubicación</string>
+	<string name="show_on_map">Amosar no mapa</string>
+	<string name="app_name">OsmAnd Telegram</string>
+	<string name="phone_number_title">Número do teléfono móbil</string>
+	<string name="phone_number_descr">Número do teléfono móbil no formato internacional</string>
+	<string name="shared_string_password">Contrasinal</string>
+	<string name="enter_code">Inserir código</string>
+	<string name="authentication_code">Código da autentificación</string>
+	<string name="authentication_code_descr">O Telegram enviou un código para que o OsmAnd inicie sesión na súa conta.</string>
+	<string name="enter_password">Inserir contrasinal</string>
+	<string name="password_descr">Contrasinal do Telegram</string>
+	<string name="shared_string_login">Inicia-la sesión</string>
+	<string name="shared_string_logout">Pecha-la sesión</string>
+	<string name="initialization">Estase a iniciar</string>
+	<string name="logging_out">Estase a pecha-la sesión</string>
+	<string name="closing">Estase a pechar</string>
+	<string name="gps_network_not_enabled">Activar «Ubicación»\?</string>
+	<string name="not_logged_in">Non iniciou a sesión</string>
+	<string name="shared_string_continue">Proseguer</string>
+	<string name="shared_string_settings">Axustes</string>
+	<string name="no_location_permission">A aplicación non ten permiso para acceder ós datos da ubicación.</string>
+	<string name="gps_not_available">Activar «Ubicación» nos axustes do sistema</string>
+	<string name="location_service_no_gps_available">Escolla un dos fornecedores da ubicación para compartilla-la súa ubicación.</string>
+	<string name="osmand_service">Modo no segundo plano</string>
+	<string name="osmand_service_descr">O OsmAnd Telegram execútase no modo en segundo plano ca pantalla apagada.</string>
+	<string name="shared_string_distance">Distancia</string>
+	<string name="share_location">Compartillar ubicación</string>
+	<string name="sharing_location">Estase a compartilla-la ubicación</string>
+	<string name="process_service">Servizo do OsmAnd Telegram</string>
+	<string name="osmand_logo">Logotipo do OsmAnd</string>
+	<string name="install_osmand_dialog_message">Precísase instalar primeiro a versión de balde ou de pagamento do OsmAnd</string>
+	<string name="install_osmand">Instala-lo OsmAnd</string>
+	<string name="show_users_on_map">Amosar usuarios no mapa</string>
+	<string name="active_chats">Conversas activas</string>
+	<string name="shared_string_authorization">Autorización</string>
+	<string name="shared_string_authorization_descr">Insira o número de teléfono móbil do Telegram no formato internacional</string>
+	<string name="shared_string_welcome">Benvido</string>
+
+	<string name="yard">id</string>
+	<string name="foot">pés</string>
+	<string name="mile">mi</string>
+	<string name="km">km</string>
+	<string name="m">m</string>
+	<string name="min_mile">min/mi</string>
+	<string name="min_km">min/km</string>
+	<string name="nm_h">nmi/h</string>
+	<string name="m_s">m/seg</string>
+	<string name="km_h">km/h</string>
+	<string name="mile_per_hour">mi/h</string>
+	<string name="si_nm_h">Millas náuticas por hora (nós)</string>
+	<string name="shared_string_hour_short">h</string>
+	<string name="shared_string_minute_short">min</string>
+	<string name="shared_string_second_short">seg</string>
+	<string name="welcome_descr">A <b>Ubicación compartillada do OsmAnd</b> (en inglés, «OsmAnd Location Sharing») permite compartilla-la súa ubicación e olla-las ubicacións de outras persoas no OsmAnd.<br/><br/>A aplicación execútase sobre a base da API do Telegram. Para empregar esta aplicación ten que ter unha conta do Telegram.</string>
+	<string name="my_location">A miña ubicación</string>
+	<string name="live_now">Ao vivo agora</string>
+
+
+<string name="send_location_as">Enviar ubicación coma</string>
+	<string name="send_location_as_descr">Escolla de que xeito se verán as mensaxes ca súa ubicación.</string>
+	<string name="shared_string_map">Mapa</string>
+	<string name="shared_string_text">Texto</string>
+	<string name="map_and_text">Mapa e texto</string>
+    <string name="monitoring_is_enabled">O monitoramento está activado</string>
+    <string name="monitoring_is_disabled">O monitoramento está desactivado</string>
+    <string name="time_on_the_move">tempo en movemento</string>
+    <string name="average_altitude">Altitude media</string>
+    <string name="average_speed">Velocidade media</string>
+    <string name="open_in_osmand">Abrir no OsmAnd</string>
+    <string name="end_date">Data de finalización</string>
+    <string name="start_date">Data de inicio</string>
+    <string name="timeline_description">Activar o monitoramento para recompilar datos de movemento no segundo plano.</string>
+    <string name="timeline">Liña do tempo</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-he/strings.xml b/OsmAnd-telegram/res/values-he/strings.xml
new file mode 100644
index 0000000000..292f6ef558
--- /dev/null
+++ b/OsmAnd-telegram/res/values-he/strings.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="last_update_from_telegram">עדכון אחרון מטלגרם</string>
+	<string name="enter_another_device_name">נא לבחור שם שלא השתמשת בו עדיין</string>
+	<string name="device_added_successfully">%1$s נוסף.</string>
+	<string name="shared_string_add">הוספה</string>
+	<string name="error_adding_new_device">לא ניתן להוסיף מכשיר חדש</string>
+	<string name="enter_device_name_description">נא לתת שם באורך של עד 200 תווים למכשיר החדש שלך.</string>
+	<string name="device_name_is_too_long">שם המכשיר ארוך מדי</string>
+	<string name="device_name_cannot_be_empty">שם המכשיר לא יכול להישאר ריק</string>
+	<string name="device_name">שם המכשיר</string>
+	<string name="shared_string_hide">הסתרה</string>
+	<string name="share_location_as_description_second_line">ניתן ליצור ולצפות במזהה ההתקן בלקוח הטלגרם הזה באמצעות רובוט ההתכתבות %1$s.‏ %2$s</string>
+	<string name="share_location_as_description">אם ברצונך לחבר מגוון מכשירים לחשבון טלגרם אחד, עליך להשתמש במכשיר אחר כדי לשתף את המיקום שלך.</string>
+	<string name="last_updated_location">המיקום האחרון שעודכן:</string>
+	<string name="successfully_sent_and_updated">נשלח ועודכן בהצלחה</string>
+	<string name="not_possible_to_send_to_telegram_chats">אין אפשרות לשלוח להתכתבויות בטלגרם:</string>
+	<string name="send_location_as">שליחת מיקום בתור</string>
+	<string name="send_location_as_descr">נא לבחור כיצד הודעות עם המיקום שלך תיראנה.</string>
+	<string name="shared_string_map">מפה</string>
+	<string name="shared_string_text">טקסט</string>
+	<string name="map_and_text">מפה וטקסט</string>
+	<string name="waiting_for_response_from_telegram">בהמתנה לתגובה מטלגרם</string>
+	<string name="sending_location_messages">המיקום נשלח</string>
+	<string name="initializing">מופעל</string>
+	<string name="searching_for_gps">מתבצע איתור המיקום…</string>
+	<string name="connecting_to_the_internet">מתבצעת התחברות לאינטרנט</string>
+	<string name="background_work_description">ניתן לשנות הגדרות מיטוב סוללה כדי לייצב את שיתוף המיקום.</string>
+	<string name="background_work">עבודת רקע</string>
+	<string name="sharing_in_background">מתבצע שיתוף ברקע</string>
+	<string name="go_to_settings">מעבר להגדרות</string>
+	<string name="shared_string_later">אחר כך</string>
+	<string name="not_sent_yet">לא נשלח עדיין</string>
+	<string name="not_found_yet">לא נמצא עדיין</string>
+	<string name="re_send_location">שליחת המיקום מחדש</string>
+	<string name="last_available_location">המיקום האחרון הזמין</string>
+	<string name="sharing_status">מצב שיתוף</string>
+	<string name="sharing_enabled">שיתוף: פעיל</string>
+	<string name="shared_string_status">מצב</string>
+	<string name="no_gps_connection">אין חיבור ל־GPS</string>
+	<string name="no_internet_connection">אין חיבור לאינטרנט</string>
+	<string name="shared_string_disable">השבתה</string>
+	<string name="shared_string_save">שמירה</string>
+	<string name="add_device">הוספת מכשיר</string>
+	<string name="share_location_as">שיתוף מיקום בתור</string>
+	<string name="live_now_description">אנשי קשר וקבוצות שמשתפים אתך מיקום.</string>
+    <string name="battery_optimization_description">כיבוי מיטוב סוללה עבור טלגרם OsmAnd כדי שהשירות לא יכבה ברקע.</string>
+    <string name="logout_from_osmand_telegram_descr">לצאת מטלגרם OsmAnd כדי לכבות את האפשרות לשתף מיקום או לצפות במיקום של אחרים\?</string>
+    <string name="logout_from_osmand_telegram">לצאת מטלגרם OsmAnd\?</string>
+    <string name="shared_string_name">שם</string>
+    <string name="by_distance">לפי מרחק</string>
+    <string name="by_name">לפי שם</string>
+    <string name="by_group">לפי קבוצה</string>
+    <string name="shared_string_sort">מיון</string>
+    <string name="shared_string_sort_by">מיון לפי</string>
+    <string name="shared_string_exit">יציאה</string>
+    <string name="last_response">תגובה אחרונה</string>
+    <string name="shared_string_group">קבוצה</string>
+    <string name="logout_no_internet_msg">יש להתחבר לאינטרנט כדי לצאת מטלגרם כראוי.</string>
+    <string name="shared_string_close">סגירה</string>
+    <string name="choose_osmand_desc">נא לבחור גרסת OsmAnd שבה אנשי קשר יופיעו על המסך.</string>
+    <string name="choose_osmand">נא לבחור גרסת OsmAnd לשימוש</string>
+    <string name="disable_all_sharing_desc">כיבוי שיתוף מיקום לכל ההתכתבויות הנבחרות (%1$d).</string>
+    <string name="disable_all_sharing">השבתת כל השיתופים</string>
+    <string name="turn_off_all">לכבות הכול</string>
+    <string name="shared_string_account">חשבון</string>
+    <string name="monitoring_is_enabled">הניטור פעיל</string>
+    <string name="monitoring_is_disabled">הניטור מושבת</string>
+    <string name="time_on_the_move">זמן בתנועה</string>
+    <string name="average_altitude">גובה ממוצע</string>
+    <string name="average_speed">מהירות ממוצעת</string>
+    <string name="open_in_osmand">פתיחה ב־OsmAnd</string>
+    <string name="end_date">מועד סיום</string>
+    <string name="start_date">מועד התחלה</string>
+    <string name="timeline_description">יש להפעיל ניטור כדי לאסוף נתוני תנועה ברקע.</string>
+    <string name="disconnect_from_telegram_desc">כדי לשלול גישה לשיתוף המיקום. יש לפתוח את טלגרם, לגשת להגדרות ← פרטיות ← הפעלות ולסגור את הפעלת הטלגרם של OsmAnd.</string>
+    <string name="disconnect_from_telegram">איך לכבות את שיתוף המיקום של OsmAnd מטלגרם</string>
+    <string name="logout_help_desc">איך לכבות את שיתוף המיקום של OsmAnd מטלגרם</string>
+    <string name="connected_account">חשבון מחובר</string>
+    <string name="in_time">בעוד %1$s</string>
+    <string name="osmand_connect_desc">נא לבחור את גרסת ה־OsmAnd בה יעשה שימוש OsmAnd טלגרם לטובת הצגת מיקומים.</string>
+    <string name="location_history_desc">להסתיר אנשי קשר שלא זזו במשך זה מסוים.</string>
+    <string name="location_history">היסטוריית מיקום</string>
+    <string name="stale_location_desc">הפעם האחרונה שאיש קשר זז.</string>
+    <string name="stale_location">אין תזוזה</string>
+    <string name="send_my_location">שליחת המיקום שלי</string>
+    <string name="gps_and_location">מיקום</string>
+    <string name="sharing_time">זמן השיתוף</string>
+    <string name="expire_at">תפוגה</string>
+    <string name="stop_sharing_all">השיתוף פעיל (כיבוי)</string>
+    <string name="turn_off_location_sharing">כיבוי שיתוף מיקום</string>
+    <string name="open_osmand">פתיחת OsmAnd</string>
+    <string name="shared_string_live">חי</string>
+    <string name="shared_string_bot">רובוט</string>
+    <string name="get_telegram_title">הרשמה בטלגרם</string>
+    <string name="get_telegram_account_first">כדי להשתמש בשיתוף מיקום צריך חשבון בטלגרם.</string>
+    <string name="get_telegram_description_continue">נא להתקין טלגרם ולהגדיר חשבון.</string>
+    <string name="get_telegram_after_creating_account">לאחר מכן תהיה לך אפשרות להשתמש ביישומון הזה.</string>
+    <string name="shared_string_all">הכול</string>
+    <string name="shared_string_off">כבוי</string>
+    <string name="already_registered_in_telegram">צריך חשבון רשום בטלגרם ומספר טלפון</string>
+    <string name="do_not_have_telegram">אין לי חשבון בטלגרם</string>
+    <string name="enter_phone_number">נא להקליד מספר טלפון</string>
+    <string name="enter_authentication_code">נא להקליד קוד אימות</string>
+    <string name="set_visible_time_for_all">הגדרת זמן חשיפה לכולם</string>
+    <string name="hours_and_minutes_format">%1$d שע׳ %2$d דק׳</string>
+    <string name="minutes_format">%1$d דק׳</string>
+    <string name="hours_format">%1$d שע׳</string>
+    <string name="shared_string_install">התקנה</string>
+    <string name="shared_string_share">שיתוף</string>
+    <string name="shared_string_back">חזרה</string>
+    <string name="visible_time_for_all">זמן חשיפה לכולם</string>
+    <string name="set_time_description">נא להגדיר את משך הזמן שבו הקבוצות ואנשי הקשר הנבחרים שלך יראו את המיקום שלך בזמן אמת.</string>
+    <string name="set_time">הגדרת זמן</string>
+    <string name="location_sharing_description">נא לבחור את אנשי הקשר והקבוצות עמם ברצונך לשתף את מיקומך.</string>
+    <string name="my_location_search_hint">חיפוש: קבוצה או איש קשר</string>
+    <string name="start_location_sharing">שיתוף מיקום</string>
+    <string name="show_on_map">הצגה במפה</string>
+    <string name="app_name">OsmAnd טלגרם</string>
+    <string name="phone_number_title">מספר טלפון</string>
+    <string name="phone_number_descr">מספר טלפון בתצורה בינלאומית</string>
+    <string name="shared_string_password">ססמה</string>
+    <string name="enter_code">נא להכניס קוד</string>
+    <string name="authentication_code">קוד אימות</string>
+    <string name="authentication_code_descr">נשלח אליך קוד מטלגרם עבור OsmAnd לטובת כניסה לחשבון שלך.</string>
+    <string name="enter_password">נא להקליד ססמה</string>
+    <string name="password_descr">ססמת טלגרם</string>
+    <string name="shared_string_login">כניסה</string>
+    <string name="shared_string_logout">יציאה</string>
+    <string name="initialization">התחלה</string>
+    <string name="logging_out">מתבצעת יציאה</string>
+    <string name="closing">מתבצעת סגירה</string>
+    <string name="gps_network_not_enabled">להפעיל „מיקום”\?</string>
+    <string name="not_logged_in">לא נכנסת</string>
+    <string name="shared_string_continue">המשך</string>
+    <string name="shared_string_cancel">ביטול</string>
+    <string name="shared_string_settings">הגדרות</string>
+    <string name="no_location_permission">ליישומון חסרה הרשאה לגישה לנתוני מיקום.</string>
+    <string name="gps_not_available">נא להפעיל את „מיקום” בהגדרות המערכת</string>
+    <string name="location_service_no_gps_available">נא לבחור את אחד מספקי המיקום כדי לשתף את המיקום שלך.</string>
+    <string name="osmand_service">מצב רקע</string>
+    <string name="osmand_service_descr">OsmAnd טלגרם פועל ברקע בזמן שהמסך כבוי.</string>
+    <string name="shared_string_distance">מרחק</string>
+    <string name="share_location">שיתוף מיקום</string>
+    <string name="sharing_location">המיקום משותף</string>
+    <string name="process_service">שירות OsmAnd טלגרם</string>
+    <string name="osmand_logo">הלוגו של OsmAnd</string>
+    <string name="install_osmand_dialog_message">עליך להתקין את הגרסה החופשית או את הגרסה בתשלום של OsmAnd תחילה</string>
+    <string name="install_osmand">התקנת OsmAnd</string>
+    <string name="show_users_on_map">הצגת משתמשים במפה</string>
+    <string name="active_chats">התכתבויות פעילות</string>
+    <string name="shared_string_authorization">אימות</string>
+    <string name="shared_string_authorization_descr">נא להקליד את מספר הטלפון שלך בטלגרם בתצורה בינלאומית</string>
+    <string name="shared_string_welcome">ברוך בואך</string>
+    <string name="yard">יארד</string>
+    <string name="foot">רגל</string>
+    <string name="mile">מייל</string>
+    <string name="km">ק״מ</string>
+    <string name="m">מ׳</string>
+    <string name="nm">מייל ימי</string>
+    <string name="min_mile">דק׳/מ׳</string>
+    <string name="min_km">דק׳/ק״מ</string>
+    <string name="nm_h">קשר</string>
+    <string name="m_s">מ/שנ׳</string>
+    <string name="km_h">קמ״ש</string>
+    <string name="mile_per_hour">מייל לשעה</string>
+    <string name="si_kmh">קילומטרים לשעה</string>
+    <string name="si_mph">מיילים לשעה</string>
+    <string name="si_m_s">מטרים לשנייה</string>
+    <string name="si_min_km">דקות לקילומטר</string>
+    <string name="si_min_m">דקות למייל</string>
+    <string name="si_nm_h">מייל ימי לשעה (קשר)</string>
+    <string name="si_mi_feet">מיילים/רגל</string>
+    <string name="si_mi_yard">מיילים/יארדים</string>
+    <string name="si_km_m">קילומטרים/מטרים</string>
+    <string name="si_nm">מיילים ימיים</string>
+    <string name="si_mi_meters">מיילים/מטרים</string>
+    <string name="shared_string_hour_short">שע</string>
+    <string name="shared_string_minute_short">דק׳</string>
+    <string name="shared_string_second_short">שנ׳</string>
+    <string name="my_location">המיקום שלי</string>
+    <string name="timeline">ציר זמן</string>
+    <string name="send_my_location_desc">הגדרת טווח הזמן המזערי לשיתוף מיקום.</string>
+    <string name="welcome_descr"><b>שיתוף המקום דרךOsmAnd</b> מאפשר לך לשתף את המיקום ולראות את מיקומם של אחרים ב־OsmAnd.<br/><br/>היישומון משתמש ב־API ודורש חשבון טלגרם.</string>
+    <string name="live_now">חי כעת</string>
+    <string name="gps_points_in_buffer">נשלחו (%1$d ממתינות)</string>
+    <string name="points_size">%1$d נקודות</string>
+    <string name="shared_string_date">תאריך</string>
+    <string name="shared_string_collected">נאספו</string>
+    <string name="gps_points">נקודות GPS</string>
+    <string name="shared_string_sent">נשלחו</string>
+    <string name="osmand_connect">OsmAnd connect</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-it/strings.xml b/OsmAnd-telegram/res/values-it/strings.xml
new file mode 100644
index 0000000000..dfa1dd3667
--- /dev/null
+++ b/OsmAnd-telegram/res/values-it/strings.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="last_update_from_telegram">Ultimo aggiornamento da Telegram</string>
+	<string name="enter_another_device_name">Scegli un nome che non hai ancora usato</string>
+	<string name="device_added_successfully">%1$s aggiunto.</string>
+	<string name="shared_string_add">Aggiungi</string>
+	<string name="error_adding_new_device">Impossibile aggiungere il nuovo dispositivo</string>
+	<string name="enter_device_name_description">Dai un nome di non più di 200 caratteri al tuo dispositivo.</string>
+	<string name="device_name_is_too_long">Nome del dispositivo troppo lungo</string>
+	<string name="device_name_cannot_be_empty">Il nome del dispositivo non può essere vuoto</string>
+	<string name="device_name">Nome del dispositivo</string>
+	<string name="shared_string_hide">Nascondi</string>
+	<string name="share_location_as_description_second_line">Puoi creare e visualizzare l\'ID del dispositivo nel client Telegram usando il chat bot %1$s. %2$s</string>
+	<string name="share_location_as_description">Se vuoi connettere più dispositivi a un account telegram, devi usare un dispositivo diverso per condividere la tua posizione.</string>
+	<string name="last_updated_location">Ultimo aggiornamento della posizione:</string>
+	<string name="successfully_sent_and_updated">Inviato e caricato con successo</string>
+	<string name="not_possible_to_send_to_telegram_chats">Impossibile da inviare alle chat Telegram:</string>
+	<string name="waiting_for_response_from_telegram">Aspettando una risposta da Telegram</string>
+	<string name="sending_location_messages">Inviando la posizione</string>
+	<string name="initializing">Avvio</string>
+	<string name="searching_for_gps">Localizzazione…</string>
+	<string name="connecting_to_the_internet">Collegamento a Internet</string>
+	<string name="background_work_description">Cambia le impostazioni di ottimizzazione della batteria per stabilizzare la condivisione della posizione.</string>
+	<string name="background_work">Funzionamento in secondo piano</string>
+	<string name="battery_optimization_description">Disattiva l\'ottimizzazione della batteria per OsmAnd Telegram in modo che non venga chiuso improvvisamente quando è in secondo piano.</string>
+	<string name="sharing_in_background">Condivisione in secondo piano</string>
+	<string name="go_to_settings">Vai alle impostazioni</string>
+	<string name="shared_string_later">Più tardi</string>
+	<string name="not_sent_yet">Non ancora inviato</string>
+	<string name="not_found_yet">Non ancora trovato</string>
+	<string name="re_send_location">Invia nuovamente la posizione</string>
+	<string name="last_available_location">Ultima posizione disponibile</string>
+	<string name="sharing_status">Condivisione dello stato</string>
+	<string name="sharing_enabled">Condivisione: Attivata</string>
+	<string name="shared_string_status">Stato</string>
+	<string name="no_gps_connection">Nessuna connessione GPS</string>
+	<string name="no_internet_connection">Nessuna connessione ad Internet</string>
+	<string name="shared_string_disable">Disattiva</string>
+	<string name="shared_string_save">Salva</string>
+	<string name="add_device">Aggiungi dispositivo</string>
+	<string name="share_location_as">Condividi posizione come</string>
+	<string name="live_now_description">Contatti e gruppi che condividono la posizione con te.</string>
+	<string name="logout_from_osmand_telegram">Disconnettersi da OsmAnd Telegram\?</string>
+	<string name="shared_string_name">Nome</string>
+	<string name="by_distance">Per distanza</string>
+	<string name="by_name">Per nome</string>
+	<string name="by_group">Per gruppo</string>
+	<string name="shared_string_sort">Ordina</string>
+	<string name="shared_string_sort_by">Ordina per</string>
+	<string name="choose_osmand_desc">Seleziona la versione di OsmAnd in cui i contatti saranno mostrati sulla mappa.</string>
+	<string name="choose_osmand">Seleziona la versione di OsmAnd da usare</string>
+	<string name="disable_all_sharing_desc">Disattiva la condivisione della posizione per tutte le conversazioni selezionate (%1$d).</string>
+	<string name="disable_all_sharing">Disattiva tutte le condivisioni</string>
+	<string name="turn_off_all">Disattiva tutto</string>
+	<string name="shared_string_exit">Esci</string>
+	<string name="time_ago">fa</string>
+	<string name="last_response">Ultima risposta</string>
+	<string name="shared_string_group">Gruppo</string>
+	<string name="logout_no_internet_msg">Connettiti a Internet per uscire correttamente dall\'account di Telegram.</string>
+	<string name="shared_string_close">Chiudi</string>
+	<string name="disconnect_from_telegram_desc">Per revocare l\'accesso alla condivisione della posizione, apri Telegram, vai a Impostazioni → Privacy e Sicurezza → Sessioni, e termina la sessione di OsmAnd Telegram.</string>
+	<string name="disconnect_from_telegram">Come disattivare la condivisione della posizione di OsmAnd da Telegram</string>
+	<string name="logout_help_desc">Come disattivare la condivisione della posizione di OsmAnd da Telegram</string>
+	<string name="connected_account">Account connesso</string>
+	<string name="shared_string_account">Account</string>
+	<string name="in_time">in %1$s</string>
+	<string name="osmand_connect_desc">Scegli la versione di OsmAnd che OsmAnd Telegram userà per mostrare le posizioni.</string>
+	<string name="location_history_desc">Nascondi i contatti che non si sono spostati per un certo periodo di tempo.</string>
+	<string name="location_history">Cronologia delle posizioni</string>
+	<string name="stale_location_desc">L\'ultima volta in cui un contatto si è spostato.</string>
+	<string name="stale_location">Non in movimento</string>
+	<string name="send_my_location_desc">Imposta l\'intervallo di tempo minimo per condividere la posizione.</string>
+	<string name="send_my_location">Invia la mia posizione</string>
+	<string name="gps_and_location">Posizione</string>
+	<string name="sharing_time">Tempo di condivisione</string>
+        <string name="expire_at">Scade</string>
+	<string name="stop_sharing_all">La condivisione è attivata (disattiva)</string>
+	<string name="turn_off_location_sharing">Disattiva la condivisione della posizione</string>
+	<string name="open_osmand">Apri OsmAnd</string>
+	<string name="shared_string_live">In diretta</string>
+	<string name="shared_string_bot">Bot</string>
+	<string name="get_telegram_title">Registrazione a Telegram</string>
+	<string name="get_telegram_account_first">Hai bisogno di un account Telegram per usare la condivisione della posizione.</string>
+	<string name="get_telegram_description_continue">Si prega di installare Telegram e creare un account.</string>
+	<string name="get_telegram_after_creating_account">Allora potrai usare quest\'applicazione.</string>
+	<string name="shared_string_all">Tutti</string>
+	<string name="shared_string_off">Spento</string>
+	<string name="already_registered_in_telegram">Hai bisogno di un account di Telegram e un numero di telefono</string>
+	<string name="do_not_have_telegram">Non ho un account di Telegram</string>
+	<string name="enter_phone_number">Inserisci un numero di telefono</string>
+	<string name="enter_authentication_code">Inserisci il codice di autenticazione</string>
+	<string name="hours_and_minutes_format">%1$d h %2$d m</string>
+	<string name="minutes_format">%1$d m</string>
+	<string name="hours_format">%1$d h</string>
+	<string name="shared_string_install">Installa</string>
+	<string name="shared_string_share">Condividi</string>
+	<string name="shared_string_back">Indietro</string>
+	<string name="set_time_description">Imposta il tempo in cui i contatti e gruppi che hai selezionato vedranno la tua posizione in tempo reale.</string>
+	<string name="set_time">Imposta il tempo</string>
+	<string name="location_sharing_description">Seleziona i contatti e i gruppi con cui vuoi condividere la tua posizione.</string>
+	<string name="my_location_search_hint">Cerca: gruppo o contatto</string>
+	<string name="start_location_sharing">Condividi la posizione</string>
+	<string name="show_on_map">Mostra sulla mappa</string>
+	<string name="app_name">OsmAnd Telegram</string>
+	<string name="phone_number_title">Numero di telefono</string>
+	<string name="phone_number_descr">Numero di telefono nel formato internazionale</string>
+	<string name="shared_string_password">Password</string>
+	<string name="enter_code">Inserisci il codice</string>
+	<string name="authentication_code">Codice di autenticazione</string>
+	<string name="authentication_code_descr">Telegram ti ha inviato un codice per OsmAnd per entrare nel tuo account.</string>
+	<string name="enter_password">Inserisci la password</string>
+	<string name="password_descr">Password di Telegram</string>
+	<string name="shared_string_login">Entra</string>
+	<string name="shared_string_logout">Esci</string>
+	<string name="initialization">Avvio</string>
+	<string name="logging_out">Disconnessione</string>
+	<string name="closing">Chiusura</string>
+	<string name="gps_network_not_enabled">Attivare la \"posizione\"\?</string>
+	<string name="not_logged_in">Non sei connesso</string>
+	<string name="shared_string_continue">Continua</string>
+	<string name="shared_string_cancel">Annulla</string>
+	<string name="shared_string_settings">Impostazioni</string>
+	<string name="no_location_permission">L\'applicazione non ha i permessi per accedere ai dati sulla posizione.</string>
+	<string name="gps_not_available">Si prega di attivare la \"posizione\" nelle impostazioni di sistema</string>
+	<string name="location_service_no_gps_available">Seleziona uno dei provider della posizione per condividerla.</string>
+	<string name="osmand_service">In secondo piano</string>
+	<string name="osmand_service_descr">OsmAnd Telegram funziona in secondo piano quando lo schermo è spento.</string>
+	<string name="shared_string_distance">Distanza</string>
+	<string name="share_location">Condividi la posizione</string>
+	<string name="sharing_location">Condivisione della posizione</string>
+	<string name="process_service">Servizio di OsmAnd Telegram</string>
+	<string name="osmand_logo">Logo di OsmAnd</string>
+	<string name="install_osmand_dialog_message">Devi installare prima la versione gratis o a pagamento di OsmAnd</string>
+	<string name="install_osmand">Installa OsmAnd</string>
+	<string name="show_users_on_map">Mostra gli utenti sulla mappa</string>
+	<string name="active_chats">Conversazioni attive</string>
+	<string name="shared_string_authorization">Autorizzazione</string>
+	<string name="shared_string_authorization_descr">Si prega di inserire il numero di telefono di Telegram nel formato internazionale</string>
+	<string name="shared_string_welcome">Benvenuto/a</string>
+
+	<string name="yard">yd</string>
+	<string name="foot">ft</string>
+	<string name="mile">mi</string>
+	<string name="km">km</string>
+	<string name="m">m</string>
+	<string name="nm">nmi</string>
+	<string name="min_mile">min/m</string>
+	<string name="si_kmh">Chilometri all\'ora</string>
+	<string name="si_mph">Miglia all\'ora</string>
+	<string name="si_m_s">Metri al secondo</string>
+	<string name="si_min_km">Minuti al chilometro</string>
+	<string name="si_min_m">Minuti al miglio</string>
+	<string name="si_nm_h">Miglia nautiche all\'ora (nodi)</string>
+	<string name="si_mi_feet">Miglia/piedi</string>
+	<string name="si_mi_yard">Miglia/iarde</string>
+	<string name="si_km_m">Chilometri/metri</string>
+	<string name="si_nm">Miglia nautiche</string>
+	<string name="si_mi_meters">Miglia/metri</string>
+	<string name="shared_string_hour_short">h</string>
+	<string name="shared_string_minute_short">m</string>
+	<string name="shared_string_second_short">s</string>
+	<string name="welcome_descr"><b>OsmAnd Location Sharing</b> ti permette di condividere la tua posizione e di vedere quella di altri in OsmAnd.<br/><br/>L\'applicazione usa le API di Telegram ed è necessario un account di Telegram.</string>
+	<string name="my_location">La mia posizione</string>
+	<string name="live_now">Ora in diretta</string>
+
+
+<string name="logout_from_osmand_telegram_descr">Sei sicuro di volerti disconnettere da OsmAnd Telegram, cosicché non potrai condividere la posizione o vedere quella di altri\?</string>
+	<string name="osmand_connect">Connessione OsmAnd</string>
+	<string name="set_visible_time_for_all">Imposta un orario visibile a tutti</string>
+	<string name="visible_time_for_all">Orario visibile a tutti</string>
+	<string name="min_km">min/km</string>
+	<string name="nm_h">kn</string>
+	<string name="m_s">m/s</string>
+	<string name="km_h">km/h</string>
+	<string name="mile_per_hour">mi/h</string>
+    <string name="monitoring_is_enabled">Monitoraggio abilitato</string>
+    <string name="monitoring_is_disabled">Monitoraggio disabilitato</string>
+    <string name="time_on_the_move">tempo in movimento</string>
+    <string name="average_altitude">Altitudine media</string>
+    <string name="average_speed">Velocità media</string>
+    <string name="open_in_osmand">Apri in OsmAnd</string>
+    <string name="end_date">Data di fine</string>
+    <string name="start_date">Data d\'inizio</string>
+    <string name="timeline_description">Abilita il monitoraggio per raccogliere i dati degli spostamenti in secondo piano.</string>
+    <string name="send_location_as">Invia la localizzazione come</string>
+    <string name="send_location_as_descr">Scegli l\'aspetto dei messaggi con la tua localizzazione.</string>
+    <string name="shared_string_map">Mappa</string>
+    <string name="shared_string_text">Testo</string>
+    <string name="map_and_text">Mappa e testo</string>
+    <string name="timeline">Cronologia</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-nb-rNO/strings.xml b/OsmAnd-telegram/res/values-nb/strings.xml
similarity index 60%
rename from OsmAnd-telegram/res/values-nb-rNO/strings.xml
rename to OsmAnd-telegram/res/values-nb/strings.xml
index 0658a16265..ea559058e9 100644
--- a/OsmAnd-telegram/res/values-nb-rNO/strings.xml
+++ b/OsmAnd-telegram/res/values-nb/strings.xml
@@ -1,33 +1,24 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="background_work_description">Endre batterioptimiseringsinnstillinger, for stabil plasseringsdeling</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="background_work_description">Endre batterioptimiseringsinnstillinger for mer stabil posisjonsdeling.</string>
 	<string name="background_work">Bakgrunnsarbeid</string>
-	<string name="battery_optimization_description">For stabil deling av din plassering i bakgrunnen, anbefales det å skru av batterioptimalisering for OsmAnd Telegram.
-\n
-\nHvis optimaliseringer er påskrudd, kan systemet skru av programmet som kjører i bakgrunnen automatisk (når skjermen er låst/eller programmet er minimert). Dette skjer uten merknad, og opphever kringkasting av plassering.</string>
+	<string name="battery_optimization_description">Skru av batterioptimisering for OsmAnd Telegram slik at det ikke plutselig skrur seg av når det er i bakgrunnen.</string>
 	<string name="sharing_in_background">Deling i bakgrunnen</string>
 	<string name="go_to_settings">Gå til innstillinger</string>
 	<string name="shared_string_later">Senere</string>
 	<string name="not_sent_yet">Ikke sendt enda</string>
 	<string name="not_found_yet">Ikke funnet enda</string>
-	<string name="re_send_location">Send plassering på ny</string>
-	<string name="last_sent_location">Sist sendte plassering</string>
-	<string name="last_available_location">Sist tilgjengelige plassering</string>
+	<string name="re_send_location">Send posisjon på nytt</string>
+	<string name="last_available_location">Sist tilgjengelige posisjon</string>
 	<string name="sharing_status">Delingsstatus</string>
 	<string name="sharing_enabled">Deling: Påslått</string>
 	<string name="shared_string_status">Status</string>
 	<string name="no_gps_connection">Ingen GPS-tilkobling</string>
-	<string name="sharing_success">Sendt og oppdatert</string>
-	<string name="not_possible_to_send_to_chats">Kunne ikke sende sludring:</string>
 	<string name="no_internet_connection">Ingen internettilknytning</string>
 	<string name="shared_string_disable">Skru av</string>
-	<string name="shared_string_save">Lagre</string>
-	<string name="add_device_descr">Skriv inn din enhets-ID fra https://live.osmand.net/device/ID</string>
-	<string name="device_id">Enhets-ID</string>
 	<string name="add_device">Legg til enhet</string>
-	<string name="share_location_as_descr">Dette valget lar deg dele enhetens plassering, eller plassering for egendefinert lagt til via API-enheter.</string>
-	<string name="share_location_as">Del plassering som</string>
-	<string name="live_now_description">Kontakter og grupper som deler sin plassering med deg.</string>
-	<string name="logout_from_osmand_telegram_descr">Er du sikker på at du vil logge ut av OsmAnd Telegram\? Etter det, vil du ikke kunne sende din plassering, og se dine kontakters plassering på kartet i OsmAnd.</string>
+	<string name="share_location_as">Del posisjon som</string>
+	<string name="live_now_description">Kontakter og grupper som deler sin posisjon med deg.</string>
+	<string name="logout_from_osmand_telegram_descr">Er du sikker på at du vil logge ut av OsmAnd Telegram slik at du ikke kan sende din posisjon, eller se andres\?</string>
 	<string name="logout_from_osmand_telegram">Logg ut av OsmAnd Telegram\?</string>
 	<string name="shared_string_name">Navn</string>
 	<string name="by_distance">Etter distanse</string>
@@ -37,39 +28,38 @@
 	<string name="shared_string_sort_by">Sorter etter</string>
 	<string name="choose_osmand_desc">Velg OsmAnd-versjon der kontaktene skal vises på kartet.</string>
 	<string name="choose_osmand">Velg OsmAnd versjon å bruke</string>
-	<string name="disable_all_sharing_desc">Det vil skru av deling av din plassering til alle valgte sludringer (%1$d).</string>
+	<string name="disable_all_sharing_desc">Det vil skru av posisjonsdeling til alle valgte sludringer (%1$d).</string>
 	<string name="disable_all_sharing">Skru av all deling</string>
 	<string name="turn_off_all">Skru av alle</string>
 	<string name="shared_string_exit">Avslutt</string>
 	<string name="time_ago">siden</string>
 	<string name="last_response">Siste svar</string>
 	<string name="shared_string_group">Gruppe</string>
-	<string name="logout_no_internet_msg">For å logge ut av din Telegram-konto på rett vis, trenger du Internett.</string>
+	<string name="logout_no_internet_msg">Koble til Internett for å logge ut av Telegram ordentlig.</string>
 	<string name="shared_string_close">Lukk</string>
-	<string name="disconnect_from_telegram_desc">For å blokekre Telegram fra din OsmAnd-konto må du åpne innstillingene i Telegram. Under Personvern og sikkerhet - Økter, må du sluttføre OsmAnd Telegram-økta. Etter det, vil OsmAnd Plasseringsdeling ikke lenger ha tilgang til kontoen din, og du vil ikke kunne bruke dette programmet til du logger inn igjen.</string>
-	<string name="disconnect_from_telegram">Hvordan koble fra OsmAnd plasseringsdeling fra Telegram-kontoen</string>
-	<string name="logout_help_desc">Hvordan koble fra OsmAnd plasseringsdeling fra Telegram</string>
+	<string name="disconnect_from_telegram_desc">For å tilbakekalle posisjonsdelingstilgang. Åpne Telegram, gå til Innstillinger - Personvern og sikkerhet - Økter, og sluttfør OsmAnd Telegram-økta.</string>
+	<string name="disconnect_from_telegram">Hvordan koble fra OsmAnd posisjonsdeling fra Telegram</string>
+	<string name="logout_help_desc">Hvordan koble fra OsmAnd posisjonsdeling fra Telegram</string>
 	<string name="connected_account">Tilkoblet konto</string>
 	<string name="shared_string_account">Konto</string>
 	<string name="in_time">i %1$s</string>
-	<string name="osmand_connect_desc">Velg OsmAnd-versjonen OsmAnd Telegram henvender seg til for å vise posisjonen på kartet.</string>
+	<string name="osmand_connect_desc">Velg OsmAnd-versjonen OsmAnd Telegram bruker for å vise posisjoner på kartet.</string>
 	<string name="osmand_connect">OsmAnd connect</string>
 	<string name="location_history_desc">Skjul kontaktene som ikke har oppdatert sin plassering etter et gitt tidsintervall.</string>
-	<string name="location_history">Plasseringshistorikk</string>
+	<string name="location_history">Posisjonshistorikk</string>
 	<string name="stale_location_desc">Siste tidspunkt en kontakt sendte en plasseringsoppdatering.</string>
 	<string name="stale_location">Urørlig plassering</string>
-	<string name="send_my_location_desc">Sett minimumsintervall for plasseringsdeling.</string>
-	<string name="send_my_location">Send min plassering</string>
+	<string name="send_my_location_desc">Sett minimumsintervall for posisjonsdeling.</string>
+	<string name="send_my_location">Send min posisjon</string>
 	<string name="gps_and_location">GPS og plassering</string>
 	<string name="sharing_time">Delingstid</string>
 	<string name="expire_at">Utløper</string>
-	<string name="stop_sharing_all">Deling er påslått (skru av)</string>
-	<string name="turn_off_location_sharing">Skru av plasseringsdeling</string>
+	<string name="turn_off_location_sharing">Skru av posisjonsdeling</string>
 	<string name="open_osmand">Åpne OsmAnd</string>
 	<string name="shared_string_live">Sanntid</string>
 	<string name="shared_string_bot">Bot</string>
 	<string name="get_telegram_title">Registrering i Telegram</string>
-	<string name="get_telegram_account_first">Du trenger en Telegram-konto for å bruke funksjonene i OsmAnd plasseringsdeling.</string>
+	<string name="get_telegram_account_first">Du trenger en Telegram-konto for å bruke funksjonene i OsmAnd posisjonsdeling.</string>
 	<string name="get_telegram_description_continue">Hvis du ønsker å fortsette, installer Telegram fra Google Play og registrer din konto.</string>
 	<string name="get_telegram_after_creating_account">Etter oppretting av konto, kan du bruke dette programmet.</string>
 	<string name="shared_string_all">Alle</string>
@@ -86,11 +76,11 @@
 	<string name="shared_string_share">Del</string>
 	<string name="shared_string_back">Tilbake</string>
 	<string name="visible_time_for_all">Synlig tid for alle</string>
-	<string name="set_time_description">Sett tiden dine valgte kontakter og grupper vil se din plassering i sanntid.</string>
+	<string name="set_time_description">Sett tiden dine valgte kontakter og grupper vil se din posisjon i sanntid.</string>
 	<string name="set_time">Sett tid</string>
-	<string name="location_sharing_description">Velg kontaktene og gruppene du ønsker å dele din plassering med.</string>
+	<string name="location_sharing_description">Velg kontaktene og gruppene du ønsker å dele din posisjon med.</string>
 	<string name="my_location_search_hint">Søk: Gruppe eller kontakt</string>
-	<string name="start_location_sharing">Start plasseringsdeling</string>
+	<string name="start_location_sharing">Del posisjon</string>
 	<string name="show_on_map">Vis på kartet</string>
 	<string name="app_name">OsmAnd Telegram</string>
 	<string name="phone_number_title">Telefonnummer</string>
@@ -98,32 +88,23 @@
 	<string name="shared_string_password">Passord</string>
 	<string name="enter_code">Skriv inn kode</string>
 	<string name="authentication_code">Identitetsbekreftelseskode</string>
-	<string name="authentication_code_descr">Du har blitt tilsendt en kode av Telegram. Den vil bli brukt av OsmAnd for å logge inn på kontoen din.</string>
+	<string name="authentication_code_descr">Telegram har sendt deg en kode slik at OsmAnd kan logge inn på kontoen din.</string>
 	<string name="enter_password">Skriv inn passord</string>
-	<string name="password_descr">Skriv inn passordet for din Telegram-konto for å fullføre identitetsbekreftelse</string>
+	<string name="password_descr">Skriv inn passordet for din Telegram-konto</string>
 	<string name="shared_string_login">Logg inn</string>
 	<string name="shared_string_logout">Logg ut</string>
 	<string name="not_logged_in">Du er ikke innlogget</string>
-	<string name="initialization">Igangsetting</string>
-	<string name="logging_out">Logger ut</string>
-	<string name="closing">Lukker</string>
 	<string name="shared_string_continue">Fortsett</string>
 	<string name="shared_string_cancel">Avbryt</string>
-	<string name="gps_network_not_enabled">Skru på plasseringstjeneste\?</string>
 	<string name="shared_string_settings">Innstillinger</string>
-	<string name="no_location_permission">Programmet mangler tilgang til plasseringsdata.</string>
-	<string name="gps_not_available">Skru på GPS i innstillingene</string>
-	<string name="location_service_no_gps_available">Plasseringsdelingstjenesten krever at en plasseringstilbyder er påslått.</string>
+	<string name="no_location_permission">Programmet mangler tilgang til posisjonsdata.</string>
+	<string name="gps_not_available">Skru på «Posisjon» i systeminnstillingene</string>
+	<string name="location_service_no_gps_available">Velg en av posisjonstilbyderne for å dele din posisjon.</string>
 	<string name="osmand_service">Bakgrunnsmodus</string>
 	<string name="osmand_service_descr">OsmAnd Telegram kjører som nisse med skjermen av.</string>
 	<string name="shared_string_distance">Distanse</string>
-	<string name="share_location">Del plassering</string>
-	<string name="sharing_location">Deler plassering</string>
-	<string name="shared_string_paused">Pauset</string>
-	<string name="shared_string_no_data">Ingen data</string>
-	<string name="shared_string_pause">Pause</string>
-	<string name="shared_string_start">Start</string>
-	<string name="shared_string_stop">Stopp</string>
+	<string name="share_location">Del posisjon</string>
+	<string name="sharing_location">Deler posisjon</string>
 	<string name="process_service">OsmAnd Telegram-tjeneste</string>
 	<string name="osmand_logo">OsmAnd-logo</string>
 	<string name="install_osmand_dialog_message">Du må installere gratis- eller betalt versjon av OsmAnd først</string>
@@ -131,7 +112,7 @@
 	<string name="show_users_on_map">Vis brukere på kartet</string>
 	<string name="active_chats">Aktive sludringer</string>
 	<string name="shared_string_authorization">Identitetsbekreftelse</string>
-	<string name="shared_string_authorization_descr">Skriv inn telefonnummeret for din Telegram-konto i internasjonalt format</string>
+	<string name="shared_string_authorization_descr">Skriv inn ditt Telegram-telefonnummer i internasjonalt format</string>
 	<string name="shared_string_welcome">Velkommen</string>
 
 	<string name="km">km</string>
@@ -143,19 +124,17 @@
 	<string name="shared_string_hour_short">t</string>
 	<string name="shared_string_minute_short">min</string>
 	<string name="shared_string_second_short">sek</string>
-	<string name="plus">+</string>
-	<string name="welcome_descr"><b>OsmAnd plasseringsdeling</b> lar deg dele din plassering og se andres posisjon i OsmAnd.<br/><br/>Programmet belager seg på Telegram-API-et. For å bruke dette programmet må du ha en Telegram-konto.</string>
-	<string name="my_location">Min plassering</string>
-	<string name="live_now">Sender nå</string>
+	<string name="welcome_descr"><b>OsmAnd posisjonsdeling</b> lar deg dele din posisjon og se andres posisjon i OsmAnd.<br/><br/>Programmet belager seg på Telegram-API-et. For å bruke dette programmet må du ha en Telegram-konto.</string>
+	<string name="my_location">Min posisjon</string>
 
 
-<string name="last_updated_location">Sist oppdaterte plassering:</string>
+<string name="last_updated_location">Sist oppdaterte posisjon:</string>
 	<string name="successfully_sent_and_updated">Sendt og oppdatert</string>
 	<string name="not_possible_to_send_to_telegram_chats">Kan ikke sende til Telegram-sludringer:</string>
 	<string name="waiting_for_response_from_telegram">Venter på svar fra Telegram</string>
-	<string name="sending_location_messages">Sender plasseringsmeldinger</string>
+	<string name="sending_location_messages">Sender posisjon</string>
 	<string name="initializing">Starter</string>
-	<string name="searching_for_gps">Søker etter GPS</string>
+	<string name="searching_for_gps">Posisjonerer…</string>
 	<string name="connecting_to_the_internet">Kobler til Internett</string>
 	<string name="yard">yd</string>
 	<string name="foot">fot</string>
@@ -174,4 +153,40 @@
 	<string name="si_km_m">Kilometer/meter</string>
 	<string name="si_nm">Nautiske mil</string>
 	<string name="si_mi_meters">Engelske mil/meter</string>
-	</resources>
+	<string name="enter_another_device_name">Du har allerede en enhet med samme navn, velg noe annet</string>
+	<string name="device_added_successfully">%1$s lagt til.</string>
+	<string name="shared_string_add">Legg til</string>
+	<string name="error_adding_new_device">Kunne ikke legge til ny enhet</string>
+	<string name="enter_device_name_description">Skriv inn et nytt navn for din nye enhet. Maksimal lengde 200 tegn.</string>
+	<string name="device_name_is_too_long">For lang enhetsnavn</string>
+	<string name="device_name_cannot_be_empty">Enhetsnavn må velges</string>
+	<string name="device_name">Enhetsnavn</string>
+	<string name="shared_string_hide">Skjul</string>
+	<string name="share_location_as_description_second_line">Du kan opprette og vise enhets-ID i Telegram-klienten ved bruk av %1$s-sludrebot-en. %2$s</string>
+	<string name="share_location_as_description">Hvis du vil koble flere enheter til én Telegram-konto, må du bruke en annen enhet til å dele din posisjon.</string>
+	<string name="shared_string_save">Lagre</string>
+	<string name="stop_sharing_all">Deling er på (skru av)</string>
+	<string name="initialization">Starter</string>
+	<string name="logging_out">Logger ut</string>
+	<string name="closing">Lukker</string>
+	<string name="gps_network_not_enabled">Skru på \"Posisjon\"\?</string>
+	<string name="live_now">Nå direkte</string>
+
+
+<string name="last_update_from_telegram">Siste oppdatering fra Telegram</string>
+	<string name="send_location_as">Send plassering som</string>
+	<string name="send_location_as_descr">Velg hvordan meldinger med din plassering skal se ut.</string>
+	<string name="shared_string_map">Kart</string>
+	<string name="shared_string_text">Tekst</string>
+	<string name="map_and_text">Kart og tekst</string>
+    <string name="monitoring_is_enabled">Oppsyn er påskrudd</string>
+    <string name="monitoring_is_disabled">Oppsyn er avskrudd</string>
+    <string name="time_on_the_move">tid i bevegelse</string>
+    <string name="average_altitude">Gjennomsnittlig høyde</string>
+    <string name="average_speed">Gjennomsnittsfart</string>
+    <string name="open_in_osmand">Åpne i OsmAnd</string>
+    <string name="end_date">Sluttdato</string>
+    <string name="start_date">Startdato</string>
+    <string name="timeline_description">Skru på oppsyn for å samle bevegelsesdata i bakgrunnen.</string>
+    <string name="timeline">Tidslinje</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-pl/strings.xml b/OsmAnd-telegram/res/values-pl/strings.xml
index d4b0ce3108..a32ff8c97b 100644
--- a/OsmAnd-telegram/res/values-pl/strings.xml
+++ b/OsmAnd-telegram/res/values-pl/strings.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="background_work_description">Zmień ustawienia optymalizacji baterii, aby zapewnić stabilną lokalizację</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="background_work_description">Zmień ustawienia optymalizacji baterii, aby zapewnić stabilną lokalizację.</string>
 	<string name="background_work">Praca w tle</string>
 	<string name="battery_optimization_description">Aby stabilnie udostępniać swoją pozycję w tle, zaleca się wyłączenie optymalizacji baterii dla Telegram OsmAnd.
 \n
@@ -10,25 +10,19 @@
 	<string name="not_sent_yet">Jeszcze nie wysłane</string>
 	<string name="not_found_yet">Jeszcze nie znaleziono</string>
 	<string name="re_send_location">Wyślij ponownie lokalizację</string>
-	<string name="last_sent_location">Ostatnia wysłana lokalizacja</string>
 	<string name="last_available_location">Ostatnia dostępna lokalizacja</string>
 	<string name="sharing_status">Status udostępniania</string>
 	<string name="sharing_enabled">Udostępnianie: Włączone</string>
 	<string name="shared_string_status">Status</string>
 	<string name="no_gps_connection">Brak połączenia GPS</string>
-	<string name="sharing_success">Pomyślnie wysłano i zaktualizowano</string>
-	<string name="not_possible_to_send_to_chats">Nie można wysłać na czat:</string>
 	<string name="no_internet_connection">Brak połączenia z internetem</string>
 	<string name="shared_string_disable">Wyłącz</string>
 	<string name="shared_string_save">Zapisz</string>
-	<string name="add_device_descr">Wprowadź swój identyfikator urządzenia, który można znaleźć w https://live.osmand.net/device/ID</string>
-	<string name="device_id">Identyfikator urządzenia</string>
 	<string name="add_device">Dodaj urządzenie</string>
-	<string name="share_location_as_descr">Ta opcja umożliwia udostępnianie lokalizacji urządzenia lub lokalizacji niestandardowych dodawanych przez urządzenia interfejsu API.</string>
 	<string name="share_location_as">Udostępnij lokalizację jako</string>
 	<string name="live_now_description">Kontakty i grupy, które udostępniają Ci swoją lokalizację.</string>
-	<string name="logout_from_osmand_telegram_descr">Czy na pewno chcesz się wylogować z OsmAnd Telegram\? Po tym czasie nie będziesz mógł wysłać swojej pozycji i zobaczyć lokalizacji swoich kontaktów na mapie w OsmAnd.</string>
-	<string name="logout_from_osmand_telegram">Wyloguj się z OsmAnd Telegram\?</string>
+	<string name="logout_from_osmand_telegram_descr">Czy na pewno chcesz się wylogować z OsmAnd Telegram, aby nie udostępniać lokalizacji ani nie widzieć lokalizacji innych\?</string>
+	<string name="logout_from_osmand_telegram">Wylogować się z OsmAnd Telegram\?</string>
 	<string name="shared_string_name">Nazwa</string>
 	<string name="by_distance">Według odległości</string>
 	<string name="by_name">Według nazwy</string>
@@ -37,43 +31,42 @@
 	<string name="shared_string_sort_by">Sortuj według</string>
 	<string name="choose_osmand_desc">Wybierz wersję OsmAnd, w której kontakty będą wyświetlane na mapie.</string>
 	<string name="choose_osmand">Wybierz używaną wersję OsmAnd</string>
-	<string name="disable_all_sharing_desc">To wyłączy udostępnianie lokalizacji dla wszystkich wybranych czatów (%1$d).</string>
+	<string name="disable_all_sharing_desc">Wyłącza udostępnianie lokalizacji dla wszystkich wybranych czatów (%1$d).</string>
 	<string name="disable_all_sharing">Wyłącz udostępnianie</string>
 	<string name="turn_off_all">Wyłącz wszystko</string>
 	<string name="shared_string_exit">Zakończ</string>
 	<string name="time_ago">temu</string>
 	<string name="last_response">Ostatnia odpowiedź</string>
 	<string name="shared_string_group">Grupa</string>
-	<string name="logout_no_internet_msg">Internet jest wymagany, by właściwie wylogować się z konta Telegramu.</string>
+	<string name="logout_no_internet_msg">Połącz się z internetem, by właściwie wylogować się z konta Telegramu.</string>
 	<string name="shared_string_close">Zamknij</string>
-	<string name="disconnect_from_telegram">Jak rozłączyć Udostępnianie Lokalizacji OsmAnd z konta Telegramu</string>
-	<string name="logout_help_desc">Jak rozłączyć Udostępnianie Lokalizacji OsmAnd z Telegramu</string>
+	<string name="disconnect_from_telegram">Jak wyłączyć Udostępnianie Lokalizacji OsmAnd z Telegramu</string>
+	<string name="logout_help_desc">Jak wyłączyć Udostępnianie Lokalizacji OsmAnd z Telegramu</string>
 	<string name="connected_account">Połączone konta</string>
 	<string name="shared_string_account">Konto</string>
 	<string name="in_time">w %1$s</string>
-	<string name="osmand_connect_desc">Wybierz wersję OsmAnd do której Telegram OsmAnd będzie się odnosił przy wyświetlaniu pozycji na mapie.</string>
+	<string name="osmand_connect_desc">Wybierz wersję OsmAnd, którą Telegram OsmAnd będzie używał do wyświetlaniu pozycji.</string>
 	<string name="osmand_connect">Połącz OsmAnd</string>
-	<string name="location_history_desc">Ukryj kontakty, które nie zaktualizowały swojej lokalizacji po określonym czasie.</string>
+	<string name="location_history_desc">Ukryj kontakty, które nie zostały przeniesione w określonym czasie.</string>
 	<string name="location_history">Historia lokalizacji</string>
-	<string name="stale_location_desc">Ostatni raz, kiedy kontakt wysłał aktualizację do swojej lokalizacji.</string>
+	<string name="stale_location_desc">Ostatni kontakt został przeniesiony.</string>
 	<string name="send_my_location_desc">Wybierz minimalny odstęp dla udostępniania lokalizacji.</string>
 	<string name="send_my_location">Wyślij moją lokalizację</string>
-	<string name="gps_and_location">GPS i lokalizacja</string>
+	<string name="gps_and_location">Pozycja</string>
 	<string name="sharing_time">Czas udostępniania</string>
-	<string name="expire_at">Wygasa o</string>
-	<string name="stop_sharing_all">Udostępnianie jest włączone (wyłącz)</string>
+	<string name="expire_at">Wygasa</string>
 	<string name="turn_off_location_sharing">Wyłącz udostępnianie lokalizacji</string>
 	<string name="open_osmand">Otwórz OsmAnd</string>
 	<string name="shared_string_live">Na żywo</string>
 	<string name="shared_string_bot">Bot</string>
 	<string name="get_telegram_title">Rejestracja w Telegramie</string>
-	<string name="get_telegram_account_first">Potrzebujesz konto w Telegramie, by używać Udostępniania Lokalizacji OsmAnd.</string>
-	<string name="get_telegram_description_continue">Jeśli chcesz kontynuować, prosimy zainstalować Telegram z Google Play i zarejestrować konto.</string>
-	<string name="get_telegram_after_creating_account">Po utworzeniu konta, możesz używać aplikacji.</string>
+	<string name="get_telegram_account_first">Aby korzystać z udostępniania lokalizacji, potrzebujesz konta Telegram.</string>
+	<string name="get_telegram_description_continue">Zainstaluj Telegram i skonfiguruj konto.</string>
+	<string name="get_telegram_after_creating_account">Następnie możesz użyć tej aplikacji.</string>
 	<string name="shared_string_all">Wszystkie</string>
 	<string name="shared_string_off">Wyłączone</string>
-	<string name="already_registered_in_telegram">Potrzebujesz już zarejestrowanego konta i numeru telefonu w Telegramie</string>
-	<string name="do_not_have_telegram">Nie masz konta w Telegramie</string>
+	<string name="already_registered_in_telegram">Potrzebujesz zarejestrowanego konta w Telegramie i numeru telefonu</string>
+	<string name="do_not_have_telegram">Nie mam konta w Telegramie</string>
 	<string name="enter_phone_number">Wpisz numer telefonu</string>
 	<string name="enter_authentication_code">Wpisz kod zabezpieczający</string>
 	<string name="set_visible_time_for_all">Ustaw czas widoczny dla wszystkich</string>
@@ -87,8 +80,8 @@
 	<string name="set_time_description">Ustaw czas, kiedy wybrane kontakty i grupy będą widzieć twoją lokalizację w czasie rzeczywistym.</string>
 	<string name="set_time">Ustaw czas</string>
 	<string name="location_sharing_description">Wybierz kontakty i grupy, którym chcesz udostępnić swoją lokalizację.</string>
-	<string name="my_location_search_hint">Wyszukiwanie: grupa i kontakt</string>
-	<string name="start_location_sharing">Rozpocznij udostępnianie lokalizacji</string>
+	<string name="my_location_search_hint">Szukaj: Grupa lub kontakt</string>
+	<string name="start_location_sharing">Udostępnij lokalizację</string>
 	<string name="show_on_map">Pokazuj na mapie</string>
 	<string name="app_name">OsmAnd Telegram</string>
 	<string name="phone_number_title">Numer telefonu</string>
@@ -96,32 +89,24 @@
 	<string name="shared_string_password">Hasło</string>
 	<string name="enter_code">Wpisz kod</string>
 	<string name="authentication_code">Kod zabezpieczający</string>
-	<string name="authentication_code_descr">Telegram wysłał ci kod. Będzie on używany przez OsmAnd jako login do konta.</string>
+	<string name="authentication_code_descr">Telegram wysłał ci kod do OsmAnd jako login do konta.</string>
 	<string name="enter_password">Wpisz kod</string>
-	<string name="password_descr">Proszę wpisać kod konta w Telegramie by zakończyć autoryzację</string>
+	<string name="password_descr">Hasło Telegram</string>
 	<string name="shared_string_login">Zaloguj się</string>
 	<string name="shared_string_logout">Wyloguj się</string>
 	<string name="not_logged_in">Nie jesteś zalogowany/a</string>
-	<string name="initialization">Inicjalizacja</string>
-	<string name="logging_out">Wylogowywanie</string>
-	<string name="closing">Zamykanie</string>
 	<string name="shared_string_continue">Kontynuuj</string>
 	<string name="shared_string_cancel">Anuluj</string>
-	<string name="gps_network_not_enabled">Usługa lokalizacji nie jest włączona. Włączyć ją\?</string>
+	<string name="gps_network_not_enabled">Włączyć lokalizację\?</string>
 	<string name="shared_string_settings">Opcje</string>
 	<string name="no_location_permission">Aplikacja nie ma uprawnień dostępu do danych o położeniu.</string>
-	<string name="gps_not_available">Proszę włączyć GPS w opcjach</string>
-	<string name="location_service_no_gps_available">Usługa udostępniania lokalizacji wymaga włączonego dostawcy lokalizacji.</string>
+	<string name="gps_not_available">Włącz \"Lokalizacja\" w ustawieniach systemu</string>
+	<string name="location_service_no_gps_available">Wybierz jednego z dostawców lokalizacji, aby udostępnić swoją lokalizację.</string>
 	<string name="osmand_service">Tryb tła</string>
 	<string name="osmand_service_descr">Telegram OsmAnd będzie działał w tle przy wygaszonym ekranie.</string>
 	<string name="shared_string_distance">Odległość</string>
 	<string name="share_location">Udostępnij lokalizację</string>
 	<string name="sharing_location">Udostępnianie lokalizacji</string>
-	<string name="shared_string_paused">Wstrzymano</string>
-	<string name="shared_string_no_data">Brak danych</string>
-	<string name="shared_string_pause">Wstrzymaj</string>
-	<string name="shared_string_start">Rozpocznij</string>
-	<string name="shared_string_stop">Zakończ</string>
 	<string name="process_service">Usługa Telegramu OsmAnd</string>
 	<string name="osmand_logo">Logo OsmAnd</string>
 	<string name="install_osmand_dialog_message">Najpierw musisz zainstalować darmową lub płatną wersję OsmAnd</string>
@@ -129,7 +114,7 @@
 	<string name="show_users_on_map">Pokazuj użytkowników na mapie</string>
 	<string name="active_chats">Aktywuj czat</string>
 	<string name="shared_string_authorization">Autoryzacja</string>
-	<string name="shared_string_authorization_descr">Proszę wprowadzić numer telefonu konta Telegramu w formacie międzynarodowym</string>
+	<string name="shared_string_authorization_descr">Wprowadź swój numer Telegram w formacie międzynarodowym</string>
 	<string name="shared_string_welcome">Witamy</string>
 
 	<string name="yard">yd</string>
@@ -137,7 +122,7 @@
 	<string name="mile">mi</string>
 	<string name="km">km</string>
 	<string name="m">m</string>
-	<string name="nm">nmi</string>
+	<string name="nm">Mm</string>
 	<string name="min_mile">min/m</string>
 	<string name="min_km">min/km</string>
 	<string name="nm_h">nmi/h</string>
@@ -158,10 +143,50 @@
 	<string name="shared_string_hour_short">h</string>
 	<string name="shared_string_minute_short">min</string>
 	<string name="shared_string_second_short">sek</string>
-	<string name="plus">+</string>
-	<string name="welcome_descr"><b>Udostępnianie Lokalizacji OsmAnd</b> umożliwi ci udostępnianie twojej lokalizacji i zobaczenie lokalizacji innych osób w OsmAnd.<br/><br/>Aplikacja działa w opraciu o Telegram API. By używać aplikacji musisz mieć konto w Telegramie.</string>
+	<string name="welcome_descr"><b>Udostępnianie Lokalizacji OsmAnd</b> pozwala Ci udostępniać swoją lokalizację i widzieć ją w OsmAnd.<br/><br/>Aplikacja używa Telegram API i potrzebujesz konta Telegram.</string>
 	<string name="my_location">Moja lokalizacja</string>
-	<string name="live_now">Na żywo teraz</string>
+	<string name="live_now">Na żywo</string>
 
 
-</resources>
+<string name="enter_another_device_name">Wybierz nazwę, której jeszcze nie używasz</string>
+	<string name="device_added_successfully">%1$s dodany.</string>
+	<string name="shared_string_add">Dodaj</string>
+	<string name="error_adding_new_device">Nie można dodać nowego urządzenia</string>
+	<string name="enter_device_name_description">Nazwij swoje nowe urządzenie maksymalnie 200 znaków.</string>
+	<string name="device_name_is_too_long">Nazwa urządzenia jest za długa</string>
+	<string name="device_name_cannot_be_empty">Nazwa sprzętu nie można być pusta</string>
+	<string name="device_name">Nazwa urządzenia</string>
+	<string name="shared_string_hide">Ukryj</string>
+	<string name="share_location_as_description_second_line">Możesz utworzyć i zobaczyć ID sprzętu w telegramie klienta, używając %1$s bota czatu. %2$s</string>
+	<string name="share_location_as_description">Jeśli chcesz połączyć wiele urządzeń z jednym kontem telegramu, potrzebujesz użyć innego sprzętu do udostępniania lokalizacji.</string>
+	<string name="last_updated_location">Ostatnia aktualizacja lokalizacji:</string>
+	<string name="successfully_sent_and_updated">Wysłano i zaktualizowano z powodzeniem</string>
+	<string name="not_possible_to_send_to_telegram_chats">Nie można wysłać na czaty Telegramu:</string>
+	<string name="waiting_for_response_from_telegram">Oczekiwanie na odpowiedź od Telegramu</string>
+	<string name="sending_location_messages">Wysyłam lokalizację</string>
+	<string name="initializing">Wystartuj</string>
+	<string name="searching_for_gps">Pozycjonowanie…</string>
+	<string name="connecting_to_the_internet">Łączenie z internetem</string>
+	<string name="disconnect_from_telegram_desc">Aby anulować dostęp do udostępniania lokalizacji. Otwórz Telegram, przejdź do Ustawienia → Prywatność i bezpieczeństwo → Sesje i zakończ sesję OsmAnd Telegram.</string>
+	<string name="stale_location">Nie porusza się</string>
+	<string name="last_update_from_telegram">Ostatnia aktualizacja z Telegram</string>
+	<string name="stop_sharing_all">Udostępnianie jest włączone (wyłącz)</string>
+	<string name="initialization">Wystartuj</string>
+	<string name="logging_out">Wylogowuję się</string>
+	<string name="closing">Zamykanie</string>
+	<string name="send_location_as">Wyślij lokalizację jako</string>
+	<string name="send_location_as_descr">Wybierz sposób wyświetlania wiadomości z Twoją lokalizacją.</string>
+	<string name="shared_string_map">Mapa</string>
+	<string name="shared_string_text">Tekst</string>
+	<string name="map_and_text">Mapa i tekst</string>
+    <string name="monitoring_is_enabled">Monitorowanie jest włączone</string>
+    <string name="monitoring_is_disabled">Monitorowanie jest wyłączone</string>
+    <string name="time_on_the_move">czas w ruchu</string>
+    <string name="average_altitude">Średnia wysokość</string>
+    <string name="average_speed">Średnia prędkość</string>
+    <string name="open_in_osmand">Otwarte w OsmAnd</string>
+    <string name="end_date">Data końcowa</string>
+    <string name="start_date">Data rozpoczęcia</string>
+    <string name="timeline_description">Umożliwia monitorowanie, by zgromadzić dane ruchu w tle.</string>
+    <string name="timeline">Linia czasu</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-pt-rBR/strings.xml b/OsmAnd-telegram/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000000..ae84e0fc3b
--- /dev/null
+++ b/OsmAnd-telegram/res/values-pt-rBR/strings.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="send_location_as">Enviar localização como</string>
+    <string name="send_location_as_descr">Escolha como as mensagens com sua localização serão exibidas.</string>
+    <string name="shared_string_map">Mapa</string>
+    <string name="shared_string_text">Texto</string>
+    <string name="map_and_text">Mapa e texto</string>
+    <string name="last_update_from_telegram">Última atualização do Telegram</string>
+    <string name="enter_another_device_name">Escolha um nome que você ainda não usou</string>
+    <string name="device_added_successfully">%1$s adicionado.</string>
+    <string name="shared_string_add">Adicionar</string>
+    <string name="error_adding_new_device">Não foi possível adicionar novo dispositivo</string>
+    <string name="enter_device_name_description">Nomeie seu novo dispositivo no máximo 200 símbolos.</string>
+    <string name="device_name_is_too_long">Nome do dispositivo muito longo</string>
+    <string name="device_name_cannot_be_empty">O nome do dispositivo não pode estar vazio</string>
+    <string name="device_name">Nome do dispositivo</string>
+    <string name="shared_string_hide">Ocultar</string>
+    <string name="share_location_as_description_second_line">Você pode criar e visualizar o ID do dispositivo no cliente de telegrama usando o bot de bate-papo %1$s. %2$s</string>
+    <string name="share_location_as_description">Se você deseja conectar vários dispositivos a uma conta de telegrama, é necessário usar um dispositivo diferente para compartilhar sua localização.</string>
+    <string name="last_updated_location">Última localização atualizada:</string>
+    <string name="successfully_sent_and_updated">Enviado e atualizado com sucesso</string>
+    <string name="not_possible_to_send_to_telegram_chats">Não é possível enviar para bate-papo do Telegram:</string>
+    <string name="waiting_for_response_from_telegram">Aguardando resposta do Telegram</string>
+    <string name="sending_location_messages">enviando localização</string>
+    <string name="initializing">Iniciando</string>
+    <string name="searching_for_gps">Posicionando…</string>
+    <string name="connecting_to_the_internet">Conectando-se à Internet</string>
+    <string name="background_work_description">Altere as configurações de otimização da bateria para estabilizar o compartilhamento de local.</string>
+    <string name="background_work">"Funcionamento em segundo plano "</string>
+    <string name="battery_optimization_description">Desative a otimização da bateria do OsmAnd Telegram para que não seja desligado repentinamente quando estiver em segundo plano.</string>
+    <string name="sharing_in_background">Compartilhando em segundo plano</string>
+    <string name="go_to_settings">Vá para as configurações</string>
+    <string name="shared_string_later">Mais tarde</string>
+    <string name="not_sent_yet">Ainda não enviado</string>
+    <string name="not_found_yet">Ainda não encontrado</string>
+    <string name="re_send_location">Reenvie o local</string>
+    <string name="last_available_location">Última localização disponível</string>
+    <string name="sharing_status">Status de compartilhamento</string>
+    <string name="sharing_enabled">Compartilhamento: Ativado</string>
+    <string name="shared_string_status">Status</string>
+    <string name="no_gps_connection">Sem conexão GPS</string>
+    <string name="no_internet_connection">Sem conexão com a internet</string>
+    <string name="shared_string_disable">Desabilitar</string>
+    <string name="shared_string_save">Salvar</string>
+    <string name="add_device">Adicionar dispositivo</string>
+    <string name="share_location_as">Compartilhar localização como</string>
+    <string name="live_now_description">Contatos e grupos compartilhando o local para você.</string>
+    <string name="logout_from_osmand_telegram_descr">Tem certeza de que deseja sair do OsmAnd Telegram para que você não possa compartilhar a localização ou ver a localização de outras pessoas\?</string>
+    <string name="logout_from_osmand_telegram">Sair do OsmAnd Telegram\?</string>
+    <string name="shared_string_name">Nome</string>
+    <string name="by_distance">Pela distância</string>
+    <string name="by_name">Por nome</string>
+    <string name="by_group">Por grupo</string>
+    <string name="shared_string_sort">Ordenar</string>
+    <string name="shared_string_sort_by">Classificar por</string>
+    <string name="choose_osmand_desc">Selecione a versão OsmAnd, onde os contatos serão exibidos no mapa.</string>
+    <string name="choose_osmand">Selecione a versão do OsmAnd para usar</string>
+    <string name="disable_all_sharing_desc">Desativa o compartilhamento de local para todos os bate-papos selecionados (%1$d).</string>
+    <string name="disable_all_sharing">Desativar todo o compartilhamento</string>
+    <string name="turn_off_all">Desligue todos</string>
+    <string name="shared_string_exit">Sair</string>
+    <string name="time_ago">atrás</string>
+    <string name="last_response">Última resposta</string>
+    <string name="shared_string_group">Grupo</string>
+    <string name="logout_no_internet_msg">Conecte-se à Internet para efetuar a saída do Telegram corretamente.</string>
+    <string name="shared_string_close">Fechar</string>
+    <string name="disconnect_from_telegram_desc">Para revogar o acesso ao compartilhamento de local. Abra o Telegram, vá para Configurações → Privacidade e Segurança → Sessões e termine a sessão do OsmAnd Telegram.</string>
+    <string name="disconnect_from_telegram">"Como desativar o compartilhamento de local do OsmAnd  para Telegram"</string>
+    <string name="logout_help_desc">"Como desativar o compartilhamento de local do OsmAnd  para Telegram"</string>
+    <string name="connected_account">Conta conectada</string>
+    <string name="shared_string_account">Conta</string>
+    <string name="in_time">no %1$s</string>
+    <string name="osmand_connect_desc">Escolha a versão OsmAnd que OsmAnd Telegram usa para exibir posições.</string>
+    <string name="osmand_connect">"conectar ao OsmAnd "</string>
+    <string name="location_history_desc">Ocultar contatos que não foram movidos em um determinado momento.</string>
+    <string name="location_history">Histórico de localização</string>
+    <string name="stale_location_desc">A última vez que um contato foi movido.</string>
+    <string name="stale_location">Parado</string>
+    <string name="send_my_location_desc">Defina o intervalo mínimo para o compartilhamento de local.</string>
+    <string name="send_my_location">Enviar minha localização</string>
+    <string name="gps_and_location">Posição</string>
+    <string name="sharing_time">Tempo de compartilhamento</string>
+    <string name="expire_at">Expira</string>
+    <string name="stop_sharing_all">O compartilhamento está ativado (desativado)</string>
+    <string name="turn_off_location_sharing">Desativar o compartilhamento de local</string>
+    <string name="open_osmand">Abrir OsmAnd</string>
+    <string name="shared_string_live">Vivo</string>
+    <string name="shared_string_bot">Robô</string>
+    <string name="get_telegram_title">Registro no Telegram</string>
+    <string name="get_telegram_account_first">Você precisa de uma conta do Telegram para usar o compartilhamento de local.</string>
+    <string name="get_telegram_description_continue">Por favor, instale o Telegram e configure uma conta.</string>
+    <string name="get_telegram_after_creating_account">Então você pode usar este aplicativo.</string>
+    <string name="shared_string_all">Todos</string>
+    <string name="shared_string_off">Desativado</string>
+    <string name="already_registered_in_telegram">Você precisa de uma conta e número de telefone registrados no Telegram</string>
+    <string name="do_not_have_telegram">Eu não tenho conta Telegram</string>
+    <string name="enter_phone_number">Digite o número de telefone</string>
+    <string name="enter_authentication_code">Digite o código de autenticação</string>
+    <string name="set_visible_time_for_all">Definir tempo visível para todos</string>
+    <string name="hours_and_minutes_format">%1$d h %2$d m</string>
+    <string name="minutes_format">%1$d m</string>
+    <string name="hours_format">%1$d h</string>
+    <string name="shared_string_install">Instalar</string>
+    <string name="shared_string_share">Compartilhar</string>
+    <string name="shared_string_back">Voltar</string>
+    <string name="visible_time_for_all">Hora visível para todos</string>
+    <string name="set_time_description">Defina a hora em que seus contatos e grupos selecionados verão sua localização em tempo real.</string>
+    <string name="set_time">Definir tempo</string>
+    <string name="location_sharing_description">Selecione os contatos e grupos com os quais você deseja compartilhar sua localização.</string>
+    <string name="my_location_search_hint">Pesquisa: Grupo ou contato</string>
+    <string name="start_location_sharing">Compartilhar localização</string>
+    <string name="show_on_map">Mostrar no mapa</string>
+    <string name="app_name">OsmAnd Telegram</string>
+    <string name="phone_number_title">Número de telefone</string>
+    <string name="phone_number_descr">Número de telefone no formato internacional</string>
+    <string name="shared_string_password">Senha</string>
+    <string name="enter_code">Coloque o código</string>
+    <string name="authentication_code">Código de Autenticação</string>
+    <string name="authentication_code_descr">Uma faixa GPX é salva automaticamente durante a navegação.</string>
+    <string name="enter_password">Digite a senha</string>
+    <string name="password_descr">Senha do telegrama</string>
+    <string name="shared_string_login">Entrar</string>
+    <string name="shared_string_logout">Sair</string>
+    <string name="initialization">Iniciando</string>
+    <string name="logging_out">Saindo</string>
+    <string name="closing">Fechando</string>
+    <string name="gps_network_not_enabled">Ativar \"Localização\"\?</string>
+    <string name="not_logged_in">você não está logado no</string>
+    <string name="shared_string_continue">Continuar</string>
+    <string name="shared_string_cancel">Cancelar</string>
+    <string name="shared_string_settings">Configurações</string>
+    <string name="no_location_permission">O aplicativo não tem permissão para acessar os dados de localização.</string>
+    <string name="gps_not_available">Por favor, ligue \"Localização\" nas configurações do sistema</string>
+    <string name="location_service_no_gps_available">Selecione um dos provedores de localização para compartilhar sua localização.</string>
+    <string name="osmand_service">Modo em segundo plano</string>
+    <string name="osmand_service_descr">OsmAnd Telegram é executado em segundo plano com a tela desligada.</string>
+    <string name="shared_string_distance">Distância</string>
+    <string name="share_location">Compartilhar localização</string>
+    <string name="sharing_location">Compartilhando localização</string>
+    <string name="process_service">Serviço OsmAnd Telegram</string>
+    <string name="osmand_logo">Logotipo do OsmAnd</string>
+    <string name="install_osmand_dialog_message">Você precisa instalar a versão gratuita ou paga do OsmAnd primeiro</string>
+    <string name="install_osmand">Instalar OsmAnd</string>
+    <string name="show_users_on_map">Mostrar usuários no mapa</string>
+    <string name="active_chats">Bate-papos ativos</string>
+    <string name="shared_string_authorization">Autorização</string>
+    <string name="shared_string_authorization_descr">Por favor, insira o número de telefone do seu Telegram em formato internacional</string>
+    <string name="shared_string_welcome">Boas vindas</string>
+    <string name="yard">yd</string>
+    <string name="foot">ft</string>
+    <string name="mile">mi</string>
+    <string name="km">km</string>
+    <string name="m">m</string>
+    <string name="nm">mn</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="nm_h">mn/h</string>
+    <string name="m_s">m/s</string>
+    <string name="km_h">km/h</string>
+    <string name="mile_per_hour">mph</string>
+    <string name="si_kmh">Quilômetros por hora</string>
+    <string name="si_mph">Milhas por hora</string>
+    <string name="si_m_s">Metros por segundo</string>
+    <string name="si_min_km">Minutos por quilômetro</string>
+    <string name="si_min_m">Minutos por milha</string>
+    <string name="si_nm_h">Milhas náuticas por hora (nó)</string>
+    <string name="si_mi_feet">Milhas/pés</string>
+    <string name="si_mi_yard">Milhas/jardas</string>
+    <string name="si_km_m">Quilômetros/metros</string>
+    <string name="si_nm">Milhas náuticas</string>
+    <string name="si_mi_meters">Milhas/metros</string>
+    <string name="shared_string_hour_short">h</string>
+    <string name="shared_string_minute_short">min</string>
+    <string name="shared_string_second_short">seg</string>
+    <string name="welcome_descr"><b>Compartilhamento de local OsmAnd</b> permite que você compartilhe sua localização e veja a dos outros no OsmAnd.<br/><br/>O aplicativo usa a API Telegram e você precisa de uma conta Telegram.</string>
+    <string name="my_location">Minha localização</string>
+    <string name="live_now">Ao vivo agora</string>
+    <string name="monitoring_is_enabled">Monitoramento está ativado</string>
+    <string name="monitoring_is_disabled">Monitoramento está desativado</string>
+    <string name="time_on_the_move">tempo em movimento</string>
+    <string name="average_altitude">Altitude média</string>
+    <string name="average_speed">Velocidade média</string>
+    <string name="open_in_osmand">Aberto no OsmAnd</string>
+    <string name="end_date">Data final</string>
+    <string name="start_date">Data de início</string>
+    <string name="timeline_description">Ative o monitoramento para coletar dados de movimento em segundo plano.</string>
+    <string name="timeline">"Linha do tempo "</string>
+    <string name="gps_points_in_buffer">enviado (%1$d em buffer)</string>
+    <string name="points_size">"%1$d pontos "</string>
+    <string name="shared_string_date">Data</string>
+    <string name="shared_string_collected">Coletado</string>
+    <string name="gps_points">Pontos de Gps</string>
+    <string name="shared_string_sent">"Enviar "</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-ru/strings.xml b/OsmAnd-telegram/res/values-ru/strings.xml
index a182df7976..7896e335c8 100644
--- a/OsmAnd-telegram/res/values-ru/strings.xml
+++ b/OsmAnd-telegram/res/values-ru/strings.xml
@@ -1,19 +1,143 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="not_sent_yet">Не отправлено</string>
+<resources>
+	<string name="timeline_description">Включите мониторинг, для сбора данных о перемещении в фоновом режиме.</string>
+	<string name="last_update_from_telegram">Последнее обновление в Telegram</string>
+	<string name="device_name">Имя устройства</string>
+	<string name="shared_string_hide">Спрятать</string>
+	<string name="share_location_as_description_second_line">Вы можете создать и просмотреть идентификатор устройства в клиенте telegram, используя %1$s чат бота. %2$s</string>
+	<string name="logout_no_internet_msg">Подключитесь к Интернету, чтобы правильно выйти из Telegram.</string>
+	<string name="set_visible_time_for_all">Установить видимое время для всех</string>
+	<string name="hours_and_minutes_format">%1$d ч %2$d м</string>
+	<string name="minutes_format">%1$d м</string>
+	<string name="hours_format">%1$d ч</string>
+	<string name="not_logged_in">Вы не вошли в систему</string>
+	<string name="sharing_location">Трансляция местоположения</string>
+	<string name="show_users_on_map">Показывать пользователей на карте</string>
+	<string name="active_chats">Активные чаты</string>
+	<string name="sending_location_messages">Отправка местоположения</string>
+	<string name="initializing">Запуск</string>
+	<string name="sharing_in_background">Трансляция в фоновом режиме</string>
+	<string name="no_location_permission">Приложение не имеет разрешения на доступ к данным о местоположении.</string>
+	<string name="gps_not_available">Пожалуйста, включите «Местоположение» в системных настройках</string>
+	<string name="location_service_no_gps_available">Выберите один из провайдеров определения местоположения, чтобы поделиться своим местоположением.</string>
+	<string name="background_work">Работа в фоне</string>
+	<string name="battery_optimization_description">Отключите оптимизацию батареи для OsmAnd Telegram, чтобы оно не было внезапно отключено в фоновом режиме.</string>
+	<string name="osmand_service">Фоновый режим</string>
+	<string name="osmand_service_descr">OsmAnd Telegram работает в фоновом режиме с выключенным экраном.</string>
+	<string name="choose_osmand_desc">Выберите версию OsmAnd, в которой контакты будут отображаться на карте.</string>
+	<string name="choose_osmand">Выберите версию OsmAnd для использования</string>
+	<string name="disable_all_sharing_desc">Остановить трансляцию своей позиции всем ранее выбранным чатам (%1$d).</string>
+	<string name="disable_all_sharing">Отключить все трансляции</string>
+	<string name="shared_string_live">Активных</string>
+	<string name="shared_string_bot">Бот</string>
+	<string name="shared_string_close">Закрыть</string>
+	<string name="initialization">Инициализация</string>
+	<string name="set_time">Выберите время</string>
+	<string name="enter_another_device_name">Выберите имя, которое вы еще не использовали</string>
+	<string name="device_added_successfully">%1$s добавлен.</string>
+	<string name="error_adding_new_device">Не удалось добавить новое устройство</string>
+	<string name="device_name_is_too_long">Имя устройства слишком длинное</string>
+	<string name="device_name_cannot_be_empty">Имя устройства не может быть пустым</string>
+	<string name="shared_string_password">Пароль</string>
+	<string name="enter_code">Введите код</string>
+	<string name="authentication_code">Код аутентификации</string>
+	<string name="authentication_code_descr">Telegram отправил вам код для того, чтобы OsmAnd вошел в вашу учетную запись.</string>
+	<string name="enter_password">Введите пароль</string>
+	<string name="password_descr">Пароль Telegram</string>
+	<string name="welcome_descr"><![CDATA[<b>OsmAnd Location Sharing</b> позволяет вам делиться своим местоположением и видеть других в OsmAnd.<br/><br/>Приложение использует Telegram API, и вам нужна учетная запись Telegram.]]></string>
+	<string name="phone_number_title">Номер телефона</string>
+	<string name="phone_number_descr">Номер телефона в международном формате</string>
+	<string name="shared_string_authorization">Авторизация</string>
+	<string name="shared_string_authorization_descr">Введите номер телефона Telegram в международном формате</string>
+	<string name="shared_string_welcome">Добро пожаловать</string>
+	<string name="get_telegram_title">Регистрация в Telegram</string>
+	<string name="get_telegram_account_first">Для использования отправки местоположений вам нужна учетная запись Telegram.</string>
+	<string name="get_telegram_description_continue">Пожалуйста, установите Telegram и настройте учетную запись.</string>
+	<string name="get_telegram_after_creating_account">Затем вы можете использовать это приложение.</string>
+	<string name="already_registered_in_telegram">Вам нужна зарегистрированная учетная запись Telegram и номер телефона</string>
+	<string name="do_not_have_telegram">У меня нет учетной записи Telegram</string>
+	<string name="enter_phone_number">Введите номер телефона</string>
+	<string name="enter_authentication_code">Введите код аутентификации</string>
+	<string name="shared_string_add">Добавить</string>
+	<string name="enter_device_name_description">Назовите новое устройство макс. 200 символов.</string>
+	<string name="shared_string_distance">Расстояние</string>
+	<string name="my_location">Моя локация</string>
+	<string name="live_now">Активно сейчас</string>
+	<string name="shared_string_hour_short">ч</string>
+	<string name="shared_string_minute_short">мин</string>
+	<string name="shared_string_second_short">сек</string>
+	<string name="shared_string_name">Имя</string>
+	<string name="by_distance">По расстоянию</string>
+	<string name="by_name">По имени</string>
+	<string name="by_group">По группе</string>
+	<string name="shared_string_sort">Сортировать</string>
+	<string name="shared_string_sort_by">Сортировать по</string>
+	<string name="turn_off_all">Отстановить все</string>
+	<string name="shared_string_exit">Выход</string>
+	<string name="time_ago">назад</string>
+	<string name="last_response">Последний ответ</string>
+	<string name="shared_string_group">Группа</string>
+	<string name="live_now_description">Контакты и группы, отправляющие вам местоположение.</string>
+	<string name="share_location">Поделиться местоположением</string>
+	<string name="shared_string_install">Установить</string>
+	<string name="install_osmand">Установить OsmAnd</string>
+	<string name="shared_string_continue">Продолжить</string>
+	<string name="shared_string_cancel">Отмена</string>
+	<string name="location_sharing_description">Выберите контакты и группы, с которыми вы хотите поделиться своим местоположением.</string>
+	<string name="not_sent_yet">Не отправлено</string>
+	<string name="show_on_map">Показать на карте</string>
+	<string name="open_osmand">Открыть OsmAnd</string>
+	<string name="shared_string_all">Все</string>
+	<string name="shared_string_off">Отключить</string>
+	<string name="shared_string_settings">Настройки</string>
+	<string name="sharing_time">Время трансляции</string>
+	<string name="turn_off_location_sharing">Отключить трансляцию</string>
+	<string name="expire_at">Истекает в</string>
+	<string name="in_time">через %1$s</string>
+	<string name="shared_string_share">Поделиться</string>
+	<string name="shared_string_back">Назад</string>
+	<string name="set_time_description">Установите время, в течение которого выбранные вами контакты и группы будут видеть ваше местоположение в режиме реального времени.</string>
+	<string name="visible_time_for_all">Видимое время для всех</string>
+	<string name="last_updated_location">Последнее обновление локации:</string>
+	<string name="successfully_sent_and_updated">Успешно отправлено и обновлено</string>
+	<string name="not_possible_to_send_to_telegram_chats">Невозможно отправить Telegram чаты:</string>
+	<string name="waiting_for_response_from_telegram">Ожидание ответа от Telegram</string>
+	<string name="searching_for_gps">Поиск GPS</string>
+	<string name="connecting_to_the_internet">Подключение к Интернету</string>
+	<string name="background_work_description">Измените настройки оптимизации батареи, чтобы обеспечить стабильную отправку местоположения</string>
+	<string name="location_history">История местоположений</string>
+	<string name="stale_location_desc">В последний раз контакт отправил местоположение.</string>
+	<string name="stale_location">Устаревание местоположения</string>
+	<string name="send_my_location_desc">Установите минимальный интервал между отправками местоположения.</string>
+	<string name="send_my_location">Отправка моей локации</string>
+	<string name="gps_and_location">GPS &amp; местоположение</string>
+	<string name="location_history_desc">Скройте контакты, которые не обновили свое местоположение за определенный промежуток времени.</string>
+	<string name="share_location_as">Поделиться местоположением как</string>
+	<string name="share_location_as_description">Если вы хотите подключить несколько устройств к одной учетной записи Telegram, вам необходимо использовать другое устройство для трансляции местоположения.</string>
+	<string name="osmand_connect_desc">Выберите версию OsmAnd которую OsmAnd Telegram использует для отображения позиций на карте.</string>
+	<string name="osmand_connect">OsmAnd подключение</string>
+	<string name="connected_account">Связанная учетная запись</string>
+	<string name="shared_string_account">Учетная запись</string>
+	<string name="start_location_sharing">Начать отправку локации</string>
+	<string name="install_osmand_dialog_message">Вам необходимо сначала установить бесплатную или платную версию OsmAnd</string>
+	<string name="disconnect_from_telegram">Как отключить передачу данных OsmAnd от Telegram</string>
+	<string name="logout_help_desc">Как отключить передачу данных OsmAnd от Telegram</string>
+	<string name="disconnect_from_telegram_desc">Отмена доступа к отправке локаций. Откройте Telegram, перейдите в Настройки - Конфиденциальность и безопасность - Сессии и завершите сеанс OsmAnd Telegram.</string>
+	<string name="logout_from_osmand_telegram">Выйти из OsmAnd Telegram?</string>
+	<string name="shared_string_login">Войти</string>
+	<string name="shared_string_logout">Выйти</string>
+	<string name="logout_from_osmand_telegram_descr">Вы уверены, что хотите выйти из OsmAnd Telegram, так вы не сможете делиться местоположением или не видеть местоположения других?</string>
+
 	<string name="not_found_yet">Не найдено</string>
 	<string name="re_send_location">Отправить местоположение</string>
-	<string name="last_sent_location">Последнее отправление</string>
 	<string name="last_available_location">Последнее местоположение</string>
 	<string name="sharing_status">Статус отправки</string>
-	<string name="sharing_enabled">Отправка: включена</string>
+	<string name="sharing_enabled">Трансляция: включена</string>
 	<string name="shared_string_status">Статус</string>
 	<string name="no_gps_connection">Отсутствует GPS</string>
-	<string name="sharing_success">Отправлено успешно</string>
-	<string name="not_possible_to_send_to_chats">Нет возможности отправить в:</string>
 	<string name="no_internet_connection">Отсутствует интернет</string>
 	<string name="shared_string_disable">Отключить</string>
 	<string name="shared_string_save">Сохранить</string>
-	<string name="device_id">ID устройства</string>
 	<string name="add_device">Добавить устройство</string>
 	<string name="go_to_settings">Перейти в настройки</string>
 	<string name="shared_string_later">Позже</string>
diff --git a/OsmAnd-telegram/res/values-sc/strings.xml b/OsmAnd-telegram/res/values-sc/strings.xml
new file mode 100644
index 0000000000..39edfd5169
--- /dev/null
+++ b/OsmAnd-telegram/res/values-sc/strings.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="average_altitude">Artària mèdia</string>
+    <string name="average_speed">Lestresa mèdia</string>
+    <string name="open_in_osmand">Aberi in OsmAnd</string>
+    <string name="end_date">Data de fine</string>
+    <string name="start_date">Data de incumintzu</string>
+    <string name="shared_string_map">Mapa</string>
+    <string name="shared_string_text">Testu</string>
+    <string name="map_and_text">Mapa e testu</string>
+    <string name="shared_string_add">Annanghe</string>
+    <string name="device_name">Nùmene de su dispositivu</string>
+    <string name="shared_string_hide">Istichi</string>
+    <string name="shared_string_later">Prus a tardu</string>
+    <string name="shared_string_status">Istadu</string>
+    <string name="shared_string_disable">Disabìlita</string>
+    <string name="shared_string_save">Sarva</string>
+    <string name="shared_string_name">Nùmene</string>
+    <string name="shared_string_sort">Òrdina</string>
+    <string name="shared_string_exit">Essi</string>
+    <string name="shared_string_close">Serra</string>
+    <string name="shared_string_all">Totus</string>
+    <string name="shared_string_off">Istudadu</string>
+    <string name="shared_string_install">Installa</string>
+    <string name="shared_string_share">Cumpartzi</string>
+    <string name="shared_string_back">In dae segus</string>
+    <string name="shared_string_continue">Sighi</string>
+    <string name="shared_string_cancel">Annulla</string>
+    <string name="shared_string_settings">Impostatziones</string>
+    <string name="no_location_permission">S’aplicatzione no est autorizada a atzèdere a sos datos de positzione.</string>
+    <string name="gps_not_available">Allughe sa \"positzione\" in sas impostatziones</string>
+    <string name="osmand_service">Modalidade de isfundu</string>
+    <string name="osmand_service_descr">OsmAnd Telegram sighit a funtzionare in s’isfundu, cun s’ischermu mortu.</string>
+    <string name="shared_string_distance">Distàntzia</string>
+    <string name="share_location">Cumpartzi sa positzione</string>
+    <string name="install_osmand">Installa OsmAnd</string>
+    <string name="active_chats">Tzarradas ativas</string>
+    <string name="monitoring_is_enabled">Su monitoràgiu est abilitadu</string>
+    <string name="monitoring_is_disabled">Su monitoràgiu est disabilitadu</string>
+    <string name="time_on_the_move">tempus in movimentu</string>
+    <string name="timeline_description">Abìlita su monitoràgiu pro collire datos de su movimentu in s\'isfundu.</string>
+    <string name="send_location_as">Imbia sa positzione comente</string>
+    <string name="send_location_as_descr">Issèbera comente sos messàgios cun sa positzione tua ant a aparire.</string>
+    <string name="last_update_from_telegram">Ùrtimu agiornamentu de Telegram</string>
+    <string name="enter_another_device_name">Issèbera unu nùmene chi no as giai impreadu</string>
+    <string name="device_added_successfully">%1$s annantu.</string>
+    <string name="error_adding_new_device">Impossìbile annànghere su dispositivu nou</string>
+    <string name="enter_device_name_description">Dae unu nùmene de non prus de 200 caràteres a su dispositivu nou tuo.</string>
+    <string name="device_name_is_too_long">Nùmene de su dispositivu tropu longu</string>
+    <string name="device_name_cannot_be_empty">Su nùmene de su dispositivu non podet èssere bòidu</string>
+    <string name="share_location_as_description_second_line">Podes creare e abbaidare s\'ID de su dispositivu in su cliente de Telegram impreende su bot pro sas tzarradas %1$s. %2$s</string>
+    <string name="share_location_as_description">Si cheres cunnètere prus dispositivos a unu contu de Telegram, depes impreare unu dispositivu diferente pro cumpartzire sa positzione tua.</string>
+    <string name="last_updated_location">Ùrtima positzione agiornada:</string>
+    <string name="successfully_sent_and_updated">Imbiadu e agiornadu cun sutzessu</string>
+    <string name="not_possible_to_send_to_telegram_chats">Impossìbile imbiare a sas tzarradas de Telegram:</string>
+    <string name="waiting_for_response_from_telegram">Isetende una risposta dae Telegram</string>
+    <string name="sending_location_messages">Imbiende sa positzione</string>
+    <string name="initializing">Incumintzende</string>
+    <string name="searching_for_gps">Positzionende…</string>
+    <string name="connecting_to_the_internet">Collegamentu a ìnternet</string>
+    <string name="background_work_description">Muda sas impostatziones de otimizatzione de sa bateria pro istabilizare sa cumpartzidura de sa positzione.</string>
+    <string name="background_work">Modalidade de isfundu</string>
+    <string name="battery_optimization_description">Istuda s\'otimizatzione de sa bateria pro OsmAnd Telegram pro fàghere in modu chi non bèngiat serradu de repente cando est in s\'isfundu.</string>
+    <string name="sharing_in_background">Cumpartzidura in s\'isfundu</string>
+    <string name="go_to_settings">Bae a sas impostatziones</string>
+    <string name="not_sent_yet">Galu non imbiadu</string>
+    <string name="not_found_yet">Galu no agatadu</string>
+    <string name="re_send_location">Torra a imbiare sa positzione</string>
+    <string name="last_available_location">Ùrtima positzione disponìbile</string>
+    <string name="sharing_status">Istadu de cumpartzidura</string>
+    <string name="sharing_enabled">Cumpartzidura: Abilitada</string>
+    <string name="no_gps_connection">Peruna connessione GPS</string>
+    <string name="no_internet_connection">Peruna connessione a ìnternet</string>
+    <string name="add_device">Annanghe unu dispositivu</string>
+    <string name="share_location_as">Cumpartzi sa positzione comente</string>
+    <string name="live_now_description">Cuntatos e grupos chi cumpartzent sa positzione cun tie.</string>
+    <string name="logout_from_osmand_telegram_descr">Ses seguru de chèrrere essire dae OsmAnd Telegram pro non cumpartzire sa positzione tua o bìdere sa de àtere\?</string>
+    <string name="logout_from_osmand_telegram">Serrare sa sessione de OsmAnd Telegram\?</string>
+    <string name="by_distance">Pro distàntzia</string>
+    <string name="by_name">Pro nùmene</string>
+    <string name="by_group">Pro grupu</string>
+    <string name="shared_string_sort_by">Òrdina pro</string>
+    <string name="choose_osmand_desc">Ischerta sa versione de OsmAnd in ue sos cuntatos ant a èssere ammustrados in sa mapa.</string>
+    <string name="choose_osmand">Ischerta sa versione de OsmAnd de impreare</string>
+    <string name="disable_all_sharing_desc">Istuda sa cumpartzidura de sa positzione pro totu sas tzarradas ischertadas (%1$d).</string>
+    <string name="disable_all_sharing">Istuda totu sas cumpartziduras</string>
+    <string name="turn_off_all">Istuda totu</string>
+    <string name="time_ago">a como</string>
+    <string name="last_response">Ùrtima risposta</string>
+    <string name="shared_string_group">Grupu</string>
+    <string name="logout_no_internet_msg">Collega·ti a ìnternet pro essire in manera curreta dae Telegram.</string>
+    <string name="disconnect_from_telegram_desc">Pro bogare s\'atzessu a sa cumpartzidura de sa positzione. Aberi Telegram, bae a Cunfiguratziones → Riservadesa e Seguresa → Sessiones ativas, e acaba sa sessione de OsmAnd Telegram.</string>
+    <string name="disconnect_from_telegram">Comente istudare sa cumpartzidura de sa positzione de OsmAnd dae Telegram</string>
+    <string name="logout_help_desc">Comente istudare sa cumpartzidura de sa positzione de OsmAnd dae Telegram</string>
+    <string name="connected_account">Contu connessu</string>
+    <string name="shared_string_account">Contu</string>
+    <string name="in_time">in %1$s</string>
+    <string name="osmand_connect_desc">Issèbera sa versione de OsmAnd chi OsmAnd Telegram at a impreare pro ammustrare sas positziones.</string>
+    <string name="location_history_desc">Istichi sos cuntatos chi non si sunt mòvidos in unu perìodu de tempus determinadu.</string>
+    <string name="location_history">Cronologia de sas positziones</string>
+    <string name="stale_location_desc">S\'ùrtima borta chi unu cuntatu s\'est mòvidu.</string>
+    <string name="stale_location">Non in movimentu</string>
+    <string name="send_my_location_desc">Imposta s\'intervallu mìnimu pro cumpartzire sa positzione.</string>
+    <string name="send_my_location">Imbia sa positzione mea</string>
+    <string name="gps_and_location">Positzione</string>
+    <string name="sharing_time">Tempus de cumpartzidura</string>
+    <string name="expire_at">Iscadit a sas</string>
+    <string name="stop_sharing_all">Sa cumpartzidura est alluta (istuda)</string>
+    <string name="turn_off_location_sharing">Istuda sa cumpartzidura de sa positzione</string>
+    <string name="open_osmand">Aberi OsmAnd</string>
+    <string name="shared_string_live">In direta</string>
+    <string name="shared_string_bot">Bot</string>
+    <string name="get_telegram_title">Registratzione in Telegram</string>
+    <string name="get_telegram_account_first">Tenes bisòngiu de unu contu de Telegram pro impreare sa cumpartzidura de sa positzione.</string>
+    <string name="get_telegram_description_continue">Pro praghere installa Telegram e imposta unu contu.</string>
+    <string name="get_telegram_after_creating_account">A pustis as a pòdere impreare s\'aplicatzione.</string>
+    <string name="already_registered_in_telegram">Tenes bisòngiu de unu contu registradu de Telegram e de unu nùmeru de telèfono</string>
+    <string name="do_not_have_telegram">Non tèngio unu contu de Telegram</string>
+    <string name="enter_phone_number">Inserta unu nùmeru de telèfono</string>
+    <string name="enter_authentication_code">Inserta su còdighe de autenticatzione</string>
+    <string name="set_visible_time_for_all">Imposta un\'oràriu visìbile pro totus</string>
+    <string name="hours_and_minutes_format">%1$d h %2$d m</string>
+    <string name="minutes_format">%1$d m</string>
+    <string name="hours_format">%1$d h</string>
+    <string name="visible_time_for_all">Oràriu visìbile pro totus</string>
+    <string name="yard">yd</string>
+    <string name="foot">ft</string>
+    <string name="mile">mi</string>
+    <string name="km">km</string>
+    <string name="m">m</string>
+    <string name="nm">nmi</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="nm_h">nmi/h</string>
+    <string name="m_s">m/s</string>
+    <string name="km_h">km/h</string>
+    <string name="mile_per_hour">mph</string>
+    <string name="si_kmh">Chilòmetros a s\'ora</string>
+    <string name="si_mph">Mìglios a s\'ora</string>
+    <string name="si_m_s">Metros a su segundu</string>
+    <string name="si_min_km">Minutos a su chilòmetru</string>
+    <string name="si_min_m">Minutos a su mìgliu</string>
+    <string name="si_nm_h">Mìglios nàuticos a s\'ora (knot)</string>
+    <string name="si_mi_feet">Mìglios/pedes</string>
+    <string name="si_mi_yard">Mìglios/iardas</string>
+    <string name="si_km_m">Chilòmetros/metros</string>
+    <string name="si_nm">Mìglios nàuticos</string>
+    <string name="si_mi_meters">Mìglios/metros</string>
+    <string name="shared_string_hour_short">h</string>
+    <string name="shared_string_minute_short">min</string>
+    <string name="shared_string_second_short">seg</string>
+    <string name="my_location">Positzione mea</string>
+    <string name="timeline">Lìnia temporale</string>
+    <string name="osmand_connect">Connessione OsmAnd</string>
+    <string name="set_time_description">Imposta su tempus in su cale sos cuntatos e sos grupos chi as ischertadu ant a bìdere sa positzione tua in direta.</string>
+    <string name="set_time">Imposta su tempus</string>
+    <string name="location_sharing_description">Ischerta sos cuntatos e sos grupos cun sos cales cheres cumpartzire sa positzione.</string>
+    <string name="my_location_search_hint">Chirca: grupu o cuntatu</string>
+    <string name="start_location_sharing">Cumpartzi sa positzione</string>
+    <string name="show_on_map">Ammustra in sa mapa</string>
+    <string name="app_name">OsmAnd Telegram</string>
+    <string name="phone_number_title">Nùmeru de telèfono</string>
+    <string name="phone_number_descr">Nùmeru de telèfono in formadu internatzionale</string>
+    <string name="shared_string_password">Crae de intrada</string>
+    <string name="enter_code">Inserta su còdighe</string>
+    <string name="authentication_code">Còdighe de autenticatzione</string>
+    <string name="authentication_code_descr">Telegram t\'at imbiadu unu còdighe pro permìtere a OsmAnd de intrare in su contu tuo.</string>
+    <string name="enter_password">Inserta sa crae</string>
+    <string name="password_descr">Crae de Telegram</string>
+    <string name="shared_string_login">Intra</string>
+    <string name="shared_string_logout">Essi</string>
+    <string name="initialization">Incumintzende</string>
+    <string name="logging_out">Essende</string>
+    <string name="closing">Serrende</string>
+    <string name="gps_network_not_enabled">Allùghere sa \"Positzione\"\?</string>
+    <string name="not_logged_in">No as fatu s\'atzessu</string>
+    <string name="location_service_no_gps_available">Ischerta unu de sos frunidores de sa positzione pro la cumpartzire.</string>
+    <string name="sharing_location">Cumpartzende sa positzione</string>
+    <string name="process_service">Servìtziu de OsmAnd Telegram</string>
+    <string name="osmand_logo">Logo de OsmAnd</string>
+    <string name="install_osmand_dialog_message">In antis depes installare sa versione de badas o a pagamentu de OsmAnd</string>
+    <string name="show_users_on_map">Ammustra sos impreadores in sa mapa</string>
+    <string name="shared_string_authorization">Autorizatzione</string>
+    <string name="shared_string_authorization_descr">Pro praghere inserta su nùmeru de telèfono tuo in formadu internatzionale</string>
+    <string name="shared_string_welcome">Bene bènnidu</string>
+    <string name="welcome_descr">Sa <b>Cumpartzidura de sa Positzione de OsmAnd</b> ti permitit de cumpartzire sa positzione tua e de bìdere cussa de sos àteros in OsmAnd.<br/><br/>S\'aplicatzione impreat s\'API de Telegram e tenes bisòngiu de unu contu de Telegram.</string>
+    <string name="live_now">In direta como</string>
+    <string name="gps_points_in_buffer">imbiadu (%1$d in sa memòria tampone)</string>
+    <string name="points_size">%1$d puntos</string>
+    <string name="shared_string_date">Data</string>
+    <string name="shared_string_collected">Collidos</string>
+    <string name="gps_points">Puntos GPS</string>
+    <string name="shared_string_sent">Imbiadu</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-sl/strings.xml b/OsmAnd-telegram/res/values-sl/strings.xml
new file mode 100644
index 0000000000..980ec22611
--- /dev/null
+++ b/OsmAnd-telegram/res/values-sl/strings.xml
@@ -0,0 +1,93 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="enter_another_device_name">Izberite ime, ki ga še niste uporabili</string>
+	<string name="device_added_successfully">Naprava %1$s je uspešno dodana.</string>
+	<string name="shared_string_add">Dodaj</string>
+	<string name="error_adding_new_device">Ni mogoče dodati nove naprave</string>
+	<string name="enter_device_name_description">Ime nove naprave je omejeno z 200 znaki.</string>
+	<string name="device_name_is_too_long">Ime naprave je predolgo</string>
+	<string name="device_name_cannot_be_empty">Ime naprave mora biti dodeljeno</string>
+	<string name="device_name">Ime naprave</string>
+	<string name="shared_string_hide">Skrij</string>
+	<string name="share_location_as_description_second_line">ID naprave je mogoče ustvariti in pogledati v odjemalcu Telegram z uporabo klepetalnega robota %1$s. %2$s</string>
+	<string name="last_updated_location">Nazadnje zabeleženo mesto:</string>
+	<string name="successfully_sent_and_updated">Podatki so uspešno poslani in posodobljeni.</string>
+	<string name="not_possible_to_send_to_telegram_chats">Ni mogoče pošiljati klepetov Telegram:</string>
+	<string name="waiting_for_response_from_telegram">Poteka čakanje na odziv programa Telegram</string>
+	<string name="sending_location_messages">Pošiljanje podatkov o trenutnem mestu</string>
+	<string name="initializing">Začenjanje</string>
+	<string name="searching_for_gps">Poteka določevanje mesta …</string>
+	<string name="connecting_to_the_internet">Poteka vzpostavljanje povezave na internet</string>
+	<string name="go_to_settings">Skoči na nastavitve</string>
+	<string name="shared_string_later">Kasneje</string>
+	<string name="not_sent_yet">Ni še poslano</string>
+	<string name="not_found_yet">Ni še najdeno</string>
+	<string name="re_send_location">Ponovno pošiljanje trenutnega mesta</string>
+	<string name="last_available_location">Zadnje določeno mesto</string>
+	<string name="sharing_status">Objavljanje stanja</string>
+	<string name="sharing_enabled">Objavljanje: omogočeno</string>
+	<string name="shared_string_status">Stanje</string>
+	<string name="no_gps_connection">Ni povezave z GPS</string>
+	<string name="no_internet_connection">Ni vzpostavljene internetne povezave</string>
+	<string name="shared_string_disable">Onemogoči</string>
+	<string name="shared_string_save">Shrani</string>
+	<string name="add_device">Dodaj napravo</string>
+	<string name="share_location_as">Objavi trenutno mesto kot</string>
+	<string name="logout_from_osmand_telegram">Ali se želite odjaviti iz storitve OsmAnd Telegram\?</string>
+	<string name="shared_string_name">Ime</string>
+	<string name="by_distance">Po razdalji</string>
+	<string name="by_name">Po imenu</string>
+	<string name="by_group">Po skupini</string>
+	<string name="shared_string_sort">Razvrsti</string>
+	<string name="shared_string_sort_by">Razvrsti po</string>
+	<string name="choose_osmand">Izbor različice OsmAnd za uporabo</string>
+	<string name="disable_all_sharing">Onemogoči vse objavljanje</string>
+	<string name="turn_off_all">Izklopi vse</string>
+	<string name="shared_string_exit">Končaj</string>
+	<string name="last_response">Zadnji odziv</string>
+	<string name="shared_string_group">Skupina</string>
+	<string name="logout_no_internet_msg">Pred odjavo storitve Telegram je treba vzpostaviti internetno povezavo.</string>
+	<string name="shared_string_close">Zapri</string>
+	<string name="connected_account">Povezan račun</string>
+	<string name="shared_string_account">Račun</string>
+	<string name="in_time">v %1$s</string>
+	<string name="show_on_map">Pokaži na zemljevidu</string>
+	<string name="app_name">OsmAnd Telegram</string>
+	<string name="phone_number_title">Telefonska številka</string>
+	<string name="phone_number_descr">Telefonska številka v mednarodnem zapisu</string>
+	<string name="shared_string_password">Geslo</string>
+	<string name="enter_code">Koda</string>
+	<string name="authentication_code">Overitvena koda</string>
+	<string name="install_osmand">Namesti program OsmAnd</string>
+	<string name="show_users_on_map">Pokaži uporabnike na zemljevidu</string>
+	<string name="active_chats">Dejavni klepeti</string>
+	<string name="shared_string_authorization">Overitev</string>
+	<string name="shared_string_authorization_descr">Telefonsko številko programa Telegram je treba vpisati v mednarodnem zapisu</string>
+	<string name="shared_string_welcome">Dobrodošli</string>
+
+	<string name="yard">yd</string>
+	<string name="foot">ft</string>
+	<string name="mile">mi</string>
+	<string name="km">km</string>
+	<string name="m">m</string>
+	<string name="nm">nmi</string>
+	<string name="min_mile">min/m</string>
+	<string name="min_km">min/km</string>
+	<string name="nm_h">nmi/h</string>
+	<string name="m_s">m/s</string>
+	<string name="km_h">km/h</string>
+	<string name="mile_per_hour">mph</string>
+	<string name="si_kmh">Kilometri na uro</string>
+	<string name="si_mph">Milje na uro</string>
+	<string name="si_m_s">Metri na sekundo</string>
+	<string name="si_min_km">Minute na kilometer</string>
+	<string name="si_min_m">Minute na miljo</string>
+	<string name="si_nm_h">Navtične milje na uro (vozli)</string>
+	<string name="si_mi_feet">Milje/Čevlji</string>
+	<string name="si_mi_yard">Milje/Jardi</string>
+	<string name="si_km_m">Kilometri/Metri</string>
+	<string name="si_nm">Navtične milje</string>
+	<string name="si_mi_meters">Milje/Metri</string>
+	<string name="shared_string_hour_short">h</string>
+	<string name="shared_string_minute_short">min</string>
+	<string name="shared_string_second_short">sek</string>
+	</resources>
diff --git a/OsmAnd-telegram/res/values-uk/strings.xml b/OsmAnd-telegram/res/values-uk/strings.xml
new file mode 100644
index 0000000000..91c5164ce2
--- /dev/null
+++ b/OsmAnd-telegram/res/values-uk/strings.xml
@@ -0,0 +1,163 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="enter_another_device_name">Оберіть назву, яку ви ще не використовували</string>
+	<string name="device_added_successfully">%1$s додано.</string>
+	<string name="shared_string_add">Додати</string>
+	<string name="error_adding_new_device">Не вдалося додати новий пристрій</string>
+	<string name="enter_device_name_description">Назвіть новий пристрій, максимум 200 символів.</string>
+	<string name="device_name_is_too_long">Назва пристрою занадто довге</string>
+	<string name="device_name_cannot_be_empty">Назва пристрою не може бути порожнім</string>
+	<string name="device_name">Назва пристрою</string>
+	<string name="shared_string_hide">Приховати</string>
+	<string name="share_location_as_description_second_line">Ви можете створити та переглянути ідентифікатор пристрою в клієнті telegram, використовуючи %1$s чат боту. %2$s</string>
+	<string name="share_location_as_description">Якщо бажаєте під\'єднати декілька пристроїв до одного облікового запису Telegram, Вам необхідно використовувати інший пристрій для трансляції позиції.</string>
+	<string name="last_updated_location">Крайнє оновлення позиціювання:</string>
+	<string name="successfully_sent_and_updated">Успішно надіслано та оновлено</string>
+	<string name="not_possible_to_send_to_telegram_chats">Неможливо надіслати чати Telegram:</string>
+	<string name="waiting_for_response_from_telegram">Очікування відповіді від Telegram</string>
+	<string name="sending_location_messages">Надсилання позиціювання</string>
+	<string name="initializing">Запуск</string>
+	<string name="searching_for_gps">Позиціювання…</string>
+	<string name="connecting_to_the_internet">Зʼєднання із інтернетом</string>
+	<string name="background_work_description">Змініть налаштування оптимізації батареї, для стабільної трансляції позиціювання.</string>
+	<string name="background_work">Робота у фоні</string>
+	<string name="battery_optimization_description">Вимкніть оптимізацію батареї для OsmAnd Telegram, аби додаток не вимикався у фоновому режимі.</string>
+	<string name="sharing_in_background">Трансляція у фоновому режимі</string>
+	<string name="go_to_settings">Перейти до налаштувань</string>
+	<string name="shared_string_later">Пізніше</string>
+	<string name="not_sent_yet">Ще не надіслано</string>
+	<string name="not_found_yet">Ще не знайдено</string>
+	<string name="re_send_location">Повторно надіслати позицію</string>
+	<string name="last_available_location">Крайнє доступне позиціювання</string>
+	<string name="sharing_status">Стан трансляції</string>
+	<string name="sharing_enabled">Трансляція: Увімкнута</string>
+	<string name="shared_string_status">Статус</string>
+	<string name="no_gps_connection">Немає зʼєднання із GPS</string>
+	<string name="no_internet_connection">Немає зʼєднання із інтернетом</string>
+	<string name="shared_string_disable">Вимкнути</string>
+	<string name="shared_string_save">Зберегти</string>
+	<string name="add_device">Додати пристрій</string>
+	<string name="share_location_as">Поділитися позицією як</string>
+	<string name="live_now_description">Контакти та групи, які транслюють свою позицію Вам.</string>
+	<string name="logout_from_osmand_telegram_descr">Ви впевнені, що бажаєте вийти з OsmAnd Telegram\? Оскільки не зможете транслювати свою позицію чи бачити позицію інших.</string>
+	<string name="logout_from_osmand_telegram">Вийти з OsmAnd Telegram\?</string>
+	<string name="shared_string_name">Імʼя</string>
+	<string name="by_distance">За відстанню</string>
+	<string name="by_name">За імʼям</string>
+	<string name="by_group">За групою</string>
+	<string name="shared_string_sort">Впорядкувати</string>
+	<string name="shared_string_sort_by">Впорядкувати за</string>
+	<string name="choose_osmand_desc">Оберіть версію OsmAnd, в якій будуть показуватись контакти.</string>
+	<string name="choose_osmand">Оберіть версію OsmAnd для використання</string>
+	<string name="disable_all_sharing_desc">Вимкнути трансляцію позиції усім обраним чатам (%1$d).</string>
+	<string name="disable_all_sharing">Вимкнути всі трансляції</string>
+	<string name="turn_off_all">Вимкнути все</string>
+	<string name="shared_string_exit">Вихід</string>
+	<string name="time_ago">тому</string>
+	<string name="last_response">Остання відповідь</string>
+	<string name="shared_string_group">Група</string>
+	<string name="logout_no_internet_msg">Зʼєднайтеся із інтернетом, аби коректно вийти з Telegram.</string>
+	<string name="shared_string_close">Закрити</string>
+	<string name="disconnect_from_telegram_desc">Скасування дозволу до трансляції позиції. Відкрийте Telegram, перейдіть до пункту Налаштування → Конфіденційність та безпека → Активні сесії, та завершіть сеанс OsmAnd Telegram.</string>
+	<string name="disconnect_from_telegram">Як вимкнути OsmAnd трансляцію позиції з Telegram</string>
+	<string name="logout_help_desc">Як вимкнути OsmAnd трансляцію позиції з Telegram</string>
+	<string name="connected_account">Повʼязаний обліковий запис</string>
+	<string name="shared_string_account">Обліковий запис</string>
+	<string name="in_time">через %1$s</string>
+	<string name="osmand_connect_desc">Оберіть версію OsmAnd, яку OsmAnd Telegram буде використовувати для показу позицій на карті.</string>
+	<string name="osmand_connect">Підключення OsmAnd</string>
+	<string name="location_history_desc">Приховайте контакти, які не рухалися на протязі визначеного проміжку часу.</string>
+	<string name="location_history">Історія позицій</string>
+	<string name="send_my_location">Надіслати мою позицію</string>
+	<string name="gps_and_location">Позиція</string>
+	<string name="sharing_time">Час трансляцій</string>
+        <string name="stop_sharing_all">Трансляція активна (вимкнути)</string>
+	<string name="turn_off_location_sharing">Вимкнути трансляцію</string>
+	<string name="open_osmand">Відкрити OsmAnd</string>
+	<string name="shared_string_bot">Бот</string>
+	<string name="get_telegram_title">Реєстрація в Telegram</string>
+	<string name="get_telegram_account_first">Необхідно мати обліковий запис Telegram для трансляції позиціювання.</string>
+	<string name="get_telegram_description_continue">Будь ласка, встановіть Telegram та налаштуйте обліковий запис.</string>
+	<string name="get_telegram_after_creating_account">Тоді Ви зможете використовувати цей додаток.</string>
+	<string name="shared_string_all">Всі</string>
+	<string name="shared_string_off">Вимкнути</string>
+	<string name="already_registered_in_telegram">Вам необхідно мати зареєстрований обліковий запис Telegram та номер телефону</string>
+	<string name="do_not_have_telegram">Я не маю облікового запису Telegram</string>
+	<string name="enter_phone_number">Введіть номер телефону</string>
+	<string name="enter_authentication_code">Введіть код аутентифікації</string>
+	<string name="hours_and_minutes_format">%1$d г %2$d х</string>
+	<string name="minutes_format">%1$d х</string>
+	<string name="hours_format">%1$d г</string>
+	<string name="shared_string_install">Встановити</string>
+	<string name="shared_string_share">Поділитися</string>
+	<string name="shared_string_back">Назад</string>
+	<string name="set_time">Оберіть час</string>
+	<string name="location_sharing_description">Оберіть контакти та групи, яким ви транслюватимете свою позицію.</string>
+	<string name="my_location_search_hint">Пошук: Група або контакт</string>
+	<string name="start_location_sharing">Транслювати позицію</string>
+	<string name="show_on_map">Показати на карті</string>
+	<string name="app_name">OsmAnd Telegram</string>
+	<string name="phone_number_title">Номер телефону</string>
+	<string name="phone_number_descr">Номер телефону у міжнародному форматі</string>
+	<string name="shared_string_password">Пароль</string>
+	<string name="enter_code">Введіть код</string>
+	<string name="authentication_code">Код аутентифікації</string>
+	<string name="authentication_code_descr">Telegram надіслав Вам код, аби OsmAnd увійшов до вашого облікового запису.</string>
+	<string name="enter_password">Введіть пароль</string>
+	<string name="password_descr">Пароль Telegram</string>
+	<string name="shared_string_login">Увійти</string>
+	<string name="shared_string_logout">Вийти</string>
+	<string name="initialization">Запуск</string>
+	<string name="logging_out">Вихід із системи</string>
+	<string name="closing">Закриття</string>
+	<string name="gps_network_not_enabled">Увімкнути «Позиціювання»\?</string>
+	<string name="not_logged_in">Ви не увійшли до системи</string>
+	<string name="shared_string_continue">Продовжити</string>
+	<string name="shared_string_cancel">Скасувати</string>
+	<string name="shared_string_settings">Налаштування</string>
+	<string name="no_location_permission">Додаток не має дозволу до отримання даних позиціювання.</string>
+	<string name="gps_not_available">Будь ласка, увімкніть «Позиціювання» у системних налаштуваннях</string>
+	<string name="osmand_service">Фоновий режим</string>
+	<string name="osmand_service_descr">OsmAnd працює у фоновому режимі з вимкненим екраном.</string>
+	<string name="shared_string_distance">Відстань</string>
+	<string name="share_location">Поділитися позицією</string>
+	<string name="sharing_location">Трансляція позиції</string>
+	<string name="install_osmand_dialog_message">Вам спершу необхідно встановити безкоштовну, чи платну версію OsmAnd</string>
+	<string name="install_osmand">Встановити OsmAnd</string>
+	<string name="show_users_on_map">Показувати користувачів на карті</string>
+	<string name="active_chats">Активні чати</string>
+	<string name="shared_string_authorization">Авторизація</string>
+	<string name="shared_string_authorization_descr">Будь ласка, введіть Ваш Telegram номер телефону у міжнародному форматі</string>
+	<string name="shared_string_welcome">Ласкаво просимо</string>
+
+	<string name="yard">ярд</string>
+	<string name="foot">фут</string>
+	<string name="mile">мл</string>
+	<string name="km">км</string>
+	<string name="m">м</string>
+	<string name="nm">мор.м.</string>
+	<string name="min_mile">хв/м</string>
+	<string name="min_km">хв/км</string>
+	<string name="nm_h">вузл</string>
+	<string name="m_s">м/с</string>
+	<string name="km_h">км/г</string>
+	<string name="mile_per_hour">мл/г</string>
+	<string name="si_kmh">Кілометрів за годину</string>
+	<string name="si_mph">Миль на годину</string>
+	<string name="si_m_s">Метрів за секунду</string>
+	<string name="si_min_km">Хвилин за кілометр</string>
+	<string name="si_min_m">Хвилин за милю</string>
+	<string name="si_nm_h">Морських миль на годину (вузол)</string>
+	<string name="si_mi_feet">Милі, фути</string>
+	<string name="si_mi_yard">Милі, ярди</string>
+	<string name="si_km_m">Кілометри, метри</string>
+	<string name="si_nm">Морські милі</string>
+	<string name="si_mi_meters">Милі, метри</string>
+	<string name="shared_string_hour_short">г</string>
+	<string name="shared_string_minute_short">хв</string>
+	<string name="shared_string_second_short">сек</string>
+	<string name="welcome_descr"><b>OsmAnd Location Sharing</b> дозволяє Вам транслювати свою позицію та бачити позицію інших в OsmAnd.<br/><br/>Додаток використовує Telegram API та потребує облікового запису Telegram.</string>
+	<string name="my_location">Моя позиція</string>
+	<string name="send_my_location_desc">Встановіть мінімальний інтервал між надсиланням позиції.</string>
+	<string name="expire_at">Діє до</string>
+	<string name="last_update_from_telegram">Нещодавнє оновлення з Telegram</string>
+	</resources>
diff --git a/OsmAnd-telegram/res/values-zh-rTW/strings.xml b/OsmAnd-telegram/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000000..b2ee1c5c00
--- /dev/null
+++ b/OsmAnd-telegram/res/values-zh-rTW/strings.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="send_location_as">傳送位置為</string>
+    <string name="send_location_as_descr">選擇您所在位置怎樣的訊息外觀。</string>
+    <string name="shared_string_map">地圖</string>
+    <string name="shared_string_text">文字</string>
+    <string name="map_and_text">地圖與文字</string>
+    <string name="device_added_successfully">%1$s 已新增。</string>
+    <string name="shared_string_add">新增</string>
+    <string name="error_adding_new_device">無法增加新的裝置</string>
+    <string name="enter_device_name_description">命名您的新裝置，最多 200 個字符。</string>
+    <string name="device_name_is_too_long">裝置名稱太長</string>
+    <string name="device_name_cannot_be_empty">裝置名稱不能為空白</string>
+    <string name="device_name">裝置名稱</string>
+    <string name="shared_string_hide">隱藏</string>
+    <string name="last_updated_location">上次更新的位置：</string>
+    <string name="sending_location_messages">正在傳送位置</string>
+    <string name="initializing">正在啟動</string>
+    <string name="searching_for_gps">正在定位…</string>
+    <string name="connecting_to_the_internet">正在連線至網路</string>
+    <string name="background_work">背景工作</string>
+    <string name="sharing_in_background">在背景分享</string>
+    <string name="go_to_settings">轉至設定</string>
+    <string name="shared_string_later">隨後</string>
+    <string name="not_sent_yet">尚未傳送</string>
+    <string name="not_found_yet">尚未找到</string>
+    <string name="re_send_location">重新傳送位置</string>
+    <string name="last_available_location">最後可用的位置</string>
+    <string name="sharing_status">分享狀態</string>
+    <string name="sharing_enabled">分享：已啟用</string>
+    <string name="shared_string_status">狀態</string>
+    <string name="no_gps_connection">沒有 GPS 連接</string>
+    <string name="no_internet_connection">沒有網際網路連線</string>
+    <string name="shared_string_disable">停用</string>
+    <string name="shared_string_save">儲存</string>
+    <string name="add_device">新增裝置</string>
+    <string name="share_location_as">分享位置為</string>
+    <string name="shared_string_name">名稱</string>
+    <string name="by_distance">按距離</string>
+    <string name="by_name">按名稱</string>
+    <string name="by_group">按群組</string>
+    <string name="shared_string_sort">分類</string>
+    <string name="shared_string_sort_by">排序方式</string>
+    <string name="disable_all_sharing">停用所有分享</string>
+    <string name="turn_off_all">關閉全部</string>
+    <string name="shared_string_exit">離開</string>
+    <string name="last_update_from_telegram">Telegram 的最後一次更新</string>
+    <string name="enter_another_device_name">選擇一個尚未使用的名稱</string>
+    <string name="share_location_as_description_second_line">您可以使用 %1$s 聊天機器人在電報用戶端中創建和查看裝置 ID。 %2$s</string>
+    <string name="share_location_as_description">如果要將多個設備連接到一個 Telegram 帳戶，則需要使用不同的設備來共用您的位置。</string>
+    <string name="successfully_sent_and_updated">已成功發送和更新</string>
+    <string name="not_possible_to_send_to_telegram_chats">無法發送到 Telegram 聊天：</string>
+    <string name="waiting_for_response_from_telegram">等待 Telegram 回復</string>
+    <string name="background_work_description">更改電池最佳化設置以穩定位置共用。</string>
+    <string name="battery_optimization_description">關閉 OsmAnd Telegram 的電池最佳化，這樣在後臺時就不會突然關閉。</string>
+    <string name="live_now_description">連絡人和群組共用位置給您。</string>
+    <string name="logout_from_osmand_telegram_descr">你確定要登出 OsmAnd Telegram，這樣你就不能共用位置或看到其他人的位置嗎？</string>
+    <string name="logout_from_osmand_telegram">要登出 OsmAnd Telegram 嗎\?</string>
+    <string name="choose_osmand_desc">選擇將在地圖上顯示連絡人的 OsmAnd 版本。</string>
+    <string name="choose_osmand">選擇要使用的 OsmAnd 版本</string>
+    <string name="disable_all_sharing_desc">關閉所有選定聊天的位置共用(%1$d)。</string>
+    <string name="time_ago">前</string>
+    <string name="last_response">上次回應</string>
+    <string name="shared_string_group">群組</string>
+    <string name="logout_no_internet_msg">連接到網路以正確登出 Telegram。</string>
+    <string name="shared_string_close">關閉</string>
+    <string name="disconnect_from_telegram_desc">撤銷位置共用訪問。打開 Telegram，進入設定→隱私和安全→會話，並終 OsmAnd Telegram 會話。</string>
+    <string name="disconnect_from_telegram">如何關閉 Telegram 中的 OsmAnd 交給位置共用</string>
+    <string name="logout_help_desc">如何關閉 Telegram 中的 OsmAnd 交給位置共用</string>
+    <string name="connected_account">已連接帳戶</string>
+    <string name="shared_string_account">帳戶</string>
+    <string name="in_time">在 %1$s</string>
+    <string name="osmand_connect_desc">選擇 OsmAnd 和版本的 OsmAnd Telegram 用於顯示位置。</string>
+    <string name="osmand_connect">OsMand 連接</string>
+    <string name="location_history_desc">隱藏在給定時間內未移動的連絡人。</string>
+    <string name="location_history">位置歷史記錄</string>
+    <string name="stale_location_desc">上次移動連絡人的時間。</string>
+    <string name="stale_location">沒有移動
+\n</string>
+    <string name="send_my_location_desc">設置位置共用的最小間隔。</string>
+    <string name="send_my_location">發送我的位置</string>
+    <string name="gps_and_location">位置</string>
+    <string name="sharing_time">共用時間</string>
+    <string name="expire_at">到期</string>
+    <string name="stop_sharing_all">共用已打開 (關閉)</string>
+    <string name="turn_off_location_sharing">關閉位置共用</string>
+    <string name="open_osmand">打開 OsmAnd</string>
+    <string name="shared_string_live">即時</string>
+    <string name="shared_string_bot">提供</string>
+    <string name="get_telegram_title">註冊 Telegram</string>
+    <string name="get_telegram_account_first">您需要一個 Telegram 帳戶才能使用位置共用。</string>
+    <string name="get_telegram_description_continue">請安裝 Telegram 並建立帳戶。</string>
+    <string name="get_telegram_after_creating_account">然後您可以使用這個應用程式。</string>
+    <string name="shared_string_all">所有</string>
+    <string name="shared_string_off">關閉</string>
+    <string name="already_registered_in_telegram">你需要一個 Telegram 帳號和電話號碼</string>
+    <string name="do_not_have_telegram">我沒有 Telegram 帳戶</string>
+    <string name="enter_phone_number">添加電話號碼</string>
+    <string name="enter_authentication_code">輸入身份驗證程式碼</string>
+    <string name="set_visible_time_for_all">為所有人設定可見時間</string>
+    <string name="hours_and_minutes_format">%1$d 時 %2$d 分</string>
+    <string name="minutes_format">%1$d 分</string>
+    <string name="hours_format">%1$d 時</string>
+    <string name="shared_string_install">安裝</string>
+    <string name="shared_string_share">分享</string>
+    <string name="shared_string_back">返回</string>
+    <string name="visible_time_for_all">所有人的可見時間</string>
+    <string name="set_time_description">設置所選連絡人和組即時查看您的位置的時間。</string>
+    <string name="set_time">設定時間</string>
+    <string name="location_sharing_description">選擇要共用位置的連絡人和群組。</string>
+    <string name="my_location_search_hint">搜尋：群組或連絡人</string>
+    <string name="start_location_sharing">共用位置</string>
+    <string name="show_on_map">在地圖上顯示</string>
+    <string name="app_name">OsmAnd Telegram</string>
+    <string name="phone_number_title">電話號碼</string>
+    <string name="phone_number_descr">國際格式的電話號碼</string>
+    <string name="shared_string_password">密碼</string>
+    <string name="enter_code">輸入代碼</string>
+    <string name="authentication_code">身份驗證代碼</string>
+    <string name="authentication_code_descr">Telegram 給你發了一個代碼，要求 OsmAnd 登入你的帳戶。</string>
+    <string name="enter_password">輸入密碼</string>
+    <string name="password_descr">Telegram 密碼</string>
+    <string name="shared_string_login">登入</string>
+    <string name="shared_string_logout">登出</string>
+    <string name="initialization">正在啟動</string>
+    <string name="logging_out">已登出</string>
+    <string name="closing">關閉</string>
+    <string name="gps_network_not_enabled">打開“位置”？</string>
+    <string name="not_logged_in">您沒有登入</string>
+    <string name="shared_string_continue">繼續</string>
+    <string name="shared_string_cancel">取消</string>
+    <string name="shared_string_settings">設定</string>
+    <string name="no_location_permission">應用程式沒有存取位置數據的許可權。</string>
+    <string name="gps_not_available">請在系統設置中打開“位置”</string>
+    <string name="location_service_no_gps_available">選擇一個位置提供商來共享您的位置。</string>
+    <string name="osmand_service">背景模式</string>
+    <string name="osmand_service_descr">當螢幕關閉後，讓 OsmAnd 在背景運行。</string>
+    <string name="shared_string_distance">距離</string>
+    <string name="share_location">共用位置</string>
+    <string name="sharing_location">共用位置</string>
+    <string name="process_service">OsmAnd Telegram 伺服器</string>
+    <string name="osmand_logo">OsmAnd 圖示</string>
+    <string name="install_osmand_dialog_message">您需要先安裝免費或付費版本的 OsmAnd</string>
+    <string name="install_osmand">安裝 OsMand</string>
+    <string name="show_users_on_map">在地圖上顯示用戶</string>
+    <string name="active_chats">主動聊天</string>
+    <string name="shared_string_authorization">授權</string>
+    <string name="shared_string_authorization_descr">請以國際格式輸入 Telegram 電話號碼</string>
+    <string name="shared_string_welcome">歡迎</string>
+    <string name="yard">碼</string>
+    <string name="foot">呎</string>
+    <string name="mile">哩</string>
+    <string name="km">公里</string>
+    <string name="m">公尺</string>
+    <string name="nm">浬</string>
+    <string name="min_mile">分/公尺</string>
+    <string name="min_km">分/公里</string>
+    <string name="nm_h">浬/時</string>
+    <string name="m_s">公尺/秒</string>
+    <string name="km_h">公里/小時</string>
+    <string name="mile_per_hour">哩/小時</string>
+    <string name="si_kmh">公里每小時</string>
+    <string name="si_mph">英里每小時</string>
+    <string name="si_m_s">公尺每秒</string>
+    <string name="si_min_km">分鐘每公里</string>
+    <string name="si_min_m">分鐘每英里</string>
+    <string name="si_nm_h">浬每小時 (節)</string>
+    <string name="si_mi_feet">英哩/英呎</string>
+    <string name="si_mi_yard">英哩/碼</string>
+    <string name="si_km_m">公里/公尺</string>
+    <string name="si_nm">海浬</string>
+    <string name="si_mi_meters">英里/米</string>
+    <string name="shared_string_hour_short">時</string>
+    <string name="shared_string_minute_short">分</string>
+    <string name="shared_string_second_short">秒</string>
+    <string name="welcome_descr"><b>OsmAnd 位置共用</b>可以讓您共用您的位置，並在 OsmAnd 中看到其他人的位置。<br/><br/>該應用程式使用電報 API，你需要一個 Telegram 帳戶。</string>
+    <string name="my_location">我的位置</string>
+    <string name="live_now">即時狀況</string>
+    <string name="monitoring_is_enabled">監視已啟用</string>
+    <string name="monitoring_is_disabled">監視已停用</string>
+    <string name="time_on_the_move">移動時間</string>
+    <string name="average_altitude">平均海拔</string>
+    <string name="average_speed">平均速率</string>
+    <string name="open_in_osmand">在 OsmAnd 中開啟</string>
+    <string name="end_date">結束日期</string>
+    <string name="start_date">開始日期</string>
+    <string name="timeline_description">啟用監視以在背景蒐集移動資料。</string>
+    <string name="timeline">時間軸</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values/dimens.xml b/OsmAnd-telegram/res/values/dimens.xml
index 6b2139f3a5..7bd8b000db 100644
--- a/OsmAnd-telegram/res/values/dimens.xml
+++ b/OsmAnd-telegram/res/values/dimens.xml
@@ -52,6 +52,9 @@
 	<dimen name="my_location_text_sides_margin">32dp</dimen>
 	<dimen name="my_location_user_icon_size">60dp</dimen>
 
+	<dimen name="timeline_user_icon_size">56dp</dimen>
+	<dimen name="timeline_time_buttons_height">50dp</dimen>
+
 	<dimen name="disable_sharing_image_height">132dp</dimen>
 	<dimen name="disable_sharing_icon_top_margin">30dp</dimen>
 
diff --git a/OsmAnd-telegram/res/values/strings.xml b/OsmAnd-telegram/res/values/strings.xml
index 8b3555f5f1..d93be06214 100644
--- a/OsmAnd-telegram/res/values/strings.xml
+++ b/OsmAnd-telegram/res/values/strings.xml
@@ -1,13 +1,47 @@
 <resources>
+	<string name="please_update_osmand">Please update OsmAnd to view data on the map</string>
+	<string name="shared_string_update">Update</string>
+	<string name="gps_points_in_buffer">sent (%1$d in buffer)</string>
+	<string name="points_size">%1$d points</string>
+	<string name="shared_string_date">Date</string>
+	<string name="shared_string_collected">Collected</string>
+	<string name="gps_points">Gps points</string>
+	<string name="shared_string_sent">Sent</string>
+	<string name="monitoring_is_enabled">Monitoring is enabled</string>
+	<string name="monitoring_is_disabled">Monitoring is disabled</string>
+	<string name="time_on_the_move">time on the move</string>
+	<string name="average_altitude">Average altitude</string>
+	<string name="average_speed">Average speed</string>
+	<string name="open_in_osmand">Open in OsmAnd</string>
+	<string name="end_date">End date</string>
+	<string name="start_date">Start date</string>
+	<string name="timeline_description">Enable monitoring to collect movement data in the background.</string>
+	<string name="send_location_as">Send location as</string>
+	<string name="send_location_as_descr">Choose how messages with your location will look like.</string>
+	<string name="shared_string_map">Map</string>
+	<string name="shared_string_text">Text</string>
+	<string name="map_and_text">Map and text</string>
+	<string name="last_update_from_telegram">Last update from Telegram</string>
+	<string name="enter_another_device_name">Pick a name you haven\'t already used</string>
+	<string name="device_added_successfully">%1$s added.</string>
+	<string name="shared_string_add">Add</string>
+	<string name="error_adding_new_device">Could not add new device</string>
+	<string name="enter_device_name_description">Name your new device in max. 200 symbols.</string>
+	<string name="device_name_is_too_long">Device name too long</string>
+	<string name="device_name_cannot_be_empty">Device name cannot be empty</string>
+	<string name="device_name">Device name</string>
+	<string name="shared_string_hide">Hide</string>
+	<string name="share_location_as_description_second_line">You can create and view the Device ID in the telegram client using the %1$s chat bot. %2$s</string>
+	<string name="share_location_as_description">If you want to connect multiple devices to one telegram account, you need to use different Device to share your location.</string>
 	<string name="last_updated_location">Last updated location:</string>
 	<string name="successfully_sent_and_updated">Successfully sent and updated</string>
 	<string name="not_possible_to_send_to_telegram_chats">Not possible to send to Telegram chats:</string>
 	<string name="waiting_for_response_from_telegram">Waiting for response from Telegram</string>
-	<string name="sending_location_messages">Sending location messages</string>
-	<string name="initializing">Initializing</string>
-	<string name="searching_for_gps">Searching for GPS</string>
-	<string name="connecting_to_the_internet">Connecting to the internet</string>
-	<string name="background_work_description">Change battery optimization settings, for stable location sharing</string>
+	<string name="sending_location_messages">Sending location</string>
+	<string name="initializing">Starting</string>
+	<string name="searching_for_gps">Positioning…</string>
+	<string name="connecting_to_the_internet">Connecting to the Internet</string>
+	<string name="background_work_description">Change battery optimization settings to stabilize location sharing.</string>
 	<string name="background_work">Background work</string>
 	<string name="battery_optimization_description">Turn off battery optimization for OsmAnd Telegram so that it isn\'t suddenly turned off when in the background.</string>
 	<string name="sharing_in_background">Sharing in the background</string>
@@ -16,21 +50,15 @@
 	<string name="not_sent_yet">Not sent yet</string>
 	<string name="not_found_yet">Not found yet</string>
 	<string name="re_send_location">Re-send location</string>
-	<string name="last_sent_location">Last sent location</string>
 	<string name="last_available_location">Last available location</string>
 	<string name="sharing_status">Sharing status</string>
 	<string name="sharing_enabled">Sharing: Enabled</string>
 	<string name="shared_string_status">Status</string>
 	<string name="no_gps_connection">No GPS connection</string>
-	<string name="sharing_success">Sent and updated</string>
-	<string name="not_possible_to_send_to_chats">Could not send to chats:</string>
 	<string name="no_internet_connection">No internet connection</string>
 	<string name="shared_string_disable">Disable</string>
 	<string name="shared_string_save">Save</string>
-	<string name="add_device_descr">Find your device ID at https://live.osmand.net/device/ID</string>
-	<string name="device_id">Device ID</string>
 	<string name="add_device">Add device</string>
-	<string name="share_location_as_descr">Allow sharing your device location, or location of custom devices added via API.</string>
 	<string name="share_location_as">Share location as</string>
 	<string name="live_now_description">Contacts and groups sharing location to you.</string>
 	<string name="logout_from_osmand_telegram_descr">Are you sure you want to log out of OsmAnd Telegram so you can\'t share location or see the location of others?</string>
@@ -52,32 +80,33 @@
 	<string name="shared_string_group">Group</string>
 	<string name="logout_no_internet_msg">Connect to the Internet to properly log out of Telegram.</string>
 	<string name="shared_string_close">Close</string>
-	<string name="disconnect_from_telegram_desc">To revoke location sharing access. Open Telegram, go to Settings - Privacy and Security - Sessions and terminate the OsmAnd Telegram session.</string>
+	<string name="disconnect_from_telegram_desc">To revoke location sharing access. Open Telegram, go to Settings → Privacy and Security → Sessions, and terminate the OsmAnd Telegram session.</string>
 	<string name="disconnect_from_telegram">How to turn off OsmAnd Location Sharing from Telegram</string>
 	<string name="logout_help_desc">How to turn off OsmAnd Location Sharing from Telegram</string>
 	<string name="connected_account">Connected account</string>
 	<string name="shared_string_account">Account</string>
 	<string name="in_time">in %1$s</string>
-	<string name="osmand_connect_desc">Choose the OsmAnd version OsmAnd Telegram uses to display positions on the map.</string>
+	<string name="osmand_connect_desc">Choose the OsmAnd version OsmAnd Telegram uses to display positions.</string>
 	<string name="osmand_connect">OsmAnd connect</string>
-	<string name="location_history_desc">Hide the contacts that have not updated their location in a given amount of time.</string>
+	<string name="location_history_desc">Hide contacts that have not moved in a given time.</string>
 	<string name="location_history">Location history</string>
-	<string name="stale_location_desc">The last time a contact sent a location.</string>
-	<string name="stale_location">Stale location</string>
+	<string name="stale_location_desc">The last time a contact moved.</string>
+	<string name="stale_location">Not moving</string>
 	<string name="send_my_location_desc">Set the minimum interval for location sharing.</string>
 	<string name="send_my_location">Send my location</string>
-	<string name="gps_and_location">GPS &amp; location</string>
+	<string name="gps_and_location">Position</string>
 	<string name="sharing_time">Sharing time</string>
-	<string name="expire_at">Expires at</string>
-	<string name="stop_sharing_all">Sharing is enabled (disable)</string>
+        <!-- The following is a time of day. Expires (at) ___ -->
+	<string name="expire_at">Expires</string>
+	<string name="stop_sharing_all">Sharing is on (turn off)</string>
 	<string name="turn_off_location_sharing">Turn off location sharing</string>
 	<string name="open_osmand">Open OsmAnd</string>
 	<string name="shared_string_live">Live</string>
 	<string name="shared_string_bot">Bot</string>
 	<string name="get_telegram_title">Registration in Telegram</string>
-	<string name="get_telegram_account_first">You need a Telegram account to use OsmAnd Location Sharing.</string>
-	<string name="get_telegram_description_continue">Please install Telegram from Google Play and register an account to do so.</string>
-	<string name="get_telegram_after_creating_account">After creating the account, you can use this app.</string>
+	<string name="get_telegram_account_first">You need a Telegram account to use location sharing.</string>
+	<string name="get_telegram_description_continue">Please install Telegram and set up an account.</string>
+	<string name="get_telegram_after_creating_account">Then you can use this app.</string>
 	<string name="shared_string_all">All</string>
 	<string name="shared_string_off">Off</string>
 	<string name="already_registered_in_telegram">You need a registered Telegram account and phone number</string>
@@ -94,42 +123,37 @@
 	<string name="visible_time_for_all">Visible time for all</string>
 	<string name="set_time_description">Set the time that your selected contacts and groups will see your location in real time.</string>
 	<string name="set_time">Set time</string>
-	<string name="location_sharing_description">Select the contacts and groups with whom you want to share your location.</string>
-	<string name="my_location_search_hint">Search: group or contact</string>
-	<string name="start_location_sharing">Start location sharing</string>
+	<string name="location_sharing_description">Select the contacts and groups you want to share your location with.</string>
+	<string name="my_location_search_hint">Search: Group or contact</string>
+	<string name="start_location_sharing">Share location</string>
 	<string name="show_on_map">Show on map</string>
 	<string name="app_name">OsmAnd Telegram</string>
 	<string name="phone_number_title">Phone number</string>
-	<string name="phone_number_descr">Phone number in the international format</string>
+	<string name="phone_number_descr">Phone number in international format</string>
 	<string name="shared_string_password">Password</string>
 	<string name="enter_code">Enter code</string>
 	<string name="authentication_code">Authentication code</string>
 	<string name="authentication_code_descr">Telegram has sent you a code for OsmAnd to log in on your account.</string>
 	<string name="enter_password">Enter password</string>
-	<string name="password_descr">Please enter your Telegram account password</string>
+	<string name="password_descr">Telegram password</string>
 	<string name="shared_string_login">Log in</string>
 	<string name="shared_string_logout">Log out</string>
-	<string name="not_logged_in">You are not logged in</string>
-	<string name="initialization">Initialization</string>
+	<string name="initialization">Starting</string>
 	<string name="logging_out">Logging out</string>
 	<string name="closing">Closing</string>
+	<string name="gps_network_not_enabled">Turn on \"Location\"?</string>
+	<string name="not_logged_in">You are not logged in</string>
 	<string name="shared_string_continue">Continue</string>
 	<string name="shared_string_cancel">Cancel</string>
-	<string name="gps_network_not_enabled">Turn on location service?</string>
 	<string name="shared_string_settings">Settings</string>
 	<string name="no_location_permission">App lacks permission for location data access.</string>
-	<string name="gps_not_available">Please turn on GPS in the settings</string>
-	<string name="location_service_no_gps_available">Select on of the location providers to share your location.</string>
+	<string name="gps_not_available">Please turn on \"Location\" in the system settings</string>
+	<string name="location_service_no_gps_available">Select one of the location providers to share your location.</string>
 	<string name="osmand_service">Background mode</string>
 	<string name="osmand_service_descr">OsmAnd Telegram runs in the background with the screen off.</string>
 	<string name="shared_string_distance">Distance</string>
 	<string name="share_location">Share location</string>
 	<string name="sharing_location">Sharing location</string>
-	<string name="shared_string_paused">Paused</string>
-	<string name="shared_string_no_data">No data</string>
-	<string name="shared_string_pause">Pause</string>
-	<string name="shared_string_start">Start</string>
-	<string name="shared_string_stop">Stop</string>
 	<string name="process_service">OsmAnd Telegram service</string>
 	<string name="osmand_logo">OsmAnd logo</string>
 	<string name="install_osmand_dialog_message">You need to install the free or paid version of OsmAnd first</string>
@@ -166,10 +190,10 @@
 	<string name="shared_string_hour_short">h</string>
 	<string name="shared_string_minute_short">min</string>
 	<string name="shared_string_second_short">sec</string>
-	<string name="plus">+</string>
 	<string name="welcome_descr"><![CDATA[<b>OsmAnd Location Sharing</b> lets you share your location and see that of others in the OsmAnd.<br/><br/>The app uses Telegram API and you need a Telegram account.]]></string>
 	<string name="my_location">My location</string>
-	<string name="live_now">Sending now</string>
+	<string name="live_now">Live now</string>
+	<string name="timeline">Timeline</string>
 
 
 </resources>
diff --git a/OsmAnd-telegram/src/net/osmand/PlatformUtil.java b/OsmAnd-telegram/src/net/osmand/PlatformUtil.java
index 9ec83421ae..f1d8143948 100644
--- a/OsmAnd-telegram/src/net/osmand/PlatformUtil.java
+++ b/OsmAnd-telegram/src/net/osmand/PlatformUtil.java
@@ -1,6 +1,11 @@
 package net.osmand;
 
+import android.util.Xml;
+
 import org.apache.commons.logging.Log;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlSerializer;
 
 public class PlatformUtil {
 
@@ -143,4 +148,11 @@ public class PlatformUtil {
 		return getLog(cl.getName());
 	}
 
+	public static XmlPullParser newXMLPullParser() throws XmlPullParserException {
+		return Xml.newPullParser();
+	}
+
+	public static XmlSerializer newSerializer() {
+		return Xml.newSerializer();
+	}
 }
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlCallback.aidl b/OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlCallback.aidl
index be010bb062..6f0cb8f65b 100644
--- a/OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlCallback.aidl
+++ b/OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlCallback.aidl
@@ -1,9 +1,14 @@
 package net.osmand.aidl;
 
 import net.osmand.aidl.search.SearchResult;
+import net.osmand.aidl.gpx.AGpxBitmap;
 
 interface IOsmAndAidlCallback {
     void onSearchComplete(in List<SearchResult> resultSet);
     
     void onUpdate();
+
+    void onAppInitialized();
+
+    void onGpxBitmapCreated(in AGpxBitmap bitmap);
 }
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlInterface.aidl b/OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlInterface.aidl
index d7ebb4492d..59fd213ab6 100644
--- a/OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlInterface.aidl
+++ b/OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlInterface.aidl
@@ -55,6 +55,9 @@ import net.osmand.aidl.maplayer.point.ShowMapPointParams;
 
 import net.osmand.aidl.navdrawer.SetNavDrawerItemsParams;
 
+import net.osmand.aidl.navdrawer.NavDrawerFooterParams;
+import net.osmand.aidl.navdrawer.NavDrawerHeaderParams;
+
 import net.osmand.aidl.navigation.PauseNavigationParams;
 import net.osmand.aidl.navigation.ResumeNavigationParams;
 import net.osmand.aidl.navigation.StopNavigationParams;
@@ -67,6 +70,16 @@ import net.osmand.aidl.search.SearchResult;
 import net.osmand.aidl.search.SearchParams;
 import net.osmand.aidl.navigation.NavigateSearchParams;
 
+import net.osmand.aidl.customization.SetWidgetsParams;
+import net.osmand.aidl.customization.OsmandSettingsParams;
+
+import net.osmand.aidl.gpx.AGpxFile;
+import net.osmand.aidl.gpx.AGpxFileDetails;
+import net.osmand.aidl.gpx.CreateGpxBitmapParams;
+import net.osmand.aidl.tiles.ASqliteDbFile;
+
+import net.osmand.aidl.plugins.PluginParams;
+
 // NOTE: Add new methods at the end of file!!!
 
 interface IOsmAndAidlInterface {
@@ -133,4 +146,34 @@ interface IOsmAndAidlInterface {
 
     long registerForUpdates(in long updateTimeMS, IOsmAndAidlCallback callback);
     boolean unregisterFromUpdates(in long callbackId);
+
+    boolean setNavDrawerLogo(in String imageUri);
+
+    boolean setEnabledIds(in List<String> ids);
+    boolean setDisabledIds(in List<String> ids);
+    boolean setEnabledPatterns(in List<String> patterns);
+    boolean setDisabledPatterns(in List<String> patterns);
+
+    boolean regWidgetVisibility(in SetWidgetsParams params);
+    boolean regWidgetAvailability(in SetWidgetsParams params);
+
+    boolean customizeOsmandSettings(in OsmandSettingsParams params);
+
+    boolean getImportedGpx(out List<AGpxFile> files);
+
+    boolean getSqliteDbFiles(out List<ASqliteDbFile> files);
+    boolean getActiveSqliteDbFiles(out List<ASqliteDbFile> files);
+    boolean showSqliteDbFile(String fileName);
+    boolean hideSqliteDbFile(String fileName);
+
+    boolean setNavDrawerLogoWithParams(in NavDrawerHeaderParams params);
+    boolean setNavDrawerFooterWithParams(in NavDrawerFooterParams params);
+
+    boolean restoreOsmand();
+
+    boolean changePluginState(in PluginParams params);
+
+    boolean registerForOsmandInitListener(in IOsmAndAidlCallback callback);
+
+    boolean getBitmapForGpx(in CreateGpxBitmapParams file, IOsmAndAidlCallback callback);
 }
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl b/OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl
new file mode 100644
index 0000000000..770070bb46
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.customization;
+
+parcelable OsmandSettingsParams;
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsParams.java b/OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsParams.java
new file mode 100644
index 0000000000..bff8c68018
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsParams.java
@@ -0,0 +1,60 @@
+package net.osmand.aidl.customization;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+public class OsmandSettingsParams implements Parcelable {
+
+	private String sharedPreferencesName;
+	private Bundle bundle;
+
+	public OsmandSettingsParams(@NonNull String sharedPreferencesName, @Nullable Bundle bundle) {
+		this.sharedPreferencesName = sharedPreferencesName;
+		this.bundle = bundle;
+	}
+
+	public OsmandSettingsParams(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<OsmandSettingsParams> CREATOR = new Creator<OsmandSettingsParams>() {
+		@Override
+		public OsmandSettingsParams createFromParcel(Parcel in) {
+			return new OsmandSettingsParams(in);
+		}
+
+		@Override
+		public OsmandSettingsParams[] newArray(int size) {
+			return new OsmandSettingsParams[size];
+		}
+	};
+
+	public String getSharedPreferencesName() {
+		return sharedPreferencesName;
+	}
+
+	public Bundle getBundle() {
+		return bundle;
+	}
+
+	@Override
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeString(sharedPreferencesName);
+		out.writeBundle(bundle);
+	}
+
+	@SuppressLint("ParcelClassLoader")
+	private void readFromParcel(Parcel in) {
+		sharedPreferencesName = in.readString();
+		bundle = in.readBundle();
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+}
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/customization/SetWidgetsParams.aidl b/OsmAnd-telegram/src/net/osmand/aidl/customization/SetWidgetsParams.aidl
new file mode 100644
index 0000000000..235a4abe51
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/customization/SetWidgetsParams.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.customization;
+
+parcelable SetWidgetsParams;
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/customization/SetWidgetsParams.java b/OsmAnd-telegram/src/net/osmand/aidl/customization/SetWidgetsParams.java
new file mode 100644
index 0000000000..d9343b920e
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/customization/SetWidgetsParams.java
@@ -0,0 +1,93 @@
+package net.osmand.aidl.customization;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SetWidgetsParams implements Parcelable {
+
+	private String widgetKey;
+	private List<String> appModesKeys;
+
+	public SetWidgetsParams(String widgetKey, @Nullable List<String> appModesKeys) {
+		this.widgetKey = widgetKey;
+		this.appModesKeys = appModesKeys;
+	}
+
+	public SetWidgetsParams(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<SetWidgetsParams> CREATOR = new Creator<SetWidgetsParams>() {
+		@Override
+		public SetWidgetsParams createFromParcel(Parcel in) {
+			return new SetWidgetsParams(in);
+		}
+
+		@Override
+		public SetWidgetsParams[] newArray(int size) {
+			return new SetWidgetsParams[size];
+		}
+	};
+
+	public String getWidgetKey() {
+		return widgetKey;
+	}
+
+	public List<String> getAppModesKeys() {
+		return appModesKeys;
+	}
+
+	@Override
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeString(widgetKey);
+		writeStringList(out, appModesKeys);
+	}
+
+	private void readFromParcel(Parcel in) {
+		widgetKey = in.readString();
+		appModesKeys = readStringList(in);
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+
+	private void writeStringList(Parcel out, List<String> val) {
+		if (val == null) {
+			out.writeInt(-1);
+			return;
+		}
+		int N = val.size();
+		int i = 0;
+		out.writeInt(N);
+		while (i < N) {
+			out.writeString(val.get(i));
+			i++;
+		}
+	}
+
+	private List<String> readStringList(Parcel in) {
+		List<String> list = new ArrayList<>();
+		int M = list.size();
+		int N = in.readInt();
+		if (N == -1) {
+			return null;
+		}
+		int i = 0;
+		for (; i < M && i < N; i++) {
+			list.set(i, in.readString());
+		}
+		for (; i < N; i++) {
+			list.add(in.readString());
+		}
+		for (; i < M; i++) {
+			list.remove(N);
+		}
+		return list;
+	}
+}
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxBitmap.aidl b/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxBitmap.aidl
new file mode 100644
index 0000000000..128f5e6b94
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxBitmap.aidl
@@ -0,0 +1,4 @@
+package net.osmand.aidl.gpx;
+
+parcelable AGpxBitmap;
+
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxBitmap.java b/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxBitmap.java
new file mode 100644
index 0000000000..2f423e126e
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxBitmap.java
@@ -0,0 +1,50 @@
+package net.osmand.aidl.gpx;
+
+import android.graphics.Bitmap;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+
+public class AGpxBitmap implements Parcelable {
+
+	private Bitmap bitmap;
+
+	public AGpxBitmap(@NonNull Bitmap bitmap) {
+		this.bitmap = bitmap;
+	}
+
+	public AGpxBitmap(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public Bitmap getBitmap() {
+		return bitmap;
+	}
+
+	public void setBitmap(Bitmap bitmap) {
+		this.bitmap = bitmap;
+	}
+
+	public static final Creator<AGpxBitmap> CREATOR = new
+			Creator<AGpxBitmap>() {
+				public AGpxBitmap createFromParcel(Parcel in) {
+					return new AGpxBitmap(in);
+				}
+
+				public AGpxBitmap[] newArray(int size) {
+					return new AGpxBitmap[size];
+				}
+			};
+
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeParcelable(bitmap, flags);
+	}
+
+	private void readFromParcel(Parcel in) {
+		bitmap = in.readParcelable(Bitmap.class.getClassLoader());
+	}
+
+	public int describeContents() {
+		return 0;
+	}
+}
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFile.aidl b/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFile.aidl
new file mode 100644
index 0000000000..413d34a571
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFile.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.gpx;
+
+parcelable AGpxFile;
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFile.java b/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFile.java
new file mode 100644
index 0000000000..9572057fdc
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFile.java
@@ -0,0 +1,89 @@
+package net.osmand.aidl.gpx;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+public class AGpxFile implements Parcelable {
+
+	private String fileName;
+	private long modifiedTime;
+	private long fileSize;
+	private boolean active;
+	private AGpxFileDetails details;
+
+	public AGpxFile(@NonNull String fileName, long modifiedTime, long fileSize, boolean active, @Nullable AGpxFileDetails details) {
+		this.fileName = fileName;
+		this.modifiedTime = modifiedTime;
+		this.fileSize = fileSize;
+		this.active = active;
+		this.details = details;
+	}
+
+	public AGpxFile(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<AGpxFile> CREATOR = new
+			Creator<AGpxFile>() {
+				public AGpxFile createFromParcel(Parcel in) {
+					return new AGpxFile(in);
+				}
+
+				public AGpxFile[] newArray(int size) {
+					return new AGpxFile[size];
+				}
+			};
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public long getModifiedTime() {
+		return modifiedTime;
+	}
+
+	public long getFileSize() {
+		return fileSize;
+	}
+
+	public boolean isActive() {
+		return active;
+	}
+
+	public AGpxFileDetails getDetails() {
+		return details;
+	}
+
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeString(fileName);
+		out.writeLong(modifiedTime);
+		out.writeLong(fileSize);
+		out.writeByte((byte) (active ? 1 : 0));
+
+		out.writeByte((byte) (details != null ? 1 : 0));
+		if (details != null) {
+			out.writeParcelable(details, flags);
+		}
+	}
+
+	private void readFromParcel(Parcel in) {
+		fileName = in.readString();
+		modifiedTime = in.readLong();
+		fileSize = in.readLong();
+		active = in.readByte() != 0;
+
+		boolean hasDetails= in.readByte() != 0;
+		if (hasDetails) {
+			details = in.readParcelable(AGpxFileDetails.class.getClassLoader());
+		} else {
+			details = null;
+		}
+	}
+
+	public int describeContents() {
+		return 0;
+	}
+}
+
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl b/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl
new file mode 100644
index 0000000000..1e2cdec2b1
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.gpx;
+
+parcelable AGpxFileDetails;
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFileDetails.java b/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFileDetails.java
new file mode 100644
index 0000000000..3fe755135e
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFileDetails.java
@@ -0,0 +1,196 @@
+package net.osmand.aidl.gpx;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+public class AGpxFileDetails implements Parcelable {
+
+	private float totalDistance = 0;
+	private int totalTracks = 0;
+	private long startTime = Long.MAX_VALUE;
+	private long endTime = Long.MIN_VALUE;
+	private long timeSpan = 0;
+	private long timeMoving = 0;
+	private float totalDistanceMoving = 0;
+
+	private double diffElevationUp = 0;
+	private double diffElevationDown = 0;
+	private double avgElevation = 0;
+	private double minElevation = 99999;
+	private double maxElevation = -100;
+
+	private float minSpeed = Float.MAX_VALUE;
+	private float maxSpeed = 0;
+	private float avgSpeed;
+
+	private int points;
+	private int wptPoints = 0;
+
+	private List<String> wptCategoryNames = new ArrayList<>();
+
+	public AGpxFileDetails(float totalDistance, int totalTracks,
+						   long startTime, long endTime,
+						   long timeSpan, long timeMoving, float totalDistanceMoving,
+						   double diffElevationUp, double diffElevationDown,
+						   double avgElevation, double minElevation, double maxElevation,
+						   float minSpeed, float maxSpeed, float avgSpeed,
+						   int points, int wptPoints, Set<String> wptCategoryNames) {
+		this.totalDistance = totalDistance;
+		this.totalTracks = totalTracks;
+		this.startTime = startTime;
+		this.endTime = endTime;
+		this.timeSpan = timeSpan;
+		this.timeMoving = timeMoving;
+		this.totalDistanceMoving = totalDistanceMoving;
+		this.diffElevationUp = diffElevationUp;
+		this.diffElevationDown = diffElevationDown;
+		this.avgElevation = avgElevation;
+		this.minElevation = minElevation;
+		this.maxElevation = maxElevation;
+		this.minSpeed = minSpeed;
+		this.maxSpeed = maxSpeed;
+		this.avgSpeed = avgSpeed;
+		this.points = points;
+		this.wptPoints = wptPoints;
+		if (wptCategoryNames != null) {
+			this.wptCategoryNames = new ArrayList<>(wptCategoryNames);
+		}
+	}
+
+	public AGpxFileDetails(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<AGpxFileDetails> CREATOR = new
+			Creator<AGpxFileDetails>() {
+				public AGpxFileDetails createFromParcel(Parcel in) {
+					return new AGpxFileDetails(in);
+				}
+
+				public AGpxFileDetails[] newArray(int size) {
+					return new AGpxFileDetails[size];
+				}
+			};
+
+	public float getTotalDistance() {
+		return totalDistance;
+	}
+
+	public int getTotalTracks() {
+		return totalTracks;
+	}
+
+	public long getStartTime() {
+		return startTime;
+	}
+
+	public long getEndTime() {
+		return endTime;
+	}
+
+	public long getTimeSpan() {
+		return timeSpan;
+	}
+
+	public long getTimeMoving() {
+		return timeMoving;
+	}
+
+	public float getTotalDistanceMoving() {
+		return totalDistanceMoving;
+	}
+
+	public double getDiffElevationUp() {
+		return diffElevationUp;
+	}
+
+	public double getDiffElevationDown() {
+		return diffElevationDown;
+	}
+
+	public double getAvgElevation() {
+		return avgElevation;
+	}
+
+	public double getMinElevation() {
+		return minElevation;
+	}
+
+	public double getMaxElevation() {
+		return maxElevation;
+	}
+
+	public float getMinSpeed() {
+		return minSpeed;
+	}
+
+	public float getMaxSpeed() {
+		return maxSpeed;
+	}
+
+	public float getAvgSpeed() {
+		return avgSpeed;
+	}
+
+	public int getPoints() {
+		return points;
+	}
+
+	public int getWptPoints() {
+		return wptPoints;
+	}
+
+	public List<String> getWptCategoryNames() {
+		return wptCategoryNames;
+	}
+
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeFloat(totalDistance);
+		out.writeInt(totalTracks);
+		out.writeLong(startTime);
+		out.writeLong(endTime);
+		out.writeLong(timeSpan);
+		out.writeLong(timeMoving);
+		out.writeFloat(totalDistanceMoving);
+		out.writeDouble(diffElevationUp);
+		out.writeDouble(diffElevationDown);
+		out.writeDouble(avgElevation);
+		out.writeDouble(minElevation);
+		out.writeDouble(maxElevation);
+		out.writeFloat(minSpeed);
+		out.writeFloat(maxSpeed);
+		out.writeFloat(avgSpeed);
+		out.writeInt(points);
+		out.writeInt(wptPoints);
+		out.writeStringList(wptCategoryNames);
+	}
+
+	private void readFromParcel(Parcel in) {
+		totalDistance = in.readFloat();
+		totalTracks = in.readInt();
+		startTime = in.readLong();
+		endTime = in.readLong();
+		timeSpan = in.readLong();
+		timeMoving = in.readLong();
+		totalDistanceMoving = in.readFloat();
+		diffElevationUp = in.readDouble();
+		diffElevationDown = in.readDouble();
+		avgElevation = in.readDouble();
+		minElevation = in.readDouble();
+		maxElevation = in.readDouble();
+		minSpeed = in.readFloat();
+		maxSpeed = in.readFloat();
+		avgSpeed = in.readFloat();
+		points = in.readInt();
+		wptPoints = in.readInt();
+		in.readStringList(wptCategoryNames);
+	}
+
+	public int describeContents() {
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl b/OsmAnd-telegram/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl
new file mode 100644
index 0000000000..b02d5c6e70
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.gpx;
+
+parcelable CreateGpxBitmapParams;
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java b/OsmAnd-telegram/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java
new file mode 100644
index 0000000000..b6af1d354c
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java
@@ -0,0 +1,101 @@
+package net.osmand.aidl.gpx;
+
+import android.net.Uri;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.io.File;
+
+public class CreateGpxBitmapParams implements Parcelable {
+
+	private File gpxFile;
+	private Uri gpxUri;
+	private float density;
+	private int widthPixels;
+	private int heightPixels;
+	private int color; //ARGB color int
+
+	public CreateGpxBitmapParams(File gpxFile, float density, int widthPixels, int heightPixels, int color) {
+		this.gpxFile = gpxFile;
+		this.density = density;
+		this.widthPixels = widthPixels;
+		this.heightPixels = heightPixels;
+		this.color = color;
+	}
+
+	public CreateGpxBitmapParams(Uri gpxUri, float density, int widthPixels, int heightPixels, int color) {
+		this.gpxUri = gpxUri;
+		this.density = density;
+		this.widthPixels = widthPixels;
+		this.heightPixels = heightPixels;
+		this.color = color;
+	}
+
+	public CreateGpxBitmapParams(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<CreateGpxBitmapParams> CREATOR = new
+			Creator<CreateGpxBitmapParams>() {
+				public CreateGpxBitmapParams createFromParcel(Parcel in) {
+					return new CreateGpxBitmapParams(in);
+				}
+
+				public CreateGpxBitmapParams[] newArray(int size) {
+					return new CreateGpxBitmapParams[size];
+				}
+			};
+
+	public File getGpxFile() {
+		return gpxFile;
+	}
+
+	public Uri getGpxUri() {
+		return gpxUri;
+	}
+
+	public int getWidthPixels() {
+		return widthPixels;
+	}
+
+	public int getHeightPixels() {
+		return heightPixels;
+	}
+
+	public float getDensity() {
+		return density;
+	}
+
+	public int getColor() {
+		return color;
+	}
+
+	public void writeToParcel(Parcel out, int flags) {
+		if (gpxFile != null) {
+			out.writeString(gpxFile.getAbsolutePath());
+		} else {
+			out.writeString(null);
+		}
+		out.writeParcelable(gpxUri, flags);
+		out.writeFloat(density);
+		out.writeInt(widthPixels);
+		out.writeInt(heightPixels);
+		out.writeInt(color);
+	}
+
+	private void readFromParcel(Parcel in) {
+		String gpxAbsolutePath = in.readString();
+		if (gpxAbsolutePath != null) {
+			gpxFile = new File(gpxAbsolutePath);
+		}
+		gpxUri = in.readParcelable(Uri.class.getClassLoader());
+		density = in.readFloat();
+		widthPixels = in.readInt();
+		heightPixels = in.readInt();
+		color = in.readInt();
+	}
+
+	public int describeContents() {
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl b/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl
new file mode 100644
index 0000000000..fc1271a8ca
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.navdrawer;
+
+parcelable NavDrawerFooterParams;
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java b/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java
new file mode 100644
index 0000000000..9bfd70193f
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java
@@ -0,0 +1,68 @@
+package net.osmand.aidl.navdrawer;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+public class NavDrawerFooterParams implements Parcelable {
+
+	@NonNull
+	private String packageName;
+	@Nullable
+	private String intent;
+	@Nullable
+	private String appName;
+
+	@NonNull
+	public String getPackageName() {
+		return packageName;
+	}
+
+	@Nullable
+	public String getIntent() {
+		return intent;
+	}
+
+	@Nullable
+	public String getAppName() {
+		return appName;
+	}
+
+	public NavDrawerFooterParams(@NonNull String packageName, @Nullable String intent,
+			@Nullable String appName) {
+		this.packageName = packageName;
+		this.intent = intent;
+		this.appName = appName;
+	}
+
+	protected NavDrawerFooterParams(Parcel in) {
+		packageName = in.readString();
+		intent = in.readString();
+		appName = in.readString();
+	}
+
+	@Override
+	public void writeToParcel(Parcel dest, int flags) {
+		dest.writeString(packageName);
+		dest.writeString(intent);
+		dest.writeString(appName);
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+
+	public static final Creator<NavDrawerFooterParams> CREATOR = new Creator<NavDrawerFooterParams>() {
+		@Override
+		public NavDrawerFooterParams createFromParcel(Parcel in) {
+			return new NavDrawerFooterParams(in);
+		}
+
+		@Override
+		public NavDrawerFooterParams[] newArray(int size) {
+			return new NavDrawerFooterParams[size];
+		}
+	};
+}
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl b/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl
new file mode 100644
index 0000000000..c230824841
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.navdrawer;
+
+parcelable NavDrawerHeaderParams;
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java b/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java
new file mode 100644
index 0000000000..c88950fd10
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java
@@ -0,0 +1,68 @@
+package net.osmand.aidl.navdrawer;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+public class NavDrawerHeaderParams implements Parcelable {
+
+	@NonNull
+	private String imageUri;
+	@NonNull
+	private String packageName;
+	@Nullable
+	private String intent;
+
+	@NonNull
+	public String getImageUri() {
+		return imageUri;
+	}
+
+	@NonNull
+	public String getPackageName() {
+		return packageName;
+	}
+
+	@Nullable
+	public String getIntent() {
+		return intent;
+	}
+
+	public NavDrawerHeaderParams(@NonNull String imageUri, @NonNull String packageName,
+			@Nullable String intent) {
+		this.imageUri = imageUri;
+		this.packageName = packageName;
+		this.intent = intent;
+	}
+
+	public NavDrawerHeaderParams(Parcel in) {
+		imageUri = in.readString();
+		packageName = in.readString();
+		intent = in.readString();
+	}
+
+	@Override
+	public void writeToParcel(Parcel dest, int flags) {
+		dest.writeString(imageUri);
+		dest.writeString(packageName);
+		dest.writeString(intent);
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+
+	public static final Creator<NavDrawerHeaderParams> CREATOR = new Creator<NavDrawerHeaderParams>() {
+		@Override
+		public NavDrawerHeaderParams createFromParcel(Parcel in) {
+			return new NavDrawerHeaderParams(in);
+		}
+
+		@Override
+		public NavDrawerHeaderParams[] newArray(int size) {
+			return new NavDrawerHeaderParams[size];
+		}
+	};
+}
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/plugins/PluginParams.aidl b/OsmAnd-telegram/src/net/osmand/aidl/plugins/PluginParams.aidl
new file mode 100644
index 0000000000..beff693f5a
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/plugins/PluginParams.aidl
@@ -0,0 +1,5 @@
+// PluginParams.aidl
+package net.osmand.aidl.plugins;
+
+parcelable PluginParams;
+
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/plugins/PluginParams.java b/OsmAnd-telegram/src/net/osmand/aidl/plugins/PluginParams.java
new file mode 100644
index 0000000000..028bd8676a
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/plugins/PluginParams.java
@@ -0,0 +1,51 @@
+package net.osmand.aidl.plugins;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class PluginParams implements Parcelable {
+
+	private String pluginId;
+	private int newState; //0- off, 1 - on
+
+	public PluginParams(String pluginId, int newState) {
+		this.pluginId = pluginId;
+		this.newState = newState;
+	}
+
+	public String getPluginId() {
+		return pluginId;
+	}
+
+	public int getNewState() {
+		return newState;
+	}
+
+	protected PluginParams(Parcel in) {
+		pluginId = in.readString();
+		newState = in.readInt();
+	}
+
+	@Override
+	public void writeToParcel(Parcel dest, int flags) {
+		dest.writeString(pluginId);
+		dest.writeInt(newState);
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+
+	public static final Creator<PluginParams> CREATOR = new Creator<PluginParams>() {
+		@Override
+		public PluginParams createFromParcel(Parcel in) {
+			return new PluginParams(in);
+		}
+
+		@Override
+		public PluginParams[] newArray(int size) {
+			return new PluginParams[size];
+		}
+	};
+}
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl b/OsmAnd-telegram/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl
new file mode 100644
index 0000000000..319cfd5035
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.tiles;
+
+parcelable ASqliteDbFile;
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/aidl/tiles/ASqliteDbFile.java b/OsmAnd-telegram/src/net/osmand/aidl/tiles/ASqliteDbFile.java
new file mode 100644
index 0000000000..ac6f5e55d2
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/aidl/tiles/ASqliteDbFile.java
@@ -0,0 +1,69 @@
+package net.osmand.aidl.tiles;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+
+public class ASqliteDbFile implements Parcelable {
+
+	private String fileName;
+	private long modifiedTime;
+	private long fileSize;
+	private boolean active;
+
+	public ASqliteDbFile(@NonNull String fileName, long modifiedTime, long fileSize, boolean active) {
+		this.fileName = fileName;
+		this.modifiedTime = modifiedTime;
+		this.fileSize = fileSize;
+		this.active = active;
+	}
+
+	public ASqliteDbFile(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<ASqliteDbFile> CREATOR = new
+			Creator<ASqliteDbFile>() {
+				public ASqliteDbFile createFromParcel(Parcel in) {
+					return new ASqliteDbFile(in);
+				}
+
+				public ASqliteDbFile[] newArray(int size) {
+					return new ASqliteDbFile[size];
+				}
+			};
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public long getModifiedTime() {
+		return modifiedTime;
+	}
+
+	public long getFileSize() {
+		return fileSize;
+	}
+
+	public boolean isActive() {
+		return active;
+	}
+
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeString(fileName);
+		out.writeLong(modifiedTime);
+		out.writeLong(fileSize);
+		out.writeByte((byte) (active ? 1 : 0));
+	}
+
+	private void readFromParcel(Parcel in) {
+		fileName = in.readString();
+		modifiedTime = in.readLong();
+		fileSize = in.readLong();
+		active = in.readByte() != 0;
+	}
+
+	public int describeContents() {
+		return 0;
+	}
+}
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt b/OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt
index 45e78851e2..eddcb80acb 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt
@@ -24,7 +24,7 @@ class TelegramApplication : Application(), OsmandHelperListener {
 	lateinit var notificationHelper: NotificationHelper private set
 	lateinit var osmandAidlHelper: OsmandAidlHelper private set
 	lateinit var locationProvider: TelegramLocationProvider private set
-	lateinit var messagesDbHelper: MessagesDbHelper private set
+	lateinit var locationMessages: LocationMessages private set
 
 	var telegramService: TelegramService? = null
 
@@ -67,11 +67,14 @@ class TelegramApplication : Application(), OsmandHelperListener {
 		showLocationHelper = ShowLocationHelper(this)
 		notificationHelper = NotificationHelper(this)
 		locationProvider = TelegramLocationProvider(this)
-		messagesDbHelper = MessagesDbHelper(this)
+		locationMessages = LocationMessages(this)
 
 		if (settings.hasAnyChatToShareLocation() && AndroidUtils.isLocationPermissionAvailable(this)) {
 			shareLocationHelper.startSharingLocation()
 		}
+		if (settings.monitoringEnabled) {
+			showLocationHelper.startShowingLocation()
+		}
 	}
 
 	fun cleanupResources() {
@@ -85,6 +88,10 @@ class TelegramApplication : Application(), OsmandHelperListener {
 		telegramHelper.stopSendingLiveLocationMessages(settings.getChatsShareInfo())
 	}
 
+	fun isAnyOsmAndInstalled() = TelegramSettings.AppConnect.getInstalledApps(this).isNotEmpty()
+
+	fun isOsmAndChosen() = settings.appToConnectPackage.isNotEmpty()
+
 	fun isOsmAndInstalled() = AndroidUtils.isAppInstalled(this, settings.appToConnectPackage)
 
 	val isWifiConnected: Boolean
@@ -94,6 +101,13 @@ class TelegramApplication : Application(), OsmandHelperListener {
 			return ni != null && ni.type == ConnectivityManager.TYPE_WIFI
 		}
 
+	val isMobileConnected: Boolean
+		get() {
+			val mgr = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+			val ni = mgr.activeNetworkInfo
+			return ni != null && ni.type == ConnectivityManager.TYPE_MOBILE
+		}
+
 	private val isInternetConnected: Boolean
 		get() {
 			val mgr = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/TelegramService.kt b/OsmAnd-telegram/src/net/osmand/telegram/TelegramService.kt
index 4b90dd5a93..e1fc26e463 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/TelegramService.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/TelegramService.kt
@@ -13,10 +13,11 @@ import android.os.*
 import android.util.Log
 import android.widget.Toast
 import net.osmand.PlatformUtil
-import net.osmand.telegram.helpers.TelegramHelper.TelegramOutgoingMessagesListener
 import net.osmand.telegram.helpers.TelegramHelper.TelegramIncomingMessagesListener
+import net.osmand.telegram.helpers.TelegramHelper.TelegramOutgoingMessagesListener
 import net.osmand.telegram.notifications.TelegramNotification.NotificationType
 import net.osmand.telegram.utils.AndroidUtils
+import net.osmand.telegram.utils.OsmandLocationUtils
 import org.drinkless.td.libcore.telegram.TdApi
 import java.util.*
 
@@ -123,6 +124,7 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
 		app.telegramHelper.stopLiveMessagesUpdates()
 		app.telegramHelper.removeIncomingMessagesListener(this)
 		app.telegramHelper.removeOutgoingMessagesListener(this)
+		app.settings.save()
 		app.telegramService = null
 		mHandlerThread.quit()
 
@@ -202,13 +204,14 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
 			providers.add(0, providers.removeAt(passiveFirst))
 		}
 		// find location
+		var location: net.osmand.Location? = null
 		for (provider in providers) {
-			val location = convertLocation(service.getLastKnownLocation(provider))
-			if (location != null) {
-				return location
+			val loc = convertLocation(service.getLastKnownLocation(provider))
+			if (loc != null && (location == null || loc.hasAccuracy() && loc.accuracy < location.accuracy)) {
+				location = loc
 			}
 		}
-		return null
+		return location
 	}
 
 	private fun setupAlarm() {
@@ -274,6 +277,11 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
 
 	override fun onReceiveChatLocationMessages(chatId: Long, vararg messages: TdApi.Message) {
 		app().showLocationHelper.startShowMessagesTask(chatId, *messages)
+		messages.forEach {
+			if (!it.isOutgoing) {
+				app().locationMessages.addNewLocationMessage(it)
+			}
+		}
 	}
 
 	override fun onDeleteChatLocationMessages(chatId: Long, messages: List<TdApi.Message>) {
@@ -287,6 +295,12 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
 	override fun onUpdateMessages(messages: List<TdApi.Message>) {
 		messages.forEach {
 			app().settings.updateShareInfo(it)
+			app().shareLocationHelper.checkAndSendBufferMessagesToChat(it.chatId)
+			if (it.sendingState == null && (it.content is TdApi.MessageLocation || it.content is TdApi.MessageText)) {
+				if (!it.isOutgoing) {
+					app().locationMessages.addNewLocationMessage(it)
+				}
+			}
 		}
 	}
 
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt b/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
index 451918a91f..3b3f3146b3 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
@@ -7,10 +7,11 @@ import android.support.annotation.DrawableRes
 import android.support.annotation.StringRes
 import android.text.SpannableStringBuilder
 import android.text.style.ForegroundColorSpan
-import net.osmand.data.LatLon
+import net.osmand.PlatformUtil
 import net.osmand.telegram.helpers.OsmandAidlHelper
 import net.osmand.telegram.helpers.TelegramHelper
 import net.osmand.telegram.utils.AndroidUtils
+import net.osmand.telegram.utils.OsmandApiUtils
 import net.osmand.telegram.utils.OsmandFormatter
 import net.osmand.telegram.utils.OsmandFormatter.MetricsConstants
 import net.osmand.telegram.utils.OsmandFormatter.SpeedConstants
@@ -23,6 +24,8 @@ import java.util.concurrent.ConcurrentLinkedQueue
 
 val ADDITIONAL_ACTIVE_TIME_VALUES_SEC = listOf(15 * 60L, 30 * 60L, 60 * 60L, 180 * 60L)
 
+const val SHARE_DEVICES_KEY = "devices"
+
 private val SEND_MY_LOC_VALUES_SEC =
 	listOf(1L, 2L, 3L, 5L, 10L, 15L, 30L, 60L, 90L, 2 * 60L, 3 * 60L, 5 * 60L)
 private val STALE_LOC_VALUES_SEC =
@@ -40,9 +43,15 @@ private val LOC_HISTORY_VALUES_SEC = listOf(
 	24 * 60 * 60L
 )
 
+const val SHARE_TYPE_MAP = "Map"
+const val SHARE_TYPE_TEXT =  "Text"
+const val SHARE_TYPE_MAP_AND_TEXT = "Map_and_text"
+private val SHARE_TYPE_VALUES = listOf(SHARE_TYPE_MAP, SHARE_TYPE_TEXT, SHARE_TYPE_MAP_AND_TEXT)
+
 private const val SEND_MY_LOC_DEFAULT_INDEX = 6
-private const val STALE_LOC_DEFAULT_INDEX = 4
-private const val LOC_HISTORY_DEFAULT_INDEX = 2
+private const val STALE_LOC_DEFAULT_INDEX = 0
+private const val LOC_HISTORY_DEFAULT_INDEX = 7
+private const val SHARE_TYPE_DEFAULT_INDEX = 2
 
 private const val SETTINGS_NAME = "osmand_telegram_settings"
 
@@ -57,6 +66,7 @@ private const val SPEED_CONSTANTS_KEY = "speed_constants"
 private const val SEND_MY_LOC_INTERVAL_KEY = "send_my_loc_interval"
 private const val STALE_LOC_TIME_KEY = "stale_loc_time"
 private const val LOC_HISTORY_TIME_KEY = "loc_history_time"
+private const val SHARE_TYPE_KEY = "share_type"
 
 private const val APP_TO_CONNECT_PACKAGE_KEY = "app_to_connect_package"
 
@@ -70,17 +80,24 @@ private const val SHARE_CHATS_INFO_KEY = "share_chats_info"
 
 private const val BATTERY_OPTIMISATION_ASKED = "battery_optimisation_asked"
 
+private const val MONITORING_ENABLED = "monitoring_enabled"
+
 private const val SHARING_INITIALIZATION_TIME = 60 * 2L // 2 minutes
 
+private const val GPS_UPDATE_EXPIRED_TIME = 60 * 3L // 3 minutes
+
 class TelegramSettings(private val app: TelegramApplication) {
 
+	private val log = PlatformUtil.getLog(TelegramSettings::class.java)
+
 	private var shareChatsInfo = ConcurrentHashMap<Long, ShareChatInfo>()
 	private var hiddenOnMapChats: Set<Long> = emptySet()
+	private var shareDevices: Set<DeviceBot> = emptySet()
 
 	var sharingStatusChanges = ConcurrentLinkedQueue<SharingStatus>()
 
-	var shareDevicesIds = mutableMapOf<String, String>()
 	var currentSharingMode = ""
+		private set
 
 	var metricsConstants = MetricsConstants.KILOMETERS_AND_METERS
 	var speedConstants = SpeedConstants.KILOMETERS_PER_HOUR
@@ -88,16 +105,19 @@ class TelegramSettings(private val app: TelegramApplication) {
 	var sendMyLocInterval = SEND_MY_LOC_VALUES_SEC[SEND_MY_LOC_DEFAULT_INDEX]
 	var staleLocTime = STALE_LOC_VALUES_SEC[STALE_LOC_DEFAULT_INDEX]
 	var locHistoryTime = LOC_HISTORY_VALUES_SEC[LOC_HISTORY_DEFAULT_INDEX]
+	var shareTypeValue = SHARE_TYPE_VALUES[SHARE_TYPE_DEFAULT_INDEX]
 
 	var appToConnectPackage = ""
 		private set
 
-	var liveNowSortType = LiveNowSortType.SORT_BY_GROUP
+	var liveNowSortType = LiveNowSortType.SORT_BY_DISTANCE
 
-	val gpsAndLocPrefs = listOf(SendMyLocPref(), StaleLocPref(), LocHistoryPref())
+	val gpsAndLocPrefs = listOf(SendMyLocPref(), StaleLocPref(), LocHistoryPref(), ShareTypePref())
 
 	var batteryOptimisationAsked = false
 
+	var monitoringEnabled = false
+
 	init {
 		updatePrefs()
 		read()
@@ -107,6 +127,8 @@ class TelegramSettings(private val app: TelegramApplication) {
 
 	fun isSharingLocationToChat(chatId: Long) = shareChatsInfo.containsKey(chatId)
 
+	fun isSharingLocationToUser(userId: Int) = shareChatsInfo.values.any { it.userId == userId }
+
 	fun hasAnyChatToShowOnMap() = !hiddenOnMapChats.containsAll(getLiveNowChats())
 
 	fun isShowingChatOnMap(chatId: Long) = !hiddenOnMapChats.contains(chatId)
@@ -126,41 +148,69 @@ class TelegramSettings(private val app: TelegramApplication) {
 		addActiveTime: Long = ADDITIONAL_ACTIVE_TIME_VALUES_SEC[0]
 	) {
 		if (share) {
-			val lp: Long = when {
-				livePeriod < TelegramHelper.MIN_LOCATION_MESSAGE_LIVE_PERIOD_SEC -> TelegramHelper.MIN_LOCATION_MESSAGE_LIVE_PERIOD_SEC.toLong()
-				else -> livePeriod
-			}
 			var shareChatInfo = shareChatsInfo[chatId]
 			if (shareChatInfo == null) {
 				shareChatInfo = ShareChatInfo()
 			}
-			val currentTime = System.currentTimeMillis() / 1000
-			shareChatInfo.chatId = chatId
-			shareChatInfo.start = currentTime
-			if (shareChatInfo.livePeriod == -1L) {
-				shareChatInfo.livePeriod = lp
+			val chat = app.telegramHelper.getChat(chatId)
+			if (chat != null && (chat.type is TdApi.ChatTypePrivate || chat.type is TdApi.ChatTypeSecret)) {
+				shareChatInfo.userId = app.telegramHelper.getUserIdFromChatType(chat.type)
 			}
-			shareChatInfo.userSetLivePeriod = lp
-			shareChatInfo.userSetLivePeriodStart = currentTime
-			shareChatInfo.currentMessageLimit = currentTime + Math.min(lp, TelegramHelper.MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC.toLong())
-			shareChatInfo.additionalActiveTime = addActiveTime
+			shareChatInfo.chatId = chatId
+			updateChatShareInfo(shareChatInfo, livePeriod, addActiveTime)
 			shareChatsInfo[chatId] = shareChatInfo
 		} else {
 			shareChatsInfo.remove(chatId)
 		}
 	}
 
-	fun updateShareDevicesIds(list: List<DeviceBot>) {
-		shareDevicesIds.clear()
-		list.forEach {
-			shareDevicesIds[it.externalId] = it.deviceName
+	fun shareLocationToUser(
+		userId: Int,
+		livePeriod: Long = DEFAULT_VISIBLE_TIME_SECONDS,
+		addActiveTime: Long = ADDITIONAL_ACTIVE_TIME_VALUES_SEC[0]
+	) {
+		val shareChatInfo = ShareChatInfo()
+		shareChatInfo.userId = userId
+		updateChatShareInfo(shareChatInfo, livePeriod, addActiveTime)
+		app.telegramHelper.createPrivateChatWithUser(userId, shareChatInfo, shareChatsInfo)
+	}
+
+	fun updateShareDevices(list: List<DeviceBot>) {
+		shareDevices = list.toHashSet()
+	}
+
+	fun addShareDevice(device: DeviceBot) {
+		val devices = shareDevices.toMutableList()
+		devices.add(device)
+		shareDevices = devices.toHashSet()
+	}
+
+	fun updateCurrentSharingMode(sharingMode: String) {
+		if (currentSharingMode != sharingMode) {
+			shareChatsInfo.forEach { (_, shareInfo) ->
+				shareInfo.shouldSendViaBotMessage = true
+			}
 		}
+		currentSharingMode = sharingMode
 	}
 
 	fun getChatLivePeriod(chatId: Long) = shareChatsInfo[chatId]?.livePeriod
 
 	fun getChatsShareInfo() = shareChatsInfo
 
+	fun getShareDevices() = shareDevices
+
+	fun containsShareDeviceWithName(name: String): Boolean {
+		shareDevices.forEach {
+			if (it.deviceName == name) {
+				return true
+			}
+		}
+		return false
+	}
+
+	fun getCurrentSharingDevice() = shareDevices.singleOrNull { it.externalId == currentSharingMode }
+
 	fun getLastSuccessfulSendTime() = shareChatsInfo.values.maxBy { it.lastSuccessfulSendTimeMs }?.lastSuccessfulSendTimeMs ?: -1
 
 	fun stopSharingLocationToChats() {
@@ -195,12 +245,56 @@ class TelegramSettings(private val app: TelegramApplication) {
 	}
 
 	fun updateShareInfo(message: TdApi.Message) {
-		val shareChatInfo = shareChatsInfo[message.chatId]
+		val shareInfo = shareChatsInfo[message.chatId]
 		val content = message.content
-		if (shareChatInfo != null && content is TdApi.MessageLocation) {
-			shareChatInfo.currentMessageId = message.id
-			shareChatInfo.lastSuccessfulLocation = LatLon(content.location.latitude, content.location.longitude)
-			shareChatInfo.lastSuccessfulSendTimeMs = Math.max(message.editDate, message.date) * 1000L
+		if (shareInfo != null) {
+			when (content) {
+				is TdApi.MessageLocation -> {
+					val state = message.sendingState
+					if (state != null) {
+						if (state.constructor == TdApi.MessageSendingStatePending.CONSTRUCTOR) {
+							shareInfo.pendingMapMessage = true
+							log.debug("updateShareInfo MAP ${message.id} MessageSendingStatePending")
+							shareInfo.oldMapMessageId = message.id
+						} else if (state.constructor == TdApi.MessageSendingStateFailed.CONSTRUCTOR) {
+							shareInfo.hasSharingError = true
+							shareInfo.pendingMapMessage = false
+							log.debug("updateShareInfo MAP ${message.id} MessageSendingStateFailed")
+						}
+					} else {
+						shareInfo.currentMapMessageId = message.id
+						shareInfo.pendingMapMessage = false
+						shareInfo.pendingTdLib--
+						shareInfo.lastSuccessfulSendTimeMs = Math.max(message.editDate, message.date) * 1000L
+						if (shareTypeValue == SHARE_TYPE_MAP) {
+							shareInfo.sentMessages++
+						}
+						log.debug("updateShareInfo MAP ${message.id} SUCCESS pendingTdLib: ${shareInfo.pendingTdLib}")
+					}
+				}
+				is TdApi.MessageText -> {
+					val state = message.sendingState
+					if (state != null) {
+						if (state.constructor == TdApi.MessageSendingStatePending.CONSTRUCTOR) {
+							log.debug("updateShareInfo TEXT ${message.id} MessageSendingStatePending")
+							shareInfo.pendingTextMessage = true
+							shareInfo.oldTextMessageId = message.id
+						} else if (state.constructor == TdApi.MessageSendingStateFailed.CONSTRUCTOR) {
+							log.debug("updateShareInfo TEXT ${message.id} MessageSendingStateFailed")
+							shareInfo.hasSharingError = true
+							shareInfo.pendingTextMessage = false
+						}
+					} else {
+						shareInfo.currentTextMessageId = message.id
+						shareInfo.updateTextMessageId++
+						shareInfo.pendingTextMessage = false
+						shareInfo.pendingTdLib--
+						shareInfo.sentMessages++
+						shareInfo.lastSuccessfulSendTimeMs = Math.max(message.editDate, message.date) * 1000L
+						log.debug("updateShareInfo TEXT ${message.id} SUCCESS pendingTdLib: ${shareInfo.pendingTdLib}")
+					}
+				}
+			}
 		}
 	}
 
@@ -216,11 +310,15 @@ class TelegramSettings(private val app: TelegramApplication) {
 					statusChangeTime = newSharingStatus.statusChangeTime
 					locationTime = newSharingStatus.locationTime
 					chatsTitles = newSharingStatus.chatsTitles
+					title = newSharingStatus.title
 
 					if (statusType == SharingStatusType.INITIALIZING
-						&& newSharingStatus.statusType == SharingStatusType.INITIALIZING
-						&& !lastSharingStatus.description.contains(newSharingStatus.description)) {
-						lastSharingStatus.description = "${lastSharingStatus.description}, ${newSharingStatus.description}"
+						&& newSharingStatus.statusType == SharingStatusType.INITIALIZING) {
+						if (!description.contains(newSharingStatus.description)) {
+							description = "$description, ${newSharingStatus.description}"
+						}
+					} else {
+						description = newSharingStatus.description
 					}
 				}
 			}
@@ -229,12 +327,44 @@ class TelegramSettings(private val app: TelegramApplication) {
 		}
 	}
 
+	private fun updateChatShareInfo(
+		shareChatInfo: ShareChatInfo,
+		livePeriod: Long = DEFAULT_VISIBLE_TIME_SECONDS,
+		addActiveTime: Long = ADDITIONAL_ACTIVE_TIME_VALUES_SEC[0]
+	) {
+		val lp: Long = when {
+			livePeriod < TelegramHelper.MIN_LOCATION_MESSAGE_LIVE_PERIOD_SEC -> TelegramHelper.MIN_LOCATION_MESSAGE_LIVE_PERIOD_SEC.toLong()
+			else -> livePeriod
+		}
+		val currentTime = System.currentTimeMillis() / 1000
+		val user = app.telegramHelper.getCurrentUser()
+		if (user != null && currentSharingMode != user.id.toString() && shareChatInfo.start == -1L) {
+			shareChatInfo.shouldSendViaBotMessage = true
+		}
+
+		shareChatInfo.start = currentTime
+		if (shareChatInfo.livePeriod == -1L) {
+			shareChatInfo.livePeriod = lp
+		}
+		shareChatInfo.userSetLivePeriod = lp
+		shareChatInfo.userSetLivePeriodStart = currentTime
+		shareChatInfo.currentMessageLimit = currentTime + Math.min(lp, TelegramHelper.MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC.toLong())
+		shareChatInfo.additionalActiveTime = addActiveTime
+	}
+
 	private fun getNewSharingStatusHistoryItem(): SharingStatus {
 		return SharingStatus().apply {
 			statusChangeTime = System.currentTimeMillis()
 			val lm = app.getSystemService(Context.LOCATION_SERVICE) as LocationManager
 			val gpsEnabled = try {
-				lm.isProviderEnabled(LocationManager.GPS_PROVIDER)
+				if (lm.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+					val loc = lm.getLastKnownLocation(LocationManager.GPS_PROVIDER)
+					val gpsActive = loc != null && ((statusChangeTime - loc.time) / 1000) < GPS_UPDATE_EXPIRED_TIME
+					val lastSentLocationExpired = ((statusChangeTime - app.shareLocationHelper.lastLocationUpdateTime) / 1000) > GPS_UPDATE_EXPIRED_TIME
+					(gpsActive || !lastSentLocationExpired)
+				} else {
+					false
+				}
 			} catch (ex: Exception) {
 				false
 			}
@@ -263,7 +393,10 @@ class TelegramSettings(private val app: TelegramApplication) {
 			} else if (!initializing) {
 				when {
 					!gpsEnabled -> {
-						locationTime = app.shareLocationHelper.lastLocationMessageSentTime
+						locationTime = app.shareLocationHelper.lastLocationUpdateTime
+						if (locationTime <= 0) {
+							locationTime = getLastSuccessfulSendTime()
+						}
 						title = app.getString(R.string.no_gps_connection)
 						description = app.getString(R.string.last_updated_location)
 						statusType = SharingStatusType.NO_GPS
@@ -276,9 +409,14 @@ class TelegramSettings(private val app: TelegramApplication) {
 					}
 					else -> {
 						locationTime = getLastSuccessfulSendTime()
-						title = app.getString(R.string.successfully_sent_and_updated)
-						description = app.getString(R.string.last_updated_location)
-						statusType = SharingStatusType.SUCCESSFULLY_SENT
+						statusType = SharingStatusType.SENDING
+						if (locationTime == -1L) {
+							title = app.getString(R.string.sending_location_messages)
+							description = app.getString(R.string.waiting_for_response_from_telegram)
+						} else {
+							title = app.getString(R.string.successfully_sent_and_updated)
+							description = app.getString(R.string.last_updated_location)
+						}
 					}
 				}
 			} else {
@@ -300,9 +438,14 @@ class TelegramSettings(private val app: TelegramApplication) {
 	}
 
 	fun onDeleteLiveMessages(chatId: Long, messages: List<Long>) {
-		val currentMessageId = shareChatsInfo[chatId]?.currentMessageId
-		if (messages.contains(currentMessageId)) {
-			shareChatsInfo[chatId]?.currentMessageId = -1
+		val currentMapMessageId = shareChatsInfo[chatId]?.currentMapMessageId
+		if (messages.contains(currentMapMessageId)) {
+			shareChatsInfo[chatId]?.currentMapMessageId = -1
+		}
+		val currentTextMessageId = shareChatsInfo[chatId]?.currentTextMessageId
+		if (messages.contains(currentTextMessageId)) {
+			shareChatsInfo[chatId]?.currentTextMessageId = -1
+			shareChatsInfo[chatId]?.updateTextMessageId = 1
 		}
 	}
 	
@@ -326,28 +469,24 @@ class TelegramSettings(private val app: TelegramApplication) {
 		edit.putLong(STALE_LOC_TIME_KEY, staleLocTime)
 		edit.putLong(LOC_HISTORY_TIME_KEY, locHistoryTime)
 
+		edit.putString(SHARE_TYPE_KEY, shareTypeValue)
+
 		edit.putString(APP_TO_CONNECT_PACKAGE_KEY, appToConnectPackage)
 
 		edit.putString(LIVE_NOW_SORT_TYPE_KEY, liveNowSortType.name)
 
 		edit.putBoolean(BATTERY_OPTIMISATION_ASKED, batteryOptimisationAsked)
 
-		try {
-			val jArray = JSONArray()
-			shareChatsInfo.forEach { (chatId, chatInfo) ->
-				val obj = JSONObject()
-				obj.put(ShareChatInfo.CHAT_ID_KEY, chatId)
-				obj.put(ShareChatInfo.START_KEY, chatInfo.start)
-				obj.put(ShareChatInfo.LIVE_PERIOD_KEY, chatInfo.livePeriod)
-				obj.put(ShareChatInfo.LIMIT_KEY, chatInfo.currentMessageLimit)
-				obj.put(ShareChatInfo.CURRENT_MESSAGE_ID_KEY, chatInfo.currentMessageId)
-				obj.put(ShareChatInfo.USER_SET_LIVE_PERIOD_KEY, chatInfo.userSetLivePeriod)
-				obj.put(ShareChatInfo.USER_SET_LIVE_PERIOD_START_KEY, chatInfo.userSetLivePeriodStart)
-				jArray.put(obj)
-			}
+		edit.putBoolean(MONITORING_ENABLED, monitoringEnabled)
+
+		val jArray = convertShareChatsInfoToJson()
+		if (jArray != null) {
 			edit.putString(SHARE_CHATS_INFO_KEY, jArray.toString())
-		} catch (e: JSONException) {
-			e.printStackTrace()
+		}
+
+		val jsonObject = convertShareDevicesToJson()
+		if (jsonObject != null) {
+			edit.putString(SHARE_DEVICES_KEY, jsonObject.toString())
 		}
 
 		edit.apply()
@@ -376,22 +515,80 @@ class TelegramSettings(private val app: TelegramApplication) {
 			e.printStackTrace()
 		}
 
+		parseShareDevices(prefs.getString(SHARE_DEVICES_KEY, ""))
+
 		val sendMyLocDef = SEND_MY_LOC_VALUES_SEC[SEND_MY_LOC_DEFAULT_INDEX]
 		sendMyLocInterval = prefs.getLong(SEND_MY_LOC_INTERVAL_KEY, sendMyLocDef)
 		val staleLocDef = STALE_LOC_VALUES_SEC[STALE_LOC_DEFAULT_INDEX]
 		staleLocTime = prefs.getLong(STALE_LOC_TIME_KEY, staleLocDef)
 		val locHistoryDef = LOC_HISTORY_VALUES_SEC[LOC_HISTORY_DEFAULT_INDEX]
 		locHistoryTime = prefs.getLong(LOC_HISTORY_TIME_KEY, locHistoryDef)
+		val shareTypeDef = SHARE_TYPE_VALUES[SHARE_TYPE_DEFAULT_INDEX]
+		shareTypeValue = prefs.getString(SHARE_TYPE_KEY, shareTypeDef)
 
 		currentSharingMode = prefs.getString(SHARING_MODE_KEY, "")
 
-		appToConnectPackage = prefs.getString(APP_TO_CONNECT_PACKAGE_KEY, "")
+		val defPackage = if (AppConnect.getInstalledApps(app).size == 1) AppConnect.getInstalledApps(app).first().appPackage else ""
+		appToConnectPackage = prefs.getString(APP_TO_CONNECT_PACKAGE_KEY, defPackage)
 
 		liveNowSortType = LiveNowSortType.valueOf(
-			prefs.getString(LIVE_NOW_SORT_TYPE_KEY, LiveNowSortType.SORT_BY_GROUP.name)
+			prefs.getString(LIVE_NOW_SORT_TYPE_KEY, LiveNowSortType.SORT_BY_DISTANCE.name)
 		)
 
 		batteryOptimisationAsked = prefs.getBoolean(BATTERY_OPTIMISATION_ASKED,false)
+
+		monitoringEnabled = prefs.getBoolean(MONITORING_ENABLED,false)
+	}
+
+	private fun convertShareDevicesToJson():JSONObject?{
+		return try {
+			val jsonObject = JSONObject()
+			val jArray = JSONArray()
+			shareDevices.forEach { device ->
+				val obj = JSONObject()
+				obj.put(DeviceBot.DEVICE_ID, device.id)
+				obj.put(DeviceBot.USER_ID, device.userId)
+				obj.put(DeviceBot.CHAT_ID, device.chatId)
+				obj.put(DeviceBot.DEVICE_NAME, device.deviceName)
+				obj.put(DeviceBot.EXTERNAL_ID, device.externalId)
+				obj.put(DeviceBot.DATA, JSONObject(device.data))
+				jArray.put(obj)
+			}
+			jsonObject.put(SHARE_DEVICES_KEY, jArray)
+		} catch (e: JSONException) {
+			e.printStackTrace()
+			null
+		}
+	}
+
+	private fun convertShareChatsInfoToJson(): JSONArray? {
+		return try {
+			val jArray = JSONArray()
+			shareChatsInfo.forEach { (chatId, chatInfo) ->
+				val obj = JSONObject()
+				obj.put(ShareChatInfo.CHAT_ID_KEY, chatId)
+				obj.put(ShareChatInfo.USER_ID_KEY, chatInfo.userId)
+				obj.put(ShareChatInfo.START_KEY, chatInfo.start)
+				obj.put(ShareChatInfo.LIVE_PERIOD_KEY, chatInfo.livePeriod)
+				obj.put(ShareChatInfo.LIMIT_KEY, chatInfo.currentMessageLimit)
+				obj.put(ShareChatInfo.UPDATE_TEXT_MESSAGE_ID_KEY, chatInfo.updateTextMessageId)
+				obj.put(ShareChatInfo.CURRENT_MAP_MESSAGE_ID_KEY, chatInfo.currentMapMessageId)
+				obj.put(ShareChatInfo.CURRENT_TEXT_MESSAGE_ID_KEY, chatInfo.currentTextMessageId)
+				obj.put(ShareChatInfo.USER_SET_LIVE_PERIOD_KEY, chatInfo.userSetLivePeriod)
+				obj.put(ShareChatInfo.USER_SET_LIVE_PERIOD_START_KEY, chatInfo.userSetLivePeriodStart)
+				obj.put(ShareChatInfo.LAST_SUCCESSFUL_SEND_TIME_KEY, chatInfo.lastSuccessfulSendTimeMs)
+				obj.put(ShareChatInfo.LAST_SEND_MAP_TIME_KEY, chatInfo.lastSendMapMessageTime)
+				obj.put(ShareChatInfo.LAST_SEND_TEXT_TIME_KEY, chatInfo.lastSendTextMessageTime)
+				obj.put(ShareChatInfo.PENDING_TEXT_MESSAGE_KEY, chatInfo.pendingTextMessage)
+				obj.put(ShareChatInfo.PENDING_MAP_MESSAGE_KEY, chatInfo.pendingMapMessage)
+				obj.put(ShareChatInfo.SENT_MESSAGES_KEY, chatInfo.sentMessages)
+				jArray.put(obj)
+			}
+			jArray
+		} catch (e: JSONException) {
+			e.printStackTrace()
+			null
+		}
 	}
 
 	private fun parseShareChatsInfo(json: JSONArray) {
@@ -399,17 +596,30 @@ class TelegramSettings(private val app: TelegramApplication) {
 			val obj = json.getJSONObject(i)
 			val shareInfo = ShareChatInfo().apply {
 				chatId = obj.optLong(ShareChatInfo.CHAT_ID_KEY)
+				userId = obj.optInt(ShareChatInfo.USER_ID_KEY)
 				start = obj.optLong(ShareChatInfo.START_KEY)
 				livePeriod = obj.optLong(ShareChatInfo.LIVE_PERIOD_KEY)
 				currentMessageLimit = obj.optLong(ShareChatInfo.LIMIT_KEY)
-				currentMessageId = obj.optLong(ShareChatInfo.CURRENT_MESSAGE_ID_KEY)
+				updateTextMessageId = obj.optInt(ShareChatInfo.UPDATE_TEXT_MESSAGE_ID_KEY)
+				currentMapMessageId = obj.optLong(ShareChatInfo.CURRENT_MAP_MESSAGE_ID_KEY)
+				currentTextMessageId = obj.optLong(ShareChatInfo.CURRENT_TEXT_MESSAGE_ID_KEY)
 				userSetLivePeriod = obj.optLong(ShareChatInfo.USER_SET_LIVE_PERIOD_KEY)
 				userSetLivePeriodStart = obj.optLong(ShareChatInfo.USER_SET_LIVE_PERIOD_START_KEY)
+				lastSuccessfulSendTimeMs = obj.optLong(ShareChatInfo.LAST_SUCCESSFUL_SEND_TIME_KEY)
+				lastSendMapMessageTime = obj.optInt(ShareChatInfo.LAST_SEND_MAP_TIME_KEY)
+				lastSendTextMessageTime = obj.optInt(ShareChatInfo.LAST_SEND_TEXT_TIME_KEY)
+				pendingTextMessage = obj.optBoolean(ShareChatInfo.PENDING_TEXT_MESSAGE_KEY)
+				pendingMapMessage = obj.optBoolean(ShareChatInfo.PENDING_MAP_MESSAGE_KEY)
+				sentMessages = obj.optInt(ShareChatInfo.SENT_MESSAGES_KEY)
 			}
 			shareChatsInfo[shareInfo.chatId] = shareInfo
 		}
 	}
 
+	private fun parseShareDevices(json: String) {
+		shareDevices = OsmandApiUtils.parseJsonContents(json).toHashSet()
+	}
+
 	private fun getLiveNowChats() = app.telegramHelper.getMessagesByChatIds(locHistoryTime).keys
 
 	private fun updatePrefs() {
@@ -473,6 +683,41 @@ class TelegramSettings(private val app: TelegramApplication) {
 		}
 	}
 
+	inner class ShareTypePref : DurationPref(
+		R.drawable.ic_action_location_history,
+		R.string.send_location_as,
+		R.string.send_location_as_descr,
+		emptyList()
+	) {
+
+		override fun getCurrentValue(): String {
+			return getTextValue(shareTypeValue)
+		}
+
+		override fun setCurrentValue(index: Int) {
+			val newSharingType = SHARE_TYPE_VALUES[index]
+			if (shareTypeValue != newSharingType && app.telegramHelper.getCurrentUser()?.id.toString() != currentSharingMode) {
+				shareChatsInfo.forEach { (_, shareInfo) ->
+					shareInfo.shouldSendViaBotMessage = true
+				}
+			}
+			shareTypeValue = newSharingType
+		}
+
+		override fun getMenuItems(): List<String> {
+			return SHARE_TYPE_VALUES.map { getTextValue(it) }
+		}
+
+		private fun getTextValue(shareType: String): String {
+			return when (shareType) {
+				SHARE_TYPE_MAP -> app.getString(R.string.shared_string_map)
+				SHARE_TYPE_TEXT -> app.getString(R.string.shared_string_text)
+				SHARE_TYPE_MAP_AND_TEXT -> app.getString(R.string.map_and_text)
+				else -> ""
+			}
+		}
+	}
+
 	abstract inner class DurationPref(
 		@DrawableRes val iconId: Int,
 		@StringRes val titleId: Int,
@@ -484,7 +729,7 @@ class TelegramSettings(private val app: TelegramApplication) {
 
 		abstract fun setCurrentValue(index: Int)
 
-		fun getMenuItems() = values.map { OsmandFormatter.getFormattedDuration(app, it) }
+		open fun getMenuItems() = values.map { OsmandFormatter.getFormattedDuration(app, it) }
 	}
 
 	enum class AppConnect(
@@ -528,6 +773,16 @@ class TelegramSettings(private val app: TelegramApplication) {
 				return 0
 			}
 
+			@DrawableRes
+			fun getIconId(appPackage: String): Int {
+				for (item in values()) {
+					if (item.appPackage == appPackage) {
+						return item.iconId
+					}
+				}
+				return 0
+			}
+
 			fun getInstalledApps(context: Context) =
 				values().filter { AndroidUtils.isAppInstalled(context, it.appPackage) }
 		}
@@ -567,11 +822,6 @@ class TelegramSettings(private val app: TelegramApplication) {
 			R.color.sharing_status_icon_error,
 			true
 		),
-		SUCCESSFULLY_SENT(
-			R.drawable.ic_action_share_location,
-			R.color.sharing_status_icon_success,
-			false
-		),
 		SENDING(
 			R.drawable.ic_action_share_location,
 			R.color.sharing_status_icon_success,
@@ -601,6 +851,16 @@ class TelegramSettings(private val app: TelegramApplication) {
 		var deviceName: String = ""
 		var externalId: String = ""
 		var data: String = ""
+
+		companion object {
+
+			internal const val DEVICE_ID = "id"
+			internal const val USER_ID = "userId"
+			internal const val CHAT_ID = "chatId"
+			internal const val DEVICE_NAME = "deviceName"
+			internal const val EXTERNAL_ID = "externalId"
+			internal const val DATA = "data"
+		}
 	}
 
 	class SharingStatus {
@@ -634,17 +894,29 @@ class TelegramSettings(private val app: TelegramApplication) {
 	class ShareChatInfo {
 
 		var chatId = -1L
+		var userId = -1
 		var start = -1L
 		var livePeriod = -1L
+		var updateTextMessageId = 1
 		var currentMessageLimit = -1L
-		var currentMessageId = -1L
+		var currentMapMessageId = -1L
+		var oldMapMessageId = -1L
+		var currentTextMessageId = -1L
+		var oldTextMessageId = -1L
 		var userSetLivePeriod = -1L
 		var userSetLivePeriodStart = -1L
-		var lastSuccessfulLocation: LatLon? = null
 		var lastSuccessfulSendTimeMs = -1L
-		var shouldDeletePreviousMessage = false
-		var additionalActiveTime = ADDITIONAL_ACTIVE_TIME_VALUES_SEC[0]
+		var lastSendTextMessageTime = -1
+		var lastSendMapMessageTime = -1
+		var sentMessages = 0
+		var pendingTdLib = 0
+		var pendingTextMessage = false
+		var pendingMapMessage = false
+		var shouldSendViaBotMessage = false
 		var hasSharingError = false
+		var shouldDeletePreviousMapMessage = false
+		var shouldDeletePreviousTextMessage = false
+		var additionalActiveTime = ADDITIONAL_ACTIVE_TIME_VALUES_SEC[0]
 
 		fun getNextAdditionalActiveTime(): Long {
 			var index = ADDITIONAL_ACTIVE_TIME_VALUES_SEC.indexOf(additionalActiveTime)
@@ -662,12 +934,21 @@ class TelegramSettings(private val app: TelegramApplication) {
 		companion object {
 
 			internal const val CHAT_ID_KEY = "chatId"
+			internal const val USER_ID_KEY = "userId"
 			internal const val START_KEY = "start"
 			internal const val LIVE_PERIOD_KEY = "livePeriod"
 			internal const val LIMIT_KEY = "limit"
-			internal const val CURRENT_MESSAGE_ID_KEY = "currentMessageId"
+			internal const val UPDATE_TEXT_MESSAGE_ID_KEY = "updateTextMessageId"
+			internal const val CURRENT_MAP_MESSAGE_ID_KEY = "currentMapMessageId"
+			internal const val CURRENT_TEXT_MESSAGE_ID_KEY = "currentTextMessageId"
 			internal const val USER_SET_LIVE_PERIOD_KEY = "userSetLivePeriod"
 			internal const val USER_SET_LIVE_PERIOD_START_KEY = "userSetLivePeriodStart"
+			internal const val LAST_SUCCESSFUL_SEND_TIME_KEY = "lastSuccessfulSendTime"
+			internal const val LAST_SEND_MAP_TIME_KEY = "lastSendMapMessageTime"
+			internal const val LAST_SEND_TEXT_TIME_KEY = "lastSendTextMessageTime"
+			internal const val PENDING_TEXT_MESSAGE_KEY = "pendingTextMessage"
+			internal const val PENDING_MAP_MESSAGE_KEY = "pendingMapMessage"
+			internal const val SENT_MESSAGES_KEY = "sentMessages"
 		}
 	}
 }
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/helpers/LocationMessages.kt b/OsmAnd-telegram/src/net/osmand/telegram/helpers/LocationMessages.kt
new file mode 100644
index 0000000000..421ada72bf
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/telegram/helpers/LocationMessages.kt
@@ -0,0 +1,517 @@
+package net.osmand.telegram.helpers
+
+import android.content.Context
+import android.database.Cursor
+import android.database.sqlite.SQLiteDatabase
+import android.database.sqlite.SQLiteOpenHelper
+import net.osmand.Location
+import net.osmand.PlatformUtil
+import net.osmand.data.LatLon
+import net.osmand.telegram.TelegramApplication
+import net.osmand.telegram.utils.OsmandLocationUtils
+import net.osmand.util.MapUtils
+import org.drinkless.td.libcore.telegram.TdApi
+
+class LocationMessages(val app: TelegramApplication) {
+
+	private val log = PlatformUtil.getLog(LocationMessages::class.java)
+
+	private var bufferedMessages = emptyList<BufferMessage>()
+
+	private var lastLocationPoints = mutableMapOf<LocationHistoryPoint, LatLon>()
+
+	private val dbHelper: SQLiteHelper
+
+	init {
+		dbHelper = SQLiteHelper(app)
+		readBufferedMessages()
+	}
+
+	fun getBufferedMessages(): List<BufferMessage> {
+		return bufferedMessages.sortedBy { it.time }
+	}
+
+	fun getBufferedMessagesForChat(chatId: Long): List<BufferMessage> {
+		return bufferedMessages.filter { it.chatId==chatId }.sortedBy { it.time }
+	}
+
+	fun getIngoingMessages(currentUserId: Int, start: Long, end: Long): List<LocationMessage> {
+		return dbHelper.getIngoingMessages(currentUserId, start, end)
+	}
+
+	fun getIngoingUserLocations(start: Long, end: Long): List<UserLocations> {
+		return dbHelper.getIngoingUserLocations(start, end)
+	}
+
+	fun getMessagesForUserInChat(userId: Int, chatId: Long, start: Long, end: Long): List<LocationMessage> {
+		return dbHelper.getMessagesForUserInChat(userId, chatId, start, end)
+	}
+
+	fun getMessagesForUser(userId: Int, start: Long, end: Long): List<LocationMessage> {
+		return dbHelper.getMessagesForUser(userId, start, end)
+	}
+
+	fun addBufferedMessage(message: BufferMessage) {
+		log.debug("addBufferedMessage $message")
+		val messages = mutableListOf(*this.bufferedMessages.toTypedArray())
+		messages.add(message)
+		this.bufferedMessages = messages
+		dbHelper.addBufferedMessage(message)
+	}
+
+	fun addNewLocationMessage(message: TdApi.Message) {
+		log.debug("addNewLocationMessage ${message.id}")
+		val type = OsmandLocationUtils.getMessageType(message, app.telegramHelper)
+
+		val newItem = LocationHistoryPoint(message.senderUserId, message.chatId, type)
+		val previousMessageLatLon = lastLocationPoints[newItem]
+		val locationMessage = OsmandLocationUtils.parseMessage(message, app.telegramHelper, previousMessageLatLon)
+		if (locationMessage != null) {
+			dbHelper.addLocationMessage(locationMessage)
+			lastLocationPoints[newItem] = LatLon(locationMessage.lat, locationMessage.lon)
+		}
+	}
+
+	fun addMyLocationMessage(loc: Location) {
+		log.debug("addMyLocationMessage")
+		val currentUserId = app.telegramHelper.getCurrentUserId()
+		val newItem = LocationHistoryPoint(currentUserId, 0, -1)
+		val previousMessageLatLon = lastLocationPoints[newItem]
+		val distance = if (previousMessageLatLon != null) { MapUtils.getDistance(previousMessageLatLon, loc.latitude, loc.longitude) } else 0.0
+		val message = LocationMessages.LocationMessage(currentUserId, 0, loc.latitude, loc.longitude, loc.altitude,
+			loc.speed.toDouble(), loc.accuracy.toDouble(), loc.bearing.toDouble(), loc.time, TYPE_MY_LOCATION, 0, distance)
+
+		dbHelper.addLocationMessage(message)
+		lastLocationPoints[newItem] = LatLon(message.lat, message.lon)
+	}
+
+	fun clearBufferedMessages() {
+		log.debug("clearBufferedMessages")
+		dbHelper.clearBufferedMessages()
+		bufferedMessages = emptyList()
+	}
+
+	fun removeBufferedMessage(message: BufferMessage) {
+		log.debug("removeBufferedMessage $message")
+		val messages = mutableListOf(*this.bufferedMessages.toTypedArray())
+		messages.remove(message)
+		this.bufferedMessages = messages
+		dbHelper.removeBufferedMessage(message)
+	}
+
+	fun getBufferedMessagesCount(): Int {
+		return bufferedMessages.size
+	}
+
+	fun getBufferedMessagesCountForChat(chatId: Long): Int {
+		return bufferedMessages.count { it.chatId == chatId }
+	}
+
+	private fun readBufferedMessages() {
+		this.bufferedMessages = dbHelper.getBufferedMessages()
+	}
+
+	private fun readLastMessages() {
+		this.lastLocationPoints = dbHelper.getLastMessages()
+	}
+
+	private class SQLiteHelper(context: Context) :
+		SQLiteOpenHelper(context, DATABASE_NAME, null, DATABASE_VERSION) {
+
+		override fun onCreate(db: SQLiteDatabase) {
+			db.execSQL(TIMELINE_TABLE_CREATE)
+			db.execSQL("CREATE INDEX IF NOT EXISTS $DATE_INDEX ON $TIMELINE_TABLE_NAME (\"$COL_TIME\" DESC);")
+			db.execSQL(BUFFER_TABLE_CREATE)
+		}
+
+		override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+			db.execSQL(TIMELINE_TABLE_DELETE)
+			db.execSQL(BUFFER_TABLE_DELETE)
+			onCreate(db)
+		}
+
+		internal fun addBufferedMessage(message: BufferMessage) {
+			writableDatabase?.execSQL(BUFFER_TABLE_INSERT,
+				arrayOf(message.chatId, message.lat, message.lon, message.altitude, message.speed,
+					message.hdop, message.bearing, message.time, message.type))
+		}
+
+		internal fun addLocationMessage(message: LocationMessage) {
+			writableDatabase?.execSQL(TIMELINE_TABLE_INSERT,
+				arrayOf(message.userId, message.chatId, message.lat, message.lon, message.altitude, message.speed,
+					message.hdop, message.bearing, message.time, message.type, message.messageId, message.distanceFromPrev))
+		}
+
+		internal fun getMessagesForUser(userId: Int, start: Long, end: Long): List<LocationMessage> {
+			val res = arrayListOf<LocationMessage>()
+			readableDatabase?.rawQuery(
+				"$TIMELINE_TABLE_SELECT WHERE $COL_USER_ID = ? AND $COL_TIME BETWEEN $start AND $end ORDER BY $COL_CHAT_ID ASC, $COL_TYPE DESC, $COL_TIME ASC ",
+				arrayOf(userId.toString()))?.apply {
+				if (moveToFirst()) {
+					do {
+						res.add(readLocationMessage(this@apply))
+					} while (moveToNext())
+				}
+				close()
+			}
+			return res
+		}
+
+		internal fun getPreviousMessage(userId: Int, chatId: Long): LocationMessage? {
+			var res:LocationMessage? = null
+			readableDatabase?.rawQuery(
+				"$TIMELINE_TABLE_SELECT WHERE $COL_USER_ID = ? AND $COL_CHAT_ID = ? ORDER BY $COL_TIME DESC LIMIT 1",
+				arrayOf(userId.toString(), chatId.toString()))?.apply {
+				if (moveToFirst()) {
+					res = readLocationMessage(this@apply)
+				}
+				close()
+			}
+			return res
+		}
+
+		internal fun getIngoingMessages(currentUserId: Int, start: Long, end: Long): List<LocationMessage> {
+			val res = arrayListOf<LocationMessage>()
+			readableDatabase?.rawQuery(
+				"$TIMELINE_TABLE_SELECT WHERE $COL_USER_ID != ? AND $COL_TIME BETWEEN $start AND $end ORDER BY $COL_USER_ID, $COL_CHAT_ID, $COL_TYPE DESC, $COL_TIME ",
+				arrayOf(currentUserId.toString()))?.apply {
+				if (moveToFirst()) {
+					do {
+						res.add(readLocationMessage(this@apply))
+					} while (moveToNext())
+				}
+				close()
+			}
+			return res
+		}
+
+		internal fun getIngoingUserLocations(start: Long, end: Long): List<UserLocations> {
+			val res = arrayListOf<UserLocations>()
+			readableDatabase?.rawQuery(
+				"$TIMELINE_TABLE_SELECT WHERE $COL_TIME BETWEEN $start AND $end ORDER BY $COL_USER_ID, $COL_CHAT_ID, $COL_TYPE DESC, $COL_TIME ", null
+				)?.apply {
+				if (moveToFirst()) {
+					var userId = -1
+					var chatId = -1L
+					// TODO query bot name
+					var botName = ""
+					var userLocations: UserLocations? = null
+					var userLocationsMap: MutableMap<Int, MutableList<UserTrkSegment>>? = null
+					var userLocationsListByType: MutableList<LocationMessage>? = null
+					var segment: UserTrkSegment? = null
+					do {
+						val locationMessage = readLocationMessage(this@apply)
+						userId = locationMessage.userId
+						chatId = locationMessage.chatId
+						// TODO compare bot name as well
+						if(userLocations == null || userLocations.userId != userId ||
+							userLocations.chatId != chatId) {
+							userLocationsMap = mutableMapOf()
+							userLocations = UserLocations(userId, chatId, botName, userLocationsMap)
+							res.add(userLocations)
+							segment = null
+						}
+						if(segment == null ||
+							segment.type != locationMessage.type || locationMessage.time - segment.maxTime > 30 * 1000 * 60) {
+							segment = UserTrkSegment(mutableListOf(), 0.0, locationMessage.type,
+								locationMessage.time, locationMessage.time)
+							if(userLocationsMap!![segment.type] == null) {
+								userLocationsMap[segment.type] = mutableListOf()
+							}
+							userLocationsMap[segment.type]!!.add(segment)
+						}
+						if(segment.points.size > 0) {
+							segment.distance += MapUtils.getDistance(locationMessage.lat,
+								locationMessage.lon, segment.points.last().lat, segment.points.last().lon)
+						}
+						segment.maxTime = locationMessage.time
+						segment.points.add(locationMessage)
+					} while (moveToNext())
+				}
+				close()
+			}
+			return res
+		}
+
+		internal fun getMessagesForUserInChat(userId: Int, chatId: Long, start: Long, end: Long): List<LocationMessage> {
+			val res = arrayListOf<LocationMessage>()
+			readableDatabase?.rawQuery(
+				"$TIMELINE_TABLE_SELECT WHERE $COL_USER_ID = ? AND $COL_CHAT_ID = ? AND $COL_TIME BETWEEN $start AND $end ORDER BY $COL_TYPE DESC, $COL_TIME ",
+				arrayOf(userId.toString(), chatId.toString()))?.apply {
+				if (moveToFirst()) {
+					do {
+						res.add(readLocationMessage(this@apply))
+					} while (moveToNext())
+				}
+				close()
+			}
+			return res
+		}
+
+		internal fun getBufferedMessages(): List<BufferMessage> {
+			val res = arrayListOf<BufferMessage>()
+			readableDatabase?.rawQuery(BUFFER_TABLE_SELECT, null)?.apply {
+				if (moveToFirst()) {
+					do {
+						res.add(readBufferMessage(this@apply))
+					} while (moveToNext())
+				}
+				close()
+			}
+			return res
+		}
+
+		internal fun getLastMessages(): MutableMap<LocationHistoryPoint, LatLon> {
+			val res = mutableMapOf<LocationHistoryPoint, LatLon>()
+			readableDatabase?.rawQuery("$TIMELINE_TABLE_SELECT_HISTORY_POINTS ORDER BY $COL_TIME ASC", null)?.apply {
+				if (moveToFirst()) {
+					do {
+//						res.add(readLocationMessage(this@apply))
+					} while (moveToNext())
+				}
+				close()
+			}
+			return res
+		}
+
+		internal fun readLocationMessage(cursor: Cursor): LocationMessage {
+			val userId = cursor.getInt(0)
+			val chatId = cursor.getLong(1)
+			val lat = cursor.getDouble(2)
+			val lon = cursor.getDouble(3)
+			val altitude = cursor.getDouble(4)
+			val speed = cursor.getDouble(5)
+			val hdop = cursor.getDouble(6)
+			val bearing = cursor.getDouble(7)
+			val date = cursor.getLong(8)
+			val type = cursor.getInt(9)
+			val messageId = cursor.getLong(10)
+			val distanceFromPrev = cursor.getDouble(11)
+
+			return LocationMessage(userId, chatId, lat, lon, altitude, speed, hdop, bearing, date, type, messageId, distanceFromPrev)
+		}
+
+		internal fun readBufferMessage(cursor: Cursor): BufferMessage {
+			val chatId = cursor.getLong(0)
+			val lat = cursor.getDouble(1)
+			val lon = cursor.getDouble(2)
+			val altitude = cursor.getDouble(3)
+			val speed = cursor.getDouble(4)
+			val hdop = cursor.getDouble(5)
+			val bearing = cursor.getDouble(6)
+			val date = cursor.getLong(7)
+			val type = cursor.getInt(8)
+
+			return BufferMessage(chatId, lat, lon, altitude, speed, hdop, bearing, date, type)
+		}
+
+		internal fun readLocationHistoryPoint(cursor: Cursor): Pair<LocationHistoryPoint, LatLon> {
+			val userId = cursor.getInt(0)
+			val chatId = cursor.getLong(1)
+			val lat = cursor.getDouble(2)
+			val lon = cursor.getDouble(3)
+			val type = cursor.getInt(4)
+
+			return Pair(LocationHistoryPoint(userId, chatId, type), LatLon(lat, lon))
+		}
+
+		internal fun clearBufferedMessages() {
+			writableDatabase?.execSQL(BUFFER_TABLE_CLEAR)
+		}
+
+		internal fun removeBufferedMessage(message: BufferMessage) {
+
+			writableDatabase?.execSQL(
+				BUFFER_TABLE_REMOVE,
+				arrayOf(
+					message.chatId,
+					message.lat,
+					message.lon,
+					message.altitude,
+					message.speed,
+					message.hdop,
+					message.bearing,
+					message.time,
+					message.type
+				)
+			)
+		}
+
+		companion object {
+
+			private const val DATABASE_NAME = "location_messages"
+			private const val DATABASE_VERSION = 5
+
+			private const val TIMELINE_TABLE_NAME = "timeline"
+			private const val BUFFER_TABLE_NAME = "buffer"
+
+			private const val COL_USER_ID = "user_id"
+			private const val COL_CHAT_ID = "chat_id"
+			private const val COL_TIME = "time"
+			private const val COL_LAT = "lat"
+			private const val COL_LON = "lon"
+			private const val COL_ALTITUDE = "altitude"
+			private const val COL_SPEED = "speed"
+			private const val COL_HDOP = "hdop"
+			private const val COL_BEARING = "bearing"
+			private const val COL_TYPE = "type" // 0 = user map message, 1 = user text message, 2 = bot map message, 3 = bot text message
+			private const val COL_MESSAGE_ID = "message_id"
+			private const val COL_DISTANCE_FROM_PREV = "distance_from_prev"
+
+			private const val DATE_INDEX = "date_index"
+
+			// Timeline messages table
+			private const val TIMELINE_TABLE_INSERT =
+				("INSERT INTO $TIMELINE_TABLE_NAME ($COL_USER_ID, $COL_CHAT_ID, $COL_LAT, $COL_LON, $COL_ALTITUDE, $COL_SPEED, $COL_HDOP, $COL_BEARING, $COL_TIME, $COL_TYPE,  $COL_MESSAGE_ID,  $COL_DISTANCE_FROM_PREV) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+
+			private const val TIMELINE_TABLE_CREATE =
+				("CREATE TABLE IF NOT EXISTS $TIMELINE_TABLE_NAME ($COL_USER_ID long, $COL_CHAT_ID long,$COL_LAT double, $COL_LON double, $COL_ALTITUDE double, $COL_SPEED float, $COL_HDOP double, $COL_BEARING double, $COL_TIME long, $COL_TYPE int, $COL_MESSAGE_ID long, $COL_DISTANCE_FROM_PREV double )")
+
+			private const val TIMELINE_TABLE_SELECT =
+				"SELECT $COL_USER_ID, $COL_CHAT_ID, $COL_LAT, $COL_LON, $COL_ALTITUDE, $COL_SPEED, $COL_HDOP, $COL_BEARING, $COL_TIME, $COL_TYPE, $COL_MESSAGE_ID, $COL_DISTANCE_FROM_PREV FROM $TIMELINE_TABLE_NAME"
+
+			private const val TIMELINE_TABLE_SELECT_HISTORY_POINTS =
+				"SELECT $COL_USER_ID, $COL_CHAT_ID, $COL_LAT, $COL_LON, $COL_TIME, $COL_TYPE FROM $TIMELINE_TABLE_NAME"
+
+			private const val TIMELINE_TABLE_CLEAR = "DELETE FROM $TIMELINE_TABLE_NAME"
+
+			private const val TIMELINE_TABLE_DELETE = "DROP TABLE IF EXISTS $TIMELINE_TABLE_NAME"
+
+			// Buffer messages table
+			private const val BUFFER_TABLE_INSERT =
+					("INSERT INTO $BUFFER_TABLE_NAME ($COL_CHAT_ID, $COL_LAT, $COL_LON, $COL_ALTITUDE, $COL_SPEED, $COL_HDOP, $COL_BEARING, $COL_TIME, $COL_TYPE) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)")
+
+			private const val BUFFER_TABLE_CREATE =
+					("CREATE TABLE IF NOT EXISTS $BUFFER_TABLE_NAME ($COL_CHAT_ID long, $COL_LAT double, $COL_LON double, $COL_ALTITUDE double, $COL_SPEED float, $COL_HDOP double, $COL_BEARING double, $COL_TIME long, $COL_TYPE int)")
+
+			private const val BUFFER_TABLE_SELECT =
+					"SELECT $COL_CHAT_ID, $COL_LAT, $COL_LON, $COL_ALTITUDE, $COL_SPEED, $COL_HDOP, $COL_BEARING, $COL_TIME, $COL_TYPE FROM $BUFFER_TABLE_NAME"
+
+			private const val BUFFER_TABLE_CLEAR = "DELETE FROM $BUFFER_TABLE_NAME"
+
+			private const val BUFFER_TABLE_REMOVE = "DELETE FROM $BUFFER_TABLE_NAME  WHERE $COL_CHAT_ID = ? AND $COL_LAT = ? AND $COL_LON = ? AND $COL_ALTITUDE = ? AND $COL_SPEED = ? AND $COL_HDOP = ? AND $COL_BEARING = ? AND $COL_TIME = ? AND $COL_TYPE = ?"
+
+			private const val BUFFER_TABLE_DELETE = "DROP TABLE IF EXISTS $BUFFER_TABLE_NAME"
+		}
+	}
+
+	data class LocationMessage(
+		val userId: Int,
+		val chatId: Long,
+		val lat: Double,
+		val lon: Double,
+		val altitude: Double,
+		val speed: Double,
+		val hdop: Double,
+		val bearing: Double,
+		val time: Long,
+		val type: Int,
+		val messageId: Long,
+		val distanceFromPrev: Double)
+
+	data class BufferMessage (
+		val chatId: Long,
+		val lat: Double,
+		val lon: Double,
+		val altitude: Double,
+		val speed: Double,
+		val hdop: Double,
+		val bearing: Double,
+		val time: Long,
+		val type: Int)
+
+	data class UserLocations(
+		var userId: Int,
+		var chatId: Long,
+		var botName: String,
+		var locationsByType: Map<Int, List<UserTrkSegment>>
+
+
+	){
+		fun getUniqueSegments(): List<UserTrkSegment> {
+			// TODO TYPE_BOT_MAP. TYPE_BOT_TEXT, TYPE_USER_BOTH, TYPE_BOT_BOTH - delete
+			val list = mutableListOf<UserTrkSegment>()
+			if(locationsByType.containsKey(TYPE_MY_LOCATION)) {
+				return locationsByType.get(TYPE_MY_LOCATION)?: list
+			}
+			list.addAll(locationsByType.get(TYPE_USER_TEXT)?: emptyList())
+			val mapList = locationsByType.get(TYPE_USER_MAP)?: emptyList();
+			mapList.forEach {
+				var ti = 0;
+				while(ti < list.size && list[ti].maxTime < it.minTime) {
+					ti++;
+				}
+				if(ti < list.size  && list[ti].minTime > it.maxTime ) {
+					list.add(ti, it)
+				} else if(ti == list.size) {
+					list.add(it)
+				}
+			}
+
+
+			return list
+		}
+	}
+
+	data class UserTrkSegment(
+		val points: MutableList<LocationMessage>,
+		var distance: Double,
+		var type: Int,
+		var minTime: Long,
+		var maxTime: Long
+	) {
+		fun newer(other: UserTrkSegment): Boolean {
+			return other.maxTime < maxTime;
+		}
+
+
+		fun overlap(other: UserTrkSegment): Boolean {
+
+			if(other.maxTime < maxTime) {
+				return other.maxTime > minTime;
+			} else {
+				return other.minTime < maxTime;
+			}
+		}
+
+	}
+
+	data class LocationHistoryPoint(
+		val userId: Int,
+		val chatId: Long,
+		val type: Int
+	) {
+
+		override fun equals(other: Any?): Boolean {
+			if (other == null) {
+				return false
+			}
+			if (other !is LocationHistoryPoint) {
+				return false
+			}
+			val o = other as LocationHistoryPoint?
+			return this.userId == o!!.userId && this.chatId == o.chatId && this.type == o.type
+		}
+
+		override fun hashCode(): Int {
+			val prime = 31
+			var result = 1
+			result = prime * result + userId.hashCode()
+			result = prime * result + chatId.hashCode()
+			result = prime * result + type.hashCode()
+			return result
+		}
+	}
+
+
+	companion object {
+
+		const val TYPE_USER_MAP = 0
+		const val TYPE_USER_TEXT = 1
+		const val TYPE_USER_BOTH = 2
+		const val TYPE_BOT_MAP = 3
+		const val TYPE_BOT_TEXT = 4
+		const val TYPE_BOT_BOTH = 5
+		const val TYPE_MY_LOCATION = 6
+	}
+}
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/helpers/MessagesDbHelper.kt b/OsmAnd-telegram/src/net/osmand/telegram/helpers/MessagesDbHelper.kt
deleted file mode 100644
index dcd4d67c46..0000000000
--- a/OsmAnd-telegram/src/net/osmand/telegram/helpers/MessagesDbHelper.kt
+++ /dev/null
@@ -1,122 +0,0 @@
-package net.osmand.telegram.helpers
-
-import android.content.Context
-import android.database.sqlite.SQLiteDatabase
-import android.database.sqlite.SQLiteOpenHelper
-import net.osmand.telegram.TelegramApplication
-import org.drinkless.td.libcore.telegram.TdApi
-
-class MessagesDbHelper(val app: TelegramApplication) {
-
-	private val messages = HashSet<Message>()
-
-	private val sqliteHelper: SQLiteHelper
-
-	init {
-		sqliteHelper = SQLiteHelper(app)
-		sqliteHelper.getMessages().forEach {
-			app.telegramHelper.loadMessage(it.chatId, it.messageId)
-		}
-		app.telegramHelper.addIncomingMessagesListener(object :
-			TelegramHelper.TelegramIncomingMessagesListener {
-
-			override fun onReceiveChatLocationMessages(
-				chatId: Long, vararg messages: TdApi.Message
-			) {
-				messages.forEach { addMessage(chatId, it.id) }
-			}
-
-			override fun onDeleteChatLocationMessages(chatId: Long, messages: List<TdApi.Message>) {
-				messages.forEach { removeMessage(chatId, it.id) }
-			}
-
-			override fun updateLocationMessages() {}
-		})
-	}
-
-	fun saveMessages() {
-		clearMessages()
-		synchronized(messages) {
-			sqliteHelper.addMessages(messages)
-		}
-	}
-	
-	fun clearMessages() {
-		sqliteHelper.clearMessages()
-	}
-
-	private fun addMessage(chatId: Long, messageId: Long) {
-		synchronized(messages) {
-			messages.add(Message(chatId, messageId))
-		}
-	}
-
-	private fun removeMessage(chatId: Long, messageId: Long) {
-		synchronized(messages) {
-			messages.remove(Message(chatId, messageId))
-		}
-	}
-
-	private class SQLiteHelper(context: Context) :
-		SQLiteOpenHelper(context, DB_NAME, null, DB_VERSION) {
-
-		override fun onCreate(db: SQLiteDatabase) {
-			db.execSQL(MESSAGES_TABLE_CREATE)
-		}
-
-		override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
-			db.execSQL(MESSAGES_TABLE_DELETE)
-			onCreate(db)
-		}
-
-		internal fun addMessages(messages: Set<Message>) {
-			messages.forEach {
-				writableDatabase?.execSQL(MESSAGES_TABLE_INSERT, arrayOf(it.chatId, it.messageId))
-			}
-		}
-
-		internal fun getMessages(): Set<Message> {
-			val res = HashSet<Message>()
-			readableDatabase?.rawQuery(MESSAGES_TABLE_SELECT, null)?.apply {
-				if (moveToFirst()) {
-					do {
-						res.add(Message(getLong(0), getLong(1)))
-					} while (moveToNext())
-				}
-				close()
-			}
-			return res
-		}
-
-		internal fun clearMessages() {
-			writableDatabase?.execSQL(MESSAGES_TABLE_CLEAR)
-		}
-
-		companion object {
-
-			private const val DB_NAME = "messages.db"
-			private const val DB_VERSION = 1
-
-			private const val MESSAGES_TABLE_NAME = "messages"
-			private const val MESSAGES_COL_CHAT_ID = "chat_id"
-			private const val MESSAGES_COL_MESSAGE_ID = "message_id"
-
-			private const val MESSAGES_TABLE_CREATE =
-				"CREATE TABLE IF NOT EXISTS $MESSAGES_TABLE_NAME (" +
-						"$MESSAGES_COL_CHAT_ID LONG, " +
-						"$MESSAGES_COL_MESSAGE_ID LONG)"
-
-			private const val MESSAGES_TABLE_DELETE = "DROP TABLE IF EXISTS $MESSAGES_TABLE_NAME"
-
-			private const val MESSAGES_TABLE_SELECT =
-				"SELECT $MESSAGES_COL_CHAT_ID, $MESSAGES_COL_MESSAGE_ID FROM $MESSAGES_TABLE_NAME"
-
-			private const val MESSAGES_TABLE_CLEAR = "DELETE FROM $MESSAGES_TABLE_NAME"
-
-			private const val MESSAGES_TABLE_INSERT = "INSERT INTO $MESSAGES_TABLE_NAME (" +
-					"$MESSAGES_COL_CHAT_ID,  $MESSAGES_COL_MESSAGE_ID) VALUES (?, ?)"
-		}
-	}
-
-	private data class Message(val chatId: Long, val messageId: Long)
-}
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/helpers/OsmandAidlHelper.kt b/OsmAnd-telegram/src/net/osmand/telegram/helpers/OsmandAidlHelper.kt
index edac62b427..9608affa9e 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/helpers/OsmandAidlHelper.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/helpers/OsmandAidlHelper.kt
@@ -75,6 +75,12 @@ class OsmandAidlHelper(private val app: TelegramApplication) {
 		fun onSearchComplete(resultSet: List<SearchResult>)
 	}
 
+	private var gpxBitmapCreatedListener: GpxBitmapCreatedListener? = null
+
+	interface GpxBitmapCreatedListener {
+		fun onGpxBitmapCreated(bitmap: AGpxBitmap)
+	}
+
 	private val mIOsmAndAidlCallback = object : IOsmAndAidlCallback.Stub() {
 
 		@Throws(RemoteException::class)
@@ -90,12 +96,26 @@ class OsmandAidlHelper(private val app: TelegramApplication) {
 				mUpdatesListener!!.update()
 			}
 		}
+
+		override fun onAppInitialized() {
+
+		}
+
+		override fun onGpxBitmapCreated(bitmap: AGpxBitmap) {
+			if (gpxBitmapCreatedListener != null) {
+				gpxBitmapCreatedListener!!.onGpxBitmapCreated(bitmap)
+			}
+		}
 	}
 
 	fun setSearchCompleteListener(mSearchCompleteListener: SearchCompleteListener) {
 		this.mSearchCompleteListener = mSearchCompleteListener
 	}
 
+	fun setGpxBitmapCreatedListener(gpxBitmapCreatedListener: GpxBitmapCreatedListener) {
+		this.gpxBitmapCreatedListener = gpxBitmapCreatedListener
+	}
+
 	private var mUpdatesListener: UpdatesListener? = null
 
 	interface UpdatesListener {
@@ -106,6 +126,7 @@ class OsmandAidlHelper(private val app: TelegramApplication) {
 		this.mUpdatesListener = mUpdatesListener
 	}
 
+	fun updatesCallbackRegistered() = osmandCallbackId > 0
 	/**
 	 * Class for interacting with the main interface of the service.
 	 */
@@ -183,6 +204,15 @@ class OsmandAidlHelper(private val app: TelegramApplication) {
 		}
 	}
 
+	fun execOsmandApi(action: (() -> Unit)) {
+		if (!isOsmandConnected() && isOsmandBound()) {
+			connectOsmand()
+		}
+		if (isOsmandConnected()) {
+			action.invoke()
+		}
+	}
+
 	private fun bindService(packageName: String): Boolean {
 		return if (mIOsmAndAidlInterface == null) {
 			val intent = Intent("net.osmand.aidl.OsmandAidlService")
@@ -1052,7 +1082,23 @@ class OsmandAidlHelper(private val app: TelegramApplication) {
 	fun unregisterFromUpdates(): Boolean {
 		if (mIOsmAndAidlInterface != null) {
 			try {
-				return mIOsmAndAidlInterface!!.unregisterFromUpdates(osmandCallbackId)
+				val unregistered = mIOsmAndAidlInterface!!.unregisterFromUpdates(osmandCallbackId)
+				if (unregistered) {
+					osmandCallbackId = 0
+				}
+				return unregistered
+			} catch (e: RemoteException) {
+				e.printStackTrace()
+			}
+		}
+		return false
+	}
+
+	fun getBitmapForGpx(gpxUri: Uri, density: Float, widthPixels: Int, heightPixels: Int, color: Int): Boolean {
+		if (mIOsmAndAidlInterface != null) {
+			try {
+				app.grantUriPermission(app.settings.appToConnectPackage, gpxUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+				return mIOsmAndAidlInterface!!.getBitmapForGpx(CreateGpxBitmapParams(gpxUri, density, widthPixels, heightPixels, color), mIOsmAndAidlCallback)
 			} catch (e: RemoteException) {
 				e.printStackTrace()
 			}
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/helpers/ShareLocationHelper.kt b/OsmAnd-telegram/src/net/osmand/telegram/helpers/ShareLocationHelper.kt
index 74001a6d03..74dbec35be 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/helpers/ShareLocationHelper.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/helpers/ShareLocationHelper.kt
@@ -2,12 +2,19 @@ package net.osmand.telegram.helpers
 
 import net.osmand.Location
 import net.osmand.PlatformUtil
-import net.osmand.telegram.TelegramApplication
+import net.osmand.telegram.*
+import net.osmand.telegram.helpers.LocationMessages.BufferMessage
 import net.osmand.telegram.notifications.TelegramNotification.NotificationType
 import net.osmand.telegram.utils.AndroidNetworkUtils
+import net.osmand.telegram.utils.BASE_URL
+import org.drinkless.td.libcore.telegram.TdApi
+import org.json.JSONException
+import org.json.JSONObject
 
 private const val USER_SET_LIVE_PERIOD_DELAY_MS = 5000 // 5 sec
 
+private const val UPDATE_LOCATION_ACCURACY = 150 // 150 meters
+
 class ShareLocationHelper(private val app: TelegramApplication) {
 
 	private val log = PlatformUtil.getLog(ShareLocationHelper::class.java)
@@ -21,7 +28,7 @@ class ShareLocationHelper(private val app: TelegramApplication) {
 	var distance: Int = 0
 		private set
 
-	var lastLocationMessageSentTime: Long = 0
+	var lastLocationUpdateTime: Long = 0
 
 	var lastLocation: Location? = null
 		set(value) {
@@ -43,19 +50,11 @@ class ShareLocationHelper(private val app: TelegramApplication) {
 	fun updateLocation(location: Location?) {
 		lastLocation = location
 
-		if (location != null) {
-			val chatsShareInfo = app.settings.getChatsShareInfo()
-			if (chatsShareInfo.isNotEmpty()) {
-				val user = app.telegramHelper.getCurrentUser()
-				val sharingMode = app.settings.currentSharingMode
-				if (user != null && sharingMode == user.id.toString()) {
-					app.telegramHelper.sendLiveLocationMessage(chatsShareInfo, location.latitude, location.longitude)
-				} else if (sharingMode.isNotEmpty()) {
-					val url = "https://live.osmand.net/device/$sharingMode/send?lat=${location.latitude}&lon=${location.longitude}"
-					AndroidNetworkUtils.sendRequestAsync(url, null)
-				}
+		if (location != null && location.accuracy < UPDATE_LOCATION_ACCURACY) {
+			lastLocationUpdateTime = System.currentTimeMillis()
+			if (app.settings.getChatsShareInfo().isNotEmpty()) {
+				shareLocationMessages(location, app.telegramHelper.getCurrentUserId())
 			}
-			lastLocationMessageSentTime = System.currentTimeMillis()
 		}
 		app.settings.updateSharingStatusHistory()
 		refreshNotification()
@@ -77,14 +76,16 @@ class ShareLocationHelper(private val app: TelegramApplication) {
 									livePeriod
 								}
 							livePeriod = newLivePeriod
-							shouldDeletePreviousMessage = true
+							shouldDeletePreviousMapMessage = true
+							shouldDeletePreviousTextMessage = true
 							currentMessageLimit = currentTime + Math.min(newLivePeriod, TelegramHelper.MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC.toLong())
 						}
 					}
 					shareInfo.userSetLivePeriod != shareInfo.livePeriod
 							&& (shareInfo.userSetLivePeriodStart + USER_SET_LIVE_PERIOD_DELAY_MS) > currentTime -> {
 						shareInfo.apply {
-							shouldDeletePreviousMessage = true
+							shouldDeletePreviousMapMessage = true
+							shouldDeletePreviousTextMessage = true
 							livePeriod = shareInfo.userSetLivePeriod
 							currentMessageLimit = currentTime + Math.min(livePeriod, TelegramHelper.MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC.toLong())
 						}
@@ -96,6 +97,37 @@ class ShareLocationHelper(private val app: TelegramApplication) {
 		}
 	}
 
+	fun checkAndSendBufferMessagesToChat(chatId: Long) {
+		val shareInfo = app.settings.getChatsShareInfo()[chatId]
+		if (shareInfo != null && shareInfo.pendingTdLib < 10) {
+			app.locationMessages.getBufferedMessagesForChat(shareInfo.chatId).forEach {
+				if (it.type == LocationMessages.TYPE_USER_TEXT && !shareInfo.pendingTextMessage && shareInfo.currentTextMessageId != -1L) {
+					app.telegramHelper.editTextLocation(shareInfo, it)
+					app.locationMessages.removeBufferedMessage(it)
+				} else if (it.type == LocationMessages.TYPE_USER_MAP && !shareInfo.pendingMapMessage && shareInfo.currentMapMessageId != -1L) {
+					app.telegramHelper.editMapLocation(shareInfo, it)
+					app.locationMessages.removeBufferedMessage(it)
+				} else if (it.type == LocationMessages.TYPE_USER_BOTH) {
+					var messageSent = false
+					if (!shareInfo.pendingMapMessage && shareInfo.currentMapMessageId != -1L) {
+						app.telegramHelper.editMapLocation(shareInfo, it)
+						messageSent = true
+					}
+					if (!shareInfo.pendingTextMessage && shareInfo.currentTextMessageId != -1L) {
+						app.telegramHelper.editTextLocation(shareInfo, it)
+						messageSent = true
+					}
+					if (messageSent) {
+						app.locationMessages.removeBufferedMessage(it)
+					}
+				}
+				if (shareInfo.pendingTdLib >= 10) {
+					return
+				}
+			}
+		}
+	}
+
 	fun startSharingLocation() {
 		if (!sharingLocation) {
 			sharingLocation = true
@@ -103,6 +135,8 @@ class ShareLocationHelper(private val app: TelegramApplication) {
 			app.startMyLocationService()
 
 			refreshNotification()
+
+			checkAndSendBufferMessages()
 		} else {
 			app.forceUpdateMyLocation()
 		}
@@ -132,6 +166,209 @@ class ShareLocationHelper(private val app: TelegramApplication) {
 		refreshNotification()
 	}
 
+	private fun checkAndSendBufferMessages(){
+		log.debug("checkAndSendBufferMessages")
+		app.settings.getChatsShareInfo().forEach loop@{ (chatId, shareInfo) ->
+			if (shareInfo.pendingTdLib < 10) {
+				app.locationMessages.getBufferedMessagesForChat(chatId).forEach {
+					if (it.type == LocationMessages.TYPE_USER_TEXT && !shareInfo.pendingTextMessage && shareInfo.currentTextMessageId != -1L) {
+						app.telegramHelper.editTextLocation(shareInfo, it)
+						app.locationMessages.removeBufferedMessage(it)
+					} else if (it.type == LocationMessages.TYPE_USER_MAP && !shareInfo.pendingMapMessage && shareInfo.currentMapMessageId != -1L) {
+						app.telegramHelper.editMapLocation(shareInfo, it)
+						app.locationMessages.removeBufferedMessage(it)
+					}
+					if (shareInfo.pendingTdLib >= 10) {
+						return@loop
+					}
+				}
+			}
+		}
+	}
+
+	private fun shareLocationMessages(location: Location, userId: Int) {
+		val chatsShareInfo = app.settings.getChatsShareInfo()
+		val latitude = location.latitude
+		val longitude = location.longitude
+		val altitude = location.altitude
+		val speed = location.speed.toDouble()
+		val accuracy = location.accuracy.toDouble()
+		val bearing = location.bearing.toDouble()
+		val time = location.time
+		val sharingMode = app.settings.currentSharingMode
+		val isBot = sharingMode != userId.toString()
+		var bufferedMessagesFull = false
+		val type = when (app.settings.shareTypeValue) {
+			SHARE_TYPE_MAP -> {
+				if (isBot) LocationMessages.TYPE_BOT_MAP else LocationMessages.TYPE_USER_MAP
+			}
+			SHARE_TYPE_TEXT -> {
+				if (isBot) LocationMessages.TYPE_BOT_TEXT else LocationMessages.TYPE_USER_TEXT
+			}
+			SHARE_TYPE_MAP_AND_TEXT -> {
+				if (isBot) LocationMessages.TYPE_BOT_BOTH else LocationMessages.TYPE_USER_BOTH
+			} else -> -1
+		}
+		chatsShareInfo.values.forEach { shareInfo ->
+			if (shareInfo.pendingTdLib >= 10) {
+				bufferedMessagesFull = true
+			}
+			val message = BufferMessage(shareInfo.chatId, latitude, longitude, altitude, speed, accuracy, bearing, time, type)
+
+			if (type == LocationMessages.TYPE_USER_MAP || type == LocationMessages.TYPE_BOT_MAP) {
+				prepareMapMessage(shareInfo, message, isBot, sharingMode)
+			} else if (type == LocationMessages.TYPE_USER_TEXT || type == LocationMessages.TYPE_BOT_TEXT) {
+				prepareTextMessage(shareInfo, message, isBot, sharingMode)
+			} else if (type == LocationMessages.TYPE_USER_BOTH || type == LocationMessages.TYPE_BOT_BOTH) {
+				prepareMapAndTextMessage(shareInfo, message, isBot, sharingMode)
+			}
+		}
+		app.locationMessages.addMyLocationMessage(location)
+		if (bufferedMessagesFull) {
+			checkNetworkType()
+		}
+	}
+
+	private fun prepareTextMessage(shareInfo: TelegramSettings.ShareChatInfo,message: BufferMessage,isBot:Boolean, sharingMode: String) {
+		log.debug("prepareTextMessage $message")
+		if (shareInfo.currentTextMessageId == -1L) {
+			if (shareInfo.pendingTextMessage) {
+				app.locationMessages.addBufferedMessage(message)
+			} else {
+				if (isBot) {
+					sendLocationToBot(message, sharingMode, shareInfo, SHARE_TYPE_TEXT)
+				} else {
+					app.telegramHelper.sendNewTextLocation(shareInfo, message)
+				}
+			}
+		} else {
+			if (isBot) {
+				sendLocationToBot(message, sharingMode, shareInfo, SHARE_TYPE_TEXT)
+			} else {
+				if (shareInfo.pendingTdLib < 10) {
+					app.telegramHelper.editTextLocation(shareInfo, message)
+				} else {
+					app.locationMessages.addBufferedMessage(message)
+				}
+			}
+		}
+	}
+
+	private fun prepareMapMessage(shareInfo: TelegramSettings.ShareChatInfo,message: BufferMessage,isBot:Boolean, sharingMode: String) {
+		log.debug("prepareMapMessage $message")
+		if (shareInfo.currentMapMessageId == -1L) {
+			if (shareInfo.pendingMapMessage) {
+				app.locationMessages.addBufferedMessage(message)
+			} else {
+				if (isBot) {
+					sendLocationToBot(message, sharingMode, shareInfo, SHARE_TYPE_MAP)
+				} else {
+					app.telegramHelper.sendNewMapLocation(shareInfo, message)
+				}
+			}
+		} else {
+			if (isBot) {
+				sendLocationToBot(message, sharingMode, shareInfo, SHARE_TYPE_MAP)
+			} else {
+				if (shareInfo.pendingTdLib < 10) {
+					app.telegramHelper.editMapLocation(shareInfo, message)
+				} else {
+					app.locationMessages.addBufferedMessage(message)
+				}
+			}
+		}
+	}
+
+	private fun prepareMapAndTextMessage(shareInfo: TelegramSettings.ShareChatInfo, message: BufferMessage, isBot:Boolean, sharingMode: String) {
+		log.debug("prepareMapAndTextMessage $message")
+		if (shareInfo.pendingMapMessage || shareInfo.pendingTextMessage || shareInfo.pendingTdLib >= 10) {
+			app.locationMessages.addBufferedMessage(message)
+		} else {
+			if (isBot) {
+				sendLocationToBot(message, sharingMode, shareInfo, SHARE_TYPE_MAP_AND_TEXT)
+			} else {
+				if (shareInfo.currentMapMessageId == -1L) {
+					app.telegramHelper.sendNewMapLocation(shareInfo, message)
+				} else {
+					app.telegramHelper.editMapLocation(shareInfo, message)
+				}
+				if (shareInfo.currentTextMessageId == -1L) {
+					app.telegramHelper.sendNewTextLocation(shareInfo, message)
+				} else {
+					app.telegramHelper.editTextLocation(shareInfo, message)
+				}
+			}
+		}
+	}
+
+	fun checkNetworkType(){
+		if (app.isInternetConnectionAvailable) {
+			val networkType = when {
+				app.isWifiConnected -> TdApi.NetworkTypeWiFi()
+				app.isMobileConnected -> TdApi.NetworkTypeMobile()
+				else -> TdApi.NetworkTypeOther()
+			}
+			app.telegramHelper.networkChange(networkType)
+		}
+	}
+
+	private fun sendLocationToBot(locationMessage: BufferMessage, sharingMode: String, shareInfo: TelegramSettings.ShareChatInfo, shareType: String) {
+		if (app.isInternetConnectionAvailable) {
+			log.debug("sendLocationToBot $locationMessage")
+			val url = getDeviceSharingUrl(locationMessage, sharingMode)
+			AndroidNetworkUtils.sendRequestAsync(app, url, null, "Send Location", false, false,
+				object : AndroidNetworkUtils.OnRequestResultListener {
+					override fun onResult(result: String?) {
+						val chatsShareInfo = app.settings.getChatsShareInfo()
+						val success = checkResultAndUpdateShareInfoSuccessfulSendTime(result, chatsShareInfo)
+						val osmandBotId = app.telegramHelper.getOsmandBot()?.id ?: -1
+						val device = app.settings.getCurrentSharingDevice()
+
+						if (success && shareInfo.shouldSendViaBotMessage && osmandBotId != -1 && device != null) {
+							app.telegramHelper.sendViaBotLocationMessage(osmandBotId, shareInfo, TdApi.Location(locationMessage.lat, locationMessage.lon), device, shareType)
+							shareInfo.shouldSendViaBotMessage = false
+						}
+					}
+				})
+		}
+	}
+
+	private fun getDeviceSharingUrl(loc: BufferMessage, sharingMode: String): String {
+		val url = "$BASE_URL/device/$sharingMode/send?lat=${loc.lat}&lon=${loc.lon}"
+		val builder = StringBuilder(url)
+		if (loc.bearing != 0.0) {
+			builder.append("&azi=${loc.bearing}")
+		}
+		if (loc.speed != 0.0) {
+			builder.append("&spd=${loc.speed}")
+		}
+		if (loc.altitude != 0.0) {
+			builder.append("&alt=${loc.altitude}")
+		}
+		if (loc.hdop != 0.0) {
+			builder.append("&hdop=${loc.hdop}")
+		}
+		return builder.toString()
+	}
+
+	private fun checkResultAndUpdateShareInfoSuccessfulSendTime(result: String?, chatsShareInfo: Map<Long, TelegramSettings.ShareChatInfo>):Boolean {
+		if (result != null) {
+			try {
+				val jsonResult = JSONObject(result)
+				val status = jsonResult.getString("status")
+				val currentTime = System.currentTimeMillis()
+				if (status == "OK") {
+					chatsShareInfo.forEach { (_, shareInfo) ->
+						shareInfo.lastSuccessfulSendTimeMs = currentTime
+					}
+					return true
+				}
+			} catch (e: JSONException) {
+			}
+		}
+		return false
+	}
+
 	private fun refreshNotification() {
 		app.runInUIThread {
 			app.notificationHelper.refreshNotification(NotificationType.LOCATION)
@@ -144,4 +381,4 @@ class ShareLocationHelper(private val app: TelegramApplication) {
 		const val MIN_LOCATION_MESSAGE_LIVE_PERIOD_SEC = TelegramHelper.MIN_LOCATION_MESSAGE_LIVE_PERIOD_SEC - 1
 		const val MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC = TelegramHelper.MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC + 1
 	}
-}
+}
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/helpers/ShowLocationHelper.kt b/OsmAnd-telegram/src/net/osmand/telegram/helpers/ShowLocationHelper.kt
index cb08aafdb1..d36e899557 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/helpers/ShowLocationHelper.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/helpers/ShowLocationHelper.kt
@@ -8,9 +8,11 @@ import net.osmand.aidl.map.ALatLon
 import net.osmand.aidl.maplayer.point.AMapPoint
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
-import net.osmand.telegram.helpers.TelegramHelper.MessageOsmAndBotLocation
 import net.osmand.telegram.helpers.TelegramUiHelper.ListItem
 import net.osmand.telegram.utils.AndroidUtils
+import net.osmand.telegram.utils.OsmandLocationUtils
+import net.osmand.telegram.utils.OsmandLocationUtils.MessageOsmAndBotLocation
+import net.osmand.telegram.utils.OsmandLocationUtils.MessageUserLocation
 import org.drinkless.td.libcore.telegram.TdApi
 import java.io.File
 import java.util.concurrent.Executors
@@ -33,7 +35,7 @@ class ShowLocationHelper(private val app: TelegramApplication) {
 	private var forcedStop: Boolean = false
 
 	fun setupMapLayer() {
-		execOsmandApi {
+		osmandAidlHelper.execOsmandApi {
 			osmandAidlHelper.addMapLayer(MAP_LAYER_ID, "Telegram", 5.5f, null)
 		}
 	}
@@ -42,7 +44,7 @@ class ShowLocationHelper(private val app: TelegramApplication) {
 		if (item.latLon == null) {
 			return
 		}
-		execOsmandApi {
+		osmandAidlHelper.execOsmandApi {
 			osmandAidlHelper.showMapPoint(
 				MAP_LAYER_ID,
 				item.getMapPointId(),
@@ -58,10 +60,10 @@ class ShowLocationHelper(private val app: TelegramApplication) {
 	}
 	
 	fun updateLocationsOnMap() {
-		execOsmandApi {
+		osmandAidlHelper.execOsmandApi {
 			val messages = telegramHelper.getMessages()
 			for (message in messages) {
-				val date = telegramHelper.getLastUpdatedTime(message)
+				val date = OsmandLocationUtils.getLastUpdatedTime(message)
 				val messageShowingTime = System.currentTimeMillis() / 1000 - date
 				if (messageShowingTime > app.settings.locHistoryTime) {
 					removeMapPoint(message.chatId, message)
@@ -73,13 +75,13 @@ class ShowLocationHelper(private val app: TelegramApplication) {
 	}
 
 	fun addOrUpdateLocationOnMap(message: TdApi.Message, update: Boolean = false) {
-		execOsmandApi {
+		osmandAidlHelper.execOsmandApi {
 			val chatId = message.chatId
 			val chatTitle = telegramHelper.getChat(message.chatId)?.title
 			val content = message.content
-			val date = telegramHelper.getLastUpdatedTime(message)
+			val date = OsmandLocationUtils.getLastUpdatedTime(message)
 			val stale = System.currentTimeMillis() / 1000 - date > app.settings.staleLocTime
-			if (chatTitle != null && content is TdApi.MessageLocation) {
+			if (chatTitle != null && (content is TdApi.MessageLocation || (content is MessageUserLocation && content.isValid()))) {
 				var userName = ""
 				var photoPath: String? = null
 				val user = telegramHelper.getUser(message.senderUserId)
@@ -102,12 +104,19 @@ class ShowLocationHelper(private val app: TelegramApplication) {
 				}
 				setupMapLayer()
 				val params = generatePointParams(photoPath, stale)
-				if (update) {
-					osmandAidlHelper.updateMapPoint(MAP_LAYER_ID, "${chatId}_${message.senderUserId}", userName, userName,
-						chatTitle, Color.WHITE, ALatLon(content.location.latitude, content.location.longitude), null, params)
-				} else {
-					osmandAidlHelper.addMapPoint(MAP_LAYER_ID, "${chatId}_${message.senderUserId}", userName, userName,
-						chatTitle, Color.WHITE, ALatLon(content.location.latitude, content.location.longitude), null, params)
+				val aLatLon = when (content) {
+					is TdApi.MessageLocation -> ALatLon(content.location.latitude, content.location.longitude)
+					is MessageUserLocation -> ALatLon(content.lat, content.lon)
+					else -> null
+				}
+				if (aLatLon != null) {
+					if (update) {
+						osmandAidlHelper.updateMapPoint(MAP_LAYER_ID, "${chatId}_${message.senderUserId}", userName, userName,
+							chatTitle, Color.WHITE, aLatLon, null, params)
+					} else {
+						osmandAidlHelper.addMapPoint(MAP_LAYER_ID, "${chatId}_${message.senderUserId}", userName, userName,
+							chatTitle, Color.WHITE, aLatLon, null, params)
+					}
 				}
 			} else if (chatTitle != null && content is MessageOsmAndBotLocation && content.isValid()) {
 				val name = content.name
@@ -124,7 +133,7 @@ class ShowLocationHelper(private val app: TelegramApplication) {
 	}
 
 	fun showChatMessages(chatId: Long) {
-		execOsmandApi {
+		osmandAidlHelper.execOsmandApi {
 			val messages = telegramHelper.getChatMessages(chatId)
 			for (message in messages) {
 				addOrUpdateLocationOnMap(message)
@@ -137,7 +146,7 @@ class ShowLocationHelper(private val app: TelegramApplication) {
 	}
 
 	fun hideMessages(messages: List<TdApi.Message>) {
-		execOsmandApi {
+		osmandAidlHelper.execOsmandApi {
 			for (message in messages) {
 				val user = telegramHelper.getUser(message.senderUserId)
 				if (user != null) {
@@ -149,7 +158,7 @@ class ShowLocationHelper(private val app: TelegramApplication) {
 
 	fun startShowingLocation() {
 		if (!showingLocation && !forcedStop) {
-			showingLocation = if (isUseOsmandCallback()) {
+			showingLocation = if (isUseOsmandCallback() && !app.settings.monitoringEnabled) {
 				osmandAidlHelper.registerForUpdates()
 			} else {
 				app.startUserLocationService()
@@ -162,14 +171,32 @@ class ShowLocationHelper(private val app: TelegramApplication) {
 		forcedStop = force
 		if (showingLocation) {
 			showingLocation = false
-			if (isUseOsmandCallback()) {
+			if (isUseOsmandCallback() && app.osmandAidlHelper.updatesCallbackRegistered()) {
 				osmandAidlHelper.unregisterFromUpdates()
-			} else {
+			} else if (!app.settings.monitoringEnabled) {
 				app.stopUserLocationService()
 			}
 		}
 	}
 
+	fun changeUpdatesType() {
+		if (!forcedStop) {
+			if (app.settings.monitoringEnabled) {
+				if (app.osmandAidlHelper.updatesCallbackRegistered()) {
+					osmandAidlHelper.unregisterFromUpdates()
+				}
+				app.startUserLocationService()
+			} else {
+				if (isUseOsmandCallback()) {
+					app.stopUserLocationService()
+					osmandAidlHelper.registerForUpdates()
+				} else {
+					app.startUserLocationService()
+				}
+			}
+		}
+	}
+
 	fun isUseOsmandCallback(): Boolean {
 		val version = AndroidUtils.getAppVersionCode(app, app.settings.appToConnectPackage)
 		return version >= MIN_OSMAND_CALLBACK_VERSION_CODE
@@ -242,19 +269,10 @@ class ShowLocationHelper(private val app: TelegramApplication) {
 
 	private fun removeMapPoint(chatId: Long, message: TdApi.Message) {
 		val content = message.content
-		if (content is TdApi.MessageLocation) {
+		if (content is TdApi.MessageLocation || content is MessageUserLocation) {
 			osmandAidlHelper.removeMapPoint(MAP_LAYER_ID, "${chatId}_${message.senderUserId}")
 		} else if (content is MessageOsmAndBotLocation) {
 			osmandAidlHelper.removeMapPoint(MAP_LAYER_ID, "${chatId}_${content.name}")
 		}
 	}
-
-	private fun execOsmandApi(action: (() -> Unit)) {
-		if (!osmandAidlHelper.isOsmandConnected() && osmandAidlHelper.isOsmandBound()) {
-			osmandAidlHelper.connectOsmand()
-		}
-		if (osmandAidlHelper.isOsmandConnected()) {
-			action.invoke()
-		}
-	}
 }
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt b/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
index cf21651e84..a6e23f6f03 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
@@ -2,16 +2,24 @@ package net.osmand.telegram.helpers
 
 import android.text.TextUtils
 import net.osmand.PlatformUtil
-import net.osmand.telegram.TelegramSettings
+import net.osmand.telegram.*
 import net.osmand.telegram.helpers.TelegramHelper.TelegramAuthenticationParameterType.*
 import net.osmand.telegram.utils.GRAYSCALE_PHOTOS_DIR
 import net.osmand.telegram.utils.GRAYSCALE_PHOTOS_EXT
+import net.osmand.telegram.utils.OsmandLocationUtils
+import net.osmand.telegram.utils.OsmandLocationUtils.DEVICE_PREFIX
+import net.osmand.telegram.utils.OsmandLocationUtils.MessageOsmAndBotLocation
+import net.osmand.telegram.utils.OsmandLocationUtils.MessageUserLocation
+import net.osmand.telegram.utils.OsmandLocationUtils.USER_TEXT_LOCATION_TITLE
+import net.osmand.telegram.utils.OsmandLocationUtils.getLastUpdatedTime
+import net.osmand.telegram.utils.OsmandLocationUtils.parseOsmAndBotLocation
+import net.osmand.telegram.utils.OsmandLocationUtils.parseOsmAndBotLocationContent
+import net.osmand.telegram.utils.OsmandLocationUtils.parseTextLocation
 import org.drinkless.td.libcore.telegram.Client
 import org.drinkless.td.libcore.telegram.Client.ResultHandler
 import org.drinkless.td.libcore.telegram.TdApi
 import org.drinkless.td.libcore.telegram.TdApi.AuthorizationState
 import java.io.File
-import java.text.SimpleDateFormat
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executors
@@ -30,28 +38,14 @@ class TelegramHelper private constructor() {
 		private const val IGNORED_ERROR_CODE = 406
 		private const val MESSAGE_CANNOT_BE_EDITED_ERROR_CODE = 5
 
-		private const val DEVICE_PREFIX = "Device: "
-		private const val LOCATION_PREFIX = "Location: "
-		private const val LAST_LOCATION_PREFIX = "Last location: "
-		private const val UPDATED_PREFIX = "Updated: "
-
-		private const val FEW_SECONDS_AGO = "few seconds ago"
-		private const val SECONDS_AGO_SUFFIX = " seconds ago"
-		private const val MINUTES_AGO_SUFFIX = " minutes ago"
-		private const val HOURS_AGO_SUFFIX = " hours ago"
-		private const val UTC_FORMAT_SUFFIX = " UTC"
-
-		private val UTC_DATE_FORMAT = SimpleDateFormat("yyyy-MM-dd", Locale.US).apply {
-			timeZone = TimeZone.getTimeZone("UTC")
-		}
-
-		private val UTC_TIME_FORMAT = SimpleDateFormat("HH:mm:ss", Locale.US).apply {
-			timeZone = TimeZone.getTimeZone("UTC")
-		}
 		// min and max values for the Telegram API
 		const val MIN_LOCATION_MESSAGE_LIVE_PERIOD_SEC = 61
 		const val MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC = 60 * 60 * 24 - 1 // one day
 
+		const val MAX_LOCATION_MESSAGE_HISTORY_SCAN_SEC = 60 * 60 * 24 // one day
+
+		const val SEND_NEW_MESSAGE_INTERVAL_SEC = 10 * 60 // 10 minutes
+
 		private var helper: TelegramHelper? = null
 
 		val instance: TelegramHelper
@@ -65,7 +59,10 @@ class TelegramHelper private constructor() {
 
 	var messageActiveTimeSec: Long = 0
 
+	var lastTelegramUpdateTime: Int = 0
+
 	private val users = ConcurrentHashMap<Int, TdApi.User>()
+	private val contacts = ConcurrentHashMap<Int, TdApi.User>()
 	private val basicGroups = ConcurrentHashMap<Int, TdApi.BasicGroup>()
 	private val supergroups = ConcurrentHashMap<Int, TdApi.Supergroup>()
 	private val secretChats = ConcurrentHashMap<Int, TdApi.SecretChat>()
@@ -89,6 +86,7 @@ class TelegramHelper private constructor() {
 
 	private var client: Client? = null
 	private var currentUser: TdApi.User? = null
+	private var osmandBot: TdApi.User? = null
 
 	private var haveFullChatList: Boolean = false
 	private var needRefreshActiveLiveLocationMessages: Boolean = true
@@ -138,14 +136,20 @@ class TelegramHelper private constructor() {
 
 	fun getChatListIds() = getChatList().map { it.chatId }
 
+	fun getContacts() = contacts
+
 	fun getChatIds() = chats.keys().toList()
 
 	fun getChat(id: Long) = chats[id]
 
 	fun getUser(id: Int) = users[id]
 
+	fun getOsmandBot() = osmandBot
+
 	fun getCurrentUser() = currentUser
 
+	fun getCurrentUserId() = currentUser?.id ?: -1
+
 	fun getUserMessage(user: TdApi.User) =
 		usersLocationMessages.values.firstOrNull { it.senderUserId == user.id }
 
@@ -190,17 +194,8 @@ class TelegramHelper private constructor() {
 		return chat.type is TdApi.ChatTypeSupergroup || chat.type is TdApi.ChatTypeBasicGroup
 	}
 
-	fun getLastUpdatedTime(message: TdApi.Message): Int {
-		val content = message.content
-		return if (content is MessageOsmAndBotLocation) {
-			content.lastUpdated
-		} else {
-			Math.max(message.editDate, message.date)
-		}
-	} 
-
 	fun isPrivateChat(chat: TdApi.Chat): Boolean = chat.type is TdApi.ChatTypePrivate
-	
+
 	fun isSecretChat(chat: TdApi.Chat): Boolean = chat.type is TdApi.ChatTypeSecret
 
 	private fun isChannel(chat: TdApi.Chat): Boolean {
@@ -232,6 +227,7 @@ class TelegramHelper private constructor() {
 		fun onTelegramChatsRead()
 		fun onTelegramChatsChanged()
 		fun onTelegramChatChanged(chat: TdApi.Chat)
+		fun onTelegramChatCreated(chat: TdApi.Chat)
 		fun onTelegramUserChanged(user: TdApi.User)
 		fun onTelegramError(code: Int, message: String)
 	}
@@ -297,7 +293,7 @@ class TelegramHelper private constructor() {
 		try {
 			log.debug("Loading native tdlib...")
 			System.loadLibrary("tdjni")
-			Client.setLogVerbosityLevel(0)
+			Client.setLogVerbosityLevel(1)
 			libraryLoaded = true
 		} catch (e: Throwable) {
 			log.error("Failed to load tdlib", e)
@@ -322,6 +318,12 @@ class TelegramHelper private constructor() {
 		}
 	}
 
+	fun networkChange(networkType: TdApi.NetworkType) {
+		client?.send(TdApi.SetNetworkType(networkType)) { obj ->
+			log.debug(obj)
+		}
+	}
+
 	fun isInit() = client != null && haveAuthorization
 
 	fun getUserPhotoPath(user: TdApi.User?) = when {
@@ -359,11 +361,20 @@ class TelegramHelper private constructor() {
 		is TdApi.ChatTypeSecret -> type.userId
 		else -> 0
 	}
-	
+
 	fun isOsmAndBot(userId: Int) = users[userId]?.username == OSMAND_BOT_USERNAME
 
 	fun isBot(userId: Int) = users[userId]?.type is TdApi.UserTypeBot
 
+	fun getSenderMessageId(message: TdApi.Message): Int {
+		val forwardInfo = message.forwardInfo
+		return if (forwardInfo != null && forwardInfo is TdApi.MessageForwardedFromUser) {
+			forwardInfo.senderUserId
+		} else {
+			message.senderUserId
+		}
+	}
+
 	fun startLiveMessagesUpdates(interval: Long) {
 		stopLiveMessagesUpdates()
 
@@ -382,7 +393,12 @@ class TelegramHelper private constructor() {
 	fun hasGrayscaleUserPhoto(userId: Int): Boolean {
 		return File("$appDir/$GRAYSCALE_PHOTOS_DIR$userId$GRAYSCALE_PHOTOS_EXT").exists()
 	}
-	
+
+	private fun isUserLocationMessage(message: TdApi.Message): Boolean {
+		val cont = message.content
+		return (cont is MessageUserLocation || cont is TdApi.MessageLocation)
+	}
+
 	private fun hasLocalUserPhoto(user: TdApi.User): Boolean {
 		val localPhoto = user.profilePhoto?.small?.local
 		return if (localPhoto != null) {
@@ -420,7 +436,7 @@ class TelegramHelper private constructor() {
 		}
 	}
 
-	private fun requestChats(reload: Boolean = false) {
+	private fun requestChats(reload: Boolean = false, onComplete: (() -> Unit)?) {
 		synchronized(chatList) {
 			if (reload) {
 				chatList.clear()
@@ -451,7 +467,8 @@ class TelegramHelper private constructor() {
 								}
 							}
 							// chats had already been received through updates, let's retry request
-							requestChats()
+							requestChats(false, this@TelegramHelper::scanChatsHistory)
+							onComplete?.invoke()
 						}
 						else -> listener?.onTelegramError(-1, "Receive wrong response from TDLib: $obj")
 					}
@@ -480,6 +497,54 @@ class TelegramHelper private constructor() {
 		}
 	}
 
+	fun sendViaBotLocationMessage(userId: Int, shareInfo: TelegramSettings.ShareChatInfo, location: TdApi.Location, device: TelegramSettings.DeviceBot, shareType:String) {
+		log.debug("sendViaBotLocationMessage - ${shareInfo.chatId}")
+		client?.send(TdApi.GetInlineQueryResults(userId, shareInfo.chatId, location, device.deviceName, "")) { obj ->
+			when (obj.constructor) {
+				TdApi.Error.CONSTRUCTOR -> {
+					val error = obj as TdApi.Error
+					if (error.code != IGNORED_ERROR_CODE) {
+						listener?.onTelegramError(error.code, error.message)
+					} else {
+						shareInfo.shouldSendViaBotMessage = true
+					}
+				}
+				TdApi.InlineQueryResults.CONSTRUCTOR -> {
+					sendViaBotMessageFromQueryResults(shareInfo, obj as TdApi.InlineQueryResults, device.externalId, shareType)
+				}
+			}
+		}
+	}
+
+	private fun sendViaBotMessageFromQueryResults(
+		shareInfo: TelegramSettings.ShareChatInfo,
+		inlineQueryResults: TdApi.InlineQueryResults,
+		deviceId: String,
+		shareType: String
+	) {
+		val queryResults = inlineQueryResults.results.asList()
+		if (queryResults.isNotEmpty()) {
+			val resultArticles = mutableListOf<TdApi.InlineQueryResultArticle>()
+			queryResults.forEach {
+				if (it is TdApi.InlineQueryResultArticle && it.id.substring(1) == deviceId) {
+					val textLocationArticle = it.id.startsWith("t")
+					val mapLocationArticle = it.id.startsWith("m")
+					if (shareType == SHARE_TYPE_MAP && mapLocationArticle
+						|| shareType == SHARE_TYPE_TEXT && textLocationArticle
+						|| shareType == SHARE_TYPE_MAP_AND_TEXT && (textLocationArticle || mapLocationArticle)) {
+						resultArticles.add(it)
+					}
+				}
+			}
+			resultArticles.forEach {
+				client?.send(TdApi.SendInlineQueryResultMessage(shareInfo.chatId, 0, true,
+					true, inlineQueryResults.inlineQueryId, it.id)) { obj ->
+					handleTextLocationMessageUpdate(obj, shareInfo)
+				}
+			}
+		}
+	}
+
 	private fun requestSupergroupFullInfo(id: Int) {
 		client?.send(TdApi.GetSupergroupFullInfo(id)) { obj ->
 			when (obj.constructor) {
@@ -518,8 +583,109 @@ class TelegramHelper private constructor() {
 		}
 	}
 
-	fun loadMessage(chatId: Long, messageId: Long) {
-		requestMessage(chatId, messageId, this@TelegramHelper::addNewMessage)
+	private fun requestContacts(){
+		client?.send(TdApi.GetContacts()) { obj ->
+			when (obj.constructor) {
+				TdApi.Error.CONSTRUCTOR -> {
+					val error = obj as TdApi.Error
+					if (error.code != IGNORED_ERROR_CODE) {
+						listener?.onTelegramError(error.code, error.message)
+					}
+				}
+				TdApi.Users.CONSTRUCTOR -> {
+					val usersIds = obj as TdApi.Users
+					usersIds.userIds.forEach {
+						requestUser(it)
+					}
+				}
+			}
+		}
+	}
+
+	fun scanChatsHistory() {
+		log.debug("scanChatsHistory: chatList: ${chatList.size}")
+		chatList.forEach {
+			scanChatHistory(it.chatId, 0, 0, 100)
+		}
+	}
+
+	private fun scanChatHistory(
+		chatId: Long,
+		fromMessageId: Long,
+		offset: Int,
+		limit: Int,
+		onlyLocal: Boolean = false
+	) {
+		client?.send(TdApi.GetChatHistory(chatId, fromMessageId, offset, limit, onlyLocal)) { obj ->
+			when (obj.constructor) {
+				TdApi.Error.CONSTRUCTOR -> {
+					val error = obj as TdApi.Error
+					if (error.code != IGNORED_ERROR_CODE) {
+						listener?.onTelegramError(error.code, error.message)
+					}
+				}
+				TdApi.Messages.CONSTRUCTOR -> {
+					val messages = (obj as TdApi.Messages).messages
+					log.debug("scanChatHistory: chatId: $chatId fromMessageId: $fromMessageId size: ${messages.size}")
+					if (messages.isNotEmpty()) {
+						messages.forEach {
+							addNewMessage(it)
+						}
+						val lastMessage = messages.last()
+						val currentTime = System.currentTimeMillis() / 1000
+						if (currentTime-Math.max(lastMessage.date, lastMessage.editDate) < MAX_LOCATION_MESSAGE_HISTORY_SCAN_SEC) {
+							scanChatHistory(chatId, lastMessage.id, 0, 100)
+							log.debug("scanChatHistory searchMessageId: ${lastMessage.id}")
+						} else {
+							log.debug("scanChatHistory finishForChat: $chatId")
+						}
+					}
+				}
+			}
+		}
+	}
+
+	private fun requestUser(id: Int) {
+		client?.send(TdApi.GetUser(id)) { obj ->
+			when (obj.constructor) {
+				TdApi.Error.CONSTRUCTOR -> {
+					val error = obj as TdApi.Error
+					if (error.code != IGNORED_ERROR_CODE) {
+						listener?.onTelegramError(error.code, error.message)
+					}
+				}
+				TdApi.User.CONSTRUCTOR -> {
+					val user = obj as TdApi.User
+					contacts[user.id] = user
+					if (!hasLocalUserPhoto(user) && hasRemoteUserPhoto(user)) {
+						requestUserPhoto(user)
+					}
+				}
+			}
+		}
+	}
+
+	fun createPrivateChatWithUser(
+		userId: Int,
+		shareInfo: TelegramSettings.ShareChatInfo,
+		shareChatsInfo: ConcurrentHashMap<Long, TelegramSettings.ShareChatInfo>
+	) {
+		client?.send(TdApi.CreatePrivateChat(userId, false)) { obj ->
+			when (obj.constructor) {
+				TdApi.Error.CONSTRUCTOR -> {
+					val error = obj as TdApi.Error
+					if (error.code != IGNORED_ERROR_CODE) {
+						shareInfo.hasSharingError = true
+						listener?.onTelegramError(error.code, error.message)
+					}
+				}
+				TdApi.Chat.CONSTRUCTOR -> {
+					shareInfo.chatId = (obj as TdApi.Chat).id
+					shareChatsInfo[shareInfo.chatId] = shareInfo
+					listener?.onTelegramChatCreated(obj)
+				}
+			}
+		}
 	}
 
 	private fun requestMessage(chatId: Long, messageId: Long, onComplete: (TdApi.Message) -> Unit) {
@@ -531,19 +697,34 @@ class TelegramHelper private constructor() {
 	}
 
 	private fun addNewMessage(message: TdApi.Message) {
+		lastTelegramUpdateTime = Math.max(lastTelegramUpdateTime, Math.max(message.date, message.editDate))
 		if (message.isAppropriate()) {
+			if (message.isOutgoing) {
+				return
+			}
+			log.debug("addNewMessage: ${message.id}")
 			val fromBot = isOsmAndBot(message.senderUserId)
 			val viaBot = isOsmAndBot(message.viaBotUserId)
 			val oldContent = message.content
 			if (oldContent is TdApi.MessageText) {
-				message.content = parseOsmAndBotLocation(oldContent.text.text)
+				if (oldContent.text.text.startsWith(DEVICE_PREFIX)) {
+					message.content = parseTextLocation(oldContent.text)
+				} else if (oldContent.text.text.startsWith(USER_TEXT_LOCATION_TITLE)) {
+					message.content = parseTextLocation(oldContent.text, false)
+				}
 			} else if (oldContent is TdApi.MessageLocation && (fromBot || viaBot)) {
 				message.content = parseOsmAndBotLocation(message)
 			}
 			removeOldMessages(message, fromBot, viaBot)
-			usersLocationMessages[message.id] = message
+			val oldMessage = usersLocationMessages.values.firstOrNull { getSenderMessageId(it) == getSenderMessageId(message) && !fromBot && !viaBot }
+			val hasNewerMessage = oldMessage != null && (Math.max(message.editDate, message.date) < Math.max(oldMessage.editDate, oldMessage.date))
+			if (!hasNewerMessage) {
+				usersLocationMessages[message.id] = message
+			}
 			incomingMessagesListeners.forEach {
-				it.onReceiveChatLocationMessages(message.chatId, message)
+				if (!hasNewerMessage || it is TelegramService) {
+					it.onReceiveChatLocationMessages(message.chatId, message)
+				}
 			}
 		}
 	}
@@ -553,7 +734,7 @@ class TelegramHelper private constructor() {
 		while (iterator.hasNext()) {
 			val message = iterator.next().value
 			if (newMessage.chatId == message.chatId) {
-				val sameSender = newMessage.senderUserId == message.senderUserId
+				val sameSender = getSenderMessageId(newMessage) == getSenderMessageId(message)
 				val viaSameBot = newMessage.viaBotUserId == message.viaBotUserId
 				if (fromBot || viaBot) {
 					if ((fromBot && sameSender) || (viaBot && viaSameBot)) {
@@ -565,39 +746,19 @@ class TelegramHelper private constructor() {
 							}
 						}
 					}
-				} else if (sameSender) {
+				} else if (sameSender && isUserLocationMessage(message) && isUserLocationMessage(newMessage)
+					&& Math.max(newMessage.editDate, newMessage.date) >= Math.max(message.editDate, message.date)) {
 					iterator.remove()
 				}
 			}
 		}
 	}
 
-	/**
-	 * @chatId Id of the chat
-	 * @livePeriod Period for which the location can be updated, in seconds; should be between 60 and 86400 for a live location and 0 otherwise.
-	 * @latitude Latitude of the location
-	 * @longitude Longitude of the location
-	 */
-	fun sendLiveLocationMessage(chatsShareInfo:Map<Long, TelegramSettings.ShareChatInfo>, latitude: Double, longitude: Double): Boolean {
-		if (!requestingActiveLiveLocationMessages && haveAuthorization) {
-			if (needRefreshActiveLiveLocationMessages) {
-				getActiveLiveLocationMessages {
-					sendLiveLocationImpl(chatsShareInfo, latitude, longitude)
-				}
-				needRefreshActiveLiveLocationMessages = false
-			} else {
-				sendLiveLocationImpl(chatsShareInfo, latitude, longitude)
-			}
-			return true
-		}
-		return false
-	}
-
 	fun stopSendingLiveLocationToChat(shareInfo: TelegramSettings.ShareChatInfo) {
-		if (shareInfo.currentMessageId != -1L && shareInfo.chatId != -1L) {
+		if (shareInfo.currentMapMessageId != -1L && shareInfo.chatId != -1L) {
 			client?.send(
-				TdApi.EditMessageLiveLocation(shareInfo.chatId, shareInfo.currentMessageId, null, null)) { obj ->
-				handleLiveLocationMessageUpdate(obj, shareInfo)
+				TdApi.EditMessageLiveLocation(shareInfo.chatId, shareInfo.currentMapMessageId, null, null)) { obj ->
+				handleMapLocationMessageUpdate(obj, shareInfo)
 			}
 		}
 		needRefreshActiveLiveLocationMessages = true
@@ -608,7 +769,7 @@ class TelegramHelper private constructor() {
 			stopSendingLiveLocationToChat(chatInfo)
 		}
 	}
-	
+
 	fun getActiveLiveLocationMessages(onComplete: (() -> Unit)?) {
 		requestingActiveLiveLocationMessages = true
 		client?.send(TdApi.GetActiveLiveLocationMessages()) { obj ->
@@ -625,6 +786,7 @@ class TelegramHelper private constructor() {
 				TdApi.Messages.CONSTRUCTOR -> {
 					val messages = (obj as TdApi.Messages).messages
 					if (messages.isNotEmpty()) {
+						log.debug("getActiveLiveLocationMessages: $messages")
 						outgoingMessagesListeners.forEach {
 							it.onUpdateMessages(messages.asList())
 						}
@@ -639,20 +801,26 @@ class TelegramHelper private constructor() {
 		}
 	}
 
-	private fun recreateLiveLocationMessage(shareInfo: TelegramSettings.ShareChatInfo, content: TdApi.InputMessageLocation) {
-		if (shareInfo.currentMessageId != -1L && shareInfo.chatId != -1L) {
-			log.info("recreateLiveLocationMessage - $shareInfo.currentMessageId")
+	private fun recreateLiveLocationMessage(shareInfo: TelegramSettings.ShareChatInfo, content: TdApi.InputMessageContent) {
+		if (shareInfo.chatId != -1L) {
 			val array = LongArray(1)
-			array[0] = shareInfo.currentMessageId
-			client?.send(TdApi.DeleteMessages(shareInfo.chatId, array, true)) { obj ->
-				when (obj.constructor) {
-					TdApi.Ok.CONSTRUCTOR -> sendNewLiveLocationMessage(shareInfo, content)
-					TdApi.Error.CONSTRUCTOR -> {
-						val error = obj as TdApi.Error
-						if (error.code != IGNORED_ERROR_CODE) {
-							needRefreshActiveLiveLocationMessages = true
-							outgoingMessagesListeners.forEach {
-								it.onSendLiveLocationError(error.code, error.message)
+			if (content is TdApi.InputMessageLocation) {
+				array[0] = shareInfo.currentMapMessageId
+			} else if (content is TdApi.InputMessageText) {
+				array[0] = shareInfo.currentTextMessageId
+			}
+			if (array[0] != 0L) {
+				log.debug("recreateLiveLocationMessage - ${array[0]}")
+				client?.send(TdApi.DeleteMessages(shareInfo.chatId, array, true)) { obj ->
+					when (obj.constructor) {
+						TdApi.Ok.CONSTRUCTOR -> sendNewLiveLocationMessage(shareInfo, content)
+						TdApi.Error.CONSTRUCTOR -> {
+							val error = obj as TdApi.Error
+							if (error.code != IGNORED_ERROR_CODE) {
+								needRefreshActiveLiveLocationMessages = true
+								outgoingMessagesListeners.forEach {
+									it.onSendLiveLocationError(error.code, error.message)
+								}
 							}
 						}
 					}
@@ -662,54 +830,82 @@ class TelegramHelper private constructor() {
 		needRefreshActiveLiveLocationMessages = true
 	}
 
-	private fun sendNewLiveLocationMessage(shareInfo: TelegramSettings.ShareChatInfo, content: TdApi.InputMessageLocation) {
+	private fun sendNewLiveLocationMessage(shareInfo: TelegramSettings.ShareChatInfo, content: TdApi.InputMessageContent) {
 		needRefreshActiveLiveLocationMessages = true
-		log.info("sendNewLiveLocationMessage")
-		client?.send(
-			TdApi.SendMessage(shareInfo.chatId, 0, false, true, null, content)) { obj ->
-			handleLiveLocationMessageUpdate(obj, shareInfo)
+		log.debug("sendNewLiveLocationMessage")
+		client?.send(TdApi.SendMessage(shareInfo.chatId, 0, false, true, null, content)) { obj ->
+			if (content is TdApi.InputMessageText) {
+				handleTextLocationMessageUpdate(obj, shareInfo)
+			} else if (content is TdApi.InputMessageLocation) {
+				handleMapLocationMessageUpdate(obj, shareInfo)
+			}
 		}
 	}
 
-	private fun sendLiveLocationImpl(chatsShareInfo: Map<Long, TelegramSettings.ShareChatInfo>, latitude: Double, longitude: Double) {
-		val location = TdApi.Location(latitude, longitude)
-		chatsShareInfo.forEach { (chatId, shareInfo) ->
-			if (shareInfo.getChatLiveMessageExpireTime() <= 0) {
-				return@forEach
+	fun sendNewTextLocation(shareInfo: TelegramSettings.ShareChatInfo, location: LocationMessages.BufferMessage) {
+		shareInfo.updateTextMessageId = 1
+		val content = OsmandLocationUtils.getTextMessageContent(shareInfo.updateTextMessageId, location)
+		if (!shareInfo.pendingTextMessage) {
+			shareInfo.pendingTextMessage = true
+			shareInfo.pendingTdLib++
+			log.error("sendNewTextLocation ${shareInfo.pendingTdLib}")
+			client?.send(TdApi.SendMessage(shareInfo.chatId, 0, false, true, null, content)) { obj ->
+				handleTextLocationMessageUpdate(obj, shareInfo)
 			}
-			val livePeriod =
-				if (shareInfo.currentMessageLimit > (shareInfo.start + MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC)) {
-					MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC
-				} else {
-					shareInfo.livePeriod.toInt()
-				}
-			val content = TdApi.InputMessageLocation(location, livePeriod)
-			val msgId = shareInfo.currentMessageId
-			if (msgId != -1L) {
-				if (shareInfo.shouldDeletePreviousMessage) {
-					recreateLiveLocationMessage(shareInfo, content)
-					shareInfo.shouldDeletePreviousMessage = false
-					shareInfo.currentMessageId = -1
-				} else {
-					log.info("EditMessageLiveLocation - $msgId")
-					client?.send(
-						TdApi.EditMessageLiveLocation(chatId, msgId, null, location)) { obj ->
-						handleLiveLocationMessageUpdate(obj, shareInfo)
-					}
-				}
+		}
+	}
+
+	fun editTextLocation(shareInfo: TelegramSettings.ShareChatInfo, location: LocationMessages.BufferMessage) {
+		val content = OsmandLocationUtils.getTextMessageContent(shareInfo.updateTextMessageId, location)
+		if (shareInfo.currentTextMessageId!=-1L) {
+			shareInfo.pendingTdLib++
+			log.info("editTextLocation ${shareInfo.currentTextMessageId} pendingTdLib: ${shareInfo.pendingTdLib}")
+			client?.send(TdApi.EditMessageText(shareInfo.chatId, shareInfo.currentTextMessageId, null, content)) { obj ->
+				handleTextLocationMessageUpdate(obj, shareInfo)
+			}
+		}
+	}
+
+	fun sendNewMapLocation(shareInfo: TelegramSettings.ShareChatInfo, locationMessage: LocationMessages.BufferMessage) {
+		needRefreshActiveLiveLocationMessages = true
+		val location = TdApi.Location(locationMessage.lat, locationMessage.lon)
+		val livePeriod =
+			if (shareInfo.currentMessageLimit > (shareInfo.start + MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC)) {
+				MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC
 			} else {
-				sendNewLiveLocationMessage(shareInfo, content)
+				shareInfo.livePeriod.toInt()
+			}
+		val content = TdApi.InputMessageLocation(location, livePeriod)
+		if (!shareInfo.pendingMapMessage) {
+			shareInfo.pendingMapMessage = true
+			shareInfo.pendingTdLib++
+			log.error("sendNewMapLocation ${shareInfo.pendingTdLib}")
+			client?.send(TdApi.SendMessage(shareInfo.chatId, 0, false, true, null, content)) { obj ->
+				handleMapLocationMessageUpdate(obj, shareInfo)
 			}
 		}
 	}
 
-	private fun handleLiveLocationMessageUpdate(obj: TdApi.Object, shareInfo: TelegramSettings.ShareChatInfo) {
+	fun editMapLocation(shareInfo: TelegramSettings.ShareChatInfo, locationMessage: LocationMessages.BufferMessage) {
+		needRefreshActiveLiveLocationMessages = true
+		val location = TdApi.Location(locationMessage.lat, locationMessage.lon)
+		if (shareInfo.currentMapMessageId!=-1L) {
+			shareInfo.pendingTdLib++
+			log.info("editMapLocation ${shareInfo.currentMapMessageId} pendingTdLib: ${shareInfo.pendingTdLib}")
+			client?.send(TdApi.EditMessageLiveLocation(shareInfo.chatId, shareInfo.currentMapMessageId, null, location)) { obj ->
+				handleMapLocationMessageUpdate(obj, shareInfo)
+			}
+		}
+	}
+
+	private fun handleMapLocationMessageUpdate(obj: TdApi.Object, shareInfo: TelegramSettings.ShareChatInfo) {
 		when (obj.constructor) {
 			TdApi.Error.CONSTRUCTOR -> {
+				log.debug("handleMapLocationMessageUpdate - ERROR $obj")
 				val error = obj as TdApi.Error
 				needRefreshActiveLiveLocationMessages = true
 				if (error.code == MESSAGE_CANNOT_BE_EDITED_ERROR_CODE) {
-					shareInfo.shouldDeletePreviousMessage = true
+					shareInfo.shouldDeletePreviousMapMessage = true
 				} else if (error.code != IGNORED_ERROR_CODE) {
 					shareInfo.hasSharingError = true
 					outgoingMessagesListeners.forEach {
@@ -719,16 +915,31 @@ class TelegramHelper private constructor() {
 			}
 			TdApi.Message.CONSTRUCTOR -> {
 				if (obj is TdApi.Message) {
-					if (obj.sendingState?.constructor == TdApi.MessageSendingStateFailed.CONSTRUCTOR) {
-						shareInfo.hasSharingError = true
-						needRefreshActiveLiveLocationMessages = true
-						outgoingMessagesListeners.forEach {
-							it.onSendLiveLocationError(-1, "Live location message ${obj.id} failed to send")
+					when {
+						obj.sendingState?.constructor == TdApi.MessageSendingStateFailed.CONSTRUCTOR -> {
+							shareInfo.hasSharingError = true
+							needRefreshActiveLiveLocationMessages = true
+							shareInfo.pendingMapMessage = false
+							log.debug("handleTextLocationMessageUpdate - MessageSendingStateFailed")
+							outgoingMessagesListeners.forEach {
+								it.onSendLiveLocationError(-1, "Map location message ${obj.id} failed to send")
+							}
 						}
-					} else {
-						shareInfo.hasSharingError = false
-						outgoingMessagesListeners.forEach {
-							it.onUpdateMessages(listOf(obj))
+						obj.sendingState?.constructor == TdApi.MessageSendingStatePending.CONSTRUCTOR -> {
+							shareInfo.pendingMapMessage = true
+							shareInfo.lastSendMapMessageTime = obj.date
+							log.debug("handleMapLocationMessageUpdate - MessageSendingStatePending")
+							outgoingMessagesListeners.forEach {
+								it.onUpdateMessages(listOf(obj))
+							}
+						}
+						else -> {
+							shareInfo.hasSharingError = false
+							shareInfo.pendingMapMessage = false
+							log.debug("handleMapLocationMessageUpdate - MessageSendingStateSuccess")
+							outgoingMessagesListeners.forEach {
+								it.onUpdateMessages(listOf(obj))
+							}
 						}
 					}
 				}
@@ -736,21 +947,52 @@ class TelegramHelper private constructor() {
 		}
 	}
 
-	/**
-	 * @chatId Id of the chat
-	 * @message Text of the message
-	 */
-	fun sendTextMessage(chatId: Long, message: String): Boolean {
-		// initialize reply markup just for testing
-		//val row = arrayOf(TdApi.InlineKeyboardButton("https://telegram.org?1", TdApi.InlineKeyboardButtonTypeUrl()), TdApi.InlineKeyboardButton("https://telegram.org?2", TdApi.InlineKeyboardButtonTypeUrl()), TdApi.InlineKeyboardButton("https://telegram.org?3", TdApi.InlineKeyboardButtonTypeUrl()))
-		//val replyMarkup = TdApi.ReplyMarkupInlineKeyboard(arrayOf(row, row, row))
-
-		if (haveAuthorization) {
-			val content = TdApi.InputMessageText(TdApi.FormattedText(message, null), false, true)
-			client?.send(TdApi.SendMessage(chatId, 0, false, true, null, content), defaultHandler)
-			return true
+	private fun handleTextLocationMessageUpdate(obj: TdApi.Object, shareInfo: TelegramSettings.ShareChatInfo) {
+		when (obj.constructor) {
+			TdApi.Error.CONSTRUCTOR -> {
+				log.debug("handleTextLocationMessageUpdate - ERROR")
+				val error = obj as TdApi.Error
+				if (error.code == MESSAGE_CANNOT_BE_EDITED_ERROR_CODE) {
+					shareInfo.shouldDeletePreviousTextMessage = true
+				} else if (error.code != IGNORED_ERROR_CODE) {
+					shareInfo.hasSharingError = true
+					outgoingMessagesListeners.forEach {
+						it.onSendLiveLocationError(error.code, error.message)
+					}
+				}
+			}
+			TdApi.Message.CONSTRUCTOR -> {
+				if (obj is TdApi.Message) {
+					when {
+						obj.sendingState?.constructor == TdApi.MessageSendingStateFailed.CONSTRUCTOR -> {
+							shareInfo.hasSharingError = true
+							shareInfo.pendingTextMessage = false
+							needRefreshActiveLiveLocationMessages = true
+							log.debug("handleTextLocationMessageUpdate - MessageSendingStateFailed")
+							outgoingMessagesListeners.forEach {
+								it.onSendLiveLocationError(-1, "Text location message ${obj.id} failed to send")
+							}
+						}
+						obj.sendingState?.constructor == TdApi.MessageSendingStatePending.CONSTRUCTOR -> {
+							shareInfo.pendingTextMessage = true
+							shareInfo.lastSendTextMessageTime = obj.date
+							log.debug("handleTextLocationMessageUpdate - MessageSendingStatePending")
+							outgoingMessagesListeners.forEach {
+								it.onUpdateMessages(listOf(obj))
+							}
+						}
+						else -> {
+							shareInfo.hasSharingError = false
+							shareInfo.pendingTextMessage = false
+							log.debug("handleTextLocationMessageUpdate - MessageSendingStateSuccess")
+							outgoingMessagesListeners.forEach {
+								it.onUpdateMessages(listOf(obj))
+							}
+						}
+					}
+				}
+			}
 		}
-		return false
 	}
 
 	fun logout(): Boolean {
@@ -850,8 +1092,9 @@ class TelegramHelper private constructor() {
 		if (wasAuthorized != haveAuthorization) {
 			needRefreshActiveLiveLocationMessages = true
 			if (haveAuthorization) {
-				requestChats(true)
+				requestChats(true, null)
 				requestCurrentUser()
+				requestContacts()
 			}
 		}
 		val newAuthState = getTelegramAuthorizationState()
@@ -862,142 +1105,24 @@ class TelegramHelper private constructor() {
 		if (isChannelPost) {
 			return false
 		}
+		val content = content
+		val isUserTextLocation = (content is TdApi.MessageText) && content.text.text.startsWith(USER_TEXT_LOCATION_TITLE)
 		val isOsmAndBot = isOsmAndBot(senderUserId) || isOsmAndBot(viaBotUserId)
-		if (isOutgoing && !isOsmAndBot) {
+		if (!(isUserTextLocation || content is TdApi.MessageLocation || isOsmAndBot)) {
 			return false
 		}
 		val lastEdited = Math.max(date, editDate)
 		if (TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()) - lastEdited > messageActiveTimeSec) {
 			return false
 		}
-		val content = content
+
 		return when (content) {
 			is TdApi.MessageLocation -> true
-			is TdApi.MessageText -> (isOsmAndBot) && content.text.text.startsWith(DEVICE_PREFIX)
+			is TdApi.MessageText -> (isOsmAndBot) && content.text.text.startsWith(DEVICE_PREFIX) || isUserTextLocation
 			else -> false
 		}
 	}
 
-	private fun parseOsmAndBotLocation(message: TdApi.Message): MessageOsmAndBotLocation {
-		val messageLocation = message.content as TdApi.MessageLocation
-		return MessageOsmAndBotLocation().apply {
-			name = getOsmAndBotDeviceName(message)
-			lat = messageLocation.location.latitude
-			lon = messageLocation.location.longitude
-			lastUpdated = getLastUpdatedTime(message)
-		}
-	}
-
-	private fun parseOsmAndBotLocationContent(oldContent:MessageOsmAndBotLocation, content: TdApi.MessageContent): MessageOsmAndBotLocation {
-		val messageLocation = content as TdApi.MessageLocation
-		return MessageOsmAndBotLocation().apply {
-			name = oldContent.name
-			lat = messageLocation.location.latitude
-			lon = messageLocation.location.longitude
-			lastUpdated = (System.currentTimeMillis() / 1000).toInt()
-		}
-	}
-
-	private fun parseOsmAndBotLocation(text: String): MessageOsmAndBotLocation {
-		val res = MessageOsmAndBotLocation()
-		var locationNA = false
-		for (s in text.lines()) {
-			when {
-				s.startsWith(DEVICE_PREFIX) -> {
-					res.name = s.removePrefix(DEVICE_PREFIX)
-				}
-				s.startsWith(LOCATION_PREFIX) || s.startsWith(LAST_LOCATION_PREFIX) -> {
-					var locStr: String
-					var parse = true
-					if (s.startsWith(LAST_LOCATION_PREFIX)) {
-						locStr = s.removePrefix(LAST_LOCATION_PREFIX)
-						if (!locationNA) {
-							parse = false
-						}
-					} else {
-						locStr = s.removePrefix(LOCATION_PREFIX)
-						if (locStr.trim() == "n/a") {
-							locationNA = true
-							parse = false
-						}
-					}
-					if (parse) {
-						try {
-							val (latS, lonS) = locStr.split(" ")
-							val updatedS = locStr.substring(locStr.indexOf("("), locStr.length)
-
-							res.lastUpdated =
-									(parseTime(updatedS.removePrefix("(").removeSuffix(")")) / 1000).toInt()
-							res.lat = latS.dropLast(1).toDouble()
-							res.lon = lonS.toDouble()
-
-						} catch (e: Exception) {
-							e.printStackTrace()
-						}
-					}
-				}
-				s.startsWith(UPDATED_PREFIX) -> {
-					if (res.lastUpdated == 0) {
-						val updatedStr = s.removePrefix(UPDATED_PREFIX)
-						val updatedS = updatedStr.substring(0, updatedStr.indexOf("("))
-						res.lastUpdated = (parseTime(updatedS.trim()) / 1000).toInt()
-					}
-				}
-			}
-		}
-		return res
-	}
-
-	private fun parseTime(timeS: String): Long {
-		try {
-			when {
-				timeS.endsWith(FEW_SECONDS_AGO) -> return System.currentTimeMillis() - 5000
-
-				timeS.endsWith(SECONDS_AGO_SUFFIX) -> {
-					val locStr = timeS.removeSuffix(SECONDS_AGO_SUFFIX)
-					return System.currentTimeMillis() - locStr.toLong() * 1000
-				}
-				timeS.endsWith(MINUTES_AGO_SUFFIX) -> {
-					val locStr = timeS.removeSuffix(MINUTES_AGO_SUFFIX)
-					val minutes = locStr.toLong()
-					return System.currentTimeMillis() - minutes * 60 * 1000
-				}
-				timeS.endsWith(HOURS_AGO_SUFFIX) -> {
-					val locStr = timeS.removeSuffix(HOURS_AGO_SUFFIX)
-					val hours = locStr.toLong()
-					return (System.currentTimeMillis() -  hours * 60 * 60 * 1000)
-				}
-				timeS.endsWith(UTC_FORMAT_SUFFIX) -> {
-					val locStr = timeS.removeSuffix(UTC_FORMAT_SUFFIX)
-					val (latS, lonS) = locStr.split(" ")
-					val date = UTC_DATE_FORMAT.parse(latS)
-					val time = UTC_TIME_FORMAT.parse(lonS)
-					val res = date.time + time.time
-					return res
-				}
-			}
-		} catch (e: Exception) {
-			e.printStackTrace()
-		}
-		return 0
-	}
-
-	class MessageOsmAndBotLocation : TdApi.MessageContent() {
-
-		var name: String = ""
-			internal set
-		var lat: Double = Double.NaN
-			internal set
-		var lon: Double = Double.NaN
-			internal set
-		var lastUpdated: Int = 0
-			internal set
-
-		override fun getConstructor() = -1
-
-		fun isValid() = name != "" && lat != Double.NaN && lon != Double.NaN
-	}
-
 	class OrderedChat internal constructor(internal val order: Long, internal val chatId: Long, internal val isChannel: Boolean) : Comparable<OrderedChat> {
 
 		override fun compareTo(other: OrderedChat): Int {
@@ -1036,7 +1161,14 @@ class TelegramHelper private constructor() {
 
 				TdApi.UpdateUser.CONSTRUCTOR -> {
 					val updateUser = obj as TdApi.UpdateUser
-					users[updateUser.user.id] = updateUser.user
+					val user = updateUser.user
+					users[updateUser.user.id] = user
+					if (user.outgoingLink is TdApi.LinkStateIsContact) {
+						contacts[user.id] = user
+					}
+					if (isOsmAndBot(user.id)) {
+						osmandBot = user
+					}
 				}
 				TdApi.UpdateUserStatus.CONSTRUCTOR -> {
 					val updateUserStatus = obj as TdApi.UpdateUserStatus
@@ -1179,35 +1311,30 @@ class TelegramHelper private constructor() {
 				}
 				TdApi.UpdateMessageEdited.CONSTRUCTOR -> {
 					val updateMessageEdited = obj as TdApi.UpdateMessageEdited
-					val message = usersLocationMessages[updateMessageEdited.messageId]
-					if (message == null) {
-						updateMessageEdited.apply {
-							requestMessage(chatId, messageId, this@TelegramHelper::addNewMessage)
-						}
-					} else {
-						synchronized(message) {
-							message.editDate = updateMessageEdited.editDate
-						}
-						incomingMessagesListeners.forEach {
-							it.onReceiveChatLocationMessages(message.chatId, message)
-						}
-					}
+					lastTelegramUpdateTime = Math.max(lastTelegramUpdateTime, updateMessageEdited.editDate)
 				}
 				TdApi.UpdateMessageContent.CONSTRUCTOR -> {
 					val updateMessageContent = obj as TdApi.UpdateMessageContent
 					val message = usersLocationMessages[updateMessageContent.messageId]
+					log.debug("UpdateMessageContent " + updateMessageContent.messageId)
 					if (message == null) {
 						updateMessageContent.apply {
 							requestMessage(chatId, messageId, this@TelegramHelper::addNewMessage)
 						}
 					} else {
 						synchronized(message) {
+							lastTelegramUpdateTime = Math.max(lastTelegramUpdateTime, Math.max(message.date, message.editDate))
 							val newContent = updateMessageContent.newContent
+							val fromBot = isOsmAndBot(message.senderUserId)
+							val viaBot = isOsmAndBot(message.viaBotUserId)
 							message.content = if (newContent is TdApi.MessageText) {
-								parseOsmAndBotLocation(newContent.text.text)
-							} else if (newContent is TdApi.MessageLocation &&
-								(isOsmAndBot(message.senderUserId) || isOsmAndBot(message.viaBotUserId))) {
-								parseOsmAndBotLocationContent(message.content as MessageOsmAndBotLocation, newContent)
+								parseTextLocation(newContent.text, (fromBot || viaBot))
+							} else if (newContent is TdApi.MessageLocation) {
+								if(fromBot||viaBot){
+									parseOsmAndBotLocationContent(message.content as MessageOsmAndBotLocation, newContent)
+								} else {
+									OsmandLocationUtils.parseUserMapLocation(message)
+								}
 							} else {
 								newContent
 							}
@@ -1219,6 +1346,7 @@ class TelegramHelper private constructor() {
 				}
 				TdApi.UpdateNewMessage.CONSTRUCTOR -> {
 					addNewMessage((obj as TdApi.UpdateNewMessage).message)
+					log.debug("UpdateNewMessage " + obj.message.id)
 				}
 				TdApi.UpdateMessageMentionRead.CONSTRUCTOR -> {
 					val updateChat = obj as TdApi.UpdateMessageMentionRead
@@ -1324,6 +1452,14 @@ class TelegramHelper private constructor() {
 						fullInfoUpdatesListeners.forEach { it.onSupergroupFullInfoUpdated(id, info) }
 					}
 				}
+				TdApi.UpdateMessageSendSucceeded.CONSTRUCTOR -> {
+					val updateSucceeded = obj as TdApi.UpdateMessageSendSucceeded
+					val message = updateSucceeded.message
+					log.debug("UpdateMessageSendSucceeded: ${message.id} oldId: ${updateSucceeded.oldMessageId}")
+					outgoingMessagesListeners.forEach {
+						it.onUpdateMessages(listOf(message))
+					}
+				}
 			}
 		}
 	}
@@ -1345,4 +1481,4 @@ class TelegramHelper private constructor() {
 			}// result is already received through UpdateAuthorizationState, nothing to do
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramUiHelper.kt b/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramUiHelper.kt
index e9b11f081d..4b846dc88d 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramUiHelper.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramUiHelper.kt
@@ -6,7 +6,10 @@ import android.widget.ImageView
 import net.osmand.data.LatLon
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
-import net.osmand.telegram.helpers.TelegramHelper.MessageOsmAndBotLocation
+import net.osmand.telegram.utils.GPXUtilities.GPXFile
+import net.osmand.telegram.utils.OsmandLocationUtils
+import net.osmand.telegram.utils.OsmandLocationUtils.MessageOsmAndBotLocation
+import net.osmand.telegram.utils.OsmandLocationUtils.MessageUserLocation
 import org.drinkless.td.libcore.telegram.TdApi
 
 object TelegramUiHelper {
@@ -63,10 +66,12 @@ object TelegramUiHelper {
 				val user = helper.getUser(userId)
 				val message = messages.firstOrNull { it.viaBotUserId == 0 }
 				if (message != null) {
-					res.lastUpdated = helper.getLastUpdatedTime(message)
+					res.lastUpdated = OsmandLocationUtils.getLastUpdatedTime(message)
 					val content = message.content
 					if (content is TdApi.MessageLocation) {
 						res.latLon = LatLon(content.location.latitude, content.location.longitude)
+					} else if (content is MessageUserLocation) {
+						res.latLon = LatLon(content.lat, content.lon)
 					}
 				}
 				if (user != null) {
@@ -106,6 +111,7 @@ object TelegramUiHelper {
 		val content = message.content
 		return when (content) {
 			is MessageOsmAndBotLocation -> botMessageToLocationItem(chat, content)
+			is MessageUserLocation -> locationMessageToLocationItem(helper, chat, message)
 			is TdApi.MessageLocation -> locationMessageToLocationItem(helper, chat, message)
 			else -> null
 		}
@@ -120,6 +126,7 @@ object TelegramUiHelper {
 		return when (content) {
 			is MessageOsmAndBotLocation -> botMessageToChatItem(helper, chat, content)
 			is TdApi.MessageLocation -> locationMessageToChatItem(helper, chat, message)
+			is MessageUserLocation -> locationMessageToChatItem(helper, chat, message)
 			else -> null
 		}
 	}
@@ -148,17 +155,21 @@ object TelegramUiHelper {
 		message: TdApi.Message
 	): LocationItem? {
 		val user = helper.getUser(message.senderUserId) ?: return null
-		val content = message.content as TdApi.MessageLocation
+		val content = message.content
 		return LocationItem().apply {
 			chatId = chat.id
 			chatTitle = chat.title
 			name = TelegramUiHelper.getUserName(user)
-			latLon = LatLon(content.location.latitude, content.location.longitude)
+			latLon = when (content) {
+				is TdApi.MessageLocation -> LatLon(content.location.latitude, content.location.longitude)
+				is MessageUserLocation -> LatLon(content.lat, content.lon)
+				else -> null
+			}
 			photoPath = helper.getUserPhotoPath(user)
 			grayscalePhotoPath = helper.getUserGreyPhotoPath(user)
 			placeholderId = R.drawable.img_user_picture
 			userId = message.senderUserId
-			lastUpdated = helper.getLastUpdatedTime(message)
+			lastUpdated = OsmandLocationUtils.getLastUpdatedTime(message)
 		}
 	}
 
@@ -190,12 +201,16 @@ object TelegramUiHelper {
 		message: TdApi.Message
 	): ChatItem? {
 		val user = helper.getUser(message.senderUserId) ?: return null
-		val content = message.content as TdApi.MessageLocation
+		val content = message.content
 		return ChatItem().apply {
 			chatId = chat.id
 			chatTitle = chat.title
 			name = TelegramUiHelper.getUserName(user)
-			latLon = LatLon(content.location.latitude, content.location.longitude)
+			latLon = when (content) {
+				is TdApi.MessageLocation -> LatLon(content.location.latitude, content.location.longitude)
+				is MessageUserLocation -> LatLon(content.lat, content.lon)
+				else -> null
+			}
 			if (helper.isGroup(chat)) {
 				photoPath = helper.getUserPhotoPath(user)
 				groupPhotoPath = chat.photo?.small?.local?.path
@@ -207,7 +222,35 @@ object TelegramUiHelper {
 			userId = message.senderUserId
 			privateChat = helper.isPrivateChat(chat) || helper.isSecretChat(chat)
 			chatWithBot = helper.isBot(userId)
-			lastUpdated = helper.getLastUpdatedTime(message)
+			lastUpdated = OsmandLocationUtils.getLastUpdatedTime(message)
+		}
+	}
+
+	fun userLocationsToChatItem(helper: TelegramHelper, userLocation: LocationMessages.UserLocations): LocationMessagesChatItem? {
+		val user = helper.getUser(userLocation.userId)
+		val chat = helper.getChat(userLocation.chatId)
+		return LocationMessagesChatItem().apply {
+			if (chat != null) {
+				chatId = chat.id
+				chatTitle = chat.title
+				if (helper.isGroup(chat)) {
+					photoPath = helper.getUserPhotoPath(user)
+					groupPhotoPath = chat.photo?.small?.local?.path
+				} else {
+					photoPath = user?.profilePhoto?.small?.local?.path
+					privateChat = helper.isPrivateChat(chat) || helper.isSecretChat(chat)
+				}
+			} else {
+				photoPath = user?.profilePhoto?.small?.local?.path
+			}
+			if (user != null) {
+				name = TelegramUiHelper.getUserName(user)
+				userId = user.id
+			}
+			userLocations = userLocation
+			grayscalePhotoPath = helper.getUserGreyPhotoPath(user)
+			placeholderId = R.drawable.img_user_picture
+			chatWithBot = helper.isBot(userId)
 		}
 	}
 
@@ -259,6 +302,24 @@ object TelegramUiHelper {
 		override fun getVisibleName() = chatTitle
 	}
 
+	class LocationMessagesChatItem : ListItem() {
+
+		var userLocations: LocationMessages.UserLocations? = null
+			internal set
+		var groupPhotoPath: String? = null
+			internal set
+		var privateChat: Boolean = false
+			internal set
+		var chatWithBot: Boolean = false
+			internal set
+
+		override fun canBeOpenedOnMap() = latLon != null
+
+		override fun getMapPointId() = "${chatId}_$userId"
+
+		override fun getVisibleName() = chatTitle
+	}
+
 	class LocationItem : ListItem() {
 
 		override fun canBeOpenedOnMap() = latLon != null
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/notifications/LocationNotification.kt b/OsmAnd-telegram/src/net/osmand/telegram/notifications/LocationNotification.kt
index 5e55476462..b41306ebca 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/notifications/LocationNotification.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/notifications/LocationNotification.kt
@@ -77,6 +77,6 @@ class LocationNotification(app: TelegramApplication) : TelegramNotification(app,
 				.setStyle(NotificationCompat.BigTextStyle().bigText(notificationText))
 	}
 
-	private fun isShowingChatsNotificationEnabled() = !app.showLocationHelper.isUseOsmandCallback()
-			&& app.isOsmAndInstalled() && app.settings.hasAnyChatToShowOnMap()
+	private fun isShowingChatsNotificationEnabled() = (!app.showLocationHelper.isUseOsmandCallback() || app.settings.monitoringEnabled)
+			&& app.isAnyOsmAndInstalled() && app.settings.hasAnyChatToShowOnMap()
 }
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/AddNewDeviceBottomSheet.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/AddNewDeviceBottomSheet.kt
new file mode 100644
index 0000000000..b562ba3024
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/AddNewDeviceBottomSheet.kt
@@ -0,0 +1,186 @@
+package net.osmand.telegram.ui
+
+import android.app.Dialog
+import android.content.Intent
+import android.os.Bundle
+import android.support.design.widget.BottomSheetBehavior
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentManager
+import android.support.v4.content.ContextCompat
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.EditText
+import android.widget.ProgressBar
+import android.widget.TextView
+import net.osmand.telegram.R
+import net.osmand.telegram.TelegramSettings
+import net.osmand.telegram.ui.views.BottomSheetDialog
+import net.osmand.telegram.utils.AndroidNetworkUtils
+import net.osmand.telegram.utils.OsmandApiUtils
+import org.drinkless.td.libcore.telegram.TdApi
+import org.json.JSONException
+import org.json.JSONObject
+
+class AddNewDeviceBottomSheet : BaseDialogFragment() {
+
+	private lateinit var editText: EditText
+	private lateinit var errorTextDescription: TextView
+	private lateinit var primaryBtn: TextView
+	private lateinit var progressBar: ProgressBar
+
+	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+		val dialog = BottomSheetDialog(context!!)
+		dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
+		return dialog
+	}
+
+	override fun onCreateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+		savedInstanceState: Bundle?
+	): View? {
+		val mainView = inflater.inflate(R.layout.bottom_sheet_add_new_device, container, false)
+
+		mainView.findViewById<View>(R.id.scroll_view_container).setOnClickListener { dismiss() }
+
+		BottomSheetBehavior.from(mainView.findViewById<View>(R.id.scroll_view))
+			.setBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
+				override fun onStateChanged(bottomSheet: View, newState: Int) {
+					if (newState == BottomSheetBehavior.STATE_HIDDEN) {
+						dismiss()
+					}
+				}
+
+				override fun onSlide(bottomSheet: View, slideOffset: Float) {}
+			})
+
+		editText = mainView.findViewById<EditText>(R.id.edit_text).apply {
+			addTextChangedListener(object :
+				TextWatcher {
+				override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
+
+				override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+
+				override fun afterTextChanged(s: Editable) {
+					updateErrorTextDescription(s.toString())
+				}
+			})
+		}
+
+		errorTextDescription = mainView.findViewById<TextView>(R.id.error_text_descr)
+
+		progressBar = mainView.findViewById<ProgressBar>(R.id.progressBar).apply {
+			indeterminateDrawable.setColorFilter(ContextCompat.getColor(app, R.color.primary_btn_text_light), android.graphics.PorterDuff.Mode.MULTIPLY)
+		}
+
+		mainView.findViewById<TextView>(R.id.secondary_btn).apply {
+			setText(R.string.shared_string_cancel)
+			setOnClickListener { dismiss() }
+		}
+
+		primaryBtn = mainView.findViewById<TextView>(R.id.primary_btn).apply {
+			setText(R.string.shared_string_add)
+			setOnClickListener {
+				val deviceName = editText.text.toString()
+				updateErrorTextDescription(deviceName)
+				if (deviceName.isNotEmpty() && deviceName.length < MAX_DEVICE_NAME_LENGTH
+					&& !app.settings.containsShareDeviceWithName(deviceName)) {
+					val user = app.telegramHelper.getCurrentUser()
+					if (user != null) {
+						updatePrimaryBtnAndProgress(true)
+						createNewDeviceWithName(user, deviceName)
+					}
+				}
+			}
+		}
+		return mainView
+	}
+
+	private fun createNewDeviceWithName(user: TdApi.User, deviceName: String) {
+		OsmandApiUtils.createNewDevice(app, user, app.telegramHelper.isBot(user.id), deviceName, 0,
+			object : AndroidNetworkUtils.OnRequestResultListener {
+				override fun onResult(result: String?) {
+					updatePrimaryBtnAndProgress(false)
+					val deviceJson = getDeviceJson(result)
+					if (deviceJson != null) {
+						targetFragment?.also { target ->
+							val intent = Intent().putExtra(DEVICE_JSON, deviceJson.toString())
+							target.onActivityResult(targetRequestCode, NEW_DEVICE_REQUEST_CODE, intent)
+						}
+						dismiss()
+					} else {
+						updateErrorTextDescription(null)
+					}
+				}
+			})
+	}
+
+	private fun updateErrorTextDescription(text: String?) {
+		when {
+			text == null -> {
+				errorTextDescription.visibility = View.VISIBLE
+				errorTextDescription.text = getString(R.string.error_adding_new_device)
+			}
+			text.isEmpty() -> {
+				errorTextDescription.visibility = View.VISIBLE
+				errorTextDescription.text = getString(R.string.device_name_cannot_be_empty)
+			}
+			text.length > MAX_DEVICE_NAME_LENGTH -> {
+				errorTextDescription.visibility = View.VISIBLE
+				errorTextDescription.text = getString(R.string.device_name_is_too_long)
+			}
+			app.settings.containsShareDeviceWithName(text.toString()) -> {
+				errorTextDescription.visibility = View.VISIBLE
+				errorTextDescription.text = getString(R.string.enter_another_device_name)
+			}
+			else -> errorTextDescription.visibility = View.INVISIBLE
+		}
+	}
+
+	private fun updatePrimaryBtnAndProgress(showProgress: Boolean) {
+		if (showProgress) {
+			progressBar.visibility = View.VISIBLE
+			primaryBtn.text = ""
+		} else {
+			progressBar.visibility = View.GONE
+			primaryBtn.setText(R.string.shared_string_add)
+		}
+	}
+
+	private fun getDeviceJson(json: String?): JSONObject? {
+		if (json != null) {
+			try {
+				val jsonResult = JSONObject(json)
+				val status = jsonResult.getString("status")
+				if (status == "OK") {
+					return jsonResult.getJSONObject("device")
+				}
+			} catch (e: JSONException) {
+			}
+		}
+		return null
+	}
+
+	companion object {
+		const val NEW_DEVICE_REQUEST_CODE = 5
+		const val DEVICE_JSON = "device_json"
+		const val MAX_DEVICE_NAME_LENGTH = 200
+
+		private const val TAG = "AddNewDeviceBottomSheet"
+		fun showInstance(fm: FragmentManager, target: Fragment): Boolean {
+			return try {
+				AddNewDeviceBottomSheet().apply {
+					setTargetFragment(target, NEW_DEVICE_REQUEST_CODE)
+					show(fm, TAG)
+				}
+				true
+			} catch (e: RuntimeException) {
+				false
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/LiveNowTabFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/LiveNowTabFragment.kt
index 2157e9d17a..c0a52921a9 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/LiveNowTabFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/LiveNowTabFragment.kt
@@ -1,8 +1,10 @@
 package net.osmand.telegram.ui
 
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
 import android.support.v4.app.Fragment
+import android.support.v4.widget.SwipeRefreshLayout
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.ListPopupWindow
 import android.support.v7.widget.RecyclerView
@@ -33,6 +35,7 @@ import net.osmand.telegram.utils.OsmandFormatter
 import net.osmand.telegram.utils.UiUtils.UpdateLocationViewCache
 import net.osmand.util.MapUtils
 import org.drinkless.td.libcore.telegram.TdApi
+import java.util.*
 
 private const val CHAT_VIEW_TYPE = 0
 private const val LOCATION_ITEM_VIEW_TYPE = 1
@@ -44,7 +47,6 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
 		get() = activity?.application as TelegramApplication
 
 	private val telegramHelper get() = app.telegramHelper
-	private val osmandAidlHelper get() = app.osmandAidlHelper
 	private val settings get() = app.settings
 
 	private lateinit var adapter: LiveNowListAdapter
@@ -52,11 +54,14 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
 
 	private lateinit var openOsmAndBtn: TextView
 	private lateinit var sortByBtn: TextView
+	private lateinit var lastTelegramUpdateTime: TextView
 
 	private var location: Location? = null
 	private var heading: Float? = null
 	private var locationUiUpdateAllowed: Boolean = true
 
+	private var lastTelegramUpdateStr = ""
+
 	override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -64,6 +69,10 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
 	): View? {
 		val mainView = inflater.inflate(R.layout.fragment_live_now_tab, container, false)
 		val appBarLayout = mainView.findViewById<View>(R.id.app_bar_layout)
+
+		lastTelegramUpdateTime = mainView.findViewById<TextView>(R.id.last_telegram_update_time)
+		lastTelegramUpdateStr = getString(R.string.last_update_from_telegram) + ": "
+
 		AndroidUtils.addStatusBarPadding19v(context!!, appBarLayout)
 		adapter = LiveNowListAdapter()
 		mainView.findViewById<RecyclerView>(R.id.recycler_view).apply {
@@ -92,11 +101,19 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
 			}
 		}
 
+		mainView.findViewById<SwipeRefreshLayout>(R.id.swipe_refresh).apply {
+			setOnRefreshListener {
+				app.shareLocationHelper.checkNetworkType()
+				updateList()
+				isRefreshing = false
+			}
+			setColorSchemeColors(Color.RED, Color.GREEN, Color.BLUE, Color.CYAN)
+		}
+
 		openOsmAndBtn = mainView.findViewById<TextView>(R.id.open_osmand_btn).apply {
 			setOnClickListener {
-				val pack = settings.appToConnectPackage
-				if (AndroidUtils.isAppInstalled(context, pack)) {
-					activity?.packageManager?.getLaunchIntentForPackage(pack)?.also { intent ->
+				if (app.isOsmAndInstalled()) {
+					activity?.packageManager?.getLaunchIntentForPackage(settings.appToConnectPackage)?.also { intent ->
 						startActivity(intent)
 					}
 				} else {
@@ -164,6 +181,10 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
 		updateList()
 	}
 
+	override fun onTelegramChatCreated(chat: TdApi.Chat) {
+		updateList()
+	}
+
 	override fun onTelegramUserChanged(user: TdApi.User) {
 		updateList()
 	}
@@ -278,6 +299,12 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
 			}
 		}
 
+		if (res.isEmpty()) {
+			lastTelegramUpdateTime.visibility = View.VISIBLE
+			lastTelegramUpdateTime.text = OsmandFormatter.getListItemLiveTimeDescr(app, telegramHelper.lastTelegramUpdateTime, lastTelegramUpdateStr)
+		} else {
+			lastTelegramUpdateTime.visibility = View.GONE
+		}
 		adapter.items = sortAdapterItems(res)
 	}
 
@@ -423,9 +450,11 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
 			openOnMapView?.isEnabled = canBeOpenedOnMap
 			if (canBeOpenedOnMap) {
 				openOnMapView?.setOnClickListener {
-					if (!app.isOsmAndInstalled()) {
+					if (!app.isAnyOsmAndInstalled()) {
 						showOsmAndMissingDialog()
-					} else {
+					} else if (!app.isOsmAndChosen() || (app.isOsmAndChosen() && !app.isOsmAndInstalled())) {
+						fragmentManager?.also { ChooseOsmAndBottomSheet.showInstance(it, this@LiveNowTabFragment) }
+					} else if(app.isOsmAndInstalled()){
 						app.showLocationHelper.showLocationOnMap(item, staleLocation)
 					}
 				}
@@ -446,6 +475,13 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
 			}
 			holder.bottomShadow?.visibility = if (lastItem) View.VISIBLE else View.GONE
 
+			if (lastItem) {
+				holder.lastTelegramUpdateTime?.visibility = View.VISIBLE
+				holder.lastTelegramUpdateTime?.text = OsmandFormatter.getListItemLiveTimeDescr(app, telegramHelper.lastTelegramUpdateTime, lastTelegramUpdateStr)
+			} else {
+				holder.lastTelegramUpdateTime?.visibility = View.GONE
+			}
+
 			if (item is ChatItem && holder is ChatViewHolder) {
 				val nextIsLocation = !lastItem && (items[position + 1] is LocationItem || !sortByGroup)
 				val chatId = item.chatId
@@ -511,17 +547,21 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
 
 					settings.showChatOnMap(chatId, allSelected)
 					if (settings.hasAnyChatToShowOnMap()) {
-						if (!app.isOsmAndInstalled()) {
+						if (!app.isAnyOsmAndInstalled()) {
 							if (allSelected) {
 								showOsmAndMissingDialog()
 							}
+						} else if (!app.isOsmAndChosen() || (app.isOsmAndChosen() && !app.isOsmAndInstalled())) {
+							fragmentManager?.also { ChooseOsmAndBottomSheet.showInstance(it, this@LiveNowTabFragment) }
 						} else {
-							if (allSelected) {
-								app.showLocationHelper.showChatMessages(chatId)
-							} else {
-								app.showLocationHelper.hideChatMessages(chatId)
+							if (app.isOsmAndInstalled()) {
+								if (allSelected) {
+									app.showLocationHelper.showChatMessages(chatId)
+								} else {
+									app.showLocationHelper.hideChatMessages(chatId)
+								}
+								app.showLocationHelper.startShowingLocation()
 							}
-							app.showLocationHelper.startShowingLocation()
 						}
 					} else {
 						app.showLocationHelper.stopShowingLocation()
@@ -545,6 +585,7 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
 			val distanceText: TextView? = view.findViewById(R.id.distance_text)
 			val description: TextView? = view.findViewById(R.id.description)
 			val bottomShadow: View? = view.findViewById(R.id.bottom_shadow)
+			val lastTelegramUpdateTime: TextView? = view.findViewById(R.id.last_telegram_update_time)
 
 			abstract fun getOpenOnMapClickView(): View?
 		}
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
index 9d372ca24d..b36a164c01 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
@@ -27,6 +27,7 @@ import net.osmand.telegram.ui.MyLocationTabFragment.ActionButtonsListener
 import net.osmand.telegram.ui.views.LockableViewPager
 import net.osmand.telegram.utils.*
 import org.drinkless.td.libcore.telegram.TdApi
+import java.io.File
 import java.lang.ref.WeakReference
 
 const val OPEN_MY_LOCATION_TAB_KEY = "open_my_location_tab"
@@ -35,6 +36,7 @@ private const val PERMISSION_REQUEST_LOCATION = 1
 
 private const val MY_LOCATION_TAB_POS = 0
 private const val LIVE_NOW_TAB_POS = 1
+private const val TIMELINE_TAB_POS = 2
 
 class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListener, TelegramIncomingMessagesListener {
 
@@ -54,6 +56,7 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 
 	private var myLocationTabFragment: MyLocationTabFragment? = null
 	private var liveNowTabFragment: LiveNowTabFragment? = null
+	private var timelineTabFragment: TimelineTabFragment? = null
 
 	private lateinit var buttonsBar: LinearLayout
 	private lateinit var bottomNav: BottomNavigationView
@@ -72,7 +75,7 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 
 		val viewPager = findViewById<LockableViewPager>(R.id.view_pager).apply {
 			swipeLocked = true
-			offscreenPageLimit = 2
+			offscreenPageLimit = 3
 			adapter = ViewPagerAdapter(supportFragmentManager)
 		}
 
@@ -82,11 +85,13 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 				when (it.itemId) {
 					R.id.action_my_location -> pos = MY_LOCATION_TAB_POS
 					R.id.action_live_now -> pos = LIVE_NOW_TAB_POS
+					R.id.action_timeline -> pos = TIMELINE_TAB_POS
 				}
 				if (pos != -1 && pos != viewPager.currentItem) {
 					when (pos) {
 						MY_LOCATION_TAB_POS -> liveNowTabFragment?.tabClosed()
 						LIVE_NOW_TAB_POS -> liveNowTabFragment?.tabOpened()
+						TIMELINE_TAB_POS -> liveNowTabFragment?.tabClosed()
 					}
 					viewPager.currentItem = pos
 					return@setOnNavigationItemSelectedListener true
@@ -139,10 +144,10 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 		if (fragment is TelegramListener) {
 			listeners.add(WeakReference(fragment))
 		}
-		if (fragment is MyLocationTabFragment) {
-			myLocationTabFragment = fragment
-		} else if (fragment is LiveNowTabFragment) {
-			liveNowTabFragment = fragment
+		when (fragment) {
+			is MyLocationTabFragment -> myLocationTabFragment = fragment
+			is LiveNowTabFragment -> liveNowTabFragment = fragment
+			is TimelineTabFragment -> timelineTabFragment = fragment
 		}
 	}
 
@@ -160,7 +165,7 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 		if (AndroidUtils.isLocationPermissionAvailable(this)) {
 			app.locationProvider.resumeAllUpdates()
 		}
-		if (settings.hasAnyChatToShowOnMap() && !app.isOsmAndInstalled()) {
+		if (settings.hasAnyChatToShowOnMap() && !app.isAnyOsmAndInstalled()) {
 			showOsmandMissingDialog()
 		}
 	}
@@ -178,7 +183,6 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 	override fun onStop() {
 		super.onStop()
 		settings.save()
-		app.messagesDbHelper.saveMessages()
 	}
 
 	override fun onDestroy() {
@@ -218,7 +222,7 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 					if (user != null) {
 						OsmandApiUtils.updateSharingDevices(app, user.id)
 						if (settings.currentSharingMode.isEmpty()) {
-							settings.currentSharingMode = user.id.toString()
+							settings.updateCurrentSharingMode(user.id.toString())
 						}
 					}
 				}
@@ -254,6 +258,12 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 		}
 	}
 
+	override fun onTelegramChatCreated(chat: TdApi.Chat) {
+		runOnUi {
+			listeners.forEach { it.get()?.onTelegramChatCreated(chat) }
+		}
+	}
+
 	override fun onTelegramUserChanged(user: TdApi.User) {
 		val photoPath = telegramHelper.getUserPhotoPath(user)
 		if (photoPath != null) {
@@ -311,6 +321,15 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 		android.os.Process.killProcess(android.os.Process.myPid())
 	}
 
+	fun shareGpx(path: String) {
+		val fileUri = AndroidUtils.getUriForFile(app, File(path))
+		val sendIntent = Intent(Intent.ACTION_SEND)
+		sendIntent.putExtra(Intent.EXTRA_STREAM, fileUri)
+		sendIntent.type = "application/gpx+xml"
+		sendIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+		startActivity(sendIntent)
+	}
+
 	fun loginTelegram() {
 		if (telegramHelper.getTelegramAuthorizationState() != TelegramAuthorizationState.CLOSED) {
 			telegramHelper.logout()
@@ -321,7 +340,7 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 	fun logoutTelegram(silent: Boolean = false) {
 		if (telegramHelper.getTelegramAuthorizationState() == TelegramHelper.TelegramAuthorizationState.READY) {
 			if (app.isInternetConnectionAvailable) {
-				app.messagesDbHelper.clearMessages()
+				app.locationMessages.clearBufferedMessages()
 				settings.clear()
 				telegramHelper.logout()
 			} else {
@@ -429,7 +448,7 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 					settings.stopSharingLocationToChats()
 					app.shareLocationHelper.stopSharingLocation()
 				}
-				if (settings.hasAnyChatToShowOnMap() && !app.isOsmAndInstalled()) {
+				if (settings.hasAnyChatToShowOnMap() && !app.isAnyOsmAndInstalled()) {
 					showOsmandMissingDialog()
 				}
 			}
@@ -457,7 +476,7 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 
 	class ViewPagerAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm) {
 
-		private val fragments = listOf<Fragment>(MyLocationTabFragment(), LiveNowTabFragment())
+		private val fragments = listOf<Fragment>(MyLocationTabFragment(), LiveNowTabFragment(), TimelineTabFragment())
 
 		override fun getItem(position: Int) = fragments[position]
 
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt
index 41fa47db5b..312752229f 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt
@@ -28,6 +28,7 @@ import net.osmand.telegram.utils.OsmandFormatter
 import org.drinkless.td.libcore.telegram.TdApi
 
 private const val SELECTED_CHATS_KEY = "selected_chats"
+private const val SELECTED_CHATS_USERS = "selected_users"
 private const val SHARE_LOCATION_CHAT = 1
 private const val DEFAULT_CHAT = 0
 
@@ -71,11 +72,12 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 	private lateinit var appBarOutlineProvider: ViewOutlineProvider
 
 	private val selectedChats = HashSet<Long>()
+	private val selectedUsers = HashSet<Long>()
 
 	private var actionButtonsListener: ActionButtonsListener? = null
 
 	private var sharingMode = false
-	
+
 	private var updateEnable: Boolean = false
 
 	override fun onCreateView(
@@ -94,12 +96,17 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 		searchBoxSidesMargin = resources.getDimensionPixelSize(R.dimen.content_padding_half)
 
 		sharingMode = settings.hasAnyChatToShareLocation()
-				
+
 		savedInstanceState?.apply {
-			selectedChats.addAll(getLongArray(SELECTED_CHATS_KEY).toSet())
-			if (selectedChats.isNotEmpty()) {
-				actionButtonsListener?.switchButtonsVisibility(true)
+			val chatsArray = getLongArray(SELECTED_CHATS_KEY)
+			val usersArray = getLongArray(SELECTED_CHATS_KEY)
+			if (chatsArray != null) {
+				selectedChats.addAll(chatsArray.toSet())
 			}
+			if (usersArray != null) {
+				selectedUsers.addAll(usersArray.toSet())
+			}
+			actionButtonsListener?.switchButtonsVisibility((selectedUsers.isNotEmpty() || selectedChats.isNotEmpty()))
 		}
 
 		val mainView = inflater.inflate(R.layout.fragment_my_location_tab, container, false)
@@ -130,7 +137,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 			setupOptionsBtn(optionsBtn)
 			setupOptionsBtn(mainView.findViewById<ImageView>(R.id.options_title))
 		}
-		
+
 		imageContainer = mainView.findViewById<FrameLayout>(R.id.image_container)
 		titleContainer = mainView.findViewById<LinearLayout>(R.id.title_container).apply {
 			AndroidUtils.addStatusBarPadding19v(context, this)
@@ -139,8 +146,10 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 		mainView.findViewById<TextView>(R.id.status_title).apply {
 			val sharingStatus = getString(R.string.sharing_enabled)
 			val spannable = SpannableString(sharingStatus)
-			spannable.setSpan(ForegroundColorSpan(app.uiUtils.getActiveColor()),
-				sharingStatus.indexOf(" "), sharingStatus.length, 0)
+			spannable.setSpan(
+				ForegroundColorSpan(app.uiUtils.getActiveColor()),
+				sharingStatus.indexOf(" "), sharingStatus.length, 0
+			)
 			text = spannable
 		}
 
@@ -191,7 +200,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 
 		mainView.findViewById<View>(R.id.stop_all_sharing_row).setOnClickListener {
 			fragmentManager?.also { fm ->
-				DisableSharingBottomSheet.showInstance(fm, this, adapter.chats.size)
+				DisableSharingBottomSheet.showInstance(fm, this, adapter.items.size)
 			}
 		}
 
@@ -215,14 +224,13 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 				updateContent()
 			}
 		}
-		
+
 		return mainView
 	}
 
 	override fun onResume() {
 		super.onResume()
 		updateCurrentUserPhoto()
-		telegramHelper.getActiveLiveLocationMessages(null)
 		updateContent()
 		updateEnable = true
 		startHandler()
@@ -232,10 +240,11 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 		super.onPause()
 		updateEnable = false
 	}
-	
+
 	override fun onSaveInstanceState(outState: Bundle) {
 		super.onSaveInstanceState(outState)
 		outState.putLongArray(SELECTED_CHATS_KEY, selectedChats.toLongArray())
+		outState.putLongArray(SELECTED_CHATS_USERS, selectedUsers.toLongArray())
 	}
 
 	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -274,7 +283,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 			TelegramHelper.TelegramAuthorizationState.LOGGING_OUT,
 			TelegramHelper.TelegramAuthorizationState.CLOSED,
 			TelegramHelper.TelegramAuthorizationState.UNKNOWN -> {
-				adapter.chats = mutableListOf()
+				adapter.items = mutableListOf()
 			}
 			else -> Unit
 		}
@@ -292,6 +301,11 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 		updateContent()
 	}
 
+	override fun onTelegramChatCreated(chat: TdApi.Chat) {
+		sharingMode = settings.hasAnyChatToShareLocation()
+		updateContent()
+	}
+
 	override fun onTelegramUserChanged(user: TdApi.User) {
 		if (user.id == telegramHelper.getCurrentUser()?.id) {
 			updateCurrentUserPhoto()
@@ -303,9 +317,9 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 	}
 
 	fun onPrimaryBtnClick() {
-		if (selectedChats.isNotEmpty()) {
+		if (selectedChats.isNotEmpty() || selectedUsers.isNotEmpty()) {
 			val fm = fragmentManager ?: return
-			SetTimeDialogFragment.showInstance(fm, selectedChats, this)
+			SetTimeDialogFragment.showInstance(fm, selectedChats, selectedUsers, this)
 		}
 	}
 
@@ -336,7 +350,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 			}
 		}, ADAPTER_UPDATE_INTERVAL_MIL)
 	}
-	
+
 	private fun animateStartSharingBtn(show: Boolean) {
 		if (startSharingBtn.visibility == View.VISIBLE) {
 			val scale = if (show) 1f else 0f
@@ -348,9 +362,10 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 				.start()
 		}
 	}
-	
+
 	private fun clearSelection() {
 		selectedChats.clear()
+		selectedUsers.clear()
 		adapter.notifyDataSetChanged()
 		actionButtonsListener?.switchButtonsVisibility(false)
 	}
@@ -436,25 +451,31 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 		textContainer.visibility = if (sharingMode) View.GONE else View.VISIBLE
 		titleContainer.visibility = if (sharingMode) View.VISIBLE else View.GONE
 		startSharingBtn.visibility = if (sharingMode) View.VISIBLE else View.GONE
-		headerParams.scrollFlags = if (sharingMode) 0 else AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
+		headerParams.scrollFlags =
+				if (sharingMode) 0 else AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
 		stopSharingSwitcher.isChecked = true
 		appBarScrollRange = -1
 	}
 
 	private fun updateSharingStatus() {
 		if (sharingMode) {
-			if (settings.sharingStatusChanges.isEmpty()) {
-				settings.updateSharingStatusHistory()
-			}
+			settings.updateSharingStatusHistory()
 			val sharingStatus = settings.sharingStatusChanges.last()
 			sharingStatusTitle.text = sharingStatus.getTitle(app)
-			sharingStatusIcon.setImageDrawable(app.uiUtils.getIcon(sharingStatus.statusType.iconId, sharingStatus.statusType.iconColorRes))
+			sharingStatusIcon.setImageDrawable(
+				app.uiUtils.getIcon(
+					sharingStatus.statusType.iconId,
+					sharingStatus.statusType.iconColorRes
+				)
+			)
 		}
 	}
 
 	private fun updateList() {
+		val items: MutableList<TdApi.Object> = mutableListOf()
 		val chats: MutableList<TdApi.Chat> = mutableListOf()
 		val currentUser = telegramHelper.getCurrentUser()
+		val contacts = telegramHelper.getContacts()
 		val chatList = if (sharingMode) {
 			settings.getShareLocationChats()
 		} else {
@@ -473,27 +494,57 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 				chats.add(chat)
 			}
 		}
+		items.addAll(chats)
+		if (!sharingMode) {
+			for (user in contacts.values) {
+				val containsInChats =
+					chats.any { telegramHelper.getUserIdFromChatType(it.type) == user.id }
+				if ((!sharingMode && settings.isSharingLocationToUser(user.id)) || user.id == currentUser?.id || containsInChats) {
+					continue
+				}
+				items.add(user)
+			}
+		}
 		if (sharingMode && settings.hasAnyChatToShareLocation()) {
-			adapter.chats = sortAdapterItems(chats)
+			adapter.items = sortAdapterItems(items)
 		} else {
-			adapter.chats = chats
+			adapter.items = items
 		}
 	}
 
-	private fun sortAdapterItems(list: MutableList<TdApi.Chat>): MutableList<TdApi.Chat> {
-		list.sortWith(Comparator<TdApi.Chat> { o1, o2 -> o1.title.compareTo(o2.title) })
+	private fun sortAdapterItems(list: MutableList<TdApi.Object>): MutableList<TdApi.Object> {
+		list.sortWith(Comparator<TdApi.Object> { o1, o2 ->
+			val title1 = when (o1) {
+				is TdApi.Chat -> o1.title
+				is TdApi.User -> TelegramUiHelper.getUserName(o1)
+				else -> ""
+			}
+			val title2 = when (o2) {
+				is TdApi.Chat -> o2.title
+				is TdApi.User -> TelegramUiHelper.getUserName(o2)
+				else -> ""
+			}
+			title1.compareTo(title2)
+		})
 		return list
 	}
-	
-	inner class MyLocationListAdapter : RecyclerView.Adapter<MyLocationListAdapter.BaseViewHolder>() {
-		var chats = mutableListOf<TdApi.Chat>()
+
+	inner class MyLocationListAdapter :
+		RecyclerView.Adapter<MyLocationListAdapter.BaseViewHolder>() {
+		var items = mutableListOf<TdApi.Object>()
 			set(value) {
 				field = value
 				notifyDataSetChanged()
 			}
 
 		override fun getItemViewType(position: Int): Int {
-			return if (settings.isSharingLocationToChat(chats[position].id) && sharingMode) {
+			val item = items[position]
+			val id = when (item) {
+				is TdApi.Chat -> item.id
+				is TdApi.User -> item.id.toLong()
+				else -> -1
+			}
+			return if (settings.isSharingLocationToChat(id) && sharingMode) {
 				SHARE_LOCATION_CHAT
 			} else {
 				DEFAULT_CHAT
@@ -518,15 +569,35 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 
 		@SuppressLint("SetTextI18n")
 		override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
-			val chat = chats[position]
+			val item = items[position]
+			val isChat = item is TdApi.Chat
+			val itemId = if (isChat) {
+				(item as TdApi.Chat).id
+			} else {
+				(item as TdApi.User).id.toLong()
+			}
+
 			val lastItem = position == itemCount - 1
-			val placeholderId = if (telegramHelper.isGroup(chat)) R.drawable.img_group_picture else R.drawable.img_user_picture
-			val live = settings.isSharingLocationToChat(chat.id)
-			val shareInfo = settings.getChatsShareInfo()[chat.id]
+			val placeholderId =
+				if (isChat && telegramHelper.isGroup(item as TdApi.Chat)) R.drawable.img_group_picture else R.drawable.img_user_picture
+			val live = (isChat && settings.isSharingLocationToChat(itemId))
+			val shareInfo = if (isChat) settings.getChatsShareInfo()[itemId] else null
 
-			TelegramUiHelper.setupPhoto(app, holder.icon, chat.photo?.small?.local?.path, placeholderId, false)
-			holder.title?.text = chat.title
+			val photoPath = when (item) {
+				is TdApi.Chat -> item.photo?.small?.local?.path
+				is TdApi.User -> item.profilePhoto?.small?.local?.path
+				else -> null
+			}
 
+			TelegramUiHelper.setupPhoto(app, holder.icon, photoPath, placeholderId, false)
+
+			val title = when (item) {
+				is TdApi.Chat -> item.title
+				is TdApi.User -> TelegramUiHelper.getUserName(item)
+				else -> null
+			}
+
+			holder.title?.text = title
 			if (holder is ChatViewHolder) {
 				holder.description?.visibility = View.GONE
 				if (live) {
@@ -535,21 +606,33 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 					holder.checkBox?.apply {
 						visibility = View.VISIBLE
 						setOnCheckedChangeListener(null)
-						isChecked = selectedChats.contains(chat.id)
+						isChecked = if (isChat) {
+							selectedChats.contains(itemId)
+						} else {
+							selectedUsers.contains(itemId)
+						}
 						setOnCheckedChangeListener { _, isChecked ->
 							if (isChecked) {
-								selectedChats.add(chat.id)
+								if (isChat) {
+									selectedChats.add(itemId)
+								} else {
+									selectedUsers.add(itemId)
+								}
 							} else {
-								selectedChats.remove(chat.id)
+								if (isChat) {
+									selectedChats.remove(itemId)
+								} else {
+									selectedUsers.remove(itemId)
+								}
 							}
-							actionButtonsListener?.switchButtonsVisibility(selectedChats.isNotEmpty())
+							actionButtonsListener?.switchButtonsVisibility(selectedChats.isNotEmpty() || selectedUsers.isNotEmpty())
 						}
 					}
 				}
 				holder.bottomShadow?.visibility = if (lastItem) View.VISIBLE else View.GONE
 				holder.itemView.setOnClickListener {
 					if (live) {
-						settings.shareLocationToChat(chat.id, false)
+						settings.shareLocationToChat(itemId, false)
 						shareLocationHelper.stopSharingLocation()
 						notifyItemChanged(position)
 					} else {
@@ -563,18 +646,19 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 					isChecked = live
 					setOnCheckedChangeListener { _, isChecked ->
 						if (!isChecked) {
-							settings.shareLocationToChat(chat.id, false)
+							settings.shareLocationToChat(itemId, false)
 							if (shareInfo != null) {
 								telegramHelper.stopSendingLiveLocationToChat(shareInfo)
 							}
-							removeItem(chat)
+							removeItem(item)
 						}
 					}
 				}
 
 				val duration = shareInfo?.userSetLivePeriod
 				if (duration != null && duration > 0) {
-					holder.descriptionDuration?.text = OsmandFormatter.getFormattedDuration(context!!, duration)
+					holder.descriptionDuration?.text =
+							OsmandFormatter.getFormattedDuration(context!!, duration)
 					holder.description?.apply {
 						visibility = View.VISIBLE
 						text = "${getText(R.string.sharing_time)}:"
@@ -582,16 +666,32 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 				}
 
 				val expiresIn = shareInfo?.getChatLiveMessageExpireTime() ?: 0
-				
+
 				holder.textInArea?.apply {
-					val time = shareInfo?.additionalActiveTime ?: ADDITIONAL_ACTIVE_TIME_VALUES_SEC[0]
+					val time =
+						shareInfo?.additionalActiveTime ?: ADDITIONAL_ACTIVE_TIME_VALUES_SEC[0]
 					visibility = View.VISIBLE
-					text = "${getText(R.string.plus)} ${OsmandFormatter.getFormattedDuration(context!!, time)}"
+					text = "+ ${OsmandFormatter.getFormattedDuration(context!!, time)}"
 					setOnClickListener {
 						val expireTime = shareInfo?.getChatLiveMessageExpireTime() ?: 0
-						val newLivePeriod = expireTime + (shareInfo?.additionalActiveTime ?: ADDITIONAL_ACTIVE_TIME_VALUES_SEC[0])
-						val nextAdditionalActiveTime = shareInfo?.getNextAdditionalActiveTime() ?: ADDITIONAL_ACTIVE_TIME_VALUES_SEC[1]
-						settings.shareLocationToChat(chat.id, true, newLivePeriod, nextAdditionalActiveTime)
+						val newLivePeriod = expireTime + (shareInfo?.additionalActiveTime
+							?: ADDITIONAL_ACTIVE_TIME_VALUES_SEC[0])
+						val nextAdditionalActiveTime = shareInfo?.getNextAdditionalActiveTime()
+							?: ADDITIONAL_ACTIVE_TIME_VALUES_SEC[1]
+						if (isChat) {
+							settings.shareLocationToChat(
+								itemId,
+								true,
+								newLivePeriod,
+								nextAdditionalActiveTime
+							)
+						} else {
+							settings.shareLocationToUser(
+								itemId.toInt(),
+								newLivePeriod,
+								nextAdditionalActiveTime
+							)
+						}
 						notifyItemChanged(position)
 					}
 				}
@@ -608,17 +708,30 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 
 				holder.stopSharingSecondPart?.apply {
 					visibility = getStopSharingVisibility(expiresIn)
-					text = "(${getString(R.string.in_time,
-						OsmandFormatter.getFormattedDuration(context!!, expiresIn, true))})"
+					text = "(${getString(
+						R.string.in_time,
+						OsmandFormatter.getFormattedDuration(context!!, expiresIn, true)
+					)})"
+				}
+				holder.gpsPointsCollected?.apply {
+					if (shareInfo != null) {
+						text = " ${shareInfo.sentMessages}"
+					}
+				}
+				holder.gpsPointsSent?.apply {
+					if (shareInfo != null) {
+						text = getString(R.string.gps_points_in_buffer, shareInfo.pendingTdLib + app.locationMessages.getBufferedMessagesCountForChat(shareInfo.chatId))
+					}
 				}
 			}
 		}
 
-		private fun getStopSharingVisibility(expiresIn: Long) = if (expiresIn > 0) View.VISIBLE else View.INVISIBLE
+		private fun getStopSharingVisibility(expiresIn: Long) =
+			if (expiresIn > 0) View.VISIBLE else View.INVISIBLE
 
-		private fun removeItem(chat: TdApi.Chat) {
-			chats.remove(chat)
-			if (chats.isEmpty()) {
+		private fun removeItem(chat: TdApi.Object) {
+			items.remove(chat)
+			if (items.isEmpty()) {
 				sharingMode = false
 				updateContent()
 				shareLocationHelper.stopSharingLocation()
@@ -627,7 +740,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 			}
 		}
 
-		override fun getItemCount() = chats.size
+		override fun getItemCount() = items.size
 
 		abstract inner class BaseViewHolder(view: View) : RecyclerView.ViewHolder(view) {
 			val icon: ImageView? = view.findViewById(R.id.icon)
@@ -647,10 +760,12 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 			val stopSharingDescr: TextView? = view.findViewById(R.id.stop_in)
 			val stopSharingFirstPart: TextView? = view.findViewById(R.id.ending_in_first_part)
 			val stopSharingSecondPart: TextView? = view.findViewById(R.id.ending_in_second_part)
+			val gpsPointsCollected: TextView? = view.findViewById(R.id.gps_points_collected)
+			val gpsPointsSent: TextView? = view.findViewById(R.id.gps_points_in_buffer_txt)
 		}
 	}
 
 	interface ActionButtonsListener {
 		fun switchButtonsVisibility(visible: Boolean)
 	}
-}
+}
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/SetTimeDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/SetTimeDialogFragment.kt
index c7d49771fe..c3007c9217 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/SetTimeDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/SetTimeDialogFragment.kt
@@ -14,13 +14,14 @@ import android.widget.TextView
 import net.osmand.Location
 import net.osmand.data.LatLon
 import net.osmand.telegram.R
-import net.osmand.telegram.TelegramLocationProvider.TelegramLocationListener
 import net.osmand.telegram.TelegramLocationProvider.TelegramCompassListener
+import net.osmand.telegram.TelegramLocationProvider.TelegramLocationListener
 import net.osmand.telegram.helpers.ShareLocationHelper
 import net.osmand.telegram.helpers.TelegramUiHelper
 import net.osmand.telegram.ui.SetTimeDialogFragment.SetTimeListAdapter.ChatViewHolder
 import net.osmand.telegram.utils.AndroidUtils
 import net.osmand.telegram.utils.OsmandFormatter
+import net.osmand.telegram.utils.OsmandLocationUtils
 import net.osmand.telegram.utils.UiUtils
 import net.osmand.util.MapUtils
 import org.drinkless.td.libcore.telegram.TdApi
@@ -36,6 +37,7 @@ class SetTimeDialogFragment : BaseDialogFragment(), TelegramLocationListener, Te
 	private lateinit var timeForAllValue: TextView
 
 	private val chatLivePeriods = HashMap<Long, Long>()
+	private val userLivePeriods = HashMap<Long, Long>()
 
 	private var location: Location? = null
 	private var heading: Float? = null
@@ -90,6 +92,9 @@ class SetTimeDialogFragment : BaseDialogFragment(), TelegramLocationListener, Te
 					chatLivePeriods.forEach { (chatId, livePeriod) ->
 						settings.shareLocationToChat(chatId, true, livePeriod)
 					}
+					userLivePeriods.forEach { (userId, livePeriod) ->
+						settings.shareLocationToUser(userId.toInt(),  livePeriod)
+					}
 					app.shareLocationHelper.startSharingLocation()
 					targetFragment?.also {
 						it.onActivityResult(targetRequestCode, LOCATION_SHARED_REQUEST_CODE, null)
@@ -121,7 +126,13 @@ class SetTimeDialogFragment : BaseDialogFragment(), TelegramLocationListener, Te
 			chats.add(id)
 			chats.add(livePeriod)
 		}
+		val users = mutableListOf<Long>()
+		for ((id, livePeriod) in userLivePeriods) {
+			users.add(id)
+			users.add(livePeriod)
+		}
 		outState.putLongArray(CHATS_KEY, chats.toLongArray())
+		outState.putLongArray(USERS_KEY, users.toLongArray())
 	}
 
 	override fun updateLocation(location: Location?) {
@@ -167,17 +178,27 @@ class SetTimeDialogFragment : BaseDialogFragment(), TelegramLocationListener, Te
 	
 	private fun readFromBundle(bundle: Bundle?) {
 		chatLivePeriods.clear()
+		userLivePeriods.clear()
 		bundle?.getLongArray(CHATS_KEY)?.also {
 			for (i in 0 until it.size step 2) {
 				val livePeriod = settings.getChatLivePeriod(it[i])
 				chatLivePeriods[it[i]] = livePeriod ?: it[i + 1]
 			}
 		}
+		bundle?.getLongArray(USERS_KEY)?.also {
+			for (j in 0 until it.size step 2) {
+				val livePeriod = settings.getChatLivePeriod(it[j])
+				userLivePeriods[it[j]] = livePeriod ?: it[j + 1]
+			}
+		}
 	}
 
 	private fun getTimeForAll(useDefValue: Boolean = false): Long {
 		val returnVal = if (useDefValue) DEFAULT_VISIBLE_TIME_SECONDS else NO_VALUE
-		val iterator = chatLivePeriods.values.iterator()
+		val allTime = mutableListOf<Long>()
+		allTime.addAll(chatLivePeriods.values)
+		allTime.addAll(userLivePeriods.values)
+		val iterator = allTime.iterator()
 		if (!iterator.hasNext()) {
 			return returnVal
 		}
@@ -202,7 +223,7 @@ class SetTimeDialogFragment : BaseDialogFragment(), TelegramLocationListener, Te
 		}
 	}
 
-	private fun selectDuration(id: Long? = null) {
+	private fun selectDuration(id: Long? = null, isChat: Boolean = true) {
 		val timeForAll = getTimeForAll(true)
 		val defSeconds = if (id == null) timeForAll else chatLivePeriods[id] ?: timeForAll
 		val (defHours, defMinutes) = secondsToHoursAndMinutes(defSeconds)
@@ -213,11 +234,18 @@ class SetTimeDialogFragment : BaseDialogFragment(), TelegramLocationListener, Te
 						TimeUnit.MINUTES.toSeconds(minutes.toLong())
 				if (seconds >= ShareLocationHelper.MIN_LOCATION_MESSAGE_LIVE_PERIOD_SEC) {
 					if (id != null) {
-						chatLivePeriods[id] = seconds
+						if (isChat) {
+							chatLivePeriods[id] = seconds
+						} else {
+							userLivePeriods[id] = seconds
+						}
 					} else {
 						chatLivePeriods.keys.forEach {
 							chatLivePeriods[it] = seconds
 						}
+						userLivePeriods.keys.forEach {
+							userLivePeriods[it] = seconds
+						}
 					}
 					updateTimeForAllRow()
 					adapter.notifyDataSetChanged()
@@ -242,17 +270,19 @@ class SetTimeDialogFragment : BaseDialogFragment(), TelegramLocationListener, Te
 	}
 
 	private fun updateList() {
-		val chats: MutableList<TdApi.Chat> = mutableListOf()
+		val items: MutableList<TdApi.Object> = mutableListOf()
 		telegramHelper.getChatList().filter { chatLivePeriods.keys.contains(it.chatId) }
 			.forEach { orderedChat ->
-				telegramHelper.getChat(orderedChat.chatId)?.also { chats.add(it) }
+				telegramHelper.getChat(orderedChat.chatId)?.also { items.add(it) }
 			}
-		adapter.chats = chats
+		telegramHelper.getContacts().values.filter { userLivePeriods.keys.contains(it.id.toLong()) }
+			.forEach { user -> items.add(user) }
+		adapter.items = items
 	}
 
 	inner class SetTimeListAdapter : RecyclerView.Adapter<ChatViewHolder>() {
 
-		var chats: List<TdApi.Chat> = emptyList()
+		var items: List<TdApi.Object> = emptyList()
 			set(value) {
 				field = value
 				notifyDataSetChanged()
@@ -265,21 +295,41 @@ class SetTimeDialogFragment : BaseDialogFragment(), TelegramLocationListener, Te
 		}
 
 		override fun onBindViewHolder(holder: ChatViewHolder, position: Int) {
-			val chat = chats[position]
-			val placeholderId = if (telegramHelper.isGroup(chat)) R.drawable.img_group_picture else R.drawable.img_user_picture
+			val item = items[position]
+			val isChat = item is TdApi.Chat
+			val itemId = if (isChat) {
+				(item as TdApi.Chat).id
+			} else {
+				(item as TdApi.User).id.toLong()
+			}
 
-			TelegramUiHelper.setupPhoto(app, holder.icon, chat.photo?.small?.local?.path, placeholderId, false)
-			holder.title?.text = chat.title
+			val placeholderId = if (isChat && telegramHelper.isGroup((item as TdApi.Chat))) R.drawable.img_group_picture else R.drawable.img_user_picture
 
-			if (telegramHelper.isGroup(chat)) {
+			val photoPath = when (item) {
+				is TdApi.Chat -> item.photo?.small?.local?.path
+				is TdApi.User -> item.profilePhoto?.small?.local?.path
+				else -> null
+			}
+
+			TelegramUiHelper.setupPhoto(app, holder.icon, photoPath, placeholderId, false)
+
+			val title = when (item) {
+				is TdApi.Chat -> item.title
+				is TdApi.User -> TelegramUiHelper.getUserName(item)
+				else -> null
+			}
+
+			holder.title?.text = title
+
+			if (isChat && telegramHelper.isGroup((item as TdApi.Chat))) {
 				holder.locationViewContainer?.visibility = View.GONE
 				holder.description?.visibility = View.VISIBLE
 				holder.description?.text = getString(R.string.shared_string_group)
 			} else {
-				val message = telegramHelper.getChatMessages(chat.id).firstOrNull()
+				val message = telegramHelper.getChatMessages(itemId).firstOrNull()
 				val content = message?.content
 				if (message != null && content is TdApi.MessageLocation && (location != null && content.location != null)) {
-					val lastUpdated = telegramHelper.getLastUpdatedTime(message)
+					val lastUpdated = OsmandLocationUtils.getLastUpdatedTime(message)
 					holder.description?.visibility = View.VISIBLE
 					holder.description?.text = OsmandFormatter.getListItemLiveTimeDescr(app, lastUpdated)
 
@@ -301,15 +351,19 @@ class SetTimeDialogFragment : BaseDialogFragment(), TelegramLocationListener, Te
 
 			holder.textInArea?.apply {
 				visibility = View.VISIBLE
-				chatLivePeriods[chat.id]?.also { text = formatLivePeriod(it) }
+				if (isChat) {
+					chatLivePeriods[itemId]?.also { text = formatLivePeriod(it) }
+				} else {
+					userLivePeriods[itemId]?.also { text = formatLivePeriod(it) }
+				}
 			}
 			holder.bottomShadow?.visibility = View.GONE
 			holder.itemView.setOnClickListener {
-				selectDuration(chat.id)
+				selectDuration(itemId, isChat)
 			}
 		}
 
-		override fun getItemCount() = chats.size
+		override fun getItemCount() = items.size
 
 		inner class ChatViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
 			val icon: ImageView? = view.findViewById(R.id.icon)
@@ -329,18 +383,31 @@ class SetTimeDialogFragment : BaseDialogFragment(), TelegramLocationListener, Te
 
 		private const val TAG = "SetTimeDialogFragment"
 		private const val CHATS_KEY = "chats_key"
+		private const val USERS_KEY = "users_key"
 		private const val DEFAULT_VISIBLE_TIME_SECONDS = 60 * 60L // 1 hour
 		private const val NO_VALUE = -1L
 
-		fun showInstance(fm: FragmentManager, chatIds: Set<Long>, target: Fragment): Boolean {
+		fun showInstance(fm: FragmentManager, chatIds: Set<Long>, usersIds: Set<Long>, target: Fragment): Boolean {
 			return try {
 				val chats = mutableListOf<Long>()
 				for (id in chatIds) {
 					chats.add(id)
 					chats.add(DEFAULT_VISIBLE_TIME_SECONDS)
 				}
+				val users = mutableListOf<Long>()
+				for (id in usersIds) {
+					users.add(id)
+					users.add(DEFAULT_VISIBLE_TIME_SECONDS)
+				}
 				SetTimeDialogFragment().apply {
-					arguments = Bundle().apply { putLongArray(CHATS_KEY, chats.toLongArray()) }
+					arguments = Bundle().apply {
+						if (chats.isNotEmpty()) {
+							putLongArray(CHATS_KEY, chats.toLongArray())
+						}
+						if (users.isNotEmpty()) {
+							putLongArray(USERS_KEY, users.toLongArray())
+						}
+					}
 					setTargetFragment(target, LOCATION_SHARED_REQUEST_CODE)
 					show(fm, TAG)
 				}
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt
index 1d749d87fb..44db164777 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt
@@ -1,11 +1,14 @@
 package net.osmand.telegram.ui
 
 import android.content.Intent
+import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
 import android.support.v4.app.FragmentManager
 import android.support.v7.widget.ListPopupWindow
 import android.support.v7.widget.Toolbar
+import android.text.SpannableStringBuilder
+import android.text.style.ForegroundColorSpan
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -14,13 +17,20 @@ import android.widget.*
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramSettings
 import net.osmand.telegram.TelegramSettings.DurationPref
+import net.osmand.telegram.helpers.TelegramHelper.Companion.OSMAND_BOT_USERNAME
 import net.osmand.telegram.helpers.TelegramUiHelper
 import net.osmand.telegram.utils.AndroidUtils
+import net.osmand.telegram.utils.OsmandApiUtils
 import org.drinkless.td.libcore.telegram.TdApi
+import org.json.JSONObject
 
 class SettingsDialogFragment : BaseDialogFragment() {
 
 	private val uiUtils get() = app.uiUtils
+	private lateinit var shareAsContainer: ViewGroup
+	private lateinit var shareAsDescription: TextView
+
+	private var shareAsDescriptionHidden = true
 
 	override fun onCreateView(
 		inflater: LayoutInflater,
@@ -65,6 +75,36 @@ class SettingsDialogFragment : BaseDialogFragment() {
 			}
 		}
 
+		shareAsDescription = mainView.findViewById<TextView>(R.id.share_as_description).apply {
+			text = getText(R.string.share_location_as_description)
+			setOnClickListener {
+				updateShareAsDescription()
+			}
+		}
+
+		shareAsContainer = mainView.findViewById(R.id.share_as_container)
+		val user = telegramHelper.getCurrentUser()
+		if (user != null) {
+			addItemToContainer(inflater, shareAsContainer, user.id.toString(),  TelegramUiHelper.getUserName(user))
+		}
+		settings.getShareDevices().forEach {
+			addItemToContainer(inflater, shareAsContainer, it.externalId, it.deviceName)
+		}
+
+		mainView.findViewById<TextView>(R.id.add_new_device_title)
+			.setTextColor(AndroidUtils.createPressedColorStateList(app, true, R.color.ctrl_active_light, R.color.ctrl_light))
+
+		mainView.findViewById<ImageView>(R.id.add_new_device_icon)
+			.setImageDrawable(getAddNewDeviceIcon())
+
+		mainView.findViewById<LinearLayout>(R.id.add_new_device_btn).apply {
+			setOnClickListener {
+				fragmentManager?.also { fm ->
+					AddNewDeviceBottomSheet.showInstance(fm, this@SettingsDialogFragment)
+				}
+			}
+		}
+
 		container = mainView.findViewById(R.id.osmand_connect_container)
 		for (appConn in TelegramSettings.AppConnect.values()) {
 			val pack = appConn.appPackage
@@ -106,15 +146,6 @@ class SettingsDialogFragment : BaseDialogFragment() {
 		}
 		updateSelectedAppConn()
 
-		container = mainView.findViewById(R.id.share_as_container)
-		val user = telegramHelper.getCurrentUser()
-		if (user != null) {
-			addItemToContainer(inflater, container, user.id.toString(),  TelegramUiHelper.getUserName(user))
-		}
-		settings.shareDevicesIds.forEach {
-			addItemToContainer(inflater, container, it.key, it.value)
-		}
-
 		if (user != null) {
 			TelegramUiHelper.setupPhoto(
 				app,
@@ -151,6 +182,21 @@ class SettingsDialogFragment : BaseDialogFragment() {
 				logoutTelegram()
 				dismiss()
 			}
+			AddNewDeviceBottomSheet.NEW_DEVICE_REQUEST_CODE -> {
+				val user = app.telegramHelper.getCurrentUser()
+				if (user != null && data != null && data.hasExtra(AddNewDeviceBottomSheet.DEVICE_JSON)) {
+					val deviceJson = data.getStringExtra(AddNewDeviceBottomSheet.DEVICE_JSON)
+					val device = OsmandApiUtils.parseDeviceBot(JSONObject(deviceJson))
+					if (device != null) {
+						app.settings.addShareDevice(device)
+						val inflater = activity?.layoutInflater
+						if (inflater != null) {
+							addItemToContainer(inflater, shareAsContainer, device.externalId, device.deviceName)
+							Toast.makeText(app, getString(R.string.device_added_successfully, device.deviceName), Toast.LENGTH_SHORT).show()
+						}
+					}
+				}
+			}
 		}
 	}
 
@@ -167,7 +213,7 @@ class SettingsDialogFragment : BaseDialogFragment() {
 				isChecked = checked
 			}
 			setOnClickListener {
-				settings.currentSharingMode = tag
+				settings.updateCurrentSharingMode(tag)
 				updateSelectedSharingMode()
 			}
 			this.tag = tag
@@ -182,7 +228,11 @@ class SettingsDialogFragment : BaseDialogFragment() {
 			isModal = true
 			anchorView = valueView
 			setContentWidth(AndroidUtils.getPopupMenuWidth(ctx, menuList))
-			height = AndroidUtils.getPopupMenuHeight(ctx)
+			height = if (menuList.size < 6) {
+				ListPopupWindow.WRAP_CONTENT
+			} else {
+				AndroidUtils.getPopupMenuHeight(ctx)
+			}
 			setDropDownGravity(Gravity.END or Gravity.TOP)
 			setAdapter(ArrayAdapter(ctx, R.layout.popup_list_text_item, menuList))
 			setOnItemClickListener { _, _, position, _ ->
@@ -235,6 +285,46 @@ class SettingsDialogFragment : BaseDialogFragment() {
 		}
 	}
 
+	private fun updateShareAsDescription() {
+		if (shareAsDescriptionHidden) {
+			shareAsDescription.text = getFullShareAsDescriptionText()
+		} else {
+			shareAsDescription.text = getText(R.string.share_location_as_description)
+		}
+		shareAsDescriptionHidden = !shareAsDescriptionHidden
+	}
+
+	private fun getFullShareAsDescriptionText(): CharSequence {
+		val textHide = "${getString(R.string.shared_string_hide)}."
+		val spannableString = SpannableStringBuilder(getText(R.string.share_location_as_description))
+		val newSpannable = SpannableStringBuilder(getString(R.string.share_location_as_description_second_line, OSMAND_BOT_USERNAME, textHide))
+
+		spannableString.append("\n\n")
+
+		var startIndex = newSpannable.indexOf(OSMAND_BOT_USERNAME)
+		var endIndex = startIndex + OSMAND_BOT_USERNAME.length
+		newSpannable.setSpan(ForegroundColorSpan(app.uiUtils.getActiveColor()), startIndex, endIndex, 0)
+
+		startIndex = newSpannable.indexOf(textHide)
+		endIndex = startIndex + textHide.length
+		newSpannable.setSpan(ForegroundColorSpan(app.uiUtils.getActiveColor()), startIndex, endIndex, 0)
+
+		spannableString.append(newSpannable)
+
+		return spannableString
+	}
+
+	private fun getAddNewDeviceIcon(): Drawable? {
+		val normal = app.uiUtils.getActiveIcon(R.drawable.ic_action_add)
+		if (Build.VERSION.SDK_INT >= 21) {
+			val active = app.uiUtils.getIcon(R.drawable.ic_action_add, R.color.ctrl_light)
+			if (normal != null && active != null) {
+				return AndroidUtils.createPressedStateListDrawable(normal, active)
+			}
+		}
+		return normal
+	}
+
 	private fun logoutTelegram() {
 		val act = activity ?: return
 		(act as MainActivity).logoutTelegram()
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/SharingStatusBottomSheet.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/SharingStatusBottomSheet.kt
index 0708a2ff06..eaf2bc98b3 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/SharingStatusBottomSheet.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/SharingStatusBottomSheet.kt
@@ -55,16 +55,17 @@ class SharingStatusBottomSheet : DialogFragment() {
 				findViewById<TextView>(R.id.status_change_time).text = OsmandFormatter.getFormattedTime(sharingStatus.statusChangeTime, false)
 				findViewById<TextView>(R.id.last_location_line).text = sharingStatus.description
 
-				if (sharingStatusType != TelegramSettings.SharingStatusType.INITIALIZING
-					&& sharingStatusType != TelegramSettings.SharingStatusType.SENDING) {
-					val descriptionTime = when {
-						time > 0 -> OsmandFormatter.getFormattedTime(time, false)
-						sharingStatusType == TelegramSettings.SharingStatusType.NO_GPS -> getString(
-							R.string.not_found_yet
-						)
-						else -> getString(R.string.not_sent_yet)
+				if (sharingStatusType != TelegramSettings.SharingStatusType.INITIALIZING) {
+					if ((sharingStatusType == TelegramSettings.SharingStatusType.SENDING && time <= 0)) {
+						findViewById<TextView>(R.id.last_location_line_time).visibility = View.GONE
+					} else {
+						val descriptionTime = when {
+							time > 0 -> OsmandFormatter.getFormattedTime(time, false)
+							sharingStatusType == TelegramSettings.SharingStatusType.NO_GPS -> getString(R.string.not_found_yet)
+							else -> getString(R.string.not_sent_yet)
+						}
+						findViewById<TextView>(R.id.last_location_line_time).text = descriptionTime
 					}
-					findViewById<TextView>(R.id.last_location_line_time).text = descriptionTime
 				} else {
 					findViewById<TextView>(R.id.last_location_line_time).visibility = View.GONE
 				}
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/TimelineTabFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/TimelineTabFragment.kt
new file mode 100644
index 0000000000..721b885056
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/TimelineTabFragment.kt
@@ -0,0 +1,305 @@
+package net.osmand.telegram.ui
+
+import android.annotation.SuppressLint
+import android.app.DatePickerDialog
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import android.support.annotation.DrawableRes
+import android.support.v4.app.Fragment
+import android.support.v4.widget.SwipeRefreshLayout
+import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.Switch
+import android.widget.TextView
+import net.osmand.PlatformUtil
+import net.osmand.telegram.R
+import net.osmand.telegram.TelegramApplication
+import net.osmand.telegram.helpers.LocationMessages
+import net.osmand.telegram.helpers.TelegramUiHelper
+import net.osmand.telegram.helpers.TelegramUiHelper.ListItem
+import net.osmand.telegram.ui.TimelineTabFragment.LiveNowListAdapter.BaseViewHolder
+import net.osmand.telegram.utils.AndroidUtils
+import net.osmand.telegram.utils.OsmandFormatter
+import java.util.*
+
+
+class TimelineTabFragment : Fragment() {
+
+	private val log = PlatformUtil.getLog(TimelineTabFragment::class.java)
+
+	private val app: TelegramApplication
+		get() = activity?.application as TelegramApplication
+
+	private val telegramHelper get() = app.telegramHelper
+	private val settings get() = app.settings
+
+	private lateinit var adapter: LiveNowListAdapter
+
+	private lateinit var dateBtn: TextView
+	private lateinit var mainView: View
+
+	private var start = 0L
+	private var end = 0L
+
+	private var updateEnable: Boolean = false
+
+	override fun onCreateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+		savedInstanceState: Bundle?
+	): View? {
+		mainView = inflater.inflate(R.layout.fragment_timeline_tab, container, false)
+		val appBarLayout = mainView.findViewById<View>(R.id.app_bar_layout)
+
+		val calendar = Calendar.getInstance()
+		start = getStartOfDay(calendar)
+		end = getEndOfDay(calendar)
+
+		AndroidUtils.addStatusBarPadding19v(context!!, appBarLayout)
+		adapter = LiveNowListAdapter()
+		mainView.findViewById<RecyclerView>(R.id.recycler_view).apply {
+			layoutManager = LinearLayoutManager(context)
+			adapter = this@TimelineTabFragment.adapter
+		}
+
+		val switcher = mainView.findViewById<Switch>(R.id.monitoring_switcher)
+		val monitoringTv = mainView.findViewById<TextView>(R.id.monitoring_title)
+		switcher.isChecked = settings.monitoringEnabled
+		monitoringTv.setText(if (settings.monitoringEnabled) R.string.monitoring_is_enabled else R.string.monitoring_is_disabled)
+
+		mainView.findViewById<View>(R.id.monitoring_container).setOnClickListener {
+			settings.monitoringEnabled = !settings.monitoringEnabled
+			app.showLocationHelper.changeUpdatesType()
+			switcher.isChecked = settings.monitoringEnabled
+			monitoringTv.setText(if (settings.monitoringEnabled) R.string.monitoring_is_enabled else R.string.monitoring_is_disabled)
+		}
+
+		dateBtn = mainView.findViewById<TextView>(R.id.date_btn).apply {
+			setOnClickListener {
+				selectDate()
+			}
+			setCompoundDrawablesWithIntrinsicBounds(getPressedStateIcon(R.drawable.ic_action_date_start), null, null, null)
+			setTextColor(AndroidUtils.createPressedColorStateList(app, true, R.color.ctrl_active_light, R.color.ctrl_light))
+			text = OsmandFormatter.getFormattedDate(start / 1000)
+		}
+
+		mainView.findViewById<SwipeRefreshLayout>(R.id.swipe_refresh).apply {
+			setOnRefreshListener {
+				updateList()
+				isRefreshing = false
+			}
+			setColorSchemeColors(Color.RED, Color.GREEN, Color.BLUE, Color.CYAN)
+		}
+		updateList()
+
+		return mainView
+	}
+
+	override fun onResume() {
+		super.onResume()
+		updateEnable = true
+		startHandler()
+	}
+
+	override fun onPause() {
+		super.onPause()
+		updateEnable = false
+	}
+
+	private fun selectDate() {
+		val dateFromDialog =
+			DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
+				val calendar = Calendar.getInstance()
+				calendar.set(Calendar.YEAR, year)
+				calendar.set(Calendar.MONTH, monthOfYear)
+				calendar.set(Calendar.DAY_OF_MONTH, dayOfMonth)
+
+				start = getStartOfDay(calendar)
+				end = getEndOfDay(calendar)
+
+				updateList()
+				updateDateButton()
+			}
+		val startCalendar = Calendar.getInstance()
+		startCalendar.timeInMillis = start
+		DatePickerDialog(context, dateFromDialog,
+			startCalendar.get(Calendar.YEAR),
+			startCalendar.get(Calendar.MONTH),
+			startCalendar.get(Calendar.DAY_OF_MONTH)
+		).show()
+	}
+
+	private fun getStartOfDay(calendar: Calendar): Long {
+		calendar.set(Calendar.HOUR_OF_DAY, 0)
+		calendar.clear(Calendar.MINUTE)
+		calendar.clear(Calendar.SECOND)
+		calendar.clear(Calendar.MILLISECOND)
+		return calendar.timeInMillis
+	}
+
+	private fun getEndOfDay(calendar: Calendar): Long {
+		calendar.set(Calendar.HOUR_OF_DAY, 23)
+		calendar.set(Calendar.MINUTE, 59)
+		calendar.set(Calendar.SECOND, 59)
+		calendar.set(Calendar.MILLISECOND, 999)
+		return calendar.timeInMillis
+	}
+
+	private fun updateDateButton() {
+		dateBtn.text = OsmandFormatter.getFormattedDate(start / 1000)
+	}
+
+	private fun getPressedStateIcon(@DrawableRes iconId: Int): Drawable? {
+		val normal = app.uiUtils.getActiveIcon(iconId)
+		if (Build.VERSION.SDK_INT >= 21) {
+			val active = app.uiUtils.getIcon(iconId, R.color.ctrl_light)
+			if (normal != null && active != null) {
+				return AndroidUtils.createPressedStateListDrawable(normal, active)
+			}
+		}
+		return normal
+	}
+
+	private fun startHandler() {
+		val updateAdapter = Handler()
+		updateAdapter.postDelayed({
+			if (updateEnable) {
+				updateList()
+				startHandler()
+			}
+		}, ADAPTER_UPDATE_INTERVAL_MIL)
+	}
+
+	private fun updateList() {
+		val res = mutableListOf<ListItem>()
+		app.locationMessages.getIngoingUserLocations(start, end).forEach {
+			TelegramUiHelper.userLocationsToChatItem(telegramHelper, it)?.also { chatItem ->
+				res.add(chatItem)
+			}
+		}
+		adapter.items = sortAdapterItems(res)
+	}
+
+	private fun sortAdapterItems(list: MutableList<ListItem>): MutableList<ListItem> {
+		val currentUserId = telegramHelper.getCurrentUserId()
+		list.sortWith(java.util.Comparator { lhs, rhs ->
+			when (currentUserId) {
+				lhs.userId -> return@Comparator -1
+				rhs.userId -> return@Comparator 1
+				else -> return@Comparator lhs.name.compareTo(rhs.name)
+			}
+		})
+		return list
+	}
+
+	inner class LiveNowListAdapter : RecyclerView.Adapter<BaseViewHolder>() {
+
+		var items: List<ListItem> = emptyList()
+			set(value) {
+				field = value
+				notifyDataSetChanged()
+			}
+
+		override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
+			val inflater = LayoutInflater.from(parent.context)
+			return BaseViewHolder(inflater.inflate(R.layout.live_now_chat_card, parent, false))
+		}
+
+		@SuppressLint("SetTextI18n")
+		override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
+			val lastItem = position == itemCount - 1
+			val item = items[position]
+			val currentUserId = telegramHelper.getCurrentUserId()
+			TelegramUiHelper.setupPhoto(app, holder.icon, item.photoPath, R.drawable.img_user_picture_active, false)
+			holder.title?.text = item.name
+			holder.bottomShadow?.visibility = if (lastItem) View.VISIBLE else View.GONE
+			holder.lastTelegramUpdateTime?.visibility = View.GONE
+
+			if (item is TelegramUiHelper.LocationMessagesChatItem) {
+				val userLocations = item.userLocations
+				if (userLocations != null) {
+					val trackData = getDistanceAndCountedPoints(userLocations)
+					val distance = OsmandFormatter.getFormattedDistance(trackData.dist, app)
+					val groupDescrRowVisible = (!item.privateChat || item.chatWithBot) && item.userId != currentUserId
+					if (groupDescrRowVisible) {
+						holder.groupDescrContainer?.visibility = View.VISIBLE
+						holder.groupTitle?.text = item.getVisibleName()
+						TelegramUiHelper.setupPhoto(app, holder.groupImage, item.groupPhotoPath, item.placeholderId, false)
+					} else {
+						holder.groupDescrContainer?.visibility = View.GONE
+					}
+					holder.locationAndDescrContainer?.visibility = View.GONE
+					holder.distanceAndPointsContainer?.visibility = View.VISIBLE
+					holder.distanceImage?.setImageDrawable(app.uiUtils.getThemedIcon(R.drawable.ic_action_distance_16dp))
+					val point = if (groupDescrRowVisible) " • " else ""
+					holder.distanceAndPointsTitle?.text = "$distance (${getString(R.string.points_size, trackData.points)}) $point "
+					holder.userRow?.setOnClickListener {
+						childFragmentManager.also {
+							UserGpxInfoFragment.showInstance(it, item.userId, item.chatId, trackData.minTime, trackData.maxTime)
+						}
+					}
+				}
+
+				holder.imageButton?.visibility = View.GONE
+				holder.showOnMapRow?.visibility = View.GONE
+				holder.bottomDivider?.visibility = if (lastItem) View.GONE else View.VISIBLE
+				holder.topDivider?.visibility = if (position != 0) View.GONE else View.VISIBLE
+			}
+		}
+
+
+		private fun getDistanceAndCountedPoints(userLocations: LocationMessages.UserLocations): UITrackData {
+			val uiTrackData = UITrackData(0.0f, 0, 0, 0)
+
+			userLocations.getUniqueSegments().forEach {
+				if (uiTrackData.minTime == 0L) {
+					uiTrackData.minTime = it.minTime
+				}
+				uiTrackData.dist += it.distance.toFloat();
+				uiTrackData.points += it.points.size
+				uiTrackData.maxTime = it.maxTime
+			}
+			return uiTrackData
+		}
+
+		override fun getItemCount() = items.size
+
+		inner class BaseViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+			val icon: ImageView? = view.findViewById(R.id.icon)
+			val title: TextView? = view.findViewById(R.id.title)
+			val description: TextView? = view.findViewById(R.id.description)
+			val bottomShadow: View? = view.findViewById(R.id.bottom_shadow)
+			val lastTelegramUpdateTime: TextView? = view.findViewById(R.id.last_telegram_update_time)
+
+			val userRow: View? = view.findViewById(R.id.user_row)
+			val distanceAndPointsContainer: View? = view.findViewById(R.id.distance_and_points_container)
+			val locationAndDescrContainer: View? = view.findViewById(R.id.location_with_descr_container)
+			val distanceImage: ImageView? = view.findViewById(R.id.distance_icon)
+			val distanceAndPointsTitle: TextView? = view.findViewById(R.id.distance_and_points_text)
+			val groupDescrContainer: View? = view.findViewById(R.id.group_container)
+			val groupImage: ImageView? = view.findViewById(R.id.group_icon)
+			val groupTitle: TextView? = view.findViewById(R.id.group_title)
+			val imageButton: ImageView? = view.findViewById(R.id.image_button)
+			val showOnMapRow: View? = view.findViewById(R.id.show_on_map_row)
+			val topDivider: View? = view.findViewById(R.id.top_divider)
+			val bottomDivider: View? = view.findViewById(R.id.bottom_divider)
+		}
+	}
+
+	data class UITrackData (
+		var dist: Float,
+		var points: Int,
+		var minTime: Long,
+		var maxTime: Long
+	)
+	companion object {
+		private const val ADAPTER_UPDATE_INTERVAL_MIL = 15 * 1000L // 15 sec
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/UserGpxInfoFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/UserGpxInfoFragment.kt
new file mode 100644
index 0000000000..27c82e681c
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/UserGpxInfoFragment.kt
@@ -0,0 +1,397 @@
+package net.osmand.telegram.ui
+
+import android.app.DatePickerDialog
+import android.app.TimePickerDialog
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.os.Bundle
+import android.support.design.widget.Snackbar
+import android.support.v4.app.FragmentManager
+import android.util.DisplayMetrics
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import android.widget.Toast
+import net.osmand.PlatformUtil
+import net.osmand.aidl.gpx.AGpxBitmap
+import net.osmand.telegram.R
+import net.osmand.telegram.TelegramSettings
+import net.osmand.telegram.helpers.LocationMessages
+import net.osmand.telegram.helpers.OsmandAidlHelper
+import net.osmand.telegram.helpers.TelegramUiHelper
+import net.osmand.telegram.utils.*
+import net.osmand.util.Algorithms
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.*
+
+class UserGpxInfoFragment : BaseDialogFragment() {
+
+	private val log = PlatformUtil.getLog(UserGpxInfoFragment::class.java)
+
+	private val uiUtils get() = app.uiUtils
+
+	private var gpxFile = GPXUtilities.GPXFile()
+
+	private lateinit var mainView: View
+	private lateinit var dateStartBtn: TextView
+	private lateinit var timeStartBtn: TextView
+	private lateinit var dateEndBtn: TextView
+	private lateinit var timeEndBtn: TextView
+
+	private lateinit var avgElevationTv: TextView
+	private lateinit var avgSpeedTv: TextView
+	private lateinit var totalDistanceTv: TextView
+	private lateinit var timeSpanTv: TextView
+
+	private var startCalendar = Calendar.getInstance()
+	private var endCalendar = Calendar.getInstance()
+
+	private var locationMessages = emptyList<LocationMessages.LocationMessage>()
+
+	private var userId = -1
+	private var chatId = -1L
+
+	override fun onCreateView(
+		inflater: LayoutInflater,
+		parent: ViewGroup?,
+		savedInstanceState: Bundle?
+	): View {
+		mainView = inflater.inflate(R.layout.fragment_user_gpx_info, parent)
+		AndroidUtils.addStatusBarPadding19v(context!!, mainView)
+
+		readFromBundle(savedInstanceState ?: arguments)
+
+		val user = app.telegramHelper.getUser(userId)
+		if (user != null) {
+			mainView.findViewById<TextView>(R.id.title).text = TelegramUiHelper.getUserName(user)
+			TelegramUiHelper.setupPhoto(app, mainView.findViewById<ImageView>(R.id.user_icon),
+				telegramHelper.getUserPhotoPath(user), R.drawable.img_user_placeholder, false)
+		}
+		val openGpxListener = View.OnClickListener {
+			val gpx = gpxFile
+			if (gpx.path.isNotEmpty()) {
+				openGpx(gpx.path)
+			} else {
+				saveCurrentGpxToFile(object :
+					OsmandLocationUtils.SaveGpxListener {
+
+					override fun onSavingGpxFinish(path: String) {
+						openGpx(path)
+					}
+
+					override fun onSavingGpxError(warnings: List<String>?) {
+						Toast.makeText(app, warnings?.firstOrNull(), Toast.LENGTH_LONG).show()
+					}
+				})
+			}
+		}
+		val iconMap = mainView.findViewById<ImageView>(R.id.gpx_map)
+		app.osmandAidlHelper.setGpxBitmapCreatedListener(
+			object : OsmandAidlHelper.GpxBitmapCreatedListener {
+				override fun onGpxBitmapCreated(bitmap: AGpxBitmap) {
+					activity?.runOnUiThread {
+						iconMap.setImageDrawable(BitmapDrawable(app.resources, bitmap.bitmap))
+						iconMap.setOnClickListener(openGpxListener)
+					}
+				}
+			})
+
+		mainView.findViewById<ImageView>(R.id.back_button).apply {
+			setImageDrawable(uiUtils.getThemedIcon(R.drawable.ic_arrow_back))
+			setOnClickListener {
+				dismiss()
+			}
+		}
+
+		dateStartBtn = mainView.findViewById<TextView>(R.id.date_start_btn)
+		timeStartBtn = mainView.findViewById<TextView>(R.id.time_start_btn)
+		dateEndBtn = mainView.findViewById<TextView>(R.id.date_end_btn)
+		timeEndBtn = mainView.findViewById<TextView>(R.id.time_end_btn)
+
+		dateStartBtn.setOnClickListener { selectStartDate() }
+		timeStartBtn.setOnClickListener { selectStartTime() }
+		dateEndBtn.setOnClickListener { selectEndDate() }
+		timeEndBtn.setOnClickListener { selectEndTime() }
+
+		setupBtnTextColor(dateStartBtn)
+		setupBtnTextColor(timeStartBtn)
+		setupBtnTextColor(dateEndBtn)
+		setupBtnTextColor(timeEndBtn)
+
+		updateDateAndTimeButtons()
+
+		avgElevationTv = mainView.findViewById<TextView>(R.id.average_altitude_text)
+		avgSpeedTv = mainView.findViewById<TextView>(R.id.average_speed_text)
+		totalDistanceTv = mainView.findViewById<TextView>(R.id.distance_text)
+		timeSpanTv = mainView.findViewById<TextView>(R.id.duration_text)
+
+		mainView.findViewById<ImageView>(R.id.average_altitude_icon).apply {
+			setImageDrawable(uiUtils.getThemedIcon(R.drawable.ic_action_altitude_range))
+		}
+		mainView.findViewById<ImageView>(R.id.average_speed_icon).apply {
+			setImageDrawable(uiUtils.getThemedIcon(R.drawable.ic_action_speed_average))
+		}
+		mainView.findViewById<ImageView>(R.id.distance_icon).apply {
+			setImageDrawable(uiUtils.getThemedIcon(R.drawable.ic_action_sort_by_distance))
+		}
+		mainView.findViewById<ImageView>(R.id.duration_icon).apply {
+			setImageDrawable(uiUtils.getThemedIcon(R.drawable.ic_action_time_span))
+		}
+
+		updateGPXStatisticRow()
+
+		val imageRes = if (app.isOsmAndInstalled()) {
+			TelegramSettings.AppConnect.getIconId(settings.appToConnectPackage)
+		} else {
+			R.drawable.ic_logo_osmand_free
+		}
+		mainView.findViewById<ImageView>(R.id.open_in_osmand_icon).setImageResource(imageRes)
+		mainView.findViewById<LinearLayout>(R.id.open_in_osmand_btn).setOnClickListener(openGpxListener)
+
+		mainView.findViewById<TextView>(R.id.open_in_osmand_title).setTextColor(AndroidUtils.createPressedColorStateList(app, true, R.color.primary_text_light, R.color.ctrl_light))
+		mainView.findViewById<TextView>(R.id.share_gpx_title).setTextColor(AndroidUtils.createPressedColorStateList(app, true, R.color.primary_text_light, R.color.ctrl_light))
+
+		mainView.findViewById<ImageView>(R.id.share_gpx_icon).setImageDrawable(getShareIcon())
+		mainView.findViewById<LinearLayout>(R.id.share_gpx_btn).apply {
+			setOnClickListener {
+				val gpx = gpxFile
+				if (gpx.path.isNotEmpty()) {
+					(activity as MainActivity).shareGpx(gpx.path)
+				} else {
+					saveCurrentGpxToFile(object :
+						OsmandLocationUtils.SaveGpxListener {
+						override fun onSavingGpxFinish(path: String) {
+							(activity as MainActivity).shareGpx(path)
+						}
+
+						override fun onSavingGpxError(warnings: List<String>?) {
+							Toast.makeText(app, warnings?.firstOrNull(), Toast.LENGTH_LONG).show()
+						}
+					})
+				}
+			}
+		}
+
+		updateGpxInfo()
+
+		return mainView
+	}
+
+	override fun onSaveInstanceState(outState: Bundle) {
+		super.onSaveInstanceState(outState)
+		outState.putLong(START_KEY, startCalendar.timeInMillis)
+		outState.putLong(END_KEY, endCalendar.timeInMillis)
+	}
+
+	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+		super.onActivityResult(requestCode, resultCode, data)
+		when (requestCode) {
+			ChooseOsmAndBottomSheet.OSMAND_CHOSEN_REQUEST_CODE -> updateGPXMap()
+		}
+	}
+
+	private fun canOsmandCreateBitmap(): Boolean {
+		val version = AndroidUtils.getAppVersionCode(app, app.settings.appToConnectPackage)
+		return version >= MIN_OSMAND_BITMAP_VERSION_CODE
+	}
+
+	private fun openGpx(path: String) {
+		val fileUri = AndroidUtils.getUriForFile(app, File(path))
+		val openGpxIntent = Intent(Intent.ACTION_VIEW)
+		openGpxIntent.setDataAndType(fileUri, "application/gpx+xml")
+		openGpxIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+		val resolved = activity?.packageManager?.resolveActivity(openGpxIntent, PackageManager.MATCH_DEFAULT_ONLY)
+		if (resolved != null) {
+			startActivity(openGpxIntent)
+		}
+	}
+
+	private fun saveCurrentGpxToFile(listener: OsmandLocationUtils.SaveGpxListener) {
+		if (!gpxFile.isEmpty) {
+			val file = File(app.getExternalFilesDir(null), TRACKS_DIR)
+			OsmandLocationUtils.saveGpx(app, listener, file, gpxFile)
+		}
+	}
+
+	private fun readFromBundle(bundle: Bundle?) {
+		bundle?.also {
+			userId = it.getInt(USER_ID_KEY)
+			chatId = it.getLong(CHAT_ID_KEY)
+			startCalendar.timeInMillis = it.getLong(START_KEY)
+			endCalendar.timeInMillis = it.getLong(END_KEY)
+		}
+	}
+
+	private fun setupBtnTextColor(textView: TextView) {
+		textView.setTextColor(AndroidUtils.createPressedColorStateList(app, true, R.color.ctrl_active_light, R.color.ctrl_light))
+	}
+
+	private fun getShareIcon(): Drawable? {
+		val normal = app.uiUtils.getActiveIcon(R.drawable.ic_action_share)
+		if (Build.VERSION.SDK_INT >= 21) {
+			val active = app.uiUtils.getIcon(R.drawable.ic_action_share, R.color.ctrl_light)
+			if (normal != null && active != null) {
+				return AndroidUtils.createPressedStateListDrawable(normal, active)
+			}
+		}
+		return normal
+	}
+
+	private fun updateGpxInfo() {
+		checkTime()
+		locationMessages = app.locationMessages.getMessagesForUserInChat(userId, chatId, startCalendar.timeInMillis, endCalendar.timeInMillis)
+
+		gpxFile = OsmandLocationUtils.convertLocationMessagesToGpxFiles(locationMessages).firstOrNull()?:GPXUtilities.GPXFile()
+		updateGPXStatisticRow()
+		updateDateAndTimeButtons()
+		updateGPXMap()
+	}
+
+	private fun checkTime() {
+		if (startCalendar.timeInMillis > endCalendar.timeInMillis) {
+			val time = startCalendar.timeInMillis
+			startCalendar.timeInMillis = endCalendar.timeInMillis
+			endCalendar.timeInMillis = time
+		}
+	}
+
+	private fun updateDateAndTimeButtons() {
+		dateStartBtn.text = SimpleDateFormat("dd MMM", Locale.getDefault()).format(startCalendar.timeInMillis)
+		dateEndBtn.text = SimpleDateFormat("dd MMM", Locale.getDefault()).format(endCalendar.timeInMillis)
+
+		timeStartBtn.text = SimpleDateFormat("HH:mm", Locale.getDefault()).format(startCalendar.timeInMillis)
+		timeEndBtn.text = SimpleDateFormat("HH:mm", Locale.getDefault()).format(endCalendar.timeInMillis)
+	}
+
+	private fun updateGPXStatisticRow() {
+		val analysis: GPXUtilities.GPXTrackAnalysis = gpxFile.getAnalysis(0)
+
+		avgElevationTv.text = if (analysis.avgElevation != 0.0) OsmandFormatter.getFormattedAlt(analysis.avgElevation, app) else "-"
+		avgSpeedTv.text = if (analysis.isSpeedSpecified) OsmandFormatter.getFormattedSpeed(analysis.avgSpeed, app) else "-"
+		totalDistanceTv.text = if (analysis.totalDistance != 0.0f) OsmandFormatter.getFormattedDistance(analysis.totalDistance, app)  else  "-"
+		timeSpanTv.text = if (analysis.timeSpan != 0L)  Algorithms.formatDuration((analysis.timeSpan / 1000).toInt(), true) else  "-"
+	}
+
+	private fun updateGPXMap() {
+		if (!app.isAnyOsmAndInstalled()) {
+			activity?.let {
+				MainActivity.OsmandMissingDialogFragment().show(it.supportFragmentManager, null)
+			}
+		} else if (!app.isOsmAndChosen() || (app.isOsmAndChosen() && !app.isOsmAndInstalled())) {
+			fragmentManager?.also { ChooseOsmAndBottomSheet.showInstance(it, this) }
+		} else if (!canOsmandCreateBitmap()) {
+			 val snackbar = Snackbar.make(mainView, R.string.please_update_osmand, Snackbar.LENGTH_LONG).setAction(R.string.shared_string_update) {
+					val packageName = if (app.settings.appToConnectPackage == OsmandAidlHelper.OSMAND_NIGHTLY_PACKAGE_NAME)
+							OsmandAidlHelper.OSMAND_FREE_PACKAGE_NAME else app.settings.appToConnectPackage
+					startActivity(AndroidUtils.getPlayMarketIntent(app, packageName))
+				}
+			AndroidUtils.setSnackbarTextColor(snackbar, R.color.ctrl_active_dark)
+			snackbar.show()
+		} else {
+			saveCurrentGpxToFile(object :
+				OsmandLocationUtils.SaveGpxListener {
+				override fun onSavingGpxFinish(path: String) {
+					val mgr = activity?.getSystemService(Context.WINDOW_SERVICE)
+					if (mgr != null) {
+						val dm = DisplayMetrics()
+						(mgr as WindowManager).defaultDisplay.getMetrics(dm)
+						val widthPixels = dm.widthPixels - (2 * app.resources.getDimensionPixelSize(R.dimen.content_padding_standard))
+						val heightPixels = AndroidUtils.dpToPx(app, 152f)
+						val gpxUri = AndroidUtils.getUriForFile(app, File(path))
+						app.osmandAidlHelper.execOsmandApi {
+							app.osmandAidlHelper.getBitmapForGpx(gpxUri, dm.density, widthPixels, heightPixels, GPX_TRACK_COLOR)
+						}
+					}
+				}
+
+				override fun onSavingGpxError(warnings: List<String>?) {
+					log.debug("onSavingGpxError ${warnings?.firstOrNull()}")
+				}
+			})
+		}
+	}
+
+	private fun selectStartDate() {
+		val dateFromDialog =
+			DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
+				startCalendar.set(Calendar.YEAR, year)
+				startCalendar.set(Calendar.MONTH, monthOfYear)
+				startCalendar.set(Calendar.DAY_OF_MONTH, dayOfMonth)
+				updateGpxInfo()
+			}
+		DatePickerDialog(context, dateFromDialog,
+			startCalendar.get(Calendar.YEAR),
+			startCalendar.get(Calendar.MONTH),
+			startCalendar.get(Calendar.DAY_OF_MONTH)).show()
+	}
+
+	private fun selectStartTime() {
+		TimePickerDialog(context,
+			TimePickerDialog.OnTimeSetListener { _, hours, minutes ->
+				startCalendar.set(Calendar.HOUR_OF_DAY, hours)
+				startCalendar.set(Calendar.MINUTE, minutes)
+				updateGpxInfo()
+			}, 0, 0, true).show()
+	}
+
+	private fun selectEndDate() {
+		val dateFromDialog =
+			DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
+				endCalendar.set(Calendar.YEAR, year)
+				endCalendar.set(Calendar.MONTH, monthOfYear)
+				endCalendar.set(Calendar.DAY_OF_MONTH, dayOfMonth)
+				updateGpxInfo()
+			}
+		DatePickerDialog(context, dateFromDialog,
+			endCalendar.get(Calendar.YEAR),
+			endCalendar.get(Calendar.MONTH),
+			endCalendar.get(Calendar.DAY_OF_MONTH)).show()
+	}
+
+	private fun selectEndTime() {
+		TimePickerDialog(context,
+			TimePickerDialog.OnTimeSetListener { _, hours, minutes ->
+				endCalendar.set(Calendar.HOUR_OF_DAY, hours)
+				endCalendar.set(Calendar.MINUTE, minutes)
+				updateGpxInfo()
+			}, 0, 0, true).show()
+	}
+
+	companion object {
+
+		private const val TAG = "UserGpxInfoFragment"
+		private const val START_KEY = "start_key"
+		private const val END_KEY = "end_key"
+		private const val USER_ID_KEY = "user_id_key"
+		private const val CHAT_ID_KEY = "chat_id_key"
+
+		private const val GPX_TRACK_COLOR = -65536
+		private	const val MIN_OSMAND_BITMAP_VERSION_CODE = 330
+
+		fun showInstance(fm: FragmentManager,userId:Int,chatId:Long, start: Long, end: Long): Boolean {
+			return try {
+				val fragment = UserGpxInfoFragment().apply {
+					arguments = Bundle().apply {
+						putInt(USER_ID_KEY, userId)
+						putLong(CHAT_ID_KEY, chatId)
+						putLong(START_KEY, start)
+						putLong(END_KEY, end)
+					}
+				}
+				fragment.show(fm, TAG)
+				true
+			} catch (e: RuntimeException) {
+				false
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidNetworkUtils.kt b/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidNetworkUtils.kt
index 928ccc4905..3b5f99a974 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidNetworkUtils.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidNetworkUtils.kt
@@ -2,8 +2,14 @@ package net.osmand.telegram.utils
 
 import android.os.AsyncTask
 import net.osmand.PlatformUtil
-import java.io.*
-import java.net.*
+import net.osmand.telegram.TelegramApplication
+import java.io.BufferedOutputStream
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStreamReader
+import java.net.HttpURLConnection
+import java.net.MalformedURLException
+import java.net.URL
 
 
 object AndroidNetworkUtils {
@@ -11,21 +17,34 @@ object AndroidNetworkUtils {
 	private val log = PlatformUtil.getLog(AndroidNetworkUtils::class.java)
 
 	interface OnRequestResultListener {
-		fun onResult(result: String)
+		fun onResult(result: String?)
 	}
 
-	fun sendRequestAsync(urlText: String, listener: OnRequestResultListener?) {
-		SendRequestTask(urlText, listener).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
+	fun sendRequestAsync(
+		app: TelegramApplication,
+		urlText: String,
+		json: String?,
+		userOperation: String,
+		toastAllowed: Boolean,
+		post: Boolean,
+		listener: OnRequestResultListener?
+	) {
+		SendRequestTask(app, urlText, json, userOperation, toastAllowed, post, listener).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
 	}
 
 	private class SendRequestTask(
-		private val urlText: String,
+		private val app: TelegramApplication,
+		private val url: String,
+		private val json: String?,
+		private val userOperation: String,
+		private val toastAllowed: Boolean,
+		private val post: Boolean,
 		private val listener: OnRequestResultListener?
 	) : AsyncTask<Void, Void, String?>() {
 
 		override fun doInBackground(vararg params: Void): String? {
 			return try {
-				sendRequest(urlText)
+				sendRequest(app, url, json, userOperation, toastAllowed, post)
 			} catch (e: Exception) {
 				log.error(e.message, e)
 				null
@@ -33,47 +52,99 @@ object AndroidNetworkUtils {
 		}
 
 		override fun onPostExecute(response: String?) {
-			if (response != null) {
-				listener?.onResult(response)
-			}
+			listener?.onResult(response)
 		}
 	}
 
-	fun sendRequest(urlText: String): String? {
+	fun sendRequest(
+		app: TelegramApplication,
+		url: String,
+		jsonBody: String?,
+		userOperation: String,
+		toastAllowed: Boolean,
+		post: Boolean
+	): String? {
+		var connection: HttpURLConnection? = null
 		try {
-			log.info("GET : $urlText")
-			val conn = getHttpURLConnection(urlText)
-			conn.doInput = true
-			conn.doOutput = false
-			conn.requestMethod = "GET"
-			conn.setRequestProperty("User-Agent", "OsmAnd Sharing")
-			log.info("Response code and message : " + conn.responseCode + " " + conn.responseMessage)
-			if (conn.responseCode != 200) {
-				return conn.responseMessage
+			connection = getHttpURLConnection(url)
+			connection.setRequestProperty("Accept-Charset", "UTF-8")
+			connection.setRequestProperty("User-Agent", app.packageName)
+			connection.connectTimeout = 15000
+			if (jsonBody != null && post) {
+				connection.doInput = true
+				connection.doOutput = true
+				connection.useCaches = false
+				connection.requestMethod = "POST"
+
+				connection.setRequestProperty("Accept", "application/json")
+				connection.setRequestProperty("Content-Type", "application/json")
+				connection.setRequestProperty("Content-Length", jsonBody.toByteArray(charset("UTF-8")).size.toString())
+
+				connection.setFixedLengthStreamingMode(jsonBody.toByteArray(charset("UTF-8")).size)
+
+				val output = BufferedOutputStream(connection.outputStream)
+
+				output.write(jsonBody.toByteArray(charset("UTF-8")))
+				output.flush()
+				output.close()
+
+			} else {
+				connection.requestMethod = "GET"
+				connection.connect()
 			}
-			val inputStream = conn.inputStream
-			val responseBody = StringBuilder()
-			responseBody.setLength(0)
-			if (inputStream != null) {
-				val bufferedInput = BufferedReader(InputStreamReader(inputStream, "UTF-8"))
-				var s = bufferedInput.readLine()
-				var first = true
-				while (s != null) {
-					if (first) {
-						first = false
-					} else {
-						responseBody.append("\n")
-					}
-					responseBody.append(s)
-					s = bufferedInput.readLine()
+
+			if (connection.responseCode != HttpURLConnection.HTTP_OK) {
+				if (toastAllowed) {
+					val msg = (userOperation + " " + "Failed: " + connection.responseMessage)
+					log.error(msg)
 				}
-				inputStream.close()
+			} else {
+				val responseBody = StringBuilder()
+				responseBody.setLength(0)
+				val i = connection.inputStream
+				if (i != null) {
+					val input = BufferedReader(InputStreamReader(i, "UTF-8"), 256)
+					var s: String? = input.readLine()
+					var f = true
+					while (s != null) {
+						if (!f) {
+							responseBody.append("\n")
+						} else {
+							f = false
+						}
+						responseBody.append(s)
+						s = input.readLine()
+					}
+					try {
+						input.close()
+						i.close()
+					} catch (e: Exception) {
+						// ignore exception
+					}
+
+				}
+				return responseBody.toString()
+			}
+		} catch (e: NullPointerException) {
+			if (toastAllowed) {
+				val msg = (userOperation + " " + "Failed - $e" + ": " + connection?.responseMessage)
+				log.error(msg)
+			}
+		} catch (e: MalformedURLException) {
+			if (toastAllowed) {
+				val msg = (userOperation + " " + "Failed - $e" + ": " + connection?.responseMessage)
+				log.error(msg)
 			}
-			return responseBody.toString()
 		} catch (e: IOException) {
-			log.error(e.message, e)
-			return e.message
+			if (toastAllowed) {
+				val msg = (userOperation + " " + "Failed - $e" + ": " + connection?.responseMessage)
+				log.error(msg)
+			}
+		} finally {
+			connection?.disconnect()
 		}
+
+		return null
 	}
 
 	@Throws(MalformedURLException::class, IOException::class)
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt b/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
index a205a55c55..858278976a 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
@@ -6,22 +6,29 @@ import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.graphics.Color
 import android.graphics.Paint
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.StateListDrawable
 import android.net.Uri
 import android.os.Build
 import android.support.annotation.AttrRes
 import android.support.annotation.ColorInt
+import android.support.annotation.ColorRes
+import android.support.design.widget.Snackbar
 import android.support.v4.app.ActivityCompat
 import android.support.v4.app.DialogFragment
 import android.support.v4.app.FragmentManager
+import android.support.v4.content.ContextCompat
 import android.support.v4.content.FileProvider
 import android.util.TypedValue
 import android.util.TypedValue.COMPLEX_UNIT_DIP
 import android.view.View
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
+import android.widget.TextView
 import net.osmand.telegram.R
 import java.io.File
 
@@ -131,6 +138,52 @@ object AndroidUtils {
 		return ctx.resources.getDimensionPixelSize(R.dimen.list_popup_window_height)
 	}
 
+	fun setSnackbarTextColor(snackbar: Snackbar, @ColorRes colorId: Int) {
+		val view = snackbar.view
+		val tv = view.findViewById(android.support.design.R.id.snackbar_action) as TextView
+		tv.setTextColor(ContextCompat.getColor(view.context, colorId))
+	}
+
+	fun createPressedColorStateList(
+		ctx: Context, light: Boolean,
+		@ColorRes lightNormal: Int, @ColorRes lightPressed: Int,
+		@ColorRes darkNormal: Int = 0, @ColorRes darkPressed: Int = 0
+	): ColorStateList {
+		return createColorStateList(
+			ctx, light, android.R.attr.state_pressed,
+			lightNormal, lightPressed, darkNormal, darkPressed
+		)
+	}
+
+	fun createColorStateList(
+		ctx: Context, light: Boolean, state: Int,
+		@ColorRes lightNormal: Int, @ColorRes lightState: Int,
+		@ColorRes darkNormal: Int, @ColorRes darkState: Int
+	): ColorStateList {
+		return ColorStateList(
+			arrayOf(intArrayOf(state), intArrayOf()),
+			intArrayOf(
+				ContextCompat.getColor(ctx, if (light) lightState else darkState),
+				ContextCompat.getColor(ctx, if (light) lightNormal else darkNormal)
+			)
+		)
+	}
+
+	fun createPressedStateListDrawable(normal: Drawable, pressed: Drawable): StateListDrawable {
+		return createStateListDrawable(normal, pressed, android.R.attr.state_pressed)
+	}
+
+	fun createStateListDrawable(
+		normal: Drawable,
+		stateDrawable: Drawable,
+		state: Int
+	): StateListDrawable {
+		val res = StateListDrawable()
+		res.addState(intArrayOf(state), stateDrawable)
+		res.addState(intArrayOf(), normal)
+		return res
+	}
+
 	@ColorInt
 	fun getAttrColor(ctx: Context, @AttrRes attrId: Int, @ColorInt defaultColor: Int = 0): Int {
 		val ta = ctx.theme.obtainStyledAttributes(intArrayOf(attrId))
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/utils/GPXUtilities.java b/OsmAnd-telegram/src/net/osmand/telegram/utils/GPXUtilities.java
new file mode 100644
index 0000000000..b27293c40b
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/telegram/utils/GPXUtilities.java
@@ -0,0 +1,1808 @@
+package net.osmand.telegram.utils;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.support.annotation.ColorInt;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+
+import net.osmand.Location;
+import net.osmand.PlatformUtil;
+import net.osmand.data.QuadRect;
+import net.osmand.data.RotatedTileBox;
+import net.osmand.telegram.TelegramApplication;
+import net.osmand.util.Algorithms;
+
+import org.apache.commons.logging.Log;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.Stack;
+import java.util.TimeZone;
+
+// copy from net.osmand.plus.GPXUtilities and changes done to WptPt and GPXFile (userId,chatId)
+
+public class GPXUtilities {
+	public final static Log log = PlatformUtil.getLog(GPXUtilities.class);
+
+	private final static String GPX_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'"; //$NON-NLS-1$
+	private final static String GPX_TIME_FORMAT_MILLIS = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; //$NON-NLS-1$
+
+	private final static NumberFormat latLonFormat = new DecimalFormat("0.00#####", new DecimalFormatSymbols(
+			new Locale("EN", "US")));
+	private final static NumberFormat decimalFormat = new DecimalFormat("#.###", new DecimalFormatSymbols(
+			new Locale("EN", "US")));
+
+	public static class GPXExtensions {
+		Map<String, String> extensions = null;
+
+		public Map<String, String> getExtensionsToRead() {
+			if (extensions == null) {
+				return Collections.emptyMap();
+			}
+			return extensions;
+		}
+
+		@ColorInt
+		public int getColor(@ColorInt int defColor) {
+			String clrValue = null;
+			if (extensions != null) {
+				clrValue = extensions.get("color");
+				if (clrValue == null) {
+					clrValue = extensions.get("colour");
+				}
+				if (clrValue == null) {
+					clrValue = extensions.get("displaycolor");
+				}
+			}
+			if (clrValue != null && clrValue.length() > 0) {
+				try {
+					return Color.parseColor(clrValue.toUpperCase());
+				} catch (IllegalArgumentException e) {
+					e.printStackTrace();
+				}
+			}
+			return defColor;
+		}
+
+		public void setColor(int color) {
+			getExtensionsToWrite().put("color", Algorithms.colorToString(color));
+		}
+
+		public void removeColor() {
+			getExtensionsToWrite().remove("color");
+		}
+
+		public Map<String, String> getExtensionsToWrite() {
+			if (extensions == null) {
+				extensions = new LinkedHashMap<>();
+			}
+			return extensions;
+		}
+
+	}
+
+	public static class Elevation {
+		public float distance;
+		public int time;
+		public float elevation;
+	}
+
+	public static class Speed {
+		public float distance;
+		public int time;
+		public float speed;
+	}
+
+	public static class WptPt extends GPXExtensions implements LocationPoint {
+		public boolean firstPoint = false;
+		public boolean lastPoint = false;
+		public int userId;
+		public long chatId;
+		public double lat;
+		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;
+		public String comment = null;
+		// by default
+		public long time = 0;
+		public double ele = Double.NaN;
+		public double speed = 0;
+		public double hdop = Double.NaN;
+		public boolean deleted = false;
+		public int colourARGB = 0;                    // point colour (used for altitude/speed colouring)
+		public double distance = 0.0;                // cumulative distance, if in a track
+
+		public WptPt() {
+		}
+
+		public WptPt(WptPt wptPt) {
+			this.lat = wptPt.lat;
+			this.lon = wptPt.lon;
+			this.name = wptPt.name;
+			this.link = wptPt.link;
+
+			this.category = wptPt.category;
+			this.desc = wptPt.desc;
+			this.comment = wptPt.comment;
+
+			this.time = wptPt.time;
+			this.ele = wptPt.ele;
+			this.speed = wptPt.speed;
+			this.hdop = wptPt.hdop;
+			this.deleted = wptPt.deleted;
+			this.colourARGB = wptPt.colourARGB;
+			this.distance = wptPt.distance;
+		}
+
+		public void setDistance(double dist) {
+			distance = dist;
+		}
+
+		public double getDistance() {
+			return distance;
+		}
+
+		@Override
+		public int getColor() {
+			return getColor(0);
+		}
+
+		@Override
+		public double getLatitude() {
+			return lat;
+		}
+
+		@Override
+		public double getLongitude() {
+			return lon;
+		}
+
+
+//		@Override
+//		public PointDescription getPointDescription(Context ctx) {
+//			return new PointDescription(PointDescription.POINT_TYPE_WPT, name);
+//		}
+
+		public WptPt(double lat, double lon, long time, double ele, double speed, double hdop) {
+			this.lat = lat;
+			this.lon = lon;
+			this.time = time;
+			this.ele = ele;
+			this.speed = speed;
+			this.hdop = hdop;
+		}
+
+		@Override
+		public boolean isVisible() {
+			return true;
+		}
+
+		@Override
+		public int hashCode() {
+			final int prime = 31;
+			int result = 1;
+			result = prime * result + ((name == null) ? 0 : name.hashCode());
+			result = prime * result + ((category == null) ? 0 : category.hashCode());
+			result = prime * result + ((desc == null) ? 0 : desc.hashCode());
+			result = prime * result + ((comment == null) ? 0 : comment.hashCode());
+			result = prime * result + ((lat == 0) ? 0 : Double.valueOf(lat).hashCode());
+			result = prime * result + ((lon == 0) ? 0 : Double.valueOf(lon).hashCode());
+			return result;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj)
+				return true;
+			if (obj == null || getClass() != obj.getClass())
+				return false;
+			WptPt other = (WptPt) obj;
+			return Algorithms.objectEquals(other.name, name)
+					&& Algorithms.objectEquals(other.category, category)
+					&& Algorithms.objectEquals(other.lat, lat)
+					&& Algorithms.objectEquals(other.lon, lon)
+					&& Algorithms.objectEquals(other.desc, desc);
+		}
+	}
+
+	public static class TrkSegment extends GPXExtensions {
+		public boolean generalSegment = false;
+
+		public List<WptPt> points = new ArrayList<>();
+
+//		public List<Renderable.RenderableSegment> renders = new ArrayList<>();
+
+		public List<GPXTrackAnalysis> splitByDistance(double meters) {
+			return split(getDistanceMetric(), getTimeSplit(), meters);
+		}
+
+		public List<GPXTrackAnalysis> splitByTime(int seconds) {
+			return split(getTimeSplit(), getDistanceMetric(), seconds);
+		}
+
+		private List<GPXTrackAnalysis> split(SplitMetric metric, SplitMetric secondaryMetric, double metricLimit) {
+			List<SplitSegment> splitSegments = new ArrayList<>();
+			splitSegment(metric, secondaryMetric, metricLimit, splitSegments, this);
+			return convert(splitSegments);
+		}
+
+//		public void drawRenderers(double zoom, Paint p, Canvas c, RotatedTileBox tb) {
+//			for (Renderable.RenderableSegment rs : renders) {
+//				rs.drawSegment(zoom, p, c, tb);
+//			}
+//		}
+	}
+
+	public static class Track extends GPXExtensions {
+		public String name = null;
+		public String desc = null;
+		public List<TrkSegment> segments = new ArrayList<>();
+		public boolean generalTrack = false;
+
+	}
+
+	public static class Route extends GPXExtensions {
+		public String name = null;
+		public String desc = null;
+		public List<WptPt> points = new ArrayList<>();
+
+	}
+
+	public static class Metadata extends GPXExtensions {
+		public String desc;
+
+		@Nullable
+		public String getArticleTitle() {
+			return getExtensionsToRead().get("article_title");
+		}
+
+		@Nullable
+		public String getArticleLang() {
+			return getExtensionsToRead().get("article_lang");
+		}
+	}
+
+	public static class GPXTrackAnalysis {
+		public float totalDistance = 0;
+		public int totalTracks = 0;
+		public long startTime = Long.MAX_VALUE;
+		public long endTime = Long.MIN_VALUE;
+		public long timeSpan = 0;
+		//Next few lines for Issue 3222 heuristic testing only
+		//public long timeMoving0 = 0;
+		//public float totalDistanceMoving0 = 0;
+		public long timeMoving = 0;
+		public float totalDistanceMoving = 0;
+
+		public double diffElevationUp = 0;
+		public double diffElevationDown = 0;
+		public double avgElevation = 0;
+		public double minElevation = 99999;
+		public double maxElevation = -100;
+
+		public float minSpeed = Float.MAX_VALUE;
+		public float maxSpeed = 0;
+		public float avgSpeed;
+
+		public int points;
+		public int wptPoints = 0;
+
+		public Set<String> wptCategoryNames;
+
+		public double metricEnd;
+		public double secondaryMetricEnd;
+		public WptPt locationStart;
+		public WptPt locationEnd;
+
+		public double left = 0;
+		public double right = 0;
+		public double top = 0;
+		public double bottom = 0;
+
+		public boolean isTimeSpecified() {
+			return startTime != Long.MAX_VALUE && startTime != 0;
+		}
+
+		public boolean isTimeMoving() {
+			return timeMoving != 0;
+		}
+
+		public boolean isElevationSpecified() {
+			return maxElevation != -100;
+		}
+
+		public boolean hasSpeedInTrack() {
+			return hasSpeedInTrack;
+		}
+
+		public boolean isBoundsCalculated() {
+			return left != 0 && right != 0 && top != 0 && bottom != 0;
+		}
+
+		public List<Elevation> elevationData;
+		public List<Speed> speedData;
+
+		public boolean hasElevationData;
+		public boolean hasSpeedData;
+		public boolean hasSpeedInTrack = false;
+
+		public boolean isSpeedSpecified() {
+			return avgSpeed > 0;
+		}
+
+
+		public static GPXTrackAnalysis segment(long filetimestamp, TrkSegment segment) {
+			return new GPXTrackAnalysis().prepareInformation(filetimestamp, new SplitSegment(segment));
+		}
+
+		public GPXTrackAnalysis prepareInformation(long filestamp, SplitSegment... splitSegments) {
+			float[] calculations = new float[1];
+
+			long startTimeOfSingleSegment = 0;
+			long endTimeOfSingleSegment = 0;
+
+			float totalElevation = 0;
+			int elevationPoints = 0;
+			int speedCount = 0;
+			int timeDiff = 0;
+			double totalSpeedSum = 0;
+			points = 0;
+
+			double channelThresMin = 10;           // Minimum oscillation amplitude considered as relevant or as above noise for accumulated Ascent/Descent analysis
+			double channelThres = channelThresMin; // Actual oscillation amplitude considered as above noise (dynamic channel adjustment, accomodates depedency on current VDOP/getAccuracy if desired)
+			double channelBase;
+			double channelTop;
+			double channelBottom;
+			boolean climb = false;
+
+			elevationData = new ArrayList<>();
+			speedData = new ArrayList<>();
+
+			for (SplitSegment s : splitSegments) {
+				final int numberOfPoints = s.getNumberOfPoints();
+
+				channelBase = 99999;
+				channelTop = channelBase;
+				channelBottom = channelBase;
+				//channelThres = channelThresMin; //only for dynamic channel adjustment
+
+				float segmentDistance = 0f;
+				metricEnd += s.metricEnd;
+				secondaryMetricEnd += s.secondaryMetricEnd;
+				points += numberOfPoints;
+				for (int j = 0; j < numberOfPoints; j++) {
+					WptPt point = s.get(j);
+					if (j == 0 && locationStart == null) {
+						locationStart = point;
+					}
+					if (j == numberOfPoints - 1) {
+						locationEnd = point;
+					}
+					long time = point.time;
+					if (time != 0) {
+						if (s.metricEnd == 0) {
+							if (s.segment.generalSegment) {
+								if (point.firstPoint) {
+									startTimeOfSingleSegment = time;
+								} else if (point.lastPoint) {
+									endTimeOfSingleSegment = time;
+								}
+								if (startTimeOfSingleSegment != 0 && endTimeOfSingleSegment != 0) {
+									timeSpan += endTimeOfSingleSegment - startTimeOfSingleSegment;
+									startTimeOfSingleSegment = 0;
+									endTimeOfSingleSegment = 0;
+								}
+							}
+						}
+						startTime = Math.min(startTime, time);
+						endTime = Math.max(endTime, time);
+					}
+
+					if (left == 0 && right == 0) {
+						left = point.getLongitude();
+						right = point.getLongitude();
+						top = point.getLatitude();
+						bottom = point.getLatitude();
+					} else {
+						left = Math.min(left, point.getLongitude());
+						right = Math.max(right, point.getLongitude());
+						top = Math.max(top, point.getLatitude());
+						bottom = Math.min(bottom, point.getLatitude());
+					}
+
+					double elevation = point.ele;
+					Elevation elevation1 = new Elevation();
+					if (!Double.isNaN(elevation)) {
+						totalElevation += elevation;
+						elevationPoints++;
+						minElevation = Math.min(elevation, minElevation);
+						maxElevation = Math.max(elevation, maxElevation);
+
+						elevation1.elevation = (float) elevation;
+					} else {
+						elevation1.elevation = Float.NaN;
+					}
+
+					float speed = (float) point.speed;
+					if (speed > 0) {
+						hasSpeedInTrack = true;
+					}
+
+					// Trend channel analysis for elevation gain/loss, Hardy 2015-09-22, LPF filtering added 2017-10-26:
+					// - Detect the consecutive elevation trend channels: Only use the net elevation changes of each trend channel (i.e. between the turnarounds) to accumulate the Ascent/Descent values.
+					// - Perform the channel evaluation on Low Pass Filter (LPF) smoothed ele data instead of on the raw ele data
+					// Parameters:
+					// - channelThresMin (in meters): defines the channel turnaround detection, i.e. oscillations smaller than this are ignored as irrelevant or noise.
+					// - smoothWindow (number of points): is the LPF window
+					// NOW REMOVED, as no relevant examples found: Dynamic channel adjustment: To suppress unreliable measurement points, could relax the turnaround detection from the constant channelThresMin to channelThres which is e.g. based on the maximum VDOP of any point which contributed to the current trend. (Good assumption is VDOP=2*HDOP, which accounts for invisibility of lower hemisphere satellites.)
+
+					// LPF smooting of ele data, usually smooth over odd number of values like 5
+					final int smoothWindow = 5;
+					double eleSmoothed = Double.NaN;
+					int j2 = 0;
+					for (int j1 = -smoothWindow + 1; j1 <= 0; j1++) {
+						if ((j + j1 >= 0) && !Double.isNaN(s.get(j + j1).ele)) {
+							j2++;
+							if (!Double.isNaN(eleSmoothed)) {
+								eleSmoothed = eleSmoothed + s.get(j + j1).ele;
+							} else {
+								eleSmoothed = s.get(j + j1).ele;
+							}
+						}
+					}
+					if (!Double.isNaN(eleSmoothed)) {
+						eleSmoothed = eleSmoothed / j2;
+					}
+
+					if (!Double.isNaN(eleSmoothed)) {
+						// Init channel
+						if (channelBase == 99999) {
+							channelBase = eleSmoothed;
+							channelTop = channelBase;
+							channelBottom = channelBase;
+							//channelThres = channelThresMin; //only for dynamic channel adjustment
+						}
+						// Channel maintenance
+						if (eleSmoothed > channelTop) {
+							channelTop = eleSmoothed;
+							//if (!Double.isNaN(point.hdop)) {
+							//	channelThres = Math.max(channelThres, 2.0 * point.hdop); //only for dynamic channel adjustment
+							//}
+						} else if (eleSmoothed < channelBottom) {
+							channelBottom = eleSmoothed;
+							//if (!Double.isNaN(point.hdop)) {
+							//	channelThres = Math.max(channelThres, 2.0 * point.hdop); //only for dynamic channel adjustment
+							//}
+						}
+						// Turnaround (breakout) detection
+						if ((eleSmoothed <= (channelTop - channelThres)) && (climb == true)) {
+							if ((channelTop - channelBase) >= channelThres) {
+								diffElevationUp += channelTop - channelBase;
+							}
+							channelBase = channelTop;
+							channelBottom = eleSmoothed;
+							climb = false;
+							//channelThres = channelThresMin; //only for dynamic channel adjustment
+						} else if ((eleSmoothed >= (channelBottom + channelThres)) && (climb == false)) {
+							if ((channelBase - channelBottom) >= channelThres) {
+								diffElevationDown += channelBase - channelBottom;
+							}
+							channelBase = channelBottom;
+							channelTop = eleSmoothed;
+							climb = true;
+							//channelThres = channelThresMin; //only for dynamic channel adjustment
+						}
+						// End detection without breakout
+						if (j == (numberOfPoints - 1)) {
+							if ((channelTop - channelBase) >= channelThres) {
+								diffElevationUp += channelTop - channelBase;
+							}
+							if ((channelBase - channelBottom) >= channelThres) {
+								diffElevationDown += channelBase - channelBottom;
+							}
+						}
+					}
+
+					if (j > 0) {
+						WptPt prev = s.get(j - 1);
+
+						// Old complete summation approach for elevation gain/loss
+						//if (!Double.isNaN(point.ele) && !Double.isNaN(prev.ele)) {
+						//	double diff = point.ele - prev.ele;
+						//	if (diff > 0) {
+						//		diffElevationUp += diff;
+						//	} else {
+						//		diffElevationDown -= diff;
+						//	}
+						//}
+
+						// totalDistance += MapUtils.getDistance(prev.lat, prev.lon, point.lat, point.lon);
+						// using ellipsoidal 'distanceBetween' instead of spherical haversine (MapUtils.getDistance) is
+						// a little more exact, also seems slightly faster:
+						net.osmand.Location.distanceBetween(prev.lat, prev.lon, point.lat, point.lon, calculations);
+						totalDistance += calculations[0];
+						segmentDistance += calculations[0];
+						point.distance = segmentDistance;
+						timeDiff = (int) ((point.time - prev.time) / 1000);
+
+						//Last resort: Derive speed values from displacement if track does not originally contain speed
+						if (!hasSpeedInTrack && speed == 0 && timeDiff > 0) {
+							speed = calculations[0] / timeDiff;
+						}
+
+						// Motion detection:
+						//   speed > 0  uses GPS chipset's motion detection
+						//   calculations[0] > minDisplacment * time  is heuristic needed because tracks may be filtered at recording time, so points at rest may not be present in file at all
+						if ((speed > 0) && (calculations[0] > 0.1 / 1000f * (point.time - prev.time)) && point.time != 0 && prev.time != 0) {
+							timeMoving = timeMoving + (point.time - prev.time);
+							totalDistanceMoving += calculations[0];
+						}
+
+						//Next few lines for Issue 3222 heuristic testing only
+						//	if (speed > 0 && point.time != 0 && prev.time != 0) {
+						//		timeMoving0 = timeMoving0 + (point.time - prev.time);
+						//		totalDistanceMoving0 += calculations[0];
+						//	}
+					}
+
+					elevation1.time = timeDiff;
+					elevation1.distance = (j > 0) ? calculations[0] : 0;
+					elevationData.add(elevation1);
+					if (!hasElevationData && !Float.isNaN(elevation1.elevation) && totalDistance > 0) {
+						hasElevationData = true;
+					}
+
+					minSpeed = Math.min(speed, minSpeed);
+					if (speed > 0) {
+						totalSpeedSum += speed;
+						maxSpeed = Math.max(speed, maxSpeed);
+						speedCount++;
+					}
+
+					Speed speed1 = new Speed();
+					speed1.speed = speed;
+					speed1.time = timeDiff;
+					speed1.distance = elevation1.distance;
+					speedData.add(speed1);
+					if (!hasSpeedData && speed1.speed > 0 && totalDistance > 0) {
+						hasSpeedData = true;
+					}
+				}
+			}
+			if (totalDistance < 0) {
+				hasElevationData = false;
+				hasSpeedData = false;
+			}
+			if (!isTimeSpecified()) {
+				startTime = filestamp;
+				endTime = filestamp;
+			}
+
+			// OUTPUT:
+			// 1. Total distance, Start time, End time
+			// 2. Time span
+			if (timeSpan == 0) {
+				timeSpan = endTime - startTime;
+			}
+
+			// 3. Time moving, if any
+			// 4. Elevation, eleUp, eleDown, if recorded
+			if (elevationPoints > 0) {
+				avgElevation = totalElevation / elevationPoints;
+			}
+
+
+			// 5. Max speed and Average speed, if any. Average speed is NOT overall (effective) speed, but only calculated for "moving" periods.
+			//    Averaging speed values is less precise than totalDistanceMoving/timeMoving
+			if (speedCount > 0) {
+				if (timeMoving > 0) {
+					avgSpeed = (float) totalDistanceMoving / (float) timeMoving * 1000f;
+				} else {
+					avgSpeed = (float) totalSpeedSum / (float) speedCount;
+				}
+			} else {
+				avgSpeed = -1;
+			}
+			return this;
+		}
+
+	}
+
+	private static class SplitSegment {
+		TrkSegment segment;
+		double startCoeff = 0;
+		int startPointInd;
+		double endCoeff = 0;
+		int endPointInd;
+		double metricEnd;
+		double secondaryMetricEnd;
+
+		public SplitSegment(TrkSegment s) {
+			startPointInd = 0;
+			startCoeff = 0;
+			endPointInd = s.points.size() - 2;
+			endCoeff = 1;
+			this.segment = s;
+		}
+
+		public SplitSegment(TrkSegment s, int pointInd, double cf) {
+			this.segment = s;
+			this.startPointInd = pointInd;
+			this.startCoeff = cf;
+		}
+
+
+		public int getNumberOfPoints() {
+			return endPointInd - startPointInd + 2;
+		}
+
+		public WptPt get(int j) {
+			final int ind = j + startPointInd;
+			if (j == 0) {
+				if (startCoeff == 0) {
+					return segment.points.get(ind);
+				}
+				return approx(segment.points.get(ind), segment.points.get(ind + 1), startCoeff);
+			}
+			if (j == getNumberOfPoints() - 1) {
+				if (endCoeff == 1) {
+					return segment.points.get(ind);
+				}
+				return approx(segment.points.get(ind - 1), segment.points.get(ind), endCoeff);
+			}
+			return segment.points.get(ind);
+		}
+
+
+		private WptPt approx(WptPt w1, WptPt w2, double cf) {
+			long time = value(w1.time, w2.time, 0, cf);
+			double speed = value(w1.speed, w2.speed, 0, cf);
+			double ele = value(w1.ele, w2.ele, 0, cf);
+			double hdop = value(w1.hdop, w2.hdop, 0, cf);
+			double lat = value(w1.lat, w2.lat, -360, cf);
+			double lon = value(w1.lon, w2.lon, -360, cf);
+			return new WptPt(lat, lon, time, ele, speed, hdop);
+		}
+
+		private double value(double vl, double vl2, double none, double cf) {
+			if (vl == none || Double.isNaN(vl)) {
+				return vl2;
+			} else if (vl2 == none || Double.isNaN(vl2)) {
+				return vl;
+			}
+			return vl + cf * (vl2 - vl);
+		}
+
+		private long value(long vl, long vl2, long none, double cf) {
+			if (vl == none) {
+				return vl2;
+			} else if (vl2 == none) {
+				return vl;
+			}
+			return vl + ((long) (cf * (vl2 - vl)));
+		}
+
+
+		public double setLastPoint(int pointInd, double endCf) {
+			endCoeff = endCf;
+			endPointInd = pointInd;
+			return endCoeff;
+		}
+
+	}
+
+	private static SplitMetric getDistanceMetric() {
+		return new SplitMetric() {
+
+			private float[] calculations = new float[1];
+
+			@Override
+			public double metric(WptPt p1, WptPt p2) {
+				net.osmand.Location.distanceBetween(p1.lat, p1.lon, p2.lat, p2.lon, calculations);
+				return calculations[0];
+			}
+		};
+	}
+
+	private static SplitMetric getTimeSplit() {
+		return new SplitMetric() {
+
+			@Override
+			public double metric(WptPt p1, WptPt p2) {
+				if (p1.time != 0 && p2.time != 0) {
+					return (int) Math.abs((p2.time - p1.time) / 1000l);
+				}
+				return 0;
+			}
+		};
+	}
+
+	private abstract static class SplitMetric {
+
+		public abstract double metric(WptPt p1, WptPt p2);
+
+	}
+
+	private static void splitSegment(SplitMetric metric, SplitMetric secondaryMetric,
+	                                 double metricLimit, List<SplitSegment> splitSegments,
+	                                 TrkSegment segment) {
+		double currentMetricEnd = metricLimit;
+		double secondaryMetricEnd = 0;
+		SplitSegment sp = new SplitSegment(segment, 0, 0);
+		double total = 0;
+		WptPt prev = null;
+		for (int k = 0; k < segment.points.size(); k++) {
+			WptPt point = segment.points.get(k);
+			if (k > 0) {
+				double currentSegment = metric.metric(prev, point);
+				secondaryMetricEnd += secondaryMetric.metric(prev, point);
+				while (total + currentSegment > currentMetricEnd) {
+					double p = currentMetricEnd - total;
+					double cf = (p / currentSegment);
+					sp.setLastPoint(k - 1, cf);
+					sp.metricEnd = currentMetricEnd;
+					sp.secondaryMetricEnd = secondaryMetricEnd;
+					splitSegments.add(sp);
+
+					sp = new SplitSegment(segment, k - 1, cf);
+					currentMetricEnd += metricLimit;
+					prev = sp.get(0);
+				}
+				total += currentSegment;
+			}
+			prev = point;
+		}
+		if (segment.points.size() > 0
+				&& !(sp.endPointInd == segment.points.size() - 1 && sp.startCoeff == 1)) {
+			sp.metricEnd = total;
+			sp.secondaryMetricEnd = secondaryMetricEnd;
+			sp.setLastPoint(segment.points.size() - 2, 1);
+			splitSegments.add(sp);
+		}
+	}
+
+	private static List<GPXTrackAnalysis> convert(List<SplitSegment> splitSegments) {
+		List<GPXTrackAnalysis> ls = new ArrayList<>();
+		for (SplitSegment s : splitSegments) {
+			GPXTrackAnalysis a = new GPXTrackAnalysis();
+			a.prepareInformation(0, s);
+			ls.add(a);
+		}
+		return ls;
+	}
+
+	public static class GPXFile extends GPXExtensions {
+		public String author;
+		public Metadata metadata;
+		public List<Track> tracks = new ArrayList<>();
+		private List<WptPt> points = new ArrayList<>();
+		public List<Route> routes = new ArrayList<>();
+
+		public String warning = null;
+		public String path = "";
+		public boolean showCurrentTrack;
+		public long modifiedTime = 0;
+		public int userId;
+		public long chatId;
+
+		private Track generalTrack;
+		private TrkSegment generalSegment;
+
+		public List<WptPt> getPoints() {
+			return Collections.unmodifiableList(points);
+		}
+
+		public Map<String, List<WptPt>> getPointsByCategories() {
+			Map<String, List<WptPt>> res = new HashMap<>();
+			for (WptPt pt : points) {
+				String category = pt.category == null ? "" : pt.category;
+				List<WptPt> list = res.get(category);
+				if (list != null) {
+					list.add(pt);
+				} else {
+					list = new ArrayList<>();
+					list.add(pt);
+					res.put(category, list);
+				}
+			}
+			return res;
+		}
+
+		public boolean isPointsEmpty() {
+			return points.isEmpty();
+		}
+
+		public int getPointsSize() {
+			return points.size();
+		}
+
+		boolean containsPoint(WptPt point) {
+			return points.contains(point);
+		}
+
+		void clearPoints() {
+			points.clear();
+			modifiedTime = System.currentTimeMillis();
+		}
+
+		public void addPoint(WptPt point) {
+			points.add(point);
+			modifiedTime = System.currentTimeMillis();
+		}
+
+		public void addPoint(int position, WptPt point) {
+			points.add(position, point);
+			modifiedTime = System.currentTimeMillis();
+		}
+
+		void addPoints(Collection<? extends WptPt> collection) {
+			points.addAll(collection);
+			modifiedTime = System.currentTimeMillis();
+		}
+
+		public boolean isCloudmadeRouteFile() {
+			return "cloudmade".equalsIgnoreCase(author);
+		}
+
+		public void addGeneralTrack() {
+			Track generalTrack = getGeneralTrack();
+			if (generalTrack != null && !tracks.contains(generalTrack)) {
+				tracks.add(0, generalTrack);
+			}
+		}
+
+		public Track getGeneralTrack() {
+			TrkSegment generalSegment = getGeneralSegment();
+			if (generalTrack == null && generalSegment != null) {
+				Track track = new Track();
+				track.segments = new ArrayList<>();
+				track.segments.add(generalSegment);
+				generalTrack = track;
+				track.generalTrack = true;
+			}
+			return generalTrack;
+		}
+
+		public TrkSegment getGeneralSegment() {
+			if (generalSegment == null && getNonEmptySegmentsCount() > 1) {
+				buildGeneralSegment();
+			}
+			return generalSegment;
+		}
+
+		private void buildGeneralSegment() {
+			TrkSegment segment = new TrkSegment();
+			for (Track track : tracks) {
+				for (TrkSegment s : track.segments) {
+					if (s.points.size() > 0) {
+						List<WptPt> waypoints = new ArrayList<>(s.points.size());
+						for (WptPt wptPt : s.points) {
+							waypoints.add(new WptPt(wptPt));
+						}
+						waypoints.get(0).firstPoint = true;
+						waypoints.get(waypoints.size() - 1).lastPoint = true;
+						segment.points.addAll(waypoints);
+					}
+				}
+			}
+			if (segment.points.size() > 0) {
+				segment.generalSegment = true;
+				generalSegment = segment;
+			}
+		}
+
+		public GPXTrackAnalysis getAnalysis(long fileTimestamp) {
+			GPXTrackAnalysis g = new GPXTrackAnalysis();
+			g.wptPoints = points.size();
+			g.wptCategoryNames = getWaypointCategories(true);
+			List<SplitSegment> splitSegments = new ArrayList<GPXUtilities.SplitSegment>();
+			for (int i = 0; i < tracks.size(); i++) {
+				Track subtrack = tracks.get(i);
+				for (TrkSegment segment : subtrack.segments) {
+					if (!segment.generalSegment) {
+						g.totalTracks++;
+						if (segment.points.size() > 1) {
+							splitSegments.add(new SplitSegment(segment));
+						}
+					}
+				}
+			}
+			g.prepareInformation(fileTimestamp, splitSegments.toArray(new SplitSegment[splitSegments.size()]));
+			return g;
+		}
+
+		public List<WptPt> getRoutePoints() {
+			List<WptPt> points = new ArrayList<>();
+			for (int i = 0; i < routes.size(); i++) {
+				Route rt = routes.get(i);
+				points.addAll(rt.points);
+			}
+			return points;
+		}
+
+		public boolean hasRtePt() {
+			for (Route r : routes) {
+				if (r.points.size() > 0) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		public boolean hasWptPt() {
+			return points.size() > 0;
+		}
+
+		public boolean hasTrkPt() {
+			for (Track t : tracks) {
+				for (TrkSegment ts : t.segments) {
+					if (ts.points.size() > 0) {
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
+		public WptPt addWptPt(double lat, double lon, long time, String description, String name, String category, int color) {
+			double latAdjusted = Double.parseDouble(latLonFormat.format(lat));
+			double lonAdjusted = Double.parseDouble(latLonFormat.format(lon));
+			final WptPt pt = new WptPt(latAdjusted, lonAdjusted, time, Double.NaN, 0, Double.NaN);
+			pt.name = name;
+			pt.category = category;
+			pt.desc = description;
+			if (color != 0) {
+				pt.setColor(color);
+			}
+
+			points.add(pt);
+
+			modifiedTime = System.currentTimeMillis();
+
+			return pt;
+		}
+
+		public WptPt addRtePt(double lat, double lon, long time, String description, String name, String category, int color) {
+			double latAdjusted = Double.parseDouble(latLonFormat.format(lat));
+			double lonAdjusted = Double.parseDouble(latLonFormat.format(lon));
+			final WptPt pt = new WptPt(latAdjusted, lonAdjusted, time, Double.NaN, 0, Double.NaN);
+			pt.name = name;
+			pt.category = category;
+			pt.desc = description;
+			if (color != 0) {
+				pt.setColor(color);
+			}
+
+			if (routes.size() == 0) {
+				routes.add(new Route());
+			}
+			Route currentRoute = routes.get(routes.size() - 1);
+			currentRoute.points.add(pt);
+
+			modifiedTime = System.currentTimeMillis();
+
+			return pt;
+		}
+
+		public void addTrkSegment(List<WptPt> points) {
+			removeGeneralTrackIfExists();
+
+			TrkSegment segment = new TrkSegment();
+			segment.points.addAll(points);
+
+			if (tracks.size() == 0) {
+				tracks.add(new Track());
+			}
+			Track lastTrack = tracks.get(tracks.size() - 1);
+			lastTrack.segments.add(segment);
+
+			modifiedTime = System.currentTimeMillis();
+		}
+
+		public boolean replaceSegment(TrkSegment oldSegment, TrkSegment newSegment) {
+			removeGeneralTrackIfExists();
+
+			for (int i = 0; i < tracks.size(); i++) {
+				Track currentTrack = tracks.get(i);
+				for (int j = 0; j < currentTrack.segments.size(); j++) {
+					int segmentIndex = currentTrack.segments.indexOf(oldSegment);
+					if (segmentIndex != -1) {
+						currentTrack.segments.remove(segmentIndex);
+						currentTrack.segments.add(segmentIndex, newSegment);
+						addGeneralTrack();
+						modifiedTime = System.currentTimeMillis();
+						return true;
+					}
+				}
+			}
+
+			addGeneralTrack();
+			return false;
+		}
+
+		public void addRoutePoints(List<WptPt> points) {
+			if (routes.size() == 0) {
+				Route route = new Route();
+				routes.add(route);
+			}
+
+			Route lastRoute = routes.get(routes.size() - 1);
+			lastRoute.points.addAll(points);
+			modifiedTime = System.currentTimeMillis();
+		}
+
+		public void replaceRoutePoints(List<WptPt> points) {
+			routes.clear();
+			routes.add(new Route());
+			Route currentRoute = routes.get(routes.size() - 1);
+			currentRoute.points.addAll(points);
+			modifiedTime = System.currentTimeMillis();
+		}
+
+		public void updateWptPt(WptPt pt, double lat, double lon, long time, String description, String name, String category, int color) {
+			int index = points.indexOf(pt);
+			double latAdjusted = Double.parseDouble(latLonFormat.format(lat));
+			double lonAdjusted = Double.parseDouble(latLonFormat.format(lon));
+			pt.lat = latAdjusted;
+			pt.lon = lonAdjusted;
+			pt.time = time;
+			pt.desc = description;
+			pt.name = name;
+			pt.category = category;
+			if (color != 0) {
+				pt.setColor(color);
+			}
+
+			if (index != -1) {
+				points.set(index, pt);
+			}
+			modifiedTime = System.currentTimeMillis();
+		}
+
+		private void removeGeneralTrackIfExists() {
+			if (generalTrack != null) {
+				tracks.remove(generalTrack);
+				this.generalTrack = null;
+				this.generalSegment = null;
+			}
+		}
+
+		public boolean removeTrkSegment(TrkSegment segment) {
+			removeGeneralTrackIfExists();
+
+			for (int i = 0; i < tracks.size(); i++) {
+				Track currentTrack = tracks.get(i);
+				for (int j = 0; j < currentTrack.segments.size(); j++) {
+					if (currentTrack.segments.remove(segment)) {
+						addGeneralTrack();
+						modifiedTime = System.currentTimeMillis();
+						return true;
+					}
+				}
+			}
+			addGeneralTrack();
+			return false;
+		}
+
+		public boolean deleteWptPt(WptPt pt) {
+			modifiedTime = System.currentTimeMillis();
+			return points.remove(pt);
+		}
+
+		public boolean deleteRtePt(WptPt pt) {
+			modifiedTime = System.currentTimeMillis();
+			for (Route route : routes) {
+				if (route.points.remove(pt)) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		public List<TrkSegment> processRoutePoints() {
+			List<TrkSegment> tpoints = new ArrayList<TrkSegment>();
+			if (routes.size() > 0) {
+				for (Route r : routes) {
+					int routeColor = r.getColor(getColor(0));
+					if (r.points.size() > 0) {
+						TrkSegment sgmt = new TrkSegment();
+						tpoints.add(sgmt);
+						sgmt.points.addAll(r.points);
+						sgmt.setColor(routeColor);
+					}
+				}
+			}
+			return tpoints;
+		}
+
+		public List<TrkSegment> proccessPoints() {
+			List<TrkSegment> tpoints = new ArrayList<TrkSegment>();
+			for (Track t : tracks) {
+				int trackColor = t.getColor(getColor(0));
+				for (TrkSegment ts : t.segments) {
+					if (!ts.generalSegment && ts.points.size() > 0) {
+						TrkSegment sgmt = new TrkSegment();
+						tpoints.add(sgmt);
+						sgmt.points.addAll(ts.points);
+						sgmt.setColor(trackColor);
+					}
+				}
+			}
+			return tpoints;
+		}
+
+		public WptPt getLastPoint() {
+			if (tracks.size() > 0) {
+				Track tk = tracks.get(tracks.size() - 1);
+				if (tk.segments.size() > 0) {
+					TrkSegment ts = tk.segments.get(tk.segments.size() - 1);
+					if (ts.points.size() > 0) {
+						return ts.points.get(ts.points.size() - 1);
+					}
+				}
+			}
+			return null;
+		}
+
+		public WptPt findPointToShow() {
+			for (Track t : tracks) {
+				for (TrkSegment s : t.segments) {
+					if (s.points.size() > 0) {
+						return s.points.get(0);
+					}
+				}
+			}
+			for (Route s : routes) {
+				if (s.points.size() > 0) {
+					return s.points.get(0);
+				}
+			}
+			if (points.size() > 0) {
+				return points.get(0);
+			}
+			return null;
+		}
+
+		public boolean isEmpty() {
+			for (Track t : tracks) {
+				if (t.segments != null) {
+					for (TrkSegment s : t.segments) {
+						boolean tracksEmpty = s.points.isEmpty();
+						if (!tracksEmpty) {
+							return false;
+						}
+					}
+				}
+			}
+			return points.isEmpty() && routes.isEmpty();
+		}
+
+		public int getNonEmptySegmentsCount() {
+			int count = 0;
+			for (Track t : tracks) {
+				for (TrkSegment s : t.segments) {
+					if (s.points.size() > 0) {
+						count++;
+					}
+				}
+			}
+			return count;
+		}
+
+		public Set<String> getWaypointCategories(boolean withDefaultCategory) {
+			Set<String> categories = new HashSet<>();
+			for (WptPt pt : points) {
+				String category = pt.category == null ? "" : pt.category;
+				if (withDefaultCategory || !TextUtils.isEmpty(category)) {
+					categories.add(category);
+				}
+			}
+			return categories;
+		}
+
+		public Map<String, Integer> getWaypointCategoriesWithColors(boolean withDefaultCategory) {
+			Map<String, Integer> categories = new HashMap<>();
+			for (WptPt pt : points) {
+				String category = pt.category == null ? "" : pt.category;
+				int color = pt.category == null ? 0 : pt.getColor();
+				boolean emptyCategory = TextUtils.isEmpty(category);
+				if (!emptyCategory) {
+					Integer existingColor = categories.get(category);
+					if (existingColor == null || (existingColor == 0 && color != 0)) {
+						categories.put(category, color);
+					}
+				} else if (withDefaultCategory) {
+					categories.put(category, 0);
+				}
+			}
+			return categories;
+		}
+
+		public QuadRect getRect() {
+			double left = 0, right = 0;
+			double top = 0, bottom = 0;
+			for (Track track : tracks) {
+				for (TrkSegment segment : track.segments) {
+					for (WptPt p : segment.points) {
+						if (left == 0 && right == 0) {
+							left = p.getLongitude();
+							right = p.getLongitude();
+							top = p.getLatitude();
+							bottom = p.getLatitude();
+						} else {
+							left = Math.min(left, p.getLongitude());
+							right = Math.max(right, p.getLongitude());
+							top = Math.max(top, p.getLatitude());
+							bottom = Math.min(bottom, p.getLatitude());
+						}
+					}
+				}
+			}
+			for (WptPt p : points) {
+				if (left == 0 && right == 0) {
+					left = p.getLongitude();
+					right = p.getLongitude();
+					top = p.getLatitude();
+					bottom = p.getLatitude();
+				} else {
+					left = Math.min(left, p.getLongitude());
+					right = Math.max(right, p.getLongitude());
+					top = Math.max(top, p.getLatitude());
+					bottom = Math.min(bottom, p.getLatitude());
+				}
+			}
+			for (GPXUtilities.Route route : routes) {
+				for (WptPt p : route.points) {
+					if (left == 0 && right == 0) {
+						left = p.getLongitude();
+						right = p.getLongitude();
+						top = p.getLatitude();
+						bottom = p.getLatitude();
+					} else {
+						left = Math.min(left, p.getLongitude());
+						right = Math.max(right, p.getLongitude());
+						top = Math.max(top, p.getLatitude());
+						bottom = Math.min(bottom, p.getLatitude());
+					}
+				}
+			}
+			return new QuadRect(left, top, right, bottom);
+		}
+	}
+
+	public static String asString(GPXFile file, TelegramApplication ctx) {
+		final Writer writer = new StringWriter();
+		GPXUtilities.writeGpx(writer, file, ctx);
+		return writer.toString();
+	}
+
+	public static String writeGpxFile(File fout, GPXFile file, TelegramApplication ctx) {
+		Writer output = null;
+		try {
+			if (fout.getParentFile() != null) {
+				fout.getParentFile().mkdirs();
+			}
+			output = new OutputStreamWriter(new FileOutputStream(fout), "UTF-8"); //$NON-NLS-1$
+			if (Algorithms.isEmpty(file.path)) {
+				file.path = fout.getAbsolutePath();
+			}
+			String msg = writeGpx(output, file, ctx);
+			return msg;
+		} catch (IOException e) {
+			log.error("Error saving gpx", e); //$NON-NLS-1$
+			return "Error saving gpx";
+		} finally {
+			if (output != null) {
+				try {
+					output.close();
+				} catch (IOException ignore) {
+					// ignore
+				}
+			}
+		}
+	}
+
+	public static String writeGpx(Writer output, GPXFile file, TelegramApplication ctx) {
+		try {
+			SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT, Locale.US);
+			format.setTimeZone(TimeZone.getTimeZone("UTC"));
+			XmlSerializer serializer = PlatformUtil.newSerializer();
+			serializer.setOutput(output);
+			serializer.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true); //$NON-NLS-1$
+			serializer.startDocument("UTF-8", true); //$NON-NLS-1$
+			serializer.startTag(null, "gpx"); //$NON-NLS-1$
+			serializer.attribute(null, "version", "1.1"); //$NON-NLS-1$ //$NON-NLS-2$
+			if (file.author == null) {
+				serializer.attribute(null, "creator", ctx.getPackageName()); //$NON-NLS-1$
+			} else {
+				serializer.attribute(null, "creator", file.author); //$NON-NLS-1$
+			}
+			serializer.attribute(null, "xmlns", "http://www.topografix.com/GPX/1/1"); //$NON-NLS-1$ //$NON-NLS-2$
+			serializer.attribute(null, "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
+			serializer.attribute(null, "xsi:schemaLocation",
+					"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd");
+
+			String trackName = getFilename(file.path);
+			serializer.startTag(null, "metadata");
+			writeNotNullText(serializer, "name", trackName);
+			if (file.metadata != null) {
+				writeNotNullText(serializer, "desc", file.metadata.desc);
+				writeExtensions(serializer, file.metadata);
+			}
+			serializer.endTag(null, "metadata");
+
+
+			for (Track track : file.tracks) {
+				if (!track.generalTrack) {
+					serializer.startTag(null, "trk"); //$NON-NLS-1$
+					writeNotNullText(serializer, "name", track.name);
+					writeNotNullText(serializer, "desc", track.desc);
+					for (TrkSegment segment : track.segments) {
+						serializer.startTag(null, "trkseg"); //$NON-NLS-1$
+						for (WptPt p : segment.points) {
+							serializer.startTag(null, "trkpt"); //$NON-NLS-1$
+							writeWpt(format, serializer, p);
+							serializer.endTag(null, "trkpt"); //$NON-NLS-1$
+						}
+						serializer.endTag(null, "trkseg"); //$NON-NLS-1$
+					}
+					writeExtensions(serializer, track);
+					serializer.endTag(null, "trk"); //$NON-NLS-1$
+				}
+			}
+
+			for (Route track : file.routes) {
+				serializer.startTag(null, "rte"); //$NON-NLS-1$
+				writeNotNullText(serializer, "name", track.name);
+				writeNotNullText(serializer, "desc", track.desc);
+
+				for (WptPt p : track.points) {
+					serializer.startTag(null, "rtept"); //$NON-NLS-1$
+					writeWpt(format, serializer, p);
+					serializer.endTag(null, "rtept"); //$NON-NLS-1$
+				}
+				writeExtensions(serializer, track);
+				serializer.endTag(null, "rte"); //$NON-NLS-1$
+			}
+
+			for (WptPt l : file.points) {
+				serializer.startTag(null, "wpt"); //$NON-NLS-1$
+				writeWpt(format, serializer, l);
+				serializer.endTag(null, "wpt"); //$NON-NLS-1$
+			}
+
+			serializer.endTag(null, "gpx"); //$NON-NLS-1$
+			serializer.endDocument();
+			serializer.flush();
+
+
+		} catch (RuntimeException e) {
+			log.error("Error saving gpx", e); //$NON-NLS-1$
+			return "Error saving gpx";
+		} catch (IOException e) {
+			log.error("Error saving gpx", e); //$NON-NLS-1$
+			return "Error saving gpx";
+		}
+		return null;
+	}
+
+	private static String getFilename(String path) {
+		if (path != null) {
+			int i = path.lastIndexOf('/');
+			if (i > 0) {
+				path = path.substring(i + 1);
+			}
+			i = path.lastIndexOf('.');
+			if (i > 0) {
+				path = path.substring(0, i);
+			}
+		}
+		return path;
+	}
+
+	private static void writeNotNullText(XmlSerializer serializer, String tag, String value) throws IOException {
+		if (value != null) {
+			serializer.startTag(null, tag);
+			serializer.text(value);
+			serializer.endTag(null, tag);
+		}
+	}
+
+	private static void writeExtensions(XmlSerializer serializer, GPXExtensions p) throws IOException {
+		if (!p.getExtensionsToRead().isEmpty()) {
+			serializer.startTag(null, "extensions");
+			for (Map.Entry<String, String> s : p.getExtensionsToRead().entrySet()) {
+				writeNotNullText(serializer, s.getKey(), s.getValue());
+			}
+			serializer.endTag(null, "extensions");
+		}
+	}
+
+	private static void writeWpt(SimpleDateFormat format, XmlSerializer serializer, WptPt p) throws IOException {
+		serializer.attribute(null, "lat", latLonFormat.format(p.lat)); //$NON-NLS-1$ //$NON-NLS-2$
+		serializer.attribute(null, "lon", latLonFormat.format(p.lon)); //$NON-NLS-1$ //$NON-NLS-2$
+
+		if (!Double.isNaN(p.ele)) {
+			writeNotNullText(serializer, "ele", decimalFormat.format(p.ele));
+		}
+		if (p.time != 0) {
+			writeNotNullText(serializer, "time", format.format(new Date(p.time)));
+		}
+		writeNotNullText(serializer, "name", p.name);
+		writeNotNullText(serializer, "desc", p.desc);
+		if (p.link != null) {
+			serializer.startTag(null, "link");
+			serializer.attribute(null, "href", p.link);
+			serializer.endTag(null, "link");
+		}
+		writeNotNullText(serializer, "type", p.category);
+		if (p.comment != null) {
+			writeNotNullText(serializer, "cmt", p.comment);
+		}
+		if (!Double.isNaN(p.hdop)) {
+			writeNotNullText(serializer, "hdop", decimalFormat.format(p.hdop));
+		}
+		if (p.speed > 0) {
+			p.getExtensionsToWrite().put("speed", decimalFormat.format(p.speed));
+		}
+		writeExtensions(serializer, p);
+	}
+
+	public static class GPXFileResult {
+		public ArrayList<List<Location>> locations = new ArrayList<List<Location>>();
+		public ArrayList<WptPt> wayPoints = new ArrayList<>();
+		// special case for cloudmate gpx : they discourage common schema
+		// by using waypoint as track points and rtept are not very close to real way
+		// such as wpt. However they provide additional information into gpx.
+		public boolean cloudMadeFile;
+		public String error;
+
+		public Location findFistLocation() {
+			for (List<Location> l : locations) {
+				for (Location ls : l) {
+					if (ls != null) {
+						return ls;
+					}
+				}
+			}
+			return null;
+		}
+	}
+
+	private static String readText(XmlPullParser parser, String key) throws XmlPullParserException, IOException {
+		int tok;
+		String text = null;
+		while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
+			if (tok == XmlPullParser.END_TAG && parser.getName().equals(key)) {
+				break;
+			} else if (tok == XmlPullParser.TEXT) {
+				if (text == null) {
+					text = parser.getText();
+				} else {
+					text += parser.getText();
+				}
+			}
+
+		}
+		return text;
+	}
+
+	public static GPXFile loadGPXFile(Context ctx, File f) {
+		FileInputStream fis = null;
+		try {
+			fis = new FileInputStream(f);
+			GPXFile file = loadGPXFile(ctx, fis);
+			file.path = f.getAbsolutePath();
+			try {
+				fis.close();
+			} catch (IOException e) {
+			}
+			return file;
+		} catch (IOException e) {
+			GPXFile res = new GPXFile();
+			res.path = f.getAbsolutePath();
+			log.error("Error reading gpx " + res.path, e); //$NON-NLS-1$
+			res.warning = "Error reading gpx ";
+			return res;
+		} finally {
+			try {
+				if (fis != null)
+					fis.close();
+			} catch (IOException ignore) {
+				// ignore
+			}
+		}
+	}
+
+	public static GPXFile loadGPXFile(Context ctx, InputStream f) {
+		GPXFile res = new GPXFile();
+		SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT, Locale.US);
+		format.setTimeZone(TimeZone.getTimeZone("UTC"));
+		SimpleDateFormat formatMillis = new SimpleDateFormat(GPX_TIME_FORMAT_MILLIS, Locale.US);
+		formatMillis.setTimeZone(TimeZone.getTimeZone("UTC"));
+		try {
+			XmlPullParser parser = PlatformUtil.newXMLPullParser();
+			parser.setInput(getUTF8Reader(f));
+			Stack<GPXExtensions> parserState = new Stack<>();
+			boolean extensionReadMode = false;
+			parserState.push(res);
+			int tok;
+			while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
+				if (tok == XmlPullParser.START_TAG) {
+					Object parse = parserState.peek();
+					String tag = parser.getName();
+					if (extensionReadMode && parse instanceof GPXExtensions) {
+						String value = readText(parser, tag);
+						if (value != null) {
+							((GPXExtensions) parse).getExtensionsToWrite().put(tag.toLowerCase(), value);
+							if (tag.equals("speed") && parse instanceof WptPt) {
+								try {
+									((WptPt) parse).speed = Float.parseFloat(value);
+								} catch (NumberFormatException e) {
+								}
+							}
+						}
+
+					} else if (parse instanceof GPXExtensions && tag.equals("extensions")) {
+						extensionReadMode = true;
+					} else {
+						if (parse instanceof GPXFile) {
+							if (tag.equals("gpx")) {
+								((GPXFile) parse).author = parser.getAttributeValue("", "creator");
+							}
+							if (tag.equals("metadata")) {
+								Metadata metadata = new Metadata();
+								((GPXFile) parse).metadata = metadata;
+								parserState.push(metadata);
+							}
+							if (tag.equals("trk")) {
+								Track track = new Track();
+								((GPXFile) parse).tracks.add(track);
+								parserState.push(track);
+							}
+							if (tag.equals("rte")) {
+								Route route = new Route();
+								((GPXFile) parse).routes.add(route);
+								parserState.push(route);
+							}
+							if (tag.equals("wpt")) {
+								WptPt wptPt = parseWptAttributes(parser);
+								((GPXFile) parse).points.add(wptPt);
+								parserState.push(wptPt);
+							}
+						} else if (parse instanceof Metadata) {
+							if (tag.equals("desc")) {
+								((Metadata) parse).desc = readText(parser, "desc");
+							}
+						} else if (parse instanceof Route) {
+							if (tag.equals("name")) {
+								((Route) parse).name = readText(parser, "name");
+							}
+							if (tag.equals("desc")) {
+								((Route) parse).desc = readText(parser, "desc");
+							}
+							if (tag.equals("rtept")) {
+								WptPt wptPt = parseWptAttributes(parser);
+								((Route) parse).points.add(wptPt);
+								parserState.push(wptPt);
+							}
+						} else if (parse instanceof Track) {
+							if (tag.equals("name")) {
+								((Track) parse).name = readText(parser, "name");
+							}
+							if (tag.equals("desc")) {
+								((Track) parse).desc = readText(parser, "desc");
+							}
+							if (tag.equals("trkseg")) {
+								TrkSegment trkSeg = new TrkSegment();
+								((Track) parse).segments.add(trkSeg);
+								parserState.push(trkSeg);
+							}
+						} else if (parse instanceof TrkSegment) {
+							if (tag.equals("trkpt")) {
+								WptPt wptPt = parseWptAttributes(parser);
+								((TrkSegment) parse).points.add(wptPt);
+								parserState.push(wptPt);
+							}
+							if (tag.equals("csvattributes")) {
+								String segmentPoints = readText(parser, "csvattributes");
+								String[] pointsArr = segmentPoints.split("\n");
+								for (int i = 0; i < pointsArr.length; i++) {
+									String[] pointAttrs = pointsArr[i].split(",");
+									try {
+										int arrLength = pointsArr.length;
+										if (arrLength > 1) {
+											WptPt wptPt = new WptPt();
+											wptPt.lon = Double.parseDouble(pointAttrs[0]);
+											wptPt.lat = Double.parseDouble(pointAttrs[1]);
+											((TrkSegment) parse).points.add(wptPt);
+											if (arrLength > 2) {
+												wptPt.ele = Double.parseDouble(pointAttrs[2]);
+											}
+										}
+									} catch (NumberFormatException e) {
+									}
+								}
+							}
+							// main object to parse
+						} else if (parse instanceof WptPt) {
+							if (tag.equals("name")) {
+								((WptPt) parse).name = readText(parser, "name");
+							} else if (tag.equals("desc")) {
+								((WptPt) parse).desc = readText(parser, "desc");
+							} else if (tag.equals("cmt")) {
+								((WptPt) parse).comment = readText(parser, "cmt");
+							} else if (tag.equals("speed")) {
+								try {
+									String value = readText(parser, "speed");
+									((WptPt) parse).speed = Float.parseFloat(value);
+									((WptPt) parse).getExtensionsToWrite().put("speed", value);
+								} catch (NumberFormatException e) {
+								}
+							} else if (tag.equals("link")) {
+								((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 (tag.equals("ele")) {
+								String text = readText(parser, "ele");
+								if (text != null) {
+									try {
+										((WptPt) parse).ele = Float.parseFloat(text);
+									} catch (NumberFormatException e) {
+									}
+								}
+							} else if (tag.equals("hdop")) {
+								String text = readText(parser, "hdop");
+								if (text != null) {
+									try {
+										((WptPt) parse).hdop = Float.parseFloat(text);
+									} catch (NumberFormatException e) {
+									}
+								}
+							} else if (tag.equals("time")) {
+								String text = readText(parser, "time");
+								if (text != null) {
+									try {
+										((WptPt) parse).time = format.parse(text).getTime();
+									} catch (ParseException e1) {
+										try {
+											((WptPt) parse).time = formatMillis.parse(text).getTime();
+										} catch (ParseException e2) {
+
+										}
+									}
+								}
+							}
+						}
+					}
+
+				} else if (tok == XmlPullParser.END_TAG) {
+					Object parse = parserState.peek();
+					String tag = parser.getName();
+					if (parse instanceof GPXExtensions && tag.equals("extensions")) {
+						extensionReadMode = false;
+					}
+
+					if (tag.equals("metadata")) {
+						Object pop = parserState.pop();
+						assert pop instanceof Metadata;
+					} else if (tag.equals("trkpt")) {
+						Object pop = parserState.pop();
+						assert pop instanceof WptPt;
+					} else if (tag.equals("wpt")) {
+						Object pop = parserState.pop();
+						assert pop instanceof WptPt;
+					} else if (tag.equals("rtept")) {
+						Object pop = parserState.pop();
+						assert pop instanceof WptPt;
+					} else if (tag.equals("trk")) {
+						Object pop = parserState.pop();
+						assert pop instanceof Track;
+					} else if (tag.equals("rte")) {
+						Object pop = parserState.pop();
+						assert pop instanceof Route;
+					} else if (tag.equals("trkseg")) {
+						Object pop = parserState.pop();
+						assert pop instanceof TrkSegment;
+					}
+				}
+			}
+		} catch (RuntimeException e) {
+			log.error("Error reading gpx", e); //$NON-NLS-1$
+			res.warning = "Error reading gpx" + " " + e.getMessage();
+		} catch (XmlPullParserException e) {
+			log.error("Error reading gpx", e); //$NON-NLS-1$
+			res.warning = "Error reading gpx" + " " + e.getMessage();
+		} catch (IOException e) {
+			log.error("Error reading gpx", e); //$NON-NLS-1$
+			res.warning = "Error reading gpx" + " " + e.getMessage();
+		}
+
+		return res;
+	}
+
+	private static Reader getUTF8Reader(InputStream f) throws IOException {
+		BufferedInputStream bis = new BufferedInputStream(f);
+		assert bis.markSupported();
+		bis.mark(3);
+		boolean reset = true;
+		byte[] t = new byte[3];
+		bis.read(t);
+		if (t[0] == ((byte) 0xef) && t[1] == ((byte) 0xbb) && t[2] == ((byte) 0xbf)) {
+			reset = false;
+		}
+		if (reset) {
+			bis.reset();
+		}
+		return new InputStreamReader(bis, "UTF-8");
+	}
+
+	private static WptPt parseWptAttributes(XmlPullParser parser) {
+		WptPt wpt = new WptPt();
+		try {
+			wpt.lat = Double.parseDouble(parser.getAttributeValue("", "lat")); //$NON-NLS-1$ //$NON-NLS-2$
+			wpt.lon = Double.parseDouble(parser.getAttributeValue("", "lon")); //$NON-NLS-1$ //$NON-NLS-2$
+		} catch (NumberFormatException e) {
+		}
+		return wpt;
+	}
+
+	public static void mergeGPXFileInto(GPXFile to, GPXFile from) {
+		if (from == null) {
+			return;
+		}
+		if (from.showCurrentTrack) {
+			to.showCurrentTrack = true;
+		}
+		if (from.points != null) {
+			to.points.addAll(from.points);
+		}
+		if (from.tracks != null) {
+			to.tracks.addAll(from.tracks);
+		}
+		if (from.routes != null) {
+			to.routes.addAll(from.routes);
+		}
+		if (from.warning != null) {
+			to.warning = from.warning;
+		}
+	}
+}
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/utils/LocationPoint.java b/OsmAnd-telegram/src/net/osmand/telegram/utils/LocationPoint.java
new file mode 100644
index 0000000000..220896e389
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/telegram/utils/LocationPoint.java
@@ -0,0 +1,24 @@
+package net.osmand.telegram.utils;
+
+
+import android.content.Context;
+
+/**
+ */
+public interface LocationPoint {
+
+	public double getLatitude();
+
+	public double getLongitude();
+
+	public int getColor();
+
+	public boolean isVisible();
+
+//	public PointDescription getPointDescription(Context ctx);
+
+//	public String getSpeakableName();
+
+	//public void prepareCommandPlayer(CommandBuilder cmd, String names);
+
+}
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/utils/OsmandApiUtils.kt b/OsmAnd-telegram/src/net/osmand/telegram/utils/OsmandApiUtils.kt
index be10f8f601..fe58650860 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/utils/OsmandApiUtils.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/utils/OsmandApiUtils.kt
@@ -1,46 +1,97 @@
 package net.osmand.telegram.utils
 
 import net.osmand.PlatformUtil
+import net.osmand.telegram.SHARE_DEVICES_KEY
 import net.osmand.telegram.TelegramApplication
 import net.osmand.telegram.TelegramSettings
+import org.drinkless.td.libcore.telegram.TdApi
 import org.json.JSONException
 import org.json.JSONObject
 
+const val BASE_URL = "https://live.osmand.net"
+
+const val BASE_SHARING_URL = "http://osmand.net/go"
+
 object OsmandApiUtils {
 
 	private val log = PlatformUtil.getLog(OsmandApiUtils::class.java)
 
 	fun updateSharingDevices(app: TelegramApplication, userId: Int) {
-		AndroidNetworkUtils.sendRequestAsync(
-			"https://osmand.net/device/send-devices?uid=$userId",
+		AndroidNetworkUtils.sendRequestAsync(app, "$BASE_URL/device/send-devices?uid=$userId", null, "Get Devices", true, false,
 			object : AndroidNetworkUtils.OnRequestResultListener {
-				override fun onResult(result: String) {
-					val list = parseJsonContents(result)
-					app.settings.updateShareDevicesIds(list)
+				override fun onResult(result: String?) {
+					if (result != null) {
+						val list = parseJsonContents(result)
+						app.settings.updateShareDevices(list)
+					}
 				}
 			}
 		)
 	}
 
+	fun createNewDevice(
+		app: TelegramApplication,
+		user: TdApi.User,
+		isBot: Boolean,
+		deviceName: String,
+		chatId: Long,
+		listener: AndroidNetworkUtils.OnRequestResultListener
+	) {
+		val json = getNewDeviceJson(user, isBot, deviceName, chatId)
+		if (json != null) {
+			AndroidNetworkUtils.sendRequestAsync(app, "$BASE_URL/device/new", json.toString(), "add Device", true, true, listener)
+		}
+	}
+
+	fun parseDeviceBot(deviceJSON: JSONObject): TelegramSettings.DeviceBot? {
+		return try {
+			TelegramSettings.DeviceBot().apply {
+				id = deviceJSON.optLong(TelegramSettings.DeviceBot.DEVICE_ID)
+				userId = deviceJSON.optLong(TelegramSettings.DeviceBot.USER_ID)
+				chatId = deviceJSON.optLong(TelegramSettings.DeviceBot.CHAT_ID)
+				deviceName = deviceJSON.optString(TelegramSettings.DeviceBot.DEVICE_NAME)
+				externalId = deviceJSON.optString(TelegramSettings.DeviceBot.EXTERNAL_ID)
+				data = deviceJSON.optString(TelegramSettings.DeviceBot.DATA)
+			}
+		} catch (e: JSONException) {
+			log.error(e.message, e)
+			null
+		}
+	}
+
 	fun parseJsonContents(contentsJson: String): List<TelegramSettings.DeviceBot> {
 		val list = mutableListOf<TelegramSettings.DeviceBot>()
 		try {
-			val jArray = JSONObject(contentsJson).getJSONArray("devices")
+			val jArray = JSONObject(contentsJson).getJSONArray(SHARE_DEVICES_KEY)
 			for (i in 0 until jArray.length()) {
 				val deviceJSON = jArray.getJSONObject(i)
-				val deviceBot = TelegramSettings.DeviceBot().apply {
-					id = deviceJSON.getLong("id")
-					userId = deviceJSON.getLong("userId")
-					chatId = deviceJSON.getLong("chatId")
-					deviceName = deviceJSON.getString("deviceName")
-					externalId = deviceJSON.getString("externalId")
-					data = deviceJSON.getString("data")
+				val deviceBot = parseDeviceBot(deviceJSON)
+				if (deviceBot != null) {
+					list.add(deviceBot)
 				}
-				list.add(deviceBot)
 			}
 		} catch (e: JSONException) {
 			log.error(e.message, e)
 		}
 		return list
 	}
+
+	private fun getNewDeviceJson(user: TdApi.User, isBot: Boolean, deviceName: String, chatId: Long): JSONObject? {
+		return try {
+			val json = JSONObject()
+			json.put("deviceName", deviceName)
+			json.put("chatId", chatId)
+			val jsonUser = JSONObject()
+			jsonUser.put("id", user.id)
+			jsonUser.put("firstName", user.firstName)
+			jsonUser.put("isBot", isBot)
+			jsonUser.put("lastName", user.lastName)
+			jsonUser.put("userName", user.username)
+			jsonUser.put("languageCode", user.languageCode)
+			json.put("user", jsonUser)
+		} catch (e: JSONException) {
+			log.error(e)
+			null
+		}
+	}
 }
\ No newline at end of file
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/utils/OsmandFormatter.kt b/OsmAnd-telegram/src/net/osmand/telegram/utils/OsmandFormatter.kt
index 7e8e4d9b32..3a9719848a 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/utils/OsmandFormatter.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/utils/OsmandFormatter.kt
@@ -23,6 +23,7 @@ object OsmandFormatter {
 	private const val SHORT_TIME_FORMAT = "%02d:%02d"
 	private const val SIMPLE_TIME_OF_DAY_FORMAT = "HH:mm"
 	private const val SIMPLE_DATE_FORMAT = "dd MMM HH:mm:ss"
+	private const val SHORT_DATE_FORMAT = "dd MMM yyyy"
 
 	private const val MIN_DURATION_FOR_DATE_FORMAT = 48 * 60 * 60
 
@@ -77,8 +78,13 @@ object OsmandFormatter {
 		}
 	}
 
-	fun getFormattedDate(seconds: Long): String =
-		SimpleDateFormat(SIMPLE_DATE_FORMAT, Locale.getDefault()).format(seconds * 1000L)
+	fun getFormattedDate(seconds: Long, shortFormat: Boolean = false): String {
+		return if (shortFormat) {
+			SimpleDateFormat(SIMPLE_DATE_FORMAT, Locale.getDefault()).format(seconds * 1000L)
+		} else {
+			SimpleDateFormat(SHORT_DATE_FORMAT, Locale.getDefault()).format(seconds * 1000L)
+		}
+	}
 
 	fun getListItemLiveTimeDescr(ctx: TelegramApplication, lastUpdated: Int, prefix: String = ""): String {
 		return if (lastUpdated > 0) {
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/utils/OsmandLocationUtils.kt b/OsmAnd-telegram/src/net/osmand/telegram/utils/OsmandLocationUtils.kt
new file mode 100644
index 0000000000..64eed09fc0
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/telegram/utils/OsmandLocationUtils.kt
@@ -0,0 +1,559 @@
+package net.osmand.telegram.utils
+
+import android.os.AsyncTask
+import net.osmand.Location
+import net.osmand.data.LatLon
+import net.osmand.telegram.TelegramApplication
+import net.osmand.telegram.helpers.LocationMessages
+import net.osmand.telegram.helpers.LocationMessages.BufferMessage
+import net.osmand.telegram.helpers.LocationMessages.LocationMessage
+import net.osmand.telegram.helpers.TelegramHelper
+import net.osmand.telegram.helpers.TelegramUiHelper
+import net.osmand.util.GeoPointParserUtil
+import net.osmand.util.MapUtils
+import org.drinkless.td.libcore.telegram.TdApi
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.*
+
+const val TRACKS_DIR = "tracker/"
+
+object OsmandLocationUtils {
+
+	const val DEVICE_PREFIX = "Device: "
+	const val LOCATION_PREFIX = "Location: "
+	const val LAST_LOCATION_PREFIX = "Last location: "
+	const val UPDATED_PREFIX = "Updated: "
+	const val USER_TEXT_LOCATION_TITLE = "\uD83D\uDDFA OsmAnd sharing:"
+
+	const val SHARING_LINK = "https://play.google.com/store/apps/details?id=net.osmand.telegram"
+
+	const val ALTITUDE_PREFIX = "Altitude: "
+	const val SPEED_PREFIX = "Speed: "
+	const val HDOP_PREFIX = "Horizontal precision: "
+
+	const val NOW = "now"
+	const val FEW_SECONDS_AGO = "few seconds ago"
+	const val SECONDS_AGO_SUFFIX = " seconds ago"
+	const val MINUTES_AGO_SUFFIX = " minutes ago"
+	const val HOURS_AGO_SUFFIX = " hours ago"
+	const val UTC_FORMAT_SUFFIX = " UTC"
+
+	val UTC_DATE_FORMAT = SimpleDateFormat("yyyy-MM-dd", Locale.US).apply {
+		timeZone = TimeZone.getTimeZone("UTC")
+	}
+
+	val UTC_TIME_FORMAT = SimpleDateFormat("HH:mm:ss", Locale.US).apply {
+		timeZone = TimeZone.getTimeZone("UTC")
+	}
+
+	fun getLastUpdatedTime(message: TdApi.Message): Int {
+		val content = message.content
+		return when (content) {
+			is MessageOsmAndBotLocation -> content.lastUpdated
+			is MessageUserLocation -> content.lastUpdated
+			else -> Math.max(message.editDate, message.date)
+		}
+	}
+
+	fun getOsmAndBotDeviceName(message: TdApi.Message): String {
+		var deviceName = ""
+		if (message.replyMarkup is TdApi.ReplyMarkupInlineKeyboard) {
+			val replyMarkup = message.replyMarkup as TdApi.ReplyMarkupInlineKeyboard
+			try {
+				deviceName = replyMarkup.rows[0][1].text.split("\\s".toRegex())[1]
+			} catch (e: Exception) {
+
+			}
+		}
+		return deviceName
+	}
+
+	fun parseOsmAndBotLocation(message: TdApi.Message): MessageOsmAndBotLocation {
+		val messageLocation = message.content as TdApi.MessageLocation
+		return MessageOsmAndBotLocation().apply {
+			name = getOsmAndBotDeviceName(message)
+			lat = messageLocation.location.latitude
+			lon = messageLocation.location.longitude
+			lastUpdated = getLastUpdatedTime(message)
+		}
+	}
+
+	fun parseUserMapLocation(message: TdApi.Message): MessageUserLocation {
+		val messageLocation = message.content as TdApi.MessageLocation
+		return MessageUserLocation().apply {
+			lat = messageLocation.location.latitude
+			lon = messageLocation.location.longitude
+			lastUpdated = getLastUpdatedTime(message)
+			type = LocationMessages.TYPE_USER_MAP
+		}
+	}
+
+	fun parseMessage(message: TdApi.Message, helper: TelegramHelper, previousMessageLatLon: LatLon?): LocationMessage? {
+		var locationMessage: LocationMessage? = null
+		val oldContent = message.content
+		val messageType = getMessageType(message,helper)
+		var parsedMessageContent: MessageLocation? = null
+		if (messageType != -1) {
+			parsedMessageContent = when (messageType) {
+				LocationMessages.TYPE_BOT_TEXT -> {
+					parseTextLocation((oldContent as TdApi.MessageText).text)
+				}
+				LocationMessages.TYPE_USER_TEXT -> {
+					if (oldContent is TdApi.MessageText) {
+						parseTextLocation(oldContent.text, false)
+					} else {
+						oldContent as MessageUserLocation
+					}
+				}
+				LocationMessages.TYPE_BOT_MAP -> {
+					parseOsmAndBotLocation(message)
+				}
+				LocationMessages.TYPE_USER_MAP -> {
+					parseUserMapLocation(message)
+				}
+				else -> null
+			}
+		}
+
+		if (parsedMessageContent != null) {
+			val distanceFromPrev = if (previousMessageLatLon != null) {
+				MapUtils.getDistance(previousMessageLatLon, parsedMessageContent.lat, parsedMessageContent.lon) } else 0.0
+
+			locationMessage = LocationMessage(helper.getSenderMessageId(message), message.chatId, parsedMessageContent.lat,
+					parsedMessageContent.lon, parsedMessageContent.altitude, parsedMessageContent.speed, parsedMessageContent.hdop,
+					parsedMessageContent.bearing, parsedMessageContent.lastUpdated * 1000L, messageType, message.id, distanceFromPrev)
+		}
+
+		return locationMessage
+	}
+
+	fun getMessageType(message: TdApi.Message, helper: TelegramHelper): Int {
+		val fromBot = helper.isOsmAndBot(message.senderUserId)
+		val viaBot = helper.isOsmAndBot(message.viaBotUserId)
+		val oldContent = message.content
+		return if (oldContent is TdApi.MessageText) {
+			if (fromBot || viaBot) {
+				LocationMessages.TYPE_BOT_TEXT
+			} else {
+				LocationMessages.TYPE_USER_TEXT
+			}
+		} else if (oldContent is TdApi.MessageLocation) {
+			if (fromBot || viaBot) {
+				LocationMessages.TYPE_BOT_MAP
+			} else {
+				LocationMessages.TYPE_USER_MAP
+			}
+		} else if (oldContent is MessageLocation) {
+			oldContent.type
+		} else {
+			-1
+		}
+	}
+
+	fun formatLocation(sig: Location): String {
+		return String.format(Locale.US, "%.5f, %.5f", sig.latitude, sig.longitude)
+	}
+
+	fun formatLocation(sig: LocationMessage): String {
+		return String.format(Locale.US, "%.5f, %.5f", sig.lat, sig.lon)
+	}
+
+	fun formatLocation(sig: BufferMessage): String {
+		return String.format(Locale.US, "%.5f, %.5f", sig.lat, sig.lon)
+	}
+
+	fun formatFullTime(ti: Long): String {
+		val dt = Date(ti)
+		return UTC_DATE_FORMAT.format(dt) + " " + UTC_TIME_FORMAT.format(dt) + " UTC"
+	}
+
+	fun parseOsmAndBotLocationContent(oldContent: MessageOsmAndBotLocation, content: TdApi.MessageContent): MessageOsmAndBotLocation {
+		val messageLocation = content as TdApi.MessageLocation
+		return MessageOsmAndBotLocation().apply {
+			name = oldContent.name
+			lat = messageLocation.location.latitude
+			lon = messageLocation.location.longitude
+			lastUpdated = (System.currentTimeMillis() / 1000).toInt()
+			type = LocationMessages.TYPE_BOT_MAP
+		}
+	}
+
+	fun parseTextLocation(text: TdApi.FormattedText, botLocation: Boolean = true): MessageLocation {
+		val res = if (botLocation) MessageOsmAndBotLocation() else MessageUserLocation()
+		res.type = if (botLocation) LocationMessages.TYPE_BOT_TEXT else LocationMessages.TYPE_USER_TEXT
+		var locationNA = false
+		for (s in text.text.lines()) {
+			when {
+				s.startsWith(DEVICE_PREFIX) -> {
+					if (res is MessageOsmAndBotLocation) {
+						res.name = s.removePrefix(DEVICE_PREFIX)
+					}
+				}
+				s.startsWith(LOCATION_PREFIX) || s.startsWith(LAST_LOCATION_PREFIX) -> {
+					var locStr: String
+					var parse = true
+					if (s.startsWith(LAST_LOCATION_PREFIX)) {
+						locStr = s.removePrefix(LAST_LOCATION_PREFIX)
+						if (!locationNA) {
+							parse = false
+						}
+					} else {
+						locStr = s.removePrefix(LOCATION_PREFIX)
+						if (locStr.trim() == "n/a") {
+							locationNA = true
+							parse = false
+						}
+					}
+					if (parse) {
+						try {
+							val urlTextEntity =
+								text.entities.firstOrNull { it.type is TdApi.TextEntityTypeTextUrl }
+							if (urlTextEntity != null && urlTextEntity.offset == text.text.indexOf(
+									locStr
+								)
+							) {
+								val url = (urlTextEntity.type as TdApi.TextEntityTypeTextUrl).url
+								val point: GeoPointParserUtil.GeoParsedPoint? =
+									GeoPointParserUtil.parse(url)
+								if (point != null) {
+									res.lat = point.latitude
+									res.lon = point.longitude
+								}
+							} else {
+								val (latS, lonS) = locStr.split(" ")
+								res.lat = latS.dropLast(1).toDouble()
+								res.lon = lonS.toDouble()
+
+								val timeIndex = locStr.indexOf("(")
+								if (timeIndex != -1) {
+									val updatedS = locStr.substring(timeIndex, locStr.length)
+									res.lastUpdated =
+											(parseTime(updatedS.removePrefix("(").removeSuffix(")")) / 1000).toInt()
+								}
+							}
+						} catch (e: Exception) {
+							e.printStackTrace()
+						}
+					}
+				}
+				s.startsWith(ALTITUDE_PREFIX) -> {
+					val altStr = s.removePrefix(ALTITUDE_PREFIX)
+					try {
+						val alt = altStr.split(" ").first()
+						res.altitude = alt.toDouble()
+					} catch (e: Exception) {
+						e.printStackTrace()
+					}
+				}
+				s.startsWith(SPEED_PREFIX) -> {
+					val altStr = s.removePrefix(SPEED_PREFIX)
+					try {
+						val alt = altStr.split(" ").first()
+						res.speed = alt.toDouble()
+					} catch (e: Exception) {
+						e.printStackTrace()
+					}
+				}
+				s.startsWith(HDOP_PREFIX) -> {
+					val altStr = s.removePrefix(HDOP_PREFIX)
+					try {
+						val alt = altStr.split(" ").first()
+						res.hdop = alt.toDouble()
+					} catch (e: Exception) {
+						e.printStackTrace()
+					}
+				}
+				s.startsWith(UPDATED_PREFIX) -> {
+					if (res.lastUpdated == 0) {
+						val updatedStr = s.removePrefix(UPDATED_PREFIX)
+						val endIndex = updatedStr.indexOf("(")
+						val updatedS = updatedStr.substring(
+							0,
+							if (endIndex != -1) endIndex else updatedStr.length
+						)
+						val parsedTime = (parseTime(updatedS.trim()) / 1000).toInt()
+						val currentTime = (System.currentTimeMillis() / 1000) - 1
+						res.lastUpdated =
+								if (parsedTime < currentTime) parsedTime else currentTime.toInt()
+					}
+				}
+			}
+		}
+		return res
+	}
+
+	fun parseTime(timeS: String): Long {
+		try {
+			when {
+				timeS.endsWith(FEW_SECONDS_AGO) -> return System.currentTimeMillis() - 5000
+
+				timeS.endsWith(SECONDS_AGO_SUFFIX) -> {
+					val locStr = timeS.removeSuffix(SECONDS_AGO_SUFFIX)
+					return System.currentTimeMillis() - locStr.toLong() * 1000
+				}
+				timeS.endsWith(MINUTES_AGO_SUFFIX) -> {
+					val locStr = timeS.removeSuffix(MINUTES_AGO_SUFFIX)
+					val minutes = locStr.toLong()
+					return System.currentTimeMillis() - minutes * 60 * 1000
+				}
+				timeS.endsWith(HOURS_AGO_SUFFIX) -> {
+					val locStr = timeS.removeSuffix(HOURS_AGO_SUFFIX)
+					val hours = locStr.toLong()
+					return (System.currentTimeMillis() - hours * 60 * 60 * 1000)
+				}
+				timeS.endsWith(UTC_FORMAT_SUFFIX) -> {
+					val locStr = timeS.removeSuffix(UTC_FORMAT_SUFFIX)
+					val (latS, lonS) = locStr.split(" ")
+					val date = UTC_DATE_FORMAT.parse(latS)
+					val time = UTC_TIME_FORMAT.parse(lonS)
+					val res = date.time + time.time
+					return res
+				}
+			}
+		} catch (e: Exception) {
+			e.printStackTrace()
+		}
+		return 0
+	}
+
+	fun getTextMessageContent(updateId: Int, location: LocationMessage): TdApi.InputMessageText {
+		val entities = mutableListOf<TdApi.TextEntity>()
+		val builder = StringBuilder()
+		val locationMessage = formatLocation(location)
+
+		val firstSpace = USER_TEXT_LOCATION_TITLE.indexOf(' ')
+		val secondSpace = USER_TEXT_LOCATION_TITLE.indexOf(' ', firstSpace + 1)
+		entities.add(TdApi.TextEntity(builder.length + firstSpace + 1, secondSpace - firstSpace, TdApi.TextEntityTypeTextUrl(SHARING_LINK)))
+		builder.append("$USER_TEXT_LOCATION_TITLE\n")
+
+		entities.add(TdApi.TextEntity(builder.lastIndex, LOCATION_PREFIX.length, TdApi.TextEntityTypeBold()))
+		builder.append(LOCATION_PREFIX)
+
+		entities.add(TdApi.TextEntity(builder.length, locationMessage.length,
+			TdApi.TextEntityTypeTextUrl("$BASE_SHARING_URL?lat=${location.lat}&lon=${location.lon}")))
+		builder.append("$locationMessage\n")
+
+		if (location.altitude != 0.0) {
+			entities.add(TdApi.TextEntity(builder.lastIndex, ALTITUDE_PREFIX.length, TdApi.TextEntityTypeBold()))
+			builder.append(String.format(Locale.US, "$ALTITUDE_PREFIX%.1f m\n", location.altitude))
+		}
+		if (location.speed > 0) {
+			entities.add(TdApi.TextEntity(builder.lastIndex, SPEED_PREFIX.length, TdApi.TextEntityTypeBold()))
+			builder.append(String.format(Locale.US, "$SPEED_PREFIX%.1f m/s\n", location.speed))
+		}
+		if (location.hdop != 0.0 && location.speed == 0.0) {
+			entities.add(TdApi.TextEntity(builder.lastIndex, HDOP_PREFIX.length, TdApi.TextEntityTypeBold()))
+			builder.append(String.format(Locale.US, "$HDOP_PREFIX%d m\n", location.hdop.toInt()))
+		}
+		if (updateId == 0) {
+			builder.append(String.format("$UPDATED_PREFIX%s\n", formatFullTime(location.time)))
+		} else {
+			builder.append(String.format("$UPDATED_PREFIX%s (%d)\n", formatFullTime(location.time), updateId))
+		}
+		val textMessage = builder.toString().trim()
+
+		return TdApi.InputMessageText(TdApi.FormattedText(textMessage, entities.toTypedArray()), true, true)
+	}
+
+	fun getTextMessageContent(updateId: Int, location: BufferMessage): TdApi.InputMessageText {
+		val entities = mutableListOf<TdApi.TextEntity>()
+		val builder = StringBuilder()
+		val locationMessage = formatLocation(location)
+
+		val firstSpace = USER_TEXT_LOCATION_TITLE.indexOf(' ')
+		val secondSpace = USER_TEXT_LOCATION_TITLE.indexOf(' ', firstSpace + 1)
+		entities.add(TdApi.TextEntity(builder.length + firstSpace + 1, secondSpace - firstSpace, TdApi.TextEntityTypeTextUrl(SHARING_LINK)))
+		builder.append("$USER_TEXT_LOCATION_TITLE\n")
+
+		entities.add(TdApi.TextEntity(builder.lastIndex, LOCATION_PREFIX.length, TdApi.TextEntityTypeBold()))
+		builder.append(LOCATION_PREFIX)
+
+		entities.add(TdApi.TextEntity(builder.length, locationMessage.length,
+			TdApi.TextEntityTypeTextUrl("$BASE_SHARING_URL?lat=${location.lat}&lon=${location.lon}")))
+		builder.append("$locationMessage\n")
+
+		if (location.altitude != 0.0) {
+			entities.add(TdApi.TextEntity(builder.lastIndex, ALTITUDE_PREFIX.length, TdApi.TextEntityTypeBold()))
+			builder.append(String.format(Locale.US, "$ALTITUDE_PREFIX%.1f m\n", location.altitude))
+		}
+		if (location.speed > 0) {
+			entities.add(TdApi.TextEntity(builder.lastIndex, SPEED_PREFIX.length, TdApi.TextEntityTypeBold()))
+			builder.append(String.format(Locale.US, "$SPEED_PREFIX%.1f m/s\n", location.speed))
+		}
+		if (location.hdop != 0.0 && location.speed == 0.0) {
+			entities.add(TdApi.TextEntity(builder.lastIndex, HDOP_PREFIX.length, TdApi.TextEntityTypeBold()))
+			builder.append(String.format(Locale.US, "$HDOP_PREFIX%d m\n", location.hdop.toInt()))
+		}
+		if (updateId == 0) {
+			builder.append(String.format("$UPDATED_PREFIX%s\n", formatFullTime(location.time)))
+		} else {
+			builder.append(String.format("$UPDATED_PREFIX%s (%d)\n", formatFullTime(location.time), updateId))
+		}
+		val textMessage = builder.toString().trim()
+
+		return TdApi.InputMessageText(TdApi.FormattedText(textMessage, entities.toTypedArray()), true, true)
+	}
+
+	fun convertLocationMessagesToGpxFiles(items: List<LocationMessage>, newGpxPerChat: Boolean = true): List<GPXUtilities.GPXFile> {
+		val dataTracks = ArrayList<GPXUtilities.GPXFile>()
+
+		var previousTime: Long = -1
+		var previousChatId: Long = -1
+		var previousUserId = -1
+		var segment: GPXUtilities.TrkSegment? = null
+		var track: GPXUtilities.Track? = null
+		var gpx: GPXUtilities.GPXFile? = null
+		var countedLocations = 0
+
+		items.forEach {
+			val userId = it.userId
+			val chatId = it.chatId
+			val time = it.time
+			if (previousTime >= time) {
+				return@forEach
+			}
+			countedLocations++
+			if (previousUserId != userId || (newGpxPerChat && previousChatId != chatId)) {
+				gpx = GPXUtilities.GPXFile()
+				gpx!!.chatId = chatId
+				gpx!!.userId = userId
+				previousTime = 0
+				track = null
+				segment = null
+				dataTracks.add(gpx!!)
+			}
+			val pt = GPXUtilities.WptPt()
+			pt.userId = userId
+			pt.chatId = chatId
+			pt.lat = it.lat
+			pt.lon = it.lon
+			pt.ele = it.altitude
+			pt.speed = it.speed
+			pt.hdop = it.hdop
+			pt.time = time
+			val currentInterval = Math.abs(time - previousTime)
+			if (track != null) {
+				if (currentInterval < 30 * 60 * 1000) {
+					// 30 minute - same segment
+					segment!!.points.add(pt)
+				} else {
+					segment = GPXUtilities.TrkSegment()
+					segment!!.points.add(pt)
+					track!!.segments.add(segment)
+				}
+			} else {
+				track = GPXUtilities.Track()
+				segment = GPXUtilities.TrkSegment()
+				track!!.segments.add(segment)
+				segment!!.points.add(pt)
+
+				gpx!!.tracks.add(track)
+			}
+			previousTime = time
+			previousUserId = userId
+			previousChatId = chatId
+		}
+
+		return dataTracks
+	}
+
+	fun saveGpx(app: TelegramApplication, listener: SaveGpxListener, dir: File, gpxFile: GPXUtilities.GPXFile) {
+		if (!gpxFile.isEmpty) {
+			val task = SaveGPXTrackToFileTask(app, listener, gpxFile, dir, 0)
+			task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
+		}
+	}
+
+	abstract class MessageLocation : TdApi.MessageContent() {
+
+		var lat: Double = Double.NaN
+			internal set
+		var lon: Double = Double.NaN
+			internal set
+		var lastUpdated: Int = 0
+			internal set
+		var speed: Double = 0.0
+			internal set
+		var altitude: Double = 0.0
+			internal set
+		var hdop: Double = 0.0
+			internal set
+		var bearing: Double = 0.0
+			internal set
+		var type: Int = -1
+			internal set
+
+		override fun getConstructor() = -1
+
+		abstract fun isValid(): Boolean
+	}
+
+	class MessageOsmAndBotLocation : MessageLocation() {
+
+		var name: String = ""
+			internal set
+
+		override fun isValid() = name != "" && lat != Double.NaN && lon != Double.NaN
+	}
+
+	class MessageUserLocation : MessageLocation() {
+
+		override fun isValid() = lat != Double.NaN && lon != Double.NaN
+
+	}
+
+	private class SaveGPXTrackToFileTask internal constructor(
+		private val app: TelegramApplication, private val listener: SaveGpxListener?,
+		private val gpxFile: GPXUtilities.GPXFile, private val dir: File, private val userId: Int
+	) :
+		AsyncTask<Void, Void, List<String>>() {
+
+		override fun doInBackground(vararg params: Void): List<String> {
+			val warnings = ArrayList<String>()
+			dir.mkdirs()
+			if (dir.parentFile.canWrite()) {
+				if (dir.exists()) {
+					// save file
+					var fout = File(dir, "$userId.gpx")
+					if (!gpxFile.isEmpty) {
+						val pt = gpxFile.findPointToShow()
+
+						val user = app.telegramHelper.getUser(pt!!.userId)
+						val fileName: String
+						fileName = if (user != null) {
+							(TelegramUiHelper.getUserName(user) + "_" + SimpleDateFormat("yyyy-MM-dd", Locale.US).format(Date(pt.time)))
+						} else {
+							userId.toString() + "_" + SimpleDateFormat("yyyy-MM-dd", Locale.US).format(Date(pt.time))
+						}
+						fout = File(dir, "$fileName.gpx")
+					}
+					val warn = GPXUtilities.writeGpxFile(fout, gpxFile, app)
+					if (warn != null) {
+						warnings.add(warn)
+						return warnings
+					}
+				}
+			}
+
+			return warnings
+		}
+
+		override fun onPostExecute(warnings: List<String>?) {
+			if (listener != null) {
+				if (warnings != null && warnings.isEmpty()) {
+					listener.onSavingGpxFinish(gpxFile.path)
+				} else {
+					listener.onSavingGpxError(warnings)
+				}
+			}
+		}
+	}
+
+	interface SaveGpxListener {
+
+		fun onSavingGpxFinish(path: String)
+
+		fun onSavingGpxError(warnings: List<String>?)
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/.gitignore b/OsmAnd/.gitignore
index 5f59a8e51a..c75beb837e 100644
--- a/OsmAnd/.gitignore
+++ b/OsmAnd/.gitignore
@@ -22,6 +22,7 @@ assets/specialphrases/*
 assets/voice/*
 assets/fonts/*
 assets/feature_articles/*
+assets/World_basemap_mini*
 gen/
 local.properties
 raw/
diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index c0d2b707a7..b76a33db3e 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -39,7 +39,7 @@
 	<uses-feature android:name="android.hardware.bluetooth" android:required="false" />
 	<uses-feature android:name="com.sec.feature.spen_usp" android:required="false"/>
 
-	<uses-sdk android:targetSdkVersion="26" android:minSdkVersion="15"
+	<uses-sdk android:targetSdkVersion="26"
 		tools:overrideLibrary="com.getkeepsafe.taptargetview, studio.carbonylgroup.textfieldboxes, android.support.customtabs"/>
 
 	<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"
@@ -119,34 +119,160 @@
 
 			<!-- android matches non-greedy : http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i-->
 			<!-- mimeType&host are both needed or you will either have unwanted matching or no match when needed -->
-			<intent-filter>
+			<!-- Capture file open requests (pathPattern is honoured) where no MIME type is provided in the Intent.  An Intent with a null
+           MIME type will never be matched by a filter with a set MIME type, so we need a second intent-filter if we wish to also
+           match files with this extension and a non-null MIME type (even if it is non-null but zero length).
+           https://stackoverflow.com/a/31028507/4654078 -->
+
+			<intent-filter
+				android:label="@string/app_name"
+				android:priority="50">
 				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.gpx" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.gpx" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.gpx" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.gpx" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.kml" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.kml" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.kml" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.kml" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kml" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.kmz" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.kmz" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.kmz" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.kmz" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmz" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.obf" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.obf" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.obf" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.obf" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.obf" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.sqlitedb" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.sqlitedb" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.sqlitedb" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.sqlitedb" />
-				<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.sqlitedb" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="file"/>
+				<data android:scheme="content"/>
+				<data android:host="*"/>
+				<data android:pathPattern=".*\\.gpx" />
+				<data android:pathPattern=".*\\..*\\.gpx" />
+				<data android:pathPattern=".*\\..*\\..*\\.gpx" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\.gpx" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx" />
+			</intent-filter>
+
+			<intent-filter
+				android:label="@string/app_name"
+				android:priority="50">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="file"/>
+				<data android:scheme="content"/>
+				<data android:host="*"/>
+				<data android:mimeType="*/*"/>
+				<data android:pathPattern=".*\\.gpx" />
+				<data android:pathPattern=".*\\..*\\.gpx" />
+				<data android:pathPattern=".*\\..*\\..*\\.gpx" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\.gpx" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx" />
+			</intent-filter>
+
+			<intent-filter
+				android:label="@string/app_name"
+				android:priority="50">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="content"/>
+				<data android:scheme="file"/>
+				<data android:scheme="data"/>
+				<data android:host="*"/>
+				<data android:mimeType="*/*"/>
+				<data android:pathPattern="*.kml"/>
+				<data android:pathPattern=".*\\.kml" />
+				<data android:pathPattern=".*\\..*\\.kml" />
+				<data android:pathPattern=".*\\..*\\..*\\.kml" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\.kml" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kml" />
+			</intent-filter>
+
+			<intent-filter
+				android:label="@string/app_name"
+				android:priority="50">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="content"/>
+				<data android:scheme="file"/>
+				<data android:scheme="data"/>
+				<data android:host="*"/>
+				<data android:mimeType="*/*"/>
+				<data android:pathPattern=".*\\.kmz" />
+				<data android:pathPattern=".*\\..*\\.kmz" />
+				<data android:pathPattern=".*\\..*\\..*\\.kmz" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\.kmz" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmz" />
+			</intent-filter>
+
+			<intent-filter
+				android:label="@string/app_name"
+				android:priority="50">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="file"/>
+				<data android:host="*"/>
+				<data android:mimeType="*/*"/>
+				<data android:pathPattern=".*\\.kmz" />
+				<data android:pathPattern=".*\\..*\\.kmz" />
+				<data android:pathPattern=".*\\..*\\..*\\.kmz" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\.kmz" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmz" />
+			</intent-filter>
+
+			<intent-filter
+				android:label="@string/app_name"
+				android:priority="50">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="file"/>
+				<data android:host="*"/>
+				<data android:pathPattern=".*\\.obf" />
+				<data android:pathPattern=".*\\..*\\.obf" />
+				<data android:pathPattern=".*\\..*\\..*\\.obf" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\.obf" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.obf" />
+			</intent-filter>
+
+			<intent-filter
+				android:label="@string/app_name"
+				android:priority="50">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="file"/>
+				<data android:host="*"/>
+				<data android:mimeType="*/*"/>
+				<data android:pathPattern=".*\\.obf" />
+				<data android:pathPattern=".*\\..*\\.obf" />
+				<data android:pathPattern=".*\\..*\\..*\\.obf" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\.obf" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.obf" />
+			</intent-filter>
+
+			<intent-filter
+				android:label="@string/app_name"
+				android:priority="50">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="file"/>
+				<data android:host="*"/>
+				<data android:pathPattern=".*\\.sqlitedb" />
+				<data android:pathPattern=".*\\..*\\.sqlitedb" />
+				<data android:pathPattern=".*\\..*\\..*\\.sqlitedb" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\.sqlitedb" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.sqlitedb" />
+			</intent-filter>
+
+			<intent-filter
+				android:label="@string/app_name"
+				android:priority="50">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="content"/>
+				<data android:scheme="file"/>
+				<data android:scheme="data"/>
+				<data android:host="*"/>
+				<data android:mimeType="*/*"/>
+				<data android:pathPattern="*.sqlitedb" />
+				<data android:pathPattern=".*\\.sqlitedb" />
+				<data android:pathPattern=".*\\..*\\.sqlitedb" />
+				<data android:pathPattern=".*\\..*\\..*\\.sqlitedb" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\.sqlitedb" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.sqlitedb" />
 			</intent-filter>
 
 			<!--trying to handle emails-->
diff --git a/OsmAnd/assets/bundled_assets.xml b/OsmAnd/assets/bundled_assets.xml
index 4b0e2550e1..3cb6693083 100644
--- a/OsmAnd/assets/bundled_assets.xml
+++ b/OsmAnd/assets/bundled_assets.xml
@@ -21,7 +21,9 @@
 	<asset source="voice/fa/fa_tts.js" destination="voice/fa-tts/fa_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/fi/fi_tts.js" destination="voice/fi-tts/fi_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/fr/fr_tts.js" destination="voice/fr-tts/fr_tts.js" mode="alwaysOverwriteOrCopy" />
+	<asset source="voice/gn-py/gn-py_tts.js" destination="voice/gn-py-tts/gn-py_tts.js" mode="overwriteOnlyIfExists" />
 	<!--<asset source="voice/he/he_tts.js" destination="voice/he-tts/he_tts.js" mode="overwriteOnlyIfExists" />-->
+	<asset source="voice/nb/nb_tts.js" destination="voice/nb-tts/nb_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/hi/hi_tts.js" destination="voice/hi-tts/hi_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/hr/hr_tts.js" destination="voice/hr-tts/hr_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/hu/hu_tts.js" destination="voice/hu-tts/hu_tts.js" mode="overwriteOnlyIfExists" />
@@ -49,8 +51,6 @@
 	<asset source="fonts/10_NotoSans-Bold.ttf" destination="fonts/10_NotoSans-Bold.ttf" mode="alwaysOverwriteOrCopy" />
 	<asset source="fonts/15_NotoSans-Italic.ttf" destination="fonts/15_NotoSans-Italic.ttf" mode="alwaysOverwriteOrCopy" />
 	<asset source="fonts/20_NotoSans-BoldItalic.ttf" destination="fonts/20_NotoSans-BoldItalic.ttf" mode="alwaysOverwriteOrCopy" />
-	<asset source="fonts/25_NotoSansArabic-Regular.ttf" destination="fonts/25_NotoSansArabic-Regular.ttf" mode="alwaysOverwriteOrCopy" />
-	<asset source="fonts/30_NotoSansArabic-Bold.ttf" destination="fonts/30_NotoSansArabic-Bold.ttf" mode="alwaysOverwriteOrCopy" />
 	<asset source="fonts/35_NotoSansSouthAsian-Regular.ttf" destination="fonts/35_NotoSansSouthAsian-Regular.ttf" mode="alwaysOverwriteOrCopy" />
 	<asset source="fonts/40_NotoSansSouthAsian-Bold.ttf" destination="fonts/40_NotoSansSouthAsian-Bold.ttf" mode="alwaysOverwriteOrCopy" />
 	<asset source="fonts/45_NotoSansSoutheastAsian-Regular.ttf" destination="fonts/45_NotoSansSoutheastAsian-Regular.ttf" mode="alwaysOverwriteOrCopy" />
@@ -60,4 +60,6 @@
 	<asset source="fonts/65_NotoSansNastaliqUrdu-Regular.ttf" destination="fonts/65_NotoSansNastaliqUrdu-Regular.ttf" mode="alwaysOverwriteOrCopy" />
 
 	<asset source="sounds/camera_click.ogg" destination="sounds/camera_click.ogg" mode="copyOnlyIfDoesNotExist" />
+
+	<asset source="World_basemap_mini.obf" destination="World_basemap_mini.obf" mode="alwaysOverwriteOrCopy" />
 </assets>
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index b0a4d3a82e..8695bd75c6 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -52,10 +52,10 @@ android {
 		minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() :
 				 (analytics ? 15 : 14)
 		targetSdkVersion 26
-		versionCode 320
+		versionCode 330
 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
 		multiDexEnabled true
-		versionName "3.2.0"
+		versionName "3.3.0"
 		versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
 		versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName
 	}
@@ -234,6 +234,12 @@ task validateTranslate {
 	}
 }
 
+task downloadWorldMiniBasemap {
+	doLast {
+		ant.get(src: 'http://builder.osmand.net/basemap/World_basemap_mini_2.obf', dest: 'assets/World_basemap_mini.obf', skipexisting: 'true')
+	}
+}
+
 task collectVoiceAssets(type: Sync) {
 	from "../../resources/voice"
 	into "assets/voice"
@@ -292,13 +298,14 @@ task copyWidgetIcons(type: Exec) {
 
 task collectExternalResources {
 	dependsOn collectVoiceAssets,
-		collectFonts,
-		collectHelpContentsAssets,
-		collectHelpContentsStyle,
-		copyStyleIcons,
-		updateNoTranslate,
-		validateTranslate,
-		copyWidgetIcons
+			collectFonts,
+			collectHelpContentsAssets,
+			collectHelpContentsStyle,
+			copyStyleIcons,
+			updateNoTranslate,
+			validateTranslate,
+			copyWidgetIcons,
+			downloadWorldMiniBasemap
 }
 
 // Legacy core build
diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml
index 4f310b48ec..be266d95a0 100644
--- a/OsmAnd/no_translate.xml
+++ b/OsmAnd/no_translate.xml
@@ -24,7 +24,12 @@
     <string name="hint_tag">Tag</string>
     <string name="hint_value">Value</string>
     <!-- DEVELOPMENT -->
-        <string name="osm_live_default_price">€1,49</string>
+    <string name="osm_live_default_price">€1,49</string>
+    <string name="osm_live_monthly_price">€1,99</string>
+    <string name="osm_live_3_months_price">€3,99</string>
+    <string name="osm_live_3_months_monthly_price">€1,33</string>
+    <string name="osm_live_annual_price">€7,99</string>
+    <string name="osm_live_annual_monthly_price">€2,66</string>
     <string name="twitter_address">https://twitter.com/osmandapp</string>
     <string name="facebook_address">https://www.facebook.com/osmandapp</string>
     <string name="vk_address">https://vk.com/osmandapp</string>
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_allow_private_access.png b/OsmAnd/res/drawable-hdpi/ic_action_allow_private_access.png
new file mode 100644
index 0000000000..e0fd9cf302
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_allow_private_access.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_avoid_motorways.png b/OsmAnd/res/drawable-hdpi/ic_action_avoid_motorways.png
new file mode 100644
index 0000000000..7820b1e9e5
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_avoid_motorways.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_edit_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_edit_dark.png
index 7a84c52ecc..bff0bdb1a9 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_edit_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_elevation.png b/OsmAnd/res/drawable-hdpi/ic_action_elevation.png
new file mode 100644
index 0000000000..5f6e69aa61
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_elevation.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_forbid_private_access.png b/OsmAnd/res/drawable-hdpi/ic_action_forbid_private_access.png
new file mode 100644
index 0000000000..bf0de8b1bd
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_forbid_private_access.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_fuel.png b/OsmAnd/res/drawable-hdpi/ic_action_fuel.png
new file mode 100644
index 0000000000..cfa278c5fe
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_fuel.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_item_move.png b/OsmAnd/res/drawable-hdpi/ic_action_item_move.png
new file mode 100644
index 0000000000..beb5146138
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_item_move.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_motorways.png b/OsmAnd/res/drawable-hdpi/ic_action_motorways.png
new file mode 100644
index 0000000000..d1f9d0cab7
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_motorways.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_nautical_depth.png b/OsmAnd/res/drawable-hdpi/ic_action_nautical_depth.png
new file mode 100644
index 0000000000..2be1fb6d06
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_nautical_depth.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png
index fba92868eb..ac26add075 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_sand_clock.png b/OsmAnd/res/drawable-hdpi/ic_action_sand_clock.png
new file mode 100644
index 0000000000..5aacc19165
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_sand_clock.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_show_along_route.png b/OsmAnd/res/drawable-hdpi/ic_action_show_along_route.png
new file mode 100644
index 0000000000..1afaf4f922
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_show_along_route.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_start_navigation.png b/OsmAnd/res/drawable-hdpi/ic_action_start_navigation.png
index f858899c7a..05f1981a06 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_start_navigation.png and b/OsmAnd/res/drawable-hdpi/ic_action_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_unlimited_download.png b/OsmAnd/res/drawable-hdpi/ic_action_unlimited_download.png
new file mode 100644
index 0000000000..6ec40bdb79
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_unlimited_download.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_volume_mute.png b/OsmAnd/res/drawable-hdpi/ic_action_volume_mute.png
new file mode 100644
index 0000000000..5d54c893d4
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_volume_mute.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_nautical_bearing.png b/OsmAnd/res/drawable-hdpi/map_nautical_bearing.png
new file mode 100644
index 0000000000..72e427c437
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_nautical_bearing.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_nautical_bearing_night.png b/OsmAnd/res/drawable-hdpi/map_nautical_bearing_night.png
new file mode 100644
index 0000000000..c7d4e436be
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_nautical_bearing_night.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_nautical_location.png b/OsmAnd/res/drawable-hdpi/map_nautical_location.png
new file mode 100644
index 0000000000..4a8b8aebc5
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_nautical_location.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_nautical_location_night.png b/OsmAnd/res/drawable-hdpi/map_nautical_location_night.png
new file mode 100644
index 0000000000..80baedcf73
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_nautical_location_night.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_nautical_location_view_angle.png b/OsmAnd/res/drawable-hdpi/map_nautical_location_view_angle.png
new file mode 100644
index 0000000000..6940b54e60
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_nautical_location_view_angle.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_nautical_location_view_angle_night.png b/OsmAnd/res/drawable-hdpi/map_nautical_location_view_angle_night.png
new file mode 100644
index 0000000000..744054c178
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_nautical_location_view_angle_night.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_start_navigation.png b/OsmAnd/res/drawable-hdpi/map_start_navigation.png
index f858899c7a..9ab5382df1 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_start_navigation.png and b/OsmAnd/res/drawable-hdpi/map_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_nautical_bearing.png b/OsmAnd/res/drawable-large-hdpi/map_nautical_bearing.png
new file mode 100644
index 0000000000..84492536d2
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_nautical_bearing.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_nautical_bearing_night.png b/OsmAnd/res/drawable-large-hdpi/map_nautical_bearing_night.png
new file mode 100644
index 0000000000..4a5d566a9f
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_nautical_bearing_night.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_nautical_location.png b/OsmAnd/res/drawable-large-hdpi/map_nautical_location.png
new file mode 100644
index 0000000000..eb4ee41d99
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_nautical_location.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_nautical_location_night.png b/OsmAnd/res/drawable-large-hdpi/map_nautical_location_night.png
new file mode 100644
index 0000000000..5925133490
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_nautical_location_night.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_nautical_location_view_angle.png b/OsmAnd/res/drawable-large-hdpi/map_nautical_location_view_angle.png
new file mode 100644
index 0000000000..db4d3d4a75
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_nautical_location_view_angle.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_nautical_location_view_angle_night.png b/OsmAnd/res/drawable-large-hdpi/map_nautical_location_view_angle_night.png
new file mode 100644
index 0000000000..908e52b411
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_nautical_location_view_angle_night.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_start_navigation.png b/OsmAnd/res/drawable-large-hdpi/map_start_navigation.png
index 50e6999757..3e784bf91e 100644
Binary files a/OsmAnd/res/drawable-large-hdpi/map_start_navigation.png and b/OsmAnd/res/drawable-large-hdpi/map_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_nautical_bearing.png b/OsmAnd/res/drawable-large-xhdpi/map_nautical_bearing.png
new file mode 100644
index 0000000000..01533ae4f7
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_nautical_bearing.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_nautical_bearing_night.png b/OsmAnd/res/drawable-large-xhdpi/map_nautical_bearing_night.png
new file mode 100644
index 0000000000..e6687ff69a
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_nautical_bearing_night.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_nautical_location.png b/OsmAnd/res/drawable-large-xhdpi/map_nautical_location.png
new file mode 100644
index 0000000000..4e19b38778
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_nautical_location.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_nautical_location_night.png b/OsmAnd/res/drawable-large-xhdpi/map_nautical_location_night.png
new file mode 100644
index 0000000000..8800e0c2b8
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_nautical_location_night.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_nautical_location_view_angle.png b/OsmAnd/res/drawable-large-xhdpi/map_nautical_location_view_angle.png
new file mode 100644
index 0000000000..28f4b540fe
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_nautical_location_view_angle.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_nautical_location_view_angle_night.png b/OsmAnd/res/drawable-large-xhdpi/map_nautical_location_view_angle_night.png
new file mode 100644
index 0000000000..c1b505218b
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_nautical_location_view_angle_night.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_start_navigation.png b/OsmAnd/res/drawable-large-xhdpi/map_start_navigation.png
index 6445f91337..ee62bbac20 100644
Binary files a/OsmAnd/res/drawable-large-xhdpi/map_start_navigation.png and b/OsmAnd/res/drawable-large-xhdpi/map_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-large/map_nautical_bearing.png b/OsmAnd/res/drawable-large/map_nautical_bearing.png
new file mode 100644
index 0000000000..72e427c437
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_nautical_bearing.png differ
diff --git a/OsmAnd/res/drawable-large/map_nautical_bearing_night.png b/OsmAnd/res/drawable-large/map_nautical_bearing_night.png
new file mode 100644
index 0000000000..c7d4e436be
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_nautical_bearing_night.png differ
diff --git a/OsmAnd/res/drawable-large/map_nautical_location.png b/OsmAnd/res/drawable-large/map_nautical_location.png
new file mode 100644
index 0000000000..4a8b8aebc5
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_nautical_location.png differ
diff --git a/OsmAnd/res/drawable-large/map_nautical_location_night.png b/OsmAnd/res/drawable-large/map_nautical_location_night.png
new file mode 100644
index 0000000000..80baedcf73
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_nautical_location_night.png differ
diff --git a/OsmAnd/res/drawable-large/map_nautical_location_view_angle.png b/OsmAnd/res/drawable-large/map_nautical_location_view_angle.png
new file mode 100644
index 0000000000..6940b54e60
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_nautical_location_view_angle.png differ
diff --git a/OsmAnd/res/drawable-large/map_nautical_location_view_angle_night.png b/OsmAnd/res/drawable-large/map_nautical_location_view_angle_night.png
new file mode 100644
index 0000000000..744054c178
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_nautical_location_view_angle_night.png differ
diff --git a/OsmAnd/res/drawable-large/map_start_navigation.png b/OsmAnd/res/drawable-large/map_start_navigation.png
index f858899c7a..9ab5382df1 100644
Binary files a/OsmAnd/res/drawable-large/map_start_navigation.png and b/OsmAnd/res/drawable-large/map_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_allow_private_access.png b/OsmAnd/res/drawable-mdpi/ic_action_allow_private_access.png
new file mode 100644
index 0000000000..500496b736
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_allow_private_access.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_avoid_motorways.png b/OsmAnd/res/drawable-mdpi/ic_action_avoid_motorways.png
new file mode 100644
index 0000000000..643f3d8b60
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_avoid_motorways.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_edit_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_edit_dark.png
index d1b7340b56..2ad91ead2e 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_edit_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_elevation.png b/OsmAnd/res/drawable-mdpi/ic_action_elevation.png
new file mode 100644
index 0000000000..c5419d9164
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_elevation.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_forbid_private_access.png b/OsmAnd/res/drawable-mdpi/ic_action_forbid_private_access.png
new file mode 100644
index 0000000000..4b7db66c7f
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_forbid_private_access.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_fuel.png b/OsmAnd/res/drawable-mdpi/ic_action_fuel.png
new file mode 100644
index 0000000000..d3d12983d2
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_fuel.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_item_move.png b/OsmAnd/res/drawable-mdpi/ic_action_item_move.png
new file mode 100644
index 0000000000..f3b8367a18
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_item_move.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_motorways.png b/OsmAnd/res/drawable-mdpi/ic_action_motorways.png
new file mode 100644
index 0000000000..cb91768a09
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_motorways.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_nautical_depth.png b/OsmAnd/res/drawable-mdpi/ic_action_nautical_depth.png
new file mode 100644
index 0000000000..536f58dac3
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_nautical_depth.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_road_works_dark.png
index 3fb1c2cd90..72417b25f5 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_road_works_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_road_works_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_sand_clock.png b/OsmAnd/res/drawable-mdpi/ic_action_sand_clock.png
new file mode 100644
index 0000000000..a0590dab76
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_sand_clock.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_show_along_route.png b/OsmAnd/res/drawable-mdpi/ic_action_show_along_route.png
new file mode 100644
index 0000000000..59994b22f8
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_show_along_route.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_start_navigation.png b/OsmAnd/res/drawable-mdpi/ic_action_start_navigation.png
index 3ad15dbab7..d145134e9e 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_start_navigation.png and b/OsmAnd/res/drawable-mdpi/ic_action_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_unlimited_download.png b/OsmAnd/res/drawable-mdpi/ic_action_unlimited_download.png
new file mode 100644
index 0000000000..01cbc6aa57
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_unlimited_download.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_volume_mute.png b/OsmAnd/res/drawable-mdpi/ic_action_volume_mute.png
new file mode 100644
index 0000000000..f7341e3544
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_volume_mute.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_nautical_bearing.png b/OsmAnd/res/drawable-mdpi/map_nautical_bearing.png
new file mode 100644
index 0000000000..f5226ce658
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_nautical_bearing.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_nautical_bearing_night.png b/OsmAnd/res/drawable-mdpi/map_nautical_bearing_night.png
new file mode 100644
index 0000000000..1cac77b7c5
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_nautical_bearing_night.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_nautical_location.png b/OsmAnd/res/drawable-mdpi/map_nautical_location.png
new file mode 100644
index 0000000000..ccf25980c1
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_nautical_location.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_nautical_location_night.png b/OsmAnd/res/drawable-mdpi/map_nautical_location_night.png
new file mode 100644
index 0000000000..0ab169798e
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_nautical_location_night.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_nautical_location_view_angle.png b/OsmAnd/res/drawable-mdpi/map_nautical_location_view_angle.png
new file mode 100644
index 0000000000..ec345eb578
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_nautical_location_view_angle.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_nautical_location_view_angle_night.png b/OsmAnd/res/drawable-mdpi/map_nautical_location_view_angle_night.png
new file mode 100644
index 0000000000..b51a6fcee2
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_nautical_location_view_angle_night.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_start_navigation.png b/OsmAnd/res/drawable-mdpi/map_start_navigation.png
index 3ad15dbab7..226a412587 100644
Binary files a/OsmAnd/res/drawable-mdpi/map_start_navigation.png and b/OsmAnd/res/drawable-mdpi/map_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_allow_private_access.png b/OsmAnd/res/drawable-xhdpi/ic_action_allow_private_access.png
new file mode 100644
index 0000000000..1996777306
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_allow_private_access.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_avoid_motorways.png b/OsmAnd/res/drawable-xhdpi/ic_action_avoid_motorways.png
new file mode 100644
index 0000000000..7afa47fcdc
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_avoid_motorways.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_edit_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_edit_dark.png
index 65f24663bc..66ab8968fa 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_edit_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_elevation.png b/OsmAnd/res/drawable-xhdpi/ic_action_elevation.png
new file mode 100644
index 0000000000..0d095c40a3
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_elevation.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_forbid_private_access.png b/OsmAnd/res/drawable-xhdpi/ic_action_forbid_private_access.png
new file mode 100644
index 0000000000..88017d5efe
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_forbid_private_access.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_fuel.png b/OsmAnd/res/drawable-xhdpi/ic_action_fuel.png
new file mode 100644
index 0000000000..c50722ba24
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_fuel.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_item_move.png b/OsmAnd/res/drawable-xhdpi/ic_action_item_move.png
new file mode 100644
index 0000000000..7bc48814a7
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_item_move.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_motorways.png b/OsmAnd/res/drawable-xhdpi/ic_action_motorways.png
new file mode 100644
index 0000000000..c431d5712d
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_motorways.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_nautical_depth.png b/OsmAnd/res/drawable-xhdpi/ic_action_nautical_depth.png
new file mode 100644
index 0000000000..ece5b9af0e
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_nautical_depth.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png
index 7ad11bc01e..8e71595943 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_sand_clock.png b/OsmAnd/res/drawable-xhdpi/ic_action_sand_clock.png
new file mode 100644
index 0000000000..e92ee34e30
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_sand_clock.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_show_along_route.png b/OsmAnd/res/drawable-xhdpi/ic_action_show_along_route.png
new file mode 100644
index 0000000000..4e021d54cc
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_show_along_route.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_start_navigation.png b/OsmAnd/res/drawable-xhdpi/ic_action_start_navigation.png
index 50e6999757..9b74a47019 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_start_navigation.png and b/OsmAnd/res/drawable-xhdpi/ic_action_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_unlimited_download.png b/OsmAnd/res/drawable-xhdpi/ic_action_unlimited_download.png
new file mode 100644
index 0000000000..ae38e9711d
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_unlimited_download.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_volume_mute.png b/OsmAnd/res/drawable-xhdpi/ic_action_volume_mute.png
new file mode 100644
index 0000000000..4a81fff637
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_volume_mute.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_nautical_bearing.png b/OsmAnd/res/drawable-xhdpi/map_nautical_bearing.png
new file mode 100644
index 0000000000..84492536d2
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_nautical_bearing.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_nautical_bearing_night.png b/OsmAnd/res/drawable-xhdpi/map_nautical_bearing_night.png
new file mode 100644
index 0000000000..4a5d566a9f
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_nautical_bearing_night.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_nautical_location.png b/OsmAnd/res/drawable-xhdpi/map_nautical_location.png
new file mode 100644
index 0000000000..eb4ee41d99
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_nautical_location.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_nautical_location_night.png b/OsmAnd/res/drawable-xhdpi/map_nautical_location_night.png
new file mode 100644
index 0000000000..5925133490
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_nautical_location_night.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_nautical_location_view_angle.png b/OsmAnd/res/drawable-xhdpi/map_nautical_location_view_angle.png
new file mode 100644
index 0000000000..db4d3d4a75
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_nautical_location_view_angle.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_nautical_location_view_angle_night.png b/OsmAnd/res/drawable-xhdpi/map_nautical_location_view_angle_night.png
new file mode 100644
index 0000000000..908e52b411
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_nautical_location_view_angle_night.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_start_navigation.png b/OsmAnd/res/drawable-xhdpi/map_start_navigation.png
index 50e6999757..3e784bf91e 100644
Binary files a/OsmAnd/res/drawable-xhdpi/map_start_navigation.png and b/OsmAnd/res/drawable-xhdpi/map_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_allow_private_access.png b/OsmAnd/res/drawable-xxhdpi/ic_action_allow_private_access.png
new file mode 100644
index 0000000000..908703d273
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_allow_private_access.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_avoid_motorways.png b/OsmAnd/res/drawable-xxhdpi/ic_action_avoid_motorways.png
new file mode 100644
index 0000000000..41e01d50dd
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_avoid_motorways.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_edit_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_edit_dark.png
index 42eec822b5..f13f0e3278 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_edit_dark.png and b/OsmAnd/res/drawable-xxhdpi/ic_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_elevation.png b/OsmAnd/res/drawable-xxhdpi/ic_action_elevation.png
new file mode 100644
index 0000000000..2214ab9476
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_elevation.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_forbid_private_access.png b/OsmAnd/res/drawable-xxhdpi/ic_action_forbid_private_access.png
new file mode 100644
index 0000000000..d28c4f3910
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_forbid_private_access.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_fuel.png b/OsmAnd/res/drawable-xxhdpi/ic_action_fuel.png
new file mode 100644
index 0000000000..ca1e394930
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_fuel.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_item_move.png b/OsmAnd/res/drawable-xxhdpi/ic_action_item_move.png
new file mode 100644
index 0000000000..da3f33b6b5
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_item_move.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_motorways.png b/OsmAnd/res/drawable-xxhdpi/ic_action_motorways.png
new file mode 100644
index 0000000000..1d010a4f3b
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_motorways.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_nautical_depth.png b/OsmAnd/res/drawable-xxhdpi/ic_action_nautical_depth.png
new file mode 100644
index 0000000000..9ef52a6519
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_nautical_depth.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_dark.png
index 3cc2e11963..b98e85fc29 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_dark.png and b/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_sand_clock.png b/OsmAnd/res/drawable-xxhdpi/ic_action_sand_clock.png
new file mode 100644
index 0000000000..afb35668ca
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_sand_clock.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_show_along_route.png b/OsmAnd/res/drawable-xxhdpi/ic_action_show_along_route.png
new file mode 100644
index 0000000000..3ab4c55809
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_show_along_route.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_start_navigation.png b/OsmAnd/res/drawable-xxhdpi/ic_action_start_navigation.png
index 6445f91337..cf8fd2ed24 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_start_navigation.png and b/OsmAnd/res/drawable-xxhdpi/ic_action_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_unlimited_download.png b/OsmAnd/res/drawable-xxhdpi/ic_action_unlimited_download.png
new file mode 100644
index 0000000000..cf83cd4f81
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_unlimited_download.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_volume_mute.png b/OsmAnd/res/drawable-xxhdpi/ic_action_volume_mute.png
new file mode 100644
index 0000000000..9c832cbbf6
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_volume_mute.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_nautical_bearing.png b/OsmAnd/res/drawable-xxhdpi/map_nautical_bearing.png
new file mode 100644
index 0000000000..01533ae4f7
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_nautical_bearing.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_nautical_bearing_night.png b/OsmAnd/res/drawable-xxhdpi/map_nautical_bearing_night.png
new file mode 100644
index 0000000000..e6687ff69a
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_nautical_bearing_night.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_nautical_location.png b/OsmAnd/res/drawable-xxhdpi/map_nautical_location.png
new file mode 100644
index 0000000000..4e19b38778
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_nautical_location.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_nautical_location_night.png b/OsmAnd/res/drawable-xxhdpi/map_nautical_location_night.png
new file mode 100644
index 0000000000..8800e0c2b8
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_nautical_location_night.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_nautical_location_view_angle.png b/OsmAnd/res/drawable-xxhdpi/map_nautical_location_view_angle.png
new file mode 100644
index 0000000000..28f4b540fe
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_nautical_location_view_angle.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_nautical_location_view_angle_night.png b/OsmAnd/res/drawable-xxhdpi/map_nautical_location_view_angle_night.png
new file mode 100644
index 0000000000..c1b505218b
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_nautical_location_view_angle_night.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_start_navigation.png b/OsmAnd/res/drawable-xxhdpi/map_start_navigation.png
index 6445f91337..ee62bbac20 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/map_start_navigation.png and b/OsmAnd/res/drawable-xxhdpi/map_start_navigation.png differ
diff --git a/OsmAnd/res/drawable/btn_border_active_dark.xml b/OsmAnd/res/drawable/btn_border_active_dark.xml
new file mode 100644
index 0000000000..7bfff2de9a
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_border_active_dark.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="rectangle">
+			<corners android:radius="4dp" />
+			<stroke android:width="1dp" android:color="@color/active_buttons_and_links_dark" />
+		</shape>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_border_active_light.xml b/OsmAnd/res/drawable/btn_border_active_light.xml
new file mode 100644
index 0000000000..52999f4b4c
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_border_active_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="rectangle">
+			<corners android:radius="4dp" />
+			<stroke android:width="1dp" android:color="@color/active_buttons_and_links_light" />
+		</shape>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_border_pressed_dark.xml b/OsmAnd/res/drawable/btn_border_pressed_dark.xml
new file mode 100644
index 0000000000..3bbe4043e9
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_border_pressed_dark.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<corners android:radius="4dp" />
+			<stroke android:width="1dp" android:color="@color/active_buttons_and_links_dark" />
+		</shape>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_border_pressed_light.xml b/OsmAnd/res/drawable/btn_border_pressed_light.xml
new file mode 100644
index 0000000000..12e9738e62
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_border_pressed_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<corners android:radius="4dp" />
+			<stroke android:width="1dp" android:color="@color/active_buttons_and_links_light" />
+		</shape>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_border_trans_dark.xml b/OsmAnd/res/drawable/btn_border_trans_dark.xml
new file mode 100644
index 0000000000..f50714a963
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_border_trans_dark.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<corners android:radius="4dp" />
+			<stroke android:width="1dp" android:color="@color/route_info_go_btn_inking_dark" />
+		</shape>
+	</item>
+	<item android:state_enabled="false">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/activity_background_dark" />
+			<corners android:radius="4dp" />
+		</shape>
+	</item>
+	<item>
+		<shape android:shape="rectangle">
+			<solid android:color="@null" />
+			<corners android:radius="4dp" />
+			<stroke android:width="1dp" android:color="@color/divider_dark" />
+		</shape>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_border_trans_light.xml b/OsmAnd/res/drawable/btn_border_trans_light.xml
new file mode 100644
index 0000000000..5c262a9204
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_border_trans_light.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<corners android:radius="4dp" />
+			<stroke android:width="1dp" android:color="@color/active_buttons_and_links_light" />
+		</shape>
+	</item>
+	<item android:state_enabled="false">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/activity_background_light" />
+			<corners android:radius="4dp" />
+		</shape>
+	</item>
+	<item>
+		<shape android:shape="rectangle">
+			<solid android:color="@null" />
+			<corners android:radius="4dp" />
+			<stroke android:width="1dp" android:color="@color/divider_light" />
+		</shape>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_border_trans_rounded_dark.xml b/OsmAnd/res/drawable/btn_border_trans_rounded_dark.xml
new file mode 100644
index 0000000000..3f68423d61
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_border_trans_rounded_dark.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<corners android:radius="18dp" />
+			<stroke android:width="1dp" android:color="@color/route_info_go_btn_inking_dark" />
+		</shape>
+	</item>
+	<item android:state_enabled="false">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/activity_background_dark" />
+			<corners android:radius="18dp" />
+		</shape>
+	</item>
+	<item>
+		<shape android:shape="rectangle">
+			<solid android:color="@null" />
+			<corners android:radius="18dp" />
+			<stroke android:width="1dp" android:color="@color/divider_dark" />
+		</shape>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_border_trans_rounded_light.xml b/OsmAnd/res/drawable/btn_border_trans_rounded_light.xml
new file mode 100644
index 0000000000..aee8c9de9d
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_border_trans_rounded_light.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<corners android:radius="18dp" />
+			<stroke android:width="1dp" android:color="@color/active_buttons_and_links_light" />
+		</shape>
+	</item>
+	<item android:state_enabled="false">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/activity_background_light" />
+			<corners android:radius="18dp" />
+		</shape>
+	</item>
+	<item>
+		<shape android:shape="rectangle">
+			<solid android:color="@null" />
+			<corners android:radius="18dp" />
+			<stroke android:width="1dp" android:color="@color/divider_light" />
+		</shape>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_round_border_dark_2.xml b/OsmAnd/res/drawable/btn_round_border_dark_2.xml
new file mode 100644
index 0000000000..5e6a95c5ca
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_round_border_dark_2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="rectangle">
+			<stroke android:color="@color/color_dialog_buttons_dark" android:width="2dp"/>
+			<corners android:radius="@dimen/map_button_rect_rad" />
+		</shape>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_round_border_light_2.xml b/OsmAnd/res/drawable/btn_round_border_light_2.xml
new file mode 100644
index 0000000000..28b70eaacb
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_round_border_light_2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="rectangle">
+			<stroke android:color="@color/color_dialog_buttons_light" android:width="2dp"/>
+			<corners android:radius="@dimen/map_button_rect_rad" />
+		</shape>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/context_menu_controller_disabled_bg_dark.xml b/OsmAnd/res/drawable/context_menu_controller_disabled_bg_dark.xml
index 33274d8ff8..5738125226 100644
--- a/OsmAnd/res/drawable/context_menu_controller_disabled_bg_dark.xml
+++ b/OsmAnd/res/drawable/context_menu_controller_disabled_bg_dark.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/route_info_divider_dark" />
+        android:color="@color/ctx_menu_buttons_divider_dark" />
 
     <corners android:radius="3dp" />
 
diff --git a/OsmAnd/res/drawable/context_menu_controller_disabled_bg_light.xml b/OsmAnd/res/drawable/context_menu_controller_disabled_bg_light.xml
index 4ac0d70116..292955d5c4 100644
--- a/OsmAnd/res/drawable/context_menu_controller_disabled_bg_light.xml
+++ b/OsmAnd/res/drawable/context_menu_controller_disabled_bg_light.xml
@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/route_info_divider_light" />
+        android:color="@color/ctx_menu_buttons_divider_light" />
 
     <corners android:radius="3dp" />
 
diff --git a/OsmAnd/res/drawable/ripple_dark.xml b/OsmAnd/res/drawable/ripple_dark.xml
new file mode 100644
index 0000000000..ce5672d46c
--- /dev/null
+++ b/OsmAnd/res/drawable/ripple_dark.xml
@@ -0,0 +1,9 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/active_buttons_and_links_trans_dark">
+	<item android:id="@android:id/mask">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/active_buttons_and_links_dark" />
+			<corners android:radius="4dp" />
+		</shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/ripple_light.xml b/OsmAnd/res/drawable/ripple_light.xml
new file mode 100644
index 0000000000..f4a9855f6b
--- /dev/null
+++ b/OsmAnd/res/drawable/ripple_light.xml
@@ -0,0 +1,9 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/active_buttons_and_links_trans_light">
+	<item android:id="@android:id/mask">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/active_buttons_and_links_light" />
+			<corners android:radius="4dp" />
+		</shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/ripple_rounded_dark.xml b/OsmAnd/res/drawable/ripple_rounded_dark.xml
new file mode 100644
index 0000000000..dc86d03171
--- /dev/null
+++ b/OsmAnd/res/drawable/ripple_rounded_dark.xml
@@ -0,0 +1,9 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/active_buttons_and_links_trans_dark">
+	<item android:id="@android:id/mask">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/active_buttons_and_links_dark" />
+			<corners android:radius="18dp" />
+		</shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/ripple_rounded_light.xml b/OsmAnd/res/drawable/ripple_rounded_light.xml
new file mode 100644
index 0000000000..a4a056ac0c
--- /dev/null
+++ b/OsmAnd/res/drawable/ripple_rounded_light.xml
@@ -0,0 +1,9 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/active_buttons_and_links_trans_light">
+	<item android:id="@android:id/mask">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/active_buttons_and_links_light" />
+			<corners android:radius="18dp" />
+		</shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/route_cards_topsides_light.xml b/OsmAnd/res/drawable/route_cards_topsides_light.xml
new file mode 100644
index 0000000000..ebe1ef8a27
--- /dev/null
+++ b/OsmAnd/res/drawable/route_cards_topsides_light.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<nine-patch android:src="@drawable/bg_card_shadow"/>
+	</item>
+	<item>
+		<shape>
+			<solid android:color="@color/bg_color_light"/>
+			<corners android:radius="4dp" />
+		</shape>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/route_info_trans_gradient_dark.xml b/OsmAnd/res/drawable/route_info_trans_gradient_dark.xml
new file mode 100644
index 0000000000..cf3653787d
--- /dev/null
+++ b/OsmAnd/res/drawable/route_info_trans_gradient_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape>
+			<gradient
+				android:angle="0"
+				android:startColor="#0517191a"
+				android:centerColor="@color/activity_background_dark"
+				android:endColor="@color/activity_background_dark"
+				android:centerX="0.2"
+				android:type="linear" />
+			<corners android:radius="4dp" />
+		</shape>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/route_info_trans_gradient_light.xml b/OsmAnd/res/drawable/route_info_trans_gradient_light.xml
new file mode 100644
index 0000000000..76dd06c92e
--- /dev/null
+++ b/OsmAnd/res/drawable/route_info_trans_gradient_light.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape>
+			<gradient
+				android:angle="0"
+				android:startColor="#05ffffff"
+				android:centerColor="@color/card_and_list_background_light"
+				android:endColor="@color/card_and_list_background_light"
+				android:centerX="0.2"
+				android:type="linear" />
+			<corners android:radius="4dp" />
+		</shape>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/text_rounded_bg_active_dark.xml b/OsmAnd/res/drawable/text_rounded_bg_active_dark.xml
new file mode 100644
index 0000000000..f5de3e9de0
--- /dev/null
+++ b/OsmAnd/res/drawable/text_rounded_bg_active_dark.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<solid android:color="@color/color_transparent" />
+	<stroke
+		android:width="1dp"
+		android:color="@color/wikivoyage_active_dark" />
+	<corners android:radius="@dimen/map_button_rect_rad" />
+</shape>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/text_rounded_bg_active_light.xml b/OsmAnd/res/drawable/text_rounded_bg_active_light.xml
new file mode 100644
index 0000000000..7d69b928f8
--- /dev/null
+++ b/OsmAnd/res/drawable/text_rounded_bg_active_light.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<solid android:color="@color/color_transparent" />
+	<stroke
+		android:width="1dp"
+		android:color="@color/osmand_orange" />
+	<corners android:radius="@dimen/map_button_rect_rad" />
+</shape>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/text_rounded_bg_regular_dark.xml b/OsmAnd/res/drawable/text_rounded_bg_regular_dark.xml
new file mode 100644
index 0000000000..17ace62642
--- /dev/null
+++ b/OsmAnd/res/drawable/text_rounded_bg_regular_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<solid android:color="@color/wikivoyage_card_divider_dark" />
+	<corners android:radius="@dimen/map_button_rect_rad" />
+</shape>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/text_rounded_bg_regular_light.xml b/OsmAnd/res/drawable/text_rounded_bg_regular_light.xml
new file mode 100644
index 0000000000..68edc5de9d
--- /dev/null
+++ b/OsmAnd/res/drawable/text_rounded_bg_regular_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<solid android:color="@color/wikivoyage_card_divider_light" />
+	<corners android:radius="@dimen/map_button_rect_rad" />
+</shape>
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/map_hud_bottom.xml b/OsmAnd/res/layout-land/map_hud_bottom.xml
index 680be73185..53cdff7392 100644
--- a/OsmAnd/res/layout-land/map_hud_bottom.xml
+++ b/OsmAnd/res/layout-land/map_hud_bottom.xml
@@ -183,14 +183,6 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"/>
 
-                <ImageButton
-                    android:id="@+id/map_transparency_hide"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:background="@drawable/btn_circle_transparent"
-                    android:contentDescription="@string/shared_string_hide"
-                    android:src="@drawable/headliner_close"/>
             </LinearLayout>
             
                	<ProgressBar
diff --git a/OsmAnd/res/layout-land/map_hud_top.xml b/OsmAnd/res/layout-land/map_hud_top.xml
index 7ffd423c86..cd42f72365 100644
--- a/OsmAnd/res/layout-land/map_hud_top.xml
+++ b/OsmAnd/res/layout-land/map_hud_top.xml
@@ -437,6 +437,21 @@
                             android:visibility="gone"
                             tools:text="New version of OsmAnd+ with 50% discount"/>
 
+                        <net.osmand.plus.widgets.TextViewEx
+                            android:id="@+id/widget_top_bar_text_btn"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="?attr/selectableItemBackground"
+                            android:ellipsize="end"
+                            android:maxLines="1"
+                            android:layout_marginTop="8dp"
+                            android:textColor="?attr/wikivoyage_active_color"
+                            android:textSize="@dimen/default_list_text_size"
+                            android:visibility="gone"
+                            osmand:typeface="@string/font_roboto_medium"
+                            tools:text="Some button"
+                            tools:visibility="visible"/>
+
                     </LinearLayout>
 
                     <ImageButton
diff --git a/OsmAnd/res/layout-land/plan_route_info.xml b/OsmAnd/res/layout-land/plan_route_info.xml
deleted file mode 100644
index 4a065679ed..0000000000
--- a/OsmAnd/res/layout-land/plan_route_info.xml
+++ /dev/null
@@ -1,427 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    android:id="@+id/plan_route_info"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/color_transparent"
-    android:clickable="true"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <LinearLayout
-        android:id="@+id/main_view"
-        android:layout_width="@dimen/dashboard_land_width"
-        android:layout_height="match_parent"
-        android:layout_gravity="bottom"
-        tools:background="@drawable/route_info_menu_bg_dark"
-        android:clickable="true"
-        android:orientation="vertical">
-
-        <ProgressBar
-            android:id="@+id/progress_bar"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="match_parent"
-            android:layout_height="4dp"
-            android:max="100"
-            android:visibility="gone"
-            tools:progress="60"
-            tools:visibility="visible" />
-
-        <LinearLayout
-            android:id="@+id/ModesLayout"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="@dimen/route_info_modes_height"
-                android:orientation="horizontal">
-
-                <LinearLayout
-                    android:id="@+id/app_modes"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:gravity="left"
-                    android:orientation="horizontal"/>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginLeft="@dimen/list_content_padding"
-                    android:orientation="horizontal"
-                    android:visibility="gone">
-
-                    <ImageView
-                        android:id="@+id/waypoints"
-                        android:layout_width="@dimen/list_item_height"
-                        android:layout_height="@dimen/list_item_height"
-                        android:background="?attr/selectableItemBackground"
-                        android:scaleType="center"
-                        android:src="@drawable/map_action_waypoints"/>
-                </LinearLayout>
-            </LinearLayout>
-
-            <View
-                android:id="@+id/dividerModesLayout"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/dashboard_divider_dark"
-                android:focusable="false"/>
-        </LinearLayout>
-
-        <ScrollView
-            android:layout_width="fill_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:fillViewport="true">
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content">
-
-                        <LinearLayout
-                            android:id="@+id/FromLayout"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="?attr/selectableItemBackground"
-                            android:minHeight="@dimen/list_item_height"
-                            android:orientation="horizontal">
-
-                            <ImageView
-                                android:id="@+id/fromIcon"
-                                android:layout_width="@dimen/standard_icon_size"
-                                android:layout_height="match_parent"
-                                android:layout_marginLeft="@dimen/list_content_padding"
-                                android:layout_marginRight="@dimen/list_content_padding"
-                                android:src="@drawable/map_default_location"/>
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_weight="1"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:id="@+id/fromTitle"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginBottom="3dp"
-                                    android:layout_marginRight="@dimen/list_content_padding"
-                                    android:layout_marginTop="5dp"
-                                    android:text="@string/route_from"
-                                    android:textSize="@dimen/default_sub_text_size"/>
-
-                                <Spinner
-                                    android:id="@+id/FromSpinner"
-                                    android:layout_width="fill_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginLeft="-8dp"
-                                    android:background="@null"
-                                    android:textSize="@dimen/default_list_text_size"/>
-
-                            </LinearLayout>
-
-                            <ImageView
-                                android:id="@+id/fromDropDownIcon"
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_marginRight="@dimen/list_header_text_left_margin"
-                                android:src="@drawable/ic_action_arrow_drop_down"/>
-
-                        </LinearLayout>
-
-                        <View
-                            android:layout_marginStart="@dimen/route_info_divider_margin"
-                            android:layout_marginLeft="@dimen/route_info_divider_margin"
-                            android:id="@+id/dividerFromDropDown"
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:background="@color/dashboard_divider_dark"
-                            android:focusable="false"/>
-
-                        <LinearLayout
-                            android:id="@+id/ViaLayout"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="?attr/selectableItemBackground"
-                            android:minHeight="@dimen/list_item_height"
-                            android:orientation="horizontal">
-
-                            <ImageView
-                                android:id="@+id/viaIcon"
-                                android:layout_width="@dimen/standard_icon_size"
-                                android:layout_height="match_parent"
-                                android:layout_marginLeft="@dimen/list_content_padding"
-                                android:layout_marginRight="@dimen/list_content_padding"
-                                android:src="@drawable/map_default_location"/>
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_weight="1"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:id="@+id/ViaSubView"
-                                    android:layout_width="fill_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginBottom="3dp"
-                                    android:layout_marginTop="5dp"
-                                    android:gravity="left"
-                                    android:text="@string/route_via"
-                                    android:textSize="@dimen/default_sub_text_size"/>
-
-                                <TextView
-                                    android:id="@+id/ViaView"
-                                    android:layout_width="fill_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginRight="@dimen/list_content_padding"
-                                    android:gravity="left"
-                                    android:singleLine="true"
-                                    android:textColor="?android:textColorPrimary"
-                                    android:textSize="@dimen/default_list_text_size"/>
-
-                            </LinearLayout>
-
-                        </LinearLayout>
-
-                        <View
-                            android:layout_marginStart="@dimen/route_info_divider_margin"
-                            android:layout_marginLeft="@dimen/route_info_divider_margin"
-                            android:id="@+id/viaLayoutDivider"
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:background="@color/dashboard_divider_dark"
-                            android:focusable="false"/>
-
-                        <LinearLayout
-                            android:id="@+id/ToLayout"
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content"
-                            android:background="?attr/selectableItemBackground"
-                            android:minHeight="@dimen/list_item_height"
-                            android:orientation="horizontal">
-
-                            <ImageView
-                                android:id="@+id/toIcon"
-                                android:layout_width="@dimen/standard_icon_size"
-                                android:layout_height="match_parent"
-                                android:layout_marginLeft="@dimen/list_content_padding"
-                                android:layout_marginRight="@dimen/list_content_padding"
-                                android:src="@drawable/map_default_location"/>
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_weight="1"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:id="@+id/toTitle"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginBottom="3dp"
-                                    android:layout_marginTop="5dp"
-                                    android:text="@string/route_to"
-                                    android:textSize="@dimen/default_sub_text_size">
-                                </TextView>
-
-                                <Spinner
-                                    android:id="@+id/ToSpinner"
-                                    android:layout_width="fill_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginLeft="-8dp"
-                                    android:background="@null"
-                                    android:textSize="@dimen/default_list_text_size"/>
-
-                            </LinearLayout>
-
-                            <ImageView
-                                android:id="@+id/toDropDownIcon"
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_marginRight="@dimen/list_header_text_left_margin"
-                                android:src="@drawable/ic_action_arrow_drop_down"/>
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                    <ImageView
-                        android:background="?attr/selectableItemBackground"
-                        android:id="@+id/swap_direction_image_view"
-                        android:paddingRight="@dimen/route_info_icon_padding_right"
-                        android:paddingLeft="@dimen/route_info_icon_padding_right"
-                        android:layout_gravity="end"
-                        tools:src="@drawable/ic_action_test_light"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"/>
-
-                </LinearLayout>
-
-                <View
-                    android:id="@+id/dividerToDropDown"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/dashboard_divider_dark"
-                    android:focusable="false"/>
-
-                <LinearLayout
-                    android:id="@+id/RouteInfoControls"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <LinearLayout
-                        android:id="@+id/Info"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackground"
-                        android:minHeight="@dimen/list_item_height"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:id="@+id/Prev"
-                            android:layout_width="@dimen/list_item_height"
-                            android:layout_height="@dimen/list_item_height"
-                            android:background="?attr/selectableItemBackground"
-                            android:contentDescription="@string/shared_string_previous"
-                            android:scaleType="center"
-                            android:src="@drawable/ic_prev"/>
-
-                        <ImageView
-                            android:id="@+id/InfoIcon"
-                            android:layout_width="@dimen/standard_icon_size"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginLeft="@dimen/list_content_padding"
-                            android:layout_marginRight="@dimen/list_content_padding"
-                            android:contentDescription="@string/info_button"
-                            android:scaleType="center"
-                            android:src="@drawable/ic_action_info_dark"/>
-
-                        <LinearLayout
-                            android:id="@+id/InfoDistance"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:id="@+id/DistanceTitle"
-                                android:layout_width="fill_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="3dp"
-                                android:layout_marginTop="5dp"
-                                android:gravity="left"
-                                android:text="@string/route_distance"
-                                android:textSize="@dimen/default_sub_text_size"/>
-
-                            <TextView
-                                android:id="@+id/DistanceText"
-                                android:layout_width="fill_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginRight="@dimen/list_content_padding"
-                                android:gravity="left"
-                                android:singleLine="true"
-                                android:textColor="?android:textColorPrimary"
-                                android:textSize="@dimen/default_list_text_size"/>
-
-                        </LinearLayout>
-
-                        <ImageView
-                            android:id="@+id/DurationIcon"
-                            android:layout_width="@dimen/standard_icon_size"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginLeft="@dimen/list_content_padding"
-                            android:layout_marginRight="@dimen/list_content_padding"
-                            android:contentDescription="@string/info_button"
-                            android:scaleType="center"
-                            android:src="@drawable/ic_action_time"/>
-
-                        <LinearLayout
-                            android:id="@+id/InfoDuration"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:id="@+id/DurationTitle"
-                                android:layout_width="fill_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="3dp"
-                                android:layout_marginTop="5dp"
-                                android:gravity="left"
-                                android:text="@string/route_duration"
-                                android:textSize="@dimen/default_sub_text_size"/>
-
-                            <TextView
-                                android:id="@+id/DurationText"
-                                android:layout_width="fill_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginRight="@dimen/list_content_padding"
-                                android:gravity="left"
-                                android:singleLine="true"
-                                android:textColor="?android:textColorPrimary"
-                                android:textSize="@dimen/default_list_text_size"/>
-
-                        </LinearLayout>
-
-                        <TextView
-                            android:id="@+id/InfoTextView"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical|left"
-                            android:layout_margin="8dp"
-                            android:layout_weight="1"
-                            android:textSize="@dimen/default_desc_text_size"/>
-
-                        <ImageView
-                            android:id="@+id/Next"
-                            android:layout_width="@dimen/list_item_height"
-                            android:layout_height="@dimen/list_item_height"
-                            android:layout_marginLeft="5dp"
-                            android:background="?attr/selectableItemBackground"
-                            android:contentDescription="@string/shared_string_next"
-                            android:scaleType="center"
-                            android:src="@drawable/ic_next"/>
-                    </LinearLayout>
-
-                </LinearLayout>
-            </LinearLayout>
-
-        </ScrollView>
-
-        <View
-            android:id="@+id/dividerButtons"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_gravity="bottom"
-            android:background="@color/dashboard_divider_dark"
-            android:focusable="false"/>
-
-        <include
-            android:id="@+id/map_route_prepare_bottom_view"
-            layout="@layout/map_route_prepare_bottom"/>
-
-    </LinearLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/along_the_route_category_item.xml b/OsmAnd/res/layout/along_the_route_category_item.xml
new file mode 100644
index 0000000000..61887fd5d0
--- /dev/null
+++ b/OsmAnd/res/layout/along_the_route_category_item.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:gravity="center_vertical"
+	android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+	android:orientation="vertical">
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
+		android:background="?attr/selectableItemBackground">
+
+		<ImageView
+			android:id="@+id/icon"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="start|center_vertical"
+			android:layout_marginBottom="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_marginTop="@dimen/content_padding"
+			tools:src="@drawable/ic_action_arrow_down" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="64dp"
+			android:layout_marginRight="64dp"
+			android:ellipsize="end"
+			android:maxLines="1"
+			android:textAppearance="@style/TextAppearance.ListItemTitle"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:text="Some Title" />
+
+		<android.support.v7.widget.SwitchCompat
+			android:id="@+id/compound_button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical|end"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:background="@null"
+			android:clickable="false"
+			android:focusable="false"
+			android:focusableInTouchMode="false" />
+
+	</FrameLayout>
+
+	<View
+		android:id="@+id/bottom_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp" />
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/along_the_route_point_item.xml b/OsmAnd/res/layout/along_the_route_point_item.xml
new file mode 100644
index 0000000000..b5b816d5ab
--- /dev/null
+++ b/OsmAnd/res/layout/along_the_route_point_item.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/package_delivered_layout"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<LinearLayout
+		android:id="@+id/waypoint_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/selectableItemBackground"
+		android:descendantFocusability="blocksDescendants"
+		android:orientation="horizontal">
+
+		<ImageView
+			android:id="@+id/waypoint_icon"
+			android:layout_width="@dimen/standard_icon_size"
+			android:layout_height="@dimen/standard_icon_size"
+			android:layout_gravity="center_vertical"
+			android:layout_marginBottom="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_marginTop="@dimen/content_padding"
+			android:src="@drawable/ic_action_fav_dark" />
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
+			android:layout_marginStart="@dimen/bottom_sheet_content_margin_small"
+			android:layout_weight="1"
+			android:gravity="center"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/waypoint_text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:ellipsize="end"
+				android:maxLines="2"
+				android:textSize="@dimen/default_list_text_size"
+				tools:text="Some waypoint text" />
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="2dp">
+
+				<TextView
+					android:id="@+id/waypoint_dist"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="bottom"
+					android:maxLines="1"
+					android:textColor="@color/color_myloc_distance"
+					android:textSize="@dimen/default_sub_text_size"
+					tools:text="12 km" />
+
+				<TextView
+					android:id="@+id/waypoint_deviation"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="bottom"
+					android:layout_marginLeft="6dp"
+					android:layout_marginStart="6dp"
+					android:drawablePadding="2dp"
+					android:maxLines="1"
+					android:textColor="@color/secondary_text_dark"
+					android:textSize="@dimen/default_sub_text_size"
+					tools:text="Intermediate point " />
+
+				<TextView
+					android:id="@+id/waypoint_desc_text"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_gravity="bottom"
+					android:layout_weight="1"
+					android:ellipsize="end"
+					android:maxLines="1"
+					android:textColor="@color/secondary_text_dark"
+					android:textSize="@dimen/default_sub_text_size"
+					tools:text="some description" />
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+		<ImageButton
+			android:id="@+id/info_close"
+			style="@style/Widget.AppCompat.ActionButton"
+			android:layout_width="48dp"
+			android:layout_height="48dp"
+			android:layout_gravity="center_vertical"
+			android:layout_marginEnd="2dp"
+			android:layout_marginRight="2dp"
+			android:contentDescription="@string/shared_string_delete"
+			android:focusable="false"
+			android:scaleType="center"
+			android:src="@drawable/ic_action_remove_dark" />
+
+	</LinearLayout>
+
+	<View
+		android:id="@+id/bottom_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginTop="8dp" />
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/along_the_route_radius_poi.xml b/OsmAnd/res/layout/along_the_route_radius_poi.xml
new file mode 100644
index 0000000000..2ab9fb0a11
--- /dev/null
+++ b/OsmAnd/res/layout/along_the_route_radius_poi.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:minHeight="56dp"
+	android:orientation="vertical">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/route_info_start_divider_margin"
+		android:layout_marginStart="@dimen/route_info_start_divider_margin"
+		android:orientation="vertical">
+
+		<View
+			android:id="@+id/top_divider"
+			android:layout_width="match_parent"
+			android:layout_height="1dp" />
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="56dp"
+			android:baselineAligned="false"
+			android:orientation="horizontal">
+
+			<LinearLayout
+				android:id="@+id/firstCellContainer"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
+				android:background="?attr/selectableItemBackground">
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:orientation="vertical">
+
+					<TextView
+						android:id="@+id/title"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:text="@string/search_radius_proximity"
+						android:textSize="@dimen/default_desc_text_size" />
+
+					<net.osmand.plus.widgets.TextViewEx
+						android:id="@+id/description"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:layout_marginRight="16dp"
+						android:layout_marginTop="2dp"
+						android:textColor="@color/color_myloc_distance"
+						android:textSize="@dimen/default_desc_text_size"
+						osmand:typeface="@string/font_roboto_medium"
+						tools:text="500 m" />
+
+				</LinearLayout>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/secondCellContainer"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_marginRight="16dp"
+				android:layout_weight="1"
+				android:background="?attr/selectableItemBackground">
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:orientation="vertical">
+
+					<TextView
+						android:id="@+id/titleEx"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:text="@string/shared_string_type"
+						android:textSize="@dimen/default_desc_text_size" />
+
+					<net.osmand.plus.widgets.TextViewEx
+						android:id="@+id/descriptionEx"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:layout_marginTop="2dp"
+						android:textColor="@color/color_myloc_distance"
+						android:textSize="@dimen/default_desc_text_size"
+						osmand:typeface="@string/font_roboto_medium"
+						tools:text="Cinema" />
+
+				</LinearLayout>
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+		<View
+			android:id="@+id/divider"
+			android:layout_width="match_parent"
+			android:layout_height="1dp" />
+
+	</LinearLayout>
+
+	<View
+		android:id="@+id/bottom_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginTop="8dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/along_the_route_radius_simple.xml b/OsmAnd/res/layout/along_the_route_radius_simple.xml
new file mode 100644
index 0000000000..7012dc3308
--- /dev/null
+++ b/OsmAnd/res/layout/along_the_route_radius_simple.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:minHeight="44dp"
+	android:orientation="vertical">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/selectableItemBackground"
+		android:minHeight="44dp"
+		android:orientation="horizontal">
+
+		<TextView
+			android:id="@+id/title"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="64dp"
+			android:layout_marginStart="64dp"
+			android:layout_weight="1"
+			android:text="@string/search_radius_proximity"
+			android:textSize="@dimen/default_desc_text_size" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/description"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="16dp"
+			android:layout_marginRight="16dp"
+			android:textColor="@color/color_myloc_distance"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:text="500 m" />
+
+	</LinearLayout>
+
+	<View
+		android:id="@+id/bottom_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginTop="8dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/bottom_sheet_double_item.xml b/OsmAnd/res/layout/bottom_sheet_double_item.xml
new file mode 100644
index 0000000000..af9d8a73fe
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_double_item.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:gravity="center_vertical"
+	android:minHeight="@dimen/bottom_sheet_selected_item_title_height">
+
+	<FrameLayout
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_weight="1"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:id="@+id/first_item"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/bottom_sheet_list_item_height"
+			android:layout_marginTop="4dp"
+			android:background="?attr/selectableItemBackground"
+			android:orientation="horizontal">
+
+			<ImageView
+				android:id="@+id/first_icon"
+				android:layout_width="@dimen/standard_icon_size"
+				android:layout_height="@dimen/standard_icon_size"
+				android:layout_gravity="center_vertical"
+				android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
+				android:layout_marginLeft="@dimen/content_padding"
+				android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
+				android:layout_marginStart="@dimen/content_padding"
+				tools:src="@drawable/ic_action_search_dark" />
+
+			<TextView
+				android:id="@+id/first_title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:layout_marginEnd="@dimen/bottom_sheet_content_margin_small"
+				android:layout_marginRight="@dimen/bottom_sheet_content_margin_small"
+				android:ellipsize="end"
+				android:maxLines="1"
+				android:textAppearance="@style/TextAppearance.ListItemTitle"
+				tools:text="@string/shared_string_search" />
+
+		</LinearLayout>
+
+		<View
+			android:id="@+id/first_divider"
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:layout_gravity="bottom"
+			android:layout_marginBottom="3dp"
+			android:layout_marginEnd="@dimen/bottom_sheet_content_margin_small"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/bottom_sheet_content_margin_small"
+			android:layout_marginStart="@dimen/content_padding" />
+
+	</FrameLayout>
+
+	<FrameLayout
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_weight="1"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:id="@+id/second_item"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/bottom_sheet_list_item_height"
+			android:layout_marginTop="4dp"
+			android:background="?attr/selectableItemBackground"
+			android:orientation="horizontal">
+
+			<ImageView
+				android:id="@+id/second_icon"
+				android:layout_width="@dimen/standard_icon_size"
+				android:layout_height="@dimen/standard_icon_size"
+				android:layout_gravity="center_vertical"
+				android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
+				android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
+				android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
+				android:layout_marginStart="@dimen/bottom_sheet_content_margin_small"
+				tools:src="@drawable/ic_action_info_dark" />
+
+			<TextView
+				android:id="@+id/second_title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:layout_marginEnd="@dimen/content_padding"
+				android:layout_marginRight="@dimen/content_padding"
+				android:ellipsize="end"
+				android:maxLines="1"
+				android:textAppearance="@style/TextAppearance.ListItemTitle"
+				tools:text="@string/shared_string_address" />
+
+		</LinearLayout>
+
+		<View
+			android:id="@+id/second_divider"
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:layout_gravity="bottom"
+			android:layout_marginBottom="3dp"
+			android:layout_marginEnd="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_marginStart="@dimen/bottom_sheet_content_margin_small" />
+
+	</FrameLayout>
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/bottom_sheet_item_btn.xml b/OsmAnd/res/layout/bottom_sheet_item_btn.xml
new file mode 100644
index 0000000000..8664423c6e
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_btn.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
+	android:minHeight="@dimen/dashboard_map_toolbar"
+	android:orientation="vertical">
+
+	<FrameLayout
+		android:id="@+id/button_container"
+		android:layout_width="match_parent"
+		android:layout_height="36dp"
+		android:layout_gravity="center_vertical"
+		android:layout_marginBottom="5dp"
+		android:layout_marginLeft="@dimen/route_info_buttons_padding_top_bottom"
+		android:layout_marginRight="@dimen/route_info_buttons_padding_top_bottom"
+		android:layout_marginTop="7dp"
+		android:orientation="horizontal">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/button_descr"
+			android:layout_width="match_parent"
+			android:layout_height="36dp"
+			android:layout_gravity="center"
+			android:ellipsize="end"
+			android:gravity="center"
+			android:letterSpacing="@dimen/text_button_letter_spacing"
+			android:maxLines="1"
+			android:text="@string/rendering_category_details"
+			android:textSize="@dimen/text_button_text_size"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:ignore="UnusedAttribute"
+			tools:textColor="?attr/wikivoyage_active_color" />
+
+	</FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/bottom_sheet_item_simple_56dp.xml b/OsmAnd/res/layout/bottom_sheet_item_simple_56dp.xml
new file mode 100644
index 0000000000..40afcad7c7
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_simple_56dp.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	android:background="?attr/selectableItemBackground"
+	android:gravity="center_vertical"
+	android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding">
+
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="@dimen/standard_icon_size"
+		android:layout_height="@dimen/standard_icon_size"
+		android:layout_gravity="center_vertical"
+		android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
+		android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
+		tools:src="@drawable/ic_action_info_dark"/>
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_weight="1"
+		android:ellipsize="end"
+		android:maxLines="1"
+		android:textAppearance="@style/TextAppearance.ListItemTitle"
+		osmand:typeface="@string/font_roboto_regular"
+		tools:text="Title"/>
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/bottom_sheet_item_simple_right_icon.xml b/OsmAnd/res/layout/bottom_sheet_item_simple_right_icon.xml
new file mode 100644
index 0000000000..1a74dd281a
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_simple_right_icon.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/bottom_sheet_list_item_height"
+	android:background="?attr/selectableItemBackground"
+	android:gravity="center_vertical"
+	android:minHeight="@dimen/bottom_sheet_list_item_height"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding">
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_weight="1"
+		android:ellipsize="end"
+		android:maxLines="1"
+		android:textAppearance="@style/TextAppearance.ListItemCategoryTitle"
+		android:textColor="?android:textColorPrimary"
+		android:textSize="@dimen/default_list_text_size"
+		app:typeface="@string/font_roboto_medium"
+		tools:text="Title" />
+
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="@dimen/standard_icon_size"
+		android:layout_height="@dimen/standard_icon_size"
+		android:layout_gravity="center_vertical"
+		android:layout_marginLeft="@dimen/bottom_sheet_icon_margin"
+		android:layout_marginStart="@dimen/bottom_sheet_icon_margin"
+		tools:src="@drawable/ic_action_info_dark" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/bottom_sheet_item_title_long.xml b/OsmAnd/res/layout/bottom_sheet_item_title_long.xml
new file mode 100644
index 0000000000..749f155f79
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_title_long.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/title"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:ellipsize="end"
+	android:minHeight="@dimen/bottom_sheet_list_item_height"
+	android:paddingBottom="@dimen/bottom_sheet_content_margin_small"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding"
+	android:textAppearance="@style/TextAppearance.ListItemTitle"
+	tools:text="Some long description" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/bottom_sheet_item_toolbar_title.xml b/OsmAnd/res/layout/bottom_sheet_item_toolbar_title.xml
new file mode 100644
index 0000000000..98fdf1267a
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_toolbar_title.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/toolbar"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
+	android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+	osmand:contentInsetLeft="54dp"
+	osmand:contentInsetStart="54dp">
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/title"
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/bottom_sheet_title_height"
+		android:ellipsize="end"
+		android:gravity="center_vertical"
+		android:maxLines="1"
+		android:minHeight="@dimen/bottom_sheet_title_height"
+		android:textAppearance="@style/TextAppearance.ListItemTitle"
+		osmand:typeface="@string/font_roboto_medium"
+		tools:text="Some Title" />
+
+</android.support.v7.widget.Toolbar>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_switch_56dp.xml b/OsmAnd/res/layout/bottom_sheet_item_with_switch_56dp.xml
new file mode 100644
index 0000000000..ad46fc49b4
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_switch_56dp.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:gravity="center_vertical"
+	android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding">
+
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="@dimen/standard_icon_size"
+		android:layout_height="@dimen/standard_icon_size"
+		android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
+		android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
+		tools:src="@drawable/ic_action_coordinates_latitude" />
+
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_weight="1"
+		android:ellipsize="end"
+		android:maxLines="2"
+		android:textAppearance="@style/TextAppearance.ListItemTitle"
+		tools:text="Some Title"/>
+
+	<android.support.v7.widget.SwitchCompat
+		android:id="@+id/compound_button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical|end"
+		android:background="@null"
+		android:clickable="false"
+		android:focusable="false"
+		android:focusableInTouchMode="false"/>
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_switch_no_icon.xml b/OsmAnd/res/layout/bottom_sheet_item_with_switch_no_icon.xml
new file mode 100644
index 0000000000..c9b104fcad
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_switch_no_icon.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/bottom_sheet_list_item_height"
+	android:background="?attr/selectableItemBackground"
+	android:gravity="center_vertical"
+	android:minHeight="@dimen/bottom_sheet_list_item_height"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding">
+
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_weight="1"
+		android:ellipsize="end"
+		android:maxLines="1"
+		android:textAppearance="@style/TextAppearance.ListItemTitle"
+		tools:text="Some Title" />
+
+	<android.support.v7.widget.SwitchCompat
+		android:id="@+id/compound_button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical|end"
+		android:background="@null"
+		android:clickable="false"
+		android:focusable="false"
+		android:focusableInTouchMode="false" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/bottom_sheet_menu_base.xml b/OsmAnd/res/layout/bottom_sheet_menu_base.xml
index 7e98ba5ca1..dc7ec4009f 100644
--- a/OsmAnd/res/layout/bottom_sheet_menu_base.xml
+++ b/OsmAnd/res/layout/bottom_sheet_menu_base.xml
@@ -36,6 +36,7 @@
 		android:background="?attr/dashboard_divider"/>
 
 	<LinearLayout
+		android:id="@+id/buttons_container"
 		android:layout_width="match_parent"
 		android:layout_height="@dimen/bottom_sheet_cancel_button_height">
 
diff --git a/OsmAnd/res/layout/coordinate_input_data_area.xml b/OsmAnd/res/layout/coordinate_input_data_area.xml
index e6a4818f2d..1a92c5c83b 100644
--- a/OsmAnd/res/layout/coordinate_input_data_area.xml
+++ b/OsmAnd/res/layout/coordinate_input_data_area.xml
@@ -324,7 +324,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="1dp"
 		android:layout_marginTop="@dimen/content_padding"
-		android:background="@color/route_info_divider_dark"/>
+		android:background="@color/dialog_divider_dark"/>
 
 	<LinearLayout
 		android:id="@+id/point_name_et_container"
diff --git a/OsmAnd/res/layout/dash_restore_osmand_fragment.xml b/OsmAnd/res/layout/dash_restore_osmand_fragment.xml
new file mode 100644
index 0000000000..f0c440c92e
--- /dev/null
+++ b/OsmAnd/res/layout/dash_restore_osmand_fragment.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:background="?attr/bg_card"
+  android:layout_marginTop="@dimen/dash_margin"
+  android:layout_marginBottom="@dimen/dash_margin"
+  android:layout_marginLeft="@dimen/dash_margin_h"
+  android:layout_marginRight="@dimen/dash_margin_h"
+  android:orientation="vertical">
+
+  <TextView
+    android:id="@+id/run_full_osmand_header"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/dashSearchPaddingTop"
+    android:layout_marginBottom="@dimen/dashSearchPaddingBot"
+    android:layout_marginRight="@dimen/subHeaderMarginRight"
+    android:layout_marginStart="@dimen/subHeaderMarginLeft"
+    android:layout_marginLeft="@dimen/subHeaderMarginLeft"
+    android:layout_marginEnd="@dimen/subHeaderMarginRight"
+    android:layout_gravity="center_horizontal"
+    android:text="@string/run_full_osmand_header"
+    android:textColor="?android:textColorPrimary"
+    />
+  <TextView
+    android:id="@+id/run_full_osmand_message"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:layout_marginTop="@dimen/subHeaderPadding"
+    android:layout_marginBottom="@dimen/dashSearchPaddingBot"
+    android:layout_marginRight="@dimen/subHeaderMarginRight"
+    android:layout_marginStart="@dimen/subHeaderMarginLeft"
+    android:layout_marginLeft="@dimen/subHeaderMarginLeft"
+    android:layout_marginEnd="@dimen/subHeaderMarginRight"
+    android:layout_weight="1"
+    tools:text="@string/lorem_ipsum"/>
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:background="?attr/dashboard_divider"/>
+
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="@dimen/list_header_height"
+    android:orientation="horizontal">
+
+    <Button
+      android:id="@+id/cancel_full_osmand_btn"
+      style="@style/DashboardGeneralButton"
+      android:layout_width="0dp"
+      android:gravity="center"
+      android:layout_weight="1"
+      android:text="@string/shared_string_cancel"/>
+
+    <View
+      android:layout_width="1dp"
+      android:layout_height="match_parent"
+      android:background="?attr/dashboard_divider"/>
+
+    <Button
+      android:id="@+id/launch_full_osmand_btn"
+      style="@style/DashboardGeneralButton"
+      android:layout_width="0dp"
+      android:gravity="center"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:text="@string/shared_string_launch"/>
+  </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/first_usage_wizard_fragment.xml b/OsmAnd/res/layout/first_usage_wizard_fragment.xml
index 7aebca4265..f2de23d262 100644
--- a/OsmAnd/res/layout/first_usage_wizard_fragment.xml
+++ b/OsmAnd/res/layout/first_usage_wizard_fragment.xml
@@ -622,122 +622,6 @@
 
                     </LinearLayout>
 
-                    <View
-                        android:id="@+id/map_downloading_divider"
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/dashboard_divider_light"/>
-
-                    <LinearLayout
-                        android:id="@+id/map2_downloading_layout"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackground"
-                        android:minHeight="48dp"
-                        android:orientation="horizontal">
-
-                        <android.support.v7.widget.AppCompatImageView
-                            android:id="@+id/map2_downloading_icon"
-                            android:layout_width="54dp"
-                            android:layout_height="60dp"
-                            android:scaleType="center"
-                            android:src="@drawable/ic_map"
-                            android:tint="@color/icon_color"/>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:orientation="horizontal">
-
-                                <LinearLayout
-                                    android:layout_marginTop="14dp"
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="center_vertical"
-                                    android:minHeight="35dp"
-                                    android:orientation="vertical">
-
-                                    <TextView
-                                        android:id="@+id/map2_downloading_title"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:textColor="?android:attr/textColorPrimary"
-                                        android:textSize="@dimen/default_list_text_size"
-                                        tools:text="The Netherlands"/>
-
-                                    <TextView
-                                        android:id="@+id/map2_downloading_desc"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:layout_marginTop="2dp"
-                                        android:textColor="?android:attr/textColorSecondary"
-                                        android:textSize="@dimen/default_sub_text_size"
-                                        tools:text="255 MB"/>
-
-                                </LinearLayout>
-
-                                <ImageButton
-                                    android:id="@+id/map2_redownload_button"
-                                    style="@style/Widget.AppCompat.ActionButton"
-                                    android:layout_width="44dp"
-                                    android:layout_height="60dp"
-                                    android:contentDescription="@string/shared_string_cancel"
-                                    android:src="@drawable/ic_action_refresh_dark"
-                                    android:tint="@color/map_widget_blue"
-                                    android:visibility="gone"/>
-
-                            </LinearLayout>
-
-                            <View
-                                android:id="@+id/map2_download_padding"
-                                android:layout_width="match_parent"
-                                android:layout_height="14dp"
-                                android:visibility="gone"/>
-
-                            <LinearLayout
-                                android:id="@+id/map2_download_progress_layout"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="-8dp"
-                                android:orientation="horizontal">
-
-                                <LinearLayout
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center_vertical"
-                                    android:layout_weight="1"
-                                    android:orientation="vertical">
-
-                                    <ProgressBar
-                                        android:id="@+id/map2_download_progress_bar"
-                                        style="?android:attr/progressBarStyleHorizontal"
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:visibility="visible"/>
-
-                                </LinearLayout>
-
-                                <ImageButton
-                                    android:id="@+id/map2_download_progress_button"
-                                    style="@style/Widget.AppCompat.ActionButton"
-                                    android:layout_width="44dp"
-                                    android:layout_height="44dp"
-                                    android:contentDescription="@string/shared_string_cancel"
-                                    android:src="@drawable/map_action_cancel"
-                                    android:tint="@color/icon_color"/>
-
-                            </LinearLayout>
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
                     <View
                         android:id="@+id/map2_downloading_divider"
                         android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/fragment_mapillary_filters.xml b/OsmAnd/res/layout/fragment_mapillary_filters.xml
index a3baf12f4e..718f60c55c 100644
--- a/OsmAnd/res/layout/fragment_mapillary_filters.xml
+++ b/OsmAnd/res/layout/fragment_mapillary_filters.xml
@@ -376,6 +376,53 @@
                 android:background="?attr/dashboard_divider" />
         </LinearLayout>
 
+        <RelativeLayout
+            android:id="@+id/pano_row"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/bg_color"
+            android:minHeight="60dp"
+            tools:layout_height="60dp">
+
+            <android.support.v7.widget.SwitchCompat
+                android:id="@+id/pano_row_toggle"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:focusable="false" />
+
+            <android.support.v7.widget.AppCompatTextView
+                android:id="@+id/pano_row_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
+                android:text="@string/mapillary_menu_title_pano"
+                android:paddingLeft="52dp" />
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:animateLayoutChanges="true"
+            android:background="?attr/bg_color"
+            android:orientation="vertical"
+            android:paddingLeft="52dp"
+            android:paddingStart="52dp">
+            <View
+                android:layout_width="wrap_content"
+                android:layout_height="1dp"
+                android:background="?attr/dashboard_divider" />
+        </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -421,9 +468,9 @@
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="18dp" />
+                android:layout_height="26dp" />
         </LinearLayout>
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/OsmAnd/res/layout/fragment_show_all_routes.xml b/OsmAnd/res/layout/fragment_show_all_routes.xml
new file mode 100644
index 0000000000..e9ba652102
--- /dev/null
+++ b/OsmAnd/res/layout/fragment_show_all_routes.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/color_transparent">
+
+	<ImageButton
+		android:id="@+id/back_button"
+		android:layout_width="@dimen/map_button_size"
+		android:layout_height="@dimen/map_button_size"
+		android:layout_gravity="start"
+		android:layout_marginLeft="4dp"
+		android:layout_marginRight="4dp"
+		android:layout_marginTop="@dimen/map_button_spacing"
+		android:background="@drawable/btn_circle"
+		android:contentDescription="@string/shared_string_collapse"
+		android:scaleType="center"
+		tools:src="@drawable/ic_action_test_light" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:orientation="vertical"
+		tools:visibility="visible">
+
+		<LinearLayout
+			android:id="@+id/fab_container"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="right"
+			android:layout_marginBottom="@dimen/map_button_margin"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding">
+
+			<ImageButton
+				android:id="@+id/map_my_location_button"
+				android:layout_width="@dimen/map_button_size"
+				android:layout_height="@dimen/map_button_size"
+				android:layout_gravity="bottom"
+				android:background="@drawable/btn_circle"
+				android:contentDescription="@string/shared_string_my_location"
+				tools:src="@drawable/ic_action_test_light" />
+
+			<LinearLayout
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="@dimen/map_button_spacing"
+				android:orientation="vertical">
+
+				<ImageButton
+					android:id="@+id/map_zoom_in_button"
+					android:layout_width="@dimen/map_button_size"
+					android:layout_height="@dimen/map_button_size"
+					android:background="@drawable/btn_circle"
+					android:contentDescription="@string/zoomIn"
+					tools:src="@drawable/ic_action_test_light" />
+
+				<ImageButton
+					android:id="@+id/map_zoom_out_button"
+					android:layout_width="@dimen/map_button_size"
+					android:layout_height="@dimen/map_button_size"
+					android:layout_marginTop="@dimen/map_button_spacing"
+					android:background="@drawable/btn_circle"
+					android:contentDescription="@string/zoomOut"
+					tools:src="@drawable/ic_action_test_light" />
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+		<net.osmand.plus.LockableViewPager
+			android:id="@+id/pager"
+			android:layout_width="match_parent"
+			android:layout_height="200dp"
+			android:layout_gravity="bottom" />
+
+	</LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/live_updates_header.xml b/OsmAnd/res/layout/live_updates_header.xml
index 1e020e9598..367fba142e 100644
--- a/OsmAnd/res/layout/live_updates_header.xml
+++ b/OsmAnd/res/layout/live_updates_header.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:osmand="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:paddingLeft="6dp"
     android:paddingRight="6dp"
@@ -182,6 +182,76 @@
 
         </LinearLayout>
 
+        <View
+            android:id="@+id/buttons_div"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/dashboard_divider"
+            android:visibility="visible"/>
+
+        <LinearLayout
+            android:id="@+id/buttons_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:minHeight="48dp"
+            android:orientation="horizontal"
+            android:visibility="visible">
+
+            <LinearLayout
+                android:id="@+id/button_subscriptions_container"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.5"
+                android:gravity="left|center_vertical">
+
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/button_subscriptions"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"
+                    android:ellipsize="end"
+                    android:gravity="left|center_vertical"
+                    android:lines="1"
+                    android:maxLines="1"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:text="@string/osm_live_subscriptions"
+                    android:textColor="?attr/color_dialog_buttons"
+                    android:textSize="@dimen/default_list_text_size"
+                    app:textAllCapsCompat="true"
+                    app:typeface="@string/font_roboto_medium" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/button_settings_container"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.5"
+                android:gravity="right|center_vertical">
+
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/button_settings"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"
+                    android:gravity="right|center_vertical"
+                    android:ellipsize="end"
+                    android:lines="1"
+                    android:maxLines="1"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:text="@string/shared_string_settings"
+                    android:textColor="?attr/color_dialog_buttons"
+                    android:textSize="@dimen/default_list_text_size"
+                    app:textAllCapsCompat="true"
+                    app:typeface="@string/font_roboto_medium" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml
index cc21249620..faea36d53d 100644
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/mapBackground">
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/drawer_layout"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="?attr/mapBackground"
+  android:layout_gravity="start">
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -93,13 +95,33 @@
 
     </FrameLayout>
 
-    <ListView
-        android:id="@+id/menuItems"
+    <RelativeLayout
+        android:id="@+id/drawer_relative_layout"
         android:layout_width="280dp"
         android:layout_height="match_parent"
-        android:layout_gravity="left"
-        android:background="?attr/bg_color"
-        android:clipToPadding="false"
-        android:drawSelectorOnTop="true"/>
+        android:layout_gravity="start">
+
+        <ListView
+            android:id="@+id/menuItems"
+            android:layout_width="280dp"
+            android:layout_height="match_parent"
+            android:background="?attr/bg_color"
+            android:clipToPadding="false"
+            android:drawSelectorOnTop="true"
+            android:layout_gravity="start"/>
+
+        <RelativeLayout
+            android:id="@+id/drawer_footer_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:layout_alignParentBottom="true"
+            android:layout_gravity="start"
+            android:visibility="gone">
+
+            <include layout="@layout/powered_by_osmand_item"/>
+
+        </RelativeLayout>
+    </RelativeLayout>
 
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index 143794a913..3556cf3998 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -103,14 +103,6 @@
                 android:paddingLeft="6dp"
                 android:paddingRight="6dp"/>
 
-            <ImageButton
-                android:id="@+id/map_transparency_hide"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/btn_circle_transparent"
-                android:contentDescription="@string/shared_string_hide"
-                android:src="@drawable/headliner_close"/>
         </LinearLayout>
 
         <LinearLayout
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index 654bb611ec..e94cdf02a1 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -214,6 +214,21 @@
                         android:visibility="gone"
                         tools:text="New version of OsmAnd+ with 50% discount"/>
 
+                    <net.osmand.plus.widgets.TextViewEx
+                        android:id="@+id/widget_top_bar_text_btn"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="?attr/selectableItemBackground"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:layout_marginTop="8dp"
+                        android:textColor="?attr/wikivoyage_active_color"
+                        android:textSize="@dimen/default_list_text_size"
+                        android:visibility="gone"
+                        osmand:typeface="@string/font_roboto_medium"
+                        tools:text="Some button"
+                        tools:visibility="visible"/>
+
                 </LinearLayout>
 
                 <ImageButton
diff --git a/OsmAnd/res/layout/map_route_prepare_bottom.xml b/OsmAnd/res/layout/map_route_prepare_bottom.xml
deleted file mode 100644
index 90ab1632d5..0000000000
--- a/OsmAnd/res/layout/map_route_prepare_bottom.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/map_route_preparation_layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:background="@color/route_info_bottom_view_bg_dark"
-    android:layout_gravity="bottom">
-
-    <ImageButton
-        android:id="@+id/map_cancel_route_button"
-        android:contentDescription="@string/cancel_route"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/route_info_buttons_padding_top_bottom"
-        android:paddingBottom="@dimen/route_info_buttons_padding_top_bottom"
-        android:paddingLeft="@dimen/route_info_buttons_padding_left_right"
-        android:paddingRight="@dimen/route_info_buttons_padding_left_right"
-        android:layout_gravity="center_vertical"
-        android:background="?attr/selectableItemBackground"
-        android:src="@drawable/ic_action_test_light" />
-
-    <View
-        android:id="@+id/dividerBtn1"
-        android:layout_width="1dp"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/route_info_buttons_padding_top_bottom"
-        android:layout_marginBottom="@dimen/route_info_buttons_padding_top_bottom"
-        android:layout_gravity="center"
-        tools:background="@color/route_info_divider_dark"/>
-
-    <ImageButton
-        android:id="@+id/map_waypoints_route_button"
-        android:contentDescription="@string/shared_string_waypoints"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/route_info_buttons_padding_top_bottom"
-        android:paddingBottom="@dimen/route_info_buttons_padding_top_bottom"
-        android:paddingLeft="@dimen/route_info_buttons_padding_left_right"
-        android:paddingRight="@dimen/route_info_buttons_padding_left_right"
-        android:layout_gravity="center_vertical"
-        android:background="?attr/selectableItemBackground"
-        android:src="@drawable/ic_action_test_light" />
-
-    <View
-        android:id="@+id/dividerBtn2"
-        android:layout_width="1dp"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/route_info_buttons_padding_top_bottom"
-        android:layout_marginBottom="@dimen/route_info_buttons_padding_top_bottom"
-        android:layout_gravity="center"
-        tools:background="@color/route_info_divider_dark"/>
-
-    <ImageButton
-        android:id="@+id/map_options_route_button"
-        android:contentDescription="@string/shared_string_more"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/route_info_buttons_padding_top_bottom"
-        android:paddingBottom="@dimen/route_info_buttons_padding_top_bottom"
-        android:paddingLeft="@dimen/route_info_buttons_padding_left_right"
-        android:paddingRight="@dimen/route_info_buttons_padding_left_right"
-        android:layout_gravity="center_vertical"
-        android:background="?attr/selectableItemBackground"
-        android:src="@drawable/ic_action_test_light" />
-
-    <TextView
-        android:textAllCaps="true"
-        android:id="@+id/map_go_route_button"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:layout_gravity="center_vertical"
-        tools:drawableLeft="@drawable/ic_action_test_light"
-        android:gravity="center_vertical"
-        android:drawablePadding="@dimen/route_info_button_go_drawable_padding"
-        android:paddingLeft="@dimen/route_info_button_go_drawable_padding"
-        android:paddingStart="@dimen/route_info_button_go_drawable_padding"
-        android:layout_marginTop="@dimen/route_info_button_go_margin"
-        android:layout_marginBottom="@dimen/route_info_button_go_margin"
-        android:layout_marginRight="@dimen/route_info_button_go_margin"
-        android:layout_marginEnd="@dimen/route_info_button_go_margin"
-        android:textSize="@dimen/default_list_text_size"
-        android:textStyle="bold"
-        tools:background="@drawable/route_info_go_btn_bg_dark"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/mode_toggles.xml b/OsmAnd/res/layout/mode_toggles.xml
index 25639d644e..ea35a3a2bc 100644
--- a/OsmAnd/res/layout/mode_toggles.xml
+++ b/OsmAnd/res/layout/mode_toggles.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<HorizontalScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="start">
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/app_modes_scroll_container"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:layout_gravity="start">
 
-    <LinearLayout
-        android:id="@+id/app_modes_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="start"
-        android:orientation="horizontal">
-    </LinearLayout>
+	<LinearLayout
+		android:id="@+id/app_modes_content"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="start"
+		android:orientation="horizontal"/>
 
 </HorizontalScrollView>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/mode_view_route_preparation.xml b/OsmAnd/res/layout/mode_view_route_preparation.xml
new file mode 100644
index 0000000000..24a9490cfb
--- /dev/null
+++ b/OsmAnd/res/layout/mode_view_route_preparation.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="@dimen/route_info_modes_height"
+	android:layout_height="@dimen/route_info_modes_height">
+
+	<ImageView
+		android:id="@+id/app_mode_icon"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:paddingBottom="@dimen/route_info_icon_vertical_padding"
+		android:paddingLeft="@dimen/route_info_icon_padding_left"
+		android:paddingRight="@dimen/route_info_icon_padding_left"
+		android:paddingTop="@dimen/route_info_icon_vertical_padding"
+		android:scaleType="center"
+		tools:src="@drawable/ic_dashboard_dark" />
+
+	<View
+		android:id="@+id/selection"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
+		android:layout_marginTop="@dimen/route_info_icon_vertical_padding"
+		android:scaleType="center"
+		tools:background="@drawable/btn_border_trans_light" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/plan_route_gpx.xml b/OsmAnd/res/layout/plan_route_gpx.xml
index e8d9cd7009..62e0aa0270 100644
--- a/OsmAnd/res/layout/plan_route_gpx.xml
+++ b/OsmAnd/res/layout/plan_route_gpx.xml
@@ -1,45 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="@dimen/list_item_height"
-    android:descendantFocusability="blocksDescendants"
-    android:orientation="horizontal"
-    android:layout_marginTop="8dp"
-    android:layout_marginBottom="8dp"
-    android:paddingLeft="@dimen/list_content_padding"
-    android:paddingRight="@dimen/list_content_padding">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:gravity="center_vertical"
+	android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+	android:orientation="horizontal"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding">
 
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:orientation="vertical">
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="@dimen/standard_icon_size"
+		android:layout_height="@dimen/standard_icon_size"
+		android:layout_gravity="center_vertical"
+		android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
+		android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
+		tools:src="@drawable/ic_action_coordinates_latitude" />
 
-        <TextView
-            android:id="@+id/GPXRouteTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/shared_string_gpx_route"
-            android:textSize="@dimen/default_sub_text_size">
-        </TextView>
+	<LinearLayout
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_weight="1"
+		android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/GPXRouteSpinner"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:textSize="@dimen/default_list_text_size">
-        </TextView>
+		<TextView
+			android:id="@+id/title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:ellipsize="end"
+			android:maxLines="2"
+			android:text="@string/shared_string_gpx_route"
+			android:textAppearance="@style/TextAppearance.ListItemTitle" />
 
-    </LinearLayout>
+		<TextView
+			android:id="@+id/description"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:maxLines="2"
+			android:textAppearance="@style/TextAppearance.ContextMenuSubtitle" />
 
-    <ImageView
-        android:id="@+id/dropDownIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:src="@drawable/ic_action_arrow_drop_down"/>
+	</LinearLayout>
+
+	<ImageView
+		android:id="@+id/dropDownIcon"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:src="@drawable/ic_action_arrow_drop_down" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/plan_route_info.xml b/OsmAnd/res/layout/plan_route_info.xml
index b9c07693e1..8a9cebdd57 100644
--- a/OsmAnd/res/layout/plan_route_info.xml
+++ b/OsmAnd/res/layout/plan_route_info.xml
@@ -1,431 +1,539 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    android:id="@+id/plan_route_info"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/color_transparent"
-    android:clickable="true"
-    xmlns:tools="http://schemas.android.com/tools">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/color_transparent">
 
-    <LinearLayout
-        android:id="@+id/main_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        tools:background="@drawable/route_info_menu_bg_dark"
-        android:clickable="true"
-        android:orientation="vertical">
+	<net.osmand.plus.mapcontextmenu.InterceptorLinearLayout
+		android:id="@+id/main_view"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="vertical">
 
-        <ProgressBar
-            android:id="@+id/progress_bar"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="match_parent"
-            android:layout_height="4dp"
-            android:max="100"
-            android:visibility="gone"
-            tools:progress="60"
-            tools:visibility="visible" />
+		<LinearLayout
+			android:id="@+id/route_menu_top_shadow_all"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			tools:background="@drawable/route_info_menu_bg_light">
 
-        <LinearLayout
-            android:id="@+id/ModesLayout"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+			<FrameLayout
+				android:id="@+id/ModesLayout"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/route_info_modes_height"
+				android:orientation="horizontal">
 
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="@dimen/route_info_modes_height"
-                android:orientation="horizontal">
+				<LinearLayout
+					android:id="@+id/app_modes"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_gravity="center_vertical"
+					android:layout_marginLeft="@dimen/context_menu_buttons_padding_bottom"
+					android:layout_marginRight="@dimen/context_menu_buttons_padding_bottom"
+					android:orientation="horizontal"
+					android:paddingEnd="@dimen/route_info_app_modes_padding"
+					android:paddingRight="@dimen/route_info_app_modes_padding" />
 
-                <LinearLayout
-                    android:id="@+id/app_modes"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:gravity="left"
-                    android:orientation="horizontal"/>
+				<LinearLayout
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_horizontal"
+					android:layout_marginLeft="@dimen/list_content_padding"
+					android:layout_marginStart="@dimen/list_content_padding"
+					android:orientation="horizontal"
+					android:visibility="gone">
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginLeft="@dimen/list_content_padding"
-                    android:orientation="horizontal"
-                    android:visibility="gone">
+					<ImageView
+						android:id="@+id/waypoints"
+						android:layout_width="@dimen/list_item_height"
+						android:layout_height="@dimen/list_item_height"
+						android:background="?attr/selectableItemBackground"
+						android:scaleType="center"
+						android:src="@drawable/map_action_waypoints" />
 
-                    <ImageView
-                        android:id="@+id/waypoints"
-                        android:layout_width="@dimen/list_item_height"
-                        android:layout_height="@dimen/list_item_height"
-                        android:background="?attr/selectableItemBackground"
-                        android:scaleType="center"
-                        android:src="@drawable/map_action_waypoints"/>
-                </LinearLayout>
-            </LinearLayout>
-            <View
-                android:id="@+id/dividerModesLayout"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/dashboard_divider_dark"
-                android:focusable="false"/>
-        </LinearLayout>
+				</LinearLayout>
 
-        <ScrollView
-            android:layout_width="fill_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:fillViewport="true">
+				<LinearLayout
+					android:id="@+id/app_modes_options_container"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_gravity="end"
+					tools:background="@drawable/route_info_trans_gradient_light">
 
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+					<ImageView
+						android:id="@+id/app_modes_options"
+						android:layout_width="wrap_content"
+						android:layout_height="match_parent"
+						android:background="?attr/selectableItemBackground"
+						android:paddingLeft="@dimen/route_info_icon_padding_right"
+						android:paddingRight="@dimen/route_info_icon_padding_right"
+						android:src="@drawable/ic_overflow_menu_dark" />
 
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+				</LinearLayout>
 
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content">
+			</FrameLayout>
 
-                        <LinearLayout
-                            android:id="@+id/FromLayout"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="?attr/selectableItemBackground"
-                            android:minHeight="@dimen/list_item_height"
-                            android:orientation="horizontal">
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="vertical">
 
-                            <ImageView
-                                android:id="@+id/fromIcon"
-                                android:layout_width="@dimen/standard_icon_size"
-                                android:layout_height="match_parent"
-                                android:layout_marginStart="@dimen/route_info_icon_padding_left"
-                                android:layout_marginLeft="@dimen/route_info_icon_padding_left"
-                                android:layout_marginRight="@dimen/route_info_icon_padding_right"
-                                android:layout_marginEnd="@dimen/route_info_icon_padding_right"
-                                android:src="@drawable/map_default_location"/>
+				<LinearLayout
+					android:id="@+id/FromLayout"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="?attr/selectableItemBackground"
+					android:minHeight="@dimen/route_info_list_item_height"
+					android:orientation="horizontal">
 
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_weight="1"
-                                android:orientation="vertical">
+					<ImageView
+						android:id="@+id/fromIcon"
+						android:layout_width="@dimen/standard_icon_size"
+						android:layout_height="@dimen/standard_icon_size"
+						android:layout_marginBottom="@dimen/list_header_text_left_margin"
+						android:layout_marginEnd="@dimen/favorites_icon_right_margin"
+						android:layout_marginLeft="@dimen/list_content_padding"
+						android:layout_marginRight="@dimen/favorites_icon_right_margin"
+						android:layout_marginStart="@dimen/list_content_padding"
+						android:layout_marginTop="@dimen/list_header_text_left_margin"
+						android:src="@drawable/map_default_location" />
 
-                                <TextView
-                                    android:id="@+id/fromTitle"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginBottom="3dp"
-                                    android:layout_marginRight="@dimen/list_content_padding"
-                                    android:layout_marginTop="5dp"
-                                    android:text="@string/route_from"
-                                    android:textSize="@dimen/default_sub_text_size"/>
+					<LinearLayout
+						android:layout_width="0dp"
+						android:layout_height="match_parent"
+						android:layout_weight="1"
+						android:orientation="vertical">
 
-                                <Spinner
-                                    android:id="@+id/FromSpinner"
-                                    android:layout_width="fill_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginLeft="-8dp"
-                                    android:background="@null"
-                                    android:textSize="@dimen/default_list_text_size"/>
+						<TextView
+							android:id="@+id/fromTitle"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_marginBottom="3dp"
+							android:layout_marginRight="@dimen/list_content_padding"
+							android:layout_marginTop="5dp"
+							android:text="@string/route_from"
+							android:textSize="@dimen/default_sub_text_size" />
 
-                            </LinearLayout>
+						<Spinner
+							android:id="@+id/FromSpinner"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginLeft="-8dp"
+							android:background="@null"
+							android:textSize="@dimen/default_list_text_size" />
 
-                            <ImageView
-                                android:id="@+id/fromDropDownIcon"
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_marginRight="@dimen/list_header_text_left_margin"
-                                android:src="@drawable/ic_action_arrow_drop_down"/>
+					</LinearLayout>
 
-                        </LinearLayout>
+					<FrameLayout
+						android:id="@+id/from_button"
+						android:layout_width="wrap_content"
+						android:layout_height="@dimen/route_info_buttons_height"
+						android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
+						android:layout_marginLeft="@dimen/context_menu_padding_margin_medium"
+						android:layout_marginRight="@dimen/context_menu_padding_margin_medium"
+						android:layout_marginTop="@dimen/route_info_icon_vertical_padding"
+						tools:background="@drawable/btn_border_trans_rounded_dark">
 
-                        <View
-                            android:layout_marginStart="@dimen/route_info_divider_margin"
-                            android:layout_marginLeft="@dimen/route_info_divider_margin"
-                            android:id="@+id/dividerFromDropDown"
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:background="@color/dashboard_divider_dark"
-                            android:focusable="false"/>
+						<LinearLayout
+							android:id="@+id/from_button_container"
+							android:layout_width="wrap_content"
+							android:layout_height="match_parent"
+							android:gravity="center"
+							tools:visibility="visible">
 
-                        <LinearLayout
-                            android:id="@+id/ViaLayout"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="?attr/selectableItemBackground"
-                            android:minHeight="@dimen/list_item_height"
-                            android:orientation="horizontal">
+							<net.osmand.plus.widgets.TextViewEx
+								android:id="@+id/from_button_description"
+								android:layout_width="0dp"
+								android:layout_height="wrap_content"
+								android:layout_gravity="center"
+								android:layout_weight="1"
+								android:ellipsize="end"
+								android:gravity="center"
+								android:letterSpacing="@dimen/text_button_letter_spacing"
+								android:maxLines="1"
+								android:textSize="@dimen/text_button_text_size"
+								android:visibility="gone"
+								osmand:typeface="@string/font_roboto_medium"
+								tools:ignore="UnusedAttribute"
+								tools:text="@string/shared_string_edit"
+								tools:textColor="?attr/wikivoyage_active_color"
+								tools:visibility="gone" />
 
-                            <ImageView
-                                android:id="@+id/viaIcon"
-                                android:layout_width="@dimen/standard_icon_size"
-                                android:layout_height="match_parent"
-                                android:layout_marginStart="@dimen/route_info_icon_padding_left"
-                                android:layout_marginLeft="@dimen/route_info_icon_padding_left"
-                                android:layout_marginRight="@dimen/route_info_icon_padding_right"
-                                android:layout_marginEnd="@dimen/route_info_icon_padding_right"
-                                android:src="@drawable/map_default_location"/>
+							<ImageView
+								android:id="@+id/from_button_image_view"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
+								android:layout_marginLeft="@dimen/route_info_icon_vertical_padding"
+								android:layout_marginRight="@dimen/route_info_icon_vertical_padding"
+								android:layout_marginTop="@dimen/route_info_icon_vertical_padding"
+								tools:src="@drawable/ic_action_test_light" />
 
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_weight="1"
-                                android:orientation="vertical">
+						</LinearLayout>
 
-                                <TextView
-                                    android:id="@+id/ViaSubView"
-                                    android:layout_width="fill_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginBottom="3dp"
-                                    android:layout_marginTop="5dp"
-                                    android:gravity="left"
-                                    android:text="@string/route_via"
-                                    android:textSize="@dimen/default_sub_text_size"/>
+					</FrameLayout>
 
-                                <TextView
-                                    android:id="@+id/ViaView"
-                                    android:layout_width="fill_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginRight="@dimen/list_content_padding"
-                                    android:gravity="left"
-                                    android:singleLine="true"
-                                    android:textColor="?android:textColorPrimary"
-                                    android:textSize="@dimen/default_list_text_size"/>
+				</LinearLayout>
 
-                            </LinearLayout>
+				<View
+					android:id="@+id/dividerFromDropDown"
+					android:layout_width="match_parent"
+					android:layout_height="1dp"
+					android:layout_marginEnd="@dimen/route_info_end_divider_margin"
+					android:layout_marginLeft="@dimen/route_info_start_divider_margin"
+					android:layout_marginRight="@dimen/route_info_end_divider_margin"
+					android:layout_marginStart="@dimen/route_info_start_divider_margin"
+					android:background="@color/dashboard_divider_dark"
+					android:focusable="false" />
 
-                        </LinearLayout>
+				<LinearLayout
+					android:id="@+id/ViaLayout"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="?attr/selectableItemBackground"
+					android:minHeight="@dimen/route_info_list_item_height"
+					android:orientation="horizontal">
 
-                        <View
-                            android:layout_marginStart="@dimen/route_info_divider_margin"
-                            android:layout_marginLeft="@dimen/route_info_divider_margin"
-                            android:id="@+id/viaLayoutDivider"
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:background="@color/dashboard_divider_dark"
-                            android:focusable="false"/>
+					<ImageView
+						android:id="@+id/viaIcon"
+						android:layout_width="@dimen/standard_icon_size"
+						android:layout_height="@dimen/standard_icon_size"
+						android:layout_marginBottom="@dimen/list_header_text_left_margin"
+						android:layout_marginEnd="@dimen/favorites_icon_right_margin"
+						android:layout_marginLeft="@dimen/list_content_padding"
+						android:layout_marginRight="@dimen/favorites_icon_right_margin"
+						android:layout_marginStart="@dimen/list_content_padding"
+						android:layout_marginTop="@dimen/list_header_text_left_margin"
+						android:src="@drawable/map_default_location" />
 
-                        <LinearLayout
-                            android:id="@+id/ToLayout"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="?attr/selectableItemBackground"
-                            android:minHeight="@dimen/list_item_height"
-                            android:orientation="horizontal">
+					<LinearLayout
+						android:layout_width="0dp"
+						android:layout_height="match_parent"
+						android:layout_weight="1"
+						android:orientation="vertical">
 
-                            <ImageView
-                                android:id="@+id/toIcon"
-                                android:layout_width="@dimen/standard_icon_size"
-                                android:layout_height="match_parent"
-                                android:layout_marginStart="@dimen/route_info_icon_padding_left"
-                                android:layout_marginLeft="@dimen/route_info_icon_padding_left"
-                                android:layout_marginRight="@dimen/route_info_icon_padding_right"
-                                android:layout_marginEnd="@dimen/route_info_icon_padding_right"
-                                android:src="@drawable/map_default_location"/>
+						<TextView
+							android:id="@+id/ViaSubView"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginBottom="3dp"
+							android:layout_marginTop="5dp"
+							android:ellipsize="end"
+							android:gravity="left"
+							android:singleLine="true"
+							android:text="@string/intermediate_destinations"
+							android:textSize="@dimen/default_sub_text_size" />
 
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_weight="1"
-                                android:orientation="vertical">
+						<TextView
+							android:id="@+id/ViaView"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginRight="@dimen/list_content_padding"
+							android:gravity="left"
+							android:singleLine="true"
+							android:textColor="?android:textColorPrimary"
+							android:textSize="@dimen/default_list_text_size" />
 
-                                <TextView
-                                    android:id="@+id/toTitle"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginBottom="3dp"
-                                    android:layout_marginTop="5dp"
-                                    android:text="@string/route_to"
-                                    android:textSize="@dimen/default_sub_text_size">
-                                </TextView>
+					</LinearLayout>
 
-                                <Spinner
-                                    android:id="@+id/ToSpinner"
-                                    android:layout_width="fill_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginLeft="-8dp"
-                                    android:background="@null"
-                                    android:textSize="@dimen/default_list_text_size"/>
+					<FrameLayout
+						android:id="@+id/via_button"
+						android:layout_width="wrap_content"
+						android:layout_height="@dimen/route_info_buttons_height"
+						android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
+						android:layout_marginLeft="@dimen/context_menu_padding_margin_medium"
+						android:layout_marginRight="@dimen/context_menu_padding_margin_medium"
+						android:layout_marginTop="@dimen/route_info_icon_vertical_padding"
+						tools:background="@drawable/btn_border_trans_rounded_dark">
 
-                            </LinearLayout>
+						<LinearLayout
+							android:id="@+id/via_button_container"
+							android:layout_width="wrap_content"
+							android:layout_height="match_parent"
+							android:gravity="center"
+							android:visibility="visible">
 
-                            <ImageView
-                                android:id="@+id/toDropDownIcon"
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_marginRight="@dimen/list_header_text_left_margin"
-                                android:src="@drawable/ic_action_arrow_drop_down"/>
+							<net.osmand.plus.widgets.TextViewEx
+								android:id="@+id/via_button_description"
+								android:layout_width="0dp"
+								android:layout_height="wrap_content"
+								android:layout_gravity="center"
+								android:layout_marginLeft="@dimen/content_padding_small"
+								android:layout_marginStart="@dimen/content_padding_small"
+								android:layout_weight="1"
+								android:ellipsize="end"
+								android:gravity="center"
+								android:letterSpacing="@dimen/text_button_letter_spacing"
+								android:maxLines="1"
+								android:text="@string/shared_string_edit"
+								android:textSize="@dimen/text_button_text_size"
+								osmand:typeface="@string/font_roboto_medium"
+								tools:ignore="UnusedAttribute"
+								tools:textColor="?attr/wikivoyage_active_color" />
 
-                        </LinearLayout>
+							<ImageView
+								android:id="@+id/via_button_image_view"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
+								android:layout_marginLeft="@dimen/route_info_icon_vertical_padding"
+								android:layout_marginRight="@dimen/route_info_icon_vertical_padding"
+								android:layout_marginTop="@dimen/route_info_icon_vertical_padding"
+								tools:src="@drawable/ic_action_edit_dark" />
 
-                    </LinearLayout>
+						</LinearLayout>
 
-                    <ImageView
-                        android:background="?attr/selectableItemBackground"
-                        android:id="@+id/swap_direction_image_view"
-                        android:paddingRight="@dimen/route_info_icon_padding_right"
-                        android:paddingLeft="@dimen/route_info_icon_padding_right"
-                        android:layout_gravity="end"
-                        tools:src="@drawable/ic_action_test_light"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"/>
+					</FrameLayout>
 
-                </LinearLayout>
+				</LinearLayout>
 
-                <View
-                    android:id="@+id/dividerToDropDown"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/dashboard_divider_dark"
-                    android:focusable="false"/>
+				<View
+					android:id="@+id/viaLayoutDivider"
+					android:layout_width="match_parent"
+					android:layout_height="1dp"
+					android:layout_marginEnd="@dimen/route_info_end_divider_margin"
+					android:layout_marginLeft="@dimen/route_info_start_divider_margin"
+					android:layout_marginRight="@dimen/route_info_end_divider_margin"
+					android:layout_marginStart="@dimen/route_info_start_divider_margin"
+					android:background="@color/dashboard_divider_dark"
+					android:focusable="false" />
 
-                <LinearLayout
-                    android:id="@+id/RouteInfoControls"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+				<LinearLayout
+					android:id="@+id/ToLayout"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="?attr/selectableItemBackground"
+					android:minHeight="@dimen/route_info_list_item_height"
+					android:orientation="horizontal">
 
-                    <LinearLayout
-                        android:id="@+id/Info"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackground"
-                        android:minHeight="@dimen/list_item_height"
-                        android:orientation="horizontal">
+					<ImageView
+						android:id="@+id/toIcon"
+						android:layout_width="@dimen/standard_icon_size"
+						android:layout_height="@dimen/standard_icon_size"
+						android:layout_marginBottom="@dimen/list_header_text_left_margin"
+						android:layout_marginEnd="@dimen/favorites_icon_right_margin"
+						android:layout_marginLeft="@dimen/list_content_padding"
+						android:layout_marginRight="@dimen/favorites_icon_right_margin"
+						android:layout_marginStart="@dimen/list_content_padding"
+						android:layout_marginTop="@dimen/list_header_text_left_margin"
+						android:src="@drawable/map_default_location" />
 
-                        <ImageView
-                            android:id="@+id/Prev"
-                            android:layout_width="@dimen/list_item_height"
-                            android:layout_height="@dimen/list_item_height"
-                            android:background="?attr/selectableItemBackground"
-                            android:contentDescription="@string/shared_string_previous"
-                            android:scaleType="center"
-                            android:src="@drawable/ic_prev"/>
+					<LinearLayout
+						android:layout_width="0dp"
+						android:layout_height="match_parent"
+						android:layout_weight="1"
+						android:orientation="vertical">
 
-                        <ImageView
-                            android:id="@+id/InfoIcon"
-                            android:layout_width="@dimen/standard_icon_size"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginLeft="@dimen/list_content_padding"
-                            android:layout_marginRight="@dimen/list_content_padding"
-                            android:contentDescription="@string/info_button"
-                            android:scaleType="center"
-                            android:src="@drawable/ic_action_info_dark"/>
+						<TextView
+							android:id="@+id/toTitle"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_marginBottom="3dp"
+							android:layout_marginTop="5dp"
+							android:text="@string/route_to"
+							android:textSize="@dimen/default_sub_text_size" />
 
-                        <LinearLayout
-                            android:id="@+id/InfoDistance"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
+						<Spinner
+							android:id="@+id/ToSpinner"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginLeft="-8dp"
+							android:background="@null"
+							android:textSize="@dimen/default_list_text_size" />
 
-                            <TextView
-                                android:id="@+id/DistanceTitle"
-                                android:layout_width="fill_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="3dp"
-                                android:layout_marginTop="5dp"
-                                android:gravity="left"
-                                android:text="@string/route_distance"
-                                android:textSize="@dimen/default_sub_text_size"/>
+					</LinearLayout>
 
-                            <TextView
-                                android:id="@+id/DistanceText"
-                                android:layout_width="fill_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginRight="@dimen/list_content_padding"
-                                android:gravity="left"
-                                android:singleLine="true"
-                                android:textColor="?android:textColorPrimary"
-                                android:textSize="@dimen/default_list_text_size"/>
+					<FrameLayout
+						android:id="@+id/to_button"
+						android:layout_width="wrap_content"
+						android:layout_height="@dimen/route_info_buttons_height"
+						android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
+						android:layout_marginLeft="@dimen/context_menu_padding_margin_medium"
+						android:layout_marginRight="@dimen/context_menu_padding_margin_medium"
+						android:layout_marginTop="@dimen/route_info_icon_vertical_padding"
+						tools:background="@drawable/btn_border_trans_rounded_dark">
 
-                        </LinearLayout>
+						<LinearLayout
+							android:id="@+id/to_button_container"
+							android:layout_width="wrap_content"
+							android:layout_height="match_parent"
+							android:gravity="center"
+							android:visibility="visible">
 
-                        <ImageView
-                            android:id="@+id/DurationIcon"
-                            android:layout_width="@dimen/standard_icon_size"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginLeft="@dimen/list_content_padding"
-                            android:layout_marginRight="@dimen/list_content_padding"
-                            android:contentDescription="@string/info_button"
-                            android:scaleType="center"
-                            android:src="@drawable/ic_action_time_span"/>
+							<net.osmand.plus.widgets.TextViewEx
+								android:id="@+id/to_button_description"
+								android:layout_width="0dp"
+								android:layout_height="match_parent"
+								android:layout_gravity="center"
+								android:layout_marginLeft="@dimen/content_padding_small"
+								android:layout_marginStart="@dimen/content_padding_small"
+								android:layout_weight="1"
+								android:ellipsize="end"
+								android:gravity="center"
+								android:letterSpacing="@dimen/text_button_letter_spacing"
+								android:maxLines="1"
+								android:text="@string/shared_string_add"
+								android:textSize="@dimen/text_button_text_size"
+								osmand:typeface="@string/font_roboto_medium"
+								tools:ignore="UnusedAttribute"
+								tools:textColor="?attr/wikivoyage_active_color" />
 
-                        <LinearLayout
-                            android:id="@+id/InfoDuration"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
+							<ImageView
+								android:id="@+id/to_button_image_view"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
+								android:layout_marginLeft="@dimen/route_info_icon_vertical_padding"
+								android:layout_marginRight="@dimen/route_info_icon_vertical_padding"
+								android:layout_marginTop="@dimen/route_info_icon_vertical_padding"
+								tools:src="@drawable/ic_action_plus" />
 
-                            <TextView
-                                android:id="@+id/DurationTitle"
-                                android:layout_width="fill_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="3dp"
-                                android:layout_marginTop="5dp"
-                                android:gravity="left"
-                                android:text="@string/route_duration"
-                                android:textSize="@dimen/default_sub_text_size"/>
+						</LinearLayout>
 
-                            <TextView
-                                android:id="@+id/DurationText"
-                                android:layout_width="fill_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginRight="@dimen/list_content_padding"
-                                android:gravity="left"
-                                android:singleLine="true"
-                                android:textColor="?android:textColorPrimary"
-                                android:textSize="@dimen/default_list_text_size"/>
+					</FrameLayout>
 
-                        </LinearLayout>
+				</LinearLayout>
 
-                        <TextView
-                            android:id="@+id/InfoTextView"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical|left"
-                            android:layout_margin="8dp"
-                            android:layout_weight="1"
-                            android:textSize="@dimen/default_desc_text_size"/>
+			</LinearLayout>
 
-                        <ImageView
-                            android:id="@+id/Next"
-                            android:layout_width="@dimen/list_item_height"
-                            android:layout_height="@dimen/list_item_height"
-                            android:layout_marginLeft="5dp"
-                            android:background="?attr/selectableItemBackground"
-                            android:contentDescription="@string/shared_string_next"
-                            android:scaleType="center"
-                            android:src="@drawable/ic_next"/>
-                    </LinearLayout>
+			<View
+				android:id="@+id/dividerButtons"
+				android:layout_width="match_parent"
+				android:layout_height="1dp"
+				android:layout_gravity="bottom"
+				android:focusable="false"
+				tools:background="@color/dashboard_divider_dark" />
 
-                </LinearLayout>
-            </LinearLayout>
+			<FrameLayout
+				android:id="@+id/map_route_options"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/list_item_height">
 
-        </ScrollView>
+				<HorizontalScrollView
+					android:id="@+id/route_options_scroll_container"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_gravity="start"
+					android:paddingBottom="@dimen/bottom_sheet_content_margin_small"
+					android:paddingTop="@dimen/bottom_sheet_content_margin_small">
 
-        <View
-            android:id="@+id/dividerButtons"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_gravity="bottom"
-            android:background="@color/dashboard_divider_dark"
-            android:focusable="false"/>
+					<LinearLayout
+						android:id="@+id/route_options_container"
+						android:layout_width="wrap_content"
+						android:layout_height="match_parent"
+						android:gravity="start"
+						android:orientation="horizontal"
+						android:paddingEnd="70dp"
+						android:paddingLeft="5dp"
+						android:paddingRight="70dp"
+						android:paddingStart="5dp">
 
-        <include layout="@layout/map_route_prepare_bottom"
-            android:id="@+id/map_route_prepare_bottom_view"/>
+					</LinearLayout>
 
-    </LinearLayout>
+				</HorizontalScrollView>
+
+				<LinearLayout
+					android:id="@+id/map_options_route_button"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_gravity="end"
+					android:orientation="horizontal"
+					android:paddingLeft="@dimen/route_info_buttons_padding_top_bottom"
+					android:paddingStart="@dimen/route_info_buttons_padding_top_bottom">
+
+					<net.osmand.plus.widgets.TextViewEx
+						android:id="@+id/map_options_route_button_title"
+						android:layout_width="wrap_content"
+						android:layout_height="match_parent"
+						android:layout_gravity="end"
+						android:ellipsize="end"
+						android:gravity="center"
+						android:letterSpacing="@dimen/text_button_letter_spacing"
+						android:maxLines="1"
+						android:text="@string/shared_string_options"
+						android:textSize="@dimen/text_button_text_size"
+						osmand:typeface="@string/font_roboto_medium"
+						tools:ignore="UnusedAttribute"
+						tools:textColor="?attr/wikivoyage_active_color" />
+
+					<ImageView
+						android:id="@+id/map_options_route_button_icon"
+						android:layout_width="wrap_content"
+						android:layout_height="match_parent"
+						android:paddingEnd="@dimen/route_info_buttons_padding_top_bottom"
+						android:paddingLeft="@dimen/content_padding_small"
+						android:paddingRight="@dimen/route_info_buttons_padding_top_bottom"
+						android:paddingStart="@dimen/content_padding_small"
+						tools:src="@drawable/ic_action_edit_dark"
+						tools:tint="@color/recording_color" />
+
+				</LinearLayout>
+
+				<ProgressBar
+					android:id="@+id/progress_bar"
+					style="?android:attr/progressBarStyleHorizontal"
+					android:layout_width="match_parent"
+					android:layout_height="2dp"
+					android:layout_gravity="bottom"
+					android:max="100"
+					android:visibility="gone"
+					tools:progress="60"
+					tools:visibility="visible" />
+
+			</FrameLayout>
+
+		</LinearLayout>
+
+		<FrameLayout
+			android:id="@+id/bottom_container"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:foregroundGravity="top|fill_horizontal"
+			tools:foreground="@drawable/bg_contextmenu_shadow">
+
+			<net.osmand.plus.LockableScrollView
+				android:id="@+id/route_menu_bottom_scroll"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				tools:background="?attr/ctx_menu_info_view_bg">
+
+				<LinearLayout
+					android:id="@+id/route_menu_cards_container"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:paddingBottom="60dp"
+					android:orientation="vertical"
+					tools:background="?attr/ctx_menu_info_view_bg">
+
+				</LinearLayout>
+
+			</net.osmand.plus.LockableScrollView>
+
+		</FrameLayout>
+
+	</net.osmand.plus.mapcontextmenu.InterceptorLinearLayout>
+
+	<LinearLayout
+		android:id="@+id/control_buttons"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:orientation="vertical">
+
+		<ImageView
+			android:layout_width="match_parent"
+			android:layout_height="10dp"
+			android:layout_gravity="bottom"
+			android:background="@drawable/bg_contextmenu_shadow_top_light" />
+
+		<include
+			layout="@layout/route_info_menu_control_buttons"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="bottom" />
+
+	</LinearLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/powered_by_osmand_item.xml b/OsmAnd/res/layout/powered_by_osmand_item.xml
new file mode 100644
index 0000000000..3211d2d863
--- /dev/null
+++ b/OsmAnd/res/layout/powered_by_osmand_item.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/list_item_height"
+	android:layout_gravity="bottom"
+	android:orientation="horizontal">
+
+	<android.support.v7.widget.AppCompatImageView
+		android:layout_width="36dp"
+		android:layout_height="36dp"
+		android:layout_gravity="center"
+		android:layout_marginStart="8dp"
+		android:layout_marginLeft="8dp"
+		android:contentDescription="@string/app_name_osmand"
+		android:scaleType="centerInside"
+		android:tint="@color/osmand_orange"
+		android:src="@drawable/ic_action_osmand_logo" />
+
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:drawablePadding="24dp"
+		android:gravity="center_vertical"
+		android:minHeight="@dimen/list_item_height"
+		android:paddingStart="4dp"
+		android:paddingLeft="4dp"
+		android:text="@string/powered_by_osmand"
+		android:textColor="?android:attr/textColorSecondary"
+		android:textAppearance="@style/TextAppearance.ListItemTitle"
+		android:textStyle="normal" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/purchase_dialog_active_card.xml b/OsmAnd/res/layout/purchase_dialog_active_card.xml
deleted file mode 100644
index ef4ebd43cb..0000000000
--- a/OsmAnd/res/layout/purchase_dialog_active_card.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:osmand="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/list_header_padding"
-    android:layout_marginLeft="@dimen/card_padding"
-    android:layout_marginRight="@dimen/card_padding"
-    android:background="?attr/purchase_dialog_active_card_bg"
-    android:orientation="vertical">
-
-    <include layout="@layout/purchase_dialog_card_header"/>
-
-    <View
-        android:id="@+id/header_div"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginLeft="1dp"
-        android:layout_marginRight="1dp"
-        android:background="?attr/wikivoyage_card_divider_color"/>
-
-    <LinearLayout
-        android:id="@+id/rows_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"/>
-
-    <net.osmand.plus.widgets.TextViewEx
-        android:id="@+id/card_descr"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/list_content_padding_large"
-        android:layout_marginRight="@dimen/list_content_padding_large"
-        android:layout_marginTop="@dimen/list_header_padding"
-        android:gravity="center"
-        android:textColor="?attr/card_description_text_color"
-        android:textSize="@dimen/default_desc_text_size"
-        osmand:typeface="@string/font_roboto_regular"
-        tools:text="@string/osm_live_payment_desc"/>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/card_padding">
-
-        <include layout="@layout/purchase_dialog_card_button"/>
-
-    </FrameLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/purchase_dialog_card.xml b/OsmAnd/res/layout/purchase_dialog_card.xml
index d511f68ece..2dde98ac32 100644
--- a/OsmAnd/res/layout/purchase_dialog_card.xml
+++ b/OsmAnd/res/layout/purchase_dialog_card.xml
@@ -43,6 +43,7 @@
         android:layout_margin="@dimen/card_padding">
 
         <include layout="@layout/purchase_dialog_card_button"/>
+        <include layout="@layout/purchase_dialog_card_button_disabled"/>
 
     </FrameLayout>
 
diff --git a/OsmAnd/res/layout/purchase_dialog_card_button_active_ex.xml b/OsmAnd/res/layout/purchase_dialog_card_button_active_ex.xml
new file mode 100644
index 0000000000..5647137c1f
--- /dev/null
+++ b/OsmAnd/res/layout/purchase_dialog_card_button_active_ex.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginLeft="1dp"
+	android:layout_marginRight="1dp"
+	android:background="?attr/subscription_active_bg_color"
+	android:orientation="vertical">
+
+	<View
+		android:id="@+id/div_top"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:background="?attr/subscription_active_div_color"
+		android:visibility="gone" />
+
+	<LinearLayout
+		android:id="@+id/button_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/selectableItemBackground"
+		android:baselineAligned="false"
+		android:minHeight="@dimen/dialog_button_ex_height"
+		android:orientation="horizontal"
+		android:paddingLeft="@dimen/card_padding"
+		android:paddingRight="@dimen/card_padding">
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:layout_marginTop="@dimen/list_header_padding"
+			android:layout_marginEnd="@dimen/list_content_padding"
+			android:layout_marginRight="@dimen/list_content_padding"
+			android:layout_marginBottom="@dimen/list_header_padding"
+			android:layout_weight="1"
+			android:orientation="vertical">
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="center"
+				android:textColor="?attr/dialog_title_color"
+				android:textSize="@dimen/default_list_text_size"
+				osmand:typeface="@string/font_roboto_regular"
+				tools:text="Pay monthly" />
+
+			<LinearLayout
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal">
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/description"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textColor="?attr/card_description_text_color"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_regular"
+					tools:text="Monthly payment" />
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/button_view"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:background="?attr/wikivoyage_secondary_btn_bg">
+
+			<LinearLayout
+				android:id="@+id/button"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/dialog_button_height"
+				android:gravity="center"
+				android:orientation="horizontal"
+				android:padding="@dimen/list_header_padding">
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/button_title"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:gravity="center"
+					android:letterSpacing="@dimen/text_button_letter_spacing"
+					android:maxWidth="@dimen/dialog_button_ex_max_width"
+					android:minWidth="@dimen/dialog_button_ex_min_width"
+					android:textColor="@color/wikivoyage_secondary_text"
+					android:textSize="@dimen/text_button_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="7,99€" />
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/button_cancel_view"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:background="?attr/wikivoyage_primary_btn_bg">
+
+			<LinearLayout
+				android:id="@+id/button_cancel"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/dialog_button_height"
+				android:gravity="center"
+				android:orientation="horizontal"
+				android:padding="@dimen/list_header_padding">
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/button_cancel_title"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:gravity="center"
+					android:letterSpacing="@dimen/text_button_letter_spacing"
+					android:maxWidth="@dimen/dialog_button_ex_max_width"
+					android:minWidth="@dimen/dialog_button_ex_min_width"
+					android:text="@string/shared_string_cancel"
+					android:textColor="@color/color_white"
+					android:textSize="@dimen/text_button_text_size"
+					osmand:typeface="@string/font_roboto_medium" />
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+	<View
+		android:id="@+id/div"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginLeft="@dimen/card_padding"
+		android:layout_marginRight="@dimen/card_padding"
+		android:background="?attr/subscription_active_div_color"
+		android:visibility="gone" />
+
+	<View
+		android:id="@+id/div_bottom"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:background="?attr/subscription_active_div_color"
+		android:visibility="gone" />
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/purchase_dialog_card_button_disabled.xml b/OsmAnd/res/layout/purchase_dialog_card_button_disabled.xml
new file mode 100644
index 0000000000..d54fefb6b5
--- /dev/null
+++ b/OsmAnd/res/layout/purchase_dialog_card_button_disabled.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/wikivoyage_secondary_btn_bg">
+
+	<LinearLayout
+		android:id="@+id/card_button_disabled"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/selectableItemBackgroundBorderless"
+		android:gravity="center"
+		android:minHeight="@dimen/card_button_min_size"
+		android:orientation="vertical"
+		android:paddingLeft="@dimen/list_content_padding"
+		android:paddingTop="@dimen/list_header_padding"
+		android:paddingRight="@dimen/list_content_padding"
+		android:paddingBottom="@dimen/list_header_padding">
+
+		<ProgressBar
+			android:id="@+id/card_button_progress"
+			android:layout_width="@dimen/card_button_progress_size"
+			android:layout_height="@dimen/card_button_progress_size"
+			android:indeterminate="true"
+			android:visibility="gone" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/card_button_title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center"
+			android:letterSpacing="@dimen/text_button_letter_spacing"
+			android:textColor="@color/wikivoyage_secondary_text"
+			android:textSize="@dimen/text_button_text_size"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:text="Buy - 5€" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/card_button_subtitle"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center"
+			android:letterSpacing="@dimen/text_button_letter_spacing"
+			android:textColor="@color/wikivoyage_secondary_text"
+			android:textSize="@dimen/text_button_text_size"
+			osmand:typeface="@string/font_roboto_regular"
+			tools:text="One time purchase" />
+
+	</LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/purchase_dialog_card_button_ex.xml b/OsmAnd/res/layout/purchase_dialog_card_button_ex.xml
new file mode 100644
index 0000000000..2dba96adf7
--- /dev/null
+++ b/OsmAnd/res/layout/purchase_dialog_card_button_ex.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginLeft="1dp"
+	android:layout_marginRight="1dp"
+	android:orientation="vertical">
+
+	<LinearLayout
+		android:id="@+id/button_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/selectableItemBackground"
+		android:baselineAligned="false"
+		android:minHeight="@dimen/dialog_button_ex_height"
+		android:orientation="horizontal"
+		android:paddingLeft="@dimen/card_padding"
+		android:paddingRight="@dimen/card_padding">
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:layout_marginTop="@dimen/list_header_padding"
+			android:layout_marginEnd="@dimen/list_content_padding"
+			android:layout_marginRight="@dimen/list_content_padding"
+			android:layout_marginBottom="@dimen/list_header_padding"
+			android:layout_weight="1"
+			android:orientation="vertical">
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="center"
+				android:textColor="?attr/dialog_title_color"
+				android:textSize="@dimen/default_list_text_size"
+				osmand:typeface="@string/font_roboto_regular"
+				tools:text="Pay monthly" />
+
+			<LinearLayout
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal">
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/description"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:textColor="?attr/card_description_text_color"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_regular"
+					tools:text="Monthly payment" />
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/discount_banner_regular"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="bottom"
+					android:layout_marginStart="@dimen/list_item_button_padding"
+					android:layout_marginLeft="@dimen/list_item_button_padding"
+					android:background="?attr/text_rounded_bg_regular"
+					android:textColor="?attr/card_description_text_color"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_regular"
+					tools:text=" Save 20%! " />
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/discount_banner_active"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="bottom"
+					android:layout_marginStart="@dimen/list_item_button_padding"
+					android:layout_marginLeft="@dimen/list_item_button_padding"
+					android:background="?attr/text_rounded_bg_active"
+					android:textColor="@color/osmand_orange"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_regular"
+					tools:text=" Save 20%! " />
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/button_view"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:background="?attr/btn_round_border_2">
+
+			<LinearLayout
+				android:id="@+id/button"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/dialog_button_height"
+				android:background="?attr/selectableItemBackground"
+				android:gravity="center"
+				android:orientation="horizontal"
+				android:padding="@dimen/list_header_padding">
+
+				<ProgressBar
+					android:id="@+id/button_progress"
+					android:layout_width="@dimen/card_button_progress_size_small"
+					android:layout_height="@dimen/card_button_progress_size_small"
+					android:indeterminate="true"
+					android:visibility="gone" />
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/button_title"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:gravity="center"
+					android:letterSpacing="@dimen/text_button_letter_spacing"
+					android:maxWidth="@dimen/dialog_button_ex_max_width"
+					android:minWidth="@dimen/dialog_button_ex_min_width"
+					android:textColor="?attr/color_dialog_buttons"
+					android:textSize="@dimen/text_button_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="7,99€" />
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/button_ex_view"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:background="?attr/wikivoyage_primary_btn_bg">
+
+			<LinearLayout
+				android:id="@+id/button_ex"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/dialog_button_height"
+				android:background="?attr/selectableItemBackground"
+				android:gravity="center"
+				android:orientation="horizontal"
+				android:padding="@dimen/list_header_padding">
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/button_ex_title"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:gravity="center"
+					android:letterSpacing="@dimen/text_button_letter_spacing"
+					android:maxWidth="@dimen/dialog_button_ex_max_width"
+					android:minWidth="@dimen/dialog_button_ex_min_width"
+					android:textColor="@color/color_white"
+					android:textSize="@dimen/text_button_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="7,99€" />
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+	<View
+		android:id="@+id/div"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginLeft="@dimen/card_padding"
+		android:layout_marginRight="@dimen/card_padding"
+		android:background="?attr/wikivoyage_card_divider_color"
+		android:visibility="gone" />
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/purchase_dialog_osm_live_card.xml b/OsmAnd/res/layout/purchase_dialog_osm_live_card.xml
new file mode 100644
index 0000000000..997ae7a2dd
--- /dev/null
+++ b/OsmAnd/res/layout/purchase_dialog_osm_live_card.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginLeft="@dimen/card_padding"
+	android:layout_marginRight="@dimen/card_padding"
+	android:layout_marginBottom="@dimen/list_header_padding"
+	android:background="?attr/purchase_dialog_active_card_bg"
+	android:orientation="vertical">
+
+	<include layout="@layout/purchase_dialog_card_header" />
+
+	<View
+		android:id="@+id/header_div"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginLeft="1dp"
+		android:layout_marginRight="1dp"
+		android:background="?attr/wikivoyage_card_divider_color" />
+
+	<LinearLayout
+		android:id="@+id/rows_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical" />
+
+	<View
+		android:id="@+id/buttons_div"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginLeft="1dp"
+		android:layout_marginRight="1dp"
+		android:background="?attr/wikivoyage_card_divider_color"/>
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/card_button_subtitle"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/card_padding"
+		android:layout_marginLeft="@dimen/card_padding"
+		android:layout_marginRight="@dimen/card_padding"
+		android:layout_marginBottom="@dimen/list_header_padding"
+		android:text="@string/osm_live_payment_header"
+		android:textColor="@color/dialog_text_description_color"
+		android:textSize="@dimen/default_desc_text_size"
+		osmand:typeface="@string/font_roboto_regular" />
+
+	<ProgressBar
+		android:id="@+id/card_progress"
+		android:layout_width="@dimen/card_button_progress_size"
+		android:layout_height="@dimen/card_button_progress_size"
+		android:layout_gravity="center"
+		android:layout_marginTop="@dimen/card_padding"
+		android:layout_marginLeft="@dimen/card_padding"
+		android:layout_marginRight="@dimen/card_padding"
+		android:layout_marginBottom="@dimen/list_content_padding_large"
+		android:indeterminate="true"
+		android:visibility="visible" />
+
+	<LinearLayout
+		android:id="@+id/card_buttons_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="2dp"
+		android:orientation="vertical"
+		android:visibility="gone" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/route_info_menu_control_buttons.xml b/OsmAnd/res/layout/route_info_menu_control_buttons.xml
new file mode 100644
index 0000000000..295cba1d43
--- /dev/null
+++ b/OsmAnd/res/layout/route_info_menu_control_buttons.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<View
+		android:id="@+id/dividerControlButtons"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:focusable="false" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="48dp"
+		android:baselineAligned="false"
+		android:orientation="horizontal">
+
+		<FrameLayout
+			android:id="@+id/cancel_button"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1">
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/cancel_button_descr"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:background="?attr/selectableItemBackground"
+				android:ellipsize="end"
+				android:gravity="center"
+				android:letterSpacing="@dimen/text_button_letter_spacing"
+				android:maxLines="1"
+				android:paddingLeft="16dp"
+				android:paddingRight="16dp"
+				android:text="@string/shared_string_cancel"
+				android:textSize="@dimen/text_button_text_size"
+				osmand:typeface="@string/font_roboto_medium"
+				tools:ignore="UnusedAttribute" />
+
+		</FrameLayout>
+
+		<FrameLayout
+			android:id="@+id/start_button"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1">
+
+			<ProgressBar
+				android:id="@+id/progress_bar_button"
+				style="?android:attr/progressBarStyleHorizontal"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:layout_gravity="bottom"
+				android:max="100"
+				android:visibility="gone"
+				tools:progress="60"
+				tools:progressDrawable="?attr/size_progress_bar" />
+
+			<net.osmand.plus.widgets.ImageViewExProgress
+				android:id="@+id/start_icon"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:padding="@dimen/route_info_icon_padding_left"
+				android:scaleType="fitStart"
+				tools:src="@drawable/ic_action_start_navigation" />
+
+			<net.osmand.plus.widgets.TextViewExProgress
+				android:id="@+id/start_button_descr"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:background="?attr/selectableItemBackground"
+				android:ellipsize="end"
+				android:gravity="center"
+				android:letterSpacing="@dimen/text_button_letter_spacing"
+				android:maxLines="1"
+				android:paddingLeft="16dp"
+				android:paddingRight="16dp"
+				android:text="@string/shared_string_control_start"
+				android:textSize="@dimen/text_button_text_size"
+				osmand:typeface="@string/font_roboto_medium"
+				tools:ignore="UnusedAttribute" />
+
+		</FrameLayout>
+
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/route_info_statistic.xml b/OsmAnd/res/layout/route_info_statistic.xml
new file mode 100644
index 0000000000..c39bfdb60b
--- /dev/null
+++ b/OsmAnd/res/layout/route_info_statistic.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/route_info_details_card"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<View
+		android:id="@+id/dividerToDropDown"
+		android:layout_width="match_parent"
+		android:layout_height="2dp"
+		android:focusable="false" />
+
+	<LinearLayout
+		android:id="@+id/RouteInfoControls"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:id="@+id/info_container"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+			<LinearLayout
+				android:id="@+id/Info"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:minHeight="@dimen/route_info_list_item_height"
+				android:orientation="horizontal"
+				android:paddingBottom="@dimen/route_info_details_padding"
+				android:paddingTop="@dimen/route_info_details_padding">
+
+				<LinearLayout
+					android:layout_width="0dp"
+					android:layout_height="36dp"
+					android:layout_weight="1"
+					android:orientation="horizontal"
+					android:paddingEnd="@dimen/route_info_buttons_padding_top_bottom"
+					android:paddingRight="@dimen/route_info_buttons_padding_top_bottom">
+
+					<ImageView
+						android:id="@+id/InfoIcon"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="@dimen/list_content_padding"
+						android:layout_marginRight="@dimen/list_content_padding"
+						android:contentDescription="@string/info_button"
+						android:src="@drawable/ic_action_info_dark" />
+
+					<LinearLayout
+						android:id="@+id/InfoDistance"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:orientation="vertical">
+
+						<net.osmand.plus.widgets.TextViewEx
+							android:id="@+id/DistanceText"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:gravity="left"
+							android:singleLine="true"
+							android:textColor="?android:textColorPrimary"
+							android:textSize="@dimen/default_list_text_size" />
+
+						<net.osmand.plus.widgets.TextViewEx
+							android:id="@+id/DistanceTitle"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:gravity="left"
+							android:text="@string/route_distance"
+							android:textSize="@dimen/default_sub_text_size" />
+
+					</LinearLayout>
+
+				</LinearLayout>
+
+				<View
+					android:id="@+id/info_divider"
+					android:layout_width="1dp"
+					android:layout_height="match_parent"
+					android:paddingBottom="@dimen/list_item_button_padding" />
+
+				<LinearLayout
+					android:layout_width="0dp"
+					android:layout_height="36dp"
+					android:layout_weight="1"
+					android:orientation="horizontal"
+					android:paddingEnd="@dimen/route_info_buttons_padding_top_bottom"
+					android:paddingRight="@dimen/route_info_buttons_padding_top_bottom">
+
+					<ImageView
+						android:id="@+id/DurationIcon"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="@dimen/list_content_padding"
+						android:layout_marginRight="@dimen/list_content_padding"
+						android:contentDescription="@string/info_button"
+						android:src="@drawable/ic_action_time" />
+
+					<LinearLayout
+						android:id="@+id/InfoDuration"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:orientation="vertical">
+
+						<net.osmand.plus.widgets.TextViewEx
+							android:id="@+id/DurationText"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:gravity="left"
+							android:singleLine="true"
+							android:textColor="?android:textColorPrimary"
+							android:textSize="@dimen/default_list_text_size" />
+
+						<net.osmand.plus.widgets.TextViewEx
+							android:id="@+id/DurationTitle"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:gravity="left"
+							android:text="@string/arrive_at_time"
+							android:textSize="@dimen/default_sub_text_size" />
+
+					</LinearLayout>
+
+				</LinearLayout>
+
+			</LinearLayout>
+
+			<com.github.mikephil.charting.charts.LineChart
+				android:id="@+id/chart"
+				android:layout_width="match_parent"
+				android:layout_height="72dp"
+				android:layout_gravity="center_vertical" />
+
+		</LinearLayout>
+
+		<FrameLayout
+			android:id="@+id/details_button"
+			android:layout_width="match_parent"
+			android:layout_height="36dp"
+			android:layout_gravity="center_vertical"
+			android:layout_marginBottom="@dimen/route_info_details_padding"
+			android:layout_marginLeft="@dimen/route_info_buttons_padding_top_bottom"
+			android:layout_marginRight="@dimen/route_info_buttons_padding_top_bottom"
+			android:layout_marginTop="@dimen/route_info_details_padding"
+			android:orientation="horizontal">
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/details_button_descr"
+				android:layout_width="match_parent"
+				android:layout_height="36dp"
+				android:layout_gravity="center"
+				android:ellipsize="end"
+				android:gravity="center"
+				android:letterSpacing="@dimen/text_button_letter_spacing"
+				android:maxLines="1"
+				android:text="@string/rendering_category_details"
+				android:textSize="@dimen/text_button_text_size"
+				osmand:typeface="@string/font_roboto_medium"
+				tools:ignore="UnusedAttribute"
+				tools:textColor="?attr/wikivoyage_active_color" />
+
+		</FrameLayout>
+
+	</LinearLayout>
+
+	<include
+		android:id="@+id/shadow"
+		layout="@layout/card_bottom_divider"
+		android:visibility="visible" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/route_option_btn.xml b/OsmAnd/res/layout/route_option_btn.xml
new file mode 100644
index 0000000000..6fd1abeb7c
--- /dev/null
+++ b/OsmAnd/res/layout/route_option_btn.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/route_option_button"
+	android:layout_width="100dp"
+	android:layout_height="32dp"
+	android:orientation="horizontal">
+
+	<LinearLayout
+		android:id="@+id/route_option_container"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:gravity="start"
+		android:visibility="visible"
+		tools:background="@drawable/btn_border_trans_dark">
+
+		<ImageView
+			android:id="@+id/route_option_image_view"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:paddingBottom="@dimen/route_info_icon_vertical_padding"
+			android:paddingLeft="@dimen/route_info_icon_vertical_padding"
+			android:paddingRight="@dimen/route_info_icon_vertical_padding"
+			android:paddingTop="@dimen/route_info_icon_vertical_padding"
+			android:src="@drawable/ic_action_edit_dark"
+			tools:visibility="visible" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/route_option_title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:ellipsize="end"
+			android:gravity="center"
+			android:letterSpacing="@dimen/text_button_letter_spacing"
+			android:maxLines="1"
+			android:paddingBottom="3dp"
+			android:paddingEnd="4dp"
+			android:paddingLeft="3dp"
+			android:paddingRight="4dp"
+			android:paddingStart="3dp"
+			android:paddingTop="3dp"
+			android:text="@string/routing_attr_avoid_motorway_name"
+			android:textSize="@dimen/default_sub_text_size"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:ignore="UnusedAttribute"
+			tools:textColor="?attr/wikivoyage_active_color" />
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:id="@+id/avoid_route_options_container"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:gravity="center"
+		android:orientation="horizontal"
+		android:visibility="visible"
+		tools:background="@drawable/btn_border_trans_dark" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/route_options_container.xml b/OsmAnd/res/layout/route_options_container.xml
new file mode 100644
index 0000000000..ec50f5b162
--- /dev/null
+++ b/OsmAnd/res/layout/route_options_container.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/route_option_button"
+	android:layout_width="100dp"
+	android:layout_height="32dp"
+	android:orientation="horizontal"
+	tools:background="@drawable/btn_border_trans_dark">
+
+	<FrameLayout
+		android:id="@+id/removable_option"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:visibility="visible">
+
+		<LinearLayout
+			android:id="@+id/route_removable_option_container"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:gravity="start|center_vertical"
+			android:paddingLeft="8dp"
+			android:paddingRight="8dp">
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/route_removable_option_title"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:layout_gravity="center"
+				android:ellipsize="end"
+				android:gravity="center"
+				android:letterSpacing="@dimen/text_button_letter_spacing"
+				android:maxLines="1"
+				android:paddingBottom="3dp"
+				android:paddingTop="3dp"
+				android:text="@string/routing_attr_avoid_motorway_name"
+				android:textSize="@dimen/default_sub_text_size"
+				osmand:typeface="@string/font_roboto_medium"
+				tools:ignore="UnusedAttribute"
+				tools:textColor="?attr/wikivoyage_active_color" />
+
+		</LinearLayout>
+
+		<View
+			android:id="@+id/title_divider"
+			android:layout_width="wrap_content"
+			android:layout_height="1dp"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="8dp"
+			android:layout_marginRight="8dp"
+			android:background="@color/description_font_and_bottom_sheet_icons" />
+
+		<ImageView
+			android:id="@+id/removable_option_icon"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="end|center_vertical"
+			android:layout_marginLeft="1dp"
+			android:layout_marginRight="1dp"
+			android:paddingBottom="3dp"
+			android:paddingLeft="@dimen/route_info_icon_vertical_padding"
+			android:paddingRight="@dimen/route_info_icon_vertical_padding"
+			android:paddingTop="3dp"
+			tools:src="@drawable/ic_action_remove_dark" />
+
+		<View
+			android:id="@+id/options_divider_end"
+			android:layout_width="1dp"
+			android:layout_height="16dp"
+			android:layout_gravity="end|center_vertical" />
+
+	</FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/route_waypoint_item.xml b/OsmAnd/res/layout/route_waypoint_item.xml
new file mode 100644
index 0000000000..1cca0d15bc
--- /dev/null
+++ b/OsmAnd/res/layout/route_waypoint_item.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/package_delivered_layout"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="@drawable/view_transparent_selection"
+	android:descendantFocusability="blocksDescendants"
+	android:minHeight="48dp"
+	android:orientation="vertical">
+
+	<View
+		android:id="@+id/top_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginEnd="@dimen/route_info_end_divider_margin"
+		android:layout_marginLeft="@dimen/route_info_start_divider_margin"
+		android:layout_marginRight="@dimen/route_info_end_divider_margin"
+		android:layout_marginStart="@dimen/route_info_start_divider_margin"
+		android:background="@color/dashboard_divider_dark"
+		android:focusable="false" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:minHeight="48dp"
+		android:orientation="horizontal">
+
+
+		<ImageView
+			android:id="@+id/info_move"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_gravity="center_vertical"
+			android:clickable="false"
+			android:contentDescription="@string/shared_string_more"
+			android:focusable="false"
+			android:paddingBottom="12dp"
+			android:paddingEnd="24dp"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingRight="24dp"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingTop="12dp"
+			android:scaleType="center"
+			android:src="@drawable/ic_action_item_move"
+			android:visibility="visible" />
+
+		<ImageView
+			android:id="@+id/waypoint_icon"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:src="@drawable/ic_action_fav_dark" />
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_weight="1"
+			android:gravity="center"
+			android:orientation="vertical"
+			android:paddingLeft="24dp"
+			android:paddingStart="24dp">
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="2dp">
+
+				<TextView
+					android:id="@+id/waypoint_dist"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="bottom"
+					android:maxLines="1"
+					android:textColor="@color/color_myloc_distance"
+					android:textSize="@dimen/default_sub_text_size"
+					tools:text="12 km" />
+
+				<TextView
+					android:id="@+id/waypoint_deviation"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="bottom"
+					android:layout_marginLeft="6dp"
+					android:layout_marginStart="6dp"
+					android:drawablePadding="2dp"
+					android:maxLines="1"
+					android:textColor="@color/secondary_text_dark"
+					android:textSize="@dimen/default_sub_text_size"
+					tools:text="Intermediate point " />
+
+				<TextView
+					android:id="@+id/waypoint_desc_text"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_gravity="bottom"
+					android:layout_weight="1"
+					android:ellipsize="end"
+					android:maxLines="1"
+					android:textColor="@color/secondary_text_dark"
+					android:textSize="@dimen/default_sub_text_size"
+					tools:text="some description" />
+
+			</LinearLayout>
+
+			<TextView
+				android:id="@+id/waypoint_text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:ellipsize="end"
+				android:maxLines="2"
+				android:textSize="@dimen/default_list_text_size"
+				tools:text="Some waypoint text" />
+
+		</LinearLayout>
+
+		<ImageButton
+			android:id="@+id/info_close"
+			style="@style/Widget.AppCompat.ActionButton"
+			android:layout_width="48dp"
+			android:layout_height="48dp"
+			android:layout_gravity="center_vertical"
+			android:layout_marginEnd="2dp"
+			android:layout_marginRight="2dp"
+			android:layout_marginLeft="6dp"
+			android:layout_marginStart="6dp"
+			android:contentDescription="@string/shared_string_delete"
+			android:focusable="false"
+			android:scaleType="center"
+			android:src="@drawable/ic_action_remove_dark" />
+
+	</LinearLayout>
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/route_waypoints_fragment.xml b/OsmAnd/res/layout/route_waypoints_fragment.xml
new file mode 100644
index 0000000000..ed3559e5ac
--- /dev/null
+++ b/OsmAnd/res/layout/route_waypoints_fragment.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/plan_route_info"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:layout_gravity="bottom"
+	android:background="@color/color_transparent">
+
+	<LinearLayout
+		android:id="@+id/main_view"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:background="?attr/bg_color"
+		android:orientation="vertical">
+
+		<FrameLayout
+			android:layout_width="match_parent"
+			android:layout_height="48dp"
+			android:orientation="horizontal">
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:orientation="horizontal">
+
+				<ImageView
+					android:id="@+id/back_button"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:background="?attr/selectableItemBackgroundBorderless"
+					android:contentDescription="@string/shared_string_collapse"
+					android:paddingEnd="@dimen/bottom_sheet_icon_margin"
+					android:paddingLeft="@dimen/content_padding"
+					android:paddingRight="@dimen/bottom_sheet_icon_margin"
+					android:paddingStart="@dimen/content_padding"
+					android:scaleType="center"
+					android:src="@drawable/ic_arrow_back"
+					android:visibility="visible" />
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/title"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:layout_weight="1"
+					android:ellipsize="end"
+					android:maxLines="1"
+					android:text="@string/shared_string_waypoints"
+					android:textAppearance="@style/TextAppearance.ListItemCategoryTitle" />
+
+			</LinearLayout>
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/text_button"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:layout_gravity="end"
+				android:background="?attr/selectableItemBackground"
+				android:ellipsize="end"
+				android:gravity="center"
+				android:letterSpacing="@dimen/text_button_letter_spacing"
+				android:maxLines="1"
+				android:paddingLeft="16dp"
+				android:paddingRight="16dp"
+				android:text="@string/shared_string_sort"
+				android:textSize="@dimen/text_button_text_size"
+				osmand:typeface="@string/font_roboto_medium"
+				tools:ignore="UnusedAttribute"
+				tools:textColor="?attr/wikivoyage_active_color" />
+
+		</FrameLayout>
+
+		<FrameLayout
+			android:id="@+id/dash_list_view_layout"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_gravity="bottom"
+			android:orientation="vertical"
+			android:visibility="visible">
+
+			<net.osmand.plus.views.controls.DynamicListView
+				android:id="@+id/dash_list_view"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="116dp"
+				android:divider="@null"
+				android:fadeScrollbars="true" />
+
+			<LinearLayout
+				android:id="@+id/waypoints_control_buttons"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="bottom"
+				android:orientation="horizontal"
+				android:paddingBottom="60dp"
+				android:paddingTop="6dp">
+
+				<FrameLayout
+					android:id="@+id/add_button"
+					android:layout_width="0dp"
+					android:layout_height="36dp"
+					android:layout_gravity="center_vertical"
+					android:layout_marginBottom="@dimen/route_info_details_padding"
+					android:layout_marginLeft="@dimen/route_info_buttons_padding_top_bottom"
+					android:layout_marginRight="@dimen/route_info_buttons_padding_top_bottom"
+					android:layout_marginTop="6dp"
+					android:layout_weight="1"
+					android:orientation="horizontal">
+
+					<net.osmand.plus.widgets.TextViewEx
+						android:id="@+id/add_button_descr"
+						android:layout_width="match_parent"
+						android:layout_height="36dp"
+						android:layout_gravity="center"
+						android:drawablePadding="12dp"
+						android:ellipsize="end"
+						android:gravity="start|center_vertical"
+						android:letterSpacing="@dimen/text_button_letter_spacing"
+						android:maxLines="1"
+						android:paddingLeft="8dp"
+						android:paddingRight="8dp"
+						android:text="@string/shared_string_add"
+						android:textSize="@dimen/text_button_text_size"
+						osmand:typeface="@string/font_roboto_medium"
+						tools:drawableLeft="@drawable/ic_action_plus"
+						tools:drawableStart="@drawable/ic_action_plus"
+						tools:ignore="UnusedAttribute"
+						tools:textColor="?attr/wikivoyage_active_color" />
+
+				</FrameLayout>
+
+				<FrameLayout
+					android:id="@+id/clear_all_button"
+					android:layout_width="0dp"
+					android:layout_height="36dp"
+					android:layout_gravity="center_vertical"
+					android:layout_marginBottom="@dimen/route_info_details_padding"
+					android:layout_marginLeft="@dimen/route_info_buttons_padding_top_bottom"
+					android:layout_marginRight="@dimen/route_info_buttons_padding_top_bottom"
+					android:layout_marginTop="6dp"
+					android:layout_weight="1"
+					android:orientation="horizontal">
+
+					<net.osmand.plus.widgets.TextViewEx
+						android:id="@+id/clear_all_button_descr"
+						android:layout_width="match_parent"
+						android:layout_height="36dp"
+						android:layout_gravity="center"
+						android:drawablePadding="12dp"
+						android:ellipsize="end"
+						android:gravity="start|center_vertical"
+						android:letterSpacing="@dimen/text_button_letter_spacing"
+						android:maxLines="1"
+						android:paddingLeft="8dp"
+						android:paddingRight="8dp"
+						android:text="@string/shared_string_clear_all"
+						android:textSize="@dimen/text_button_text_size"
+						osmand:typeface="@string/font_roboto_medium"
+						tools:drawableLeft="@drawable/ic_action_clear_all"
+						tools:drawableStart="@drawable/ic_action_clear_all"
+						tools:ignore="UnusedAttribute"
+						tools:textColor="?attr/wikivoyage_active_color" />
+
+				</FrameLayout>
+
+			</LinearLayout>
+
+		</FrameLayout>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:id="@+id/control_buttons"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:orientation="vertical">
+
+		<ImageView
+			android:layout_width="match_parent"
+			android:layout_height="10dp"
+			android:layout_gravity="bottom"
+			android:background="@drawable/bg_contextmenu_shadow_top_light" />
+
+		<include
+			layout="@layout/route_info_menu_control_buttons"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="bottom" />
+
+	</LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/show_along_the_route_info_item.xml b/OsmAnd/res/layout/show_along_the_route_info_item.xml
new file mode 100644
index 0000000000..22a78d0740
--- /dev/null
+++ b/OsmAnd/res/layout/show_along_the_route_info_item.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/package_delivered_layout"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/bottom_sheet_list_item_height"
+	android:background="?attr/selectableItemBackground"
+	android:minHeight="@dimen/bottom_sheet_list_item_height"
+	android:orientation="vertical">
+
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_gravity="center_vertical"
+		android:layout_marginLeft="64dp"
+		android:layout_marginStart="64dp"
+		android:layout_weight="1"
+		android:ellipsize="end"
+		android:gravity="center_vertical"
+		android:maxLines="1"
+		android:textAppearance="@style/TextAppearance.ListItemTitle" />
+
+	<View
+		android:id="@+id/bottom_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginTop="8dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/simple_list_menu_item.xml b/OsmAnd/res/layout/simple_list_menu_item.xml
index 2ea55d7033..e3abd3bc0d 100644
--- a/OsmAnd/res/layout/simple_list_menu_item.xml
+++ b/OsmAnd/res/layout/simple_list_menu_item.xml
@@ -12,10 +12,13 @@
         android:layout_gravity="center_vertical"
         android:drawablePadding="24dp"
         android:gravity="center_vertical"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:paddingLeft="16dp"
+        android:paddingRight = "16dp"
         android:textAppearance="@style/TextAppearance.ListItemTitle"
         android:textStyle="normal"
-        tools:drawableLeft="@drawable/ic_action_search_dark"
+        tools:drawableStart="@drawable/ic_action_search_dark"
         tools:text="@string/layer_poi"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/subscription_fragment.xml b/OsmAnd/res/layout/subscription_fragment.xml
index df72477715..f4401d074b 100644
--- a/OsmAnd/res/layout/subscription_fragment.xml
+++ b/OsmAnd/res/layout/subscription_fragment.xml
@@ -277,7 +277,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="16dp"
                         android:layout_marginTop="16dp"
-                        android:visibility="gone">
+                        android:visibility="visible">
 
                         <Button
                             android:id="@+id/saveChangesButton"
@@ -297,105 +297,6 @@
 
                 <include layout="@layout/card_bottom_divider"/>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="8dp"/>
-
-                <include layout="@layout/card_top_divider"/>
-
-                <LinearLayout
-                    android:id="@+id/purchaseCard"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="?attr/bg_color"
-                    android:orientation="vertical"
-                    android:visibility="visible">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:orientation="horizontal">
-
-                        <android.support.v7.widget.AppCompatImageView
-                            android:layout_width="56dp"
-                            android:layout_height="48dp"
-                            android:scaleType="center"
-                            android:tint="?attr/color_dialog_buttons"
-                            android:src="@drawable/ic_action_payment_card"/>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="16dp"
-                            android:layout_marginRight="16dp"
-                            android:orientation="vertical">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="8dp"
-                                android:orientation="horizontal">
-
-                                <net.osmand.plus.widgets.TextViewEx
-                                    android:id="@+id/priceTextView"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
-                                    android:text="@string/osm_live_default_price"
-                                    android:textColor="?attr/color_dialog_buttons"
-                                    android:textSize="@dimen/default_list_text_size_large"
-                                    android:textStyle="bold"/>
-
-                                <net.osmand.plus.widgets.TextViewEx
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text=" - "
-                                    android:textColor="?android:attr/textColorPrimary"
-                                    android:textSize="@dimen/default_list_text_size_large"
-                                    android:textStyle="bold"/>
-
-                                <net.osmand.plus.widgets.TextViewEx
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:text="@string/osm_live_month_cost"
-                                    android:textColor="?android:attr/textColorPrimary"
-                                    android:textSize="@dimen/default_list_text_size_large"
-                                    android:textStyle="bold"/>
-
-                            </LinearLayout>
-
-                            <net.osmand.plus.widgets.TextViewEx
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="8dp"
-                                android:text="@string/osm_live_payment_desc"
-                                android:textColor="?android:attr/textColorSecondary"
-                                android:textSize="@dimen/default_desc_text_size"/>
-
-                            <android.support.v7.widget.AppCompatButton
-                                android:id="@+id/subscribeButton"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="16dp"
-                                android:layout_marginBottom="20dp"
-                                android:background="@drawable/blue_button_drawable"
-                                android:paddingBottom="4dp"
-                                android:paddingLeft="14dp"
-                                android:paddingRight="14dp"
-                                android:paddingTop="4dp"
-                                android:text="@string/osm_live_subscribe_btn"
-                                android:textColor="@color/color_white"
-                                android:visibility="visible"/>
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <include layout="@layout/card_bottom_divider"/>
-
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="16dp"/>
diff --git a/OsmAnd/res/layout/transport_route_card.xml b/OsmAnd/res/layout/transport_route_card.xml
new file mode 100644
index 0000000000..a25489378c
--- /dev/null
+++ b/OsmAnd/res/layout/transport_route_card.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/route_info_details_card"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<LinearLayout
+		android:id="@+id/card_divider"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<include layout="@layout/list_item_divider" />
+
+	</LinearLayout>
+
+	<View
+		android:id="@+id/top_divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:focusable="false" />
+
+	<LinearLayout
+		android:id="@+id/routes_info_container"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="vertical"
+		android:paddingLeft="@dimen/route_info_buttons_padding_top_bottom"
+		android:paddingRight="@dimen/route_info_buttons_padding_top_bottom"
+		android:paddingTop="@dimen/content_padding">
+
+		<net.osmand.plus.widgets.FlowLayout
+			android:id="@+id/routes_badges"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="4dp" />
+
+		<LinearLayout
+			android:id="@+id/routes_info"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:paddingBottom="14dp">
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/from_line"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:paddingBottom="6dp"
+				android:textSize="@dimen/default_desc_text_size"
+				osmand:typeface="@string/font_roboto_regular"
+				tools:text="@string/route_from" />
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/way_line"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textSize="@dimen/default_desc_text_size"
+				osmand:typeface="@string/font_roboto_regular"
+				tools:text="@string/route_from" />
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_marginBottom="@dimen/route_info_details_padding"
+			android:baselineAligned="false"
+			android:orientation="horizontal">
+
+			<FrameLayout
+				android:id="@+id/details_button"
+				android:layout_width="0dp"
+				android:layout_height="36dp"
+				android:layout_gravity="center_vertical"
+				android:layout_weight="1"
+				android:orientation="horizontal">
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/details_button_descr"
+					android:layout_width="match_parent"
+					android:layout_height="36dp"
+					android:layout_gravity="center"
+					android:ellipsize="end"
+					android:gravity="center"
+					android:letterSpacing="@dimen/text_button_letter_spacing"
+					android:maxLines="1"
+					android:text="@string/rendering_category_details"
+					android:textSize="@dimen/text_button_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:ignore="UnusedAttribute"
+					tools:textColor="?attr/wikivoyage_active_color" />
+
+			</FrameLayout>
+
+			<FrameLayout
+				android:id="@+id/show_button"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:layout_marginLeft="@dimen/content_padding"
+				android:layout_marginRight="@dimen/content_padding"
+				android:layout_weight="1"
+				android:orientation="horizontal"
+				android:visibility="gone">
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/show_button_descr"
+					android:layout_width="match_parent"
+					android:layout_height="36dp"
+					android:layout_gravity="center"
+					android:ellipsize="end"
+					android:gravity="center"
+					android:letterSpacing="@dimen/text_button_letter_spacing"
+					android:maxLines="1"
+					android:text="@string/shared_string_show_on_map"
+					android:textSize="@dimen/text_button_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:ignore="UnusedAttribute"
+					tools:textColor="?attr/wikivoyage_active_color" />
+
+			</FrameLayout>
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+	<ImageView
+		android:id="@+id/bottom_shadow"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:scaleType="fitXY"
+		android:src="@drawable/bg_shadow_list_bottom" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/transport_stop_route_item_with_icon.xml b/OsmAnd/res/layout/transport_stop_route_item_with_icon.xml
new file mode 100644
index 0000000000..1588b41775
--- /dev/null
+++ b/OsmAnd/res/layout/transport_stop_route_item_with_icon.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="wrap_content"
+	android:layout_height="28dp"
+	android:background="@drawable/transport_stop_route_bg"
+	android:orientation="horizontal">
+
+	<ImageView
+		android:id="@+id/transport_stop_route_icon"
+		android:layout_width="20dp"
+		android:layout_height="20dp"
+		android:layout_gravity="center_vertical"
+		android:layout_margin="4dp"
+		tools:src="@drawable/ic_action_bus_dark" />
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/transport_stop_route_text"
+		android:layout_width="wrap_content"
+		android:layout_height="28dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginRight="8dp"
+		android:gravity="center"
+		android:textColor="@color/color_white"
+		android:textSize="@dimen/default_desc_text_size"
+		osmand:typeface="@string/font_roboto_medium"
+		tools:text="3" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ar/phrases.xml b/OsmAnd/res/values-ar/phrases.xml
index e5c73b3984..5535da3f72 100644
--- a/OsmAnd/res/values-ar/phrases.xml
+++ b/OsmAnd/res/values-ar/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_shop">متجر</string>
 		<string name="poi_personal_transport">نقل شخصي</string>
 		<string name="poi_public_transport">نقل عام</string>
@@ -1063,8 +1063,8 @@
 	<string name="poi_description">وصف</string>
 	<string name="poi_email">البريد الإلكتروني</string>
 	<string name="poi_fax">فاكس</string>
-	<string name="facebook">فيسبوك</string>
-	<string name="twitter">تويتر</string>
+	<string name="facebook">فايسبوك</string>
+	<string name="twitter">توييتر</string>
 	<string name="poi_skype">سكايب</string>
 	<string name="poi_youtube">يوتيوب</string>
 	<string name="poi_instagram">إنستجرام</string>
@@ -1622,4 +1622,4 @@
 	<string name="poi_payment_centre">مركز الدفع</string>
 	<string name="poi_money_transfer">تحويل أموال</string>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index 35c0602325..dd214695f2 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="recording_context_menu_show">اظهر</string>
     <string name="av_def_action_picture">التقط صورة</string>
     
@@ -31,7 +31,7 @@
     <string name="prefer_motorways">تفضل الطرق السريعة</string>
 	<string name="prefer_in_routing_title">فضّل…</string>
 	<string name="prefer_in_routing_descr">فضّل الطرق السريعة.</string>
-    <string name="max_speed_none">لا شيء</string>
+    <string name="max_speed_none">بلا</string>
     <string name="index_name_openmaps">فتح خرائط الاتحاد الأوروبي</string>
     
     <string name="local_indexes_cat_av">بيانات الصوت / الفيديو</string>
@@ -63,7 +63,7 @@
     <string name="download_srtm_maps">الخطوط المحيطية (الكنتورية)</string>
     <string name="download_regular_maps">الخرائط العادية</string>
     <string name="rendering_attr_noAdminboundaries_name">الحدود</string>
-	<string name="map_widget_max_speed">حدّ السرعة</string>
+	<string name="map_widget_max_speed">حد السرعة</string>
     
     
     
@@ -91,7 +91,7 @@
 	<string name="poi_filter_food_shop">متاجر المواد الغذائية</string>
 	<string name="poi_filter_for_tourists">للسياح</string>
 	<string name="poi_filter_fuel">وقود</string>
-	<string name="show_warnings_title">إظهار تنبيهات…</string>
+	<string name="show_warnings_title">إظهار التنبيهات…</string>
 	<string name="use_compass_navigation">استخدم البوصلة</string>
 	<string name="avoid_motorway">تجنب الطرق السريعة</string>
 	
@@ -99,7 +99,7 @@
 	<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_title">تجنب…</string>
 	<string name="avoid_in_routing_descr">تجنب الطرق ذات الرسوم، وغير المعبدة، والعبارات.</string>
 	
 	
@@ -111,9 +111,9 @@
 	<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_altitude">ارتفاع</string>
-	<string name="map_widget_time">وقت الذهاب</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>
 	<string name="bg_service_screen_lock_toast">أقفلت الشاشة</string>
 	<string name="bg_service_screen_lock">قفل الشاشة</string>
@@ -131,9 +131,9 @@
 	<string name="gpxup_trackable">تتبعها</string>
 	<string name="gpxup_private">خاص</string>
 	
-	<string name="route_kl">الزم اليسار واذهب</string>
-	<string name="route_kr">الزم اليمين واذهب</string>
-	<string name="rendering_attr_contourLines_name">اظهر الخطوط المحيطية (الكنتورية)</string>
+	<string name="route_kl">التزم اليسار واذهب</string>
+	<string name="route_kr">التزم اليمين واذهب</string>
+	<string name="rendering_attr_contourLines_name">اظهار الخطوط المحيطية</string>
 	<string name="rendering_attr_hmRendered_name">اظهر المزيد من تفاصيل الخريطة</string>
 	<string name="rendering_attr_hmRendered_description">زيادة كمية خريطة التفصيل هو مبين.</string>
 	<string name="local_index_routing_data">بيانات التوجيه</string>
@@ -208,7 +208,7 @@
 	<string name="driving_region_europe_asia">أوروبا، آسيا، أمريكا اللاتينية، وغيرها</string>
 	<string name="driving_region_uk">المملكة المتحدة، الهند وما شابه ذلك</string>
 	
-    <string name="speak_title">أعلن…</string>
+    <string name="speak_title">أعلان…</string>
 	<string name="osb_author_or_password_not_specified">يرجى تحديد مستخدم OSM وكلمة سره في الإعدادات</string>
     <string name="clear_intermediate_points">محو الوجهات الوسيطة</string>
     <string name="keep_intermediate_points">الحفاظ على الوجهات الوسيطة</string>
@@ -241,7 +241,7 @@
     <string name="distance_measurement_load_gpx">فتح القائمة GPX</string>
     <string name="other_location">أخرى</string>
     <string name="install_paid">النسخة الكاملة</string>
-    <string name="cancel_navigation">توقف الملاحة</string>
+    <string name="cancel_navigation">وقف الملاحة</string>
     <string name="clear_destination">امح الهدف</string>
     <string name="download_using_mobile_internet">واي فاي غير متصل حاليا. هل تريد متابعة التنزيل بواسطة اتصال الإنترنت الحالي؟</string>
     <string name="street_name">اسم الشارع</string>
@@ -265,7 +265,7 @@
 	
 	<string name="osb_author_dialog_password">OSM كلمة المرور (اختياري)</string>
 	<string name="add_favorite_dialog_default_favourite_name">مفضلة</string>
-	<string name="shared_string_apply">تطبق</string>
+	<string name="shared_string_apply">تطبيق</string>
 	<string name="shared_string_add">إضافة</string>
 	<string name="shared_string_no">لا</string>
 	<string name="shared_string_yes">نعم</string>
@@ -326,17 +326,17 @@
 	    
     
     <string name="speak_descr">ضبط إعدادات نطق أسماء الشوارع، وتحذيرات المرور (توقيفات الإجبارية، ومطبات السرعة)، و تحذيرات كاميرات السرعة، و السرعة القصوى.</string>
-	<string name="speak_street_names">نطق أسماء الشوارع ( نطق آلي TTS )</string>
-    <string name="speak_speed_limit">السرعة القصوى</string>
+	<string name="speak_street_names">أسماء الشوارع (TTS)</string>
+    <string name="speak_speed_limit">حد السرعة</string>
     <string name="speak_cameras">كاميرات السرعة</string>
 	<string name="speak_traffic_warnings">تحذيرات حركة المرور</string>
     <string name="route_descr_map_location">الخريطة: </string>
     <string name="destination_point">الوجهة %1$s</string>
     <string name="search_street_in_neighborhood_cities">البحث عن الشارع في المدن المجاورة</string>
-    <string name="intermediate_items_sort_by_distance">فرز باب لـ باب </string>
+    <string name="intermediate_items_sort_by_distance">فرز باب لـ باب</string>
     <string name="wait_current_task_finished">الرجاء الانتظار حتى انتهاء المهمة الحالية</string>
     <string name="available_downloads_left">توفر %1$d ملفات للتنزيل</string>
-    <string name="cancel_route">ألغ المسار</string>
+    <string name="cancel_route">صرف المسار</string>
     <string name="monitoring_settings">تسجيل الرحلة</string>
     <string name="monitoring_settings_descr">قم بضبط كيفية تسجيل الرحلات.</string>
     
@@ -397,9 +397,9 @@
     <string name="add_as_last_destination_point">أضف كآخر وجهة وسيطة</string>
     <string name="add_as_first_destination_point">أضف كأول وجهة وسيطة</string>
     <string name="intermediate_point_too_far">الوجهة %1$s بعيدة جدا من أقرب طريق.</string>
-    <string name="arrived_at_intermediate_point">إنك قد وصلت إلى وجهتك الوسيطة</string>
+    <string name="arrived_at_intermediate_point">لقد وصلت إلى وجهتك الوسيطة</string>
     <string name="context_menu_item_intermediate_point">أضف كوجهة وسيطة</string>
-    <string name="map_widget_intermediate_distance">وجهة متوسطة</string>
+    <string name="map_widget_intermediate_distance">وجهة وسيطة</string>
     <string name="ending_point_too_far">نقطة الوصول بعيدة جدا عن أقرب طريق.</string>
     <string name="add_tag">أضف وسما</string>
     <string name="show_warnings_descr">ضبط تحذيرات المرور ( حدود السرعة، والتوقف القسري، والمطبات الصناعية ) ، وتحذيرات كاميرا السرعة ، ومعلومات الممرات.</string>
@@ -409,7 +409,7 @@
     <string name="edit_tilesource_successfully">حُفِظ المصدر التّجانبي %1$s بنجاح</string>
     <string name="use_compass_navigation_descr">استخدم البوصلة عندما لا تكون هناك أي وجهة محددة.</string>
 	<string name="auto_zoom_map_descr">ملائمة تقريب الخريطة وفقا لسرعتك (هذا بينما تتزامن الخريطة مع الموقع الحالي).</string>
-	<string name="auto_zoom_map">تقريب الخريطة تلقائيًا</string>
+	<string name="auto_zoom_map">تكبير الخريطة تلقائيًا</string>
 	<string name="snap_to_road_descr">ألصق الموقع إلى الشوارع أثناء الملاحة.</string>
 	<string name="snap_to_road">الالتصاق بالطريق</string>
 	<string name="osmand_play_title_30_chars">خرائط OsmAnd وملاحة</string>
@@ -420,7 +420,7 @@
 	<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>
+	<string name="day_night_info">معلومات النهار/الليل</string>
 	
 	<string name="map_widget_vector_attributes">سمات التقديم</string>
 	<string name="map_widget_renderer">نمط الخريطة</string>
@@ -433,18 +433,18 @@
 	<string name="map_widget_show_ruler">مسطرة</string>
 	
 	<string name="map_widget_view_direction">عرض الاتجاه</string>
-	<string name="map_widget_transparent">حاجيات شفافة</string>
+	<string name="map_widget_transparent">أدوات شفافة</string>
 	<string name="bg_service_sleep_mode_off">تشغيل\n التطبيق في الخلفية</string>
 	<string name="bg_service_sleep_mode_on">إيقاف\n التشغيل في الخلفية</string>
 	<string name="map_widget_config">ضبط الشاشة</string>
 	<string name="map_widget_back_to_loc">أين أنا</string>
 	<string name="map_widget_lock_screen">اقفل الشاشة</string>
-	<string name="map_widget_compass">البوصلة</string>
+	<string name="map_widget_compass">بوصلة</string>
 	
 	
 	
 	<string name="map_widget_next_turn_small">المنعطف التالي (صغير)</string>
-	<string name="map_widget_next_next_turn">المنعطف الثاني</string>
+	<string name="map_widget_next_next_turn">المنعطف التالي الثاني</string>
 	<string name="map_widget_mini_route">خريطة طريق مصغرة</string>
 	<string name="bg_service_interval">تعيين الفاصل الزمني للتنبيه:</string>
 	<string name="continue_follow_previous_route_auto">المسار السابق لم يكتمل. هل تريد متابعته؟ (%1$s ثانية)</string>
@@ -507,7 +507,7 @@
 	<string name="basemap_was_selected_to_download">خريطة العالم الأساسية مطلوبة لعمل التطبيق بشكل سليم، وقد حددت للتنزيل.</string>
 	<string name="select_index_file_to_download">لم يتم العثور على شيء. إذا لم تتمكن من إيجاد منطقتك، يمكنك صنعها بنفسك (انظر http://osmand.net ).</string>
 	<string name="auto_zoom_close">إلى الصورة عن قرب</string>
-	<string name="auto_zoom_none">تعطيل التكبير التلقائي</string>
+	<string name="auto_zoom_none">لا يوجد تكبير تلقائي</string>
 	<string name="auto_zoom_far">قم بتوسيط الخريطة هنا</string>
 	<string name="local_indexes_cat_tile">قراميد خرائط متصلة بالإنترنت وتجانبية</string>
 	<string name="map_online_plugin_is_not_installed">تمكين ملحق الخرائط على الإنترنت من تحديد مصادر مختلفة للخرائط</string>
@@ -619,22 +619,22 @@
 	<string name="edit_filter_create_message">عامل تصفية {0} تم إنشاؤه</string>
 	
 	<string name="edit_filter_delete_message">عامل تصفية {0} تم حذفه</string>
-	<string name="edit_filter_delete_dialog_title">حذف عامل التصفية المحدد؟</string>
+	<string name="edit_filter_delete_dialog_title">حذف الفلتر المحدد؟</string>
 	<string name="oclock">o\'على مدار الساعة</string>
 	<string name="auto_announce_off">إيقاف الإخطار التلقائي</string>
 	<string name="auto_announce_on">تفعيل الإخطار التلقائي</string>
 	
 	<string name="audionotes_location_not_defined">لم يتم ربط الملاحظة بأي موقع. إضغط على \"استخدام المكان …\" لترفق ملاحظة بالمكان المحدد.</string>
-	<string name="animate_routing_route_not_calculated">الرجاء، احتسب المسار أولا</string>
+	<string name="animate_routing_route_not_calculated">الرجاء حساب الطريق أولا</string>
     <string name="animate_routing_route">حاكي باستخدام المسار المحتسب </string>
     <string name="animate_routing_gpx">حاكي باستخدام مسار GPX</string>
     <string name="shared_string_remember_my_choice">تذكر اختياري</string>
 	
 	<string name="native_app_allocated_memory_descr">إجمالي الذاكرة الأصلية المخصصة من قبل التطبيق %1$s ميغابايت (Dalvik %2$s ميغابايت، الأخرى %3$s ميغابايت). الذاكرة النسبية %4$s ميغابايت (حد الجهاز %5$s ميغابايت Dalvik %6$s ميغابايت).</string>
-	<string name="app_mode_hiking">مشي</string>
+	<string name="app_mode_hiking">التنزه</string>
     <string name="app_mode_motorcycle">دراجة نارية</string>
     <string name="app_mode_boat">قارب</string>
-    <string name="app_mode_aircraft">الطائرات</string>
+    <string name="app_mode_aircraft">طائرة</string>
     <string name="app_modes_choose_descr">اختر أوضاع الاستخدام لتكون مرئية في التطبيق.</string>
     <string name="app_modes_choose">ملامح التطبيق</string>
 	
@@ -713,12 +713,12 @@
 	<string name="use_transparent_map_theme">السمة الشفافة</string>
 	<string name="native_library_not_supported">المكتبات الأصيلة غير مدعومة على هذا الجهاز.</string>
 	<string name="init_native_library">تهيئة المكتبة الأصيلة…</string>
-	<string name="choose_auto_follow_route">إعرض وجه الخريطة في المنتصف تلقائيًا</string>
+	<string name="choose_auto_follow_route">إعرض رؤية الخريطة في المنتصف تلقائيا</string>
 	<string name="choose_auto_follow_route_descr">المدة اللازمة ليتزامن عرض الخريطة مع الموقع الحالي.</string>
 	
 	<string name="auto_follow_route_navigation">مركز صناعة السيارات الوحيد</string>
 	<string name="auto_follow_route_navigation_descr">التوسيط التلقائي لعرض الخريطة فقط أثناء الملاحة.</string>
-	<string name="auto_follow_location_enabled">توسيط عرض الخريطة تلقائيا مفعل.</string>
+	<string name="auto_follow_location_enabled">توسيط عرض الخريطة تلقائيا أثناء الاستخدام.</string>
 	<string name="pref_vector_rendering">خيارات محددةناقلات العارض</string>
 	<string name="pref_overlay">غطاء/بطانة</string>
 	<string name="pref_raster_map">اعدادات مصدر الخريطة</string>
@@ -738,7 +738,7 @@
 	<string name="shared_string_gpx_route">الطريق GPX</string>
 	<string name="poi_query_by_name_matches_categories">وجد عدة تصنيفات POI توافق الاستعلام:</string>
 	<string name="data_to_search_poi_not_available">البيانات المحلية لبحث POI غير موجودة.</string>
-	<string name="poi_filter_by_name">البحث بالاسم</string>
+	<string name="poi_filter_by_name">بحث بالاسم</string>
 	<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>
@@ -823,11 +823,11 @@
 	<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_from_start_point">يمر على طول المسار باكمله</string>
+	<string name="gpx_option_from_start_point">المرور على طول المسار بأكمله</string>
 	<string name="switch_to_vector_map_to_see">خرائط فيكتور المحلية المتوفرة لهذا الموقع
 ← 
 ← للتفعيل إذهب إلى \'القائمة\' ← \'ضبط الخريطة\' ← \'مصدر الخريطة...\' ← \'خرائط فيكتور المحلية\'.</string>
-	<string name="choose_audio_stream">خروج التوجيه الصوتي</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>
@@ -880,7 +880,7 @@
 	<string name="shared_string_previous">السابق</string>
 	<string name="unit_of_length_descr">تغيير وحدات الطول.</string>
 	<string name="unit_of_length">وحدات الطول</string>
-	<string name="si_mi_feet">ميل/قدم</string>
+	<string name="si_mi_feet">أميال/أقدام</string>
 	<string name="si_mi_yard">ميل/ ياردة</string>
 	<string name="si_km_m">كيلومتر/متر</string>
 	<string name="yard">ياردة</string>
@@ -924,7 +924,7 @@
 	<string name="m">متر</string>
 	<string name="old_map_index_is_not_supported">انتقدت خريطة تنسيق البيانات \'\' {0} \'\' غير معتمد</string>
 	<string name="poi_filter_closest_poi">أقرب POI</string>
-	<string name="poi_filter_custom_filter">تصفية مخصصة</string>
+	<string name="poi_filter_custom_filter">فلتر مخصص</string>
 	<string name="poi_filter_namefinder">البحث عن الاسم في الإنترنت</string>
 	<string name="reading_cached_tiles">جاري قراءة التجانبيات المخزنة مؤقتا…</string>
 	<string name="version_index_is_big_for_memory">الفهرس \"{0}\" كبير جدًّا على الذاكرة</string>
@@ -976,7 +976,7 @@
     <string name="hours_ago">ساعة</string>
     <string name="minutes_ago">دقيقة</string>
     <string name="seconds_ago">ثانية</string>
-    <string name="always_center_position_on_map">اظهر الموضع في المنتصف دائماً</string>
+    <string name="always_center_position_on_map">اظهر الموقع في الوسط دائما</string>
     <string name="localization_pref_title">التوطين</string>
     <string name="lang_hr">الكرواتية</string>
     <string name="lang_pt_br">البرتغالية (البرازيل)</string>
@@ -1005,19 +1005,19 @@
     <string name="route_info">معلومات الطريق</string>
     
 	<string name="routing_attr_avoid_toll_name">تجنب الطرق ذات الرسوم</string>
-	<string name="routing_attr_avoid_toll_description">إجتناب الطرق التي يجب دفع رسوم للمرور فيها.</string>
-	<string name="routing_attr_avoid_unpaved_name">تجنب الطرق غير المعبّدة</string>
+	<string name="routing_attr_avoid_toll_description">تجنب الطرق ذات الرسوم</string>
+	<string name="routing_attr_avoid_unpaved_name">تجنب الطرق غير المعبدة</string>
 	<string name="routing_attr_avoid_unpaved_description">اجتناب الطرق الترابية والوعرة.</string>
 	<string name="routing_attr_avoid_ferries_name">تجنب العبّارات</string>
-	<string name="routing_attr_weight_name">حد الوزن المسموح</string>
+	<string name="routing_attr_weight_name">الوزن الأقصى</string>
 	<string name="android_19_location_disabled">منذ نسخة أندرويد كتكات 4.4، لا يمكنك تنزيل أو تحديث الخرائط في مكان التخزين السابق (%s). هل تريد تغيير المكان إلى مكان مسموح ونسخ كل الملفات إليه ؟
 
  ملاحظة 1 : الملفات القديمة ستبقى كما هي دون لمس (ولكن يمكن حذفها يدويا).
 
  ملاحظة 2 : لا يمكن مشاركة الملفات بين OsmAnd و +OsmAnd في مكان التخزين الجديد.</string>
     <string name="copying_osmand_one_file_descr">نسخ الملف (%s) إلى مساره الجديد…</string>
-    <string name="arrival_distance">إخطار الوصول</string>
-    <string name="arrival_distance_descr">هل تريد أن يعلمك البرنامج عند الوصول إلى مقصدك؟</string>
+    <string name="arrival_distance">إعلان الوصول</string>
+    <string name="arrival_distance_descr">متى تريد اعلان الوصول ؟</string>
     <string name="keep_informing_never">أبدًا</string>
     
 	<string name="specified_dir_doesnt_exist">تعذر العثور على المجلد المحدد.</string>
@@ -1041,7 +1041,7 @@
     <string name="storage_directory">تخزين الخريطة</string>
     <string name="shared_string_copy">نسخ</string>
     <string name="filter_poi_hint">فلترة حسب الاسم</string>
-    <string name="search_poi_category_hint">اكتب للبحث عن الجميع</string>
+    <string name="search_poi_category_hint">اكتب لبحث الكل</string>
     <string name="shared_string_is_open">مفتوح الآن</string>
     <string name="rendering_attr_OSMMapperAssistant_name">مساعد OSM mapper</string>
 	<string name="agps_info">معلومات A-GPS</string>
@@ -1067,7 +1067,7 @@
     <string name="mark_to_delete">اختر للحذف</string>
 	
 	<string name="confirmation_to_clear_history">هل ترغب في حذف السجل الزمني؟</string>
-    <string name="shared_string_go">ذهاب</string>
+    <string name="shared_string_go">إنطلق</string>
 	<string name="osmand_parking_overdue">تأخر</string>
 	<string name="osmand_parking_time_left">يسار</string>
 	<string name="your_edits">تعديلاتك</string>
@@ -1078,7 +1078,7 @@
 خط الطول %2$s</string>
     <string name="tips_and_tricks_descr">الأسئلة الشائعة، التغييرات الحديثة، وأخرى.</string>
     <string name="routing_settings_2">إعدادات الملاحة</string>
-    <string name="general_settings_2">الإعدادات العامة</string>
+    <string name="general_settings_2">إعدادات عامة</string>
 	<string name="shared_string_ellipsis">…</string>
 	<string name="shared_string_ok">موافق</string>
 	<string name="shared_string_dismiss">انصراف</string>
@@ -1089,7 +1089,7 @@
 	<string name="shared_string_disabled">معطل</string>
 	<string name="shared_string_selected">محدد</string>
 	<string name="shared_string_selected_lowercase">محدد</string>
-	<string name="shared_string_never">أبداً</string>
+	<string name="shared_string_never">أبدا</string>
 	<string name="shared_string_history">السجل الزمني</string>
 	<string name="shared_string_select_on_map">حدد على الخريطة</string>
 	<string name="shared_string_select_all">تحديد الكل</string>
@@ -1142,7 +1142,7 @@
 	<string name="get_directions">الاتجاهات</string>
 	<string name="show_point_options">إستخدام الموقع …</string>
 	<string name="favorite">مفضلة</string>
-	<string name="speak_favorites">نقاط مفضلة مجاورة</string>
+	<string name="speak_favorites">النقاط المفضلة مجاورة</string>
 	<string name="save_as_favorites_points">إحفظ كمجموعة مفضلة</string>
     <string name="add_favorite_dialog_top_text">أدخل اسم المفضلة</string>
 	<string name="add_favorite_dialog_favourite_added_template">"تم إضافة النقطة المفضلة  \'\'{0}\'\' بنجاح."</string>
@@ -1178,7 +1178,7 @@
     <string name="edit_group">تعديل مجموعة</string>
     <string name="remove_the_tag">إزالة العلامة</string>
     <string name="gps_status">حالة GPS</string>
-    <string name="rendering_attr_streetLighting_name">إنارة الشوارع</string>
+    <string name="rendering_attr_streetLighting_name">إنارة شارع</string>
     <string name="proxy_pref_title">بروكسي</string>
     <string name="proxy_pref_descr">تحديد وكيل بروكسي إنترنت.</string>
     <string name="settings_privacy">الخصوصية</string>
@@ -1221,12 +1221,12 @@
     <string name="rendering_attr_tramRoutes_name">خطوط الترام</string>
     <string name="rendering_category_routes">طرق</string>
     <string name="rendering_category_transport">المواصلات</string>
-    <string name="rendering_category_others">سمات أخرى للخريطة</string>
+    <string name="rendering_category_others">ميزات آخرى للخريطة</string>
     <string name="map_widget_appearance_rem">العناصر المتبقية</string>
     <string name="map_widget_top">شريط المعلومات</string>
 	<string name="map_widget_right">اللوحة اليمنى</string>
 	<string name="map_widget_left">اللوحة اليسرى</string>
-	<string name="search_radius_proximity">ضمن</string>
+	<string name="search_radius_proximity">في غضون</string>
     
     <string name="anonymous_user">مستخدم مجهول</string>
     <string name="logged_as">سجل الدخول بـ %1$s</string>
@@ -1285,7 +1285,7 @@
     <string name="rendering_attr_hideNonVehicleHighways_name">الطرق السريعة غير المخصصة للمركبات</string>
     <string name="rendering_attr_hideText_name">النص</string>
     <string name="rendering_attr_buildings15zoom_name">المباني في التقريب 15</string>
-    <string name="rendering_attr_moreDetailed_name">مزيد من التفاصيل</string>
+    <string name="rendering_attr_moreDetailed_name">التفاصيل اكثر</string>
     <string name="rendering_attr_lessDetailed_name">تفاصيل أقل</string>
     <string name="rendering_attr_showSurfaceGrade_name">إظهار جودة الطريق</string>
     
@@ -1312,36 +1312,36 @@
 	<string name="shared_string_collapse">إغلاق</string>
 	<string name="drawer">قائمة منبسطة</string>
     <string name="osm_settings">تعديل OSM</string>
-	<string name="free">مجاني %1$s</string>
+	<string name="free">فارغ %1$s</string>
 	<string name="parking_place">مكان للركن</string>
     <string name="version_settings_descr">نزل الإصدارات الليلية.</string>
     <string name="version_settings">إصدرات</string>
     <string name="speak_pedestrian">ممرات الراجلين</string>
-    <string name="traffic_warning_pedestrian">ممرات الراجلين</string>
+    <string name="traffic_warning_pedestrian">ممر الراجلين</string>
 	<string name="show_railway_warnings">تقاطعات القطارات</string>
 	<string name="show_pedestrian_warnings">ممرات الراجلين</string>
     <string name="navigate_point_easting">تشريق</string>
     <string name="error_avoid_specific_road">لا يوجد منفذ للتجاوز</string>
-    <string name="rendering_attr_tramTrainRoutes_name">سكك القطارات والترام</string>
+    <string name="rendering_attr_tramTrainRoutes_name">سكك قطار وترام</string>
 	<string name="rendering_attr_trolleybusRoutes_name">طرق الحافلات الكهربائية</string>
     <string name="rendering_attr_busRoutes_name">طرق الحافلات</string>
     <string name="rendering_attr_subwayMode_name">سكك مترو الأنفاق</string>
     <string name="rendering_attr_shareTaxiRoutes_name">شارك طرق التاكسي</string>
-    <string name="speed_limit_exceed_message">حدد حد السرعة المسموح به لتلقي تنبيه صوتي ما إذا تجاوزته.</string>
+    <string name="speed_limit_exceed_message">حدد مجال السرعة المسموح به لتتلقى تنبيه صوتي ما إذا تجاوزته.</string>
 	<string name="traffic_warning_border_control">مراقبة الحدود</string>
     <string name="traffic_warning_payment">كشك الرسوم</string>
     <string name="traffic_warning_calming">تخفيف الازدحام</string>
-    <string name="traffic_warning_speed_camera">كاميرا مراقبة السرعة</string>
-    <string name="traffic_warning">تنبيه مروري</string>
-	<string name="speak_poi">POI مجاورة</string>
+    <string name="traffic_warning_speed_camera">كاميرا السرعة</string>
+    <string name="traffic_warning">تحذير حركة المرور</string>
+	<string name="speak_poi">POI المجاورة</string>
 	<string name="way_alarms">تنبيهات مرورية</string>
 	<string name="save_track_to_gpx_globally_headline">تسجيل المسار حسب الطلب</string>
 	<string name="download_additional_maps">حمّل الخرائط المفقودة %1$s (%2$d MB)؟</string>
     
     <string name="rendering_attr_hideAccess_name">قيود الدخول</string>
     <string name="rendering_attr_showAccess_name">عرض قيود الدخول</string>
-    <string name="rendering_attr_showSurfaces_name">عرض سطح الطريق</string>
-    <string name="rendering_attr_showCycleRoutes_name">عرض الطرق الدائرية</string>
+    <string name="rendering_attr_showSurfaces_name">إظهار سطح الطريق</string>
+    <string name="rendering_attr_showCycleRoutes_name">عرض الطرق الخاصة بالدرجات</string>
     
     
     <string name="delay_navigation_start">ابدأ التوجيه دروان بدوران تلقائيا</string>
@@ -1410,14 +1410,14 @@
 	<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="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="routing_attr_prefer_motorway_name">تفضيل طرق الدراجات النارية</string>
-	<string name="routing_attr_prefer_motorway_description">تفضيل طرق الدراجات النارية.</string>
-	<string name="routing_attr_avoid_ferries_description">تجنب العبّارات المائية.</string>
+    <string name="routing_attr_prefer_motorway_name">تفضل الطرق السريعة</string>
+	<string name="routing_attr_prefer_motorway_description">تفضيل الطرق السريعة</string>
+	<string name="routing_attr_avoid_ferries_description">تجنب العبّارات المائية</string>
 	<string name="routing_attr_avoid_motorway_name">تجنب الطرق السريعة</string>
-	<string name="routing_attr_avoid_motorway_description">تجنب طرق الدراجات النارية.</string>
+	<string name="routing_attr_avoid_motorway_description">تجنب الطرق السريعة</string>
 	<string name="routing_attr_weight_description">حدد وزن المركبة الأقصى المسموح به على الطرقات.</string>
     <string name="copying_osmand_files_descr">نسخ ملفات بيانات OsmAnd إلى المسار الجديد (%s)…</string>
     <string name="calculate_osmand_route_gpx">احسب طريق OsmAnd بدون اتصال</string>
@@ -1469,7 +1469,7 @@
 	<string name="background_router_service">تشغيل أوسماند OSMAnd في الخلفية</string>
 	<string name="background_service_provider">مزود تحديد المواقع</string>
 	<string name="background_service_provider_descr">تحديد مزود تحديد المواقع المستخدَم من قبل التطبيق في الخلفية.</string>
-	<string name="int_seconds">ثانية</string>
+	<string name="int_seconds">ثواني</string>
 	<string name="int_min">دقيقة</string>
 	<string name="gps_provider">GPS</string>
 	<string name="network_provider">شبكة</string>
@@ -1490,7 +1490,7 @@
 	<string name="amenity_type_transportation">نقل</string>
 	<string name="daynight_mode_day">نهار</string>
 	<string name="daynight_mode_night">ليل</string>
-	<string name="daynight_mode_auto">الشروق/الغروب</string>
+	<string name="daynight_mode_auto">شروق/غروب</string>
 	<string name="daynight_mode_sensor">مستشعر الضوء</string>
 	<string name="shared_string_download_map">تحميل الخريطة</string>
 	<string name="select_max_zoom_preload_area">حدد أقصى تقريب للتحميل المسبق</string>
@@ -1565,7 +1565,7 @@
     <string name="osm_live_enter_user_name">فضلًا أدخل اسمًا عموميًّا</string>
     <string name="osm_live_thanks">نشكرك على اشتراكك بالتّحديثات الحيّة!</string>
     <string name="osm_live_subscription_settings">إعدادات الاشتراك</string>
-    <string name="shared_string_widgets">الودجات</string>
+    <string name="shared_string_widgets">الأدوات</string>
     <string name="postcode">الرمز البريدي</string>
     <string name="shared_string_from">من</string>
     <string name="map_widget_search">بحث</string>
@@ -1638,9 +1638,9 @@
     <string name="lang_nb">النرويجية ( بوكمال )</string>
     <string name="lang_nn">النرويجية (الحديثة )</string>
     <string name="lang_es_ar">الإسبانية (الأرجنتين)</string>
-    <string name="si_nm">ميلا بحري</string>
+    <string name="si_nm">ميل بحري</string>
     <string name="dark_theme">داكن</string>
-    <string name="routing_attr_height_name">تحديد الإرتفاع</string>
+    <string name="routing_attr_height_name">الإرتفاع الاقصى</string>
     <string name="default_speed_system_descr">تحديد وحدة السرعة.</string>
     <string name="default_speed_system">وحدة السرعة</string>
     <string name="plugin_settings">ملحقات</string>
@@ -1657,7 +1657,7 @@
     <string name="rendering_value_translucent_orange_name">برتقالي شفاف</string>
     <string name="rendering_attr_currentTrackColor_name">لون الجي بي إكس GPX</string>
     <string name="rendering_attr_currentTrackColor_description">لون الجي بي إكس GPX</string>
-    <string name="city_type_district">منطقة</string>
+    <string name="city_type_district">مقاطعة</string>
     <string name="city_type_neighbourhood">حي</string>
     <string name="file_name_containes_illegal_char">يحتوي اسم الملف على حرف غير قانوني</string>
 <string name="reports_for">تقرير عن</string>
@@ -1809,7 +1809,7 @@
     <string name="route_distance">المسافة :</string>
     <string name="route_duration">المدة الزمنية :</string>
     <string name="route_tr">در يمينا ثم واصل</string>
-    <string name="route_tl">در يسارا و اسلك</string>
+    <string name="route_tl">در يسارا وواصل</string>
     <string name="plugin_nautical_descr">هاته الأداة تثري خريطة التطبيق والملاحة لتوفير خرائط بحرية للزوارق والمراكب الشراعية وأنواع أخرى من الرياضات المائية.
 \n
 \nخريطة خاصة إضافية للتطبيق ستوفر كل علامات الملاحة البحرية سواء داخلية أو شاطئية وكذلك جدول للرموز. وصف كل علامة ملاحة يوفر التفاصيل اللازمة للتعرف عليها ومعانيها (الفئة، الشكل، اللون، التسلسل، المرجع...إلخ).
@@ -1817,12 +1817,12 @@
 \nللعودة إلى واحدة من أنماط الخريطة التقليدية، ببساطة إما عطل هاته الأداة مرة أخرى أو غير \'نمط الخريطة\' في \'ضبط الخريطة\' حسب الرغبة.</string>
     <string name="search_near_map">البحث قرب مركز الخريطة الحالية</string>
     <string name="active_markers">العلامات المفعلة</string>
-    <string name="map_markers">العلامات على الخريطة</string>
+    <string name="map_markers">علامات خرائطية</string>
     
-    <string name="routing_attr_avoid_borders_name">منع تخطي الحدود</string>
+    <string name="routing_attr_avoid_borders_name">تجنب عبور الحدود</string>
     <string name="impassable_road_desc">حدد الطرق التي تريد تجنبها أثناء التنقل.</string>
     <string name="search_categories">فئات</string>
-    <string name="shared_string_near">بالقرب من</string>
+    <string name="shared_string_near">قرب</string>
     <string name="route_tslr">در قليلا إلى اليمين ثم واصل</string>
     <string name="route_tsll">در قليلا إلى اليسار ثم واصل</string>
     <string name="no_address_found">لم يتم تحديد أي عنوان</string>
@@ -1852,7 +1852,7 @@
     <string name="shared_string_read_more">إقرأ المزيد</string>
     <string name="road_blocked">طريق مسدود</string>
     <string name="shared_string_select">حدد</string>
-    <string name="switch_start_finish">إعكس نقطة الانطلاق و الوصول</string>
+    <string name="switch_start_finish">عكس نقطة الانطلاق و الوصول</string>
     <string name="rendering_attr_hideIcons_name">أيقونات ال POI</string>
     <string name="shared_string_type">النوع</string>
     <string name="shared_string_not_selected">غير محدد</string>
@@ -1894,19 +1894,19 @@
     <string name="favorite_category_add_new_title">إضافة فئة جديدة</string>
     <string name="regions">المناطق</string>
     <string name="favorite_category_select">إختر فئة</string>
-    <string name="si_kmh">كم/ساعة</string>
-    <string name="si_mph">ميلا في الساعة</string>
+    <string name="si_kmh">كم في الساعة</string>
+    <string name="si_mph">ميل في الساعة</string>
     <string name="si_m_s">متر في الثانية</string>
-    <string name="si_min_km">دقيقة لكل كيلومتر</string>
+    <string name="si_min_km">دقيقة في الكيلومتر</string>
     <string name="si_min_m">دقيقة لكل ميل</string>
     <string name="si_nm_h">ميلا بحريا في الساعة (عقدة)</string>
-    <string name="min_mile">دقيقة/م</string>
-    <string name="min_km">دقيقة/كم</string>
+    <string name="min_mile">دق/م</string>
+    <string name="min_km">دق/كم</string>
     <string name="m_s">م/ث</string>
     <string name="shared_string_navigation">الملاحة</string>
     <string name="osmand_running_in_background">قيد التشغيل في الخلفية</string>
     <string name="favourites_edit_dialog_title">المعلومات المفضلة</string>
-    <string name="looking_up_address">البحث عن عنوان</string>
+    <string name="looking_up_address">بحث عن عنوان</string>
     <string name="no_updates_available">لا تتوفر هناك أية تحديثات جديدة</string>
     <string name="rendering_value_default13_name">الافتراضي (13)</string>
     <string name="rendering_value_defaultTranslucentCyan_name">الافتراضي (سماوي شفاف)</string>
@@ -2075,7 +2075,7 @@
     <string name="region_maps">خرائط واسعة النطاق</string>
     <string name="hillshade_layer_disabled">طبقة التضاريس غير مفعلة</string>
     <string name="srtm_plugin_disabled">الخطوط الكفافية معطلة</string>
-    <string name="nm">بحاجة إلى معلومات أكثر</string>
+    <string name="nm">ميل بحري</string>
     <string name="nm_h">ميل بحري/ساعة</string>
     <string name="simulate_your_location_descr">محاكاة موقعك باستخدام طريق مقاس أو مسار GPX مسجل.</string>
     <string name="routing_attr_avoid_shuttle_train_name">تجنب قطار المدينة</string>
@@ -2128,13 +2128,13 @@
     
     <string name="lang_hu_formal">الهنغارية (الرسمية)</string>
     <string name="routing_attr_avoid_stairs_name">تجنب الأدراج</string>
-    <string name="routing_attr_avoid_stairs_description">تجنب الأدراج.</string>
+    <string name="routing_attr_avoid_stairs_description">تجنب الأدراج</string>
     <string name="routing_attr_avoid_borders_description">تجنب عبور الحدود إلى بلد آخر.</string>
     <string name="routing_attr_height_description">تحديد ارتفاع السيارة المسموح على الطرق.</string>
     <string name="disable_complex_routing_descr">تعطيل 2-مرحلة التوجيه للملاحة بالسيارة.</string>
-    <string name="rendering_attr_alpineHiking_name">مقياس جبال الألب للتنزه (نادي جبال الألب السويسرية)</string>
+    <string name="rendering_attr_alpineHiking_name">مقياس جبال الألب للتنزه (SAC)</string>
     <string name="rendering_attr_alpineHiking_description">تقديم مسارات وفقا لمقياس SAC.</string>
-    <string name="rendering_attr_hikingRoutesOSMC_name">غطاء رمز التنزه</string>
+    <string name="rendering_attr_hikingRoutesOSMC_name">اوفرلاي رمز تسلق الجبال</string>
     <string name="rendering_attr_hikingRoutesOSMC_description">تقديم مسارات وفقا لآثار OSMC.</string>
 
     <string name="local_index_description">انقر على أي عنصر موجود لمعرفة المزيد من التفاصيل، انقر مطولا للتعطيل أو الحذف. البيانات الحالية في الجهاز (%1$s متاحة):</string>
@@ -2230,7 +2230,7 @@
 يمكنك فقط مشاهدة الخريطة المحملة مسبقا ولا يمكنك التحميل من الإنترنت.</string>
     <string name="route_tshr">در يمينا بشكل حاد وواصل</string>
     <string name="route_tshl">در يسارا بشكل حاد وواصل</string>
-    <string name="route_tu">قم بإنعطاف-U وواصل</string>
+    <string name="route_tu">قم بإنعطاف U وواصل</string>
     <string name="search_nearby">بحث بالقرب</string>
     <string name="opening_hours_not_supported">نمط ساعات العمل غير متاح التعديل</string>
     <string name="transport_search_after">المسار اللاحق للرحلة</string>
@@ -2252,7 +2252,7 @@
     <string name="rendering_attr_hideOverground_name">أشياء فوق سطح الأرض</string>
 
     <string name="shared_string_change">تغيير</string>
-    <string name="get_started">باشر</string>
+    <string name="get_started">ابدأ</string>
     <string name="routing_attr_short_way_name">طريق أقل استهلاكا للوقود</string>
     <string name="routing_attr_short_way_description">استخدم طريق أقل استهلاكا للوقود (عادة أقصر).</string>
     <string name="replace_favorite_confirmation">هل أنت متأكد من أنك تريد استبدال المفضلة %1$s؟</string>
@@ -2264,10 +2264,10 @@
     <string name="skip_map_downloading_desc">ليس لديك أي خريطة محلية مثبتة. يمكنك اختيار خريطة من اللائحة أو تنزيل خرائط لاحقاً عبر القائمة - %1$s.</string>
     <string name="search_another_country">حدد منطقة أخرى</string>
     <string name="search_map">البحث عن الخرائط جارٍ …</string>
-    <string name="first_usage_wizard_desc">دع تطبيق أواسام آند يحدد موقعك ويقترح عليك تنزيل خرائط المنطقة.</string>
-    <string name="location_not_found">لم يتم العثور على الموقع</string>
+    <string name="first_usage_wizard_desc">دع تطبيق أواسام آند يحدد موقعك ويقترح عليك تنزيل خرائط لتلك المنطقة.</string>
+    <string name="location_not_found">الموقع غير موجود</string>
     <string name="no_inet_connection">لا يوجد اتصال بالشبكة</string>
-    <string name="no_inet_connection_desc_map">مطلوبة لتنزيل الخرائط.</string>
+    <string name="no_inet_connection_desc_map">مطلوب لتنزيل الخرائط.</string>
     <string name="search_location">البحث عن الموقع…</string>
     <string name="storage_free_space">مساحة حرة</string>
     <string name="storage_place_description">مخزن بيانات التطبيق (للخرائط، المسارات، إلخ.): %1$s.</string>
@@ -2290,7 +2290,7 @@
     <string name="shared_string_filters">فلترات</string>
     <string name="apply_filters">تطبيق الفلترات</string>
     <string name="save_filter">حفظ الفلتر</string>
-    <string name="delete_filter">حذف الفلتر</string>
+    <string name="delete_filter">حذف فلتر</string>
     <string name="new_filter">فلتر جديد</string>
     <string name="new_filter_desc">رجاءا أدخل اسم للفلتر الجديد. ستجده ضمن لائحة الفئات.</string>
     <string name="selected_categories">الفئات المحددة</string>
@@ -2319,7 +2319,7 @@
     <string name="shared_string_pause">إيقاف</string>
     <string name="shared_string_trip">رحلة</string>
     <string name="shared_string_recorded">مسجل</string>
-    <string name="shared_string_record">تسيجل</string>
+    <string name="shared_string_record">تسجيل</string>
     <string name="gpx_logging_no_data">لا توجد بيانات</string>
     
     
@@ -2337,13 +2337,7 @@
     <string name="route_roundabout_short">خذ المخرج %1$d ثم واصل</string>
     
     <string name="search_map_hint">بحث عن مدينة أو منطقة</string>
-    <string name="wiki_around">"تنصل وتذكير :
-          إذا كنت تعمل على ترجمة الجمل، يرجى التأكد من:
-          1. لا توجد سلاسل أو سترينجز مكررة بالاسم
-          2. كل فاصلة (للاقتباس) تكون مسبوقة بخط مائل (لاحظ أمثلة).
-          إذا كنت ترغب بالقيام بـ / تصحيح ترجمة الإنجليزية تأكد من أن:
-          3. كل السلاسل أو السترينجز المنشأة/المعدلة  التي تم إنشاؤها متواجدة في الجزء العلوي من الملف (لتسهيل ايجاد ما هو مترجم).
-     من فضلك: إلقاء نظرة على http://code.google.com/p/osmand/wiki/UIConsistency، قد تحسن من عملك وعملنا :-) شكرا - هاردي"</string>
+    <string name="wiki_around">مقالات ويكيبيديا مجاورة</string>
     <string name="show_legacy_search">إظهار طريقة البحث القديمة</string>
     <string name="show_legacy_search_desc">إضافة البحث المتعمق في قائمة الدرج.</string>
     <string name="routing_attr_allow_motorway_name">الطريق السريع مسموح</string>
@@ -2460,17 +2454,17 @@
     <string name="altitude_ascent">مرتفع</string>
     <string name="altitude_range">مدى الإرتفاع</string>
     <string name="average_altitude">متوسط الإرتفاع</string>
-    <string name="routing_attr_height_obstacles_name">إستعمل بيانات الإرتفاع</string>
+    <string name="routing_attr_height_obstacles_name">إستعمال بيانات الإرتفاع</string>
     <string name="do_not_show_startup_messages">لا تعرض الرسائل عند بدء التشغيل</string>
     <string name="routing_attr_allow_private_name">السماح بالدخول الخاص</string>
     <string name="routing_attr_allow_private_description">السماح بالوصول إلى المناطق الخاصة.</string>
-    <string name="type_address">اكتب عنواناً</string>
-    <string name="select_city">إختر مدينةً</string>
-    <string name="select_postcode">إختر رمزاً بريدياً</string>
+    <string name="type_address">اكتب العنوان</string>
+    <string name="select_city">إختر مدينة</string>
+    <string name="select_postcode">إختر رمز بريدي</string>
     <string name="nearest_cities">أقرب المدن</string>
     <string name="type_city_town">اكتب إسم بلدة أو مدينة</string>
-    <string name="type_postcode">اكتب رمزاً بريدياً</string>
-    <string name="nothing_found">لم يتم العثور على أي شيء :(</string>
+    <string name="type_postcode">اكتب رمز بريدي</string>
+    <string name="nothing_found">لم يتم العثور على أي شيء</string>
     <string name="increase_search_radius">قم بتوسيع دائرة البحث</string>
     <string name="search_favorites">ابحث في المفضلة</string>
     <string name="shared_string_plugin">ملحق</string>
@@ -2478,14 +2472,14 @@
     <string name="favorite_group_name">إسم المجموعة</string>
     <string name="change_color">تغيير اللون</string>
     <string name="edit_name">تعديل الإسم</string>
-    <string name="select_street">إختر طريقاً</string>
+    <string name="select_street">إختر شارع</string>
     <string name="shared_string_in_name">في %1$s</string>
     <string name="quick_action_add_destination">إضافة وجهة</string>
     <string name="quick_action_replace_destination">تبديل الوجهة</string>
     <string name="subscribe_email_error">خطأ</string>
     <string name="nautical_maps">الخرائط البحرية</string>
     <string name="fonts_header">خطوط الخريطة</string>
-    <string name="right_side_navigation">القيادة اليمنى</string>
+    <string name="right_side_navigation">القيادة على اليمين</string>
     <string name="driving_region_automatic">آلي</string>
     <string name="parking_options">خيارات مواقف السيارات</string>
     <string name="full_version_thanks">شكرا لكم لاقتناء النسخة الكاملة من أوسماند.</string>
@@ -2503,7 +2497,7 @@
 \n • تحميل مسارات GPX إلى الموقع مباشرة بالتطبيق
 \n • إضافة POI ورفعها مباشرة إلى الموقع (أو في وقت لاحق إن كنت غير متصل بالشبكة)</string>
     <string name="nothing_found_descr">حاول تغيير طلب البحث أو وسع دائرة البحث.</string>
-    <string name="quick_action_showhide_osmbugs_title">إظهار أو إخفاء ملاحظات الخريطة</string>
+    <string name="quick_action_showhide_osmbugs_title">تبديل ملاحظات الخريطة</string>
     <string name="quick_action_osmbugs_show">أظهر ملاحظات الخريطة</string>
     <string name="quick_action_osmbugs_hide">اخفي ملاحظات الخريطة</string>
     <string name="sorted_by_distance">ترتيب حسب المسافة</string>
@@ -2532,28 +2526,26 @@
     <string name="online_photos">صور على الإنترنت</string>
     <string name="shared_string_add_photos">إضافة صور</string>
     <string name="no_photos_descr">ليس لدينا صور لهذا الموقع.</string>
-    <string name="mapillary_action_descr">ساهم بصور الشوارع الخاصة بك لهذا الموقع عن طريق مابيلاري.</string>
+    <string name="mapillary_action_descr">ساهم بمنظر الشارع الخاص بك لهذا الموقع عن طريق مابيلاري.</string>
     <string name="mapillary_widget">ويدجت مابيلاري</string>
-    <string name="mapillary_widget_descr">يسمح لك بالمساهمة بسرعة لمابيلاري.</string>
+    <string name="mapillary_widget_descr">يسمح بمساهمة سريعة في مابيلاري.</string>
     <string name="mapillary_descr">صور شوارع متاحة على الإنترنت للجميع. اكتشف أماكن، تعاون، والتقط صورا للعالم.</string>
     <string name="mapillary">مابيلاري</string>
     <string name="plugin_mapillary_descr">صور شوارع متاحة للجميع. اكتشف أماكن، تعاون، والتقط صورا للعالم.</string>
-    <string name="private_access_routing_req">الوجهة الخاص بك تقع في منطقة ذات ولوج خاص. هل تريد تفعيل خاصية السماح بالوصول إلى هاته الأماكن لهذه الرحلة؟</string>
-    <string name="quick_action_showhide_osmbugs_descr">النقر على زر الإجراء سيظهر أو يخفي ملاحظات OSM على الخريطة.</string>
+    <string name="private_access_routing_req">الوجهة الخاص بك تقع في منطقة ذات ولوج خاص. هل تسمح بالدخول إلى الطرق الخاصة لهذه الرحلة؟</string>
+    <string name="quick_action_showhide_osmbugs_descr">النقر على زر الإجراء هذا يظهر أو يخفي ملاحظات OSM على الخريطة.</string>
     <string name="hide_from_zoom_level">إخفاء من مستوى التكبير/التصغير</string>
     <string name="srtm_menu_download_descr">لعرض الخطوط الكنتورية على الخريطة، تحتاج إلى تحميل خريطة الخط الكنتوري لهذه المنطقة.</string>
     <string name="show_from_zoom_level">عرض من مستوى التكبير/التصغير</string>
-    <string name="display_zoom_level">عرض مستوى التكبير/التصغير: %1$s</string>
+    <string name="display_zoom_level">عرض مستوى التكبير: %1$s</string>
     <string name="animate_my_location">قم بتحريك موقعي</string>
     <string name="srtm_purchase_header">لمشاهدة الخطوط الكنتورية على الخريطة، أنت بحاجة لشراء وتثبيت البرنامج المساعد للخطوط الكنتورية</string>
     <string name="animate_my_location_desc">تفعيل حركة تعديل مجال رؤية الخريطة بالنسبة لموقعي أثناء الملاحة.</string>
     <string name="quick_action_auto_zoom_desc">النقر على زر الإجراء سوف يقوم بتشغيل/إيقاف تكبير الخريطة وفقا لسرعتك.</string>
     <string name="quick_action_add_destination_desc">النقر على زر الإجراء سيقوم بإضافة وجهة في مركز الشاشة. الوجهة المعينة مسبقا تصبح النقطة الوسيطة الأخيرة.</string>
     <string name="quick_action_replace_destination_desc">النقر على زر الإجراء سيحل محل الوجهة بالموقع الظاهر على مركز الشاشة.</string>
-    <string name="improve_coverage_install_mapillary_desc">يمكنك أن تأخذ صورك الخاصة أو سلسلة من الصور وإرفاقها بهذا الموقع.
-\n
-\nللقيام بذل، تحتاج إلى تثبيت تطبيق مابيلاري من البلاي ستور.</string>
-    <string name="hillshade_menu_download_descr">لمشاهدة التضاريس على الخريطة، تحتاج إلى تحميل خريطة طبقة التضاريس لهذه المنطقة.</string>
+    <string name="improve_coverage_install_mapillary_desc">ثبت تطبيق مابيلاري لإضافة صورة أو أكثر إلى هذا الموقع.</string>
+    <string name="hillshade_menu_download_descr">لمشاهدة التضاريس على الخريطة، حمل خريطة طبقة التضاريس لهذه المنطقة.</string>
     <string name="hillshade_purchase_header">لمشاهدة التضاريس على الخريطة، تحتاج إلى شراء وتثبيت برنامج الخطوط الكنتورية المساعد</string>
     <string name="quick_action_add_first_intermediate_desc">النقر على زر الإجراء سيتم إضافة نقطة وسيطة أولى في موقع مركز الشاشة.</string>
     <string name="no_overlay">لا طبقة فوقية</string>
@@ -2568,8 +2560,8 @@
     <string name="do_not_send_anonymous_app_usage_desc">التطبيق يقوم بجمع معلومات حول أجزاء من التطبيقات التي تفتحها. الموقع الخاص بك لا يرسل ابدأ، ولا أي شيء تقوم بإدخاله في التطبيق أو أي تفاصيل لمناطق رأيتها ، بحثت عنها أو نزلتها.</string>
     <string name="do_not_show_startup_messages_desc">منع عرض الخصومات على التطبيق وإعلانات الأحداث المحلية المميزة.</string>
     <string name="routing_attr_relief_smoothness_factor_plains_name">أقل تضاريس</string>
-    <string name="routing_attr_relief_smoothness_factor_more_plains_name">مسطحة</string>
-    <string name="routing_attr_driving_style_balance_name">متوازنة</string>
+    <string name="routing_attr_relief_smoothness_factor_more_plains_name">مسطح</string>
+    <string name="routing_attr_driving_style_balance_name">متوازن</string>
     <string name="relief_smoothness_factor_descr">التضاريس المفضلة : مسطحة أو تلال.</string>
     <string name="shared_string_slope">منحدر</string>
     <string name="shared_string_move">انتقل</string>
@@ -2599,7 +2591,7 @@
     <string name="quick_action_page_list_descr">النقر على زر الإجراء سوف يوجهك خلال القائمة أدناه.</string>
     <string name="route_points_category_name">انعطافات لتمر بهذا الطريق</string>
     <string name="navigate_point_olc_info_area">OLC الصالحة بالكامل\nتمثل المنطقة: %1$s x %2$s</string>
-    <string name="wrong_user_name">اسم المستخدم خاطئ !</string>
+    <string name="wrong_user_name">اسم المستخدم خاطئ</string>
     <string name="shared_string_to">إلى</string>
     <string name="mapillary_menu_date_from">من</string>
     <string name="mapillary_menu_descr_dates">عرض الصور المضافة فقط</string>
@@ -2607,13 +2599,13 @@
     <string name="mapillary_menu_edit_text_hint">قم بادخال اسم المستخدم</string>
     <string name="mapillary_menu_descr_username">عرض الصور التي أضافها المستخدم</string>
     <string name="mapillary_menu_title_username">اسم المستخدم</string>
-    <string name="mapillary_menu_filter_description">يمكنك تصفية الصور حسب مقدمها أو حسب التاريخ. يتم تطبيق عوامل التصفية اذا ما كان التكبير عن كثب فقط.</string>
+    <string name="mapillary_menu_filter_description">تصفية الصور حسب مقدمها أو حسب التاريخ. مفعل فقط اذا ما كان التكبير عن كثب.</string>
     <string name="shared_string_reload">إعادة تحميل</string>
     <string name="mapillary_menu_descr_tile_cache">إعادة تحميل أجزاء الخريطة لمشاهدة البيانات المحدثة.</string>
     <string name="mapillary_menu_title_tile_cache">التخزين المؤقت لأجزاء الخريطة</string>
     <string name="shared_string_reset">إعادة تعيين</string>
     <string name="store_tracks_in_monthly_directories">تخزين المسارات المسجلة في المجلدات الشهرية</string>
-    <string name="store_tracks_in_monthly_directories_descrp">تخزين المسارات المسجلة في مجلدات فرعية لكل تسجيل شهري (مثل 01-2017).</string>
+    <string name="store_tracks_in_monthly_directories_descrp">تخزين المسارات المسجلة في مجلدات فرعية لكل تسجيل شهري (مثل 01-2018).</string>
     <string name="average">متوسط</string>
     <string name="of">%1$d من %2$d</string>
     <string name="ascent_descent">صعود/نزول</string>
@@ -2624,9 +2616,9 @@
     <string name="min_max">الأدنى/الأقصى</string>
     
     <string name="rendering_value_translucent_pink_name">وردي شفاف</string>
-    <string name="quick_action_resume_pause_navigation">استئناف/وقف الملاحة</string>
+    <string name="quick_action_resume_pause_navigation">وقف/استئناف الملاحة</string>
     <string name="quick_action_resume_pause_navigation_descr">اضغط هذا الزر لإيقاف أو استئناف الملاحة.</string>
-    <string name="quick_action_show_navigation_finish_dialog">إظهار انتهاء الملاحة</string>
+    <string name="quick_action_show_navigation_finish_dialog">إظهار نافذة \'انتهاء الملاحة\'</string>
     <string name="quick_action_start_stop_navigation">بدء/انهاء الملاحة</string>
     <string name="quick_action_start_stop_navigation_descr">اضغط هذا الزر لبدء أو إنهاء الملاحة.</string>
     <string name="live_monitoring_max_interval_to_send">الوقت الإضافي المخزن المؤقت للتتبع على الإنترنت</string>
@@ -2688,7 +2680,7 @@
     
     <string name="show_direction">مؤشر المسافة</string>
     <string name="sort_by">فرز حسب</string>
-    <string name="do_not_use_animations">عدم استخدام الرسوم المتحركة</string>
+    <string name="do_not_use_animations">بدون رسوم متحركة</string>
     <string name="do_not_use_animations_descr">تعطيل الرسوم المتحركة في التطبيق.</string>
     <string name="keep_showing_on_map">استمرار العرض على الخريطة</string>
     <string name="exit_without_saving">الخروج دون حفظ؟</string>
@@ -2761,7 +2753,7 @@
     <string name="context_menu_read_full_article">إقرأ المقال كاملا</string>
     <string name="context_menu_read_article">قراءة المقال</string>
     <string name="context_menu_points_of_group">كافة نقاط المجموعة</string>
-    <string name="open_from">مفتوح مِن</string>
+    <string name="open_from">افتح من</string>
     <string name="open_till">مفتوح إلى غاية</string>
     <string name="will_close_at">يغلق أبوابه على</string>
     <string name="will_open_at">سيفتح الأبواب على</string>
@@ -2816,11 +2808,11 @@
 	<string name="south_abbreviation">ج</string>
 	<string name="north_abbreviation">ش</string>
 	<string name="optional_point_name">الإسم الإختياري للنقطة</string>
-    <string name="transport_nearby_routes_within">المسارات القريبة مِن</string>
+    <string name="transport_nearby_routes_within">المسارات القريبة في غضون</string>
     <string name="enter_the_file_name">أدخل إسم الملف.</string>
     <string name="map_import_error">خطأ أثناء استرجاع الخريطة</string>
     <string name="map_imported_successfully">تمت عملية استيراد الخريطة</string>
-    <string name="make_as_start_point">تحديد كنقطة البداية</string>
+    <string name="make_as_start_point">تحديد هذا كنقطة البداية</string>
     <string name="show_closed_notes">إظهار الملاحظات المُغلَقة</string>
     <string name="switch_osm_notes_visibility_desc">إظهار/إخفاء ملاحظات OSM على الخريطة.</string>
     <string name="shared_string_gpx_file">ملف GPX</string>
@@ -2837,18 +2829,18 @@
     <string name="tunnel_warning">على مقربة مِن نفق</string>
     <string name="show_tunnels">الأنفاق</string>
 <string name="wikivoyage_search_hint">البحث : بلد أو مدينة أو منطقة</string>
-    <string name="shared_string_explore">إكتشف</string>
+    <string name="shared_string_explore">اكتشف</string>
     <string name="shared_string_result">النتيجة</string>
     <string name="shared_string_travel_guides">السفر</string>
     <string name="enter_lon">إدخال خط الطول</string>
     <string name="enter_lat">إدخال دائرة العرض</string>
-    <string name="transport_nearby_routes">بالقُرب مِن</string>
+    <string name="transport_nearby_routes">في غضون</string>
     <string name="shared_string_current">الحالي</string>
     <string name="delete_search_history">حذف تأريخ البحث</string>
     <string name="show_images">إظهار الصور</string>
-    <string name="download_maps_travel">خرائط السفر</string>
+    <string name="download_maps_travel">أدلة السفر</string>
     <string name="shared_string_wikivoyage">ويكي سفر</string>
-    <string name="select_travel_book">إختيار كتاب للسفر</string>
+    <string name="select_travel_book">اختيار كتاب للسفر</string>
     <string name="shared_string_travel_book">كتاب السفر</string>
     <string name="purchase_cancelled_dialog_title">لقد قمت بإلغاء اشتراك OsmAnd Live</string>
     <string name="maps_you_need">خرائط قد تحتاجها</string>
@@ -2860,7 +2852,7 @@
     <string name="start_editing">إبداء التحرير</string>
     <string name="get_unlimited_access">تحصل على نفاذ بلا حدود</string>
     <string name="welcome_to_open_beta">مرحبا بكم على النسخة التجريبية المفتوحة</string>
-    <string name="wikivoyage_travel_guide">دليل ويكي سفر</string>
+    <string name="wikivoyage_travel_guide">أدلة السفر</string>
     <string name="monthly_map_updates">تحديثات الخرائط : <b>كل شهر</b></string>
     <string name="daily_map_updates">تحديثات الخرائط : <b>كل ساعة</b></string>
     <string name="purchase_unlim_title">شراء - %1$s</string>
@@ -2898,4 +2890,106 @@
     <string name="shared_string_restart">إعادة تشغيل التطبيق</string>
     <string name="shared_string_bookmark">إشارة مرجعية</string>
     <string name="waypoints_removed_from_map_markers">نقاط بالطريق تم إزالتها من علامات الخريطة</string>
-    </resources>
+    <string name="powered_by_osmand">مشغل بواسطة OsmAnd</string>
+    <string name="osm_live_plan_pricing">البرنامج والتسعير</string>
+    <string name="osm_live_payment_monthly_title">الدفع الشهري</string>
+    <string name="osm_live_payment_3_months_title">الدفع مرة واحدة في 3 أشهر</string>
+    <string name="osm_live_payment_annual_title">الدفع مرة واحدة في السنة</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / الشهر</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%2$s %1$.2f/ الشهر</string>
+    <string name="osm_live_payment_discount_descr">حفظ %1$s!</string>
+	<string name="osm_live_payment_current_subscription">اشتراكك الحالي</string>
+    <string name="osm_live_payment_renews_monthly">تجدد شهريا</string>
+    <string name="osm_live_payment_renews_quarterly">تجدد كل ثلاثة شهور</string>
+    <string name="osm_live_payment_renews_annually">تجدد سنويا</string>
+    <string name="osm_live_payment_header">حدد مدة الدفع المناسبة لك:</string>
+    <string name="osm_live_payment_contribute_descr">جزء من الدخل يذهب للمساهمين بالتطبيق.</string>
+    <string name="markers_remove_dialog_msg">حذف علامة الخريطة \'%s\'؟</string>
+    <string name="edit_map_marker">تعديل علامة الخريطة</string>
+    <string name="search_street">البحث عن شارع</string>
+    <string name="start_search_from_city">اختر المدينة أولا</string>
+    <string name="shared_string_restore">استعادة</string>
+    <string name="third_party_application">تطبيق من طرف-ثالث</string>
+    <string name="keep_passed_markers_descr">العلامات المضافة كمجموعة مفضلة أو نقاط طريق GPX ستظل على الخريطة. اذا كانت المجموعة غير نشطة، العلامات سوف تختفي من الخريطة.</string>
+    <string name="keep_passed_markers">إبقاء العلامات المتجاوزة على الخريطة</string>
+    <string name="more_transport_on_stop_hint">هناك المزيد من النقل في هذا الموقف.</string>
+    <string name="ask_for_location_permission">يرجى إعطاء إذن الموقع للتطبيق لكي يواصل.</string>
+    <string name="thank_you_for_feedback">شكرا على ردود الفعل</string>
+    <string name="poi_cannot_be_found">النقطة أو الطريق غير موجود.</string>
+    <string name="search_no_results_feedback">لا نتائج بحث؟
+\nاخبرنا بانطباعك</string>
+    <string name="increase_search_radius_to">توسيع دائرة البحث بقطر %1$s</string>
+    <string name="send_search_query">ارسال استفسار البحث؟</string>
+    <string name="shared_string_world">العالم</string>
+    <string name="point_deleted">تم حذف %1$s نقطة</string>
+    <string name="coord_input_edit_point">تحرير نقطة</string>
+    <string name="coord_input_add_point">إضافة نقطة</string>
+    <string name="coord_input_save_as_track">حفظ كمسار</string>
+    <string name="coord_input_save_as_track_descr">لقد أضفت %1$s نقطة. اكتب اسم الملف و اضغط على \"حفظ\".</string>
+    <string name="error_notification_desc">يرجى إرسال لقطة شاشة من هذا الإخطار الى support@osmand.net</string>
+    <string name="quick_action_edit_actions">تعديل الإجراءات</string>
+    <string name="get_osmand_live">احصل على OsmAnd Live لفتح جميع الميزات: تحديثات يومية للخريطة مع تنزيلات غير محدودة، جميع الإضافات المدفوعة والمجانية، Wikipedia ،wikivoyage وأكثر من ذلك بكثير.</string>
+    <string name="osm_live_subscriptions">الاشتراكات</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="read_wikipedia_offline_description">احصل على اشتراك OsmAnd Live لقراءة مقالات Wikipedia و wikivoyage.</string>
+    <string name="purchase_cancelled_dialog_descr">جدد الاشتراك لتستمر في استخدام كافة الميزات:</string>
+
+    <string name="maps_you_need_descr">استنادا إلى المقالات التي قمتم بحفظها، الخرائط التالية موصى بتحميلها:</string>
+    <string name="paid_app">تطبيق مدفوع</string>
+    <string name="paid_plugin">أداة مدفوعة</string>
+    <string name="start_editing_card_image_text">دليل السفر العالمي المجانا الذي بامكان أي شخص التعديل عليه.</string>
+    <string name="day_off_label">معطّل</string>
+    <string name="unirs_render_descr">تعديل النمط الافتراضي لزيادة تباين المشاة و طرق الدراجات .يستخدم Legasy Mapnik colors .</string>
+    <string name="commiting_way">تعديل طريق…</string>
+    <string name="wikivoyage_travel_guide_descr">أدلة إلى الأماكن الأكثر أهمية في العالم، في أوسماند بدون الحاجة إلى اتصال انترنت.</string>
+    <string name="in_app_purchase">شراء بداخل التطبيق</string>
+    <string name="in_app_purchase_desc">دفع مرة واحدة</string>
+    <string name="in_app_purchase_desc_ex">عند الشراء مرة واحدة سيكون متاحًا لك إلى الأبد.</string>
+    <string name="unlock_all_features">فتح كل ميزات أوسماند</string>
+    <string name="purchase_dialog_title">اختيار خطة</string>
+    <string name="purchase_dialog_travel_description">اشترِ واحدًا من الآتي للحصول على وظائف دليل سفر بدون نت:</string>
+    <string name="purchase_dialog_subtitle">اختر العنصر المناسب:</string>
+    <string name="shared_string_dont">لا تفعل</string>
+    <string name="shared_string_do">افعل</string>
+    <string name="wikivoyage_download_pics_descr">صور المقالة يمكن تحمل للاستخدام بدون اتصال.
+\nدائمًا متوفرة في \'إكتشف\'←\'خيارات\'.</string>
+    <string name="online_webpage_warning">الصفحة متوفرة فقط بالاتصال. هل تريد الفتح في المتصفح؟</string>
+    <string name="images_cache">تخزين مؤقت للصور</string>
+    <string name="use_two_digits_longitude">استخدم خط طول برقمين</string>
+    <string name="last_intermediate_dest_description">يضيف وقفة عاجلة</string>
+    <string name="first_intermediate_dest_description">يضيف وقفة ابتدائية</string>
+    <string name="subsequent_dest_description">يرفع الوجهة للأعلى وينشئها</string>
+    <string name="gpx_file_desc">GPX - مناسب للتصدير إلى JOSM ومحررات OSM الأخرى.</string>
+    <string name="osc_file_desc">OSC - مناسب للتصدير إلى خريطة الشارع المفتوحة.</string>
+    <string name="osm_edits_export_desc">اختر نوع التصدير: ملاحظة OSM أو POI أو كلاهما.</string>
+    <string name="add_group_descr">استيراد مجموعات من المفضلة أو نقاط طريق GPX.</string>
+    <string name="coordinate_input_accuracy_description">انتقال تلقائيًا إلى الحقل التالي بعد إدخال %1$d أرقام عشرية.</string>
+    <string name="mapillary_menu_title_pano">عرض صور 360° فقط</string>
+    <string name="release_3_2_pre">• اصلاح الفشل عند بدء التشغيل التي وقعت في بعض الأجهزة
+\n
+\n• ميزة علامات جديدة: عرض العلامات التي تم اجتيازها بالفعل
+\n
+\n• يعرض سجل البحث الآن الفئات التي بحثت عنها مسبقًا
+\n
+\n• اصلاح الفشل عند بدء التشغيل الذي حدث مع الخرائط غير اللاتينية
+\n
+\n• تحسين مشكلات سرعة العرض على أجهزة Android 8.0
+\n
+\n• دعم لتحرير الكائنات المضلعة (غير الملائمة)
+\n
+\n• قياس المسافة: إضافة زر القياس إلى الإجراءات في قائمة السياق</string>
+    <string name="release_3_1">• التنقل: إصلاح شريط التقدم ، تبديل سريع لنقطة البداية والنهاية للطريق
+\n
+\n• محددات الخرائط: قم بإيقاف تشغيل / إيقاف مجموعات ، والقدرة على إخفاء علامات من الخريطة
+\n
+\n• OSM Edit (تحرير OSM): القدرة على تحرير العلامات للكائنات غير المحددة النقاط وطرقها ، إصلاح التعليقات المفقودة على الملاحظات ، النسخ الاحتياطي للتحرير
+\n
+\n• تحسين تحليل Wikipedia و Wikivoyage ، الملفات المحدثة متوفرة بالفعل
+\n
+\n• قائمة السياق: إصلاح لون دروع النقل في الوضع الليلي ، إصلاح أحجام القوائم الإضافية
+\n
+\n• قارب الملاحة: دعم الممر المائي الممر
+\n
+\n• إصلاحات الأخطاء الأخرى</string>
+    <string name="start_editing_card_description">يمكنك وتحرير أي مقال على Wikivoyage. تبادل المعرفة والخبرة والموهبة واهتمامك</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-b+ast/phrases.xml b/OsmAnd/res/values-b+ast/phrases.xml
index 558bdcc4a4..dd173c94c8 100644
--- a/OsmAnd/res/values-b+ast/phrases.xml
+++ b/OsmAnd/res/values-b+ast/phrases.xml
@@ -1,234 +1,234 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="poi_shop">Tienda</string>
-	<string name="poi_emergency">Emerxencia</string>
-	<string name="poi_transportation">Tresporte</string>
-	<string name="poi_filling_station">Gasolinera</string>
-	<string name="poi_personal_transport">Tresporte personal</string>
-	<string name="poi_public_transport">Tresporte públicu</string>
-	<string name="poi_air_transport">Tresporte aereu</string>
-	<string name="poi_water_transport">Tresporte acuáticu</string>
-	<string name="poi_communication">Comunicación</string>
-<string name="poi_fuel_type">Triba de combustible</string>
-	<string name="poi_fuel_avia_type">Triba de combustible (avia)</string>
-	<string name="poi_payment_type">Triba de pagu</string>
-	<string name="poi_payment_fuel_type">Tarxetes pa gasolineres</string>
-	<string name="poi_additional_type">Adicional</string>
-	<string name="poi_internet_access_type">Triba d\'accesu a internet</string>
-	<string name="poi_bicycle_service">Serviciu de bicicletes</string>
-	<string name="poi_clothes_type">Triba</string>
-	<string name="poi_shoes_type">Triba</string>
-	<string name="poi_fire_hydrant_type">Triba</string>
-	<string name="poi_fire_hydrant_position">Posición</string>
-	<string name="poi_fire_hydrant_water_source">Fonte d\'agua</string>
-	<string name="poi_payment_toll_type">Triba de pagu</string>
-	<string name="poi_traffic_signals_sound">Soníu</string>
-	<string name="poi_highway_crossing_type">Triba</string>
-	<string name="poi_tactile_paving">Pavimentu táutil</string>
-	<string name="poi_service_general">Serviciu</string>
-	<string name="poi_parking_type">Triba</string>
-	<string name="poi_subway_station_filter">Estación de metru</string>
-	<string name="poi_bicycle_parking_type">Triba</string>
-	<string name="poi_telescope_type">Triba</string>
-	<string name="poi_animal_training_type">Triba</string>
-	<string name="poi_embassy_type">Triba</string>
-	<string name="poi_city_capital">Capital</string>
-	<string name="poi_healthcare_alternative_types">Especialidá</string>
-	<string name="poi_free_flying_characteristics">Carauteurístico</string>
-	<string name="poi_archaeological_site_type">Triba</string>
-	<string name="poi_religion_type">Relixón</string>
-	<string name="poi_denomination">Denomación</string>
-	<string name="poi_information_type">Triba</string>
-	<string name="poi_information_contents">Conteníos</string>
-	<string name="poi_clock_option">Adicional</string>
-	<string name="poi_resort_type">Triba</string>
-	<string name="poi_cocktails">Cócteles</string>
-	<string name="poi_beauty_salon_service">Serviciu</string>
-	<string name="poi_recycling_type">Triba</string>
-	<string name="poi_shelter_type">Triba</string>
-	<string name="poi_medical_system">Sistema mélicu</string>
-	<string name="poi_vending_type">Tipu de máquina de venta</string>
-	<string name="poi_self_service">Autoserviciu</string>
-	<string name="poi_automated">Automatizáu</string>
-	<string name="poi_covered">Cubiertu</string>
-	<string name="poi_brushless">Sin escobines</string>
-	<string name="poi_ferry_terminal_cargo">Carga</string>
-	<string name="poi_aerialway_bicycle">Tresporte de bicicletes</string>
-	<string name="poi_aerialway_heating">Calefacción</string>
-	<string name="poi_pump">Bomba</string>
-	<string name="poi_observatory_designation">Designación</string>
-	<string name="poi_pharmacy_dispensing">Con receta</string>
-	<string name="poi_star_rating">Estrelles de puntuación</string>
-	<string name="poi_scout_camp">Campamentu de Scouts</string>
-	<string name="poi_backcountry">Fuera de pista</string>
-	<string name="poi_piste_difficulty">Dificultá de la pista</string>
-	<string name="poi_piste_grooming">Cuidáu de la pista</string>
-	<string name="poi_theatre_genre">Xéneru</string>
-	<string name="poi_outdoor_seating">Asientos al aire llibre</string>
-	<string name="poi_fee">Coste</string>
-	<string name="poi_smoking">Fumadores</string>
-	<string name="poi_delivery">Repartu</string>
-	<string name="poi_drive_in">Carril d\'atención</string>
-	<string name="poi_drive_through">Serviciu nel coche</string>
-	<string name="poi_takeaway">Pa llevar</string>
-	<string name="poi_microbrewery">Cervecería artesanal</string>
-	<string name="poi_recycling_accepted_waste">Residuos aceutaos</string>
-	<string name="poi_fireplace">Llar pa fueu</string>
-	<string name="poi_seasonal">Temporada</string>
-	<string name="poi_water_characteristic">Tipu d\'agua</string>
-	<string name="poi_beach_surface_type">Superfície</string>
-	<string name="poi_nudism">Nudismu</string>
-	<string name="poi_diet">Dieta</string>
-	<string name="poi_health_specialty">Especialidá médica</string>
-	<string name="poi_massage_type">Tipu de masaxe</string>
-	<string name="poi_tents">Tiendes</string>
-	<string name="poi_washing_machine">Llavadora</string>
-	<string name="poi_caravans">Caravanes</string>
-	<string name="poi_power_supply">Tomes d\'electricidá</string>
-	<string name="poi_home_visit">Visites en casa</string>
-	<string name="poi_dish">Platu</string>
-	<string name="poi_payment_transport_type">Tipu de pagu (tresporte)</string>
-	<string name="poi_social_facility_type">Tipu</string>
-	<string name="poi_social_facility_for">Grupu de destín</string>
-	<string name="poi_compressed_air_filter">Aire comprimíu</string>
-	<string name="poi_vacuum_cleaner_filter">Aspiradora</string>
-	<string name="poi_free_flying_characteristic">Carauterística</string>
-	<string name="poi_cafeteria">Cafetería</string>
-	<string name="poi_zoo_type">Tipu</string>
-	<string name="poi_motorcycle_services">Servicios</string>
-	<string name="poi_motorcycle_type">Tipu de moto</string>
-	<string name="poi_animal_shelter_type">Animales aceutaos</string>
-	<string name="poi_animal_shelter_purpose">Oxetivu</string>
+	<string name="poi_shop"></string>
+	<string name="poi_emergency"></string>
+	<string name="poi_transportation"></string>
+	<string name="poi_filling_station"></string>
+	<string name="poi_personal_transport"></string>
+	<string name="poi_public_transport"></string>
+	<string name="poi_air_transport"></string>
+	<string name="poi_water_transport"></string>
+	<string name="poi_communication"></string>
+<string name="poi_fuel_type"/>
+	<string name="poi_fuel_avia_type"/>
+	<string name="poi_payment_type"/>
+	<string name="poi_payment_fuel_type"/>
+	<string name="poi_additional_type"/>
+	<string name="poi_internet_access_type"/>
+	<string name="poi_bicycle_service"/>
+	<string name="poi_clothes_type"/>
+	<string name="poi_shoes_type"/>
+	<string name="poi_fire_hydrant_type"/>
+	<string name="poi_fire_hydrant_position"/>
+	<string name="poi_fire_hydrant_water_source"/>
+	<string name="poi_payment_toll_type"/>
+	<string name="poi_traffic_signals_sound"/>
+	<string name="poi_highway_crossing_type"/>
+	<string name="poi_tactile_paving"/>
+	<string name="poi_service_general"/>
+	<string name="poi_parking_type"/>
+	<string name="poi_subway_station_filter"/>
+	<string name="poi_bicycle_parking_type"/>
+	<string name="poi_telescope_type"/>
+	<string name="poi_animal_training_type"/>
+	<string name="poi_embassy_type"/>
+	<string name="poi_city_capital"/>
+	<string name="poi_healthcare_alternative_types"/>
+	<string name="poi_free_flying_characteristics"/>
+	<string name="poi_archaeological_site_type"/>
+	<string name="poi_religion_type"/>
+	<string name="poi_denomination"/>
+	<string name="poi_information_type"/>
+	<string name="poi_information_contents"/>
+	<string name="poi_clock_option"/>
+	<string name="poi_resort_type"/>
+	<string name="poi_cocktails"/>
+	<string name="poi_beauty_salon_service"/>
+	<string name="poi_recycling_type"/>
+	<string name="poi_shelter_type"/>
+	<string name="poi_medical_system"></string>
+	<string name="poi_vending_type"/>
+	<string name="poi_self_service"/>
+	<string name="poi_automated"/>
+	<string name="poi_covered"/>
+	<string name="poi_brushless"/>
+	<string name="poi_ferry_terminal_cargo"/>
+	<string name="poi_aerialway_bicycle"/>
+	<string name="poi_aerialway_heating"/>
+	<string name="poi_pump"/>
+	<string name="poi_observatory_designation"/>
+	<string name="poi_pharmacy_dispensing"/>
+	<string name="poi_star_rating"/>
+	<string name="poi_scout_camp"/>
+	<string name="poi_backcountry"/>
+	<string name="poi_piste_difficulty"/>
+	<string name="poi_piste_grooming"/>
+	<string name="poi_theatre_genre"/>
+	<string name="poi_outdoor_seating"/>
+	<string name="poi_fee"/>
+	<string name="poi_smoking"/>
+	<string name="poi_delivery"/>
+	<string name="poi_drive_in"/>
+	<string name="poi_drive_through"/>
+	<string name="poi_takeaway"/>
+	<string name="poi_microbrewery"/>
+	<string name="poi_recycling_accepted_waste"/>
+	<string name="poi_fireplace"></string>
+	<string name="poi_seasonal"></string>
+	<string name="poi_water_characteristic"></string>
+	<string name="poi_beach_surface_type"></string>
+	<string name="poi_nudism"></string>
+	<string name="poi_diet"></string>
+	<string name="poi_health_specialty"></string>
+	<string name="poi_massage_type"></string>
+	<string name="poi_tents"></string>
+	<string name="poi_washing_machine"></string>
+	<string name="poi_caravans"></string>
+	<string name="poi_power_supply"></string>
+	<string name="poi_home_visit"></string>
+	<string name="poi_dish"></string>
+	<string name="poi_payment_transport_type"></string>
+	<string name="poi_social_facility_type"></string>
+	<string name="poi_social_facility_for"></string>
+	<string name="poi_compressed_air_filter"></string>
+	<string name="poi_vacuum_cleaner_filter"></string>
+	<string name="poi_free_flying_characteristic"></string>
+	<string name="poi_cafeteria"></string>
+	<string name="poi_zoo_type"></string>
+	<string name="poi_motorcycle_services"></string>
+	<string name="poi_motorcycle_type"></string>
+	<string name="poi_animal_shelter_type"></string>
+	<string name="poi_animal_shelter_purpose"></string>
 
-<string name="poi_shop_food">Tienda d\'alimentación y supermercáu</string>
-	<string name="poi_emergency_infrastructure">Infraestructura d\'emerxencia</string>
-	<string name="poi_road_obstacle">Estorbisa na carretera</string>
-	<string name="poi_bicycle_transport">Tresporte ciclista</string>
-	<string name="poi_aerialway_transport">Tresporte per cable</string>
-	<string name="poi_node_networks">Nudos de rede d\'escursionismu/ciclismu</string>
-	<string name="poi_hiking_routes">Rutes d\'escursionismu</string>
-	<string name="poi_traffic_enforcement">Control del tráficu</string>
-	<string name="poi_man_made">Artificial</string>
-	<string name="poi_transport_construction">Tresporte en construcción</string>
-	<string name="poi_water_supply">Suministru d\'agua</string>
-	<string name="poi_power">Enerxía</string>
-	<string name="poi_trash_disposal">Vertíu de basoria</string>
-	<string name="poi_landuse">Usu del suelu</string>
-	<string name="poi_education">Educación</string>
-	<string name="poi_administrative">Alministrativu</string>
-	<string name="poi_healthcare">Sanidá</string>
-	<string name="poi_office">Oficina</string>
-	<string name="poi_sport">Deporte</string>
-	<string name="poi_tourism">Turismu</string>
-	<string name="poi_sightseeing">Visita interesante</string>
-	<string name="poi_accomodation">Agospiamientu</string>
-	<string name="poi_internet_access">Accesu a Internet</string>
-	<string name="poi_entertainment">Entretenimientu</string>
-	<string name="poi_club">Club</string>
-	<string name="poi_sustenance">Comida</string>
-	<string name="poi_cafe_and_restaurant">Café y restaurante</string>
-	<string name="poi_service">Serviciu</string>
-	<string name="poi_craft">Artesanía</string>
-	<string name="poi_finance">Finances</string>
-	<string name="poi_natural">Naturaleza</string>
-	<string name="poi_seamark">Náutica</string>
-	<string name="poi_military">Militar</string>
-	<string name="poi_osmwiki">Wikipedia</string>
-	<string name="poi_user_defined_other">Definíu pol usuariu</string>
+<string name="poi_shop_food"></string>
+	<string name="poi_emergency_infrastructure"></string>
+	<string name="poi_road_obstacle"></string>
+	<string name="poi_bicycle_transport"></string>
+	<string name="poi_aerialway_transport"></string>
+	<string name="poi_node_networks"></string>
+	<string name="poi_hiking_routes"></string>
+	<string name="poi_traffic_enforcement"></string>
+	<string name="poi_man_made"></string>
+	<string name="poi_transport_construction"></string>
+	<string name="poi_water_supply"></string>
+	<string name="poi_power"></string>
+	<string name="poi_trash_disposal"></string>
+	<string name="poi_landuse"></string>
+	<string name="poi_education"></string>
+	<string name="poi_administrative"></string>
+	<string name="poi_healthcare"></string>
+	<string name="poi_office"></string>
+	<string name="poi_sport"></string>
+	<string name="poi_tourism"></string>
+	<string name="poi_sightseeing"></string>
+	<string name="poi_accomodation"></string>
+	<string name="poi_internet_access"></string>
+	<string name="poi_entertainment"></string>
+	<string name="poi_club"></string>
+	<string name="poi_sustenance"></string>
+	<string name="poi_cafe_and_restaurant"></string>
+	<string name="poi_service"></string>
+	<string name="poi_craft"></string>
+	<string name="poi_finance"></string>
+	<string name="poi_natural"></string>
+	<string name="poi_seamark"></string>
+	<string name="poi_military"></string>
+	<string name="poi_osmwiki"></string>
+	<string name="poi_user_defined_other"></string>
 
-	<string name="poi_palaeontological_site">Xacimientu paleontolóxicu</string>
+	<string name="poi_palaeontological_site"></string>
 
-	<string name="poi_bakery">Panadería</string>
-	<string name="poi_alcohol">Llicorería</string>
-	<string name="poi_cheese">Quesería</string>
-	<string name="poi_chocolate">Chicolatería</string>
-	<string name="poi_coffee">Tienda de cafés</string>
-	<string name="poi_convenience">Tienda d\'alimentación</string>
-	<string name="poi_mall">Centru comercial</string>
-	<string name="poi_beverages">Tienda de bébora</string>
-	<string name="poi_butcher">Carnicería</string>
-	<string name="poi_deli">Tienda gourmet</string>
-	<string name="poi_farm">Productos d\'aldea</string>
-	<string name="poi_greengrocer">Verdulería</string>
-	<string name="poi_seafood">Pescadería</string>
-	<string name="poi_confectionery">Pastelería</string>
-	<string name="poi_ice_cream">Xeladería</string>
-	<string name="poi_supermarket">Supermercáu</string>
-	<string name="poi_tea">Venta de te</string>
-	<string name="poi_pasta">Tienda de pasta</string>
-	<string name="poi_pastry">Confitería</string>
-	<string name="poi_dairy">Llechería</string>
-	<string name="poi_vending_machine">Máquina vendedora</string>
-	<string name="poi_wine">Tienda de vinos</string>
-	<string name="poi_books">Llibrería</string>
-	<string name="poi_bicycle">Tienda de bicicletes</string>
-	<string name="poi_anime">Tienda d\'anime</string>
-	<string name="poi_antiques">Anticuariu</string>
-	<string name="poi_art">Galería d\'arte</string>
-	<string name="poi_baby_goods">Artículos pa nácaros</string>
-	<string name="poi_bag">Bolsos</string>
-	<string name="poi_bathroom_furnishing">Muebles de bañu</string>
-	<string name="poi_bed">Ropa de cama</string>
-	<string name="poi_boutique">Boutique</string>
-	<string name="poi_camera">Cámares y lentes</string>
-	<string name="poi_carpet">Tienda d\'alfombres</string>
-	<string name="poi_charity">Tienda benéfica</string>
-	<string name="poi_chemist">Droguería</string>
-	<string name="poi_clothes">Tienda de ropa</string>
-	<string name="poi_clothes_children">Ropa infantil</string>
-	<string name="poi_shoes">Zapatería</string>
-	<string name="poi_candles">Cerería</string>
-	<string name="poi_computer">Tienda d\'informática</string>
-	<string name="poi_copyshop">Copistería</string>
-	<string name="poi_curtain">Tienda de cortines</string>
-	<string name="poi_fabric">Tienda de teles</string>
-<string name="poi_dive">Equipamientu de merguyu</string>
-	<string name="poi_doityourself">Tienda de bricolaxe</string>
-	<string name="poi_doors">Puertes</string>
-	<string name="poi_erotic">Tienda erótica</string>
-	<string name="poi_fashion">Tienda de moda</string>
-	<string name="poi_fishing">Equipamientu de pesca</string>
-	<string name="poi_florist">Floristería</string>
-	<string name="poi_frame">Tienda de marcos</string>
-	<string name="poi_free_flying">Artículos de vuelu llibre</string>
-<string name="poi_furniture">Mueblería</string>
-	<string name="poi_garden_centre">Centru de xardinería</string>
-	<string name="poi_garden_furniture">Muebles de xardín</string>
-	<string name="poi_gas">Tienda de gas líquidu</string>
-	<string name="poi_shop_yes">Bazar</string>
-	<string name="poi_gift">Tienda de regalos</string>
-	<string name="poi_glaziery">Cristalería</string>
-	<string name="poi_hardware">Ferretería</string>
-	<string name="poi_hearing_aids">Audífonos</string>
-	<string name="poi_herbalist">Herbolariu</string>
-	<string name="poi_hifi">Equipos d\'alta fidelidá</string>
-	<string name="poi_houseware">Complementos pal llar</string>
-	<string name="poi_hunting">Equipamientu de caza</string>
-	<string name="poi_interior_decoration">Decoración d\'interiores</string>
-	<string name="poi_jewelry">Xoyería</string>
-	<string name="poi_kiosk">Quioscu</string>
-	<string name="poi_kitchen">Muebles de cocina</string>
-	<string name="poi_leather">Artículos de cueru</string>
-	<string name="poi_medical_supply">Suministros médicos</string>
-	<string name="poi_mobile_phone">Tienda de telefonía móvil</string>
-	<string name="poi_motorcycle">Tienda de motocicletes</string>
-	<string name="poi_music">Tienda de música</string>
-	<string name="poi_musical_instrument">Instrumentos musicales</string>
-	<string name="poi_newsagent">Prensa</string>
-	<string name="poi_optician">Optometría</string>
-	<string name="poi_organic">Comida ecolóxica</string>
-	<string name="poi_outdoor">Tienda d\'aire llibre</string>
-	<string name="poi_paint">Pintures</string>
-	<string name="poi_pet">Tienda d\'animales</string>
-	<string name="poi_photo">Tienda de fotografía</string>
-	<string name="poi_radiotechnics">Tienda de radioteunia</string>
-	<string name="poi_second_hand">Tienda de segunda mano</string>
-	<string name="poi_scuba_diving_shop">Artículos de merguyu con botella</string>
-	<string name="poi_ship_chandler">Efeutos navales</string>
-	<string name="poi_sports">Material deportivu</string>
-	<string name="poi_stationery">Papelería</string>
-	<string name="poi_tableware">Tienda de cacía</string>
-	<string name="poi_ticket">Venta d\'entraes</string>
-	<string name="poi_tobacco">Estancu</string>
-	<string name="poi_toys">Xuguetería</string>
-	</resources>
+	<string name="poi_bakery"></string>
+	<string name="poi_alcohol"></string>
+	<string name="poi_cheese"></string>
+	<string name="poi_chocolate"></string>
+	<string name="poi_coffee"></string>
+	<string name="poi_convenience"></string>
+	<string name="poi_mall"></string>
+	<string name="poi_beverages"></string>
+	<string name="poi_butcher"></string>
+	<string name="poi_deli"></string>
+	<string name="poi_farm"></string>
+	<string name="poi_greengrocer"></string>
+	<string name="poi_seafood"></string>
+	<string name="poi_confectionery"></string>
+	<string name="poi_ice_cream"></string>
+	<string name="poi_supermarket"></string>
+	<string name="poi_tea"></string>
+	<string name="poi_pasta"></string>
+	<string name="poi_pastry"></string>
+	<string name="poi_dairy"></string>
+	<string name="poi_vending_machine"></string>
+	<string name="poi_wine"></string>
+	<string name="poi_books"></string>
+	<string name="poi_bicycle"></string>
+	<string name="poi_anime"></string>
+	<string name="poi_antiques"></string>
+	<string name="poi_art"></string>
+	<string name="poi_baby_goods"></string>
+	<string name="poi_bag"></string>
+	<string name="poi_bathroom_furnishing"></string>
+	<string name="poi_bed"></string>
+	<string name="poi_boutique"></string>
+	<string name="poi_camera"></string>
+	<string name="poi_carpet"></string>
+	<string name="poi_charity"></string>
+	<string name="poi_chemist"></string>
+	<string name="poi_clothes"></string>
+	<string name="poi_clothes_children"></string>
+	<string name="poi_shoes"></string>
+	<string name="poi_candles"></string>
+	<string name="poi_computer"></string>
+	<string name="poi_copyshop"></string>
+	<string name="poi_curtain"></string>
+	<string name="poi_fabric"></string>
+<string name="poi_dive"></string>
+	<string name="poi_doityourself"></string>
+	<string name="poi_doors"></string>
+	<string name="poi_erotic"></string>
+	<string name="poi_fashion"></string>
+	<string name="poi_fishing"></string>
+	<string name="poi_florist"></string>
+	<string name="poi_frame"></string>
+	<string name="poi_free_flying"></string>
+<string name="poi_furniture"></string>
+	<string name="poi_garden_centre"></string>
+	<string name="poi_garden_furniture"></string>
+	<string name="poi_gas"></string>
+	<string name="poi_shop_yes"></string>
+	<string name="poi_gift"></string>
+	<string name="poi_glaziery"></string>
+	<string name="poi_hardware"></string>
+	<string name="poi_hearing_aids"></string>
+	<string name="poi_herbalist"></string>
+	<string name="poi_hifi"></string>
+	<string name="poi_houseware"></string>
+	<string name="poi_hunting"></string>
+	<string name="poi_interior_decoration"></string>
+	<string name="poi_jewelry"></string>
+	<string name="poi_kiosk"></string>
+	<string name="poi_kitchen"></string>
+	<string name="poi_leather"></string>
+	<string name="poi_medical_supply"></string>
+	<string name="poi_mobile_phone"></string>
+	<string name="poi_motorcycle"></string>
+	<string name="poi_music"></string>
+	<string name="poi_musical_instrument"></string>
+	<string name="poi_newsagent"></string>
+	<string name="poi_optician"></string>
+	<string name="poi_organic"></string>
+	<string name="poi_outdoor"></string>
+	<string name="poi_paint"></string>
+	<string name="poi_pet"></string>
+	<string name="poi_photo"></string>
+	<string name="poi_radiotechnics"></string>
+	<string name="poi_second_hand"></string>
+	<string name="poi_scuba_diving_shop"></string>
+	<string name="poi_ship_chandler"></string>
+	<string name="poi_sports"></string>
+	<string name="poi_stationery"></string>
+	<string name="poi_tableware"></string>
+	<string name="poi_ticket"></string>
+	<string name="poi_tobacco"></string>
+	<string name="poi_toys"></string>
+	</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-b+ast/strings.xml b/OsmAnd/res/values-b+ast/strings.xml
index df13cb8735..6a0a763439 100644
--- a/OsmAnd/res/values-b+ast/strings.xml
+++ b/OsmAnd/res/values-b+ast/strings.xml
@@ -1,77 +1,77 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="av_locations">Allugamientos</string>
-	<string name="plugin_settings">Complementos</string>
+	<string name="plugin_settings">Plugins</string>
 	<string name="no_updates_available">Nun hai anovamientos disponibles</string>
 	<string name="download_live_updates">Anovamientos en direuto</string>
 	<string name="copied_to_clipboard">Copióse al cartafueyu</string>
-	<string name="shared_string_download_map">Descarga de mapes</string>
-	<string name="contact_us">Contáutamos</string>
+	<string name="shared_string_download_map">Tra</string>
+	<string name="contact_us">Contautar</string>
 	<string name="first_usage_item">Primer usu</string>
 	<string name="features_menu_group">Carauterístiques</string>
-	<string name="help_us_to_improve_menu_group">Ayúdamos a ameyorar OsmAnd</string>
+	<string name="help_us_to_improve_menu_group">Ayuda a ameyorar OsmAnd</string>
 	<string name="new_version">Versión nueva</string>
 	<string name="begin_with_osmand_menu_group">Primeros pasos con OsmAnd</string>
-	<string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
-	<string name="file_size_in_mb">%.1f MB</string>
+	<string name="value_downloaded_of_max">%1$.1f de %2$.1fMB</string>
+	<string name="file_size_in_mb">%.1fMB</string>
 	<string name="get_full_version">Versión completa</string>
 	<string name="downloads">Descargues</string>
-	<string name="later">Sero</string>
+	<string name="later">Más sero</string>
 	<string name="roads">Carreteres</string>
-	<string name="downloading_number_of_files">Baxando - %1$d ficheru</string>
-	<string name="buy">MERCAR</string>
-	<string name="unsaved_changes_will_be_lost">Perderáse cualesquier camudancia ensin guardar. ¿Siguir?</string>
-	<string name="are_you_sure">¿Tas seguru?</string>
-	<string name="saved_at_time">Guardóse con ésitu en: %1$s</string>
-	<string name="working_days">Díes de trabayu</string>
-	<string name="contact_info">Información de contautu</string>
+	<string name="downloading_number_of_files"/>
+	<string name="buy"/>
+	<string name="unsaved_changes_will_be_lost">Va perdese cualesquier cambéu ensin guardar. ¿Siguir\?</string>
+	<string name="are_you_sure">¿De xuru\?</string>
+	<string name="saved_at_time"/>
+	<string name="working_days">Díes llaborables</string>
+	<string name="contact_info"/>
 	<string name="description">Descripción</string>
 	<string name="next_proceed">Siguiente</string>
 	<string name="shared_string_skip">Saltar</string>
 	<string name="app_name_osmand">OsmAnd</string>
-	<string name="shared_string_undo">DESFACER</string>
-	<string name="try_again">Téntalo de nueves</string>
+	<string name="shared_string_undo">Desfacer</string>
+	<string name="try_again"/>
 	<string name="osn_bug_name">Nota d\'OSM</string>
-	<string name="osn_add_dialog_error">Asocedió una esceición: nun se creó la nota</string>
-	<string name="osb_comment_dialog_message">Mensaxe</string>
-	<string name="osb_comment_dialog_author">Nome d\'autor</string>
-	<string name="osb_comment_dialog_error">Asocedió una esceición: nun s\'amestó\'l comentariu</string>
-	<string name="osb_comment_dialog_success">Amestóse con ésitu\'l comentariu</string>
+	<string name="osn_add_dialog_error">Nun pudo crease la nota</string>
+	<string name="osb_comment_dialog_message"/>
+	<string name="osb_comment_dialog_author"/>
+	<string name="osb_comment_dialog_error">Nun pudo amestase\'l comentariu</string>
+	<string name="osb_comment_dialog_success"/>
 	<string name="shared_string_location">Allugamientu</string>
 	<string name="lang_nds">Baxu alemán</string>
 	<string name="lang_mk">Macedoniu</string>
 	<string name="read_more">Llei más</string>
 	<string name="shared_string_qr_code">Códigu QR</string>
-	<string name="rec_split_storage_size">Tamañu d\'almacenamientu</string>
+	<string name="rec_split_storage_size">Tamañu del almacenamientu</string>
 	<string name="available_maps">Mapes disponibles</string>
-	<string name="shared_string_sound">Soníu</string>
-	<string name="impassable_road_desc">Esbilla les estraes que quies evitar na navegación.</string>
+	<string name="shared_string_sound"/>
+	<string name="impassable_road_desc">Esbilla les carreteres que quies evitar na navegación.</string>
 	<string name="no_location_permission">L\'aplicación nun tien permisu p\'acceder a los datos d\'allugamientu.</string>
 	<string name="no_camera_permission">L\'aplicación nun tien permisu p\'acceder a la cámara.</string>
 	<string name="no_microphone_permission">L\'aplicación nun tien permisu p\'acceder al micrófonu.</string>
 	<string name="route_distance">Distancia:</string>
-	<string name="av_video_quality_low">Calidá más baxa</string>
-	<string name="av_video_quality_high">Calidá más alta</string>
-	<string name="av_video_quality">Calidá de salida de videu</string>
-	<string name="av_audio_format">Formatu de salida d\'audiu</string>
-	<string name="av_audio_bitrate">Tasa de bits d\'audiu</string>
-	<string name="osn_add_dialog_success">Creóse con ésitu la nota</string>
+	<string name="av_video_quality_low">La calidá más baxa</string>
+	<string name="av_video_quality_high">La calidá más alta</string>
+	<string name="av_video_quality">Calidá del videu de salida</string>
+	<string name="av_audio_format"/>
+	<string name="av_audio_bitrate"/>
+	<string name="osn_add_dialog_success"/>
 	<string name="osb_author_dialog_password">Contraseña d\'OSM (opcional)</string>
-	<string name="osn_close_dialog_error">Asocedió una esceición: nun se zarró la nota</string>
-	<string name="osn_close_dialog_success">La nota zarróse con ésitu</string>
-	<string name="share_osm_edits_subject">Ediciones d\'OSM compartíes per OsmAnd</string>
-	<string name="map_downloaded_descr">Descargóse\'l mapa %1$s, yá puedes principiar a usalu.</string>
-	<string name="favorite_category_name">Nome d\'estaya</string>
-	<string name="world_maps">Mapes mundiales</string>
+	<string name="osn_close_dialog_error">Nun pudo zarrase la nota</string>
+	<string name="osn_close_dialog_success"/>
+	<string name="share_osm_edits_subject"/>
+	<string name="map_downloaded_descr"/>
+	<string name="favorite_category_name"/>
+	<string name="world_maps"/>
 	<string name="regions">Rexones</string>
 	<string name="region_maps">Mapes rexonales</string>
 	<string name="si_nm">Milles náutiques</string>
 	<string name="si_kmh">Quilómetros per hora</string>
 	<string name="si_mph">Milles per hora</string>
 	<string name="si_m_s">Metros per segundu</string>
-	<string name="si_min_km">Minutos per kilómetru</string>
+	<string name="si_min_km">Minutos per quilómetru</string>
 	<string name="si_min_m">Minutos per milla</string>
-	<string name="si_nm_h">Milles náutiques per hora (nuedu)</string>
+	<string name="si_nm_h">Milles náutiques per hora (nuedos)</string>
 	<string name="min_mile">min/m</string>
 	<string name="min_km">min/km</string>
 	<string name="m_s">m/s</string>
@@ -89,42 +89,42 @@
 	<string name="rendering_value_purple_name">Moráu</string>
 	<string name="rendering_value_pink_name">Rosa</string>
 	<string name="rendering_value_brown_name">Marrón</string>
-	<string name="rendering_value_translucent_purple_name">Moráu tresllúcidu</string>
-	<string name="restart_is_required">P\'aplicar dafechu les camudancies, ríquese un reaniciu manual de l\'aplicación.</string>
+	<string name="rendering_value_translucent_purple_name">Moráu tresllúcido</string>
+	<string name="restart_is_required">Reanicia l\'aplicación a mano p\'aplicar tolos cambeos.</string>
 	<string name="lang_is">Islandés</string>
 	<string name="lang_br">Bretón</string>
 	<string name="lang_ga">Irlandés</string>
 	<string name="lang_la">Llatín</string>
 	<string name="lang_eo">Esperantu</string>
-	<string name="lang_nn">Noruegu (Nynorsk)</string>
+	<string name="lang_nn">Nynorsk noruegu</string>
 	<string name="lang_gl">Gallegu</string>
-	<string name="archive_wikipedia_data">Tienes baxaos datos vieyos de Wikipedia incompatibles. ¿Quies archivalos?</string>
-	<string name="download_wikipedia_files">"¿Quies baxar datos adicionales de Wikipedia  (%1$s MB)?"</string>
-	<string name="gps_network_not_enabled">Nun ta habilitáu\'l serviciu d\'allugamientu. ¿Quies activalu?</string>
+	<string name="archive_wikipedia_data">Tienes datos de Wikipedia vieyos ya incompatibles. ¿Archivalos\?</string>
+	<string name="download_wikipedia_files"/>
+	<string name="gps_network_not_enabled">Nun s\'activó\'l serviciu d\'allugamientu. ¿Activalu\?</string>
 	<string name="shared_string_wikipedia">Wikipedia</string>
 	<string name="local_indexes_cat_wiki">Wikipedia</string>
-	<string name="application_dir_change_warning3">¿Quies qu\'OsmAnd tamién copie los sos ficheros de datos al destín nuevu?</string>
+	<string name="application_dir_change_warning3">¿Copiar los ficheros d\'OsmAnd al destín nuevu\?</string>
 	<string name="copying_osmand_file_failed">Falló la copia de ficheros</string>
 	<string name="storage_directory_external">Almacenamientu esternu</string>
-	<string name="storage_directory_multiuser">Almacenamientu multi-usuariu</string>
+	<string name="storage_directory_multiuser">Almacenamientu multiusuariu</string>
 	<string name="storage_directory_default">Memoria interna</string>
-	<string name="application_dir">Carpeta d\'almacenamientu de datos</string>
-	<string name="storage_directory">Almacenamientu de mapes</string>
+	<string name="application_dir"/>
+	<string name="storage_directory"/>
 	<string name="agps_info">Información d\'A-GPS</string>
 	<string name="shared_string_places">Llugares</string>
-	<string name="confirm_usage_speed_cameras">En munchos paises (Alemaña, Francia, Italia y otros) nun ta permitío por llei l\'usu d\'avisadores de radares. OsmAnd nun asume dal responsabilidá si violes la llei. Toca Sí namái si tas cualificáu pa usar esta carauterística.</string>
-	<string name="welcome_select_region">Pa reflexar correutamente les señales y regulaciones de tráficu, por favor esbilla la to rexón de conducción:</string>
-	<string name="welcome_header">Bienllegáu/ada</string>
-	<string name="current_route">Camín actual</string>
-	<string name="confirmation_to_clear_history">¿Quies llimpiar la historia?</string>
+	<string name="confirm_usage_speed_cameras"/>
+	<string name="welcome_select_region"/>
+	<string name="welcome_header">Afáyate</string>
+	<string name="current_route">Ruta actual</string>
+	<string name="confirmation_to_clear_history">¿Llimpiar l\'historial\?</string>
 	<string name="osmand_parking_hour">h</string>
 	<string name="osmand_parking_minute">min</string>
-	<string name="osm_edits">Ediciones d\'OSM</string>
+	<string name="osm_edits"/>
 	<string name="your_edits">Les tos ediciones</string>
 	<string name="shared_string_ellipsis">…</string>
-	<string name="routing_settings_2">Axustes de navegación</string>
+	<string name="routing_settings_2">Axustes de la navegación</string>
 	<string name="general_settings_2">Axustes xenerales</string>
-	<string name="shared_string_ok">Aceutar</string>
+	<string name="shared_string_ok">Val</string>
 	<string name="shared_string_cancel">Encaboxar</string>
 	<string name="shared_string_yes">Sí</string>
 	<string name="shared_string_do_not_use">Nun usar</string>
@@ -133,11 +133,11 @@
 	<string name="shared_string_help">Ayuda</string>
 	<string name="shared_string_settings">Axustes</string>
 	<string name="shared_string_and">y</string>
-	<string name="shared_string_or">ó</string>
-	<string name="shared_string_history">Historia</string>
+	<string name="shared_string_or">o</string>
+	<string name="shared_string_history">Historial</string>
 	<string name="shared_string_select_all">Esbillar too</string>
-	<string name="shared_string_deselect"/>
-	<string name="shared_string_deselect_all">Nun esbillar nada</string>
+	<string name="shared_string_deselect">Deseleicionar</string>
+	<string name="shared_string_deselect_all">Deseleicionar too</string>
 	<string name="shared_string_clear">Llimpiar</string>
 	<string name="shared_string_clear_all">Llimpiar too</string>
 	<string name="shared_string_save">Guardar</string>
@@ -152,33 +152,33 @@
 	<string name="shared_string_more">Más…</string>
 	<string name="shared_string_more_actions">Más aiciones</string>
 	<string name="shared_string_do_not_show_again">Nun amosar de nueves</string>
-	<string name="shared_string_remember_my_choice">Recordar la mio escoyeta</string>
+	<string name="shared_string_remember_my_choice">Recordar la escoyeta</string>
 	<string name="shared_string_refresh">Refrescar</string>
-	<string name="shared_string_download_successful">Descarga esitosa</string>
-	<string name="shared_string_io_error">Asocedión un fallu d\'E/S</string>
-	<string name="shared_string_unexpected_error">Asocedió un fallu inesperáu</string>
-	<string name="shared_string_action_template">Aición {0}</string>
+	<string name="shared_string_download_successful"/>
+	<string name="shared_string_io_error">Fallu d\'E/S</string>
+	<string name="shared_string_unexpected_error"/>
+	<string name="shared_string_action_template"/>
 	<string name="shared_string_my_location">La mio posición</string>
 	<string name="shared_string_my_places">Los mios llugares</string>
-	<string name="shared_string_my_favorites">Los mios favoritos</string>
+	<string name="shared_string_my_favorites">Favoritos</string>
 	<string name="shared_string_audio">Audiu</string>
 	<string name="shared_string_video">Videu</string>
 	<string name="shared_string_photo">Semeya</string>
 	<string name="shared_string_online_maps">Mapes en llinia</string>
 	<string name="audionotes_plugin_name">Notes d\'audiu/videu</string>
-	<string name="osmand_parking_plugin_name">Posición d\'aparcaderu</string>
+	<string name="osmand_parking_plugin_name"/>
 	<string name="shared_string_accessibility">Accesibilidá</string>
-	<string name="osm_settings">Edición d\'OSM</string>
+	<string name="osm_settings">Edición n\'OSM</string>
 	<string name="debugging_and_development">Desendolcu d\'OsmAnd</string>
 	<string name="notes">Notes</string>
 	<string name="online_map">Mapa en llinia</string>
 	<string name="roads_only">Namái carreteres</string>
 	<string name="device_memory">Memoria del preséu</string>
-	<string name="parking_place">Llugar d\'aparcamientu</string>
-	<string name="gps_status">Estáu de GPS</string>
+	<string name="parking_place"/>
+	<string name="gps_status"/>
 	<string name="settings_privacy">Privacidá</string>
 	<string name="proxy_pref_title">Proxy</string>
-	<string name="avoid_roads_msg">Pues aicionar un camín alternativu esbillando les carreteres a evitar</string>
+	<string name="avoid_roads_msg">Aiciona una ruta alternativa esbillando les carreteres a evitar</string>
 	<string name="dash_download_msg">Baxesti %1$s mapes</string>
 	<string name="rendering_attr_transportStops_name">Paraes de tresporte</string>
 	<string name="navigate_point_zone">Zona</string>
@@ -186,31 +186,31 @@
 	<string name="download_tab_updates">Anovamientos</string>
 	<string name="download_tab_local">Llocal</string>
 	<string name="everything_up_to_date">Tolos ficheros tán anovaos</string>
-	<string name="use_opengl_render">Usar renderizáu d\'OpenGL</string>
-	<string name="use_opengl_render_descr">Usa la renderización d\'OpenGL acelerada per hardware (escurque nun funcione\'n dellos preseos).</string>
-	<string name="home_button">Aniciu</string>
+	<string name="use_opengl_render">Usar el renderizáu d\'OpenGL</string>
+	<string name="use_opengl_render_descr">Usa\'l renderizáu aceleráu per hardware d\'OpenGL (usa más batería y/o igual nun funciona en preseos vieyos).</string>
+	<string name="home_button"/>
 	<string name="coordinates">Coordenaes</string>
 	<string name="impassable_road">Evitar carreteres…</string>
-	<string name="rendering_attr_busRoutes_name">Caminos de bus</string>
-	<string name="rendering_attr_trainLightrailRoutes_name">Caminos de tren</string>
-	<string name="rendering_category_routes">Caminos</string>
+	<string name="rendering_attr_busRoutes_name"/>
+	<string name="rendering_attr_trainLightrailRoutes_name"/>
+	<string name="rendering_category_routes"/>
 	<string name="rendering_category_details">Detalles</string>
-	<string name="rendering_category_transport">Tresporte</string>
-	<string name="map_widget_top">Barra d\'estáu</string>
+	<string name="rendering_category_transport"/>
+	<string name="map_widget_top"/>
 	<string name="map_widget_right">Panel drechu</string>
 	<string name="map_widget_left">Panel esquierdu</string>
-	<string name="configure_map">Configurar mapa</string>
+	<string name="configure_map"/>
 	<string name="anonymous_user">Usuariu anónimu</string>
 	
 	<string name="anonymous_user_hint"/>
-	<string name="logged_as">Aniciesti sesión como %1$s</string>
-	<string name="text_size">Tamañu de testos</string>
+	<string name="logged_as"/>
+	<string name="text_size">Tamañu de la tipografía</string>
 	<string name="traffic_warning_speed_limit">Llende de velocidá</string>
-	<string name="traffic_warning_payment">Portalgu</string>
+	<string name="traffic_warning_payment"/>
 	<string name="traffic_warning_stop">Señal de STOP</string>
-	<string name="traffic_warning_speed_camera">Radar de velocidá</string>
-	<string name="traffic_warning">Alvertencia de tráficu</string>
-	<string name="way_alarms">Alvertencies de tráficu</string>
+	<string name="traffic_warning_speed_camera"/>
+	<string name="traffic_warning"/>
+	<string name="way_alarms"/>
 	<string name="confirm_every_run">Entrugar siempres</string>
 	<string name="save_track_interval_globally">Intervalu de rexistru</string>
 	<string name="save_track_interval">Intervalu de rexistru na navegación</string>
@@ -220,94 +220,94 @@
 	
 	<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="speak_pedestrian">Pasos de peatones</string>
-	<string name="traffic_warning_railways">Pasu a nivel</string>
-	<string name="traffic_warning_pedestrian">Pasu peatones</string>
-	<string name="dash_download_msg_none">¿Quies baxar mapes fuera de llinia?</string>
-	<string name="enter_country_name">Introduz el nome del país</string>
-	<string name="mark_point">Oxetivu</string>
-	<string name="get_plugin">BAXAR</string>
-	<string name="profile_settings">Axustes específicos de perfil</string>
-	<string name="map_widget_battery">Nivel de batería</string>
+	<string name="rendering_value_pedestrian_name"/>
+	<string name="speak_pedestrian">Pasos de cebra</string>
+	<string name="traffic_warning_railways"/>
+	<string name="traffic_warning_pedestrian">Pasu de cebra</string>
+	<string name="dash_download_msg_none"/>
+	<string name="enter_country_name"/>
+	<string name="mark_point"/>
+	<string name="get_plugin">Consiguir</string>
+	<string name="profile_settings"/>
+	<string name="map_widget_battery">Nivel de la batería</string>
 	<string name="app_mode_bus">Bus</string>
  	<string name="app_mode_train">Tren</string>
 	<!-- string name="lat_lon_pattern">Lla: %1$.5f Llo: %2$.5f</string -->
-	<string name="osmand_development_plugin_description">Esti complementu amuesa axustes pal desendolcu y depuración de carauterístiques pa probar o simular trayeutos, el rindimientu del renderizáu de pantalla o avisos per voz. Estos axustes tán pensaos pa desendolcadores y nun se precisen pal usuariu xeneral.</string>
-	<string name="osmand_accessibility_description">Esti complementu fai que les carauterístiques d\'accesibilidá del preséu tean disponibles direutamente n\'OsmAnd. Facilita, por exemplu, l\'axuste de la tasa de fala pa voces TTS, configuración de la pantalla de navegación del mandu direicional, usu d\'un trackball pa controlar el zoom o usu de feedback pa testu a falar como pal anunciu automáticu de la to posición.</string>
-	<string name="osm_editing_plugin_description">Pente esti complementu, OsmAnd pue usase pa facer collaboraciones n\'OSM como la creación o modificación d\'oxetos POI, apertura o comentar notes y collaboración con ficheros GPX guardaos. OSM ta fechu pola comunidá, un proyeutu de cartografía de dominiu públicu. Pa detalles, por favor vete a https://openstreetmap.org. Agradezse la participación activa y les collaboraciones puen facese direutamente dende OsmAnd si especifiques les tos credenciales personales d\'OSM na aplicación.</string>
-	<string name="osmand_distance_planning_plugin_description">Esti complementu apurre un widget cola pantalla del mapa pa crear caminos calcando nel mapa, o usar o modificar ficheros GPX esistentes pa planiar un viaxe y midir la distancia ente puntos. Los resultaos puen guardase como ficheru GPX pa usalos más sero como referencia.</string>
-	<string name="osm_live_thanks">¡Gracies por soscribite a los anovamientos en direuto!</string>
-	<string name="live_updates">En direuto</string>
+	<string name="osmand_development_plugin_description"/>
+	<string name="osmand_accessibility_description"/>
+	<string name="osm_editing_plugin_description"/>
+	<string name="osmand_distance_planning_plugin_description"/>
+	<string name="osm_live_thanks">¡Gracies por sofitar a OsmAnd! P\'activar toles carauterístiques nueves precises reaniciar l\'aplicación.</string>
+	<string name="live_updates">Anovamientos en direuto</string>
 	<string name="safe_mode">Mou seguru</string>
-	<string name="native_library_not_running">L\'aplicación ta executándose en mou seguru (deshabilítalu nos Axustes).</string>
+	<string name="native_library_not_running"/>
 	<string name="access_no_destination">Nun s\'afitó\'l destín</string>
-	<string name="access_smart_autoannounce_descr">Avisa namái cuando cambie la direición al puntu de destín.</string>
-	<string name="access_autoannounce_period">Periodu d\'auto-anunciu</string>
+	<string name="access_smart_autoannounce_descr">Avisa namái cuando camude la direición al puntu de destín.</string>
+	<string name="access_autoannounce_period"/>
 	<string name="access_autoannounce_period_descr">Intervalu mínimu de tiempu ente anuncios.</string>
-	<string name="access_default_color">Color por defeutu</string>
-	<string name="access_map_linked_to_location">El mapa ta enllazáu al allugamientu</string>
+	<string name="access_default_color"/>
+	<string name="access_map_linked_to_location"/>
 	<string name="access_shared_string_not_installed">Nun s\'instaló</string>
-	<string name="number_of_gpx_files_selected_pattern">%s ficheros GPX esbillaos</string>
+	<string name="number_of_gpx_files_selected_pattern"/>
 	
 	<string name="donations">Donaciones</string>
-	<string name="osm_live_email_desc">Precísase p\'apurrite información tocante a les collaboraciones.</string>
+	<string name="osm_live_email_desc"/>
 	<string name="osm_live_user_public_name">Nome públicu</string>
 	<string name="osm_live_month_cost">Costu mensual</string>
-	<string name="osm_live_month_cost_desc">Pagu mensual.</string>
-	<string name="osm_live_ask_for_purchase">Primero has soscribite a OsmAnd Live</string>
-	<string name="shared_string_toolbar">Barra de ferramientes</string>
-	<string name="upload_osm_note_description">Pues xubir la nota d\'OSM anónimamente o usando\'l perfil d\'OpenStreetMap.org.</string>
+	<string name="osm_live_month_cost_desc">Pagu mensual</string>
+	<string name="osm_live_ask_for_purchase">Primero merca una soscripción a OsmAnd Live</string>
+	<string name="shared_string_toolbar">Barres de ferramientes</string>
+	<string name="upload_osm_note_description">Xubi la nota d\'OSM de mou anónimu o usando\'l to perfil d\'OpenStreetMap.org .</string>
 	<string name="consider_turning_polygons_off">Aconséyase desactivar el renderizáu de polígonos.</string>
-	<string name="rendering_attr_hideUnderground_name">Oxetos soterraños</string>
-	<string name="data_is_not_available">Los datos nun tán disponibles</string>
+	<string name="rendering_attr_hideUnderground_name"/>
+	<string name="data_is_not_available">Nun hai datos disponibles</string>
 	<string name="shared_string_remove">Desaniciar</string>
 	<string name="shared_string_read_more">Llei más</string>
-	<string name="clear_updates_proposition_message">Pues desaniciar anovamientos baxaos y volver a la edición orixinal del mapa</string>
-	<string name="shared_string_undo_all">DESFACER TOO</string>
-	<string name="rendering_attr_hideIcons_name">Iconos POI</string>
+	<string name="clear_updates_proposition_message"/>
+	<string name="shared_string_undo_all">Desfacer too</string>
+	<string name="rendering_attr_hideIcons_name"/>
 	<string name="shared_string_hide">Anubrir</string>
-	<string name="please_specify_poi_type_only_from_list">Especifica la triba de PDI correuta o sáltalu.</string>
-	<string name="lang_fy">Frisón</string>
+	<string name="please_specify_poi_type_only_from_list"/>
+	<string name="lang_fy">Frisiu</string>
 	<string name="lang_als">Albanés (Tosk)</string>
-	<string name="go_to_map">Ver el mapa</string>
-	<string name="favorite_category_dublicate_message">Yá esiste\'l nome de la estaya especificada. Usa otru nome, por favor.</string>
+	<string name="go_to_map">Amosar el mapa</string>
+	<string name="favorite_category_dublicate_message"/>
 	<string name="default_speed_system">Unidá de velocidá</string>
 	<string name="nm">nmi</string>
-	<string name="nm_h">nmi/h</string>
-	<string name="rendering_attr_currentTrackColor_name">Color de GPX</string>
-	<string name="rendering_attr_currentTrackColor_description">Color de GPX</string>
-	<string name="rendering_attr_currentTrackWidth_name">Anchor de GPX</string>
-	<string name="rendering_attr_currentTrackWidth_description">Anchor de GPX</string>
+	<string name="nm_h">kn</string>
+	<string name="rendering_attr_currentTrackColor_name"/>
+	<string name="rendering_attr_currentTrackColor_description"/>
+	<string name="rendering_attr_currentTrackWidth_name"/>
+	<string name="rendering_attr_currentTrackWidth_description"/>
 	<string name="rendering_value_lightgreen_name">Verde claro</string>
 	<string name="rendering_value_translucent_lightgreen_name">Verde claro tresllúcido</string>
 	<string name="rendering_value_lightblue_name">Azul claro</string>
 	<string name="rendering_value_translucent_lightblue_name">Azul claro tresllúcido</string>
 <string name="shared_string_gpx_points">Puntos</string>
     <string name="map_locale">Llingua del mapa</string>
-    <string name="map_update">Anovamientos disponibles pa %1$s mapes</string>
-    <string name="lock_screen_request_explanation">%1$s precisa esti permisu p\'apagar la pantalla pola carauterística d\'aforru d\'enerxía.</string>
+    <string name="map_update"/>
+    <string name="lock_screen_request_explanation">%1$s precisa esti permisu p\'apagar la pantalla pa la carauterística d\'aforru d\'enerxía.</string>
     
-    <string name="fav_point_emoticons_message">Modificóse\'l nome del puntu favoritu a %1$s pa facilitar el guardáu afayadizu de la cadena con fustaxes nun ficheru.</string>
-    <string name="traffic_warning_border_control">Control d\'aduana</string>
-    <string name="sleep_mode_stop_dialog">¿Parar mou de fondu de GPS?</string>
-    <string name="stop_navigation_service">Parar</string>
-    <string name="proxy_host_descr">Configura\'l nome de host del to proxy (p.ex.: 127.0.0.1).</string>
-    <string name="proxy_port_title">Puertu de proxy</string>
+    <string name="fav_point_emoticons_message"/>
+    <string name="traffic_warning_border_control"/>
+    <string name="sleep_mode_stop_dialog"/>
+    <string name="stop_navigation_service"/>
+    <string name="proxy_host_descr">Configura\'l nome del agospiu del proxy (exemplu: 127.0.0.1).</string>
+    <string name="proxy_port_title">Puertu del proxy</string>
     
     
-    <string name="continue_navigation">Siguir navegación</string>
-    <string name="pause_navigation">Posar navegación</string>
-    <string name="keep_navigation_service">Caltener</string>
+    <string name="continue_navigation"/>
+    <string name="pause_navigation"/>
+    <string name="keep_navigation_service"/>
     <string name="local_map_names">Nomes llocales</string>
     <string name="rendering_attr_hideBuildings_name">Edificios</string>
-    <string name="no_index_file_to_download">Nun s\'alcontraron descargues, por favor comprueba la to conexón d\'internet.</string>
-    <string name="select_index_file_to_download">Nun s\'alcontró nada. Si nun pues alcontrar la to rexón, pues facela tu mesmu (mira http://osmand.net).</string>
+    <string name="no_index_file_to_download">Nun s\'alcontraron descargues, comprueba la conexón a internet.</string>
+    <string name="select_index_file_to_download">Nun s\'alcontró nada. Si nun pues alcontrar la to rexón, pues facela tu mesmu (mira https://osmand.net).</string>
     <string name="loading_smth">Cargando %1$s…</string>
     <string name="gpx_info_average_speed">Velocidá media: %1$s</string>
     <string name="gpx_info_maximum_speed">Velocidá máxima: %1$s</string>
-    <string name="gpx_info_avg_altitude">Altitú promediu: %1$s</string>
-    <string name="gpx_info_diff_altitude">Rangu d\'altitú: %1$s</string>
+    <string name="gpx_info_avg_altitude">Altitú media: %1$s</string>
+    <string name="gpx_info_diff_altitude"/>
     <string name="gpx_info_asc_altitude">Descendente/ascendente: %1$s</string>
     
     
@@ -331,7 +331,7 @@
     
     
     <string name="voice_pref_title">Voz</string>
-    <string name="misc_pref_title">Miscelaina</string>
+    <string name="misc_pref_title"/>
     <string name="lang_zh">Chinu</string>
     <string name="lang_pt_br">Portugués (Brasil)</string>
     <string name="lang_en">Inglés</string>
@@ -342,7 +342,7 @@
     <string name="lang_hy">Armeniu</string>
     <string name="lang_eu">Vascu</string>
     <string name="lang_be">Bielorrusu</string>
-    <string name="lang_be_by">Bielorrusu (Llatín)</string>
+    <string name="lang_be_by">Bielorrusu llatín</string>
     <string name="lang_bs">Bosniu</string>
     <string name="lang_bg">Búlgaru</string>
     <string name="lang_ca">Catalán</string>
@@ -358,29 +358,29 @@
     <string name="lang_iw">Hebréu</string>
     <string name="lang_hi">Hindi</string>
     <string name="lang_hu">Húngaru</string>
-    <string name="lang_hu_formal">Húngaru (formal)</string>
+    <string name="lang_hu_formal">Húngaru formal</string>
     <string name="lang_id">Indonesiu</string>
     <string name="lang_it">Italianu</string>
     <string name="lang_ja">Xaponés</string>
     <string name="lang_kn">Canarés</string>
     <string name="lang_ko">Coreanu</string>
-    <string name="lang_lv">Lletón</string>
-    <string name="lang_lt">Llituanu</string>
-    <string name="lang_mr">Maratí</string>
-    <string name="lang_no">Noruegu</string>
+    <string name="lang_lv">Letón</string>
+    <string name="lang_lt">Lituanu</string>
+    <string name="lang_mr">Marathi</string>
+    <string name="lang_no">Bokmål noruegu</string>
     <string name="lang_fa">Persa</string>
     <string name="lang_pl">Polacu</string>
-    <string name="lang_pt">Portugués</string>
+    <string name="lang_pt">Portugues</string>
     <string name="lang_ro">Rumanu</string>
     <string name="lang_ru">Rusu</string>
     <string name="lang_sc">Sardu</string>
     <string name="lang_sr">Serbiu</string>
-    <string name="lang_zh_cn">Chinu (Simplificáu)</string>
+    <string name="lang_zh_cn">Chinu simplificáu</string>
     <string name="lang_sk">Eslovacu</string>
     <string name="lang_sl">Eslovenu</string>
-    <string name="lang_es">Español</string>
+    <string name="lang_es">Castellán</string>
     <string name="lang_sv">Suecu</string>
-    <string name="lang_zh_tw">Chinu (Tradicional)</string>
+    <string name="lang_zh_tw">Chinu tradicional</string>
     <string name="lang_tr">Turcu</string>
     <string name="lang_uk">Ucraín</string>
     <string name="lang_vi">Vietnamita</string>
@@ -388,15 +388,15 @@
     <string name="index_name_canada">América del Norte - Canadá</string>
     <string name="index_name_italy">Europa - Italia</string>
     <string name="index_name_gb">Europa - Gran Bretaña</string>
-    <string name="select_gpx">Esbillar GPX…</string>
-    <string name="copying_osmand_one_file_descr">Copia\'l ficheru (%s) al destín nuevu…</string>
-    <string name="copying_osmand_files_descr">Copiando datos de ficheros d\'OsmAnd al destín nuevu (%s)…</string>
-    <string name="copying_osmand_files">Copiando ficheros de datos d\'OsmAnd…</string>
-    <string name="local_osm_changes_delete_all_confirm">Vas desaniciar %1$s camudancies d\'OSM. ¿Tas seguru?</string>
-    <string name="animate_routing_route_not_calculated">Primero calcula la ruta, por favor</string>
+    <string name="select_gpx"/>
+    <string name="copying_osmand_one_file_descr">Copiando\'l ficheru (%s) al destín nuevu…</string>
+    <string name="copying_osmand_files_descr">Copiando los ficheros d\'OsmAnd al destín nuevu (%s)…</string>
+    <string name="copying_osmand_files">Copiando los ficheros d\'OsmAnd…</string>
+    <string name="local_osm_changes_delete_all_confirm">Vas desaniciar %1$d cambeos d\'OSM, ¿De xuru\?</string>
+    <string name="animate_routing_route_not_calculated">Calcula la ruta primero</string>
     <string name="about_version">Versión:</string>
-    <string name="shared_string_about">Tocante a</string>
-    <string name="about_settings_descr">Información de versión, llicencies, miembros del proyeutu</string>
+    <string name="shared_string_about"/>
+    <string name="about_settings_descr">Información de la versión, llicencies y miembros del proyeutu</string>
     <string name="local_index_tile_data_zooms">Zooms baxaos: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Zoom máximu: %1$s</string>
     <string name="local_index_tile_data_minzoom">Zoom mínimu: %1$s</string>
@@ -405,162 +405,159 @@
     <string name="driving_region_japan">Xapón</string>
     <string name="driving_region_us">Estaos Xuníos</string>
     <string name="driving_region_canada">Canadá</string>
-    <string name="driving_region_europe_asia">Europa, Asia, América llatina y asemeyaos</string>
-    <string name="driving_region_uk">RR.XX, India, y asemeyaos</string>
-    <string name="speak_speed_limit">Llende de velocidá</string>
-    <string name="speak_cameras">Radares de velocidá</string>
-    <string name="speak_traffic_warnings">Alvertencies de tráficu</string>
-    <string name="osb_author_or_password_not_specified">"Especifica l\'usuariu y contraseña  d\'OSM n\'Axustes, por favor"</string>
+    <string name="driving_region_europe_asia">Europa, Asia, América Llatina y similar</string>
+    <string name="driving_region_uk">Reinu Xuníu India y similar</string>
+    <string name="speak_speed_limit">Llendes de velocidá</string>
+    <string name="speak_cameras"/>
+    <string name="speak_traffic_warnings"/>
+    <string name="osb_author_or_password_not_specified">Especifica un usuariu y contraseña d\'OSM n\'«Axustes»</string>
     <string name="route_descr_map_location">Mapa:</string>
     <string name="route_descr_lat_lon">Lla %1$.3f, llo %2$.3f</string>
     <string name="route_descr_destination">Destín</string>
-    <string name="route_to">A:</string>
-    <string name="route_via">Per:</string>
+    <string name="route_to">Hasta:</string>
+    <string name="route_via"/>
     <string name="route_from">Dende:</string>
 
     <string name="city_type_district">Distritu</string>
     <string name="postcode">Códigu postal</string>
-    <string name="storage_directory_card">Tarxeta memoria</string>
+    <string name="storage_directory_card">Tarxeta de memoria</string>
     <string name="coords_search">Gueta de coordenaes</string>
     <string name="advanced_coords_search">Gueta avanzada de coordenaes</string>
     <string name="search_categories">Estayes</string>
     
-    <string name="storage_permission_restart_is_required">Agora l\'aplicación tien permisu pa escribir nel almacenamientu esternu. Ríquese un reaniciu a mano de l\'aplicación.</string>
-    <string name="show_polygons">Amosar polígonos</string>
-    <string name="find_parking">Alcontrar aparcaderu</string>
+    <string name="storage_permission_restart_is_required">Agora esta aplicación tien permisu p\'acceder al almancenamientu esternu pero precisa reaniciase pa facelo.</string>
+    <string name="show_polygons"/>
+    <string name="find_parking"/>
     <string name="shared_string_status">Estáu</string>
-    <string name="shared_string_save_changes">Guardar camudancies</string>
+    <string name="shared_string_save_changes">Guardar cambeos</string>
     <string name="shared_string_email_address">Direición de corréu</string>
-    <string name="shared_string_type">Triba</string>
+    <string name="shared_string_type"/>
     <string name="route_duration">Tiempu:</string>
     <string name="shared_string_near">Cierca</string>
-    <string name="osn_close_dialog_title">Zarru de nota</string>
-    <string name="osn_reopen_dialog_title">Reapertura de nota</string>
-    <string name="osn_add_dialog_title">Creación de nota</string>
-    <string name="shared_string_commit">Unviar</string>
+    <string name="osn_close_dialog_title"/>
+    <string name="osn_reopen_dialog_title"/>
+    <string name="osn_add_dialog_title"/>
+    <string name="shared_string_commit"/>
 
     <string name="whats_new">Qué hai nuevo en</string>
     <string name="shared_string_update">Anovar</string>
     <string name="shared_string_upload">Xubir</string>
     <string name="lang_sq">Albanés</string>
     <string name="location_on_map">Allugamientu:
-Lla %1$s
-Llo %2$s</string>
-    <string name="rendering_value_germanRoadAtlas_name">Atles de carreteras alemanes</string>
-    <string name="dash_download_manage">Xestionar</string>
-    <string name="rendering_category_hide">Anubrir</string>
-    <string name="map_widget_vector_attributes">Atributos de renderizáu</string>
-    <string name="speed_limit_exceed">Tolerancia de llende de velocidá</string>
-    <string name="lang_pms">Piamontese</string>
+\n Lla %1$s
+\n Llo %2$s</string>
+    <string name="rendering_value_germanRoadAtlas_name">Atles de carreteres alemanes</string>
+    <string name="dash_download_manage"/>
+    <string name="rendering_category_hide"/>
+    <string name="map_widget_vector_attributes"/>
+    <string name="speed_limit_exceed">Tolerancia de la llende de velocidá</string>
+    <string name="lang_pms">Piamontés</string>
     <string name="lang_bn">Bengalí</string>
     <string name="lang_tl">Tagalu</string>
     <string name="lang_sh">Serbocroata</string>
-    <string name="lang_az">Azerbaiyanu</string>
+    <string name="lang_az">Azerbaixanu</string>
     <string name="lang_bpy">Bishnupriya</string>
-    <string name="lang_nv">Navayu</string>
+    <string name="lang_nv"/>
     <string name="lang_ku">Curdu</string>
     <string name="lang_ta">Tamil</string>
-    <string name="lang_ml">Malayalam</string>
+    <string name="lang_ml">Malabar</string>
     <string name="lang_lb">Luxemburgués</string>
     <string name="lang_os">Osetiu</string>
-    <string name="lang_es_us">Español (Americanu)</string>
-    <string name="lang_es_ar">Español (Arxentina)</string>
-    <string name="lang_nb">Noruegu (Bokmål)</string>
-    <string name="lang_vo">Volapuk</string>
+    <string name="lang_es_us">Castellán (América)</string>
+    <string name="lang_es_ar">Castellán (Arxentina)</string>
+    <string name="lang_nb">Bokmål noruegu</string>
+    <string name="lang_vo">Volapük</string>
     <string name="lang_th">Tailandés</string>
     <string name="lang_te">Telugu</string>
     <string name="lang_ms">Malasiu</string>
-    <string name="lang_new">Newar / Nepal Bhasa</string>
-    <string name="lang_ht">Ħaitianu</string>
+    <string name="lang_new">Newarí</string>
+    <string name="lang_ht">Tahitianu</string>
     <string name="lang_et">Estoniu</string>
     <string name="lang_ceb">Cebuanu</string>
     <string name="lang_ast">Asturianu</string>
-    <string name="lang_hsb">Sorbiu (Altu)</string>
+    <string name="lang_hsb">Altu sorabu</string>
     <string name="lang_sw">Suaḥili</string>
     <string name="lang_he">Hebréu</string>
-    <string name="coords_format_descr">Formatu de les coordenaes xeográfiques.</string>
-  	<string name="access_direction_audio_feedback_descr">Indicación acústica de la direición del puntu de destín.</string>
-    <string name="access_direction_haptic_feedback_descr">Indicar vibrando la direición del puntu de destín.</string>
-    <string name="access_hint_enter_description">Escribi la descripción.</string>
-    <string name="osm_live_region_desc">Parte de la to donación unviaráse a usuarios d\'OSM qu\'unvien camudancies al mapa nesa rexón.</string>
-    <string name="select_voice_provider_descr">Seleiciona o descarga la guía de voz pa la to llingua.</string>
-    <string name="av_video_quality_descr">Seleiciona la calidá de videu.</string>
-    <string name="av_audio_format_descr">Seleiciona la calidá de salida de soníu.</string>
-    <string name="av_audio_bitrate_descr">Seleiciona la tasa de bits del soníu.</string>
-    <string name="access_from_map_description">El botón de menú abre\'l tableru, non el menú.</string>
-    <string name="show_on_start_description">«Off» llancia direutamente la pantalla del mapa.</string>
-    <string name="default_speed_system_descr">Define la unidá de velocidá.</string>
-    <string name="osmand_parking_plugin_description">El complementu de posición d\'aparcaderu déxate memorizar u ta aparcáu\'l to coche y cuantu tiempu-y queda (si hai llende de tiempu).
-
-L\'allugamientu y tiempu son visibles nel cuadru de mandos d\'OsmAnd tamién nel widget sobro la pantalla\'l mapa. Pue amestase una alarma nel calendariu d\'Android como recordatoriu.</string>
-    <string name="version_settings_descr">Baxar versiones diaries inestables.</string>
+    <string name="coords_format_descr">El formatu de les coordenaes xeográfiques.</string>
+  	<string name="access_direction_audio_feedback_descr">Indica sonando la direición del puntu de destín.</string>
+    <string name="access_direction_haptic_feedback_descr">Indica vibrando la direición del puntu de destín.</string>
+    <string name="access_hint_enter_description"/>
+    <string name="osm_live_region_desc">Parte de la donación va unviase a los usuarios d\'OSM qu\'unviaron cambeos al mapa d\'esa rexón.</string>
+    <string name="select_voice_provider_descr"/>
+    <string name="av_video_quality_descr">Esbilla la calidá de videu.</string>
+    <string name="av_audio_format_descr"/>
+    <string name="av_audio_bitrate_descr"/>
+    <string name="access_from_map_description"/>
+    <string name="show_on_start_description">«Non» llanza direutamente la pantalla del mapa.</string>
+    <string name="default_speed_system_descr"/>
+    <string name="osmand_parking_plugin_description"/>
+    <string name="version_settings_descr">Baxa compilaciones nightly.</string>
     <string name="enable_proxy_descr">Configura un proxy HTTP pa toles solicitúes de rede.</string>
-    <string name="proxy_port_descr">Configura\'l númberu de puertu del proxy (p.ex.: 8118).</string>
-    <string name="show_zoom_buttons_navigation_descr">Amuesa los botones de zoom al navegar.</string>
-    <string name="osmand_parking_position_description">L\'allugamientu\'l to coche aparcáu. %1$s</string>
+    <string name="proxy_port_descr">Configura\'l númberu de puertu del proxy (exemplu: 8118).</string>
+    <string name="show_zoom_buttons_navigation_descr"/>
+    <string name="osmand_parking_position_description">L\'allugamientu del vehículu aparcáu. %1$s</string>
     <string name="navpoint_search_desc">Coordenaes</string>
     <string name="gpx_description_txt">Descripción</string>
-    <string name="support_new_features_descr">Fai un donativu pa ver carauterístiques nueves añadíes na aplicación.</string>
-    <string name="prefs_plugins_descr">Los complementos activen los axustes avanzaos y otres funciones.</string>
-    <string name="accessibility_mode_descr">Activa les funciones d\'accesibilidá.</string>
+    <string name="support_new_features_descr">Dona pa ver les carauterístiques nueves implementaes na aplicación.</string>
+    <string name="prefs_plugins_descr">Los plugins activen axustes y funcionalidaes avanzaos.</string>
+    <string name="accessibility_mode_descr">Activa les carauterístiques pa usuarios discapacitaos.</string>
     <string name="accessibility_preferences_descr">Preferencies rellacionaes cola accesibilidá.</string>
-    <string name="local_openstreetmap_descr_title">Edición d\'OSM asíncrona:</string>
-    <string name="osmand_service_descr">OsmAnd sigue executándose de fondu mentanto la pantalla ta apagada.</string>
-    <string name="background_router_service_descr">Executa OsmAnd de fondu pa siguir la to posición mentanto la pantalla ta apagada.</string>
+    <string name="local_openstreetmap_descr_title">Edición asíncrona d\'OSM:</string>
+    <string name="osmand_service_descr"/>
+    <string name="background_router_service_descr"/>
     <string name="app_description">Aplicación de navegación</string>
     <string name="plugin_description_title">Descripción</string>
-    <string name="faq_item_description">Entrugues más frecuentes</string>
-    <string name="route_stops_before">%1$s paraes enantes</string>
+    <string name="faq_item_description">Entrugues frecuentes</string>
+    <string name="route_stops_before"/>
     <string name="number_of_edits">Númberu d\'ediciones</string>
     <string name="morning">Mañana</string>
     <string name="night">Nueche</string>
     <string name="weekly">Selmanalmente</string>
-    <string name="daily">Diariamente</string>
-    <string name="missing_write_external_storage_permission">L\'aplicación nun tien permisos pa usar la tarxeta SD</string>
-    <string name="only_download_over_wifi">Namái baxar sobro WiFi</string>
-    <string name="application_dir_description">Escueye ónde quies guardar los mapes y otros ficheros de datos.</string>
+    <string name="daily">Caldía</string>
+    <string name="missing_write_external_storage_permission">A OsmAnd fálta-y un permisu pa usar la tarxeta de memoria</string>
+    <string name="only_download_over_wifi">Baxar namái na Wi-Fi</string>
+    <string name="application_dir_description">Escueyi ónde quies atroxar los mapes y otros ficheros.</string>
 
-    <string name="index_name_voice">Avisos per voz (grabaos, carauterístiques llimitaes)</string>
-    <string name="index_name_tts_voice">Indicaciones de voz (sintetizaes con TTS, preferibles)</string>
-    <string name="audionotes_location_not_defined">Entá nun se definió l\'allugamientu p\'asociar cola nota. «Usar allugamientu...» p\'asinar una nota al llugar especificáu.</string>
-    <string name="show_point_options">Usar allugamientu…</string>
-    <string name="local_recordings_delete_all_confirm">Vas desaniciar %1$d notes. ¿Tas seguru?</string>
-    <string name="local_osm_changes_upload_all_confirm">Vas xubir %1$d camudancia(es) a OSM. ¿Tas seguru?</string>
+    <string name="index_name_voice"/>
+    <string name="index_name_tts_voice"/>
+    <string name="audionotes_location_not_defined">Entá nun se definió un allugamientu a asociar cola nota. «Usar allugamientu…» p\'asignar una notar al allugamientu especificáu.</string>
+    <string name="show_point_options">Usar l\'allugamientu…</string>
+    <string name="local_recordings_delete_all_confirm">Vas desaniciar %1$d notes. ¿De xuru\?</string>
+    <string name="local_osm_changes_upload_all_confirm">Vas xubir %1$d cambéu(os) a OSM. ¿De xuru\?</string>
     <string name="shared_string_go">Dir</string>
-    <string name="short_location_on_map">Lla %1$s
- Llo %2$s</string>
-    <string name="tips_and_tricks_descr">Entrugues más frecuentes, camudancies recién y otros.</string>
+    <string name="short_location_on_map"/>
+    <string name="tips_and_tricks_descr">Entrugues frecuentes, cambeos recientes y más.</string>
     <string name="shared_string_map">Mapa</string>
-    <string name="shared_string_favorite">Favoritu</string>
+    <string name="shared_string_favorite"/>
     <string name="shared_string_favorites">Favoritos</string>
     <string name="shared_string_address">Direición</string>
     <string name="shared_string_add">Amestar</string>
-    <string name="shared_string_add_to_favorites">Amestar a «Favoritos»</string>
-    <string name="record_plugin_name">Grabación de viaxe</string>
-	<string name="audionotes_plugin_description">El complementu de notes d\'audiu/videu apurre la funcionalidá de facer notes d\'audiu/semeyes/videu nun viaxe, usando un botón na pantalla\'l mapa o direutamente dende\'l menú contestual pa cualesquier posición nel mapa.</string>
-    <string name="free">%1$s llibre</string>
-    <string name="remove_the_tag">DESANICIAR ETIQUETA</string>
-    <string name="show_pedestrian_warnings">Pasos peatones</string>
-    <string name="background_service_is_enabled_question">Entá ta executándose\'l serviciu de fondu d\'OsmAnd. ¿Quies paralu tamién?</string>
-    <string name="monitoring_settings">Grabación de viaxe</string>
-    <string name="monitoring_settings_descr">Configura cómo grabar les rutes.</string>
+    <string name="shared_string_add_to_favorites">Amestar a Favoritos</string>
+    <string name="record_plugin_name">Grabación de viaxes</string>
+	<string name="audionotes_plugin_description"/>
+    <string name="free">%1$s llibres</string>
+    <string name="remove_the_tag">DESANICIAR LA ETIQUETA</string>
+    <string name="show_pedestrian_warnings">Pasos de cebra</string>
+    <string name="background_service_is_enabled_question">El serviciu en segundu planu d\'OsmAnd ta entá n\'execución, ¿Paralu tamién\?</string>
+    <string name="monitoring_settings"/>
+    <string name="monitoring_settings_descr"/>
     <string name="int_hour">h</string>
-    <string name="index_tours">Percorríos</string>
-    <string name="rendering_attr_hideText_name">Testu</string>
+    <string name="index_tours"/>
+    <string name="rendering_attr_hideText_name">Tipografía</string>
     <string name="rendering_attr_moreDetailed_name">Más detalles</string>
-    <string name="rendering_attr_lessDetailed_name">Dellos detalles</string>
+    <string name="rendering_attr_lessDetailed_name"/>
     
-    <string name="gpx_info_distance">Distancia: %1$s (%2$s puntos)</string>
-    <string name="gpx_selection_segment_title">Segmentu</string>
+    <string name="gpx_info_distance"/>
+    <string name="gpx_selection_segment_title"/>
     <string name="gpx_selection_number_of_points">%1$s puntos</string>
-    <string name="gpx_selection_point">Puntu %1$s</string>
+    <string name="gpx_selection_point"/>
     
-    <string name="shared_string_from">dende</string>
-    <string name="map_widget_search">Guetar</string>
-	<string name="coords_format">Formatu de coordenaes</string>
-    <string name="follow_us">Síguimos</string>
-    <string name="use_osm_live_routing">Navegación d\'OsmAnd Live</string>
-    <string name="access_category_choice">Escoyer estaya</string>
+    <string name="shared_string_from"/>
+    <string name="map_widget_search"/>
+	<string name="coords_format"/>
+    <string name="follow_us">Síguinos</string>
+    <string name="use_osm_live_routing">Navegación d\'OsmAnd</string>
+    <string name="access_category_choice"/>
     
     
     
@@ -569,259 +566,257 @@ L\'allugamientu y tiempu son visibles nel cuadru de mandos d\'OsmAnd tamién nel
     
     <string name="shared_string_move_up">Xubir</string>
     <string name="shared_string_move_down">Baxar</string>
-    <string name="finish_navigation">Finar navegación</string>
+    <string name="finish_navigation"/>
     <string name="storage_directory_shared">Memoria compartida</string>
     <string name="full_report">Informe completu</string>
-    <string name="osm_live_subscription">Soscripción d\'OsmAnd Live</string>
+    <string name="osm_live_subscription">Soscripción a OsmAnd Live</string>
     <string name="osm_live_hide_user_name">Nun amosar el mio nome nos informes</string>
     <string name="osm_live_subscribe_btn">Soscribise</string>
-    <string name="osm_live_subscription_settings">Axustes de soscripción</string>
+    <string name="osm_live_subscription_settings"/>
     <string name="map_markers_other">Otros marcadores</string>
     <string name="upload_anonymously">Xubir de mou anónimu</string>
     <string name="shared_string_widgets">Widgets</string>
     <string name="show_on_start">Amosar nel aniciu</string>
-    <string name="rendering_attr_hideProposed_name">Oxetos propuestos</string>
-    <string name="simulate_initial_startup_descr">Marca l\'aplicación que s\'anicia primero, caltien sin cambios los otros axustes.</string>
+    <string name="rendering_attr_hideProposed_name"/>
+    <string name="simulate_initial_startup_descr">Afita la banera qu\'indica\'l primer aniciu de l\'aplicación, caltién los demás axustes ensin camudar.</string>
     <string name="shared_string_send">Unviar</string>
-    <string name="share_menu_location">Compartir allugamientu</string>
-    <string name="shared_string_trip_recording">Grabación de viaxe</string>
-    <string name="osmand_running_in_background">Executándose de fondu</string>
-    <string name="light_theme">Claru</string>
-    <string name="dark_theme">Escuru</string>
+    <string name="share_menu_location"/>
+    <string name="shared_string_trip_recording"/>
+    <string name="osmand_running_in_background"/>
+    <string name="light_theme">Claridá</string>
+    <string name="dark_theme">Escuridá</string>
     <string name="shared_string_import2osmand">Importar a OsmAnd</string>
     <string name="shared_string_show_details">Amosar detalles</string>
-    <string name="storage_directory_internal_app">Memoria d\'aplicación interna</string>
+    <string name="storage_directory_internal_app">Memoria interna de l\'aplicación</string>
     <string name="shared_string_copy">Copiar</string>
-    <string name="filter_poi_hint">Peñerar pel nome</string>
-    <string name="search_poi_category_hint">Teclexa pa guetar too</string>
-    <string name="shared_string_is_open">Abrir agora</string>
+    <string name="filter_poi_hint">Peñerar pol nome</string>
+    <string name="search_poi_category_hint">Teclexa pa guetar de too</string>
+    <string name="shared_string_is_open">Abiertu agora</string>
     <string name="shared_string_manage">Xestionar</string>
     <string name="shared_string_edit">Editar</string>
-    <string name="shared_string_search">Guetar</string>
-    <string name="shared_string_show_description">Amosar la descripción.</string>
-    <string name="shared_string_message">Mensaxe</string>
+    <string name="shared_string_search"/>
+    <string name="shared_string_show_description"/>
+    <string name="shared_string_message"/>
     <string name="welmode_download_maps">Baxar mapes</string>
-    <string name="shared_string_not_selected">Nun s\'esbilló</string>
-    <string name="no_address_found">Nun se determinó direición dala</string>
+    <string name="shared_string_not_selected"/>
+    <string name="no_address_found">Nun se determinó la direición</string>
     <string name="shared_string_download">Baxar</string>
     <string name="shared_string_downloading">Baxando</string>
     <string name="shared_string_close">Zarrar</string>
     <string name="shared_string_exit">Colar</string>
-    <string name="shared_string_show">Amosar</string>
+    <string name="shared_string_show"/>
     <string name="shared_string_show_all">Amosar too</string>
     <string name="shared_string_next">Siguiente</string>
     
     <string name="shared_string_show_on_map">Amosar nel mapa</string>
-    <string name="map_widget_appearance_rem">Elementos de mapes</string>
+    <string name="map_widget_appearance_rem">Elementos restantes</string>
     <string name="first_usage_greeting">Consigui direiciones y descubri llugares nuevos ensin conexón a internet</string>
     <string name="get_started">Entamar</string>
     <string name="first_usage_wizard_desc">Dexa qu\'OsmAnd determine\'l to allugamientu y suxera mapes a baxar pa esa rexón.</string>
     <string name="no_inet_connection_desc_map">Ríquese pa baxar mapes.</string>
     <string name="no_inet_connection">Nun hai conexón a internet</string>
-    <string name="storage_place_description">Almacenamientu de datos d\'OsmAnd (pa mapes, carreteres... etc): %1$s.</string>
+    <string name="storage_place_description">L\'almacenamientu de datos d\'OsmAnd (pa mapes, ficheros GPX...): %1$s.</string>
     <string name="storage_free_space">Espaciu llibre</string>
-    <string name="download_files_not_enough_space">Nun hai espaciu abondo pa baxar %1$s MB (llibres: %2$s).</string>
+    <string name="download_files_not_enough_space">Nun hai espaciu abondo pa baxar %1$sMB (llibres: %2$s).</string>
     <string name="install_more">Instalar más…</string>
     <string name="shared_string_select_on_map">Esbillar nel mapa</string>
-    <string name="routing_attr_avoid_toll_name">Evitar carreteres con portalgu</string>
-    <string name="routing_attr_avoid_toll_description">Evitar estraes con portalgu.</string>
-    <string name="avoid_toll_roads">Evitar carreteres con portalgu</string>
-    <string name="error_occurred_saving_gpx">Fallu mentanto se guardaba\'l GPX</string>
-    <string name="fast_route_mode">Ruta más rápida</string>
-    <string name="fast_route_mode_descr">Activar pa calcular la ruta más rápida o desactivar pa una ruta de menor consumu.</string>
+    <string name="routing_attr_avoid_toll_name"/>
+    <string name="routing_attr_avoid_toll_description"/>
+    <string name="avoid_toll_roads"/>
+    <string name="error_occurred_saving_gpx"/>
+    <string name="fast_route_mode">La ruta más rápida</string>
+    <string name="fast_route_mode_descr"/>
     <string name="speak_street_names">Nomes de cais (TTS)</string>
     <string name="si_mi_meters">Milles/metros</string>
     <string name="si_mi_feet">Milles/pies</string>
     <string name="si_mi_yard">Milles/yardes</string>
-    <string name="donation_to_osm">Donación a la comunidá d\'OpenStreetMap</string>
+    <string name="donation_to_osm">Donación pa la comunidá d\'OpenStreetMap</string>
     <string name="location_not_found">Nun s\'alcontró l\'allugamientu</string>
-    <string name="search_location">Guetando allugamientu…</string>
-    <string name="update_all_maps_now">¿Quies anovar agora tolos mapes?</string>
-    <string name="confirmation_to_delete_history_items">¿Desaniciar del «Historial» los elementos esbillaos?</string>
-    <string name="looking_up_address">Guetando direición</string>
-    <string name="specified_directiory_not_writeable">Nun pudieron crease los mapes nel direutoriu especificáu</string>
-    <string name="map_preferred_locale_descr">Llingua preferida pa les etiquetes del mapa (si nun ta disponible, camudaráse a inglés o nomes llocales).</string>
-    <string name="map_preferred_locale">Llingua preferida de mapes</string>
+    <string name="search_location">Guetando l\'allugamientu…</string>
+    <string name="update_all_maps_now">¿Anovar agora tolos mapes\?</string>
+    <string name="confirmation_to_delete_history_items"/>
+    <string name="looking_up_address">Guetando la direición</string>
+    <string name="specified_directiory_not_writeable">Los mapes nun pudieron crease nel direutoriu especificáu</string>
+    <string name="map_preferred_locale_descr"/>
+    <string name="map_preferred_locale"/>
     
     
     
-    <string name="sort_by_distance">Ordenar pela distancia</string>
-    <string name="sort_by_name">Ordenar pel nome</string>
-    <string name="gpx_selection_points">%1$s
-Puntos</string>
+    <string name="sort_by_distance"/>
+    <string name="sort_by_name"/>
+    <string name="gpx_selection_points"/>
     
     
     
-    <string name="hours_ago">hai hores</string>
-    <string name="minutes_ago">hai mins</string>
-    <string name="seconds_ago">hai segs</string>
+    <string name="hours_ago"/>
+    <string name="minutes_ago"/>
+    <string name="seconds_ago"/>
     
-    <string name="index_item_world_altitude_correction">Correición d\'altitú mundial</string>
-    <string name="routing_attr_weight_name">Llende d\'anchor</string>
-    <string name="routing_attr_height_name">Llende d\'altor</string>
+    <string name="index_item_world_altitude_correction">Coreición de l\'altitú mundial</string>
+    <string name="routing_attr_weight_name"/>
+    <string name="routing_attr_height_name"/>
     <string name="app_mode_truck">Camión</string>
     <string name="new_directions_point_dialog">Yá afitesti destinos intermedios.</string>
-    <string name="context_menu_item_directions_to">Direiciones a</string>
-    <string name="context_menu_item_directions_from">Direiciones de</string>
+    <string name="context_menu_item_directions_to">Direiciones hasta</string>
+    <string name="context_menu_item_directions_from">Direiciones dende</string>
     <string name="plugin_distance_point_hdop">precisión</string>
     <string name="plugin_distance_point_speed">velocidá</string>
-    <string name="plugin_distance_point">Puntu</string>
-    <string name="wait_current_task_finished">Espera fasta que fines la xera actual, por favor</string>
-    <string name="use_kalman_filter_compass_descr">Amenorga\'l ruíu nes llectures de la brúxula pero amiesta inercia.</string>
-    <string name="use_kalman_filter_compass">Usar peñera Kalman</string>
-    <string name="use_magnetic_sensor_descr">Usar el sensor magnéticu pa lleer la brúxula, en cuentes del sensor d\'orientación.</string>
-    <string name="files_limit">Falten %1$d ficheros</string>
+    <string name="plugin_distance_point"/>
+    <string name="wait_current_task_finished">Espera hasta que fine la xera actual</string>
+    <string name="use_kalman_filter_compass_descr">Amenorga\'l ruíu de les llectures de la brúxula pero amiesta incercia.</string>
+    <string name="use_kalman_filter_compass">Usar el filtru Kalman</string>
+    <string name="use_magnetic_sensor_descr">Pa les llectures de la brúxula, usa\'l sensor magnéticu en cuentes del sensor d\'orientación.</string>
+    <string name="files_limit">Queden %1$d ficheros</string>
     <string name="install_paid">Versión completa</string>
-    <string name="clear_destination">Llimpiar destín</string>
+    <string name="clear_destination"/>
     <string name="website">Sitiu web</string>
-    <string name="phone">Teléfonu</string>
+    <string name="phone"/>
     <string name="rename_failed">Falló\'l renomáu.</string>
-    <string name="tile_source_already_installed">Yá ta instaláu el mapa, anovaráse la configuración.</string>
-    <string name="internet_not_available">Ríquese una conexón a internet pa esta operación pero nun ta disponible.</string>
-    <string name="error_doing_search">Asocedió un fallu na gueta ensin conexón.</string>
+    <string name="tile_source_already_installed">El mapa yá ta instaláu, «Axustes» va anovase.</string>
+    <string name="internet_not_available">Nun pue facese la operación ensin una conexón a internet.</string>
+    <string name="error_doing_search">Nun pudo facese la gueta fuera de llinia.</string>
     <string name="system_locale">Sistema</string>
-    <string name="incomplete_locale">incompletu</string>
-    <string name="unit_of_length_descr">Cambiar les unidaes de llonxitú.</string>
+    <string name="incomplete_locale">nun se completó</string>
+    <string name="unit_of_length_descr"/>
     <string name="unit_of_length">Unidaes de llonxitú</string>
     <string name="si_km_m">Quilómetros/metros</string>
     <string name="yard">yd</string>
     <string name="foot">ft</string>
     <string name="mile_per_hour">mph</string>
     <string name="mile">mi</string>
-    <string name="send_location_sms_pattern">"Allugamientu:  %1$s
- %2$s"</string>
-    <string name="amenity_type_entertainment">Entretenimientu</string>
-    <string name="amenity_type_military">Militar</string>
-    <string name="amenity_type_natural">Natural</string>
-    <string name="amenity_type_office">Oficina</string>
-    <string name="amenity_type_other">Otru</string>
-    <string name="amenity_type_shop">Tienda</string>
-    <string name="amenity_type_tourism">Turismu</string>
-    <string name="amenity_type_transportation">Tresporte</string>
-    <string name="indexing_address">Indizando direición…</string>
-    <string name="indexing_map">Indizando mapa…</string>
-    <string name="indexing_transport">Indizando tresporte…</string>
+    <string name="send_location_sms_pattern"/>
+    <string name="amenity_type_entertainment"/>
+    <string name="amenity_type_military"/>
+    <string name="amenity_type_natural"/>
+    <string name="amenity_type_office"/>
+    <string name="amenity_type_other"/>
+    <string name="amenity_type_shop"/>
+    <string name="amenity_type_tourism"/>
+    <string name="amenity_type_transportation"/>
+    <string name="indexing_address">Indizando la direición…</string>
+    <string name="indexing_map">Indizando\'l mapa…</string>
+    <string name="indexing_transport">Indizando\'l tresporte…</string>
     <string name="km">km</string>
     <string name="km_h">km/h</string>
     <string name="m">m</string>
-    <string name="install_selected_build">¿Quies instalar OsmAnd - {0} of {1} {2} MB?</string>
-    <string name="shared_string_topbar">Barra superior</string>
-    <string name="text_size_descr">Afita\'l tamañu\'l testu nel mapa.</string>
-    <string name="use_osm_live_routing_description">Activa la navegación peles camudancies d\'OsmAnd Live.</string>
-	<string name="access_disable_offroute_recalc_descr">Evita\'l recálculu automáticu de la ruta tres abandonala.</string>
-    <string name="access_disable_wrong_direction_recalc_descr">Evita\'l recálculu automáticu de la ruta cuando sólo te muevas en direición contraria.</string>
+    <string name="install_selected_build">¿Instalar OsmAnd - {0} del {1} de {2}MB\?</string>
+    <string name="shared_string_topbar">Barra cimera</string>
+    <string name="text_size_descr"/>
+    <string name="use_osm_live_routing_description">Activa la navegación colos cambeos d\'OsmAnd Live.</string>
+	<string name="access_disable_offroute_recalc_descr"/>
+    <string name="access_disable_wrong_direction_recalc_descr"/>
     
     
-    <string name="simulate_your_location_stop_descr">Parar la simulación d\'allugamientu.</string>
-    <string name="simulate_your_location_descr">Simular la posición usando una ruta calculada o una traza GPX grabada.</string>
-    <string name="disable_recording_once_app_killed_descrp">Posaráse\'l rexistru de GPX cuando s\'amortie l\'aplicación (per aplicaciones recientes). (La indicación de fondu d\'OsmAnd desapaecerá de la barra d\'avisos d\'Android).</string>
+    <string name="simulate_your_location_stop_descr"/>
+    <string name="simulate_your_location_descr"/>
+    <string name="disable_recording_once_app_killed_descrp"/>
     <string name="restore_purchases">Restaurar merques</string>
-    <string name="fonts_header">Tipografía del mapa</string>
-    <string name="right_side_navigation">Conducción pela derecha</string>
-    <string name="driving_region_automatic">Automáticu</string>
-    <string name="do_not_send_anonymous_app_usage">Nun unviar estadístiques anónimes d\'usu de l\'aplicación</string>
-    <string name="do_not_send_anonymous_app_usage_desc">Osmand recueye información tocante a les partes qu\'abres de l\'aplicación. Enxamás s\'unvia\'l to allugamientu, nin nada qu\'introduzas n\'aplicación o nos detalles de les árees que veas, guetes o descargues.</string>
-    <string name="do_not_show_startup_messages">Nun amosar los mensaxes nel aniciu</string>
-    <string name="do_not_show_startup_messages_desc">Nun amosar descuentos de l\'aplicación nin mensaxes especiales d\'actividaes llocales.</string>
-    <string name="parking_options">Opciones d\'aparcamientu</string>
+    <string name="fonts_header"/>
+    <string name="right_side_navigation"/>
+    <string name="driving_region_automatic"/>
+    <string name="do_not_send_anonymous_app_usage">Nun unviar estadístiques d\'usu anónimes</string>
+    <string name="do_not_send_anonymous_app_usage_desc">OsmAnd recueye información tocante a les partes de l\'aplicación qu\'abres. Nun unvia\'l to allugamientu, nin nada qu\'introduzas na aplicación, nin árees que mires, guetes o baxes.</string>
+    <string name="do_not_show_startup_messages">Nun amosar mensaxes nel aniciu</string>
+    <string name="do_not_show_startup_messages_desc"/>
+    <string name="parking_options"/>
     <string name="full_version_thanks">Gracies por mercar la versión de pagu d\'OsmAnd.</string>
-    <string name="routing_attr_relief_smoothness_factor_hills_name">Pindio</string>
-    <string name="routing_attr_relief_smoothness_factor_plains_name">Menos pindio</string>
-    <string name="routing_attr_relief_smoothness_factor_more_plains_name">Plano</string>
-    <string name="routing_attr_driving_style_speed_name">Les rutes más curties</string>
-    <string name="routing_attr_driving_style_balance_name">Equilibráu</string>
-    <string name="routing_attr_driving_style_safety_name">Preferir estraes secundaries</string>
-    <string name="relief_smoothness_factor_descr">Terrén preferíu: Llanu o pindiu.</string>
-    <string name="shared_string_slope">Cuesta</string>
-    <string name="add_new_folder">Añadir carpeta nueva</string>
-    <string name="points_delete_multiple_succesful">Puntu(os) desaniciáu(os).</string>
-    <string name="points_delete_multiple">Vas desaniciar %1$d puntu(os). ¿Tas seguru?</string>
-    <string name="route_points_category_name">Xiros a pasar con esta ruta</string>
-    <string name="track_points_category_name">Puntos destacaos d\'esta ruta</string>
-    <string name="shared_string_gpx_track">Traza</string>
+    <string name="routing_attr_relief_smoothness_factor_hills_name"/>
+    <string name="routing_attr_relief_smoothness_factor_plains_name"/>
+    <string name="routing_attr_relief_smoothness_factor_more_plains_name"/>
+    <string name="routing_attr_driving_style_speed_name"/>
+    <string name="routing_attr_driving_style_balance_name"/>
+    <string name="routing_attr_driving_style_safety_name"/>
+    <string name="relief_smoothness_factor_descr"/>
+    <string name="shared_string_slope"/>
+    <string name="add_new_folder"/>
+    <string name="points_delete_multiple_succesful"/>
+    <string name="points_delete_multiple">Vas desaniciar %1$d puntu(os). ¿De xuru\?</string>
+    <string name="route_points_category_name"/>
+    <string name="track_points_category_name"/>
+    <string name="shared_string_gpx_track"/>
     <string name="max_speed">Velocidá máxima</string>
     <string name="average_speed">Velocidá media</string>
-    <string name="shared_string_time_moving">Tiempu moviéndose</string>
-    <string name="shared_string_time_span">Duración temporal</string>
-    <string name="shared_string_max">Máx.</string>
-    <string name="shared_string_start_time">Salida</string>
-    <string name="shared_string_end_time">Llegada</string>
+    <string name="shared_string_time_moving"/>
+    <string name="shared_string_time_span"/>
+    <string name="shared_string_max">Máx</string>
+    <string name="shared_string_start_time"/>
+    <string name="shared_string_end_time"/>
     <string name="shared_string_color">Color</string>
-    <string name="select_gpx_folder">Escueye la carpeta de traces</string>
-    <string name="file_can_not_be_moved">El ficheru nun puede movese.</string>
+    <string name="select_gpx_folder"/>
+    <string name="file_can_not_be_moved">El ficheru nun pue movese.</string>
     <string name="shared_string_move">Mover</string>
-    <string name="shared_string_gpx_tracks">Traces</string>
+    <string name="shared_string_gpx_tracks"/>
     <string name="routing_attr_driving_style_name">Estilu de conducción</string>
-    <string name="route_altitude">Altor de la ruta</string>
-    <string name="altitude_descent">Descensu</string>
-    <string name="altitude_ascent">Ascensu</string>
-    <string name="altitude_range">Intervalu d\'altor</string>
-    <string name="average_altitude">Altor mediu</string>
+    <string name="route_altitude"/>
+    <string name="altitude_descent">Descendente</string>
+    <string name="altitude_ascent">Ascendente</string>
+    <string name="altitude_range"/>
+    <string name="average_altitude">Altitú media</string>
     <string name="shared_string_time">Tiempu</string>
     <string name="total_distance">Distancia total</string>
-    <string name="routing_attr_relief_smoothness_factor_name">Seleiciona la variación d\'altor</string>
+    <string name="routing_attr_relief_smoothness_factor_name"/>
     <string name="routing_attr_height_obstacles_name">Usar datos d\'elevación</string>
-    <string name="routing_attr_height_obstacles_description">Usar los datos d\'elevación del terrén proporcionaos por SRTM, ASTER y EU-DEM.</string>
+    <string name="routing_attr_height_obstacles_description">Inclúi la elevación del tarrén (pelos datos de SRTM, ASTER y EU-DEM).</string>
 
-    <string name="rendering_attr_depthContours_description">Amosar la batimetría y puntos.</string>
-    <string name="rendering_attr_depthContours_name">Curves de fondura marina</string>
+    <string name="rendering_attr_depthContours_description"/>
+    <string name="rendering_attr_depthContours_name"/>
 	
 	<string name="search_another_country">Esbillar otra rexón</string>
     <string name="shared_string_change">Camudar</string>
     <string name="mapillary_image">Imaxe de Mapillary</string>
     <string name="open_mapillary">Abrir Mapillary</string>
     <string name="shared_string_install">Instalar</string>
-    <string name="improve_coverage_install_mapillary_desc">Instala Mapillary p\\\'añadir una o más fotos nesti llugar del mapa.</string>
+    <string name="improve_coverage_install_mapillary_desc">Instala Mapillary p\'amestar una o más semeyes nesti allugamientu.</string>
     <string name="online_photos">Semeyes en llinia</string>
     <string name="shared_string_add_photos">Amestar semeyes</string>
-    <string name="no_photos_descr">Nun tenemos semeyes pa esti llugar.</string>
-    <string name="mapillary_action_descr">Ufre la to vista d\'esti allugamientu dende la cai usando Mapillary.</string>
+    <string name="no_photos_descr">Nun tenemos semeyes pa esti allugamientu.</string>
+    <string name="mapillary_action_descr">Collabora per Mapillary cola to vista d\'esti allugamientu a nivel de cai.</string>
     <string name="mapillary_widget">Widget de Mapillary</string>
-    <string name="mapillary_widget_descr">Permite collaborar aína con Mapillary.</string>
-    <string name="mapillary_descr">Semeyes en llinia a nivel de cai. Escubri llugares, collabora o captura\'l mundu.</string>
+    <string name="mapillary_widget_descr">Permite collaboraciones rápides en Mapillary.</string>
+    <string name="mapillary_descr">Semeyes en llinia a nivel de cai pa tol mundu. Descubri llugares, collabora, fotografía\'l mundu.</string>
     <string name="mapillary">Mapillary</string>
-    <string name="plugin_mapillary_descr">Semeyes a nivel de cai pa tol mundu. Descubri llugares, collabora y captura\'l mundu.</string>
-    <string name="private_access_routing_req">El destín allúgase nun área con accesu priváu. ¿Usar les carreteres privaes nesti viaxe?</string>
-    <string name="restart_search">Reaniciar gueta</string>
-    <string name="increase_search_radius">Aumentar radiu de gueta</string>
+    <string name="plugin_mapillary_descr">Semeyes a nivel de cai pa tol mundu. Descubri llugares, collabora, fotografía\'l mundu.</string>
+    <string name="private_access_routing_req">El destín allúgase nun área con accesu priváu. ¿Permitir l\'accesu a carreteres privaes nesti viaxe\?</string>
+    <string name="restart_search"/>
+    <string name="increase_search_radius">Aumentar el radiu de gueta</string>
     <string name="nothing_found">Nun s\'alcontró nada</string>
-    <string name="nothing_found_descr">Cambia la consulta de gueta o aumenta\'l radiu.</string>
-    <string name="quick_action_showhide_osmbugs_title">Conmutar les Notes d\'OSM</string>
-    <string name="quick_action_osmbugs_show">Amosar notes d\'OSM</string>
-    <string name="quick_action_osmbugs_hide">Anubrir notes d\'OSM</string>
-    <string name="quick_action_showhide_osmbugs_descr">Tocando nesti botón d\'aición amuésense o anúbrense les Notes d\'OSM nel mapa.</string>
-    <string name="sorted_by_distance">Ordenóse pela distancia</string>
-    <string name="search_favorites">Guetar favoritos</string>
-    <string name="hide_from_zoom_level">Anubrir del nivel de zoom</string>
-    <string name="shared_string_plugin">Complementu</string>
-    <string name="srtm_color_scheme">Esquema de color</string>
-    <string name="routing_attr_allow_private_name">Permitir accesu priváu</string>
-    <string name="routing_attr_allow_private_description">Permite l\'accesu a árees privaes.</string>
-    <string name="favorite_group_name">Nome del grupu</string>
-    <string name="change_color">Camudar color</string>
-    <string name="edit_name">Editar nome</string>
+    <string name="nothing_found_descr">Modifica la consulta o aumenta\'l radiu de gueta.</string>
+    <string name="quick_action_showhide_osmbugs_title">Alternar notes d\'OSM</string>
+    <string name="quick_action_osmbugs_show"/>
+    <string name="quick_action_osmbugs_hide"/>
+    <string name="quick_action_showhide_osmbugs_descr">Tocar esti botón d\'aición amuesa/anubre nel mapa les notes d\'OSM.</string>
+    <string name="sorted_by_distance"/>
+    <string name="search_favorites"/>
+    <string name="hide_from_zoom_level"/>
+    <string name="shared_string_plugin">Plugin</string>
+    <string name="srtm_color_scheme">Esquema de colores</string>
+    <string name="routing_attr_allow_private_name"/>
+    <string name="routing_attr_allow_private_description">Permitir l\'accesu a árees privaes.</string>
+    <string name="favorite_group_name"/>
+    <string name="change_color">Camudar el color</string>
+    <string name="edit_name">Editar el nome</string>
     <string name="animate_my_location">Animar la mio posición</string>
-    <string name="animate_my_location_desc">Activa l\'animación de movimientu nel mapa de «Mio posición» demientres navego.</string>
-    <string name="shared_string_overview">Previsualización</string>
-    <string name="select_street">Esbillar cai</string>
-    <string name="shared_string_in_name">en %1$s</string>
+    <string name="animate_my_location_desc"/>
+    <string name="shared_string_overview"/>
+    <string name="select_street"/>
+    <string name="shared_string_in_name"/>
     <string name="type_address">Teclexa la direición</string>
-    <string name="type_city_town">Teclexa la ciudá o pueblu</string>
-    <string name="type_postcode">Teclexa\'l códigu postal</string>
-    <string name="nearest_cities">Ciudaes más averaes</string>
-    <string name="select_city">Esbillar ciudá</string>
-    <string name="select_postcode">Esbillar códigu postal</string>
-    <string name="quick_action_add_destination">Amestar destín</string>
-    <string name="quick_action_replace_destination">Trocar destín</string>
+    <string name="type_city_town"/>
+    <string name="type_postcode"/>
+    <string name="nearest_cities">Les ciudaes más cercanes</string>
+    <string name="select_city"/>
+    <string name="select_postcode">Esbillar el códigu postal</string>
+    <string name="quick_action_add_destination"/>
+    <string name="quick_action_replace_destination">Trocar el destín</string>
     <string name="subscribe_email_error">Fallu</string>
     <string name="nautical_maps">Mapes náuticos</string>
     <string name="shared_string_visible">Visible</string>
     <string name="rendering_attr_hideWaterPolygons_description">Agua</string>
-    <string name="rendering_attr_hideWaterPolygons_name">Anubrir agua</string>
-    <string name="wiki_around">Artículos de Wikipedia averaos</string>
-    <string name="gpx_no_tracks_title">Entá nun tienes rutes</string>
-    <string name="gpx_no_tracks_title_folder">Podríes tamién amestar rutes a la carpeta</string>
-    <string name="gpx_add_track">Amestar ruta</string>
+    <string name="rendering_attr_hideWaterPolygons_name"/>
+    <string name="wiki_around"/>
+    <string name="gpx_no_tracks_title"/>
+    <string name="gpx_no_tracks_title_folder"/>
+    <string name="gpx_add_track">Amestar más…</string>
     <string name="gpx_appearance">Aspeutu</string>
     
     
@@ -829,163 +824,163 @@ Puntos</string>
     <string name="shared_string_notifications">Avisos</string>
     <string name="shared_string_continue">Siguir</string>
     <string name="shared_string_pause">Posar</string>
-    <string name="shared_string_paused">Posóse</string>
+    <string name="shared_string_paused"/>
     <string name="shared_string_trip">Viaxe</string>
     <string name="shared_string_recorded">Grabóse</string>
     <string name="shared_string_record">Grabar</string>
-    <string name="gpx_logging_no_data">Ensin datos</string>
-    <string name="save_track_min_speed">Rexistru de velocidá mínima</string>
-    <string name="save_track_min_speed_descr">Filtru: Configura la velocidá mínima pa rexistrar un puntu.</string>
-    <string name="save_track_min_distance">Movimientu mínimu a grabar</string>
-    <string name="save_track_min_distance_descr">Filtru: Configura la distancia mínima dende la cabera posición pa rexistrar el puntu.</string>
-    <string name="save_track_precision">Rexistru de precisión mínimo</string>
-    <string name="save_track_precision_descr">Filtru: Configura la precisión mínima pa rexistrar un puntu.</string>
-    <string name="christmas_poi">POI de Nadal</string>
-    <string name="christmas_desc">Anticipa les vacaciones de Nadal y Añu nuevu, pues escoyer l\'amosar los POI asociaos col Nadal: Árboles de nadal, tiendes... etc.</string>
-    <string name="christmas_desc_q">¿Amosar POI de Nadal?</string>
+    <string name="gpx_logging_no_data">Nun hai datos</string>
+    <string name="save_track_min_speed"/>
+    <string name="save_track_min_speed_descr"/>
+    <string name="save_track_min_distance"/>
+    <string name="save_track_min_distance_descr"/>
+    <string name="save_track_precision"/>
+    <string name="save_track_precision_descr"/>
+    <string name="christmas_poi">PdI de nadal</string>
+    <string name="christmas_desc"/>
+    <string name="christmas_desc_q"/>
     <string name="rendering_value_light_brown_name">Marrón claro</string>
     <string name="rendering_value_dark_brown_name">Marrón escuro</string>
-    <string name="search_hint">Teclexa la ciudá, dirición nome de POI</string>
-    <string name="edit_filter">Editar estayes</string>
+    <string name="search_hint">Teclexa una ciudá, direición, un PdI</string>
+    <string name="edit_filter"/>
     <string name="subcategories">Soestayes</string>
-    <string name="selected_categories">Estayes esbillaes</string>
-    <string name="routing_attr_short_way_name">Carretera eficiente</string>
-    <string name="routing_attr_short_way_description">Usar estraes con menor consumu (davezu más curties).</string>
-    <string name="back_to_search">Volver a la gueta</string>
+    <string name="selected_categories"/>
+    <string name="routing_attr_short_way_name">Camín eficiente</string>
+    <string name="routing_attr_short_way_description"/>
+    <string name="back_to_search"/>
     <string name="show_something_on_map">Amosar %1$s nel mapa</string>
-    <string name="shared_string_is_open_24_7">Abierto 24/7</string>
-    <string name="current_track">Ruta actual</string>
-    <string name="access_disable_offroute_recalc">Nun recalcular la ruta cuando s\'abandone</string>
+    <string name="shared_string_is_open_24_7">Abiertu 24/7</string>
+    <string name="current_track">Itinerariu actual</string>
+    <string name="access_disable_offroute_recalc"/>
     <string name="shared_string_permissions">Permisos</string>
-    <string name="import_gpx_failed_descr">OsmAnd nun pudo importar el ficheru. Comprueba si OsmAnd tien permisu pa lleer el ficheru dende\'l so allugamientu.</string>
-    <string name="distance_moving">Distancia correxida</string>
-    <string name="wrong_user_name">Nome d\\\'usuariu incorreutu</string>
-    <string name="shared_string_to">A</string>
-    <string name="mapillary_menu_date_from">Dende</string>
-    <string name="mapillary_menu_descr_dates">Ver namái les imaxes añadíes</string>
+    <string name="import_gpx_failed_descr">OsmAnd nun pue importar el ficheru. Comprueba si l\'aplicación tien permisu pa lleer esi ficheru dende\'l so allugmientu.</string>
+    <string name="distance_moving"/>
+    <string name="wrong_user_name">El nome d\'usuariu ye incorreutu</string>
+    <string name="shared_string_to"/>
+    <string name="mapillary_menu_date_from"/>
+    <string name="mapillary_menu_descr_dates"/>
     <string name="mapillary_menu_title_dates">Data</string>
-    <string name="mapillary_menu_edit_text_hint">Escribe\\\'l nome d\\\'usuariu</string>
-    <string name="mapillary_menu_descr_username">Ver namái les imaxes añadíes por</string>
-    <string name="mapillary_menu_title_username">Nome del usuariu</string>
-    <string name="mapillary_menu_filter_description">Puedes filtriar les imaxes pol remitente o pola data. Los filtros aplíquense solo nes escales cercanes.</string>
+    <string name="mapillary_menu_edit_text_hint">Teclexa\'l nome d\'usuariu</string>
+    <string name="mapillary_menu_descr_username"/>
+    <string name="mapillary_menu_title_username">Nome d\'usuariu</string>
+    <string name="mapillary_menu_filter_description"/>
     
-    <string name="map_widget_ruler_control">Regla de radiu</string>
-    <string name="improve_coverage_mapillary">Ameyorar la cobertura de fotos con Mapillary</string>
-    <string name="hillshade_menu_download_descr">"Descarga\'l  mapa de «Superposición de solombra» pa dar relieve a esta fastera."</string>
-    <string name="hillshade_purchase_header">Instala\'l complementu «Curves de Nivel» pa veles nel mapa</string>
-    <string name="srtm_menu_download_descr">Descarga\'l mapa de «Curves de nivel» pa usalu nesta fastera.</string>
-    <string name="store_tracks_in_monthly_directories">Almacenar les traces grabaes en carpetes mensuales</string>
-    <string name="store_tracks_in_monthly_directories_descrp">Almacenar les traces grabaes en subcarpetes por mes de grabación (como 2018 - 01).</string>
-    <string name="shared_string_reset">Reaniciar</string>
+    <string name="map_widget_ruler_control"/>
+    <string name="improve_coverage_mapillary"/>
+    <string name="hillshade_menu_download_descr"/>
+    <string name="hillshade_purchase_header"/>
+    <string name="srtm_menu_download_descr"/>
+    <string name="store_tracks_in_monthly_directories">Atroxar itinerarios grabaos en carpetes mensuales</string>
+    <string name="store_tracks_in_monthly_directories_descrp">Atroxa los itinerarios grabaos en socarpetes pel mes de grabación (como 2018-01).</string>
+    <string name="shared_string_reset"/>
     <string name="shared_string_reload">Recargar</string>
-    <string name="mapillary_menu_descr_tile_cache">Recargar los mosaicos pa ver los datos actualizaos.</string>
+    <string name="mapillary_menu_descr_tile_cache">Recarga los mosaicos pa ver los datos anovaos.</string>
     <string name="mapillary_menu_title_tile_cache">Caché de mosaicos</string>
-    <string name="srtm_purchase_header">Pa ver les curves de nivel nel mapa, necesites comprar ya instalar el complementu «Curves de nivel»</string>
-    <string name="show_from_zoom_level">Amosar dende\'l nivel de zoom</string>
-    <string name="display_zoom_level">Nivel de zoom: %1$s</string>
-    <string name="quick_action_auto_zoom">Zoom automáticu del mapa sí/non</string>
-    <string name="quick_action_auto_zoom_on">Activar ampliación automática del mapa</string>
-    <string name="quick_action_auto_zoom_off">Desactivar ampliación automática del mapa</string>
-    <string name="quick_action_add_first_intermediate">Añadir primer intermediu</string>
-    <string name="no_overlay">Ensin superposición</string>
-    <string name="no_underlay">Ensin fondu</string>
+    <string name="srtm_purchase_header"/>
+    <string name="show_from_zoom_level"/>
+    <string name="display_zoom_level"/>
+    <string name="quick_action_auto_zoom"/>
+    <string name="quick_action_auto_zoom_on"/>
+    <string name="quick_action_auto_zoom_off"/>
+    <string name="quick_action_add_first_intermediate"/>
+    <string name="no_overlay"/>
+    <string name="no_underlay"/>
     <string name="subscribe_email_desc"/>
-    <string name="depth_contour_descr">Ver les llinies de batimetría y puntos náuticos.</string>
-    <string name="sea_depth_thanks">¡Gracies por comprar les «Curves de fondura náutica»</string>
+    <string name="depth_contour_descr"/>
+    <string name="sea_depth_thanks"/>
     <string name="shared_string_markers">Marcadores</string>
-    <string name="coordinates_format">Formatu de coordenaes</string>
+    <string name="coordinates_format"/>
     <string name="use_system_keyboard">Usar el tecláu del sistema</string>
-    <string name="fast_coordinates_input_descr">Escueyi\'l formatu d\'entrada de coordenaes. Siempre puedes cambialo tocando en «Opciones».</string>
-    <string name="fast_coordinates_input">Entrada rápida de coordenaes</string>
-    <string name="routing_attr_avoid_ice_roads_fords_name">Evitar les estraes con xelu, vaos</string>
-    <string name="routing_attr_avoid_ice_roads_fords_description">Evitar les estraes de xelu y vaos.</string>
-    <string name="use_location">Usar posición</string>
-    <string name="add_location_as_first_point_descr">Añade la to posición como puntu de salida pa planificar la ruta perfeuta.</string>
+    <string name="fast_coordinates_input_descr">Escueyi\'l formatu d\'introducción de coordenaes. Siempres vas poder camudalu tocando n\'«Opciones».</string>
+    <string name="fast_coordinates_input">Introducción rápida de coordenaes</string>
+    <string name="routing_attr_avoid_ice_roads_fords_name"/>
+    <string name="routing_attr_avoid_ice_roads_fords_description"/>
+    <string name="use_location"/>
+    <string name="add_location_as_first_point_descr">Amiesta la to posición como puntu d\'aniciu pa planiar la ruta perfeuta.</string>
     <string name="my_location">La mio posición</string>
-    <string name="shared_string_finish">Acabar</string>
-    <string name="plan_route">Planificar ruta</string>
-    <string name="shared_string_sort">Ordenar</string>
-    <string name="coordinate_input">Entrada de coordenaes</string>
-    <string name="is_saved">guardóse</string>
-    <string name="marker_save_as_track_descr">Esportar los marcadores a un ficheru que puedes indicar equí:</string>
-    <string name="marker_save_as_track">Guardar como traza</string>
+    <string name="shared_string_finish">Finar</string>
+    <string name="plan_route"/>
+    <string name="shared_string_sort"/>
+    <string name="coordinate_input">Introducción de coordenaes</string>
+    <string name="is_saved"/>
+    <string name="marker_save_as_track_descr"/>
+    <string name="marker_save_as_track"/>
     <string name="move_to_history">Mover al historial</string>
-    <string name="group_will_be_removed_after_restart">El grupu desapaecerá la siguiente vez qu\'anicies la app.</string>
-    <string name="show_guide_line">Ver les llinies de direición</string>
-    <string name="show_arrows_on_the_map">Ver fleches nel mapa</string>
-    <string name="show_passed">Ver pasaos</string>
-    <string name="hide_passed">Tapecer pasaos</string>
-    <string name="remove_from_map_markers">Quitar de los marcadores de mapa</string>
-    <string name="descendingly">descendiente</string>
-    <string name="ascendingly">ascendiente</string>
-    <string name="date_added">Añadióse la data</string>
-    <string name="order_by">Ordenar per:</string>
-    <string name="osn_modify_dialog_title">Cambiar nota</string>
-    <string name="context_menu_item_modify_note">Cambiar nota d\'OSM</string>
-    <string name="make_round_trip_descr">Añadir una copia del puntu de partida como destín.</string>
-    <string name="make_round_trip">Facer un trayectu circular</string>
+    <string name="group_will_be_removed_after_restart">El grupu va desaniciase la próxima vegada qu\'anicies l\'aplicación.</string>
+    <string name="show_guide_line">Amosar llinies direicionales</string>
+    <string name="show_arrows_on_the_map">Amosar fleches nel mapa</string>
+    <string name="show_passed">Amosar lo que se pasó</string>
+    <string name="hide_passed"/>
+    <string name="remove_from_map_markers"/>
+    <string name="descendingly"/>
+    <string name="ascendingly"/>
+    <string name="date_added"/>
+    <string name="order_by"/>
+    <string name="osn_modify_dialog_title"/>
+    <string name="context_menu_item_modify_note"/>
+    <string name="make_round_trip_descr"/>
+    <string name="make_round_trip"/>
     
-    <string name="marker_show_distance_descr">Seleiciona como indicar la distancia i dirección a los marcadores de mapa na pantalla:</string>
-    <string name="wrong_input">Entrada incorreuta</string>
-	<string name="enter_new_name">Escribir un nome nuevu</string>
-	<string name="shared_string_back">Anterior</string>
+    <string name="marker_show_distance_descr"/>
+    <string name="wrong_input">La introducción ye incorreuta</string>
+	<string name="enter_new_name"/>
+	<string name="shared_string_back">Atrás</string>
 	<string name="shared_string_view">Ver</string>
-	<string name="wrong_format">Formatu incorreutu</string>
-    <string name="shared_string_road">Estrada</string>
-    <string name="show_map">Ver el mapa</string>
-    <string name="route_is_calculated">Ruta calculada</string>
-    <string name="round_trip">Trayectu circular</string>
-    <string name="shared_string_right">Derecha</string>
-    <string name="shared_string_left">Izquierda</string>
-    <string name="show_number_pad">Amosar tecláu numbéricu</string>
-    <string name="shared_string_paste">Pegar</string>
-    <string name="coordinate_input_accuracy_description">Camudar automáticamente al campu siguiente tres introducir %1$d díxitos decimales.</string>
-    <string name="coordinate_input_accuracy">%1$d cifres</string>
-    <string name="go_to_next_field">Siguiente campu</string>
-    <string name="rename_marker">Cambiar nome del marcador</string>
-    <string name="tap_on_map_to_hide_interface_descr">Una toque nel mapa alterna los botones de control y los complementos.</string>
-    <string name="tap_on_map_to_hide_interface">Mou de pantalla completa</string>
+	<string name="wrong_format">El formatu ye incorreutu</string>
+    <string name="shared_string_road">Carretera</string>
+    <string name="show_map"/>
+    <string name="route_is_calculated"/>
+    <string name="round_trip"/>
+    <string name="shared_string_right">Drecha</string>
+    <string name="shared_string_left">Esquierda</string>
+    <string name="show_number_pad"/>
+    <string name="shared_string_paste">Apegar</string>
+    <string name="coordinate_input_accuracy_description">Cambia automáticamente al campu siguiente tres introducir %1$d díxitos decimales.</string>
+    <string name="coordinate_input_accuracy">%1$d díxitos</string>
+    <string name="go_to_next_field">Campu siguiente</string>
+    <string name="rename_marker"/>
+    <string name="tap_on_map_to_hide_interface_descr"/>
+    <string name="tap_on_map_to_hide_interface">Mou a pantalla completa</string>
     
-    <string name="mark_passed">Marcar como pasáu</string>
-    <string name="import_gpx_file_description">puede importase como favoritu, o como ficheru de traza.</string>
-    <string name="import_as_gpx">Importar como ficheru GPX</string>
-    <string name="import_as_favorites">Importar como favoritu</string>
-    <string name="import_file">Importar ficheru</string>
-	<string name="waypoints_added_to_map_markers">Puntos de ruta añadíos a los marcadores del mapa</string>
-	<string name="plan_route_no_markers_toast">Hai qu\'amestar polo menos un marcador pa usar esta función.</string>
-    <string name="osn_modify_dialog_error">Nun pudo camudase la nota</string>
-    <string name="empty_state_av_notes">¡Toma notes!</string>
+    <string name="mark_passed"/>
+    <string name="import_gpx_file_description"/>
+    <string name="import_as_gpx"/>
+    <string name="import_as_favorites"/>
+    <string name="import_file"/>
+	<string name="waypoints_added_to_map_markers"/>
+	<string name="plan_route_no_markers_toast">Has amestar polo menos un marcador pa usar esta función.</string>
+    <string name="osn_modify_dialog_error">Nun pudo modificase la nota</string>
+    <string name="empty_state_av_notes"/>
     <string name="yesterday">Ayeri</string>
     <string name="this_year">Esti añu</string>
     <string name="move_all_to_history">Mover too al historial</string>
     <string name="do_not_use_animations">Ensin animaciones</string>
     <string name="keep_showing_on_map">Siguir amosando nel mapa</string>
-    <string name="exit_without_saving">¿Colar ensin guardar?</string>
+    <string name="exit_without_saving">¿Colar ensin guardar\?</string>
     <string name="line">Llinia</string>
-    <string name="save_as_line">Guardar como llinia</string>
-    <string name="route_point">Puntu de ruta</string>
-    <string name="edit_line">Editar llinia</string>
+    <string name="save_as_line"/>
+    <string name="route_point"/>
+    <string name="edit_line"/>
     <string name="shared_string_options">Opciones</string>
-    <string name="enter_gpx_name">Nome de ficheru GPX:</string>
+    <string name="enter_gpx_name"/>
     <string name="no_update_info">Nun amosar anovamientos</string>
-    <string name="rendering_value_bold_name">Negrina</string>
-    <string name="map_widget_plain_time">Tiempu actual</string>
-    <string name="app_mode_boat">Barcu</string>
-    <string name="access_arrival_time">Tiempu de llegada</string>
+    <string name="rendering_value_bold_name"/>
+    <string name="map_widget_plain_time"/>
+    <string name="app_mode_boat"/>
+    <string name="access_arrival_time"/>
     <string name="index_name_openmaps">OpenMaps EU</string>
-    <string name="local_indexes_cat_av">Datos d\'Audiu/Videu</string>
-    <string name="dropbox_plugin_name">Complementu Dropbox</string>
-    <string name="map_widget_audionotes">Notes d\'audiu</string>
+    <string name="local_indexes_cat_av">Datos d\'audiu/videu</string>
+    <string name="dropbox_plugin_name">Plugin pa Dropbox</string>
+    <string name="map_widget_audionotes"/>
     <string name="rendering_attr_noAdminboundaries_name">Llendes</string>
     <string name="shared_string_target_points">Destinos</string>
     <string name="poi_filter_entertainment">Entretenimientu</string>
     <string name="avoid_in_routing_title">Evitar…</string>
     <string name="map_widget_distance">Destín</string>
-    <string name="gpx_tags_txt">Etiquetes</string>
+    <string name="gpx_tags_txt"/>
     <string name="zoomOut">Alloñar</string>
     <string name="zoomIn">Averar</string>
     <string name="zoomIs">El nivel de zoom ye</string>
-    <string name="arrival_distance">Anunciu de llegada</string>
+    <string name="arrival_distance"/>
     <string name="index_name_north_america">América del Norte</string>
     <string name="index_name_central_america">América Central</string>
     <string name="index_name_south_america">América del Sur</string>
@@ -995,106 +990,702 @@ Puntos</string>
     <string name="index_name_russia">Rusia</string>
     <string name="index_name_asia">Asia</string>
     <string name="favorite_places_category">Llugares</string>
-    <string name="continuous_rendering">Renderizáu continuu</string>
-    <string name="error_reading_gpx">Fallu lleendo los datos GPX</string>
-    <string name="network_provider">Rede</string>
+    <string name="continuous_rendering"/>
+    <string name="error_reading_gpx">Nun pudieron lleese los datos GPX</string>
+    <string name="network_provider"/>
     <string name="int_seconds">segundos</string>
     <string name="transport_Routes">Rutes</string>
-    <string name="transport">Tresporte</string>
+    <string name="transport"/>
     <string name="get_directions">Direiciones</string>
-    <string name="error_calculating_route">Fallu calculando la ruta</string>
-    <string name="empty_route_calculated">Fallu: La ruta calculada ta balera</string>
-    <string name="app_mode_car">Coche</string>
-    <string name="app_mode_bicycle">Bicicleta</string>
-    <string name="navigate_point_format_D">DDD.DD</string>
-    <string name="navigate_point_format_DM">DDD MM.MM</string>
-    <string name="navigate_point_format_DMS">DDD MM SS.SS</string>
-    <string name="favourites_remove_dialog_msg">¿Desaniciar el puntu favortiu «%s»?</string>
-    <string name="default_buttons_commit">Unviar</string>
+    <string name="error_calculating_route">Nun pudo calculase la ruta</string>
+    <string name="empty_route_calculated">La ruta calculada ta balera</string>
+    <string name="app_mode_car"/>
+    <string name="app_mode_bicycle"/>
+    <string name="navigate_point_format_D"/>
+    <string name="navigate_point_format_DM"/>
+    <string name="navigate_point_format_DMS"/>
+    <string name="favourites_remove_dialog_msg">¿Desaniciar el puntu favoritu «%s»\?</string>
+    <string name="default_buttons_commit"/>
     <string name="error_message_pattern">Fallu: {0}</string>
     <string name="faq_item">FAQ</string>
     <string name="favorite_empty_place_name">Llugar</string>
-    <string name="shared_string_without_name">Ensin nome</string>
-    <string name="what_is_here">Lo qu\\\'hai equí:</string>
-    <string name="parked_at">aparcáu a les</string>
-    <string name="pick_up_till">Recoyer antes de les</string>
-    <string name="without_time_limit">Sin llende de tiempu</string>
-    <string name="context_menu_read_full_article">Lleer l\\\'artículu completu</string>
-    <string name="context_menu_read_article">Lleer l\\\'artículu</string>
+    <string name="shared_string_without_name"/>
+    <string name="what_is_here"/>
+    <string name="parked_at"/>
+    <string name="pick_up_till"/>
+    <string name="without_time_limit"/>
+    <string name="context_menu_read_full_article"/>
+    <string name="context_menu_read_article"/>
     <string name="context_menu_points_of_group">Tolos puntos del grupu</string>
-    <string name="open_from">Abierto dende les</string>
-    <string name="open_till">Abierto hasta les</string>
-    <string name="will_close_at">Zarra a les</string>
+    <string name="open_from"/>
+    <string name="open_till"/>
+    <string name="will_close_at">Zarrar a les</string>
     <string name="will_open_at">Abre a les</string>
-    <string name="will_open_on">Abre a les</string>
-    <string name="additional_actions">Más aiciones</string>
-    <string name="av_locations_selected_desc">Ficheru GPX con coordenaes y datos de les notes esbillaes.</string>
-    <string name="av_locations_all_desc">Ficheru GPX con coordenaes y datos de toles notes.</string>
-    <string name="release_3_0">Nuevu menú Viaxe : consultar los artículos de WikiVoyage ensin conexón
-\u2022 Wikipedia, Wikivoyage : nuevu aspeutu, imaxes
-\u2022 Interfazd\'apertura de traces : ver grupos de puntos de ruta
-\u2022 Marcadores del mapa : importar grupos seleicionaos dende ficheros GPX, nuevu aspeutu de la entrada de coordenaes
-\u2022 La suscripción a OsmAnd Live agora incluye toles funciones d\'OsmAnd
-\n</string>
-    <string name="modify_the_search_query">Cambiar la consulta de la gueta.</string>
+    <string name="will_open_on"/>
+    <string name="additional_actions">Aiciones adicionales</string>
+    <string name="av_locations_selected_desc"/>
+    <string name="av_locations_all_desc"/>
+    <string name="release_3_0"/>
+    <string name="modify_the_search_query"/>
     <string name="shared_string_actions">Aiciones</string>
     <string name="shared_string_marker">Marcador</string>
-    <string name="empty_state_osm_edits">Crear o tresformar oxetos OSM</string>
-    <string name="empty_state_osm_edits_descr">Crea o tresforma PDI d\\\'OSM, abre o comenta Notes d\\\'OSM y apurre ficheros GPX grabaos.</string>
-    <string name="shared_string_deleted">Desaniciáu</string>
-    <string name="shared_string_edited">Editáu</string>
-    <string name="shared_string_added">Añadíu</string>
-    <string name="marker_activated">Activáu el marcador %s.</string>
-    <string name="one_tap_active_descr">"Prime un marcador del mapa pa movelu al principiu de los marcadores activos sin abrir el menú  de contestu."</string>
-    <string name="one_tap_active">Activar con un toque</string>
-    <string name="empty_state_av_notes_desc">Añade una nota de soníu, videu o foto pa cada puntu del mapa, utilizando\\\'l complementu o\\\'l menú de contestu.</string>
-    <string name="notes_by_date">Notes per data</string>
-    <string name="by_date">Per data</string>
-    <string name="by_type">Per triba</string>
-    <string name="looking_for_tracks_with_waypoints">Buscando traces con puntos de ruta</string>
+    <string name="empty_state_osm_edits">Creación o modificación d\'oxetos d\'OSM</string>
+    <string name="empty_state_osm_edits_descr"/>
+    <string name="shared_string_deleted"/>
+    <string name="shared_string_edited"/>
+    <string name="shared_string_added"/>
+    <string name="marker_activated">Activóse\'l marcador %s.</string>
+    <string name="one_tap_active_descr">Toca un marcador del mapa pa movelu a lo cimero de los marcadores activos ensin abrir el menú contestual.</string>
+    <string name="one_tap_active">Activación con un toque</string>
+    <string name="empty_state_av_notes_desc">Amiesta una nota d\'audiu, videu o semeya a cada puntu del mapa usando\'l widget o\'l menú contestual.</string>
+    <string name="notes_by_date">Notes pola data</string>
+    <string name="by_date">Pola data</string>
+    <string name="by_type">Pola triba</string>
+    <string name="looking_for_tracks_with_waypoints"/>
     <string name="shared_string_more_without_dots">Más</string>
-    <string name="appearance_on_the_map">Apariencia nel mapa</string>
-    <string name="add_track_to_markers_descr">Los puntos de ruta pueden añadise a los marcadores seleicionando una de les traces que los tengan.</string>
-    <string name="add_favourites_group_to_markers_descr">Seleiciona una categoría favorita p\\\'amestala a los marcadores.</string>
-    <string name="shared_string_gpx_waypoints">Puntos de ruta de la traza</string>
-    <string name="favourites_group">Categoría de favoritos</string>
-    <string name="add_group">Amestar un grupu</string>
-    <string name="add_group_descr">Importar grupos dende favoritos o de puntos de ruta de la traza.</string>
-    <string name="empty_state_markers_active">¡Crea marcadores de mapa!</string>
-    <string name="empty_state_markers_active_desc">Da un toque llargu o curtiu en «Llugares», llueu toca nel botón de bandera de marcador.</string>
-    <string name="empty_state_markers_groups">Importar grupos</string>
-    <string name="empty_state_markers_groups_desc">Importar grupos de favoritos o puntos de ruta de la traza como marcadores.</string>
+    <string name="appearance_on_the_map">Aspeutu nel mapa</string>
+    <string name="add_track_to_markers_descr"/>
+    <string name="add_favourites_group_to_markers_descr"/>
+    <string name="shared_string_gpx_waypoints"/>
+    <string name="favourites_group"/>
+    <string name="add_group"/>
+    <string name="add_group_descr"/>
+    <string name="empty_state_markers_active"/>
+    <string name="empty_state_markers_active_desc"/>
+    <string name="empty_state_markers_groups">Importación de grupos</string>
+    <string name="empty_state_markers_groups_desc"/>
     <string name="shared_string_two">Dos</string>
-    <string name="shared_string_one">Un</string>
-    <string name="show_guide_line_descr">Amosar llinies de direición dende la to posición a les de marcadores activos.</string>
-    <string name="show_arrows_descr">Ver una o dos fleches qu\'indiquen la direición a los marcadores activos.</string>
+    <string name="shared_string_one">Unu</string>
+    <string name="show_guide_line_descr"/>
+    <string name="show_arrows_descr">Amuesa una o dos fleches qu\'indiquen la direición a los marcadores activos.</string>
     <string name="osmand_parking_am">AM</string>
-    <string name="thank_you_for_feedback">Gracies pola to opinión</string>
-    <string name="search_street">Buscar una rúa</string>
-    <string name="start_search_from_city">Principiar la gueta dende la ciudá</string>
+    <string name="thank_you_for_feedback"/>
+    <string name="search_street"/>
+    <string name="start_search_from_city"/>
     <string name="shared_string_restore">Restaurar</string>
-    <string name="keep_passed_markers_descr">Los marcadores añadíos como grupu de Favoritos o puntos de ruta GPX marcaos como Pasaos remanecerán nel mapa. Si\'l grupu nun ta activu, los marcadores desapaecerán del mapa.</string>
-    <string name="keep_passed_markers">Caltener los marcadores pasaos nel mapa</string>
-    <string name="more_transport_on_stop_hint">Hai más tresportes nesta parada.</string>
-    <string name="ask_for_location_permission">Pa siguir fai falta permitir a OsmAnd l\'accesu al allugamientu.</string>
-    <string name="poi_cannot_be_found">Nun pudo alcontrase\'l nodiu o la vía.</string>
-    <string name="search_no_results_feedback">¿Ensin resultaos na gueta? 
+    <string name="keep_passed_markers_descr"/>
+    <string name="keep_passed_markers">Caltener marcadores pasaos nel mapa</string>
+    <string name="more_transport_on_stop_hint"/>
+    <string name="ask_for_location_permission">Da-y el permisu d\'allugamientu a OsmAnd pa siguir, por favor.</string>
+    <string name="poi_cannot_be_found">Nun pue alcontrase\'l noyu o camín.</string>
+    <string name="search_no_results_feedback">¿Nun hai resultaos de gueta\?
 \nComéntanoslo</string>
-    <string name="release_3_2_pre">"• Iguáu el fallu nel aniciu qu\'asocedía colos mapes en caráuteres non llatinos 
-\n 
-\n • Ameyoramientu nos problemes de velocidá de renderizáu nos preseos Android 8.0 
-\n 
-\n • Encontu pa editar oxetos poligonales (non servicios) 
-\n
-\n • Midir distancies: añadíu\'l botón Midir en Aiciones en el menú contestual "</string>
-    <string name="commiting_way">Unviando vía…</string>
-    <string name="increase_search_radius_to">Aumentar el radiu de gueta a %1$s</string>
-    <string name="send_search_query_description">Unviaremos la consulta de gueta: <b>«%1$s»</b>, asina como l\'allugamientu.<br/><br/> Nun collechamos información personal, sólo necesitamos datos de la gueta p\'ameyorar l\' algoritmu de la mesma.<br/></string>
-    <string name="send_search_query">¿Unviar la consulta de la gueta?</string>
+    <string name="release_3_2_pre"/>
+    <string name="commiting_way"/>
+    <string name="increase_search_radius_to">Aumentar el radiu de gueta hasta %1$s</string>
+    <string name="send_search_query_description">Vamos unviar la consulta <b>«%1$s»</b> amás del to allugamientu. <br/><br/>Nun recoyemos información personal, namái precisamos estos datos p\'ameyorar l\'algoritmu de gueta.<br/></string>
+    <string name="send_search_query">¿Unviar la consulta de gueta\?</string>
     <string name="shared_string_world">Mundu</string>
-    <string name="point_deleted">El puntu %1$s desanicióse</string>
-    <string name="coord_input_edit_point">Editar puntu</string>
-    <string name="coord_input_add_point">Añadir un puntu</string>
-    <string name="coord_input_save_as_track">Guardar como traza</string>
-    <string name="coord_input_save_as_track_descr">Añadisti %1$s puntos. Escribe un nome de ficheru y pulsia en «Guardar».</string>
-    </resources>
+    <string name="point_deleted"/>
+    <string name="coord_input_edit_point"/>
+    <string name="coord_input_add_point"/>
+    <string name="coord_input_save_as_track"/>
+    <string name="coord_input_save_as_track_descr">Amestesti %1$s puntos. Teclexa un nome y toca «Guardar».</string>
+    <string name="osm_live_subscriptions">Soscripciones</string>
+    <string name="powered_by_osmand">Cola potencia d\'OsmAnd</string>
+    <string name="osm_live_plan_pricing">Plan y preciu</string>
+    <string name="osm_live_payment_monthly_title">Pagu mensual</string>
+    <string name="osm_live_payment_3_months_title">Pagu cada 3 meses</string>
+    <string name="osm_live_payment_annual_title">Pagu añal</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s/mes</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s/mes</string>
+    <string name="osm_live_payment_current_subscription">La soscripción actual</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Esbilla\'l periodu de pagu más afayadizu pa ti:</string>
+    <string name="osm_live_payment_contribute_descr">Parte de los ingresos van pa los collaboradores d\'OpenStreetMap.</string>
+    <string name="markers_remove_dialog_msg">¿Desaniciar el marcador «%s» del mapa\?</string>
+    <string name="third_party_application">Aplicación de terceros</string>
+    <string name="error_notification_desc">Unvia una captura d\'esti avisu a support@osmand.net, por favor</string>
+    <string name="show_full_description">Amosar la descripción completa</string>
+    <string name="open_wikipedia_link_online_description">L\'enllaz va abrise nun restolador web.</string>
+    <string name="how_to_open_link">¿Cómo abrir l\'enllaz\?</string>
+    <string name="purchase_cancelled_dialog_title">Encaboxesti la soscripción a OsmAnd Live</string>
+    <string name="purchase_cancelled_dialog_descr">Renueva la soscripción pa siguir usando toles carauterístiques:</string>
+    <string name="maps_you_need">Mapes que precises</string>
+    <string name="osmand_team">L\'equipu d\'OsmAnd</string>
+    <string name="travel_card_download_descr"/>
+    <string name="update_is_available">Anovamientu disponible</string>
+    <string name="start_editing_card_image_text">La guía de viaxes mundial y llibre que tol mundu pue editar.</string>
+    <string name="start_editing">Apenzar la edición</string>
+    <string name="welcome_to_open_beta">Afáyate na beta abierta</string>
+    <string name="wikivoyage_travel_guide_descr">Guíes de los llugares más interesantes del planeta, dientro d\'OsmAnd, ensin conexón a internet.</string>
+    <string name="monthly_map_updates">Anovamientos del mapa: <b>cada mes</b></string>
+    <string name="daily_map_updates">Anovamientos del mapa: <b>cada hora</b></string>
+    <string name="wikivoyage_offline">Wikivoyage fuera de llinia</string>
+    <string name="unlimited_downloads">Descargues ensin llende</string>
+    <string name="wikipedia_offline">Wikipedia fuera de llinia</string>
+    <string name="unlock_all_features">Desbloquéu de toles carauterístiques d\'OsmAnd</string>
+    <string name="purchase_dialog_title">Escoyeta d\'un plan</string>
+    <string name="shared_string_only_with_wifi">Namái na Wi-Fi</string>
+    <string name="wikivoyage_download_pics">Baxar imáxenes</string>
+    <string name="shared_string_wifi_only">Namái na Wi-Fi</string>
+    <string name="online_webpage_warning">La páxina namái ta disponible en llinia. ¿Abrila nun restoaldor web\?</string>
+    <string name="images_cache">Caché d\'imáxenes</string>
+    <string name="shared_string_wikivoyage">Wikivoyage</string>
+    <string name="saved_articles">Artículos en marcadores</string>
+    <string name="nothing_found_in_radius">Nun pudo alcontrase nada:</string>
+    <string name="shared_string_total">Total</string>
+    <string name="distance_farthest">Distancia: primero lo más lloñe</string>
+    <string name="distance_nearest">Distancia: primero lo más cerca</string>
+    <string name="dd_mm_ss_format">GG°MM′SS″</string>
+    <string name="dd_dddddd_format">GG.GGGGGGº</string>
+    <string name="dd_ddddd_format">GG.GGGGGº</string>
+    <string name="dd_mm_mmmm_format">GG°MM.MMMM′</string>
+    <string name="dd_mm_mmm_format">GG°MM.MMM′</string>
+    <string name="east_abbreviation">E</string>
+    <string name="west_abbreviation">O</string>
+    <string name="south_abbreviation">S</string>
+    <string name="north_abbreviation">N</string>
+    <string name="optional_point_name"/>
+    <string name="last_intermediate_dest_description">Amiesta una parada intermedia</string>
+    <string name="first_intermediate_dest_description">Amiesta una parada inicial</string>
+    <string name="all_data">Tolos datos</string>
+    <string name="osm_notes">Notes d\'OSM</string>
+    <string name="will_open_tomorrow_at">Abre mañana a les</string>
+    <string name="distance_indication_descr">Escueyi cómo amosar la distancia a los marcadores activos.</string>
+    <string name="active_markers_descr">Escueyi cuántos marcadores de direición amosar.</string>
+    <string name="digits_quantity">Númberu de díxitos decimales</string>
+    <string name="shared_string_groups">Grupos</string>
+    <string name="today">Güei</string>
+    <string name="last_seven_days">Los últimos 7 díes</string>
+    <string name="show_direction">Indicación de la distancia</string>
+    <string name="do_not_use_animations_descr">Desactiva les animaciones de l\'aplicación.</string>
+    <string name="measurement_tool">Midir la distancia</string>
+    <string name="quick_action_resume_pause_navigation_descr">Toca esti botón pa posar o siguir cola navegación.</string>
+    <string name="quick_action_start_stop_navigation_descr">Toca esti botón p\'aniciar/finar la navegación.</string>
+    <string name="quick_action_auto_zoom_desc">Tocar esti botón d\'aición des/activa\'l zoom automáticu del mapa acordies cola to velocidá.</string>
+    <string name="analyze_on_map">Analizar nel mapa</string>
+    <string name="search_map_hint">Guetar una ciudá o rexón</string>
+    <string name="trip_rec_notification_settings">Activar l\'aniciu rápidu de les grabaciones</string>
+    <string name="trip_rec_notification_settings_desc">Amuesa una avisu que permite aniciar la grabación d\'un viaxe.</string>
+    <string name="translit_names"/>
+    <string name="custom_search">Gueta personalizada</string>
+    <string name="shared_string_filters">Peñeres</string>
+    <string name="save_filter">Guardar la peñera</string>
+    <string name="new_filter">Peñera nueva</string>
+    <string name="new_filter_desc">Introduz un nome pa la pañera nueva, esta peñera va amestase a la llingüeta «Estayes».</string>
+    <string name="donation_to_osm_desc">Parte de la donación mándase a los usuarios d\'OSM qu\'unviaron cambeos a OpenStreetMap. El costu de la soscripción sigue igual.</string>
+    <string name="skip_map_downloading">Omisión de la descarga de mapes</string>
+    <string name="skip_map_downloading_desc">Nun tienes dengún mapa instaláu. Escueyi unu de la llista o báxalu más sero per «Menú - %1$s».</string>
+    <string name="search_map">Guetando mapes…</string>
+    <string name="replace_favorite_confirmation">¿De xuru que quies trocar el favoritu %1$s\?</string>
+    <string name="share_history_subject">compartióse per OsmAnd</string>
+    <string name="city_type_neighbourhood">Vecinderu</string>
+    <string name="change_markers_position">Camudar la posición del marcador</string>
+    <string name="access_direction_haptic_feedback">Direiciones háptiques</string>
+    <string name="access_smart_autoannounce">Anunciu intelixente</string>
+    <string name="access_collapsed_list"/>
+    <string name="access_tree_list">Llista n\'árbole</string>
+    <string name="map_mode">Mou del mapa</string>
+    <string name="open_street_map_login_and_pass">Nome d\'usuariu y contraseña d\'OSM</string>
+    <string name="add_points_to_map_markers_q">¿Amestar tolos puntos como marcadores del mapa\?</string>
+    <string name="clear_active_markers_q">¿Desaniciar tolos marcadores activos\?</string>
+    <string name="active_markers">Marcadores activos</string>
+    <string name="map_markers">Marcadores del mapa</string>
+    <string name="starting_point">Puntu d\'aniciu</string>
+    <string name="rec_split">Dixebra de la grabadora</string>
+    <string name="rec_split_title">Usar la dixebra de la grabadora</string>
+    <string name="rec_split_desc">Sobrescribe los clips cuando l\'espaciu usáu perpasa\'l tamañu d\'almacenamientu.</string>
+    <string name="rec_split_clip_length">Llargor de los clips</string>
+    <string name="rec_split_storage_size_desc">La cantidá d\'espaciu que puen ocupar tolos clips grabaos.</string>
+    <string name="access_from_map">Acceder dende\'l mapa</string>
+    <string name="simulate_initial_startup">Simular el primer aniciu de l\'aplicación</string>
+    <string name="share_geo">geo:</string>
+    <string name="traffic_warning_hazard">Peligru</string>
+    <string name="rendering_value_default13_name">Por defeutu (13)</string>
+    <string name="rendering_value_defaultTranslucentCyan_name">Por defeutu (cianu tresllúcido)</string>
+    <string name="rendering_value_darkyellow_name">Mariellu escuro</string>
+    <string name="rendering_value_translucent_pink_name">Rosa tresllúcido</string>
+    <string name="rendering_value_black_name">Prietu</string>
+    <string name="lang_lo">Laosianu</string>
+    <string name="lang_kab">Cabiliu</string>
+    <string name="lang_ber">Bereber</string>
+    <string name="shared_string_dismiss">Escartar</string>
+    <string name="shared_string_on">Sí</string>
+    <string name="shared_string_off">Non</string>
+    <string name="shared_string_enable">Activar</string>
+    <string name="shared_string_disabled">Desactivóse</string>
+    <string name="shared_string_control_start">Aniciar</string>
+    <string name="shared_string_collapse">Recoyer</string>
+    <string name="plugin_ski_name">Vista de mapa d\'esquí</string>
+    <string name="version_settings">Compilaciones</string>
+    <string name="rendering_value__name">Por defeutu</string>
+    <string name="rendering_value_default_name">Por defeutu</string>
+    <string name="rendering_value_highContrastRoads_name">Carreteres en contraste altu</string>
+    <string name="rendering_value_americanRoadAtlas_name">Atles de carreteres americanes</string>
+    <string name="no_internet_connection">Nun pue baxase, comprueba la conexón a internet.</string>
+    <string name="rendering_attr_subwayMode_name">Rutes de metru</string>
+    <string name="enable_proxy_title">Activar el proxy HTTP</string>
+    <string name="proxy_host_title">Agospiu del proxy</string>
+    <string name="of">%1$d de %2$d</string>
+    <string name="ascent_descent">Ascendente/descendente</string>
+    <string name="home">Panel</string>
+    <string name="always_center_position_on_map">Amosar la posición nel centru siempres</string>
+    <string name="lang_sr_latn">Serbiu llatín</string>
+    <string name="lang_zh_hk">Chinu (Ḥong Kong)</string>
+    <string name="lang_gn_py">Guaraní</string>
+    <string name="route_descr_select_destination">Esbilla\'l destín</string>
+    <string name="app_modes_choose_descr">Esbilla los perfiles que van ser visibles na aplicación.</string>
+    <string name="app_modes_choose">Perfiles de l\'aplicación</string>
+    <string name="map_widget_map_rendering">Renderizáu del mapa</string>
+    <string name="app_mode_motorcycle">Motocicleta</string>
+    <string name="map_magnifier">Lente del mapa</string>
+    <string name="edit_tilesource_maxzoom">Zoom máximu</string>
+    <string name="edit_tilesource_minzoom">Zoom mínimu</string>
+    <string name="driving_region">Rexón de conducción</string>
+    <string name="driving_region_australia">Australia</string>
+    <string name="speak_title">Anunciar…</string>
+    <string name="settings_preset">Perfil predetermináu</string>
+    <string name="distance_measurement_start_editing">Apenzar la edición</string>
+    <string name="use_magnetic_sensor">Usar el sensor magnéticu</string>
+    <string name="cancel_route">Escarte de la ruta</string>
+    <string name="contribution_activity">Instalación d\'una versión</string>
+    <string name="choose_osmand_theme">Estilu de l\'aplicación</string>
+    <string name="accessibility_options">Opciones d\'accesibilidá</string>
+    <string name="prefer_in_routing_title">Preferir…</string>
+    <string name="download_wikipedia_maps">Wikipedia</string>
+    <string name="stop_routing_confirm">¿De xuru que quies parar la navegación\?</string>
+    <string name="clear_dest_confirm">¿De xuru que quies llimpiar el destín (y los destinos intermedios)\?</string>
+    <string name="recording_context_menu_precord">Facer una semeya</string>
+    <string name="av_def_action_choose">Esbillar so demanda</string>
+    <string name="av_def_action_video">Grabar un videu</string>
+    <string name="av_def_action_audio">Grabar l\'audiu</string>
+    <string name="av_widget_action_descr">Esbilla l\'aición predeterminada del widget.</string>
+    <string name="av_widget_action">Aición predeterminada del widget</string>
+    <string name="av_video_format_descr">Esbilla\'l formatu de salida del videu.</string>
+    <string name="av_use_external_recorder_descr">Usa la grabadora del sistema pal videu.</string>
+    <string name="av_use_external_recorder">Usar al grabadora del sistema</string>
+    <string name="av_use_external_camera_descr">Usa l\'aplicación del sistema pa les semeyes.</string>
+    <string name="av_settings_descr">Configura los axustes d\'audiu y videu.</string>
+    <string name="av_settings">Axustes d\'audiu/videu</string>
+    <string name="recording_error">Falló la grabación</string>
+    <string name="recording_camera_not_available">"La cámara nun ta disponible "</string>
+    <string name="recording_delete_confirm">¿Desaniciar esti elementu\?</string>
+    <string name="recording_unavailable">non disponible</string>
+    <string name="recording_context_menu_arecord">Crear una nota d\'audiu</string>
+    <string name="recording_context_menu_vrecord">Crear una nota de videu</string>
+    <string name="map_widget_av_notes">Notes d\'audiu/videu</string>
+    <string name="download_select_map_types">Otros mapes</string>
+    <string name="download_roads_only_item">Namái carreteres</string>
+    <string name="download_regular_maps">Mapa estándar</string>
+    <string name="download_roads_only_maps">Mapa de namái carreteres</string>
+    <string name="map_widget_max_speed">Llende de velocidá</string>
+    <string name="monitoring_control_start">GPX</string>
+    <string name="no_buildings_found">Nun s\'alcontraron edificaciones.</string>
+    <string name="rendering_attr_showRoadMaps_name">Mapes de namái carreteres</string>
+    <string name="zxing_barcode_scanner_not_found">Nun s\'instaló l\'aplicación ZXing Barcode Scanner. ¿Guetala en Google Play\?</string>
+    <string name="gps_not_available">Activa\'l GPS nos axustes, por favor</string>
+    <string name="intermediate_point">Destín intermediu %1$s</string>
+    <string name="replace_destination_point">Trocar el destín</string>
+    <string name="new_destination_point_dialog">Yá afitesti un destín:</string>
+    <string name="intermediate_point_too_far">El destín intermediu %1$s ta perlloñe de la carretera más cercana.</string>
+    <string name="arrived_at_intermediate_point">Aportesti al destín intermediu</string>
+    <string name="map_widget_intermediate_distance">Destín intermediu</string>
+    <string name="ending_point_too_far">El puntu de fin ta perlloñe de la carretera más cercana.</string>
+    <string name="btn_advanced_mode">Mou avanzáu…</string>
+    <string name="poi_filter_emergency">Emerxencia</string>
+    <string name="poi_filter_public_transport">Tresporte públicu</string>
+    <string name="poi_filter_restaurants">Restoranes</string>
+    <string name="show_warnings_title">Amosar alertes…</string>
+    <string name="interrupt_music">Posar la música</string>
+    <string name="day_night_info_description">Riscar: %1$s 
+\nAtapecer: %2$s</string>
+    <string name="day_night_info">Información de día/nueche</string>
+    <string name="map_widget_renderer">Estilu del mapa</string>
+    <string name="map_widget_transparent">Widgets tresparentes</string>
+    <string name="screen_is_locked">Toca l\'iconu de bloquéu pa desbloquiar la pantalla</string>
+    <string name="map_widget_back_to_loc">Ónde toi</string>
+    <string name="map_widget_compass">Brúxula</string>
+    <string name="map_widget_reset">Reafitar</string>
+    <string name="map_widget_speed">Velocidá</string>
+    <string name="map_widget_altitude">Altitú</string>
+    <string name="map_widget_next_turn">Xiru siguiente</string>
+    <string name="bg_service_screen_lock_toast">La pantalla ta bloquiada</string>
+    <string name="route_updated_loc_found">Esperando la posición pa calcular la ruta</string>
+    <string name="osmand_parking_hours">Hores</string>
+    <string name="osmand_parking_minutes">Minutos</string>
+    <string name="osmand_parking_position_description_add_time">El coche ta aparcáu en</string>
+    <string name="global_app_allocated_memory">Memoria asignada</string>
+    <string name="native_app_allocated_memory">Memoria nativa total</string>
+    <string name="starting_point_too_far">El puntu d\'aniciu ta perlloñe de la carretera más cercana.</string>
+    <string name="osmand_parking_pm">PM</string>
+    <string name="rendering_attr_noPolygons_name">Polígonos</string>
+    <string name="rendering_attr_appMode_name">Mou del renderizáu</string>
+    <string name="favourites_search_desc">Un mou de guetar favoritos</string>
+    <string name="unknown_from_location">Entá nun se determinó\'l puntu d\'aniciu</string>
+    <string name="unknown_location">Entá nun se conoz la posición</string>
+    <string name="confirm_interrupt_download">¿Encaboxar la descarga del ficheru\?</string>
+    <string name="plugins_screen">Plugins</string>
+    <string name="prefs_plugins">Plugins</string>
+    <string name="gpx_visibility_txt">Visibilidá</string>
+    <string name="info_button">Información</string>
+    <string name="accessibility_default">Acordies col axuste del sistema Android</string>
+    <string name="backToMenu">Volver al menú</string>
+    <string name="north">norte</string>
+    <string name="north_north_east">nornoreste</string>
+    <string name="north_east">noreste</string>
+    <string name="east_north_east">este-noreste</string>
+    <string name="east">este</string>
+    <string name="east_south_east">este-sureste</string>
+    <string name="south_east">sureste</string>
+    <string name="south_south_east">sursureste</string>
+    <string name="south">sur</string>
+    <string name="south_south_west">sursuroeste</string>
+    <string name="south_west">suroeste</string>
+    <string name="west_south_west">oeste-sureste</string>
+    <string name="west">oeste</string>
+    <string name="west_north_west">oeste-noroeste</string>
+    <string name="north_west">noroeste</string>
+    <string name="north_north_west">nornoroeste</string>
+    <string name="oclock">en puntu</string>
+    <string name="accuracy">Precisión</string>
+    <string name="altitude">Altitú</string>
+    <string name="i_am_here">Toi equí</string>
+    <string name="arrival_distance_factor_normally">Normal</string>
+    <string name="arrival_distance_factor_at_last">Nos últimos metros</string>
+    <string name="offline_edition">Edición fuera de llinia</string>
+    <string name="offline_edition_descr">Siempres va usase la edición fuera de llinia.</string>
+    <string name="local_openstreetmap_uploading">Xubiendo…</string>
+    <string name="free_version_message">Pues baxar o anovar %1$s mapes.</string>
+    <string name="free_version_title">Versión de baldre</string>
+    <string name="index_name_netherlands">Europa - Países Baxos</string>
+    <string name="index_name_us">América del Norte - Estaos Xuníos</string>
+    <string name="index_name_africa">África</string>
+    <string name="index_name_oceania">Australia y Oceanía</string>
+    <string name="amenity_type_osmwiki">Wikipedia (fuera de llinia)</string>
+    <string name="routing_settings">Navegación</string>
+    <string name="routing_settings_descr">Especifica les opciones pa la navegación.</string>
+    <string name="global_settings">Axustes globales</string>
+    <string name="general_settings">Xeneral</string>
+    <string name="general_settings_descr">Configura los axustes comunes y d\'amuesa de l\'aplicación.</string>
+    <string name="global_app_settings">Axustes globales de l\'aplicación</string>
+    <string name="user_name">Nome d\'usuariu</string>
+    <string name="open_street_map_login_descr">Precísense pa los unvios a openstreetmap.org .</string>
+    <string name="user_password">Contraseña</string>
+    <string name="use_transparent_map_theme">Estilu tresparente</string>
+    <string name="native_library_not_supported">La biblioteca nativa nun se sofita nesti preséu.</string>
+    <string name="init_native_library">Aniciando la biblioteca nativa…</string>
+    <string name="keep_informing_descr">Anunciar de nueves les instrucciones de navegación en intervalos regulares.</string>
+    <string name="pref_raster_map">Axustes de la fonte del mapa</string>
+    <string name="delete_confirmation_msg">¿Desaniciar %1$s\?</string>
+    <string name="city_type_village">Pueblu</string>
+    <string name="city_type_town">Villa</string>
+    <string name="city_type_city">Ciudá</string>
+    <string name="file_can_not_be_renamed">El ficheru nun pue renomase.</string>
+    <string name="file_with_name_already_exists">Yá esiste un ficheru esi mesmu nome.</string>
+    <string name="search_position_address">Direición…</string>
+    <string name="search_position_favorites">Favoritos…</string>
+    <string name="select_search_position">Orixe:</string>
+    <string name="file_with_name_already_exist">Yá esiste un ficheru col mesmu nome.</string>
+    <string name="favorite_friends_category">Collacios</string>
+    <string name="shared_string_name">Nome</string>
+    <string name="favourites_edit_dialog_category">Estaya</string>
+    <string name="shared_string_no_thanks">Non, gracies</string>
+    <string name="local_index_installed">Versión llocal</string>
+    <string name="local_index_no_items_to_do">Nun hai elementos a %1$s</string>
+    <string name="local_index_action_do">Tas a piques de %1$s %2$s elementu(os). ¿Siguir\?</string>
+    <string name="local_index_mi_restore">Activar</string>
+    <string name="local_index_mi_backup">Desactivar</string>
+    <string name="local_indexes_cat_backup">Desactivóse</string>
+    <string name="ttsvoice">Voz TTS</string>
+    <string name="map_text_size_descr">Esbilla\'l tamañu del testu de los nomes nel mapa.</string>
+    <string name="preferred_locale_descr">Esbilla la llingua a usar (fai efeutu cuando se reanicia OsmAnd).</string>
+    <string name="preferred_locale">Llingua</string>
+    <string name="version_index_is_not_supported">Nun se sofita la versión del índiz «{0}»</string>
+    <string name="specified_dir_doesnt_exist">Nun pue alcontrase la carpeta especificada.</string>
+    <string name="loading_builds_failed">Falló la recupración de la llista de compilaciones d\'OsmAnd</string>
+    <string name="loading_builds">Cargando compilaciones d\'OsmAnd…</string>
+    <string name="select_build_to_install">Esbilla una compilación d\'OsmAnd a instalar</string>
+    <string name="daynight_mode_day">Día</string>
+    <string name="daynight_mode_night">Nueche</string>
+    <string name="daynight_mode_auto">Riscar/atapecer</string>
+    <string name="daynight_mode_sensor">Sensor de lluz</string>
+    <string name="maps_could_not_be_downloaded">Esti mapa nun pudo baxase</string>
+    <string name="rendering_exception">Nun pudo dibuxase l\'área esbilláu</string>
+    <string name="renderer_load_exception">Nun pudo cargase\'l renderizador</string>
+    <string name="renderers">Renderizador de vectores</string>
+    <string name="rotate_map_compass_opt">Direición de la brúxula</string>
+    <string name="rotate_map_bearing_opt">Direición de la movición</string>
+    <string name="rotate_map_none_opt">Ensin voltéu (el norte siempres p\'arriba)</string>
+    <string name="rotate_map_to_bearing">Orientación del mapa</string>
+    <string name="share_fav_subject">Favoritos compartíos per OsmAnd</string>
+    <string name="error_occurred_loading_gpx">Nun pudo cargase\'l GPX</string>
+    <string name="send_report">Unviar un informe</string>
+    <string name="none_region_found">Nun pudo alcontrase dengún mapa baxáu na tarxeta de memoria.</string>
+    <string name="layer_osm_bugs">Notes d\'OSM (en llinia)</string>
+    <string name="where_am_i">¿Ónde toi\?</string>
+    <string name="gps_provider">GPS</string>
+    <string name="background_service_provider">Fornidor d\'allugamientos</string>
+    <string name="search_poi_filter"/>
+    <string name="menu_mute_off">El soníu ta activáu</string>
+    <string name="menu_mute_on">El soníu ta desactiváu</string>
+    <string name="voice_data_initializing">Aniciando los datos de voz…</string>
+    <string name="unzipping_file">Descompriendo\'l ficheru…</string>
+    <string name="route_tr"/>
+    <string name="first_time_continue">Más sero</string>
+    <string name="search_poi_location">Esperando la señal…</string>
+    <string name="map_orientation_default">Igual que la del preséu</string>
+    <string name="map_screen_orientation">Orientación de la pantalla</string>
+    <string name="update_poi_error_loading">Nun pudieron cargase los datos del sirvidor</string>
+    <string name="context_menu_item_update_map_confirm">¿Anovar los datos llocales d\'internet\?</string>
+    <string name="search_history_city">Ciudá: {0}</string>
+    <string name="search_history_street">Cai: {0}, {1}</string>
+    <string name="search_history_int_streets">Interseición: {0} x {1} en {2}</string>
+    <string name="uploading_data">Xubiendo datos…</string>
+    <string name="uploading">Xubiendo…</string>
+    <string name="searching">Guetando…</string>
+    <string name="search_offline_address">Gueta fuera de llinia</string>
+    <string name="search_online_address">Gueta en llinia</string>
+    <string name="route_general_information">Distancia total %1$s, tiempu del viaxe %2$d h %3$d min.</string>
+    <string name="address">Direición</string>
+    <string name="downloading_list_indexes">Baxando la llista de rexones disponibles…</string>
+    <string name="list_index_files_was_not_loaded">Nun pudo dise en cata de la llista de rexones de https://osmand.net .</string>
+    <string name="fav_points_not_exist">Nun esisten puntos favoritos</string>
+    <string name="update_existing">Trocar</string>
+    <string name="mark_final_location_first">Primero esbillá\'l destín</string>
+    <string name="closing_changeset">Zarrando\'l conxuntu de cambeos…</string>
+    <string name="auth_failed">Falló l\'autorización</string>
+    <string name="failed_op">falló</string>
+    <string name="loading_streets_buildings">Cargando cais/edificaciones…</string>
+    <string name="loading_postcodes">Cargando códigos postales…</string>
+    <string name="loading_streets">Cargando cais…</string>
+    <string name="loading_cities">Cargando ciudaes…</string>
+    <string name="poi">PdI</string>
+    <string name="error_calculating_route_occured">Nun pudo calculase la ruta</string>
+    <string name="arrived_at_destination">Aportesti al destín</string>
+    <string name="loading_data">Cargando datos…</string>
+    <string name="previous_run_crashed">La última execución d\'OsmAnd cascó. El ficheru de rexistru ta en {0}. Informa del fallu y axunta esi ficheru, por favor.</string>
+    <string name="use_online_routing_descr">Usa internet pa calcular una ruta.</string>
+    <string name="data_settings">Datos</string>
+    <string name="additional_settings">Axustes adicionales</string>
+    <string name="use_internet">Usar internet</string>
+    <string name="use_internet_to_download_tile">Baxa los mosaicos del mapa que falten</string>
+    <string name="search_button">Guetar</string>
+    <string name="Closest_Amenities">Servicios más cercanos</string>
+    <string name="navigate_point_latitude">Llatitú</string>
+    <string name="navigate_point_longitude">Llonxitú</string>
+    <string name="search_address_region">Rexón</string>
+    <string name="search_address_city">Ciudá</string>
+    <string name="poi_error_unexpected_template">Nun pudo facese l\'aición {0}.</string>
+    <string name="poi_error_io_error_template">Fallu d\'E/S mentanto se facía l\'aición {0}.</string>
+    <string name="poi_dialog_other_tags_message">Caltiénense toles demás etiquetes</string>
+    <string name="edit_filter_delete_dialog_title">¿Desaniciar la peñera esbillada\?</string>
+    <string name="edit_filter_delete_message">Desanicióse la pañera {0}</string>
+    <string name="edit_filter_create_message">Creóse la pañera {0}</string>
+    <string name="av_camera_focus_descr">Esbilla\'l mou internu d\'enfoque de la cámara.</string>
+    <string name="av_camera_focus_auto">Enfoque automáticu</string>
+    <string name="av_camera_focus_hiperfocal">Enfoque hiperfocal</string>
+    <string name="av_camera_focus_continuous">La cámara tenta d\'enfocar de contino</string>
+    <string name="av_photo_play_sound">Reproducir un soníu al facer una semeya</string>
+    <string name="plugin_install_needs_network">Precises tar coneutáu a internet pa instalar esti plugin.</string>
+    <string name="use_fast_recalculation">Recálculu intelixente de rutes</string>
+    <string name="use_fast_recalculation_desc">Pa viaxes llargos, namái recalcula la parte inicial d\'una ruta.</string>
+    <string name="do_you_like_osmand">¿Préstate OsmAnd\?</string>
+    <string name="failed_to_upload">Falló la xuba</string>
+    <string name="dahboard_options_dialog_title">Configuración del panel</string>
+    <string name="poi_dialog_poi_type">Triba del PdI</string>
+    <string name="favourites">Favoritos</string>
+    <string name="count_of_lines">Númberu de llinies</string>
+    <string name="downloads_left_template">Queden %1$s descargues</string>
+    <string name="show_free_version_banner">Amosar la pancarta de la versión de baldre</string>
+    <string name="show_free_version_banner_description">Amuesa la pancarta de la versión de baldre magar que teas na de pagu.</string>
+    <string name="confirm_download_roadmaps">Nun se precisa\'l mapa de namái de carreteres darréu que tienes el mapa estándar (completu). ¿Baxalu de toes toes\?</string>
+    <string name="plugins_menu_group">Plugins</string>
+    <string name="first_usage_item_description">Cómo baxar mapes y afitar los axustes básicos.</string>
+    <string name="navigation_item_description">Configura la navegación.</string>
+    <string name="map_viewing_item">Vista del mapa</string>
+    <string name="instalation_troubleshooting_item">Instalación ya igües de fallos</string>
+    <string name="techical_articles_item">Artículos téunicos</string>
+    <string name="versions_item">Versiones</string>
+    <string name="feedback">Comentarios</string>
+    <string name="map_legend">Lleenda del mapa</string>
+    <string name="dashboard_or_drawer_title">Panel o menú de control</string>
+    <string name="hourly">Cada hora</string>
+    <string name="number_of_contributors">Númberu de collaboradores</string>
+    <string name="configure_screen_quick_action">Aición rápida</string>
+    <string name="quick_action_map_style_switch">L\'estilu del mapa camudó a «%s».</string>
+    <string name="quick_action_take_audio_note">Nota d\'audiu nueva</string>
+    <string name="quick_action_navigation_voice_off">La voz ta desactivada</string>
+    <string name="quick_action_navigation_voice_on">La voz ta activada</string>
+    <string name="quick_actions_delete_text">¿De xuru que quies desaniciar l\'aición «%s»\?</string>
+    <string name="quick_action_take_audio_note_descr">Tocar esti botón d\'aición amiesta una nota d\'audiu metanes de la pantalla.</string>
+    <string name="quick_action_add_osm_bug_descr">Tocar esti botón d\'aición amiesta una nota d\'OSM metanes de la pantalla.</string>
+    <string name="quick_action_add_poi_descr">Tocar esti botón d\'aición amiesta un PdI metanes de la pantalla.</string>
+    <string name="quick_action_switch_day_mode">Mou diurnu</string>
+    <string name="quick_action_switch_night_mode">Mou nocherniegu</string>
+    <string name="quick_action_showhide_favorites_descr">Tocar esti botón d\'aición amuesa/anubre nel mapa los puntos favoritos.</string>
+    <string name="quick_action_showhide_poi_descr">Tocar esti botón d\'aición amuesa/anubre nel mapa los PdI.</string>
+    <string name="quick_action_showhide_favorites_title">Amosar/anubrir Favoritos</string>
+    <string name="quick_action_add_navigation">Navegación</string>
+    <string name="quick_action_bug_descr">Esti mensaxe inclúise nel campu de comentarios.</string>
+    <string name="quick_action_gpx_category_descr">Esbilla una estaya opcional.</string>
+    <string name="mappilary_no_internet_desc">Precises tar coneutáu a internet pa ver les semeyes de Mapillary.</string>
+    <string name="retry">Retentar</string>
+    <string name="empty_state_favourites">Amiestu de favoritos</string>
+    <string name="empty_state_favourites_desc">Importa favoritos o amiéstalos per puntos de marcáu nel mapa.</string>
+    <string name="total_donations">Donaciones totales</string>
+    <string name="toast_empty_name_error">Allugamientu ensin nome</string>
+    <string name="show_tunnels">Túneles</string>
+    <string name="download_wiki_region_placeholder">esta rexón</string>
+    <string name="wiki_article_not_found">Nun s\'alcontró l\'artículu</string>
+    <string name="how_to_open_wiki_title">¿Cómo abrir los artículos de Wikipedia\?</string>
+    <string name="run_full_osmand_header">¿Llanzar OsmAnd\?</string>
+    <string name="delete_search_history">Desaniciar l\'historial de gueta</string>
+    <string name="download_images">Baxar imáxenes</string>
+    <string name="shared_string_read">Lleer</string>
+    <string name="shared_string_result">Resultáu</string>
+    <string name="show_closed_notes">Amosar notes zarraes</string>
+    <string name="osm_edits_export_desc">Esbilla la triba d\'esportación: notes d\'OSM, PdI o dambos.</string>
+    <string name="empty_state_markers_history_desc">Los marcadores como pasaos van apaecer nesta pantalla.</string>
+    <string name="marker_moved_to_history">Movióse\'l marcador del mapa al historial</string>
+    <string name="shared_string_list">Llista</string>
+    <string name="make_active">Facer activu</string>
+    <string name="none_point_error">Amiesta polo menos un puntu, por favor.</string>
+    <string name="mapillary_menu_title_pano">Amosar imáxenes namái en 360°</string>
+    <string name="report">Informe</string>
+    <string name="number_of_recipients">Númberu de beneficiarios</string>
+    <string name="upload_osm_note">Xuba d\'una nota d\'OSM</string>
+    <string name="shared_string_reverse_order">Orde inversu</string>
+    <string name="shared_string_select">Esbillar</string>
+    <string name="shared_string_launch">Llanzar</string>
+    <string name="print_route">Imprentación de la ruta</string>
+    <string name="app_mode_aircraft">Aeronave</string>
+    <string name="animate_routing_route">Simular usando la ruta calculada</string>
+    <string name="map_widget_fps_info">Información de depuración de FPS</string>
+    <string name="driving_region_descr">Esbilla la rexón de conducción: EE.UU, Europa, Reinu Xuníu, Asia y otra.</string>
+    <string name="map_widget_gps_info">Información del GPS</string>
+    <string name="layer_recordings">Capa de grabación</string>
+    <string name="poi_filter_accomodation">Agospiu</string>
+    <string name="osmand_plus_extended_description_part8">Calidá y cobertoria aproximada de mapes:
+\n • Europa Occidental: ****
+\n • Europa Oriental: ***
+\n • Rusia: ***
+\n • América del Norte: ***
+\n • América del Sur: **
+\n • Asia: **
+\n • Xapón y Corea: ***
+\n • Oriente Mediu: **
+\n • África: **
+\n • L\'Antártida: *
+\n La mayoría de países del mundu tán disponibles como descarga
+\n Dende Afganistán hasta Zimbabue, dende Australia hasta EE.XX. Arxentina, Brasil, Canadá, Francia, Alemaña, Méxicu, Reinu Xuníu, España…
+\n</string>
+    <string name="native_app_allocated_memory_descr">L\'aplicación asignó %1$sMB de memoria nativa (Dalvik %2$sMB, otra %3$sMB). Memoria proporcional %4$sMB (llende d\'Android %5$sMB, Dalvik %6$sMB).</string>
+    <string name="osmand_parking_warning">Alvertencia</string>
+    <string name="local_openstreetmap_were_uploaded">Xubiéronse {0} PdI/notes</string>
+    <string name="filename_input">Nome de ficheru:</string>
+    <string name="layer_underlay">Capa soxacente…</string>
+    <string name="map_underlay">Capa soxacente</string>
+    <string name="layer_overlay">Capa superpuesta…</string>
+    <string name="map_overlay">Capa superpuesta</string>
+    <string name="renderers_descr">Esceuyi l\'aspeutu del renderizáu.</string>
+    <string name="show_route">Detalles de la ruta</string>
+    <string name="layer_map">Fonte del mapa…</string>
+    <string name="new_route_calculated_dist">Calculóse una ruta nueva, distancia</string>
+    <string name="app_settings">Axustes de l\'aplicación</string>
+    <string name="add_favorite_dialog_favourite_added_template">Amestóse\'l puntu favoritu «{0}».</string>
+    <string name="av_camera_pic_size_descr">Esbilla\'l tamañu de les semeyes de la cámara interna.</string>
+    <string name="rate_this_app_long">Puntua a OsmAnd en Google Play</string>
+    <string name="live_update">Anovamientu en direuto</string>
+    <string name="update_now">Anovar agora</string>
+    <string name="updates_size">Tamañu del anovamientu</string>
+    <string name="last_map_change">Últimu cambéu del mapa: %s</string>
+    <string name="reports_for">Informe de</string>
+    <string name="quick_action_take_video_note">Nota de videu nueva</string>
+    <string name="quick_action_category_descr">Esbilla la estaya na que guardar el favoritu.</string>
+    <string name="quick_action_map_overlay_switch">La capa superpuesta camudó a «%s».</string>
+    <string name="quick_action_map_underlay_switch">La capa soxacente camudó a «%s».</string>
+    <string name="quick_action_map_source_switch">La fonte del mapa camudó a «%s».</string>
+    <string name="osm_recipients_label">Beneficiarios d\'OSM</string>
+    <string name="points_of_interests">Puntos d\'interés (PdI)</string>
+    <string name="waiting_for_route_calculation">Esperando pol cálculu de la ruta</string>
+    <string name="intermediate_destinations">Destinos intermedios: %1$s</string>
+    <string name="map_import_error">Fallu na importación del mapa</string>
+    <string name="simulate_your_location">Simular la to posición</string>
+    <string name="shared_string_disable">Desactivar</string>
+    <string name="layer_amenity_label">Etiquetes de la capa de PdI</string>
+    <string name="disable_complex_routing">Desactivar l\'enrutamientu complexu</string>
+    <string name="use_fluorescent_overlays_descr">Usa colores fluorescentes p\'amosar itinerarios y rutes.</string>
+    <string name="layer_poi">Capa de PdI…</string>
+    <string name="poi_error_info_not_loaded">Nun pudo cargase la información tocante al noyu</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Capacidá</string>
+    <string name="shared_string_width">Anchor</string>
+    <string name="shared_string_height">Altor</string>
+    <string name="swap_start_and_destination">Intercambiar l\'aniciu y destín</string>
+    <string name="add_start_point">Amiestu d\'un puntu d\'aniciu</string>
+    <string name="intermediate_waypoint">Puntu intermediu: %1$s</string>
+    <string name="get_osmand_live">Consigui OsmAnd pa desbloquiar toles caratuerístiques: Anovamientos diarios del mapa con descargues ensin llende, tolos plugins de pagu y de baldre, Wikipedia, Wikivoyage y muncho más.</string>
+    <string name="maps_you_need_descr">Según los artículos qu\'amestesti a marcadores, aconséyase que baxes los mapes de darréu:</string>
+    <string name="popular_destinations">Destinos sonaos</string>
+    <string name="paid_app">Aplicación de pagu</string>
+    <string name="paid_plugin">Plugin de pagu</string>
+    <string name="welcome_to_open_beta_description">Anguaño les guíes de viaxes básense en Wikivoyage. Prueba de baldre toles carauterístiques na beta abierta. Dempués, eses guíes van tar disponibles pa los soscriptores d\'OsmAnd Unlimited y dueños dOsmAnd +.</string>
+    <string name="start_editing_card_description">Pues y deberíes editar cualesquier artículu de Wikivoyage. Comparti\'l talentu, curiáu, la conocencia y esperiencia que tengas</string>
+    <string name="get_unlimited_access">Consiguir l\'accesu ensin llende</string>
+    <string name="all_markers_moved_to_history">Tolos marcadores del mapa moviéronse al historial</string>
+    <string name="passed">Últimu usu: %1$s</string>
+    <string name="sort_by">Ordenar por</string>
+    <string name="get_it">Consiguir</string>
+    <string name="osm_live_banner_desc">Consigui más d\'una vegada al mes descagues y anovamientos ensin llende de mapes: selmanalmente, caldía, cada hora.</string>
+    <string name="osm_editors_ranking">Clasificación d\'editores d\'OSM</string>
+    <string name="world_map_download_descr">Falta o nun s\'anovó\'l mapamundi base (que cubre tol mundu a un nivel baxu de zoom). Considera baxalu pa una previsualización global, por favor.</string>
+    <string name="osm_changes_added_to_local_edits">Los cambeos d\'OSM amestáronse al conxuntu de cambeos llocal</string>
+    <string name="shared_string_enabled">Activóse</string>
+    <string name="max_min">Má/Mín</string>
+    <string name="min_max">Mín/Máx</string>
+    <string name="index_item_world_basemap">Mapamundi xeneral</string>
+    <string name="base_world_map">Mapamundi base</string>
+    <string name="local_osm_changes_backup_failed">Nun pudo facese una copia de seguranza de los cambeos d\'OSM</string>
+    <string name="plugin_distance_point_ele">elevación</string>
+    <string name="osmand_background_plugin_description">Amuesa los axustes p\'activar el siguimientu y navegación en segundu planu esconsoñando davezu\'l preséu GPS (cola pantalla apagada).</string>
+    <string name="dropbox_plugin_description">El plugin pa Dropbox permítete sincronizar itinerarios y notes d\'audiu/videu cola to cuenta de Dropbox.</string>
+    <string name="rendering_attr_noAdminboundaries_description">Omite l\'amuesa de llendes rexonales (niveles alministrativos 5-9).</string>
+    <string name="map_widget_monitoring_services">Servicios de rexistru</string>
+    <string name="poi_filter_for_tourists">Pa turistes</string>
+    <string name="poi_filter_fuel">Combustible</string>
+    <string name="global_app_allocated_memory_descr">Asignóse %1$sMB de memoria (llende d\'Android %2$sMB, Dalvik %3$sMB).</string>
+    <string name="local_indexes_cat_tile">Mapes de mosaicos en llinia y na caché</string>
+    <string name="local_indexes_cat_map">Mapes estándar (vectores)</string>
+    <string name="map_online_data">Mapes de mosaicos en llinia</string>
+    <string name="native_rendering">Renderización nativa</string>
+    <string name="show_current_gpx_title">Amosar l\'itinerariu actual</string>
+    <string name="data_to_search_poi_not_available">Los datos llocales pa guetar PdI nun tán presentes.</string>
+    <string name="basemap_missing">Baxa\'l mapamundi base pa consiguir una previsualización que cubra tol mundu a unos niveles baxos de zoom.</string>
+    <string name="search_offline_clear_search">Gueta nueva</string>
+    <string name="tts_missing_language_data">¿Dir a la tienda d\'aplicaciones pa baxar la llingua esbillada\?</string>
+    <string name="poi_filter_closest_poi">Los PdI más cercanos</string>
+    <string name="off_router_service_no_gps_available">El serviciu en segundu planu de navegación rique que s\'active un fornidor d\'allugamientos.</string>
+    <string name="sd_unmounted">La tarxeta de memoria nun ye accesible.
+\nNun vas ser a ver los mapes o alcontrar coses.</string>
+    <string name="map_orientation_portrait">Vertical</string>
+    <string name="map_orientation_landscape">Horizontal</string>
+    <string name="search_nothing_found">Nun s\'alcontró nada</string>
+    <string name="router_service_descr">Esbilla un serviciu de navegación en llinia o fuera de llinia.</string>
+    <string name="router_service">Serviciu de navegación</string>
+    <string name="loading_poi_obj">Cargando los PdI…</string>
+    <string name="invalid_locations">Les coordenaes nun son válides</string>
+    <string name="show_poi_over_map">Amuesa de la capa de PdI</string>
+    <string name="search_address_building">Edificiu</string>
+    <string name="search_address_building_option">Edificiu</string>
+    <string name="save_poi_without_poi_type_message">¿De xuru que quies guardar el PdI ensin una triba\?</string>
+    <string name="show_along_the_route">Amosar pel camín…</string>
+    <string name="osm_live_subscription_desc">La soscripción permite anovamientos cada hora, caldía, cada selmana y descargues ensin llende pa tolos mapes.</string>
+    <string name="rendering_value_thin_name">Delgáu</string>
+    <string name="agps_data_last_downloaded">Data de los últimos datos baxaos d\'A-GPS: %1$s</string>
+    <string name="plugin_nautical_name">Vista de mapa náuticu</string>
+    <string name="wake_on_voice">Prender la pantalla</string>
+    <string name="wake_on_voice_descr">Prende la pantalla del preséu (si ta apagada) cuando t\'aproximes a un xiru.</string>
+    <string name="speak_favorites">Favoritos cercanos</string>
+    <string name="speak_poi">PdI cercanos</string>
+    <string name="routing_attr_avoid_unpaved_name">Carreteres ensin pavimentar</string>
+    <string name="routing_attr_avoid_motorway_name">Autopistes</string>
+    <string name="snap_to_road_descr">Axusta la posición a los caminos na navegación.</string>
+    <string name="snap_to_road">Axustar a la carretera</string>
+    <string name="keep_informing_never">Namái a mano (toca na flecha)</string>
+    <string name="keep_informing">Repitir les instrucciones de navegación</string>
+    <string name="trace_rendering_descr">Amuesa\'l rindimientu del renderizáu.</string>
+    <string name="planning_trip_item">Planificación d\'un viaxe</string>
+    <string name="search_on_the_map_item">Guetes nel mapa</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-b+hsb/phrases.xml b/OsmAnd/res/values-b+hsb/phrases.xml
index cec103b9ea..a818d37e8f 100644
--- a/OsmAnd/res/values-b+hsb/phrases.xml
+++ b/OsmAnd/res/values-b+hsb/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 <string name="poi_shop">wobchod</string>
 		<string name="poi_shop_food">žiwidłowy wobchod a superwiki</string>
@@ -134,7 +134,7 @@
 	<string name="poi_bicycle_service">kolesowarski serwis</string>
 	<string name="poi_payment_toll_type">wašnje zapłaćenja</string>
 	<string name="poi_traffic_signals_sound">Zwuk</string>
-	<string name="poi_subway_station_filter">Zastanišćo metra</string>
+	<string name="poi_subway_station_filter">zastanišćo metra</string>
 	<string name="poi_pump">Klumpa</string>
 	<string name="poi_city_capital">Stolica</string>
 	<string name="poi_religion_type">Nabožina</string>
@@ -1522,7 +1522,7 @@
 	<string name="poi_traffic_calming_island">wobchadna kupa</string>
 	<string name="poi_traffic_signals">ampla</string>
 
-	<string name="poi_car_repair">awtowa reparatura</string>
+	<string name="poi_car_repair">awtowa porjedźernja</string>
 	<string name="poi_service_tyres">wobruče</string>
 	<string name="poi_vehicle_inspection">inspekcija awta</string>
 	<string name="poi_car_wash">awtowa myjernja</string>
@@ -1610,7 +1610,7 @@
 	<string name="poi_power_plant">milinarnja</string>
 	<string name="poi_power_generator">milinowy generator</string>
 	<string name="poi_post_office">póšta</string>
-	<string name="poi_post_box">listowy kašćik</string>
+	<string name="poi_post_box">póštowy kašćik</string>
 	<string name="poi_telephone">telefon</string>
 	<string name="poi_observation_tower">wobkedźowanska wěža</string>
 	<string name="poi_bell_tower">zwóńca</string>
@@ -2076,4 +2076,58 @@
 	<string name="poi_leaf_type_mixed">měšany</string>
 	<string name="poi_climbing_mixed_yes">měšane: haj</string>
 	<string name="poi_climbing_mixed_no">měšane: ně</string>
-	</resources>
+	<string name="poi_aerialway_bicycle">transport kolesow</string>
+	<string name="poi_transportation">transport</string>
+	<string name="poi_bicycle_parking">parkowanje kolesow</string>
+
+	<string name="poi_railway_yard">nakładne dwórnišćo</string>
+    <string name="poi_healthcare_rehabilitation">rehabilitacija</string>
+    <string name="poi_company">firma</string>
+    <string name="poi_health_specialty_physiatry_yes">medicina a rehapilitacija</string>
+    <string name="poi_counselling_type_marriage_yes">poradźowanje (kwas): haj</string>
+    <string name="poi_counselling_type_marriage_no">poradźowanje (kwas): ně</string>
+    <string name="poi_counselling_type_nutrition_yes">poradźowanje (zežiwjenje): haj</string>
+    <string name="poi_counselling_type_nutrition_nfire_hydo">poradźowanje (zežiwjenje): ně</string>
+    <string name="poi_counselling_type_rehabilitation_yes">poradźowanje (rehabilitacija): haj</string>
+    <string name="poi_counselling_type_rehabilitation_no">poradźowanje (rehabilitacija): ně</string>
+    <string name="poi_counselling_type_sexual_yes">poradźowanje (seksualne): haj</string>
+    <string name="poi_counselling_type_sexual_no">poradźowanje (seksualne): ně</string>
+    <string name="poi_counselling_type_sexual_abuse_yes">poradźowanje (seksualne znjewužiwanje): haj</string>
+    <string name="poi_counselling_type_sexual_abuse_no">poradźowanje (seksualne znjewužiwanje): ně</string>
+    <string name="poi_counselling_type_victim_yes">poradźowanje (wopory): haj</string>
+    <string name="poi_counselling_type_victim_no">poradźowanje (wopory): ně</string>
+    <string name="poi_counselling_type_violence_yes">poradźowanje (namóc): haj</string>
+    <string name="poi_counselling_type_violence_no">poradźowanje (namóc): ně</string>
+    <string name="poi_provided_for_infant_yes">poskitk za dźěći: haj</string>
+    <string name="poi_provided_for_infant_no">poskitk za dźěći: ně</string>
+    <string name="poi_provided_for_toddler_yes">poskitk za ćěšenki: haj</string>
+    <string name="poi_provided_for_toddler_no">poskitk za ćěšenki: ně</string>
+    <string name="poi_provided_for_adult_yes">poskitk za dorosćenych: haj</string>
+    <string name="poi_provided_for_adult_no">poskitk za dorosćenych: ně</string>
+    <string name="poi_provided_for_woman_yes">poskitk za žony: haj</string>
+    <string name="poi_provided_for_woman_no">poskitk za žony: ně</string>
+    <string name="poi_provided_for_senior_yes">poskitk za seniorow: haj</string>
+    <string name="poi_provided_for_senior_no">poskitk za seniorow: ně</string>
+    <string name="poi_provided_for_girl_yes">poskitk za holcy: haj</string>
+    <string name="poi_provided_for_girl_no">poskitk za holcy: ně</string>
+    <string name="poi_provided_for_man_yes">poskitk za mužow: haj</string>
+    <string name="poi_provided_for_man_no">poskitk za mužow: ně</string>
+    <string name="poi_provided_for_boy_yes">poskitk za hólcow: haj</string>
+    <string name="poi_provided_for_boy_no">poskitk za hólcow: ně</string>
+    <string name="poi_counselling_yes">poradźowanje: haj</string>
+    <string name="poi_counselling_no">poradźowanje: ně</string>
+    <string name="poi_emergency_yes">nuzowe pady: haj</string>
+    <string name="poi_emergency_no">nuzowe pady: ně</string>
+    <string name="poi_home_visit_no">domowy wopyt: ně</string>
+    <string name="poi_fire_hydrant_position_green">zelenišćo</string>
+    <string name="poi_fire_hydrant_position_parking_lot">parkowanišćo</string>
+    <string name="poi_salt_yes">sel</string>
+    <string name="poi_salt_no">sel: ně</string>
+    <string name="poi_telescope_usage_education">wužiwanje: kubłanje</string>
+    <string name="poi_telescope_usage_espionage">wužiwanje: spionaža</string>
+    <string name="poi_telescope_usage_research">wužiwanje: slědźenje</string>
+    <string name="poi_observatory_type_espionage">wužiwanje: spionaža</string>
+    <string name="poi_display_yes">display: haj</string>
+    <string name="poi_display_no">display: ně</string>
+    <string name="poi_service_vehicle_car_repair_yes">awtowa porjedźernja</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-b+hsb/strings.xml b/OsmAnd/res/values-b+hsb/strings.xml
index 78a098779f..766a3143e8 100644
--- a/OsmAnd/res/values-b+hsb/strings.xml
+++ b/OsmAnd/res/values-b+hsb/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 <string name="app_mode_bus">Bus</string>
  	<string name="app_mode_train">Ćah</string>
@@ -420,7 +420,7 @@
     <string name="rendering_attr_roadColors_description">Wubjerće barbowu šemu za dróhi:</string>
     <string name="rendering_attr_roadColors_name">Barbowa šema dróhow</string>
     <string name="map_widget_show_destination_arrow">Pokazaj směr do cila</string>
-    <string name="enable_plugin_monitoring_services">Zapińće nahrawanski modul, zo byšće móhł(a) wužiwać nahrawanske słužby (GPX-logging, online-tracking)</string>
+    <string name="enable_plugin_monitoring_services">Zapińće nahrawanski modul, zo byšće móhł(a) wužiwać nahrawanske słužby (GPX-nahrawanje, online-tracking)</string>
     <string name="non_optimal_route_calculation">Snadź njeoptimalne čary přez dołhe distancy wobličeć</string>
     <string name="gps_not_available">Prošu zapińće GPS w swojich nastajenjach</string>
     <string name="map_widget_monitoring_services">Słužby nahrawanja</string>
@@ -938,7 +938,7 @@
     <string name="mapillary_image">Wobraz z Mapillary</string>
     <string name="open_mapillary">Mapillary wočinić</string>
     <string name="improve_coverage_install_mapillary_desc">Instaluj Mapillary, zo by swójske wobrazy abo seriju wobrazow z tutym městnom zwjazał(a).</string>
-    <string name="online_photos">Fota online</string>
+    <string name="online_photos">Wobrazy w syći</string>
     <string name="mapillary_widget">Asistent Mapillary</string>
     <string name="private_access_routing_req">Twój cil leži w priwatnej kónčinje. Za tutu jězbu přistup k priwatnym pućam dowolić?</string>
     <string name="restart_search">Pytanje wospjetować</string>
@@ -1517,4 +1517,23 @@
     <string name="route_info">Informacije wo čarje</string>
     <string name="routing_attr_prefer_motorway_name">Awtodróhi preferować</string>
     <string name="routing_attr_prefer_motorway_description">Awtodróhi preferować</string>
-    </resources>
+    <string name="gpx_monitoring_start">GPX-nahrawanje započeć</string>
+    <string name="gpx_monitoring_stop">GPX-nahrawanje zastajić</string>
+    <string name="map_widget_monitoring">GPX-nahrawanje</string>
+    <string name="distance_farthest">Zdalenosć: najdalši jako prěni</string>
+    <string name="distance_nearest">Zdalenosć: najbliši jako prěni</string>
+    <string name="enter_lat_and_lon">Šěrinu a dołhotu zapodać</string>
+	<string name="east_abbreviation">W</string>
+	<string name="west_abbreviation">Z</string>
+	<string name="south_abbreviation">J</string>
+	<string name="north_abbreviation">S</string>
+	<string name="transport_nearby_routes_within">Bliske linije we wokruhu</string>
+    <string name="map_imported_successfully">Karta importěrowana</string>
+    <string name="osm_live_banner_desc">Za njewobmjezowane sćehnjenje kartow a aktualizacije husćišo hač jónu wob měsac: tydźensce, wšědnje abo hodźinsce.</string>
+    <string name="save_global_track_interval">Powšitkowny interwal nahrawanja</string>
+    <string name="save_track_to_gpx_globally">Čaru jako GPX-dataju nahrać</string>
+    <string name="save_track_interval_globally">Interwal nahrawanja</string>
+    <string name="save_track_interval">Interwal nahrawanja w běhu nawigacije</string>
+    <string name="save_track_interval_descr">Wuběr interwal za nahrawanje čary w běhu nawigacije.</string>
+    <string name="gpx_start_new_segment">Nowy wotrězk zahajić</string>
+    </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index 3bd3098282..b6bffe4110 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="speak_pedestrian">Piešachodnyja pierachody</string>
     <string name="rendering_attr_roadStyle_name">Styl aŭtadaroh</string>
     <string name="rendering_value_default_name">Pa zmoŭčańnі</string>
@@ -2723,7 +2723,7 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="mapillary_menu_edit_text_hint">Uviadzicie imia karystaĺnika</string>
     <string name="mapillary_menu_descr_username">Pahliadzieć toĺki vyjavy dadanyja</string>
     <string name="mapillary_menu_title_username">Imia karystaĺnika</string>
-    <string name="mapillary_menu_filter_description">Fiĺtravać vyjavy pa adpraŭniku ci dacie. Aktyŭnyja toĺki dlia bujnoha pavieličennia.</string>
+    <string name="mapillary_menu_filter_description">Filtravać vyjavy pa adpraŭniku, pa dacie abo pa typu. Aktyŭnyja toĺki dlia bujnoha pavieličennia.</string>
     <string name="shared_string_reload">Abnavić</string>
     <string name="mapillary_menu_descr_tile_cache">Abnavić frahmienty, kab ubačyć aktuaĺnyja danyja.</string>
     <string name="mapillary_menu_title_tile_cache">Keš frahmientaŭ</string>
@@ -3130,7 +3130,7 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="edit_map_marker">Redahavać paznaku mapy</string>
     <string name="third_party_application">Staronniaje prykladannie</string>
     <string name="search_street">Pošuk vulicy</string>
-    <string name="start_search_from_city">Pačać pošuk z horada</string>
+    <string name="start_search_from_city">Spačatku abiarycie horad</string>
     <string name="shared_string_restore">Adnavić</string>
     <string name="keep_passed_markers_descr">Paznaki, dadanyja jak hrupa uliublionych ci projdienych maršrutnych GPX-kropak, zastanucca na mapie. Kali hrupa nieaktyŭnaja, paznaki zniknuć z mapy.</string>
     <string name="keep_passed_markers">Pakinuć projdzienyja paknaki na mapie</string>
@@ -3152,4 +3152,25 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
 \n
 \n</string>
     <string name="rendering_value_black_name">Čorny</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Plan i ceny</string>
+    <string name="osm_live_payment_monthly_title">Placić štomiesiačna</string>
+    <string name="osm_live_payment_3_months_title">Placić raz u 3 miesiacy</string>
+    <string name="osm_live_payment_annual_title">Pracić štohodna</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / miesiac</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / miesiac</string>
+    <string name="osm_live_payment_discount_descr">Aščada %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Vaša ciapierašniaja padpiska</string>
+    <string name="osm_live_payment_renews_monthly">Abnaŭliajecca štomiesiac</string>
+    <string name="osm_live_payment_renews_quarterly">Abnaŭliajecca štokvartaĺna</string>
+    <string name="osm_live_payment_renews_annually">Abnaŭliajecca štohodna</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Abiarycie zručnuju dlia vas pieryjadyčnasć aplat:</string>
+    <string name="osm_live_payment_contribute_descr">Častka dachodu idzie ŭdzieĺnikam OpenStreetMap.</string>
+    <string name="powered_by_osmand">Pracuje na OsmAnd</string>
+    <string name="mapillary_menu_title_pano">Pakazać tolki 360° malunki</string>
+    <string name="osm_live_subscriptions">Padpiski</string>
+    <string name="shared_string_launch">Zapusk</string>
+    <string name="lang_gn_py">Huarani</string>
+    <string name="run_full_osmand_msg">Vy karystajeciesia mapaj {0}, jakaja pastaŭliajecca OsmAnd. Vy chočacie zapuscić poŭnuju viersiju OsmAnd\?</string>
+    <string name="run_full_osmand_header">Zapuscić OsmAnd\?</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index bb72f3a4be..d01adcc05f 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -1,17 +1,17 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_bakery">Пякарня</string>
 	<string name="poi_alcohol">Вінна-гарэлкавая крама</string>
-	<string name="poi_convenience">Крама</string>
+	<string name="poi_convenience">Прадуктовая крама</string>
 	<string name="poi_palaeontological_site">Палеанталагічны сайт</string>
 
 	<string name="poi_mall">Гандлёвы цэнтр</string>
 	<string name="poi_beverages">Напоі</string>
-	<string name="poi_butcher">Ятка</string>
-	<string name="poi_deli">Дэлікатэсы</string>
+	<string name="poi_butcher">Мясная крама</string>
+	<string name="poi_deli">Далікатэсы</string>
 	<string name="poi_farm">Фермерскія прадукты</string>
 	<string name="poi_greengrocer">Гародніна і садавіна</string>
 	<string name="poi_seafood">Морапрадукты</string>
-	<string name="poi_confectionery">Кандытарская</string>
+	<string name="poi_confectionery">Кандытарская крама</string>
 	<string name="poi_ice_cream">Марозіва</string>
 	<string name="poi_supermarket">Супермаркет</string>
 	<string name="poi_dairy">Малочная крама</string>
@@ -27,7 +27,7 @@
 	<string name="poi_military_nuclear_explosion_site">Месца ядзернага выбуху</string>
 <string name="poi_historic_mine">Гістарычная шахта</string>
 	<string name="poi_carpet">Крама дываноў</string>
-	<string name="poi_florist">Кветі</string>
+	<string name="poi_florist">Кветкі</string>
 	<string name="poi_furniture">Мэбля</string>
 	<string name="poi_garden_centre">Сад і агарод</string>
 	<string name="poi_gas">Газ у балонах</string>
@@ -35,19 +35,19 @@
 	<string name="poi_gift">Падарункі, сувеніры</string>
 	<string name="poi_baby_goods">Тавары для дзяцей</string>
 	<string name="poi_bathroom_furnishing">Сантэхніка, ванныя</string>
-	<string name="poi_bed">Крама пасьцельнай бялізны</string>
+	<string name="poi_bed">Крама пасцельнай бялізны</string>
 	<string name="poi_boutique">Буцік</string>
 	<string name="poi_chemist">Аптэка</string>
-	<string name="poi_clothes">Крама адзеньня</string>
-	<string name="poi_clothes_children">Дзіцячае адзеньне</string>
+	<string name="poi_clothes">Крама адзення</string>
+	<string name="poi_clothes_children">Дзіцячае адзенне</string>
 	<string name="poi_shoes">Крама абутку</string>
 	<string name="poi_computer">Кампутары</string>
-	<string name="poi_copyshop">Капіявальныя паслугі</string>
+	<string name="poi_copyshop">Капіравальныя паслугі</string>
 	<string name="poi_curtain">Салон штор</string>
 	<string name="poi_fabric">Тканіны</string>
 	<string name="poi_bedding">Пасьцельная бялізна</string>
-	<string name="poi_dive">Абсталяваньне для дайвінгу</string>
-	<string name="poi_doityourself">Інструмэнты і будматэрыялы</string>
+	<string name="poi_dive">Абсталяванне для дайвінгу</string>
+	<string name="poi_doityourself">Інструменты і будматэрыялы</string>
 	<string name="poi_erotic">Сэкс-шоп</string>
 	<string name="poi_fishing">Рыбалоўная крама</string>
 	<string name="poi_frame">Рамкі, багет</string>
@@ -58,22 +58,22 @@
 	<string name="poi_hifi">Hi-Fi апаратура</string>
 	<string name="poi_houseware">Гаспадарчыя тавары</string>
 	<string name="poi_hunting">Паляўнічая крама</string>
-	<string name="poi_interior_decoration">Дэкор і афармленьне</string>
+	<string name="poi_interior_decoration">Дэкор і афармленне</string>
 	<string name="poi_jewelry">Ювелірная крама</string>
 	<string name="poi_kiosk">Кіёск</string>
 	<string name="poi_kitchen">Кухонная мэбля</string>
 	<string name="poi_mobile_phone">Мабільныя тэлефоны</string>
 	<string name="poi_motorcycle">Матацыклы</string>
-	<string name="poi_musical_instrument">Музычныя інструмэнты</string>
-	<string name="poi_newsagent">Газэты і часопісы</string>
+	<string name="poi_musical_instrument">Музычныя інструменты</string>
+	<string name="poi_newsagent">Газеты і часопісы</string>
 	<string name="poi_optician">Акуліст</string>
 	<string name="poi_organic">Арганічныя прадукты харчаваньня</string>
 	<string name="poi_outdoor">Тавары для актыўнага адпачынку</string>
 	<string name="poi_paint">Фарбы</string>
 	<string name="poi_pet">Тавары для жывёл</string>
-	<string name="poi_radiotechnics">Радыёдэталі</string>
+	<string name="poi_radiotechnics">Радыядэталі</string>
 	<string name="poi_second_hand">Сэканд-хэнд</string>
-	<string name="poi_ship_chandler">Яхты, запчасткі, абсталяваньне</string>
+	<string name="poi_ship_chandler">Яхты, запчасткі, абсталяванне</string>
 	<string name="poi_sports">Спорттавары</string>
 	<string name="poi_stationery">Канцылярскія тавары</string>
 	<string name="poi_tableware">Посуд</string>
@@ -90,7 +90,7 @@
 	<string name="poi_car">Аўтасалон</string>
 	<string name="poi_car_parts">Аўтазапчасткі</string>
 	<string name="poi_atv">Квадрацыклы</string>
-	<string name="poi_cosmetics">Касметыка, парфумерыя</string>
+	<string name="poi_cosmetics">Касметыка</string>
 	<string name="poi_marketplace">Рынак</string>
 	<string name="poi_sewing">Галантарэя</string>
 
@@ -99,18 +99,18 @@
 	<string name="poi_emergency_phone">Экстраны тэлефон</string>
 	<string name="poi_fire_hydrant">Пажарны гідрант</string>
 	<string name="poi_fire_extinguisher">Вогнетушыцель</string>
-	<string name="poi_fire_flapper">Ручны сродак пажаратушэньня</string>
+	<string name="poi_fire_flapper">Ручны сродак пажаратушэння</string>
 	<string name="poi_fire_hose">Пажарны шланг</string>
 	<string name="poi_fire_water_pond">Пажарны вадаём</string>
-	<string name="poi_grit_bin">Скрыня зь пяском</string>
+	<string name="poi_grit_bin">Скрыня з пяском</string>
 	<string name="poi_ambulance_station">Станцыя хуткай дапамогі</string>
 	<string name="poi_ses_station">Санэпідэмстанцыя</string>
-	<string name="poi_emergency_access_point">Таблічка з кодам для службы выратаваньня</string>
+	<string name="poi_emergency_access_point">Таблічка з кодам для службы выратавання</string>
 
 	<string name="poi_ford">Брод</string>
 	<string name="poi_mountain_pass">Перавал</string>
 	<string name="poi_gate">Вароты</string>
-	<string name="poi_city_wall">Гарадзкая сьцяна</string>
+	<string name="poi_city_wall">Гарадская сцяна</string>
 	<string name="poi_lift_gate">Шлагбаўм</string>
 	<string name="poi_toll_booth">Пункт аплаты праезду</string>
 	<string name="poi_border_control">Памежны кантроль</string>
@@ -120,7 +120,7 @@
 	<string name="poi_traffic_calming_chicane">Шыкана</string>
 	<string name="poi_traffic_calming_rumble_strip">Ляжачы паліцыянт (пральная дошка)</string>
 	<string name="poi_traffic_calming_table">Ляжачы паліцыянт (стол)</string>
-	<string name="poi_traffic_calming_choker">Звужэньне</string>
+	<string name="poi_traffic_calming_choker">Звужэнне</string>
 	<string name="poi_traffic_signals">Святлафор</string>
 
 	<string name="poi_car_repair">Аўтасэрвіс</string>
@@ -128,7 +128,7 @@
 	<string name="poi_vehicle_inspection">Пункт тэхагляду</string>
 	<string name="poi_car_wash">Аўтамыйка</string>
 	<string name="poi_fuel">Запраўка;АЗС;Аўтазаправачная станцыя</string>
-	<string name="poi_electricity_combined_charging">Зарадная станцыя</string>
+	<string name="poi_electricity_combined_charging">Станцыя сілкавання</string>
 	<string name="poi_vehicle_ramp">Рамонтная эстакада/яма</string>
 	<string name="poi_compressed_air">Кампрэсар для падпампоўкі шын</string>
 	<string name="poi_parking">Паркоўка</string>
@@ -136,26 +136,26 @@
 	<string name="poi_parking_entrance">Заезд на паркоўку</string>
 	<string name="poi_garages">Гаражы</string>
 
-	<string name="poi_public_transport_platform">Прыпынак грамадзкага транспарту</string>
-	<string name="poi_public_transport_platform_bus">Прыпынак аўтобусу</string>
-	<string name="poi_public_transport_platform_trolleybus">Прыпынак тралейбусу</string>
+	<string name="poi_public_transport_platform">Прыпынак грамадскага транспарту</string>
+	<string name="poi_public_transport_platform_bus">Аўтобусны прыпынак</string>
+	<string name="poi_public_transport_platform_trolleybus">Тралейбусны прыпынак</string>
 	<string name="poi_bus_stop">Аўтобусны прыпынак</string>
-	<string name="poi_public_transport_platform_tram">Прыпынак трамваю</string>
-	<string name="poi_tea">Чайная крама</string>
+	<string name="poi_public_transport_platform_tram">Трамвайны прыпынак</string>
+	<string name="poi_tea">Крама гарбаты</string>
 	<string name="poi_tram_stop">Трамвайны прыпынак</string>
-	<string name="poi_public_transport_station">Станцыя грамадзкага транспарту</string>
+	<string name="poi_public_transport_station">Станцыя грамадскага транспарту</string>
 	<string name="poi_bus_station">Аўтобусная станцыя</string>
 	<string name="poi_railway_station">Чыгуначная станцыя</string>
-	<string name="poi_railway_platform">Чыгуначная плятформа</string>
-	<string name="poi_subway_entrance">Уваход у мэтро</string>
-	<string name="poi_subway_station">Станцыя мэтро</string>
+	<string name="poi_railway_platform">Чыгуначная платформа</string>
+	<string name="poi_subway_entrance">Уваход у метро</string>
+	<string name="poi_subway_station">Так</string>
 	<string name="poi_taxi">Стаянка таксі</string>
 
 	<string name="poi_aerodrome">Аэрапорт</string>
-	<string name="poi_helipad">Шрубалётная пляцоўка</string>
+	<string name="poi_helipad">Верталётная пляцоўка</string>
 	<string name="poi_runway">Узлётная паласа</string>
 	<string name="poi_aeroway_terminal">Тэрмінал аэрапорту</string>
-	<string name="poi_aeroway_gate">Выйсьце на пасадку ў аэрапорце</string>
+	<string name="poi_aeroway_gate">Выхад на пасадку ў аэрапорце</string>
 
 	<string name="poi_slipway">Пахіл для лодак</string>
 	<string name="poi_ferry_terminal">Прычал парому</string>
@@ -166,12 +166,12 @@
 
 	<string name="poi_aerialway_station">Станцыя канатнай дарогі</string>
 	<string name="poi_aerialway_cable_car">Канатная дарога з кабінамі</string>
-	<string name="poi_aerialway_gondola">Канатная дарога зь невялікімі кабінамі</string>
+	<string name="poi_aerialway_gondola">Канатная дарога з невялікімі кабінамі</string>
 	<string name="poi_aerialway_chair_lift">Канатная дарога з адкрытымі крэсламі</string>
-	<string name="poi_aerialway_t_bar">T-вобразны пад\'ёмнік</string>
-	<string name="poi_aerialway_j_bar">J-вобразны пад\'ёмнік</string>
+	<string name="poi_aerialway_t_bar">Пад\'ёмнік у выглядзе Т</string>
+	<string name="poi_aerialway_j_bar">Пад\'ёмнік у выглядзе J</string>
 	<string name="poi_aerialway_platter">Талерачны пад\'ёмнік</string>
-	<string name="poi_aerialway_mixed_lift">Пад\'ёмнік змяшанага тыпу</string>
+	<string name="poi_aerialway_mixed_lift">Пад\'ёмнік змешанага тыпу</string>
 	<string name="poi_aerialway_drag_lift">Бугельная канатная дарога</string>
 	<string name="poi_aerialway_rope_tow">Рухомы канат</string>
 	<string name="poi_aerialway_goods">Грузавы пад\'ёмнік</string>
@@ -180,13 +180,13 @@
 	<string name="poi_tunnel">Тунэль</string>
 	<string name="poi_bridge">Мост</string>
 
-	<string name="poi_speed_camera">Камэра для замеру хуткасьці</string>
+	<string name="poi_speed_camera">Камера для замеру хуткасці</string>
 	<string name="poi_turning_circle">Разваротнае кальцо</string>
 	<string name="poi_water_well">Студня</string>
 	<string name="poi_standpipe">Напорная труба</string>
 	<string name="poi_water_works">Водазабор</string>
 	<string name="poi_boatyard">Cудабудаўнічая майстэрня</string>
-	<string name="poi_wastewater_plant">Вычышчальныя збудаваньні</string>
+	<string name="poi_wastewater_plant">Вычышчальныя збудаванні</string>
 	<string name="poi_water_tower">Воданапорная вежа</string>
 	<string name="poi_lock_gate">Вароты шлюзу</string>
 	<string name="poi_waterway_turning_point">Паваротная кропка на вадзе</string>
@@ -197,7 +197,7 @@
 	<string name="poi_power_substation">Падстанцыя</string>
 	<string name="poi_power_transformer">Трансфарматар</string>
 	<string name="poi_power_plant">Электрастанцыя</string>
-	<string name="poi_power_generator">Генэратар</string>
+	<string name="poi_power_generator">Генератар</string>
 
 	<string name="poi_post_office">Пошта</string>
 	<string name="poi_post_box">Паштовая скрыня</string>
@@ -205,33 +205,33 @@
 	<string name="poi_communication_tower">Вежа сувязі</string>
 	<string name="poi_telephone_exchange">АТС</string>
 
-	<string name="poi_recycling">Перапрацоўка адыходаў</string>
+	<string name="poi_recycling">Перапрацоўка адходаў</string>
 	<string name="poi_landfill">Звалка</string>
-	<string name="poi_waste_disposal">Сьмецьцевы кантэйнэр</string>
-	<string name="poi_waste_basket">Сьметніца</string>
+	<string name="poi_waste_disposal">Смеццевы кантэйнер</string>
+	<string name="poi_waste_basket">Сметніца</string>
 
 	<string name="poi_pier">Пірс</string>
-	<string name="poi_surveillance">Камэра відэаназіраньня</string>
-	<string name="poi_observatory">Абсэрваторыя</string>
+	<string name="poi_surveillance">Камера відэаназірання</string>
+	<string name="poi_observatory">Абсерваторыя</string>
 	<string name="poi_astronomical_observatory">Астранамічная</string>
 	<string name="poi_construction">Будоўля</string>
 	<string name="poi_works">Завод</string>
 	<string name="poi_mineshaft">Шахтавы ствол</string>
 	<string name="poi_adit">Ходня</string>
-	<string name="poi_petroleum_well">Нафтавая сьвідравіна</string>
+	<string name="poi_petroleum_well">Нафтавая свідравіна</string>
 	<string name="poi_survey_point">Трыангуляцыйны знак</string>
 	<string name="poi_windmill">Вятрак</string>
 	<string name="poi_quarry">Кар\'ер</string>
 	<string name="poi_vineyard">Вінаграднік</string>
 	<string name="poi_orchard">Сад</string>
-	<string name="poi_salt_pond">Сажалка для асаджэньня солі</string>
+	<string name="poi_salt_pond">Сажалка для асаджэння солі</string>
 	<string name="poi_cricket_nets">Сетка для крыкету</string>
 
 	<string name="poi_driving_school">Аўташкола</string>
 	<string name="poi_school">Школа</string>
 	<string name="poi_kindergarten">Дзіцячы сад</string>
 	<string name="poi_college">Каледж</string>
-	<string name="poi_university">Унівэрсытэт</string>
+	<string name="poi_university">Універсітэт</string>
 
 	<string name="poi_social_facility">Сацыяльная ўстанова</string>
 	<string name="poi_courthouse">Суд</string>
@@ -241,7 +241,7 @@
 	<string name="poi_government">Дзяржаўная ўстанова</string>
 	<string name="poi_bailiff">Служба судовых прыставаў</string>
 	<string name="poi_prosecutor">Пракуратура</string>
-	<string name="poi_pension_fund">Пэнсійны фонд</string>
+	<string name="poi_pension_fund">Пенсіённы фонд</string>
 	<string name="poi_migration">Міграцыйная служба</string>
 	<string name="poi_tax_inspection">Падатковая</string>
 	<string name="poi_office_administrative">Адміністрацыйная ўстанова</string>
@@ -253,81 +253,81 @@
 	<string name="poi_isolated_dwelling">Сяліба</string>
 	<string name="poi_locality">Урочышча</string>
 	<string name="poi_place_allotments">Садоўніцкае таварыства</string>
-	<string name="poi_place_farm">Фэрма</string>
+	<string name="poi_place_farm">Ферма</string>
 
 	<string name="poi_pharmacy">Аптэка</string>
 	<string name="poi_hospital">Лякарня</string>
 	<string name="poi_doctors">Лекар</string>
 	<string name="poi_clinic">Паліклініка, клініка</string>
 	<string name="poi_first_aid">Першая дапамога</string>
-	<string name="poi_dentist">Стаматалёгія</string>
+	<string name="poi_dentist">Стаматалогія</string>
 	<string name="poi_nursing_home">Дом састарэлых</string>
 	<string name="poi_baby_hatch">Бэбі-бокс</string>
-	<string name="poi_veterinary">Вэтэрынарная лякарня</string>
+	<string name="poi_veterinary">Ветэрынарная лякарня</string>
 	<string name="poi_sanatorium">Санаторый</string>
 	<string name="poi_healthcare_alternative">Альтэрнатыўная медыцына</string>
-	<string name="poi_audiologist">Оталярынголяг</string>
+	<string name="poi_audiologist">Оталарынголаг</string>
 	<string name="poi_blood_bank">Банк крыві</string>
-	<string name="poi_healthcare_centre">Медыцынскі цэнтар</string>
+	<string name="poi_healthcare_centre">Медыцынскі цэнтр</string>
 	<string name="poi_midwife">Акушэрка</string>
-	<string name="poi_occupational_therapist">Прафэсыйны лекар</string>
-	<string name="poi_optometrist">Оптамэтрыст</string>
-	<string name="poi_physiotherapist">Фізыятэрапэўт</string>
+	<string name="poi_occupational_therapist">Прафесійны лекар</string>
+	<string name="poi_optometrist">Оптаметрыст</string>
+	<string name="poi_physiotherapist">Фізыятэрапеўт</string>
 	<string name="poi_podiatrist">Артапед</string>
-	<string name="poi_psychotherapist">Псыхатэрапэўт</string>
+	<string name="poi_psychotherapist">Псіхатэрапеўт</string>
 	<string name="poi_healthcare_rehabilitation">Рэабілітацыя</string>
-	<string name="poi_speech_therapist">Лягапэд</string>
+	<string name="poi_speech_therapist">Лагапед</string>
 	<string name="poi_healthcare_yes">Медыцынская ўстанова</string>
 
 	<string name="poi_company">Фірма</string>
 	<string name="poi_insurance">Страхавая кампанія</string>
-	<string name="poi_estate_agent">Агенцтва нерухомасьці</string>
+	<string name="poi_estate_agent">Агенцтва нерухомасці</string>
 	<string name="poi_lawyer">Юрыдычныя паслугі</string>
 	<string name="poi_office_telecommunication">Тэлекамунікацыйная кампанія</string>
-	<string name="poi_ngo">Грамадзкая арганізацыя</string>
+	<string name="poi_ngo">Грамадская арганізацыя</string>
 	<string name="poi_townhall">Адміністрацыя населенага пункта</string>
 	<string name="poi_employment_agency">Біржа працы</string>
-	<string name="poi_research">Дасьледчы цэнтар</string>
-	<string name="poi_it">Інфармацыйныя тэхналёгіі</string>
-	<string name="poi_newspaper">Друкаванае выданьне</string>
+	<string name="poi_research">Даследавачны цэнтр</string>
+	<string name="poi_it">Інфармацыйныя тэхналогіі</string>
+	<string name="poi_newspaper">Друкаванае выданне</string>
 	<string name="poi_architect">Праектнае бюро</string>
 	<string name="poi_advertising_agency">Рэкламнае агенцтва</string>
 	<string name="poi_educational_institution">Адукацыйная ўстанова (адміністрацыя)</string>
-	<string name="poi_studio">Студыя гукапісу, тэлестудыя</string>
-	<string name="poi_bookmaker">Букмэкерская кантора</string>
+	<string name="poi_studio">Студыя гуказапісу, тэлестудыя</string>
+	<string name="poi_bookmaker">Букмекерская кантора</string>
 
 	<string name="poi_stadium">Стадыён</string>
-	<string name="poi_sports_centre">Спартовы цэнтар</string>
+	<string name="poi_sports_centre">Спартовы цэнтр</string>
 	<string name="poi_golf_course">Поле для гольфу</string>
 	<string name="poi_ice_rink">Коўзанка</string>
 	<string name="poi_pitch">Спартовая пляцоўка, поле, корт</string>
 	<string name="poi_leisure_track">Спартовая дарожка</string>
 	<string name="poi_running_track">Бегавая дарожка</string>
-	<string name="poi_bicycle_track">Велатрэк</string>
+	<string name="poi_bicycle_track">Роварная дарожка</string>
 	<string name="poi_horse_track">Іпадром</string>
 	<string name="poi_raceway">Гоначная/ралійная траса</string>
-	<string name="poi_9pin">9-кегельный боўлінг</string>
-	<string name="poi_10pin">10-кегельный боўлінг (звычайны)</string>
+	<string name="poi_9pin">9-кегельны боўлінг</string>
+	<string name="poi_10pin">10-кегельны боўлінг (звычайны)</string>
 	<string name="poi_archery">Стральба з луку</string>
 	<string name="poi_athletics">Лёгкая атлетыка</string>
-	<string name="poi_american_football">Амэрыканскі футбол</string>
+	<string name="poi_american_football">Амерыканскі футбол</string>
 	<string name="poi_australian_football">Аўстралійскі футбол</string>
 	<string name="poi_base">Бэйзджампінг</string>
-	<string name="poi_baseball">Бэйзбол</string>
+	<string name="poi_baseball">Бейсбол</string>
 	<string name="poi_basketball">Баскетбол</string>
 	<string name="poi_beachvolleyball">Пляжны валейбол</string>
 	<string name="poi_bmx">Веламотакрос</string>
 	<string name="poi_boules">Бул</string>
 	<string name="poi_bowls">Боўлз</string>
-	<string name="poi_canadian_football">Канадзкі футбол</string>
-	<string name="poi_canoe">Плаваньне на байдарках і каяках</string>
+	<string name="poi_canadian_football">Канадскі футбол</string>
+	<string name="poi_canoe">Плаванне на байдарках і каяках</string>
 	<string name="poi_chess">Шахматы</string>
-	<string name="poi_climbing">Скалалазаньне</string>
+	<string name="poi_climbing">Скалалазанне</string>
 	<string name="poi_cricket">Крыкет</string>
 	<string name="poi_croquet">Кракет</string>
-	<string name="poi_cycling">Веласіпедны спорт</string>
-	<string name="poi_diving">Скачкі ў ваду</string>
-	<string name="poi_scuba_diving">Падводнае плаваньне</string>
+	<string name="poi_cycling">Роварны спорт</string>
+	<string name="poi_diving">Дайвінг</string>
+	<string name="poi_scuba_diving">Падводнае плаванне</string>
 	<string name="poi_dog_racing">Сабачыя бягі</string>
 	<string name="poi_equestrian">Верхавая язда</string>
 	<string name="poi_golf">Гольф</string>
@@ -335,71 +335,71 @@
 	<string name="poi_handball">Гандбол</string>
 	<string name="poi_hockey">Хакей</string>
 	<string name="poi_horse_racing">Конскія скокі</string>
-	<string name="poi_ice_skating">Катаньне на каньках</string>
+	<string name="poi_ice_skating">Коўзанне на каньках</string>
 	<string name="poi_ice_stock">Айсшток</string>
 	<string name="poi_korfbal">Корфбол</string>
 	<string name="poi_sport_motor">Аўтамотаспорт</string>
-	<string name="poi_sport_multi">Унівэрсальная спортпляцоўка</string>
-	<string name="poi_orienteering">Спартовае арыентаваньне</string>
+	<string name="poi_sport_multi">Універсальная спортпляцоўка</string>
+	<string name="poi_orienteering">Спартовае арыентаванне</string>
 	<string name="poi_paddle_tennis">Настольны тэніс</string>
-	<string name="poi_paragliding">Парапланэрызм</string>
+	<string name="poi_paragliding">Парапланерызм</string>
 	<string name="poi_pelota">Пялота</string>
 	<string name="poi_racquet">Бадмінтон, сквош</string>
-	<string name="poi_roller_skating">Катаньне на роліках</string>
-	<string name="poi_rowing">Акадэмічнае веславаньне</string>
+	<string name="poi_roller_skating">Катанне на роліках</string>
+	<string name="poi_rowing">Акадэмічнае веславанне</string>
 	<string name="poi_rugby_union">Рэгбі-юніён</string>
 	<string name="poi_rugby_league">Рэгбі-ліг</string>
 	<string name="poi_shooting">Стральба</string>
-	<string name="poi_skating">Катаньне на роліках (каньках)</string>
+	<string name="poi_skating">Катанга на роліках</string>
 	<string name="poi_skateboard">Скейтборд</string>
 	<string name="poi_skiing">Лыжны спорт</string>
-	<string name="poi_soccer">Традыцыйны футбол</string>
+	<string name="poi_soccer">Футбол</string>
 	<string name="poi_surfing">Сёрфінг</string>
-	<string name="poi_swimming">Плаваньне</string>
+	<string name="poi_swimming">Плаванне</string>
 	<string name="poi_table_tennis">Пінг-понг</string>
 	<string name="poi_tennis">Тэніс</string>
 	<string name="poi_toboggan">Санкавы спорт</string>
 	<string name="poi_volleyball">Валейбол</string>
 
-	<string name="poi_museum">Музэй</string>
-	<string name="poi_memorial">Помнік, мэмарыял</string>
+	<string name="poi_museum">Музей</string>
+	<string name="poi_memorial">Помнік, мемарыял</string>
 	<string name="poi_artwork">Твор мастацтва</string>
-	<string name="poi_archaeological_site">Раскопы</string>
+	<string name="poi_archaeological_site">Раскопкі</string>
 	<string name="poi_battlefield">Поле бітвы</string>
 	<string name="poi_boundary_stone">Межавы камень</string>
 	<string name="poi_historic_cannon">Гістарычныя гарматы</string>
 	<string name="poi_castle">Замак</string>
-	<string name="poi_city_gate">Гарадзкая брама</string>
-	<string name="poi_fort">Фартыфікацыйныя збудаваньні</string>
+	<string name="poi_city_gate">Гарадская брама</string>
+	<string name="poi_fort">Фартыфікацыйныя збудаванні</string>
 	<string name="poi_fountain">Фантан</string>
 	<string name="poi_historic_ruins">Гістарычныя руіны</string>
-	<string name="poi_rune_stone">Руніцкі камень</string>
-	<string name="poi_wreck">Месца караблекрушэньня</string>
-	<string name="poi_historic_ship">Судна (музэй)</string>
-	<string name="poi_monument">Манумэнт (помнік)</string>
+	<string name="poi_rune_stone">Рунны камень</string>
+	<string name="poi_wreck">Месца караблекрушэння</string>
+	<string name="poi_historic_ship">Судна (музей)</string>
+	<string name="poi_monument">Манумент (помнік)</string>
 	<string name="poi_zoo">Заапарк</string>
 	<string name="poi_theme_park">Парк забаў</string>
 	
-	<string name="poi_attraction">Турыстычная славутасьць</string>
+	<string name="poi_attraction">Турыстычная славутасць</string>
 	<string name="poi_attraction_big_wheel">Кола агляду</string>
-	<string name="poi_attraction_carousel">Карусэль</string>
-	<string name="poi_attraction_maze">Лябірынт</string>
-	<string name="poi_attraction_swing_carousel">Арэлі-карусэлі</string>
+	<string name="poi_attraction_carousel">Карусель</string>
+	<string name="poi_attraction_maze">Лабірынт</string>
+	<string name="poi_attraction_swing_carousel">Арэлі-каруселі</string>
 	<string name="poi_attraction_train">Цягнік (атракцыён)</string>
 	<string name="poi_attraction_water_slide">Водныя горкі</string>
 
 	<string name="poi_hotel">Гатэль</string>
-	<string name="poi_guest_house">Гасьцявы дом</string>
-	<string name="poi_hostel">Гостэл</string>
+	<string name="poi_guest_house">Гасцявы дом</string>
+	<string name="poi_hostel">Хостэль</string>
 	<string name="poi_motel">Матэль</string>
 	<string name="poi_alpine_hut">Горны прытулак</string>
 	<string name="poi_chalet">Шале</string>
 
-	<string name="poi_place_of_worship">Месца пакланеньня</string>
-	<string name="poi_religion_christian">Хрысьціянства</string>
-	<string name="poi_religion_jewish">Юдаізм</string>
+	<string name="poi_place_of_worship">Месца пакланення</string>
+	<string name="poi_religion_christian">Хрысціянства</string>
+	<string name="poi_religion_jewish">Іудаізм</string>
 	<string name="poi_religion_muslim">Іслам</string>
-	<string name="poi_religion_sikh">Сыкхізм</string>
+	<string name="poi_religion_sikh">Сікхізм</string>
 	<string name="poi_religion_buddhist">Будызм</string>
 	<string name="poi_religion_hindu">Індуізм</string>
 	<string name="poi_religion_shinto">Сінтаізм</string>
@@ -407,59 +407,59 @@
 	<string name="poi_monastery">Кляштар</string>
 	<string name="poi_historic_monastery">Гістарычны кляштар</string>
 	<string name="poi_wayside_cross">Прыдарожны крыж</string>
-	<string name="poi_wayside_shrine">Прыдарожная сьвятыня</string>
+	<string name="poi_wayside_shrine">Прыдарожная святыня</string>
 	<string name="poi_information">Інфармацыйны стэнд</string>
-	<string name="poi_clock">Гадзіньнік</string>
+	<string name="poi_clock">Гадзіннік</string>
 	<string name="poi_travel_agent">Турагент</string>
-	<string name="poi_viewpoint">Месца з добрым відам</string>
+	<string name="poi_viewpoint">Месца з добрым краявідам</string>
 	<string name="poi_camp_site">Месца для лагера</string>
 	<string name="poi_caravan_site">Месца для начлегу</string>
 	<string name="poi_picnic_site">Месца для пікніка</string>
 	<string name="poi_spring">Крыніца</string>
 	<string name="poi_hot_spring">Гарачая крыніца</string>
-	<string name="poi_geyser">Гейзэр</string>
+	<string name="poi_geyser">Гейзер</string>
 	<string name="poi_cemetery">Могілкі</string>
 	<string name="poi_grave_yard">Могілкі (невялікія)</string>
 	<string name="poi_shelter">Хованка ад непагадзі</string>
 	<string name="poi_funicular">Фунікулёр</string>
 	<string name="poi_resort">Курорт</string>
 
-	<string name="poi_club_art">Клюб аматараў мастацтва</string>
-	<string name="poi_club_astronomy">Астранамічны клюб</string>
-	<string name="poi_club_computer">Кампутарны клюб</string>
+	<string name="poi_club_art">Клуб аматараў мастацтва</string>
+	<string name="poi_club_astronomy">Астранамічны клуб</string>
+	<string name="poi_club_computer">Кампутарны клуб</string>
 	<string name="poi_club_board_games">Настольныя гульні</string>
-	<string name="poi_club_motorcycle">Мотаклюб</string>
-	<string name="poi_club_sport">Спартовы клюб</string>
-	<string name="poi_club_game">Гульнявы клюб</string>
-	<string name="poi_club_automobile">Аўтаклюб</string>
-	<string name="poi_club_chess">Шахматны клюб</string>
-	<string name="poi_club_cinema">Кінаклюб</string>
-	<string name="poi_club_fan">Фанклюб</string>
-	<string name="poi_club_fishing">Клюб рыбаловаў</string>
-	<string name="poi_club_veterans">Клюб вэтэранаў</string>
-	<string name="poi_club_linux">Клюб аматараў Linux</string>
-	<string name="poi_club_theatre">Тэатральны клюб</string>
-	<string name="poi_club_history">Гістарычны клюб</string>
-	<string name="poi_club_music">Музычны клюб</string>
-	<string name="poi_club_ethnic">Клюб этнічнай культуры</string>
-	<string name="poi_club_nature">Клюб натуралістаў</string>
-	<string name="poi_club_photography">Фотаклюб</string>
-	<string name="poi_club_hunting">Клюб паляўнічых</string>
-	<string name="poi_club_shooting">Зброевы клюб</string>
-	<string name="poi_club_tourism">Турыстычны клюб</string>
-	<string name="poi_club_charity">Дабрачыннны клюб</string>
+	<string name="poi_club_motorcycle">Мотаклуб</string>
+	<string name="poi_club_sport">Спартовы клуб</string>
+	<string name="poi_club_game">Гульнявы клуб</string>
+	<string name="poi_club_automobile">Аўтаклуб</string>
+	<string name="poi_club_chess">Шахматны клуб</string>
+	<string name="poi_club_cinema">Кінаклуб</string>
+	<string name="poi_club_fan">Фанклуб</string>
+	<string name="poi_club_fishing">Клуб рыбаловаў</string>
+	<string name="poi_club_veterans">Клуб ветэранаў</string>
+	<string name="poi_club_linux">Клуб аматараў Linux</string>
+	<string name="poi_club_theatre">Тэатральны клуб</string>
+	<string name="poi_club_history">Гістарычны клуб</string>
+	<string name="poi_club_music">Музычны клуб</string>
+	<string name="poi_club_ethnic">Клуб этнічнай культуры</string>
+	<string name="poi_club_nature">Клуб натуралістаў</string>
+	<string name="poi_club_photography">Фотаклуб</string>
+	<string name="poi_club_hunting">Клуб паляўнічых</string>
+	<string name="poi_club_shooting">Збройны клуб</string>
+	<string name="poi_club_tourism">Турыстычны клуб</string>
+	<string name="poi_club_charity">Дабрачыннны клуб</string>
 
 	<string name="poi_library">Бібліятэка</string>
-	<string name="poi_arts_centre">Мастацкі цэнтар</string>
+	<string name="poi_arts_centre">Мастацкі цэнтр</string>
 	<string name="poi_cinema">Кінатэатр</string>
 	<string name="poi_casino">Казіно</string>
-	<string name="poi_community_centre">Грамадзкі цэнтар</string>
-	<string name="poi_social_centre">Грамада, клюб</string>
-	<string name="poi_theatre">Тэатр, канцэртная заля</string>
+	<string name="poi_community_centre">Грамадскі цэнтр</string>
+	<string name="poi_social_centre">Грамада, клуб</string>
+	<string name="poi_theatre">Тэатр, канцэртная зала</string>
 	<string name="poi_theatre_genre_circus">Цырк</string>
 	<string name="poi_dance_floor">Танцпляцоўка</string>
-	<string name="poi_nightclub">Начны клюб;Дыска</string>
-	<string name="poi_stripclub">Стрыпклюб</string>
+	<string name="poi_nightclub">Начны клуб;Дыска</string>
+	<string name="poi_stripclub">Стрыпклуб</string>
 	<string name="poi_beach_resort">Пляжны комплекс</string>
 	<string name="poi_dog_park">Пляцоўка для выгулу сабак</string>
 	<string name="poi_leisure_fishing">Месца для рыбалкі</string>
@@ -468,14 +468,14 @@
 	<string name="poi_marina">Прыстань, яхт-клуб</string>
 	<string name="poi_miniature_golf">Міні-гольф</string>
 	<string name="poi_playground">Дзіцячая пляцоўка</string>
-	<string name="poi_swimming_pool">Басэйн</string>
+	<string name="poi_swimming_pool">Басейн</string>
 	<string name="poi_water_park">Аквапарк</string>
 	<string name="poi_park">Парк</string>
 
 	<string name="poi_cafe">Кафэ</string>
 	<string name="poi_biergarten">Летняе кафэ</string>
 	<string name="poi_restaurant">Рэстаран</string>
-	<string name="poi_fast_food">Фастфуд (хуткае харчаваньне)</string>
+	<string name="poi_fast_food">Фастфуд (хуткае харчаванне)</string>
 	<string name="poi_bar">Бар</string>
 	<string name="poi_pub">Паб</string>
 	<string name="poi_food_court">Рэстаранны панадворак</string>
@@ -483,7 +483,7 @@
 	<string name="poi_barbecue">Ўстаноўка для барбекю</string>
 
 	<string name="poi_craft_agricultural_engines">Рамонт с/г тэхнікі</string>
-	<string name="poi_craft_basket_maker">Пляценьне з лазы</string>
+	<string name="poi_craft_basket_maker">Пляценне з лазы</string>
 	<string name="poi_craft_beekeeper">Пчаляр</string>
 	<string name="poi_craft_blacksmith">Гамарня</string>
 	<string name="poi_craft_brewery">Бровар</string>
@@ -492,36 +492,36 @@
 	<string name="poi_craft_carpenter">Сталярная майстэрня</string>
 	<string name="poi_craft_carpet_layer">Укладка дываноў, каўраліна</string>
 	<string name="poi_craft_caterer">Кэйтэрынг</string>
-	<string name="poi_craft_clockmaker">Гадзіньнікавая майстэрня</string>
+	<string name="poi_craft_clockmaker">Гадзіннікавая майстэрня</string>
 	<string name="poi_craft_dressmaker">Пашыў, рамонт адзежы</string>
 	<string name="poi_craft_electrician">Электрык</string>
 	<string name="poi_craft_gardener">Садоўнік, ландшафтны дызайнер</string>
 	<string name="poi_craft_glaziery">Шклорэзная майстэрня</string>
-	<string name="poi_craft_handicraft">Рукадзельле, упрыгожваньні</string>
-	<string name="poi_craft_hvac">Мантаж кандыцыянераў, сыстэм вэнтыляцыі</string>
-	<string name="poi_craft_insulation">Паслугі па ўцяпленьні памяшканьняў</string>
+	<string name="poi_craft_handicraft">Рукадзелле, упрыгожванні</string>
+	<string name="poi_craft_hvac">Мантаж кандыцыянераў, сістэм вентыляцыі</string>
+	<string name="poi_craft_insulation">Паслугі па ўцяпленні памяшканняў</string>
 	<string name="poi_craft_jeweller">Ювелірная майстэрня</string>
 	<string name="poi_craft_locksmith">Слясарныя працы</string>
 	<string name="poi_craft_key_cutter">Выраб ключоў</string>
-	<string name="poi_craft_metal_construction">Мэталаканструкцыі</string>
+	<string name="poi_craft_metal_construction">Металаканструкцыі</string>
 	<string name="poi_craft_optician">Оптык</string>
 	<string name="poi_craft_painter">Маляр</string>
 	<string name="poi_craft_parquet_layer">Паркетныя працы</string>
 	<string name="poi_craft_photographer">Фатограф</string>
-	<string name="poi_craft_photographic_laboratory">Фоталябараторыя</string>
+	<string name="poi_craft_photographic_laboratory">Фоталабараторыя</string>
 	<string name="poi_craft_plasterer">Тынковачныя працы</string>
 	<string name="poi_craft_plumber">Сантэхнік</string>
 	<string name="poi_craft_pottery">Ганчарная майстэрня</string>
-	<string name="poi_craft_rigger">Абсталяваньне для яхт, катэраў</string>
+	<string name="poi_craft_rigger">Абсталяванне для яхт, катэраў</string>
 	<string name="poi_craft_roofer">Страхар</string>
 	<string name="poi_craft_saddler">Пашыў і рамонт аўтакрэслаў</string>
 	<string name="poi_craft_sailmaker">Пашыў і рамонт ветразяў</string>
 	<string name="poi_craft_sawmill">Піларама</string>
-	<string name="poi_craft_scaffolder">Узвядзеньне будаўнічых лясоў</string>
+	<string name="poi_craft_scaffolder">Узвядзенне будаўнічых лясоў</string>
 	<string name="poi_craft_sculptor">Скульптар</string>
 	<string name="poi_craft_shoemaker">Абутковая майстэрня</string>
 	<string name="poi_craft_stand_builder">Выраб выставачных стэндаў</string>
-	<string name="poi_craft_stonemason">Каменярэзная майстэрня</string>
+	<string name="poi_craft_stonemason">Каменарэзная майстэрня</string>
 	<string name="poi_craft_sun_protection">Выраб падстрэшкаў, жалюзі</string>
 	<string name="poi_craft_sweep">Камінар</string>
 	<string name="poi_craft_tailor">Атэлье</string>
@@ -529,15 +529,15 @@
 	<string name="poi_craft_tinsmith">Бляхар, лудзільнік</string>
 	<string name="poi_craft_upholsterer">Драпавальнік, абіўка мэблі</string>
 	<string name="poi_craft_watchmaker">Гадзіннікавы майстар</string>
-	<string name="poi_craft_window_construction">Выраб вокнаў</string>
+	<string name="poi_craft_window_construction">Выраб акон</string>
 
 	<string name="poi_funeral_directors">Рытуальныя паслугі</string>
 	<string name="poi_craft_computer">Зборка кампутараў</string>
-	<string name="poi_beauty">Салон прыгажосьці</string>
+	<string name="poi_beauty">Салон прыгажосці</string>
 	<string name="poi_beauty_salon_nails">Манікюр</string>
 	<string name="poi_hairdresser">Цырульня</string>
-	<string name="poi_massage">Масажны салён</string>
-	<string name="poi_tattoo">Тату салён</string>
+	<string name="poi_massage">Масажны салон</string>
+	<string name="poi_tattoo">Татусалон</string>
 	<string name="poi_dry_cleaning">Хімчыстка</string>
 	<string name="poi_laundry">Пральня</string>
 	<string name="poi_car_rental">Пракат аўтамабіляў</string>
@@ -553,7 +553,7 @@
 	<string name="poi_bank">Банк</string>
 	<string name="poi_amenity_atm">Банкамат</string>
 	<string name="poi_money_lender">Ліхвяр</string>
-	<string name="poi_pawnbroker">Лямбард</string>
+	<string name="poi_pawnbroker">Ламбард</string>
 	<string name="poi_bureau_de_change">Абмен валют</string>
 	<string name="poi_accountant">Бухгалтарскія паслугі</string>
 	<string name="poi_bitcoin_yes">Аплата bitcoin</string>
@@ -574,43 +574,43 @@
 	<string name="poi_cape">Мыс</string>
 	<string name="poi_beach">Пляж</string>
 	<string name="poi_bay">Заліў, бухта</string>
-	<string name="poi_fjord">Фіёрд</string>
+	<string name="poi_fjord">Ф’ёрд</string>
 	<string name="poi_reef">Рыф</string>
 	<string name="poi_wetland">Балота</string>
 	<string name="poi_nature_reserve">Запаведнік</string>
 	<string name="poi_strait">Праліў</string>
-	<string name="poi_island">Выспа</string>
-	<string name="poi_islet">Выспа (невялікая)</string>
+	<string name="poi_island">Востраў</string>
+	<string name="poi_islet">Востраў (невялікі)</string>
 
 	<string name="poi_anchorage">Якарная стаянка</string>
 	<string name="poi_anchor_berth">Якарны прычал</string>
 	<string name="poi_beacon">Бакен</string>
-	<string name="poi_beacon_special_purpose">Бакен адмысловага прызначэньня</string>
+	<string name="poi_beacon_special_purpose">Бакен адмысловага прызначэння</string>
 	<string name="poi_berth">Прычал</string>
-	<string name="poi_buoy_installation">Знак ізаляванай небясьпекі</string>
+	<string name="poi_buoy_installation">Знак ізаляванай небяспекі</string>
 	<string name="poi_buoy_special_purpose">Адмысловы буй</string>
-	<string name="poi_fog_signal">Сыгнал пры смузе</string>
+	<string name="poi_fog_signal">Сігнал пры смузе</string>
 	<string name="poi_seamark_harbour">Гавань</string>
 	<string name="poi_mooring">Прычал</string>
-	<string name="poi_notice">Апавяшчэньне (навігацыйны знак)</string>
-	<string name="poi_radio_station">Радыёстанцыя (навігацыйны знак)</string>
-	<string name="poi_signal_station_warning">Сыгнал небясьпекі</string>
-	<string name="poi_seamark_wreck">Караблекрушэньне (навігацыйны знак)</string>
+	<string name="poi_notice">Апавяшчэнне (навігацыйны знак)</string>
+	<string name="poi_radio_station">Радыястанцыя (навігацыйны знак)</string>
+	<string name="poi_signal_station_warning">Сігнал небяспекі</string>
+	<string name="poi_seamark_wreck">Караблекрушэнне (навігацыйны знак)</string>
 
 	<string name="poi_military">Вайсковае</string>
 	<string name="poi_military_airfield">Ваенны аэрадром</string>
 	<string name="poi_military_bunker">Ваенны бункер</string>
 	<string name="poi_military_barracks">Баракі</string>
-	<string name="poi_military_danger_area">Небясьпечная зона</string>
+	<string name="poi_military_danger_area">Небяспечная зона</string>
 	<string name="poi_military_range">Ваеннае стрэльбішча</string>
 	<string name="poi_suburb">Прыгарад</string>
 	<string name="poi_neighbourhood">Ваколіцы</string>
 	<string name="poi_dock">Док</string>
-	<string name="poi_motorway_junction">Дарожная разьвязка</string>
+	<string name="poi_motorway_junction">Дарожная развязка</string>
 
 	<string name="poi_attraction_amusement_ride">Атракцыён</string>
 	<string name="poi_attraction_animal">Жывёла (атракцыён)</string>
-	<string name="poi_attraction_roller_coaster">Амэрыканскія горкі</string>
+	<string name="poi_attraction_roller_coaster">Амерыканскія горкі</string>
 	<string name="poi_attraction_slide">Жолаб</string>
 	<string name="poi_attraction_summer_toboggan">Летнія сані</string>
 	<string name="poi_seamark_rock">Скала (навігацыйны знак)</string>
@@ -619,21 +619,21 @@
 	<string name="poi_tower">Вежа</string>
 	<string name="poi_mast">Шчогла</string>
 	<string name="poi_radar">Радар</string>
-	<string name="poi_aquarium">Акварыюм</string>
-	<string name="poi_buoy_isolated_danger">Буй (ізаляваная небясьпека)</string>
+	<string name="poi_aquarium">Акварыум</string>
+	<string name="poi_buoy_isolated_danger">Буй (ізаляваная небяспека)</string>
 	<string name="poi_buoy_lateral">Латэральны буй</string>
 	<string name="poi_dyke">Дамба</string>
 	<string name="poi_beacon_cardinal">Кардынальны бакен</string>
 	<string name="poi_beacon_lateral">Латэральны бакен</string>
 	<string name="poi_buoy_cardinal">Кардынальны буй</string>
-	<string name="poi_radar_transponder">Радыёлакацыйны транспондар (навігацыйны знак)</string>
+	<string name="poi_radar_transponder">Радыялакацыйны транспондар (навігацыйны знак)</string>
 	<string name="poi_pile">Навігацыйны знак на палях</string>
 	<string name="poi_signal_station_traffic">Сігнальная станцыя (трафік)</string>
 	<string name="poi_topmark">Топавая фігура (навігацыйны знак)</string>
 	<string name="poi_seamark_building">Будынак (арыентыр)</string>
 	<string name="poi_seamark_bridge">Мост (арыентыр)</string>
-	<string name="poi_buoy_safe_water">Бясьпечная вада (буй)</string>
-	<string name="poi_beacon_safe_water">Бясьпечная вада (бакен)</string>
+	<string name="poi_buoy_safe_water">Бяспечная вада (буй)</string>
+	<string name="poi_beacon_safe_water">Бяспечная вада (бакен)</string>
 	<string name="poi_harbour_basin">Акваторыя порту</string>
 	<string name="poi_landmark">Берагавы знак</string>
 	<string name="poi_seamark_light">Агонь маяка</string>
@@ -641,7 +641,7 @@
 	<string name="poi_seamark_light_major">Асноўны агонь маяка</string>
 	<string name="poi_seamark_light_minor">Малы агонь маяка</string>
 	<string name="poi_seamark_light_float">Агонь плывучага маяка</string>
-	<string name="poi_distance_mark">Пазнака дальнасьці</string>
+	<string name="poi_distance_mark">Пазнака дальнасці</string>
 	<string name="poi_seamark_light_vessel">Агонь плывучага маяка (судна)</string>
 	<string name="poi_small_craft_facility">Лодкавая станцыя</string>
 	<string name="poi_team_handball">Гандбол</string>
@@ -655,7 +655,7 @@
 	<string name="poi_service">Сэрвіс</string>
 	<string name="poi_finance">Фінансы</string>
 	<string name="poi_natural">Прырода</string>
-	<string name="poi_osmwiki">Вікіпэдыя</string>
+	<string name="poi_osmwiki">Вікіпедыя</string>
 	<string name="poi_user_defined_other">Карыстальніцкія</string>
 	
 	<string name="poi_military_landuse">Вайсковая зона</string>
@@ -665,51 +665,51 @@
 	<string name="poi_seamark">Марское</string>
 	<string name="poi_entertainment">Адпачынак</string>
 	<string name="poi_man_made">Антрапагеннае</string>
-	<string name="poi_apartment">Апартамэнты</string>
+	<string name="poi_apartment">Апартаменты</string>
 
 	<string name="poi_wine">Вінная крама</string>
 
-	<string name="poi_public_transport_stop_position">Месца прыпынку грамадзкага транспарту</string>
+	<string name="poi_public_transport_stop_position">Месца прыпынку грамадскага транспарту</string>
 	<string name="poi_halt">Чыгуначны прыпынак</string>
 	<string name="poi_internet_access_wlan">Доступ у Інтэрнэт: WLAN</string>
 	<string name="poi_internet_access_terminal">Доступ у Інтэрнэт: тэрмінал</string>
 	<string name="poi_internet_access_wired">Доступ у Інтэрнэт: дротавы</string>
-	<string name="poi_internet_access_public">Доступ у Інтэрнэт: агульны</string>
+	<string name="poi_internet_access_public">Доступ у Інтэрнэт: публічны</string>
 	<string name="poi_internet_access_service">Доступ у Інтэрнэт: паслугі</string>
 	
 	<string name="poi_lodging">Начлег</string>
 	<string name="poi_railway_buffer_stop">Чыгуначны тупіковы ўпор</string>
-	<string name="poi_club">Клюб</string>
+	<string name="poi_club">Клуб</string>
 	<string name="poi_craft">Майстэрня</string>
 	<string name="poi_personal_transport">Уласны транспарт</string>
-		<string name="poi_public_transport">Грамадзкі транспарт</string>
-		<string name="poi_sightseeing">Славутасьці</string>
+		<string name="poi_public_transport">Грамадскі транспарт</string>
+		<string name="poi_sightseeing">Славутасці</string>
 		<string name="poi_internet_access">Доступ у Інтэрнэт</string>
 	<string name="poi_cafe_and_restaurant">Кафэ і рэстаран</string>
 	<string name="poi_filling_station">АЗС</string>
 		<string name="poi_water_transport">Водны транспарт</string>
 		<string name="poi_bicycle_transport">Роварны транспарт</string>
-		<string name="poi_water_supply">Водазабесьпячэньне</string>
-		<string name="poi_trash_disposal">Сьметнік</string>
-	<string name="poi_shop_food">Прадуктовая крама і супэрмаркет</string>
+		<string name="poi_water_supply">Водазабеспячэнне</string>
+		<string name="poi_trash_disposal">Сметнік</string>
+	<string name="poi_shop_food">Прадуктовая крама і супермаркет</string>
 	<string name="poi_road_obstacle">Дарожная перашкода</string>
-		<string name="poi_air_transport">Авія транспарт</string>
+		<string name="poi_air_transport">Авіятранспарт</string>
 		<string name="poi_aerialway_transport">Лінная дарога</string>
 	<string name="poi_transport_construction">Транспартнае будаўніцтва</string>
 		<string name="poi_power">Энэргетыка</string>
 		<string name="poi_communication">Сувязь</string>
-		<string name="poi_accomodation">Жыльлё</string>
-		<string name="poi_medical_supply">Медыцынскае забесьпячэньне</string>
+		<string name="poi_accomodation">Жыллё</string>
+		<string name="poi_medical_supply">Медыцынскае забеспячэнне</string>
 	<string name="poi_field_hockey">Хакей на траве</string>
-	<string name="poi_smoking_area">Зона для паленьня</string>
-	<string name="poi_training">Навучальны цэнтар</string>
+	<string name="poi_smoking_area">Зона для палення</string>
+	<string name="poi_training">Навучальны цэнтр</string>
 	<string name="poi_quarter">Квартал</string>
 	<string name="poi_rest_area">Зона адпачынку</string>
 
-	<string name="poi_reservoir">Рэзэрвуар</string>
+	<string name="poi_reservoir">Рэзервуар</string>
 	<string name="poi_gasometer">Газасховішча</string>
 	<string name="poi_silo">Сілас</string>
-	<string name="poi_storage_tank">Бак (рэзэрвуар)</string>
+	<string name="poi_storage_tank">Бак (рэзервуар)</string>
 
 	<string name="poi_piste_nordic">Лыжня</string>
 	<string name="poi_piste_snow_park">Сноўпарк</string>
@@ -720,7 +720,7 @@
 
 	<string name="poi_piste_sled">Санкавы схіл</string>
 	<string name="poi_piste_sleigh">Нартавая дарога</string>
-	<string name="poi_piste_hike">Сьцежка</string>
+	<string name="poi_piste_hike">Сцежка</string>
 	<string name="poi_canal">Канал</string>
 	<string name="poi_bench">Лаўка</string>
 	<string name="poi_water">Вада</string>
@@ -729,11 +729,11 @@
 
 	<string name="poi_valley">Даліна</string>
 	<string name="poi_wood">Лес</string>
-	<string name="poi_landuse">Землекарыстаньне</string>
-	<string name="poi_fuel_diesel">Дызэль</string>
-	<string name="poi_fuel_gtl_diesel">GTL-дызэль</string>
-	<string name="poi_fuel_hgv_diesel">HGV-дызэль</string>
-	<string name="poi_fuel_biodiesel">Біядызэль</string>
+	<string name="poi_landuse">Землекарыстанне</string>
+	<string name="poi_fuel_diesel">Дызель</string>
+	<string name="poi_fuel_gtl_diesel">GTL-дызель</string>
+	<string name="poi_fuel_hgv_diesel">HGV-дызель</string>
+	<string name="poi_fuel_biodiesel">Біядызель</string>
 	<string name="poi_fuel_lpg">Звадкаваны газ</string>
 	<string name="poi_fuel_octane_80">Актан 80</string>
 	<string name="poi_fuel_octane_91">Актан 91</string>
@@ -741,18 +741,18 @@
 	<string name="poi_fuel_octane_95">Актан 95</string>
 	<string name="poi_fuel_octane_98">Актан 98</string>
 	<string name="poi_fuel_octane_100">Актан 100</string>
-	<string name="poi_fuel_cng">Сьціснуты прыродны газ</string>
+	<string name="poi_fuel_cng">Сціснуты прыродны газ</string>
 	<string name="poi_fuel_1_25">Паліва 1:25</string>
 	<string name="poi_fuel_1_50">Паліва 1:50</string>
-	<string name="poi_fuel_ethanol">Этаноль</string>
-	<string name="poi_fuel_methanol">Мэтаноль</string>
+	<string name="poi_fuel_ethanol">Этанол</string>
+	<string name="poi_fuel_methanol">Метанол</string>
 	<string name="poi_fuel_svo">Алейнае паліва</string>
 	<string name="poi_fuel_e10">E10</string>
 	<string name="poi_fuel_e20">E20</string>
 	<string name="poi_fuel_e85">E85</string>
 	<string name="poi_fuel_biogas">Біягаз</string>
 	<string name="poi_fuel_lh2">Вадкі вадарод</string>
-	<string name="poi_fuel_electricity">Электрычнасьць</string>
+	<string name="poi_fuel_electricity">Электрычнасць</string>
 	<string name="poi_farmyard">Падворак</string>
 	<string name="poi_meadow">Луг</string>
 
@@ -764,7 +764,7 @@
 
 	<string name="poi_landuse_railway">Чыгуначная паласа</string>
 
-	<string name="poi_junction">Перакрыжаваньне</string>
+	<string name="poi_junction">Перакрыжаванне</string>
 	<string name="poi_sailing">Парусны спорт</string>
 	<string name="poi_charity">Дабрачынная крама</string>
 	<string name="poi_photo">Фота</string>
@@ -791,79 +791,79 @@
 	<string name="poi_general_tourist_attraction_yes">Турыстычная славутасьць</string>
 	<string name="poi_trail_riding_station">Станцыя для вершнікаў</string>
 
-	<string name="poi_wiki_place">Вікіпэдыя</string>
-	<string name="poi_wiki_lang_en">Англійская Вікіпэдыя</string>
-	<string name="poi_camera">Фота і оптыка</string>
+	<string name="poi_wiki_place">Вікіпедыя</string>
+	<string name="poi_wiki_lang_en">Вікіпедыя на англійскай мове</string>
+	<string name="poi_camera">Камеры і аб’ектывы</string>
 	<string name="poi_religious">Рэлігійны пляц</string>
-	<string name="poi_wiki_lang_ar">Арабская Вікі</string>
-	<string name="poi_wiki_lang_be">Беларуская Вікі</string>
-	<string name="poi_wiki_lang_bg">Баўгарская Вікі</string>
-	<string name="poi_wiki_lang_ca">Каталанская Вікі</string>
-	<string name="poi_wiki_lang_zh">Кітайская Вікі</string>
+	<string name="poi_wiki_lang_ar">Вікіпедыя на арабскай мове</string>
+	<string name="poi_wiki_lang_be">Вікіпедыя на беларускай мове</string>
+	<string name="poi_wiki_lang_bg">Вікіпедыя на балгарскай мове</string>
+	<string name="poi_wiki_lang_ca">Вікіпедыя на каталанскай мове</string>
+	<string name="poi_wiki_lang_zh">Вікіпедыя на кітайскай мове</string>
 
-<string name="poi_wiki_lang_cs">Чэская Вікі</string>
-	<string name="poi_wiki_lang_da">Дацкая Вікі</string>
-	<string name="poi_wiki_lang_de">Нямецкая Вікі</string>
-	<string name="poi_wiki_lang_el">Грэцкая Вікі</string>
-	<string name="poi_wiki_lang_et">Эстонская Вікі</string>
-	<string name="poi_wiki_lang_es">Гішпанская Вікі</string>
-	<string name="poi_wiki_lang_fi">Фінская Вікі</string>
-	<string name="poi_wiki_lang_fr">Французкая Вікі</string>
-	<string name="poi_wiki_lang_gl">Галіцкая Вікі</string>
-	<string name="poi_wiki_lang_he">Габрэйская Вікі</string>
-	<string name="poi_wiki_lang_hr">Харвацкая Вікі</string>
-	<string name="poi_wiki_lang_ht">Гаіцянская Вікі</string>
-	<string name="poi_wiki_lang_hu">Вугорская Вікі</string>
-	<string name="poi_wiki_lang_id">Інданэзійская Вікі</string>
-	<string name="poi_wiki_lang_it">Італійская Вікі</string>
-	<string name="poi_wiki_lang_ja">Японская Вікі</string>
-	<string name="poi_wiki_lang_ko">Карэйская Вікі</string>
-	<string name="poi_wiki_lang_lt">Літоўская Вікі</string>
-	<string name="poi_wiki_lang_lv">Латвійская Вікі</string>
-	<string name="poi_wiki_lang_ms">Малайская Вікі</string>
-	<string name="poi_wiki_lang_new">Нэварская Вікі</string>
-	<string name="poi_wiki_lang_nl">Галяндзкая Вікі</string>
-	<string name="poi_wiki_lang_nn">Нованарвежская Вікі</string>
-	<string name="poi_wiki_lang_no">Нарвежская Вікі</string>
-	<string name="poi_wiki_lang_pl">Польская Вікі</string>
-	<string name="poi_wiki_lang_pt">Партугальская Вікі</string>
-	<string name="poi_wiki_lang_ro">Румынская Вікі</string>
-	<string name="poi_wiki_lang_ru">Расейская Вікі</string>
-	<string name="poi_wiki_lang_sk">Славацкая Вікі</string>
-	<string name="poi_wiki_lang_sl">Славенская Вікі</string>
-	<string name="poi_wiki_lang_sr">Сербская Вікі</string>
-	<string name="poi_wiki_lang_sv">Швэдзкая Вікі</string>
-	<string name="poi_wiki_lang_th">Тайская Вікі</string>
-	<string name="poi_wiki_lang_tr">Турэцкая Вікі</string>
-	<string name="poi_wiki_lang_uk">Украінская Вікі</string>
-	<string name="poi_wiki_lang_vi">В\'етнамская Вікі</string>
-	<string name="poi_wiki_lang_sw">Суахільская Вікі</string>
-	<string name="poi_barrier_entrance">Праход у сьцяне ці плоце</string>
+<string name="poi_wiki_lang_cs">Вікіпедыя на чэшскай мове</string>
+	<string name="poi_wiki_lang_da">Вікіпедыя на дацкай мове</string>
+	<string name="poi_wiki_lang_de">Вікіпедыя на нямецкай мове</string>
+	<string name="poi_wiki_lang_el">Вікіпедыя на грэчаскай мове</string>
+	<string name="poi_wiki_lang_et">Вікіпедыя на эстонскай мове</string>
+	<string name="poi_wiki_lang_es">Вікіпедыя на іспанскай мове</string>
+	<string name="poi_wiki_lang_fi">Вікіпедыя на фінскай мове</string>
+	<string name="poi_wiki_lang_fr">Вікіпедыя на французскай мове</string>
+	<string name="poi_wiki_lang_gl">Вікіпедыя на галіцкай мове</string>
+	<string name="poi_wiki_lang_he">Вікіпедыя на іўрыце</string>
+	<string name="poi_wiki_lang_hr">Вікіпедыя на харвацкай мове</string>
+	<string name="poi_wiki_lang_ht">Вікіпедыя на гаіцянскай мове</string>
+	<string name="poi_wiki_lang_hu">Вікіпедыя на венгерскай мове</string>
+	<string name="poi_wiki_lang_id">Вікіпедыя на інданэзійскай мове</string>
+	<string name="poi_wiki_lang_it">Вікіпедыя на італьянскай мове</string>
+	<string name="poi_wiki_lang_ja">Вікіпедыя на японскай мове</string>
+	<string name="poi_wiki_lang_ko">Вікіпедыя на карэйскай мове</string>
+	<string name="poi_wiki_lang_lt">Вікіпедыя на летувісскай мове</string>
+	<string name="poi_wiki_lang_lv">Вікіпедыя на латышскай мове</string>
+	<string name="poi_wiki_lang_ms">Вікіпедыя на малазійскай мове</string>
+	<string name="poi_wiki_lang_new">Вікіпедыя на неварскай мове</string>
+	<string name="poi_wiki_lang_nl">Вікіпедыя на галандскай мове</string>
+	<string name="poi_wiki_lang_nn">Вікіпедыя на нарвежскай (Нюнорск) мове</string>
+	<string name="poi_wiki_lang_no">Вікіпедыя на нарвежскай мове</string>
+	<string name="poi_wiki_lang_pl">Вікіпедыя на польскай мове</string>
+	<string name="poi_wiki_lang_pt">Вікіпедыя на партугальскай мове</string>
+	<string name="poi_wiki_lang_ro">Вікіпедыя на румынскай мове</string>
+	<string name="poi_wiki_lang_ru">Вікіпедыя на расійскай мове</string>
+	<string name="poi_wiki_lang_sk">Вікіпедыя на славацкай мове</string>
+	<string name="poi_wiki_lang_sl">Вікіпедыя на славенскай мове</string>
+	<string name="poi_wiki_lang_sr">Вікіпедыя на сербскай мове</string>
+	<string name="poi_wiki_lang_sv">Вікіпедыя шведскай мове</string>
+	<string name="poi_wiki_lang_th">Вікіпедыя на тайскай мове</string>
+	<string name="poi_wiki_lang_tr">Вікіпедыя на турэцкай мове</string>
+	<string name="poi_wiki_lang_uk">Вікіпедыя на украінскай мове</string>
+	<string name="poi_wiki_lang_vi">Вікіпедыя на в’етнамскай мове</string>
+	<string name="poi_wiki_lang_sw">Вікіпедыя на суахілі</string>
+	<string name="poi_barrier_entrance">Праход у сцяне ці плоце</string>
 	<string name="poi_entrance_main">Асноўны ўваход</string>
 	<string name="poi_entrance">Уваход</string>
 	<string name="poi_entrance_exit">Выхад</string>
 
-	<string name="poi_cheese">Сыр</string>
+	<string name="poi_cheese">Сырная крама</string>
 	<string name="poi_chocolate">Шакаладніца</string>
 	<string name="poi_pasta">Макаронныя вырабы</string>
-	<string name="poi_candles">Сьвечы</string>
+	<string name="poi_candles">Свечы</string>
 	<string name="poi_garden_furniture">Садовая мэбля</string>
 	<string name="poi_music">Музыка</string>
 	<string name="poi_tyres">Шыны</string>
-	<string name="poi_watches">Гадзіньнікі</string>
+	<string name="poi_watches">Гадзіннікі</string>
 	<string name="poi_games">Гульні</string>
-	<string name="poi_video_games">Відэа гульні</string>
+	<string name="poi_video_games">Відэагульні</string>
 	<string name="poi_pyrotechnics">Піратэхніка</string>
 	<string name="poi_weapons">Зброя</string>
 
 	<string name="poi_coffee">Крама кавы</string>
 	<string name="poi_pastry">Цукерня</string>
-	<string name="poi_leather">Галянтарэя</string>
-	<string name="poi_swimming_pool_shop">Тавары для басэйна</string>
+	<string name="poi_leather">Скураныя вырабы</string>
+	<string name="poi_swimming_pool_shop">Тавары для басейна</string>
 	<string name="poi_model">Мадэлістам</string>
 	<string name="poi_fashion">Крама моды</string>
 	<string name="poi_furnace">Крама абагравальнікаў</string>
-	<string name="poi_scuba_diving_shop">Крама для плаваньня з маскамі</string>
+	<string name="poi_scuba_diving_shop">Крама тавараў для дайвінгу</string>
 	<string name="poi_trophy">Узнагароды, прызы</string>
 	<string name="poi_height_restrictor">Абмежавальнік вышыні</string>
 	<string name="poi_free_flying">Крама для парашутыстаў</string>
@@ -880,15 +880,15 @@
 	<string name="poi_horse_stile">Праезд для вершнікаў</string>
 	<string name="poi_kissing_gate">Брамка</string>
 	<string name="poi_sally_port">Брама</string>
-	<string name="poi_wiki_lang_hi">Хіндзі Вікі</string>
-	<string name="poi_wiki_lang_te">Тэлугу Вікі</string>
-	<string name="poi_wiki_lang_vo">Валапюк Вікі</string>
+	<string name="poi_wiki_lang_hi">Вікіпедыя на хіндзі</string>
+	<string name="poi_wiki_lang_te">Вікіпедыя на тэлугу</string>
+	<string name="poi_wiki_lang_vo">Вікіпедыя на валапюк</string>
 	<string name="poi_swing_gate">Паваротны шлагбаўм</string>
 	<string name="poi_turnstile">Турнікет</string>
 	<string name="poi_kent_carriage_gap">Праезд для фурманак</string>
-	<string name="poi_highway_crossing">Пешаходныя пераход</string>
+	<string name="poi_highway_crossing">Пешаходны пераход</string>
 
-<string name="poi_wiki_lang_ceb">Себуанская Вікі</string>
+<string name="poi_wiki_lang_ceb">Вікіпедыя на себуанскай мове</string>
 	<string name="poi_energy">Энэргетыка</string>
 	<string name="poi_breakwater">Хвалялом</string>
 	<string name="poi_groyne">Хвалярэз</string>
@@ -896,25 +896,25 @@
 	<string name="poi_tourism_attraction">Турыстычная славутасьць</string>
 	<string name="poi_tree">Дрэва</string>
 	<string name="poi_opening_hours">Гадзіны працы</string>
-	<string name="poi_description">Апісаньне</string>
+	<string name="poi_description">Апісанне</string>
 	<string name="poi_phone">Тэлефон</string>
 	<string name="poi_website">Вэб-сайт</string>
-	<string name="poi_operator">Апэратар</string>
+	<string name="poi_operator">Аператар</string>
 	<string name="poi_brand">Брэнд</string>
 
-	<string name="poi_power_cable_distribution_cabinet">Разьмеркавальная скрыня</string>
+	<string name="poi_power_cable_distribution_cabinet">Размеркавальная скрыня</string>
 	<string name="poi_basin">Штучны вадаём</string>
 	<string name="poi_crane">Кран</string>
 	<string name="poi_country">Краіна</string>
 	<string name="poi_cutline">Прасека</string>
 	<string name="poi_enforcement_toll">Кантроль: аплата</string>
 
-<string name="poi_enforcement_maxspeed">Кантроль: максімальная хуткасьць</string>
+<string name="poi_enforcement_maxspeed">Кантроль: максімальная хуткасць</string>
 	<string name="poi_enforcement_maxheight">Кантроль: максімальная вышыня</string>
 	<string name="poi_enforcement_mindistance">Кантроль: мінімальная дыстанцыя паміж аўтамабілямі</string>
-	<string name="poi_enforcement_check">Патрабаваньне:кантроль</string>
+	<string name="poi_enforcement_check">Патрабаванне:кантроль</string>
 	<string name="poi_enforcement_access">Кантроль: доступ</string>
-	<string name="poi_enforcement_traffic_signals">Кантроль: праезд на чырвоны сігнал сьвятлафора</string>
+	<string name="poi_enforcement_traffic_signals">Кантроль: праезд на чырвоны сігнал святлафора</string>
 	<string name="poi_fee_yes">Так</string>
 
 	<string name="poi_disused">Невыкарыстоўваемы</string>
@@ -927,40 +927,40 @@
 	<string name="poi_icn_ref">Пункт міжнароднай роварнай сеткі</string>
 	<string name="poi_ncn_ref">Пункт нацыянальнай роварнай сеткі</string>
 	<string name="poi_rcn_ref">Пункт рэгіянальнай роварнай сеткі</string>
-	<string name="poi_lcn_ref">Пункт лякальнай роварнай сеткі</string>
+	<string name="poi_lcn_ref">Пункт мясцовай роварнай сеткі</string>
 	<string name="poi_iwn_ref">Пункт міжнароднай сеткі пешых маршрутаў</string>
 	<string name="poi_nwn_ref">Пункт нацыянальнай сеткі пешых маршрутаў</string>
 	<string name="poi_rwn_ref">Пункт рэгіянальнай сеткі пешых маршрутаў</string>
-	<string name="poi_lwn_ref">Пункт лякальнай сеткі пешых маршрутаў</string>
+	<string name="poi_lwn_ref">Пункт мясцовай сеткі пешых маршрутаў</string>
 
 	<string name="poi_route_hiking_iwn_poi">Міжнародны пешы маршрут</string>
 	<string name="poi_route_hiking_nwn_poi">Нацыянальны пешы маршрут</string>
 	<string name="poi_route_hiking_rwn_poi">Рэгіянальны пешы маршрут</string>
-	<string name="poi_route_hiking_lwn_poi">Лякальны пешы маршрут</string>
+	<string name="poi_route_hiking_lwn_poi">Мясцовы пешы маршрут</string>
 	<string name="poi_conservation">Абароненая вобласьць</string>
 
 	<string name="poi_node_networks">Вузлы пешаходнай ці рованай сеткі</string>
 		<string name="poi_hiking_routes">Пешыя маршруты</string>
 		<string name="poi_traffic_enforcement">Кантроль руху</string>
-	<string name="poi_collection_times">Гадзіны выманьня</string>
-	<string name="poi_route_hiking_ref_poi">Абазначэньне пешага маршруту</string>
+	<string name="poi_collection_times">Гадзіны вымання</string>
+	<string name="poi_route_hiking_ref_poi">Абазначэнне пешага маршруту</string>
 
 	<string name="poi_access_private">Прыватны доступ</string>
 	<string name="poi_access_no">Няма доступу</string>
 	<string name="poi_access_permissive">Доступ з дазволу</string>
 	<string name="poi_access_customers">Доступ спажыўцам</string>
 	<string name="poi_access_delivery">Доступ для дастаўкі</string>
-	<string name="poi_access_agricultural">Сельгасп. доступ</string>
+	<string name="poi_access_agricultural">Сельгас доступ</string>
 
 	<string name="poi_access_destination">Транзіт забаронены</string>
-	<string name="poi_capital">Сталіца</string>
+	<string name="poi_capital">Так</string>
 	<string name="poi_fee_no">Не</string>
 
-	<string name="poi_monitoring_station">Станцыя назіраньня</string>
+	<string name="poi_monitoring_station">Станцыя назірання</string>
 	<string name="poi_email">Эл. пошта</string>
 	<string name="poi_fax">Факс</string>
-	<string name="facebook">Facebook</string>
-	<string name="poi_mobile">Сотавы тэлефон</string>
+	<string name="facebook">Фэйсбук</string>
+	<string name="poi_mobile">Мабільны тэлефон</string>
 	<string name="poi_animal_shelter_dog">Сабакі</string>
 	<string name="poi_animal_shelter_cat">Каты</string>
 	<string name="poi_animal_shelter_dog_cat">Сабакі, каты</string>
@@ -968,20 +968,20 @@
 
 <string name="poi_shower">Душ</string>
 	<string name="poi_recycling_centre">Пункт прыёму</string>
-	<string name="poi_recycling_container">Кантэйнэр</string>
+	<string name="poi_recycling_container">Кантэйнер</string>
 	<string name="poi_recycling_glass">Шкло</string>
 	<string name="poi_recycling_paper">Папера</string>
 	<string name="poi_recycling_clothes">Вопратка</string>
 	<string name="poi_recycling_cans">Бляшанкі</string>
 	<string name="poi_recycling_glass_bottles">Шкляныя бутэлькі</string>
-	<string name="poi_recycling_plastic">Плястык</string>
-	<string name="poi_recycling_scrap_metal">Мэталалом</string>
+	<string name="poi_recycling_plastic">Пластык</string>
+	<string name="poi_recycling_scrap_metal">Металалом</string>
 	<string name="poi_recycling_batteries">Батарэйкі</string>
-	<string name="poi_recycling_plastic_bottles">Плястыкавыя бутэлькі</string>
-	<string name="poi_recycling_green_waste">Расьліннае сьмецьце</string>
-	<string name="poi_recycling_waste">Сьмецьце (чорныя мяхі)</string>
-	<string name="poi_recycling_plastic_packaging">Плястыкавая тара</string>
-	<string name="poi_recycling_newspaper">Газэты</string>
+	<string name="poi_recycling_plastic_bottles">Пластыкавыя бутэлькі</string>
+	<string name="poi_recycling_green_waste">Расліннае сьмецце</string>
+	<string name="poi_recycling_waste">Смецце (чорныя мяхі)</string>
+	<string name="poi_recycling_plastic_packaging">Пластыкавая тара</string>
+	<string name="poi_recycling_newspaper">Газеты</string>
 	<string name="poi_recycling_magazines">Часопісы</string>
 	<string name="poi_recycling_books">Кнігі</string>
 	<string name="poi_recycling_shoes">Абутак</string>
@@ -998,16 +998,16 @@
 	<string name="poi_recycling_aluminium">Алюміній</string>
 	<string name="poi_recycling_organic">Арганічныя харчовыя адходы</string>
 	<string name="poi_recycling_beverage_cartons">Скрынкі з-пад гародніны</string>
-	<string name="poi_recycling_garden_waste">Садовае сьмецьце</string>
-	<string name="poi_recycling_low_energy_bulbs">Энэргазьберагальныя лямпы</string>
-	<string name="poi_recycling_fluorescent_tubes">Люмінесцэнтныя лямпы</string>
-	<string name="poi_recycling_metal">Мэталь</string>
+	<string name="poi_recycling_garden_waste">Садовае смецце</string>
+	<string name="poi_recycling_low_energy_bulbs">Энэргазберагальныя лампы</string>
+	<string name="poi_recycling_fluorescent_tubes">Люмінесцэнтныя лампы</string>
+	<string name="poi_recycling_metal">Метал</string>
 	<string name="poi_recycling_electrical_items">Буйная бытавая тэхніка</string>
 	<string name="poi_recycling_white_goods">Бытавая тэхніка</string>
-	<string name="poi_recycling_cooking_oil">Алей для смажаньня</string>
+	<string name="poi_recycling_cooking_oil">Алей для смажання</string>
 	<string name="poi_recycling_engine_oil">Аліва</string>
-	<string name="poi_recycling_plastic_bags">Плястыкавыя мяхі</string>
-	<string name="poi_recycling_hazardous_waste">Небясьпечныя адходы</string>
+	<string name="poi_recycling_plastic_bags">Пластыкавыя мяхі</string>
+	<string name="poi_recycling_hazardous_waste">Небяспечныя адходы</string>
 	<string name="poi_recycling_mobile_phones">Мабільныя тэлефоны</string>
 	<string name="poi_recycling_hydrargyrum">Ртуць</string>
 	<string name="poi_recycling_computers">Кампутары</string>
@@ -1018,15 +1018,15 @@
 	<string name="poi_recycling_cds">Кампакт-дыскі</string>
 	<string name="poi_recycling_bottles">Бутэлькі</string>
 	<string name="poi_recycling_cork">Вінныя коркі</string>
-	<string name="poi_recycling_printer_cartridges">Картрыджы для друкарак</string>
+	<string name="poi_recycling_printer_cartridges">Картрыджы для прынтараў</string>
 	<string name="poi_recycling_sheet_metal">Бляшаныя вырабы</string>
 	<string name="poi_recycling_foil">Фальга</string>
 	<string name="poi_recycling_paint">Фарба</string>
-	<string name="poi_recycling_styrofoam">Пенапляст</string>
+	<string name="poi_recycling_styrofoam">Пенапласт</string>
 	<string name="poi_recycling_drugs">Лекі</string>
 	<string name="poi_recycling_compost">Кампост</string>
-	<string name="poi_recycling_hardcore">Будаўнічае сьмецьце</string>
-	<string name="poi_recycling_christmas_trees">Навагоднія елкі</string>
+	<string name="poi_recycling_hardcore">Будаўнічае смецце</string>
+	<string name="poi_recycling_christmas_trees">Калядныя елкі</string>
 	<string name="poi_recycling_light_bulbs">Лямпачкі</string>
 	<string name="poi_recycling_chipboard">ДСП</string>
 	<string name="poi_recycling_polyester">Поліэстэр</string>
@@ -1045,27 +1045,27 @@
 	<string name="poi_supervised_no">Некантралюемы аб\'ект</string>
 	<string name="poi_seasonal_yes">Так</string>
 	<string name="poi_seasonal_no">Не</string>
-	<string name="poi_seasonal_dry_season">Сухі сэзон</string>
-	<string name="poi_seasonal_wet_season">Сэзон дажджоў</string>
-	<string name="poi_crossing_traffic_signals">Са сьвятлафорам</string>
+	<string name="poi_seasonal_dry_season">Сухі сезон</string>
+	<string name="poi_seasonal_wet_season">Сезон дажджоў</string>
+	<string name="poi_crossing_traffic_signals">Са святлафорам</string>
 	<string name="poi_crossing_uncontrolled">Нерэгулюемы</string>
-	<string name="poi_crossing_unmarked">Неразьмечаны</string>
+	<string name="poi_crossing_unmarked">Неразмечаны</string>
 
 	<string name="poi_recycling_waste_oil">Адпрацаваная алiва</string>
-	<string name="poi_perfumery">Парфумэрыя</string>
+	<string name="poi_perfumery">Парфумерыя</string>
 
-	<string name="twitter">Твітар</string>
-	<string name="poi_skype">Скайп</string>
-	<string name="poi_youtube">Ютуб</string>
-	<string name="poi_instagram">Інстаграм</string>
+	<string name="twitter">Twitter</string>
+	<string name="poi_skype">Skype</string>
+	<string name="poi_youtube">YouTube</string>
+	<string name="poi_instagram">Instagram</string>
 	<string name="vk">УКантакце</string>
-	<string name="poi_google_plus">Гугл+</string>
+	<string name="poi_google_plus">Google+</string>
 	<string name="poi_mill_pond">Млынавая сажалка</string>
 	<string name="poi_building">Будынак</string>
 
 <string name="poi_military_office">Ваенкамат</string>
-	<string name="poi_notary">Натарыўс</string>
-	<string name="poi_landfill_waste_nuclear">Ядравыя адыходы</string>
+	<string name="poi_notary">Натарыус</string>
+	<string name="poi_landfill_waste_nuclear">Радыяактыўныя адходы</string>
 	<string name="poi_population">Насельніцтва</string>
 
 	<string name="poi_trees_pomegranate">Гранат</string>
@@ -1073,7 +1073,7 @@
 	<string name="poi_trees_coffea">Кава</string>
 	<string name="poi_trees_rubber">Каўчук</string>
 	<string name="poi_trees_mango">Манга</string>
-	<string name="poi_trees_nectorine">Нэктарын</string>
+	<string name="poi_trees_nectorine">Нектарын</string>
 	<string name="poi_religion_voodoo">Вуду</string>
 	<string name="poi_religion_pagan">Паганства</string>
 	<string name="poi_religion_zoroastrian">Зараастрызм</string>
@@ -1085,10 +1085,10 @@
 	<string name="poi_denomination_lutheran">Лютэранства</string>
 	<string name="poi_denomination_sunni">Сунізм</string>
 	<string name="poi_denomination_protestant">Пратэстантызм</string>
-	<string name="poi_denomination_methodist">Мэтадызм</string>
+	<string name="poi_denomination_methodist">Метадызм</string>
 	<string name="poi_denomination_anglican">Англіканства</string>
-	<string name="poi_denomination_russian_orthodox">Расейкае праваслаўе</string>
-	<string name="poi_denomination_greek_orthodox">Грэцкае праваслаўе</string>
+	<string name="poi_denomination_russian_orthodox">Расійкае праваслаўе</string>
+	<string name="poi_denomination_greek_orthodox">Грэчаскае праваслаўе</string>
 	<string name="poi_denomination_reformed">Кальвінізм</string>
 	<string name="poi_denomination_seventh_day_adventist">Адвентысты сёмага дня</string>
 	<string name="poi_denomination_new_apostolic">Новаапостальская царква</string>
@@ -1097,20 +1097,20 @@
 	<string name="poi_denomination_united">Аб\'яднаная царква</string>
 	<string name="poi_denomination_greek_catholic">Грэка-каталіцызм</string>
 	<string name="poi_denomination_tibetan">Тыбецкі будызм</string>
-	<string name="poi_denomination_church_of_scotland">Царква Шатляндыі</string>
-	<string name="poi_denomination_salvation_army">Армія выратаваньня</string>
+	<string name="poi_denomination_church_of_scotland">Царква Шатландыі</string>
+	<string name="poi_denomination_salvation_army">Армія выратавання</string>
 	<string name="poi_denomination_iglesia_ni_cristo">Царква Хрыста</string>
 	<string name="poi_denomination_quaker">Квакерства</string>
-	<string name="poi_denomination_bulgarian_orthodox">Баўгарскае праваслаўе</string>
+	<string name="poi_denomination_bulgarian_orthodox">Балгарскае праваслаўе</string>
 	<string name="poi_denomination_nondenominational">Без дэнамінацыі</string>
 	<string name="poi_denomination_old_believers">Стараверства</string>
 	<string name="poi_denomination_serbian_orthodox">Сербскае праваслаўе</string>
-	<string name="poi_denomination_spiritist">Сьпірытызм</string>
+	<string name="poi_denomination_spiritist">Спірытызм</string>
 	<string name="poi_denomination_armenian_apostolic">Армянская апостальская царква</string>
 	<string name="poi_height">Вышыня</string>
 	<string name="poi_ele">Вышыня над узроўнем мора</string>
 	<string name="poi_start_date">Дата пачатку будаўніцтва</string>
-	<string name="poi_wheelchair_yes">Даступна для інвалідных крэслаў</string>
+	<string name="poi_wheelchair_yes">Так</string>
 	<string name="poi_parking_underground">Падземная</string>
 	<string name="poi_parking_multi_storey">Шматпавярховая</string>
 
@@ -1130,61 +1130,61 @@
 
 	<string name="poi_traffic_signals_sound_no">Не</string>
 	<string name="poi_traffic_signals_sound_yes">Так</string>
-	<string name="poi_tactile_paving_no">Без тактыльнага пакрыцьця</string>
+	<string name="poi_tactile_paving_no">Без тактыльнага пакрыцця</string>
 	<string name="poi_tactile_paving_yes">Так</string>
 	<string name="poi_toll_hgv_yes">Платна для грузавых аўтамабіляў</string>
 	<string name="poi_toll_no">Бясплатна</string>
 	<string name="poi_information_tactile_map">Тактыльныя мапа</string>
 	<string name="poi_board_type_notice">Дошка аб\'яў</string>
-	<string name="poi_board_type_plants">Расьліны</string>
-	<string name="poi_board_type_geology">Геалёгія</string>
-	<string name="poi_board_type_public_transport">Расклад грамадзкага транспарту</string>
-	<string name="poi_board_type_technology">Тэхналёгія</string>
+	<string name="poi_board_type_plants">Расліны</string>
+	<string name="poi_board_type_geology">Геалогія</string>
+	<string name="poi_board_type_public_transport">Расклад грамадскага транспарту</string>
+	<string name="poi_board_type_technology">Тэхналогія</string>
 	<string name="poi_board_type_astronomy">Астраномія</string>
 
-	<string name="poi_commercial">Камерцыйнае землекарыстаньне</string>
-	<string name="poi_retail">Раздробны гандаль (землекарыстаньне)</string>
+	<string name="poi_commercial">Камерцыйнае землекарыстанне</string>
+	<string name="poi_retail">Раздробны гандаль (землекарыстанне)</string>
 
 	<string name="poi_fireplace_yes">Так</string>
 	<string name="poi_smoking_no">Забаронена</string>
 	<string name="poi_smoking_outside">Толькі знадворку</string>
 	<string name="poi_smoking_yes">Дазволена</string>
-	<string name="poi_smoking_dedicated">Спэцыялізаваная ўстанова для тых, хто паліць</string>
+	<string name="poi_smoking_dedicated">Спецыялізаваная ўстанова для тых, хто паліць</string>
 
 	<string name="poi_toll_yes">Платна</string>
-	<string name="poi_doors">Дзьверы</string>
+	<string name="poi_doors">Дзверы</string>
 	<string name="poi_ford_stepping_stones">Рудыментарны мост з камянёў</string>
 	<string name="poi_services">Зона паслуг, прылеглая да шашы</string>
 
 <string name="poi_brownfield">Землі пад забудову (выкарыстаныя раней)</string>
 	<string name="poi_greenfield">Зямля пад забудову</string>
-	<string name="poi_bunker_silo">Збудаваньне для захоўваньня сіласу</string>
-	<string name="poi_paediatrics">Пэдыятар</string>
+	<string name="poi_bunker_silo">Збудаванне для захоўвання сіласу</string>
+	<string name="poi_paediatrics">Педыятр</string>
 
-	<string name="poi_office_religion">Офіс рэлігійнай арганізацыі</string>
+	<string name="poi_office_religion">Офіс рэлігійнай установы</string>
 	<string name="poi_association">Офіс таварыства, асацыяцыі</string>
 	<string name="poi_financial">Фінансавая кантора</string>
 	<string name="poi_political_party">Офіс палітычнай партыі</string>
-	<string name="poi_foundation">Офіс фонду (грамадзкай арганізацыі)</string>
-	<string name="poi_tax_advisor">Спэцыяліст па падрыхтоўцы падатковых дэклярацый</string>
+	<string name="poi_foundation">Офіс фонду (грамадскай арганізацыі)</string>
+	<string name="poi_tax_advisor">Спецыяліст па падрыхтоўцы падатковых дэкларацый</string>
 
 	<string name="poi_religion_spiritualist">Спірытуалізм</string>
-	<string name="poi_religion_tenrikyo">Тэнрыкё</string>
-	<string name="poi_rtsa_scale">Катэгорыя складанасьці перавала</string>
+	<string name="poi_religion_tenrikyo">Тэнрыко</string>
+	<string name="poi_rtsa_scale">Катэгорыя складанасці перавала</string>
 
 <string name="poi_garden">Сад</string>
 
 	<string name="poi_heath">Пустка</string>
 	<string name="poi_grass">Газон</string>
 	<string name="poi_grassland">Луг</string>
-	<string name="poi_scrub">Хмызьняк</string>
-	<string name="poi_farmland">Сельскагаспадарчыя ўгодзьдзі</string>
+	<string name="poi_scrub">Хмызняк</string>
+	<string name="poi_farmland">Сельскагаспадарчыя ўгоддзі</string>
 	<string name="poi_logging">Высечкі</string>
 	<string name="poi_sand">Пясок</string>
 
 	<string name="poi_dead_wood">Сухастой</string>
 
-	<string name="poi_passing_place">Месца разьезду</string>
+	<string name="poi_passing_place">Месца раз’езду</string>
 	<string name="poi_level">Паверх</string>
 	<string name="poi_generator_source_coal">Крыніца энергіі: вугаль</string>
 	<string name="poi_generator_source_gas">Крыніца энэргіі: газ</string>
@@ -1207,13 +1207,13 @@
 
 	<string name="poi_pump_manual">Ручная</string>
 	<string name="poi_pump_powered">Аўтаматычная</string>
-	<string name="poi_pump_no">Бяз помпы</string>
+	<string name="poi_pump_no">Без помпы</string>
 
-	<string name="poi_water_characteristic_mineral">Мінэральная</string>
+	<string name="poi_water_characteristic_mineral">Мінеральная</string>
 	<string name="poi_water_characteristic_mud">Характарыстыка вады: брудная</string>
 	<string name="poi_water_characteristic_sulfuric">Серная</string>
 
-	<string name="poi_water_point">Пункт водазабесьпячэньня</string>
+	<string name="poi_water_point">Пункт водазабеспечэння</string>
 
 	<string name="poi_cuisine">Кухня</string>
 
@@ -1233,9 +1233,9 @@
 	<string name="poi_trees_oil">Пальмавы алей</string>
 	<string name="poi_trees_orange">Апельсін</string>
 	<string name="poi_trees_banana">Банан</string>
-	<string name="poi_aerialway_bubble_no">Няма шкленьня</string>
+	<string name="poi_aerialway_bubble_no">Няма шклення</string>
 	<string name="poi_aerialway_heating_yes">Так</string>
-	<string name="poi_aerialway_heating_no">Без абаграваньня</string>
+	<string name="poi_aerialway_heating_no">Без абагравання</string>
 	<string name="poi_aerialway_bicycle_yes">Дазволены</string>
 	<string name="poi_aerialway_bicycle_no">Правоз ровараў забаронены</string>
 	<string name="poi_aerialway_bicycle_summer">Толькі летам</string>
@@ -1247,13 +1247,13 @@
 	<string name="poi_aerialway_summer_access_both">Доступ летам: уваход і выхад</string>
 
 	<string name="poi_stars_1">1 (турысцкі клас)</string>
-	<string name="poi_stars_1s">1S (палепшаны турысцкі кляс)</string>
-	<string name="poi_stars_2">2 (стандартны кляс)</string>
-	<string name="poi_stars_2s">2S (палепшаны стандартны кляс)</string>
-	<string name="poi_stars_3">3 (камфортны кляс)</string>
-	<string name="poi_stars_3s">3S (палепшаны камфортны кляс)</string>
-	<string name="poi_stars_4">4 (першы кляс)</string>
-	<string name="poi_stars_4s">4S (палепшаны першы кляс)</string>
+	<string name="poi_stars_1s">1S (палепшаны турысцкі клас)</string>
+	<string name="poi_stars_2">2 (стандартны клас)</string>
+	<string name="poi_stars_2s">2S (палепшаны стандартны клас)</string>
+	<string name="poi_stars_3">3 (камфортны клас)</string>
+	<string name="poi_stars_3s">3S (палепшаны камфортны клас)</string>
+	<string name="poi_stars_4">4 (першы клас)</string>
+	<string name="poi_stars_4s">4S (палепшаны першы клас)</string>
 	<string name="poi_stars_5">5 (катэгорыя люкс)</string>
 	<string name="poi_stars_5s">5S (катэгорыя люкс +)</string>
 	<string name="poi_stars_6">Колькасьць зорак: 6</string>
@@ -1286,11 +1286,11 @@
 	<string name="poi_service_parts">Запчасткі</string>
 	<string name="poi_service_dealer">Дылер</string>
 	<string name="poi_service_repair">Рамонт</string>
-	<string name="poi_service_repair_no">Рамонт не ажыцьцяўляецца</string>
+	<string name="poi_service_repair_no">Рамонт не ажыццяўляецца</string>
 	<string name="poi_service_electrical">Рамонт электратранспарту</string>
 	<string name="poi_motorcycle_repair">Рамонт матацыклаў</string>
 	<string name="poi_self_service_yes">Так</string>
-	<string name="poi_self_service_no">Самаабслугоўваньне: няма</string>
+	<string name="poi_self_service_no">Самаабслугоўванне: няма</string>
 	<string name="poi_automated_yes">Так</string>
 	<string name="poi_automated_no">Без аўтаматызацыі</string>
 	<string name="poi_full_service_yes">Поўны комплекс паслуг</string>
@@ -1299,13 +1299,13 @@
 	<string name="poi_car_wash_no">Без аўтамыйні</string>
 
 	<string name="poi_aeroway_fuel">Авіяцыйная запраўка</string>
-	<string name="poi_public_bath">Грамадзкая лазьня</string>
+	<string name="poi_public_bath">Грамадская лазня</string>
 
 	<string name="poi_male_yes">Для мужчын</string>
 	<string name="poi_male_no">Не для мужчын</string>
 	<string name="poi_female_yes">Для жанчын</string>
 	<string name="poi_female_no">Не для жанчын</string>
-	<string name="poi_indoor_yes">Унутры памяшканьня</string>
+	<string name="poi_indoor_yes">Унутры памяшкання</string>
 	<string name="poi_indoor_no">Знадворку</string>
 	<string name="poi_toilets_yes">Так</string>
 	<string name="poi_toilets_no">Без прыбіральні</string>
@@ -1313,24 +1313,24 @@
 	<string name="poi_toilets_wheelchair_no">Доступ у прыбіральню для інвалідных вазкоў: не</string>
 	<string name="poi_toilets_access_customers">Доступ у прыбіральню: толькі для наведвальнікаў</string>
 	<string name="poi_toilets_access_permissive">Доступ у прыбіральню: з дазволу ўладальніка</string>
-	<string name="poi_toilets_access_public">Доступ у прыбіральню: агульны</string>
+	<string name="poi_toilets_access_public">Доступ у прыбіралню: агульны</string>
 
 	<string name="poi_maxstay">Максімальны час стаянкі</string>
 
 	<string name="poi_vending_parking_tickets">Парковачныя талоны</string>
 	<string name="poi_vending_cigarettes">Цыгарэты</string>
 	<string name="poi_vending_excrement_bags">Пакеты для экскрыментаў жывёл</string>
-	<string name="poi_vending_public_transport_tickets">Квіткі на грамадзкі транспарт</string>
+	<string name="poi_vending_public_transport_tickets">Квіткі на грамадскі транспарт</string>
 	<string name="poi_vending_drinks">Продаж напояў</string>
-	<string name="poi_vending_sweets">Саладосьці</string>
-	<string name="poi_vending_parcel_pickup_mail_in">Атрыманьне і адпраўленьне пасылак</string>
-	<string name="poi_vending_condoms">Прэзэрватывы</string>
+	<string name="poi_vending_sweets">Саладосці</string>
+	<string name="poi_vending_parcel_pickup_mail_in">Атрыманне і адпраўленне пасылак</string>
+	<string name="poi_vending_condoms">Прэзерватывы</string>
 	<string name="poi_vending_stamps">Маркі</string>
-	<string name="poi_vending_bicycle_tube">Веласіпедныя камэры</string>
-	<string name="poi_vending_food">Харчаваньне</string>
+	<string name="poi_vending_bicycle_tube">Роварныя камеры</string>
+	<string name="poi_vending_food">Харчаванне</string>
 	<string name="poi_vending_drinks_food">Напоі і закускі</string>
 	<string name="poi_vending_fuel">Паліва</string>
-	<string name="poi_vending_parcel_pickup">Атрыманьне пасылак</string>
+	<string name="poi_vending_parcel_pickup">Атрыманне пасылак</string>
 	<string name="poi_memorial_plaque">Дошка</string>
 	<string name="poi_memorial_statue">Статуя</string>
 	<string name="poi_memorial_stone">Камень</string>
@@ -1353,7 +1353,7 @@
 	<string name="poi_trees_date">Фінікі</string>
 	<string name="poi_religion_bahai">Бахаізм</string>
 	<string name="poi_denomination_presbyterian">Прэсбітарыянства</string>
-	<string name="poi_denomination_evangelical">Эвангелізм</string>
+	<string name="poi_denomination_evangelical">Евангелізм</string>
 	<string name="poi_denomination_pentecostal">Пяцідзесятніцтва</string>
 	<string name="poi_denomination_mormon">Марманізм</string>
 	<string name="poi_denomination_shia">Шыізм</string>
@@ -1369,26 +1369,26 @@
 	<string name="poi_wheelchair_limited">Абмежавана</string>
 	<string name="poi_wholesale">Опт</string>
 
-	<string name="poi_traffic_calming_island">Астравок (перашкода)</string>
+	<string name="poi_traffic_calming_island">Выспа (перашкода)</string>
 	<string name="poi_tourism_yes">Турыстычны аб\'ект</string>
 	<string name="poi_religion_unitarian_universalist">Унітарны ўніверсалізм</string>
-	<string name="poi_religion_multifaith">Шматканфесійнасьць</string>
+	<string name="poi_religion_multifaith">Шматканфесійнасць</string>
 	<string name="poi_religion_jain">Джайнізм</string>
-	<string name="poi_religion_scientologist">Саенталёгія</string>
-	<string name="poi_denomination_jehovahs_witness">Сьведкі Іеговы</string>
+	<string name="poi_religion_scientologist">Саенталогія</string>
+	<string name="poi_denomination_jehovahs_witness">Сведкі Іеговы</string>
 	<string name="poi_denomination_united_reformed">Аб\'яднаная рэфармаваная царква</string>
-	<string name="poi_denomination_mennonite">Мэнаніцтва</string>
+	<string name="poi_denomination_mennonite">Менаніцтва</string>
 	<string name="poi_denomination_assemblies_of_god">Асамблеі Бога</string>
 	<string name="poi_denomination_nazarene">Назаране</string>
 	<string name="poi_denomination_united_methodist">Аб\'яднаная метадысцкая царква</string>
 	<string name="poi_denomination_congregational">Кангрэгацыйная царква</string>
-	<string name="poi_denomination_dutch_reformed">Нідэрляндзкая рэфармацкая царква</string>
+	<string name="poi_denomination_dutch_reformed">Нідэрландская рэфарматарская царква</string>
 	<string name="poi_denomination_apostolic">Апостальская царква</string>
-	<string name="poi_denomination_latter_day_saints">Рух сьвятых апошніх дзён</string>
+	<string name="poi_denomination_latter_day_saints">Рух святых апошніх дзён</string>
 	<string name="poi_denomination_scientist">Саентызм</string>
-	<string name="poi_denomination_ethiopian_orthodox_tewahedo">Эфіёпская (абісінская) праваслаўная царква</string>
+	<string name="poi_denomination_ethiopian_orthodox_tewahedo">Эфіопская (абісінская) праваслаўная царква</string>
 	<string name="poi_denomination_unitarian">Унітарыянства</string>
-	<string name="poi_denomination_wesleyan">Вэсліянская царква</string>
+	<string name="poi_denomination_wesleyan">Весліянская царква</string>
 	<string name="poi_denomination_shaktism">Шактызм</string>
 	<string name="poi_denomination_shingon_shu">Сінгон</string>
 	<string name="poi_denomination_maronite">Мараніцкая каталіцкая царква</string>
@@ -1408,17 +1408,17 @@
 	<string name="poi_architect_name">Архітэктар</string>
 
 	<string name="poi_architecture_modern">Архітэктурны стыль: мадэрнізм</string>
-	<string name="poi_architecture_stalinist_neoclassicism">Архітэктурны стыль: сталінскі нэаклясіцызм</string>
+	<string name="poi_architecture_stalinist_neoclassicism">Архітэктурны стыль: сталінскі неакласіцызм</string>
 	<string name="poi_architecture_eclectic">Архітэктурны стыль: эклектыка</string>
 	<string name="poi_architecture_new_objectivity">Архітэктурны стыль: новая рэчыўнасць</string>
 	<string name="poi_architecture_contemporary">Архітэктурны стыль: сучасны</string>
 	<string name="poi_architecture_constructivism">Архітэктурны стыль: канструктывізм</string>
 	<string name="poi_architecture_timber_frame">Архітэктурны стыль: фахвэрк</string>
 	<string name="poi_architecture_art_nouveau">Архітэктурны стыль: мадэрн</string>
-	<string name="poi_architecture_neoclassicism">Архітэктурны стыль: нэаклясіцызм</string>
+	<string name="poi_architecture_neoclassicism">Архітэктурны стыль: неакласіцызм</string>
 	<string name="poi_architecture_victorian">Архітэктурны стыль: віктарыянскі</string>
 	<string name="poi_architecture_brutalism">Архітэктурны стыль: бруталізм</string>
-	<string name="poi_architecture_classicism">Архітэктурны стыль: клясіцызм</string>
+	<string name="poi_architecture_classicism">Архітэктурны стыль: класіцызм</string>
 	<string name="poi_architecture_gothic">Архітэктурны стыль: готыка</string>
 	<string name="poi_architecture_oldrussian">Архітэктурны стыль: рускі (сярэднія вякі)</string>
 	<string name="poi_architecture_baroque">Архітэктурны стыль: барока</string>
@@ -1435,64 +1435,64 @@
 <string name="poi_mini_roundabout">Міні кругавы рух</string>
 	<string name="poi_railway_crossing">Чыгуначны пераход</string>
 	<string name="poi_railway_level_crossing">Чыгуначны пераезд</string>
-	<string name="poi_bird_hide">Месца для назіраньня за птушкамі</string>
+	<string name="poi_bird_hide">Месца для назірання за птушкамі</string>
 	<string name="poi_horse_riding">Язда на конях</string>
 	<string name="poi_leisure_common">Агульнадаступная пляцоўка для адпачынку</string>
 	<string name="poi_windfall">Ветравал</string>
 	<string name="poi_piste_difficulty_easy">Нізкая</string>
 	<string name="poi_piste_difficulty_intermediate">Сярэдняя</string>
 	<string name="poi_piste_difficulty_advanced">Высокая</string>
-	<string name="poi_piste_difficulty_novice">Найпростая</string>
-	<string name="poi_piste_difficulty_expert">Экспэрт</string>
+	<string name="poi_piste_difficulty_novice">Найпрасцейшая</string>
+	<string name="poi_piste_difficulty_expert">Эксперт</string>
 	<string name="poi_piste_difficulty_freeride">Фрырайд</string>
-	<string name="poi_piste_grooming_classic">Клясіка</string>
-	<string name="poi_piste_grooming_classic_skating">Клясіка+канёк</string>
+	<string name="poi_piste_grooming_classic">Класіка</string>
+	<string name="poi_piste_grooming_classic_skating">Класіка+канёк</string>
 	<string name="poi_piste_grooming_backcountry">Крос-кантры</string>
-	<string name="poi_piste_grooming_scooter">Сьнежны скутэр</string>
+	<string name="poi_piste_grooming_scooter">Снежны скутэр</string>
 	<string name="poi_piste_grooming_skating">Канёк</string>
 	<string name="poi_piste_grooming_no">Не</string>
 	<string name="poi_piste_grooming_mogul">Могул</string>
 
 	<string name="poi_garden_type_residential">Тып саду: дваровы</string>
-	<string name="poi_garden_type_community">Тып саду: грамадзкі</string>
+	<string name="poi_garden_type_community">Тып саду: грамадскі</string>
 	<string name="poi_garden_type_private">Тып саду: прыватны</string>
 	<string name="poi_garden_type_botanical">Тып саду: батанічны</string>
 
 	<string name="poi_garden_style_kitchen">Стыль саду: кухня</string>
 	<string name="poi_garden_style_rosarium">Стыль саду: ружоўнік</string>
-	<string name="poi_garden_style_french">Стыль саду: французкі</string>
+	<string name="poi_garden_style_french">Стыль саду: французскі</string>
 	<string name="poi_garden_style_english">Стыль саду: англійскі</string>
 	<string name="poi_garden_style_japanese">Стыль саду: японскі</string>
 
-	<string name="poi_capacity">Ёмістасьць</string>
+	<string name="poi_capacity">Ёмістасць</string>
 	<string name="poi_capacity_disabled_yes">Так</string>
-	<string name="poi_capacity_disabled_no">Няма выдзеленых месцаў для інвалідаў</string>
+	<string name="poi_capacity_disabled_no">Няма адведзеных месцаў для інвалідаў</string>
 	<string name="poi_capacity_disabled">Месцы для інвалідаў</string>
 	<string name="poi_capacity_women_yes">Месцы для жанчын</string>
-	<string name="poi_capacity_women_no">Няма выдзеленых месцаў для жанчын</string>
+	<string name="poi_capacity_women_no">Няма адведзеных месцаў для жанчын</string>
 	<string name="poi_capacity_women">Месцы для жанчын</string>
 	<string name="poi_capacity_pupils">Месцы для студэнтаў</string>
 	<string name="poi_capacity_teachers">Месцы для настаўнікаў</string>
 	<string name="poi_capacity_parent_yes">Месцы для бацькоў з дзецьмі</string>
-	<string name="poi_capacity_parent_no">Няма выдзеленых месцаў для бацькоў зь дзецьмі</string>
-	<string name="poi_capacity_parent">Месцы для бацькоў зь дзецьмі</string>
+	<string name="poi_capacity_parent_no">Няма адведзеных месцаў для бацькоў з дзецьмі</string>
+	<string name="poi_capacity_parent">Месцы для бацькоў з дзецьмі</string>
 
-	<string name="poi_aerialway_occupancy">Ёмістасьць кабінкі</string>
-	<string name="poi_aerialway_capacity">Прапускная здольнасьць, у гадзіну</string>
+	<string name="poi_aerialway_occupancy">Умяшчальнасць кабінкі</string>
+	<string name="poi_aerialway_capacity">Прапускная здольнасць, у гадзіну</string>
 	<string name="poi_aerialway_duration">Сярэдні час руху, хвілін</string>
-	<string name="poi_aerialway_bubble_yes">Шкленьне</string>
-	<string name="poi_payment_coins_yes">Манэты</string>
-	<string name="poi_payment_coins_no">Манэты не прымаюцца</string>
-	<string name="poi_payment_coins_0.5">Манэты па $ 0.5</string>
-	<string name="poi_payment_coins_50c12">Манэты па 50c, 1€ і 2€</string>
+	<string name="poi_aerialway_bubble_yes">Шкленне</string>
+	<string name="poi_payment_coins_yes">Манеты</string>
+	<string name="poi_payment_coins_no">Манеты не прымаюцца</string>
+	<string name="poi_payment_coins_0.5">Манеты па $ 0.5</string>
+	<string name="poi_payment_coins_50c12">Манеты па 50c, 1€ і 2€</string>
 	<string name="poi_payment_telephone_cards_yes">Тэлефонныя карткі</string>
 	<string name="poi_payment_telephone_cards_no">Тэлефонныя карткі не прымаюцца</string>
 	<string name="poi_payment_credit_cards_yes">Крэдытныя карткі</string>
 	<string name="poi_payment_credit_cards_no">Крэдытныя карткі не прымаюцца</string>
 	<string name="poi_payment_notes_yes">Банкноты</string>
 	<string name="poi_payment_notes_no">Банкноты не прымаюцца</string>
-	<string name="poi_payment_electronic_purses_yes">Электронныя кашалькі</string>
-	<string name="poi_payment_electronic_purses_no">Электронныя кашалькі не прымаюцца</string>
+	<string name="poi_payment_electronic_purses_yes">Электронныя гаманцы</string>
+	<string name="poi_payment_electronic_purses_no">Электронныя гаманцы не прымаюцца</string>
 	<string name="poi_payment_cash_yes">Наяўныя</string>
 	<string name="poi_payment_cash_no">Наяўныя не прымаюцца</string>
 	<string name="poi_payment_debit_cards_yes">Дэбетавыя карткі</string>
@@ -1514,7 +1514,7 @@
 	<string name="poi_payment_dkv_no">DKV не прымаюцца</string>
 	<string name="poi_payment_uta_yes">UTA</string>
 	<string name="poi_payment_uta_no">Карткі UTA не прымаюцца</string>
-	<string name="poi_diet_vegan_no">Веганскае харчаваньне не прапануецца</string>
+	<string name="poi_diet_vegan_no">Веганскае харчаванне не прапануецца</string>
 	<string name="poi_diet_gluten_free_only">Толькі безглютэнавае</string>
 	<string name="poi_diet_gluten_free_yes">Безглютэнавае</string>
 	<string name="poi_resource_stone">Камень (рэсурс)</string>
@@ -1524,20 +1524,20 @@
 	<string name="poi_resource_zircon">Цыркон</string>
 
 	<string name="poi_highway_steps">Сходы</string>
-	<string name="poi_content_silage">Зьмесьціва: сілас</string>
-	<string name="poi_content_water">Зьмесьціва: вада</string>
-	<string name="poi_content_oil">Зьмесьціва: нафта</string>
-	<string name="poi_content_fuel">Зьмесьціва: паліва</string>
-	<string name="poi_content_manure">Зьмесьціва: гной</string>
-	<string name="poi_content_wine">Зьмесьціва: віно</string>
-	<string name="poi_content_sewage">Зьмесьціва: стокавыя воды</string>
-	<string name="poi_content_gas">Зьмесьціва: газ</string>
-	<string name="poi_content_biomass">Зьмесьціва: біямаса</string>
-	<string name="poi_content_crop">Зьмесьціва: ураджай</string>
-	<string name="poi_content_fodder">Зьмесьціва: корм</string>
-	<string name="poi_content_beer">Зьмесьціва: піва</string>
-	<string name="poi_content_salt">Зьмесьціва: соль</string>
-	<string name="poi_content_grain">Зьмесьціва: збожжа</string>
+	<string name="poi_content_silage">Змесціва: сілас</string>
+	<string name="poi_content_water">Змесціва: вада</string>
+	<string name="poi_content_oil">Змесціва: нафта</string>
+	<string name="poi_content_fuel">Змесціва: паліва</string>
+	<string name="poi_content_manure">Змесціва: гной</string>
+	<string name="poi_content_wine">Змесціва: віно</string>
+	<string name="poi_content_sewage">Змесціва: стокавыя воды</string>
+	<string name="poi_content_gas">Змесціва: газ</string>
+	<string name="poi_content_biomass">Змесціва: біямаса</string>
+	<string name="poi_content_crop">Змесціва: ураджай</string>
+	<string name="poi_content_fodder">Змесціва: корм</string>
+	<string name="poi_content_beer">Змесціва: піва</string>
+	<string name="poi_content_salt">Змесціва: соль</string>
+	<string name="poi_content_grain">Змесціва: збожжа</string>
 
 	<string name="poi_nudism_yes">Дазволены</string>
 	<string name="poi_nudism_no">Забаронены</string>
@@ -1546,37 +1546,37 @@
 	<string name="poi_nudism_permissive">З дазволу</string>
 
 	<string name="poi_trade_building_supplies">Будаўнічыя матэрыялы</string>
-	<string name="poi_trade_plumbing">Матэрыялы для вадавода</string>
+	<string name="poi_trade_plumbing">Матэрыялы для вадаавода</string>
 	<string name="poi_trade_wood">Лесаматэрыялы</string>
 	<string name="poi_trade_agricultural_supplies">Сельгаспрадукцыя</string>
 	<string name="poi_trade_tile">Кафля</string>
 
-	<string name="poi_content_slurry">Зьмесьціва: завісь</string>
-	<string name="poi_bicycle_parking_anchors">Замацаванае кольца</string>
+	<string name="poi_content_slurry">Змесціва: завісь</string>
+	<string name="poi_bicycle_parking_anchors">Замацаванае кальцо</string>
 	<string name="poi_bicycle_parking_stands">Стойка</string>
-	<string name="poi_bicycle_parking_wall_loops">Мацаваньне толькі для пярэдняга кола</string>
+	<string name="poi_bicycle_parking_wall_loops">Мацаванне толькі для пярэдняга кола</string>
 	<string name="poi_bicycle_parking_rack">Рама</string>
 	<string name="poi_bicycle_parking_building">Адмысловы будынак</string>
 	<string name="poi_bicycle_parking_shed">Падстрэшак</string>
-	<string name="poi_bicycle_parking_bollard">Слупок з мацаваньнем</string>
+	<string name="poi_bicycle_parking_bollard">Слупок з мацаваннем</string>
 	<string name="poi_bicycle_parking_informal">Неафіцыйная</string>
 
-	<string name="poi_leaf_type_broadleaved">Шырокалісьцевая расьліннасьць</string>
-	<string name="poi_leaf_type_needleleaved">Хвойная расьліннасьць</string>
-	<string name="poi_leaf_type_mixed">Зьмяшанага тыпу</string>
-	<string name="poi_leaf_type_leafless">Бязьлісьцевая расьліннасьць</string>
+	<string name="poi_leaf_type_broadleaved">Шырокалісцевая расліннасць</string>
+	<string name="poi_leaf_type_needleleaved">Хвойная расліннасць</string>
+	<string name="poi_leaf_type_mixed">Змяшанага тыпу</string>
+	<string name="poi_leaf_type_leafless">Бязлісцевая расліннасць</string>
 	<string name="poi_species">Від</string>
 	<string name="poi_genus">Род</string>
 	<string name="poi_taxon">Таксон</string>
 
 	<string name="poi_trees_olive">Аліва</string>
-	<string name="poi_urban">Гарадзкога тыпу</string>
+	<string name="poi_urban">Гарадскога тыпу</string>
 	<string name="poi_rural">Сельскага тыпу</string>
 
 	<string name="poi_animal_shelter">Прытулак для жывёл</string>
 	<string name="poi_seats">Сядушкі</string>
-	<string name="poi_backrest_yes">Са сьпінкай</string>
-	<string name="poi_backrest_no">Без сьпінкі</string>
+	<string name="poi_backrest_yes">Са спінкай</string>
+	<string name="poi_backrest_no">Без спінкі</string>
 
 	<string name="poi_intermittent">Перасыхае</string>
 
@@ -1594,7 +1594,7 @@
 	<string name="poi_covered_yes">Так</string>
 	<string name="poi_covered_no">Без страхі</string>
 
-	<string name="poi_smoking_separated">У асобным памяшканьні</string>
+	<string name="poi_smoking_separated">У асобным памяшканні</string>
 	<string name="poi_smoking_isolated">У адмысловым пакоі</string>
 	<string name="poi_payment_efectivo_yes">Efectivo</string>
 	<string name="poi_payment_efectivo_no">Efectivo не прымаюцца</string>
@@ -1615,7 +1615,7 @@
 	<string name="poi_payment_visa_debit_no">Дэбетавыя карткі Visa не прымаюцца</string>
 	<string name="poi_payment_cryptocurrencies_no">Крыптавалюты не прымаюцца</string>
 	<string name="poi_payment_others_yes">Іншыя</string>
-	<string name="poi_payment_others_no">Іншыя мэтады аплаты не прымаюцца</string>
+	<string name="poi_payment_others_no">Іншыя метады аплаты не прымаюцца</string>
 	<string name="poi_payment_routex_yes">Routex</string>
 	<string name="poi_payment_routex_no">Паліўныя карткі Routex не прымаюцца</string>
 	<string name="poi_payment_bancomat_yes">Bancomat (італьянская сетка)</string>
@@ -1654,7 +1654,7 @@
 	<string name="poi_payment_ep_avant_yes">AvantCard</string>
 	<string name="poi_payment_ep_avant_no">AvantCard не прымаюцца</string>
 	<string name="poi_payment_ep_mep_yes">MEP</string>
-	<string name="poi_payment_ep_mep_no">MEP не принимется</string>
+	<string name="poi_payment_ep_mep_no">MEP не прымаюцца</string>
 	<string name="poi_payment_ep_minipay_yes">Minipay</string>
 	<string name="poi_payment_ep_minipay_no">Minipay не прымаецца</string>
 	<string name="poi_payment_ep_minicash_yes">MiniCash</string>
@@ -1683,8 +1683,8 @@
 	<string name="poi_payment_sube_no">Карткі SUBE не прымаюцца</string>
 	<string name="poi_payment_via_verde_yes">Via Verde</string>
 	<string name="poi_payment_via_verde_no">Via Verde не прымаецца</string>
-	<string name="poi_payment_meal_voucher_yes">Талоны на харчаваньне</string>
-	<string name="poi_payment_meal_voucher_no">Талоны на харчаваньне не прымаюцца</string>
+	<string name="poi_payment_meal_voucher_yes">Талоны на харчаванне</string>
+	<string name="poi_payment_meal_voucher_no">Талоны на харчаванне не прымаюцца</string>
 	<string name="poi_payment_paypal_yes">PayPal</string>
 	<string name="poi_payment_paypal_no">Аплата праз PayPal не прымаецца</string>
 	<string name="poi_payment_u_key_yes">U-Key</string>
@@ -1703,63 +1703,63 @@
 	<string name="poi_payment_mtsmoney_no">Аплата праз MТС-Грошы не прымаецца</string>
 	<string name="poi_payment_yandexmoney_yes">Яндэкс.Грошы</string>
 	<string name="poi_payment_yandexmoney_no">Аплата праз Яндэкс.Грошы не прымаецца</string>
-	<string name="poi_description_payment">Апісаньне спосабу аплаты</string>
+	<string name="poi_description_payment">Апісанне спосабу аплаты</string>
 
 	<string name="poi_internet_access_fee_yes">Доступ у Інтэрнэт - спаганяецца плата</string>
 	<string name="poi_internet_access_fee_no">Доступ у Інтэрнэт - бясплатны</string>
 
-	<string name="poi_events_venue">Месца правядзеньня мерапрыемстваў</string>
+	<string name="poi_events_venue">Месца правядзення мерапрыемстваў</string>
 
-	<string name="poi_diet_vegetarian_only">Толькі вэгетарыянскае харчаваньне</string>
-	<string name="poi_diet_vegetarian_yes">Вэгетарыянскае</string>
-	<string name="poi_diet_vegetarian_no">Вэгетарыянскае харчаваньне не прапануецца</string>
-	<string name="poi_diet_vegetarian_few">Вэгетарыянскае харчаваньне (невялікі выбар)</string>
-	<string name="poi_diet_vegan_only">Толькі вэганскае</string>
-	<string name="poi_diet_vegan_yes">Вэганскае</string>
-	<string name="poi_diet_gluten_free_no">Безглютэнавае харчаваньне не прапануецца</string>
+	<string name="poi_diet_vegetarian_only">Толькі вегетарыянскае харчаванне</string>
+	<string name="poi_diet_vegetarian_yes">Вегетарыянскае</string>
+	<string name="poi_diet_vegetarian_no">Вегетарыянскае харчаванне не прапануецца</string>
+	<string name="poi_diet_vegetarian_few">Вегетарыянскае харчаванне (невялікі выбар)</string>
+	<string name="poi_diet_vegan_only">Толькі веганскае</string>
+	<string name="poi_diet_vegan_yes">Веганскае</string>
+	<string name="poi_diet_gluten_free_no">Безглютэнавае харчаванне не прапануецца</string>
 	<string name="poi_diet_kosher_only">Толькі кашэрнае</string>
 	<string name="poi_diet_kosher_yes">Кашэрнае</string>
-	<string name="poi_diet_kosher_no">Кашэрнае харчаваньне не прапануецца</string>
+	<string name="poi_diet_kosher_no">Кашэрнае харчаванне не прапануецца</string>
 	<string name="poi_diet_halal_only">Толькі халяль</string>
 	<string name="poi_diet_halal_yes">Халяль</string>
 	<string name="poi_diet_halal_no">Халяльная ежа не прапануецца</string>
 	<string name="poi_diet_lactose_free_only">Толькі безлактозныя</string>
 	<string name="poi_diet_lactose_free_yes">Безлактозныя</string>
 	<string name="poi_diet_lactose_free_no">Безлактозныя прадукты не прапануюцца</string>
-	<string name="poi_diet_pescetarian_yes">Пэскетарыянская</string>
+	<string name="poi_diet_pescetarian_yes">Пескетарыянская</string>
 
 	<string name="poi_drive_in_yes">Так</string>
 	<string name="poi_drive_in_no">Кліенты, якія сядзяць у аўтамабілі, не абслугоўваюцца</string>
 	<string name="poi_drive_through_yes">Так</string>
 	<string name="poi_drive_through_no">Кліенты, што сядзяць у аўтамабілі, не абслугоўваюцца</string>
 
-	<string name="poi_brewery_additional">Назва бровару</string>
-	<string name="poi_microbrewery_yes">Уласны бровар</string>
+	<string name="poi_brewery_additional">Назва бровара</string>
+	<string name="poi_microbrewery_yes">Так</string>
 	<string name="poi_microbrewery_no">Няма ўласнага бровара</string>
 
 	<string name="poi_takeaway_yes">На вынас</string>
-	<string name="poi_toilets_access_community">Туалет: грамадзкі</string>
+	<string name="poi_toilets_access_community">Туалет: грамадскі</string>
 	<string name="poi_diaper_yes">Пеленальны столік</string>
 	<string name="poi_diaper_no">Пеленальны столік адсутнічае</string>
 	<string name="poi_diaper_room">Пеленальны пакой</string>
 
-	<string name="poi_vending_parcel_mail_in">Адпраўленьне пасылак</string>
+	<string name="poi_vending_parcel_mail_in">Адпраўленне пасылак</string>
 	<string name="poi_vending_milk">Малако</string>
 	<string name="poi_vending_elongated_coin">Падоўжаныя манеты (сувеніры)</string>
 	<string name="poi_vending_bread">Хлеб</string>
 	<string name="poi_vending_chewing_gums">Жавальная гумка</string>
-	<string name="poi_vending_parking_tickets_public_transport_tickets">Паркавальныя талоны; квіткі на грамадзкі транспарт</string>
+	<string name="poi_vending_parking_tickets_public_transport_tickets">Паркавальныя талоны; квіткі на грамадскі транспарт</string>
 	<string name="poi_vending_coffee">Кава</string>
 	<string name="poi_vending_toll">Аплата за праезд</string>
 	<string name="poi_vending_tickets">Квіткі</string>
 	<string name="poi_vending_water">Продаж вады</string>
 	<string name="poi_vending_telephone_vouchers">Тэлефонныя карткі</string>
 	<string name="poi_vending_animal_food">Ежа для жывёл</string>
-	<string name="poi_vending_public_transport_plans">Карткі грамадзкага транспарту</string>
-	<string name="poi_vending_drinks_sweets">Напоі і саладосьці</string>
+	<string name="poi_vending_public_transport_plans">Карткі грамадскага транспарту</string>
+	<string name="poi_vending_drinks_sweets">Напоі і саладосці</string>
 	<string name="poi_vending_vouchers">Ваўчары</string>
 	<string name="poi_vending_dvd">DVD</string>
-	<string name="poi_vending_candles">Сьвечкі</string>
+	<string name="poi_vending_candles">Свечкі</string>
 	<string name="poi_vending_toys">Продаж цацак</string>
 	<string name="poi_vending_ice_cream">Продаж марозіва</string>
 	<string name="poi_vending_sim_cards">SIM-карткі</string>
@@ -1768,7 +1768,7 @@
 
 	<string name="poi_memorial_war">Вайсковец</string>
 	<string name="poi_memorial_jizo">Дзідзо</string>
-	<string name="poi_memorial_vehicle">Сродак перасоўваньня</string>
+	<string name="poi_memorial_vehicle">Сродак перамяшчэння</string>
 	<string name="poi_memorial_stolperstein">Камень перапоны</string>
 	<string name="poi_memorial_column">Слуп</string>
 	<string name="poi_memorial_stupa">Ступа</string>
@@ -1782,7 +1782,7 @@
 	<string name="poi_resource_barite">Барыт</string>
 	<string name="poi_resource_basalt">Базальт</string>
 	<string name="poi_resource_bauxite">Баксіты</string>
-	<string name="poi_resource_beryl">Бэрыль</string>
+	<string name="poi_resource_beryl">Берылі́й</string>
 	<string name="poi_resource_bismuth">Бісмут</string>
 	<string name="poi_resource_chromite">Храміты, хромавая руда</string>
 	<string name="poi_resource_clay">Гліна</string>
@@ -1790,25 +1790,25 @@
 	<string name="poi_resource_copper">Медзь</string>
 	<string name="poi_resource_diamond">Дыяменты</string>
 	<string name="poi_resource_dimension_stone">Будаўнічы камень</string>
-	<string name="poi_resource_dolomite">Даляміт</string>
+	<string name="poi_resource_dolomite">Даламіт</string>
 	<string name="poi_resource_gas">Прыродны газ</string>
 	<string name="poi_resource_gold">Золата</string>
 	<string name="poi_resource_graphite">Графіт</string>
 	<string name="poi_resource_gravel">Жвір</string>
 	<string name="poi_resource_gypsum">Гіпс</string>
 	<string name="poi_resource_iron_ore">Жалезная руда</string>
-	<string name="poi_resource_lead">Сьвінец</string>
+	<string name="poi_resource_lead">Свінец</string>
 	<string name="poi_resource_lignite">Буры вугаль</string>
 	<string name="poi_resource_limestone">Вапняк</string>
 	<string name="poi_resource_marble">Мармур</string>
 	<string name="poi_resource_mercury">Ртуць</string>
 	<string name="poi_resource_mica">Лушчак</string>
-	<string name="poi_resource_mineral_oil">Мінэральная аліва</string>
+	<string name="poi_resource_mineral_oil">Мінеральная аліва</string>
 	<string name="poi_resource_nickel">Нікель</string>
 	<string name="poi_resource_oil">Нафта/аліва</string>
 	<string name="poi_resource_opal">Апал</string>
 	<string name="poi_resource_peat">Торф</string>
-	<string name="poi_resource_platinum">Пляціна</string>
+	<string name="poi_resource_platinum">Плаціна</string>
 	<string name="poi_resource_radium">Радый</string>
 	<string name="poi_resource_ruby">Рубін</string>
 	<string name="poi_resource_rutile">Рутыль</string>
@@ -1825,12 +1825,12 @@
 	<string name="poi_wetland_wet_meadow">Забалочаная сенажаць</string>
 	<string name="poi_wetland_bog">Тарфяное балота</string>
 	<string name="poi_wetland_marsh">Лясістае балота</string>
-	<string name="poi_wetland_reedbed">Трысьняговыя зарасьнікі</string>
+	<string name="poi_wetland_reedbed">Трысняговыя зараснікі</string>
 	<string name="poi_wetland_swamp">Адкрытае балота</string>
 	<string name="poi_wetland_saltern">Саляварня</string>
 	<string name="poi_wetland_tidalflat">Ваты</string>
 	<string name="poi_wetland_saltmarsh">Балота, што перыядычна затапляецца марской вадой</string>
-	<string name="poi_wetland_mangrove">Мангравыя зарасьнікі</string>
+	<string name="poi_wetland_mangrove">Мангравыя зараснікі</string>
 	<string name="poi_wetland_string_bog">Аапа-балота</string>
 	<string name="poi_wetland_fen">Нізіннае балота</string>
 	<string name="poi_wetland_palsa_bog">Пальза</string>
@@ -1847,25 +1847,25 @@
 
 	<string name="poi_bench_yes">Так</string>
 	<string name="poi_bench_no">Без лаўкі</string>
-	<string name="poi_bin_yes">Са смецьцевым кошыкам</string>
-	<string name="poi_bin_no">Без смецьцевага кошыка</string>
+	<string name="poi_bin_yes">Са сметніцай</string>
+	<string name="poi_bin_no">Без сметніцы</string>
 
-	<string name="poi_shelter_type_public_transport">Прыпынак грамадзкага транспарту</string>
+	<string name="poi_shelter_type_public_transport">Прыпынак грамадскага транспарту</string>
 	<string name="poi_shelter_type_picnic_shelter">Для пікніка</string>
 	<string name="poi_shelter_type_weather_shelter">Ад непагадзі</string>
 	<string name="poi_shelter_type_lean_to">Падстрэшак</string>
 	<string name="poi_shelter_type_basic_hut">Шалаш</string>
 	<string name="poi_shelter_type_building">Будынак</string>
-	<string name="poi_shelter_type_wildlife_hide">Для назіраньня за дзікай прыродай</string>
+	<string name="poi_shelter_type_wildlife_hide">Для назірання за дзікай прыродай</string>
 	<string name="poi_shelter_type_rock_shelter">У камянях</string>
 	<string name="poi_shelter_type_sun_shelter">Ад сонца</string>
 	<string name="poi_shelter_type_field_shelter">У полі</string>
 	<string name="poi_shelter_type_tent">Тып хованкі: тэнт</string>
 	<string name="poi_shelter_type_abandoned">Тып хованкі: закінутае</string>
 
-	<string name="poi_internet_access_type_wlan">Бесправадны</string>
+	<string name="poi_internet_access_type_wlan">Wi-Fi</string>
 	<string name="poi_internet_access_type_terminal">Тэрмінал</string>
-	<string name="poi_internet_access_type_wired">Кабельны</string>
+	<string name="poi_internet_access_type_wired">Дротавы</string>
 	<string name="poi_internet_access_type_public">Публічны доступ у інтэрнэт</string>
 	<string name="poi_internet_access_type_service">Тып доступу ў інтэрнэт: службовы</string>
 	<string name="poi_internet_access_type_no">Без доступу ў інтэрнэт</string>
@@ -1887,13 +1887,13 @@
 	<string name="poi_architecture_postconstructivism">Архітэктурны стыль: постканструктывізм</string>
 	<string name="poi_architecture_wilhelminian_style">Архітэктурны стыль: вільгельмінскі</string>
 	<string name="poi_bridge_pedestrian">Пешаходны мост</string>
-	<string name="poi_bridge_bicycle">Веласіпедны мост</string>
+	<string name="poi_bridge_bicycle">Роварны мост</string>
 	<string name="poi_bridge_railway">Чыгуначны мост</string>
 	<string name="poi_bridge_waterway">Водны мост</string>
 	<string name="poi_bridge_structure_beam">Канструкцыя моста: бэлечны</string>
 	<string name="poi_bridge_structure_simple_suspension">Канструкцыя моста: просты падвесны</string>
-	<string name="poi_bridge_structure_suspension">Канструкцыя моста: падвесны</string>
-	<string name="poi_bridge_structure_arch">Канструкцыя моста: аркавы</string>
+	<string name="poi_bridge_structure_suspension">Канструкцыя моста: падвясны</string>
+	<string name="poi_bridge_structure_arch">Канструкцыя моста: арачны</string>
 	<string name="poi_bridge_structure_truss">Канструкцыя моста: ферма</string>
 	<string name="poi_bridge_structure_floating">Канструкцыя моста: пантонны</string>
 	<string name="poi_bridge_structure_humpback">Канструкцыя моста: гарбаты</string>
@@ -1912,19 +1912,19 @@
 	<string name="poi_bridge_movable_transporter">Тып разводнага моста: лятучы паром</string>
 	<string name="poi_bridge_movable_retractable">Тып разводнага моста: высоўвальны</string>
 
-	<string name="poi_lit_yes">Аб\'ект асьветлены: так</string>
-	<string name="poi_lit_no">Аб\'ект асьветлены: не</string>
+	<string name="poi_lit_yes">Аб\'ект асветлены: так</string>
+	<string name="poi_lit_no">Аб\'ект асветлены: не</string>
 
-	<string name="poi_surface_unpaved">Паверхня: без пакрыцьця</string>
-	<string name="poi_surface_paved">Паверхня: з пакрыцьцём</string>
+	<string name="poi_surface_unpaved">Паверхня: без пакрыцця</string>
+	<string name="poi_surface_paved">Паверхня: з пакрыццём</string>
 	<string name="poi_surface_asphalt">Паверхня: асфальт</string>
-	<string name="poi_surface_concrete">Паверхня: бэтон</string>
+	<string name="poi_surface_concrete">Паверхня: бетон</string>
 	<string name="poi_surface_sett">Паверхня: брук</string>
 	<string name="poi_surface_cobblestone">Паверхня: выкладзены камень</string>
 	<string name="poi_surface_paving_stones">Паверхня: ходнікавая плітка</string>
 	<string name="poi_surface_pebblestone">Паверхня: галька</string>
 	<string name="poi_surface_stone">Паверхня: камяністая</string>
-	<string name="poi_surface_metal">Паверхня: мэталь</string>
+	<string name="poi_surface_metal">Паверхня: метал</string>
 	<string name="poi_surface_wood">Паверхня: дрэва</string>
 	<string name="poi_surface_gravel">Паверхня: жвір</string>
 	<string name="poi_surface_fine_gravel">Паверхня: шматпластовы жвір</string>
@@ -1934,10 +1934,10 @@
 	<string name="poi_surface_grass_paver">Паверхня: няшчыльнае брукаванне камянямі</string>
 	<string name="poi_surface_ground">Паверхня: голая глеба</string>
 	<string name="poi_surface_dirt">Паверхня: бруд</string>
-	<string name="poi_surface_mud">Паверхня: бруд без цьвёрдага пласта</string>
+	<string name="poi_surface_mud">Паверхня: бруд без цвёрдага пласта</string>
 	<string name="poi_surface_ice">Паверхня: лёд</string>
 	<string name="poi_surface_salt">Паверхня: соль (саляныя азёры)</string>
-	<string name="poi_surface_snow">Паверхня: сьнег (зімнік)</string>
+	<string name="poi_surface_snow">Паверхня: снег (зімнік)</string>
 
 	<string name="poi_route_bus_ref">Аўтобус</string>
 	<string name="poi_route_share_taxi_ref">Маршрутнае таксі</string>
@@ -1945,14 +1945,14 @@
 	<string name="poi_route_tram_ref">Трамвай</string>
 	<string name="poi_route_train_ref">Цягнік</string>
 	<string name="poi_route_light_rail_ref">Лёгкарэйкавы транспарт</string>
-	<string name="poi_route_monorail_ref">Манарэйка</string>
+	<string name="poi_route_monorail_ref">Монарэйка</string>
 	<string name="poi_route_funicular_ref">Фунікулёр</string>
 	<string name="poi_route_ferry_ref">Паром</string>
 
 	<string name="poi_route_railway_ref">Чыгуначны шлях</string>
 
 	<string name="poi_historic_yes">Гістарычны аб\'ект</string>
-	<string name="poi_surveillance_yes">З відэаназіраньнем</string>
+	<string name="poi_surveillance_yes">З відэаназіраннем</string>
 	<string name="poi_shop_additional_yes">З крамай</string>
 
 	<string name="poi_service_bicycle_retail_yes">Продаж</string>
@@ -1962,41 +1962,41 @@
 	<string name="poi_service_bicycle_rental_yes">Пракат</string>
 	<string name="poi_service_bicycle_rental_no">Пракат ровараў: адсутнічае</string>
 	<string name="poi_service_bicycle_pump_yes">Падпампоўка шын</string>
-	<string name="poi_service_bicycle_pump_no">Падпампоўка веласіпедных шын: адсутнічае</string>
+	<string name="poi_service_bicycle_pump_no">Падпампоўка роварных шын: адсутнічае</string>
 	<string name="poi_service_bicycle_diy_yes">Прылады для самастойнага рамонту</string>
 	<string name="poi_service_bicycle_diy_no">Прылады для самастойнага рамонту ровара: не</string>
 	<string name="poi_service_bicycle_cleaning_yes">Мыйка</string>
 	<string name="poi_service_bicycle_cleaning_no">Мыйка ровараў: адсутнічае</string>
-	<string name="poi_service_bicycle_chaintool_yes">Выцісканьне ланцуга</string>
-	<string name="poi_service_bicycle_chaintool_no">Выцісканьне ланцуга для ровараў: адсутнічае</string>
+	<string name="poi_service_bicycle_chaintool_yes">Выцісканне ланцуга</string>
+	<string name="poi_service_bicycle_chaintool_no">Выцісканне ланцуга для ровараў: адсутнічае</string>
 	<string name="poi_service_bicycle_second_hand_yes">Продаж ужываных ровараў</string>
 	<string name="poi_service_bicycle_second_hand_no">Продаж ужываных ровараў: адсутнічае</string>
 
-	<string name="poi_wildlife_hide">Хованка для назіраньня за дзікай прыродай</string>
+	<string name="poi_wildlife_hide">Хованка для назірання за дзікай прыродай</string>
 
-	<string name="poi_training_language">Навучаньне: замежная мова</string>
-	<string name="poi_training_music">Навучаньне: музыка</string>
-	<string name="poi_training_dance">Навучаньне: танцы</string>
-	<string name="poi_training_sport">Навучаньне: спорт</string>
-	<string name="poi_training_art">Навучаньне: мастацтва</string>
-	<string name="poi_training_cooking">Навучаньне: падрыхтоўка ежы</string>
-	<string name="poi_training_computer">Навучаньне: праца на кампутары</string>
-	<string name="poi_training_yoga">Навучаньне: ёга</string>
-	<string name="poi_training_martial_art">Навучаньне: баявыя мастацтвы</string>
-	<string name="poi_training_aviation">Навучаньне: авіяцыя</string>
-	<string name="poi_training_hairdressing">Навучаньне: цырульнік</string>
+	<string name="poi_training_language">Навучанне: замежная мова</string>
+	<string name="poi_training_music">Навучанне: музыка</string>
+	<string name="poi_training_dance">Навучанне: танцы</string>
+	<string name="poi_training_sport">Навучанне: спорт</string>
+	<string name="poi_training_art">Навучанне: мастацтва</string>
+	<string name="poi_training_cooking">Навучанне: гатаванне ежы</string>
+	<string name="poi_training_computer">Навучанне: праца на кампутары</string>
+	<string name="poi_training_yoga">Навучанне: ёга</string>
+	<string name="poi_training_martial_art">Навучанне: баявыя мастацтвы</string>
+	<string name="poi_training_aviation">Навучанне: авіяцыя</string>
+	<string name="poi_training_hairdressing">Навучанне: цырульнік</string>
 
-	<string name="poi_monument_yes">Манумэнтальны аб\'ект</string>
+	<string name="poi_monument_yes">Манументальны аб\'ект</string>
 
-	<string name="poi_industrial_oil">Тып: нафтавая прамысловасьць</string>
-	<string name="poi_industrial_wellsite">Тып: сьвідравая пляцоўка</string>
+	<string name="poi_industrial_oil">Тып: нафтавая прамысловасць</string>
+	<string name="poi_industrial_wellsite">Тып: свідравая пляцоўка</string>
 	<string name="poi_industrial_factory">Тып: фабрыка</string>
-	<string name="poi_industrial_gas">Тып: газавая прамысловасьць</string>
+	<string name="poi_industrial_gas">Тып: газавая прамысловасць</string>
 	<string name="poi_industrial_timber">Тып: лесаматэрыялы</string>
 	<string name="poi_industrial_refinery">Тып: ачышчальны завод</string>
 	<string name="poi_industrial_warehouse">Тып: склад</string>
 	<string name="poi_industrial_auto_wrecker">Тып: утылізацыя машын</string>
-	<string name="poi_industrial_agriculture">Тып: сельскагаспадарчая прамысловасьць</string>
+	<string name="poi_industrial_agriculture">Тып: сельскагаспадарчая прамысловасць</string>
 	<string name="poi_industrial_brewery">Тып: бровар</string>
 	<string name="poi_industrial_brickyard">Тып: цагельня</string>
 	<string name="poi_industrial_intermodal_freight_terminal">Тып: інтэрмадальны грузавы тэрмінал</string>
@@ -2007,7 +2007,7 @@
 
 	<string name="poi_note">Нататка</string>
 	<string name="poi_watering_place">Вадапой</string>
-	<string name="poi_animal_boarding">Часовае ўтрыманьне жывёл</string>
+	<string name="poi_animal_boarding">Часовае ўтрыманне жывёл</string>
 	<string name="poi_animal_boarding_dog">Тып прытулку: для сабак</string>
 	<string name="poi_animal_boarding_cat">Тып прытулку: для котак</string>
 	<string name="poi_animal_boarding_dog_cat">Тып прытулку: для сабак і котак</string>
@@ -2022,14 +2022,14 @@
 
 	<string name="poi_technical_monument">Тэхнічны помнік</string>
 
-	<string name="poi_office_camping">Прыёмная лягера</string>
+	<string name="poi_office_camping">Прыёмная лагера</string>
 	<string name="poi_model_aerodrome">Авіямадэльны спорт</string>
 	<string name="poi_guide">Офіс гіда</string>
 	<string name="poi_quango">Квазіаўтаномная няўрадавая арганізацыя</string>
 	<string name="poi_consulting">Кансультацыі</string>
 	<string name="poi_cooperative">Офіс кааператыва</string>
-	<string name="poi_office_forestry">Офіс лясьніцтва</string>
-	<string name="poi_logistics">Офіс транспартна-лягістычнай кампаніі</string>
+	<string name="poi_office_forestry">Офіс лясніцтва</string>
+	<string name="poi_logistics">Офіс транспартна-лагістычнай кампаніі</string>
 	<string name="poi_parish">Парафія</string>
 	<string name="poi_publisher">Выдавецтва</string>
 
@@ -2044,13 +2044,13 @@
 
 	<string name="poi_street_lamp">Вулічны ліхтар</string>
 
-	<string name="poi_escape_lane">Паласа аварыйнага тармажэньня</string>
+	<string name="poi_escape_lane">Паласа аварыйнага тармажэння</string>
 
 	<string name="poi_crop_rice">Агракультура: рыс</string>
 	<string name="poi_crop_grass">Агракультура: трава</string>
 	<string name="poi_crop_corn">Агракультура: кукуруза</string>
 	<string name="poi_crop_cereal">Агракультура: збожжавая</string>
-	<string name="poi_crop_sugarcane">Агракультура: цукровы трысьнёг</string>
+	<string name="poi_crop_sugarcane">Агракультура: цукровы трыснёг</string>
 	<string name="poi_crop_wheat">Агракультура: пшаніца</string>
 	<string name="poi_crop_soy">Агракультура: соя</string>
 	<string name="poi_crop_barley">Агракультура: ячмень</string>
@@ -2058,23 +2058,23 @@
 	<string name="poi_crop_hop">Агракультура: хмель</string>
 	<string name="poi_crop_rape">Агракультура: рапс</string>
 	<string name="poi_crop_beet">Агракультура: бурак</string>
-	<string name="poi_crop_lavender">Агракультура: ляванда</string>
-	<string name="poi_crop_tea">Агракультура: гарбата</string>
+	<string name="poi_crop_lavender">Агракультура: лаванда</string>
+	<string name="poi_crop_tea">Агракультура: чай</string>
 	<string name="poi_crop_coffee">Агракультура: кава</string>
-	<string name="poi_crop_poultry">Агракультура: кармавая расьліна</string>
+	<string name="poi_crop_poultry">Агракультура: кармавая расліна</string>
 	<string name="poi_crop_sunflower">Агракультура: сланечнік</string>
 	<string name="poi_crop_raspberry">Агракультура: маліна</string>
 	<string name="poi_crop_tobacco">Агракультура: тытунь</string>
-	<string name="poi_crop_strawberry">Агракультура: трускаўка</string>
+	<string name="poi_crop_strawberry">Агракультура: клубніцы</string>
 	<string name="poi_crop_vegetables_flowers">Агракультура: гародніна, кветкі</string>
 	<string name="poi_crop_cassava">Агракультура: маніёк</string>
 	<string name="poi_crop_cranberry">Агракультура: журавіны</string>
 	<string name="poi_crop_asparagus">Агракультура: спаржа</string>
 	<string name="poi_crop_flowers">Агракультура: кветкі</string>
 
-	<string name="poi_surveillance_indoor">Відэаназіраньне: усярэдзіне</string>
-	<string name="poi_surveillance_outdoor">Відэаназіраньне: знадворку</string>
-	<string name="poi_surveillance_public">Відэаназіраньне: у грамадзкіх месцах</string>
+	<string name="poi_surveillance_indoor">Відэаназіранне: унутры</string>
+	<string name="poi_surveillance_outdoor">Відэаназіранне: знадворку</string>
+	<string name="poi_surveillance_public">Відэаназіранне: у грамадскіх месцах</string>
 
 	<string name="poi_clothes_women">Жаночая</string>
 	<string name="poi_clothes_underwear">Ніжняя бялізна</string>
@@ -2106,12 +2106,12 @@
 	<string name="poi_shoes_women">Жаночы</string>
 	<string name="poi_shoes_sport">Спартовы</string>
 	<string name="poi_shoes_men">Мужчынскі</string>
-	<string name="poi_shoes_orthopedic">Артапэдычны</string>
+	<string name="poi_shoes_orthopedic">Артапедычны</string>
 
 	<string name="poi_historic_manor">Гістарычны маёнтак</string>
 	<string name="poi_castle_type_stately">Тып замка: велічны</string>
 	<string name="poi_castle_type_defensive">Тып замка: абарончы</string>
-	<string name="poi_castle_type_fortress">Тып замка: крэпасьць</string>
+	<string name="poi_castle_type_fortress">Тып замка: крэпасць</string>
 	<string name="poi_castle_type_palace">Тып замка: палац</string>
 	<string name="poi_castle_type_kremlin">Тып замка: крэмль</string>
 	<string name="poi_castle_type_defensive_stately">Тып замка: ахоўны, велічны</string>
@@ -2122,19 +2122,19 @@
 	<string name="poi_massage_sexual">Эратычны</string>
 	<string name="poi_massage_chinese">Кітайскі</string>
 	<string name="poi_massage_yes">Аказваюцца масажныя паслугі</string>
-	<string name="poi_massage_therapeutic">Тэрапэўтычны</string>
+	<string name="poi_massage_therapeutic">Тэрапеўтычны</string>
 
-	<string name="poi_sauna_yes">Аказваюцца паслугі сауны</string>
+	<string name="poi_sauna_yes">Аказваюцца паслугі саўны</string>
 	<string name="poi_solarium_yes">Аказваюцца паслугі салярыя</string>
 
 	<string name="poi_tents_yes">Дазволена</string>
-	<string name="poi_tents_no">Усталёўка намётаў забаронена</string>
-	<string name="poi_openfire_yes">Развядзеньне адкрытага агню дазволена</string>
-	<string name="poi_openfire_no">Развядзеньне адкрытага агню забаронена</string>
+	<string name="poi_tents_no">Усталёўка намётаў забароненая</string>
+	<string name="poi_openfire_yes">Развядзенне адкрытага агню дазволена</string>
+	<string name="poi_openfire_no">Развядзенне адкрытага агню забаронена</string>
 	<string name="poi_backcountry_yes">Так</string>
 	<string name="poi_backcountry_no">Не</string>
-	<string name="poi_scout_yes">так</string>
-	<string name="poi_scout_no">Лягер скаўтаў: не</string>
+	<string name="poi_scout_yes">Так</string>
+	<string name="poi_scout_no">Лагер скаўтаў: не</string>
 	<string name="poi_group_only_yes">Даступна толькі для груп: так</string>
 	<string name="poi_group_only_no">Даступна толькі для груп: не</string>
 	<string name="poi_washing_machine_yes">Так</string>
@@ -2144,35 +2144,35 @@
 	<string name="poi_shower_hot">Душ: гарачы</string>
 	<string name="poi_shower_outdoor">Душ: знадворку</string>
 	<string name="poi_shower_cold">Душ: халодны</string>
-	<string name="poi_shower_indoor">Душ: усярэдзіне</string>
+	<string name="poi_shower_indoor">Душ: унутры</string>
 	<string name="poi_caravans_yes">Так</string>
-	<string name="poi_caravans_no">Аўтапрычэпы забаронены</string>
+	<string name="poi_caravans_no">Аўтапрычэпы забароненыя</string>
 	<string name="poi_impromptu_yes">Імправізаваны: так</string>
 	<string name="poi_impromptu_no">Імправізаваны: не</string>
-	<string name="poi_sanitary_dump_station_yes">Асенізацыйная зьліўная станцыя: ёсьць</string>
-	<string name="poi_sanitary_dump_station_no">Асенізацыйная зьліўная станцыя: адсутнічае</string>
+	<string name="poi_sanitary_dump_station_yes">Асенізацыйная зліўная станцыя: ёсць</string>
+	<string name="poi_sanitary_dump_station_no">Асенізацыйная зліўная станцыя: адсутнічае</string>
 	<string name="poi_sanitary_dump_station_customers">Асенізацыйная зьліўная станцыя: толькі для наведвальнікаў</string>
 	<string name="poi_power_supply_yes">Так</string>
-	<string name="poi_power_supply_no">Крыніца сілкаваньня: адсутнічае</string>
-	<string name="poi_power_supply_cee_17_blue">Крыніца сілкаваньня (раздым): CEE 17 blue</string>
-	<string name="poi_power_supply_cee_7_4">Крыніца сілкаваньня (раздым): CEE 7/4</string>
-	<string name="poi_power_supply_cee_7_5">Крыніца сілкаваньня (раздым): CEE 7/5</string>
-	<string name="poi_power_supply_nema_5_15">Крыніца сілкаваньня (раздым): NEMA 5-15</string>
+	<string name="poi_power_supply_no">Крыніца сілкавання: адсутнічае</string>
+	<string name="poi_power_supply_cee_17_blue">Крыніца сілкавання (штэкер): CEE 17 blue</string>
+	<string name="poi_power_supply_cee_7_4">Крыніца сілкавання (штэкер): CEE 7/4</string>
+	<string name="poi_power_supply_cee_7_5">Крыніца сілкавання (штэкер): CEE 7/5</string>
+	<string name="poi_power_supply_nema_5_15">Крыніца сілкавання (штэкер): NEMA 5-15</string>
 
 	<string name="poi_capacity_tents">Максімальны лік намётаў</string>
 	<string name="poi_capacity_caravans">Максімальны лік аўтапрычэпаў</string>
 	<string name="poi_dog_yes">Уваход з сабакамі дазволены</string>
 	<string name="poi_dog_no">Уваход з сабакамі забаронены</string>
 
-	<string name="poi_refugee_yes">Выгоды, прызначаныя для ўцекачоў</string>
-	<string name="poi_refugee_no">Уцекачы: не</string>
+	<string name="poi_refugee_yes">Выгоды, прызначаныя для ўцякачоў</string>
+	<string name="poi_refugee_no">Уцякачы: не</string>
 
-	<string name="poi_social_facility_group_home">Групавое пражываньне</string>
+	<string name="poi_social_facility_group_home">Групавое пражыванне</string>
 	<string name="poi_social_facility_assisted_living">Дом састарэлых</string>
-	<string name="poi_social_facility_outreach">Сацыяльныя паслугі без пражываньня</string>
+	<string name="poi_social_facility_outreach">Сацыяльныя паслугі без пражывання</string>
 	<string name="poi_social_facility_food_bank">Раздача ежы</string>
 	<string name="poi_social_facility_shelter">Часовы прытулак</string>
-	<string name="poi_social_facility_ambulatory_care">Амбуляторнае лячэньне</string>
+	<string name="poi_social_facility_ambulatory_care">Амбулаторнае лячэнне</string>
 	<string name="poi_social_facility_workshop">Майстэрня</string>
 	<string name="poi_social_facility_day_care">Дзённы дагляд</string>
 
@@ -2180,7 +2180,7 @@
 	<string name="poi_social_facility_for_child">Дзеці</string>
 	<string name="poi_social_facility_for_orphan">Сіроты</string>
 	<string name="poi_social_facility_for_disabled">Інваліды</string>
-	<string name="poi_social_facility_for_mental_health">Пацыенты з засмучэньнямі псыхікі</string>
+	<string name="poi_social_facility_for_mental_health">Пацыенты з засмучэннямі псіхікі</string>
 	<string name="poi_social_facility_for_juvenile">Падлеткі</string>
 	<string name="poi_social_facility_for_homeless">Бяздомныя</string>
 	<string name="poi_social_facility_for_migrant">Мігранты</string>
@@ -2190,13 +2190,13 @@
 	<string name="poi_social_facility_for_diseased">Хворыя</string>
 	<string name="poi_social_facility_for_child_juvenile">Дзеці і падлеткі</string>
 
-	<string name="poi_theatre_genre_philharmonic">Філярмонія</string>
+	<string name="poi_theatre_genre_philharmonic">Філармонія</string>
 	<string name="poi_theatre_genre_musical">Музычны</string>
 	<string name="poi_theatre_genre_drama">Драматычны</string>
-	<string name="poi_theatre_genre_opera">Опэрны</string>
+	<string name="poi_theatre_genre_opera">Оперны</string>
 	<string name="poi_theatre_genre_cabaret">Кабарэ</string>
 	<string name="poi_theatre_genre_puppet">Лялечны тэатр</string>
-	<string name="poi_theatre_genre_comedy">Камэдыйны</string>
+	<string name="poi_theatre_genre_comedy">Камедыйны</string>
 	<string name="poi_theatre_genre_chamber_music">Камерная музыка</string>
 	<string name="poi_theatre_genre_marionette">Марыянеткі</string>
 	<string name="poi_theatre_genre_ballet">Балет</string>
@@ -2212,23 +2212,23 @@
 	<string name="poi_product_charcoal">Вырабляецца: драўняны вугаль</string>
 	<string name="poi_product_meat">Вырабляецца: мяса</string>
 
-	<string name="poi_wheelchair_description">Апісаньне для людзей на інвалідных вазках</string>
-	<string name="poi_blind_description">Апісаньне для сьляпых</string>
-	<string name="poi_deaf_description">Апісаньне для глухіх</string>
+	<string name="poi_wheelchair_description">Апісанне для людзей на інвалідных вазках</string>
+	<string name="poi_blind_description">Апісанне для сляпых</string>
+	<string name="poi_deaf_description">Апісанне для глухіх</string>
 
 	<string name="poi_handrail_yes">Поручань: ёсць</string>
 	<string name="poi_handrail_no">Поручань: адсутнічае</string>
-	<string name="poi_ramp_yes">Рампа: ёсьць</string>
+	<string name="poi_ramp_yes">Рампа: ёсць</string>
 	<string name="poi_ramp_no">Рампа: адсутнічае</string>
-	<string name="poi_ramp_wheelchair_yes">Рампа для інвалідных вазкоў: ёсьць</string>
+	<string name="poi_ramp_wheelchair_yes">Рампа для інвалідных вазкоў: ёсць</string>
 	<string name="poi_ramp_wheelchair_no">Рампа для інвалідных вазкоў: адсутнічае</string>
-	<string name="poi_ramp_stroller_yes">Рампа (падвойная): ёсьць</string>
+	<string name="poi_ramp_stroller_yes">Рампа (падвойная): ёсць</string>
 	<string name="poi_ramp_stroller_no">Рампа (падвойная): адсутнічае</string>
-	<string name="poi_ramp_bicycle_yes">Рампа для ровараў: ёсьць</string>
+	<string name="poi_ramp_bicycle_yes">Рампа для ровараў: ёсць</string>
 	<string name="poi_ramp_bicycle_no">Рампа для ровараў: адсутнічае</string>
-	<string name="poi_ramp_luggage_yes">Рампа для багажу: ёсьць</string>
+	<string name="poi_ramp_luggage_yes">Рампа для багажу: ёсць</string>
 	<string name="poi_ramp_luggage_no">Рампа для багажу: адсутнічае</string>
-	<string name="poi_step_count">Колькасьць прыступак</string>
+	<string name="poi_step_count">Колькасць прыступак</string>
 	<string name="poi_step_condition_even">Стан прыступак: добры</string>
 	<string name="poi_step_condition_uneven">Стан прыступак: сярэдні</string>
 	<string name="poi_step_condition_rough">Стан прыступак: дрэнны</string>
@@ -2237,11 +2237,11 @@
 
 	<string name="poi_memorial_fassade_decoration">Фасадная дэкарацыя</string>
 	<string name="poi_defibrillator">Дэфібрылятар</string>
-	<string name="poi_defibrillator_yes">Дэфібрылятар: ёсьць</string>
+	<string name="poi_defibrillator_yes">Дэфібрылятар: ёсць</string>
 
 	<string name="poi_tomb_war_grave">Тып: брацкая магіла</string>
 	<string name="poi_tomb_tumulus">Тып: тумулус</string>
-	<string name="poi_tomb_rock_cut">Тып: выразаная ў камені</string>
+	<string name="poi_tomb_rock_cut">Тып: выразаная ў камяні</string>
 	<string name="poi_tomb_hypogeum">Тып: гіпагей</string>
 	<string name="poi_tomb_vault">Тып: магільны склеп</string>
 	<string name="poi_tomb_columbarium">Тып: калумбарый</string>
@@ -2254,7 +2254,7 @@
 	<string name="poi_historic_civilization_nuragic">Цывілізацыя: нурагіцкая (18 ст. да н.э. – 2 ст. н.э.)</string>
 	<string name="poi_historic_civilization_etruscan">Цывілізацыя: этруская</string>
 	<string name="poi_historic_civilization_prehistoric">Цывілізацыя: дагістарычная</string>
-	<string name="poi_historic_civilization_ancient_greek">Цывілізацыя: старажытнагрэцкая</string>
+	<string name="poi_historic_civilization_ancient_greek">Цывілізацыя: старажытнагрэчаская</string>
 	<string name="poi_historic_civilization_roman">Цывілізацыя: рымская</string>
 	<string name="poi_historic_civilization_byzantine">Цывілізацыя: бізантыйская (285 н.э. – 1453 г. н.э.)</string>
 	<string name="poi_historic_civilization_imperial_chinese">Цывілізацыя: кітайская (221 г. да н.э. – 1911 г. н.э.)</string>
@@ -2266,8 +2266,8 @@
 	<string name="poi_historic_civilization_hernici">Цывілізацыя: гернікі</string>
 	<string name="poi_historic_civilization_greek_egyptian">Цывілізацыя: грэка-егіпецкая (332 г. да н.э. – 30 г. да н.э.)</string>
 	<string name="poi_historic_civilization_roman_and_byzantine_egyptian">Цывілізацыя: рымская і візантыйска-егіпецкая</string>
-	<string name="poi_historic_civilization_helladic">Цывілізацыя: эладзкая</string>
-	<string name="poi_historic_civilization_cycladic">Цывілізацыя: кікладзкая</string>
+	<string name="poi_historic_civilization_helladic">Цывілізацыя: эладская</string>
+	<string name="poi_historic_civilization_cycladic">Цывілізацыя: кікладская</string>
 	<string name="poi_historic_civilization_minoan">Цывілізацыя: мінойская</string>
 	<string name="poi_historic_civilization_tiahuanacota">Цывілізацыя: тыўанако</string>
 
@@ -2280,87 +2280,87 @@
 	<string name="poi_animal_yes">Доступ для жывёл дазволены</string>
 	<string name="poi_animal_no">Доступ для жывёл забаронены</string>
 
-	<string name="poi_historic_period_nuragic">Гістарычны пэрыяд: нурагіцкі</string>
-	<string name="poi_historic_period_stone_bronze_undetermined">Гістарычны пэрыяд: каменны / бронзавыя вякі (не вызначана)</string>
-	<string name="poi_historic_period_bronze_age">Гістарычны пэрыяд: бронзавы век</string>
-	<string name="poi_historic_period_principate">Гістарычны пэрыяд: прынцыпат (27 г. да н.э. – 284 г. н.э.)</string>
-	<string name="poi_historic_period_classical_greece">Гістарычны пэрыяд: клясічная Грэцыя (5-й – 4-й у. да н.э.)</string>
-	<string name="poi_historic_period_archaic_greece">Гістарычны пэрыяд: архаічная Грэцыя</string>
-	<string name="poi_historic_period_iron_age">Гістарычны пэрыяд: жалезны век</string>
-	<string name="poi_historic_period_roman_republic">Гістарычны пэрыяд: Рымская рэспубліка (508 г. да н.э. – 27 г. да н.э.)</string>
-	<string name="poi_historic_period_hellenistic_greece">Гістарычны пэрыяд: эліністычная Грэцыя</string>
-	<string name="poi_historic_period_new_kingdom">Гістарычны пэрыяд: новае царства(1550 – 1069 г. да н.э.)</string>
-	<string name="poi_historic_period_middle_kingdom">Гістарычны пэрыяд: сярэдняе царства(2055 – 1650 г. да н.э.)</string>
-	<string name="poi_historic_period_predynastic_egypt">Гістарычны пэрыяд: дадынастычны Егіпет</string>
-	<string name="poi_historic_period_early_dynastic_period">Гістарычны пэрыяд: ранняе царства (3100 – 2686 г. да н.э.)</string>
-	<string name="poi_historic_period_old_kingdom">Гістарычны пэрыяд: старажытнае царства (2686 – 2181 г. да н.э.)</string>
-	<string name="poi_historic_period_first_intermediate_period">Гістарычны пэрыяд: першы пераходны пэрыяд (2181 – 2055 г. да н.э.)</string>
-	<string name="poi_historic_period_second_intermediate_period">Гістарычны пэрыяд: другі пераходны пэрыяд (1650 – 1550 г. да н.э.)</string>
-	<string name="poi_historic_period_third_intermediate_period">Гістарычны пэрыяд: трэці пераходны пэрыяд (1069 – 664 г. да н.э.)</string>
-	<string name="poi_historic_period_first_persian_period">Гістарычны пэрыяд: першы пэрсідзкі пэрыяд</string>
-	<string name="poi_historic_period_late_period">Гістарычны пэрыяд: позняе царства (664 – 332 г. да н.э.)</string>
-	<string name="poi_historic_period_second_persian_period">Гістарычны пэрыяд: другі пэрсідскі пэрыяд</string>
-	<string name="poi_historic_period_alexander_the_great">Гістарычны пэрыяд: Аляксандар Вялікі</string>
-	<string name="poi_historic_period_ptolemaic_egypt">Гістарычны пэрыяд: эліністычны Егіпет(305 г. да н.э. – 30 г. да н.э.)</string>
-	<string name="poi_historic_period_christian_egypt">Гістарычны пэрыяд: хрысьціянскі Егіпет</string>
-	<string name="poi_historic_period_byzantine_egypt">Гістарычны пэрыяд: бізантыйскі Егіпет(30 г. да н.э. – 641 г. н.э.)</string>
-	<string name="poi_historic_period_persian_occupation">Гістарычны пэрыяд: пэрсідская акупацыя</string>
-	<string name="poi_historic_period_greek_dark_ages">Гістарычны пэрыяд: цёмныя стагодзьдзі (Грэцыя) (1100 – 800 г. да н.э.)</string>
-	<string name="poi_historic_period_roman_greece">Гістарычны пэрыяд: Рымская Грэцыя (146 г. да н.э. – 330 г. н.э.)</string>
-	<string name="poi_historic_period_roman_kingdom">Гістарычны пэрыяд: Рымскае царства (753 – 509 г. да н.э.)</string>
-	<string name="poi_historic_period_dominate">Гістарычны пэрыяд: дамінантны</string>
-	<string name="poi_historic_period_villager">Гістарычны пэрыяд: земляробчы (пэрыяд I і II, 1580 г. да н.э. – 133 г. н.э.)</string>
-	<string name="poi_historic_period_urban">Гістарычны пэрыяд: гарадзкі (пэрыяд III, 133 – 374 г. н.э.)</string>
-	<string name="poi_historic_period_classical">Гістарычны пэрыяд: клясічны (пэрыяд IV, 374 – 900 г. н.э.)</string>
-	<string name="poi_historic_period_imperial">Гістарычны пэрыяд: імпэрскі (пэрыяд V, 900 – 1200 г. н.э.)</string>
+	<string name="poi_historic_period_nuragic">Гістарычны перыяд: нурагіцкі</string>
+	<string name="poi_historic_period_stone_bronze_undetermined">Гістарычны перыяд: каменны / бронзавыя вякі (не вызначана)</string>
+	<string name="poi_historic_period_bronze_age">Гістарычны перыяд: бронзавы век</string>
+	<string name="poi_historic_period_principate">Гістарычны перыяд: прынцыпат (27 г. да н.э. – 284 г. н.э.)</string>
+	<string name="poi_historic_period_classical_greece">Гістарычны перыяд: класічная Грэцыя (5-й – 4-й у. да н.э.)</string>
+	<string name="poi_historic_period_archaic_greece">Гістарычны перыяд: архаічная Грэцыя</string>
+	<string name="poi_historic_period_iron_age">Гістарычны перыяд: жалезны век</string>
+	<string name="poi_historic_period_roman_republic">Гістарычны перыяд: Рымская рэспубліка (508 г. да н.э. – 27 г. да н.э.)</string>
+	<string name="poi_historic_period_hellenistic_greece">Гістарычны перыяд: эліністычная Грэцыя</string>
+	<string name="poi_historic_period_new_kingdom">Гістарычны перыяд: новае царства(1550 – 1069 г. да н.э.)</string>
+	<string name="poi_historic_period_middle_kingdom">Гістарычны перыяд: сярэдняе царства(2055 – 1650 г. да н.э.)</string>
+	<string name="poi_historic_period_predynastic_egypt">Гістарычны перыяд: дадынастычны Егіпет</string>
+	<string name="poi_historic_period_early_dynastic_period">Гістарычны перыяд: ранняе царства (3100 – 2686 г. да н.э.)</string>
+	<string name="poi_historic_period_old_kingdom">Гістарычны перыяд: старажытнае царства (2686 – 2181 г. да н.э.)</string>
+	<string name="poi_historic_period_first_intermediate_period">Гістарычны перыяд: першы пераходны перыяд (2181 – 2055 г. да н.э.)</string>
+	<string name="poi_historic_period_second_intermediate_period">Гістарычны перыяд: другі пераходны перыяд (1650 – 1550 г. да н.э.)</string>
+	<string name="poi_historic_period_third_intermediate_period">Гістарычны перыяд: трэці пераходны перыяд (1069 – 664 г. да н.э.)</string>
+	<string name="poi_historic_period_first_persian_period">Гістарычны перыяд: першы персідскі перыяд</string>
+	<string name="poi_historic_period_late_period">Гістарычны перыяд: позняе царства (664 – 332 г. да н.э.)</string>
+	<string name="poi_historic_period_second_persian_period">Гістарычны перыяд: другі персідскі перыяд</string>
+	<string name="poi_historic_period_alexander_the_great">Гістарычны перыяд: Аляксандр Вялікі</string>
+	<string name="poi_historic_period_ptolemaic_egypt">Гістарычны перыяд: эліністычны Егіпет(305 г. да н.э. – 30 г. да н.э.)</string>
+	<string name="poi_historic_period_christian_egypt">Гістарычны перыяд: хрысціянскі Егіпет</string>
+	<string name="poi_historic_period_byzantine_egypt">Гістарычны перыяд: візантыйскі Егіпет(30 г. да н.э. – 641 г. н.э.)</string>
+	<string name="poi_historic_period_persian_occupation">Гістарычны перыяд: персідская акупацыя</string>
+	<string name="poi_historic_period_greek_dark_ages">Гістарычны перыяд: цёмныя стагоддзі (Грэцыя) (1100 – 800 г. да н.э.)</string>
+	<string name="poi_historic_period_roman_greece">Гістарычны перыяд: Рымская Грэцыя (146 г. да н.э. – 330 г. н.э.)</string>
+	<string name="poi_historic_period_roman_kingdom">Гістарычны перыяд: Рымскае царства (753 – 509 г. да н.э.)</string>
+	<string name="poi_historic_period_dominate">Гістарычны перыяд: дамінантны</string>
+	<string name="poi_historic_period_villager">Гістарычны перыяд: земляробчы (перыяд I і II, 1580 г. да н.э. – 133 г. н.э.)</string>
+	<string name="poi_historic_period_urban">Гістарычны перыяд: гарадскі (перыяд III, 133 – 374 г. н.э.)</string>
+	<string name="poi_historic_period_classical">Гістарычны перыяд: класічны (перыяд IV, 374 – 900 г. н.э.)</string>
+	<string name="poi_historic_period_imperial">Гістарычны перыяд: імперскі (перыяд V, 900 – 1200 г. н.э.)</string>
 
 	<string name="poi_historic_era_paleolithic">Эра: палеаліт (2.6 млн. гадоў да н.э. – 10000 гадоў да н.э.)</string>
-	<string name="poi_historic_era_mesolithic">Эра: мэзаліт</string>
-	<string name="poi_historic_era_neolithic">Эра: нэаліт</string>
-	<string name="poi_historic_era_chalcolithic">Эра: халкаліт (медны век) (IV—III тысячагодзьдзі да н.э.)</string>
+	<string name="poi_historic_era_mesolithic">Эра: мезаліт</string>
+	<string name="poi_historic_era_neolithic">Эра: неаліт</string>
+	<string name="poi_historic_era_chalcolithic">Эра: халкаліт (медны век) (IV—III тысячагоддзі да н.э.)</string>
 
 	<string name="poi_historic_stone">Гістарычны камень</string>
 	<string name="poi_stone_type_conciliation_cross">Тып: прымірэнчы крыж</string>
 	<string name="poi_stone_type_coat_of_arms">Тып: герб</string>
 
 	<string name="poi_material_wood">Матэрыял: дрэва</string>
-	<string name="poi_material_metal">Матэрыял: мэталь</string>
+	<string name="poi_material_metal">Матэрыял: метал</string>
 	<string name="poi_material_reinforced_concrete">Матэрыял: жалезабетон</string>
 	<string name="poi_material_concrete">Матэрыял: бетон</string>
 	<string name="poi_material_steel">Матэрыял: сталь</string>
 	<string name="poi_material_stone">Матэрыял: камень</string>
 	<string name="poi_material_masonry">Матэрыял: каменны мур</string>
 	<string name="poi_material_brick">Матэрыял: цэгла</string>
-	<string name="poi_material_plastic">Матэрыял: плястык</string>
+	<string name="poi_material_plastic">Матэрыял: пластык</string>
 	<string name="poi_material_sandstone">Матэрыял: пяшчанік</string>
 	<string name="poi_material_granite_stone">Матэрыял: граніт</string>
 	<string name="poi_material_metal_wood">Матэрыял: метал, дрэва</string>
 	<string name="poi_material_glass">Матэрыял: шкло</string>
 	<string name="poi_material_bronze">Матэрыял: бронза</string>
 	<string name="poi_material_earth">Матэрыял: зямля</string>
-	<string name="poi_material_composite">Матэрыял: складовы</string>
+	<string name="poi_material_composite">Матэрыял: кампазітны</string>
 	<string name="poi_material_limestone">Матэрыял: вапняк</string>
 	<string name="poi_material_marble">Матэрыял: мармур</string>
 	<string name="poi_material_aluminium">Матэрыял: алюміній</string>
 
-	<string name="poi_site_type_megalith">Мэгаліт</string>
+	<string name="poi_site_type_megalith">Мегаліт</string>
 	<string name="poi_site_type_tumulus">Тумулюс</string>
-	<string name="poi_site_type_fortification">Умацаваньне</string>
+	<string name="poi_site_type_fortification">Умацаванне</string>
 	<string name="poi_site_type_settlement">Селішча</string>
 	<string name="poi_site_type_city">Горад</string>
 	<string name="poi_site_type_hut_circle">Круг з хат</string>
-	<string name="poi_site_type_necropolis">Нэкропаль</string>
-	<string name="poi_site_type_petroglyph">Пэтрогліф</string>
-	<string name="poi_site_type_earthwork">Земляное ўмацаваньне</string>
-	<string name="poi_megalith_type_menhir">Тып мэгаліта: мэнгір</string>
-	<string name="poi_megalith_type_dolmen">Тып мэгаліту: дольмэн</string>
-	<string name="poi_megalith_type_nuraghe">Тып мэгаліту: нурагі</string>
-	<string name="poi_megalith_type_stone_circle">Тып мэгаліту: каменнае кола</string>
-	<string name="poi_megalith_type_passage_grave">Тып мэгаліту: калідорная магільня</string>
-	<string name="poi_fortification_type_hill_fort">Тып умацаваньня: гарадзішча</string>
-	<string name="poi_fortification_type_limes">Тып умацаваньня: лімэс</string>
-	<string name="poi_fortification_type_sconce">Тып умацаваньня: шанец</string>
-	<string name="poi_fortification_type_ring_ditch">Тып умацаваньня: рандэля (колцавая канава)</string>
+	<string name="poi_site_type_necropolis">Некропаль</string>
+	<string name="poi_site_type_petroglyph">Петрогліф</string>
+	<string name="poi_site_type_earthwork">Земляное ўмацаванне</string>
+	<string name="poi_megalith_type_menhir">Тып мегаліта: менгір</string>
+	<string name="poi_megalith_type_dolmen">Тып мегаліту: дольмен</string>
+	<string name="poi_megalith_type_nuraghe">Тып мегаліту: нурагі</string>
+	<string name="poi_megalith_type_stone_circle">Тып мегаліту: каменнае кола</string>
+	<string name="poi_megalith_type_passage_grave">Тып мегаліту: калідорная магільня</string>
+	<string name="poi_fortification_type_hill_fort">Тып умацавання: гарадзішча</string>
+	<string name="poi_fortification_type_limes">Тып умацавання: лімес</string>
+	<string name="poi_fortification_type_sconce">Тып умацавання: шанец</string>
+	<string name="poi_fortification_type_ring_ditch">Тып умацавання: рандэля (кругавая канава)</string>
 
 	<string name="poi_pa">Па (умацаванае селішча маоры)</string>
 
@@ -2368,8 +2368,8 @@
 	<string name="poi_historic_railway_station">Гістарычная чыгуначная станцыя</string>
 
 	<string name="poi_club_freemasonry">Масонскае Ложа</string>
-	<string name="poi_club_sailing">Клюб ветразьнага спорту</string>
-	<string name="poi_club_scout">Клюб скаўтаў</string>
+	<string name="poi_club_sailing">Клуб ветразевага спорту</string>
+	<string name="poi_club_scout">Клуб скаўтаў</string>
 
 	<string name="poi_historic_threshing_floor">Гістарычнае гумно</string>
 	<string name="poi_historic_gallows">Гістарычная шыбеніца</string>
@@ -2382,30 +2382,30 @@
 	<string name="poi_building_type_church">Тып будынка: царква</string>
 	<string name="poi_building_type_chapel">Тып будынка: капліца</string>
 	<string name="poi_building_type_mosque">Тып будынка: мячэць</string>
-	<string name="poi_building_type_temple">Тып будынка: храм</string>
+	<string name="poi_building_type_temple">Тып будынка: святыня</string>
 	<string name="poi_building_type_cathedral">Тып будынка: сабор</string>
 	<string name="poi_building_type_monastery">Тып будынка: манастыр</string>
 	<string name="poi_building_type_basilica">Тып будынка: базіліка</string>
 	<string name="poi_building_type_synagogue">Тып будынка: сінагога</string>
-	<string name="poi_building_type_shrine">Тып будынка: сьвятыня</string>
+	<string name="poi_building_type_shrine">Тып будынка: святыня</string>
 
 	<string name="poi_cross">Крыж</string>
-	<string name="poi_summit_cross">Крыж на вяршыні: ёсьць</string>
+	<string name="poi_summit_cross">Крыж на вяршыні: ёсць</string>
 
-	<string name="poi_prison_camp">Былы турэмны лягер</string>
-	<string name="poi_concentration_camp">Тып: канцэнтрацыйны лягер</string>
+	<string name="poi_prison_camp">Былы турэмны лагер</string>
+	<string name="poi_concentration_camp">Тып: канцэнтрацыйны лагер</string>
 	<string name="poi_pow_camp">Тып: для ваеннапалонных</string>
 	<string name="poi_labor_camp">Тып: выпраўленча-працоўны</string>
 	<string name="poi_concentration_camp_nazism">Тып: нацысцкі</string>
 	<string name="poi_concentration_camp_gulag">Тып: гулаг</string>
 
-	<string name="poi_temperature">Тэмпэратура</string>
-	<string name="poi_bathing_yes">Купаньне: так</string>
-	<string name="poi_bathing_no">Купаньне: не</string>
+	<string name="poi_temperature">Тэмпература</string>
+	<string name="poi_bathing_yes">Купанне: так</string>
+	<string name="poi_bathing_no">Купанне: не</string>
 
-	<string name="poi_boat_storage">Месца для захоўваньня лодак</string>
+	<string name="poi_boat_storage">Месца для захоўвання лодак</string>
 
-	<string name="poi_conveying_yes">Эскалятар/травалятар</string>
+	<string name="poi_conveying_yes">Эскалатар/травалятар</string>
 
 	<string name="poi_bridge_ref">Пазнака моста</string>
 	<string name="poi_tunnel_ref">Пазнака тунэля</string>
@@ -2415,153 +2415,153 @@
 	<string name="poi_cargo_passengers">Пасажыры</string>
 	<string name="poi_cargo_vehicle">Аўтамабілі</string>
 	<string name="poi_cargo_bicycle">Ровары</string>
-	<string name="poi_cargo_container">Кантэйнэры</string>
+	<string name="poi_cargo_container">Кантэйнеры</string>
 	<string name="poi_cargo_hgv">Грузавікі</string>
 
 	<string name="poi_fitness_station">Фітнэс-станцыя</string>
 
 	<string name="poi_hackerspace">Хакерспэйс</string>
 
-	<string name="poi_wiki_lang_af">Вікіпэдыя на афрыкаанс</string>
-	<string name="poi_wiki_lang_als">Вікіпэдыя на алеманскай</string>
-	<string name="poi_wiki_lang_az">Вікіпэдыя на азербайджанскай</string>
-	<string name="poi_wiki_lang_bn">Вікіпэдыя на бенгальскай</string>
-	<string name="poi_wiki_lang_bpy">Вікіпэдыя на бішнупрыя-маніпуры</string>
-	<string name="poi_wiki_lang_br">Вікіпэдыя на брэтонскай</string>
-	<string name="poi_wiki_lang_bs">Вікіпэдыя на баснійскай</string>
-	<string name="poi_wiki_lang_cy">Вікіпэдыя на валійскай</string>
-	<string name="poi_wiki_lang_eo">Вікіпэдыя на эспэранта</string>
-	<string name="poi_wiki_lang_eu">Вікіпэдыя на баскскай</string>
-	<string name="poi_wiki_lang_fa">Вікіпэдыя на пэрсідзкай</string>
-	<string name="poi_wiki_lang_fy">Вікіпэдыя на заходнефрызкай</string>
-	<string name="poi_wiki_lang_ga">Вікіпэдыя на ірляндзкай</string>
-	<string name="poi_wiki_lang_hy">Вікіпэдыя на армянскай</string>
-	<string name="poi_wiki_lang_is">Вікіпэдыя на ісьляндзкай</string>
-	<string name="poi_wiki_lang_ka">Вікіпэдыя на грузінскай</string>
-	<string name="poi_wiki_lang_ku">Вікіпэдыя на курдзкай</string>
-	<string name="poi_wiki_lang_la">Вікіпэдыя на лацінскай</string>
-	<string name="poi_wiki_lang_lb">Вікіпэдыя на люксэмбургскай</string>
-	<string name="poi_wiki_lang_mk">Вікіпэдыя на македонскай</string>
-	<string name="poi_wiki_lang_ml">Вікіпэдыя на малаялам</string>
-	<string name="poi_wiki_lang_mr">Вікіпэдыя на маратхі</string>
-	<string name="poi_wiki_lang_nds">Вікіпэдыя на ніжненямецкай</string>
-	<string name="poi_wiki_lang_nv">Вікіпэдыя на наваха</string>
-	<string name="poi_wiki_lang_os">Вікіпэдыя на асяцінскай</string>
-	<string name="poi_wiki_lang_pms">Вікіпэдыя на п\'емонцкай</string>
-	<string name="poi_wiki_lang_sc">Вікіпэдыя на сардынскай</string>
-	<string name="poi_wiki_lang_sh">Вікіпэдыя на сэрбахарвацкай</string>
-	<string name="poi_wiki_lang_sq">Вікіпэдыя на альбанскай</string>
-	<string name="poi_wiki_lang_ta">Вікіпэдыя на тамільскай</string>
-	<string name="poi_wiki_lang_tl">Вікіпэдыя на тагальскай</string>
+	<string name="poi_wiki_lang_af">Вікіпедыя на афрыкаанс</string>
+	<string name="poi_wiki_lang_als">Вікіпедыя на алеманскай мове</string>
+	<string name="poi_wiki_lang_az">Вікіпедыя на азербайджанскай мове</string>
+	<string name="poi_wiki_lang_bn">Вікіпедыя на бенгальскай мове</string>
+	<string name="poi_wiki_lang_bpy">Вікіпедыя на бішнупрыя-маніпуры</string>
+	<string name="poi_wiki_lang_br">Вікіпедыя на брэтонскай мове</string>
+	<string name="poi_wiki_lang_bs">Вікіпедыя на баснійскай мове</string>
+	<string name="poi_wiki_lang_cy">Вікіпедыя на валійскай мове</string>
+	<string name="poi_wiki_lang_eo">Вікіпедыя на эсперанта</string>
+	<string name="poi_wiki_lang_eu">Вікіпедыя на басконскай мове</string>
+	<string name="poi_wiki_lang_fa">Вікіпедыя на персідскай мове</string>
+	<string name="poi_wiki_lang_fy">Вікіпедыя на заходнефрызскай мове</string>
+	<string name="poi_wiki_lang_ga">Вікіпедыя на ірландскай мове</string>
+	<string name="poi_wiki_lang_hy">Вікіпедыя на армянскай мове</string>
+	<string name="poi_wiki_lang_is">Вікіпедыя на ісландскай мове</string>
+	<string name="poi_wiki_lang_ka">Вікіпедыя на грузінскай мове</string>
+	<string name="poi_wiki_lang_ku">Вікіпедыя на курдскай мове</string>
+	<string name="poi_wiki_lang_la">Вікіпедыя на лацінскай мове</string>
+	<string name="poi_wiki_lang_lb">Вікіпедыя на люксембургскай мове</string>
+	<string name="poi_wiki_lang_mk">Вікіпедыя на македонскай мове</string>
+	<string name="poi_wiki_lang_ml">Вікіпедыя на малаялам</string>
+	<string name="poi_wiki_lang_mr">Вікіпедыя на маратхі</string>
+	<string name="poi_wiki_lang_nds">Вікіпедыя на ніжненямецкай мове</string>
+	<string name="poi_wiki_lang_nv">Вікіпедыя на наваха</string>
+	<string name="poi_wiki_lang_os">Вікіпедыя на асяцінскай мове</string>
+	<string name="poi_wiki_lang_pms">Вікіпедыя на п\'емонцкай мове</string>
+	<string name="poi_wiki_lang_sc">Вікіпедыя на сардынскай мове</string>
+	<string name="poi_wiki_lang_sh">Вікіпедыя на сербскахарвацкай мове</string>
+	<string name="poi_wiki_lang_sq">Вікіпедыя на албанскай мове</string>
+	<string name="poi_wiki_lang_ta">Вікіпедыя на тамільскай мове</string>
+	<string name="poi_wiki_lang_tl">Вікіпедыя на тагальскай мове</string>
 
-	<string name="poi_wiki_lang_war">Вікіпэдыя на варайскай</string>
-	<string name="poi_wiki_lang_min">Вікіпэдыя на мінангкабаў</string>
-	<string name="poi_wiki_lang_kk">Вікіпэдыя на казахскай</string>
-	<string name="poi_wiki_lang_uz">Вікіпэдыя на ўзбецкай</string>
-	<string name="poi_wiki_lang_ce">Вікіпэдыя на чачэнскай</string>
-	<string name="poi_wiki_lang_ur">Вікіпэдыя на урду</string>
-	<string name="poi_wiki_lang_oc">Вікіпэдыя на аксітанскай</string>
-	<string name="poi_wiki_lang_zhminnan">Вікіпэдыя на паўднёваміньскай</string>
-	<string name="poi_wiki_lang_mg">Вікіпэдыя на малагасійскай</string>
-	<string name="poi_wiki_lang_tt">Вікіпэдыя на татарскай</string>
-	<string name="poi_wiki_lang_jv">Вікіпэдыя на яванскай</string>
-	<string name="poi_wiki_lang_ky">Вікіпэдыя на кіргізкай</string>
-	<string name="poi_wiki_lang_zhyue">Вікіпэдыя на кантонскай</string>
-	<string name="poi_wiki_lang_ast">Вікіпэдыя на астурлеонскай</string>
-	<string name="poi_wiki_lang_tg">Вікіпэдыя на таджыцкай</string>
-	<string name="poi_wiki_lang_ba">Вікіпэдыя на башкірскай</string>
-	<string name="poi_wiki_lang_sco">Вікіпэдыя на шатляндзкай</string>
-	<string name="poi_wiki_lang_pnb">Вікіпэдыя на заходнім панджабі</string>
-	<string name="poi_wiki_lang_cv">Вікіпэдыя на чувашскай</string>
-	<string name="poi_wiki_lang_lmo">Вікіпэдыя на лямбардзкай</string>
-	<string name="poi_wiki_lang_my">Вікіпэдыя на бірманскай</string>
-	<string name="poi_wiki_lang_yo">Вікіпэдыя на ёруба</string>
-	<string name="poi_wiki_lang_an">Вікіпэдыя на арагонскай</string>
-	<string name="poi_wiki_lang_ne">Вікіпэдыя на нэпальскай</string>
-	<string name="poi_wiki_lang_gu">Вікіпэдыя на гуджараці</string>
-	<string name="poi_wiki_lang_scn">Вікіпэдыя на сіцылійскай</string>
-	<string name="poi_wiki_lang_bar">Вікіпэдыя на баварскай</string>
-	<string name="poi_wiki_lang_mn">Вікіпэдыя на мангольскай</string>
-	<string name="poi_wiki_lang_nap">Вікіпэдыя на нэапалітанскай</string>
+	<string name="poi_wiki_lang_war">Вікіпедыя на варайскай мове</string>
+	<string name="poi_wiki_lang_min">Вікіпедыя на мінангкабаў</string>
+	<string name="poi_wiki_lang_kk">Вікіпедыя на казахскай мове</string>
+	<string name="poi_wiki_lang_uz">Вікіпедыя на ўзбецкай мове</string>
+	<string name="poi_wiki_lang_ce">Вікіпедыя на чачэнскай мове</string>
+	<string name="poi_wiki_lang_ur">Вікіпедыя на урду</string>
+	<string name="poi_wiki_lang_oc">Вікіпедыя на аксітанскай мове</string>
+	<string name="poi_wiki_lang_zhminnan">Вікіпедыя на паўднёваміньскай мове</string>
+	<string name="poi_wiki_lang_mg">Вікіпедыя на малагасійскай мове</string>
+	<string name="poi_wiki_lang_tt">Вікіпедыя на татарскай мове</string>
+	<string name="poi_wiki_lang_jv">Вікіпедыя на яванскай мове</string>
+	<string name="poi_wiki_lang_ky">Вікіпедыя на кіргізскай мове</string>
+	<string name="poi_wiki_lang_zhyue">Вікіпедыя на кантонскай мове</string>
+	<string name="poi_wiki_lang_ast">Вікіпедыя на астурлеонскай мове</string>
+	<string name="poi_wiki_lang_tg">Вікіпедыя на таджыцкай мове</string>
+	<string name="poi_wiki_lang_ba">Вікіпедыя на башкірскай мове</string>
+	<string name="poi_wiki_lang_sco">Вікіпедыя на шатландскай мове</string>
+	<string name="poi_wiki_lang_pnb">Вікіпедыя на заходнім панджабі</string>
+	<string name="poi_wiki_lang_cv">Вікіпедыя на чувашскай мове</string>
+	<string name="poi_wiki_lang_lmo">Вікіпедыя на ламбардскай мове</string>
+	<string name="poi_wiki_lang_my">Вікіпедыя на бірманскай мове</string>
+	<string name="poi_wiki_lang_yo">Вікіпедыя на ёруба</string>
+	<string name="poi_wiki_lang_an">Вікіпедыя на арагонскай мове</string>
+	<string name="poi_wiki_lang_ne">Вікіпедыя на непальскай мове</string>
+	<string name="poi_wiki_lang_gu">Вікіпедыя на гуджараці</string>
+	<string name="poi_wiki_lang_scn">Вікіпедыя на сіцылійскай мове</string>
+	<string name="poi_wiki_lang_bar">Вікіпедыя на баварскай мове</string>
+	<string name="poi_wiki_lang_mn">Вікіпедыя на мангольскай мове</string>
+	<string name="poi_wiki_lang_nap">Вікіпедыя на неапалітанскай мове</string>
 
-	<string name="poi_fireworks">Крама феервэркаў</string>
+	<string name="poi_fireworks">Крама феерверкаў</string>
 
-	<string name="poi_aerialway_length">Працягласьць</string>
+	<string name="poi_aerialway_length">Працягласць</string>
 
-	<string name="poi_health_specialty_general_yes">Сямейная мэдыцына</string>
-	<string name="poi_health_specialty_ophthalmology_yes">Афтальмалёгія</string>
-	<string name="poi_health_specialty_gynaecology_yes">Гінэкалёгія</string>
+	<string name="poi_health_specialty_general_yes">Сямейная медыцына</string>
+	<string name="poi_health_specialty_ophthalmology_yes">Афтальмалогія</string>
+	<string name="poi_health_specialty_gynaecology_yes">Гінэкалогія</string>
 	<string name="poi_health_specialty_internal_medicine_yes">Унутраныя хваробы</string>
-	<string name="poi_health_specialty_orthopaedics_yes">Артапэдыя</string>
-	<string name="poi_health_specialty_otolaryngology_yes">Оталярынгалёгія (ЛОР)</string>
-	<string name="poi_health_specialty_paediatrics_yes">Пэдыятрыя</string>
-	<string name="poi_health_specialty_paediatrics_no">Спэцыялізацыя: пэдыятрыя: адсутнічае</string>
-	<string name="poi_health_specialty_dermatology_yes">Дэрматалёгія</string>
-	<string name="poi_health_specialty_urology_yes">Уралёгія</string>
+	<string name="poi_health_specialty_orthopaedics_yes">Артапедыя</string>
+	<string name="poi_health_specialty_otolaryngology_yes">Оталарынгалогія</string>
+	<string name="poi_health_specialty_paediatrics_yes">Педыятрыя</string>
+	<string name="poi_health_specialty_paediatrics_no">Спецыялізацыя: педыятрыя: адсутнічае</string>
+	<string name="poi_health_specialty_dermatology_yes">Дэрматалогія</string>
+	<string name="poi_health_specialty_urology_yes">Уралогія</string>
 	<string name="poi_health_specialty_surgery_yes">Агульная хірургія</string>
-	<string name="poi_health_specialty_radiology_yes">Радыялёгія</string>
-	<string name="poi_health_specialty_psychiatry_yes">Псыхіятрыя</string>
-	<string name="poi_health_specialty_neurology_yes">Нэўралёгія</string>
-	<string name="poi_health_specialty_dermatovenereology_yes">Дэрматавэнэралёгія</string>
-	<string name="poi_health_specialty_cardiology_yes">Кардыялёгія</string>
-	<string name="poi_health_specialty_trauma_yes">Траўматалёгія</string>
-	<string name="poi_health_specialty_biology_yes">Лябараторная мэдыцына</string>
+	<string name="poi_health_specialty_radiology_yes">Радыялогія</string>
+	<string name="poi_health_specialty_psychiatry_yes">Псіхіятрыя</string>
+	<string name="poi_health_specialty_neurology_yes">Неўралогія</string>
+	<string name="poi_health_specialty_dermatovenereology_yes">Дэрматавенералогія</string>
+	<string name="poi_health_specialty_cardiology_yes">Кардыялогія</string>
+	<string name="poi_health_specialty_trauma_yes">Траўматалогія</string>
+	<string name="poi_health_specialty_biology_yes">Лабараторная медыцына</string>
 	<string name="poi_health_specialty_osteopathy_yes">Астэапатыя</string>
-	<string name="poi_health_specialty_anaesthetics_yes">Анэстэзіялёгія і рэанімацыя</string>
-	<string name="poi_health_specialty_pulmonology_yes">Пульманалёгія</string>
+	<string name="poi_health_specialty_anaesthetics_yes">Анэстэзіялогія і рэанімацыя</string>
+	<string name="poi_health_specialty_pulmonology_yes">Пульманалогія</string>
 	<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Сківічна-тваравая, зубная хірургія</string>
 	<string name="poi_health_specialty_maternity_yes">Мацярынства</string>
 	<string name="poi_health_specialty_emergency_medicine_yes">Хуткая і неадкладная дапамога</string>
-	<string name="poi_health_specialty_emergency_medicine_no">Спэцыялізацыя: хуткая і неадкладная дапамога: адсутнічае</string>
-	<string name="poi_health_specialty_plastic_surgery_yes">Плястычная хірургія</string>
+	<string name="poi_health_specialty_emergency_medicine_no">Спецыялізацыя: хуткая і неадкладная дапамога: адсутнічае</string>
+	<string name="poi_health_specialty_plastic_surgery_yes">Пластычная хірургія</string>
 	<string name="poi_health_specialty_orthodontics_yes">Артадонтыя</string>
 	<string name="poi_health_specialty_physiotherapy_yes">Фізіятэрапія (лячэбная фізічная культура)</string>
 	<string name="poi_health_specialty_biochemistry_yes">Біяхімія</string>
-	<string name="poi_health_specialty_occupational_yes">Прафэсійныя хваробы</string>
-	<string name="poi_health_specialty_child_psychiatry_yes">Дзіцячая псыхіятрыя</string>
+	<string name="poi_health_specialty_occupational_yes">Прафесійныя хваробы</string>
+	<string name="poi_health_specialty_child_psychiatry_yes">Дзіцячая псіхіятрыя</string>
 	<string name="poi_health_specialty_physiatry_yes">Рэабілітацыя</string>
 	<string name="poi_health_specialty_maxillofacial_surgery_yes">Сківічна-тваравая хірургія</string>
 	<string name="poi_health_specialty_diagnostic_radiology_yes">Прамянёвая дыягностыка</string>
-	<string name="poi_health_specialty_gastroenterology_yes">Гастраэнтэралёгія</string>
-	<string name="poi_health_specialty_dentistry_yes">Стаматалёгія</string>
-	<string name="poi_health_specialty_nephrology_yes">Нэфралёгія (нырачныя захворваньні)</string>
-	<string name="poi_health_specialty_neurosurgery_yes">Нэўрахірургія</string>
-	<string name="poi_health_specialty_neuropsychiatry_yes">Нэўрапсыхіятрыя</string>
-	<string name="poi_health_specialty_endocrinology_yes">Эндакрыналёгія</string>
-	<string name="poi_health_specialty_nuclear_medicine_yes">Ядзерная мэдыцына</string>
+	<string name="poi_health_specialty_gastroenterology_yes">Гастраэнтэралогія</string>
+	<string name="poi_health_specialty_dentistry_yes">Стаматалогія</string>
+	<string name="poi_health_specialty_nephrology_yes">Нефралогія (нырачныя захворванні)</string>
+	<string name="poi_health_specialty_neurosurgery_yes">Нейрахірургія</string>
+	<string name="poi_health_specialty_neuropsychiatry_yes">Нейрапсіхіятрыя</string>
+	<string name="poi_health_specialty_endocrinology_yes">Эндакрыналогія</string>
+	<string name="poi_health_specialty_nuclear_medicine_yes">Радыяцыйная медыцына</string>
 	<string name="poi_health_specialty_pathology_yes">Патанатомія</string>
-	<string name="poi_health_specialty_oncology_yes">Анкалёгія</string>
-	<string name="poi_health_specialty_tropical_medicine_yes">Трапічная мэдыцына</string>
-	<string name="poi_health_specialty_tropical_medicine_no">Спэцыялізацыя: трапічная мэдыцына: адсутнічае</string>
-	<string name="poi_health_specialty_obstetrics_postnatal_yes">Акушэрства (пасьляродавае)</string>
-	<string name="poi_health_specialty_obstetrics_postnatal_no">Спэцыялізацыя: акушэрства (пасьляродавае): адсутнічае</string>
+	<string name="poi_health_specialty_oncology_yes">Анкалогія</string>
+	<string name="poi_health_specialty_tropical_medicine_yes">Трапічная медыцына</string>
+	<string name="poi_health_specialty_tropical_medicine_no">Спецыялізацыя: трапічная медыцына: адсутнічае</string>
+	<string name="poi_health_specialty_obstetrics_postnatal_yes">Акушэрства (пасляродавае)</string>
+	<string name="poi_health_specialty_obstetrics_postnatal_no">Спецыялізацыя: акушэрства (пасляродавае): адсутнічае</string>
 	<string name="poi_health_specialty_obstetrics_antenatal_yes">Акушэрства (дародавае)</string>
-	<string name="poi_health_specialty_obstetrics_antenatal_no">Спэцыялізацыя: акушэрства (дародавае): адсутнічае</string>
-	<string name="poi_health_specialty_social_paediatrics_yes">Сацыяльная пэдыятрыя</string>
-	<string name="poi_health_specialty_social_paediatrics_no">Спэцыялізацыя: сацыяльная пэдыятрыя: адсутнічае</string>
+	<string name="poi_health_specialty_obstetrics_antenatal_no">Спецыялізацыя: акушэрства (дародавае): адсутнічае</string>
+	<string name="poi_health_specialty_social_paediatrics_yes">Сацыяльная педыятрыя</string>
+	<string name="poi_health_specialty_social_paediatrics_no">Спецыялізацыя: сацыяльная педыятрыя: адсутнічае</string>
 	<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Акушэрства (кесараў перасек)</string>
-	<string name="poi_health_specialty_obstetrics_caesarean_section_no">Спэцыялізацыя: акушэрства (кесараў перасек): адсутнічае</string>
-	<string name="poi_health_specialty_addiction_medicine_yes">Наркалёгія</string>
-	<string name="poi_health_specialty_optometry_yes">Оптамэтрыя</string>
-	<string name="poi_health_specialty_clinical_pathology_yes">Клінічная паталёгія</string>
-	<string name="poi_health_specialty_speech_therapy_yes">Лягапэд</string>
+	<string name="poi_health_specialty_obstetrics_caesarean_section_no">Спецыялізацыя: акушэрства (кесараў перасек): адсутнічае</string>
+	<string name="poi_health_specialty_addiction_medicine_yes">Наркалогія</string>
+	<string name="poi_health_specialty_optometry_yes">Оптаметрыя</string>
+	<string name="poi_health_specialty_clinical_pathology_yes">Клінічная паталогія</string>
+	<string name="poi_health_specialty_speech_therapy_yes">Лагапед</string>
 	<string name="poi_health_specialty_manual_therapy_yes">Мануальная тэрапія</string>
-	<string name="poi_health_specialty_sports_medicine_yes">Спартовая мэдыцына</string>
-	<string name="poi_health_specialty_podology_yes">Падалёгія</string>
-	<string name="poi_health_specialty_adult_psychiatry_yes">Псыхіятрыя для дарослых</string>
+	<string name="poi_health_specialty_sports_medicine_yes">Спартовая медыцына</string>
+	<string name="poi_health_specialty_podology_yes">Падалогія</string>
+	<string name="poi_health_specialty_adult_psychiatry_yes">Псіхіятрыя для дарослых</string>
 	<string name="poi_health_specialty_acupuncture_yes">Акупунктура</string>
-	<string name="poi_health_specialty_homeopathy_yes">Гамэапатыя</string>
-	<string name="poi_health_specialty_traditional_chinese_medicine_yes">Традыцыйная кітайская мэдыцына</string>
+	<string name="poi_health_specialty_homeopathy_yes">Гамеапатыя</string>
+	<string name="poi_health_specialty_traditional_chinese_medicine_yes">Традыцыйная кітайская медыцына</string>
 	<string name="poi_health_specialty_reiki_yes">Рэйкі</string>
 	<string name="poi_health_specialty_herbalism_yes">Траўніцтва</string>
 	<string name="poi_health_specialty_chiropractic_yes">Хірапрактыка</string>
 	<string name="poi_health_specialty_naturopathy_yes">Натурапатыя</string>
-	<string name="poi_health_specialty_depth_psychology_yes">Глыбінная псыхалёгія</string>
-	<string name="poi_health_specialty_behavior_yes">Біхевіяральная псыхатэрапія</string>
+	<string name="poi_health_specialty_depth_psychology_yes">Глыбінная псіхалогія</string>
+	<string name="poi_health_specialty_behavior_yes">Біхевіяральная псіхатэрапія</string>
 
 	<string name="poi_building_type_pyramid">Тып будынка: піраміда</string>
 
-	<string name="poi_fitness_centre">Фітнэс-цэнтар</string>
+	<string name="poi_fitness_centre">Фітнэс-цэнтр</string>
 	<string name="poi_fitness">Фітнэс</string>
 
 	<string name="poi_billiards">Більярд</string>
@@ -2575,7 +2575,7 @@
 	<string name="poi_parking_garage_boxes">Гаражы</string>
 	<string name="poi_parking_carports">Падстрэшак</string>
 
-	<string name="poi_dojo">Дадзё</string>
+	<string name="poi_dojo">Доджо</string>
 
 	<string name="poi_gaelic_games">Гэльскія гульні</string>
 	<string name="poi_running">Бег</string>
@@ -2585,7 +2585,7 @@
 	<string name="poi_judo">Дзюдо</string>
 	<string name="poi_disc_golf">Дыск-гольф</string>
 	<string name="poi_futsal">Міні-футбол</string>
-	<string name="poi_rc_car">Гонкі на радыёкіраваных аўтамадэлях</string>
+	<string name="poi_rc_car">Гонкі на радыякіруемых аўтамадэлях</string>
 	<string name="poi_squash">Сквош</string>
 	<string name="poi_shuffleboard">Шафлборд</string>
 	<string name="poi_lacrosse">Лакрос</string>
@@ -2609,17 +2609,17 @@
 	<string name="poi_atm_no">Без банкамата</string>
 
 	<string name="poi_firepit">Кастрышча</string>
-	<string name="poi_street_cabinet">Разьмеркавальная шафа</string>
+	<string name="poi_street_cabinet">Размеркавальная шафа</string>
 
-	<string name="poi_fair_trade_yes">Справядлівы гандаль (Fairtrade): ёсьць</string>
+	<string name="poi_fair_trade_yes">Справядлівы гандаль (Fairtrade): ёсць</string>
 	<string name="poi_fair_trade_no">Справядлівы гандаль (Fairtrade): няма</string>
 	<string name="poi_fair_trade_only">Толькі тавары з маркіроўкай Справядлівага гандлю (Fairtrade)</string>
 
 	<string name="poi_ice_hockey">Хакей з шайбай</string>
-	<string name="poi_bandy">Хакей зь мячом</string>
+	<string name="poi_bandy">Хакей з мячом</string>
 
-	<string name="poi_protected_area">Ахоўваная прыродная/гістарычная тэрыторыя</string>
-	<string name="poi_protection_title">Тып ахоўванага аб\'екта</string>
+	<string name="poi_protected_area">Ахоўваемая прыродная/гістарычная тэрыторыя</string>
+	<string name="poi_protection_title">Тып ахоўваемага аб\'екта</string>
 	<string name="poi_protection_object_historic">Аб\'ект аховы: гістарычны</string>
 	<string name="poi_protection_object_nature">Аб\'ект аховы: прырода</string>
 	<string name="poi_protection_object_habitat">Аб\'ект аховы: арэал</string>
@@ -2636,31 +2636,31 @@
 	<string name="poi_nuclear_explosion_type_atmospheric_atmospheric_surface">Тып выбуху: атмасферны (на паверхні)</string>
 	<string name="poi_nuclear_explosion_type_atmospheric_water_surface_barge">Тып выбуху: атмасферны (паверхня вады, баржа)</string>
 	<string name="poi_nuclear_explosion_type_underground">Тып выбуху: падземны</string>
-	<string name="poi_nuclear_explosion_type_cratering_burst">Тып выбуху: неглыбокага залажэньня</string>
+	<string name="poi_nuclear_explosion_type_cratering_burst">Тып выбуху: неглыбокага залажэння</string>
 	<string name="poi_nuclear_explosion_type_atmospheric_rocket_or_missile">Тып выбуху: атмасферны (ракета)</string>
-	<string name="poi_nuclear_explosion_type_space">Тып выбуху: касьмічны (вышыня больш 80км)</string>
+	<string name="poi_nuclear_explosion_type_space">Тып выбуху: касмічны (вышыня больш 80км)</string>
 	<string name="poi_nuclear_explosion_type_underwater">Тып выбуху: падводны</string>
 	<string name="poi_nuclear_explosion_date_utc">Дата выбуху (UTC)</string>
 	<string name="poi_nuclear_explosion_shot_name_en">Кодавае імя (англ.)</string>
-	<string name="poi_nuclear_explosion_series">Сэрыя</string>
-	<string name="poi_nuclear_explosion_purpose_nuclear_weapons_related">Мэта выбуху: выпрабаваньні ядзернай зброі</string>
+	<string name="poi_nuclear_explosion_series">Серыя</string>
+	<string name="poi_nuclear_explosion_purpose_nuclear_weapons_related">Мэта выбуху: выпрабаванні ядзернай зброі</string>
 	<string name="poi_nuclear_explosion_purpose_weapons_effects">Мэта выбуху: эфект зброі</string>
-	<string name="poi_nuclear_explosion_purpose_safety_experiment">Мэта выбуху: вывучэньне бясьпекі</string>
-	<string name="poi_nuclear_explosion_purpose_research_for_peaceful_applications">Мэта выбуху: дасьледаваньні для мірных ужываньняў</string>
-	<string name="poi_nuclear_explosion_purpose_fundamental_science">Мэта выбуху: фундамэнтальная навука</string>
-	<string name="poi_nuclear_explosion_purpose_industrial_application_cavity_excavation">Мэта выбуху: прамысловае ўжываньне, стварэньне паражнін</string>
-	<string name="poi_nuclear_explosion_purpose_industrial_application_seismic_sounding">Мэта выбуху: прамысловае ўжываньне, сэйсмічнае зандаваньне</string>
-	<string name="poi_nuclear_explosion_purpose_industrial_application_oil_stimulation">Мэта выбуху: прамысловае ўжываньне, стымуляцыя прытоку нафты</string>
-	<string name="poi_nuclear_explosion_purpose_industrial_application">Мэта выбуху: прамысловае ўжываньне</string>
-	<string name="poi_nuclear_explosion_purpose_industrial_application_earth_moving">Мэта выбуху: прамысловае ўжываньне, зрух земляных пластоў</string>
+	<string name="poi_nuclear_explosion_purpose_safety_experiment">Мэта выбуху: вывучэнне бяспекі</string>
+	<string name="poi_nuclear_explosion_purpose_research_for_peaceful_applications">Мэта выбуху: даследаванні для мірных ужыванняў</string>
+	<string name="poi_nuclear_explosion_purpose_fundamental_science">Мэта выбуху: фундаментальная навука</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_cavity_excavation">Мэта выбуху: прамысловае ўжыванне, стварэнне паражнін</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_seismic_sounding">Мэта выбуху: прамысловае ўжыванне, сейсмічнае зандаванне</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_oil_stimulation">Мэта выбуху: прамысловае ўжыванне, стымуляцыя прытоку нафты</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application">Мэта выбуху: прамысловае ўжыванне</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_earth_moving">Мэта выбуху: прамысловае ўжыванне, зрух земляных пластоў</string>
 	<string name="poi_nuclear_explosion_time_utc">Час выбуху (UTC)</string>
-	<string name="poi_nuclear_explosion_yield">Магутнасьць выбуху</string>
+	<string name="poi_nuclear_explosion_yield">Магутнасць выбуху</string>
 	<string name="poi_nuclear_explosion_height_of_burst">Вышыня выбуху (ад паверхні)</string>
 	<string name="poi_nuclear_explosion_ground_zero_altitude">Вышыня эпіцэнтра над узроўнем мора</string>
 	<string name="poi_nuclear_explosion_body_wave_magnitude">Магнітуда землятрусу</string>
-	<string name="poi_nuclear_explosion_crater_diameter">Дыямэтр кратара</string>
+	<string name="poi_nuclear_explosion_crater_diameter">Дыяметр кратара</string>
 	<string name="poi_nuclear_explosion_warhead">Боегалоўка</string>
-	<string name="poi_nuclear_explosion_device">Прыстасаваньне</string>
+	<string name="poi_nuclear_explosion_device">Прылада</string>
 
 	<string name="poi_addr_housename">Назва дому</string>
 	<string name="poi_religion">Рэлігійная крама</string>
@@ -2693,8 +2693,8 @@
 	<string name="poi_free_flying_paragliding_no">Парапланерызм: не</string>
 	<string name="poi_free_flying_hanggliding_yes">Дэльтапланерызм</string>
 	<string name="poi_free_flying_hanggliding_no">Дэльтапланерызм: не</string>
-	<string name="poi_free_flying_rigid_yes">Дэльтаплан зь цьвёрдым крылом</string>
-	<string name="poi_free_flying_rigid_no">Дэльтаплан з цьвёрдым крылом: не</string>
+	<string name="poi_free_flying_rigid_yes">Дэльтаплан з цвёрдым крылом</string>
+	<string name="poi_free_flying_rigid_no">Дэльтаплан з цвёрдым крылом: не</string>
 	<string name="poi_free_flying_site_orientation_n">Арыентацыя пляцоўкі для вольнага палёту: Пн</string>
 	<string name="poi_free_flying_site_orientation_ne">Арыентацыя пляцоўкі для вольнага палёту: ПнУ</string>
 	<string name="poi_free_flying_site_orientation_e">Арыентацыя пляцоўкі для вольнага палёту: У</string>
@@ -2709,7 +2709,7 @@
 
 	<string name="poi_tanning_salon">Салярый</string>
 
-	<string name="poi_sanitary_dump_station">Асенізацыйная зьліўная станцыя</string>
+	<string name="poi_sanitary_dump_station">Асенізацыйная зліўная станцыя</string>
 
 	<string name="poi_medical_system_western_yes">Заходняя</string>
 	<string name="poi_medical_system_chinese_yes">Традыцыйная кітайская</string>
@@ -2721,37 +2721,37 @@
 	<string name="poi_medical_system_sidda_yes">Традыцыйная тамільская</string>
 	<string name="poi_medical_system_unani_yes">Традыцыйная грэка-ісламская</string>
 
-	<string name="poi_health_service_nursing_yes">Мэдыцынскія паслугі: дагляд: ёсьць</string>
-	<string name="poi_health_service_nursing_no">Мэдыцынскія паслугі: дагляд: не</string>
-	<string name="poi_health_service_counselling_yes">Мэдыцынскія паслугі: кансультацыя: ёсьць</string>
-	<string name="poi_health_service_counselling_no">Мэдыцынскія паслугі: кансультацыя: не</string>
-	<string name="poi_health_service_examination_yes">Мэдыцынскія паслугі: базавая дыягностыка: ёсьць</string>
-	<string name="poi_health_service_examination_no">Мэдыцынскія паслугі: базавая дыягностыка: не</string>
-	<string name="poi_health_service_child_care_yes">Мэдыцынскія паслугі: дагляд за дзецьмі: ёсьць</string>
-	<string name="poi_health_service_child_care_no">Мэдыцынскія паслугі: дагляд за дзецьмі: не</string>
-	<string name="poi_health_service_prevention_yes">Мэдыцынскія паслугі: прафілактыка: ёсьць</string>
-	<string name="poi_health_service_prevention_no">Мэдыцынскія паслугі: прафілактыка: не</string>
-	<string name="poi_health_service_prevention_vaccination_yes">Мэдыцынскія паслугі: вакцынацыя: ёсьць</string>
-	<string name="poi_health_service_prevention_vaccination_no">Мэдыцынскія паслугі: вакцынацыя: не</string>
-	<string name="poi_health_service_support_yes">Мэдыцынскія паслугі: падтрымка: ёсьць</string>
-	<string name="poi_health_service_support_no">Мэдыцынскія паслугі: падтрымка: не</string>
-	<string name="poi_health_service_test_yes">Мэдыцынскія паслугі: тэставаньне: ёсьць</string>
-	<string name="poi_health_service_test_no">Мэдыцынскія паслугі: тэставаньне: не</string>
+	<string name="poi_health_service_nursing_yes">Медыцынскія паслугі: дагляд: ёсць</string>
+	<string name="poi_health_service_nursing_no">Медыцынскія паслугі: дагляд: не</string>
+	<string name="poi_health_service_counselling_yes">Медыцынскія паслугі: кансультацыя: ёсць</string>
+	<string name="poi_health_service_counselling_no">Медыцынскія паслугі: кансультацыя: не</string>
+	<string name="poi_health_service_examination_yes">Медыцынскія паслугі: базавая дыягностыка: ёсць</string>
+	<string name="poi_health_service_examination_no">Медыцынскія паслугі: базавая дыягностыка: не</string>
+	<string name="poi_health_service_child_care_yes">Медыцынскія паслугі: дагляд за дзецьмі: ёсць</string>
+	<string name="poi_health_service_child_care_no">Медыцынскія паслугі: дагляд за дзецьмі: не</string>
+	<string name="poi_health_service_prevention_yes">Медыцынскія паслугі: прафілактыка: ёсць</string>
+	<string name="poi_health_service_prevention_no">Медыцынскія паслугі: прафілактыка: не</string>
+	<string name="poi_health_service_prevention_vaccination_yes">Медыцынскія паслугі: вакцынацыя: ёсць</string>
+	<string name="poi_health_service_prevention_vaccination_no">Медыцынскія паслугі: вакцынацыя: не</string>
+	<string name="poi_health_service_support_yes">Медыцынскія паслугі: падтрымка: ёсць</string>
+	<string name="poi_health_service_support_no">Медыцынскія паслугі: падтрымка: не</string>
+	<string name="poi_health_service_test_yes">Медыцынскія паслугі: тэставанне: ёсць</string>
+	<string name="poi_health_service_test_no">Медыцынскія паслугі: тэставанне: не</string>
 
-	<string name="poi_health_facility_type_office">Мэдыцынскі офіс</string>
-	<string name="poi_health_facility_type_field_hospital">Тып мэдустановы: палявы шпіталь</string>
-	<string name="poi_health_facility_type_counselling_centre">Тып мэдустановы: цэнтар псіхалягічнай кансультацыі</string>
-	<string name="poi_health_facility_type_laboratory">Тып мэдустановы: мэдыцынская лябараторыя</string>
-	<string name="poi_health_facility_type_therapy">Тып мэдустановы: тэрапія</string>
-	<string name="poi_health_facility_type_department">Тып мэдустановы: адзьдзяленьне</string>
-	<string name="poi_health_facility_type_dispensary">Тып мэдустановы: выдача лекавых сродкаў</string>
-	<string name="poi_health_facility_type_first_aid">Тып мэдустановы: станцыя першай дапамогі</string>
-	<string name="poi_health_facility_type_nursing_home">Тып мэдустановы: хоспіс</string>
-	<string name="poi_health_facility_type_support_group_home">Тып мэдустановы: сустрэчы груп падтрымкі</string>
+	<string name="poi_health_facility_type_office">Медыцынскі офіс</string>
+	<string name="poi_health_facility_type_field_hospital">Тып медустановы: палявы шпіталь</string>
+	<string name="poi_health_facility_type_counselling_centre">Тып медустановы: цэнтр псіхалагічнай кансультацыі</string>
+	<string name="poi_health_facility_type_laboratory">Тып медустановы: медыцынская лабараторыя</string>
+	<string name="poi_health_facility_type_therapy">Тып медустановы: тэрапія</string>
+	<string name="poi_health_facility_type_department">Тып медустановы: аддзяленне</string>
+	<string name="poi_health_facility_type_dispensary">Тып медустановы: выдача лекавых сродкаў</string>
+	<string name="poi_health_facility_type_first_aid">Тып медустановы: станцыя першай дапамогі</string>
+	<string name="poi_health_facility_type_nursing_home">Тып медустановы: хоспіс</string>
+	<string name="poi_health_facility_type_support_group_home">Тып медустановы: сустрэчы груп падтрымкі</string>
 
 	<string name="poi_health_specialty_palliative_medicine_yes">Паліятыўная дапамога</string>
 
-	<string name="poi_suction_point">Пункт пампаваньня вады</string>
+	<string name="poi_suction_point">Пункт пампавання вады</string>
 
 	<string name="poi_fire_hydrant_type_underground">Падземны</string>
 	<string name="poi_fire_hydrant_type_pillar">Надземны</string>
@@ -2759,27 +2759,27 @@
 	<string name="poi_fire_hydrant_type_wall">Пажарны кран</string>
 
 	<string name="poi_health_amenity_type_first_aid_kit">Аптэчка першай дапамогі</string>
-	<string name="poi_health_amenity_type_scales">Шалі для публічнага карыстаньня</string>
+	<string name="poi_health_amenity_type_scales">Шалі для публічнага карыстання</string>
 
-	<string name="poi_health_person_type_assistant">Роля мэдпрацаўніка: асістэнт</string>
-	<string name="poi_health_person_type_healer">Роля мэдпрацаўніка: лекар</string>
-	<string name="poi_health_person_type_midwife">Роля мэдпрацаўніка: акушэр</string>
-	<string name="poi_health_person_type_nurse">Роля мэдпрацаўніка: мэдсястра</string>
-	<string name="poi_health_person_type_paramedic">Роля мэдпрацаўніка: фельчар</string>
-	<string name="poi_health_person_type_physician">Роля мэдпрацаўніка: урач</string>
-	<string name="poi_health_person_type_podologist">Роля медпрацаўніка: падоляг</string>
-	<string name="poi_health_person_type_psychologist">Роля мэдпрацаўніка: псіхоляг</string>
-	<string name="poi_health_person_type_therapist">Роля мэдпрацаўніка: тэрапэўт</string>
-	<string name="poi_health_person_type_physician_assitant">Роля мэдпрацаўніка: памагаты лекара</string>
-	<string name="poi_health_person_type_technician">Роля мэдпрацаўніка: тэхнік</string>
-	<string name="poi_health_person_type_witchdoctor">Роля мэдпрацаўніка: знахар</string>
+	<string name="poi_health_person_type_assistant">Роля медпрацаўніка: асістэнт</string>
+	<string name="poi_health_person_type_healer">Роля медпрацаўніка: лекар</string>
+	<string name="poi_health_person_type_midwife">Роля медпрацаўніка: акушэр</string>
+	<string name="poi_health_person_type_nurse">Роля медпрацаўніка: медсястра</string>
+	<string name="poi_health_person_type_paramedic">Роля медпрацаўніка: фельчар</string>
+	<string name="poi_health_person_type_physician">Роля медпрацаўніка: лекар</string>
+	<string name="poi_health_person_type_podologist">Роля медпрацаўніка: падолаг</string>
+	<string name="poi_health_person_type_psychologist">Роля медпрацаўніка: псіхолаг</string>
+	<string name="poi_health_person_type_therapist">Роля медпрацаўніка: тэрапеўт</string>
+	<string name="poi_health_person_type_physician_assitant">Роля медпрацаўніка: памагаты лекара</string>
+	<string name="poi_health_person_type_technician">Роля медпрацаўніка: тэхнік</string>
+	<string name="poi_health_person_type_witchdoctor">Роля медпрацаўніка: знахар</string>
 
 	<string name="poi_counselling_type_addiction_yes">Кансультацыя алка/нарказалежных: так</string>
 	<string name="poi_counselling_type_addiction_no">Кансультацыя алка/нарказалежных: не</string>
 	<string name="poi_counselling_type_antenatal_yes">Кансультацыя для цяжарных: так</string>
 	<string name="poi_counselling_type_antenatal_no">Кансультацыя для цяжарных: не</string>
-	<string name="poi_counselling_type_child_guidance_yes">Кансультацыя па дзіцячым выхаваньні: так</string>
-	<string name="poi_counselling_type_child_guidance_no">Кансультацыя па дзіцячым выхаваньні: не</string>
+	<string name="poi_counselling_type_child_guidance_yes">Кансультацыя па дзіцячым выхаванні: так</string>
+	<string name="poi_counselling_type_child_guidance_no">Кансультацыя па дзіцячым выхаванні: не</string>
 	<string name="poi_counselling_type_couple_yes">Кансультацыя для пар: так</string>
 	<string name="poi_counselling_type_couple_no">Кансультацыя для пар: не</string>
 	<string name="poi_counselling_type_crisis_yes">Кансультацыя крызісная: так</string>
@@ -2796,17 +2796,17 @@
 	<string name="poi_counselling_type_immigrant_no">Кансультацыя для імігрантаў: не</string>
 	<string name="poi_counselling_type_marriage_yes">Кансультацыя шлюбная: так</string>
 	<string name="poi_counselling_type_marriage_no">Кансультацыя шлюбная: не</string>
-	<string name="poi_counselling_type_nutrition_yes">Кансультацыя па пытаньнях харчаваньня: так</string>
+	<string name="poi_counselling_type_nutrition_yes">Кансультацыя па пытаннях харчавання: так</string>
 	<string name="poi_counselling_type_rehabilitation_yes">Кансультацыя рэабілітацыйная: так</string>
 	<string name="poi_counselling_type_rehabilitation_no">Кансультацыя рэабілітацыйная: не</string>
-	<string name="poi_counselling_type_sexual_yes">Кансультацыя сэксалягічная: так</string>
-	<string name="poi_counselling_type_sexual_no">Кансультацыя сэксалягічная: не</string>
+	<string name="poi_counselling_type_sexual_yes">Кансультацыя сэксалагічная: так</string>
+	<string name="poi_counselling_type_sexual_no">Кансультацыя сэксалагічная: не</string>
 	<string name="poi_counselling_type_sexual_abuse_yes">Кансультацыя для ахвяр гвалту: так</string>
 	<string name="poi_counselling_type_sexual_abuse_no">Кансультацыя для ахвяр гвалту: не</string>
 	<string name="poi_counselling_type_victim_yes">Кансультацыя для ахвяр гвалту: так</string>
 	<string name="poi_counselling_type_victim_no">Кансультацыя для ахвяр гвалту: не</string>
-	<string name="poi_counselling_type_violence_yes">Кансультацыя па пытаньнях (хатняга) гвалту: так</string>
-	<string name="poi_counselling_type_violence_no">Кансультацыя па пытаньнях (хатняга) гвалту: не</string>
+	<string name="poi_counselling_type_violence_yes">Кансультацыя па пытаннях (хатняга) гвалту: так</string>
+	<string name="poi_counselling_type_violence_no">Кансультацыя па пытаннях (хатняга) гвалту: не</string>
 
 	<string name="poi_provided_for_infant_yes">Паслугі падаюцца немаўлятам: так</string>
 	<string name="poi_provided_for_infant_no">Паслугі падаюцца немаўлятам: не</string>
@@ -2829,13 +2829,13 @@
 
 	<string name="poi_capacity_beds">Колькасць коек</string>
 
-	<string name="poi_treat_inpatient_yes">Абслугоўваньне ў стацыянары: так</string>
-	<string name="poi_treat_inpatient_no">Абслугоўваньне ў стацыянары: не</string>
-	<string name="poi_treat_inpatient_only">Абслугоўваньне ў стацыянары: выключна</string>
+	<string name="poi_treat_inpatient_yes">Абслугоўванне ў стацыянары: так</string>
+	<string name="poi_treat_inpatient_no">Абслугоўванне ў стацыянары: не</string>
+	<string name="poi_treat_inpatient_only">Абслугоўванне ў стацыянары: выключна</string>
 	<string name="poi_counselling_yes">Кансультацыйныя паслугі</string>
 	<string name="poi_counselling_no">Кансультацыйныя паслугі: не</string>
-	<string name="poi_emergency_yes">Крайняя неабходнасьць: так</string>
-	<string name="poi_emergency_no">Крайняя неабходнасьць: не</string>
+	<string name="poi_emergency_yes">Надзвычайная неабходнасць: так</string>
+	<string name="poi_emergency_no">Надзвычайная неабходнасць: не</string>
 	<string name="poi_home_visit_yes">Так</string>
 	<string name="poi_home_visit_no">Выезд на дом: не</string>
 
@@ -2850,16 +2850,16 @@
 
 	<string name="poi_office_physician">Офіс лекара</string>
 	<string name="poi_office_therapist">Офіс тэрапеўта</string>
-	<string name="poi_office_podologist">Офіс падоляга</string>
+	<string name="poi_office_podologist">Офіс падолага</string>
 	<string name="poi_office_healer">Офіс лекара</string>
-	<string name="poi_office_psychologist">Офіс псіхоляга</string>
+	<string name="poi_office_psychologist">Офіс псіхолага</string>
 	<string name="poi_office_nursing_service">Офіс службы дагляду за хворымі</string>
 	<string name="poi_office_midwife">Офіс акушэркі</string>
 
-	<string name="poi_fire_hydrant_diameter">Дыямэтр гідранта</string>
+	<string name="poi_fire_hydrant_diameter">Дыяметр гідранта</string>
 	<string name="poi_fire_hydrant_pressure">Ціск вады ў гідранце</string>
-	<string name="poi_fire_hydrant_count">Колькасьць гідрантаў</string>
-	<string name="poi_fire_hydrant_flow_capacity">Прапускная здольнасьць гідранта</string>
+	<string name="poi_fire_hydrant_count">Колькасць гідрантаў</string>
+	<string name="poi_fire_hydrant_flow_capacity">Прапускная здольнасць гідранта</string>
 	<string name="poi_fire_hydrant_position_sidewalk">Ходнік</string>
 	<string name="poi_fire_hydrant_position_parking_lot">Паркоўка</string>
 	<string name="poi_fire_hydrant_position_street">Вуліца</string>
@@ -2867,22 +2867,22 @@
 	<string name="poi_fire_hydrant_style_water_source_main">Асноўная</string>
 	<string name="poi_fire_hydrant_style_water_source_pond">Сажалка</string>
 	<string name="poi_fire_hydrant_style_water_source_stream">Струмень</string>
-	<string name="poi_fire_hydrant_style_water_source_cistern">Ёмістасьць</string>
+	<string name="poi_fire_hydrant_style_water_source_cistern">Ёмістасць</string>
 	<string name="poi_in_service_yes">Выкарыстоўваецца: так</string>
 
-	<string name="poi_street_cabinet_power">Тып шафы: электрычны</string>
+	<string name="poi_street_cabinet_power">Тып шафы: электрычная</string>
 	<string name="poi_street_cabinet_telecom">Тып шафы: тэлекамунікацыі</string>
 	<string name="poi_street_cabinet_cable_tv">Тып шафы: кабельнае ТБ</string>
 	<string name="poi_street_cabinet_gas">Тып шафы: газ</string>
 	<string name="poi_street_cabinet_postal_service">Тып шафы: паштовая служба</string>
-	<string name="poi_street_cabinet_waste">Тып шафы: сьмецьце</string>
-	<string name="poi_street_cabinet_water_management">Тып шафы: кіраваньне воднымі рэсурсамі</string>
-	<string name="poi_street_cabinet_street_lighting">Тып шафы: вулічнае асьвятленьне</string>
+	<string name="poi_street_cabinet_waste">Тып шафы: смецце</string>
+	<string name="poi_street_cabinet_water_management">Тып шафы: кіраванне воднымі рэсурсамі</string>
+	<string name="poi_street_cabinet_street_lighting">Тып шафы: вулічнае асвятленне</string>
 
 	<string name="poi_military_checkpoint">Вайсковы КПП</string>
 
-	<string name="poi_bicycle_parking_lockers">Шафкі, што замыкаюцца</string>
-	<string name="poi_bicycle_parking_tree">Велапаркоўка ў форме дрэва</string>
+	<string name="poi_bicycle_parking_lockers">Шафы, што замыкаюцца</string>
+	<string name="poi_bicycle_parking_tree">Паркоўка для ровараў у форме дрэва</string>
 	<string name="poi_bicycle_parking_streetpod">Адкрыты адсек</string>
 
 	<string name="poi_depth">Глыбіня</string>
@@ -2893,11 +2893,11 @@
 	<string name="poi_spoil_heap">Адвал пароды</string>
 	
 	<string name="poi_summer_camp">Дзіцячы летнік</string>
-	<string name="poi_recreation_center">Аздараўленчы цэнтар</string>
+	<string name="poi_recreation_center">Аздараўленчы цэнтр</string>
 
-	<string name="poi_crossing_activation_automatic">Кіраваньне пераездам: аўтаматычнае</string>
-	<string name="poi_crossing_activation_local">Кіраваньне пераездам: мясцовае</string>
-	<string name="poi_crossing_activation_remote">Кіраваньне пераездам: дыстанцыйнае</string>
+	<string name="poi_crossing_activation_automatic">Кіраванне пераездам: аўтаматычнае</string>
+	<string name="poi_crossing_activation_local">Кіраванне пераездам: мясцовае</string>
+	<string name="poi_crossing_activation_remote">Кіраванне пераездам: дыстанцыйнае</string>
 	<string name="poi_crossing_barrier_no">Бар\'ер на пераездзе: не</string>
 	<string name="poi_crossing_barrier_yes">Бар\'ер на пераездзе</string>
 	<string name="poi_crossing_barrier_full">Бар\'ер на пераездзе: поўны</string>
@@ -2905,39 +2905,39 @@
 	<string name="poi_crossing_barrier_double_half">Бар\'ер на пераездзе: падвойны палавінны</string>
 	<string name="poi_crossing_bell_yes">Гукавы сігнал ля пераезду</string>
 	<string name="poi_crossing_bell_no">Гукавы сігнал ля пераезду: не</string>
-	<string name="poi_crossing_light_yes">Сьвятлафор ля пераезду</string>
-	<string name="poi_crossing_light_no">Сьвятлафор ля пераезду: не</string>
-	<string name="poi_crossing_on_demand_yes">Пераезд па патрабаваньні</string>
-	<string name="poi_crossing_on_demand_no">Пераезд па патрабаваньні: не</string>
+	<string name="poi_crossing_light_yes">Святлафор ля пераезду</string>
+	<string name="poi_crossing_light_no">Святлафор ля пераезду: не</string>
+	<string name="poi_crossing_on_demand_yes">Пераезд па патрабаванні</string>
+	<string name="poi_crossing_on_demand_no">Пераезд па патрабаванні: не</string>
 	<string name="poi_crossing_saltire_yes">Знак ля пераезду</string>
 	<string name="poi_crossing_saltire_no">Знак ля пераезду: не</string>
-	<string name="poi_crossing_supervision_yes">Назіраньне за пераездам</string>
-	<string name="poi_crossing_supervision_no">Назіраньне за пераездам: адсутнічае</string>
-	<string name="poi_crossing_supervision_attendant">Назіраньне за пераездам: нагляд</string>
-	<string name="poi_crossing_supervision_camera">Назіраньне за пераездам: камэра</string>
+	<string name="poi_crossing_supervision_yes">Назіранне за пераездам</string>
+	<string name="poi_crossing_supervision_no">Назіранне за пераездам: адсутнічае</string>
+	<string name="poi_crossing_supervision_attendant">Назіранне за пераездам: нагляд</string>
+	<string name="poi_crossing_supervision_camera">Назіранне за пераездам: камера</string>
 
 	<string name="poi_dispensing_yes">Так</string>
 	<string name="poi_dispensing_no">Продаж лекаў па рэцэптах: не</string>
 
 	<string name="poi_aerodrome_type_international">Міжнародны</string>
 	<string name="poi_aerodrome_type_regional">Рэгіянальны</string>
-	<string name="poi_aerodrome_type_public">Грамадзкі</string>
+	<string name="poi_aerodrome_type_public">Грамадскі</string>
 	<string name="poi_aerodrome_type_military">Вайсковы</string>
-	<string name="poi_aerodrome_type_military_public">Вайсковы/грамадзкі</string>
+	<string name="poi_aerodrome_type_military_public">Вайсковы/грамадскі</string>
 	<string name="poi_aerodrome_type_private">Прыватны</string>
 
 	<string name="poi_valley_balka">Сухадол</string>
 
-	<string name="poi_ventilation_shaft">Вэнтыляцыйная шахта</string>
+	<string name="poi_ventilation_shaft">Вентыляцыйная шахта</string>
 
 	<string name="poi_pump_type_beam_pump">Тып помпы: станок-пампавалка</string>
 	<string name="poi_pump_type_india_mk_2_3">Тып помпы: India Mk II ці III</string>
-	<string name="poi_pump_type_gravity">Тып помпы: гравітацыйны</string>
-	<string name="poi_pump_style_modern">Стыль помпы: сучасны</string>
-	<string name="poi_pump_style_historic">Стыль помпы: гістарычны</string>
+	<string name="poi_pump_type_gravity">Тып помпы: гравітацыйная</string>
+	<string name="poi_pump_style_modern">Стыль помпы: сучасная</string>
+	<string name="poi_pump_style_historic">Стыль помпы: гістарычная</string>
 	<string name="poi_pump_status_ok">Стан помпы: працуе</string>
-	<string name="poi_pump_status_broken">Стан помпы: зламаны</string>
-	<string name="poi_pump_status_locked">Стан помпы: замкнёны</string>
+	<string name="poi_pump_status_broken">Стан помпы: зламаная</string>
+	<string name="poi_pump_status_locked">Стан помпы: замкнёная</string>
 
 	<string name="poi_payment_troika_yes">Тройка</string>
 	<string name="poi_payment_troika_no">Карткі Тройка не прымаюцца</string>
@@ -2946,53 +2946,53 @@
 	<string name="poi_telescope_type_optical">Аптычны</string>
 	<string name="poi_telescope_type_radio">Радыё</string>
 	<string name="poi_telescope_type_gamma">Гама</string>
-	<string name="poi_telescope_diameter">Дыямэтар</string>
-	<string name="poi_telescope_spectrum">Спэктр</string>
-	<string name="poi_telescope_usage_education">Прызначэньне: адукацыя</string>
-	<string name="poi_telescope_usage_espionage">Прызначэньне: шпіянаж</string>
-	<string name="poi_telescope_usage_research">Прызначэньне: дасьледаваньні</string>
+	<string name="poi_telescope_diameter">Дыяметр</string>
+	<string name="poi_telescope_spectrum">Спектр</string>
+	<string name="poi_telescope_usage_education">Прызначэнне: адукацыя</string>
+	<string name="poi_telescope_usage_espionage">Прызначэнне: шпіянаж</string>
+	<string name="poi_telescope_usage_research">Прызначэнне: даследаванні</string>
 
-	<string name="poi_observatory_type_espionage">Прызначэньне: шпіянаж</string>
-	<string name="poi_observatory_type_meteorological">Мэтэаралягічная</string>
+	<string name="poi_observatory_type_espionage">Прызначэнне: шпіянаж</string>
+	<string name="poi_observatory_type_meteorological">Метэаралагічная</string>
 	<string name="poi_observatory_type_gravitational">Гравітацыйная</string>
 
 	<string name="poi_greenhouse_horticulture">Парніковае садоўніцтва</string>
 
-	<string name="poi_voltage">Напружаньне</string>
-	<string name="poi_generator_output_electricity">Выходная магутнасьць</string>
-	<string name="poi_generator_output_electricity_yes">Выпрацоўвае электрычнасьць</string>
-	<string name="poi_generator_output_hot_water">Выходная магутнасьць гарачай вады</string>
+	<string name="poi_voltage">Напружанне</string>
+	<string name="poi_generator_output_electricity">Выходная магутнасць</string>
+	<string name="poi_generator_output_electricity_yes">Выпрацоўвае электрычнасць</string>
+	<string name="poi_generator_output_hot_water">Выходная магутнасць гарачай вады</string>
 	<string name="poi_generator_output_hot_water_yes">Выпрацоўвае гарачую ваду</string>
 	<string name="poi_generator_output_steam_yes">Выпрацоўвае пару</string>
 	<string name="poi_generator_output_hot_air_yes">Выпрацоўвае гарачае паветра</string>
-	<string name="poi_generator_output_cold_water_yes">Вырабляе: халодная вада</string>
-	<string name="poi_generator_output_compressed_air">Выходная магутнасьць сьціснутага паветра</string>
-	<string name="poi_generator_output_compressed_air_yes">Вырабляе: сьціснутае паветра</string>
-	<string name="poi_generator_output_vacuum_yes">Вырабляе: вакуум</string>
-	<string name="poi_generator_output_biogas">Выходная магутнасьць біягазу</string>
-	<string name="poi_generator_output_biogas_yes">Вырабляе: біягаз</string>
+	<string name="poi_generator_output_cold_water_yes">Выпрацоўвае: халодная вада</string>
+	<string name="poi_generator_output_compressed_air">Выходная магутнасць сціснутага паветра</string>
+	<string name="poi_generator_output_compressed_air_yes">Выпрацоўвае: сціснутае паветра</string>
+	<string name="poi_generator_output_vacuum_yes">Выпрацоўвае: вакуум</string>
+	<string name="poi_generator_output_biogas">Выходная магутнасць біягазу</string>
+	<string name="poi_generator_output_biogas_yes">Выпрацоўвае: біягаз</string>
 
 	<string name="poi_pumping_station">Помпавая станцыя</string>
 
-	<string name="poi_display_yes">Дысплей: ёсьць</string>
+	<string name="poi_display_yes">Дысплей: ёсць</string>
 	<string name="poi_display_no">Дысплей: адсутнічае</string>
 	<string name="poi_display_analog_yes">Аналагавы дысплей</string>
 	<string name="poi_display_digital_yes">Лічбавы дысплей</string>
-	<string name="poi_display_sundial_yes">Сонечны гадзіньнік</string>
+	<string name="poi_display_sundial_yes">Сонечны гадзіннік</string>
 
-	<string name="poi_barometer_yes">Баромэтар</string>
-	<string name="poi_barometer_no">Баромэтар: адсутнічае</string>
-	<string name="poi_thermometer_yes">Тэрмомэтар</string>
-	<string name="poi_thermometer_no">Тэрмомэтар: адсутнічае</string>
-	<string name="poi_hygrometer_yes">Гігромэтар</string>
-	<string name="poi_hygrometer_no">Гігромэтар: адсутнічае</string>
+	<string name="poi_barometer_yes">Барометр</string>
+	<string name="poi_barometer_no">Барометр: адсутнічае</string>
+	<string name="poi_thermometer_yes">Тэрмометр</string>
+	<string name="poi_thermometer_no">Тэрмометр: адсутнічае</string>
+	<string name="poi_hygrometer_yes">Гігрометр</string>
+	<string name="poi_hygrometer_no">Гігрометр: адсутнічае</string>
 	<string name="poi_date_yes">Паказ даты</string>
 	<string name="poi_date_no">Дата: не</string>
 
 	<string name="poi_support_pole">Апора: слуп</string>
-	<string name="poi_support_wall_mounted">Апора: сьцяна</string>
+	<string name="poi_support_wall_mounted">Апора: сцяна</string>
 	<string name="poi_support_tree">Апора: дрэва</string>
-	<string name="poi_support_pedestal">Апора: пастамэнт</string>
+	<string name="poi_support_pedestal">Апора: пастамент</string>
 	<string name="poi_support_ground">Апора: зямля</string>
 	<string name="poi_support_billboard">Апора: рэкламны шчыт</string>
 	<string name="poi_support_ceiling">Апора: столь</string>
@@ -3000,7 +3000,7 @@
 	<string name="poi_support_roof">Апора: дах</string>
 	<string name="poi_support_tower">Апора: вежа</string>
 
-	<string name="poi_passenger_information_display_yes">Інфармацыйны дысплей пасажыра: ёсьць</string>
+	<string name="poi_passenger_information_display_yes">Інфармацыйны дысплей пасажыра: ёсць</string>
 	<string name="poi_passenger_information_display_no">Інфармацыйны дысплей пасажыра: адсутнічае</string>
 
 	<string name="poi_aquaculture">Аквакультура</string>
@@ -3018,32 +3018,32 @@
 	<string name="poi_traffic_mirror">Дарожнае люстэрка</string>
 
 	<string name="poi_diplomatic_consulate">Консульства</string>
-	<string name="poi_diplomatic_consulate_general">Генэральнае консульства</string>
+	<string name="poi_diplomatic_consulate_general">Генеральнае консульства</string>
 	<string name="poi_diplomatic_honorary_consulate">Ганаровае консульства</string>
 	<string name="poi_diplomatic_permanent_mission">Сталае прадстаўніцтва</string>
 	<string name="poi_diplomatic_delegation">Дэлегацыя</string>
 	<string name="poi_diplomatic_ambassadors_residence">Рэзідэнцыя амбасадара</string>
 	<string name="poi_diplomatic_high_commission">Вярхоўны камісарыят</string>
 
-	<string name="poi_fire_operator">Пажарны апэратар</string>
+	<string name="poi_fire_operator">Пажарны аператар</string>
 
-	<string name="poi_diaper_table_count">Колькасьць пеленальных столікаў</string>
+	<string name="poi_diaper_table_count">Колькасць пеленальных столікаў</string>
 
-	<string name="poi_water_tank">Пажарны рэзэрвуар з вадой</string>
+	<string name="poi_water_tank">Пажарны рэзервуар з вадой</string>
 
 	<string name="poi_toilets_disposal_flush">Змываецца вадой</string>
 	<string name="poi_toilets_disposal_pitlatrine">Выграбная яма</string>
-	<string name="poi_toilets_disposal_bucket">Утылізацыя адыходаў: кантэйнэр</string>
+	<string name="poi_toilets_disposal_bucket">Утылізацыя адыходаў: кантэйнер</string>
 
 	<string name="poi_length">Даўжыня</string>
 
 <string name="poi_fuel_autogas">Аўтагаз</string>
-	<string name="poi_dolphin">Дэльфінарыюм</string>
+	<string name="poi_dolphin">Дэльфінарыум</string>
 
 	<string name="poi_seamark_dyke">Вадзяны знак: насып</string>
-	<string name="poi_content_wastewater">Зьмесьціва: сьцёкі</string>
+	<string name="poi_content_wastewater">Змесціва: сцёкі</string>
 	<string name="poi_fire_hydrant_position_green">Трава</string>
-	<string name="poi_wiki_link">Вікіпэдыя</string>
+	<string name="poi_wiki_link">Вікіпедыя</string>
 
 <string name="poi_toilets_disposal_chemical">Утылізацыя адыходаў: хімічная</string>
 	<string name="poi_nuclear_explosion_hole">Варонка выбуху</string>
@@ -3052,15 +3052,15 @@
 	<string name="poi_additional_type">Дадатковы</string>
 <string name="poi_payment_account_cards_yes">Рахункавыя карткі</string>
 	<string name="poi_payment_account_cards_no">Карткі не прымаюцца</string>
-	<string name="poi_spices">Крама з прыправамі</string>
+	<string name="poi_spices">Крама з заправамі</string>
 
 <string name="poi_denomination_uniting">Яднаючая Царква ў Аўстраліі</string>
-	<string name="poi_denomination_reform">Рэфармісцкі юдаізм</string>
+	<string name="poi_denomination_reform">Рэфарматарскі іудаізм</string>
 	<string name="poi_memorial_koshinto">Кашынта</string>
 	<string name="poi_service_bicycle_charging_no">Зарадка: не</string>
 
 <string name="poi_service_bicycle_charging_yes">Зарадка: ёсць</string>
-	<string name="poi_shop_craft">Тавары для рукадзельля</string>
+	<string name="poi_shop_craft">Тавары для рукадзелля</string>
 
 	<string name="poi_fuel_avia_type">Тып авіяцыйнага паліва</string>
 	<string name="poi_payment_fuel_type">Паліўныя карткі</string>
@@ -3070,15 +3070,15 @@
 	<string name="poi_clothes_type">Тып адзежы</string>
 	<string name="poi_shoes_type">Тып абутку</string>
 	<string name="poi_fire_hydrant_type">Тып</string>
-	<string name="poi_fire_hydrant_position">Разьмяшчэньне</string>
+	<string name="poi_fire_hydrant_position">Размяшчэнне</string>
 	<string name="poi_fire_hydrant_water_source">Крыніца вады</string>
 	<string name="poi_payment_toll_type">Тып аплаты</string>
 	<string name="poi_traffic_signals_sound">Гукавы сігнал</string>
 	<string name="poi_highway_crossing_type">Тып</string>
-	<string name="poi_tactile_paving">Тактыльнае пакрыцьцё</string>
+	<string name="poi_tactile_paving">Тактыльнае пакрыццё</string>
 	<string name="poi_service_general">Паслугі</string>
 	<string name="poi_brushless">Безкантактная</string>
-	<string name="poi_self_service">Самаабслугоўваньне</string>
+	<string name="poi_self_service">Самаабслугоўванне</string>
 	<string name="poi_parking_type">Тып</string>
 	<string name="poi_subway_station_filter">Станцыя метро</string>
 	<string name="poi_ferry_terminal_cargo">Груз</string>
@@ -3086,34 +3086,34 @@
 	<string name="poi_aerialway_bicycle">Правоз ровараў</string>
 	<string name="poi_aerialway_heating">Абагрэў</string>
 	<string name="poi_pump">Помпа</string>
-	<string name="poi_observatory_designation">Прызначэньне</string>
+	<string name="poi_observatory_designation">Прызначэнне</string>
 	<string name="poi_telescope_type">Тып</string>
 	<string name="poi_animal_training_type">Тып</string>
 	<string name="poi_embassy_type">Тып</string>
 	<string name="poi_city_capital">Сталіца</string>
 	<string name="poi_pharmacy_dispensing">Продаж лекаў па рэцэптам</string>
-	<string name="poi_healthcare_alternative_types">Спэцыялізацыя</string>
+	<string name="poi_healthcare_alternative_types">Спецыялізацыя</string>
 	<string name="poi_free_flying_characteristics">Характарыстыка</string>
 	<string name="poi_archaeological_site_type">Тып</string>
-	<string name="poi_star_rating">Колькасьць зорак</string>
+	<string name="poi_star_rating">Колькасць зорак</string>
 	<string name="poi_religion_type">Рэлігія</string>
 	<string name="poi_automated">Аўтаматызацыя</string>
 	<string name="poi_covered">Крыты</string>
-	<string name="poi_denomination">Веравызнаньне</string>
+	<string name="poi_denomination">Веравызнанне</string>
 	<string name="poi_information_type">Тып</string>
-	<string name="poi_information_contents">Зьмест</string>
+	<string name="poi_information_contents">Змест</string>
 	<string name="poi_clock_option">Дадаткова</string>
 	<string name="poi_scout_camp">Скаўцкі лагер</string>
 	<string name="poi_backcountry">Месца для лагера на прыродзе без выгод</string>
 	<string name="poi_resort_type">Тып</string>
-	<string name="poi_piste_difficulty">Складанасьць трасы</string>
-	<string name="poi_piste_grooming">Абслугоўваньне трасы</string>
+	<string name="poi_piste_difficulty">Складанасць трасы</string>
+	<string name="poi_piste_grooming">Абслугоўванне трасы</string>
 	<string name="poi_theatre_genre">Жанр</string>
 	<string name="poi_outdoor_seating">Месцы на адкрытым паветры</string>
 	<string name="poi_fee">Аплата</string>
-	<string name="poi_smoking">Паленьне</string>
+	<string name="poi_smoking">Паленне</string>
 	<string name="poi_delivery">Дастаўка</string>
-	<string name="poi_drive_in">Абслугоўваньне кліентаў, якія сядзяць у аўтамабілі</string>
+	<string name="poi_drive_in">Абслугоўванне кліентаў, якія сядзяць у аўтамабілі</string>
 	<string name="poi_drive_through">Абслугоўванне кліентаў, якія сядзяць у аўтамабілі</string>
 	<string name="poi_takeaway">На вынас</string>
 	<string name="poi_cocktails">Кактэйлі</string>
@@ -3122,19 +3122,19 @@
 	<string name="poi_recycling_type">Тып</string>
 	<string name="poi_recycling_accepted_waste">Прыманыя адыходы</string>
 	<string name="poi_shelter_type">Тып</string>
-	<string name="poi_fireplace">Месца для развядзеньня агню</string>
-	<string name="poi_seasonal">Сэзоннасьць</string>
+	<string name="poi_fireplace">Месца для развядзення агню</string>
+	<string name="poi_seasonal">Сезоннасць</string>
 	<string name="poi_water_characteristic">Характарыстыка вады</string>
 	<string name="poi_beach_surface_type">Паверхня</string>
 	<string name="poi_nudism">Нудызм</string>
-	<string name="poi_diet">Харчовыя абмежаваньні</string>
-	<string name="poi_health_specialty">Спэцыялізацыя</string>
-	<string name="poi_massage_type">Від масажу</string>
+	<string name="poi_diet">Харчовыя абмежаванні</string>
+	<string name="poi_health_specialty">Спецыялізацыя</string>
+	<string name="poi_massage_type">Тып масажу</string>
 	<string name="poi_tents">Усталёўка намётаў</string>
 	<string name="poi_washing_machine">Пральная машына</string>
 	<string name="poi_caravans">Аўтапрычэпы</string>
-	<string name="poi_power_supply">Крыніца сілкаваньня</string>
-	<string name="poi_medical_system">Мэдычная сыстэма</string>
+	<string name="poi_power_supply">Крыніца сілкавання</string>
+	<string name="poi_medical_system">Медыцынская сістэма</string>
 	<string name="poi_home_visit">Выезд на дом</string>
 	<string name="poi_dish">Стравы</string>
 	<string name="poi_payment_transport_type">Тып аплаты (транспарт)</string>
@@ -3147,12 +3147,12 @@
 <string name="poi_emergency_infrastructure">Аварыйная інфраструктура</string>
 	<string name="poi_waterway_fuel">Запраўная станцыя для лодак</string>
 	<string name="poi_wheelchair_accessibility">Даступна для інвалідных крэслаў</string>
-	<string name="poi_diet_vegetarian_filter_yes">Для вэгетарыянцаў</string>
-	<string name="poi_diet_vegan_filter_yes">Для вэганаў</string>
-	<string name="poi_diet_gluten_free_filter_yes">Безглютэнавае харчаваньне</string>
-	<string name="poi_diet_kosher_filter_yes">Кашэрнае харчаваньне</string>
+	<string name="poi_diet_vegetarian_filter_yes">Для вегетарыянцаў</string>
+	<string name="poi_diet_vegan_filter_yes">Для веганаў</string>
+	<string name="poi_diet_gluten_free_filter_yes">Безглютэнавае харчаванне</string>
+	<string name="poi_diet_kosher_filter_yes">Кашэрнае харчаванне</string>
 	<string name="poi_diet_halal_filter_yes">Халяль</string>
-	<string name="poi_diet_lactose_free_filter_yes">Безляктозныя прадукты</string>
+	<string name="poi_diet_lactose_free_filter_yes">Безлактозныя прадукты</string>
 	<string name="poi_takeaway_filter_yes">Так</string>
 	<string name="poi_delivery_filter_yes">Так</string>
 	<string name="poi_outdoor_seating_filter_yes">Так</string>
@@ -3164,17 +3164,17 @@
 	<string name="poi_xmas_shop">Калядная крама</string>
 	<string name="poi_xmas_shop_christmas_tree">Крама елак</string>
 	<string name="poi_xmas_tree">Калядная елка</string>
-	<string name="poi_xmas_day_date">Каляды: пачатак і сканчэньне падзеі</string>
+	<string name="poi_xmas_day_date">Каляды: пачатак і завяршэнне падзеі</string>
 	<string name="poi_xmas_note">Каляды: нататка</string>
 	<string name="poi_xmas_opening_hours">Каляды: гадзіны працы</string>
-	<string name="poi_xmas_location">Каляды: месца правядзеньня</string>
+	<string name="poi_xmas_location">Каляды: месца правядзення</string>
 	<string name="poi_xmas_url">Каляды: вэбсайт</string>
 
-	<string name="poi_public_bookcase">Грамадзкая кніжная шафа</string>
+	<string name="poi_public_bookcase">Грамадская кніжная шафа</string>
 	<string name="poi_cuisine_pizza">Піца</string>
 	<string name="poi_cuisine_burger">Бургер</string>
 	<string name="poi_cuisine_coffee">Кава</string>
-	<string name="poi_cuisine_sandwich">Сандвіч</string>
+	<string name="poi_cuisine_sandwich">Сэндвіч</string>
 	<string name="poi_cuisine_kebab">Кебаб</string>
 	<string name="poi_cuisine_doner">Донер кебаб (шаўрма)</string>
 	<string name="poi_cuisine_chicken">Курыца</string>
@@ -3182,12 +3182,12 @@
 	<string name="poi_cuisine_sushi">Сушы</string>
 	<string name="poi_cuisine_fish_and_chips">Рыба і чыпсы</string>
 	<string name="poi_cuisine_seafood">Морапрадукты</string>
-	<string name="poi_cuisine_barbecue">Барбэкю</string>
+	<string name="poi_cuisine_barbecue">Барбекю</string>
 	<string name="poi_cuisine_noodle">Локшына</string>
 	<string name="poi_cuisine_donut">Пончык</string>
 	<string name="poi_cuisine_ramen">Рамэн</string>
 	<string name="poi_cuisine_crepe">Блінцы</string>
-	<string name="poi_cuisine_breakfast">Сьняданак</string>
+	<string name="poi_cuisine_breakfast">Сняданак</string>
 	<string name="poi_cuisine_beef_bowl">Гюдон</string>
 	<string name="poi_cuisine_steak">Стэйк</string>
 	<string name="poi_cuisine_tapas">Тапас</string>
@@ -3195,15 +3195,15 @@
 	<string name="poi_cuisine_heuriger">Хойрыгер</string>
 	<string name="poi_cuisine_curry">Кары</string>
 	<string name="poi_cuisine_grill">Грыль</string>
-	<string name="poi_cuisine_sausage">Кілбаса</string>
+	<string name="poi_cuisine_sausage">Каўбаса</string>
 	<string name="poi_cuisine_cake">Пірожнае</string>
 	<string name="poi_cuisine_pancake">Бліны</string>
 	<string name="poi_cuisine_pasta">Макаронныя вырабы</string>
 	<string name="poi_cuisine_fast_food">Фастфуд</string>
 	<string name="poi_cuisine_juice">Сокі</string>
 	<string name="poi_cuisine_soba">Соба</string>
-	<string name="poi_cuisine_tea">Гарбара</string>
-	<string name="poi_cuisine_tea_shop">Гарбаты</string>
+	<string name="poi_cuisine_tea">Гарбата</string>
+	<string name="poi_cuisine_tea_shop">Гарбата</string>
 	<string name="poi_cuisine_soup">Супы</string>
 	<string name="poi_cuisine_pie">Пірагі</string>
 	<string name="poi_cuisine_hotdog">Хот-дог</string>
@@ -3216,11 +3216,11 @@
 	<string name="poi_cuisine_bakery">Булачная</string>
 	<string name="poi_cuisine_couscous">Кускус</string>
 	<string name="poi_cuisine_fried_chicken">Смажанае кураня</string>
-	<string name="poi_cuisine_dessert">Дэсэрт</string>
+	<string name="poi_cuisine_dessert">Дэсерт</string>
 	<string name="poi_cuisine_canteen">Сталовая</string>
 	<string name="poi_cuisine_tacos">Тако</string>
 	<string name="poi_cuisine_piadina">П\'ядзіна</string>
-	<string name="poi_cuisine_falafel">Фаляфель</string>
+	<string name="poi_cuisine_falafel">Фалафель</string>
 	<string name="poi_cuisine_smoothie">Смузі</string>
 	<string name="poi_cuisine_souvlaki">Суўлякі</string>
 	<string name="poi_cuisine_snack">Снэк</string>
@@ -3236,37 +3236,37 @@
 	<string name="poi_cuisine_meat">Мяса</string>
 	<string name="poi_cuisine_wings">Крыльцы</string>
 	<string name="poi_cuisine_waffle">Вафлі</string>
-	<string name="poi_cuisine_chocolate">Шакаляд</string>
+	<string name="poi_cuisine_chocolate">Шакалад</string>
 	<string name="poi_cuisine_wine">Віно</string>
 	<string name="poi_cuisine_potato">Бульба</string>
 	<string name="poi_cuisine_brunch">Бранч</string>
 	<string name="poi_cuisine_sub">Сэндвіч у форме падводнай лодкі</string>
 	<string name="poi_cuisine_pita">Піта</string>
 	<string name="poi_cuisine_fondue">Фандзю</string>
-	<string name="poi_cuisine_baguette">Французкі багет</string>
+	<string name="poi_cuisine_baguette">Французскі багет</string>
 	<string name="poi_cuisine_burrito">Бурыта</string>
 	<string name="poi_cuisine_teriyaki">Тэрыякі</string>
 	<string name="poi_cuisine_regional">Мясцовая</string>
 	<string name="poi_cuisine_italian">Італьянская</string>
 	<string name="poi_cuisine_chinese">Кітайская</string>
-	<string name="poi_cuisine_mexican">Мэксіканская</string>
+	<string name="poi_cuisine_mexican">Мексіканская</string>
 	<string name="poi_cuisine_japanese">Японская</string>
 	<string name="poi_cuisine_german">Нямецкая</string>
 	<string name="poi_cuisine_indian">Індыйская</string>
-	<string name="poi_cuisine_american">Амэрыканская</string>
+	<string name="poi_cuisine_american">Амерыканская</string>
 	<string name="poi_cuisine_asian">Азіяцкая</string>
-	<string name="poi_cuisine_french">Французкая</string>
-	<string name="poi_cuisine_greek">Грэцкая</string>
+	<string name="poi_cuisine_french">Французская</string>
+	<string name="poi_cuisine_greek">Грэчаская</string>
 	<string name="poi_cuisine_thai">Тайская</string>
 	<string name="poi_cuisine_international">Міжнародная</string>
 	<string name="poi_cuisine_turkish">Турэцкая</string>
-	<string name="poi_cuisine_spanish">Гішпанская</string>
+	<string name="poi_cuisine_spanish">Іспанская</string>
 	<string name="poi_cuisine_vietnamese">В\'етнамская</string>
 	<string name="poi_cuisine_korean">Карэйская</string>
 	<string name="poi_cuisine_mediterranean">Міжземнаморская</string>
 	<string name="poi_cuisine_bavarian">Баварская</string>
-	<string name="poi_cuisine_lebanese">Лібанская</string>
-	<string name="poi_cuisine_russian">Расейская</string>
+	<string name="poi_cuisine_lebanese">Ліванская</string>
+	<string name="poi_cuisine_russian">Расійская</string>
 	<string name="poi_cuisine_filipino">Філіпінская</string>
 	<string name="poi_cuisine_portuguese">Партугальская</string>
 	<string name="poi_cuisine_georgian">Грузінская</string>
@@ -3279,57 +3279,57 @@
 	<string name="poi_cuisine_caribbean">Карыбская</string>
 	<string name="poi_cuisine_argentinian">Аргенцінская</string>
 	<string name="poi_cuisine_balkan">Балканская</string>
-	<string name="poi_cuisine_peruvian">Пэруанская</string>
+	<string name="poi_cuisine_peruvian">Перуанская</string>
 	<string name="poi_cuisine_croatian">Харвацкая</string>
 	<string name="poi_cuisine_bolivian">Балівійская</string>
 	<string name="poi_cuisine_malagasy">Малагасійская</string>
-	<string name="poi_cuisine_persian">Пэрсідзкая</string>
+	<string name="poi_cuisine_persian">Персідская</string>
 	<string name="poi_cuisine_moroccan">Мараканская</string>
 	<string name="poi_cuisine_austrian">Аўстрыйская</string>
 	<string name="poi_cuisine_malaysian">Малазійская</string>
-	<string name="poi_cuisine_irish">Ірляндзкая</string>
-	<string name="poi_cuisine_ethiopian">Эфіёпская</string>
-	<string name="poi_cuisine_hungarian">Вугорская</string>
+	<string name="poi_cuisine_irish">Ірландская</string>
+	<string name="poi_cuisine_ethiopian">Эфіопская</string>
+	<string name="poi_cuisine_hungarian">Венгерская</string>
 	<string name="poi_cuisine_lao">Лаоская</string>
-	<string name="poi_cuisine_european">Эўрапейская</string>
+	<string name="poi_cuisine_european">Еўрапейская</string>
 	<string name="poi_cuisine_uzbek">Узбекская</string>
-	<string name="poi_cuisine_czech">Чэская</string>
+	<string name="poi_cuisine_czech">Чэшская</string>
 	<string name="poi_cuisine_cuban">Кубінская</string>
 	<string name="poi_cuisine_british">Брытанская</string>
-	<string name="poi_cuisine_latin_american">Лацінаамэрыканская</string>
-	<string name="poi_cuisine_nepalese">Нэпальская</string>
+	<string name="poi_cuisine_latin_american">Лацінаамерыканская</string>
+	<string name="poi_cuisine_nepalese">Непальская</string>
 	<string name="poi_cuisine_mongolian">Мангольская</string>
 	<string name="poi_cuisine_middle_eastern">Блізкаўсходняя</string>
 	<string name="poi_cuisine_ukrainian">Украінская</string>
 	<string name="poi_cuisine_afghan">Афганская</string>
-	<string name="poi_cuisine_belgian">Бэльгійская</string>
-	<string name="poi_cuisine_basque">Баскская</string>
-	<string name="poi_cuisine_swiss">Швайцарская</string>
+	<string name="poi_cuisine_belgian">Бельгійская</string>
+	<string name="poi_cuisine_basque">Басконская</string>
+	<string name="poi_cuisine_swiss">Швейцарская</string>
 	<string name="poi_cuisine_cantonese">Кантонская</string>
-	<string name="poi_cuisine_swedish">Швэдзкая</string>
+	<string name="poi_cuisine_swedish">Шведская</string>
 	<string name="poi_cuisine_jamaican">Ямайская</string>
 	<string name="poi_cuisine_armenian">Армянская</string>
 	<string name="poi_cuisine_hawaiian">Гавайская</string>
-	<string name="poi_cuisine_english">Ангельская</string>
+	<string name="poi_cuisine_english">Англійская</string>
 	<string name="poi_cuisine_pakistani">Пакістанская</string>
 	<string name="poi_cuisine_taiwanese">Тайваньская</string>
 	<string name="poi_cuisine_tex_mex">Тэкс-мэкс</string>
-	<string name="poi_cuisine_dutch">Нідэрляндзкая</string>
+	<string name="poi_cuisine_dutch">Галандская</string>
 	<string name="poi_cuisine_syrian">Сірыйская</string>
 	<string name="poi_cuisine_australian">Аўстралійская</string>
 	<string name="poi_cuisine_cajun">Кэйджн</string>
 	<string name="poi_cuisine_egyptian">Егіпецкая</string>
-	<string name="poi_cuisine_senegalese">Сэнэгальская</string>
+	<string name="poi_cuisine_senegalese">Сенегальская</string>
 	<string name="poi_cuisine_jewish">Жыдоўская</string>
-	<string name="poi_cuisine_bulgarian">Баўгарская</string>
+	<string name="poi_cuisine_bulgarian">Балгарская</string>
 	<string name="poi_cuisine_tibetan">Тыбецкая</string>
 
-	<string name="poi_feeding_place">Месца для кармленьня жывёл</string>
+	<string name="poi_feeding_place">Месца для кармлення жывёл</string>
 
-	<string name="poi_party">Тавары для сьвята</string>
+	<string name="poi_party">Тавары для свята</string>
 	<string name="poi_electrical">Электратавары</string>
 	<string name="poi_locksmith">Замкі і ключы</string>
-	<string name="poi_lighting">Асьвятляльныя прыборы</string>
+	<string name="poi_lighting">Асвятляльныя прыборы</string>
 	<string name="poi_lottery">Латарэйныя квіткі</string>
 	<string name="poi_gambling">Месца для азартных гульняў</string>
 
@@ -3341,17 +3341,17 @@
 
 	<string name="poi_e_cigarette">Электронныя цыгарэты</string>
 
-	<string name="poi_locomotive">Лякаматыў</string>
+	<string name="poi_locomotive">Лакаматыў</string>
 
 	<string name="poi_nutrition_supplements">Харчовыя дадаткі</string>
 	<string name="poi_photo_studio">Фотастудыя</string>
 
-<string name="poi_nuclear_explosion_salvo_first_detonation">Сэрыя выбухаў: першая дэтанацыя</string>
-	<string name="poi_nuclear_explosion_salvo_second_or_later_detonation">Сэрыя выбухаў: другая або пазьнейшая дэтанацыя</string>
+<string name="poi_nuclear_explosion_salvo_first_detonation">Серыя выбухаў: першая дэтанацыя</string>
+	<string name="poi_nuclear_explosion_salvo_second_or_later_detonation">Серыя выбухаў: другая або пазнейшая дэтанацыя</string>
 	<string name="poi_public_bookcase_type_reading_box">Тып: шафа з кнігамі</string>
 	<string name="poi_public_bookcase_type_phone_box">Тып: тэлефонная будка</string>
 	<string name="poi_public_bookcase_type_wooden_cabinet">Тып: драўляная шафа</string>
-	<string name="poi_public_bookcase_type_metal_cabinet">Тып: мэталічная шафа</string>
+	<string name="poi_public_bookcase_type_metal_cabinet">Тып: металічная шафа</string>
 	<string name="poi_public_bookcase_type_shelf">Тып: паліца</string>
 
 	<string name="poi_animal_keeping_type_open_stable">Стайня адкрытага тыпу</string>
@@ -3359,11 +3359,11 @@
 <string name="poi_animal_keeping_type_paddock">Тып: загон</string>
 	<string name="poi_animal_keeping_sheep">Для авечак</string>
 	<string name="poi_animal_keeping_horse">Для коней</string>
-	<string name="poi_animal_keeping">Месца ўтрыманьня жывёл</string>
+	<string name="poi_animal_keeping">Месца ўтрымання жывёл</string>
 	<string name="poi_cliff">Стромая скала</string>
 
 	<string name="poi_cuisine_bagel">Байгель</string>
-	<string name="poi_cuisine_diner">Дайнэр</string>
+	<string name="poi_cuisine_diner">Дайнер</string>
 	<string name="poi_cuisine_shawarma">Шавэрма</string>
 
 	<string name="poi_tower_construction_lattice">Канструкцыя: рашэцістая</string>
@@ -3377,7 +3377,7 @@
 <string name="poi_coworking_space">Каворкінг</string>
 
 <string name="poi_fire_hydrant_type_dry_barrel">Наземны сухі</string>
-	<string name="poi_counselling_type_nutrition_nfire_hydo">Кансультацыя па пытаньнях харчаваньня: не</string>
+	<string name="poi_counselling_type_nutrition_nfire_hydo">Кансультацыя па пытаннях харчавання: не</string>
 	<string name="poi_fire_hydrant_position_lane">Паласа руху</string>
 	<string name="poi_fire_hydrant_style_wsh">Дызайн гідранта: wsh</string>
 	<string name="poi_cuisine_buschenschank">Buschenschank (вытанчаныя аўстрыйскія віны)</string>
@@ -3394,7 +3394,7 @@
 	<string name="poi_drink_wine_retail">Віно: продаж</string>
 	<string name="poi_drink_wine_served">Віно: дэгустацыя</string>
 
-<string name="poi_energy_supplier">Офіс пастаўніка энергіі</string>
+<string name="poi_energy_supplier">Офіс пастаўшчыка энергіі</string>
 
 <string name="poi_electronics_repair_computer">Рамонт электронікі: кампутары</string>
 	<string name="poi_electronics_repair_appliance">Рамонт электронікі: бытавая тэхніка</string>
@@ -3425,8 +3425,8 @@
 
 <string name="poi_motorcycle_sales_yes">Продаж</string>
 	<string name="poi_motorcycle_sales_no">Продаж: не</string>
-	<string name="poi_motorcycle_sales_yes_used">Продаж: так, ужывалыя</string>
-	<string name="poi_motorcycle_sales_used">Продаж: ужывалыя</string>
+	<string name="poi_motorcycle_sales_yes_used">Продаж: так, ужываныя</string>
+	<string name="poi_motorcycle_sales_used">Продаж: ужываныя</string>
 	<string name="poi_motorcycle_rental_yes">Арэнда</string>
 	<string name="poi_motorcycle_rental_no">Арэнда: не</string>
 	<string name="poi_motorcycle_repair_yes">Рамонт</string>
@@ -3438,7 +3438,7 @@
 	<string name="poi_motorcycle_clothes_yes">Матацыклетная адзежа</string>
 	<string name="poi_motorcycle_clothes_no">Матацыклетная адзежа: не</string>
 	<string name="poi_motorcycle_type_scooter">Скутэр</string>
-	<string name="poi_motorcycle_type_sportbike">Спартыўныя</string>
+	<string name="poi_motorcycle_type_sportbike">Спартовыя</string>
 	<string name="poi_motorcycle_type_chopper">Чоперы</string>
 	<string name="poi_motorcycle_type_offroad">Пазадарожныя</string>
 	<string name="poi_motorcycle_type_dualsport">Двайнога прызначэння</string>
@@ -3465,7 +3465,7 @@
 	<string name="poi_spaceport">Касмадром</string>
 
 <string name="poi_direction_n">Напрамак: поўнач</string>
-	<string name="poi_direction_nne">Напрамак: паўночна-паўночны ўсход</string>
+	<string name="poi_direction_nne">Напрамак: поўнач-паўночны ўсход</string>
 	<string name="poi_direction_ne">Напрамак: паўночны ўсход</string>
 	<string name="poi_direction_ene">Напрамак: усходне-паўночны ўсход</string>
 	<string name="poi_direction_e">Напрамак: усход</string>
@@ -3514,7 +3514,7 @@
 	<string name="poi_boat_sailboat_rental_yes">Ветразнікі: так</string>
 	<string name="poi_boat_sailboat_rental_no">Ветразнікі: не</string>
 	<string name="poi_boat_dinghy_rental_rental_yes">Шлюпкі: так</string>
-	<string name="poi_boat_dinghy_rental_rental_no">Шлюркі: не</string>
+	<string name="poi_boat_dinghy_rental_rental_no">Шлюпкі: не</string>
 	<string name="poi_boat_kayak_rental_rental_yes">Каякі: так</string>
 	<string name="poi_boat_kayak_rental_rental_no">Каякі: не</string>
 	<string name="poi_boat_canoe_rental_rental_yes">Каноэ: так</string>
@@ -3545,22 +3545,22 @@
 	<string name="poi_surface_clay">Гліна</string>
 	<string name="poi_surface_tartan">Тартан</string>
 	<string name="poi_surface_artificial_turf">Штучная трава</string>
-	<string name="poi_surface_decoturf">Дэкараратыўны дзёран</string>
+	<string name="poi_surface_decoturf">Дэкараратыўны дзёрн</string>
 	<string name="poi_surface_metal_grid">Металічная сетка</string>
 
-<string name="poi_location_underground">Знаходжанне: пад зямлёй</string>
-	<string name="poi_location_underwater">Знаходжанне: пад вадой</string>
-	<string name="poi_location_overground">Знаходжанне: над зямлёй</string>
-	<string name="poi_location_overhead">Знаходжанне: зверху</string>
-	<string name="poi_location_roof">Знаходжанне: дах</string>
-	<string name="poi_location_rooftop">Знаходжанне: на даху</string>
-	<string name="poi_location_outdoor">Знаходжанне: на адкрытым паветры</string>
-	<string name="poi_location_indoor">Знаходжанне: у памяшканні</string>
-	<string name="poi_location_platform">Знаходжанне: на пратформе</string>
-	<string name="poi_location_kiosk">Знаходжанне: шапік</string>
-	<string name="poi_location_bridge">Знаходжанне: на мосце</string>
-	<string name="poi_location_wall">Знаходжанне: на сцяне</string>
-	<string name="poi_location_entrance">Знаходжанне: каля ўвахода</string>
+<string name="poi_location_underground">Размяшчэнне: пад зямлёй</string>
+	<string name="poi_location_underwater">Размяшчэнне: пад вадой</string>
+	<string name="poi_location_overground">Размяшчэнне: над зямлёй</string>
+	<string name="poi_location_overhead">Размяшчэнне: зверху</string>
+	<string name="poi_location_roof">Размяшчэнне: дах</string>
+	<string name="poi_location_rooftop">Размяшчэнне: на даху</string>
+	<string name="poi_location_outdoor">Размяшчэнне: на адкрытым паветры</string>
+	<string name="poi_location_indoor">Размяшчэнне: у памяшканні</string>
+	<string name="poi_location_platform">Размяшчэнне: на пратформе</string>
+	<string name="poi_location_kiosk">Размяшчэнне: шапік</string>
+	<string name="poi_location_bridge">Размяшчэнне: на мосце</string>
+	<string name="poi_location_wall">Размяшчэнне: на сцяне</string>
+	<string name="poi_location_entrance">Размяшчэнне: каля ўвахода</string>
 
 	<string name="poi_visibility_house">Бачнасць: дом</string>
 	<string name="poi_visibility_street">Бачнасць: вуліца</string>
@@ -3598,69 +3598,69 @@
 	<string name="poi_water_place_access_family">Сям\'я</string>
 	<string name="poi_water_place_access_multifamilies">Некалькі сямей</string>
 
-<string name="poi_socket_cee_blue">Раздым: CEE blue</string>
-	<string name="poi_socket_cee_blue_current">Раздым: CEE blue: ток</string>
-	<string name="poi_socket_cee_blue_output">Раздым: CEE blue: магутнасць</string>
-	<string name="poi_socket_cee_red_16a">Раздым: CEE red 16А</string>
-	<string name="poi_socket_cee_red_16a_current">Раздым: CEE red 16А: ток</string>
-	<string name="poi_socket_cee_red_16a_output">Раздым: CEE red 16А: магутнасць</string>
-	<string name="poi_socket_cee_red_32a">Раздым: CEE red 32А</string>
-	<string name="poi_socket_cee_red_32a_current">Раздым: CEE red 32А: ток</string>
-	<string name="poi_socket_cee_red_32a_output">Раздым: CEE red 32А: магутнасць</string>
-	<string name="poi_socket_cee_red_64a">Раздым: CEE red 64А</string>
-	<string name="poi_socket_cee_red_64a_current">Раздым: CEE red 64А: ток</string>
-	<string name="poi_socket_cee_red_64a_output">Раздым: CEE red 64А: магутнасць</string>
-	<string name="poi_socket_cee_red_125a">Раздым: CEE red 125А</string>
-	<string name="poi_socket_cee_red_125a_current">Раздым: CEE red 125А: ток</string>
-	<string name="poi_socket_cee_red_125a_output">Раздым: CEE red 125А: магутнасць</string>
-	<string name="poi_socket_type1">Раздым: Type 1</string>
-	<string name="poi_socket_type1_current">Раздым: Type 1: ток</string>
-	<string name="poi_socket_type1_output">Раздым: Type 1: магутнасць</string>
-	<string name="poi_socket_type1_combo">Раздым: Type 1 combo</string>
-	<string name="poi_socket_type1_combo_current">Раздым: Type 1 combo: ток</string>
-	<string name="poi_socket_type1_combo_output">Раздым: Type 1 combo: магутнасць</string>
-	<string name="poi_socket_type2">Раздым: Type 2</string>
-	<string name="poi_socket_type2_current">Раздым: Type 2: ток</string>
-	<string name="poi_socket_type2_output">Раздым: Type 2: магутнасць</string>
-	<string name="poi_socket_type2_combo">Раздым: Type 2 combo</string>
-	<string name="poi_socket_type2_combo_current">Раздым: Type 2 combo: ток</string>
-	<string name="poi_socket_type2_combo_output">Раздым: Type 2 combo: магутнасць</string>
-	<string name="poi_socket_type3">Раздым: Type 3</string>
-	<string name="poi_socket_type3_current">Раздым: Type 3: ток</string>
-	<string name="poi_socket_type3_output">Раздым: Type 3: магутнасць</string>
-	<string name="poi_socket_chademo">Раздым: CHAdeMO</string>
-	<string name="poi_socket_chademo_current">Раздым: CHAdeMO: ток</string>
-	<string name="poi_socket_chademo_output">Раздым: CHAdeMO: магутнасць</string>
-	<string name="poi_socket_tesla_standard">Раздым: Tesla standard</string>
-	<string name="poi_socket_tesla_standard_current">Раздым: Tesla standard: ток</string>
-	<string name="poi_socket_tesla_standard_output">Раздым: Tesla standard: магутнасць</string>
-	<string name="poi_socket_tesla_supercharger">Раздым: Tesla Supercharger</string>
-	<string name="poi_socket_tesla_supercharger_current">Раздым: Tesla Supercharger: ток</string>
-	<string name="poi_socket_tesla_supercharger_output">Раздым: Tesla Supercharger: магутнасць</string>
-	<string name="poi_socket_tesla_roadster">Раздым: Tesla Roadster</string>
-	<string name="poi_socket_tesla_roadster_current">Раздым: Tesla Roadster: ток</string>
-	<string name="poi_socket_tesla_roadster_output">Раздым: Tesla Roadster: магутнасць</string>
-	<string name="poi_socket_nema_5_15">Раздым: NEMA 5-15R</string>
-	<string name="poi_socket_nema_5_15_current">Раздым: NEMA 5-15R: ток</string>
-	<string name="poi_socket_nema_5_15_output">Раздым: NEMA 5-15R: магутнасць</string>
-	<string name="poi_socket_nema_5_20">Раздым: NEMA 5-20</string>
-	<string name="poi_socket_nema_5_20_current">Раздым: NEMA 5-20: ток</string>
-	<string name="poi_socket_nema_5_20_output">Раздым: NEMA 5-20: магутнасць</string>
-	<string name="poi_socket_nema_14_30">Раздым: NEMA 14-30</string>
-	<string name="poi_socket_nema_14_30_current">Раздым: NEMA 14-30: ток</string>
-	<string name="poi_socket_nema_14_30_output">Раздым: NEMA 14-30: магутнасць</string>
-	<string name="poi_socket_nema_14_50">Раздым: NEMA 14-50</string>
-	<string name="poi_socket_nema_14_50_current">Раздым: NEMA 14-50: ток</string>
-	<string name="poi_socket_nema_14_50_output">Раздым: NEMA 14-50: магутнасць</string>
-	<string name="poi_socket_schuko">Раздым: Schuko</string>
-	<string name="poi_socket_schuko_current">Раздым: Schuko: ток</string>
-	<string name="poi_socket_schuko_output">Раздым: Schuko: магутнасць</string>
-	<string name="poi_socket_bs1363">Раздым: BS 1363</string>
-	<string name="poi_socket_bs1363_current">Раздым: BS 1363: ток</string>
-	<string name="poi_socket_bs1363_output">Раздым: BS 1363: магутнасць</string>
-	<string name="poi_socket_as3112">Раздым: AS/NZS 3112</string>
-	<string name="poi_socket_as3112_current">Раздым: AS/NZS 3112: ток</string>
-	<string name="poi_socket_as3112_output">Раздым: AS/NZS 3112: магутнасць</string>
+<string name="poi_socket_cee_blue">Разетка: CEE blue</string>
+	<string name="poi_socket_cee_blue_current">Разетка: CEE blue: ток</string>
+	<string name="poi_socket_cee_blue_output">Разетка: CEE blue: магутнасць</string>
+	<string name="poi_socket_cee_red_16a">Разетка: CEE red 16А</string>
+	<string name="poi_socket_cee_red_16a_current">Разетка: CEE red 16А: ток</string>
+	<string name="poi_socket_cee_red_16a_output">Разетка: CEE red 16А: магутнасць</string>
+	<string name="poi_socket_cee_red_32a">Разетка: CEE red 32А</string>
+	<string name="poi_socket_cee_red_32a_current">Разетка: CEE red 32А: ток</string>
+	<string name="poi_socket_cee_red_32a_output">Разетка: CEE red 32А: магутнасць</string>
+	<string name="poi_socket_cee_red_64a">Разетка: CEE red 64А</string>
+	<string name="poi_socket_cee_red_64a_current">Разетка: CEE red 64А: ток</string>
+	<string name="poi_socket_cee_red_64a_output">Разетка: CEE red 64А: магутнасць</string>
+	<string name="poi_socket_cee_red_125a">Разетка: CEE red 125А</string>
+	<string name="poi_socket_cee_red_125a_current">Разетка: CEE red 125А: ток</string>
+	<string name="poi_socket_cee_red_125a_output">Разетка: CEE red 125А: магутнасць</string>
+	<string name="poi_socket_type1">Разетка: Type 1</string>
+	<string name="poi_socket_type1_current">Разетка: Type 1: ток</string>
+	<string name="poi_socket_type1_output">Разетка: Type 1: магутнасць</string>
+	<string name="poi_socket_type1_combo">Разетка: Type 1 combo</string>
+	<string name="poi_socket_type1_combo_current">Разетка: Type 1 combo: ток</string>
+	<string name="poi_socket_type1_combo_output">Разетка: Type 1 combo: магутнасць</string>
+	<string name="poi_socket_type2">Разетка: Type 2</string>
+	<string name="poi_socket_type2_current">Разетка: Type 2: ток</string>
+	<string name="poi_socket_type2_output">Разетка: Type 2: магутнасць</string>
+	<string name="poi_socket_type2_combo">Разетка: Type 2 combo</string>
+	<string name="poi_socket_type2_combo_current">Разетка: Type 2 combo: ток</string>
+	<string name="poi_socket_type2_combo_output">Разетка: Type 2 combo: магутнасць</string>
+	<string name="poi_socket_type3">Разетка: Type 3</string>
+	<string name="poi_socket_type3_current">Разетка: Type 3: ток</string>
+	<string name="poi_socket_type3_output">Разетка: Type 3: магутнасць</string>
+	<string name="poi_socket_chademo">Разетка: CHAdeMO</string>
+	<string name="poi_socket_chademo_current">Разетка: CHAdeMO: ток</string>
+	<string name="poi_socket_chademo_output">Разетка: CHAdeMO: магутнасць</string>
+	<string name="poi_socket_tesla_standard">Разетка: Tesla standard</string>
+	<string name="poi_socket_tesla_standard_current">Разетка: Tesla standard: ток</string>
+	<string name="poi_socket_tesla_standard_output">Разетка: Tesla standard: магутнасць</string>
+	<string name="poi_socket_tesla_supercharger">Разетка: Tesla Supercharger</string>
+	<string name="poi_socket_tesla_supercharger_current">Разетка: Tesla Supercharger: ток</string>
+	<string name="poi_socket_tesla_supercharger_output">Разетка: Tesla Supercharger: магутнасць</string>
+	<string name="poi_socket_tesla_roadster">Разетка: Tesla Roadster</string>
+	<string name="poi_socket_tesla_roadster_current">Разетка: Tesla Roadster: ток</string>
+	<string name="poi_socket_tesla_roadster_output">Разетка: Tesla Roadster: магутнасць</string>
+	<string name="poi_socket_nema_5_15">Разетка: NEMA 5-15R</string>
+	<string name="poi_socket_nema_5_15_current">Разетка: NEMA 5-15R: ток</string>
+	<string name="poi_socket_nema_5_15_output">Разетка: NEMA 5-15R: магутнасць</string>
+	<string name="poi_socket_nema_5_20">Разетка: NEMA 5-20</string>
+	<string name="poi_socket_nema_5_20_current">Разетка: NEMA 5-20: ток</string>
+	<string name="poi_socket_nema_5_20_output">Разетка: NEMA 5-20: магутнасць</string>
+	<string name="poi_socket_nema_14_30">Разетка: NEMA 14-30</string>
+	<string name="poi_socket_nema_14_30_current">Разетка: NEMA 14-30: ток</string>
+	<string name="poi_socket_nema_14_30_output">Разетка: NEMA 14-30: магутнасць</string>
+	<string name="poi_socket_nema_14_50">Разетка: NEMA 14-50</string>
+	<string name="poi_socket_nema_14_50_current">Разетка: NEMA 14-50: ток</string>
+	<string name="poi_socket_nema_14_50_output">Разетка: NEMA 14-50: магутнасць</string>
+	<string name="poi_socket_schuko">Разетка: Schuko</string>
+	<string name="poi_socket_schuko_current">Разетка: Schuko: ток</string>
+	<string name="poi_socket_schuko_output">Разетка: Schuko: магутнасць</string>
+	<string name="poi_socket_bs1363">Разетка: BS 1363</string>
+	<string name="poi_socket_bs1363_current">Разетка: BS 1363: ток</string>
+	<string name="poi_socket_bs1363_output">Разетка: BS 1363: магутнасць</string>
+	<string name="poi_socket_as3112">Разетка: AS/NZS 3112</string>
+	<string name="poi_socket_as3112_current">Разетка: AS/NZS 3112: ток</string>
+	<string name="poi_socket_as3112_output">Разетка: AS/NZS 3112: магутнасць</string>
 
 	<string name="poi_car_yes">Аўтамабіль: так</string>
 	<string name="poi_car_no">Аўтамабіль: не</string>
@@ -3704,8 +3704,8 @@
 
 <string name="poi_ref_post">Паштовы індэкс</string>
 
-	<string name="poi_climbing_sport_yes">Спартыўны: так</string>
-	<string name="poi_climbing_sport_no">Спартыўны: не</string>
+	<string name="poi_climbing_sport_yes">Спартовы: так</string>
+	<string name="poi_climbing_sport_no">Спартовы: не</string>
 	<string name="poi_climbing_boulder_yes">Боулдэрынг: так</string>
 	<string name="poi_climbing_boulder_no">Боулдэрынг: не</string>
 	<string name="poi_climbing_toprope_yes">Вяроўка з вяршыні: так</string>
@@ -3767,7 +3767,7 @@
 	<string name="poi_cannabis">Крама канопляў</string>
 
 
-	<string name="poi_socket">Раздым</string>
+	<string name="poi_socket">Штэкер</string>
 
 <string name="poi_socket_cee_blue_yes">CEE блакітны</string>
 	<string name="poi_socket_cee_red_16a_yes">CEE чырвоны 16A</string>
@@ -3837,7 +3837,7 @@
 <string name="poi_service_car">Аўтасэрвіс</string>
 
 <string name="poi_service_vehicle_car_repair_yes">Аўтамайстэрня</string>
-	<string name="poi_service_vehicle_oil_change_yes">Змена алівы</string>
+	<string name="poi_service_vehicle_oil_change_yes">Замена алівы</string>
 	<string name="poi_service_vehicle_used_car_sales_yes">Продаж патрыманых аўтамабіляў</string>
 	<string name="poi_service_vehicle_brakes_yes">Тармазы</string>
 	<string name="poi_service_vehicle_new_car_sales_yes">Продаж новых аўтамабіляў</string>
@@ -3867,7 +3867,7 @@
 
 <string name="poi_glacier_type">Тып лядніка</string>
 
-<string name="poi_glacier_type_icecap">Ледніковая покрыва</string>
+<string name="poi_glacier_type_icecap">Ледніковае покрыва</string>
 	<string name="poi_glacier_type_icefield">Ледніковае поле</string>
 	<string name="poi_glacier_type_plateau">Пласкагор\'е</string>
 	<string name="poi_glacier_type_valley">Даліна</string>
@@ -3884,7 +3884,7 @@
 	<string name="poi_glacier_ele_bottom">Ніжэйшая кропка</string>
 	<string name="poi_glacier_slope">Сярэдні ўхіл</string>
 
-<string name="poi_checkpoint_type">Тып кантрольнага пункта</string>
+<string name="poi_checkpoint_type">Тып кантрольнага пункту</string>
 
 <string name="poi_checkpoint_hiking">Пешаходны кантрольны пункт</string>
 	<string name="poi_checkpoint_type_stamp">Пункт штампоўкі</string>
@@ -3905,7 +3905,7 @@
 <string name="poi_payment_contactless_yes">Безкантактная</string>
 	<string name="poi_payment_contactless_no">Безкантактная аплата не прымаецца</string>
 
-<string name="poi_hazard_nuclear">Ядзерная небяспека</string>
+<string name="poi_hazard_nuclear">Радыяцыйная небяспека</string>
 	<string name="poi_hazard_erosion">Небяспека эрозіі</string>
 	<string name="poi_hazard_avalanche">Небяспека лавіны</string>
 	<string name="poi_hazard_slippery_road">Слізкая дарога</string>
@@ -3924,4 +3924,42 @@
 <string name="poi_atm">Банкамат</string>
 	<string name="poi_shoe_repair">Рамонт абутку</string>
 
-</resources>
+<string name="poi_bulk_purchase">Аптовая купля</string>
+	<string name="poi_substation_type">Тып</string>
+
+<string name="poi_bulk_purchase_yes">Так</string>
+	<string name="poi_bulk_purchase_only">Толькі</string>
+
+	<string name="poi_pipeline_substation">Трубаправодная падстанцыя</string>
+	<string name="poi_substation_transmission">Перадавальная</string>
+	<string name="poi_substation_distribution">Размеркавальная</string>
+	<string name="poi_substation_minor_distribution">Лакальна размеркавальная</string>
+	<string name="poi_substation_industrial">Прамысловая</string>
+	<string name="poi_substation_transition">Пераходная</string>
+	<string name="poi_substation_traction">Цягавая</string>
+	<string name="poi_substation_converter">Пераўтваральная</string>
+	<string name="poi_substation_compensation">Кампенсавальная</string>
+
+	<string name="poi_substation_compression">Кампрэсійная</string>
+	<string name="poi_substation_measurement">Вымяральная</string>
+	<string name="poi_substation_valve">Клапан</string>
+	<string name="poi_substation_valve_group">Група клапанаў</string>
+	<string name="poi_substation_inspection_gauge">Кантрольна-вымяральная</string>
+	<string name="poi_substation_field_gathering">Збіральная</string>
+    <string name="poi_craft_confectionery">Кандытарская вытворчасць</string>
+    <string name="poi_shop_wholesale">Аптовы склад</string>
+    <string name="poi_books_type">Кнігі</string>
+    <string name="poi_laboratory">Медыцынская лабараторыя</string>
+    <string name="poi_blood_donation">Здача крыві</string>
+    <string name="poi_books_comic">Коміксы</string>
+    <string name="poi_books_antiquarian">Антыкварыят</string>
+    <string name="poi_books_religion">Рэлігіёзныя</string>
+    <string name="poi_books_academic">Акадэмічныя</string>
+    <string name="poi_books_children">Дзіцячыя</string>
+    <string name="poi_atoll">Атол</string>
+    <string name="poi_toll_gantry">Рамка аплаты</string>
+    <string name="poi_childcare">Догляд за дзецьмі</string>
+    <string name="poi_denotation">Абазначэнне</string>
+    <string name="poi_denotation_natural_monument">Помнік прыроды</string>
+    <string name="poi_denotation_landmark">Арыенцір</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index b06896a1a7..c8c1695e81 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -1,51 +1,51 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="auto_zoom_none">Без аўтаматычнага маштабавання</string>
     <string name="auto_zoom_close">Буйней</string>
     <string name="auto_zoom_far">Для сярэдняга маштабу</string>
     <string name="auto_zoom_farthest">Драбней</string>
     <string name="map_magnifier">Лупа мапы</string>
-    <string name="base_world_map">Асноўная мапа сьвету</string>
+    <string name="base_world_map">Асноўная мапа свету</string>
     <string name="about_version">Версія:</string>
-    <string name="shared_string_about">Аб праграме</string>
-    <string name="about_settings_descr">Вэрсія, ліцэнзіі, удзельнікі праекту</string>
+    <string name="shared_string_about">Аб дадатку</string>
+    <string name="about_settings_descr">Версія, ліцэнзіі, удзельнікі праекта</string>
     
     
-    <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_minzoom">Мінімальнае павелічэньне: %1$s</string>
-    <string name="local_index_tile_data_name">Зьвесткі фрагмэнту: %1$s</string>
+    <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_minzoom">Мінімальнае павелічэнне: %1$s</string>
+    <string name="local_index_tile_data_name">Даныя фрагменту: %1$s</string>
     <string name="edit_tilesource_successfully">Крыніца фрагментаў мапы «%1$s» захаваная</string>
     <string name="edit_tilesource_elliptic_tile">Эліптычны меркатар</string>
-    <string name="edit_tilesource_maxzoom">Максімальнае павелічэньне</string>
-    <string name="edit_tilesource_expiration_time">Тэрмін дзеяньня (у хвілінах)</string>
-    <string name="edit_tilesource_minzoom">Мінімальнае павелічэньне</string>
+    <string name="edit_tilesource_maxzoom">Максімальнае павелічэнне</string>
+    <string name="edit_tilesource_expiration_time">Тэрмін дзеяння (у хвілінах)</string>
+    <string name="edit_tilesource_minzoom">Мінімальнае павелічэнне</string>
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Абярыце наяўную…</string>
-    <string name="maps_define_edit">Вызначыць/зьмянiць…</string>
+    <string name="maps_define_edit">Вызначыць/змянiць…</string>
 	<string name="map_widget_fps_info">Адладачная інфармацыя FPS</string>
-	<string name="driving_region_descr">Абярыце рэгіён кіраваньня: ЗША, Эўропа, Вялікабрытанія, Азія і іншыя.</string>
+	<string name="driving_region_descr">Абярыце рэгіён кіраваньня: ЗША, Еўропа, Вялікабрытанія, Азія і іншыя.</string>
 	<string name="driving_region">Рэгіён кіравання</string>
 	<string name="driving_region_japan">Японія</string>
 	<string name="driving_region_us">ЗША</string>
 	<string name="driving_region_canada">Канада</string>
-	<string name="driving_region_europe_asia">Эўропа, Азія, Лацінская Амерыка ды іншыя</string>
+	<string name="driving_region_europe_asia">Еўропа, Азія, Лацінская Амерыка ды іншыя</string>
 	<string name="driving_region_uk">Вялікабрытанія, Індыія ды іншыя</string>
 	    
     
     
     <string name="speak_title">Агалошваць…</string>
-	<string name="speak_descr">Агалошваць назвы вуліц, дарожныя перасцярогі (вымушаныя прыпынкі, ляжачыя паліцэйскія), перасцярогі аб камерах хуткасці, абмежаванні хуткасці.</string>
+	<string name="speak_descr">Агалошваць назвы вуліц, дарожныя папярэджанні (вымушаныя прыпынкі, ляжачыя паліцэйскія), перасцярогі аб камерах хуткасці, абмежаванні хуткасці.</string>
 	<string name="speak_street_names">Назвы вуліц (TTS)</string>
     <string name="speak_speed_limit">Абмежаванне хуткасці</string>
     <string name="speak_cameras">Камеры хуткасці</string>
-	<string name="speak_traffic_warnings">Перасцярогі руху</string>
+	<string name="speak_traffic_warnings">Папярэджанні руху</string>
     
     <string name="osb_author_or_password_not_specified">Калі ласка, пазначце карыстальніка OSM і ягоны пароль у «Наладах»</string>
-    <string name="clear_intermediate_points">Ачысьціць прамежкавыя пункты прызначэньня</string>
-    <string name="keep_intermediate_points">Захаваць прамежкавыя пункты прызначэньня</string>
-    <string name="new_directions_point_dialog">У вас ужо ёсьць набор прамежкавых пунктаў прызначэньня.</string>
+    <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="route_descr_map_location">Мапа: </string>
@@ -57,50 +57,50 @@
 	
 	
 	<string name="app_mode_default">Прагляд мапы</string>
-	<string name="settings_preset">Стандартны профіль</string>
-	<string name="settings_preset_descr">Выгляд мапы й налады навігацыі захоўваюцца для кожнага асобнага профілю. Вызначце Ваш стандартны профіль.</string>
-    <string name="destination_point">Месца прызначэньня %1$s</string>
-    <string name="context_menu_item_destination_point">Ужыць як прызначэньне</string>
+	<string name="settings_preset">Прадвызначаны профіль</string>
+	<string name="settings_preset_descr">Выгляд мапы і налады навігацыі захоўваюцца для кожнага асобнага профілю. Вызначце ваш прадвызначаны профіль.</string>
+    <string name="destination_point">Месца прызначэння %1$s</string>
+    <string name="context_menu_item_destination_point">Ужыць як пункт прызначэння</string>
     <string name="please_select_address">Абярыце спачатку горад ці вуліцу</string>
     
     <string name="search_street_in_neighborhood_cities">Пошук вуліцы ў суседніх гарадах</string>
     <string name="intermediate_items_sort_return">Аптымальны парадак прамежкавых пунктаў прызначэння па шляху да месца прызначэння.</string>
-    <string name="intermediate_items_sort_by_distance">Упарадкаваць ад дзьвярэй да дзьвярэй</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">Рэзервовае капіяваньне файлу зьмен OSM</string>
-    <string name="delete_point">Выдаліць кропку</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>
-    <string name="plugin_distance_point_hdop">дакладнасьць</string>
-    <string name="plugin_distance_point_speed">хуткасьць</string>
+    <string name="plugin_distance_point_hdop">дакладнасць</string>
+    <string name="plugin_distance_point_speed">хуткасць</string>
     <string name="plugin_distance_point_ele">вышыня</string>
     <string name="plugin_distance_point">Пункт</string>
-    <string name="gpx_file_name">Назва GPX файлу</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, які пасля можа быць выкарыстаны для навігацыі.</string>
-    <string name="osmand_distance_planning_plugin_name">Прылада для разьліку адлегласьцей й плянаваньня</string>
+    <string name="osmand_distance_planning_plugin_description">Убудова дадае на экран мапы віджэт, які дазваляе ствараць маршруты, націснуйшы на мапу, а таксама выкарыстоўваць ці змяняць наяўныя файлы GPX, планаваць паездку і вымяраць адлегласць паміж пунктамі. Вынікі могуць быць захаваныя ў выглядзе файла GPX, які пасля можа быць выкарыстаны для навігацыі.</string>
+    <string name="osmand_distance_planning_plugin_name">Прылада для разліку адлегласцяў і плянавання</string>
     <string name="use_distance_measurement_help">* Націсніце, каб адзначыць пункт.
 \n * Доўга ўтрымлівайце на мапе, каб выдаліць папярэдні пункт.
 \n * Доўга ўтрымлівайце на пункце, каб паглядзець і дадаць апісанне.
 \n * Націсніце на віджэце вымярэння, каб убачыць больш дзеянняў.</string>
-    <string name="distance_measurement_start_editing">Пачаць рэдагаваньне</string>
-    <string name="distance_measurement_finish_editing">Скончыць рэдагаваньне</string>
-    <string name="distance_measurement_finish_subtrack">Пачаць новы падтрэк</string>
+    <string name="distance_measurement_start_editing">Пачаць рэдагаванне</string>
+    <string name="distance_measurement_finish_editing">Скончыць рэдагаванне</string>
+    <string name="distance_measurement_finish_subtrack">Пачаць новы падслед</string>
     <string name="distance_measurement_clear_route">Выдаліць ўсе пункты</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">Выкарыстоўваць фільтар Калмана</string>
+    <string name="wait_current_task_finished">Калі ласка, пачакайце пакуль бягучая задача не будзе завершаная</string>
+    <string name="use_kalman_filter_compass_descr">Зніжае шум паказанняў компасу, але дадае інэрцыю.</string>
+    <string name="use_kalman_filter_compass">Выкарыстоўваць фільтр Калмана</string>
     <string name="use_magnetic_sensor_descr">Выкарыстоўваць для працы компаса магнітны датчык замест датчыка арыентацыі.</string>
-    <string name="use_magnetic_sensor">Выкарыстоўваць магнітомэтр</string>
+    <string name="use_magnetic_sensor">Выкарыстоўваць магнітометр</string>
     <string name="other_location">Іншае</string>
     <string name="files_limit">засталося %1$d файлаў</string>
     <string name="available_downloads_left">Засталося %1$d файлаў для спампоўвання</string>
-    <string name="install_paid">Поўная вэрсія</string>
+    <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">Wi-Fi не падлучаны. Выкарыстаць дзейнае падлучэнне да Інтэрнэту для спампоўвання?</string>
     <string name="street_name">Назва вуліцы</string>
 	<string name="hno">Нумар дома</string>
@@ -111,83 +111,83 @@
     <string name="monitoring_settings_descr">Налады запісу вашых падарожжаў.</string>
     
     
-    <string name="osmand_background_plugin_description">Паказвае налады ўключэньня фонавага адсочвання і навігацыі праз перыядычнае абуджэнне GPS-прыймача (з адключаным экранам).</string>
-    <string name="contribution_activity">Усталяваньне версіі</string>
-    <string name="choose_osmand_theme_descr">Абраць, як выглядае прыкладанне.</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>
-    <string name="accessibility_options">Налады даступнасьці</string>
+    <string name="accessibility_options">Налады даступнасці</string>
     <string name="select_address_activity">Абраць адрас</string>
-    <string name="favourites_list_activity">Абярыце ўпадабанае</string>
+    <string name="favourites_list_activity">Абярыце ўлюбёнае</string>
     <string name="local_openstreetmap_act_title">Мадыфікацыі OSM</string>    
 	
-    <string name="layer_hillshade">Слой рэльефу мясцовасьці</string>
-    <string name="map_widget_gps_info">Зьвесткі GPS</string>
+    <string name="layer_hillshade">Слой рэльефу мясцовасці</string>
+    <string name="map_widget_gps_info">Інфармацыя GPS</string>
     
-    <string name="access_arrival_time">Час прыбыцьця</string>
+    <string name="access_arrival_time">Час прыбыцця</string>
     <string name="item_checked">адзначана</string>
     <string name="item_unchecked">не адзначана</string>
-    <string name="prefer_motorways">Надаваць перавагу аўтамагістралям</string>
-	<string name="prefer_in_routing_title">Надаваць перавагу…</string>
-	<string name="prefer_in_routing_descr">Надаваць перавагу аўтамагістралям.</string>
+    <string name="prefer_motorways">Аддаваць перавагу аўтамагістралям</string>
+	<string name="prefer_in_routing_title">Аддаваць перавагу…</string>
+	<string name="prefer_in_routing_descr">Аддаваць перавагу аўтамагістралям.</string>
     <string name="max_speed_none">няма</string>
-    <string name="index_name_openmaps">OpenMaps Эўропа</string>
+    <string name="index_name_openmaps">OpenMaps Еўропа</string>
     
-    <string name="download_hillshade_maps">Слой з рэльефам мясцовасьці</string>
+    <string name="download_hillshade_maps">Пласт з рэльефам мясцовасці</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 %2$s</string>
     <string name="av_def_action_picture">Сфатаграфаваць</string>
     <string name="recording_context_menu_precord">Сфатаграфаваць</string>
-    <string name="dropbox_plugin_description">Модуль Dropbox дазваляе вам сінхранізаваць трэкі і аўдыё/відэа-натакi з вашым Dropbox-контам.</string>
-    <string name="dropbox_plugin_name">Модуль Dropbox</string>
+    <string name="dropbox_plugin_description">Убудова Dropbox дазваляе вам сінхранізаваць сляды і аўдыё/відэа натакi з вашым акаўнтам Dropbox.</string>
+    <string name="dropbox_plugin_name">Убудова Dropbox</string>
     
-    <string name="intermediate_points_change_order">Зьмяніць парадак</string>
-    <string name="srtm_paid_version_msg">Калі ласка, падумайце пра набыццё дадатку «Contour lines» для падтрымкі далейшай распрацоўкі.</string>
-    <string name="srtm_paid_version_title">Модуль Ізалініі вышынь</string>
+    <string name="intermediate_points_change_order">Змяніць парадак</string>
+    <string name="srtm_paid_version_msg">Калі ласка, падумайце пра набыццё ўбудовы «Contour lines» для падтрымкі далейшай распрацоўкі.</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_widget_action_descr">Выберыце агаданае дзеянне віджэта.</string>
-    <string name="av_widget_action">Дзеяньне віджэта па змаўчанні</string>
-    <string name="av_video_format_descr">Выбар выхаднога фармату відэа.</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_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_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="recording_error">Запіс не ўдаўся</string>
-    <string name="recording_camera_not_available">Камера не даступная</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_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="layer_recordings">Слой запісу</string>
-    <string name="recording_can_not_be_played">Запіс не можа быць прайграны</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="layer_recordings">Пласт запісу</string>
+    <string name="recording_can_not_be_played">Запіс немагчыма прайграць</string>
     <string name="recording_context_menu_delete">Выдаліць запіс</string>
     <string name="recording_context_menu_play">Граць</string>
     <string name="recording_description">Запіс %1$s %3$s %2$s</string>
     <string name="recording_default_name">Запіс</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="audionotes_location_not_defined">Месцазнаходжанне для прывязкі нататкі пакуль яшчэ не вызначылася. «Выкарыстаць месцазнаходжаньне…» каб прызначыць нататку ў выбраным месцы.</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="audionotes_location_not_defined">Месцазнаходжанне для прывязкі нататкі пакуль яшчэ не вызначылася. «Выкарыстаць месцазнаходжанне…» для запісу нататкі ў абраным месцы.</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_name">Ізалініі вышынь</string>
@@ -204,117 +204,117 @@
 	
 	<string name="map_widget_max_speed">Абмежаванне хуткасці</string>
     <string name="monitoring_control_start">GPX</string>
-    <string name="no_buildings_found">Будынкаў ня знойдзена.</string>
-    <string name="incremental_search_city">Выберыце горад</string>
+    <string name="no_buildings_found">Будынкаў не знойдзена.</string>
+    <string name="incremental_search_city">Абярыце горад</string>
     <string name="search_villages_and_postcodes">Дадатковы пошук вёсак і паштовага індэкса</string>
 	<string name="rendering_attr_showRoadMaps_description">Абярыце калі паказваць дарожныя мапы:</string>
 	<string name="rendering_attr_showRoadMaps_name">Мапы толькі дарог</string>
-    <string name="safe_mode_description">Працаваць у бяспечным рэжыме (трохі павольней але без свойскіх бібліятэк).</string>
-    <string name="safe_mode">Бясьпечны рэжым</string>
-    <string name="native_library_not_running">Прыкладанне працуе ў бяспечным рэжыме (адключыць яго ў «Наладах»).</string>
+    <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="close_changeset">Зачыніць мноства зьмен</string>
-	<string name="zxing_barcode_scanner_not_found">Прыкладанне «ZXing Barcode Scanner» не ўстаноўленае. Шукаць у Google Play?</string>
-	<string name="rendering_attr_roadColors_description">Выберыце схему колераў дарог:</string>
+    <string name="close_changeset">Закрыць набор змен</string>
+	<string name="zxing_barcode_scanner_not_found">Дадатак «ZXing Barcode Scanner» не ўсталяваны. Знайсці ў Google Play\?</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="enable_plugin_monitoring_services">Дазволіць модулю запісу падарожжа выкарыстоўваць сэрвісы запісу сьледу (запіс GPX, адсочваньне праз сетку)</string>
-    <string name="non_optimal_route_calculation">Разлічваць прыблізны шлях на вялікія адлегласьці</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>
     
-	<string name="map_widget_monitoring_services">Службы адсочваньня</string>
+	<string name="map_widget_monitoring_services">Сэрвісы адсочвання</string>
 	<string name="no_route">Няма маршруту</string>
-	<string name="delete_target_point">Выдаліць пункт прызначэньня</string>
-	<string name="target_point">Пункт прызначэньня %1$s</string>
+	<string name="delete_target_point">Выдаліць пункт прызначэння</string>
+	<string name="target_point">Пункт прызначэння %1$s</string>
     <string name="intermediate_point">Прамежкавы пункт %1$s</string>
-    <string name="context_menu_item_last_intermediate_point">Дадаць апошнім пунктам прызначэньня</string>
-    <string name="context_menu_item_first_intermediate_point">Дадаць першым пунктам прызначэньня</string>
-    <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="shared_string_target_points">Пункты прызначэньня</string>
-    <string name="intermediate_point_too_far">Прамежкавы пункт прызначэньня %1$s занадта далёка ад бліжэйшай дарогі.</string>
+    <string name="context_menu_item_last_intermediate_point">Дадаць апошнім пунктам прызначэння</string>
+    <string name="context_menu_item_first_intermediate_point">Дадаць першым пунктам прызначэння</string>
+    <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="shared_string_target_points">Пункты прызначэння</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>
+    <string name="context_menu_item_intermediate_point">Дадаць прамежкавым пунктам прызначэння</string>
+    <string name="map_widget_intermediate_distance">Прамежкавы пункт прызначэння</string>
     <string name="ending_point_too_far">Канцавы пункт занадта далёка ад бліжэйшай дарогі.</string>
-    <string name="add_tag">Дадаць тэг</string>
+    <string name="add_tag">Дадаць пазнаку</string>
     <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_accomodation">Жыллё</string>
     <string name="poi_filter_restaurants">Рэстараны</string>
-    <string name="poi_filter_sightseeing">Славутасьці</string>
+    <string name="poi_filter_sightseeing">Славутасці</string>
     <string name="poi_filter_car_aid">Аўтамабільная дапамога</string>
 	<string name="poi_filter_food_shop">Прадуктовая крама</string>
 	<string name="poi_filter_for_tourists">Для турыстаў</string>
 	<string name="poi_filter_fuel">Паліва</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">Выкарыстоўваць компас калі інакш немагчыма вызначыць напрамак.</string>
 	<string name="use_compass_navigation">Выкарыстоўваць компас</string>
-	<string name="avoid_motorway">Пазьбягаць аўтамагістраляў</string>
-	<string name="auto_zoom_map_descr">Узровень павелічэння згодна вашай хуткасці (калі мапа сінхранізуецца з дзейным становішчам).</string>
+	<string name="avoid_motorway">Пазбягаць аўтамагістраляў</string>
+	<string name="auto_zoom_map_descr">Узровень павелічэння згодна вашай хуткасці (калі мапа сінхранізуецца з бягучым становішчам).</string>
 	<string name="auto_zoom_map">Аўтаматычнае памяншэнне/павелічэнне</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_long_description_1000_chars">OsmAnd (OSM Automated Navigation Directions) 
+	<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 Automated Navigation Directions) 
 \n 
-\nOsmAnd — праграмнае навігацыйнае дастасаванне з адкрытым кодам з доступам да розных картаграфічных дадзеных ад OpenStreetMap (OSM). Усе картаграфічныя дадзеныя (вектарныя і растравыя) могуць быць захаваныя на карце памяці для аўтаномнага выкарыстання. Аўтаномная і анлайн-маршрутызацыя падтрымліваецца таксама, уключаючы пакрокавае галасавое суправаджэнне. 
+\nOsmAnd — навігацыйн дадатак з адкрытым кодам з доступам да разнастайных даных ад OpenStreetMap (OSM). Усе  даныя (вектарныя і растравыя) можна захаваць на картцы памяці для аўтаномнага выкарыстання. Таксама падтрымліваецца аўтаномная і сеціўная маршрутызацыя, уключаючы пакрокавае галасавое суправаджэнне. 
 \n 
 \nНекалькі асноўных магчымасцяў: 
-\n - паўнавартасная праца без інтэрнэт-злучэння (захоўвае вектарныя або растравыя дадзеныя ў памяці прыстасавання); 
+\n - паўнавартасная праца без інтэрнэт-злучэння (захоўвае вектарныя або растравыя даныя ў памяці прылады); 
 \n - кампактная вектарная мапа ўсяго свету; 
-\n - загрузка мапаў краін або рэгіёну непасрэдна ў праграме; 
-\n - магчымасць адлюстравання звестак на мапе, напрыклад пласт для пракладкі маршруту або пласт з запісам GPX-следу, з POI, упадабанымі, ізалініямі вышынь, грамадзкім транспартам, дадатковымі мапамі з магчымасцю налады ўзроўню празрыстасці; 
+\n - спампоўванне мапаў краін або рэгіёну непасрэдна ў праграме; 
+\n - магчымасць адлюстравання звестак на мапе, напрыклад пласт для пракладкі маршруту або пласт з запісам GPX-следу, з POI, улюбёныміі, ізалініямі вышынь, грамадскім транспартам, дадатковымі мапамі з магчымасцю налады ўзроўня празрыстасці; 
 \n - аўтаномны пошук адрасоў і POI; 
-\n - пракладка маршрутаў афлайн на кароткія адлегласці (эксперыментальная функцыя); 
-\n - рэжымы для пешаходнай, аўтамабільнай і веланавігацыі з: 
+\n - пракладка маршрутаў па-за сецівам на кароткія адлегласці (эксперыментальная функцыя); 
+\n - рэжымы для пешаходнай, аўтамабільнай і роваравай навігацыі з: 
 \n - магчымасцю аўтаматычнага пераключэння дзённага/начнога адлюстравання; 
 \n - аўтамаштабаваннем мапы ў адпаведнасці з хуткасцю руху; 
 \n - магчымасцю арыентацыі мапы па компасе або кірунку руху, 
 \n - паказам руху па палосах і абмежаванняў хуткасці, запісанае і сінтэзуемае галасавое суправаджэнне. 
 \n 
-\nАбмежаванні бясплатнай вэрсіі: 
-\n - колькасць сцягванняў мапаў абмежаванае; 
-\n - адсутнічае афлайн доступ да інфармацыі з Вікіпэдыі для POI. 
+\nАбмежаванні бясплатнай версіі: 
+\n - колькасць спамповак мапаў абмежаваная; 
+\n - адсутнічае пазасеціўны доступ да інфармацыі з Вікіпедыі для POI. 
 \n 
-\nOsmAnd актыўна развіваецца, яго далейшае развіццё забяспечваецца фінансавымі паступленнямі ад яго карыстальнікаў, за кошт якіх адбываецца далейшая распрацоўка і тэставанне новых функцый. Калі ласка, разгледзьце магчымасць набыцця OsmAnd+ або падтрымайце распрацоўку пэўных функцый, або зрабіце дабрачынны ўнёсак на https://osmand.net.</string>
+\nOsmAnd актыўна развіваецца, яго далейшае развіццё забяспечваецца фінансавымі паступленнямі ад яго карыстальнікаў, за кошт якіх адбываецца далейшая распрацоўка і тэставанне новых функцый. Калі ласка, разгледзьце магчымасць набыцця OsmAnd+ або падтрымайце распрацоўку пэўных функцый, або зрабіце дабрачынны ўнёсак на https://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_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions) 
+	<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 Automated Navigation Directions) 
 \n 
-\n OsmAnd+ — праграмнае навігацыйнае дастасаванне з адкрытым кодам з доступам да розных картаграфічных дадзеных ад OpenStreetMap (OSM). Усе картаграфічныя дадзеныя (вектарныя і растравыя) могуць быць захаваныя на карце памяці для далейшага аўтаномнага выкарыстання. Аўтаномная і анлайн-маршрутызацыя падтрымліваецца таксама, уключаючы пакрокавае галасавое суправаджэнне. 
+\n OsmAnd+ — навігацыйны дадатак з адкрытым кодам з доступам да разнастайных даных ад OpenStreetMap (OSM). Усе  даныя (вектарныя і растравыя) можна захаваць на картцы памяці для далейшага аўтаномнага выкарыстання. Таксама падтрымліваецца аўтаномная і сеціўная маршрутызацыя, уключаючы пакрокавае галасавое суправаджэнне. 
 \n 
 \n OsmAnd+ — гэта платная версія, купляючы якую вы падтрымліваеце праект, фінансуеце распрацоўку новых функцый, і атрымліваеце апошнія абнаўленні. 
 \n 
 \n Некалькі асноўных магчымасцяў: 
-\n - поўнасцю аўтаномная праца (захаванне вектарных або растравых мапаў у памяці прыстасавання); 
-\n - кампактная вэктарная мапа для ўсяго cвету; 
-\n - неабмежаваная колькасць сцягванняў мапаў асобнай краіны або рэгіёну непасрэдна ў праграме; 
-\n - магчымасць аўтаномнай працы з дадзенымі Вікіпэдыі (загрузіце POI з Вікіпеэдыі) з\'яўляецца цудоўным інструмэнтам для падарожнікаў; 
-\n - магчымасць адлюстравання звестак на мапе, напрыклад слой для пракладкі маршруту або слой з запісам GPX-следу, з POI, упадабанымі, ізалініямі вышынь, грамадзкім транспартам, дадатковымі мапамі з магчымасцю налады ўзроўню празрыстасці; 
+\n - поўнасцю аўтаномная праца (захаванне вектарных або растравых мапаў у памяці прылады); 
+\n - кампактная вектарная мапа для ўсяго cвету; 
+\n - неабмежаваная колькасць спампоўванняў мапаў асобнай краіны або рэгіёну непасрэдна ў праграме; 
+\n - магчымасць аўтаномнай працы з данымі Вікіпедыі (спампоўванне POI з Вікіпедыі) з\'яўляецца цудоўным інструментам для падарожнікаў; 
+\n - магчымасць адлюстравання звестак на мапе, напрыклад пласт для пракладкі маршруту або пласт з запісам GPX-следу, з POI, улюбёнымі, ізалініямі вышынь, грамадскім транспартам, дадатковымі мапамі з магчымасцю налады ўзроўня празрыстасці; 
 \n 
 \n - аўтаномны пошук адрасоў і POI; 
 \n - аўтаномная пракладка маршрутаў для сярэдніх адлегласцяў; 
-\n - рэжымы для пешаходнай, аўтамабільнай і веланавігацыі з: 
+\n - рэжымы для пешаходнай, аўтамабільнай і роварнай навігацыі з: 
 \n - пераключэннем паміж дзённым і начным рэжымамі; 
 \n - маштабаваннем мапы ў адпаведнасці з хуткасцю руху; 
 \n - арыентацыяй мапы па компасе або кірунку руху; 
 \n - паказ палос руху і абмежаванняў хуткасці, галасавое суправаджэнне 
-\n</string>
+\n"</string>
 	
 	
-	<string name="filterpoi_activity">Стварыць фільтар POI</string>
-	<string name="recalculate_route_to_your_location">Від транспарту:</string>
-	<string name="select_navigation_mode">Выберыце від транспарту</string>
+	<string name="filterpoi_activity">Стварыць фільтр POI</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>
 	
@@ -324,74 +324,74 @@
 	
 	
 	
-	<string name="layer_map_appearance">Сканфігураваць экран</string>
+	<string name="layer_map_appearance">Наладзіць экран</string>
 	<string name="show_lanes">Палосы руху</string>
-	<string name="avoid_unpaved">Пазьбягаць дарог без пакрыцьця</string>
-	<string name="avoid_ferries">Пазьбягаць паромаў</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_show_ruler">Лінейка</string>
 	
-	<string name="map_widget_view_direction">Кірунак погляду</string>
-	<string name="map_widget_transparent">Празрыстае афармленьне</string>
+	<string name="map_widget_view_direction">Накірунак погляду</string>
+	<string name="map_widget_transparent">Празрыстыя віджэты</string>
 	
 	
-	<string name="bg_service_sleep_mode_off">Запусьціць у\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="gps_wakeup_interval">Iнтэрвал абуджэння GPS: %s</string>
 	<string name="int_continuosly">Безперапынны</string>
-	<string name="screen_is_locked">Націсніце значок блакавання каб разблакаваць экран</string>
+	<string name="screen_is_locked">Націсніце значок блакавання, каб разблакаваць экран</string>
 	<string name="map_widget_top_text">Назва вуліцы</string>
-	<string name="map_widget_config">Сканфігураваць экран</string>
+	<string name="map_widget_config">Наладзіць экран</string>
 	<string name="map_widget_back_to_loc">Дзе я</string>
-	<string name="map_widget_lock_screen">Блякаваць экран</string>
+	<string name="map_widget_lock_screen">Заблакаваць экран</string>
 	<string name="map_widget_compass">Компас</string>
 	
-	<string name="map_widget_reset">Вярнуцца да стандартных</string>
+	<string name="map_widget_reset">Скінуць да прадвызначаных</string>
 	
 	
 	<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_speed">Хуткасць</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>
 	<string name="map_widget_next_turn_small">Наступны паварот (малы)</string>
 	<string name="map_widget_next_next_turn">Паварот праз адзін</string>
 	<string name="map_widget_mini_route">Малая мапа маршруту</string>
-	<string name="bg_service_screen_lock">Блякаваць экран</string>
-	<string name="bg_service_screen_unlock">Разблякіраваць экран</string>
+	<string name="bg_service_screen_lock">Заблакаваць экран</string>
+	<string name="bg_service_screen_unlock">Разблакаваць экран</string>
 	<string name="bg_service_screen_lock_toast">Экран заблакаваны</string>
-	<string name="bg_service_interval">Задайце інтэрвал абуджэньня:</string>
+	<string name="bg_service_interval">Задайце інтэрвал абуджэння:</string>
 	<string name="show_cameras">Камеры хуткасці</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="avoid_toll_roads">Пазбягаць платных дарог</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">Хвiлiн</string>
 	<string name="osmand_parking_position_description_add_time">Аўтамабіль прыпаркаваны ў</string>
 	
-	<string name="select_animate_speedup">Абярыце хуткасьць сімуляцыі</string>
-    	<string name="global_app_allocated_memory_descr">Выдзелена памяці %1$s МБ (Абмежаваньне Android %2$s МБ, Dalvik %3$s МБ).</string>
-	<string name="global_app_allocated_memory">Выдзеленая памяць</string>
-	<string name="native_app_allocated_memory_descr">Усяго фізычнай памяці занятай праграмай %1$s МБ (Dalvik %2$s МБ, іншае %3$s МБ).
-Прапарцыйнай памяці %4$s МБ (Абмежаваньне Android %5$s МБ, Dalvik %6$s МБ).</string>
-	<string name="native_app_allocated_memory">Усяго фізічнай памяці</string>
+	<string name="select_animate_speedup">Абярыце хуткасць сімуляцыі</string>
+    	<string name="global_app_allocated_memory_descr">Адведзена памяці %1$s МБ (Абмежаванне Android %2$s МБ, Dalvik %3$s МБ).</string>
+	<string name="global_app_allocated_memory">Адведзеная памяць</string>
+	<string name="native_app_allocated_memory_descr">Агулам фізічнай памяці занятай дадаткам %1$s МБ (Dalvik %2$s МБ, іншае %3$s МБ). Прапарцыйнай памяці %4$s МБ (Абмежаванне Android %5$s МБ, Dalvik %6$s МБ).</string>
+	<string name="native_app_allocated_memory">Фізічнай памяці агулам</string>
 	
 	<string name="starting_point_too_far">Пачатковы пункт занадта далёка ад бліжэйшай дарогі.</string>
 	<string name="shared_location">Агульныя месцы</string>
 	<string name="osmand_parking_event">Забраць машыну са стаянкі</string>
-	<string name="osmand_parking_warning">Папярэджаньне</string>
-	<string name="osmand_parking_warning_text">Напамін аб абмежаванні часу паркоўкі аўтамабіля ўжо дададзены ў каляндар. Вам будзе неабходна яго выдаліць ўручную.</string>    
+	<string name="osmand_parking_warning">Папярэджанне</string>
+	<string name="osmand_parking_warning_text">Напамін аб абмежаванні часу паркоўкі аўтамабіля ўжо дададзены ў каляндар. Вам будзе неабходна яго выдаліць ўласнаручна.</string>    
 	<string name="osmand_parking_time_limit_title">Задайце абмежаванне часу стаянкі</string>
-	<string name="osmand_parking_delete_confirm">Выдаліць пазнаку прыпаркаванага аўтамабіля\?</string>
-	<string name="osmand_parking_delete">Выдаліць пазнаку стаянкі</string>
-	<string name="osmand_parking_choose_type">Выберыце тып паркоўкі</string>
-	<string name="osmand_parking_lim_text">З абмежаваньнем па часе</string>
-	<string name="osmand_parking_no_lim_text">Без абмежаваньня па часе</string>
+	<string name="osmand_parking_delete_confirm">Выдаліць адзнаку прыпаркаванага аўтамабіля\?</string>
+	<string name="osmand_parking_delete">Выдаліць адзнаку стаянкі</string>
+	<string name="osmand_parking_choose_type">Абярыце тып паркоўкі</string>
+	<string name="osmand_parking_lim_text">З абмежаваннем па часе</string>
+	<string name="osmand_parking_no_lim_text">Без абмежавання па часе</string>
 	<string name="osmand_parking_add_event">Дадаць напамін ў каляндар</string>
 	<string name="osmand_parking_time_limit">Час стаянкі абмежаваны</string>
 	<string name="osmand_parking_time_no_limit">Час стаянкі неабмежаваны</string>
@@ -400,10 +400,10 @@
 	<string name="osmand_parking_pm">PM</string>
 	<string name="osmand_parking_am">AM</string>
 	<string name="osmand_parking_position_name">Месца стаянкі</string>
-	<string name="osmand_parking_plugin_description">Модуль месца паркоўкі дазваляе запісаць, дзе быў прыпаркаваны ваш аўтамабіль і колькі часу засталося ў выпадку абмежаванай па часе стаянкі. Месца паркоўкі і час відаць на панэлі кіраваньня OsmAnd і на віджэце на экране з мапай. Апавяшчэньне ў календары Android можа быць дададзена для напаміну.</string>
-	<string name="osmand_parking_plugin_name">Месца стаянкі</string>
+	<string name="osmand_parking_plugin_description">Убудова месца паркоўкі дазваляе запісаць дзе быў прыпаркаваны ваш аўтамабіль і колькі часу засталося ў выпадку абмежаванай па часе стаянкі. Месца паркоўкі і час відаць на панэлі кіравання OsmAnd і на віджэце на экране з мапай. У каляндар Android можна дадаць напамін.</string>
+	<string name="osmand_parking_plugin_name">Месца паркоўкі</string>
 	<string name="context_menu_item_add_parking_point">Пазначыць месца стаянкі</string>
-	<string name="context_menu_item_delete_parking_point">Выдаліць пазнаку месца стаянкі</string>
+	<string name="context_menu_item_delete_parking_point">Выдаліць адзнаку месца стаянкі</string>
 	<string name="gpxup_public">Агульны</string>
 	<string name="gpxup_identifiable">Ідэнтыфікуемы</string>
 	<string name="gpxup_trackable">Адсочвальны</string>
@@ -417,78 +417,78 @@
 	<string name="rendering_attr_noPolygons_name">Палігоны</string>
 	<string name="rendering_attr_appMode_name">Рэжым візуалізацыі</string>
 	<string name="rendering_attr_appMode_description">Аптымізаваць мапу для</string>
-	<string name="rendering_attr_contourLines_description">Мінімальны ўзровень маштабу з адлюстраваньнем ізаліній вышынь:</string>
+	<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="local_index_routing_data">Дадзеныя маршрутызацыі</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="favourites_search_desc">Спосаб пошуку ўпадабаных</string>
+	<string name="transport_search_desc">Пошук грамадскага транспарту</string>
+	<string name="favourites_search_desc">Спосаб пошуку ўлюбёных</string>
 	
 	<string name="offline_navigation_not_available">Аўтаномная навігацыя OsmAnd часова недаступная.</string>
 	<string name="left_side_navigation">Левабаковы рух</string>
-	<string name="left_side_navigation_descr">Для краін, дзе людзі ездзяць па левай старане дарогі.</string>
+	<string name="left_side_navigation_descr">Для краін, дзе людзі ездзяць па леваму боку дарогі.</string>
 	
-	<string name="unknown_from_location">Пачатковая кропка не вызначаная</string>
-	<string name="unknown_location">Становішча пакуль ня вызначанае</string>
-	<string name="modify_transparency">Зьмяніць празрыстасьць (0 - празрысты, 255 - непразрысты)</string>
-	<string name="confirm_interrupt_download">Скасаваць cьцягваньне файлу?</string>
-	<string name="first_time_msg">Дзякуй за карыстаньне OsmAnd. Спампаваць рэгіянальныя даныя для аўтаномнага карыстання можна праз «Налады» → «Кіраваць файламі мапаў». Пасьля гэтага вы зможаце глядзець мапу, шукаць адрасы, бачыць POI, грамадзкі транспарт і іншае.</string>    
-	<string name="basemap_was_selected_to_download">Базавая мапа абраная для спампоўкі, бо неабходная для карэктнай працы.</string>
+	<string name="unknown_from_location">Пачатковы пункт не вызначаны</string>
+	<string name="unknown_location">Становішча пакуль не вызначана</string>
+	<string name="modify_transparency">Змяніць празрыстасць (0 - празрысты, 255 - непразрысты)</string>
+	<string name="confirm_interrupt_download">Скасаваць cпампоўванне файла\?</string>
+	<string name="first_time_msg">Дзякуй за выкарыстанне OsmAnd. Спампаваць рэгіянальныя даныя для аўтаномнага выкарыстання можна праз «Налады» → «Кіраваць файламі мапаў». Пасля гэтага вы зможаце глядзець мапу, шукаць адрасы, бачыць POI, грамадскі транспарт і іншае.</string>    
+	<string name="basemap_was_selected_to_download">Базавая мапа абраная для спампоўвання, бо неабходная для карэктнай працы.</string>
 	<string name="select_index_file_to_download">Нічога не знойдзена. Калі вы не знайшлі свой рэгіён, вы можаце стварыць мапу самастойна (гл. https://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="map_online_plugin_is_not_installed">Актывуйце модуль «Анлайн мапаў», каб выбіраць розныя крыніцы для мапаў</string>
+	<string name="local_indexes_cat_map">Стандартныя мапы (вектарныя)</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">Карыстацца сеціўнымі мапамі (cцягнуць і захоўваць фрагменты на картцы памяці).</string>
+	<string name="map_online_data_descr">Выкарвстоўваць сеціўныя мапы (cпампаваць і захоўваць фрагменты на картцы памяці).</string>
 	<string name="shared_string_online_maps">Сеціўныя мапы</string>
-	<string name="online_map_settings_descr">Наладзьце крыніцы сеціўных або кэшаваных растравых мапаў.</string>
+	<string name="online_map_settings_descr">Наладзіць крыніцы сеціўных або кэшаваных растравых мапаў.</string>
 	
 	
-	<string name="osmand_rastermaps_plugin_description">З дапамогай гэтага модуля вы можаце атрымаць доступ да мноства відаў інтэрнэт мапаў (тайлавых або растравых), ад папярэдне створаных фрагментаў OpenStreetMap (Mapnik) да спадарожнікавых здымкаў і слаёў спэцыяльнага прызначэння, такіх як мапы надвор\'я, кліматычныя мапы, геалагічныя мапы, пласты зацямнення вышынь і г.д. 
+	<string name="osmand_rastermaps_plugin_description">З дапамогай гэтай убудовы вы можаце атрымаць доступ да мноства тыпаў сеціўных мапаў (тайлавых альбо растравых), ад папярэдне створаных фрагментаў OpenStreetMap (Mapnik) да спадарожнікавых здымкаў і пластоў адмысловага прызначэння, такіх як мапы надвор\'я, кліматычныя мапы, геалагічныя мапы, пласты зацямнення вышынь і г.д. 
 \n 
-\nЛюбая з гэтых мапаў можа быць выкарыстана ў якасьці асноўнай (базавай) мапы для адлюстравання на экране OsmAnd або ў выглядзе накладання / падкладкі да іншай базавай мапы (стандартнай аўтаномнай мапы OsmAnd). Для таго каб зрабіць любую падкладку больш бачнай, некаторыя элемэнты вектарнай мапы OsmAnd могуць быць па жаданні лёгка схаваныя праз меню «Налады мапы». 
+\nЛюбая з гэтых мапаў можа быць выкарыстана ў якасці асноўнай (базавай) мапы для адлюстравання на экране OsmAnd або ў выглядзе накладкі / падкладкі да іншай базавай мапы (стандартнай аўтаномнай мапы OsmAnd). Для таго каб зрабіць любую падкладку больш бачнай, некаторыя элементы вектарнай мапы OsmAnd могуць быць па жаданні лёгка схаваныя праз меню «Налады мапы». 
 \n 
-\nТайлавыя мапы могуць быць атрыманыя непасрэдна з дапамогай онлайн-крыніц або могуць быць падрыхтаваныя для выкарыстання ў аўтаномным рэжыме (і ўручную скапіяваныя ў тэчку дадзеных OsmAnd) як база дадзеных SQLite, якая можа быць атрымана з дапамогай розных інструментаў падрыхтоўкі мапаў іншых вытворцаў.</string>
+\nТайлавыя мапы могуць быць атрыманыя непасрэдна з дапамогай сеціўных крыніц або могуць быць падрыхтаваныя для выкарыстання ў аўтаномным рэжыме (і ўласнаручна скапіяваныя ў каталог даных OsmAnd) як база даных SQLite, якую можна атрымаць з дапамогай розных інструментаў падрыхтоўкі мапаў іншых вытворцаў.</string>
 	
-	<string name="osmand_accessibility_description">Модуль дадае падтрымку дапаможных магчымасьцяў непасрэдна ў OsmAnd. Гэта палягчае, напрыклад, рэгуляваньне хуткасьці прамовы для голасу TTS, наладу накіраванасьці экрана навігацыі, кіраваньне маштабам пры дапамозе трэкбола або выкарыстаньне галасавых каманд зваротнай сувязі для аўтаматычнага агалошваньня вашага месцазнаходжаньня.</string>
+	<string name="osmand_accessibility_description">Убудова дадае падтрымку дадатковых магчымасцяў непасрэдна ў OsmAnd. Гэта палягчае, напрыклад, рэгуляванне хуткасці вымаўлення для голасу TTS, наладу накіраванасці экрана навігацыі, кіраванне маштабам пры дапамозе трэкбола або выкарыстанне галасавых загадаў зваротнай сувязі для аўтаматычнага агалошвання вашага месцазнаходжання.</string>
 	
 	
 	
-	<string name="osmand_development_plugin_description">Модуль адлюстроўвае парамэтры для распрацоўкі і адладкі функцый, такіх як, праверка або мадэляваньне маршруту, адлюстраваньне прадукцыйнасьці адмалёўкі, праверка галасавых падказак. Гэтыя налады прызначаныя для распрацоўнікаў і не патрабуюцца для звычайнага карыстальніка.</string>
-	<string name="plugins_screen">Дадатковыя модулі</string>
+	<string name="osmand_development_plugin_description">Убудова адлюстроўвае параметры для распрацоўкі і адладкі функцый, такіх як, праверка або мадэляванне маршруту, адлюстраванне прадукцыйнасці адмалёўкі, праверка галасавых падказак. Гэтыя налады прызначаныя для распрацоўшчыкаў і не патрэбныя звычайнаму карыстальніку.</string>
+	<string name="plugins_screen">Убудовы</string>
 	
-	<string name="prefs_plugins_descr">Модулі актывуюць дадатковыя налады і магчымасці.</string>
-	<string name="prefs_plugins">Дадатковыя модулі</string>
+	<string name="prefs_plugins_descr">Убудовы актывуюць дадатковыя налады і магчымасці.</string>
+	<string name="prefs_plugins">Убудовы</string>
 	
-	<string name="osm_editing_plugin_description">З дапамогай гэтага модуля OsmAnd можа быць выкарыстаны для паляпшэньня OSM праз стварэньне або зьмену аб\'ектаў OSM POI, адкрыцьцё або каментуючы OSM-нататкі, а таксама адсылаць запісаныя GPX-файлы. OSM разьвіваецца грамадствам, глябальны праект стварэньня мапы агульнай уласнасьці. Для атрыманьня дадатковай інфармацыі, калі ласка, зьвярніцеся на https://openstreetmap.org. Актыўны ўдзел цэніцца, і ўнёскі могуць быць зроблены непасрэдна праз OsmAnd, калі вы ўкажаце свае ўліковыя дадзеныя OSM у наладах.</string>
+	<string name="osm_editing_plugin_description">З дапамогай гэтай убудовы OsmAnd можа быць выкарыстаны для паляпшэння OSM праз стварэнне альбо змену аб\'ектаў OSM POI, адкрыццё або каментаванне OSM-нататак, адпраўленне запісаных GPX-файлаў. OSM развіваецца грамадствам. Гэта глабальны праект па стварэнні свабоднай мапы. Для атрымання дадатковай інфармацыі, калі ласка, наведайце https://openstreetmap.org. Актыўны ўдзел цэніцца, і ўнёскі могуць быць зробленыя непасрэдна праз OsmAnd, калі вы ўкажаце даныя свайго акаўнта 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="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">Для гэтай мясцовасці мапа адсутнічае. Спампуйце мапу з дапамогай «Налады» («Кіраваць файламі мапаў») або пераключыцца на выкарыстанне сеціўных мапаў.</string>
 	
-	<string name="send_files_to_osm">Адаслаць GPX файлы ў OSM?</string>
-	<string name="gpx_visibility_txt">Бачнасьць</string>
-	<string name="gpx_tags_txt">Цэтлікі</string>
-	<string name="gpx_description_txt">Апісаньне</string>
+	<string name="send_files_to_osm">Адаслаць GPX-файлы ў OSM\?</string>
+	<string name="gpx_visibility_txt">Бачнасць</string>
+	<string name="gpx_tags_txt">Пазнакі</string>
+	<string name="gpx_description_txt">Апісанне</string>
 	<string name="validate_gpx_upload_name_pwd">Калі ласка, пазначце імя і пароль карыстальніка OSM, каб адсылаць GPX-файлы.</string>
     	<string name="default_buttons_support">Падтрымка</string>
-	<string name="support_new_features">Падтрымка новых уласьцівасьцяў</string>
-	<string name="support_new_features_descr">Ахвяраваць, каб убачыць новыя магчымасці, рэалізаваныя ў прыкладанні.</string>
+	<string name="support_new_features">Падтрымка новых магчымасцяў</string>
+	<string name="support_new_features_descr">Ахвяраваць, каб убачыць новыя магчымасці, рэалізаваныя ў дадатку.</string>
 	<string name="show_ruler_level">Паказваць маштаб</string>	
 	<string name="info_button">Інфармацыя</string>
 	<string name="back_to_location">Вярнуцца да становішча</string>
 	
-	<string name="accessibility_mode">Рэжым даступнасьці</string>
+	<string name="accessibility_mode">Рэжым даступнасці</string>
 	<string name="accessibility_mode_descr">Уключае функцыі для карыстальнікаў з абмежаваннямі.</string>
-	<string name="accessibility_default">Паводле сістэмных наладаў Андроіда</string>
+	<string name="accessibility_default">Паводле сістэмных налад Android</string>
 	<string name="backToMenu">Назад да меню</string>
 	<string name="zoomOut">Аддаліць</string>
 	<string name="zoomIn">Наблізіць</string>
@@ -519,75 +519,75 @@
 	<string name="front_left">налева наперад</string>
 	<string name="oclock">гадзін</string>
 	<string name="towards">у кірунку</string>
-	<string name="accuracy">Дакладнасьць</string>
+	<string name="accuracy">Дакладнасць</string>
 	<string name="altitude">Вышыня</string>
-	<string name="no_info">Няма зьвестак</string>
-	<string name="direction_style_sidewise">Па кірункам сьвету (8 сэктараў)</string>
-	<string name="direction_style_clockwise">Па стрэлцы гадзіньніка (12 сэктараў)</string>
+	<string name="no_info">Інфармацыя адсутнічае</string>
+	<string name="direction_style_sidewise">Па накірункам свету (8 сектараў)</string>
+	<string name="direction_style_clockwise">Па стрэлцы гадзінніка (12 сектараў)</string>
 	<string name="settings_direction_style">Стыль напрамку</string>
-	<string name="settings_direction_style_descr">Абярыце стыль як паказваць адносныя напрамкі падчас руху.</string>
-	<string name="auto_announce_on">Уключыць аўтаматычнае агалошваньне</string>
-	<string name="auto_announce_off">Выключыць аўтаматычнае агалошваньне</string>
+	<string name="settings_direction_style_descr">Абярыце стыль адлюстроўвання адносных напрамкаў падчас руху.</string>
+	<string name="auto_announce_on">Уключыць аўтаматычнае агалошванне</string>
+	<string name="auto_announce_off">Выключыць аўтаматычнае агалошванне</string>
 	<string name="i_am_here">Я тут</string>
 	<string name="zoom_by_trackball_descr">Змяняць маштаб гарызантальнымі рухамі трэкболу.</string>
-	<string name="zoom_by_trackball">Карыстацца трэкболам для зьмены маштабу</string>
+	<string name="zoom_by_trackball">Карыстацца трэкболам для змены маштабу</string>
 	<string name="accessibility_preferences_descr">Налады даступнасці.</string>
-	<string name="shared_string_accessibility">Даступнасьць</string>
-	<string name="rendering_out_of_memory">Недастаткова памяці каб паказаць абраную прастору</string>
+	<string name="shared_string_accessibility">Даступнасць</string>
+	<string name="rendering_out_of_memory">Недастаткова памяці, каб паказаць абраную прастору</string>
 	<string name="use_fluorescent_overlays">Флюарэсцэнтныя пласты</string>
-	<string name="use_fluorescent_overlays_descr">Ужываць флюарэсцэнтныя колеры для трэкаў і шляхоў.</string>
-	<string name="offline_edition">Аўтаномнае рэдагаваньне</string>
+	<string name="use_fluorescent_overlays_descr">Ужываць флюарэсцэнтныя колеры для слядоў і шляхоў.</string>
+	<string name="offline_edition">Пазасеціўнае рэдагаванне</string>
 	<string name="offline_edition_descr">Заўсёды выкарыстоўваць аўтаномнае рэдагаванне.</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>
+	<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>
 	
-	<string name="local_openstreetmap_upload">Адаслаць зьмены ў OSM</string>
-	<string name="local_openstreetmap_delete">Выдаліць зьмены</string>
-	<string name="local_openstreetmap_descr_title">Асінхроннае рэдагаваньне OSM:</string>
+	<string name="local_openstreetmap_upload">Адаслаць змены ў OSM</string>
+	<string name="local_openstreetmap_delete">Выдаліць змены</string>
+	<string name="local_openstreetmap_descr_title">Асінхроннае рэдагаванне OSM:</string>
 	<string name="local_openstreetmap_settings">OSM POI/нататкі захаваныя на прыладзе</string>
 	<string name="local_openstreetmap_settings_descr">Паказаць і кіраваць OSM POI/нататкамі ў базе даных на прыладзе.</string>
 	
 	
-	<string name="live_monitoring_interval_descr">Задайце інтэрвал сеткавага сачэння.</string>
-	<string name="live_monitoring_interval">Інтэрвал сеткавага сачэньня</string>
+	<string name="live_monitoring_interval_descr">Задайце інтэрвал сеціўнага сачэння.</string>
+	<string name="live_monitoring_interval">Інтэрвал сеціўнага сачэння</string>
 	<string name="live_monitoring_url_descr">Задайце вэб-адрас з наступнымі параметрамі: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
-	<string name="live_monitoring_url">Вэб-адрас для сеткавага сачэньня</string>
-	<string name="gpx_monitoring_disabled_warn">Запісвайце сьлед выкарыстоўваючы GPX-віджэт ці пункт мэню \"Запіс падарожжа\".</string>
-	<string name="show_current_gpx_title">Паказаць бягучы сьлед</string>
+	<string name="live_monitoring_url">Вэб-адрас для сеціўнага сачэння</string>
+	<string name="gpx_monitoring_disabled_warn">Запісвайце след выкарыстоўваючы GPX-віджэт ці пункт меню \"Запіс падарожжа\".</string>
+	<string name="show_current_gpx_title">Паказаць бягучы след</string>
 	    
-	<string name="free_version_message">Вы можаце сьцягнуць ці абнавіль %1$s мап.</string>
-	<string name="free_version_title">Бясплатная вэрсія</string>
+	<string name="free_version_message">Вы можаце спампаваць ці абнавіць %1$s мапаў.</string>
+	<string name="free_version_title">Бясплатная версія</string>
 	<string name="poi_context_menu_showdescription">Паказваць апісанні POI.</string>
-	<string name="index_name_north_america">Паўночная Амэрыка</string>
-	<string name="index_name_us">Паўночная Амэрыка - Злучаныя Штаты</string>
-	<string name="index_name_central_america">Цэнтральная Амэрыка</string>
-	<string name="index_name_south_america">Паўднёвая Амэрыка</string>
-	<string name="index_name_europe">Эўропа</string>
-	<string name="index_name_france">Эўропа - Францыя</string>
-	<string name="index_name_germany">Эўропа - Германія</string>
+	<string name="index_name_north_america">Паўночная Амерыка</string>
+	<string name="index_name_us">Паўночная Амерыка - Злучаныя Штаты</string>
+	<string name="index_name_central_america">Цэнтральная Амерыка</string>
+	<string name="index_name_south_america">Паўднёвая Амерыка</string>
+	<string name="index_name_europe">Еўропа</string>
+	<string name="index_name_france">Еўропа - Францыя</string>
+	<string name="index_name_germany">Еўропа - Германія</string>
 	<string name="index_name_russia">РФ</string>
 	<string name="index_name_africa">Афрыка</string>
 	<string name="index_name_asia">Азія</string>
 	<string name="index_name_oceania">Аўстралія і Акіянія</string>
-	<string name="index_name_other">Сусьветныя і тэматычныя мапы</string>
-	<string name="index_name_wiki">Сусьветная Вікіпэдыя</string>
-	<string name="index_name_voice">Галасавыя падказкі (запісаныя, абмежаваныя магчымасьці)</string>
+	<string name="index_name_other">Сусветныя і тэматычныя мапы</string>
+	<string name="index_name_wiki">Сусветная Вікіпедыя</string>
+	<string name="index_name_voice">Галасавыя падказкі (запісаныя, абмежаваныя магчымасці)</string>
 	<string name="index_name_tts_voice">Галасавыя падказкі (TTS, пажадана)</string>
-	<string name="amenity_type_osmwiki">Вікіпэдыя (пазасеціўная)</string>
+	<string name="amenity_type_osmwiki">Вікіпедыя (пазасеціўная)</string>
 	<string name="amenity_type_user_defined">Вызначанае карыстальнікам</string>
-	<string name="fav_export_confirmation">Файл з экспартаванымі ўпадабанымі ўжо існуе. Замяніць яго?</string>
+	<string name="fav_export_confirmation">Файл з экспартаванымі ўлюбёнымі ўжо існуе. Замяніць яго\?</string>
 	<string name="profile_settings">Налады профіля</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="general_settings">Агульныя</string>
-	<string name="general_settings_descr">Налады экрану і агульныя налады прыкладання.</string>
-	<string name="global_app_settings">Агульныя налады праграмы</string>
-	<string name="user_name">Ваша імя карыстальніка OSM</string>
+	<string name="general_settings_descr">Налады экрана і агульныя налады дадатка.</string>
+	<string name="global_app_settings">Агульныя налады дадатка</string>
+	<string name="user_name">Вашае імя карыстальніка OSM</string>
 	<string name="open_street_map_login_descr">Патрэбна для прадстаўлення ў openstreetmap.org.</string>
 	<string name="user_password">Ваш пароль OSM</string>
 	
@@ -600,26 +600,24 @@
 		
 	
 	
-	<string name="download_files_not_enough_space">Няма вольнага месца каб сьцягнуць %1$s МБ (вольна: %2$s).</string>
-	<string name="download_files_question_space">Сьцягнуць {0} файл(аў)?
- Выкарыстоўваецца {1} МБ.
- (Зараз ё {2} МБ вольнага месца.)</string>
+	<string name="download_files_not_enough_space">Не стае вольнага месца для спампоўвання %1$s МБ (вольна: %2$s).</string>
+	<string name="download_files_question_space">Спампаваць {0} файл(аў)\? Выкарыстоўваецца {1} МБ. (Зараз ё {2} МБ вольнага месца.)</string>
 	
 	
 	
 	<string name="use_transparent_map_theme">Празрыстая тэма</string>
-	<string name="native_library_not_supported">Свойскія бібліятэкі не падтрымліваюцца гэтай прыладай.</string>
-	<string name="init_native_library">Ініцыалізацыя свойскіх бібліятэк…</string>
+	<string name="native_library_not_supported">Уласныя бібліятэкі не падтрымліваюцца гэтай прыладай.</string>
+	<string name="init_native_library">Ініцыалізацыя ўласных бібліятэк…</string>
 	<string name="choose_auto_follow_route">Аўтаматычнае цэнтраванне мапы</string>
 	<string name="choose_auto_follow_route_descr">Час, праз які мапа вернецца да цяперашняга становішча.</string>
 	
-	<string name="auto_follow_route_navigation">Аўтаматычнае цэнтраваньне толькі падчас навігацыі</string>
-	<string name="auto_follow_route_navigation_descr">Аўтаматычнае цэнтраваньне толькі падчас навігацыі.</string>
-	<string name="auto_follow_location_enabled">Аўтаматычнае цэнтраваньне падчас карыстаньня.</string>
-	<string name="pref_vector_rendering">Налады вэктарнай адмалёўкі</string>
-	<string name="pref_overlay">Ніжні і верхні слаі</string>
+	<string name="auto_follow_route_navigation">Аўтаматычнае цэнтраванне толькі падчас навігацыі</string>
+	<string name="auto_follow_route_navigation_descr">Аўтаматычнае цэнтраванне толькі падчас навігацыі.</string>
+	<string name="auto_follow_location_enabled">Аўтаматычнае цэнтраванне падчас выкарыстання.</string>
+	<string name="pref_vector_rendering">Налады вектарнай адмалёўкі</string>
+	<string name="pref_overlay">Ніжні/верхні пласты</string>
 	<string name="pref_raster_map">Налады крыніцы мапы</string>
-	<string name="pref_vector_map">Налады вэктарнай мапы</string>
+	<string name="pref_vector_map">Налады вектарнай мапы</string>
 	<string name="delete_confirmation_msg">Выдаліць %1$s?</string>
 	<string name="city_type_suburb">Мікрараён</string>
 	<string name="city_type_hamlet">Вёска</string>
@@ -627,80 +625,80 @@
 	<string name="city_type_town">Мястэчка</string>
 	<string name="city_type_city">Горад</string>
 	
-	<string name="animate_route_off">Спыніць мадэляваньне</string>
-	<string name="animate_route">Пачаць мадэляваньне</string>
+	<string name="animate_route_off">Спыніць мадэляванне</string>
+	<string name="animate_route">Пачаць мадэляванне</string>
 	
-	<string name="file_can_not_be_renamed">Файл ня можа быць пераназваны.</string>
+	<string name="file_can_not_be_renamed">Немагчыма змяніць назву файла.</string>
 	<string name="file_with_name_already_exists">Файл з такой назвай ужо існуе.</string>
 	<string name="shared_string_gpx_route">GPX-маршрут</string>
-	<string name="poi_query_by_name_matches_categories">Некалькі катэгорый POI знойдзены, што адпавядаюць запыту:</string>
-	<string name="data_to_search_poi_not_available">Лякальных зьвестак для пошуку POI няма.</string>
+	<string name="poi_query_by_name_matches_categories">Знойдзена екалькі катэгорый POI, што адпавядаюць запыту:</string>
+	<string name="data_to_search_poi_not_available">Лакальныя даныя для пошуку POI адсутнічаюць.</string>
 	<string name="poi_filter_by_name">Пошук па назве</string>
 	<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="update_poi_file_not_found">Лакальны файл для падтрымкі змен у POI не знойдзены і не можа быць створаны.</string>
+	<string name="button_upgrade_osmandplus">Палепшыць да OsmAnd+</string>
+	<string name="map_version_changed_info">Спампаваць новую версію дадатка, каб мець магчымасць выкарыстоўваць новыя файлы мапаў.</string>
 	
-	<string name="poi_filter_nominatim">Сеткавы Nominatim</string>
-	<string name="search_position_current_location_search">Вызначэньне становішча…</string>
+	<string name="poi_filter_nominatim">Сеціўны Nominatim</string>
+	<string name="search_position_current_location_search">Вызначэнне становішча…</string>
 	<string name="search_position_current_location_found">Маё становішча (знойдзена)</string>
 	<string name="search_position_address">Адрас…</string>
-	<string name="search_position_favorites">Упадабаныя…</string>
+	<string name="search_position_favorites">Улюбёныя…</string>
 	<string name="search_position_undefined">Нявызначана</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="route_successfully_saved_at">Маршрут захаваны як \'%1$s\'.</string>
 	<string name="filename_input">Назва файла:</string>
 	<string name="file_with_name_already_exist">Файл з такой назвай ужо існуе.</string>
 	
-	<string name="local_index_upload_gpx_description">Адаслаць GPX-файлы ў OSM-супальнасць для паляпшэння мап.</string>
+	<string name="local_index_upload_gpx_description">Адаслаць GPX-файлы ў OSM-супальнасць для паляпшэння мапаў.</string>
 	<string name="local_index_items_uploaded">%1$d з %2$d аб\'ектаў адасланыя.</string>
 	<string name="local_index_mi_upload_gpx">Адаслаць у OSM</string>
-	<string name="show_more_map_detail">Паказаць больш дэталей мапы</string>
+	<string name="show_more_map_detail">Паказаць больш дэталяў мапы</string>
 	<string name="show_more_map_detail_descr">Паказаць некаторыя дэталі вектарнай мапы (дарогі і іншыя) на меншым маштабе.</string>
-	<string name="favourites_delete_multiple_succesful">Упадабаныя пункты выдаленыя.</string>
-	<string name="favorite_delete_multiple">Вы збіраецеся выдаліць %1$d упадабаных і %2$d груп упадабаных. Вы ўпэўненыя?</string>
+	<string name="favourites_delete_multiple_succesful">Улюбёныя пункты выдаленыя.</string>
+	<string name="favorite_delete_multiple">Вы збіраецеся выдаліць %1$d улюбёных і %2$d груп улюбёных. Вы ўпэўненыя\?</string>
 	<string name="favorite_home_category">Дом</string>
 	<string name="favorite_friends_category">Сябры</string>
 	<string name="favorite_places_category">Месцы</string>
 	<string name="shared_string_others">Іншае</string>
-	<string name="shared_string_name">Назва</string>
+	<string name="shared_string_name">Імя</string>
 	<string name="favourites_edit_dialog_category">Катэгорыя</string>
 	<string name="shared_string_no_thanks">Не, дзякуй</string>
-	<string name="basemap_missing">Сьцягнуць асноўную мапу сьвету, каб мець агляд усяго сьвету на малых узроўнях набліжэння.</string>
-	<string name="vector_data_missing">Сьцягнуць даныя, каб выкарыстоўваць мапы аўтаномна.</string>
+	<string name="basemap_missing">Спампаваць асноўную мапу свету, каб мець агляд усяго свету на малых узроўнях набліжэння.</string>
+	<string name="vector_data_missing">Спампаваць даныя, каб выкарыстоўваць мапы аўтаномна.</string>
 	<string name="local_index_gpx_info_show">"
 \n
-\nДоўга ўтрымлівайце для наладаў"</string>
+\nДоўга ўтрымлівайце для паказу параметраў"</string>
 	
 	
 	
-	<string name="local_index_installed">Лякальная вэрсія</string>
+	<string name="local_index_installed">Лакальная версія</string>
 	<string name="local_index_items_backuped">%1$d з %2$d аб\'ектаў дэактываваныя.</string>
 	<string name="local_index_items_deleted">%1$d з %2$d аб\'ектаў выдаленыя.</string>
 	<string name="local_index_items_restored">%1$d з %2$d аб\'ектаў актываваныя.</string>
 	<string name="local_index_no_items_to_do">Няма аб\'ектаў да %1$s</string>
-	<string name="local_index_action_do">Вы зьбіраецеся %1$s %2$s аб\'ектаў. Працягнуць?</string>
+	<string name="local_index_action_do">Вы збіраецеся %1$s %2$s аб\'ектаў. Працягнуць\?</string>
 	<string name="local_index_descr_title">Кіраваць файламі мапаў.</string>
 	<string name="local_index_mi_restore">Актываваць</string>
 	<string name="local_index_mi_backup">Дэактываваць</string>
 	
 	
-	<string name="local_index_poi_data">Зьвесткі POI</string>
+	<string name="local_index_poi_data">Даныя POI</string>
 	<string name="local_index_address_data">Адрас</string>
-	<string name="local_index_transport_data">Зьвесткi грамадзкага транспарту</string>
-	<string name="local_index_map_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_poi">Зьвесткі POI</string>
-	<string name="ttsvoice">TTS голас</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>
+	<string name="map_text_size_descr">Абярыце памер шрыфту для назваў на мапе.</string>
 	<string name="map_text_size">Памер шрыфту мапы</string>
 	<string name="trace_rendering">Адладачная інфармацыя пра адмалёўку</string>
 	<string name="trace_rendering_descr">Паказаць прадукцыйнасць адмалёўкі.</string>
@@ -708,38 +706,40 @@
 	
 	
 	
-	<string name="installing_new_resources">Распакоўваюцца новыя дадзеныя…</string>
-	<string name="internet_connection_required_for_online_route">Абраны сеткавы навігацыйны сэрвіс, але вы не злучаныя з Інтэрнэтам.</string>
+	<string name="installing_new_resources">Распакоўваюцца новыя даныя…</string>
+	<string name="internet_connection_required_for_online_route">Вы абралі сеціўны навігацыйны сэрвіс, але злучэнне з Інтэрнэтам адсутнічае.</string>
 	<string name="tts_language_not_supported_title">Мова не падтрымліваецца</string>
-	<string name="tts_language_not_supported">Абраная мова не падтрымліваецца устаноўленым Android TTS (пераўтварэньне тэксту ў гук). Пашукаць іншы 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="tts_language_not_supported">Абраная мова не падтрымліваецца ўсталяваным Android TTS (пераўтварэнне тэксту ў гук). Пашукаць іншы 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_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="overlay_transparency_descr">Змяніць празрыстасьць накладзенага слою.</string>
-	<string name="overlay_transparency">Празрыстасьць накладаньня</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="overlay_transparency_descr">Змяніць празрыстаць накладзенага пласта.</string>
+	<string name="overlay_transparency">Празрыстасць накладкі</string>
 	<string name="map_transparency_descr">Змяніць празрыстасць асноўнай мапы.</string>
-	<string name="map_transparency">Празрыстасьць асноўнай мапы</string>
+	<string name="map_transparency">Празрыстасць асноўнай мапы</string>
 	<string name="layer_underlay">Мапа падкладкі…</string>
 	<string name="map_underlay">Мапа падкладкі</string>
 	<string name="map_underlay_descr">Абраць мапу для падкладкі.</string>
-	<string name="layer_overlay">Мапа пакрыцьця…</string>
-	<string name="map_overlay">Мапа для накладаньня</string>
+	<string name="layer_overlay">Накладзеная мапа…</string>
+	<string name="map_overlay">Мапа для накладання</string>
 	<string name="map_overlay_descr">Абраць мапу для накладання.</string>
 	<string name="tile_source_already_installed">Мапа ўжо ўсталяваная, «Налады» будуць абноўленыя.</string>
-	<string name="select_tile_source_to_install">Выберыце (растравыя) мапы для ўсталёўкі або абнаўлення.</string>
-	<string name="internet_not_available">Не магчыма выканаць аперацыю без падлучэнне да Інтэрнэту.</string>
+	<string name="select_tile_source_to_install">Абярыце (растравыя) мапы для ўсталёўкі або абнаўлення.</string>
+	<string name="internet_not_available">Немагчыма выканаць аперацыю без падлучэнне да Інтэрнэту.</string>
 	<string name="install_more">Усталяваць яшчэ…</string>
-	<string name="level_to_switch_vector_raster_descr">Выкарыстоўваць растравыя мапы для ўсяго да гэтага ўзроўню.</string>
-	<string name="level_to_switch_vector_raster">Мінімальнае ўзровнь набліжэння для вектарных мапаў</string>
+	<string name="level_to_switch_vector_raster_descr">Выкарыстоўваць агульныя растравыя мапы да гэтага ўзроўня.</string>
+	<string name="level_to_switch_vector_raster">Мінімальны ўзровень набліжэння для вектарных мапаў</string>
 	
 	
 	
@@ -747,8 +747,8 @@
 	<string name="search_offline_geo_error">Немагчыма апрацаваць запыт \'%s\'.</string>
 	<string name="search_osm_offline">Пошук па геаграфічнаму становішчу</string>
 	<string name="system_locale">Сістэмная</string>
-	<string name="preferred_locale_descr">Выбар мовы адлюстравання (набудзе сілу пасля перазапуску OsmAnd).</string>
-	<string name="preferred_locale">Мова інтэрфэйсу</string>
+	<string name="preferred_locale_descr">Абраць мову адлюстравання (набудзе моц пасля перазапуску OsmAnd).</string>
+	<string name="preferred_locale">Мова інтэрфейсу</string>
 	<string name="incomplete_locale">няпоўны</string>
 	
 	
@@ -758,23 +758,24 @@
 	
 	
 	
-	<string name="unit_of_length_descr">Змяніць адзінкі вымярэння адлегласцей.</string>
+	<string name="unit_of_length_descr">Змяніць адзінкі вымярэння адлегласцяў.</string>
 	<string name="unit_of_length">Адзінкі даўжыні</string>
 	<string name="si_mi_feet">Мілі/футы</string>
 	<string name="si_mi_yard">Мілі/ярды</string>
 	<string name="si_km_m">Кіламетры/метры</string>
 	<string name="yard">ярд</string>
 	<string name="foot">фут</string>
-	<string name="mile_per_hour">мл/г</string>
-	<string name="mile">мл</string>
+	<string name="mile_per_hour">м/г</string>
+	<string name="mile">міл</string>
 	<string name="send_location_way_choose_title">Даслаць каардынаты праз</string>
-	<string name="send_location_sms_pattern">Месцазнаходжаньне: %1$s\n%2$s</string>
-	<string name="send_location_email_pattern">Каб убачыць месцазнаходжаньне націсьніце на спасылку %1$s ці android-спасылку %2$s</string>
+	<string name="send_location_sms_pattern">Месцазнаходжанне: %1$s
+\n%2$s</string>
+	<string name="send_location_email_pattern">Каб убачыць месцазнаходжанне націсніце на спасылку %1$s ці android-спасылку %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="context_menu_item_add_waypoint">Дадаць 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">Перашкода</string>
 	<string name="amenity_type_education">Адукацыя</string>
@@ -784,7 +785,7 @@
 	<string name="amenity_type_geocache">Геакэшынг</string>
 	<string name="amenity_type_healthcare">Ахова здароўя</string>
 	<string name="amenity_type_historic">Гістарычны</string>
-	<string name="amenity_type_landuse">Землекарыстаньне</string>
+	<string name="amenity_type_landuse">Землекарыстанне</string>
 	<string name="amenity_type_leisure">Вольны час</string>
 	<string name="amenity_type_man_made">Антрапагеннае</string>
 	<string name="amenity_type_military">Ваеннае</string>
@@ -796,144 +797,144 @@
 	<string name="amenity_type_sustenance">Ежа</string>
 	<string name="amenity_type_tourism">Турызм</string>
 	<string name="amenity_type_transportation">Транспарт</string>
-	<string name="indexing_address">Індэксаваньне адрасоў…</string>
-	<string name="indexing_map">Індэксаваньне мапаў…</string>
-	<string name="indexing_poi">Індэксаваньне POI…</string>
+	<string name="indexing_address">Індэксаванне адрасоў…</string>
+	<string name="indexing_map">Індэксаванне мапаў…</string>
+	<string name="indexing_poi">Індэксаванне POI…</string>
 	<string name="indexing_transport">Індэксуецца транспарт…</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">Бліжэйшыя POI</string>
-	<string name="poi_filter_custom_filter">Свой фільтр</string>
-	<string name="poi_filter_namefinder">Сеткавы NameFinder</string>
-	<string name="reading_cached_tiles">Чытаньне захаваных фрагмэнтаў…</string>
-	<string name="version_index_is_big_for_memory">Недастаткова памяці для лякальнай мапы \'\'{0}\'\'</string>
+	<string name="poi_filter_custom_filter">Адвольны фільтр</string>
+	<string name="poi_filter_namefinder">Сеціўны NameFinder</string>
+	<string name="reading_cached_tiles">Чытанне захаваных фрагментаў…</string>
+	<string name="version_index_is_big_for_memory">Недастаткова памяці для лакальнай мапы \'\'{0}\'\'</string>
 	<string name="version_index_is_not_supported">Версія індэкса \'\'{0}\'\' не падтрымліваецца</string>
 	
 	
-	<string name="osmand_routing_experimental">Аўтаномная навігацыя OsmAnd зьяўляецца экспэрыментальнай і не працуе на доўгіх адлегласьцях каля 20 км.
-\n
+	<string name="osmand_routing_experimental">Аўтаномная навігацыя OsmAnd з’яўляецца эксперыментальнай і не працуе на доўгіх адлегласцях каля 20 км. 
+\n 
 \nНавігацыя часова пераключаецца на сэрвіс CloudMade.</string>
-	<string name="specified_dir_doesnt_exist">Указаны каталог не знойдзены.</string>
-	<string name="application_dir">Каталёг захоўваньня зьвестак</string>
+	<string name="specified_dir_doesnt_exist">Вызначаны каталог не знойдзены.</string>
+	<string name="application_dir">Каталог захоўвання даных</string>
 	
-	<string name="osmand_net_previously_installed">Усе аўтаномныя даныя ў старой усталяванай праграме будуць падтрымлівацца новай, але ўпадабаныя кропкі трэба экспартаваць са старой версіі і імпартаваць у новую.</string>
+	<string name="osmand_net_previously_installed">Усе аўтаномныя даныя ў старой усталяванай праграме будуць падтрымлівацца новай, але ўлюбёныя пункты патрэбна экспартаваць са старой версіі і імпартаваць у новую.</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_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 не ўсталяваная. Пашукаць ў краме?</string>
-	<string name="voice_is_not_available_msg">Галасавыя каманды недаступныя. Калі ласка, перайдзіце ў «Налады» → «Налады навігацыі» → «Галасавыя дадзеныя» і абярыце ці сцягніце пакет галасавых падказак.</string>
+	<string name="select_build_to_install">Абярыце зборку OsmAnd для ўсталёўкі</string>
+	<string name="gps_status_app_not_found">Дадатак стану GPS не ўсталяваны. Пашукаць ў краме\?</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>
 	<string name="daynight_mode_auto">Усход/Захад</string>
-	<string name="daynight_mode_sensor">Сэнсар сьвятла</string>
+	<string name="daynight_mode_sensor">Датчык святла</string>
 	<string name="daynight_descr">Абярыце абгрунтаванне пераключэння рэжыму дзень/ноч.</string>
 	<string name="daynight">Рэжым дзень/ноч</string>
-	<string name="download_files_question">Сьцягнуць {0} файл(ы) ({1} МБ)?</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="fast_route_mode">Найхутчэйшы шлях</string>
-	<string name="fast_route_mode_descr">Пазначыць каб разлічваць найхутчэйшы шлях, ці зняць пазнаку для паліўна-ашчаднага шляху.</string>
-	<string name="tiles_to_download_estimated_size">На маштабе {0} сьцягнуць {1} фрагмэнтаў ({2} МБ)</string>
-	<string name="shared_string_download_map">Сьцягнуць мапу</string>
-	<string name="select_max_zoom_preload_area">Выберыце максімальнае павелічэньне для папярэдняй загрузкі</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>
+	<string name="fast_route_mode_descr">Уключыць, каб разлічваць найхутчэйшы шлях, ці выключыць для паліўна-ашчаднага шляху.</string>
+	<string name="tiles_to_download_estimated_size">На маштабе {0} спампаваць {1} фрагментаў ({2} МБ)</string>
+	<string name="shared_string_download_map">Спампаваць мапу</string>
+	<string name="select_max_zoom_preload_area">Абярыце максімальнае павелічэньне для папярэдняй загрузкі</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>
 	<string name="renderer_load_sucess">Адмалёўшчык загружаны</string>
-	<string name="renderer_load_exception">Не атрымалася загрузіць адмалёўнік</string>
+	<string name="renderer_load_exception">Не атрымалася загрузіць адмалёўшчык</string>
 	<string name="renderers">Адмалёўка вектарнай мапы</string>
 	<string name="show_point_options">Гэтае месца…</string>
 	<string name="renderers_descr">Абярыце стыль адмалёўкі мапы.</string>
 	<string name="poi_context_menu_website">Паказаць сайт POI</string>
 	<string name="poi_context_menu_call">Паказаць тэлефон POI</string>
 	<string name="download_type_to_filter">фільтраваць</string>
-	<string name="use_high_res_maps">Дысплей высокай рэзалюцыі</string>
-	<string name="use_high_res_maps_descr">Не расцягваць (з размыццём) фрагменты мапы на дысплэях з высокай шчыльнасцю.</string>
+	<string name="use_high_res_maps">Дысплей з высокай раздзяляльнай здольнасцю</string>
+	<string name="use_high_res_maps_descr">Не расцягваць (з размыццём) фрагменты мапы на дысплеях з высокай шчыльнасцю.</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="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_again">Шукаць транспарт зноў</string>
 	
 	<string name="voice">Запісаны голас</string>
-	<string name="no_vector_map_loaded">Вектарныя мапы не былі загружаны</string>
+	<string name="no_vector_map_loaded">Вектарныя мапы не былі загружаныя</string>
 	
-	<string name="gpx_files_not_found">GPX файлы не знойдзены ў каталогу tracks</string>
+	<string name="gpx_files_not_found">GPX-файлаў не знойдзена ў каталогзе слядоў</string>
 	<string name="layer_gpx_layer">GPX-файлы…</string>
 	<string name="error_reading_gpx">Не атрымалася прачытаць GPX-даныя</string>
-	<string name="vector_data">Лакальныя вектарныя мапы</string>
+	<string name="vector_data">Пазасеціўныя вектарныя мапы</string>
 	<string name="transport_context_menu">Шукаць транспарт на прыпынку</string>
 	
 	
-	<string name="poi_context_menu_modify">Правіць POI</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>
-	<string name="rotate_map_to_bearing_descr">Абраць раўнаваньне мапы.</string>
+	<string name="rotate_map_to_bearing_descr">Абраць выроўніванне мапы.</string>
 	<string name="rotate_map_to_bearing">Арыентацыя мапы</string>
-	<string name="show_route">Падрабязнасьці маршруту</string>
-	<string name="fav_imported_sucessfully">Упадабаныя імпартаваныя</string>
-	<string name="fav_file_to_load_not_found">GPX-файл з упадабанымі не знойдзены ў {0}</string>
-	<string name="fav_saved_sucessfully">Упадабаныя захаваныя ў {0}</string>
-	<string name="no_fav_to_save">Няма ўпадабаных месцаў для захоўвання</string>
+	<string name="show_route">Падрабязнасці маршруту</string>
+	<string name="fav_imported_sucessfully">Улюбёныя імпартаваныя</string>
+	<string name="fav_file_to_load_not_found">GPX-файл з улюбёнымі не знойдзены ў {0}</string>
+	<string name="fav_saved_sucessfully">Улюбёныя захаваныя ў {0}</string>
+	<string name="no_fav_to_save">Улюбёныя месцы для захавання адсутнічаюць</string>
 	
 	<string name="error_occurred_loading_gpx">Не атрымалася загрузіць GPX</string>
 	<string name="send_report">Даслаць справаздачу</string>
-	<string name="none_region_found">Не атрымалася знайсці спампованых мап на картцы памяці.</string>
-	<string name="poi_namefinder_query_empty">Надрукуйце для пошуку POI</string>
+	<string name="none_region_found">На картцы памяці не атрымалася знайсці спампаваных мапаў.</string>
+	<string name="poi_namefinder_query_empty">Увядзіце для пошуку POI</string>
 	<string name="any_poi">Усе</string>
 	
 	<string name="thanks_yandex_traffic">Дзякуй Яндэксу за дарожную інфармацыю.</string>
 	<string name="layer_yandex_traffic">Яндэкс заторы</string>
 	<string name="layer_route">Маршрут</string>
-	<string name="layer_osm_bugs">OSM-нататкі (анлайн)</string>
+	<string name="layer_osm_bugs">OSM-нататкі (у сеціве)</string>
 	
 	<string name="layer_poi">POI-накладка…</string>
 	<string name="layer_map">Крыніца мапы…</string>
-	<string name="menu_layers">Слаі мапы</string>
+	<string name="menu_layers">Пласты мапы</string>
 	<string name="context_menu_item_search_poi">Пошук POI</string>
 	<string name="use_trackball_descr">Выкарыстоўвайце трэкбол для перамяшчэння мапы.</string>
 	<string name="use_trackball">Выкарыстоўвайце трэкбол</string>
 	<string name="background_service_wait_int_descr">Задае максімальна дазволены час чакання для кожнага фонавага вызначэння становішча.</string>
-	<string name="background_service_wait_int">Максімальны час чаканьня вызначэньня каардынат</string>
+	<string name="background_service_wait_int">Максімальны час чакання вызначэння каардынат</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_seconds">секунд</string>
 	<string name="int_min">хв.</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_int">Інтэрвал абуджэння GPS</string>
+	<string name="background_service_provider_descr">Абраць крыніцу месцазнаходжання для выкарыстання фонавым сэрвісам.</string>
 	<string name="background_service_provider">Крыніца каардынат</string>
-	<string name="background_router_service_descr">Адсочвае ваша становішча пры адключаным экране.</string>
-	<string name="background_router_service">Запусьціць OsmAnd у фоне</string>
-	<string name="off_router_service_no_gps_available">Фонаваму сэрвісу неабходная інфармацыя пра месцазнаходжаньне.</string>
+	<string name="background_router_service_descr">Адсочвае вашае становішча пры адключаным экране.</string>
+	<string name="background_router_service">Запусціць OsmAnd у фоне</string>
+	<string name="off_router_service_no_gps_available">Фонаваму сэрвісу неабходная інфармацыя пра месцазнаходжанне.</string>
 	<string name="hide_poi_filter">Схаваць фільтр</string>
 	<string name="show_poi_filter">Паказаць фільтр</string>
 	<string name="search_poi_filter">Фільтраваць</string>
 	<string name="menu_mute_off">Гук уключаны</string>
 	<string name="menu_mute_on">Гук выключаны</string>
-	<string name="voice_provider_descr">Выберыце галасавыя падказкі для навігацыі.</string>
+	<string name="voice_provider_descr">Абярыце галасавыя падказкі для навігацыі.</string>
 	<string name="voice_provider">Галасавыя падказкі</string>
-	<string name="voice_data_initializing">Ініцыялізуюцца галасавыя дадзеныя …</string>
-	<string name="voice_data_not_supported">Непадтрымліваемая версія галасавых дадзеных</string>
-	<string name="voice_data_corrupted">Абраныя галасавыя дадзеныя пашкоджаны</string>
-	<string name="voice_data_unavailable">Абраныя галасавыя дадзеныя не даступныя</string>
-	<string name="sd_unmounted">Картка памяці не даступная.
-\nВы не зможаце бачыць мапу або штосьці знайсці.</string>
-	<string name="sd_mounted_ro">Картка памяці толькі для чытання.
-\nЗараз можна ўбачыць толькі загружаную мапу, а не загружаць новуя вобласці.</string>
+	<string name="voice_data_initializing">Ініцыялізуюцца галасавыя даныя …</string>
+	<string name="voice_data_not_supported">Непадтрымліваемая версія галасавых даных</string>
+	<string name="voice_data_corrupted">Абраныя галасавыя даныя пашкоджаныя</string>
+	<string name="voice_data_unavailable">Абраныя галасавыя даныя недаступныя</string>
+	<string name="sd_unmounted">Картка памяці недаступная. 
+\nВы не зможаце ўбачыць мапу або штосці знайсці.</string>
+	<string name="sd_mounted_ro">Картка памяці даступная толькі для чытання. 
+\nЗараз можна ўбачыць толькі загружаную мапу, а не загружаць новыя вобласці.</string>
 	<string name="unzipping_file">Файл распакоўваецца…</string>
 	<string name="route_tr">Паварочвайце направа і рухайцеся</string>
 	<string name="route_tshr">Рэзка паварочвайце направа і рухайцеся</string>
@@ -944,15 +945,15 @@
 	<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>
+	<string name="map_orientation_default">Як у прылады</string>
+	<string name="map_orientation_portrait">Вертыкальная</string>
 	<string name="map_orientation_landscape">Гарызантальная</string>
-	<string name="map_screen_orientation">Арыентацыя экрану</string>
-	<string name="map_screen_orientation_descr">Вертыкальная, гарызантальная, ці як прылада.</string>
+	<string name="map_screen_orientation">Арыентацыя экрана</string>
+	<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>
@@ -961,66 +962,66 @@
 	<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_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">Транспарт</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>
-	<string name="update_poi_error_local">Не атрымалася абнавіць лакальны POI-спіс</string>
-	<string name="update_poi_error_loading">Не атрымалася загрузіць даных з сервера</string>
-	<string name="update_poi_no_offline_poi_index">Для гэтай мясцовасьці адсутнічаюць лякальныя дадзеныя пра POI</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>
+	<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_map_confirm">Абнавіць лякальныя даныя з Інтэрнэту?</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>
-	<string name="search_history_int_streets">Скрыжаваньне: {0} х {1} праз {2}</string>
+	<string name="search_history_int_streets">Скрыжаванне: {0} х {1} праз {2}</string>
 	<string name="search_history_building">Будынак: {0}, {1}, {2}</string>
-	<string name="favorite">Упадабанае</string>
-	<string name="uploading_data">Адсылка дадзеных…</string>
-	<string name="uploading">Адсылка…</string>
+	<string name="favorite">Улюбёнае</string>
+	<string name="uploading_data">Запампоўванне даных…</string>
+	<string name="uploading">Запампоўванне…</string>
 	<string name="search_nothing_found">Нічога не знойдзена</string>
 	<string name="searching">Пошук…</string>
 	<string name="searching_address">Пошук адрасу…</string>
-	<string name="search_osm_nominatim">Сеткавы пошук праз OSM Nominatim</string>
-	<string name="hint_search_online">Інтэрнэт-пошук: горад, вуліца, дом</string>
+	<string name="search_osm_nominatim">Сеціўны пошук праз OSM Nominatim</string>
+	<string name="hint_search_online">Сеціўны пошук: горад, вуліца, дом</string>
 	<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="route_general_information">Агульная адлегласьць %1$s, час у дарозе %2$d г. %3$d хв.</string>
+	<string name="max_level_download_tile">Максімальнае павелічэнне сеціўных мапаў</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">Каталог на карце памяці недаступны для захоўваньня!</string>
-	<string name="download_question">Сьцягнуць {0} - {1} ?</string>
-	<string name="download_question_exist">Лакальная мапа для {0} ужо існуе ({1}). Абнавіць ({2})?</string>
+	<string name="sd_dir_not_accessible">Каталог на картцы памяці непрыдатны для захавання!</string>
+	<string name="download_question">Спампаваць {0} - {1} \?</string>
+	<string name="download_question_exist">Пазасеціўная мапа для {0} ужо існуе ({1}). Абнавіць ({2})\?</string>
 	<string name="address">Адрас</string>
 	
 	
-	<string name="downloading_list_indexes">Сьцягваецца сьпіс даступных рэгіёнаў…</string>
+	<string name="downloading_list_indexes">Спампоўваецца спіс даступных рэгіёнаў…</string>
 	<string name="list_index_files_was_not_loaded">Не ўдалося атрымаць спіс рэгіёнаў з https://osmand.net.</string>
 	
-	<string name="fav_points_edited">Упадабаны пункт быў зьменены</string>
-	<string name="fav_points_not_exist">Няма ўпадабаных месцаў</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="mark_final_location_first">Абярыце спачатку месца прызначэньня</string>
+	<string name="mark_final_location_first">Спачатку абярыце пункт прызначэння</string>
 	<string name="get_directions">Навігацыя</string>
 	
 	<string name="opening_hours">Гадзіны працы</string>
-	<string name="opening_changeset">Адкрыцьцё пакета паправак…</string>
-	<string name="closing_changeset">Закрыцьцё пакета паправак…</string>
-	<string name="commiting_node">Захаваньне аб\'екта…</string>
-	<string name="loading_poi_obj">Чытаньне POI…</string>
+	<string name="opening_changeset">Адкрыццё набору правак…</string>
+	<string name="closing_changeset">Закрыццё набору правак…</string>
+	<string name="commiting_node">Захаванне аб\'екта…</string>
+	<string name="loading_poi_obj">Загрузка POI…</string>
 	<string name="auth_failed">Не атрымалася выканаць аўтарызацыю</string>
 	<string name="failed_op">не ўдалося</string>
-	<string name="converting_names">Канвэртацыя мясцовых/ангельскіх назваў…</string>
+	<string name="converting_names">Канверсія мясцовых/англійскіх назваў…</string>
 	<string name="loading_streets_buildings">Загружаюцца вуліцы і дамы…</string>
 	<string name="loading_postcodes">Загружаюцца паштовыя індэксы…</string>
 	<string name="loading_streets">Загружаюцца вуліцы…</string>
@@ -1028,16 +1029,16 @@
 	
 	<string name="poi">POI</string>
 	<string name="error_occurred_saving_gpx">Не атрымалася захаваць GPX-файл</string>
-	<string name="error_calculating_route">Не ўдалося разлічыць маршрут</string>
-	<string name="error_calculating_route_occured">Не ўдалося разлічыць маршрут</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="invalid_locations">Несапраўдныя каардынаты</string>
+	<string name="new_route_calculated_dist">Новы шлях разлічаны, адлегласць</string>
+	<string name="arrived_at_destination">Вы прыбылі ў пункт прызначэння</string>
+	<string name="invalid_locations">Хібныя каардынаты</string>
 	<string name="go_back_to_osmand">Вярнуцца да мапы OsmAnd</string>
-	<string name="loading_data">Дадзеныя загружаюцца…</string>
-	<string name="reading_indexes">Чытаньне лякальных зьвестак…</string>
-	<string name="previous_run_crashed">Папярэдні старт OsmAnd скончыўся аварыйна. Хроніка запісаная ў файл {0}. Калі ласка, паведаміце пра праблему й прычапіце файл хронікі.</string>
+	<string name="loading_data">Даныя загружаюцца…</string>
+	<string name="reading_indexes">Чытанне лакальных даных…</string>
+	<string name="previous_run_crashed">Папярэдні старт OsmAnd скончыўся аварыйна. Хроніка запісаная ў файл {0}. Калі ласка, паведаміце пра праблему і дадайце лог.</string>
 	<string name="saving_gpx_tracks">Захаванне GPX-файла…</string>
 	<string name="finished_task">Скончана</string>
 	
@@ -1045,28 +1046,28 @@
 	
 	
 	<string name="use_online_routing_descr">Выкарыстоўваць Інтэрнэт для разліку маршруту.</string>
-	<string name="use_online_routing">Выкарыстоўваць онлайн навігацыю</string>
+	<string name="use_online_routing">Выкарыстоўваць сеціўную навігацыю</string>
 	<string name="osm_settings_descr">Задаць налады для OpenStreetMap.org (OSM), неабходныя для ўнёска.</string>
-	<string name="data_settings_descr">Выбар мовы, абнаўленне дадзеных.</string>
-	<string name="data_settings">Зьвесткі</string>
+	<string name="data_settings_descr">Выбар мовы, абнаўленне даных.</string>
+	<string name="data_settings">Даныя</string>
 	
-	<string name="osm_settings">Рэдагаваньне OSM</string>
+	<string name="osm_settings">Рэдагаванне OSM</string>
 	<string name="additional_settings">Дадатковыя налады</string>
-	<string name="save_current_track_descr">Захаваць гэты трэк зараз жа як GPX-файл.</string>
-	<string name="save_current_track">Захаваць гэты след</string>
-	<string name="save_track_interval">Інтэрвал захоўваньня падчас навігацыі</string>
-	<string name="save_track_interval_descr">Пазначыць інтэрвал захоўвання пунктаў следу падчас навігацыі.</string>
-	<string name="save_track_to_gpx_descrp">GPX-трэк аўтаматычна захаваны ў каталог track падчас навігацыі.</string>
-	<string name="save_track_to_gpx">Аўтаматычна запісваць трэк падчас навігацыі</string>
+	<string name="save_current_track_descr">Захаваць бягучы след зараз жа як GPX-файл.</string>
+	<string name="save_current_track">Захаваць бягучы след</string>
+	<string name="save_track_interval">Інтэрвал захавання падчас навігацыі</string>
+	<string name="save_track_interval_descr">Абраць інтэрвал захоўвання пунктаў следу падчас навігацыі.</string>
+	<string name="save_track_to_gpx_descrp">GPX-след аўтаматычна захаваны ў каталог слядоў падчас навігацыі.</string>
+	<string name="save_track_to_gpx">Аўтаматычна запісваць след падчас навігацыі</string>
 	<string name="update_tile">Абнавіць мапу</string>
-	<string name="reload_tile">Абнавіць фрагмэнт мапы</string>
-	<string name="mark_point">Цэль</string>
+	<string name="reload_tile">Абнавіць фрагмент мапы</string>
+	<string name="mark_point">Мэта</string>
 	
 	
 	
-	<string name="use_english_names_descr">Выбар паміж мясцовымі і ангельскімі назвамі.</string>
-	<string name="use_english_names">Выкарыстоўваць ангельскія назвы</string>
-	<string name="app_settings">Налады дастасавання</string>
+	<string name="use_english_names_descr">Выбар паміж мясцовымі і англійскімі назвамі.</string>
+	<string name="use_english_names">Выкарыстоўваць англійскія назвы</string>
+	<string name="app_settings">Налады дадатка</string>
 	<string name="search_address">Пошук адраса</string>
 	<string name="choose_building">Абраць будынак</string>
 	<string name="choose_street">Абраць вуліцу</string>
@@ -1074,37 +1075,37 @@
 	<string name="ChooseCountry">Абраць краіну</string>
 	<string name="show_view_angle">Адлюстроўваць напрамак позірку</string>
 	<string name="map_view_3d_descr">Уключыць 3D-выгляд для мапы.</string>
-	<string name="map_view_3d">3D від</string>
+	<string name="map_view_3d">3D-выгляд</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_descr">Абярыце крыніцу сеціўных альбо кэшаваных фрагментаў мапы.</string>
 	<string name="map_tile_source">Крыніца растравых мапаў</string>
 	<string name="map_source">Крыніца мапы</string>
 	<string name="use_internet">Выкарыстоўваць Інтэрнэт</string>
-	<string name="show_location">Паказаць ваша становішча</string>
+	<string name="show_location">Паказаць вашае становішча</string>
 	
 	
 	<string name="show_gps_coordinates_text">Паказаць GPS-каардынаты на мапе</string>
-	<string name="use_internet_to_download_tile">Сцягнуць адсутныя фрагменты мапы</string>
-	<string name="app_description">Навігацыйнае дастасаваньне</string>
+	<string name="use_internet_to_download_tile">Спампаваць адсутныя фрагменты мапы</string>
+	<string name="app_description">Навігацыйны дадатак</string>
 	
 	
 	
 	<string name="search_button">Пошук</string>
 	<string name="search_activity">Пошук</string>
 	<string name="searchpoi_activity">Абраць POI</string>
-	<string name="search_POI_level_btn">Знайсці больш</string>
+	<string name="search_POI_level_btn">Знайсці яшчэ</string>
 	<string name="incremental_search_street">Шукаць вуліцу</string>
 	<string name="incremental_search_building">Шукаць дом</string>
-	<string name="choose_available_region">Выбраць рэгіён са сьпісу</string>
-	<string name="choose_intersected_street">Абраць скрыжаваньне</string>
+	<string name="choose_available_region">Абраць рэгіён са спіса</string>
+	<string name="choose_intersected_street">Абраць скрыжаванне</string>
 	<string name="Closest_Amenities">Бліжэйшыя паслугі</string>
-	<string name="app_mode_car">Ваджэнне</string>
+	<string name="app_mode_car">Кіраванне</string>
 	<string name="app_mode_bicycle">Язда на ровары</string>
 	<string name="app_mode_pedestrian">Хада</string>
 	<string name="position_on_map_center">У цэнтры</string>
-	<string name="position_on_map_bottom">Зьнізу</string>
-	<string name="navigate_point_top_text">Увядзіце шырату й даўгату ў абраным фармаце (D - градусы, M - хвіліны, S - сэкунды)</string>
+	<string name="position_on_map_bottom">Знізу</string>
+	<string name="navigate_point_top_text">Увядзіце шырату і даўгату ў абраным фармаце (D - градусы, M - хвіліны, S - секунды)</string>
 	<string name="navigate_point_latitude">Шырата</string>
 	<string name="navigate_point_longitude">Даўгата</string>
 	<string name="navigate_point_format_D">DDD.DD</string>
@@ -1117,52 +1118,52 @@
 	<string name="search_address_street">Вуліца</string>
 	<string name="search_address_building">Будынак</string>
 	<string name="search_address_building_option">Дом</string>
-	<string name="search_address_street_option">Перакрыжаваньне</string>
+	<string name="search_address_street_option">Скрыжаванне</string>
 	
 	
 	<string name="context_menu_item_update_map">Абнавіць мапу</string>
 	
 	<string name="context_menu_item_create_poi">Стварыць POI</string>
-	<string name="add_favorite_dialog_top_text">Увядзіце назву ўпадабанага</string>
-	<string name="add_favorite_dialog_default_favourite_name">Упадабанае</string>
-	<string name="add_favorite_dialog_favourite_added_template">Упадабаная кропка «{0}» дададзеная.</string>
-	<string name="favourites_context_menu_edit">Рэдагаваць упадабанае</string>
-	<string name="favourites_context_menu_delete">Выдаліць упадабанае</string>
-	<string name="favourites_remove_dialog_msg">Выдаліць упадабаную кропку «%s»?</string>
-	<string name="favourites_remove_dialog_success">Упадабаная кропка {0} выдаленая.</string>
+	<string name="add_favorite_dialog_top_text">Увядзіце назву ўлюбёнага</string>
+	<string name="add_favorite_dialog_default_favourite_name">Улюбёнае</string>
+	<string name="add_favorite_dialog_favourite_added_template">Улюбёны пункт «{0}» дададзены.</string>
+	<string name="favourites_context_menu_edit">Рэдагаваць улюбёнае</string>
+	<string name="favourites_context_menu_delete">Выдаліць улюбёнае</string>
+	<string name="favourites_remove_dialog_msg">Выдаліць улюбёны пункт «%s»\?</string>
+	<string name="favourites_remove_dialog_success">Улюбёны пункт {0} выдалены.</string>
 	
 	
 	
-	<string name="osb_author_dialog_password">OSM пароль (неабавязковы)</string>
+	<string name="osb_author_dialog_password">Пароль OSM (неабавязковы)</string>
 	
-	<string name="osb_comment_dialog_message">Паведамленьне</string>
+	<string name="osb_comment_dialog_message">Паведамленне</string>
 	<string name="osb_comment_dialog_author">Імя аўтара</string>
 	
 	
-	<string name="osb_comment_dialog_success">Камэнтар дададзены</string>
+	<string name="osb_comment_dialog_success">Каментар дададзены</string>
 	<string name="osb_comment_dialog_error">Не атрымалася дадаць каментар</string>
 	
 	
 	
 	
 	
-	<string name="poi_edit_title">Правіць POI</string>
+	<string name="poi_edit_title">Рэдагаваць POI</string>
 	<string name="poi_create_title">Стварыць POI</string>
 	<string name="poi_error_poi_not_found">Вузел не знойдзены або зручнасць (amenity) складаецца з некалькіх вузлоў, што не падтрымліваецца.</string>
 	<string name="poi_remove_confirm_template">Выдаліць {0} (каментар)?</string>
 	<string name="poi_remove_title">Выдаліць POI</string>
-	<string name="poi_remove_success">POI выдаленая</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_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_dialog_opening_hours">Гадзіны працы</string>
 	<string name="poi_dialog_comment">Каментар</string>
-	<string name="poi_dialog_comment_default">Зьмена POI</string>
-	<string name="poi_dialog_other_tags_message">Усе астатнія тэгі захоўваюцца</string>
-	<string name="default_buttons_commit">Зьберагчы</string>
+	<string name="poi_dialog_comment_default">Змена POI</string>
+	<string name="poi_dialog_other_tags_message">Усе астатнія пазнакі захоўваюцца</string>
+	<string name="default_buttons_commit">Пацвердзіць</string>
 	<string name="filter_current_poiButton">Фільтраваць</string>
 	
 	<string name="edit_filter_save_as_menu_item">Захаваць як</string>
@@ -1171,65 +1172,65 @@
 	<string name="edit_filter_create_message">Фільтр {0} быў створаны</string>
 	
 	<string name="email">e-mail</string>
-	<string name="av_camera_focus">Тып факусоўкі камеры</string>
-	<string name="av_camera_focus_descr">Выберыце тып фокусу ўбудаванай камеры.</string>
+	<string name="av_camera_focus">Тып факусавання камеры</string>
+	<string name="av_camera_focus_descr">Абярыце тып фокусу ўбудаванай камеры.</string>
 	<string name="av_camera_focus_auto">Аўтафокус</string>
 	<string name="av_camera_focus_hiperfocal">Гіперфакальны фокус</string>
-	<string name="av_camera_focus_edof">Павялічаная глыбіня рэзкасьці (EDOF)</string>
-	<string name="av_camera_focus_infinity">Фокус усталяваны на бясконцасьці</string>
-	<string name="av_camera_focus_macro">Макра-рэжым факусоўкі (буйны план)</string>
-	<string name="av_camera_focus_continuous">Камера пастаянна спрабуе сфакусавацца</string>
-	<string name="av_photo_play_sound">Прайграваць гук пры фатаграфаваньні</string>
-	<string name="av_photo_play_sound_descr">Выберыце, ці трэба прайграваць гук пры здымцы фатаграфій.</string>
+	<string name="av_camera_focus_edof">Павялічаная глыбіня рэзкасці (EDOF)</string>
+	<string name="av_camera_focus_infinity">Фокус усталяваны на бясконцасці</string>
+	<string name="av_camera_focus_macro">Макрарэжым факусавання (буйны план)</string>
+	<string name="av_camera_focus_continuous">Камера заўсёды спрабуе сфакусавацца</string>
+	<string name="av_photo_play_sound">Прайграваць гук пры фатаграфаванні</string>
+	<string name="av_photo_play_sound_descr">Абярыце, ці трэба прайграваць гук пры фатаграфаванні.</string>
 	
 	
 <string name="lang_hr">Харвацкая</string>
     <string name="lang_zh">Кітайская</string>
-    <string name="lang_pt_br">Партугальская (Бразылія)</string>
-    <string name="lang_en">Ангельская</string>
+    <string name="lang_pt_br">Партугальская (Бразілія)</string>
+    <string name="lang_en">Англійская</string>
 	<string name="lang_af">Афрыкаанс</string>
 	<string name="lang_hy">Армянская</string>
 	<string name="lang_eu">Басконская</string>
 	<string name="lang_be">Беларуская</string>
-	<string name="lang_bs">Басьнійская</string>
-	<string name="lang_bg">Баўгарская</string>
-	<string name="lang_ca">Каталёнская</string>
-	<string name="lang_cs">Чэская</string>
+	<string name="lang_bs">Баснійская</string>
+	<string name="lang_bg">Балгарская</string>
+	<string name="lang_ca">Каталанская</string>
+	<string name="lang_cs">Чэшская</string>
 	<string name="lang_da">Дацкая</string>
-	<string name="lang_nl">Галяндзкая</string>
+	<string name="lang_nl">Галандская</string>
 	<string name="lang_fi">Фінская</string>
-	<string name="lang_fr">Француская</string>
+	<string name="lang_fr">Французская</string>
 	<string name="lang_ka">Грузінская</string>
 	<string name="lang_de">Нямецкая</string>
-	<string name="lang_el">Грэцкая</string>
+	<string name="lang_el">Грэчаская</string>
 	<string name="lang_iw">Габрэйская</string>
 	<string name="lang_hi">Хіндзі</string>
-	<string name="lang_hu">Вугорская</string>
+	<string name="lang_hu">Венгерская</string>
 	<string name="lang_id">Інданэзійская</string>
 	<string name="lang_it">Італьянская</string>
 	<string name="lang_ja">Японская</string>
 	<string name="lang_ko">Карэйская</string>
-	<string name="lang_lv">Латыская</string>
-	<string name="lang_lt">Летувіская</string>
+	<string name="lang_lv">Латышская</string>
+	<string name="lang_lt">Летувісская</string>
 	<string name="lang_mr">Маратхі</string>
-	<string name="lang_no">Нарвэская Bokmål</string>
+	<string name="lang_no">Нарвежская (Bokmål)</string>
 	<string name="lang_pl">Польская</string>
 	<string name="lang_pt">Партугальская</string>
 	<string name="lang_ro">Румынская</string>
-	<string name="lang_ru">Расейская</string>
+	<string name="lang_ru">Расійская</string>
 	<string name="lang_sk">Славацкая</string>
 	<string name="lang_sl">Славенская</string>
-	<string name="lang_es">Гішпанская</string>
-	<string name="lang_sv">Швэдзкая</string>
+	<string name="lang_es">Іспанская</string>
+	<string name="lang_sv">Шведская</string>
 	<string name="lang_tr">Турэцкая</string>
 	<string name="lang_uk">Украінская</string>
-	<string name="lang_vi">Віетнамская</string>
+	<string name="lang_vi">В’етнамская</string>
 	<string name="lang_cy">Валійская</string>
-	<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="gpx_option_calculate_first_last_segment">Разлічыць маршрут OsmAnd для першага і апошняга ўчастка маршруту</string>
+	<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="gpx_option_calculate_first_last_segment">Разлічыць маршрут OsmAnd для першага і апошняга адрэзку маршруту</string>
     <string name="use_displayed_track_for_navigation">Выкарыстаць паказаны след для навігацыі?</string>
     <string name="route_info">Маршрутная інфармацыя</string>
     <string name="routing_attr_prefer_motorway_name">Аддаваць перавагу аўтамагістралям</string>
@@ -1237,8 +1238,8 @@
 	
 	<string name="routing_attr_avoid_toll_name">Пазбягаць платных дарог</string>
 	<string name="routing_attr_avoid_toll_description">Пазбягаць платных дарог</string>
-	<string name="routing_attr_avoid_unpaved_name">Пазбягаць грунтавых дарог</string>
-	<string name="routing_attr_avoid_unpaved_description">Пазбягаць грунтавых дарог.</string>
+	<string name="routing_attr_avoid_unpaved_name">Пазбягаць грунтовых дарог</string>
+	<string name="routing_attr_avoid_unpaved_description">Пазбягаць грунтовых дарог.</string>
 	<string name="routing_attr_avoid_ferries_name">Пазбягаць паромных перапраў</string>
 	<string name="routing_attr_avoid_ferries_description">Пазбягаць перапраў</string>
 	<string name="routing_attr_avoid_motorway_name">Пазбягаць аўтамагістраляў</string>
@@ -1246,12 +1247,12 @@
 	<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="speech_rate_descr">Задайце хуткасць вымаўлення для TTS.</string>
-    <string name="speech_rate">Хуткасьць вымаўленьня</string>
+    <string name="speech_rate">Хуткасць вымаўлення</string>
     <string name="disable_complex_routing">Адключыць складаную маршрутызацыю</string>
     <string name="map_widget_map_rendering">Адмалёўка мапы</string>
     <string name="app_mode_motorcycle">Матацыкл</string>
@@ -1261,40 +1262,40 @@
 	
     
     
-    <string name="index_item_world_basemap">Сусьветная аглядная мапа</string>
-    <string name="index_item_world_ski">Сусьветная лыжная мапа</string>
+    <string name="index_item_world_basemap">Сусветная аглядная мапа</string>
+    <string name="index_item_world_ski">Сусветная лыжная мапа</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>
-    <string name="app_modes_choose">Профілі прыкладання</string>
-	<string name="index_item_world_altitude_correction">Глябальная карэкцыя вышыні</string>
-	<string name="index_item_world_seamarks">Навігацыйныя знакі ўсяго сьвету</string>
-	<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_preferences">Настройкі маршрута</string>
-    <string name="calculate_osmand_route_gpx">Аўтаномны разлік маршруту ў OsmAnd</string>
-    <string name="guidance_preferences_descr">Навігацыйныя настройкі</string>
-    <string name="routing_preferences_descr">Настройкі маршрутызацыі</string>
-    <string name="complex_route_calculation_failed">Хуткі разлік маршруту ня ўдаўся (%s), пераход на марудны разлік.</string>
+	<string name="animate_routing_route">Імітацыя з выкарыстаннем разлічанага маршруту</string>
+    <string name="animate_routing_gpx">Імітацыя з выкарыстаннем GPX-следу</string>
+    <string name="app_modes_choose">Профілі дадатка</string>
+	<string name="index_item_world_altitude_correction">Глабальная карэкцыя вышыні</string>
+	<string name="index_item_world_seamarks">Навігацыйныя знакі ўсяго свету</string>
+	<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_preferences">Налады маршруту</string>
+    <string name="calculate_osmand_route_gpx">Пазасеціўны разлік маршруту ў OsmAnd</string>
+    <string name="guidance_preferences_descr">Налады навігацыі</string>
+    <string name="routing_preferences_descr">Налады маршрутызацыі</string>
+    <string name="complex_route_calculation_failed">Хуткі разлік маршруту схібіў (%s), пераход на марудны разлік.</string>
     <string name="disable_complex_routing_descr">Адключэнне дзвюхфазнай маршрутызацыі для аўтамабільнай навігацыі.</string>
     <string name="amenity_type_seamark">Навігацыйны знак</string>
     <string name="app_mode_hiking">Пешы турызм</string>
     <string name="app_mode_boat">Човен</string>
     
-    <string name="local_osm_changes_delete_all_confirm">Вы зьбіраецеся выдаліць %1$d зьмены OSM. Вы ўпэўненыя?</string>
-    <string name="animate_routing_route_not_calculated">Калі ласка, спачатку разьлічыце маршрут</string>
+    <string name="local_osm_changes_delete_all_confirm">Вы збіраецеся выдаліць %1$d змены OSM. Вы ўпэўненыя\?</string>
+    <string name="animate_routing_route_not_calculated">Калі ласка, спачатку разлічыце маршрут</string>
     
-    <string name="android_19_location_disabled">З версіі 4.4 Android (KitKat) вы ня можаце загружаць і абнаўляць мапу ў старым каталогу захоўваньня (%s). Скапіяваць усе файлы OsmAnd у новае сховішча?
+    <string name="android_19_location_disabled">З версіі 4.4 Android (KitKat) вы не можаце спампоўваць і абнаўляць мапу ў старым каталогу захоўвання (%s). Скапіяваць усе файлы OsmAnd у новае сховішча\? 
 \n Заўвага 1: Вашы старыя файлы застануцца некранутымі (вы можаце выдаліць іх самастойна).          
-\n Заўвага 2: У новым месцы захоўваньня будзе немагчыма адначасова выкарыстоўваць файлы ў OsmAnd і OsmAnd+.</string>
+\n Заўвага 2: У новым месцы захоўвання будзе немагчыма адначасова выкарыстоўваць файлы ў OsmAnd і OsmAnd+.</string>
     
 	
-    <string name="app_modes_choose_descr">Абярыце профілі, бачныя ў праграме.</string>
+    <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>
 	
     
@@ -1302,24 +1303,24 @@
     
     
    	<string name="always_center_position_on_map">Паказваць становішча заўсёды ў цэнтры</string>
-    <string name="route_descr_destination">Пункт прызначэньня</string>
+    <string name="route_descr_destination">Пункт прызначэння</string>
     <string name="interrupt_music_descr">Галасавыя падказкі прыпыняюць музыку, а не толькі прыглушаюць яе.</string>
-	<string name="share_route_as_gpx">Падзяліцца маршрутам праз GPX файл</string>
+	<string name="share_route_as_gpx">Падзяліцца маршрутам праз GPX-файл</string>
 	<string name="share_route_subject">Маршрут апублікаваны з дапамогай OsmAnd</string>
-	<string name="navigation_intent_invalid">Няправільны фармат: %s</string>
+	<string name="navigation_intent_invalid">Хібны фармат: %s</string>
 <string name="create_poi_link_to_osm_doc"><u>Online OSM</u> мапа з выявамі.</string>
-	<string name="keep_informing_never">Толькі ўручную (націскаць на стрэлку)</string>
+	<string name="keep_informing_never">Толькі ўласнаручна (націскаць на стрэлку)</string>
     <string name="keep_informing_descr">Паўтараць навігацыйныя інструкцыі праз рэгулярныя прамежкі часу.</string>
     <string name="keep_informing">Паўтараць навігацыйныя інструкцыі</string>
 	<string name="arrival_distance">Абвяшчэнне прыбыцця</string>
     
     
-    <string name="osmand_srtm_long_description_1000_chars">Гэты модуль паказвае як ізалініі вышынь так і рэльеф на стандартных мапах OsmAnd. Гэтыя магчымасці спатрэбяцца спартсменам, турыстам, падарожнікам і ўсім, хто цікавіцца структурай рэльефу мясцовасці. 
+    <string name="osmand_srtm_long_description_1000_chars">Гэтая ўбудова паказвае як ізалініі вышынь, так і рэльеф на стандартных мапах OsmAnd. Гэтыя магчымасці спатрэбяцца спартоўцам, турыстам, падарожнікам і ўсім, хто цікавіцца структурай рэльефу мясцовасці. 
 \n 
-\nГлабальныя дадзеныя (паміж 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">Гэты модуль паказвае як ізалініі вышынь так і рэльеф на стандартных мапах OsmAnd. Гэта магчыма спатрэбяцца спартсменам, турыстам, падарожнікам і ўсім, хто цікавіцца структурай рэльефу мясцовасці. (Звярніце ўвагу, што дадзеныя вышынь і рэльефу асобныя, дадаткова даступныя да спампоўкі, пасля актывацыі модуля.) 
+\nГлабальныя даныя (паміж 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">"Гэтая ўбудова паказвае як ізалініі вышынь, так і рэльеф на стандартных мапах OsmAnd. Гэта, магчыма,  спатрэбіцца спартоўцам, турыстам, падарожнікам і ўсім, хто цікавіцца структурай рэльефу мясцовасці. (Звярніце ўвагу, што даныя вышынь і рэльефу асобныя, дадаткова даступныя да спампоўвання, пасля актывацыі ўбудовы.) 
 \n 
-\nГлабальныя дадзеныя (паміж 70 ° на поўначы і 70 ° на поўдні) грунтуюцца на вымярэннях SRTM (Shuttle Radar Topography Mission) і ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), дадзеных інструмента візуалізацыі Terra, флагманскага спадарожніка сістэмы назірання Зямлі ад NASA. ASTER — гэта вынік сумеснай працы NASA, міністэрства эканомікі Японіі, міністэрства гандлю і прамысловасьці Японіі (METI), агенцтва касмічных сістэм Японіі (J-spacesystems).</string>
+\nГлабальныя даныя (паміж 70 ° на поўначы і 70 ° на поўдні) грунтуюцца на вымярэннях SRTM (Shuttle Radar Topography Mission) і ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), даных інструмента візуалізацыі Terra, флагманскага спадарожніка сістэмы назірання Зямлі ад NASA. ASTER — гэта вынік сумеснай працы NASA, міністэрства эканомікі Японіі, міністэрства гандлю і прамысловасці Японіі (METI), агенцтва касмічных сістэм Японіі (J-spacesystems)."</string>
     
     
     
@@ -1333,7 +1334,7 @@
         
     
     
-	<string name="share_fav_subject">Упадабаныя адасланы праз OsmAnd</string>
+	<string name="share_fav_subject">Улюбёныя адасланыя праз OsmAnd</string>
 	<string name="use_points_as_intermediates">Разлічыць маршрут паміж пунктамі</string>
     
     
@@ -1348,7 +1349,7 @@
     
     <string name="hours_ago">гадзін таму</string>
     <string name="minutes_ago">хвілін таму</string>
-    <string name="seconds_ago">сэкунд таму</string>
+    <string name="seconds_ago">секунд таму</string>
     
     
     
@@ -1365,8 +1366,8 @@
     
     
     <string name="int_days">дзён</string>
-    <string name="osmo_connect_menu">Падключыцца</string>
-    <string name="osmo_group_description">Апісаньне</string>
+    <string name="osmo_connect_menu">Злучэнне</string>
+    <string name="osmo_group_description">Апісанне</string>
     
     
     
@@ -1377,7 +1378,7 @@
     
     
     
-	<string name="import_file_favourites">Захаваць звесткі як GPX-файл або імпартаваць пункты ва ўпадабаныя?</string>
+	<string name="import_file_favourites">Захаваць даныя як GPX-файл альбо імпартаваць пункты ва ўлюбёныя\?</string>
 	
 	
 	
@@ -1385,9 +1386,9 @@
     
     
     
-	<string name="rendering_value_pink_name">ружовы</string>
+	<string name="rendering_value_pink_name">Ружовы</string>
 	
-	<string name="rendering_value_brown_name">карычневы</string>
+	<string name="rendering_value_brown_name">Карычневы</string>
 	
 	
 	
@@ -1417,11 +1418,11 @@
     
     <string name="gpx_file_is_empty">Пусты GPX-файл</string>
     
-    <string name="gpx_info_waypoints">Адзначаных пунктаў: %1$s </string>
+    <string name="gpx_info_waypoints">Пунктаў шляху: %1$s</string>
 	<string name="gpx_info_distance">Даўжыня: %1$s (%2$s кропак) </string>
 	<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_average_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>
@@ -1433,30 +1434,31 @@
     <string name="gpx_selection_route_points">%1$s \nПунктаў маршруту %2$s</string>
     <string name="gpx_selection_points">%1$s
 \nПункты</string>
-    <string name="gpx_selection_track">%1$s \nСьлед %2$s</string>
-    <string name="gpx_info_subtracks">Частак сьледу: %1$s </string>
+    <string name="gpx_selection_track">%1$s 
+\nСлед %2$s</string>
+    <string name="gpx_info_subtracks">Падслед: %1$s</string>
 	<string name="gpx_split_interval">Інтэрвал нарэзкі</string>
     <string name="gpx_info_asc_altitude">Пад’ём/спад: %1$s</string>
-    <string name="loading_smth">Чытаньне %1$s…</string>
-    <string name="map_widget_plain_time">Цяперашні час</string>
+    <string name="loading_smth">Загрузка %1$s…</string>
+    <string name="map_widget_plain_time">Бягучы час</string>
     <string name="shared_string_waypoint">Пункт шляху</string>
     <string name="selected_gpx_info_show">"
 \n
 \nДоўга ўтрымлівайце, каб убачыць на мапе"</string>
     <string name="delay_navigation_start">Аўтаматычна пачаць навігацыю</string>
     <string name="gpx_info_diff_altitude">Перапад вышынь: %1$s</string>
-	<string name="save_as_favorites_points">Захаваць як групу ўпадабаных</string>
-    <string name="select_destination_and_intermediate_points">Выберыце прызначэньне</string>
+	<string name="save_as_favorites_points">Захаваць як групу ўлюбёных</string>
+    <string name="select_destination_and_intermediate_points">Абярыце прызначэнне</string>
     <string name="layer_amenity_label">Назвы POI-накладкі</string>
-    <string name="show_zoom_buttons_navigation">Паказваць кнопкі маштабаваньня</string>
+    <string name="show_zoom_buttons_navigation">Паказваць кнопкі маштабавання</string>
     <string name="show_zoom_buttons_navigation_descr">Паказваць кнопкі маштабавання падчас навігацыі.</string>
     
-    <string name="sort_by_distance">Сартаваць паводле адлегласьці</string>
+    <string name="sort_by_distance">Сартаваць паводле адлегласці</string>
     <string name="sort_by_name">Сартаваць паводле назвы</string>
-    <string name="none_selected_gpx">GPX-файлы не абраныя. Выбраць доўгім націскам.</string>
+    <string name="none_selected_gpx">GPX-файлаў не абрана. Абраць працяжным націскам.</string>
     
-    <string name="local_index_select_gpx_file">Выбраць для паказу</string>
-    <string name="no_index_file_to_download">Спампоўка не знойдзеная. Калі ласка, праверце ваша злучэнне з Інтэрнэтам.</string>
+    <string name="local_index_select_gpx_file">Абраць для паказу</string>
+    <string name="no_index_file_to_download">Спамповак не знойдзена. Калі ласка, праверце вашае злучэнне з Інтэрнэтам.</string>
     
     
     
@@ -1471,42 +1473,42 @@
     <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>
-    <string name="rendering_attr_hideAccess_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_hideAccess_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="stop_navigation_service">Спыніць</string>
 	<string name="enable_sleep_mode">Уключыць фонавы рэжым GPS</string>
-	<string name="gps_wake_up_timer">Iнтэрвал абуджэньня 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="lang_fa">Персідская</string>
 	<string name="sleep_mode_stop_dialog">Спыніць фонавы рэжым GPS?</string>
-	<string name="map_preferred_locale_descr">Пажаданая мова надпісаў на мапе (калі не даступная, то будуць выкарыстны ангельскія ці мясцовыя назвы).</string>
+	<string name="map_preferred_locale_descr">Пажаданая мова надпісаў на мапе (калі недаступная, то будуць выкарыстны англійскія ці мясцовыя назвы).</string>
     <string name="map_preferred_locale">Пажаданая мова мапы</string>
     <string name="local_map_names">Мясцовыя назвы</string>
     <string name="forward">Наперад</string>
-    <string name="home">Панэль кіраваньня</string>
+    <string name="home">Панэль кіравання</string>
     <string name="keep_navigation_service">Пакінуць</string>
 	<string name="gpx_monitoring_stop">Спыніць запіс GPX</string>
-    <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="lang_al">Альбанская</string>
+    <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="lang_al">Албанская</string>
 	<string name="lang_ar">Арабская</string>
-	<string name="lang_sr">Сэрбская</string>
+	<string name="lang_sr">Сербская</string>
 	<string name="lang_zh_cn">Кітайская (Спрошчаная)</string>
 	<string name="lang_zh_tw">Кітайская (Традыцыйная)</string>
 	<string name="lang_sc">Сардынская</string>
-	<string name="rendering_attr_subwayMode_name">Лініі мэтро</string>
+	<string name="rendering_attr_subwayMode_name">Лініі метро</string>
  	<string name="rendering_attr_coloredBuildings_name">Пазначаць тып будынка колерам</string>
     
     
@@ -1515,8 +1517,8 @@
     <string name="pause_navigation">Прыпыніць навігацыю</string>
     <string name="rendering_attr_alpineHiking_name">Пешы горны турызм</string>
     <string name="rendering_attr_alpineHiking_description">Візуалізацыя шляху па шкале SAC.</string>
-    <string name="rendering_attr_hikingRoutesOSMC_name">Накладаньне знакаў пешага турызму</string>
-    <string name="rendering_attr_hikingRoutesOSMC_description">Візуалізацыя шляху згодна трасам OSMC.</string>
+    <string name="rendering_attr_hikingRoutesOSMC_name">Накладанне знакаў пешага турызму</string>
+    <string name="rendering_attr_hikingRoutesOSMC_description">Візуалізацыя шляху згодна трас OSMC.</string>
     
 	<string name="arrival_distance_factor_early">Раней</string>
     <string name="arrival_distance_factor_normally">Звычайна</string>
@@ -1530,24 +1532,24 @@
     <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="download_additional_maps">Спампаваць мапы, што адсутнічаюць, %1$s (%2$d МБ)\?</string>
     
     <string name="shared_string_waypoints">Пункты шляху</string>
-    <string name="way_alarms">Дарожныя папярэджаньні</string>
-    <string name="speak_favorites">Упадабаныя паблізу</string>
+    <string name="way_alarms">Дарожныя папярэджанні</string>
+    <string name="speak_favorites">Улюбёныя паблізу</string>
     <string name="speak_poi">Навакольныя POI</string>
     
     <string name="shared_string_all">Усе</string>
     <string name="index_tours">Паездкі</string>
-    <string name="record_plugin_description">Модуль актывуе функцыі для запісу і захоўвання вашых слядоў уручную націскам на віджэт запісу GPX на экране мапы, або таксама аўтаматычна запісвае ўсе вашы маршруты навігацыі ў файл GPX. 
+    <string name="record_plugin_description">Убудова актывуе функцыі для запісу і захоўвання вашых слядоў уласнаручна націскам на віджэт запісу GPX на экране мапы, або таксама аўтаматычна запісвае ўсе вашыя маршруты навігацыі ў файл GPX. 
 \n 
-\nЗапісанымі слядамі можна падзяліцца з вашымі сябрамі або выкарыстоўваць іх для адсылкі ў OSM. Спартсмены могуць выкарыстоўваць запісаныя сляды для кантролю за трэніроўкамі. Некаторы базавы аналіз трэкаў можа быць выкананы непасрэдна ў OsmAnd, напрыклад, час праходжання кругу, сярэдняя хуткасць і г.д., трэкі, вядома, пазней таксама могуць быць прааналізаваны ў спэцыяльных інструментах аналізу іншых вытворцаў.</string>
+\nЗапісанымі слядамі можна падзяліцца з вашымі сябрамі або выкарыстоўваць іх для адсылкі ў OSM. Спартоўцы могуць выкарыстоўваць запісаныя сляды для кантролю за трэніроўкамі. Некаторы базавы аналіз слядоў можна правесці непасрэдна ў OsmAnd, напрыклад, час праходжання кругу, сярэдняя хуткасць і г.д., сляды, вядома, пазней таксама можна прааналізаваць пры дапамозе адмысловых інструментахў аналізу іншых вытворцаў.</string>
     <string name="record_plugin_name">Запіс падарожжа</string>
     <string name="int_hour">г</string>
-    <string name="duration">Працягласьць</string>
-    <string name="distance">Адлегласьць</string>
+    <string name="duration">Працягласць</string>
+    <string name="distance">Адлегласць</string>
     <string name="rendering_attr_publicTransportMode_name">Маршруты аўтобусаў, тралейбусаў і таксі</string>
-	<string name="save_track_to_gpx_globally">Пісаць сьлед у GPX-файл</string>
+	<string name="save_track_to_gpx_globally">Пісаць след у GPX-файл</string>
 	<string name="save_track_interval_globally">Інтэрвал запісу</string>
 	<string name="save_track_to_gpx_globally_descr">Агульны запіс месцазнаходжання ў GPX-файл можа быць уключаны або выключаны з дапамогай кнопкі запісу GPX на экране з мапай.</string>
 	<string name="confirm_every_run">Пытацца заўсёды</string>
@@ -1557,31 +1559,31 @@
     <string name="traffic_warning_border_control">Памежны кантроль</string>
     <string name="traffic_warning_payment">Платны праезд</string>
     <string name="traffic_warning_stop">Знак СТОП</string>
-    <string name="traffic_warning_calming">Знізьце хуткасць</string>
-    <string name="traffic_warning_speed_camera">Фотарадар</string>
+    <string name="traffic_warning_calming">Паменшыце хуткасць</string>
+    <string name="traffic_warning_speed_camera">Камера хуткасці</string>
     <string name="traffic_warning">Абмежаванне руху</string>
-	<string name="text_size_descr">Зьмяніць памер тэксту на мапе.</string>
+	<string name="text_size_descr">Змяніць памер тэксту на мапе.</string>
     <string name="text_size">Памер тэксту</string>
     <string name="speed_limit_exceed">Дапушчальнае значэнне перавышэння хуткасці</string>
 	<string name="speed_limit_exceed_message">Задаць дапушчалнае значэнне перавышэння хуткасці, пры якім вы атрымаеце галасавое паведамленне.</string>
-	<string name="fav_point_emoticons_message">Назва ўпадабанага была змененая на %1$s для магчымасьці захаваньня радка з эматыконам ў файл.</string>
+	<string name="fav_point_emoticons_message">Назва ўлюбёнага была змененая на %1$s для магчымасці захавання радка з эматыконам ў файл.</string>
     <string name="print_route">Паказаць маршрут</string>
-    <string name="fav_point_dublicate">Дубляванне назвы ўпадабанага пункту</string>
-    <string name="fav_point_dublicate_message">Упадабанае з такой назвай ўжо існуе, таму будзе выкарыстана %1$s для прадухілення дублявання імёнаў.</string>
+    <string name="fav_point_dublicate">Дубляванне назвы ўлюбёнага пункту</string>
+    <string name="fav_point_dublicate_message">Улюбёнае з такой назвай ўжо існуе, таму будзе выкарыстана %1$s для прадухілення дублявання назваў.</string>
     
     
-    <string name="local_index_description">Націсьніце на любы элемэнт сьпісу для прагляду больш падрабязнай інфармацыі, доўга ўтрымлівайце, каб зьмясьціць у архіў ці выдаліць. Наяўныя дадзеныя на прыстасаваньні (%1$s вольна):</string>
+    <string name="local_index_description">Націсніце на любы элемент спіса для прагляду больш падрабязнай інфармацыі, доўга ўтрымлівайце, каб змясціць у архіў ці выдаліць. Бягучыя даныя прылады (%1$s вольна):</string>
 	
     <string name="anonymous_user">Ананімны карыстальнік</string>
     <string name="logged_as">Вы ўвайшлі як %1$s</string>
 	
-    <string name="anonymous_user_hint">Ананімнаму карыстальніку недаступныя:
-\n- Стварэнне групаў;
-\n- Сінхранізацыя групаў і прыстасаванняў з серверам;
-\n- Кіраванне групамі і прыстасаваннямі ў асабістым кабінеце.</string>
+    <string name="anonymous_user_hint">Ананімнаму карыстальніку недаступныя: 
+\n- Стварэнне групаў; 
+\n- Сінхранізацыя групаў і прылад з серверам; 
+\n- Кіраванне групамі і прыладамі ў асабістым кабінеце.</string>
     <string name="configure_map">Налады мапы</string>
     <string name="search_radius_proximity">У межах</string>
-    <string name="rendering_category_details">Падрабязнасьці</string>
+    <string name="rendering_category_details">Падрабязнасці</string>
     <string name="rendering_category_transport">Транспарт</string>
 	<string name="map_widget_top">Радок стану</string>
 	<string name="map_widget_right">Правая панэль</string>
@@ -1600,13 +1602,13 @@
     <string name="impassable_road">Пазбягаць дарог…</string>
     <string name="rendering_category_hide">Схаваць</string>
     <string name="wake_on_voice">Уключыць экран</string>
-    <string name="wake_on_voice_descr">Уключаць экран прыстасавання пры набліжэнні да павароту.</string>
-    <string name="lock_screen_request_explanation">%1$s патрабуе дазвол на выключэньне экрану для энергазберажэньня.</string>
+    <string name="wake_on_voice_descr">Уключаць экран прылады пры набліжэнні да павароту.</string>
+    <string name="lock_screen_request_explanation">%1$s патрабуе дазволу на выключэнне экрану для энергазберажэння.</string>
     
 	
     
-	<string name="home_button">Дамоў</string>
-    <string name="map_update">Ёсьць абнаўленьні для %1$s мапаў</string>
+	<string name="home_button">Дадому</string>
+    <string name="map_update">Даступны абнаўленні для %1$s мапаў</string>
 	<string name="search_for">Шукаць</string>
 	
 	<string name="coordinates">Каардынаты</string>
@@ -1614,26 +1616,26 @@
     <string name="use_opengl_render">Выкарыстоўваць OpenGL</string>
     <string name="use_opengl_render_descr">Выкарыстоўваць апаратнае паскарэнне OpenGL (можа спажываць больш энергіі ці не працаваць на вельмі старых прыладах).</string>
     <string name="everything_up_to_date">Усе файлы ў актуальным стане</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>
+    <string name="no_internet_connection">Немагчыма спампаваць. Калі ласка, праверце вашае Інтэрнэт-злучэнне.</string>
+    <string name="download_tab_downloads">Усе спампоўкі</string>
+    <string name="download_tab_updates">Абнаўленні</string>
+    <string name="download_tab_local">Лакальныя</string>
 	<string name="navigate_point_zone">Зона</string>
     <string name="navigate_point_northing">Па шыраце</string>
     <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">Вы cьцягнулі %1$s мапы</string>
-    <string name="dash_download_new_one">Сьцягнуць новую мапу</string>
+    <string name="dash_download_msg_none">Спампаваць пазасеціўныя мапы\?</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="routing_attr_no_new_routing_description">Не выкарыстоўваць правілы маршрутызацыі ўведзеныя ў v1.9.</string>
-    <string name="rendering_value_default_name">Па змоўчаньні</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>
     <string name="show_pedestrian_warnings">Пешаходныя пераходы</string>
     <string name="traffic_warning_pedestrian">Пешаходны пераход</string>
@@ -1641,9 +1643,9 @@
 	<string name="show_railway_warnings">Чыгуначныя пераезды</string>
 	<string name="speak_pedestrian">Пешаходныя пераходы</string>
     
-	<string name="save_track_to_gpx_globally_headline">Запіс сьледу па запатрабаваньні</string>
-	<string name="avoid_roads_msg">Абраць іншы маршрут, пазначыўшы дарогі, якія варта пазьбягаць</string>
-    <string name="navigation_over_track">Пачаць навігацыю ўздоўж сьледу?</string>
+	<string name="save_track_to_gpx_globally_headline">Запіс следу па патрабаванні</string>
+	<string name="avoid_roads_msg">Абраць іншы маршрут, пазначыўшы дарогі, якія варта пазбягаць</string>
+    <string name="navigation_over_track">Пачаць навігацыю ўздоўж следу\?</string>
 	
 	<string name="proxy_pref_title">Проксі</string>
 	<string name="enable_proxy_title">Уключыць HTTP-проксі</string>
@@ -1652,78 +1654,79 @@
 	<string name="proxy_host_descr">Задайце назву хаста вашага проксі (напрыклад 127.0.0.1).</string>
 	<string name="proxy_port_title">Порт проксі</string>
 	<string name="proxy_port_descr">Задайце нумар парта вашага проксі (напрыклад 8118).</string>
-	<string name="proxy_pref_descr">Задаць проксі-сервер.</string>
-    <string name="settings_privacy">Прыватнасьць</string>
-    <string name="rendering_attr_streetLighting_name">Вулічнае асьвятленьне</string>
-    <string name="version_settings_descr">Сцягваць начныя зборкі.</string>
+	<string name="proxy_pref_descr">Вызначыць проксі-сервер.</string>
+    <string name="settings_privacy">Прыватнасць</string>
+    <string name="rendering_attr_streetLighting_name">Вулічнае асвятленне</string>
+    <string name="version_settings_descr">Спампоўваць начныя зборкі.</string>
     <string name="version_settings">Зборкі</string>
     <string name="shared_string_gpx_points">Пункты</string>
     
     
     <string name="gps_status">Стан GPS</string>
     <string name="parking_place">Парковачнае месца</string>
-    <string name="remove_the_tag">Выдаліць тэг</string>
-<string name="plugin_description_title">Апісаньне</string>
+    <string name="remove_the_tag">ВЫДАЛІЦЬ ПАЗНАКУ</string>
+<string name="plugin_description_title">Апісанне</string>
 	
-<string name="edit_group">Правіць групу</string>
+<string name="edit_group">Рэдагаваць групу</string>
     
-	<string name="plugin_install_needs_network">Вам неабходна падлучэнне да Інтэрнэту, каб усталяваць гэты дадатак.</string>
+	<string name="plugin_install_needs_network">Каб усталяваць гэтую ўбудову неабходна злучыцца з інтэрнэтам.</string>
 	<string name="get_plugin">Атрымаць</string>
 <string name="plugin_ski_name">Лыжныя мапы</string>
     <string name="plugin_nautical_name">Марскія мапы</string>
-    <string name="world_ski_missing">Для адлюстраваньня лыжных мап неабходна сьцягнуць адмысловыя мапы</string>
-    <string name="nautical_maps_missing">Для адлюстраваньня марскіх мап неабходна сьцягнуць адмысловыя мапы</string>
+    <string name="world_ski_missing">Для адлюстравання лыжных мапаў неабходна спампаваць адмысловыя мапы</string>
+    <string name="nautical_maps_missing">Для адлюстраваньня марскіх мапаў неабходна спампаваць адмысловыя мапы</string>
 	<string name="rendering_attr_pisteGrooming_name">Дагляд трасы</string>
     <string name="free">Вольна %1$s</string>
-	<string name="device_memory">Памяць прыстасаваньня</string>
+	<string name="device_memory">Памяць прылады</string>
     <string name="rendering_attr_pisteRoutes_name">Лыжныя трасы</string>
 	<string name="roads_only">Толькі дарогі</string>
     <string name="watch">Сачыць</string>
 	<string name="notes">Нататкі</string>
-	<string name="online_map">Інтэрнэт мапа</string>
+	<string name="online_map">Сеціўная мапа</string>
 	<string name="share_note">Падзяліцца нататкаю</string>
 	
-	<string name="plugin_nautical_descr">Актывацыя гэтага стылю мяняе выгляд мапы на Марскую, на якой паказваюцца ўсе навігацыйныя знакі і сімвалы.
-		\n\nФайл з дадзенымі зьмяшчае ўсе навігацыйныя сімвалы ў выглядзе адзінага файлу з назвай \"World seamarks\".
-		\n\nГэты стыль можа быць скасаваны шляхам яго выключэньня тут або зьменаю ў пункце \"Стыль мапы\" меню \"Налады мапы\" на патрэбны.
-	</string>
+	<string name="plugin_nautical_descr">Актывацыя гэтага стылю змяняе выгляд мапы на Марскую, на якой паказваюцца ўсе навігацыйныя знакі і сімвалы. 
+\n
+\nФайл з данымі змяшчае ўсе навігацыйныя сімвалы ў выглядзе адзінага файла з назвай \"World seamarks\". 
+\n
+\nГэты стыль можа быць скасаваны шляхам яго выключэння тут або зменаю ў пункце \"Стыль мапы\" меню \"Налады мапы\" на патрэбны.</string>
 
 	<string name="back_to_map">Вярнуцца да мапы</string>
-	<string name="track_segments">Адрэзкі сьледу</string>
-	<string name="track_points">Пункты сьледу</string>
+	<string name="track_segments">Адрэзкі следу</string>
+	<string name="track_points">Пункты следу</string>
 	<string name="location_on_map">Каардынаты:\n Шырата %1$s\n Даўгата %2$s</string>
 	<string name="shared_string_ellipsis">…</string>
-	<string name="shared_string_ok">OK</string>
+	<string name="shared_string_ok">Добра</string>
 	<string name="shared_string_cancel">Скасаваць</string>
 	<string name="shared_string_dismiss">Адхіліць</string>
 	<string name="shared_string_yes">Так</string>
 	<string name="shared_string_no">Не</string>
 	<string name="shared_string_on">Уключыць</string>
-	<string name="shared_string_off">Выключыць</string>
+	<string name="shared_string_off">Выкл</string>
 	<string name="shared_string_previous">Назад</string>
 	<string name="shared_string_next">Далей</string>
 	<string name="shared_string_enable">Уключыць</string>
-	<string name="shared_string_disable">Адключыць</string>
+	<string name="shared_string_disable">Выключыць</string>
 	<string name="shared_string_enabled">Уключана</string>
-	<string name="shared_string_disabled">Адключана</string>
+	<string name="shared_string_disabled">Выключана</string>
 	<string name="shared_string_selected">Абрана</string>
 	<string name="shared_string_selected_lowercase">абрана</string>
 	<string name="shared_string_never">Ніколі</string>
-	<string name="shared_string_none">Ніякі</string>
+	<string name="shared_string_none">Нічога</string>
 	<string name="shared_string_and">і</string>
 	<string name="shared_string_or">альбо</string>
 	<string name="shared_string_help">Дапамога</string>
 	<string name="shared_string_settings">Налады</string>
 	<string name="shared_string_history">Гісторыя</string>
-	<string name="shared_string_select_on_map">Выбраць на мапе</string>
-	<string name="shared_string_select_all">Выбраць усё</string>
-	<string name="shared_string_deselect">Прыбраць вылучэньне</string>
-	<string name="shared_string_deselect_all">Прыбраць вылучэньне ўсіх</string>
-	<string name="shared_string_clear">Ачысьціць</string>
+	<string name="shared_string_select_on_map">Абраць на мапе</string>
+	<string name="shared_string_select_all">Абраць усё</string>
+	<string name="shared_string_deselect">Адкінуць выбар</string>
+	<string name="shared_string_deselect_all">Адкінуць выбар усяго</string>
+	<string name="shared_string_clear">Ачысціць</string>
 	
 	<string name="shared_string_save">Захаваць</string>
 	<string name="shared_string_save_as_gpx">Захаваць як новы GPX-файл</string>
-	<string name="shared_string_rename">Пераназваць</string>
+	<string name="shared_string_rename">Змяніць назву</string>
 	<string name="shared_string_delete">Выдаліць</string>
 	<string name="shared_string_delete_all">Выдаліць усё</string>
 	<string name="shared_string_share">Падзяліцца</string>
@@ -1733,27 +1736,27 @@
 	<string name="shared_string_control_stop">Спыніць</string>
 	<string name="shared_string_import">Імпартаваць</string>
 	<string name="shared_string_export">Экспартаваць</string>
-	<string name="shared_string_more">Больш…</string>
+	<string name="shared_string_more">Яшчэ…</string>
 	<string name="shared_string_do_not_show_again">Больш не паказваць</string>
 	<string name="shared_string_remember_my_choice">Запомніць выбар</string>
 	<string name="shared_string_refresh">Абнавіць</string>
-	<string name="shared_string_download">Сьцягнуць</string>
-	<string name="shared_string_downloading">Сьцягваецца</string>
-	<string name="shared_string_download_successful">Спампованая</string>
+	<string name="shared_string_download">Спампаваць</string>
+	<string name="shared_string_downloading">Спампоўваецца</string>
+	<string name="shared_string_download_successful">Спампаваная</string>
 	<string name="shared_string_io_error">Памылка ўводу/вываду</string>
 	<string name="shared_string_unexpected_error">Нечаканая памылка</string>
-	<string name="shared_string_action_template">"Дзеяньне {0}"</string>
+	<string name="shared_string_action_template">Дзеянне {0}</string>
 	<string name="shared_string_close">Закрыць</string>
-	<string name="shared_string_exit">Выхад</string>
+	<string name="shared_string_exit">Выйсці</string>
 	<string name="shared_string_show">Паказаць</string>
 	<string name="shared_string_show_all">Паказаць усе</string>
 	<string name="shared_string_show_on_map">Паказаць на мапе</string>
 	<string name="shared_string_map">Мапа</string>
-	<string name="shared_string_favorite">Упадабанае</string>
-	<string name="shared_string_favorites">Упадабаныя</string>
-	<string name="shared_string_add_to_favorites">Дадаць да «Упадабаных»</string>
+	<string name="shared_string_favorite">Улюбёнае</string>
+	<string name="shared_string_favorites">Улюбёныя</string>
+	<string name="shared_string_add_to_favorites">Дадаць ва «Улюбёныя»</string>
 	
-	<string name="shared_string_my_places">Мае мясьціны</string>
+	<string name="shared_string_my_places">Мае мясціны</string>
 	
 	
 	<string name="shared_string_audio">Аўдыё</string>
@@ -1761,150 +1764,150 @@
 	<string name="shared_string_photo">Фота</string>
 
 	<string name="route_points">Пункты маршруту</string>
-	<string name="shared_string_more_actions">Больш дзеяньняў</string>
+	<string name="shared_string_more_actions">Яшчэ дзеянні</string>
 	
 	<string name="osmand_parking_overdue">Састарэлі</string>
 	<string name="osmand_parking_hour">г</string>
 	<string name="osmand_parking_minute">хв</string>
 	<string name="osmand_parking_time_left">засталося</string>
-	<string name="action_create">Стварыць дзеяньне</string>
-	<string name="action_modify">Зьмяніць дзеяньне</string>
-	<string name="action_delete">Выдаліць дзеяньне</string>
+	<string name="action_create">Стварыць дзеянне</string>
+	<string name="action_modify">Змяніць дзеянне</string>
+	<string name="action_delete">Выдаліць дзеянне</string>
 	<string name="osm_edits">Праўкі OSM</string>
 	<string name="parking_place_limited">Час паркоўкі абмежаваны</string>
-	<string name="your_edits">Вашы праўкі</string>
-    <string name="waypoint_visit_after">Наведаць пасьля</string>
+	<string name="your_edits">Вашыя праўкі</string>
+    <string name="waypoint_visit_after">Наведаць пасля</string>
     <string name="waypoint_visit_before">Наведаць, перш чым</string>
-    <string name="simulate_your_location">Мадэляваць ваша месцазнаходжаньне</string>
-    <string name="drawer">Плоскі сьпіс</string>
+    <string name="simulate_your_location">Мадэляваць вашае месцазнаходжанне</string>
+    <string name="drawer">Плоскі спіс</string>
     <string name="short_location_on_map">Шырата %1$s\nДаўгата %2$s</string>
     <string name="tips_and_tricks_descr">Пытанні і адказы, апошнія змены і іншае.</string>
     <string name="routing_settings_2">Налады навігацыі</string>
     <string name="general_settings_2">Агульныя налады</string>
-	<string name="shared_string_clear_all">Ачысьціць ўсё</string>
+	<string name="shared_string_clear_all">Ачысціць ўсё</string>
 	<string name="shared_string_collapse">Згарнуць</string>
 	<string name="shared_string_my_location">Маё месцазнаходжанне</string>
-	<string name="shared_string_tracks">Сьляды</string>
-	<string name="shared_string_currently_recording_track">Сьлед, які цяпер запісваецца</string>
+	<string name="shared_string_tracks">Сляды</string>
+	<string name="shared_string_currently_recording_track">След, які цяпер запісваецца</string>
 	<string name="plugin_touringview_name">Турыстычная мапа</string>
-	<string name="rename_failed">Перайменаванне не атрымалася.</string>
+	<string name="rename_failed">Змяніць назву не атрымалася.</string>
 	<string name="days_behind">д. таму абнаўлялі</string>
-	<string name="shared_string_release">Выдана</string>
-	<string name="shared_string_my_favorites">Упадабаныя</string>
-	<string name="confirmation_to_clear_history">Ачысьціць гісторыю?</string>
+	<string name="shared_string_release">Выдадзена</string>
+	<string name="shared_string_my_favorites">Улюбёныя</string>
+	<string name="confirmation_to_clear_history">Ачысціць гісторыю\?</string>
     <string name="delay_to_start_navigation_descr">Задайце час затрымкі на экране планавання маршруту.</string>
     <string name="delay_to_start_navigation">Пачаць пакрокавую навігацыю праз…</string>
-    <string name="shared_string_go">Паехалі</string>
+    <string name="shared_string_go">Рушым</string>
 	
-	<string name="local_osm_changes_upload_all_confirm">Вы зьбіраецеся адаслаць %1$d зьменаў у OSM. Вы ўпэўненыя?</string>
-    <string name="plugin_ski_descr">Модуль для OsmAnd дае вам доступ да дадзеных аб гарналыжных трасах, маршрутах для бегавых лыж, альпійскіх спусках, фунікулёрах і гарналыжных пад\'ёмніках. Маршруты і спускі адзначаны рознымі колерамі ў залежнасці ад іх складанасці і намаляваныя з выкарыстаннем адмысловага «зімовага» стылю мапы, які заключаецца ў тым, што выкарыстоўваюцца «снежныя» колеры зімовага пейзажу. 
+	<string name="local_osm_changes_upload_all_confirm">Вы збіраецеся адаслаць %1$d змен у OSM. Вы ўпэўнены\?</string>
+    <string name="plugin_ski_descr">Убудова для OsmAnd дае вам доступ да даных аб гарналыжных трасах, маршрутах для бегавых лыж, альпійскіх спусках, фунікулёрах і гарналыжных пад\'ёмніках. Маршруты і спускі пазначаюцца рознымі колерамі ў залежнасці ад іх складанасці і намаляваныя з выкарыстаннем адмысловага «зімовага» стылю мапы, адметнага тым, што выкарыстоўваюцца «снежныя» колеры зімовага пейзажу. 
 \n 
-\nУ выпадку актывацыі гэтага віду, стыль мапы мяняецца на «Winter and ski», паказваючы ўсё дэталі пейзажу так, як яны выглядаюць зімой. Такі (зімовы) выгляд можа быць адменены альбо шляхам дэактывацыі тут, альбо калі вы памяняеце «Стыль мапы» у меню «Налада мапы» на жаданы выгляд.</string>
+\nУ выпадку актывацыі гэтага выгляду, стыль мапы змяняецца на «Winter and ski», паказваючы ўсё дэталі пейзажу так, як яны выглядаюць зімой. Такі (зімовы) выгляд можа быць скасаваны альбо шляхам дэактывацыі тут, альбо калі вы зменіце «Стыль мапы» у меню «Налада мапы» на пажаданы выгляд.</string>
 	
-	<string name="current_route">Цяперашні маршрут</string>
-    <string name="osm_changes_added_to_local_edits">Зьмены OSM дададзеныя да лякальнага набору зьменаў</string>
-   	<string name="mark_to_delete">Пазначыць для выдаленьня</string>
-	<string name="welmode_download_maps">Сьцягнуць мапы</string>
-	<string name="welcome_select_region">Каб правільна адлюстроўваць дарожныя знакі і правілы, калі ласка, абярыце рэгіён кіраваньня:</string>
-	<string name="welcome_text">OsmAnd дазваляе вам аўтаномна карыстацца мапамі ўсяго сьвету і аўтаномнай навігацыяй.</string>
+	<string name="current_route">Бягучы маршрут</string>
+    <string name="osm_changes_added_to_local_edits">Змены OSM дададзеныя ў лакальны набор змен</string>
+   	<string name="mark_to_delete">Пазначыць для выдалення</string>
+	<string name="welmode_download_maps">Спампаваць мапы</string>
+	<string name="welcome_select_region">Каб правільна адлюстроўваць дарожныя знакі і правілы, калі ласка, абярыце рэгіён кіравання:</string>
+	<string name="welcome_text">OsmAnd дазваляе вам аўтаномна карыстацца мапамі ўсяго свету і аўтаномнай навігацыяй.</string>
 	<string name="welcome_header">Вітаем</string>
     <string name="plugin_touringview_descr">Актывацыя гэтага стылю мяняе стыль мапы OsmAnd на «Турыстычную мапу», гэта адмысловы высока дэталяваны выгляд для падарожнікаў і прафесійных кіроўцаў. 
 \n 
-\nГэты стыль на любым маштабе мапы паказвае максімальную колькасць падрабязнасцяў для паездкі, наяўных у картаграфічных дадзеных (у прыватнасці, дарогі, дарожкі, сцяжынкі, і арыенціры). 
+\nГэты стыль на любым маштабе мапы паказвае максімальную колькасць падрабязнасцяў для паездкі, наяўных у даных мапы (у прыватнасці, дарогі, дарожкі, сцяжынкі, і арыенціры). 
 \n 
-\nЁн таксама ясна паказвае ўсе віды дарог праз колеравае кадаванне, што карысна, для, напрыклад, кіраваньня вялікімі транспартнымі сродкамі. 
+\nЁн таксама дакладна адлюстроўвае ўсе тыпы дарог праз колеравае кадаванне, што карысна, для, напрыклад, кіравання вялікімі транспартнымі сродкамі. 
 \n 
-\nІ ён дадае спецыяльныя турыстычныя налады, такія як веласіпедныя маршруты або альпійскія горныя маршруты. 
+\nІ ён дадае адмысловыя турыстычныя налады, такія як роварныя маршруты або альпійскія горныя маршруты. 
 \n 
-\nДадатковае сцягваньне не патрабуецца, выгляд ствараецца з нашых стандартных мапаў. 
+\nДадаткова нічога спампоўваць не патрэбна, выгляд ствараецца з нашых стандартных мапаў. 
 \n 
-\nГэты выгляд можа быць дэактываваны тут, або шляхам змены «Стылю мапы» у раздзеле «Налады мапы» па жаданьні.</string>
-	<string name="confirm_usage_speed_cameras">У многіх краінах (Германія, Францыя, Італія ды іншыя) выкарыстаньне дэтэктараў камер кантролю хуткасьці незаконнае. OsmAnd не нясе ніякай адказнасьці, калі вы парушыце закон. Калі ласка, націсьніце кнопку «Так», толькі калі вы маеце права выкарыстоўваць гэтую функцыю.</string>
+\nГэты выгляд можа быць дэактываваны тут, або шляхам змены «Стылю мапы» у раздзеле «Налады мапы».</string>
+	<string name="confirm_usage_speed_cameras">У многіх краінах (Германія, Францыя, Італія ды іншыя) выкарыстанне дэтэктараў камер кантролю хуткасці незаконнае. OsmAnd не нясе ніякай адказнасці, калі вы парушыце закон. Калі ласка, націсніце кнопку «Так», толькі калі вы маеце права выкарыстоўваць гэтую функцыю.</string>
 	<string name="agps_info">Інфармацыя пра A-GPS</string>
-	<string name="agps_data_last_downloaded">Апошнія сьцягнутыя зьвесткі A-GPS: %1$s</string>
-    <string name="shared_string_message">Паведамленьне</string>
+	<string name="agps_data_last_downloaded">Апошнія спампаваныя даныя A-GPS: %1$s</string>
+    <string name="shared_string_message">Паведамленне</string>
 	<string name="shared_string_do_not_use">Не выкарыстоўваць</string>
 	<string name="shared_string_address">Адрас</string>
 	<string name="shared_string_show_description">Паказаць апісанне.</string>
 	<string name="shared_string_search">Пошук</string>
 	<string name="shared_string_places">Месцы</string>
-	<string name="rendering_attr_OSMMapperAssistant_name">Памагаты картографа OSM</string>
+	<string name="rendering_attr_OSMMapperAssistant_name">Памагаты мапографа OSM</string>
 	<string name="shared_string_manage">Кіраваць</string>
-	<string name="shared_string_edit">Правіць</string>
+	<string name="shared_string_edit">Рэдагаваць</string>
 	<string name="shared_string_is_open">Адчынена</string>
     <string name="filter_poi_hint">Фільтраваць па назве</string>
-    <string name="search_poi_category_hint">Друкуйце, каб знайсьці ўсё</string>
-    <string name="index_name_netherlands">Эўропа - Нідэрлянды</string>
-	<string name="rendering_value__name">Па змоўчаньні</string>
-    <string name="rendering_value_highContrastRoads_name">Высокая кантрастнасьць дарог</string>
-	<string name="specified_directiory_not_writeable">Мапы не могуць быць створаны ў пазначанай дырэкторыі</string>
-	<string name="copying_osmand_file_failed">Капіяваньне файлаў не атрымалася</string>    
-    <string name="storage_directory_internal_app">Унутраная памяць пракладання</string>
-    <string name="storage_directory_manual">Зададзены ўручную</string>
+    <string name="search_poi_category_hint">Увядзіце, каб знайсці ўсё</string>
+    <string name="index_name_netherlands">Еўропа - Нідэрланды</string>
+	<string name="rendering_value__name">Прадвызначана</string>
+    <string name="rendering_value_highContrastRoads_name">Высокая кантрастнасць дарог</string>
+	<string name="specified_directiory_not_writeable">Немагчыма стварыць мапы ў вызначаным каталозе</string>
+	<string name="copying_osmand_file_failed">Скапіяваць файлы не атрымалася</string>    
+    <string name="storage_directory_internal_app">Унутраная памяць дадатка</string>
+    <string name="storage_directory_manual">Вызначана ўласнаручна</string>
     <string name="storage_directory_default">Унутраная памяць</string>
-    <string name="shared_string_copy">Капіяваць</string>
+    <string name="shared_string_copy">Капіраваць</string>
     <string name="storage_directory_external">Вонкавы носьбіт інфармацыі</string>
-    <string name="storage_directory">Захоўваньне мапы</string>
+    <string name="storage_directory">Захоўванне мапы</string>
     <string name="storage_directory_multiuser">Агульнае сховішча</string>
-    <string name="application_dir_change_warning3">Скапіяваць файлы даных OsmAnd у новае месца?</string>
+    <string name="application_dir_change_warning3">Скапіяваць файлы даных OsmAnd у новае месца\?</string>
     <string name="rendering_attr_hideHouseNumbers_name">Нумары дамоў</string>
     
-	<string name="routing_attr_avoid_borders_description">Пазбягаць перасячэння нацыянальных меж</string>
+	<string name="routing_attr_avoid_borders_description">Пазбягаць перасячэння нацыянальных межаў</string>
 	<string name="routing_attr_height_name">Абмежаванне па вышыні</string>
-	<string name="routing_attr_height_description">Пазначце вышыню транспартнага сродку для разліку маршруту.</string>
-    <string name="use_fast_recalculation">Разумны пераразьлік маршруту</string>
+	<string name="routing_attr_height_description">Пазначыць вышыню транспартнага сродку для разліку маршруту.</string>
+    <string name="use_fast_recalculation">Разумны пераразлік маршруту</string>
 	<string name="use_fast_recalculation_desc">Пераразлічваць толькі пачатак маршруту для доўгіх паездак.</string>
 
-    <string name="shared_string_logoff">Выйсьці</string>
-    <string name="rendering_value_disabled_name">Адключана</string>
+    <string name="shared_string_logoff">Выйсці</string>
+    <string name="rendering_value_disabled_name">Выключана</string>
     <string name="rendering_value_walkingRoutesOSMC_name">Афарбоўка па пешаходнаму сімвалу OSMC</string>
-    <string name="rendering_value_walkingRoutesScopeOSMC_name">Афарбоўка згодна прыналежнасьці сеткі</string>
+    <string name="rendering_value_walkingRoutesScopeOSMC_name">Афарбоўка згодна прыналежнасці сеткі</string>
     <string name="osm_edit_context_menu_delete">Выдаліць праўку OSM</string>    
-    <string name="read_full_article">Чытаць артыкул цалкам (анлайн)</string>
+    <string name="read_full_article">Чытаць артыкул цалкам (у сеціве)</string>
     
-    <string name="local_indexes_cat_wiki">Вікіпэдыя</string>
-    <string name="shared_string_show_details">Паказаць падрабязнасьці</string>
-    <string name="download_wikipedia_maps">Вікіпэдыя</string>
-    <string name="local_recordings_delete_all_confirm">Вы зьбіраецеся выдаліць %1$d нататкі. Вы ўпэўненыя?</string>
+    <string name="local_indexes_cat_wiki">Вікіпедыя</string>
+    <string name="shared_string_show_details">Паказаць падрабязнасці</string>
+    <string name="download_wikipedia_maps">Вікіпедыя</string>
+    <string name="local_recordings_delete_all_confirm">Вы збіраецеся выдаліць %1$d нататкі. Вы ўпэўнены\?</string>
 	<string name="shared_string_import2osmand">Імпартаваць у OsmAnd</string>
     <string name="disable_recording_once_app_killed">Прадухіліць аўтаномны запіс</string>
-    <string name="disable_recording_once_app_killed_descrp">Запіс GPX прыпыніцца, калі праграма будзе забіта (праз надаўнія праграмы). (Апавяшчэньне ў вобласьці падказак Android пра фонавы рэжым OsmAnd зьнікне.)</string>
-	<string name="gps_network_not_enabled">Служба месцазнаходжаньня не ўключаная. Уключыць яе?</string>
-    <string name="archive_wikipedia_data">Зьвесткі Вікіпэдыі састарэлі і непрыдатныя. Заархіваваць іх?</string>
-    <string name="download_wikipedia_files">Сьцягнуць дадатковыя зьвесткі Вікіпэдыі (%1$s МБ) ?</string>
+    <string name="disable_recording_once_app_killed_descrp">Запіс GPX прыпыніцца, калі дадатак будзе забіты (праз надаўнія праграмы). (Апавяшчэнне ў вобласці падказак Android пра фонавы рэжым OsmAnd знікне.)</string>
+	<string name="gps_network_not_enabled">Служба вызначэння месцазнаходжання не ўключаная. Уключыць яе\?</string>
+    <string name="archive_wikipedia_data">Даныя Вікіпедыі састарэлі і больш непрыдатныя. Заархіваваць іх\?</string>
+    <string name="download_wikipedia_files">Спампаваць дадатковыя даныя Вікіпедыі (%1$s МБ) \?</string>
     <string name="lang_th">Тайская</string>
     <string name="lang_te">Тэлугу</string>
-    <string name="lang_nn">нарвэская (Нюнашк)</string>
+    <string name="lang_nn">Нарвежская (Нюнашк)</string>
     <string name="lang_vo">Валяпюк</string>
     <string name="lang_ht">Гаіцянская</string>
     <string name="lang_gl">Галіцкая</string>
     <string name="lang_et">Эстонская</string>
     <string name="lang_ceb">Сэбуанская</string>
-    <string name="lang_ms">Малайзійская</string>
-    <string name="lang_eo">Эспэранта</string>
-    <string name="lang_es_ar">Гішпанская (Аргентына)</string>
-    <string name="lang_nb">нарвэская (Букмал)</string>
-    <string name="light_theme">Сьветлая</string>
+    <string name="lang_ms">Малазійская</string>
+    <string name="lang_eo">Эсперанта</string>
+    <string name="lang_es_ar">Іспанская (Аргентына)</string>
+    <string name="lang_nb">Нарвежская (Букмал)</string>
+    <string name="light_theme">Светлая</string>
     <string name="dark_theme">Цёмная</string>
     <string name="lang_bn">Бенгальская</string>
     <string name="lang_tl">Тагальская</string>
-    <string name="lang_sh">Сэрбскахарвацкая</string>
-    <string name="lang_az">Азэрбайджанская</string>
+    <string name="lang_sh">Сербскахарвацкая</string>
+    <string name="lang_az">Азербайджанская</string>
     <string name="lang_br">Брэтонская</string>
-    <string name="lang_sq">Альбанская</string>
+    <string name="lang_sq">Албанская</string>
     <string name="lang_is">Ісландская</string>
     <string name="lang_ga">Ірландская</string>
     <string name="lang_la">Лацінская</string>
-    <string name="lang_ku">Курдзкая</string>
+    <string name="lang_ku">Курдская</string>
     <string name="lang_ta">Тамільская</string>
     <string name="lang_ml">Малаялам</string>
-    <string name="lang_lb">Люксэмбурская</string>
+    <string name="lang_lb">Люксембургская</string>
     <string name="lang_os">Асяцінская</string>
-    <string name="lang_pms">Піемонцкая</string>
+    <string name="lang_pms">П’емонцкая</string>
     <string name="lang_bpy">Бішнупрыя</string>
     <string name="lang_nv">Наваха</string>
-    <string name="lang_new">Нэварская / Нэпал-бхаса</string>
-    <string name="restart_is_required">Каб ужыць усе зьмены, трэба перезапусьць прыкладанне ўручную.</string>
+    <string name="lang_new">Неварская / Непал-бхаса</string>
+    <string name="restart_is_required">Каб усе змены ўжыліся, патрэбна ўласнаручна перезапусціць дадатак.</string>
     <string name="rendering_attr_currentTrackColor_name">Колер GPX</string>
     <string name="rendering_attr_currentTrackWidth_name">Шырыня GPX</string>
     <string name="rendering_value_red_name">Чырвоны</string>
@@ -1912,8 +1915,8 @@
     <string name="rendering_value_translucent_orange_name">Празрысты аранжавы</string>
     <string name="rendering_value_yellow_name">Жоўты</string>
     <string name="rendering_value_translucent_yellow_name">Празрысты жоўты</string>
-    <string name="rendering_value_lightgreen_name">Сьветла зялёны</string>
-    <string name="rendering_value_translucent_lightgreen_name">Празрысты сьветла зялёны</string>
+    <string name="rendering_value_lightgreen_name">Светла-зялёны</string>
+    <string name="rendering_value_translucent_lightgreen_name">Празрысты светла-зялёны</string>
     <string name="rendering_value_green_name">Зялёны</string>
     <string name="rendering_value_translucent_green_name">Празрысты зялёны</string>
     <string name="rendering_value_lightblue_name">Блакітны</string>
@@ -1922,68 +1925,69 @@
     <string name="rendering_value_translucent_blue_name">Празрысты сіні</string>
     <string name="rendering_value_purple_name">Фіялетавы</string>
     <string name="rendering_value_translucent_purple_name">Празрысты фіялетавы</string>
-    <string name="rendering_value_default13_name">Па змоўчаньні (13)</string>
-	<string name="rendering_value_defaultTranslucentCyan_name">Па змоўчаньні (празрысты сіні)</string>
+    <string name="rendering_value_default13_name">Прадвызначана (13)</string>
+	<string name="rendering_value_defaultTranslucentCyan_name">Прадвызначана (празрысты сіні)</string>
     <string name="do_you_like_osmand">Вам падабаецца OsmAnd?</string>
 	
-	<string name="rate_this_app">Ацаніце гэту праграму</string>
+	<string name="rate_this_app">Ацаніце гэты дадатак</string>
 	<string name="rate_this_app_long">Калі ласка, дайце ацэнку OsmAnd на Google Play</string>
 	<string name="user_hates_app_get_feedback">Скажыце нам чаму.</string>
-	<string name="user_hates_app_get_feedback_long">Калі ласка, раскажыце нам, што вы хацелі б зьмяніць у гэтай праграме.</string>
+	<string name="user_hates_app_get_feedback_long">Калі ласка, раскажыце нам, што вы хацелі б змяніць у гэтым дадатку.</string>
 <string name="download_live_updates">Аўтаматычныя абнаўленні</string>
-	<string name="failed_to_upload">Не ўдалося адаслаць</string>
-	<string name="delete_change">Выдаліць зьмены</string>
-	<string name="successfully_uploaded_pattern">Адасланыя {0}/{1}</string>
+	<string name="failed_to_upload">Не атрымалася запампаваць</string>
+	<string name="delete_change">Выдаліць змены</string>
+	<string name="successfully_uploaded_pattern">Запампаваныя {0}/{1}</string>
 	<string name="try_again">Паўтарыць спробу</string>
 	<string name="error_message_pattern">Памылка: {0}</string>
-<string name="no_updates_available">Няма даступных абнаўленьняў</string>
-    <string name="we_really_care_about_your_opinion">Нас цікавіць ваша меркаваньне і ваш водгук важны для нас.</string>
+<string name="no_updates_available">Даступныя абнаўленні адсутнічаюць</string>
+    <string name="we_really_care_about_your_opinion">Нас цікавіць вашае меркаванне і ваш водгук важны для нас.</string>
 	<string name="rendering_value_boldOutline_name">Тлусты абрыс</string>
     <string name="traffic_warning_hazard">Небяспека</string>
     <string name="app_name_osmand">OsmAnd</string>
-	<string name="offline_maps_and_navigation">Аўтаномныя мапы\nі навігацыя</string>
-<string name="dahboard_options_dialog_title">Налады Панэлі кіраваньня</string>
-	<string name="shared_string_card_was_hidden">Картка схавана</string>
+	<string name="offline_maps_and_navigation">Пазасеціўныя мапы
+\nі навігацыя</string>
+<string name="dahboard_options_dialog_title">Наладзіць панэль кіравання</string>
+	<string name="shared_string_card_was_hidden">Картка схаваная</string>
 	<string name="shared_string_undo">Вярнуць</string>
-	<string name="shared_string_skip">Прапусьціць</string>
-	<string name="plugin_settings">Модулі</string>
-	<string name="commit_poi">Укласьці POI</string>
+	<string name="shared_string_skip">Прамінуць</string>
+	<string name="plugin_settings">Убудовы</string>
+	<string name="commit_poi">Пацвердзіць POI</string>
 <string name="routing_attr_avoid_shuttle_train_name">Пазбягаць прыгарадных цягнікоў</string>
 	<string name="routing_attr_avoid_shuttle_train_description">Пазбягаць выкарыстання прыгарадных цягнікоў</string>
     <string name="tab_title_basic">Асноўнае</string>
 	<string name="building_number">Нумар будынка</string>
 	<string name="next_proceed">Далей</string>
-	<string name="opening_at">Адчыняецца ў</string>
-	<string name="closing_at">Зачыняецца ў</string>
+	<string name="opening_at">Адчыняецца а</string>
+	<string name="closing_at">Зачыняецца а</string>
 <string name="tab_title_advanced">Пашыранае</string>
 	
 	<string name="contact_info">Кантакты</string>
-	<string name="description">Апісаньне</string>
+	<string name="description">Апісанне</string>
 	<string name="add_opening_hours">Дадаць гадзіны працы</string>
 	<string name="poi_dialog_poi_type">Тып POI</string>
-	<string name="please_specify_poi_type">Калі ласка, пазначце тып POI.</string>
+	<string name="please_specify_poi_type">Калі ласка, вызначце тып POI.</string>
 <string name="av_locations_descr">GPX-файл з мецазнаходжаннем заўваг.</string>
-    <string name="av_locations">Месцазнаходжаньні</string>
-    <string name="number_of_rows_in_dash">Колькасьць радкоў на галоўным экране %1$s</string>
+    <string name="av_locations">Месцазнаходжанні</string>
+    <string name="number_of_rows_in_dash">Колькасць радкоў на галоўным экране %1$s</string>
 	
 	<string name="poi_action_delete">выдаліць</string>
 	<string name="working_days">Працоўныя дні</string>
 	<string name="recent_places">Нядаўнія месцы</string>
-	<string name="favourites">Упадабаныя</string>
+	<string name="favourites">Улюбёныя</string>
 <string name="saved_at_time">Цяпер захаваны а %1$s</string>
 <string name="show_gpx">Паказаць GPX-даныя</string>
-<string name="poi_deleted_localy">POI будуць выдаленыя, як толькі вы загрузіце вашы зьмены</string>
-	<string name="show_on_start">Паказваць пры запуску</string>
-	<string name="count_of_lines">Колькасьць радкоў</string>
+<string name="poi_deleted_localy">POI будуць выдаленыя, як толькі вы запампуеце вашыя змены</string>
+	<string name="show_on_start">Паказваць падчас запуску</string>
+	<string name="count_of_lines">Колькасць радкоў</string>
     <string name="are_you_sure">Вы ўпэўненыя?</string>
-	<string name="unsaved_changes_will_be_lost">Усе незахаваныя зьмены будуць страчаны. Працягваць?</string>
+	<string name="unsaved_changes_will_be_lost">Усе незахаваныя змены будуць страчаны. Працягваць\?</string>
 <string name="simulate_your_location_stop_descr">Спыніць эмуляцыю свайго становішча.</string>
-    <string name="simulate_your_location_descr">Эмуляваць вашу пазіцыю, выкарыстоўваючы разлічаны маршрут або запісаны GPX-трэк.</string>
-    <string name="downloads_left_template">%1$s сьцягваньняў засталося</string>
-<string name="shared_string_wikipedia">Вікіпэдыя</string>
+    <string name="simulate_your_location_descr">Эмуляваць вашую пазіцыю, выкарыстоўваючы разлічаны маршрут або запісаны GPX-след.</string>
+    <string name="downloads_left_template">%1$s спамповак засталося</string>
+<string name="shared_string_wikipedia">Вікіпедыя</string>
     <string name="roads">Дарогі</string>
-<string name="favourites_edit_dialog_title">Звесткі пра ўпадабанае</string>
-    <string name="favourites_context_menu_add">Дадаць упадабанае</string>
+<string name="favourites_edit_dialog_title">Звесткі пра ўлюбёнае</string>
+    <string name="favourites_context_menu_add">Дадаць улюбёнае</string>
 	<string name="shared_string_trip_recording">Запіс падарожжа</string>
     <string name="shared_string_navigation">Навігацыя</string>
     <string name="osmand_running_in_background">Працуе ў фоне</string>
@@ -1998,99 +2002,99 @@
     <string name="si_m_s">Метраў за секунду</string>
     <string name="si_min_km">Хвілін на кіламетар</string>
     <string name="si_min_m">Хвілін на мілю</string>
-    <string name="si_nm_h">Марскіх міль за гадзіну (вузлоў)</string>
+    <string name="si_nm_h">Марскіх міль на гадзіну (вузлоў)</string>
     <string name="nm_h">вузлоў</string>
     <string name="min_mile">хв/м</string>
     <string name="min_km">хв/км</string>
     <string name="m_s">м/с</string>
     
-    <string name="srtm_plugin_disabled">Ізалініі вышынь адключаны</string>
-    <string name="downloading_number_of_files">Сьцягваецца - %1$d файл</string>
+    <string name="srtm_plugin_disabled">Ізалініі вышынь выключаныя</string>
+    <string name="downloading_number_of_files">Спампоўваецца - %1$d файл</string>
     <string name="show_free_version_banner_description">Паказваць банер бясплатнай версіі нават у платнай версіі.</string>
-<string name="show_free_version_banner">Паказваць банэр бясплатнай вэрсіі</string>
+<string name="show_free_version_banner">Паказваць банэр бясплатнай версіі</string>
     <string name="buy">Набыць</string>
-    <string name="later">Пазьней</string>
-    <string name="get_full_version">Паўнавартасная вэрсія</string>
-<string name="hillshade_layer_disabled">Зацяненьне рэльефу адключана</string>
-    <string name="activate_srtm_plugin">Калі ласка, актывуйце дадатак «Контурныя лініі»</string>
-    <string name="activate_seamarks_plugin">Калі ласка, актывуйце дадатак «Прагляд марской мапы»</string>
+    <string name="later">Пазней</string>
+    <string name="get_full_version">Поўная версія</string>
+<string name="hillshade_layer_disabled">Зацяненне рэльефу выключана</string>
+    <string name="activate_srtm_plugin">Калі ласка, ўключыце ўбудову «Контурныя лініі»</string>
+    <string name="activate_seamarks_plugin">Калі ласка, ўключяце ўбудову «Прагляд марской мапы»</string>
     <string name="regions">Рэгіёны</string>
     
     <string name="region_maps">Рэгіянальныя мапы</string>
-    <string name="world_maps">Сусьветныя мапы</string>
+    <string name="world_maps">Сусветныя мапы</string>
     
-    <string name="downloads">Сьцягваньні</string>
+    <string name="downloads">Спампоўкі</string>
 <string name="favorite_category_name">Назва катэгорыі</string>
     <string name="favorite_category_add_new_title">Дадаць новую катэгорыю</string>
-    <string name="favorite_category_dublicate_message">Калі ласка, выкарыстоўваеце назву катэгорыі, якая яшчэ не існуе.</string>
-    <string name="confirm_download_roadmaps">Мапа аўтадарог не патрэбная, бо вы маеце стандартную (поўную) мапу? Сцягнуць усё роўна?</string>
+    <string name="favorite_category_dublicate_message">Калі ласка, выкарыстайце назву катэгорыі, якая яшчэ не існуе.</string>
+    <string name="confirm_download_roadmaps">Мапа аўтадарог не патрэбная, бо вы маеце стандартную (поўную) мапу\? Спампаваць усё роўна\?</string>
     <string name="value_downloaded_of_max">%1$.1f з %2$.1f Мб</string>
     <string name="file_size_in_mb">%.1f Мб</string>
     <string name="update_all">Абнавіць усе (%1$s МБ)</string>
-    <string name="free_downloads_used">Выкарыстана бясплатных загрузак</string>
-    <string name="free_downloads_used_description">Паказвае колькі бясплатных загрузак засталося.</string>
+    <string name="free_downloads_used">Выкарыстана бясплатных спампоўванняў</string>
+    <string name="free_downloads_used_description">Паказвае колькі бясплатных спампоўванняў засталося.</string>
 <string name="shared_string_send">Адаслаць</string>
-    <string name="application_dir_description">Выберыце, дзе вы хочаце захоўваць мапы і іншыя файлы са зьвесткамі.</string>
-<string name="share_menu_location">Падзяліцца месцазнаходжаньнем</string>
+    <string name="application_dir_description">Абярыце, дзе вы хочаце захоўваць мапы і іншыя файлы даных.</string>
+<string name="share_menu_location">Падзяліцца месцазнаходжаннем</string>
     <string name="share_geo">геа:</string>
-    <string name="show_on_start_description">«Адключана» непасрэдна запускае экран мапы.</string>
-<string name="simulate_initial_startup">Імітаваць першы старт праграмы</string>
+    <string name="show_on_start_description">«Выключана» непасрэдна запускае экран мапы.</string>
+<string name="simulate_initial_startup">Імітаваць першы запуск дадатка</string>
     <string name="shared_string_qr_code">QR-код</string>
-    <string name="map_downloaded">Мапа сьцягнутая</string>
-    <string name="feedback">галасаваньне</string>
+    <string name="map_downloaded">Мапа спампаваная</string>
+    <string name="feedback">Зваротная сувязь</string>
     
-    <string name="shared_string_upload">Загрузіць</string>
+    <string name="shared_string_upload">Запампаваць</string>
     <string name="osm_edit_created_poi">Створана OSM POI</string>
     
     <string name="go_to_map">Паказаць мапу</string>
     
     
-    <string name="new_version">Новая вэрсія</string>
-    <string name="features_menu_group">Адметнасьці</string>
+    <string name="new_version">Новая версія</string>
+    <string name="features_menu_group">Магчымасці</string>
     <string name="other_menu_group">Іншае</string>
-    <string name="plugins_menu_group">Модулі</string>
-    <string name="faq_item">Часта задаваныя пытаньні</string>
-    <string name="versions_item">Вэрсіі</string>
+    <string name="plugins_menu_group">Убудовы</string>
+    <string name="faq_item">Частыя пытанні</string>
+    <string name="versions_item">Версіі</string>
     <string name="contact_us">Кантакты</string>
     <string name="map_legend">Легенда мапы</string>
 <string name="shared_string_update">Абнавіць</string>
-    <string name="world_map_download_descr">Базавая мапа сьвету (якая пакрывае ўвесь сьвет пры малым маштабе) адсутнічае або састарэла. Калі ласка, загрузіце яе каб мець агляд усяго сьвету.</string>
+    <string name="world_map_download_descr">Базавая мапа свету (якая пакрывае ўвесь свет пры малым маштабе) адсутнічае або састарэла. Калі ласка, спампуйце яе каб мець магчымасць базавага агляду ўсяго свету.</string>
     <string name="map_downloaded_descr">Мапа «%1$s» гатовая для выкарыстання.</string>
-    <string name="simulate_initial_startup_descr">Усталёўвае прыкмету першага запуску праграмы, не змяняе іншых наладаў.</string>
+    <string name="simulate_initial_startup_descr">Усталёўвае прыкмету першага запуску дадатка, не змяняе іншых налад.</string>
     <string name="enter_country_name">Увядзіце назву краіны</string>
     <string name="begin_with_osmand_menu_group">Першыя крокі з OsmAnd</string>
     <string name="help_us_to_improve_menu_group">Дапамажыце палепшыць OsmAnd</string>
     <string name="first_usage_item">Першы запуск</string>
-    <string name="first_usage_item_description">Як загрузіць мапы, усталяваць асноўныя налады.</string>
+    <string name="first_usage_item_description">Як спампаваць мапы, задаць асноўныя налады.</string>
     <string name="navigation_item_description">Налады навігацыі.</string>
-    <string name="planning_trip_item">Планаваньне паездкі</string>
-    <string name="faq_item_description">Часта задаваныя пытаньні</string>
+    <string name="planning_trip_item">Планаванне паездкі</string>
+    <string name="faq_item_description">Частыя пытанні</string>
     <string name="map_viewing_item">Агляд мапы</string>
     <string name="search_on_the_map_item">Пошук на мапе</string>
-    <string name="instalation_troubleshooting_item">Усталёўка і вырашэньне праблемаў</string>
+    <string name="instalation_troubleshooting_item">Усталёўка і вырашэнне праблемаў</string>
     <string name="techical_articles_item">Тэхнічныя артыкулы</string>
-    <string name="read_more">Падрабязьней</string>
+    <string name="read_more">Падрабязней</string>
     <string name="whats_new">Што новага ў</string>
     <string name="rendering_attr_hideProposed_name">Плануемыя аб\'екты</string>
     <string name="lang_mk">Македонская</string>
     <string name="lang_nds">Ніжненямецкая</string>
-    <string name="lang_fy">Заходнефрыская</string>
-    <string name="lang_als">Альбанская (Тоская)</string>
+    <string name="lang_fy">Заходнефрызская</string>
+    <string name="lang_als">Албанская (Tosk)</string>
     <string name="save_poi_without_poi_type_message">Вы сапраўды хочаце захаваць POI без тыпу?</string>
-    <string name="share_osm_edits_subject">Рэдагаваньні OSM апублікаваныя праз OsmAnd</string>
-    <string name="shared_string_location">Месцазнаходжаньне</string>
+    <string name="share_osm_edits_subject">Праўкі OSM, апублікаваныя праз OsmAnd</string>
+    <string name="shared_string_location">Месцазнаходжанне</string>
     <string name="copied_to_clipboard">Скапіявана ў буфер абмену</string>
-    <string name="osm_save_offline">Захаваць лякальна</string>
-    <string name="osm_edit_modified_poi">OSM POI адрэдагавана</string>
+    <string name="osm_save_offline">Захаваць лакальна</string>
+    <string name="osm_edit_modified_poi">OSM POI адрэдагаваная</string>
     <string name="osm_edit_deleted_poi">OSM POI выдаленая</string>
     <string name="context_menu_item_open_note">Дадаць нататку OSM</string>
-    <string name="osm_edit_reopened_note">Нататка OSM адкрыта зноў</string>
-    <string name="osm_edit_commented_note">Да нататкі OSM дададзены камэнтар</string>
+    <string name="osm_edit_reopened_note">Нататка OSM адкрытая зноў</string>
+    <string name="osm_edit_commented_note">Да нататкі OSM дададзены каментар</string>
     <string name="osm_edit_removed_note">Нататка OSM выдаленая</string>
-	<string name="osm_edit_created_note">Нататка OSM створана</string>
+	<string name="osm_edit_created_note">Нататка OSM створаная</string>
 	<string name="osn_bug_name">Нататка OSM</string>
 	<string name="osn_add_dialog_title">Стварыць нататку</string>
-	<string name="osn_comment_dialog_title">Дадаць камэнтар</string>
+	<string name="osn_comment_dialog_title">Дадаць каментар</string>
 	<string name="osn_reopen_dialog_title">Паўторна адкрыць нататку</string>
 	<string name="osn_close_dialog_title">Закрыць нататку</string>
 	<string name="osn_add_dialog_success">Нататка створаная</string>
@@ -2099,59 +2103,59 @@
 	<string name="osn_close_dialog_error">Не атрымалася закрыць нататку</string>
 	<string name="shared_string_commit">Адаслаць</string>
 	
-    <string name="rendering_attr_roadStyle_description">Стыль адлюстраваньня дарог</string>
+    <string name="rendering_attr_roadStyle_description">Стыль адлюстравання дарог</string>
     <string name="poi_context_menu_modify_osm_change">Рэдагаваць POI</string>
-    <string name="rendering_attr_currentTrackWidth_description">Шырыня сьледу GPX</string>
-    <string name="rendering_attr_currentTrackColor_description">Колер сьледу GPX</string>
+    <string name="rendering_attr_currentTrackWidth_description">Шырыня следу GPX</string>
+    <string name="rendering_attr_currentTrackColor_description">Колер следу GPX</string>
     <string name="poi_dialog_reopen">Пераадкрыць</string>
-	<string name="use_drawer_btn">Выкарыстоўваць мэню</string>
+	<string name="use_drawer_btn">Выкарыстоўваць меню</string>
     <string name="access_from_map_description">Кнопка «Меню» паказвае панэль кіравання, а не меню</string>
     <string name="access_from_map">Доступ з мапы</string>
-    <string name="context_menu_item_delete_waypoint">Выдаліць шляхавую кропку GPX?</string>
-    <string name="context_menu_item_edit_waypoint">Правіць кропку шляху GPX</string>
+    <string name="context_menu_item_delete_waypoint">Выдаліць пункт шляху GPX\?</string>
+    <string name="context_menu_item_edit_waypoint">Рэдагаваць пункт шляху GPX</string>
     <string name="routing_attr_avoid_stairs_name">Пазбягаць лесвіц</string>
 	<string name="routing_attr_avoid_stairs_description">Пазбягаць лесвіц</string>
 	<string name="routing_attr_avoid_borders_name">Пазбягаць перасячэння мяжы</string>
-	<string name="use_dashboard_btn">Выкарыстоўваць панэль кіраваньня</string>
-    <string name="dashboard_or_drawer_title">Панэль кіраваньня ці мэню</string>
-    <string name="please_specify_poi_type_only_from_list">Калі ласка, увядзіце правільны тып POI або прапусьціце яго.</string>
-    <string name="dashboard_or_drawer_description">Прапануецца выбар асноўнага элементу кіравання праграмаю праз панэль кіравання або статычнае меню. Ваш выбар можа быць зменены ў наладах галоўнага экрана.</string>
+	<string name="use_dashboard_btn">Выкарыстоўваць панэль кіравання</string>
+    <string name="dashboard_or_drawer_title">Панэль кіравання ці меню</string>
+    <string name="please_specify_poi_type_only_from_list">Калі ласка, ўвядзіце правільны тып POI або мініце яго.</string>
+    <string name="dashboard_or_drawer_description">Прапануецца выбар асноўнага элементу кіравання: праз панэль кіравання або статычнае меню. Ваш выбар можа быць зменены ў наладах галоўнага экрана.</string>
 
     <string name="shared_string_hide">Схаваць</string>
-    <string name="av_video_quality">Якасьць відэа</string>
-    <string name="av_video_quality_descr">Выбар якасьці відэа.</string>
-    <string name="av_audio_format">Фармат аўдыё вываду</string>
-    <string name="av_audio_format_descr">Абраць фармат аўдыё вываду.</string>
-    <string name="av_audio_bitrate">Аўдыё бітрэйт</string>
+    <string name="av_video_quality">Якасць відэа</string>
+    <string name="av_video_quality_descr">Абраць якасць відэа.</string>
+    <string name="av_audio_format">Фармат вываду аўдыё</string>
+    <string name="av_audio_format_descr">Абраць фармат вываду аўдыё.</string>
+    <string name="av_audio_bitrate">Бітрэйт аўдыё</string>
     <string name="av_audio_bitrate_descr">Абярыце бітрэйт аўдыё.</string>
-    <string name="av_video_quality_low">Нізкая якасьць</string>
-    <string name="av_video_quality_high">Высокая якасьць</string>
+    <string name="av_video_quality_low">Нізкая якасць</string>
+    <string name="av_video_quality_high">Высокая якасць</string>
     <string name="no_address_found">Адрас не вызначаны</string> 
 	<string name="shared_string_near">Побач</string>
     <string name="looking_up_address">Пошук адраса</string>
-    <string name="route_distance">Адлегласьць:</string>
+    <string name="route_distance">Адлегласць:</string>
     <string name="route_duration">Час:</string>
     <string name="rendering_attr_horseRoutes_name">Конныя маршруты</string>
-    <string name="update">Абнавіць кожны</string>
-    <string name="only_download_over_wifi">Сьцягваць толькі праз Wi-Fi</string>
-    <string name="live_update">Аўтаабнаўленьне</string>
+    <string name="update">Абнавіць</string>
+    <string name="only_download_over_wifi">Спампоўваць толькі праз Wi-Fi</string>
+    <string name="live_update">Аўтаабнаўленне</string>
     <string name="update_now">Абнавіць зараз</string>
 <string name="missing_write_external_storage_permission">OsmAnd не мае дазволу на выкарыстанне карткі памяці</string>
-<string name="no_location_permission">Праграма не мае дазволу на выкарыстаньне GPS.</string>
-    <string name="no_camera_permission">Праграма не мае дазволу на выкарыстаньне камэры.</string>
-    <string name="no_microphone_permission">Праграма не мае дазволу на выкарыстаньне мікрафону.</string>
+<string name="no_location_permission">Дадатаа не мае дазволу на выкарыстанне GPS.</string>
+    <string name="no_camera_permission">Дадатак не мае дазволу на выкарыстанне камеры.</string>
+    <string name="no_microphone_permission">Дадатак не мае дазволу на выкарыстанне мікрафону.</string>
     <string name="available_maps">Даступныя мапы</string>
     <string name="shared_string_sound">Гук</string>
-    <string name="last_update">Апошняе абнаўленьне: %s</string>
+    <string name="last_update">Апошняе абнаўленне: %s</string>
     <string name="live_updates">Аўтаматычныя абнаўленні</string>
-    <string name="select_voice_provider">Выберыце галасавыя ўказаньні</string>
-    <string name="select_voice_provider_descr">Выберыце ці сцягніце галасавыя ўказаньні для вашай мовы.</string>
+    <string name="select_voice_provider">Абярыце галасавыя падказкі</string>
+    <string name="select_voice_provider_descr">Абярыце ці спампуйце галасавыя падказкі для вашай мовы.</string>
     <string name="impassable_road_desc">Абярыце дарогі, якія вы хочаце пазбягаць падчас навігацыі.</string>
     
-    <string name="update_time">Час абнаўленьня</string>
-<string name="updates_size">Абнаўленьні: %s</string>
-    <string name="last_map_change">Апошняя зьмена мапы: %s</string>
-<string name="shared_string_not_selected">Ня выбрана</string>
+    <string name="update_time">Час абнаўлення</string>
+<string name="updates_size">Абнаўленні: %s</string>
+    <string name="last_map_change">Апошняя змена мапы: %s</string>
+<string name="shared_string_not_selected">Не абрана</string>
     <string name="hourly">Штогадзінна</string>
     <string name="daily">Штодзённа</string>
     <string name="weekly">Штотыднёва</string>
@@ -2161,126 +2165,126 @@
     <string name="starting_point">Пачатковы пункт</string>
     <string name="shared_string_undo_all">Вярнуць усё</string>
     <string name="rec_split_storage_size">Памер сховішча</string>
-    <string name="select_month_and_country">Выберыце месяц і краіну</string>
+    <string name="select_month_and_country">Абярыце месяц і краіну</string>
 <string name="shared_string_select">Абраць</string>
     <string name="shared_string_remove">Выдаліць</string>
     <string name="road_blocked">Дарога заблакаваная</string>
-    <string name="switch_start_finish">Памяняць месцамі пункт адпраўленьня і пункт прызначэньня</string>
+    <string name="switch_start_finish">Памяняць месцамі пачатковы пункт і пункт прызначэння</string>
     <string name="rendering_attr_hideIcons_name">Значкі POI</string>
-    <string name="rec_split">Разьбіцьцё на кліпы</string>
-    <string name="rec_split_title">Выкарыстоўваць разьбіцьцё на кліпы</string>
+    <string name="rec_split">Разбіццё на часткі</string>
+    <string name="rec_split_title">Выкарыстоўваць разбіццё на часткі</string>
     <string name="rec_split_desc">Цыклічны перазапіс кліпаў пры перавышэнні зададзенага аб\'ёму сховішча.</string>
-    <string name="rec_split_clip_length">Працягласьць відэакліпа</string>
+    <string name="rec_split_clip_length">Працягласць відэакліпа</string>
     <string name="rec_split_clip_length_desc">Верхняя мяжа часу запісанага кліпа.</string>
     <string name="rec_split_storage_size_desc">Аб\'ём памяці, які можа быць заняты ўсімі відэакліпамі.</string>
-    <string name="number_of_contributors">Колькасьць удзельнікаў</string>
-    <string name="number_of_edits">Колькасьць правак</string>
+    <string name="number_of_contributors">Колькасць удзельнікаў</string>
+    <string name="number_of_edits">Колькасць правак</string>
     <string name="show_polygons">Паказваць палігоны</string>
-    <string name="find_parking">Знайсьці паркоўку</string>
-    <string name="shared_string_status">Стан</string>
-    <string name="shared_string_save_changes">Захаваць зьмены</string>
-    <string name="shared_string_email_address">E-mail адрас</string>
+    <string name="find_parking">Знайсці паркоўку</string>
+    <string name="shared_string_status">Статус</string>
+    <string name="shared_string_save_changes">Захаваць змены</string>
+    <string name="shared_string_email_address">Адрас электроннай пошты</string>
     <string name="rendering_attr_hideUnderground_name">Падземныя аб\'екты</string>
-    <string name="data_is_not_available">Зьвесткі недаступныя</string>
+    <string name="data_is_not_available">Даныя недаступныя</string>
     <string name="shared_string_read_more">Чытаць далей</string>
-    <string name="clear_updates_proposition_message">Выдаліць сьцягнутыя абнаўленьні і вярнуцца да першапачатковай рэдакцыі мапы</string>
+    <string name="clear_updates_proposition_message">Выдаліць спампаваныя абнаўленні і вярнуцца да першапачатковай рэдакцыі мапы</string>
     <string name="add_time_span">Дадаць часавы прамежак</string>
-    <string name="item_removed">Элемэнт выдалены</string>
-    <string name="n_items_removed">Элемэнты выдалены</string>
+    <string name="item_removed">Элемент выдалены</string>
+    <string name="n_items_removed">Элементы выдаленыя</string>
     <string name="reports_for">Паведаміць</string>
 
-    <string name="rendering_attr_showMtbRoutes_name">Адлюстроўваць MTB маршруты</string>
-    <string name="donations">Ахвяраваньні</string>
-    <string name="storage_directory_shared">Сумесная памяць</string>
+    <string name="rendering_attr_showMtbRoutes_name">Адлюстроўваць MTB-маршруты</string>
+    <string name="donations">Ахвяраванні</string>
+    <string name="storage_directory_shared">Агульная памяць</string>
     <string name="recalculate_route">Пералічыць маршрут</string>
-    <string name="number_of_recipients">Колькасьць атрымальнікаў</string>
+    <string name="number_of_recipients">Колькасць атрымальнікаў</string>
     <string name="osm_live_subscribe_btn">Падпісацца</string>
     <string name="osm_live_hide_user_name">Не паказваць маё імя ў справаздачах</string>
     <string name="osm_live_month_cost">Кошт на месяц</string>
     <string name="osm_live_month_cost_desc">Штомесячны плацёж</string>
     <string name="osm_live_enter_email">Калі ласка, увядзіце сапраўдны адрас электроннай пошты</string>
-    <string name="osm_live_subscription_settings">Парамэтры падпіскі</string>
+    <string name="osm_live_subscription_settings">Налады падпіскі</string>
     <string name="osm_live_ask_for_purchase">Калі ласка, спачатку набудзьце падпіску OsmAnd Live</string>
 
-    <string name="osm_live_header">Гэтая падпіска дазваляе атрымліваць штогадзіннае абнаўленьне для ўсіх мапаў сьвету. Частка даходаў перадаецца ў OSM-супольнасьць і выплачваецца за кожны ўнёсак у OSM. У выпадку, калі вы любіце OsmAnd і OSM, і хочаце падтрымаць і быць падтрыманым імі, гэта ідэальны спосаб зрабіць гэта.</string>
+    <string name="osm_live_header">Гэтая падпіска дазваляе атрымліваць штогадзіннае абнаўленне для ўсіх мапаў свету. Частка даходаў перадаецца ў OSM-супольнасць і выплочваецца за кожны ўнёсак у OSM. У выпадку, калі вы любіце OsmAnd і OSM, і хочаце падтрымаць і быць падтрыманым імі, гэта ідэальны спосаб зрабіць гэта.</string>
     
-    <string name="select_map_marker">Выберыце пазнаку</string>
-    <string name="map_markers_other">Іншыя пазнакі</string>
+    <string name="select_map_marker">Абярыце адзнаку</string>
+    <string name="map_markers_other">Іншыя адзнакі</string>
     <string name="upload_anonymously">Адаслаць ананімна</string>
     <string name="download_files_error_not_enough_space">Недастаткова памяці!
  Патрабуецца {3} МБ часовай і {1} МБ сталай памяці.
  Даступна толькі {2} МБ.</string>
     <string name="download_files_question_space_with_temp">Спампаваць {0} файл(аў)? Выкарыстоўваецца {3} МБ часовай і {1} МБ сталай памяці. (Свабодна {2} МБ прасторы.)</string>
-    <string name="map_marker_1st">Першая пазнака</string>
-    <string name="map_marker_2nd">Другая пазнака</string>
-    <string name="shared_string_toolbar">Панэль інструмэнтаў</string>
+    <string name="map_marker_1st">Першая адзнака</string>
+    <string name="map_marker_2nd">Другая адзнака</string>
+    <string name="shared_string_toolbar">Панэль прылад</string>
     <string name="shared_string_widgets">Віджэты</string>
-    <string name="shared_string_reverse_order">Зваротны парадак</string>
-    <string name="clear_active_markers_q">Выдаліць усе актыўныя пазнакі\?</string>
-    <string name="clear_markers_history_q">Ачысьціць гісторыю пазнакаў мапы\?</string>
-    <string name="active_markers">Актыўныя пазнакі</string>
-    <string name="map_markers">Пазнакі</string>
-    <string name="map_marker">Пазнака мапы</string>
-    <string name="consider_turning_polygons_off">Рэкамэндуецца адключыць адмалёўку палігонаў.</string>
+    <string name="shared_string_reverse_order">Адваротны парадак</string>
+    <string name="clear_active_markers_q">Выдаліць усе актыўныя адзнакі\?</string>
+    <string name="clear_markers_history_q">Ачысціць гісторыю адзнак мапы\?</string>
+    <string name="active_markers">Актыўныя адзнакі</string>
+    <string name="map_markers">Адмеціны мапы</string>
+    <string name="map_marker">Адмеціна мапы</string>
+    <string name="consider_turning_polygons_off">Рэкамендуецца выключыць адмалёўку палігонаў.</string>
     <string name="osm_live_subscription">Падпіска OsmAnd Live</string>
     <string name="osm_live_active">Актыўны</string>
     <string name="osm_live_not_active">Не актыўны</string>
     <string name="show_transparency_seekbar">Паказаць празрыстую пошукавую панэль</string>
-    <string name="storage_permission_restart_is_required">Прыкладанне мае дазвол на запіс на знешні носьбіт, але патрабуецца перазагрузка.</string>
+    <string name="storage_permission_restart_is_required">Дадатак мае дазвол на запіс на рухомы носьбіт, але патрабуецца перазагрузка.</string>
     <string name="full_report">Поўная справаздача</string>
     <string name="open_street_map_login_and_pass">Імя карыстальніка і пароль OpenStreetMap</string>
-    <string name="osm_live_thanks">Дзякуй вам за падтрымку OsmAnd!
-\nКаб актываваць усе новыя функцыі неабходна перазапусціць OsmAnd.</string>
+    <string name="osm_live_thanks">Дзякуй вам за падтрымку OsmAnd! 
+\nКаб актываваць усе новыя функцыі, неабходна перазапусціць OsmAnd.</string>
     <string name="osm_live_region_desc">Частка вашага ахвяравання будзе накіроўвацца OSM-карыстальнікам, якія ўнеслі змены ў мапу гэтага рэгіёна.</string>
-    <string name="upload_osm_note_description">Адаслаць Вашу OSM-нататку ананімна альбо праз свой профіль OpenStreetMap.org.</string>
-    <string name="upload_osm_note">Адаслаць OSM заўвагу</string>
+    <string name="upload_osm_note_description">Адаслаць вашую OSM-нататку ананімна альбо праз свой профіль OpenStreetMap.org.</string>
+    <string name="upload_osm_note">Адаслаць OSM-нататку</string>
     <string name="report">Справаздача</string>
     
     <string name="shared_string_move_up">Перамясціць ↑</string>
     <string name="shared_string_move_down">Перамясціць ↓</string>
     <string name="finish_navigation">Завяршыць навігацыю</string>
-    <string name="avoid_road">Пазьбягаць дарог</string>
+    <string name="avoid_road">Пазбягаць дарог</string>
     <string name="shared_string_topbar">Верхняя панэль</string>
     <string name="osm_user_stat">Правак: %1$s, ранг: %2$s, усяго правак: %3$s</string>
-    <string name="osm_editors_ranking">Рэйтынг картографаў OSM</string>
+    <string name="osm_editors_ranking">Рэйтынг мапографаў OSM</string>
     <string name="osm_live_user_public_name">Публічнае імя</string>
-    <string name="osm_live_support_region">Падтрымоўваны рэгіён</string>
+    <string name="osm_live_support_region">Падтрымліваемы рэгіён</string>
     <string name="osm_live_enter_user_name">Калі ласка, ўвядзіце публічнае імя</string>
-    <string name="select_map_markers">Абярыце пазнакі</string>
-    <string name="file_name_containes_illegal_char">Назва файлу зьмяшчае недапушчальны сымбаль</string>
+    <string name="select_map_markers">Абярыце адзнакі</string>
+    <string name="file_name_containes_illegal_char">Назва файла змяшчае недапушчальны сімвал</string>
 <string name="rendering_value_thin_name">Тонкі</string>
     <string name="rendering_value_medium_name">Сярэдні</string>
     <string name="rendering_value_bold_name">Тоўсты</string>
     <string name="map_mode">Рэжым мапы</string>
-    <string name="number_of_gpx_files_selected_pattern">Абрана %s GPX файлаў</string>
-    <string name="add_points_to_map_markers_q">Дадаць усе кропкі як пазнакі мапы\?</string>
-    <string name="shared_string_add_to_map_markers">Дадаць да пазнакаў мапы</string>
-    <string name="no_map_markers_found">Калі ласка, дадайце пазнакі праз экран мапы</string>
-    <string name="storage_directory_readonly_desc">Пераключыліся на ўнутраную памяць, бо абраны каталог для захоўвання дадзеных толькі для чытання. Калі ласка, абярыце перазапісвальны каталог.</string>
+    <string name="number_of_gpx_files_selected_pattern">Абрана %s GPX-файлаў</string>
+    <string name="add_points_to_map_markers_q">Дадаць усе пункты як адзнакі мапы\?</string>
+    <string name="shared_string_add_to_map_markers">Дадаць да адзнак мапы</string>
+    <string name="no_map_markers_found">Калі ласка, дадайце адзнакі праз экран мапы</string>
+    <string name="storage_directory_readonly_desc">Пераключана на ўнутраную памяць, бо абраны каталог для захоўвання даных даступны толькі для чытання. Калі ласка, абярыце перазапісвальны каталог.</string>
     <string name="osm_live_email_desc">Неабходна, каб даць вам інфармацыю аб удзеле.</string>
-    <string name="show_map_markers_description">Актывуе функцыю пазнакаў мапы.</string>
-    <string name="no_waypoints_found">Не знайшлося шляхавых пунктаў</string>
-    <string name="access_default_color">Колер па змаўчаньні</string>
-    <string name="access_category_choice">Выберыце катэгорыю</string>
+    <string name="show_map_markers_description">Актывуе функцыю адзнак мапы.</string>
+    <string name="no_waypoints_found">Пунктаў шляху не знойдзена</string>
+    <string name="access_default_color">Прадвызначаны колер</string>
+    <string name="access_category_choice">Абярыце катэгорыю</string>
     <string name="access_hint_enter_name">Увядзіце імя</string>
     <string name="access_hint_enter_category">Увядзіце катэгорыю</string>
-    <string name="access_hint_enter_description">Увядзіце апісаньне.</string>
-    <string name="access_map_linked_to_location">Мапа прывязаная да месцазнаходжаньня</string>
-    <string name="access_collapsed_list">Згорнуты сьпіс</string>
-    <string name="access_expanded_list">Разгорнуты сьпіс</string>
-    <string name="access_empty_list">Пусты сьпіс</string>
-    <string name="access_tree_list">Іерархічны сьпіс</string>
-    <string name="access_shared_string_not_installed">Не ўсталяваны</string>
+    <string name="access_hint_enter_description">Увядзіце апісанне.</string>
+    <string name="access_map_linked_to_location">Мапа прывязаная да месцазнаходжання</string>
+    <string name="access_collapsed_list">Згорнуты спіс</string>
+    <string name="access_expanded_list">Разгорнуты спіс</string>
+    <string name="access_empty_list">Пусты спіс</string>
+    <string name="access_tree_list">Іерархічны спіс</string>
+    <string name="access_shared_string_not_installed">Не ўсталявана</string>
     <string name="access_widget_expand">Разгарнуць</string>
-    <string name="access_shared_string_navigate_up">Перайсьці ўверх</string>
+    <string name="access_shared_string_navigate_up">Перайсці вышэй</string>
     <string name="access_sort">Сартаваць</string>
-    <string name="access_disable_offroute_recalc">Не пералічваць маршрут пасля пакідання яго</string>
-    <string name="access_disable_offroute_recalc_descr">Без пераліку маршруту пасля таго, як вы зыдзеце з яго.</string>
-    <string name="access_disable_wrong_direction_recalc">Не пералічваць маршрут пры зваротным кірунку руху</string>
-    <string name="access_disable_wrong_direction_recalc_descr">Без пераліку маршруту падчас зваротнага кірунку руху.</string>
-    <string name="access_smart_autoannounce">Інтэлектуальнае аўтаабвяшчэньне</string>
-    <string name="access_smart_autoannounce_descr">Папярэджваць толькі пры змене кірунку на мэтавы пункт.</string>
-    <string name="access_autoannounce_period">Пэрыяд аўтаабвяшчэньняў</string>
+    <string name="access_disable_offroute_recalc">Не пералічваць маршрут пасля яго пакідання</string>
+    <string name="access_disable_offroute_recalc_descr">Без пераліку маршруту пасля таго, як вы пакінеце яго.</string>
+    <string name="access_disable_wrong_direction_recalc">Не пералічваць маршрут пры зваротным накірунку руху</string>
+    <string name="access_disable_wrong_direction_recalc_descr">Без пераліку маршруту падчас руху ў зваротным накірунку.</string>
+    <string name="access_smart_autoannounce">Разумнае аўтаабвяшчэнне</string>
+    <string name="access_smart_autoannounce_descr">Папярэджваць толькі пры змене накірунку на мэтавы пункт.</string>
+    <string name="access_autoannounce_period">Перыяд аўтабвяшчэнняў</string>
     <string name="access_autoannounce_period_descr">Мінімальны час паміж абвяшчэннямі.</string>
     <string name="map_widget_bearing">Адносны азімут</string>
     <string name="map_widget_magnetic_bearing">Магнітны азімут</string>
@@ -2293,13 +2297,13 @@
     <string name="access_direction_haptic_feedback_descr">Індыцыраваць вібрацыяй кірунак на мэтавы пункт.</string>
     <string name="map_widget_battery">Зарад батарэі</string>
     <!-- string name="lat_lon_pattern">Шыр: %1$.5f Даў: %2$.5f</string -->
-    <string name="lang_hu_formal">Вугорская (афіцыйная)</string>
-    <string name="move_marker_bottom_sheet_title">Перасуньце мапу, каб змяніць пазіцыю пазнакі</string>
-    <string name="change_markers_position">Змяніць пазіцыю пазнакі</string>
-    <string name="lang_be_by">Беларуская лацінка</string>
-    <string name="lang_es_us">Гішпанская (ЗША)</string>
-    <string name="lang_en_gb">Ангельская (Вялікабрытанія)</string>
-    <string name="current_track">Дзейны трэк</string>
+    <string name="lang_hu_formal">Венгерская (афіцыйная)</string>
+    <string name="move_marker_bottom_sheet_title">Перамясціце мапу, каб змяніць пазіцыю адзнакі</string>
+    <string name="change_markers_position">Змяніць пазіцыю адзнакі</string>
+    <string name="lang_be_by">"Беларуская (Лацінка) "</string>
+    <string name="lang_es_us">Іспанская (ЗША)</string>
+    <string name="lang_en_gb">Англійская (Вялікабрытанія)</string>
+    <string name="current_track">Бягучы след</string>
     <string name="lang_kn">Канада (Індыя)</string>
     <string name="use_osm_live_routing_description">Уключыць навігацыю для змен OsmAnd Live.</string>
 	<string name="lang_ast">Астурыйская</string>
@@ -2307,7 +2311,7 @@
  	<string name="app_mode_train">Цягнік</string>
     <string name="storage_directory_card">Картка памяці</string>
     <string name="coords_format">Фармат каардынатаў</string>
-    <string name="coords_format_descr">Фармат для геаграфічных каардынатаў.</string>
+    <string name="coords_format_descr">Фармат для геаграфічных каардынат.</string>
   	<string name="shared_string_is_open_24_7">Адчынена 24/7</string>
     <string name="map_widget_search">Шукаць</string>
 	<string name="shared_string_from">ад</string>
@@ -2318,99 +2322,99 @@
     <string name="postcode">Паштовы індэкс</string>
     <string name="route_stops_before">%1$s прыпынкаў да абранага</string>
     <string name="coords_search">Пошук па каардынатах</string>
-    <string name="advanced_coords_search">Пашыраны каардынатны пошук</string>
-    <string name="back_to_search">Вярнуцца да пошука</string>
+    <string name="advanced_coords_search">Пашыраны пошук па каардынатах</string>
+    <string name="back_to_search">Вярнуцца да пошуку</string>
     <string name="confirmation_to_delete_history_items">Выдаліць абраныя элементы з «Гісторыі»?</string>
     <string name="show_something_on_map">Паказаць %1$s на мапе</string>
     <string name="rendering_attr_hideOverground_name">Надземныя аб\'екты</string>
 
-    <string name="dist_away_from_my_location">Шукаць за %1$s ад месцазнаходжаньня</string>
+    <string name="dist_away_from_my_location">Шукаць за %1$s ад месцазнаходжання</string>
     <string name="share_history_subject">падзяліліся праз OsmAnd</string>
     
-    <string name="shared_string_change">Зьмяніць</string>
+    <string name="shared_string_change">Змяніць</string>
     <string name="get_started">Пачаць</string>
     <string name="routing_attr_short_way_name">Паліўна-ашчадны маршрут</string>
     <string name="routing_attr_short_way_description">Разлічвае паліва-ашчадны маршрут (звычайна найкарацейшы).</string>
-    <string name="replace_favorite_confirmation">Вы сапраўды хочаце замяніць упадабанае %1$s?</string>
+    <string name="replace_favorite_confirmation">Вы сапраўды хочаце замяніць улюбёнае %1$s\?</string>
     <string name="update_all_maps_now">Абнавіць усе мапы зараз?</string>
-    <string name="clear_tile_data">Ачысьціць кэш сеціўных мапаў</string>
+    <string name="clear_tile_data">Ачысціць кэш сеціўных мапаў</string>
     <string name="no_update_info_desc">Не правяраць новыя версій і зніжкі ад OsmAnd.</string>
     <string name="no_update_info">Не паказваць новыя версіі</string>
-    <string name="skip_map_downloading">Прапусьціць сьцягванне мапаў</string>
-    <string name="skip_map_downloading_desc">У вас няма загружаных мапаў. Вы можаце выбраць мапу са спісу або сцягнуць яе пазней праз «Меню - %1$s».</string>
+    <string name="skip_map_downloading">Прамінуць спампоўванне мапаў</string>
+    <string name="skip_map_downloading_desc">У вас адсутнічаюць мапы. Вы можаце абраць мапу са спіса альбо спампаваць яе пазней праз «Меню - %1$s».</string>
     <string name="search_another_country">Абраць іншы рэгіён</string>
     <string name="search_map">Пошук мапаў…</string>
-    <string name="first_usage_wizard_desc">OsmAnd вызначыць ваша месцазнаходжанне і прапануе спампаваць мапы для гэтага рэгіёну.</string>
+    <string name="first_usage_wizard_desc">OsmAnd вызначыць вашае месцазнаходжанне і прапануе спампаваць мапы для гэтага рэгіёна.</string>
     <string name="location_not_found">Не атрымалася вызначыць месцазнаходжанне</string>
-    <string name="no_inet_connection">Няма Інтэрнэт-злучэньня</string>
-    <string name="no_inet_connection_desc_map">Патрабуецца для сьцягваньня мапаў.</string>
+    <string name="no_inet_connection">Злучэнне з Інтэрнэтам адсутнічае</string>
+    <string name="no_inet_connection_desc_map">Патрабуецца для спампоўвання мапаў.</string>
     <string name="search_location">Пашук месцазнаходжання…</string>
     <string name="storage_free_space">Вольнае месца</string>
-    <string name="storage_place_description">Сховішча звестак OsmAnd (для мапаў, GPX-файлаў і г.д.): %1$s.</string>
+    <string name="storage_place_description">Сховішча даных OsmAnd (для мапаў, GPX-файлаў і г.д.): %1$s.</string>
     <string name="give_permission">Дазволіць</string>
-    <string name="allow_access_location">Дазволіць доступ да месцазнаходжаньня</string>
-    <string name="first_usage_greeting">Пракладвайце маршруты і адкрывайце новыя месцы без Інтэрнэт-падлучэння</string>
+    <string name="allow_access_location">Дазволіць доступ да месцазнаходжання</string>
+    <string name="first_usage_greeting">Пракладвайце маршруты і адкрывайце новыя месцы без злучэння з Інтэрнэтам</string>
     <string name="search_my_location">Знайсці маю пазіцыю</string>
     <string name="get_for">Атрымаць за %1$s</string>
     <string name="get_for_month">Атрымаць за %1$s у месяц</string>
     <string name="get_it">Атрымаць</string>
-    <string name="osm_live_banner_desc">Атрымайце неабмежаваныя загрузкі мапаў і абнаўленні больш за адзін раз на месяц: штотыдзень, штодзень ці штогадзіну.</string>
-    <string name="osmand_plus_banner_desc">Неабмежаваная загрузка мапаў, абнаўленняў і Wikipedia-дадатка.</string>
+    <string name="osm_live_banner_desc">Атрымайце неабмежаваную колькасць спампоўванняў мапаў і абнаўленні больш за адзін раз на месяц: штотыдзень, штодзень ці штогадзіну.</string>
+    <string name="osmand_plus_banner_desc">Неабмежаваная колькасць спамоўванняў мапаў, абнаўленняў і ўбудова Wikipedia.</string>
     <string name="si_mi_meters">Мілі/метры</string>
-    <string name="osm_live_payment_desc">Плата за падапіску спаганяецца штомесяц. Адмяніць яе на Google Play можна у любы момант.</string>
+    <string name="osm_live_payment_desc">Плата за падпіску спаганяецца штомесяц. Скасаваць яе на Google Play можна у любы момант.</string>
     <string name="donation_to_osm">Ахвяраванне OpenStreetMap супольнасці</string>
-    <string name="donation_to_osm_desc">Частка вашага ахвяраваньня накіраваная OSM карыстальнікам, якія адпраўляюць змены ў OpenStreetMap. Кошт падпіскі застаецца тым жа самым.</string>
-    <string name="osm_live_subscription_desc">Падпіска дазваляе атрымліваць штогадзіныя, штодзённыя, штотыднёвыя абнаўленьні і неабмежаваныя загрузкі для ўсіх мапаў па ўсім сьвеце.</string>
+    <string name="donation_to_osm_desc">Частка вашага ахвяравання накіроўваецца OSM карыстальнікам, якія адпраўляюць змены ў OpenStreetMap. Кошт падпіскі застаецца тым жа самым.</string>
+    <string name="osm_live_subscription_desc">Падпіска дазваляе атрымліваць штогадзіныя, штодзённыя, штотыднёвыя абнаўленні і неабмежаваную колькасць спампоўванняў для ўсіх мапаў па ўсім свеце.</string>
     <string name="driving_region_australia">Аўстралія</string>
     <string name="lang_kab">Кабільская</string>
     <string name="shared_string_filters">Фільтры</string>
     <string name="apply_filters">Ужыць фільтры</string>
-    <string name="save_filter">Захаваць фільтар</string>
+    <string name="save_filter">Захаваць фільтр</string>
     <string name="delete_filter">Выдаліць фільтр</string>
-    <string name="new_filter">Новы фільтар</string>
+    <string name="new_filter">Новы фільтр</string>
     <string name="new_filter_desc">Калі ласкі, увядзіце назву новага фільтра. Ён будзе дададзены ў спіс катэгорый.</string>
     <string name="edit_filter">Рэдагаваць катэгорыі</string>
     <string name="subcategories">Падкатэгорыі</string>
     <string name="selected_categories">Абраныя катэгорыі</string>
-    <string name="create_custom_poi">Стварыць уласны фільтр</string>
-    <string name="custom_search">Уласны пошук</string>
-    <string name="translit_names">Трансьлітарацыя назваў</string>
+    <string name="create_custom_poi">Стварыць адвольны фільтр</string>
+    <string name="custom_search">Адвольны пошук</string>
+    <string name="translit_names">Транслітарацыя назваў</string>
     
     
     <string name="trip_rec_notification_settings">Уключыць хуткі запуск запісу</string>
-    <string name="shared_string_notifications">Паведамленьні</string>
+    <string name="shared_string_notifications">Апавяшчэнні</string>
     <string name="shared_string_continue">Працягнуць</string>
-    <string name="shared_string_pause">Перапыніць</string>
+    <string name="shared_string_pause">Прыпыніць</string>
     <string name="shared_string_trip">Падарожжа</string>
     <string name="shared_string_recorded">Запісана</string>
     <string name="shared_string_record">Запіс</string>
-    <string name="gpx_logging_no_data">Няма зьвестак</string>
-    <string name="gpx_add_track">Дадаць больш…</string>
+    <string name="gpx_logging_no_data">Даныя адсутнічаюць</string>
+    <string name="gpx_add_track">Дадаць яшчэ…</string>
     <string name="gpx_appearance">Выгляд</string>
     
     <string name="trip_rec_notification_settings_desc">Паказваць апавяшчэнне, якое дазволіць пачаць запіс падарожжа.</string>
     <string name="christmas_poi">Калядныя POI</string>
     <string name="christmas_desc_q">Паказаць калядныя POI?</string>
-    <string name="rendering_value_light_brown_name">Сьветла-карычневы</string>
+    <string name="rendering_value_light_brown_name">Светла-карычневы</string>
     <string name="rendering_value_dark_brown_name">Цёмна-карычневы</string>
-    <string name="rendering_attr_surfaceIntegrity_name">Якасьць дарожнага пакрыцьця</string>
-    <string name="search_hint">Увядзіце горада, адрас, назву POI</string>
-    <string name="translit_name_if_miss">Трансьлітарыраваць калі назва на %1$s адсутнічае</string>
+    <string name="rendering_attr_surfaceIntegrity_name">Якасць дарожнага пакрыцця</string>
+    <string name="search_hint">Увядзіце горад, адрас, назву POI</string>
+    <string name="translit_name_if_miss">Транслітарыраваць калі назва на %1$s адсутнічае</string>
     <string name="route_calculation">Разлік шляху</string>
     <string name="gpx_no_tracks_title">У вас яшчэ няма GPX-файлаў</string>
-    <string name="gpx_no_tracks_title_folder">Вы таксама можаце дадаць GPX-файлы ў тэчку</string>
-    <string name="route_roundabout_short">Збочце на %1$d зьезьдзе</string>
-    <string name="upload_poi">Выгрузіць POI</string>
+    <string name="gpx_no_tracks_title_folder">Вы таксама можаце дадаць GPX-файлы ў каталог</string>
+    <string name="route_roundabout_short">Збочце на %1$d з’ездзе</string>
+    <string name="upload_poi">Запампаваць POI</string>
     <string name="search_map_hint">Пошук горада ці краіны</string>
-    <string name="wiki_around">Блізкія артыкулы ў Вікіпэдыі</string>
+    <string name="wiki_around">Блізкія артыкулы ў Вікіпедыі</string>
     <string name="rendering_value_fine_name">Вельмі тонкі</string>
-    <string name="rendering_attr_contourColorScheme_description">Колеравая схема гарызанталяў</string>
-    <string name="save_track_min_speed">Мінімальная хуткасьць для запісу</string>
-    <string name="christmas_desc">Напярэдадні калядных і навагодніх сьвятаў, вы можаце выбраць для адлюстраваньня POI, зьвязаныя з Калядамі: елкі, кірмашы і да т.п.</string>
-    <string name="rendering_attr_contourColorScheme_name">Колеравая схема гарызанталяў</string>
+    <string name="rendering_attr_contourColorScheme_description">Каляровая схема гарызанталяў</string>
+    <string name="save_track_min_speed">Мінімальная хуткасць для запісу</string>
+    <string name="christmas_desc">Напярэданні калядных і навагодніх святаў, вы можаце абраць для адлюстравання POI, звязаныя з Калядамі: елкі, кірмашы і да т.п.</string>
+    <string name="rendering_attr_contourColorScheme_name">Каляровая схема гарызанталяў</string>
     <string name="routing_attr_allow_motorway_name">Дазволіць аўтамагістралі</string>
     <string name="routing_attr_allow_motorway_description">Дазволіць аўтамагістралі.</string>
-    <string name="lang_sr_latn">Сэрбская лацінка</string>
+    <string name="lang_sr_latn">Сербская (Лацінка)</string>
     <string name="lang_zh_hk">Кітайская (Ганконг)</string>
     <string name="legacy_search">Састарэлы пошук</string>
     <string name="show_legacy_search">Паказваць састарэлы пошук</string>
@@ -2426,70 +2430,69 @@
     <string name="rendering_value_low_name">Нізкая</string>
     <string name="rendering_attr_hideWaterPolygons_name">Схаваць ваду</string>
     <string name="quick_action_item_screen">Экран %d</string>
-    <string name="quick_action_add_marker">Дадаць пазнаку</string>
+    <string name="quick_action_add_marker">Дадаць адзнаку</string>
     <string name="quick_action_add_poi">Дадаць POI</string>
-    <string name="quick_action_map_style">Зьмяніць стыль мапы</string>
-    <string name="quick_action_map_style_switch">Стыль мапы быў зьменены на \"%s\".</string>
+    <string name="quick_action_map_style">Змяніць стыль мапы</string>
+    <string name="quick_action_map_style_switch">Стыль мапы быў зменены на \"%s\".</string>
     <string name="quick_action_add_parking">Дадаць месца паркоўкі</string>
-    <string name="save_track_min_speed_descr">Фільтр: не журналяваць кропкі ніжэй гэтай хуткасці.</string>
-    <string name="save_track_min_distance">Журналяванне мінімальнага зрушэння</string>
-    <string name="save_track_min_distance_descr">Фільтр: задайце мінімальную адлегласць ад кропкі для журналявання новай.</string>
-    <string name="save_track_precision">Мінімальная дакладнасьць журналявання</string>
-    <string name="save_track_precision_descr">Фільтр: Не журналяваць, пакуль дакладнасць не дасягне заданай.</string>
-    <string name="navigate_point_olc_info_invalid">Некарэктны OLC
-</string>
+    <string name="save_track_min_speed_descr">Фільтр: не запісваць кропкі ніжэй гэтай хуткасці.</string>
+    <string name="save_track_min_distance">Запіс мінімальнага зруху</string>
+    <string name="save_track_min_distance_descr">Фільтр: задайце мінімальную адлегласць ад кропкі для лагавання новай.</string>
+    <string name="save_track_precision">Мінімальная дакладнасць лагавання</string>
+    <string name="save_track_precision_descr">Фільтр: Не запісваць, пакуль дакладнасць не дасягне зададзенай.</string>
+    <string name="navigate_point_olc_info_invalid">Хібны OLC</string>
     <string name="navigate_point_olc_info_short">Кароткі OLC
 \nКалі ласка, увядзіце поўны код</string>
-    <string name="navigate_point_olc_info_area">Карэктны поўны OLC
-\nАпісвае вобласьць: %1$s x %2$s</string>
-    <string name="configure_screen_quick_action">Хуткае дзеяньне</string>
+    <string name="navigate_point_olc_info_area">Карэктны поўны OLC 
+\nАпісвае вобласць: %1$s x %2$s</string>
+    <string name="configure_screen_quick_action">Хуткае дзеянне</string>
 
-    <string name="quick_action_item_action">Дзеяньне %d</string>
-    <string name="quick_action_add_gpx">Дадаць пункт да сьледу</string>
-    <string name="quick_action_new_action">Дадаць дзеяньне</string>
-    <string name="quick_action_edit_action">Рэдагаваць дзеяньне</string>
-    <string name="quick_action_add_favorite">Дадаць упадабанае</string>
-    <string name="dialog_add_action_title">Дадаць дзеяньне</string>
-    <string name="quick_actions_delete">Выдаліць дзеяньне</string>
-    <string name="quick_actions_delete_text">Вы ўпэўненыя, што хочаце выдаліць дзеяньне \"%s\"?</string>
+    <string name="quick_action_item_action">Дзеянне %d</string>
+    <string name="quick_action_add_gpx">Дадаць пункт да следу</string>
+    <string name="quick_action_new_action">Дадаць дзеянне</string>
+    <string name="quick_action_edit_action">Рэдагаваць дзеянне</string>
+    <string name="quick_action_add_favorite">Дадаць улюбёнае</string>
+    <string name="dialog_add_action_title">Дадаць дзеянне</string>
+    <string name="quick_actions_delete">Выдаліць дзеянне</string>
+    <string name="quick_actions_delete_text">Сапраўды выдаліць дзеянне \"%s\"\?</string>
     <string name="favorite_empty_place_name">Месца</string>
-    <string name="quick_action_showhide_favorites_title">Паказаць/схаваць упадабаныя</string>
-    <string name="quick_action_favorites_show">Паказаць упадабаныя</string>
-    <string name="quick_action_favorites_hide">Схаваць упадабаныя</string>
+    <string name="quick_action_showhide_favorites_title">Паказаць/схаваць улюбёныя</string>
+    <string name="quick_action_favorites_show">Паказаць улюбёныя\'</string>
+    <string name="quick_action_favorites_hide">Схаваць улюбёныя</string>
     <string name="quick_action_showhide_poi_title">Паказаць/схаваць POI</string>
     <string name="quick_action_poi_show">Паказаць %1$s</string>
     <string name="quick_action_poi_hide">Схаваць %1$s</string>
     <string name="quick_action_add_category">Дадаць катэгорыю</string>
-    <string name="quick_action_add_configure_map">Налада мапы</string>
+    <string name="quick_action_add_configure_map">Наладзіць мапу</string>
     <string name="quick_action_add_navigation">Навігацыя</string>
-    <string name="quick_action_fav_name_descr">Пакіньце пустым, каб прымяніць адрас або назву гораду.</string>
-    <string name="quick_action_bug_descr">Гэта паведамленьне уключанае ў поле камэнтара.</string>
-    <string name="quick_action_bug_message">Паведамленьне</string>
-    <string name="quick_action_category_descr">Выберыце катэгорыю, каб захаваць упадабанае там.</string>
-    <string name="quick_action_poi_list">Пералік POI</string>
-    <string name="quick_action_sh_poi_descr">Дадаць адну або некалькі катэгорый POI для адлюстраваньня на мапе.</string>
+    <string name="quick_action_fav_name_descr">Пакінце пустым, каб ужыць адрас або назву гораду.</string>
+    <string name="quick_action_bug_descr">Гэтае паведамленне дададзена ў поле камэнтара.</string>
+    <string name="quick_action_bug_message">Паведамленне</string>
+    <string name="quick_action_category_descr">Абярыце катэгорыю, каб захаваць там улюбёнае.</string>
+    <string name="quick_action_poi_list">Спіс POI</string>
+    <string name="quick_action_sh_poi_descr">Дадаць адну або некалькі катэгорый POI для адлюстравання на мапе.</string>
     <string name="quick_action_map_style_action">Дадаць стыль мапы</string>
     <string name="quick_action_empty_param_error">Запоўніце ўсе параметры</string>
     <string name="quick_action_map_styles">Стылі мапы</string>
     <string name="quick_action_map_source_title">Крыніцы мапаў</string>
     <string name="quick_action_map_source_action">Дадаць крыніцу мапы</string>
     <string name="quick_action_map_source_switch">Крыніца мапы была зьменена на \"%s\".</string>
-    <string name="quick_action_btn_tutorial_title">Зьмяніць становішча кнопкі</string>
-    <string name="shared_string_action_name">Назва дзеяньня</string>
+    <string name="quick_action_btn_tutorial_title">Змяніць становішча кнопкі</string>
+    <string name="shared_string_action_name">Назва дзеяння</string>
 <string name="quick_action_take_audio_note">Новая гукавая нататка</string>
-    <string name="quick_action_take_video_note">Новая відэа-нататка</string>
-    <string name="quick_action_take_photo_note">Новая фота-нататка</string>
+    <string name="quick_action_take_video_note">Новая відэанататка</string>
+    <string name="quick_action_take_photo_note">Новая фотанататка</string>
     <string name="quick_action_navigation_voice_off">Голас прыглушаны</string>
-    <string name="quick_action_navigation_voice_on">Голас актыўны</string>
+    <string name="quick_action_navigation_voice_on">Голас уключаны</string>
     <string name="rendering_attr_depthContours_description">Паказваць контуры і пункты глыбіні.</string>
     <string name="rendering_attr_depthContours_name">Контуры марскіх глыбінь</string>
 	
 	<string name="shared_string_slope">Ухіл</string>
-    <string name="add_new_folder">Дадаць новую тэчку</string>
-    <string name="points_delete_multiple_succesful">Кропка(і) выдаленая.</string>
-    <string name="points_delete_multiple">Вы збіраецеся выдаліць %1$d кропак. Вы ўпэўнены?</string>
-    <string name="track_points_category_name">Кропкі маршруту, цікавыя кропкі, названыя функцыі</string>
-    <string name="shared_string_gpx_track">Сьлед</string>
+    <string name="add_new_folder">Дадаць новы каталог</string>
+    <string name="points_delete_multiple_succesful">Пункт(ы) выдалены.</string>
+    <string name="points_delete_multiple">Вы збіраецеся выдаліць %1$d пунктаў. Вы ўпэўнены\?</string>
+    <string name="track_points_category_name">Пункты маршруту, цікавыя пункты, названыя функцыі</string>
+    <string name="shared_string_gpx_track">След</string>
     <string name="max_speed">Максімальная хуткасць</string>
     <string name="average_speed">Сярэдняя хуткасць</string>
     <string name="shared_string_time_moving">Час руху</string>
@@ -2498,10 +2501,10 @@
     <string name="shared_string_start_time">Час пачатку</string>
     <string name="shared_string_end_time">Час закачэння</string>
     <string name="shared_string_color">Колер</string>
-    <string name="select_gpx_folder">Абраць тэчку GPX-файлаў</string>
+    <string name="select_gpx_folder">Абраць каталог GPX-файлаў</string>
     <string name="file_can_not_be_moved">Файл не можа быць перамешчаны.</string>
     <string name="shared_string_move">Перамясціць</string>
-    <string name="shared_string_gpx_tracks">Трэкі</string>
+    <string name="shared_string_gpx_tracks">Сляды</string>
     <string name="routing_attr_driving_style_name">Стыль язды</string>
     
     <string name="route_altitude">Вышыня маршруту</string>
@@ -2516,42 +2519,42 @@
     <string name="routing_attr_height_obstacles_name">Выкарыстоўваць даныя вышыні</string>
     <string name="routing_attr_height_obstacles_description">Фактар вышыні зямной паверхні (даныя з SRTM, ASTER і EU-DEM).</string>
 
-    <string name="auto_split_recording_title">Аўтаматычнае дзяленне запісаў пасля перарыва</string>
-	<string name="auto_split_recording_descr">Пачаць новы сегмент пасля 6 мінутнага перапынку, новы трэк — пасля 2 гадзіннага перапынку, ці новы файл пасля доўгага перапынку (як змяніляся дата).</string>
+    <string name="auto_split_recording_title">Аўтаматычнае дзяленне запісаў пасля перапынку</string>
+	<string name="auto_split_recording_descr">Пачаць новы сегмент пасля 6-хвіліннага перапынку, новы след — пасля 2-гадзіннага перапынку, ці новы файл пасля доўгага перапынку (як змяніляся дата).</string>
     <string name="lang_ber">Берберская</string>
     <string name="navigate_point_olc">Адкрыты код месцазнаходжання (OLC)</string>
     <string name="quick_action_add_osm_bug">Дадаць OSM-нататку</string>
     <string name="quick_action_navigation_voice">Голас укл/адкл</string>
-    <string name="quick_favorites_show_favorites_dialog">Паказаць дыялог упадабаных</string>
-    <string name="quick_favorites_name_preset">Назва перадусталёўкі</string>
-    <string name="quick_action_add_marker_descr">Націск на гэтую кнопку дадасць пазнаку мапы ў цэнтры экрана.</string>
-    <string name="quick_action_add_gpx_descr">Націск на гэтую кнопку дадасьць GPX-кропку ў сярэдзіне экрана.</string>
-    <string name="quick_action_take_audio_note_descr">Націск на гэтую кнопку дадасць аўдыянататку на мапу ў сярэдзіне экрана.</string>
-    <string name="quick_action_take_video_note_descr">Націск на гэтую кнопку дадасць відэанататку на мапу ў сярэдзіне экрана.</string>
-    <string name="quick_action_take_photo_note_descr">Націск на гэтую кнопку дадасць фотанататку на мапу ў сярэдзіне экрана.</string>
-    <string name="quick_action_add_osm_bug_descr">Націск на гэтую кнопку дадасць OSM-нататку на мапу ў сярэдзіне экрана.</string>
-    <string name="quick_action_add_poi_descr">Націск на гэтую кнопку дадасць POI ў сярэдзіне экрана.</string>
-    <string name="quick_action_navigation_voice_descr">Націск на гэтую кнопку адключыць ці ўключыць галасавыя падказкі падчас навігацыі.</string>
-    <string name="quick_action_add_parking_descr">Націск на гэтую кнопку дадасьць месца паркоўкі ў сярэдзіне экрана.</string>
-    <string name="quick_action_interim_dialog">Паказаць прамежкавы дыялёг</string>
+    <string name="quick_favorites_show_favorites_dialog">Паказаць дыялог улюбёных</string>
+    <string name="quick_favorites_name_preset">Назва перадналад</string>
+    <string name="quick_action_add_marker_descr">Націск на гэтую кнопку дадасць адзнаку ў цэнтры экрана.</string>
+    <string name="quick_action_add_gpx_descr">Націск на гэтую кнопку дадасць пункт GPX у цэнтры экрана.</string>
+    <string name="quick_action_take_audio_note_descr">Націск на гэтую кнопку дадасць аўдыянататку на мапу ў цэнтры экрана.</string>
+    <string name="quick_action_take_video_note_descr">Націск на гэтую кнопку дадасць відэанататку на мапу ў цэнтры экрана.</string>
+    <string name="quick_action_take_photo_note_descr">Націск на гэтую кнопку дадасць фотанататку на мапу ў цэнтры экрана.</string>
+    <string name="quick_action_add_osm_bug_descr">Націск на гэтую кнопку дадасць OSM-нататку на мапу ў цэнтры экрана.</string>
+    <string name="quick_action_add_poi_descr">Націск на гэтую кнопку дадасць POI ў цэнтры экрана.</string>
+    <string name="quick_action_navigation_voice_descr">Націск на гэтую кнопку выключыць ці ўключыць галасавыя падказкі падчас навігацыі.</string>
+    <string name="quick_action_add_parking_descr">Націск на гэтую кнопку дадасць месца паркоўкі ў цэнтры экрана.</string>
+    <string name="quick_action_interim_dialog">Паказаць прамежкавы дыялог</string>
     <string name="favorite_autofill_toast_text">" было захавана ў "</string>
-    <string name="quick_action_duplicates">Назва для хуткага дзеяньня ўжо існуе. Назва будзе змененая на %1$s, каб пазбавіцца дубляваньня.</string>
+    <string name="quick_action_duplicates">Назва для хуткага дзеяння ўжо існуе. Назва будзе змененая на %1$s, каб пазбавіцца дублявання.</string>
     <string name="quick_action_duplicate">Знойдзены дублікат назвы</string>
-    <string name="quick_action_showhide_favorites_descr">Націск на гэтую кнопку пакажа ці схавае ўпадабаныя кропкі на мапе.</string>
+    <string name="quick_action_showhide_favorites_descr">Націск на гэтую кнопку пакажа ці схавае ўлюбёныя пункты на мапе.</string>
     <string name="quick_action_showhide_poi_descr">Націск на гэтую кнопку пакажа ці схавае POI на мапе.</string>
     <string name="quick_action_add_create_items">Стварэнне элементаў</string>
-    <string name="quick_action_gpx_category_descr">Абярыце катэгорыю (апцыянальна).</string>
-    <string name="quick_action_page_list_descr">Націск на гэтую кнопку гартае старонкі данага спісу.</string>
-    <string name="quick_action_map_overlay">Змяніць мапу пакрыцця</string>
-    <string name="quick_action_map_overlay_title">Мапа пакрыцця</string>
-    <string name="quick_action_map_overlay_action">Дадаць мапу пакрыцця</string>
-    <string name="quick_action_map_overlay_switch">Мапа пакрыцця зменена на «%s».</string>
-    <string name="quick_action_map_underlay_switch">Падкладка мапы зменена на «%s».</string>
+    <string name="quick_action_gpx_category_descr">Абярыце катэгорыю (неабавязкова).</string>
+    <string name="quick_action_page_list_descr">Націск на гэтую кнопку прагортвае старонкі дадзенага спіса.</string>
+    <string name="quick_action_map_overlay">Змяніць накладзеную мапу</string>
+    <string name="quick_action_map_overlay_title">Накладзеная мапа</string>
+    <string name="quick_action_map_overlay_action">Дадаць мапу накладання</string>
+    <string name="quick_action_map_overlay_switch">Мапа накладання змененая на «%s».</string>
+    <string name="quick_action_map_underlay_switch">Падкладка мапы змененая на «%s».</string>
     <string name="quick_action_map_underlay">Змяніць падкладку мапы</string>
     <string name="quick_action_map_underlay_title">Падкладка мапы</string>
     <string name="quick_action_map_underlay_action">Дадаць падкладку</string>
     <string name="quick_action_map_source">Змяніць крыніцу мапы</string>
-    <string name="quick_action_btn_tutorial_descr">Доўгі націск і перацягванне дазваляе перамясціць пазіцыю на экране.</string>
+    <string name="quick_action_btn_tutorial_descr">Доўгі націск і перацягванне дазваляе змяніць пазіцыю на экране.</string>
 	<string name="route_points_category_name">Павароты на маршруце</string>
     <string name="relief_smoothness_factor_descr">Пераважны рэльеф: раўнінны ці гарысты.</string>
     <string name="routing_attr_relief_smoothness_factor_hills_name">Гарысты</string>
@@ -2561,17 +2564,17 @@
     <string name="routing_attr_driving_style_balance_name">Збалансаваны</string>
     <string name="routing_attr_driving_style_safety_name">Аддаваць перавагу завулкам</string>
     <string name="do_not_send_anonymous_app_usage">На адсылаць ананімную статыстыку выкарыстання</string>
-    <string name="do_not_send_anonymous_app_usage_desc">OsmAnd збірае інфармацыю аб тым, які часткі праграмы выкарыстоўваюцца вамі. Ваша месцазнаходжанне ніколі не адпраўляецца, як і ўсё, што вы ўводзіце, якія вобласці праглядаеце, што шукаеце ці спампоўваеце.</string>
-    <string name="do_not_show_startup_messages">Не паказваць паведамленні пры запуску</string>
-    <string name="do_not_show_startup_messages_desc">Не паказваць зніжкі і спецыяльныя паведамленні аб лакальных падзеях.</string>
-    <string name="parking_options">Опцыі паркоўкі</string>
+    <string name="do_not_send_anonymous_app_usage_desc">OsmAnd збірае інфармацыю аб тым, якія часткі дадатка выкарыстоўваюцца вамі. Вашае месцазнаходжанне ніколі не адпраўляецца, як і ўсё, што вы ўводзіце, якія вобласці праглядаеце, што шукаеце ці спампоўваеце.</string>
+    <string name="do_not_show_startup_messages">Не паказваць паведамленні падчас запуску</string>
+    <string name="do_not_show_startup_messages_desc">Не паказваць зніжкі і адмысловыя паведамленні аб мясцовых падзеях.</string>
+    <string name="parking_options">Параметры паркоўкі</string>
     <string name="full_version_thanks">Дякуй вам за набыццё платнай версіі OsmAnd.</string>
     <string name="routing_attr_relief_smoothness_factor_name">Абраць перасечанасць мясцовасці</string>
     <string name="right_side_navigation">Правабаковы рух</string>
     <string name="driving_region_automatic">Аўтаматычна</string>
     <string name="restore_purchases">Аднаўленне пакупак</string>
     <string name="fonts_header">Шрыфты мапы</string>
-    <string name="quick_action_auto_zoom">Аўтамаштаб мапы ўкл/адкл</string>
+    <string name="quick_action_auto_zoom">Аўтамаштаб мапы ўкл/выкл</string>
     <string name="nearest_cities">Бліжэйшыя гарады</string>
     <string name="select_city">Абраць горад</string>
     <string name="select_postcode">Абраць паштовы індэкс</string>
@@ -2580,17 +2583,17 @@
     <string name="quick_action_add_first_intermediate">Дадаць прамежкавы пункт</string>
     <string name="subscribe_email_error">Памылка</string>
     <string name="quick_action_auto_zoom_on">Уключыць аўтамаштаб мапы</string>
-    <string name="quick_action_auto_zoom_off">Адключыць аўтамаштаб мапы</string>
-    <string name="select_street">Выберыце вуліцу</string>
+    <string name="quick_action_auto_zoom_off">Выключыць аўтамаштабаванне мапы</string>
+    <string name="select_street">Абярыце вуліцу</string>
     <string name="shared_string_in_name">у %1$s</string>
     <string name="type_address">Увядзіце адрас</string>
     <string name="type_city_town">Увядзіце горад</string>
     <string name="type_postcode">Увядзіце паштовы індэкс</string>
-    <string name="quick_action_auto_zoom_desc">Націск на гэтую кнопку ўключыць/адключыць аўтамаштабаванне мапы ў залежнасці ад хуткасці.</string>
+    <string name="quick_action_auto_zoom_desc">Націск на гэтую кнопку ўключыць/выключыць аўтамаштабаванне мапы ў залежнасці ад хуткасці.</string>
     <string name="quick_action_add_destination_desc">Націск на гэтую кнопку зробіць цэнтр экрана пунктам прызначэння, а папярэдні пункт прызначэння стане апошняй прамежкавай кропкай.</string>
     <string name="quick_action_replace_destination_desc">Націск на гэтую кнопку зробіць цэнтр экрана пунктам прызначэння, замяняючы папярэдні пункт прызначэння, калі ён ёсць.</string>
     <string name="quick_action_add_first_intermediate_desc">Націск на гэтую кнопку зробіць цэнтр экрана першым прамежкавым пунктам прызначэння .</string>
-    <string name="no_overlay">Няма пакрыцця</string>
+    <string name="no_overlay">Накладка адсутнічае</string>
     <string name="no_underlay">Няма падкладкі</string>
     <string name="subscribe_email_desc">Падпішыцеся на нашу паштовую рассылку аб зніжках на праграму і атрымайце 3 дадатковыя мапы!</string>
     <string name="depth_contour_descr">Контурныя лініі марскіх глыбінь і марскія знакі.</string>
@@ -2602,10 +2605,10 @@
     <string name="nautical_maps">Марскія мапы</string>
     <string name="analyze_on_map">Аналізуй на мапе</string>
     <string name="shared_string_visible">Бачны</string>
-    <string name="shared_string_paused">Прыпынены</string>
-    <string name="osmand_extended_description_part1">OsmAnd (OSM Automated Navigation Directions) мапа і праграма навігацыі з доступам да дармовых святовых якасных даных OpenStreetMap (OSM).
-\n
-\nАтрымлівайце асалоду ад голасавога і аптычнага навігатара, прагляда карысных месцаў (анг. POI, points of interest), стварэння і кіравання GPX-трэкамі, выкарыстання контурных ліній і інфармацыі аб вышыні (праз плагін), выбару паміж кіраваннем аўтамабілем, яздой на ровары і шпацырам, рэдагавання OSM і шмат іншым.</string>
+    <string name="shared_string_paused">Прыпынена</string>
+    <string name="osmand_extended_description_part1">OsmAnd (OSM Automated Navigation Directions) мапа і навігацыйны дадатак з доступам да бясплатных якасных мапаў усяго свету OpenStreetMap (OSM). 
+\n 
+\nАтрымлівайце асалоду ад голасавога і візуальнага навігатара, прагляду карысных месцаў (анг. POI, points of interest), стварэння і кіравання GPX-слядоў, выкарыстання контурных ліній і інфармацыі аб вышыні (праз убудову), выбару паміж кіраваннем аўтамабілем, яздой на ровары і шпацырам, рэдагавання OSM і шмат іншым.</string>
     <string name="shared_string_overview">Агляд</string>
     <string name="osmand_plus_extended_description_part8">Прыблізнае пакрыццё і якасць мапы: 
 \n • Заходняя Еўропа: **** 
@@ -2630,158 +2633,164 @@
     <string name="restart_search">Перазапусціць пошук</string>
     <string name="increase_search_radius">Павялічыць радыус пошуку</string>
     <string name="nothing_found">Нічога не знойдзена</string>
-    <string name="nothing_found_descr">Зьмяніце пошукавы запыт або павялічце радыюс пошуку.</string>
+    <string name="nothing_found_descr">Змяніце пошукавы запыт альбо павялічце радыус пошуку.</string>
     <string name="quick_action_showhide_osmbugs_title">Паказаць/схаваць OSM-нататкі</string>
     <string name="quick_action_osmbugs_show">Паказаць OSM-нататкі</string>
     <string name="quick_action_osmbugs_hide">Схаваць OSM-нататкі</string>
     <string name="quick_action_showhide_osmbugs_descr">Націск на гэтую кнопку пакажа ці схавае OSM-нататкі на мапе.</string>
     <string name="sorted_by_distance">Адсартавана па адлегласці</string>
-    <string name="search_favorites">Пошук упадабаных</string>
-    <string name="shared_string_plugin">Дадатак</string>
-    <string name="srtm_purchase_header">Для прагляду контурных ліній на мапе, вам неабходна набыць і ўсталяваць дадатак «Contour Lines»</string>
+    <string name="search_favorites">Пошук улюбёных</string>
+    <string name="shared_string_plugin">Убудова</string>
+    <string name="srtm_purchase_header">Для прагляду контурных ліній на мапе, вам неабходна набыць і ўсталяваць убудову «Contour Lines»</string>
     <string name="srtm_color_scheme">Каляровая схема</string>
     <string name="routing_attr_allow_private_name">Дазволіць прыватны доступ</string>
     <string name="routing_attr_allow_private_description">Дазволіць доступ на прыватную тэрыторыю.</string>
     <string name="hillshade_menu_download_descr">Каб убачыць зацяненне рэльефу, спампуйце мапу «Hillshade Overlay» гэтага рэгіёна.</string>
-    <string name="hillshade_purchase_header">Каб убачыць зацяненне рэльефу, вам неабходна набыць і ўсталяваць дадатак «Contour Lines»</string>
-    <string name="hide_from_zoom_level">Схаваць ад узроўню маштабавання</string>
+    <string name="hillshade_purchase_header">Каб убачыць зацяненне рэльефу, вам неабходна набыць і ўсталяваць убудову «Contour Lines»</string>
+    <string name="hide_from_zoom_level">Схаваць ад узроўня маштабавання</string>
     <string name="srtm_menu_download_descr">Спампаваць мапу «Contour Line» для выкарыстання ў гэтым рэгіёне.</string>
-    <string name="show_from_zoom_level">Паказваць ад узроўню маштабавання</string>
+    <string name="show_from_zoom_level">Паказваць ад узроўня маштабавання</string>
     <string name="display_zoom_level">Узровень маштабавання паказу: %1$s</string>
     <string name="route_is_too_long_v2">Калі ласка, дадайце прамежкавыя пункты, калі разлік не завяршыўся цягам 10 хвілін.</string>
-    <string name="osmand_extended_description_part4">Лыжня
-\nOsmAnd-дадатак лыжных мап дазваляе бачыць лыжныя трасы з узроўнем складанасці і некаторай дадатковай інфармацыяй, як размяшчэнне пад\'ёмнікаў і іншых аб\'ектаў.</string>
-    <string name="save_poi_too_many_uppercase">Назва змяшчае занадта шмат вялікіх літар. Прадоўжыць?</string>
+    <string name="osmand_extended_description_part4">Лыжня 
+\nУбудова лыжных мап для OsmAnd дазваляе бачыць лыжныя трасы з узроўнем складанасці і некаторай дадатковай інфармацыяй: размяшчэнне пад\'ёмнікаў і іншых аб\'ектаў.</string>
+    <string name="save_poi_too_many_uppercase">Назва змяшчае занадта шмат вялікіх літар. Працягнуць\?</string>
     <string name="osmand_extended_description_part3">Мапа 
-\n• Адлюстроўвае POI (пункт інтарэсаў) каля вас 
+\n• Адлюстроўвае POI (пункт цікавасці) побач вас 
 \n• Адаптуе мапу ў напрамку вашага руху (ці компаса) 
 \n• Паказвае, дзе вы знаходзіцеся і куды вы глядзіце 
-\n• Дзяліцеся сваім размяшчэннем, каб сябры змаглі знайсці вас 
-\n• Захоўвае вашы самыя важныя месцы ва «Ўпадабаных» 
-\n• Дазваляе вам абраць як адлюстроўваць назвы на мапе: на англійскай, лакальнай ці з фанетычным напісаннем 
-\n• Адлюстроўвае адмысловыя анлайн-тайлы, спадарожнікавыя здымкі (з Bing), розныя пазнакі, як турыстычныя/навігацыйныя GPX-трэкі і дадатковыя слаі з наладжвальнай празрыстасцю</string>
-    <string name="osmand_extended_description_part5">Язда на ровары
-\n • Вы можаце знайсці рованыя шляхі на мапе
-\n • GPS-навігацыя ў роварным рэжыме будуе маршрут выкарыстоўваючы роварныя шляхі
-\n • Глядзіце вашу хуткасць і вышыню над узроўнем мора
-\n • Опцыя GPX-запісу дазваляе вам запісваць ваша падарожжа і дзяліцца ім
-\n • Праз дадатак вы можаце ўключыць адлюстраванне гарызанталяў і зацямненне рэльефу</string>
+\n• Дзяліцеся сваім месцазнаходжаннем, каб сябры змаглі знайсці вас 
+\n• Захоўвае вашы самыя важныя месцы ва «Ўлюбёных» 
+\n• Дазваляе вам абраць як адлюстроўваць назвы на мапе: на англійскай мове, мясцовай мове, ці фанетычным напісаннем 
+\n• Адлюстроўвае адмысловыя сеціўныя тайлы, спадарожнікавыя здымкі (з Bing), розныя адзнакі, як турыстычныя/навігацыйныя GPX-сляды і дадатковыя пласты з наладжваемай празрыстасцю</string>
+    <string name="osmand_extended_description_part5">Язда на ровары 
+\n • Вы можаце знайсці роварныя шляхі на мапе 
+\n • GPS-навігацыя ў роварным рэжыме будуе маршрут выкарыстоўваючы роварныя шляхі 
+\n • Глядзіце вашу хуткасць і вышыню над узроўнем мора 
+\n • Параметр GPX-запісу дазваляе вам запісваць ваша падарожжа і дзяліцца ім 
+\n • Праз убудову вы можаце ўключыць адлюстраванне гарызанталяў і зацямненне рэльефу</string>
     <string name="mapillary">Mapillary</string>
     <string name="mapillary_widget">Віджэт Mapillary</string>
-    <string name="mapillary_widget_descr">Дазваляе хуткі ўнёсак ў Mapillary.</string>
-    <string name="mapillary_descr">Вулічныя фота анлайн для кожнага. Адкрывайце для сябе месцы, дапамагайце, здымайце свет.</string>
-    <string name="shared_string_add_photos">Дадаць фатаграфій</string>
-    <string name="mapillary_action_descr">Падзяліцца сваімі вулічнымі відамі гэтай мясцовасці праз Mapillary.</string>
-    <string name="osmand_extended_description_part6">Шпацыры, паходы, экскурсіі
-\n • Мапа паказвае пешаходныя сцежкі
-\n • Вікіпедыя ўпадабанай мовай распавядзе вам шмат чаго цікавага падчас экскурсіі
-\n • Прыпынкі грамадскага транспарту (аўтобус, травай, цягнік), уключаючы назвы маршрутаў, дапамогуць арыентавацца ў новым горадзе
-\n • GPS-навігацыя ў пешаходным рэжыме вылічвае маршрут, выкарыстоўваючы пешаходныя сцежкі
-\n • Загрузка і прытрымліванне GPX-маршрута або запіс і магчымасць дзяліцца сваім уласным</string>
-    <string name="osmand_extended_description_part7">Удзел у OSM
-\n • Паведамленне аб памылках
-\n • Загрузка GPX-трэкаў у OSM проста з праграмы
-\n • Даданне цікавых кропак (POI) і загрузка іх у OSM (ці пазней, калі афлайн)
+    <string name="mapillary_widget_descr">Дазваляе хутка дадаць фотаздымкі ў Mapillary.</string>
+    <string name="mapillary_descr">Вулічныя фота праз сеціва для кожнага. Адкрывайце для сябе месцы, дапамагайце, здымайце свет.</string>
+    <string name="shared_string_add_photos">Дадаць фотаздымкі</string>
+    <string name="mapillary_action_descr">Падзяліцца сваімі вулічнымі краявідамі гэтай мясцовасці праз Mapillary.</string>
+    <string name="osmand_extended_description_part6">Шпацыры, паходы, экскурсіі 
+\n • Мапа паказвае пешаходныя сцежкі 
+\n • Вікіпедыя абранай мовай распавядзе вам шмат чаго цікавага падчас экскурсіі 
+\n • Прыпынкі грамадскага транспарту (аўтобус, травай, цягнік), уключаючы назвы маршрутаў, дапамогуць арыентавацца ў новым горадзе 
+\n • GPS-навігацыя ў пешаходным рэжыме вылічвае маршрут, выкарыстоўваючы пешаходныя сцежкі 
+\n • Спампоўванне і прытрымліванне GPX-маршрута або запіс і магчымасць дзяліцца сваім уласным</string>
+    <string name="osmand_extended_description_part7">Удзел у OSM 
+\n • Паведамленне аб памылках 
+\n • Спампоўванне GPX-слядоў у OSM проста з дадатка 
+\n • Даданне цікавых пунктаў (POI) і запампоўка іх у OSM (ці пазней, па-за сецівам) 
 \n</string>
-    <string name="osmand_plus_extended_description_part2">Навігацыя
-\n • Працуе праз Інтэрнэт (хутка) або аўтаномна (без платы за роўмінг за мяжой)
-\n • Пакрокавыя галасавыя падказкі (запісаныя ці сінтэзаваныя галасы)
-\n • Магчымае прытрымліванне палос руху, адлюстраванне назвы вуліцы і прыблізны час прыбыцця
-\n • Падтрымка прамежкавых кропак на вашым маршруце
-\n • Аўтаматычнае перапракладванне маршрута пры адхіленні ад існага
-\n • Пошук месцаў па адрасе, тыпу (напрыклад, рэстарацыя, гатэль, запраўка, музей) ці геаграфічным каардынатам
+    <string name="osmand_plus_extended_description_part2">Навігацыя 
+\n • Працуе праз Інтэрнэт (хутка) або аўтаномна (без платы за роўмінг за мяжой) 
+\n • Пакрокавыя галасавыя падказкі (запісаныя ці сінтэзаваныя галасы) 
+\n • Магчымае прытрымліванне палос руху, адлюстраванне назвы вуліцы і прыблізны час прыбыцця 
+\n • Падтрымка прамежкавых пунктаў на вашым маршруце 
+\n • Аўтаматычная змена маршруту пры адхіленні ад бягучага 
+\n • Пошук месцаў па адрасе, тыпу (напрыклад, рэстарацыя, гатэль, запраўка, музей) ці геаграфічных каардынатах
 \n</string>
-    <string name="online_photos">Анлайн-фатаграфіі</string>
-    <string name="no_photos_descr">Мы не маем фатаграфій для гэтага месца.</string>
-    <string name="plugin_mapillary_descr">Вулічныя фатаграфіі для ўсіх. Адкрывайце для сябе месцы, дапамагайце, здымайце свет.</string>
-    <string name="osmand_extended_description_part2">GPS-навігацыя
-\n • Выбар паміж аўтаномным рэжымам (без платы за роўмінг) і праз Інтэрнэт (хутчэй)
-\n • Пакрокавыя галасавыя падказкі (запісаныя або сінтэзаваныя галасы) даставяць вас да месца прызначэння
-\n • Паўторны разлік маршруту пасля значнага адхілення ад дзейнага
-\n • Паласы руху, назвы вуліц і прыблізны час прыбыцця дапамогуць у дарозе
-\n • Для таго, каб зрабіць ваша падарожжа больш бяспечным, рэжым дня/ночы пераключаецца аўтаматычна
-\n • Паказ абмежаванняў хуткасці ды папярэджанні пры яе прывышэнні
-\n • Мапа маштабуецца адпаведна вашай хуткасці
-\n • Пошук месцы па адрасе, тыпу (паркінг, рэстарацыя, гатэль, запраўка, музей і г.д.) ці геаграфічным каардынатам
-\n • Падтрымка прамежкавых кропак маршруту
-\n • Запіс уласнага GPX-трэка або загрузка гатовага і прытрымліванне яго</string>
-    <string name="osmand_extended_description_part8">OsmAnd — адкрытае праграмнае забяспячэнне з актыўным развіццём. Кожны можа ўнесць свой уклад паведамляючы аб памылках, паляпшаючы пераклад ці распрацоўваючы навыя функцыі. Ход праекта таксама залежыць ад фінансавых унёскаў для забяспячэння працэса кадавання і тэставання новай функцыянальнасці.
-\n Прыблізнае ахапленне мап ды якасць:
-\n • Заходняя Еўропа: ****
-\n • Усходняя Еўропа: ***
-\n • Расія: ***
-\n • Паўночная Амерыка: ***
-\n • Паўднёвая Амерыка: **
-\n • Азія: **
-\n • Японія і Карэя: ***
-\n • Сярэдні Усход: **
-\n • Афрыка: **
-\n • Антарктыда:
-\n Большасць краін свету даступны да запампоўкі!
+    <string name="online_photos">Сеціўныя фотаздымкі</string>
+    <string name="no_photos_descr">Фотаздымкі для гэтага месца адсутнічаюць.</string>
+    <string name="plugin_mapillary_descr">Вулічныя фотаздымкі для ўсіх. Адкрывайце для сябе месцы, дапамагайце, здымайце свет.</string>
+    <string name="osmand_extended_description_part2">GPS-навігацыя 
+\n • Выбар паміж аўтаномным рэжымам (без платы за роўмінг) і праз Інтэрнэт (хутчэй) 
+\n • Пакрокавыя галасавыя падказкі (запісаныя або сінтэзаваныя галасы) даставяць вас да месца прызначэння 
+\n • Паўторны разлік маршруту пасля значнага адхілення ад бягучага
+\n • Палосы руху, назвы вуліц і прыблізны час прыбыцця дапамогуць у дарозе 
+\n • Для таго, каб зрабіць вашае падарожжа больш бяспечным, рэжым дня/ночы пераключаецца аўтаматычна 
+\n • Паказ абмежаванняў хуткасці ды папярэджанні пры яе прывышэнні 
+\n • Мапа маштабуецца адпаведна вашай хуткасці 
+\n • Пошук месца па адрасе, тыпу (паркінг, рэстарацыя, гатэль, запраўка, музей і г.д.) ці геаграфічным каардынатам 
+\n • Падтрымка прамежкавых пунктаў маршруту 
+\n • Запіс уласнага GPX-следу або спампоўванне гатовага і прытрымліванне яго</string>
+    <string name="osmand_extended_description_part8">OsmAnd — адкрытае праграмнае забяспячэнне з актыўным развіццём. Кожны можа ўнесць свой уклад паведамляючы аб памылках, паляпшаючы пераклад ці распрацоўваючы навыя функцыі. Ход праекта таксама залежыць ад фінансавых унёскаў для забяспячэння працэса кадавання і тэставання новай функцыянальнасці. 
+\n Прыблізнае ахапленне мап ды якасць: 
+\n • Заходняя Еўропа: **** 
+\n • Усходняя Еўропа: *** 
+\n • Расія: *** 
+\n • Паўночная Амерыка: *** 
+\n • Паўднёвая Амерыка: ** 
+\n • Азія: ** 
+\n • Японія і Карэя: *** 
+\n • Сярэдні Усход: ** 
+\n • Афрыка: ** 
+\n • Антарктыда: 
+\n Большасць краін свету даступныя да спампоўвання! 
 \n Атрымайце надзейны навігатар у вашай краіне — будзь то Беларусь, Францыя, Германія, Мексіка, Вялікабрытанія, Гіспанія, Нідэрланды, ЗША, Расія, Бразілія ці якая іншая.</string>
-    <string name="osmand_plus_extended_description_part1">OsmAnd+ (OSM Automated Navigation Directions) — картаграфічная і навігацыйная праграма з доступам да вольных, сусветных і высокаякасных даных OpenStreetMap (OSM).
-\n Атрымоўвайце асалоду ад галасавай і візуальная навігацыі, праглядайце цікавыя кропкі (POI), запісвайце GPX-трэкі, выкарыстоўвайце візуалізацыю контурных ліній ды даных вышыні, пераключайцеся паміж рэжымамі кіравання, яздой на ровары ды шпацырамі, рэдагуйце OSM-даныя і шмат іншага.
-\n OsmAnd+ — платная версія праграмы. Пры набыцці, вы падтрымаеце праект, фінансуеце распрацоўку новых мажлівасцей ды атрымаеце апошнія абнаўленні.
-\nНекаторыя з галоўных мажлівасцей:</string>
-    <string name="osmand_plus_extended_description_part3">Прагляд мапы 
-\n • Паказвае, дзе вы знаходзіся і куды глядзіце 
+    <string name="osmand_plus_extended_description_part1">OsmAnd+ (OSM Automated Navigation Directions) — мапа і навігацыйны дадатак з доступам да бясплатных, сусветных і высокаякасных даных OpenStreetMap (OSM). 
+\n Атрымоўвайце асалоду ад галасавой і візуальная навігацыі, праглядайце пукты цікавасцяў (POI), запісвайце GPX-сляды, выкарыстоўвайце візуалізацыю контурных ліній ды даных вышыні, пераключайцеся паміж рэжымамі кіравання, яздой на ровары ды шпацырамі, рэдагуйце OSM-даныя і шмат іншага. 
+\n OsmAnd+ — платная версія праграмы. Пры набыцці, вы падтрымоўваеце праект, фінансуеце распрацоўку новых магчымасцяў ды атрымоўваце апошнія абнаўленні. 
+\nНекаторыя з галоўных магчымасцяў:</string>
+    <string name="osmand_plus_extended_description_part3">"Прагляд мапы 
+\n
+\n • Паказвае дзе вы знаходзіцеся і куды глядзіце 
+\n
 \n • Пры патрэбе выраўняе мапу па компасе ці па напрамку вашага руху 
-\n • Зберагае вашы найважнейшыя месцы ва ўпадабаных 
-\n • Адлюстроўвае цікавыя кропкі вакол вас 
-\n • Паказвае адмысловыя анлайн-мапы, спадарожнікавыя здымкі (Bing), розныя накладкі накшталт турыстычных/навігацыйных GPX-трэкаў і дадатковыя слаі з наладжвальнай празрыстасцю 
-\n • Можа адлюстроўваць на мапе беларускія, англійскія, лакальныя назвы ці з фанетычным напісаннем</string>
-    <string name="osmand_plus_extended_description_part4">Выкарыстоўваюцца даныя OSM ды Вікіпедыі
-\n • Высокаякасная інфармацыя ад найлепшых праектаў свету
-\n • OSM-даныя даступныя па краіне ці рэгіёну
-\n • Цікавыя месцы з Вікіпедыі, выдатна падыходзіць для агляду выбітнасцяў
-\n • Неабмежаваная колькасць бясплатных спамповак проста з праграмы
-\n • Кампактныя афлайнавыя вектарныя мапы абноўляюцца не радзей разу ў месяц
+\n
+\n • Захавае вашыя найважнейшыя месцы ва ўлюблёных 
+\n
+\n • Адлюстроўвае пункты цікавасцяў вакол вас 
+\n
+\n • Паказвае адмысловыя сеціўныя мапы, спадарожнікавыя здымкі (Bing), розныя накладкі накшталт турыстычных/навігацыйных GPX-слядоў і дадатковыя пласты з наладжваемай празрыстасцю 
+\n
+\n • Можа адлюстроўваць на мапе беларускія, англійскія, мясцовыя назвы ці  фанетычным напісаннем"</string>
+    <string name="osmand_plus_extended_description_part4">Выкарыстоўваюцца даныя OSM ды Вікіпедыі 
+\n • Высокаякасная інфармацыя ад найлепшых праектаў свету 
+\n • OSM-даныя даступныя па краіне ці рэгіёну 
+\n • Пункты цікавасцяў з Вікіпедыі, выдатна падыходзіць для агляду выбітнасцяў 
+\n • Неабмежаваная колькасць бясплатных спампоўванняў непасрэдна з дадатка 
+\n • Кампактныя пазасеціўныя вектарныя мапы абнаўляюцца не радзей за раз на месяц 
 \n • Выбар паміж поўнымі данымі рэгіёна ці толькі дарожнай сеткай (напрыклад, уся Японія займае 700 МБ, а дарожная сетка — 200 МБ)</string>
-    <string name="osmand_plus_extended_description_part5">Асаблівасці бяспекі
-\n • Магчамасць аўтаматычнага пераключэння рэжыма дзень/ноч
-\n • Магчымасць адлюстравання абмежавання хуткасці з нагадваннем пры перавышэнні
-\n • Магчымасць змены маштабу ў залежнасці ад хуткасці
-\n • Магчамасць дзяліцца сваім месцазнаходжаннем, каб сябры змаглі знайсці вас
+    <string name="osmand_plus_extended_description_part5">Асаблівасці бяспекі 
+\n • Магчамасць аўтаматычнага пераключэння рэжыма дзень/ноч 
+\n • Магчымасць адлюстравання абмежавання хуткасці з апавяшчэннем пры перавышэнні 
+\n • Магчымасць змены маштабу ў залежнасці ад хуткасці 
+\n • Магчамасць дзяліцца сваім месцазнаходжаннем, каб сябры змаглі знайсці вас 
 \n</string>
-    <string name="osmand_plus_extended_description_part6">Мажлівасці для пешаходаў і раварыстаў
-\n • Прагляд пешаходных, турыстычных і роварных сцежак, выдатна падыходзіць для актыўнага адпачынку
-\n • Адмысловы рэжымы маршрутызацыі ды адлюстравання для раварыстаў і пешаходаў
-\n • Апцыянальныя прыпынкі грамадскага транспарту (аўтобус, трамвай, цягнік), уключаючы назвы маршрутаў
-\n • Магчымасць запісу падарожжа ў лакальны GPX-файл ці інтэрнэт-сэрвіс
-\n • Магчымасць адлюстравання хуткасці ды вышыні
+    <string name="osmand_plus_extended_description_part6">Магчымасці для пешаходаў і раварыстаў 
+\n • Прагляд пешаходных, турыстычных і роварных сцежак, выдатна падыходзіць для актыўнага адпачынку 
+\n • Адмысловы рэжымы маршрутызацыі ды адлюстравання для раварыстаў і пешаходаў 
+\n • Прыпынкі грамадскага транспарту (аўтобус, трамвай, цягнік), уключаючы назвы маршрутаў 
+\n • Магчымасць запісу падарожжа ў лакальны GPX-файл ці інтэрнэт-сэрвіс 
+\n • Магчымасць адлюстравання хуткасці ды вышыні 
 \n • Адлюстраванне контурных ліній ды зацянення вышынь (праз дадатак)</string>
-    <string name="osmand_plus_extended_description_part7">Непасрэдны ўклад у OSM
-\n • Заявы аб памылках у даных
-\n • Загрузка GPX-трэкаў у OSM проста з праграмы
-\n • Дадаванне цікавых кропак (POI) і непасрэдная загрузка іх у OSM (ці пазней, калі афлайн)
-\n • Магчымасць запісу падарожжа ў фонавым рэжыме (у той час, як прылада знаходзіцца ў спячым рэжыме)
-\n OsmAnd — адкрытае праграмнае забяспячэнне ў актыўнай распрацоўцы. Кожны можа ўнесці ўклад паведамляючы аб памылках, паляпшаючы пераклад ці распрацоўваючы новыя мажлівасці. Ход праекта залежыць таксама ад фінансавых унёскаў для забяспячэння прадаўжэння кадавання і тэставання новай функцыянальнасці.
+    <string name="osmand_plus_extended_description_part7">Непасрэдны ўклад у OSM 
+\n • Заявы аб памылках у даных 
+\n • Запампоўванне GPX-слядоў у OSM проста з дадатка 
+\n • Даданне пунктаў цікавасцяў (POI) і непасрэдная запампоўка іх у OSM (ці пазней, па-за сецівам) 
+\n • Магчымасць запісу падарожжа ў фонавым рэжыме (у той час, як прылада знаходзіцца ў спячым рэжыме) 
+\n OsmAnd — адкрытае праграмнае забяспячэнне ў актыўнай распрацоўцы. Кожны можа ўнесці ўклад паведамляючы аб памылках, паляпшаючы пераклад ці распрацоўваючы новыя магчымасці. Ход праекта залежыць таксама ад фінансавых унёскаў для забяспячэння кадавання і тэставання новай функцыянальнасці. 
 \n</string>
     <string name="shared_string_install">Усталяваць</string>
-    <string name="improve_coverage_mapillary">Палепшыць фота-пакрыццё Mapillary</string>
-    <string name="improve_coverage_install_mapillary_desc">Усталяваць Mapillary каб дадаць адну ці некалькі фатаграфій да гэтага месца на мапе.</string>
+    <string name="improve_coverage_mapillary">Палепшыць фотапакрыццё Mapillary</string>
+    <string name="improve_coverage_install_mapillary_desc">Усталяваць Mapillary, каб дадаць адзін альбо некалькі фотаздымкаў да гэтага месца на мапе.</string>
     <string name="open_mapillary">Адкрыць Mapillary</string>
     <string name="mapillary_image">Выява Mapillary</string>
-    <string name="distance_moving">Дыстанцыя папраўленая</string>
+    <string name="distance_moving">Дыстанцыя выпраўленая</string>
     <string name="shared_string_permissions">Дазволы</string>
-    <string name="import_gpx_failed_descr">OsmAnd не можа імпартаваць файл. Калі ласка, праверце, ці мае OsmAnd дазволы на чытаньне файла з гэтага каталёга.</string>
+    <string name="import_gpx_failed_descr">OsmAnd не можа імпартаваць файл. Калі ласка, праверце, ці мае OsmAnd дазвол на чытанне файлаў з гэтага каталога.</string>
     
-    <string name="map_widget_ruler_control">Лінейка прамянёвая</string>
+    <string name="map_widget_ruler_control">Радыусная лінейка</string>
     <string name="wrong_user_name">Няправільнае імя карыстальніка</string>
     <string name="shared_string_to">Да</string>
     <string name="mapillary_menu_date_from">Ад</string>
-    <string name="mapillary_menu_descr_dates">Паглядзець толькі даданыя выявы</string>
+    <string name="mapillary_menu_descr_dates">Паглядзець толькі дададзеныя выявы</string>
     <string name="mapillary_menu_title_dates">Дата</string>
     <string name="mapillary_menu_edit_text_hint">Увядзіце імя карыстальніка</string>
-    <string name="mapillary_menu_descr_username">Паглядзець толькі выявы даданыя</string>
+    <string name="mapillary_menu_descr_username">"Паглядзець толькі выявы,  дададзеныя"</string>
     <string name="mapillary_menu_title_username">Імя карыстальніка</string>
-    <string name="mapillary_menu_filter_description">Фільтраваць выявы па адпраўніку ці даце. Актыўныя толькі для буйнога павелічэння.</string>
-    <string name="shared_string_reload">Абнавіць</string>
-    <string name="mapillary_menu_descr_tile_cache">Абнавіць фрагменты, каб убачыць актуальныя даныя.</string>
+    <string name="mapillary_menu_filter_description">Фільтраваць выявы па адпраўніку, па даце або па тыпу. Актыўныя толькі для буйнога павелічэння.</string>
+    <string name="shared_string_reload">Перазагрузіць</string>
+    <string name="mapillary_menu_descr_tile_cache">Перазагрузіць фрагменты, каб убачыць актуальныя даныя.</string>
     <string name="mapillary_menu_title_tile_cache">Кэш фрагментаў</string>
     <string name="shared_string_reset">Скінуць</string>
-    <string name="store_tracks_in_monthly_directories">Захаваць запісаныя сьляды ў месячных тэчках</string>
-    <string name="store_tracks_in_monthly_directories_descrp">Захаваць запісаныя сляды ў падтэчкі на аснове месяца запісу (напрыклад, 2018-01).</string>
+    <string name="store_tracks_in_monthly_directories">Захоўваць запісаныя сляды ў каталогі па месяцах</string>
+    <string name="store_tracks_in_monthly_directories_descrp">Захоўваць запісаныя сляды ў падкаталогі на аснове месяца запісу (напрыклад, 2018-01).</string>
     <string name="average">Сярэдняя</string>
     <string name="of">%1$d з %2$d</string>
     <string name="ascent_descent">Пад\'ём/Cпуск</string>
@@ -2792,189 +2801,189 @@
     <string name="min_max">Мін./Макс.</string>
     <string name="rendering_value_translucent_pink_name">Паўпразрысты ружовы</string>
     
-    <string name="measurement_tool_action_bar">Прагляд мапы і дадаваньне кропак</string>
-    <string name="measurement_tool">Вымяраць адлегласьць</string>
+    <string name="measurement_tool_action_bar">Прагляд мапы і даданне пунктаў</string>
+    <string name="measurement_tool">Вымяраць адлегласць</string>
     <string name="quick_action_resume_pause_navigation">Прыпыніць/аднавіць навігацыю</string>
     <string name="quick_action_resume_pause_navigation_descr">Націсніце гэтую кнопку, каб прыпыніць ці аднавіць навігацыю.</string>
     <string name="quick_action_show_navigation_finish_dialog">Паказаць дыялог «Завяршэнне навігацыі»</string>
     <string name="quick_action_start_stop_navigation">Пачаць/спыніць навігацыю</string>
     <string name="quick_action_start_stop_navigation_descr">Націсніце гэтую кнопку, каб пачаць або скончыць навігацыю.</string>
-    <string name="live_monitoring_max_interval_to_send">Час буферызацыі для анлайн сачэньня</string>
-    <string name="live_monitoring_max_interval_to_send_desrc">Задае час буферызацыі для зьберажэньня месцаў для адпраўкі без злучэньня</string>
-    <string name="mappilary_no_internet_desc">Вам патрэбна падлучэнне да Інтэрнэту для прагляду фатаграфій з Mapillary.</string>
+    <string name="live_monitoring_max_interval_to_send">Час буферызацыі для сеціўнага сачэння</string>
+    <string name="live_monitoring_max_interval_to_send_desrc">Задае час буферызацыі для зберажэння месцаў для адпраўкі без злучэння</string>
+    <string name="mappilary_no_internet_desc">Для прагляду фотаздымкаў з Mapillary неабходна злучыцца з інтэрнэтам.</string>
     <string name="retry">Паўтарыць</string>
     
     
-<string name="none_point_error">Калі ласка, дадайце па меншай меры адну кропку.</string>
-    <string name="enter_gpx_name">Імя файла GPX:</string>
-    <string name="show_on_map_after_saving">Паказаць на мапе пасьля захаваньня</string>
+<string name="none_point_error">Калі ласка, дадайце па меншай меры адзін пункт.</string>
+    <string name="enter_gpx_name">Назва файла GPX:</string>
+    <string name="show_on_map_after_saving">Паказаць на мапе пасля захавання</string>
     
-    <string name="add_waypoint">Дадаць кропку шляху</string>
-    <string name="save_gpx_waypoint">Захаваць GPX-кропку шляху</string>
-    <string name="save_route_point">Захаваць кропку маршруту</string>
-    <string name="waypoint_one">Кропка шляху 1</string>
-    <string name="route_point_one">Кропка маршруту 1</string>
+    <string name="add_waypoint">Дадаць пункт шляху</string>
+    <string name="save_gpx_waypoint">Захаваць GPX-пункт шляху</string>
+    <string name="save_route_point">Захаваць пункт маршруту</string>
+    <string name="waypoint_one">Пункт шляху 1</string>
+    <string name="route_point_one">Пункт маршруту 1</string>
 
     
     <string name="line">Лінія</string>
-    <string name="save_as_route_point">Захаваць як кропкі маршруту</string>
+    <string name="save_as_route_point">Захаваць як пункты маршруту</string>
     <string name="save_as_line">Захаваць як лінію</string>
-    <string name="route_point">Кропка маршруту</string>
+    <string name="route_point">Пункт маршруту</string>
     <string name="edit_line">Рэдагаваць лінію</string>
-    <string name="add_point_before">Дадаць кропку перад</string>
-    <string name="add_point_after">Дадаць кропку пасьля</string>
-    <string name="shared_string_options">Опцыі</string>
-    <string name="measurement_tool_snap_to_road_descr">OsmAnd злучыць кропкі з маршрутам для абранага профіля.</string>
-    <string name="measurement_tool_save_as_new_track_descr">Захаваць кропкі, як кропкі маршруту ці як лінію.</string>
+    <string name="add_point_before">Дадаць пункт перад</string>
+    <string name="add_point_after">Дадаць пункт пасля</string>
+    <string name="shared_string_options">Параметры</string>
+    <string name="measurement_tool_snap_to_road_descr">OsmAnd злучыць пункты з маршрутам для абранага профіля.</string>
+    <string name="measurement_tool_save_as_new_track_descr">Захаваць пункты як пункты маршруту ці як лінію.</string>
     <string name="choose_navigation_type">Абраць профіль навігацыі</string>
-    <string name="add_route_points">Дадаць кропкі маршруту</string>
+    <string name="add_route_points">Дадаць пункты маршруту</string>
     <string name="add_line">Дадаць лінію</string>
     <string name="empty_state_my_tracks">Дадаць GPX-файлы</string>
-    <string name="empty_state_my_tracks_desc">Запісаць GPX-файлы ці запісаныя сляды.</string>
-    <string name="empty_state_favourites">Дадаць упадабаныя</string>
-    <string name="empty_state_favourites_desc">Імпартаваць упадабаныя ці дадаць з дапамогай маркіроўкі пунктаў на мапе.</string>
+    <string name="empty_state_my_tracks_desc">Імпартаваць GPX-файлы ці запісаныя сляды.</string>
+    <string name="empty_state_favourites">Дадаць улюбёныя</string>
+    <string name="empty_state_favourites_desc">Імпартаваць улюбёныя ці дадаць з адзнак на мапе.</string>
     <string name="import_track">Імпартаваць GPX-файл</string>
-    <string name="import_track_desc">Файл %1$s не зьмяшчае кропкі шляху, імпартаваць як сьлед?</string>
-    <string name="move_point">Перамясціць кропку</string>
+    <string name="import_track_desc">Файл %1$s не змяшчае пункты шляху, імпартаваць як след\?</string>
+    <string name="move_point">Перамясціць пункт</string>
     <string name="add_segment_to_the_track">Дадаць у GPX-файл</string>
 <string name="keep_showing_on_map">Працягваць паказваць на мапе</string>
-    <string name="exit_without_saving">Выйсьці без захаваньня?</string>
+    <string name="exit_without_saving">Выйсці без захавання\?</string>
     <string name="do_not_use_animations">Без анімацыі</string>
-    <string name="do_not_use_animations_descr">Адключэнне анімацыі ў праграме.</string>
-    <string name="move_all_to_history">Перамясьціць усё ў гісторыю</string>
+    <string name="do_not_use_animations_descr">Адключэнне анімацыі ў дадатку.</string>
+    <string name="move_all_to_history">Перамясціць усё ў гісторыю</string>
     
-    <string name="show_direction">Індыкацыя адлегласьці</string>
+    <string name="show_direction">Індыкацыя адлегласці</string>
     <string name="sort_by">Сартаваць па</string>
     
-    <string name="marker_show_distance_descr">Абярыце, як паказваць адлегласьць і напрамак да пазнак на экране мапы:</string>
+    <string name="marker_show_distance_descr">Абярыце, як паказваць адлегласць і напрамак да адзнак на экране мапы:</string>
     <string name="map_orientation_change_in_accordance_with_speed">Парог арыентацыі мапы</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Абярыце хуткасць, на якой арыентацыя мапы пераключаецца з «Напрамку руху» на «Па компасу».</string>
-    <string name="all_markers_moved_to_history">Усе пазнакі перанесены ў гісторыю</string>
-    <string name="marker_moved_to_history">Пазнака мапы перанесеная ў гісторыю</string>
-    <string name="marker_moved_to_active">Пазнака мапы стала актыўнай</string>
-    <string name="shared_string_list">Сьпіс</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Абярыце хуткасць, на якой арыентацыя мапы пераключаецца з «Напрамку руху» на «Па компасе».</string>
+    <string name="all_markers_moved_to_history">Усе адзнакі перамешчаныя ў гісторыю</string>
+    <string name="marker_moved_to_history">Адмеціна мапы перамешчаная ў гісторыю</string>
+    <string name="marker_moved_to_active">Адмеціна мапы стала актыўнай</string>
+    <string name="shared_string_list">Спіс</string>
     <string name="shared_string_groups">Групы</string>
     <string name="passed">Апошняе выкарыстанне: %1$s</string>
-    <string name="make_active">Актывізаваць</string>
-    <string name="today">Сёньня</string>
+    <string name="make_active">Актываваць</string>
+    <string name="today">Сёння</string>
     <string name="yesterday">Учора</string>
     <string name="last_seven_days">Апошнія 7 дзён</string>
     <string name="this_year">Сёлета</string>
     
     
-    <string name="remove_from_map_markers">Выдаліць з пазнакаў мапы</string>
-    <string name="descendingly">па зьмяншэньні</string>
-    <string name="ascendingly">па ўзрастаньні</string>
-    <string name="date_added">Дата дадаваньня</string>
-    <string name="order_by">Сартаваць па:</string>
+    <string name="remove_from_map_markers">Выдаліць з адзнак мапы</string>
+    <string name="descendingly">па ўбыванні</string>
+    <string name="ascendingly">па ўзрастанні</string>
+    <string name="date_added">Дата дадання</string>
+    <string name="order_by">Парадкаваць па:</string>
     <string name="show_guide_line">Паказаць лініі накірунку</string>
-    <string name="show_arrows_on_the_map">Паказаць стрэлкі на карце</string>
+    <string name="show_arrows_on_the_map">Паказаць стрэлкі на мапе</string>
     <string name="show_passed">Паказаць пройдзеныя</string>
     <string name="hide_passed">Схаваць пройдзеныя</string>
     <string name="use_location">Выкарыстоўваць становішча</string>
     <string name="add_location_as_first_point_descr">Дадаць ваша становішча як пачатковы пункт пры планаванні маршруту.</string>
     <string name="my_location">Маё становішча</string>
     <string name="shared_string_finish">Фініш</string>
-    <string name="plan_route">Плянаваць маршрут</string>
-    <string name="shared_string_sort">Сартаваць</string>
+    <string name="plan_route">Планаваць маршрут</string>
+    <string name="shared_string_sort">Упарадкаваць</string>
     <string name="coordinate_input">Увод каардынат</string>
     <string name="is_saved">захаваны</string>
-    <string name="marker_save_as_track_descr">Экспартаваць вашы пазнакі ў наступны GPX-файл:</string>
+    <string name="marker_save_as_track_descr">Экспартаваць вашыя адзнакі ў наступны GPX-файл:</string>
     <string name="marker_save_as_track">Захаваць як GPX-файл</string>
-    <string name="move_to_history">Перамясьціць у гісторыю</string>
-    <string name="group_will_be_removed_after_restart">Групы ўжо не будзе пасля наступнага перазапуску праграмы.</string>
-    <string name="shared_string_markers">Пазнакі</string>
+    <string name="move_to_history">Перамясціць у гісторыю</string>
+    <string name="group_will_be_removed_after_restart">Групы ўжо не будзе пасля наступнага перазапуску дадатка.</string>
+    <string name="shared_string_markers">Адмеціны</string>
     <string name="coordinates_format">Фармат каардынат</string>
-    <string name="use_system_keyboard">Выкарыстоўваць сыстэмную клявіятуру</string>
-    <string name="fast_coordinates_input_descr">Абраць фармат уводу каардынат. Вы заўсёды можаце зьмяніць яго, націснуўшы «Налады».</string>
+    <string name="use_system_keyboard">Выкарыстоўваць сістэмную клавіятуру</string>
+    <string name="fast_coordinates_input_descr">Абраць фармат уводу каардынат. Вы заўсёды можаце змяніць яго, націснуўшы \"Параметры\".</string>
     <string name="fast_coordinates_input">Хуткі ўвод каардынат</string>
-    <string name="routing_attr_avoid_ice_roads_fords_name">Пазьбягаць лядовых дарог і брадоў</string>
+    <string name="routing_attr_avoid_ice_roads_fords_name">Пазбягаць лядовых дарог і броду</string>
     <string name="routing_attr_avoid_ice_roads_fords_description">Пазбягаць лядовых дарог і бродаў.</string>
-    <string name="make_round_trip_descr">Дадаць копію пачатковай кропкі як месца прызначэньня.</string>
+    <string name="make_round_trip_descr">Дадаць копію пачатковага пункту як месца прызначэння.</string>
     <string name="make_round_trip">Зрабіць кругавое падарожжа</string>
     
     <string name="osn_modify_dialog_error">Не атрымалася змяніць нататку</string>
-    <string name="osn_modify_dialog_title">Зьмяніць нататку</string>
-    <string name="context_menu_item_modify_note">Зьмяніць OSM-нататку</string>
+    <string name="osn_modify_dialog_title">Змяніць нататку</string>
+    <string name="context_menu_item_modify_note">Змяніць OSM-нататку</string>
     
     <string name="rendering_value_darkyellow_name">Цёмна-жоўты</string>
     <string name="show_map">Паказаць мапу</string>
     <string name="route_is_calculated">Маршрут разлічаны</string>
     <string name="round_trip">Падарожжа</string>
-    <string name="plan_route_no_markers_toast">Вам неабходна дадаць па меншай меры адну пазнаку, каб выкарыстоўваць гэтую функцыю.</string>
+    <string name="plan_route_no_markers_toast">Вам неабходна дадаць па меншай меры адну адзнаку, каб выкарыстоўваць гэтую функцыю.</string>
     <string name="shared_string_road">Дарога</string>
-    <string name="wrong_format">Дрэнны фармат</string>
-    <string name="wrong_input">Дрэнны ўвод</string>
-	<string name="enter_new_name">Увядзіце новае імя</string>
+    <string name="wrong_format">Хібны фармат</string>
+    <string name="wrong_input">Хібны ўвод</string>
+	<string name="enter_new_name">Увядзіце новую назву</string>
 	<string name="shared_string_back">Назад</string>
 	<string name="shared_string_view">Праглядзець</string>
-	<string name="waypoints_added_to_map_markers">Кропкі маршрута дададзеныя ў пазнакі мапы</string>
-	<string name="import_gpx_file_description">могуць быць імпартаваныя як «Упадабаныя» ці як GPX-файл.</string>
+	<string name="waypoints_added_to_map_markers">Пункты шляху дададзеныя ў адзнакі мапы</string>
+	<string name="import_gpx_file_description">могуць быць імпартаваныя як «Улюбёныя» ці як GPX-файл.</string>
     <string name="import_as_gpx">Імпартаваць як GPX-файл</string>
-    <string name="import_as_favorites">Імпартаваць як упадабаныя</string>
+    <string name="import_as_favorites">Імпартаваць як улюбёныя</string>
     <string name="import_file">Імпартаваць файл</string>
-	<string name="tap_on_map_to_hide_interface_descr">Дотык на мапе пераключае кнопкі кіраваньня і віджэты.</string>
+	<string name="tap_on_map_to_hide_interface_descr">Націскам па мапе можна пераключыць кнопкі кіравання і віджэты.</string>
     <string name="tap_on_map_to_hide_interface">Поўныэкранны рэжым</string>
     
-    <string name="mark_passed">Адзначыць прайдзеныя</string>
-    <string name="digits_quantity">Колькасьць дзесятковых лічбаў</string>
+    <string name="mark_passed">Пазначыць пройдзеныя</string>
+    <string name="digits_quantity">Колькасць дзесятковых лічбаў</string>
     <string name="show_number_pad">Паказаць лічбавую панэль</string>
     <string name="shared_string_paste">Уставіць</string>
-    <string name="coordinate_input_accuracy_description">Аўтаматычна пераключыцца ў наступнае поле пасьля ўводу %1$d дзесятковых лічбаў.</string>
+    <string name="coordinate_input_accuracy_description">Аўтаматычна пераключыцца ў наступнае поле пасля ўводу %1$d дзесятковых лічбаў.</string>
     <string name="coordinate_input_accuracy">%1$d лічбаў</string>
     <string name="go_to_next_field">Наступнае поле</string>
-    <string name="rename_marker">Перайменаваць пазнаку</string>
+    <string name="rename_marker">Змяніць назву адзнакі</string>
     <string name="shared_string_two">Два</string>
     <string name="shared_string_one">Адзін</string>
-    <string name="add_favourites_group_to_markers_descr">Абярыце катэгорыю ўпадабаных, каб дадаць да пазнак.</string>
-    <string name="shared_string_gpx_waypoints">Кропкі следу</string>
-    <string name="favourites_group">Катэгорыя ўпадабаных</string>
+    <string name="add_favourites_group_to_markers_descr">Абярыце катэгорыю ўлюбёных, каб дадаць у адзнакі.</string>
+    <string name="shared_string_gpx_waypoints">Пункты следу</string>
+    <string name="favourites_group">Катэгорыя ўлюбёных</string>
     <string name="add_group">Дадаць групу</string>
-    <string name="add_group_descr">Імпартаваць групы з упадабаных ці GPX-кропак.</string>
-    <string name="empty_state_markers_active">Стварыце пазнакі мапы!</string>
-    <string name="empty_state_markers_active_desc">Дакраніцеся месца і потым націсніце кнопку пазнакі.</string>
+    <string name="add_group_descr">Імпартаваць групы з улюбёных ці GPX-пунктаў.</string>
+    <string name="empty_state_markers_active">Стварыце адзнакі на мапе!</string>
+    <string name="empty_state_markers_active_desc">Дакраніцеся месца і потым націсніце кнопку адзнакі.</string>
     <string name="empty_state_markers_groups">Імпартаваць групы</string>
-    <string name="empty_state_markers_groups_desc">Імпартаваць групы ўпадабаных ці шляхавыя кропкі як пазнакі.</string>
-    <string name="empty_state_markers_history_desc">Пазнакі, адзначаныя як пройдзенныя, з\'явяцца на гэтым экране.</string>
-    <string name="show_guide_line_descr">Паказвае лініі кірунку ад вашага становішча да актыўнай пазнакі.</string>
-    <string name="show_arrows_descr">Паказвае адну ці дзьве стрэлкі, якія паказваюць кірунак да актыўных пазнак.</string>
-    <string name="distance_indication_descr">Абярыце, як адлюстроўваць адлегласьць да актыўных пазнак.</string>
+    <string name="empty_state_markers_groups_desc">Імпартаваць групы ўлюбёных ці пункты шляху як адзнакі.</string>
+    <string name="empty_state_markers_history_desc">Адмеціны, пазначаныя як пройдзенныя, з\'явяцца на гэтым экране.</string>
+    <string name="show_guide_line_descr">Паказвае лініі накірунку ад вашага становішча да актыўнай адзнакі.</string>
+    <string name="show_arrows_descr">Паказвае адну ці дзьве стрэлкі, якія паказваюць накірунак да актыўных адзнак.</string>
+    <string name="distance_indication_descr">Абярыце, як адлюстроўваць адлегласць да актыўных адзнак.</string>
     <string name="active_markers_descr">Абярыце, колькі ўказальнікаў напрамку адлюстроўваць.</string>
-    <string name="appearance_on_the_map">Зьнешні выгляд на мапе</string>
-    <string name="add_track_to_markers_descr">Абраць след каб дадаць яго шляхавые кропкі ў пазнакі.</string>
+    <string name="appearance_on_the_map">Вонкавы выгляд на мапе</string>
+    <string name="add_track_to_markers_descr">Абраць след, каб дадаць яго пункты ў адзнакі.</string>
     <string name="shared_string_right">Направа</string>
     <string name="shared_string_left">Налева</string>
     <string name="shared_string_more_without_dots">Больш</string>
-    <string name="looking_for_tracks_with_waypoints">Пошук слядоў з шляхавымі кропкамі</string>
-    <string name="empty_state_osm_edits">Стварыць або зьмяніць OSM аб’екты</string>
+    <string name="looking_for_tracks_with_waypoints">Пошук слядоў з пунктамі шляху</string>
+    <string name="empty_state_osm_edits">"Стварыць альбо змяніць аб’екты OSM "</string>
     <string name="shared_string_deleted">Выдалена</string>
     <string name="shared_string_edited">Адрэдагавана</string>
-    <string name="marker_activated">Пазнака %s актываваная.</string>
+    <string name="marker_activated">Адмеціна %s актываваная.</string>
     <string name="notes_by_date">Нататкі па даце</string>
     <string name="by_date">Па даце</string>
     <string name="by_type">Па тыпу</string>
-    <string name="empty_state_osm_edits_descr">Стварайце або зьмяняйце OSM POI, адкрывайце або камэнтуйце OSM-нататкі, а таксама адсылайце запісаныя GPX-файлы.</string>
+    <string name="empty_state_osm_edits_descr">Стварайце або змяняйце OSM POI, адкрывайце або каментуйце OSM-нататкі, а таксама адсылайце запісаныя GPX-файлы.</string>
     <string name="shared_string_added">Дададзена</string>
-    <string name="one_tap_active_descr">Націск на пазнаку на мапе перамесціць гэтую пазнаку на першае месца ў спісе актыўных пазнакаў без адкрыцця кантэкстнага меню.</string>
+    <string name="one_tap_active_descr">Націск на адзнаку на мапе перамесціць яе на першае месца ў спісе актыўных без адкрыцця кантэкстнага меню.</string>
     <string name="one_tap_active">Актывацыя адным націскам</string>
     <string name="empty_state_av_notes">Рабі нататкі!</string>
     <string name="empty_state_av_notes_desc">Дадайце аўдыё-, відэа- ці фотанататку на любую кропку на мапе, выкарыстоўваючы віджэт ці кантэкстнае меню.</string>
-    <string name="modify_the_search_query">Зьмяніце пошукавы запыт.</string>
+    <string name="modify_the_search_query">Змяніце пошукавы запыт.</string>
     <string name="what_is_here">Што тут:</string>
     <string name="parked_at">прыпаркаваны на</string>
     <string name="pick_up_till">Узяць да</string>
-    <string name="without_time_limit">Без абмежаваньня часу</string>
+    <string name="without_time_limit">Без абмежавання па часе</string>
     <string name="context_menu_read_full_article">Чытаць увесь артыкул</string>
     <string name="context_menu_read_article">Чытаць артыкул</string>
-    <string name="context_menu_points_of_group">Усе кропкі групы</string>
-    <string name="additional_actions">Дадатковыя дзеяньні</string>
-    <string name="av_locations_selected_desc">GPX-файл з каардынатамі і данымі выбраных нататак.</string>
+    <string name="context_menu_points_of_group">Усе пункты групы</string>
+    <string name="additional_actions">Дадатковыя дзеянні</string>
+    <string name="av_locations_selected_desc">GPX-файл з каардынатамі і данымі абраных нататак.</string>
     <string name="av_locations_all_desc">GPX-файл з каардынатамі і данымі ўсіх нататак.</string>
     <string name="shared_string_actions">Дзеянні</string>
-    <string name="shared_string_marker">Пазнака</string>
+    <string name="shared_string_marker">Адмеціна</string>
     <string name="osm_recipient_stat">Змен %1$s, сума %2$s mBTC</string>
     <string name="osm_recipients_label">OSM-атрымальнікі</string>
-    <string name="total_donations">Усяго ахвяраванняў</string>
+    <string name="total_donations">Агулам ахвяраванняў</string>
 <string name="open_from">Адчынена з</string>
     <string name="open_till">Адчынена да</string>
     <string name="will_close_at">Зачыніцца а</string>
@@ -2984,17 +2993,17 @@
     <string name="lang_lo">Лаоская</string>
     <string name="rendering_attr_hidePOILabels_name">Назвы POI</string>
     
-    <string name="day_off_label">вых.</string>
+    <string name="day_off_label">выкл</string>
     <string name="winter_and_ski_renderer">Зімовы/лыжны</string>
     <string name="touring_view_renderer">Турыстычны выгляд</string>
     <string name="nautical_renderer">Марскі</string>
 <string name="will_open_tomorrow_at">Адчыніцца заўтра а</string>
-    <string name="copy_location_name">Капіяваць назву кропкі/POI</string>
+    <string name="copy_location_name">Скапіяваць назву пункта/POI</string>
     <string name="toast_empty_name_error">Месца без назвы</string>
 <string name="shared_string_current">Цяперашні</string>
     <string name="last_intermediate_dest_description">Дадае прамежкавы прыпынак</string>
     <string name="first_intermediate_dest_description">Дадае першы прыпынак</string>
-    <string name="subsequent_dest_description">Перасунуць прызначэньне далей і стварыць яго</string>
+    <string name="subsequent_dest_description">Перамясціць прызначэнне далей і стварыць яго</string>
     <string name="show_closed_notes">Паказаць закрытыя нататкі</string>
     <string name="switch_osm_notes_visibility_desc">Паказаць/схаваць OSM-нататкі на мапе.</string>
     <string name="gpx_file_desc">GPX падыходзіць для экспарту ў JOSM і іншыя OSM-рэдактары.</string>
@@ -3002,12 +3011,12 @@
     <string name="shared_string_gpx_file">GPX-файл</string>
     <string name="osc_file">OSC-файл</string>
     <string name="choose_file_type">Абярыце тып файла</string>
-    <string name="osm_edits_export_desc">Абярыце тып экспарту: OSM-нататкі, POI ці абодвыя.</string>
+    <string name="osm_edits_export_desc">Абярыце тып экспарту: OSM-нататкі, POI ці абодва.</string>
     <string name="all_data">Усе даныя</string>
     <string name="osm_notes">OSM-нататкі</string>
     <string name="tunnel_warning">Наперадзе тунэль</string>
     <string name="show_tunnels">Тунэлі</string>
-<string name="make_as_start_point">Зрабіць пачатковай кропкай</string>
+<string name="make_as_start_point">Зрабіць пачатковым пунктам</string>
     <string name="map_import_error">Памылка імпарту мапы</string>
     <string name="map_imported_successfully">Мапа імпартаваная</string>
     <string name="enter_the_file_name">Увядзіце назву файла.</string>
@@ -3021,80 +3030,80 @@
 	<string name="south_abbreviation">Пд</string>
 	<string name="north_abbreviation">Пн</string>
 	<string name="optional_point_name">Неабавязковая назва пункта</string>
-    <string name="transport_nearby_routes_within">Маршруты паблізу з</string>
+    <string name="transport_nearby_routes_within">Маршруты паблізу</string>
     <string name="transport_nearby_routes">Паблізу</string>
     <string name="enter_lon">Увядзіце даўгату</string>
     <string name="enter_lat">Увядзіце шырату</string>
     <string name="enter_lat_and_lon">Увядзіце шырату і даўгату</string>
-	<string name="distance_farthest">Адлегласць: спачатку найдалейшая</string>
-    <string name="distance_nearest">Адлегласць: спачатку найбліжэйшая</string>
-    <string name="clear_all_intermediates">Сцерці ўсе прамежкавыя пункты</string>
+	<string name="distance_farthest">Адлегласць: спачатку найбольшая</string>
+    <string name="distance_nearest">Адлегласць: спачатку найменшая</string>
+    <string name="clear_all_intermediates">Выдаліць усе прамежкавыя пункты</string>
     <string name="group_deleted">Група выдаленая</string>
     <string name="rendering_attr_whiteWaterSports_name">Сплаўны спорт</string>
     <string name="select_waypoints_category_description">Дадаць усе пункты шляху ці абраць асобныя катэгорыі.</string>
-    <string name="shared_string_total">Усяго</string>
+    <string name="shared_string_total">Агулам</string>
     <string name="nothing_found_in_radius">Нічога не знойдзена:</string>
     <string name="shared_string_travel_guides">Падарожжа</string>
-    <string name="waypoints_removed_from_map_markers">Шляхавыя кропкі выдаленыя з пазнакаў мапы</string>
+    <string name="waypoints_removed_from_map_markers">Пункты шляху, выдаленыя з адзнак мапы</string>
     <string name="shared_string_result">Вынік</string>
-    <string name="use_two_digits_longitude">Выкарыстоўваць дзьве лічбы даўгаты</string>
+    <string name="use_two_digits_longitude">Выкарыстоўваць дзве лічбы даўгаты</string>
     <string name="saved_articles">Закладзеныя артыкулы</string>
-    <string name="shared_string_explore">Дасьледаваць</string>
+    <string name="shared_string_explore">Даследаваць</string>
     <string name="wikivoyage_search_hint">Пошук: краіна, горад, рэгіён</string>
     <string name="shared_string_read">Чытаць</string>
     <string name="download_maps_travel">Турыстычныя даведнікі</string>
     <string name="shared_string_wikivoyage">Wikivoyage</string>
     <string name="article_removed">Артыкул выдалены</string>
-    <string name="shared_string_contents">Зьмест</string>
-    <string name="index_item_world_wikivoyage">Сусьветныя артыкулы Wikivoyage</string>
+    <string name="shared_string_contents">Змест</string>
+    <string name="index_item_world_wikivoyage">Сусветныя артыкулы Wikivoyage</string>
     <string name="online_webpage_warning">Старонка даступная толькі анлайн. Адкрыць ў вэб-браўзеры?</string>
     <string name="images_cache">Кэш выяў</string>
     <string name="delete_search_history">Выдаліць гісторыю пошукаў</string>
     <string name="show_images">Паказаць выявы</string>
     <string name="popular_destinations">Папулярныя напрамкі</string>
-    <string name="paid_app">Платнае прыкладанне</string>
-    <string name="paid_plugin">Платны плагін</string>
-    <string name="travel_card_update_descr">Дастуныя новыя даныя Wikivoyage, абнавіце іх.</string>
+    <string name="paid_app">Платны дадатак</string>
+    <string name="paid_plugin">Платная ўбудова</string>
+    <string name="travel_card_update_descr">Дастуны новыя даныя Wikivoyage, абнавіце іх.</string>
 	<string name="travel_card_download_descr">Спампуйце даведнікі Wikivoyage для прагляду артыкулаў аб мясцінах па ўсім свеце без Інтэрнэту.</string>
-	<string name="update_is_available">Абнаўленне даступнае</string>
+	<string name="update_is_available">Даступна абнаўленне</string>
 	<string name="download_file">Спампаваць файл</string>
     <string name="start_editing_card_image_text">Бясплатны сусветны турыстычны даведнік, які можа рэдагаваць кожны.</string>
-    <string name="welcome_to_open_beta_description">Турыстычныя даведнікі ў цяперашні час базуюцца на аснове Wikivoyage. Тэстуйце усе функцыі бясплатна падчас адкрытага бэта-тэставання. Потым даведнікі будуць даступныя падпішчыкам OsmAnd Unlimited і ўладальнікам OsmAnd+.</string>
-    <string name="start_editing_card_description">Вам можна і варта рэдагаваць любы артыкул на Wikivoyage. Дзяліцеся ведамі, вопытам, талентам і вашай ўвагай</string>
-    <string name="start_editing">Пачаць рэдагаваньне</string>
+    <string name="welcome_to_open_beta_description">Турыстычныя даведнікі ў цяперашні час базуюцца на Wikivoyage. Тэстуйце усе функцыі бясплатна падчас адкрытага бэта-тэставання. Потым даведнікі будуць даступныя падпісантам OsmAnd Unlimited і карыстальнікам OsmAnd+.</string>
+    <string name="start_editing_card_description">Вам можна і варта рэдагаваць любы артыкул на Wikivoyage. Дзяліцеся ведамі, досведам, талентам і тым, што заўважылі</string>
+    <string name="start_editing">Пачаць рэдагаванне</string>
     <string name="get_unlimited_access">Атрымаць неабмежаваны доступ</string>
     <string name="welcome_to_open_beta">Вітаем у адкрытым бэта-тэставанні</string>
     <string name="wikivoyage_travel_guide">Турыстычны даведнік</string>
     <string name="osmand_team">Каманда OsmAnd</string>
-    <string name="wikivoyage_travel_guide_descr">Кіраўніцтва па самым цікавым месцам на планеце ўнутны OsmAnd без злучэння з Інтэрнэтам.</string>
-    <string name="monthly_map_updates">Абнаўленні мап: <b>штомесячна</b></string>
-    <string name="daily_map_updates">Абнаўленні мап: <b>штогадзінна</b></string>
-    <string name="in_app_purchase">Пакупка ў праграме</string>
+    <string name="wikivoyage_travel_guide_descr">Дапаможнік па самым цікавым месцам на планеце ўнутры OsmAnd без злучэння з Інтэрнэтам.</string>
+    <string name="monthly_map_updates">Абнаўленні мапаў: <b>штомесяц</b></string>
+    <string name="daily_map_updates">Абнаўленні мапаў: <b>штогадзінна</b></string>
+    <string name="in_app_purchase">Пакупка ў дадатку</string>
     <string name="in_app_purchase_desc">Разавы плацёж</string>
-    <string name="in_app_purchase_desc_ex">Аднойчы набыты, гэта будзе заўсёды даступны для вас.</string>
+    <string name="in_app_purchase_desc_ex">Аднойчы набыты, будзе заўсёды даступны для вас.</string>
     <string name="purchase_unlim_title">Купіць - %1$s</string>
     <string name="purchase_subscription_title">Папісацца - %1$s</string>
 
     <string name="wikivoyage_offline">Аўтаномны Wikivoyage</string>
 
-    <string name="unlimited_downloads">Неабмежаваныя спампоўкі</string>
-    <string name="wikipedia_offline">Аўтаномная Вікіпэдыя</string>
+    <string name="unlimited_downloads">Неабмежаваныя спампоўванні</string>
+    <string name="wikipedia_offline">Аўтаномная Вікіпедыя</string>
     <string name="unlock_all_features">Разблакаваць усе функцыі OsmAnd</string>
 
     <string name="purchase_dialog_title">Абярыце план</string>
-    <string name="purchase_dialog_travel_description">Купіце адзін з наступных каб атрымаць аўтаномны турыстычны даведнік:</string>
+    <string name="purchase_dialog_travel_description">Купіце адзін з наступных, каб мець аўтаномны турыстычны даведнік:</string>
     <string name="purchase_dialog_subtitle">Абярыце прыдатны пункт:</string>
     <string name="shared_string_dont">Не</string>
     <string name="shared_string_do">Так</string>
     <string name="shared_string_only_with_wifi">Толькі праз Wi-Fi</string>
     <string name="wikivoyage_download_pics">Спампаваць выявы</string>
-    <string name="wikivoyage_download_pics_descr">Выявы з артыкулаў могуць быць спампованыя для аўтаномнага карыстання. 
-\nЗаўсёды даступная ў «Даследаваць» → «Параметры».</string>
+    <string name="wikivoyage_download_pics_descr">Выявы з артыкулаў могуць быць спампаваныя для аўтаномнага выкарыстання. 
+\nЗаўсёды даступна ў «Даследаваць» → «Параметры».</string>
     <string name="shared_string_wifi_only">Толькі праз Wi-Fi</string>
     <string name="select_travel_book">Абраць дзённік падарожжаў</string>
     <string name="shared_string_travel_book">Дзённік падарожжаў</string>
     <string name="download_images">Спампаваць выявы</string>
-    <string name="download_wikipedia_description">Спампаваць артыкулы Вікіпэдыі для %1$s для аўтаномнага чытання.</string>
+    <string name="download_wikipedia_description">Спампаваць артыкулы Вікіпедыі для %1$s для аўтаномнага чытання.</string>
     <string name="download_wikipedia_label">Спампаваць даныя Вікіпедыі</string>
     <string name="open_in_browser_wiki">Адкрыць артыкул у сеціве</string>
     <string name="open_in_browser_wiki_description">Праглядзець артыкул у браўзеры.</string>
@@ -3106,66 +3115,66 @@
     <string name="purchase_cancelled_dialog_title">Вы анулявалі падпіску OsmAnd Live</string>
     <string name="purchase_cancelled_dialog_descr">Прадоўжыць падпіску, каб і далей карыстацца ўсімі функцыямі:</string>
 
-    <string name="maps_you_need_descr">На падставе закладзеных вамі артыкулаў, наступныя мапы рэкамендуюцца для сцягвання:</string>
+    <string name="maps_you_need_descr">На падставе закладзеных вамі артыкулаў рэкамендуецца спампаваць наступныя мапы:</string>
     <string name="maps_you_need">Патрэбныя вам мапы</string>
-    <string name="contour_lines_hillshade_maps">Контупныя лініі і зацяненне рэльефу</string>
+    <string name="contour_lines_hillshade_maps">Контурныя лініі і зацяненне рэльефу</string>
     <string name="hide_full_description">Схаваць поўнае апісанне</string>
     <string name="show_full_description">Паказаць поўнае апісанне</string>
     <string name="nautical_render_descr">Стыль для марской навігацыі. Асноўныя магчымасці: буі, маякі, рачныя і марскія маршруты і адзнакі, гавані, марскія паслугі, контуры глыбіні.</string>
     <string name="ski_map_render_descr">Стыль для катання на лыжах. Асноўныя магчымасці: адмалёўка трас, пад\'ёмнікаў і іншых лыжных аб\'ектаў зручным спосабам. Менш другасных аб\'ектаў мапы, што адцягваюць увагу.</string>
-    <string name="light_rs_render_descr">Просты і кантрастны стыль для аўтамабільнай навігацыі. Пяшчотны для вачэй начны рэжым. Асноўныя магчымасці: контурныя лініі, кантрастныя памаранчавыя дарогі, менш другасных аб\'ектаў, што адцягваюць увагу.</string>
-    <string name="topo_render_descr">Кантрастны стыль, прызначаны ў першую чаргу для шпацыру, паходу і катання на ровары. Добрая чытальнасць пры складаным вонкавым асвятленні. Асноўныя магчамасці: кантрастныя дарогі і прыродныя аб\'екты, розныя тыпы маршрутаў, контурныя лініі з пашыранымі наладамі, больш падрабязная інфармацыя на адпаведных узроўнях маштабавання, чым у агаданым стылі. Опцыя цэласнасці паверхні дазваляе адрозніваць дарогі з рознай якасцю паверхні. Без начнога рэжыму.</string>
-    <string name="mapnik_render_descr">Стары агаданы стыль адмалёўкі Mapnik. Асноўныя магчымасці: колеры падобныя на стыль Mapnik.</string>
-    <string name="default_render_descr">Стыль агульнага прызначэння. Спрошчаная чыстая адмалёўка ў шчыльнанаселеных гарадах. Асноўныя магчымасці: контурныя лініі, якаць паверхні, абмежаванні доступу, дарожныя шчыты, адмалёўка шляхоў па шкале SAC, аб\'екты водных сплаваў.</string>
-    <string name="open_wikipedia_link_online">Адкрыць Вікіпедыя-спасылку анлайн</string>
+    <string name="light_rs_render_descr">Просты і кантрастны стыль для аўтамабільнай навігацыі. Пяшчотны для вачэй начны рэжым. Асноўныя магчымасці: контурныя лініі, кантрастныя аранжавыя дарогі, менш другасных аб\'ектаў, што адцягваюць увагу.</string>
+    <string name="topo_render_descr">"Кантрастны стыль, прызначаны ў першую чаргу для шпацыру, паходу і катання на ровары. Добрая чытальнасць пры складаным  асвятленні. Асноўныя магчамасці: кантрастныя дарогі і прыродныя аб\'екты, розныя тыпы маршрутаў, контурныя лініі з пашыранымі наладамі, больш падрабязная інфармацыя на адпаведных узроўнях маштабавання, чым у прадвызначаным стылі. Параметр цэласнасці паверхні дазваляе адрозніваць дарогі з рознай якасцю паверхні. Без начнога рэжыму."</string>
+    <string name="mapnik_render_descr">Стары прадвызначаны стыль адмалёўкі Mapnik. Асноўныя магчымасці: колеры падобныя на стыль Mapnik.</string>
+    <string name="default_render_descr">Стыль агульнага прызначэння. Спрошчаная чыстая адмалёўка ў шчыльнанаселеных гарадах. Асноўныя магчымасці: контурныя лініі, якасць паверхні, абмежаванні доступу, дарожныя шчыты, адмалёўка шляхоў па шкале SAC, аб\'екты водных сплаваў.</string>
+    <string name="open_wikipedia_link_online">Адкрыць спасылку на Вікіпедыю анлайн</string>
     <string name="open_wikipedia_link_online_description">Спасылка адкрыецца ў вэб-браўзеры.</string>
-    <string name="read_wikipedia_offline_description">Атрымайце падпіску на OsmAnd Live, каб чытаць артыкулы Вікіпедыі і Wikivoyage аўтаномна.</string>
+    <string name="read_wikipedia_offline_description">Атрымайце падпіску на OsmAnd Live, каб чытаць артыкулы Вікіпедыі і Wikivoyage па-за сецівам.</string>
     <string name="how_to_open_link">Як адкрыць спасылку?</string>
-    <string name="read_wikipedia_offline">Чытаць Вікіпедыю аўтаномна</string>
+    <string name="read_wikipedia_offline">Чытаць Вікіпедыю па-за сецівам</string>
     <string name="download_all">Спампаваць усё</string>
     <string name="shared_string_bookmark">Закладка</string>
-    <string name="off_road_render_descr">Падыходзіць для выкарыстання падчас кіравання па бездарожжы. Падыходзіць для выкарыстання з зялёнымі спадарожнікавымі здымкамі ў якасць падкладкі. Аснойныя асаблівасці: паменшаная таўшчыня асноўных дарог, павялічаная таўшчыня дарожак, сцяжын, роварных і іншых маршрутаў. Заснаваны на стылі «Topo».</string>
-    <string name="touring_view_render_descr">Высокадэталізаваны стыль для турыстычнах мэт. Уключае ў сябе ўсе параметры канфігурацыі агаданага стылю і, акрамя таго: паказвае, як мага больш дэталяў, наколькі гэта магчыма, у прыватнасці, усе дарогі, шляхі і іншыя спосабы перамяшчэння. Яснае візуальнае адрозненне паміж рознымі тыпамі дарог, якое нагадвае многія турыстычныя атласы. Высокакантрастная каляровая схема для вулічнага выкарыстання з дзённым і начным рэжымам.</string>
+    <string name="off_road_render_descr">Падыходзіць для выкарыстання падчас кіравання па бездарожжы. Падыходзіць для выкарыстання з зялёнымі спадарожнікавымі здымкамі ў якасці падкладкі. Асноўныя асаблівасці: паменшаная таўшчыня асноўных дарог, павялічаная таўшчыня дарожак, сцежак, роварных і іншых маршрутаў. Заснаваны на стылі \"Topo\".</string>
+    <string name="touring_view_render_descr">Высокадэталізаваны стыль для турыстычнах мэтаў. Уключае ў сябе ўсе параметры канфігурацыі прадвызначанага стылю і, акрамя таго: паказвае, як мага больш дэталяў, наколькі гэта магчыма, у прыватнасці, усе дарогі, шляхі і іншыя спосабы перамяшчэння. Зразумелае візуальнае адрозненне паміж рознымі тыпамі дарог, якое нагадвае многія турыстычныя атласы. Высокакантрастная каляровая схема для вулічнага выкарыстання з дзённым і начным рэжымам.</string>
     <string name="access_intermediate_arrival_time">Прамежкавы час прыбыцця</string>
     <string name="map_widget_intermediate_time">Прамежкавы час</string>
-    <string name="unirs_render_descr">Мадыфікацыя агаданага стылю для павялічэння кантрастнасці пешаходных і роварных дарог. Выкарыстоўвае старыя Mapnik-колеры.</string>
-    <string name="get_osmand_live">Атрымайце OsmAnd Live, каб разблакаваць усе функцыі: штодзённыя абнаўленні мап з неабмежаванай спампоўкай, усе платныя і бясплатныя дадаткі, Вікіпедыю, Вікігід і шмат іншага.</string>
+    <string name="unirs_render_descr">Мадыфікацыя прадвызначанага стылю для павялічэння кантрастнасці пешаходных і роварных дарог. Выкарыстоўвае старыя Mapnik-колеры.</string>
+    <string name="get_osmand_live">Атрымайце OsmAnd Live, каб разблакаваць усе функцыі: штодзённыя абнаўленні мап з неабмежаванымі спампоўваннямі, усе платныя і бясплатныя ўбудовы, Вікіпедыю, Вікігід і шмат іншага.</string>
     <string name="shared_string_gpx_files">GPX-файлы</string>
     <string name="quick_action_edit_actions">Рэдагаваць дзеянні</string>
-    <string name="release_3_0">• Новае: падтрымка светавых аўтаномных турыстычных даведнікаў. Спасылачныя мясціны звязаны з мапай. Зыходныя даныя ад Wikivoyage. 
+    <string name="release_3_0">• Новае: падтрымка аўтаномных турыстычных даведнікаў. Мясціны звязаныя з мапай. Зыходныя даныя ад Wikivoyage. 
 \n 
 \n • Вікіпедыя: новы выгляд, актыўныя спасылкі, падтрымка выяў 
 \n 
-\n • Open Track UI: падтрымка груп шляхавых кропак 
+\n • Open Track UI: падтрымка груп пунктаў шляху
 \n 
-\n • Пазнакі мапы: імпарт абраных груп з GPX-файлаў, увод каардынат, новы выгляд 
+\n • Адмеціны мапы: імпарт абраных груп з GPX-файлаў, увод каардынат, новы выгляд 
 \n 
 \n • Падпіска OsmAnd Live цяпер падтрымлівае ўсе функцыі OsmAnd 
 \n 
 \n</string>
     <string name="error_notification_desc">Калі ласка, адпраўце здымак экрана з гэтым апавяшчэннем на support@osmand.net</string>
-    <string name="coord_input_edit_point">Рэдагаваць кропку</string>
-    <string name="coord_input_add_point">Дадаць кропку</string>
+    <string name="coord_input_edit_point">Рэдагаваць пункт</string>
+    <string name="coord_input_add_point">Дадаць пункт</string>
     <string name="coord_input_save_as_track">Захаваць як след</string>
-    <string name="coord_input_save_as_track_descr">Вы дадалі %1$s кропак. Увядзіце назву файла і націсніце «захаваць».</string>
-    <string name="point_deleted">Кропка %1$s выдаленая</string>
+    <string name="coord_input_save_as_track_descr">Вы дадалі %1$s пунктаў. Увядзіце назву файла і націсніце \"захаваць\".</string>
+    <string name="point_deleted">Пункт %1$s выдалены</string>
     <string name="shared_string_world">Свет</string>
-    <string name="send_search_query_description">Вы адправім ваш пашуковы запыт <b>«%1$s»</b>, а таксама ваша месцазнаходжанне. <br/><br/> Мы не збіраем асабістыя звесткі, нам патрэбныя толькі даныя пошуку, каб палепшыць алгарытм.<br/></string>
+    <string name="send_search_query_description">Мы адправім ваш пашуковы запыт <b>«%1$s»</b>, а таксама вашае месцазнаходжанне. <br/><br/> Мы не збіраем асабістыя звесткі, нам патрэбныя толькі даныя пошуку, каб палепшыць алгарытм.<br/></string>
     <string name="search_no_results_description">Няма вынікаў?
 \nРаспавядзіце нам аб гэтым.</string>
     <string name="send_search_query">Адправіць пашуковы запыт?</string>
     <string name="increase_search_radius_to">Павялічыць радыус пошуку да %1$s</string>
-    <string name="thank_you_for_feedback">Дзякуй вам за водгук</string>
-    <string name="poi_cannot_be_found">Вузел ці шлях не знайдзены.</string>
-    <string name="search_no_results_feedback">Няма вынікаў пошуку?
-\nДайце нам водгук</string>
+    <string name="thank_you_for_feedback">Дзякуй за водгук</string>
+    <string name="poi_cannot_be_found">Вузел ці шлях не знойдзены.</string>
+    <string name="search_no_results_feedback">Нічога не знойдзена\? 
+\nПакінце водгук</string>
     <string name="commiting_way">Фіксуецца шлях…</string>
     <string name="test_voice_desrc">Націсніце на кнопку і паслухайце адпаведную галасавую падказку, каб вызначыць адсутныя або пашкоджаныя падказкі.</string>
-<string name="release_3_1">• Навігацыя: выпраўленне індыкатару прагрэсу, хуткая перамена пачатковага і канчатковага пунктаў маршруту 
+<string name="release_3_1">• Навігацыя: выпраўленне індыкатару прагрэсу, хуткая замена пачатковага і канчатковага пунктаў маршруту 
 \n 
-\n • Пазнакі мапы: выпраўленне ўключэння/адключэння груп, магчымасць хаваць пазнакі з мапы 
+\n • Адзнакі мапы: выпраўленне ўключэння/выключэння групаў, магчымасць хаваць адзнакі на мапе 
 \n 
-\n • Рэдагаванне OSM: магчымасць праўкі тэгаў для некропкавых аб\'ектаў і шляхоў, выпраўленне адсутных каментароў на нататках, рэзервовае капіяванне правак 
+\n • Рэдагаванне OSM: магчымасць рэдагавання пазнак для некропкавых аб\'ектаў і шляхоў, выпраўленне адсутных каментароў на нататках, рэзервовае капіяванне правак 
 \n 
 \n • Паляпшэнне разбору Wikipedia і Wikivoyage, абноўленыя файлы ўжо даступныя 
 \n 
@@ -3176,30 +3185,79 @@
 \n • Выпраўленне іншых хібаў 
 \n 
 \n</string>
-    <string name="markers_remove_dialog_msg">Выдаліць пазнаку мапы «%s»\?</string>
-    <string name="edit_map_marker">Рэдагаваць пазнаку мапы</string>
-    <string name="third_party_application">Старонняе прыкладанне</string>
+    <string name="markers_remove_dialog_msg">Выдаліць адзнаку мапы \"%s\"\?</string>
+    <string name="edit_map_marker">Рэдагаваць адзнаку мапы</string>
+    <string name="third_party_application">Асобны дадатак</string>
     <string name="search_street">Пошук вуліцы</string>
-    <string name="start_search_from_city">Пачаць пошук з горада</string>
+    <string name="start_search_from_city">Спачатку абярыце горад</string>
     <string name="shared_string_restore">Аднавіць</string>
-    <string name="keep_passed_markers_descr">Пазнакі, даданыя як група улюблёных ці пройденых маршрутных GPX-кропак, застануцца на мапе. Калі група неактыўная, пазнакі знікнуць з мапы.</string>
-    <string name="keep_passed_markers">Пакінуць пройдзеныя пакнакі на мапе</string>
-    <string name="more_transport_on_stop_hint">На гэтым прыпынку ёсць больш грамадскага транспарту.</string>
-    <string name="ask_for_location_permission">Калі ласка, дайце OsmAnd дазвол на вызначэння месцазнаходжання.</string>
-    <string name="release_3_2_pre">• Выпраўлены вылет пры запуску, што адбываўся на некаторых прыладах
-\n
-\n • Новыя функцыі пазнак: паказваюцца пройдзенныя пазнакі
-\n
-\n • Гісторыя пошуку зараз паказвае катэгорыі, што вы шукалі раней
-\n
-\n • Выпраўлены вылет пры запуску, што адбываўся з нелацінскімі картамі
-\n
-\n • Паляпшэнне хуткасці адмалёўкі на прыладах з Android 8.0
-\n
-\n • Падтрымка рэдагавання палігонных аб\'ектаў (не зручнасцей)
-\n
-\n • Вымярэнне дыстанцый: дададзена кнопка «Вымярэнне» ў «Дзеянні» кантэкстнага меню
-\n
+    <string name="keep_passed_markers_descr">Адзнакі, дададзеныя як група улюблёных ці пройдзеных маршрутных GPX-пунктаў, застануцца на мапе. Калі група неактыўная, адзнакі знікнуць з мапы.</string>
+    <string name="keep_passed_markers">Пакінуць пройдзеныя адзнакі на мапе</string>
+    <string name="more_transport_on_stop_hint">На гэтым прыпынку спыняецца больш грамадскага транспарту.</string>
+    <string name="ask_for_location_permission">Калі ласка, дайце OsmAnd дазвол на вызначэнне месцазнаходжання.</string>
+    <string name="release_3_2_pre">• Выпраўлена хіба пры запуску, што ўзнікала на некаторых прыладах 
+\n 
+\n • Новыя функцыі адзнак: паказваюцца пройдзенныя 
+\n 
+\n • Гісторыя пошуку зараз паказвае катэгорыі, што вы шукалі раней 
+\n 
+\n • Выпраўлена хіба пры запуску, што ўзнікала з нелацінскімі мапамі 
+\n 
+\n • Паляпшэнне хуткасці адмалёўкі на прыладах з Android 8.0 
+\n 
+\n • Падтрымка рэдагавання шматвугольных (нязручных) аб\'ектаў 
+\n 
+\n • Вымярэнне дыстанцый: дададзена кнопка \"Вымярэнне\" ў \"Дзеянні\" кантэкстнага меню 
+\n 
 \n</string>
     <string name="rendering_value_black_name">Чорны</string>
-    </resources>
+    <string name="osm_live_plan_pricing">План і цэны</string>
+    <string name="osm_live_payment_monthly_title">Аплачваць штомесяц</string>
+    <string name="osm_live_payment_3_months_title">Аплачваць раз на 3 месяцы</string>
+    <string name="osm_live_payment_annual_title">Аплачваць штогод</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / месяц</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / месяц</string>
+    <string name="osm_live_payment_discount_descr">Эканомія %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Ваша бягучая падпіска</string>
+    <string name="osm_live_payment_renews_monthly">Абнаўляецца штомесяц</string>
+    <string name="osm_live_payment_renews_quarterly">Абнаўляецца штоквартал</string>
+    <string name="osm_live_payment_renews_annually">Абнаўляецца штогод</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Абярыце зручную для вас перыядычнасць аплаты:</string>
+    <string name="osm_live_payment_contribute_descr">Частка даходу ідзе ўдзельнікам OpenStreetMap.</string>
+    <string name="powered_by_osmand">Працуе на OsmAnd</string>
+    <string name="mapillary_menu_title_pano">Паказаць толькі 360° малюнкі</string>
+    <string name="osm_live_subscriptions">Падпіскі</string>
+    <string name="shared_string_launch">Запуск</string>
+    <string name="lang_gn_py">Гуарані</string>
+    <string name="run_full_osmand_msg">Вы карыстаецеся мапай {0}, якая пастаўляецца OsmAnd. Вы хочаце запусціць поўную версію OsmAnd\?</string>
+    <string name="run_full_osmand_header">Запусціць OsmAnd\?</string>
+    <string name="cubic_m">м³</string>
+    <string name="metric_ton">Т</string>
+    <string name="shared_string_capacity">Аб’ём</string>
+    <string name="shared_string_width">Шырыня</string>
+    <string name="shared_string_height">Вышыня</string>
+    <string name="swap_start_and_destination">Памяняць месцамі пачатковы пункт і пункт прызначэння</string>
+    <string name="add_destination_point">Дадаць пункт прызначэння</string>
+    <string name="add_intermediate_point">Дадаць прамежкавы пункт</string>
+    <string name="add_start_point">Дадаць пачатковы пункт</string>
+    <string name="intermediate_waypoint">Прамежкавы пункт: %1$s</string>
+    <string name="waypoints">Пункты шляху: %1$s</string>
+    <string name="transfers">трансферы: %1$s</string>
+    <string name="on_foot">пешшу: %1$s</string>
+    <string name="route_way">Шлях: %1$s</string>
+    <string name="points_of_interests">Пункты цікавасцяў (POI)</string>
+    <string name="waiting_for_route_calculation">Чаканне падліку маршруту</string>
+    <string name="app_mode_public_transport">Грамадскі транспарт</string>
+    <string name="avoid_roads_descr">Абярыце на мапе альбо са спіса ніжэй дарогу, якой хочаце пазбягаць падчас навігацыі:</string>
+    <string name="show_along_the_route">Паказваць уздоўж маршруту</string>
+    <string name="simulate_navigation">Сімуляваць навігацыю</string>
+    <string name="choose_track_file_to_follow">Абярыце файл следу</string>
+    <string name="voice_announcements">Галасавыя апавяшчэнні</string>
+    <string name="intermediate_destinations">Прамежкавыя пункты: %1$s</string>
+    <string name="arrive_at_time">Прыбыццё а %1$s</string>
+    <string name="quick_action_switch_day_night_descr">Націсканне на кнопку дзеяння пераключае начны і дзённы рэжымы OsmAnd</string>
+    <string name="quick_action_switch_day_mode">Дзённы рэжым</string>
+    <string name="quick_action_switch_night_mode">Начны рэжым</string>
+    <string name="quick_action_day_night_switch_mode">Пераключыць дзённы/начны рэжым</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index bc35f65dd7..ff9099ed9d 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_palaeontological_site">Jaciment paleontològic</string>
 
 	<string name="poi_bakery">Fleca</string>
@@ -27,7 +27,7 @@
 	<string name="poi_deli">Delicadeses</string>
 	<string name="poi_farm">Productes de granja</string>
 	<string name="poi_greengrocer">Verdureria</string>
-	<string name="poi_confectionery">Confiteria</string>
+	<string name="poi_confectionery">Botiga de pastisseria</string>
 	<string name="poi_ice_cream">Gelateria</string>
 	<string name="poi_tea">Botiga de te</string>
 	<string name="poi_dairy">Productes làctics</string>
@@ -90,12 +90,12 @@
 	<string name="poi_ford">Gual</string>
 	<string name="poi_lift_gate">Tanca llevadissa</string>
 	<string name="poi_border_control">Control de fronteres</string>
-	<string name="poi_traffic_calming_bump">Banda reductora</string>
-	<string name="poi_traffic_calming_hump">Ressalt</string>
-	<string name="poi_traffic_calming_cushion">Coixí berlinès</string>
+	<string name="poi_traffic_calming_bump">Ressalt reductor</string>
+	<string name="poi_traffic_calming_hump">Gepa reductora</string>
+	<string name="poi_traffic_calming_cushion">Reducció selectiva</string>
 	<string name="poi_traffic_calming_chicane">Xicana</string>
 	<string name="poi_traffic_calming_rumble_strip">Banda rugosa</string>
-	<string name="poi_traffic_calming_table">Plataforma</string>
+	<string name="poi_traffic_calming_table">Plataforma reductora</string>
 	<string name="poi_traffic_signals">Semàfor</string>
 
 	<string name="poi_service_tyres">Pneumàtics</string>
@@ -124,7 +124,7 @@
 	<string name="poi_railway_platform">Andana de tren</string>
 	<string name="poi_halt">Parada de tren</string>
 	<string name="poi_subway_entrance">Entrada de metro</string>
-	<string name="poi_subway_station">Estació de metro</string>
+	<string name="poi_subway_station">Sí</string>
 	<string name="poi_taxi">Parada de taxis</string>
 
 	<string name="poi_aerodrome">Aeroport</string>
@@ -314,7 +314,7 @@
 	<string name="poi_traffic_calming_choker">Estretament</string>
 	<string name="poi_car_repair">Taller de reparació de cotxes</string>
 	<string name="poi_car_wash">Neteja de cotxes</string>
-	<string name="poi_fuel">Benzinera</string>
+	<string name="poi_fuel">Benzinera;Estació de servei;Estació de recàrrega</string>
 	<string name="poi_electricity_combined_charging">Estació de recàrrega</string>
 	<string name="poi_seamark_wreck">Restes de naufragi, senyal marítim</string>
 
@@ -575,7 +575,7 @@
 	<string name="poi_theatre_genre_circus">Circ</string>
 	<string name="poi_gallery">Galeria d\'art</string>
 	<string name="poi_dance_floor">Sala de ball</string>
-	<string name="poi_nightclub">Club nocturn</string>
+	<string name="poi_nightclub">Club nocturn;Disco;Discoteca</string>
 	<string name="poi_ski_resort">Estació d\'esquí</string>
 	<string name="poi_aerialway_j_bar">Teleesquí individual</string>
 	<string name="poi_aerialway_mixed_lift">Telemix</string>
@@ -949,7 +949,7 @@
 	<string name="poi_access_agricultural">Accés per a activitats agrícoles</string>
 
 	<string name="poi_monitoring_station">Centre de control</string>
-	<string name="poi_capital">Capital</string>
+	<string name="poi_capital">Sí</string>
 	<string name="poi_fee_no">No</string>
 
 	<string name="poi_email">Correu electrònic</string>
@@ -2020,7 +2020,7 @@
 	<string name="poi_material_brick">Material: maons</string>
 	<string name="poi_material_plastic">Material: plàstic</string>
 	<string name="poi_material_granite_stone">Material: pedra de granit</string>
-	<string name="poi_material_metal_wood">Material: metall;fusta</string>
+	<string name="poi_material_metal_wood">Material: metall, fusta</string>
 	<string name="poi_material_glass">Material: vidre</string>
 	<string name="poi_material_bronze">Material: bronze</string>
 	<string name="poi_material_earth">Material: terra</string>
@@ -2780,7 +2780,7 @@
 	<string name="poi_diet_halal_filter_yes">Halal</string>
 	<string name="poi_diet_lactose_free_filter_yes">Sense lactosa</string>
 	<string name="poi_brewery_additional">Nom de la cerveseria</string>
-	<string name="poi_microbrewery_yes">Microcerveseria</string>
+	<string name="poi_microbrewery_yes">Sí</string>
 	<string name="poi_takeaway_filter_yes">Sí</string>
 	<string name="poi_delivery_filter_yes">Sí</string>
 	<string name="poi_outdoor_seating_filter_yes">Sí</string>
@@ -2996,7 +2996,7 @@
 	<string name="poi_social_facility_for_drug_addicted">Addictes a les drogues</string>
 	<string name="poi_social_facility_for_unemployed">Aturats</string>
 	<string name="poi_social_facility_for_diseased">Malalts</string>
-	<string name="poi_social_facility_for_child_juvenile">Infants; joves</string>
+	<string name="poi_social_facility_for_child_juvenile">Infants joves</string>
 
 	<string name="poi_theatre_genre_philharmonic">Filharmònica</string>
 	<string name="poi_theatre_genre_musical">Musical</string>
@@ -3146,4 +3146,9 @@
 	<string name="poi_socket">Endoll</string>
 	<string name="poi_bicycle_parking_stands">Anclatje</string>
 	<string name="poi_bicycle_parking_wall_loops">Anclatje de Pared</string>
-	</resources>
+    <string name="poi_service_car">Servei automobilístic</string>
+    <string name="poi_checkpoint_type">Tipus de punt de control</string>
+    <string name="poi_substation_type">Tipus</string>
+    <string name="poi_books_type">Llibres</string>
+    <string name="poi_atm">Caixer automàtic</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index f32609dcbb..58ea5a6a1f 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="show_warnings_title">Mostra alertes…</string>
@@ -157,7 +157,7 @@
     <string name="local_openstreetmap_delete">Esborra els canvis</string>
     <string name="local_openstreetmap_uploadall">Penja-ho tot</string>
     <string name="show_current_gpx_title">Mostra la traça actual</string>
-    <string name="free_version_message">Podeu baixar de nou o actualitzar %1$s mapes.</string>
+    <string name="free_version_message">Podeu baixar o actualitzar %1$s mapes.</string>
     <string name="free_version_title">Versió gratuïta</string>
     <string name="poi_context_menu_showdescription">Mostra la descripció del PDI.</string>
     <string name="index_name_france">Europa - França</string>
@@ -1224,7 +1224,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
     <string name="index_name_canada">Amèrica del Nord - Canadà</string>
     <string name="index_name_italy">Europa - Itàlia</string>
     <string name="index_name_gb">Europa - Gran Bretanya</string>
-    <string name="index_item_world_seamarks">Balises marítimes al món</string>
+    <string name="index_item_world_seamarks">Fondàries nàutiques puntuals a tot el món</string>
     <string name="lang_mr">Marathi</string>
     <string name="lang_no">Noruec bokmål</string>
     <string name="lang_pl">Polonès</string>
@@ -2057,7 +2057,7 @@ L\'espai disponible és només de {2} MB.</string>
     <string name="finish_navigation">Atura la navegació</string>
     <string name="full_report">Informe complert</string>
     <string name="open_street_map_login_and_pass">Nom d\'usuari i contrasenya d\'OpenStreetMap</string>
-    <string name="osm_live_subscribe_btn">Subscriu</string>
+    <string name="osm_live_subscribe_btn">Subscriviu</string>
     
     <string name="osm_live_subscription">Subscripció a OsmAnd Live</string>
     <string name="osm_live_email_desc">Cal proporcionar-vos informació respecte les aportacions.</string>
@@ -2065,7 +2065,7 @@ L\'espai disponible és només de {2} MB.</string>
     <string name="osm_live_thanks">Us agraïm el vostre recolçament a OsmAnd
 \nPer activar totes les noves funcionalitats us caldrà reiniciar OsmAnd.</string>
     <string name="osm_live_region_desc">Una part del vostre donatiu s\'enviarà als usuaris d\'OSM que enviïn modificacions del mapa a aquesta regió.</string>
-    <string name="osm_live_ask_for_purchase">Primer heu de comprar una subscripció a OsmAnd Live</string>
+    <string name="osm_live_ask_for_purchase">Primer heu d\'adquirir la subscripció d\'OsmAnd Live</string>
 
     <string name="select_map_marker">Seleccioneu un marcador de mapa</string>
     <string name="map_markers_other">Altres marcadors</string>
@@ -2191,7 +2191,7 @@ L\'espai disponible és només de {2} MB.</string>
     <string name="osm_live_banner_desc">Obteniu nous mapes i actualitzacions sense límit més d\'un cop al mes: cada hora, dia o setmana.</string>
     <string name="osmand_plus_banner_desc">Baixada il·limitada de mapes, actualitzacions i el connector Viquipèdia.</string>
     <string name="get_it">Obteniu-lo</string>
-    <string name="osm_live_payment_desc">La subscripció es carregar mensualment. Cancel·leu-la amb Google Play quan ho desitgeu.</string>
+    <string name="osm_live_payment_desc">Subscripció mensual. Quan vulgueu cancel·lar-la feu-ho des de Google Play.</string>
     <string name="donation_to_osm">Donació a la comunitat OpenStreetMap</string>
     <string name="donation_to_osm_desc">"Part de la vostra donació s\'envia als usuaris d\'OSM que facin edicions a OpenStreetMaps.  El cost de la subscripció és el mateix."</string>
     <string name="osm_live_subscription_desc">La subscripció permet actualitzacions setmanals, diàries i horàries i baixades sense limitació de qualsevol mapa del món.</string>
@@ -2613,7 +2613,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="mapillary_menu_edit_text_hint">Indiqueu el nom d\'usuari</string>
     <string name="mapillary_menu_descr_username">Mostra només les imatges afegides per</string>
     <string name="mapillary_menu_title_username">Nom d\'usuari</string>
-    <string name="mapillary_menu_filter_description">Filtreu les imatges per remitent o per data. Només s\'aplicarà en apropar-se.</string>
+    <string name="mapillary_menu_filter_description">Filtreu les imatges per remitent, data o tipus. Només s\'aplica per escales baixes.</string>
     <string name="shared_string_reset">Restableix</string>
     <string name="store_tracks_in_monthly_directories">Emmagatzema les traces enregistrades en carpetes mensuals</string>
     <string name="store_tracks_in_monthly_directories_descrp">Emmagatzema les traces enregistrades en sub-carpetes segons el mes d\'enregistrament (tipus 2018-01).</string>
@@ -2905,7 +2905,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="download_maps_travel">Guies de viatge</string>
     <string name="article_removed">Article esborrat</string>
     <string name="purchase_dialog_title">Seleccioneu un pla</string>
-    <string name="purchase_dialog_travel_description">Compreu un dels elements següents per disposar la funcionalitat dels articles de viatge sense connexió:</string>
+    <string name="purchase_dialog_travel_description">Compreu un dels elements següents per disposar la funcionalitat de guies de viatge sense connexió:</string>
     <string name="purchase_dialog_subtitle">Seleccioneu l\'element adient:</string>
     <string name="wikivoyage_travel_guide">Guies de viatge</string>
     <string name="popular_destinations">Destinacions populars</string>
@@ -2976,7 +2976,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="read_wikipedia_offline_description">Aconseguiu una subscripció OsmAnd Live per llegir articles de Viquipèdia i ViquiViatges sense connexió.</string>
     <string name="unirs_render_descr">Modificació de l\'estil predefinit per incrementar el contrast a les vies per vianants i bicicletes. Utilitza els colors del llegat Mapnik.</string>
     <string name="shared_string_gpx_files">Fitxers GPX</string>
-    <string name="get_osmand_live">Obteniu OsmAnd Live per disposar de totes les funcionalitats:Actualitzacions diàries de mapes sense límit de baixades, tots els connectors tant els de pagament com els de frac, Viquipèdia, ViquiViatges i molt més.</string>
+    <string name="get_osmand_live">Obteniu OsmAnd Live per disposar de totes les funcionalitats:Actualitzacions diàries de mapes sense límit de baixades, tots els connectors tant els de pagament, Viquipèdia, ViquiViatges i molt més.</string>
     <string name="quick_action_edit_actions">Edita les accions</string>
     <string name="error_notification_desc">Us agrairem que envieu una captura de pantalla d\'aquesta notificació a support@osmand.net</string>
     <string name="coord_input_edit_point">Edita punt</string>
@@ -3028,7 +3028,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="ask_for_location_permission">Per continuar cal que doneu a OsmAnd accés a la ubicació.</string>
     <string name="rendering_value_black_name">Negre</string>
     <string name="search_street">Cerca un carrer</string>
-    <string name="start_search_from_city">Comença la cerca des de la ciutat</string>
+    <string name="start_search_from_city">Seleccioneu primer la ciutat</string>
     <string name="shared_string_restore">Restaura</string>
     <string name="keep_passed_markers_descr">Els marcadors afegits a un grup de Preferits i les fites GPX ja assolides romandran al mapa. Si el grup no estigués activat, els marcadors no apareixerien al mapa.</string>
     <string name="keep_passed_markers">Manté al mapa les fites assolides</string>
@@ -3036,4 +3036,53 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="markers_remove_dialog_msg">Voleu esborrar el marcador de mapa \'%s\'\?</string>
     <string name="edit_map_marker">Edita el marcador de mapa</string>
     <string name="third_party_application">Aplicació de tercers</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Opcions i preus</string>
+    <string name="osm_live_payment_monthly_title">Pagament mensual</string>
+    <string name="osm_live_payment_3_months_title">Pagament trimestral</string>
+    <string name="osm_live_payment_annual_title">Pagament anual</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
+    <string name="osm_live_payment_discount_descr">Desa %1$s!</string>
+	<string name="osm_live_payment_current_subscription">La vostra subscripció actual</string>
+    <string name="osm_live_payment_renews_monthly">Renovació mensual</string>
+    <string name="osm_live_payment_renews_quarterly">Renovació trimestral</string>
+    <string name="osm_live_payment_renews_annually">Renovació anual</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Seleccioneu el període de pagament que us convingui:</string>
+    <string name="osm_live_payment_contribute_descr">Una part dels ingressos és pels col·laboradors d\'OpenStreetMap.</string>
+    <string name="powered_by_osmand">Recolzat en OsmAnd</string>
+    <string name="osm_live_subscriptions">Subscripcions</string>
+    <string name="mapillary_menu_title_pano">Només mostra imatges de 360º</string>
+    <string name="shared_string_launch">Arrenca</string>
+    <string name="run_full_osmand_msg">"Esteu utilitzant el mapa {0} mitjançant OsmAnd.  Voleu iniciar la versió sencera d\'OsmAnd \?"</string>
+    <string name="run_full_osmand_header">Voleu iniciar OsmAnd\?</string>
+    <string name="lang_gn_py">Guaraní</string>
+    <string name="quick_action_switch_day_night_descr">Prement aquest botó d\'acció es canvia entre el modes Diürn i Nocturn d\'OsmAnd</string>
+    <string name="quick_action_switch_day_mode">Mode Diürn</string>
+    <string name="quick_action_switch_night_mode">Mode Nocturn</string>
+    <string name="quick_action_day_night_switch_mode">Canvia mode Diürn/Nocturn</string>
+    <string name="swap_start_and_destination">Bescanvia sortida i arribada</string>
+    <string name="add_destination_point">Afegeix destinació</string>
+    <string name="add_intermediate_point">Afegeix punt intermedi</string>
+    <string name="add_start_point">Afegeix punt d\'Inici</string>
+    <string name="intermediate_waypoint">Punt intermedi: %1$s</string>
+    <string name="waypoints">Fites: %1$s</string>
+    <string name="transfers">transferències: %1$s</string>
+    <string name="on_foot">a peu: %1$s</string>
+    <string name="route_way">Via: %1$s</string>
+    <string name="points_of_interests">Punts d\'interès(PDI)</string>
+    <string name="waiting_for_route_calculation">Esperant el càlcul de la ruta</string>
+    <string name="app_mode_public_transport">Transport públic</string>
+    <string name="avoid_roads_descr">Seleccioneu la carretera del mapa o de la llista de sota que volgueu evitar en la navegació:</string>
+    <string name="show_along_the_route">Mostra al llarg de la ruta</string>
+    <string name="simulate_navigation">Simula la navegació</string>
+    <string name="choose_track_file_to_follow">Seleccioneu l\'arxiu de la traça a seguir</string>
+    <string name="voice_announcements">Anuncis de veu</string>
+    <string name="intermediate_destinations">Destinacions intermèdies: %1$s</string>
+    <string name="arrive_at_time">Arribada a %1$s</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Capacitat</string>
+    <string name="shared_string_width">Amplada</string>
+    <string name="shared_string_height">Alçada</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-cs/phrases.xml b/OsmAnd/res/values-cs/phrases.xml
index 50d9b5f39b..bfc8106fb5 100644
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_bakery">Pekařství</string>
 	<string name="poi_alcohol">Obchod s alkoholem</string>
 	<string name="poi_convenience">Smíšené zboží</string>
@@ -3840,4 +3840,22 @@
 <string name="poi_atm">Bankomat</string>
 	<string name="poi_shoe_repair">Oprava obuvi</string>
 
-</resources>
+<string name="poi_substation_type">Typ</string>
+    <string name="poi_books_type">Knihy</string>
+    <string name="poi_books_comic">Komiksy</string>
+    <string name="poi_books_antiquarian">Starožitné</string>
+    <string name="poi_books_religion">Náboženské</string>
+    <string name="poi_books_academic">Odborné</string>
+    <string name="poi_books_children">Dětské</string>
+    <string name="poi_atoll">Atol</string>
+    <string name="poi_bulk_purchase_yes">Yes</string>
+    <string name="poi_bulk_purchase_only">Výhradně</string>
+    <string name="poi_craft_confectionery">Výroba cukrovinek</string>
+    <string name="poi_shop_wholesale">Velkoobchod</string>
+    <string name="poi_laboratory">Zdravotnická laboratoř</string>
+    <string name="poi_blood_donation">Dárcovství krve</string>
+    <string name="poi_toll_gantry">Mýtná brána</string>
+    <string name="poi_childcare">Péče o děti</string>
+    <string name="poi_denotation_natural_monument">Přírodní památka</string>
+    <string name="poi_denotation_landmark">Orientační bod</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index d67faf08ef..2f6c0656f2 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="switch_to_raster_map_to_see">Off-line vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v \'Nastavení\' (\'Stáhnout mapy\'), nebo se přepněte na modul \'Online mapy\'.</string>
@@ -2026,7 +2026,7 @@ Délka %2$s</string>
 \nPro aktivování všech nových funkcí je třeba restartovat aplikaci OsmAnd.</string>
     <string name="osm_live_region_desc">Část vašeho příspěvku bude zaslána uživatelům OSM, kteří upravují mapu ve zvolené oblasti.</string>
     <string name="osm_live_subscription_settings">Nastavení předplatného</string>
-    <string name="osm_live_ask_for_purchase">Prosím nejprve zakupte předplatné pro OsmAnd Live</string>
+    <string name="osm_live_ask_for_purchase">Nejprve prosím zakupte předplatné OsmAnd Live</string>
 
     <string name="osm_live_header">Předplatné umožní hodinové aktualizace pro všechny mapy světa. Část příjmu jde zpět do OSM komunity a za každý příspěvek do OSM je vyplacena odměna. Pokud máte rádi OsmAnd a OSM, chcete je podpořit a být podporováni, toto je výborný způsob, jak to udělat.</string>
     
@@ -2148,7 +2148,7 @@ Délka %2$s</string>
     <string name="shared_string_change">Změnit</string>
     <string name="get_started">Začít</string>
     
-    <string name="osm_live_payment_desc">Uvedená cena je poplatek za jeden měsíc. Předplatné můžete zrušit kdykoliv přes Google Play.</string>
+    <string name="osm_live_payment_desc">Předplatné je strháváno měsíčně. Můžete jej kdykoliv zrušit přes Google Play.</string>
     <string name="donation_to_osm">Příspěvek komunitě OpenStreetMap</string>
     <string name="donation_to_osm_desc">Část peněz z Vašeho příspěvku je zaslána přímo uživatelům, kteří provádějí změny v databázi OpenStreetMap. Cena předplatného pro Vás však zůstává stejná.</string>
     <string name="osm_live_subscription_desc">Předplatné umožňuje hodinové, denní, týdenní aktualizace a neomezené stahování map celého světa.</string>
@@ -2464,7 +2464,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="mapillary_menu_edit_text_hint">Zadejte uživatelské jméno</string>
     <string name="mapillary_menu_descr_username">Zobrazit pouze obrázky přidané uživatelem</string>
     <string name="mapillary_menu_title_username">Uživatelské jméno</string>
-    <string name="mapillary_menu_filter_description">Můžete filtrovat snímky podle odesílatele nebo podle datumu. Filtry se použijí pouze pro detailní přiblížení.</string>
+    <string name="mapillary_menu_filter_description">Filtrovat snímky podle odesílatele, data nebo typu. Aktivní pouze při vysokém přiblížení.</string>
     <string name="store_tracks_in_monthly_directories">Ukládat zaznamenané trasy v adresářích po měsících</string>
     <string name="store_tracks_in_monthly_directories_descrp">Ukládat zaznamenané trasy v podadresářích podle měsíce záznamu (např. 2018-01).</string>
     <string name="average">Průměr</string>
@@ -2975,4 +2975,53 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="markers_remove_dialog_msg">Odstranit mapovou značku \'%s\'\?</string>
     <string name="edit_map_marker">Upravit mapovou značku</string>
     <string name="third_party_application">Aplikace třetí strany</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Předplatné &amp; ceník</string>
+    <string name="osm_live_payment_monthly_title">Platit měsíčně</string>
+    <string name="osm_live_payment_3_months_title">Platit čtvrtletně</string>
+    <string name="osm_live_payment_annual_title">Platit ročně</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / měsíc</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / měsíc</string>
+    <string name="osm_live_payment_discount_descr">Ušetříte %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Vaše aktuální předplatné</string>
+    <string name="osm_live_payment_renews_monthly">Obnovuje se měsíčně</string>
+    <string name="osm_live_payment_renews_quarterly">Obnovuje se čtvrtletně</string>
+    <string name="osm_live_payment_renews_annually">Obnovuje se ročně</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Vyberte si frekvenci plateb, která vám vyhovuje:</string>
+    <string name="osm_live_payment_contribute_descr">Část příjmů je posílána přispěvatelům OpenStreetMap.</string>
+    <string name="powered_by_osmand">Běží na OsmAnd</string>
+    <string name="osm_live_subscriptions">Předplatné</string>
+    <string name="mapillary_menu_title_pano">Zobrazit pouze 360° obrázky</string>
+    <string name="shared_string_launch">Spustit</string>
+    <string name="run_full_osmand_msg">Používáte mapu {0}, která běží na aplikaci OsmAnd. Chcete spustit plnou verzi OsmAnd\?</string>
+    <string name="run_full_osmand_header">Spustit OsmAnd\?</string>
+    <string name="lang_gn_py">Guaranština</string>
+    <string name="quick_action_switch_day_night_descr">Klepnutím na tlačítko akce se přepíná mezi denním a nočním režimem OsmAnd</string>
+    <string name="quick_action_switch_day_mode">Denní režim</string>
+    <string name="quick_action_switch_night_mode">Noční režim</string>
+    <string name="quick_action_day_night_switch_mode">Přepnout denní/noční režim</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Kapacita</string>
+    <string name="shared_string_width">Šířka</string>
+    <string name="shared_string_height">Výška</string>
+    <string name="swap_start_and_destination">Prohodit start a cíl</string>
+    <string name="add_destination_point">Přidat cíl</string>
+    <string name="add_intermediate_point">Přidat mezicíl</string>
+    <string name="add_start_point">Přidat startovní bod</string>
+    <string name="intermediate_waypoint">Mezicíl: %1$s</string>
+    <string name="waypoints">Body na cestě: %1$s</string>
+    <string name="transfers">přestupy: %1$s</string>
+    <string name="on_foot">pěšky: %1$s</string>
+    <string name="route_way">Cesta: %1$s</string>
+    <string name="points_of_interests">Body zájmu (POI)</string>
+    <string name="waiting_for_route_calculation">Čekám na výpočet trasy</string>
+    <string name="app_mode_public_transport">Veřejná doprava</string>
+    <string name="avoid_roads_descr">Vyberte cestu na mapě nebo ze seznamu níže, které se chcete během navigace vyhnout:</string>
+    <string name="show_along_the_route">Ukázat podél trasy</string>
+    <string name="simulate_navigation">Simulovat navigaci</string>
+    <string name="choose_track_file_to_follow">Vyberte soubor s trasou, kterou chcete následovat</string>
+    <string name="voice_announcements">Hlasová oznámení</string>
+    <string name="intermediate_destinations">Mezicíle: %1$s</string>
+    <string name="arrive_at_time">Příjezd v %1$s</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 31a5b318e2..437bf6cb7c 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
         <string name="poi_bakery">Bager</string>
         <string name="poi_alcohol">Spiritus</string>
@@ -143,7 +143,7 @@
         <string name="poi_railway_station">Banegård</string>
         <string name="poi_railway_platform">Perron</string>
         <string name="poi_subway_entrance">Metroindgang</string>
-        <string name="poi_subway_station">Metrostation</string>
+        <string name="poi_subway_station">Ja</string>
         <string name="poi_taxi">Taxaholdeplads</string>
 
         <string name="poi_aerodrome">Lufthavn</string>
@@ -961,7 +961,7 @@
 	<string name="poi_access_agricultural">Adgang for landbrug</string>
 
 	<string name="poi_monitoring_station">Målestation</string>
-	<string name="poi_capital">Hovedstad</string>
+	<string name="poi_capital">Ja</string>
 	<string name="poi_fee_no">Nej</string>
 
 	<string name="poi_email">E-mail</string>
@@ -1153,7 +1153,7 @@
 	<string name="poi_denomination_scientist">Kristen Videnskab</string>
 	<string name="poi_landfill_waste_nuclear">Atomaffald</string>
 	<string name="poi_start_date">Startdato</string>
-	<string name="poi_wheelchair_yes">Kørestol</string>
+	<string name="poi_wheelchair_yes">Ja</string>
 
 	<string name="poi_content_silage">Indhold: ensilage</string>
 	<string name="poi_content_water">Indhold: vand</string>
@@ -1620,7 +1620,7 @@
 	<string name="poi_drive_through_no">Drive-through: nej</string>
 
 	<string name="poi_brewery_additional">Bryggerinavn</string>
-	<string name="poi_microbrewery_yes">Mikrobryggeri</string>
+	<string name="poi_microbrewery_yes">Ja</string>
 	<string name="poi_microbrewery_no">Ingen mikrobryggeri</string>
 
 	<string name="poi_takeaway_yes">Take Away</string>
@@ -3967,4 +3967,40 @@
 <string name="poi_atm">Pengeautomat</string>
 	<string name="poi_shoe_repair">Skoreparation</string>
 
-</resources>
+<string name="poi_bulk_purchase">Storkøb</string>
+	<string name="poi_substation_type">Type</string>
+
+<string name="poi_bulk_purchase_yes">Ja</string>
+	<string name="poi_bulk_purchase_only">Kun</string>
+
+	<string name="poi_pipeline_substation">Rørledningsstation</string>
+	<string name="poi_substation_transmission">Transmission</string>
+	<string name="poi_substation_distribution">Distribution</string>
+	<string name="poi_substation_minor_distribution">Mindre distribution</string>
+	<string name="poi_substation_industrial">Industriel</string>
+	<string name="poi_substation_transition">Overgang</string>
+	<string name="poi_substation_traction">Trækkraft</string>
+	<string name="poi_substation_converter">Converter</string>
+	<string name="poi_substation_compensation">Kompensation</string>
+
+	<string name="poi_substation_compression">Komprimering</string>
+	<string name="poi_substation_measurement">Måling</string>
+	<string name="poi_substation_valve">Ventil</string>
+	<string name="poi_substation_valve_group">Ventilgruppe</string>
+	<string name="poi_substation_inspection_gauge">Inspektionsmåler</string>
+	<string name="poi_substation_field_gathering">Feltsamling</string>
+    <string name="poi_craft_confectionery">Konfektureproduktion</string>
+    <string name="poi_shop_wholesale">Engros-butik</string>
+    <string name="poi_books_type">Bøger</string>
+    <string name="poi_laboratory">Medicinsk laboratorium</string>
+    <string name="poi_blood_donation">Bloddonor</string>
+    <string name="poi_books_comic">Tegneserier</string>
+    <string name="poi_books_antiquarian">Antikvarisk</string>
+    <string name="poi_books_religion">Religion</string>
+    <string name="poi_books_academic">Akademisk</string>
+    <string name="poi_books_children">Børn</string>
+    <string name="poi_atoll">Atoll</string>
+    <string name="poi_childcare">Børnepasning</string>
+    <string name="poi_denotation_natural_monument">Naturlig monument</string>
+    <string name="poi_denotation_landmark">Vartegn</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 64dcf46d14..2196916f7e 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="srtm_paid_version_msg">Overvej at betale for \'Højdekurve\' udvidelsen for at støtte videre udvikling.</string>
     <string name="av_def_action_video">Optag video</string>
@@ -2251,7 +2251,7 @@ Proportional hukommelse %4$s MB (Android grænse %5$s MB, Dalvik %6$s MB).</stri
 \nFor at aktivere alle nye funktioner, er det nødvendigt at genstarte OsmAnd.</string>
     <string name="osm_live_region_desc">En del af donationen vil blive sendt til OSM-brugere, som indsender ændringer til kortet i det pågældende område.</string>
     <string name="osm_live_subscription_settings">Indstillinger for abonnement</string>
-    <string name="osm_live_ask_for_purchase">Køb først OsnAnd Live-abonnement</string>
+    <string name="osm_live_ask_for_purchase">Køb først OsmAnd Live-abonnement</string>
 
     <string name="osm_live_header">"Abonnementet giver timebaserede opdateringer til alle kort i hele verden. 
 \nEn del af indtægten går tilbage til OSM-fællesskabet og udbetales for hvert OSM-bidrag. 
@@ -2795,7 +2795,7 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="mapillary_menu_edit_text_hint">Indtast brugernavn</string>
     <string name="mapillary_menu_descr_username">Se kun billeder tilføjet af</string>
     <string name="mapillary_menu_title_username">Brugernavn</string>
-    <string name="mapillary_menu_filter_description">Filtrer billeder efter indsender eller dato. Kun aktiv for højere zoomniveauer.</string>
+    <string name="mapillary_menu_filter_description">Filtrer billeder efter indsender, dato eller type. Kun aktiv for højere zoomniveauer.</string>
     <string name="mapillary_menu_descr_dates">Se kun de billeder, der er tilføjet</string>
     <string name="shared_string_reload">Genindlæs</string>
     <string name="mapillary_menu_descr_tile_cache">Genindlæs kortbrikker for at se opdaterede data.</string>
@@ -3195,23 +3195,73 @@ Repræsenterer område: %1$s x %2$s</string>
 \nGiv tilbagemelding</string>
     <string name="test_voice_desrc">Tryk på en knap og lyt til den tilsvarende talemeddelelse for at identificere manglende eller fejlagtige meddelelser.</string>
 <string name="commiting_way">Indsendelsesmåde…</string>
-    <string name="release_3_2_pre">• Løst nedbrud ved opstart, som fandt sted med ikke-latinske kort 
+    <string name="release_3_2_pre">• Løst nedbrud ved start, der opstod på nogle enheder
+\n
+\n • Ny Markør funktion: visning af de mærker, der allerede er nået
+\n
+\n • Søgehistorikken viser nu de kategorier, der er søgt efter tidligere
+\n
+\n • Løst nedbrud ved opstart, der opstod med ikke-latinske kort 
 \n 
 \n  • Forbedret renderingshastighed på Android 8.0 enheder 
 \n 
-\n  • Understøtter redigering af polygonobjekter (ikke-facilitet)
-\n
-\n  • Afstandsmåling: tilføjet knap til afstandsmåling i handlinger i kontekstmenuen
+\n  • Understøtter redigering af polygonobjekter (ikke-facilitet) 
+\n 
+\n  • Afstandsmåling: tilføjet knap til afstandsmåling i handlinger i kontekstmenuen 
 \n</string>
     <string name="ask_for_location_permission">Giv OsmAnd tilladelse til placering for at fortsætte.</string>
     <string name="rendering_value_black_name">Sort</string>
-    <string name="more_transport_on_stop_hint">Der er andre transportmidler ved dette stop.</string>
+    <string name="more_transport_on_stop_hint">Der er flere transportmidler ved dette stop.</string>
     <string name="markers_remove_dialog_msg">Slet kortmarkør \'%s\'\?</string>
     <string name="edit_map_marker">Rediger kortmarkør</string>
     <string name="third_party_application">Tredjepartsprogram</string>
     <string name="search_street">Søg efter gade</string>
-    <string name="start_search_from_city">Start søgning fra byen</string>
+    <string name="start_search_from_city">Vælg en by først</string>
     <string name="shared_string_restore">Gendan</string>
     <string name="keep_passed_markers_descr">Markører tilføjet som en gruppe af favoritter eller GPX rutepunkter markeret passeret vil forblive på kortet. Hvis gruppen ikke er aktiv, vil mærkerne forsvinde fra kortet.</string>
     <string name="keep_passed_markers">Behold passerede markører på kortet</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Plan &amp; Priser</string>
+    <string name="osm_live_payment_monthly_title">Betal månedligt</string>
+    <string name="osm_live_payment_3_months_title">Betal én gang hver 3. måned</string>
+    <string name="osm_live_payment_annual_title">Betal en gang om året</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / måned</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / måned</string>
+    <string name="osm_live_payment_discount_descr">Spar %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Nuværende abonnement</string>
+    <string name="osm_live_payment_renews_monthly">Fornyes månedligt</string>
+    <string name="osm_live_payment_renews_quarterly">Fornyes kvartalsvis</string>
+    <string name="osm_live_payment_renews_annually">Fornyes hvert år</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Vælg en passende betalingsperiode:</string>
+    <string name="osm_live_payment_contribute_descr">En del af indtægterne går til OpenStreetMap bidragsydere.</string>
+    <string name="powered_by_osmand">Drevet af OsmAnd</string>
+    <string name="osm_live_subscriptions">Abonnementer</string>
+    <string name="mapillary_menu_title_pano">Vis kun 360° billeder</string>
+    <string name="shared_string_launch">Start</string>
+    <string name="run_full_osmand_header">Start OsmAnd\?</string>
+    <string name="lang_gn_py">Guaraní</string>
+    <string name="add_destination_point">Tilføj destination</string>
+    <string name="add_intermediate_point">Tilføj mellemliggende</string>
+    <string name="add_start_point">Tilføj startpunkt</string>
+    <string name="intermediate_waypoint">Mellemliggende punkt: %1$s</string>
+    <string name="waypoints">Rutepunkter: %1$s</string>
+    <string name="transfers">overførsler: %1$s</string>
+    <string name="on_foot">til fods: %1$s</string>
+    <string name="points_of_interests">Interessepunkter (IP)</string>
+    <string name="waiting_for_route_calculation">Venter på ruteberegningen</string>
+    <string name="app_mode_public_transport">Offentlig transport</string>
+    <string name="avoid_roads_descr">Vælg vejen på kortet eller fra nedenstående liste, der skal undgås under navigation:</string>
+    <string name="show_along_the_route">Vis langs ruten</string>
+    <string name="simulate_navigation">Simulere navigation</string>
+    <string name="intermediate_destinations">Mellemliggende destinationer: %1$s</string>
+    <string name="quick_action_switch_day_mode">Dag tilstand</string>
+    <string name="quick_action_switch_night_mode">Nat tilstand</string>
+    <string name="quick_action_day_night_switch_mode">Skift dag/nat tilstand</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Kapacitet</string>
+    <string name="shared_string_width">Bredde</string>
+    <string name="shared_string_height">Højde</string>
+    <string name="route_way">Vej: %1$s</string>
+    <string name="choose_track_file_to_follow">Vælg sporfil til at følge</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 8b8bdeba49..0e07f32613 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="poi_10pin">Bowling</string>
 	<string name="poi_9pin">Kegeln</string>
@@ -153,7 +153,7 @@
 	<string name="poi_compressed_air">Druckluft</string>
 	<string name="poi_craft_computer">Computer</string>
 	<string name="poi_computer">Computergeschäft</string>
-	<string name="poi_confectionery">Süßwaren</string>
+	<string name="poi_confectionery">Süßwarenladen</string>
 	<string name="poi_construction">Anlage</string>
 	<string name="poi_convenience">Lebensmittelgeschäft</string>
 	<string name="poi_copyshop">Copy-Shop</string>
@@ -509,7 +509,7 @@
 	<string name="poi_studio">Studio</string>
 	<string name="poi_suburb">Stadtteil</string>
 	<string name="poi_subway_entrance">U-Bahnhofeingang</string>
-	<string name="poi_subway_station">U-Bahnhof</string>
+	<string name="poi_subway_station">Ja</string>
 	<string name="poi_craft_sun_protection">Sonnenschutz</string>
 	<string name="poi_supermarket">Supermarkt</string>
 	<string name="poi_surveillance">Überwachung</string>
@@ -607,7 +607,7 @@
 	<string name="poi_attraction_swing_carousel">Schaukel-Karussell</string>
 	<string name="poi_attraction_train">Eisenbahn (Attraktion)</string>
 	<string name="poi_attraction_water_slide">Wasserrutsche</string>
-	<string name="poi_tower">Sendeturm</string>
+	<string name="poi_tower">Turm</string>
 	<string name="poi_mast">Mast</string>
 	<string name="poi_radar">Radar</string>
 	<string name="poi_aquarium">Aquarium</string>
@@ -746,7 +746,7 @@
 	<string name="poi_internet_access_terminal">Internetzugang: Terminal</string>
 	<string name="poi_internet_access_service">Internetzugang: Dienst</string>
 
-	<string name="poi_fee_yes">ja</string>
+	<string name="poi_fee_yes">Ja</string>
 
 	<string name="poi_brand">Marke</string>
 	<string name="poi_maxweight">Höchstgewicht</string>
@@ -952,15 +952,15 @@
 	<string name="poi_recycling_cars">Autos</string>
 	<string name="poi_recycling_bicycles">Fahrräder</string>
 
-	<string name="poi_capital">Hauptstadt</string>
+	<string name="poi_capital">Ja</string>
 	<string name="poi_shower">Dusche</string>
 	<string name="poi_email">E-Mail</string>
 	<string name="poi_fax">Fax</string>
 	<string name="facebook">"Facebook "</string>
 	<string name="poi_mobile">Handy</string>
-	<string name="poi_fee_no">nein</string>
-	<string name="poi_drinking_water_yes">ja</string>
-	<string name="poi_drinking_water_no">nein</string>
+	<string name="poi_fee_no">Nein</string>
+	<string name="poi_drinking_water_yes">Ja</string>
+	<string name="poi_drinking_water_no">Nein</string>
 	<string name="poi_supervised_yes">Beaufsichtigt</string>
 	<string name="poi_supervised_no">Ohne Aufsicht</string>
 	<string name="poi_crossing_traffic_signals">Mit Ampeln</string>
@@ -987,8 +987,8 @@
 	<string name="poi_recycling_plasterboard">Gipskartonplatte</string>
 	<string name="poi_recycling_animal_waste">Tierischer Abfall</string>
 	<string name="poi_monitoring_station">Überwachungsstation</string>
-	<string name="poi_seasonal_yes">ja</string>
-	<string name="poi_seasonal_no">nein</string>
+	<string name="poi_seasonal_yes">Ja</string>
+	<string name="poi_seasonal_no">Nein</string>
 	<string name="poi_seasonal_dry_season">Trockenzeit</string>
 	<string name="poi_seasonal_wet_season">Regenzeit</string>
 	<string name="poi_recycling_container">Container</string>
@@ -1059,8 +1059,8 @@
 	<string name="poi_height">Höhe</string>
 	<string name="poi_ele">Meereshöhe</string>
 	<string name="poi_start_date">Anfangsdatum</string>
-	<string name="poi_wheelchair_yes">ja</string>
-	<string name="poi_wheelchair_no">nein</string>
+	<string name="poi_wheelchair_yes">Ja</string>
+	<string name="poi_wheelchair_no">Nein</string>
 	<string name="poi_wheelchair_limited">Eingeschränkt</string>
 	<string name="poi_wholesale">Großhandel</string>
 
@@ -1163,7 +1163,7 @@
 	<string name="poi_beach_rocky">Fels</string>
 
 	<string name="poi_cypress">Zypresse</string>
-	<string name="poi_bench_yes">ja</string>
+	<string name="poi_bench_yes">Ja</string>
 	<string name="poi_bench_no">ohne Sitzbank</string>
 	<string name="poi_bin_yes">Mit Abfalleimer</string>
 	<string name="poi_bin_no">Ohne Abfalleimer</string>
@@ -1200,7 +1200,7 @@
 	<string name="poi_elevator_no">Ohne Aufzug</string>
 
 	<string name="poi_fuel_91ul">Avgas UL 91</string>
-	<string name="poi_fuel_100ll">Avgas 100 LL</string>
+	<string name="poi_fuel_100ll">Avgas 100LL</string>
 	<string name="poi_fuel_autogas">Autogas</string>
 	<string name="poi_fuel_jeta1">Flugzeug A-1 Kraftstoff</string>
 	<string name="poi_fuel_adblue">AdBlue</string>
@@ -1235,7 +1235,7 @@
 
 	<string name="poi_openfire_yes">Offenes Feuer erlaubt</string>
 	<string name="poi_openfire_no">Offenes Feuer verboten</string>
-	<string name="poi_washing_machine_yes">ja</string>
+	<string name="poi_washing_machine_yes">Ja</string>
 	<string name="poi_washing_machine_no">Waschmaschine: nein</string>
 	<string name="poi_shower_yes">Dusche: ja</string>
 	<string name="poi_shower_no">Dusche: nein</string>
@@ -1243,9 +1243,9 @@
 	<string name="poi_shower_outdoor">Dusche: im Freien</string>
 	<string name="poi_shower_cold">Dusche: kalt</string>
 	<string name="poi_shower_indoor">Dusche: drinnen</string>
-	<string name="poi_caravans_yes">ja</string>
+	<string name="poi_caravans_yes">Ja</string>
 	<string name="poi_caravans_no">Wohnwagen: nein</string>
-	<string name="poi_power_supply_yes">ja</string>
+	<string name="poi_power_supply_yes">Ja</string>
 	<string name="poi_power_supply_no">Stromanschluss: nein</string>
 	<string name="poi_power_supply_cee_17_blue">Sockel: CEE 17 blau</string>
 	<string name="poi_power_supply_cee_7_4">Sockel: CEE 7/4</string>
@@ -1376,7 +1376,7 @@
 
 	<string name="poi_pump_manual">Manuell</string>
 	<string name="poi_pump_no">Keine Pumpe</string>
-	<string name="poi_pump_yes">ja</string>
+	<string name="poi_pump_yes">Ja</string>
 
 	<string name="poi_information_board">Tafel</string>
 	<string name="poi_information_map">Karte</string>
@@ -1396,18 +1396,18 @@
 	<string name="poi_board_type_astronomy">Astronomie</string>
 
 	<string name="poi_commercial">Gewerbegebiet</string>
-	<string name="poi_fireplace_yes">ja</string>
+	<string name="poi_fireplace_yes">Ja</string>
 	<string name="poi_fireplace_no">Keine Feuerstelle</string>
 
-	<string name="poi_covered_yes">ja</string>
+	<string name="poi_covered_yes">Ja</string>
 	<string name="poi_covered_no">nicht überdacht</string>
 
 	<string name="poi_smoking_no">Nicht erlaubt</string>
 	<string name="poi_smoking_outside">nur Außerhalb</string>
 	<string name="poi_smoking_yes">Erlaubt</string>
 	<string name="poi_smoking_separated">In einem separaten Raum</string>
-	<string name="poi_traffic_signals_sound_yes">ja</string>
-	<string name="poi_traffic_signals_sound_no">nein</string>
+	<string name="poi_traffic_signals_sound_yes">Ja</string>
+	<string name="poi_traffic_signals_sound_no">Nein</string>
 	<string name="poi_rescue_station">Rettungsstation</string>
 
 	<string name="poi_mini_roundabout">Mini-Kreisverkehr</string>
@@ -1442,7 +1442,7 @@
 	<string name="poi_garden_style_japanese">Gartenstil: Japanisch</string>
 
 	<string name="poi_capacity">Kapazität</string>
-	<string name="poi_capacity_disabled_yes">ja</string>
+	<string name="poi_capacity_disabled_yes">Ja</string>
 	<string name="poi_capacity_disabled_no">keine Behindertenplätze</string>
 	<string name="poi_capacity_disabled">Behindertenplätze</string>
 	<string name="poi_capacity_women_yes">Frauenplätze</string>
@@ -1459,7 +1459,7 @@
 	<string name="poi_aerialway_duration">durchschnittliche Fahrzeit, Minuten</string>
 	<string name="poi_aerialway_bubble_yes">mit Überdachung</string>
 	<string name="poi_aerialway_bubble_no">Ohne Überdachung</string>
-	<string name="poi_aerialway_heating_yes">ja</string>
+	<string name="poi_aerialway_heating_yes">Ja</string>
 	<string name="poi_aerialway_heating_no">keine Heizung</string>
 	<string name="poi_aerialway_bicycle_yes">Erlaubt</string>
 	<string name="poi_aerialway_bicycle_no">Fahrrad: nicht erlaubt</string>
@@ -1514,13 +1514,13 @@
 	<string name="poi_payment_diners_club_no">Diners Club Karte nicht akzeptiert</string>
 	<string name="poi_payment_dkv_yes">DKV</string>
 	<string name="poi_payment_dkv_no">DKV nicht akzeptiert</string>
-	<string name="poi_drive_in_yes">ja</string>
+	<string name="poi_drive_in_yes">Ja</string>
 	<string name="poi_drive_in_no">Drive-in: nein</string>
-	<string name="poi_drive_through_yes">ja</string>
+	<string name="poi_drive_through_yes">Ja</string>
 	<string name="poi_drive_through_no">Durchfahrt: nein</string>
 
 	<string name="poi_brewery_additional">Brauereiname</string>
-	<string name="poi_microbrewery_yes">Minibrauerei</string>
+	<string name="poi_microbrewery_yes">Ja</string>
 	<string name="poi_microbrewery_no">Keine Minibrauerei</string>
 
 	<string name="poi_takeaway_yes">Zum Mitnehmen</string>
@@ -1531,12 +1531,12 @@
 	<string name="poi_delivery_no">Kein Lieferservice</string>
 	<string name="poi_delivery_only">Nur Lieferung</string>
 
-	<string name="poi_cocktails_yes">ja</string>
+	<string name="poi_cocktails_yes">Ja</string>
 
 	<string name="poi_service_dealer">Händler</string>
 	<string name="poi_service_repair">Reparatur</string>
 	<string name="poi_service_repair_no">Keine Reparatur</string>
-	<string name="poi_automated_yes">ja</string>
+	<string name="poi_automated_yes">Ja</string>
 	<string name="poi_automated_no">Nicht automatisiert</string>
 	<string name="poi_brushless_no">Bürstenlos: nein</string>
 	<string name="poi_car_wash_no">Autowäsche: nein</string>
@@ -1545,7 +1545,7 @@
 	<string name="poi_male_no">Für Männer verboten</string>
 	<string name="poi_female_yes">Weiblich</string>
 	<string name="poi_female_no">Für Frauen verboten</string>
-	<string name="poi_toilets_yes">ja</string>
+	<string name="poi_toilets_yes">Ja</string>
 	<string name="poi_toilets_no">Keine Toiletten</string>
 	<string name="poi_religion_bahai">Bahaitum</string>
 	<string name="poi_religion_pagan">Heidentum</string>
@@ -1733,7 +1733,7 @@
 	<string name="poi_toll_yes">Maut</string>
 	<string name="poi_toll_no">keine Maut</string>
 	<string name="poi_toll_hgv_yes">LKW Maut</string>
-	<string name="poi_tactile_paving_yes">ja</string>
+	<string name="poi_tactile_paving_yes">Ja</string>
 	<string name="poi_tactile_paving_no">Ohne Blindenleitsystem</string>
 	<string name="poi_traffic_signals_sound_walk">Nur wenn Gehen erlaubt ist</string>
 
@@ -1751,7 +1751,7 @@
 	<string name="poi_piste_grooming_backcountry">Tourenski</string>
 	<string name="poi_piste_grooming_scooter">Schneemobil</string>
 	<string name="poi_piste_grooming_skating">Skaten</string>
-	<string name="poi_piste_grooming_no">nein</string>
+	<string name="poi_piste_grooming_no">Nein</string>
 	<string name="poi_piste_grooming_mogul">Buckel</string>
 
 	<string name="poi_garden_type_residential">Gartentyp: Hausgarten</string>
@@ -1773,7 +1773,7 @@
 	<string name="poi_payment_girocard_no">Girokarte nicht akzeptiert</string>
 	<string name="poi_payment_discover_card_yes">Discover-Karte</string>
 	<string name="poi_payment_discover_card_no">Discover Karte nicht akzeptiert</string>
-	<string name="poi_brushless_yes">ja</string>
+	<string name="poi_brushless_yes">Ja</string>
 	<string name="poi_parish">Gemeindebüro</string>
 	<string name="poi_payment_cheque_yes">Schecks</string>
 	<string name="poi_payment_cheque_no">Schecks nicht akzeptiert</string>
@@ -1919,7 +1919,7 @@
 	<string name="poi_service_parts">Teile</string>
 	<string name="poi_service_electrical">Reparatur von elektrischen Fahrzeugen</string>
 	<string name="poi_motorcycle_repair">Motorradreparatur</string>
-	<string name="poi_self_service_yes">ja</string>
+	<string name="poi_self_service_yes">Ja</string>
 	<string name="poi_self_service_no">keine Selbstbedienung</string>
 	<string name="poi_full_service_yes">Rundumservice</string>
 	<string name="poi_aeroway_fuel">Flugzeugtankstelle</string>
@@ -2271,9 +2271,9 @@
 
 	<string name="poi_tents_yes">Erlaubt</string>
 	<string name="poi_tents_no">Zelten nicht gestattet</string>
-	<string name="poi_backcountry_yes">ja</string>
-	<string name="poi_backcountry_no">nein</string>
-	<string name="poi_scout_yes">ja</string>
+	<string name="poi_backcountry_yes">Ja</string>
+	<string name="poi_backcountry_no">Nein</string>
+	<string name="poi_scout_yes">Ja</string>
 	<string name="poi_scout_no">Pfadfinderlager: nein</string>
 	<string name="poi_group_only_yes">Nur Gruppen: ja</string>
 	<string name="poi_group_only_no">Nur Gruppen: nein</string>
@@ -2630,12 +2630,12 @@
 
 	<string name="poi_plant_nursery">Baumschule</string>
 
-	<string name="poi_compressed_air_yes">ja</string>
+	<string name="poi_compressed_air_yes">Ja</string>
 	<string name="poi_compressed_air_no">Druckluft: nein</string>
 
-	<string name="poi_car_wash_yes">ja</string>
+	<string name="poi_car_wash_yes">Ja</string>
 
-	<string name="poi_vacuum_cleaner_yes">ja</string>
+	<string name="poi_vacuum_cleaner_yes">Ja</string>
 	<string name="poi_vacuum_cleaner_no">Staubsauger: nein</string>
 	<string name="poi_amenity_vacuum_cleaner">Staubsauger</string>
 
@@ -2813,7 +2813,7 @@
 	<string name="poi_counselling_no">Beratung: nein</string>
 	<string name="poi_emergency_yes">Notaufnahme: ja</string>
 	<string name="poi_emergency_no">Notaufnahme: nein</string>
-	<string name="poi_home_visit_yes">ja</string>
+	<string name="poi_home_visit_yes">Ja</string>
 	<string name="poi_home_visit_no">Hausbesuch: nein</string>
 
 	<string name="poi_disease_ebola_no">Ebola: nein</string>
@@ -2979,8 +2979,8 @@
 	<string name="poi_aquaculture_mussels">Aquakultur: Muscheln</string>
 
 	<string name="poi_mdf">Hauptverteiler</string>
-	<string name="poi_organic_yes">ja</string>
-	<string name="poi_organic_no">nein</string>
+	<string name="poi_organic_yes">Ja</string>
+	<string name="poi_organic_no">Nein</string>
 	<string name="poi_organic_only">Ausschließlich</string>
 
 	<string name="poi_diplomatic_consulate">Konsulat</string>
@@ -3274,16 +3274,16 @@
 
 	<string name="poi_payment_transport_type">Zahlungsart (Transport)</string>
 
-<string name="poi_outdoor_seating_filter_yes">ja</string>
-	<string name="poi_delivery_filter_yes">ja</string>
+<string name="poi_outdoor_seating_filter_yes">Ja</string>
+	<string name="poi_delivery_filter_yes">Ja</string>
 	<string name="poi_diet_vegetarian_filter_yes">Vegetarisch</string>
 	<string name="poi_diet_vegan_filter_yes">Vegan</string>
 	<string name="poi_diet_gluten_free_filter_yes">Glutenfrei</string>
 	<string name="poi_diet_kosher_filter_yes">Koscher</string>
 	<string name="poi_diet_halal_filter_yes">Halal</string>
 	<string name="poi_diet_lactose_free_filter_yes">Laktosefrei</string>
-	<string name="poi_takeaway_filter_yes">ja</string>
-	<string name="poi_shower_filter_yes">ja</string>
+	<string name="poi_takeaway_filter_yes">Ja</string>
+	<string name="poi_shower_filter_yes">Ja</string>
 
 <string name="poi_social_facility_for">Zielgruppe</string>
 	<string name="poi_compressed_air_filter">Druckluft</string>
@@ -3349,7 +3349,7 @@
 
 <string name="poi_cafeteria">Cafeteria</string>
 
-<string name="poi_fast_food_cafeteria">ja</string>
+<string name="poi_fast_food_cafeteria">Ja</string>
 
 	<string name="poi_drink_wine_yes">Wein: ja</string>
 	<string name="poi_drink_wine_retail">Wein: Einzelhandel</string>
@@ -3885,4 +3885,43 @@
 <string name="poi_atm">Geldautomat</string>
 	<string name="poi_shoe_repair">Schuhreparatur</string>
 
-</resources>
+<string name="poi_bulk_purchase">Großeinkauf</string>
+	<string name="poi_substation_type">Typ</string>
+
+<string name="poi_bulk_purchase_yes">Ja</string>
+	<string name="poi_bulk_purchase_only">Nur</string>
+
+	<string name="poi_substation_transmission">Umspannwerk</string>
+	<string name="poi_substation_distribution">Verteiler</string>
+	<string name="poi_substation_minor_distribution">Haushalts Verteilung</string>
+	<string name="poi_substation_industrial">Industriell</string>
+	<string name="poi_substation_transition">Übergang</string>
+	<string name="poi_substation_traction">Bahnstrom</string>
+	<string name="poi_substation_converter">Umrichter</string>
+	<string name="poi_substation_compensation">Kompensation</string>
+
+	<string name="poi_substation_compression">Kompression</string>
+	<string name="poi_substation_measurement">Messung</string>
+	<string name="poi_substation_valve">Ventil</string>
+	<string name="poi_substation_valve_group">Ventilgruppe</string>
+	<string name="poi_substation_field_gathering">Feldleitung</string>
+
+<string name="poi_pipeline_substation">Pipeline-Umspannwerk</string>
+	<string name="poi_substation_inspection_gauge">Kontrollmanometer</string>
+    <string name="poi_craft_confectionery">Süßwarenproduktion</string>
+    <string name="poi_shop_wholesale">Großhandel</string>
+    <string name="poi_books_type">Bücher</string>
+    <string name="poi_laboratory">Medizinisches Labor</string>
+    <string name="poi_blood_donation">Blutspende</string>
+    <string name="poi_books_comic">Comics</string>
+    <string name="poi_books_antiquarian">Antiquarische</string>
+    <string name="poi_books_religion">Religiöse</string>
+    <string name="poi_books_academic">Akademische</string>
+    <string name="poi_books_children">Kinder</string>
+    <string name="poi_atoll">Atoll</string>
+    <string name="poi_denotation">Bezeichnung</string>
+    <string name="poi_toll_gantry">Mautkontrollbrücke</string>
+    <string name="poi_childcare">Kinderbetreuung</string>
+    <string name="poi_denotation_natural_monument">Naturdenkmal</string>
+    <string name="poi_denotation_landmark">Orientierungspunkt</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 971b83b97a..b0589831aa 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="distance_moving">Korrigierte Distanz</string>
     <string name="wiki_around">Wikipedia-Artikel zur Umgebung</string>
@@ -2035,7 +2035,7 @@ Lon %2$s</string>
     <string name="shared_string_commit">OSM-Notiz</string>
 	
     <string name="av_locations">Standorte</string>
-    <string name="shared_string_hide">verbergen</string>
+    <string name="shared_string_hide">Verbergen</string>
     <string name="av_video_quality_low">Niedrigste Qualität</string>
     <string name="av_video_quality_high">Höchste Qualität</string>
     <string name="av_video_quality">Videoqualität</string>
@@ -2098,7 +2098,7 @@ Lon %2$s</string>
     <string name="shared_string_read_more">Mehr lesen</string>
     <string name="shared_string_status">Status</string>
     <string name="shared_string_save_changes">Änderungen speichern</string>
-    <string name="shared_string_email_address">E-Mail-Adresse speichern</string>
+    <string name="shared_string_email_address">E-Mail-Adresse</string>
     <string name="find_parking">Parkplatz finden</string>
     <string name="show_polygons">Flächen anzeigen</string>
     
@@ -2459,7 +2459,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="shared_string_end_time">Beendigungszeit</string>
     <string name="shared_string_color">Farbe</string>
     <string name="max_speed">Höchstgeschwindigkeit</string>
-    <string name="average_speed">Durchschnittsgeschwindigkeit</string>
+    <string name="average_speed">Durchschnittliche Geschwindigkeit</string>
     <string name="shared_string_gpx_track">Track</string>
     <string name="points_delete_multiple_succesful">Punkt(e) gelöscht.</string>
     <string name="points_delete_multiple">Es werden %1$d Punkt(e) gelöscht. Fortfahren?</string>
@@ -2623,7 +2623,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="subscribe_email_desc">Tragen Sie sich in unsere Mail-Liste zu App-Angeboten ein, und erhalten Sie dafür 3 zusätzliche Karten-Downloads!</string>
     <string name="depth_contour_descr">Meeresbodenkonturlinien und Seezeichen.</string>
     <string name="sea_depth_thanks">Vielen Dank, dass Sie die \'Meerestiefenkonturen\' erworben haben</string>
-    <string name="index_item_depth_contours_osmand_ext">Nautische Tiefenkonturen</string>
+    <string name="index_item_depth_contours_osmand_ext">Nautische Tiefenlinien</string>
     <string name="index_item_depth_points_southern_hemisphere">Nautische Meerestiefen der Südhalbkugel</string>
     <string name="index_item_depth_points_northern_hemisphere">Nautische Meerestiefen der Nordhalbkugel</string>
     <string name="download_depth_countours">Nautische Tiefenkonturen</string>
@@ -2709,7 +2709,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="map_widget_ruler_control">Zirkel</string>
     <string name="of">%1$d von %2$d</string>
     <string name="moving_time">Zeit in Bewegung</string>
-    <string name="mapillary_menu_filter_description">Bilder nach Absender oder Datum filtern. Nur im Nahbereich aktiv.</string>
+    <string name="mapillary_menu_filter_description">Bilder nach Absender, Datum oder Typ filtern. Nur im Nahbereich aktiv.</string>
     <string name="min_max">min/max</string>
     <string name="quick_action_resume_pause_navigation_descr">Drücken Sie diese Taste, um die Navigation zu pausieren oder fortzusetzen.</string>
     <string name="quick_action_show_navigation_finish_dialog">Dialog bei Navigationsende anzeigen</string>
@@ -2794,7 +2794,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="plan_route">Route planen</string>
     <string name="shared_string_sort">Sortieren</string>
     <string name="coordinate_input">Koordinateneingabe</string>
-    <string name="is_saved">gespeichert</string>
+    <string name="is_saved">ist gespeichert</string>
     <string name="marker_save_as_track_descr">Markierungen in die hier festgelegte GPX-Datei exportieren:</string>
     <string name="marker_save_as_track">Als GPX-Datei speichern</string>
     <string name="move_to_history">In den Verlauf verschieben</string>
@@ -2980,7 +2980,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
 \nImmer verfügbar unter \'Durchsuchen\' → \'Optionen\'.</string>
     <string name="online_webpage_warning">Seite ist nur online abrufbar. Im Webbrowser öffnen?</string>
     <string name="delete_search_history">Suchverlauf löschen</string>
-    <string name="purchase_dialog_travel_description">Für die Offlne Reiseführerfunktionalität, kaufen Sie einen der folgenden Artikel:</string>
+    <string name="purchase_dialog_travel_description">Für die Offline Reiseführerfunktionalität, kaufen Sie einen der folgenden Artikel:</string>
     <string name="purchase_dialog_subtitle">Passenden Artikel auswählen:</string>
     <string name="shared_string_dont">Nicht</string>
     <string name="shared_string_do">Tun</string>
@@ -3065,7 +3065,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="coord_input_edit_point">Punkt bearbeiten</string>
     <string name="coord_input_add_point">Punkt hinzufügen</string>
     <string name="coord_input_save_as_track">Als Track speichern</string>
-    <string name="coord_input_save_as_track_descr">Sie haben %1$s Punkte hinzugefügt. Geben Sie den Dateinamen ein und klicken Sie auf \"Speichern\".</string>
+    <string name="coord_input_save_as_track_descr">Sie haben %1$s Punkte hinzugefügt. Geben Sie einen Dateinamen ein und klicken Sie auf \"Speichern\".</string>
     <string name="point_deleted">Punkt %1$s gelöscht</string>
     <string name="send_search_query_description">Es wird Ihre Suchanfrage: <b>\"%1$s\"</b>, sowie Ihr Standort gesendet.<br/><br/> Wir sammeln keine persönlichen Daten, die Informationen dienen nur der Verbesserung des Suchalgorithmus.<br/></string>
     <string name="search_no_results_description">Keine Ergebnisse?
@@ -3090,13 +3090,13 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="poi_cannot_be_found">Knoten oder Weg kann nicht gefunden werden.</string>
     <string name="search_no_results_feedback">Keine Suchergebnisse?
 \nGeben Sie uns eine Rückmeldung</string>
-    <string name="commiting_way">Übermitteln via…</string>
-    <string name="test_voice_desrc">Tippen Sie auf eine Schaltfläche und hören Sie sich die entsprechende Sprachanweisung an, um fehlende oder fehlerhafte Anweisungen zu erkennen.</string>
+    <string name="commiting_way">Übertrage Weg…</string>
+    <string name="test_voice_desrc">Tippen Sie auf eine Schaltfläche und hören Sie sich die entsprechende Sprachausgabe an, um fehlende oder fehlerhafte Anweisungen zu erkennen.</string>
 <string name="release_3_2_pre">• Absturz beim Start behoben, der bei manchen Geräten auftrat
 \n
 \n• Neue Funktion für Markierungen: Anzeigen der Markierungen die bereits erreicht wurden
 \n
-\n• Such-Geschehen zeigt nun die Kategorien an die Sie zuvor gesucht haben
+\n• Suchverlauf zeigt nun die Kategorien an die Sie zuvor gesucht haben
 \n
 \n• Absturz beim Start von nicht-lateinischen Karten behoben
 \n 
@@ -3110,7 +3110,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="ask_for_location_permission">Bitte lassen Sie zu, dass OsmAnd auf den Standort zugreifen darf.</string>
     <string name="rendering_value_black_name">Schwarz</string>
     <string name="search_street">Straße suchen</string>
-    <string name="start_search_from_city">Suche von der Stadt aus starten</string>
+    <string name="start_search_from_city">Zunächst den Ort wählen</string>
     <string name="shared_string_restore">Wiederherstellen</string>
     <string name="keep_passed_markers_descr">Markierungen, die als Gruppe von Favoriten oder GPX-Wegpunkten hinzugefügt wurden, die als \'Passiert\' markiert sind, bleiben auf der Karte erhalten. Wenn die Gruppe nicht aktiv ist, verschwinden die Marker von der Karte.</string>
     <string name="keep_passed_markers">Passierte Markierungen auf der Karte behalten</string>
@@ -3118,4 +3118,53 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="markers_remove_dialog_msg">Kartenmarkierung \'%s\' löschen\?</string>
     <string name="edit_map_marker">Kartenmarkierung bearbeiten</string>
     <string name="third_party_application">Drittanbieter-App</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Plan &amp; Preisgestaltung</string>
+    <string name="osm_live_payment_monthly_title">Monatlich bezahlen</string>
+    <string name="osm_live_payment_3_months_title">Alle 3 Monate bezahlen</string>
+    <string name="osm_live_payment_annual_title">Einmal im Jahr bezahlen</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / Monat</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / Monat</string>
+    <string name="osm_live_payment_discount_descr">Sparen Sie %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Ihr aktuelles Abonnement</string>
+    <string name="osm_live_payment_renews_monthly">Verlängert monatlich</string>
+    <string name="osm_live_payment_renews_quarterly">Verlängert vierteljährlich</string>
+    <string name="osm_live_payment_renews_annually">Verlängert jährlich</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Wählen Sie den für Sie passenden Zahlungszeitraum aus:</string>
+    <string name="osm_live_payment_contribute_descr">Ein Teil der Einnahmen geht an OpenStreetMap-Mitwirkende.</string>
+    <string name="powered_by_osmand">Betrieben von OsmAnd</string>
+    <string name="osm_live_subscriptions">Abonnements</string>
+    <string name="mapillary_menu_title_pano">Nur 360°-Bilder anzeigen</string>
+    <string name="shared_string_launch">Starten</string>
+    <string name="lang_gn_py">Guaraní</string>
+    <string name="run_full_osmand_header">OsmAnd starten\?</string>
+    <string name="quick_action_switch_day_night_descr">Durch Antippen dieser Aktionstaste können Sie zwischen Tag- und Nacht-Modus für OsmAnd wechseln</string>
+    <string name="quick_action_switch_day_mode">Tag-Modus</string>
+    <string name="quick_action_switch_night_mode">Nacht-Modus</string>
+    <string name="quick_action_day_night_switch_mode">Schalter Tag/Nacht Modus</string>
+    <string name="run_full_osmand_msg">Sie verwenden {0} Karte, die von OsmAnd unterstützt wird. Möchten Sie die OsmAnd Vollversion starten\?</string>
+    <string name="swap_start_and_destination">Start und Ziel tauschen</string>
+    <string name="add_destination_point">Ziel hinzufügen</string>
+    <string name="add_intermediate_point">Zwischenpunkt hinzufügen</string>
+    <string name="add_start_point">Startpunkt hinzufügen</string>
+    <string name="intermediate_waypoint">Zwischenpunkt: %1$s</string>
+    <string name="waypoints">Wegpunkte: %1$s</string>
+    <string name="transfers">Umstiege: %1$s</string>
+    <string name="on_foot">Zu Fuß: %1$s</string>
+    <string name="route_way">Weg: %1$s</string>
+    <string name="points_of_interests">Orte von Interesse(OVI)</string>
+    <string name="waiting_for_route_calculation">Warten auf Routenberechung</string>
+    <string name="app_mode_public_transport">Öffentlicher Verkehr</string>
+    <string name="avoid_roads_descr">Wähle die Straße aus die während der Navigation vermieden werden soll, von der Karte oder von der Liste unten:</string>
+    <string name="show_along_the_route">Entlang der Route anzeigen</string>
+    <string name="simulate_navigation">Navigation simulieren</string>
+    <string name="choose_track_file_to_follow">Wähle Track-Datei zum Verfolgen aus</string>
+    <string name="voice_announcements">Sprachmeldungen</string>
+    <string name="intermediate_destinations">Zwischenziele: %1$s</string>
+    <string name="arrive_at_time">Ankunftszeit um %1$s</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Kapazität</string>
+    <string name="shared_string_width">Breite</string>
+    <string name="shared_string_height">Höhe</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-el/phrases.xml b/OsmAnd/res/values-el/phrases.xml
index 6ebecbfb5a..76bd3f2a07 100644
--- a/OsmAnd/res/values-el/phrases.xml
+++ b/OsmAnd/res/values-el/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_fuel_type">Τύπος καυσίμου</string>
 	<string name="poi_fuel_avia_type">Τύπος καυσίμου (αεροπορία)</string>
 	<string name="poi_payment_type">Τύπος πληρωμής</string>
@@ -162,7 +162,7 @@
 	<string name="poi_deli">Εδεσματοπωλείο</string>
 	<string name="poi_greengrocer">Οπωροκηπευτικά</string>
 	<string name="poi_seafood">Ιχθυοπωλείο</string>
-	<string name="poi_confectionery">Γλυκίσματα</string>
+	<string name="poi_confectionery">Ζαχαροπλαστείο</string>
 	<string name="poi_ice_cream">Παγωτατζίδικο</string>
 	<string name="poi_supermarket">Υπεραγορά</string>
 	<string name="poi_tea">Τσαγάδικο</string>
@@ -348,11 +348,11 @@
 	<string name="poi_railway_platform">Αποβάθρα σιδηροδρόμου</string>
 	<string name="poi_halt">Στάση σιδηροδρόμου</string>
 	<string name="poi_subway_entrance">Είσοδος μετρό</string>
-	<string name="poi_subway_station">Σταθμός μετρό</string>
-	<string name="poi_traffic_calming_cushion">Σαμαράκι (Μαξιλαράκι)</string>
+	<string name="poi_subway_station">Ναι</string>
+	<string name="poi_traffic_calming_cushion">Μαξιλαράκι ταχύτητας</string>
 	<string name="poi_traffic_calming_chicane">Επιβραδυντής (απότομη στροφή)</string>
 	<string name="poi_traffic_calming_rumble_strip">Λωρίδα τραχειάς επιφάνειας</string>
-	<string name="poi_traffic_calming_table">Σαμαράκι (πίνακας)</string>
+	<string name="poi_traffic_calming_table">Πίνακας ταχύτητας</string>
 	<string name="poi_traffic_signals">Κόκκινο φανάρι</string>
 
 	<string name="poi_car_repair">Επισκευή οχήματος</string>
@@ -577,7 +577,7 @@
 	<string name="poi_customs">Τελωνεία</string>
 	<string name="poi_country">Ύπαιθρος</string>
 	<string name="poi_city">Πόλη</string>
-	<string name="poi_capital">Πρωτεύουσα</string>
+	<string name="poi_capital">Ναι</string>
 	<string name="poi_town">Κωμόπολη</string>
 	<string name="poi_village">Χωριό</string>
 	<string name="poi_hamlet">Μικρό χωριό</string>
@@ -1774,7 +1774,7 @@
 	<string name="poi_drive_through_no">Στο όχημα σε στάση: όχι</string>
 
 	<string name="poi_brewery_additional">Όνομα ζυθοποιίας</string>
-	<string name="poi_microbrewery_yes">Μικροζυθοποιία</string>
+	<string name="poi_microbrewery_yes">Ναι</string>
 	<string name="poi_microbrewery_no">Χωρίς μικροζυθοποιία</string>
 
 	<string name="poi_takeaway_filter_yes">Ναι</string>
@@ -3841,6 +3841,40 @@
 	<string name="poi_hazard_slippery_road">Ολισθηρό οδόστρωμα</string>
 	<string name="poi_hazard_flood">Κίνδυνος πλημμύρας</string>
 	<string name="poi_hazard_minefield">Ναρκοπέδιο</string>
-
-
-</resources>
+    <string name="poi_bulk_purchase">Μαζική αγορά</string>
+    <string name="poi_substation_type">Τύπος</string>
+    <string name="poi_books_type">Βιβλία</string>
+    <string name="poi_car_pooling">Σημείο συγκέντρωσης οχημάτων</string>
+    <string name="poi_atm">Αυτόματο ταμειακό μηχάνημα (ATM)</string>
+    <string name="poi_ruins">Ερείπια</string>
+    <string name="poi_license_classes">Κλάσεις αδείας</string>
+    <string name="poi_hill">Λόφος</string>
+    <string name="poi_shoe_repair">Υποδηματοποιείο</string>
+    <string name="poi_bulk_purchase_yes">Ναι</string>
+    <string name="poi_bulk_purchase_only">Μόνο</string>
+    <string name="poi_pipeline_substation">"Υποσταθμός  ρεύματος"</string>
+    <string name="poi_substation_transmission">Μεταφορά</string>
+    <string name="poi_substation_distribution">Διανομή</string>
+    <string name="poi_substation_minor_distribution">Μικρή διανομή</string>
+    <string name="poi_substation_industrial">Βιομηχανική</string>
+    <string name="poi_substation_transition">Μετάβαση</string>
+    <string name="poi_substation_traction">Έλξη</string>
+    <string name="poi_substation_converter">Μετατροπέας</string>
+    <string name="poi_substation_compensation">Αντιστάθμιση</string>
+    <string name="poi_substation_compression">Συμπίεση</string>
+    <string name="poi_substation_measurement">Μέτρηση</string>
+    <string name="poi_substation_valve">Βαλβίδα</string>
+    <string name="poi_substation_valve_group">Ομάδα βαλβίδων</string>
+    <string name="poi_substation_inspection_gauge">Μετρητής ελέγχου</string>
+    <string name="poi_substation_field_gathering">Συγκέντρωση πεδίου</string>
+    <string name="poi_craft_confectionery">Παραγωγή ζαχαροπλαστικής</string>
+    <string name="poi_shop_wholesale">Κατάστημα χονδρικής</string>
+    <string name="poi_laboratory">Ιατρικό εργαστήριο</string>
+    <string name="poi_blood_donation">Αιμοδοσία</string>
+    <string name="poi_books_comic">Κόμικ</string>
+    <string name="poi_books_antiquarian">Αντίκες</string>
+    <string name="poi_books_religion">Θρησκευτικά</string>
+    <string name="poi_books_academic">Ακαδημαϊκά</string>
+    <string name="poi_books_children">Παιδικά</string>
+    <string name="poi_atoll">Ατόλη</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index d95eb70d7f..ab1ad431fe 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="add_tag">Προσθήκη Ετικέτας</string>
     <string name="btn_advanced_mode">Λειτουργία για προχωρημένους…</string>
@@ -2021,7 +2021,7 @@
     <string name="mapillary_menu_title_dates">Ημερομηνία</string>
     <string name="mapillary_menu_edit_text_hint">Πληκτρολογήστε όνομα χρήστη</string>
     <string name="mapillary_menu_descr_username">Προβολή μόνο των εικόνων που προστέθηκαν από</string>
-    <string name="mapillary_menu_filter_description">Φιλτράρετε εικόνες κατά υποβάλλοντα ή κατά ημερομηνία. Ενεργό μόνο για κοντινή εστίαση.</string>
+    <string name="mapillary_menu_filter_description">Φιλτράρετε εικόνες κατά υποβάλλοντα, κατά ημερομηνία ή κατά τύπο. Ενεργό μόνο για κοντινή εστίαση.</string>
     <string name="map_widget_ruler_control">Κανόνας ακτίνας</string>
     <string name="import_gpx_failed_descr">Το OsmAnd δεν μπορεί να εισάγει το αρχείο. Παρακαλούμε, ελέγξτε εάν το OsmAnd έχει άδεια να διαβάζει αρχεία από αυτή τη θέση.</string>
     <string name="mapillary_image">Εικόνα Mapillary</string>
@@ -3085,4 +3085,46 @@
     <string name="send_search_query">Αποστολή ερωτήματος αναζήτησης;</string>
     <string name="shared_string_world">Κόσμος</string>
     <string name="test_voice_desrc">Πιέστε ένα κουμπί και ακούστε την αντίστοιχη φωνητική προτροπή για να ταυτοποιήσετε ελλειπείς ή λανθασμένες προτροπές.</string>
-</resources>
+    <string name="osm_live_subscriptions">Συνδρομές</string>
+    <string name="powered_by_osmand">Προωθούμενο από το OsmAnd</string>
+    <string name="osm_live_plan_pricing">"Δυνατότητες  και τιμές"</string>
+    <string name="osm_live_payment_monthly_title">Μηνιαία πληρωμή</string>
+    <string name="osm_live_payment_3_months_title">Τριμηνιαία πληρωμή</string>
+    <string name="osm_live_payment_annual_title">Ετήσια πληρωμή</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / μήνα</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / μήνα</string>
+    <string name="osm_live_payment_discount_descr">Εξοικονόμηση %1$s!</string>
+    <string name="osm_live_payment_current_subscription">Η τρέχουσα εγγραφή σας</string>
+    <string name="osm_live_payment_renews_monthly">Μηνιαίες ανανεώσεις</string>
+    <string name="osm_live_payment_renews_quarterly">Τριμηνιαίες ανανεώσεις</string>
+    <string name="osm_live_payment_renews_annually">Ετήσιες ανανεώσεις</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Επιλέξτε την κατάλληλη περίοδο πληρωμής για σας:</string>
+    <string name="osm_live_payment_contribute_descr">Μέρος του εισοδήματος πηγαίνει στους συντελεστές του OpenStreetMap.</string>
+    <string name="markers_remove_dialog_msg">Διαγραφή σημαδιού χάρτη \'%s\';</string>
+    <string name="edit_map_marker">Επεξεργασία σημαδιού χάρτη</string>
+    <string name="third_party_application">Εφαρμογή τρίτου</string>
+    <string name="search_street">Αναζήτηση οδού</string>
+    <string name="start_search_from_city">Επιλέξτε πρώτα την πόλη</string>
+    <string name="shared_string_restore">Επαναφορά</string>
+    <string name="keep_passed_markers_descr">Τα σημάδια που προστέθηκαν ως ομάδα αγαπημένων ή σημεία διαδρομής GPX που σημειώθηκαν ως περασμένα θα παραμείνουν στον χάρτη. Εάν η ομάδα δεν είναι ενεργή, τα σημάδια θα εξαφανιστούν από τον χάρτη.</string>
+    <string name="keep_passed_markers">Διατήρηση των περασμένων σημαδιών στον χάρτη</string>
+    <string name="more_transport_on_stop_hint">Υπάρχει περισσότερη συγκοινωνία σε αυτήν τη στάση.</string>
+    <string name="ask_for_location_permission">Για να συνεχίσετε, δώστε την άδεια στο OsmAnd να χρησιμοποιήσει τη θέση σας.</string>
+    <string name="release_3_2_pre">"• Διορθώθηκαν οι καταρρεύσεις εκκίνησης που συνέβαιναν σε κάποιες συσκευές
+\n
+\n • Νέο χαρακτηριστικό σημαδιών: εμφανίζονται τα σημάδια που έχουν ήδη διασχιστεί
+\n
+\n • Το ιστορικό αναζήτησης εμφανίζει τώρα τις κατηγορίες που έχετε αναζητήσει προηγουμένως
+\n
+\n • Διορθώθηκαν οι καταρρεύσεις εκκίνησης που συνέβαιναν με μη λατινικούς χάρτες
+\n
+\n • Βελτίωση των προβλημάτων απόδοσης ταχύτητας σε συσκευές Android 8.0
+\n
+\n • Υποστήριξη επεξεργασίας αντικειμένων πολυγώνου (χωρίς υπηρεσίες)
+\n
+\n • Μέτρηση απόστασης: προσθήκη πλήκτρου Μέτρησης  στις Ενέργειες στο μενού περιβάλλοντος
+\n"</string>
+    <string name="mapillary_menu_title_pano">Εμφάνιση μόνο εικόνων 360°</string>
+    <string name="rendering_value_black_name">Μαύρο</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-eo/phrases.xml b/OsmAnd/res/values-eo/phrases.xml
index 3a9948d299..d7b5839a94 100644
--- a/OsmAnd/res/values-eo/phrases.xml
+++ b/OsmAnd/res/values-eo/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_shop">Vendejo</string>
 		<string name="poi_shop_food">Butiko oportuna kaj superbazaro</string>
 	<string name="poi_emergency">Vivsavo</string>
@@ -58,7 +58,7 @@
 	<string name="poi_farm">Terfrukt-vendejo</string>
 	<string name="poi_greengrocer">Legom-butiko</string>
 	<string name="poi_seafood">Marfrukt-vendejo</string>
-	<string name="poi_confectionery">Sukeraĵejo</string>
+	<string name="poi_confectionery">Sukeraĵejo (vendejo)</string>
 	<string name="poi_ice_cream">Glaciaĵejo</string>
 	<string name="poi_supermarket">Superbazaro</string>
 	<string name="poi_tea">Teejo</string>
@@ -94,7 +94,7 @@
 	<string name="poi_aerodrome">Aerodromo</string>
 	<string name="poi_country">Lando</string>
 	<string name="poi_city">Urbego</string>
-	<string name="poi_capital">Ĉefurbo</string>
+	<string name="poi_capital">jes</string>
 	<string name="poi_town">Urbo</string>
 	<string name="poi_village">Vilaĝo</string>
 	<string name="poi_hamlet">Vilaĝeto</string>
@@ -173,7 +173,7 @@
 	<string name="poi_halt">Haltejo fervoja</string>
 	<string name="poi_railway_platform">Kajo fervoja</string>
 	<string name="poi_subway_entrance">Metro-enirejo</string>
-	<string name="poi_subway_station">Stacidomo metroa</string>
+	<string name="poi_subway_station">jes</string>
 	<string name="poi_waste_basket">Rubujo</string>
 
 	<string name="poi_tower">Turo</string>
@@ -694,7 +694,7 @@
 	<string name="poi_attraction_carousel">Karuselo</string>
 	<string name="poi_attraction_roller_coaster">Onda fervojo</string>
 	<string name="poi_attraction_slide">Deglitejo</string>
-	<string name="poi_attraction_summer_toboggan">Somera toboganejo</string>
+	<string name="poi_attraction_summer_toboggan">Somera tobogano</string>
 	<string name="poi_attraction_swing_carousel">Karuselo ĉenseĝa</string>
 	<string name="poi_attraction_train">Vagonareto (atrakcio)</string>
 	<string name="poi_attraction_water_slide">Akvodeglitejo</string>
@@ -1300,9 +1300,9 @@
 	<string name="poi_smoking_isolated">nur en izolita ĉambro</string>
 	<string name="poi_smoking_dedicated">destinita por fumantoj</string>
 
-	<string name="poi_toll_yes">Imposto</string>
-	<string name="poi_toll_no">Sen imposto</string>
-	<string name="poi_toll_hgv_yes">Imposto por kamionoj</string>
+	<string name="poi_toll_yes">Vojimposto</string>
+	<string name="poi_toll_no">Sen vojimposto</string>
+	<string name="poi_toll_hgv_yes">Vojimposto por kamionoj</string>
 	<string name="poi_tactile_paving_yes">jes</string>
 	<string name="poi_tactile_paving_no">sen reliefo por blinduloj</string>
 	<string name="poi_traffic_signals_sound_yes">jes</string>
@@ -1583,7 +1583,7 @@
 	<string name="poi_drive_through_no">Sen-elaŭtiĝa servo (trans-veturo): ne</string>
 
 	<string name="poi_brewery_additional">Nomo de bierfarejo</string>
-	<string name="poi_microbrewery_yes">Bierfarejeto-restoracio</string>
+	<string name="poi_microbrewery_yes">jes</string>
 	<string name="poi_microbrewery_no">Sen bierfarejeto-restoracio</string>
 
 	<string name="poi_takeaway_yes">Elportado</string>
@@ -3817,7 +3817,7 @@
 	<string name="poi_service_vehicle_wheels_yes">radoj</string>
 	<string name="poi_service_vehicle_glass_yes">fenestroj</string>
 	<string name="poi_service_vehicle_truck_repair_yes">riparo de kamionoj</string>
-	<string name="poi_service_vehicle_muffler_yes">malbruigilo</string>
+	<string name="poi_service_vehicle_muffler_yes">malbruigiloj</string>
 	<string name="poi_service_vehicle_alignment_yes">alĝustigo</string>
 	<string name="poi_service_vehicle_transmission_repair_yes">rapidumskatolo</string>
 	<string name="poi_service_vehicle_motor_yes">motoro</string>
@@ -3892,4 +3892,42 @@
 <string name="poi_atm">Bankaŭtomato</string>
 	<string name="poi_shoe_repair">Ŝu-riparejo</string>
 
-</resources>
+<string name="poi_bulk_purchase">Vendado sen pakumo</string>
+	<string name="poi_substation_type">Speco</string>
+
+<string name="poi_bulk_purchase_yes">jes</string>
+	<string name="poi_bulk_purchase_only">nur</string>
+
+	<string name="poi_pipeline_substation">Konduktuba substacio</string>
+	<string name="poi_substation_transmission">transsenda</string>
+	<string name="poi_substation_distribution">distribua</string>
+	<string name="poi_substation_minor_distribution">detal-distribua</string>
+	<string name="poi_substation_industrial">industria</string>
+	<string name="poi_substation_transition">sub-super-grunda</string>
+	<string name="poi_substation_traction">kontakt-linea (fervojo/trolebuso)</string>
+	<string name="poi_substation_converter">rektifilo aŭ ondigilo</string>
+	<string name="poi_substation_compensation">kompensa</string>
+
+	<string name="poi_substation_compression">premiga</string>
+	<string name="poi_substation_measurement">mezura</string>
+	<string name="poi_substation_valve">valvo</string>
+	<string name="poi_substation_valve_group">valvaro</string>
+	<string name="poi_substation_inspection_gauge">indikilo</string>
+	<string name="poi_substation_field_gathering">kolekta</string>
+    <string name="poi_craft_confectionery">Sukeraĵejo (metiejo)</string>
+    <string name="poi_shop_wholesale">Pogranda vendejo</string>
+    <string name="poi_books_type">Libroj</string>
+    <string name="poi_laboratory">Medicina laboratorio</string>
+    <string name="poi_blood_donation">Sang-donejo</string>
+    <string name="poi_books_comic">bildrakontoj</string>
+    <string name="poi_books_antiquarian">uzitaj</string>
+    <string name="poi_books_religion">religiaj</string>
+    <string name="poi_books_academic">lernolibroj</string>
+    <string name="poi_books_children">infanaj</string>
+    <string name="poi_atoll">Atolo</string>
+    <string name="poi_toll_gantry">Telekontrolo de vojimposto</string>
+    <string name="poi_childcare">Infan-vartejo</string>
+    <string name="poi_denotation">Signifo</string>
+    <string name="poi_denotation_natural_monument">natura monumento</string>
+    <string name="poi_denotation_landmark">orientiĝa punkto</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index addebd71ee..429d274732 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="shared_string_topbar">Supra breto</string>
     <string name="recalculate_route">Rekalkuli kurson</string>
     <string name="donations">Donacoj</string>
@@ -2559,14 +2559,14 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="mapillary_menu_descr_tile_cache">Reŝargi kahelojn por ĝisdatigi datumojn.</string>
     <string name="mapillary_menu_title_tile_cache">Kahela memoro</string>
     <string name="wrong_user_name">Erara uzantnomo</string>
-    <string name="shared_string_to">Al</string>
-    <string name="mapillary_menu_date_from">El</string>
-    <string name="mapillary_menu_descr_dates">Montri nur aldonitajn bildojn</string>
+    <string name="shared_string_to">al</string>
+    <string name="mapillary_menu_date_from">de</string>
+    <string name="mapillary_menu_descr_dates">Montri bildojn aldonitajn nur</string>
     <string name="mapillary_menu_title_dates">Dato</string>
     <string name="mapillary_menu_edit_text_hint">Entajpu uzantnomon</string>
     <string name="mapillary_menu_descr_username">Montri nur bildojn aldonitajn de</string>
     <string name="mapillary_menu_title_username">Uzantnomo</string>
-    <string name="mapillary_menu_filter_description">Filtri bildojn laŭ alŝutinto aŭ laŭ dato; aktivaj nur je pligrandigo.</string>
+    <string name="mapillary_menu_filter_description">Filtri bildojn laŭ alŝutinto, laŭ dato aŭ laŭ tipo; aktivaj nur je pligrandigo.</string>
     <string name="shared_string_reset">Reagordi</string>
     <string name="store_tracks_in_monthly_directories">Konservi registritajn spurojn en monataj dosierujoj</string>
     <string name="store_tracks_in_monthly_directories_descrp">Konservi registritajn spurojn en dosierujoj por registrita monato (kiel 2018-01).</string>
@@ -2982,11 +2982,60 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="rendering_value_black_name">Nigra</string>
     <string name="more_transport_on_stop_hint">Estas pliaj transportiloj ĉe tiu ĉi haltejo.</string>
     <string name="search_street">Serĉi straton</string>
-    <string name="start_search_from_city">Ekigi serĉi de urbo</string>
+    <string name="start_search_from_city">Elekti urbon</string>
     <string name="shared_string_restore">Restarigi</string>
     <string name="keep_passed_markers_descr">Markoj aldonitaj kiel grupo de ŝatataj aŭ pasigitaj GPX-navigadpunktoj restos sur la mapo. Se la grupo estas malaktiva, ĝiaj markoj malaperos de la mapo.</string>
     <string name="keep_passed_markers">Ne kaŝi pasigitajn map-markojn de la mapo</string>
     <string name="markers_remove_dialog_msg">Ĉu forigi map-markon “%s”\?</string>
     <string name="edit_map_marker">Redakti map-markon</string>
     <string name="third_party_application">Aplikaĵo de ekstera firmao</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Kotizoj</string>
+    <string name="osm_live_payment_monthly_title">Pagi ĉiumonate</string>
+    <string name="osm_live_payment_3_months_title">Pagi je ĉiu 3 monatoj</string>
+    <string name="osm_live_payment_annual_title">Pagi ĉiujare</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / monato</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$,2f %2$s / monato</string>
+    <string name="osm_live_payment_discount_descr">Ŝparu %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Via nuna kotizo</string>
+    <string name="osm_live_payment_renews_monthly">Reaboni ĉiumonate</string>
+    <string name="osm_live_payment_renews_quarterly">Reaboni ĉiukvaronjare</string>
+    <string name="osm_live_payment_renews_annually">Reaboni ĉiujare</string>
+    <string name="default_price_currency_format">%1$,2f %2$s</string>
+    <string name="osm_live_payment_header">Elektu la plej oportunan pagmanieron por vi:</string>
+    <string name="osm_live_payment_contribute_descr">Parto de enspezoj transdoniĝas al OpenStreetMap-kontribuantoj.</string>
+    <string name="powered_by_osmand">Povigata de OsmAnd</string>
+    <string name="osm_live_subscriptions">Abonoj</string>
+    <string name="mapillary_menu_title_pano">Montri nur bildojn 360°</string>
+    <string name="shared_string_launch">Lanĉi</string>
+    <string name="run_full_osmand_msg">Vi uzas mapon {0}, kiu estas povigata de OsmAnd. Ĉu lanĉi la plenan version de OsmAnd\?</string>
+    <string name="run_full_osmand_header">Ĉu lanĉi OsmAnd\?</string>
+    <string name="lang_gn_py">Gvarania</string>
+    <string name="quick_action_switch_day_night_descr">Frapetu tiun ĉi ag-butonon por baskuli inter nokta kaj taga reĝimoj.</string>
+    <string name="quick_action_switch_day_mode">Taga reĝimo</string>
+    <string name="quick_action_switch_night_mode">Nokta reĝimo</string>
+    <string name="quick_action_day_night_switch_mode">Taga/nokta reĝimo</string>
+    <string name="swap_start_and_destination">Interŝanĝi komencon por celo</string>
+    <string name="add_destination_point">Aldoni celon</string>
+    <string name="add_intermediate_point">Aldoni intercelon</string>
+    <string name="add_start_point">Aldoni komencpunkton</string>
+    <string name="intermediate_waypoint">Intercelo: %1$s</string>
+    <string name="waypoints">Navigadpunktoj: %1$s</string>
+    <string name="transfers">transveturiliĝoj: %1$s</string>
+    <string name="on_foot">piede: %1$s</string>
+    <string name="route_way">Vojo: %1$s</string>
+    <string name="points_of_interests">Interesejoj</string>
+    <string name="waiting_for_route_calculation">Atendu ĝis la kurso kalkuliĝos</string>
+    <string name="app_mode_public_transport">Transporto publika</string>
+    <string name="avoid_roads_descr">Marku la vojon sur la mapo aŭ elektu ĝin el la jena listo por eviti ĝin dum navigado:</string>
+    <string name="show_along_the_route">Montri laŭlonge de kurso</string>
+    <string name="simulate_navigation">Simuli navigadon</string>
+    <string name="choose_track_file_to_follow">Elektu dosieron de kurso por sekvi</string>
+    <string name="voice_announcements">Voĉaj anoncoj</string>
+    <string name="intermediate_destinations">Interceloj: %1$s</string>
+    <string name="arrive_at_time">Alveno je %1$s</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">Mg</string>
+    <string name="shared_string_capacity">Enhaveco</string>
+    <string name="shared_string_width">Larĝo</string>
+    <string name="shared_string_height">Alto</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index a724db7b38..10401b6531 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_shop">Tienda;Almacén</string>
 		<string name="poi_shop_food">Almacén y supermercado</string>
 	<string name="poi_emergency">Emergencia</string>
@@ -171,7 +171,7 @@
 	<string name="poi_vehicle_inspection">Inspección de vehículos</string>
 	<string name="poi_car_wash">Lavadero de automóviles</string>
 	<string name="poi_fuel">Estación de servicio;Gasolinera;Servicentro</string>
-	<string name="poi_fuel_diesel">Euro Diésel (grado 3; euro V);Infinia Diesel;V-Power Nitro+ Diesel;Euro+ Diesel;Podium;Oil Diesel D10</string>
+	<string name="poi_fuel_diesel">Euro Diésel (grado 3, euro V);Infinia Diesel;V-Power Nitro+ Diesel;Euro+ Diesel;Podium</string>
 	<string name="poi_fuel_gtl_diesel">Diésel GTL</string>
 	<string name="poi_fuel_hgv_diesel">Diésel de vehículos pesados</string>
 	<string name="poi_fuel_biodiesel">Biodiésel</string>
@@ -215,7 +215,7 @@
 	<string name="poi_railway_platform">Andén de tren</string>
 	<string name="poi_halt">Parada de tren</string>
 	<string name="poi_subway_entrance">Entrada de subte;Entrada de metro</string>
-	<string name="poi_subway_station">Estación de subte;Estación de metro</string>
+	<string name="poi_subway_station">Sí</string>
 	<string name="poi_railway_buffer_stop">Fin de vía</string>
 	<string name="poi_taxi">Parada de taxi;Remis</string>
 
@@ -944,7 +944,7 @@
 
 	<string name="poi_access_delivery">Acceso para entregas</string>
 	<string name="poi_monitoring_station">Estación de monitoreo</string>
-	<string name="poi_capital">Capital</string>
+	<string name="poi_capital">Sí</string>
 	<string name="poi_fee_no">No</string>
 
 	<string name="poi_email">Correo electrónico;Email</string>
@@ -3084,7 +3084,7 @@
 	<string name="poi_traffic_signals_sound">Sonoro</string>
 	<string name="poi_highway_crossing_type">Tipo de cruce</string>
 	<string name="poi_tactile_paving">Pavimento táctil</string>
-	<string name="poi_service_general">Servicio para el automóvil</string>
+	<string name="poi_service_general">Servicio automotriz</string>
 	<string name="poi_self_service">Autoservicio</string>
 	<string name="poi_automated">Automatizado</string>
 	<string name="poi_parking_type">Tipo de estacionamiento</string>
@@ -3848,26 +3848,26 @@
 <string name="poi_amusement_arcade">Salón recreativo</string>
 	<string name="poi_adult_gaming_centre">Centro de juegos para adultos</string>
 
-<string name="poi_service_car">Servicio para el automóvil</string>
+<string name="poi_service_car">Servicio automotriz</string>
 
-<string name="poi_service_vehicle_car_repair_yes">Taller mecánico</string>
+<string name="poi_service_vehicle_car_repair_yes">Taller para automóviles</string>
 	<string name="poi_service_vehicle_oil_change_yes">Cambio de aceite</string>
 	<string name="poi_service_vehicle_used_car_sales_yes">Venta de autos usados</string>
 	<string name="poi_service_vehicle_brakes_yes">Frenos</string>
 	<string name="poi_service_vehicle_new_car_sales_yes">Venta de autos nuevos</string>
-	<string name="poi_service_vehicle_diagnostics_yes">Diagnóstico</string>
+	<string name="poi_service_vehicle_diagnostics_yes">Diagnósticos</string>
 	<string name="poi_service_vehicle_car_parts_yes">Autopartes</string>
 	<string name="poi_service_vehicle_batteries_yes">Baterías</string>
 	<string name="poi_service_vehicle_air_conditioning_yes">Aire acondicionado</string>
-	<string name="poi_service_vehicle_body_repair_yes">Reparación de carrocería</string>
+	<string name="poi_service_vehicle_body_repair_yes">Reparación de carrocerías</string>
 	<string name="poi_service_vehicle_electrical_yes">Eléctrico</string>
 	<string name="poi_service_vehicle_wheels_yes">Ruedas</string>
-	<string name="poi_service_vehicle_glass_yes">Vidrio</string>
-	<string name="poi_service_vehicle_truck_repair_yes">Taller mecánico para camiones</string>
+	<string name="poi_service_vehicle_glass_yes">Vidrios</string>
+	<string name="poi_service_vehicle_truck_repair_yes">Taller para camiones</string>
 	<string name="poi_service_vehicle_muffler_yes">Silenciador</string>
 	<string name="poi_service_vehicle_alignment_yes">Alineación</string>
 	<string name="poi_service_vehicle_transmission_repair_yes">Reparación de la transmisión</string>
-	<string name="poi_service_vehicle_motor_yes">Motor</string>
+	<string name="poi_service_vehicle_motor_yes">Motores</string>
 	<string name="poi_service_vehicle_insurance_yes">Aseguradora</string>
 	<string name="poi_service_vehicle_tyres_yes">Neumáticos</string>
 
@@ -3921,7 +3921,7 @@
 	<string name="poi_payment_contactless_no">No acepta Pagos sin contacto</string>
 
 <string name="poi_hazard_nuclear">Peligro nuclear</string>
-	<string name="poi_hazard_erosion">Peligro de erosión</string>
+	<string name="poi_hazard_erosion">Peligro de derrumbe por erosión</string>
 	<string name="poi_hazard_avalanche">Peligro de avalancha</string>
 	<string name="poi_hazard_slippery_road">Camino resbaladizo</string>
 	<string name="poi_hazard_flood">Peligro de inundación</string>
@@ -3938,4 +3938,42 @@
 <string name="poi_atm">Cajero automático</string>
 	<string name="poi_shoe_repair">Reparación de calzado;Zapatero</string>
 
-</resources>
+<string name="poi_bulk_purchase">Compra al por mayor</string>
+	<string name="poi_substation_type">Tipo de subestación</string>
+
+<string name="poi_bulk_purchase_yes">Sí</string>
+	<string name="poi_bulk_purchase_only">Únicamente</string>
+
+	<string name="poi_pipeline_substation">Subestación de tuberías</string>
+	<string name="poi_substation_transmission">Transmisión</string>
+	<string name="poi_substation_distribution">Distribución</string>
+	<string name="poi_substation_minor_distribution">Distribución menor</string>
+	<string name="poi_substation_industrial">Industrial</string>
+	<string name="poi_substation_transition">Transición</string>
+	<string name="poi_substation_traction">Tracción</string>
+	<string name="poi_substation_converter">Convertidora</string>
+	<string name="poi_substation_compensation">Compensación</string>
+
+	<string name="poi_substation_compression">Compresión</string>
+	<string name="poi_substation_measurement">Medición</string>
+	<string name="poi_substation_valve">Válvula</string>
+	<string name="poi_substation_valve_group">Grupo de válvulas</string>
+	<string name="poi_substation_inspection_gauge">Calibre de inspección</string>
+	<string name="poi_substation_field_gathering">Recolección de campo</string>
+    <string name="poi_craft_confectionery">Elaboración de dulces</string>
+    <string name="poi_shop_wholesale">Venta mayorista</string>
+    <string name="poi_books_type">Libros</string>
+    <string name="poi_laboratory">Laboratorio médico</string>
+    <string name="poi_blood_donation">Donación de sangre</string>
+    <string name="poi_books_comic">Historietas</string>
+    <string name="poi_books_antiquarian">Antiguos</string>
+    <string name="poi_books_religion">Religiosos</string>
+    <string name="poi_books_academic">Académicos</string>
+    <string name="poi_books_children">Infantiles</string>
+    <string name="poi_atoll">Atolón</string>
+    <string name="poi_toll_gantry">Pórtico de peaje</string>
+    <string name="poi_childcare">Guardería;Cuidado de niños</string>
+    <string name="poi_denotation">Denotación</string>
+    <string name="poi_denotation_natural_monument">Monumento natural</string>
+    <string name="poi_denotation_landmark">Referencia terrestre</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index aa300b7676..a16b86c47b 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="rendering_attr_hideHouseNumbers_name">Números de casa</string>
@@ -270,7 +270,7 @@ Lon %2$s</string>
     <string name="select_destination_and_intermediate_points">Elige los destinos</string>
     <string name="layer_amenity_label">Nombres de PDI superpuestos</string>
     <string name="loading_smth">Cargando %1$s…</string>
-    <string name="map_widget_plain_time">Tiempo actual</string>
+    <string name="map_widget_plain_time">Hora actual</string>
     <string name="shared_string_waypoint">Punto de referencia</string>
     <string name="selected_gpx_info_show">"
 \n
@@ -2604,7 +2604,7 @@ Lon %2$s</string>
     <string name="mapillary_menu_edit_text_hint">Escribir nombre de usuario</string>
     <string name="mapillary_menu_descr_username">Ver sólo imágenes añadidas por</string>
     <string name="mapillary_menu_title_username">Nombre de usuario</string>
-    <string name="mapillary_menu_filter_description">Filtrar imágenes por usuario o por fecha. Sólo activado en los primeros zooms.</string>
+    <string name="mapillary_menu_filter_description">Filtrar imágenes por usuario, fecha o tipo. Sólo activado en los primeros zooms.</string>
     <string name="shared_string_reload">Recargar</string>
     <string name="mapillary_menu_descr_tile_cache">Recarga las teselas para ver la información actualizada.</string>
     <string name="mapillary_menu_title_tile_cache">Caché de teselas</string>
@@ -2738,7 +2738,7 @@ Lon %2$s</string>
     <string name="shared_string_back">Atrás</string>
     <string name="shared_string_view">Ver</string>
 	<string name="waypoints_added_to_map_markers">Puntos de referencia añadidos en «Marcadores del mapa»</string>
-	<string name="import_gpx_file_description">pueden importarse como Favoritos o como un archivo GPX.</string>
+	<string name="import_gpx_file_description">puede importarse como Favoritos o como un archivo GPX.</string>
     <string name="import_as_gpx">Importar como archivo GPX</string>
     <string name="import_as_favorites">Importar como Favoritos</string>
     <string name="import_file">Importar archivo</string>
@@ -3029,4 +3029,53 @@ Lon %2$s</string>
     <string name="markers_remove_dialog_msg">¿Borrar marcador del mapa «%s»\?</string>
     <string name="edit_map_marker">Editar marcador del mapa</string>
     <string name="third_party_application">Aplicación de terceros</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Plan y Precios</string>
+    <string name="osm_live_payment_monthly_title">Pago mensual</string>
+    <string name="osm_live_payment_3_months_title">Pago trimestral</string>
+    <string name="osm_live_payment_annual_title">Pago anual</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
+    <string name="osm_live_payment_discount_descr">¡Ahorra %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Suscripción actual</string>
+    <string name="osm_live_payment_renews_monthly">Renovar mensualmente</string>
+    <string name="osm_live_payment_renews_quarterly">Renovar trimestralmente</string>
+    <string name="osm_live_payment_renews_annually">Renovar anualmente</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Elige la frecuencia de pago:</string>
+    <string name="osm_live_payment_contribute_descr">Parte de los ingresos se destina a los colaboradores de OpenStreetMap.</string>
+    <string name="powered_by_osmand">Desarrollado por OsmAnd</string>
+    <string name="osm_live_subscriptions">Suscripciones</string>
+    <string name="mapillary_menu_title_pano">Sólo mostrar imágenes en 360°</string>
+    <string name="shared_string_launch">Ejecutar</string>
+    <string name="run_full_osmand_msg">Estás utilizando el mapa «{0}» que funciona con OsmAnd. ¿Quieres ejecutar la versión completa de OsmAnd\?</string>
+    <string name="run_full_osmand_header">¿Ejecutar OsmAnd\?</string>
+    <string name="lang_gn_py">Guaraní</string>
+    <string name="quick_action_switch_day_night_descr">Este botón de acción, alterna entre el modo «Diurno» y «Nocturno» para OsmAnd</string>
+    <string name="quick_action_switch_day_mode">Modo diurno</string>
+    <string name="quick_action_switch_night_mode">Modo nocturno</string>
+    <string name="quick_action_day_night_switch_mode">Alternar modos diurno/nocturno</string>
+    <string name="swap_start_and_destination">Intercambiar inicio y destino</string>
+    <string name="add_destination_point">Añadir destino</string>
+    <string name="add_intermediate_point">Añadir punto intermedio</string>
+    <string name="add_start_point">Añadir punto de partida</string>
+    <string name="intermediate_waypoint">Punto intermedio: %1$s</string>
+    <string name="waypoints">Puntos de referencia: %1$s</string>
+    <string name="transfers">transferencias: %1$s</string>
+    <string name="on_foot">a pie: %1$s</string>
+    <string name="route_way">Ruta: %1$s</string>
+    <string name="points_of_interests">Puntos de interés (PDI)</string>
+    <string name="waiting_for_route_calculation">Esperando el cálculo de la ruta</string>
+    <string name="app_mode_public_transport">Transporte público</string>
+    <string name="avoid_roads_descr">Marca el camino a evitar durante la navegación, desde el mapa o de la siguiente lista:</string>
+    <string name="show_along_the_route">Mostrar a lo largo de la ruta</string>
+    <string name="simulate_navigation">Simular navegación</string>
+    <string name="choose_track_file_to_follow">Elige el archivo de la traza a seguir</string>
+    <string name="voice_announcements">Anuncios de voz</string>
+    <string name="intermediate_destinations">Destinos intermedios: %1$s</string>
+    <string name="arrive_at_time">Llegará a las %1$s</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">ton</string>
+    <string name="shared_string_capacity">Capacidad</string>
+    <string name="shared_string_width">Ancho</string>
+    <string name="shared_string_height">Altura</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rUS/phrases.xml b/OsmAnd/res/values-es-rUS/phrases.xml
index 59f6052d87..bed84f9a1f 100644
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_shop">Tienda;Almacén</string>
 		<string name="poi_shop_food">Tienda de comestibles y supermercado</string>
 	<string name="poi_emergency">Emergencia</string>
@@ -109,7 +109,7 @@
 	<string name="poi_organic">Comida orgánica</string>
 	<string name="poi_outdoor">Tienda de actividades al aire libre</string>
 	<string name="poi_paint">Pinturería</string>
-	<string name="poi_pet">Tienda de mascotas</string>
+	<string name="poi_pet">Mascotas</string>
 	<string name="poi_photo">Tienda fotográfica</string>
 	<string name="poi_radiotechnics">Venta de radiotecnia</string>
 	<string name="poi_second_hand">Tienda de artículos usados</string>
@@ -208,7 +208,7 @@
 	<string name="poi_railway_platform">Andén de tren</string>
 	<string name="poi_halt">Parada de tren</string>
 	<string name="poi_subway_entrance">Entrada de metro;Entrada de subte</string>
-	<string name="poi_subway_station">Estación de metro;Estación de subte</string>
+	<string name="poi_subway_station">Sí</string>
 	<string name="poi_railway_buffer_stop">Fin de vía</string>
 	<string name="poi_taxi">Parada de taxi;Remis</string>
 	<string name="poi_aerodrome">Aeropuerto;Aeródromo</string>
@@ -890,7 +890,7 @@
 	<string name="poi_access_agricultural">Acceso agrícola</string>
 	<string name="poi_access_delivery">Acceso para entregas</string>
 	<string name="poi_monitoring_station">Estación de monitoreo</string>
-	<string name="poi_capital">Capital</string>
+	<string name="poi_capital">Sí</string>
 	<string name="poi_fee_no">No</string>
 	<string name="poi_email">Correo electrónico;Email</string>
 	<string name="poi_fax">Fax</string>
@@ -1097,7 +1097,7 @@
 	<string name="poi_trade_plumbing">Suministros de plomería;Suministros de fontanería</string>
 	<string name="poi_trade_wood">Venta de madera</string>
 	<string name="poi_trade_agricultural_supplies">Suministros agrícolas</string>
-	<string name="poi_trade_tile">Azulejos</string>
+	<string name="poi_trade_tile">Venta de azulejos</string>
 	<string name="poi_population">Población</string>
 	<string name="poi_parking_underground">Subterráneo</string>
 	<string name="poi_parking_multi_storey">De varios pisos</string>
@@ -2188,7 +2188,7 @@
 	<string name="poi_sculptor">Escultor</string>
 	<string name="poi_cross">Cruz</string>
 	<string name="poi_summit_cross">Cumbre a la cruz: sí</string>
-	<string name="poi_prison_camp">Ex campo de prisioneros</string>
+	<string name="poi_prison_camp">Ex campo de prisioneros;Ex centro clandestino de detención</string>
 	<string name="poi_concentration_camp">Tipo: campo de concentración</string>
 	<string name="poi_pow_camp">Tipo: prisioneros de guerra</string>
 	<string name="poi_labor_camp">Tipo: trabajos forzados</string>
@@ -2847,7 +2847,7 @@
 	<string name="poi_traffic_signals_sound">Sonoro</string>
 	<string name="poi_highway_crossing_type">Tipo de cruce</string>
 	<string name="poi_tactile_paving">Pavimento táctil</string>
-	<string name="poi_service_general">Servicio para el automóvil</string>
+	<string name="poi_service_general">Servicio automotriz</string>
 	<string name="poi_brushless">Cepillo giratorio</string>
 	<string name="poi_self_service">Autoservicio</string>
 	<string name="poi_automated">Automatizado</string>
@@ -3469,7 +3469,7 @@
 	<string name="poi_post_flats">Piso de oficina</string>
 
 <string name="poi_payment_centre">Centro de pagos</string>
-	<string name="poi_money_transfer">Transferencia de dinero; Giros de dinero</string>
+	<string name="poi_money_transfer">Transferencia de dinero;Giros de dinero</string>
 
 <string name="poi_route_subway_ref">Metro</string>
 
@@ -3607,26 +3607,26 @@
 <string name="poi_amusement_arcade">Salón recreativo</string>
 	<string name="poi_adult_gaming_centre">Centro de juegos para adultos</string>
 
-<string name="poi_service_car">Servicio para el automóvil</string>
+<string name="poi_service_car">Servicio automotriz</string>
 
-<string name="poi_service_vehicle_car_repair_yes">Taller mecánico</string>
+<string name="poi_service_vehicle_car_repair_yes">Taller para automóviles</string>
 	<string name="poi_service_vehicle_oil_change_yes">Cambio de aceite</string>
 	<string name="poi_service_vehicle_used_car_sales_yes">Venta de autos usados</string>
 	<string name="poi_service_vehicle_brakes_yes">Frenos</string>
 	<string name="poi_service_vehicle_new_car_sales_yes">Venta de autos nuevos</string>
-	<string name="poi_service_vehicle_diagnostics_yes">Diagnóstico</string>
+	<string name="poi_service_vehicle_diagnostics_yes">Diagnósticos</string>
 	<string name="poi_service_vehicle_car_parts_yes">Autopartes</string>
 	<string name="poi_service_vehicle_batteries_yes">Baterías</string>
 	<string name="poi_service_vehicle_air_conditioning_yes">Aire acondicionado</string>
-	<string name="poi_service_vehicle_body_repair_yes">Reparación de carrocería</string>
+	<string name="poi_service_vehicle_body_repair_yes">Reparación de carrocerías</string>
 	<string name="poi_service_vehicle_electrical_yes">Eléctrico</string>
 	<string name="poi_service_vehicle_wheels_yes">Ruedas</string>
-	<string name="poi_service_vehicle_glass_yes">Vidrio</string>
-	<string name="poi_service_vehicle_truck_repair_yes">Taller mecánico para camiones</string>
+	<string name="poi_service_vehicle_glass_yes">Vidrios</string>
+	<string name="poi_service_vehicle_truck_repair_yes">Taller para camiones</string>
 	<string name="poi_service_vehicle_muffler_yes">Silenciador</string>
 	<string name="poi_service_vehicle_alignment_yes">Alineación</string>
 	<string name="poi_service_vehicle_transmission_repair_yes">Reparación de la transmisión</string>
-	<string name="poi_service_vehicle_motor_yes">Motor</string>
+	<string name="poi_service_vehicle_motor_yes">Motores</string>
 	<string name="poi_service_vehicle_insurance_yes">Aseguradora</string>
 	<string name="poi_service_vehicle_tyres_yes">Neumáticos</string>
 
@@ -3677,10 +3677,10 @@
 	<string name="poi_outcrop">Afloramiento</string>
 
 <string name="poi_payment_contactless_yes">Pago sin contacto</string>
-	<string name="poi_payment_contactless_no">"No acepta Pagos sin contacto "</string>
+	<string name="poi_payment_contactless_no">No acepta Pagos sin contacto</string>
 
 <string name="poi_hazard_nuclear">Peligro nuclear</string>
-	<string name="poi_hazard_erosion">Peligro de erosión</string>
+	<string name="poi_hazard_erosion">Peligro de derrumbe por erosión</string>
 	<string name="poi_hazard_avalanche">Peligro de avalancha</string>
 	<string name="poi_hazard_slippery_road">Camino resbaladizo</string>
 	<string name="poi_hazard_flood">Peligro de inundación</string>
@@ -3697,4 +3697,42 @@
 <string name="poi_atm">Cajero automático</string>
 	<string name="poi_shoe_repair">Reparación de calzado;Zapatero</string>
 
-</resources>
+<string name="poi_bulk_purchase">Compra al por mayor</string>
+	<string name="poi_substation_type">Tipo de subestación</string>
+
+<string name="poi_bulk_purchase_yes">Sí</string>
+	<string name="poi_bulk_purchase_only">Únicamente</string>
+
+	<string name="poi_pipeline_substation">Subestación de tuberías</string>
+	<string name="poi_substation_transmission">Transmisión</string>
+	<string name="poi_substation_distribution">Distribución</string>
+	<string name="poi_substation_minor_distribution">Distribución menor</string>
+	<string name="poi_substation_industrial">Industrial</string>
+	<string name="poi_substation_transition">Transición</string>
+	<string name="poi_substation_traction">Tracción</string>
+	<string name="poi_substation_converter">Convertidora</string>
+	<string name="poi_substation_compensation">Compensación</string>
+
+	<string name="poi_substation_compression">Compresión</string>
+	<string name="poi_substation_measurement">Medición</string>
+	<string name="poi_substation_valve">Válvula</string>
+	<string name="poi_substation_valve_group">Grupo de válvulas</string>
+	<string name="poi_substation_inspection_gauge">Calibre de inspección</string>
+	<string name="poi_substation_field_gathering">Recolección de campo</string>
+    <string name="poi_craft_confectionery">Elaboración de dulces</string>
+    <string name="poi_shop_wholesale">Venta mayorista</string>
+    <string name="poi_books_type">Libros</string>
+    <string name="poi_laboratory">Laboratorio médico</string>
+    <string name="poi_blood_donation">Donación de sangre</string>
+    <string name="poi_books_comic">Historietas</string>
+    <string name="poi_books_antiquarian">Antiguos</string>
+    <string name="poi_books_religion">Religiosos</string>
+    <string name="poi_books_academic">Académicos</string>
+    <string name="poi_books_children">Infantiles</string>
+    <string name="poi_atoll">Atolón</string>
+    <string name="poi_toll_gantry">Pórtico de peaje</string>
+    <string name="poi_childcare">Cuidado de niños;Guardería</string>
+    <string name="poi_denotation">Denotación</string>
+    <string name="poi_denotation_natural_monument">Monumento natural</string>
+    <string name="poi_denotation_landmark">Referencia terrestre</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index 4ca83deb18..2b5b3a9516 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="rendering_attr_hideHouseNumbers_name">Números de casa</string>
@@ -270,7 +270,7 @@ Lon %2$s</string>
     <string name="select_destination_and_intermediate_points">Elige los destinos</string>
     <string name="layer_amenity_label">Nombres de PDI superpuestos</string>
     <string name="loading_smth">Cargando %1$s…</string>
-    <string name="map_widget_plain_time">Tiempo actual</string>
+    <string name="map_widget_plain_time">Hora actual</string>
     <string name="shared_string_waypoint">Punto de referencia</string>
     <string name="selected_gpx_info_show">"
 \n
@@ -2605,7 +2605,7 @@ Lon %2$s</string>
     <string name="mapillary_menu_edit_text_hint">Escribir nombre de usuario</string>
     <string name="mapillary_menu_descr_username">Ver sólo imágenes añadidas por</string>
     <string name="mapillary_menu_title_username">Nombre de usuario</string>
-    <string name="mapillary_menu_filter_description">Filtrar imágenes por usuario o por fecha. Sólo activado en los primeros zooms.</string>
+    <string name="mapillary_menu_filter_description">Filtrar imágenes por usuario, fecha o tipo. Sólo activado en los primeros zooms.</string>
     <string name="shared_string_reload">Recargar</string>
     <string name="mapillary_menu_descr_tile_cache">Recarga las teselas para ver la información actualizada.</string>
     <string name="mapillary_menu_title_tile_cache">Caché de teselas</string>
@@ -2739,7 +2739,7 @@ Lon %2$s</string>
     <string name="wrong_format">Formato incorrecto</string>
     <string name="shared_string_view">Ver</string>
 	<string name="waypoints_added_to_map_markers">Puntos de referencia añadidos en «Marcadores del mapa»</string>
-	<string name="import_gpx_file_description">pueden importarse como Favoritos o como un archivo GPX.</string>
+	<string name="import_gpx_file_description">puede importarse como Favoritos o como un archivo GPX.</string>
     <string name="import_as_gpx">Importar como archivo GPX</string>
     <string name="import_as_favorites">Importar como Favoritos</string>
     <string name="import_file">Importar archivo</string>
@@ -3030,4 +3030,53 @@ Lon %2$s</string>
     <string name="markers_remove_dialog_msg">¿Borrar marcador del mapa «%s»\?</string>
     <string name="edit_map_marker">Editar marcador del mapa</string>
     <string name="third_party_application">Aplicación de terceros</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Plan y Precios</string>
+    <string name="osm_live_payment_monthly_title">Pago mensual</string>
+    <string name="osm_live_payment_3_months_title">Pago trimestral</string>
+    <string name="osm_live_payment_annual_title">Pago anual</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
+    <string name="osm_live_payment_discount_descr">¡Ahorra %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Suscripción actual</string>
+    <string name="osm_live_payment_renews_monthly">Renovar mensualmente</string>
+    <string name="osm_live_payment_renews_quarterly">Renovar trimestralmente</string>
+    <string name="osm_live_payment_renews_annually">Renovar anualmente</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Elige la frecuencia de pago:</string>
+    <string name="osm_live_payment_contribute_descr">Parte de los ingresos se destina a los colaboradores de OpenStreetMap.</string>
+    <string name="powered_by_osmand">Desarrollado por OsmAnd</string>
+    <string name="osm_live_subscriptions">Suscripciones</string>
+    <string name="mapillary_menu_title_pano">Sólo mostrar imágenes en 360°</string>
+    <string name="shared_string_launch">Ejecutar</string>
+    <string name="run_full_osmand_msg">Estás utilizando el mapa «{0}» que funciona con OsmAnd. ¿Quieres ejecutar la versión completa de OsmAnd\?</string>
+    <string name="run_full_osmand_header">¿Ejecutar OsmAnd\?</string>
+    <string name="lang_gn_py">Guaraní</string>
+    <string name="quick_action_switch_day_night_descr">Este botón de acción, alterna entre el modo «Diurno» y «Nocturno» para OsmAnd</string>
+    <string name="quick_action_switch_day_mode">Modo diurno</string>
+    <string name="quick_action_switch_night_mode">Modo nocturno</string>
+    <string name="quick_action_day_night_switch_mode">Alternar modos diurno/nocturno</string>
+    <string name="swap_start_and_destination">Intercambiar inicio y destino</string>
+    <string name="add_destination_point">Añadir destino</string>
+    <string name="add_intermediate_point">Añadir punto intermedio</string>
+    <string name="add_start_point">Añadir punto de partida</string>
+    <string name="intermediate_waypoint">Punto intermedio: %1$s</string>
+    <string name="waypoints">Puntos de referencia: %1$s</string>
+    <string name="transfers">transferencias: %1$s</string>
+    <string name="on_foot">a pie: %1$s</string>
+    <string name="route_way">Ruta: %1$s</string>
+    <string name="points_of_interests">Puntos de interés (PDI)</string>
+    <string name="waiting_for_route_calculation">Esperando el cálculo de la ruta</string>
+    <string name="app_mode_public_transport">Transporte público</string>
+    <string name="avoid_roads_descr">Marca el camino a evitar durante la navegación, desde el mapa o de la siguiente lista:</string>
+    <string name="show_along_the_route">Mostrar a lo largo de la ruta</string>
+    <string name="simulate_navigation">Simular navegación</string>
+    <string name="choose_track_file_to_follow">Elige el archivo de la traza a seguir</string>
+    <string name="voice_announcements">Anuncios de voz</string>
+    <string name="intermediate_destinations">Destinos intermedios: %1$s</string>
+    <string name="arrive_at_time">Llegará a las %1$s</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">ton</string>
+    <string name="shared_string_capacity">Capacidad</string>
+    <string name="shared_string_width">Ancho</string>
+    <string name="shared_string_height">Altura</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index 5a560cc27c..96706c71b5 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_shop">Tienda</string>
 		<string name="poi_shop_food">Tienda de comestibles y supermercado</string>
 	<string name="poi_emergency">Emergencia</string>
@@ -144,7 +144,7 @@
 	<string name="poi_railway_station">Estación de tren</string>
 	<string name="poi_halt">Parada de tren</string>
 	<string name="poi_subway_entrance">Entrada de metro</string>
-	<string name="poi_subway_station">Estación de metro</string>
+	<string name="poi_subway_station">Sí</string>
 	<string name="poi_aerodrome">Aeropuerto</string>
 	<string name="poi_helipad">Helipuerto</string>
 	<string name="poi_taxi">Parada de taxi</string>
@@ -387,7 +387,7 @@
 	<string name="poi_bathroom_furnishing">Muebles de baño</string>
 	<string name="poi_carpet">Tienda de alfombras</string>
 	<string name="poi_charity">Tienda benéfica</string>
-	<string name="poi_confectionery">Confitería</string>
+	<string name="poi_confectionery">Confitería;Dulcería</string>
 	<string name="poi_clothes">Tienda de ropa</string>
 	<string name="poi_clothes_children">Ropa infantil</string>
 	<string name="poi_shoes">Zapatería</string>
@@ -947,7 +947,7 @@
 
 	<string name="poi_access_delivery">Acceso para entregas</string>
 	<string name="poi_monitoring_station">Estación de monitoreo</string>
-	<string name="poi_capital">Capital</string>
+	<string name="poi_capital">Sí</string>
 	<string name="poi_fee_no">No</string>
 
 	<string name="poi_email">Email</string>
@@ -3832,24 +3832,24 @@
 
 <string name="poi_service_car">Servicio para el automóvil</string>
 
-<string name="poi_service_vehicle_car_repair_yes">Taller mecánico</string>
+<string name="poi_service_vehicle_car_repair_yes">Taller para automóviles</string>
 	<string name="poi_service_vehicle_oil_change_yes">Cambio de aceite</string>
 	<string name="poi_service_vehicle_used_car_sales_yes">Venta de autos usados</string>
 	<string name="poi_service_vehicle_brakes_yes">Frenos</string>
 	<string name="poi_service_vehicle_new_car_sales_yes">Venta de autos nuevos</string>
-	<string name="poi_service_vehicle_diagnostics_yes">Diagnóstico</string>
+	<string name="poi_service_vehicle_diagnostics_yes">Diagnósticos</string>
 	<string name="poi_service_vehicle_car_parts_yes">Autopartes</string>
 	<string name="poi_service_vehicle_batteries_yes">Baterías</string>
 	<string name="poi_service_vehicle_air_conditioning_yes">Aire acondicionado</string>
-	<string name="poi_service_vehicle_body_repair_yes">Reparación de carrocería</string>
+	<string name="poi_service_vehicle_body_repair_yes">Reparación de carrocerías</string>
 	<string name="poi_service_vehicle_electrical_yes">Eléctrico</string>
 	<string name="poi_service_vehicle_wheels_yes">Ruedas</string>
-	<string name="poi_service_vehicle_glass_yes">Vidrio</string>
-	<string name="poi_service_vehicle_truck_repair_yes">Taller mecánico para camiones</string>
+	<string name="poi_service_vehicle_glass_yes">Vidrios</string>
+	<string name="poi_service_vehicle_truck_repair_yes">Taller para camiones</string>
 	<string name="poi_service_vehicle_muffler_yes">Silenciador</string>
 	<string name="poi_service_vehicle_alignment_yes">Alineación</string>
 	<string name="poi_service_vehicle_transmission_repair_yes">Reparación de la transmisión</string>
-	<string name="poi_service_vehicle_motor_yes">Motor</string>
+	<string name="poi_service_vehicle_motor_yes">Motores</string>
 	<string name="poi_service_vehicle_insurance_yes">Aseguradora</string>
 	<string name="poi_service_vehicle_tyres_yes">Neumáticos</string>
 
@@ -3903,7 +3903,7 @@
 	<string name="poi_payment_contactless_no">Sin contacto: no se acepta</string>
 
 	<string name="poi_hazard_nuclear">Peligro nuclear</string>
-	<string name="poi_hazard_erosion">Peligro de erosión</string>
+	<string name="poi_hazard_erosion">Peligro de derrumbe por erosión</string>
 	<string name="poi_hazard_avalanche">Peligro de avalancha</string>
 	<string name="poi_hazard_slippery_road">Carretera resbaladiza</string>
 	<string name="poi_hazard_flood">Peligro de inundación</string>
@@ -3920,4 +3920,42 @@
 <string name="poi_atm">Cajero automático</string>
 	<string name="poi_shoe_repair">Reparación de calzado;Zapatero</string>
 
-</resources>
+<string name="poi_bulk_purchase">Compra al por mayor;Compra a granel</string>
+	<string name="poi_substation_type">Tipo de subestación</string>
+
+<string name="poi_bulk_purchase_yes">Sí</string>
+	<string name="poi_bulk_purchase_only">Únicamente</string>
+
+	<string name="poi_pipeline_substation">Subestación de tuberías</string>
+	<string name="poi_substation_transmission">Transmisión</string>
+	<string name="poi_substation_distribution">Distribución</string>
+	<string name="poi_substation_minor_distribution">Distribución menor</string>
+	<string name="poi_substation_industrial">Industrial</string>
+	<string name="poi_substation_transition">Transición</string>
+	<string name="poi_substation_traction">Tracción</string>
+	<string name="poi_substation_converter">Convertidora</string>
+	<string name="poi_substation_compensation">Compensación</string>
+
+	<string name="poi_substation_compression">Compresión</string>
+	<string name="poi_substation_measurement">Medición</string>
+	<string name="poi_substation_valve">Válvula</string>
+	<string name="poi_substation_valve_group">Grupo de válvulas</string>
+	<string name="poi_substation_inspection_gauge">Calibre de inspección</string>
+	<string name="poi_substation_field_gathering">Recolección de campo</string>
+    <string name="poi_craft_confectionery">Elaboración de confitería</string>
+    <string name="poi_shop_wholesale">Tienda mayorista</string>
+    <string name="poi_books_type">Libros</string>
+    <string name="poi_laboratory">Laboratorio médico</string>
+    <string name="poi_blood_donation">Donación de sangre</string>
+    <string name="poi_books_comic">Historietas</string>
+    <string name="poi_books_antiquarian">Antiguos</string>
+    <string name="poi_books_religion">Religiosos</string>
+    <string name="poi_books_academic">Académicos</string>
+    <string name="poi_books_children">Infantiles</string>
+    <string name="poi_atoll">Atolón</string>
+    <string name="poi_toll_gantry">Pórtico de peaje</string>
+    <string name="poi_childcare">Cuidado de niños;Guardería</string>
+    <string name="poi_denotation">Denotación</string>
+    <string name="poi_denotation_natural_monument">Monumento natural</string>
+    <string name="poi_denotation_landmark">Referencia terrestre</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index ccfb6dbdd4..162d3c2120 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="layer_map_appearance">Configurar pantalla</string>
@@ -87,7 +87,7 @@
     <string name="pref_raster_map">Ajustes de la fuente del mapa</string>
     <string name="pref_vector_map">Ajustes del mapa vectorial</string>
     <string name="delete_confirmation_msg">¿Borrar «%1$s»?</string>
-    <string name="city_type_suburb">Barrio</string>
+    <string name="city_type_suburb">Suburbio</string>
     <string name="city_type_hamlet">Aldea</string>
     <string name="city_type_village">Pueblo</string>
     <string name="city_type_town">Ciudad pequeña</string>
@@ -1135,7 +1135,7 @@
     <string name="routing_attr_avoid_unpaved_name">Evitar caminos sin pavimentar</string>
     <string name="routing_attr_avoid_unpaved_description">Evita los caminos sin pavimentar.</string>
     <string name="routing_attr_avoid_ferries_name">Evitar ferris/transbordadores</string>
-    <string name="routing_attr_avoid_ferries_description">Evita usar ferries</string>
+    <string name="routing_attr_avoid_ferries_description">Evita usar ferris</string>
     <string name="routing_attr_avoid_motorway_name">Evitar autopistas</string>
     <string name="routing_attr_avoid_motorway_description">Evita usar las autopistas</string>
     <string name="routing_attr_weight_name">Límite de peso</string>
@@ -1327,7 +1327,7 @@
     <string name="gpx_info_avg_altitude">Altitud media: %1$s</string>
     <string name="gpx_info_diff_altitude">Rango de altitud: %1$s</string>
     <string name="gpx_info_asc_altitude">Descendido/ascendido: %1$s</string>
-    <string name="map_widget_plain_time">Tiempo actual</string>
+    <string name="map_widget_plain_time">Hora actual</string>
     <string name="shared_string_waypoint">Punto de referencia</string>
     <string name="select_destination_and_intermediate_points">Marque los destinos</string>
     <string name="layer_amenity_label">Nombres de PDI superpuestos</string>
@@ -1542,7 +1542,7 @@
     <string name="shared_string_enabled">Activado</string>
     <string name="plugin_description_title">Descripción</string>
     <string name="edit_group">Editar grupo</string>
-    <string name="plugin_install_needs_network">Es necesaria una conexión a Internet para instalar este complemento.</string>
+    <string name="plugin_install_needs_network">Debe conectarse a Internet para instalar este complemento.</string>
     <string name="plugin_ski_name">Vista invernal</string>
     <string name="plugin_nautical_name">Vista náutica</string>
     <string name="world_ski_missing">Para mostrar mapas de esquí, debe descargarse el mapa especial sin conexión</string>
@@ -2124,7 +2124,7 @@
     <string name="lang_kn">Canarés</string>
     <string name="share_history_subject">compartido vía OsmAnd</string>
     
-    <string name="coords_search">Búsqueda de coordenadas</string>
+    <string name="coords_search">Buscar coordenadas</string>
     <string name="advanced_coords_search">Búsqueda avanzada de coordenadas</string>
     <string name="back_to_search">Volver a la búsqueda</string>
     <string name="confirmation_to_delete_history_items">¿Quitar elementos marcados del «Historial»?</string>
@@ -2469,8 +2469,8 @@
     <string name="type_city_town">Escribe la ciudad o pueblo</string>
     <string name="type_postcode">Escribe el código postal</string>
     <string name="nearest_cities">Ciudades cercanas</string>
-    <string name="select_city">Elegir ciudad o pueblo</string>
-    <string name="select_postcode">Elegir código postal</string>
+    <string name="select_city">Elegir la ciudad o pueblo</string>
+    <string name="select_postcode">Elegir el código postal</string>
     <string name="shared_string_paused">Pausado</string>
     <string name="favorite_group_name">Nombre del grupo</string>
     <string name="change_color">Cambiar color</string>
@@ -2561,7 +2561,7 @@
     <string name="restart_search">Reiniciar búsqueda</string>
     <string name="increase_search_radius">Aumentar radio de búsqueda</string>
     <string name="nothing_found">Nada encontrado</string>
-    <string name="nothing_found_descr">Modifica la consulta de búsqueda o aumenta el radio de búsqueda.</string>
+    <string name="nothing_found_descr">Modificar la consulta de búsqueda o aumentar el radio de búsqueda.</string>
     <string name="hillshade_menu_download_descr">Para ver el sombreado del relieve en el mapa, debes descargar la superposición del sombreado de esta región.</string>
     <string name="hillshade_purchase_header">Para ver el sombreado del relieve en el mapa, debes comprar e instalar el complemento «Curvas de nivel»</string>
     <string name="private_access_routing_req">El destino se ubica en un área de acceso privado. ¿Permitir el acceso a los caminos privados para este viaje?</string>
@@ -2596,7 +2596,7 @@
     <string name="mapillary_menu_edit_text_hint">Escribir nombre de usuario</string>
     <string name="mapillary_menu_descr_username">Ver sólo imágenes añadidas por</string>
     <string name="mapillary_menu_title_username">Nombre de usuario</string>
-    <string name="mapillary_menu_filter_description">Filtrar imágenes por usuario o por fecha. Sólo activado en los primeros zooms.</string>
+    <string name="mapillary_menu_filter_description">Filtrar imágenes por usuario, fecha o tipo. Sólo activado en los primeros zooms.</string>
     
     <string name="map_widget_ruler_control">Regla radial</string>
     <string name="average">Promedio</string>
@@ -2724,7 +2724,7 @@
     <string name="tap_on_map_to_hide_interface">Modo de pantalla completa</string>
     
     <string name="mark_passed">Descartar</string>
-    <string name="import_gpx_file_description">pueden importarse como Favoritos o como un archivo GPX.</string>
+    <string name="import_gpx_file_description">puede importarse como Favoritos o como un archivo GPX.</string>
     <string name="import_as_gpx">Importar como archivo GPX</string>
     <string name="import_as_favorites">Importar como Favoritos</string>
     <string name="import_file">Importar archivo</string>
@@ -2985,7 +2985,7 @@
     <string name="search_no_results_feedback">¿Sin resultados de búsqueda?
 \nDenos su opinión</string>
     <string name="commiting_way">Enviando vía…</string>
-    <string name="test_voice_desrc">Pulsa un botón y escucha el aviso de voz correspondiente para identificar las indicaciones que faltan o son defectuosas.</string>
+    <string name="test_voice_desrc">Pulsa un botón y escucha el aviso de voz correspondiente para identificar avisos faltantes o defectuosos.</string>
 <string name="release_3_2_pre">• Corregido el fallo en el inicio que se producía en algunos dispositivos
 \n
 \n • Nueva función de marcadores: muestra los marcadores que ya han sido atravesados.
@@ -3002,13 +3002,62 @@
 \n</string>
     <string name="ask_for_location_permission">Para continuar, debe permitir la ubicación a OsmAnd.</string>
     <string name="rendering_value_black_name">Negro</string>
-    <string name="search_street">Buscar calle</string>
-    <string name="start_search_from_city">Iniciar búsqueda desde ciudad</string>
+    <string name="search_street">Buscar la calle</string>
+    <string name="start_search_from_city">Elegir la ciudad o pueblo</string>
     <string name="shared_string_restore">Restaurar</string>
-    <string name="keep_passed_markers_descr">Los marcadores añadidos como un grupo de Favoritos o puntos de ruta GPX marcados como Pasados permanecerán en el mapa. Si el grupo no está activo, los marcadores desaparecerán del mapa.</string>
-    <string name="keep_passed_markers">Mantener marcadores pasados en el mapa</string>
-    <string name="more_transport_on_stop_hint">Hay más transporte en esta parada.</string>
+    <string name="keep_passed_markers_descr">Los marcadores añadidos como un grupo de Favoritos o puntos de ruta GPX marcados como «Usados», permanecerán en el mapa. Si el grupo no está activo, los marcadores desaparecerán del mapa.</string>
+    <string name="keep_passed_markers">Mantener en el mapa los marcadores ya usados</string>
+    <string name="more_transport_on_stop_hint">Hay más transportes en esta parada.</string>
     <string name="markers_remove_dialog_msg">¿Borrar marcador del mapa «%s»\?</string>
     <string name="edit_map_marker">Editar marcador del mapa</string>
     <string name="third_party_application">Aplicación de terceros</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Plan y Precios</string>
+    <string name="osm_live_payment_monthly_title">Pago mensual</string>
+    <string name="osm_live_payment_3_months_title">Pago trimestral</string>
+    <string name="osm_live_payment_annual_title">Pago anual</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
+    <string name="osm_live_payment_discount_descr">¡Ahorra %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Suscripción actual</string>
+    <string name="osm_live_payment_renews_monthly">Renovar mensualmente</string>
+    <string name="osm_live_payment_renews_quarterly">Renovar trimestralmente</string>
+    <string name="osm_live_payment_renews_annually">Renovar anualmente</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Elige la frecuencia de pago:</string>
+    <string name="osm_live_payment_contribute_descr">Parte de los ingresos se destina a los colaboradores de OpenStreetMap.</string>
+    <string name="powered_by_osmand">Desarrollado por OsmAnd</string>
+    <string name="osm_live_subscriptions">Suscripciones</string>
+    <string name="mapillary_menu_title_pano">Sólo mostrar imágenes en 360°</string>
+    <string name="shared_string_launch">Ejecutar</string>
+    <string name="lang_gn_py">Guaraní</string>
+    <string name="run_full_osmand_msg">Está utilizando el mapa «{0}» que funciona con OsmAnd. ¿Quiere ejecutar la versión completa de OsmAnd\?</string>
+    <string name="run_full_osmand_header">¿Ejecutar OsmAnd\?</string>
+    <string name="quick_action_switch_day_night_descr">Este botón de acción, alterna entre el modo «Diurno» y «Nocturno» para OsmAnd</string>
+    <string name="quick_action_switch_day_mode">Modo diurno</string>
+    <string name="quick_action_switch_night_mode">Modo nocturno</string>
+    <string name="quick_action_day_night_switch_mode">Alternar modos diurno/nocturno</string>
+    <string name="swap_start_and_destination">Intercambiar inicio y destino</string>
+    <string name="add_destination_point">Añadir destino</string>
+    <string name="add_intermediate_point">Añadir punto intermedio</string>
+    <string name="add_start_point">Añadir punto de partida</string>
+    <string name="intermediate_waypoint">Punto intermedio: %1$s</string>
+    <string name="waypoints">Puntos de referencia: %1$s</string>
+    <string name="transfers">transferencias: %1$s</string>
+    <string name="on_foot">a pie: %1$s</string>
+    <string name="route_way">Camino: %1$s</string>
+    <string name="points_of_interests">Puntos de interés (PDI)</string>
+    <string name="waiting_for_route_calculation">Esperando el cálculo de la ruta</string>
+    <string name="app_mode_public_transport">Transporte público</string>
+    <string name="avoid_roads_descr">Marca el camino a evitar durante la navegación, desde el mapa o de la siguiente lista:</string>
+    <string name="show_along_the_route">Mostrar a lo largo de la ruta</string>
+    <string name="simulate_navigation">Simular navegación</string>
+    <string name="choose_track_file_to_follow">Elija el archivo de la traza a seguir</string>
+    <string name="voice_announcements">Anuncios de voz</string>
+    <string name="intermediate_destinations">Destinos intermedios: %1$s</string>
+    <string name="arrive_at_time">Llegará a las %1$s</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">ton</string>
+    <string name="shared_string_capacity">Capacidad</string>
+    <string name="shared_string_width">Ancho</string>
+    <string name="shared_string_height">Altura</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-eu/phrases.xml b/OsmAnd/res/values-eu/phrases.xml
index c1291accbd..285671fd19 100644
--- a/OsmAnd/res/values-eu/phrases.xml
+++ b/OsmAnd/res/values-eu/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_shop">Denda</string>
 		<string name="poi_shop_food">Auzoko denda eta supermerkatua</string>
 	<string name="poi_emergency">Larrialdiak</string>
@@ -153,7 +153,7 @@
 	<string name="poi_railway_platform">Tren andena</string>
 	<string name="poi_halt">Tren geltokia</string>
 	<string name="poi_subway_entrance">Metro sarrera</string>
-	<string name="poi_subway_station">Metro geltokia</string>
+	<string name="poi_subway_station">Bai</string>
 	<string name="poi_taxi">Taxi geltokia</string>
 
 	<string name="poi_aerodrome">Aireportua</string>
@@ -247,7 +247,7 @@
 	<string name="poi_radar">Radarra</string>
 	<string name="poi_works">Lantegia</string>
 	<string name="poi_windmill">Haize errota</string>
-	<string name="poi_confectionery">Gozogileak</string>
+	<string name="poi_confectionery">Gozo-denda</string>
 	<string name="poi_pastry">Pastelgileak</string>
 	<string name="poi_vending_machine">Salmenta automatikoko makina</string>
 	<string name="poi_anime">Anime denda</string>
@@ -444,7 +444,7 @@
 	<string name="poi_prison">Kartzela</string>
 	<string name="poi_migration">Migrazioa</string>
 	<string name="poi_tax_inspection">Ogasun ikuskaritza</string>
-	<string name="poi_capital">Hiriburua</string>
+	<string name="poi_capital">Bai</string>
 	<string name="poi_town">Herria</string>
 	<string name="poi_neighbourhood">Auzoa</string>
 	<string name="poi_place_allotments">Baratza komunitarioak</string>
@@ -1541,7 +1541,7 @@
 	<string name="poi_diet_pescetarian_yes">Peszetarianoa</string>
 
 	<string name="poi_brewery_additional">Garagardotegiaren izena</string>
-	<string name="poi_microbrewery_yes">Mikro-garagardotegia</string>
+	<string name="poi_microbrewery_yes">Bai</string>
 	<string name="poi_microbrewery_no">Ez da mikro-garagardotegia</string>
 
 	<string name="poi_piste_grooming_skating">Patinajea</string>
@@ -3875,4 +3875,37 @@
 <string name="poi_atm">Kutxazain automatikoa</string>
 	<string name="poi_shoe_repair">Zapaten konponketa</string>
 
-</resources>
+<string name="poi_bulk_purchase">Handizkaria</string>
+	<string name="poi_substation_type">Mota</string>
+
+<string name="poi_bulk_purchase_yes">Bai</string>
+	<string name="poi_bulk_purchase_only">Besterik ez</string>
+
+	<string name="poi_substation_transmission">Transmisioa</string>
+	<string name="poi_substation_distribution">Banaketa</string>
+	<string name="poi_substation_minor_distribution">Txikizkaria</string>
+	<string name="poi_substation_industrial">Industriala</string>
+	<string name="poi_substation_transition">Trantsizioa</string>
+	<string name="poi_substation_traction">Trakzioa</string>
+	<string name="poi_substation_converter">Bihurtzailea</string>
+	<string name="poi_substation_compensation">Konpentsazioa</string>
+
+	<string name="poi_substation_compression">Konpresioa</string>
+	<string name="poi_substation_measurement">Neurketa</string>
+	<string name="poi_substation_valve">Balbula</string>
+	<string name="poi_substation_valve_group">Balbula taldea</string>
+	<string name="poi_substation_inspection_gauge">Inspekziorako adierazlea</string>
+    <string name="poi_pipeline_substation">Hodi azpiestazioa</string>
+    <string name="poi_substation_field_gathering">Tokiko bilketa</string>
+    <string name="poi_craft_confectionery">Gozogintza</string>
+    <string name="poi_shop_wholesale">Handizkako denda</string>
+    <string name="poi_books_type">Liburuak</string>
+    <string name="poi_laboratory">Laborategi medikoa</string>
+    <string name="poi_blood_donation">Odol donazioa</string>
+    <string name="poi_books_comic">Komikia</string>
+    <string name="poi_books_antiquarian">Antikuarioa</string>
+    <string name="poi_books_religion">Erlijioa</string>
+    <string name="poi_books_academic">Akademikoa</string>
+    <string name="poi_books_children">Haurrak</string>
+    <string name="poi_atoll">Atoloia</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index e3d96e90d1..8b4868fb67 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="local_index_tile_data_zooms">Deskargatutako zoomak: %1$s</string>
   <string name="local_index_tile_data_expire">Iraungitze epea (minutuak): %1$s</string>
@@ -690,14 +690,14 @@ Biltegiratzean {1} MB erabiliko dira.
   
   
   <string name="local_index_installed">Bertsio lokala</string>
-  <string name="local_index_items_backuped">%2$d-tik %1$d elementu desgaitu dira.</string>
+  <string name="local_index_items_backuped">%2$d-tik %1$d elementu desaktibatu dira.</string>
   <string name="local_index_items_deleted">%2$d-tik %1$d elementu ezabatu dira.</string>
-  <string name="local_index_items_restored">%2$d-tik %1$d elementu gaitu dira.</string>
+  <string name="local_index_items_restored">%2$d-tik %1$d elementu aktibatu dira.</string>
   <string name="local_index_no_items_to_do">Elementurik ez %1$s-rentzat</string>
   <string name="local_index_action_do">%2$s elementu %1$sko dituzu. Jarraitu?</string>
   <string name="local_index_descr_title">Kudeatu mapa-fitxategiak.</string>
-  <string name="local_index_mi_restore">Gaitu</string>
-  <string name="local_index_mi_backup">Ezgaitu</string>
+  <string name="local_index_mi_restore">Aktibatu</string>
+  <string name="local_index_mi_backup">Desaktibatu</string>
   
   
   <string name="shared_string_download">Deskargatu</string>
@@ -705,7 +705,7 @@ Biltegiratzean {1} MB erabiliko dira.
   <string name="local_index_address_data">Helbide datuak</string>
   <string name="local_index_transport_data">Garraio publikoaren datuak</string>
   <string name="local_index_map_data">Mapa datuak</string>
-  <string name="local_indexes_cat_backup">Esgaitua</string>
+  <string name="local_indexes_cat_backup">Desaktibatuta</string>
   <string name="local_indexes_cat_tts">Ahots abisuak (TTS)</string>
   <string name="local_indexes_cat_voice">Ahots abisuak (grabatua)</string>
   
@@ -1535,7 +1535,7 @@ Lorratza %2$s</string>
     <string name="select_map_markers">Hautatu mapa-markatzaileak</string>
     <string name="shared_string_reverse_order">Alderantzikatu ordena</string>
     <string name="show_map_markers_description">Aktibatu mapa-markatzaileen ezaugarria.</string>
-    <string name="clear_active_markers_q">Ezabatu mapa-markatzaile guztiak?</string>
+    <string name="clear_active_markers_q">Ezabatu mapa-markatzaile aktibo guztiak\?</string>
     <string name="clear_markers_history_q">Garbitu mapa-markatzaileen historiala?</string>
     <string name="active_markers">Markatzaile aktiboak</string>
     <string name="map_markers">Mapa-markatzaileak</string>
@@ -2622,7 +2622,7 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="mapillary_menu_edit_text_hint">Idatzi erabiltzaile-izena</string>
     <string name="mapillary_menu_descr_username">Ikusi erabiltzaile honek gehitutako argazkiak:</string>
     <string name="mapillary_menu_title_username">Erabiltzaile-izena</string>
-    <string name="mapillary_menu_filter_description">Iragazi argazkiak igorlearen eta dataren arabera. Zoom hurbilean bakarrik.</string>
+    <string name="mapillary_menu_filter_description">Iragazi argazkiak igorlearen, dataren edo motaren arabera. Zoom hurbilean bakarrik.</string>
     <string name="map_widget_ruler_control">Erradioaren erregela</string>
     <string name="shared_string_permissions">Baimenak</string>
     <string name="import_gpx_failed_descr">OsmAnd-ek ezin du fitxategia inportatu. Egiaztatu OsmAndek fitxategia dagoen tokian irakurtzeko baimenak dituen.</string>
@@ -3161,7 +3161,7 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="ask_for_location_permission">Eman OsmAnd-i kokalekua eskuratzeko baimena jarraitzeko.</string>
     <string name="rendering_value_black_name">Beltza</string>
     <string name="search_street">Bilatu kalea</string>
-    <string name="start_search_from_city">Hasi bilaketa hiritik</string>
+    <string name="start_search_from_city">Hautatu hiria lehenbizi</string>
     <string name="shared_string_restore">Berreskuratu</string>
     <string name="keep_passed_markers_descr">Gogokoen talde gisa gehitutako markatzaileak edo pasatutako gisa markatutako GPX bide-puntuak mapan mantenduko dira. Taldea aktibo ez badago, markatzaileak mapatik desagertuko dira.</string>
     <string name="keep_passed_markers">Mantendu pasatutako markatzaileak mapan</string>
@@ -3169,4 +3169,43 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="markers_remove_dialog_msg">Ezabatu \'%s\' mapa-markatzailea\?</string>
     <string name="edit_map_marker">Editatu mapa-markatzailea</string>
     <string name="third_party_application">Hirugarrengoen aplikazioa</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Plana eta prezioak</string>
+    <string name="osm_live_payment_monthly_title">Ordaindu hilabetero</string>
+    <string name="osm_live_payment_3_months_title">Ordaindu 3 hilero behin</string>
+    <string name="osm_live_payment_annual_title">Ordaindu urtero</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / hilero</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / hilero</string>
+    <string name="osm_live_payment_discount_descr">Gorde %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Zure oraingo harpidetza</string>
+    <string name="osm_live_payment_renews_monthly">Hilero berritzen da</string>
+    <string name="osm_live_payment_renews_quarterly">Hiru hilero berritzen da</string>
+    <string name="osm_live_payment_renews_annually">Urtero berritzen da</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Hautatu ondo datorkizun ordainketa epea:</string>
+    <string name="osm_live_payment_contribute_descr">Diru-sarreren parte bat OpenStreetMap-eko parte-hartzaileei doakie.</string>
+    <string name="powered_by_osmand">OsmAnd-ek bultzatua</string>
+    <string name="osm_live_subscriptions">Harpidetzak</string>
+    <string name="mapillary_menu_title_pano">Erakutsi 360º argazkiak besterik ez</string>
+    <string name="shared_string_launch">Abiatu</string>
+    <string name="run_full_osmand_msg">OsmAnd darabilen {0} mapa erabiltzen ari zara eta. OsmAnd bertsio osoa abiatu nahi duzu\?</string>
+    <string name="run_full_osmand_header">Abiatu OsmAnd\?</string>
+    <string name="swap_start_and_destination">Aldatu jatorria eta helburua</string>
+    <string name="add_destination_point">Gehitu helburua</string>
+    <string name="add_intermediate_point">Gehitu tarteko puntua</string>
+    <string name="add_start_point">Gehitu abiapuntua</string>
+    <string name="intermediate_waypoint">Tarteko puntua: %1$s</string>
+    <string name="waypoints">Bide-puntuak: %1$s</string>
+    <string name="transfers">transferentziak: %1$s</string>
+    <string name="on_foot">oinez: %1$s</string>
+    <string name="route_way">Bidea: %1$s</string>
+    <string name="points_of_interests">Puntu interesgarriak (POI)</string>
+    <string name="app_mode_public_transport">Garraio publikoa</string>
+    <string name="simulate_navigation">Simulatu nabigazioa</string>
+    <string name="voice_announcements">Ahots bidezko iragarpenak</string>
+    <string name="intermediate_destinations">Tarteko helburuak: %1$s</string>
+    <string name="arrive_at_time">Heltzeko ordua: %1$s</string>
+    <string name="lang_gn_py">Guaraniera</string>
+    <string name="quick_action_switch_day_mode">Eguneko modua</string>
+    <string name="quick_action_switch_night_mode">Gaueko modua</string>
+    <string name="quick_action_day_night_switch_mode">Txandakatu eguneko eta gaueko moduen artean</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-fa/phrases.xml b/OsmAnd/res/values-fa/phrases.xml
index 52bac00ee6..482c50a8e0 100644
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
 <string name="poi_palaeontological_site">محوطه دیرینه شناسی</string>
@@ -82,7 +82,7 @@
 <string name="poi_toys">اسباب بازی فروشی</string>
 <string name="poi_trade">باربری</string>
 <string name="poi_vacuum_cleaner">فروشگاه جاروبرقی</string>
-<string name="poi_variety_store">فروشگاه کوچک</string>
+<string name="poi_variety_store">فروشگاه متنوع و ارزان</string>
 <string name="poi_video">کلوب فیلم</string>
 <string name="poi_window_blind">در و پنجره سازی</string>
 <string name="poi_department_store">فروشگاه چندمنظوره</string>
@@ -110,7 +110,7 @@
 <string name="poi_ford">گدار</string>
 <string name="poi_mountain_pass">ایستگاه کوهستانی</string>
 <string name="poi_gate">دروازه</string>
-<string name="poi_city_wall">دیوار شهرستان</string>
+<string name="poi_city_wall">دیوار شهر</string>
 <string name="poi_lift_gate">دروازه آسانسور</string>
 <string name="poi_toll_booth">غرفه تلفن</string>
 <string name="poi_border_control">کنترل مرزی</string>
@@ -127,8 +127,8 @@
 <string name="poi_service_tyres">پنچرگیری</string>
 <string name="poi_vehicle_inspection">معاینه فنی خودرو</string>
 <string name="poi_car_wash">کارواش</string>
-<string name="poi_fuel">پمپ بنزین</string>
-<string name="poi_electricity_combined_charging">باطریسازی</string>
+<string name="poi_fuel">پمپ بنزین؛ جایگاه سوخت؛ جایگاه سوخت‌گیری؛ جایگاه</string>
+<string name="poi_electricity_combined_charging">ایستگاه شارژ</string>
 <string name="poi_vehicle_ramp">سطح شیب دار خودرو</string>
 <string name="poi_compressed_air">هوای فشرده</string>
 <string name="poi_parking">پارکینگ</string>
@@ -248,7 +248,7 @@
 <string name="poi_tax_inspection">اداره مالیات</string>
 <string name="poi_office_administrative">دفتر اجرایی</string>
 <string name="poi_customs">گمرک</string>
-<string name="poi_city">شهرستان</string>
+<string name="poi_city">شهر</string>
 <string name="poi_town">شهر</string>
 <string name="poi_village">روستا</string>
 <string name="poi_hamlet">دهکده</string>
@@ -291,55 +291,55 @@
 <string name="poi_ngo">NGO</string>
 <string name="poi_townhall">شهرداری</string>
 <string name="poi_employment_agency">کاریابی</string>
-<string name="poi_research">مرکز تحقیقاتی</string>
+<string name="poi_research">دفتر تحقیقاتی</string>
 <string name="poi_it">دفتر فناوری اطلاعات</string>
 <string name="poi_newspaper">دفتر روزنامه</string>
-<string name="poi_architect">مرکز معماری</string>
+<string name="poi_architect">دفتر معماری</string>
 <string name="poi_advertising_agency">آژانس تبلیغاتی</string>
 <string name="poi_educational_institution">موسسه آموزشی</string>
 <string name="poi_studio">استودیو</string>
-<string name="poi_bookmaker">ناشرکتاب</string>
+<string name="poi_bookmaker">دلال شرط‌بندی</string>
 
 <string name="poi_stadium">ورزشگاه</string>
 <string name="poi_sports_centre">مرکز ورزشی</string>
 <string name="poi_golf_course">زمین گلف</string>
 <string name="poi_ice_rink">سالن هاکی روی یخ</string>
-<string name="poi_pitch">زمین دو میدانی</string>
+<string name="poi_pitch">زمین ورزشی</string>
 <string name="poi_leisure_track">مسیر ورزشی</string>
 <string name="poi_running_track">مسیر پیاده روی</string>
 <string name="poi_bicycle_track">مسیر دوچرخه</string>
 <string name="poi_horse_track">مسیز سوارکاری</string>
-<string name="poi_raceway">جوی اب</string>
+<string name="poi_raceway">مسیر مسابقه</string>
 <string name="poi_9pin">بولینگ نه‌ماسوره‌ای</string>
 <string name="poi_10pin">بولینگ ده‌ماسوره‌ای</string>
 <string name="poi_archery">مرکز تیر اندازی</string>
 <string name="poi_athletics">سالن بدنسازی</string>
-<string name="poi_american_football">زمین فوتبال آمریکایی</string>
-<string name="poi_australian_football">زمین فوتبال استرالیا</string>
-<string name="poi_base">پیست دو میدانی</string>
-<string name="poi_baseball">زمین بیس بال</string>
-<string name="poi_basketball">زمین بسکتبال</string>
-<string name="poi_beachvolleyball">زمین والیبال ساحلی</string>
+<string name="poi_american_football">فوتبال آمریکایی</string>
+<string name="poi_australian_football">فوتبال استرالیایی</string>
+<string name="poi_base">پرش بیس</string>
+<string name="poi_baseball">بیس بال</string>
+<string name="poi_basketball">بسکتبال</string>
+<string name="poi_beachvolleyball">والیبال ساحلی</string>
 <string name="poi_bmx">پیست دوچرخه سواری</string>
 <string name="poi_boules">زمین بولینگ</string>
 <string name="poi_bowls">بولینگ</string>
-<string name="poi_canadian_football">زمین فوتبال کانادایی</string>
+<string name="poi_canadian_football">فوتبال کانادایی</string>
 <string name="poi_canoe">قایق رانی</string>
 <string name="poi_chess">میز شطرنج</string>
 <string name="poi_climbing">کوهنوردی</string>
-<string name="poi_cricket">زمین بازی کریکت</string>
+<string name="poi_cricket">کریکت</string>
 <string name="poi_croquet">زمین کروکت</string>
 <string name="poi_cycling">پیست دوچرخه سواری</string>
 <string name="poi_diving">غواصی</string>
 <string name="poi_scuba_diving">غواصی در عمق</string>
 <string name="poi_dog_racing">مسابقات حیوانات</string>
 <string name="poi_equestrian">مرکز سوارکاری</string>
-<string name="poi_golf">زمین گلف</string>
+<string name="poi_golf">گلف</string>
 <string name="poi_gymnastics">سالن ژیمناستیک</string>
-<string name="poi_handball">زمین هند بال</string>
-<string name="poi_hockey">زمین هاکی</string>
+<string name="poi_handball">هندبال</string>
+<string name="poi_hockey">هاکی</string>
 <string name="poi_horse_racing">پیست اسب دوانی</string>
-<string name="poi_ice_skating">زمین اسکیت روی یخ</string>
+<string name="poi_ice_skating">اسکیت روی یخ</string>
 <string name="poi_ice_stock">زمین یخ</string>
 <string name="poi_korfbal">زمین بسکتبال اسکاتلندی</string>
 <string name="poi_sport_motor">پیست موتور سواری</string>
@@ -363,7 +363,7 @@
 <string name="poi_table_tennis">تنیس روی میز</string>
 <string name="poi_tennis">تنیس</string>
 <string name="poi_toboggan">سورتمه سواری</string>
-<string name="poi_volleyball">زمین والیبال</string>
+<string name="poi_volleyball">والیبال</string>
 
 <string name="poi_museum">موزه</string>
 <string name="poi_memorial">بنای یادبود</string>
@@ -373,7 +373,7 @@
 <string name="poi_boundary_stone">سنگ یادبود</string>
 <string name="poi_historic_cannon">توپ تاریخی</string>
 <string name="poi_castle">قلعه</string>
-<string name="poi_city_gate">دروازه شهرستان</string>
+<string name="poi_city_gate">دروازه شهر</string>
 <string name="poi_fort">برج و بارو</string>
 <string name="poi_fountain">فواره</string>
 <string name="poi_historic_ruins">خرابه های تاریخی</string>
@@ -463,7 +463,7 @@
 <string name="poi_arts_centre">مرکز هنر</string>
 <string name="poi_cinema">سینما</string>
 <string name="poi_casino">کازینو</string>
-<string name="poi_community_centre">مراکز محلی</string>
+<string name="poi_community_centre">مرکز اجتماع</string>
 <string name="poi_social_centre">مرکز سوسیال</string>
 <string name="poi_theatre">تئاتر</string>
 <string name="poi_theatre_genre_circus">سیرک</string>
@@ -492,7 +492,7 @@
 <string name="poi_drinking_water">آب آشامیدنی</string>
 <string name="poi_barbecue">اجاق کباب پزی</string>
 
-<string name="poi_craft_agricultural_engines">ادوات کشاورزی</string>
+<string name="poi_craft_agricultural_engines">ماشین آلات و ادوات کشاورزی</string>
 <string name="poi_craft_basket_maker">سبد خرید</string>
 <string name="poi_craft_beekeeper">زنبورداری</string>
 <string name="poi_craft_blacksmith">آهنگر</string>
@@ -559,7 +559,7 @@
 <string name="poi_brothel"/>
 <string name="poi_mortuary">سردخانه مردگان</string>
 <string name="poi_crematorium">کوره جسد سوزی</string>
-<string name="poi_internet_cafe">کافی نت</string>
+<string name="poi_internet_cafe">کافی‌نت</string>
 
 <string name="poi_bank">بانک</string>
 <string name="poi_amenity_atm">ATM</string>
@@ -567,7 +567,7 @@
 <string name="poi_pawnbroker">بنگاه رهنی</string>
 <string name="poi_bureau_de_change">صرافی</string>
 <string name="poi_accountant">حسابداری</string>
-<string name="poi_bitcoin_yes">پرداخت عوارض</string>
+<string name="poi_bitcoin_yes">پرداخت بیت‌کوینی</string>
 
 <string name="poi_cave_entrance">ورودی غار</string>
 <string name="poi_peak">قله کوه</string>
@@ -647,7 +647,7 @@
 <string name="poi_shop">مغازه</string>
 		<string name="poi_shop_food">فروشگاه کوچک و فروشگاه بزرگ</string>
 	<string name="poi_fuel_avia_type">نوع سوخت</string>
-	<string name="poi_payment_type">نوع پرداخت</string>
+	<string name="poi_payment_type">شیوهٔ پرداخت</string>
 	<string name="poi_payment_fuel_type">کارت سوخت</string>
 	<string name="poi_additional_type">اضافی</string>
 	<string name="poi_internet_access_type">نوع دسترسی اینترنت</string>
@@ -657,7 +657,7 @@
 	<string name="poi_shoes_type">مدل کفش</string>
 	<string name="poi_fire_hydrant_position">موقعیت شیر آتش نشانی</string>
 	<string name="poi_fire_hydrant_water_source">منبع آب شیر اتش نشانی</string>
-	<string name="poi_payment_toll_type">نوع عوارض پرداختی</string>
+	<string name="poi_payment_toll_type">شیوهٔ پرداخت</string>
 	<string name="poi_traffic_signals_sound">صدای ترافیک</string>
 	<string name="poi_wheelchair_accessibility">دسترسی ویلچر</string>
 	<string name="poi_wheelchair_yes">بله</string>
@@ -671,7 +671,7 @@
 
 	<string name="poi_fuel_type">نوع جایگاه سوخت</string>
 	<string name="poi_fire_hydrant_type">نوع شیر آتش نشانی</string>
-	<string name="poi_highway_crossing_type">‫روش عبور از بزرگراه</string>
+	<string name="poi_highway_crossing_type">نوع</string>
 	<string name="poi_tactile_paving">کفپوش برجسته</string>
 	<string name="poi_automated">خودکار</string>
 	<string name="poi_parking_type">نوع پارکینگ</string>
@@ -687,7 +687,7 @@
 	<string name="poi_embassy_type">نوع سفارت</string>
 	<string name="poi_city_capital">پایتخت</string>
 	<string name="poi_healthcare_alternative_types">نوع درمانگاه تخصصی</string>
-	<string name="poi_free_flying_characteristics">مشخصات پرواز آزاد</string>
+	<string name="poi_free_flying_characteristics">مشخصات</string>
 	<string name="poi_archaeological_site_type">مرکز باستان شناسی</string>
 	<string name="poi_religion_type">دین</string>
 	<string name="poi_denomination">مذهب</string>
@@ -713,8 +713,8 @@
 	<string name="poi_outdoor_seating">تئاتر روباز</string>
 	<string name="poi_smoking">دخانیات</string>
 	<string name="poi_delivery">تحویل</string>
-	<string name="poi_drive_in">رانندگی در</string>
-	<string name="poi_drive_through">‎روش رانندگی</string>
+	<string name="poi_drive_in">ورود سواره</string>
+	<string name="poi_drive_through">بگیر و بران</string>
 	<string name="poi_takeaway">‌بیرون‌بر</string>
 	<string name="poi_cocktails">کوکتل</string>
 	<string name="poi_microbrewery">میکروبیچر</string>
@@ -740,7 +740,7 @@
 
 	<string name="facebook">فیسبوک</string>
 	<string name="poi_access_private">دسترسی خصوصی</string>
-	<string name="poi_access_no">ورود ممنوع</string>
+	<string name="poi_access_no">دسترسی ندارد</string>
 	<string name="poi_access_customers">دسترسی مشتری</string>
 	<string name="poi_access_agricultural">دسترسی کشاورزی</string>
 
@@ -769,7 +769,7 @@
 	<string name="poi_seasonal">فصلی</string>
 	<string name="poi_water_characteristic">مشخصات آب</string>
 	<string name="poi_beach_surface_type">سطح</string>
-	<string name="poi_diet">نوع خوراک</string>
+	<string name="poi_diet">رژیم غذایی</string>
 	<string name="poi_massage_type">نوع ماساژ</string>
 	<string name="poi_tents">چادر</string>
 	<string name="poi_washing_machine">­ماشين‌ لباس شویی</string>
@@ -787,7 +787,7 @@
 	<string name="poi_medical_system">نظام پزشکی</string>
 	<string name="poi_home_visit">خانه دیدنی</string>
 	<string name="poi_dish">سبک غذا</string>
-	<string name="poi_payment_transport_type">نوع پرداخت (حمل و نقل)</string>
+	<string name="poi_payment_transport_type">شیوهٔ پرداخت (حمل‌ونقل)</string>
 	<string name="poi_social_facility_for">گروه هدف</string>
 	<string name="poi_compressed_air_filter">کپسول هوا</string>
 	<string name="poi_vacuum_cleaner_filter">جارو برقی</string>
@@ -816,11 +816,11 @@
 	<string name="poi_landuse">کاربری زمین</string>
 	<string name="poi_education">آموزش</string>
 	<string name="poi_healthcare">سلامت</string>
-	<string name="poi_office">اداره</string>
+	<string name="poi_office">دفتر</string>
 	<string name="poi_tourism">گردشگری</string>
 	<string name="poi_sightseeing">دیدنی‌ها</string>
 	<string name="poi_accomodation">محل اسکان</string>
-	<string name="poi_internet_access">اینترنت</string>
+	<string name="poi_internet_access">دسترسی اینترنت</string>
 	<string name="poi_entertainment">اوقات فراغت</string>
 	<string name="poi_club">باشگاه</string>
 	<string name="poi_sustenance">غذا</string>
@@ -982,7 +982,7 @@
 	<string name="poi_tower">برج</string>
 	<string name="poi_water_characteristic_mineral">معدنی</string>
 	<string name="poi_payment_telephone_cards_yes">کارت تلفن</string>
-	<string name="poi_payment_telephone_cards_no">کارت تلفن قبول نمی‌کند</string>
+	<string name="poi_payment_telephone_cards_no">کارت تلفن پذیرفته نیست</string>
 	<string name="poi_sport_free_flying">پرواز آزاد (ورزش)</string>
 
 	<string name="poi_free_flying_site_landing">فرود</string>
@@ -1140,10 +1140,238 @@
 	<string name="poi_cuisine_chicken">جوجه</string>
 	<string name="poi_cuisine_ice_cream">بستنی</string>
 	<string name="poi_cuisine_sushi">سوشی</string>
-	<string name="poi_cuisine_fish_and_chips">ماهی و سیب‌زمینی سرخ‌شده</string>
+	<string name="poi_cuisine_fish_and_chips">ماهی و چیپس</string>
 	<string name="poi_cuisine_seafood">غذای دریایی</string>
-	<string name="poi_cuisine_barbecue">کباب سیخی</string>
-	<string name="poi_cuisine_grill">توری</string>
+	<string name="poi_cuisine_barbecue">کباب سیخی (باربیکیو)</string>
+	<string name="poi_cuisine_grill">توری (گریل)</string>
 	<string name="poi_cuisine_tea">چای</string>
 	<string name="poi_cuisine_soup">سوپ</string>
-	</resources>
+	<string name="poi_tourism_yes">نقطهٔ گردشگری</string>
+	<string name="poi_internet_access_no">دسترسی اینترنت: ندارد</string>
+	<string name="poi_internet_access_fee_no">دسترسی اینترنت - رایگان</string>
+
+	<string name="poi_fee_no">خیر</string>
+	<string name="poi_drinking_water_no">خیر</string>
+	<string name="poi_seasonal_no">خیر</string>
+	<string name="poi_traffic_signals_sound_no">خیر</string>
+	<string name="poi_piste_grooming_no">خیر</string>
+	<string name="poi_historic_quarry">"معدن تاریخی سنگ "</string>
+
+	<string name="poi_diet_vegetarian_filter_yes">گیاه‌خواری</string>
+	<string name="poi_diet_vegetarian_only">فقط گیاه‌خواری</string>
+	<string name="poi_diet_vegetarian_yes">گیاه‌خواری</string>
+	<string name="poi_diet_vegetarian_no">رژیم گیاه‌خواری: خیر</string>
+	<string name="poi_diet_vegan_filter_yes">گیاه‌خواری مطلق</string>
+	<string name="poi_diet_vegan_only">فقط گیاه‌خواری مطلق</string>
+	<string name="poi_diet_vegan_yes">گیاه‌خواری مطلق</string>
+	<string name="poi_diet_vegan_no">رژیم گیاه‌خواری مطلق: خیر</string>
+	<string name="poi_diet_gluten_free_filter_yes">رژیم بدون گلوتن</string>
+	<string name="poi_diet_gluten_free_only">فقط رژیم بدون گلوتن</string>
+	<string name="poi_diet_gluten_free_yes">بدون گلوتن</string>
+	<string name="poi_diet_gluten_free_no">رژیم بدون گلوتن: خیر</string>
+	<string name="poi_diet_kosher_filter_yes">کوشر</string>
+	<string name="poi_diet_kosher_only">فقط کوشر</string>
+	<string name="poi_diet_kosher_yes">کوشر</string>
+	<string name="poi_diet_kosher_no">رژیم کوشر: خیر</string>
+	<string name="poi_diet_halal_filter_yes">حلال</string>
+	<string name="poi_diet_halal_only">فقط حلال</string>
+	<string name="poi_diet_halal_yes">حلال</string>
+	<string name="poi_diet_halal_no">رژیم حلال: خیر</string>
+	<string name="poi_diet_lactose_free_filter_yes">بدون لاکتوز</string>
+	<string name="poi_diet_lactose_free_only">فقط بدون لاکتوز</string>
+	<string name="poi_diet_lactose_free_yes">بدون لاکتوز</string>
+	<string name="poi_diet_lactose_free_no">رژیم بدون لاکتوز: خیر</string>
+	<string name="poi_diet_pescetarian_yes">ماهی‌خواری</string>
+
+	<string name="poi_drive_in_no">ورود سواره: خیر</string>
+	<string name="poi_drive_through_no">بگیر و بران: خیر</string>
+
+	<string name="poi_cuisine_breakfast">صبحانه</string>
+	<string name="poi_cuisine_cake">کیک</string>
+	<string name="poi_cuisine_pasta">پاستا</string>
+	<string name="poi_cuisine_pie">پای</string>
+	<string name="poi_cuisine_hotdog">هات داگ</string>
+	<string name="poi_cuisine_salad">سالاد</string>
+	<string name="poi_cuisine_fried_chicken">جوجه سرخ‌شده</string>
+	<string name="poi_cuisine_falafel">فلافل</string>
+	<string name="poi_cuisine_chocolate">شکلات</string>
+	<string name="poi_cuisine_potato">سیب‌زمینی</string>
+	<string name="poi_cuisine_italian">ایتالیایی</string>
+	<string name="poi_cuisine_chinese">چینی</string>
+	<string name="poi_cuisine_mexican">مکزیکی</string>
+	<string name="poi_cuisine_japanese">ژاپنی</string>
+	<string name="poi_cuisine_german">آلمانی</string>
+	<string name="poi_cuisine_indian">هندی</string>
+	<string name="poi_cuisine_american">آمریکایی</string>
+	<string name="poi_cuisine_asian">آسیایی</string>
+	<string name="poi_cuisine_french">فرانسوی</string>
+	<string name="poi_cuisine_greek">یونانی</string>
+	<string name="poi_cuisine_international">بین‌المللی</string>
+	<string name="poi_cuisine_turkish">ترکی</string>
+	<string name="poi_cuisine_spanish">اسپانیایی</string>
+	<string name="poi_cuisine_vietnamese">ویتنامی</string>
+	<string name="poi_cuisine_korean">کره‌ای</string>
+	<string name="poi_cuisine_mediterranean">مدیترانه‌ای</string>
+	<string name="poi_cuisine_lebanese">لبنانی</string>
+	<string name="poi_cuisine_russian">روسی</string>
+	<string name="poi_cuisine_filipino">فیلیپینی</string>
+	<string name="poi_cuisine_portuguese">پرتغالی</string>
+	<string name="poi_cuisine_georgian">گرجی</string>
+	<string name="poi_cuisine_polish">لهستانی</string>
+	<string name="poi_cuisine_brazilian">برزیلی</string>
+	<string name="poi_cuisine_arab">عربی</string>
+	<string name="poi_cuisine_danish">دانمارکی</string>
+	<string name="poi_cuisine_indonesian">اندونزیایی</string>
+	<string name="poi_cuisine_african">آفریقایی</string>
+	<string name="poi_cuisine_caribbean">کارائیبی</string>
+	<string name="poi_cuisine_argentinian">آرژانتینی</string>
+	<string name="poi_cuisine_balkan">بالکانی</string>
+	<string name="poi_cuisine_peruvian">پرویی</string>
+	<string name="poi_cuisine_croatian">کرواتی</string>
+	<string name="poi_cuisine_bolivian">بولیویایی</string>
+	<string name="poi_cuisine_moroccan">مراکشی</string>
+	<string name="poi_cuisine_austrian">اتریشی</string>
+	<string name="poi_cuisine_malaysian">مالزیایی</string>
+	<string name="poi_cuisine_irish">ایرلندی</string>
+	<string name="poi_cuisine_ethiopian">اتیوپیایی</string>
+	<string name="poi_cuisine_hungarian">مجاری</string>
+	<string name="poi_cuisine_european">اروپایی</string>
+	<string name="poi_cuisine_uzbek">ازبک</string>
+	<string name="poi_cuisine_czech">چکی</string>
+	<string name="poi_cuisine_cuban">کوبایی</string>
+	<string name="poi_cuisine_british">بریتانیایی</string>
+	<string name="poi_cuisine_latin_american">آمریکالاتینی</string>
+	<string name="poi_cuisine_nepalese">نپالی</string>
+	<string name="poi_cuisine_mongolian">مغولی</string>
+	<string name="poi_cuisine_middle_eastern">غرب آسیایی</string>
+	<string name="poi_cuisine_ukrainian">اوکراینی</string>
+	<string name="poi_cuisine_afghan">افغانی</string>
+	<string name="poi_cuisine_belgian">بلژیکی</string>
+	<string name="poi_cuisine_basque">باسکی</string>
+	<string name="poi_cuisine_swiss">سوئیسی</string>
+	<string name="poi_cuisine_swedish">سوئدی</string>
+	<string name="poi_cuisine_jamaican">جامائیکایی</string>
+	<string name="poi_cuisine_armenian">ارمنی</string>
+	<string name="poi_cuisine_english">انگلیسی</string>
+	<string name="poi_cuisine_pakistani">پاکستانی</string>
+	<string name="poi_cuisine_taiwanese">تایوانی</string>
+	<string name="poi_cuisine_tex_mex">تگزاسی-مکزیکی</string>
+	<string name="poi_cuisine_dutch">هلندی</string>
+	<string name="poi_cuisine_syrian">سوری</string>
+	<string name="poi_cuisine_australian">استرالیایی</string>
+	<string name="poi_cuisine_egyptian">مصری</string>
+	<string name="poi_cuisine_senegalese">سنگالی</string>
+	<string name="poi_cuisine_jewish">کلیمی</string>
+	<string name="poi_cuisine_bulgarian">بلغاری</string>
+	<string name="poi_cuisine_tibetan">تبتی</string>
+
+	<string name="poi_internet_access_wlan">دسترسی اینترنت: بی‌سیم (وای‌فای)</string>
+	<string name="poi_internet_access_terminal">دسترسی اینترنت: پشت دستگاه</string>
+	<string name="poi_internet_access_wired">دسترسی اینترنت: با سیم</string>
+	<string name="poi_internet_access_public">دسترسی اینترنت: عمومی</string>
+	<string name="poi_internet_access_service">دسترسی اینترنت: با خدمات</string>
+	<string name="poi_internet_access_yes">دسترسی اینترنت: دارد</string>
+	<string name="poi_internet_access_fee_yes">دسترسی اینترنت - پولی</string>
+	<string name="poi_smoking_separated">در اتاق جداگانه</string>
+	<string name="poi_smoking_isolated">در اتاق ایزوله</string>
+	<string name="poi_piste_grooming_scooter">اسکوتر</string>
+	<string name="poi_piste_grooming_skating">اسکیت</string>
+	<string name="poi_rooms">اتاق‌ها</string>
+
+	<string name="poi_internet_access_type_wlan">وای‌فای</string>
+	<string name="poi_internet_access_type_terminal">پشت دستگاه</string>
+	<string name="poi_internet_access_type_wired">سیمی</string>
+	<string name="poi_internet_access_type_public">نوع دسترسی اینترنت: عمومی</string>
+	<string name="poi_internet_access_type_service">نوع دسترسی اینترنت: با خدمات</string>
+	<string name="poi_internet_access_type_no">بدون دسترسی اینترنت</string>
+	<string name="poi_internet_access_type_yes">با دسترسی اینترنت</string>
+
+	<string name="poi_site_type_city">شهر</string>
+	<string name="poi_map_size_city">اندازهٔ نقشه: شهر</string>
+	<string name="poi_material_wood">جنس: چوب</string>
+	<string name="poi_material_metal">جنس: فلز</string>
+	<string name="poi_material_concrete">جنس: بتن</string>
+	<string name="poi_material_steel">جنس: فولاد</string>
+	<string name="poi_material_stone">جنس: سنگ</string>
+	<string name="poi_material_brick">جنس: آجر</string>
+	<string name="poi_material_plastic">جنس: پلاستیک</string>
+	<string name="poi_material_granite_stone">جنس: سنگ گرانیت</string>
+	<string name="poi_material_metal_wood">جنس: فلز، چوب</string>
+	<string name="poi_material_glass">جنس: شیشه</string>
+	<string name="poi_material_bronze">جنس: برنز</string>
+	<string name="poi_material_aluminium">جنس: آلومینیوم</string>
+
+	<string name="poi_industrial_factory">نوع: کارخانه</string>
+    <string name="poi_crossing_traffic_signals">با چراغ ایست</string>
+    <string name="poi_crossing_uncontrolled">کنترل‌نشده</string>
+    <string name="poi_crossing_unmarked">بدون نشانه‌گذاری</string>
+    <string name="poi_crossing_activation_automatic">فعال‌شدن گذرگاه: خودکار</string>
+    <string name="poi_crossing_activation_local">فعال‌شدن گذرگاه: محلی</string>
+    <string name="poi_crossing_activation_remote">فعال‌شدن گذرگاه: از دور</string>
+    <string name="poi_crossing_barrier_no">مانع در گذرگاه: خیر</string>
+    <string name="poi_crossing_barrier_yes">مانع در گذرگاه</string>
+    <string name="poi_crossing_barrier_full">مانع در گذرگاه: کامل</string>
+    <string name="poi_crossing_barrier_half">مانع در گذرگاه: نیم‌مانع</string>
+    <string name="poi_crossing_barrier_double_half">مانع در گذرگاه: دو تا نیم‌مانع</string>
+    <string name="poi_crossing_bell_yes">زنگ هشدار گذرگاه</string>
+    <string name="poi_crossing_bell_no">زنگ هشدار گذرگاه: خیر</string>
+    <string name="poi_crossing_light_yes">چراغ هشدار گذرگاه</string>
+    <string name="poi_crossing_light_no">چراغ هشدار گذرگاه: خیر</string>
+    <string name="poi_crossing_on_demand_yes">بازشدن گذرگاه با درخواست گذرنده</string>
+    <string name="poi_crossing_on_demand_no">بازشدن گذرگاه با درخواست گذرنده: خیر</string>
+    <string name="poi_crossing_saltire_yes">تابلوی تقاطع با راه‌آهن</string>
+    <string name="poi_crossing_saltire_no">تابلوی تقاطع با راه‌آهن: خیر</string>
+    <string name="poi_crossing_supervision_yes">نظارت بر گذرگاه</string>
+    <string name="poi_crossing_supervision_no">نظارت بر گذرگاه: خیر</string>
+    <string name="poi_crossing_supervision_attendant">نظارت بر گذرگاه: متصدی</string>
+    <string name="poi_crossing_supervision_camera">نظارت بر گذرگاه: دوربین</string>
+    <string name="poi_trade_agricultural_supplies">اقلام کشاورزی</string>
+    <string name="poi_meadow_agricultural">نوع: کشاورزی</string>
+    <string name="poi_agrarian">فروشگاه کشاورزی</string>
+    <string name="poi_payment_terminal">کارت‌خوان</string>
+    <string name="poi_payment_coins_yes">سکه</string>
+    <string name="poi_payment_coins_no">سکه پذیرفته نیست</string>
+    <string name="poi_payment_coins_0.5">سکه‌های 0.5$</string>
+    <string name="poi_payment_coins_50c12">سکه‌های 50c،‏ 1€ و 2€</string>
+    <string name="poi_payment_credit_cards_yes">کارت اعتباری</string>
+    <string name="poi_payment_credit_cards_no">کارت اعتباری پذیرفته نیست</string>
+    <string name="poi_payment_notes_yes">اسکناس</string>
+    <string name="poi_payment_notes_no">اسکناس پذیرفته نیست</string>
+    <string name="poi_payment_electronic_purses_yes">کیف پول الکترونیکی</string>
+    <string name="poi_payment_electronic_purses_no">کیف پول الکترونیکی پذیرفته نیست</string>
+    <string name="poi_payment_cash_yes">وجه نقد</string>
+    <string name="poi_payment_cash_no">وجه نقد پذیرفته نیست</string>
+    <string name="poi_payment_debit_cards_yes">کارت بانکی</string>
+    <string name="poi_payment_debit_cards_no">کارت بانکی پذیرفته نیست</string>
+    <string name="poi_payment_bitcoin_yes">بیت‌کوین</string>
+    <string name="poi_payment_bitcoin_no">بیت‌کوین پذیرفته نیست</string>
+    <string name="poi_payment_visa_yes">Visa</string>
+    <string name="poi_payment_visa_no">کارت Visa پذیرفته نیست</string>
+    <string name="poi_payment_mastercard_yes">MasterCard</string>
+    <string name="poi_payment_mastercard_no">MasterCard پذیرفته نیست</string>
+    <string name="poi_payment_account_cards_yes">کارت Account</string>
+    <string name="poi_payment_account_cards_no">کارت Account پذیرفته نیست</string>
+    <string name="poi_payment_cheque_yes">چک</string>
+    <string name="poi_payment_cheque_no">چک پذیرفته نیست</string>
+    <string name="poi_payment_cryptocurrencies_no">رمزارز پذیرفته نیست</string>
+    <string name="poi_payment_others_yes">سایر</string>
+    <string name="poi_payment_others_no">سایر شیوه‌های پرداخت پذیرفته نیست</string>
+    <string name="poi_payment_sms_yes">پرداخت پیامکی</string>
+    <string name="poi_payment_sms_no">پرداخت پیامکی پذیرفته نیست</string>
+    <string name="poi_payment_paypal_no">‏PayPal پذیرفته نیست</string>
+    <string name="poi_toilets_no">بدون سرویس بهداشتی</string>
+    <string name="poi_toilets_access_customers">دسترسی سرویس بهداشتی: مشتری‌ها</string>
+    <string name="poi_toilets_access_permissive">دسترسی سرویس بهداشتی: با اجازه</string>
+    <string name="poi_toilets_access_community">دسترسی سرویس بهداشتی: هموَندان</string>
+    <string name="poi_toilets_access_public">دسترسی سرویس بهداشتی: همگانی</string>
+    <string name="poi_service_bicycle_charging_yes">شارژ: بله</string>
+    <string name="poi_service_bicycle_charging_no">شارژ: خیر</string>
+    <string name="poi_training_language">آموزش: زبان</string>
+    <string name="poi_language_school">آموزشگاه زبان</string>
+    <string name="poi_charging_station_output">خروجی ایستگاه شارژ</string>
+    <string name="poi_charging_station_filter">ایستگاه شارژ</string>
+    <string name="poi_office_religion">دفتر مذهبی</string>
+    <string name="poi_military_office">دفتر نظامی</string>
+    <string name="poi_publisher">دفتر نشر</string>
+    <string name="poi_public_bookcase">قفسه کتاب عمومی</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 295a6dd226..924508d30d 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="local_osm_changes_backup_failed">پشتیبان‌گیری از تغییرات OSM ناموفق بود</string>
     <string name="plugin_distance_point_time">زمان</string>
     <string name="plugin_distance_point_hdop">دقت</string>
@@ -20,7 +20,7 @@
     <string name="files_limit">%1$d فایل باقی مانده است</string>
     <string name="available_downloads_left">%1$d فایل برای دانلود باقی مانده</string>
     <string name="install_paid">نسخهٔ کامل</string>
-    <string name="cancel_navigation">پایان راهبری</string>
+    <string name="cancel_navigation">پایان ناوبری</string>
     <string name="clear_destination">پاک‌کردن مقصد</string>
     <string name="street_name">نام خیابان</string>
 	<string name="hno">پلاک خانه</string>
@@ -38,7 +38,7 @@
     <string name="shared_string_map">نقشه</string>
     
     
-    <string name="stop_routing_confirm">آیا مسیریابی را قطع می‌کنید؟</string>
+    <string name="stop_routing_confirm">آیا ناوبری را قطع می‌کنید؟</string>
     <string name="clear_dest_confirm">آیا از پاک‌کردن مقصد (و مقصدهای میانی) مطمئن هستید؟</string>
     <string name="intermediate_points_change_order">تغییر ترتیب</string>
     <string name="av_def_action_video">ضبط ویدئو</string>
@@ -119,14 +119,14 @@
 	<string name="map_widget_next_next_turn">دومین پیچ بعدی</string>
 	<string name="map_widget_mini_route">نقشه مسیر کوچک</string>
 	<string name="avoid_in_routing_title">پرهیز از…</string>
-	<string name="avoid_in_routing_descr">از جاده‌های دارای عوارضی، جاده‌های روسازی‌نشده و گذرگاه‌های آبی پرهیز شود.</string>
+	<string name="avoid_in_routing_descr">مثلاً، از جاده‌های عوارضی‌دار، جاده‌های روسازی‌نشده و فرابَرها پرهیز شود.</string>
 	
 	
 	<string name="bg_service_screen_lock_toast">صفحه قفل شد</string>
 	<string name="show_cameras">دوربین‌های کنترل سرعت</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="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>
@@ -291,7 +291,7 @@
 	
 	<string name="show_gps_coordinates_text">مختصات GPS را روی نقشه نشان بده</string>
 	<string name="use_internet_to_download_tile">کاشی‌های از قلم افتادهٔ نقشه دانلود شود</string>
-	<string name="app_description">برنامهٔ راهبری</string>
+	<string name="app_description">نرم‌افزار ناوبری</string>
 	<string name="shared_string_exit">خروج</string>
 	
 	
@@ -314,7 +314,7 @@
 	<string name="osb_comment_dialog_error">افزودن توضیح ناموفق بود</string>
 	
 	<string name="Closest_Amenities">نزدیک‌ترین امکانات رفاهی</string>
-	<string name="map_tile_source_descr">منبع نقشهٔ آنلاین یا کاشی‌های ذخیره‌شده را انتخاب کنید.</string>
+	<string name="map_tile_source_descr">منبع کاشی‌های آنلاین یا کاشی‌های ذخیره‌شدهٔ نقشه را انتخاب کنید.</string>
 	<string name="error_calculating_route_occured">محاسبهٔ مسیر ناموفق بود</string>
 	<string name="empty_route_calculated">مسیر محاسبه‌شده تُهی است</string>					
 	<string name="new_route_calculated_dist">مسیر جدید؛ مسافت</string>
@@ -339,7 +339,7 @@
 	<string name="fav_points_not_exist">هیچ نقطهٔ برگزیده‌ای وجود ندارد</string>
 	<string name="update_existing">جایگزین‌کردن</string>
 	<string name="only_show">مسیر را نشان بده</string>
-	<string name="follow">شروع راهبری</string>
+	<string name="follow">شروع ناوبری</string>
 	<string name="mark_final_location_first">لطفاً ابتدا مقصد را انتخاب کنید</string>
 	<string name="get_directions">مسیریابی</string>
 	
@@ -456,8 +456,8 @@
 	<string name="index_name_voice">پیام‌های گفتاری (ضبطی، قابلیت محدود)</string>
 	<string name="index_name_tts_voice">پیام‌های گفتاری (ماشینی، TTS - بهتر)</string>
 	<string name="amenity_type_osmwiki">ویکی‌پدیا (آفلاین)</string>
-	<string name="routing_settings">راهبری</string>
-	<string name="routing_settings_descr">گزینه‌های راهبری را تعریف کنید.</string>
+	<string name="routing_settings">ناوبری</string>
+	<string name="routing_settings_descr">گزینه‌های ناوبری را تعریف کنید.</string>
 	<string name="global_settings">تنظیمات کلی</string>
 	<string name="osmand_parking_delete">حذف نشانگر پارکینگ</string>
 	
@@ -574,12 +574,12 @@
     <string name="show_warnings_descr">پیکربندی‌های مربوط به هشدارهای ترافیکی (مانند محدودیت‌های سرعت، توقف‌های اجباری، سرعتگیرها، تونل‌ها)، هشدارهای دوربین کنترل سرعت و اطلاعات خط عبوری را انجام دهید.</string>
 	<string name="use_compass_navigation_descr">اگر جهت شناسایی نمی‌شود از قطب‌نما استفاده شود.</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_plus_play_title_30_chars">نقشه و مسیریابی با OsmAnd+‎</string>
-	<string name="osmand_plus_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_plus_play_title_30_chars">نقشه و ناوبری با OsmAnd+‎</string>
+	<string name="osmand_plus_short_description_80_chars">برنامهٔ همراه برای مشاهدهٔ نقشهٔ جهانی و ناوبری با نقشه‌های آفلاین و آنلاین OSM</string>
 	
 	
 	<string name="filterpoi_activity">ایجاد فیلتر برای POI</string>
@@ -654,8 +654,8 @@
 	
 	
 	<string name="settings_preset">پروفایل پیش‌فرض</string>
-	<string name="settings_preset_descr">نمای نقشه و تنظیمات راهبری برای هر پروفایل جداگانه ذخیره می‌شود. پروفایل پیش‌فرض خود را اینجا تنظیم کنید.</string>
-    <string name="osmand_background_plugin_description">تنظیمات مربوط به فعال‌سازی ردگیری و راهبری در پس‌زمینه را نشان می‌دهد که با ارسال پیام‌های بیدارباش متناوب به جی‌پی‌اس دستگاه این کار را انجام می‌دهد (با نمایشگر خاموش).</string>
+	<string name="settings_preset_descr">نمای نقشه و تنظیمات ناوبری برای هر پروفایل جداگانه ذخیره می‌شود. پروفایل پیش‌فرض خود را اینجا تنظیم کنید.</string>
+    <string name="osmand_background_plugin_description">تنظیمات مربوط به فعال‌سازی ردگیری و ناوبری در پس‌زمینه را نشان می‌دهد که با ارسال پیام‌های بیدارباش متناوب به جی‌پی‌اس دستگاه این کار را انجام می‌دهد (با نمایشگر خاموش).</string>
     <string name="av_def_action_choose">انتخاب برحسب تقاضا</string>
     <string name="audionotes_location_not_defined">مکانی برای یادداشت‌گذاری تعیین نشده. 
 \nمکانی را مشخص و از منوی زمینه اقدام کنید.</string>
@@ -678,9 +678,9 @@
 	<string name="osm_settings">ویرایش نقشهٔ OSM</string>
 	<string name="save_current_track_descr">مسیر جاری را همین حالا در قالب فایل GPX ذخیره کن.</string>
 	<string name="save_current_track">ذخیرهٔ مسیر جاری</string>
-	<string name="save_track_interval">بازهٔ زمانی ثبت داده‌ها در هنگام راهبری</string>
-	<string name="save_track_interval_descr">مشخص کنید برای ضبط مسیر در هنگام راهبری، داده‌ها با چه فاصلهٔ زمانی از هم ثبت شوند.</string>
-	<string name="save_track_to_gpx_descrp">هنگام راهبری، مسیر GPX به‌صورت خودکار ضبط و در پوشهٔ مسیرها (tracks) ذخیره می‌شود.</string>
+	<string name="save_track_interval">بازهٔ زمانی ثبت داده‌ها در هنگام ناوبری</string>
+	<string name="save_track_interval_descr">مشخص کنید برای ضبط مسیر در هنگام ناوبری، داده‌ها با چه فاصلهٔ زمانی از هم ثبت شوند.</string>
+	<string name="save_track_to_gpx_descrp">هنگام ناوبری، مسیر GPX به‌صورت خودکار ضبط و در پوشهٔ مسیرها (tracks) ذخیره می‌شود.</string>
 	
 	<string name="osm_settings_descr">تنظیمات لازم برای ارتباط با (OpenStreetMap.org (OSM را مشخص کنید.</string>
 	<string name="data_settings_descr">زبان را مشخص و داده‌ها را دانلود/بارگیری مجدد کنید.</string>
@@ -690,7 +690,7 @@
     <string name="safe_mode">حالت ایمن</string>
     <string name="show_lanes">خطوط عبوری</string>
 	<string name="avoid_unpaved">پرهیز از راه‌های روسازی‌نشده</string>
-	<string name="avoid_ferries">پرهیز از گذرگاه‌های آبی</string>
+	<string name="avoid_ferries">پرهیز از فرابَرها</string>
 	
 	<string name="map_widget_fluorescent">مسیرهای شب‌نما</string>
 	<string name="bg_service_sleep_mode_off">اجراکردن
@@ -713,11 +713,11 @@
 	<string name="navigate_point_format">قالب</string>
 	<string name="basemap_was_selected_to_download">نقشهٔ پایه انتخاب شد که دانلود شود تا برنامه راه بیفتد.</string>
 	<string name="select_index_file_to_download">چیزی پیدا نشد. اگر نمی‌توانید منطقهٔ خود را پیدا کنید، خودتان آن را بسازید (https://osmand.net را ببینید).</string>
-	<string name="local_indexes_cat_tile">نقشه‌های آنلاین و کاشی‌های ذخیره‌شده</string>
-	<string name="map_online_data">نقشه‌ها و کاشی‌های آنلاین</string>
+	<string name="local_indexes_cat_tile">نقشه‌های کاشی‌کاشی آنلاین و ذخیره‌شده</string>
+	<string name="map_online_data">نقشه‌های کاشی‌کاشی و آنلاین</string>
 	<string name="map_online_data_descr">از نقشه‌های آنلاین استفاده کنید (کاشی‌های نقشه را دانلود و روی کارت حافظه ذخیره کنید).</string>
 	<string name="shared_string_online_maps">نقشه‌های آنلاین</string>
-	<string name="online_map_settings_descr">منبع نقشه‌های آنلاین یا کاشی‌های ذخیره‌شده را تنظیم کنید.</string>
+	<string name="online_map_settings_descr">منبع کاشی‌های آنلاین یا ذخیره‌شدهٔ نقشه را تنظیم کنید.</string>
 	
 	<string name="vector_maps_may_display_faster_on_some_devices">نقشه‌های بُرداری معمولاً زودتر نمایش داده می‌شوند. شاید روی برخی دستگاه‌ها خوب کار نکند.</string>
 	<string name="test_voice_prompts">امتحان‌کردن پیام‌های گفتاری</string>    
@@ -778,8 +778,8 @@
 	<string name="choose_auto_follow_route">نمای نقشه خودکار-مرکز</string>
 	<string name="choose_auto_follow_route_descr">مدت‌زمانی که طول می‌کشد تا نقشه با موقعیت کنونی همگام شود.</string>
 	
-	<string name="auto_follow_route_navigation">راهبری فقط با حالت خودکار-مرکز</string>
-	<string name="auto_follow_route_navigation_descr">نمای خودکار-مرکز برای نقشه فقط در زمان مسیریابی فعال باشد.</string>
+	<string name="auto_follow_route_navigation">ناوبری فقط با حالت خودکار-مرکز</string>
+	<string name="auto_follow_route_navigation_descr">نمای خودکار-مرکز برای نقشه فقط در زمان ناوبری فعال باشد.</string>
 	<string name="auto_follow_location_enabled">نمای نقشه خودکار-مرکز است.</string>
 	<string name="pref_vector_rendering">تنظیمات مربوط به رندرکنندهٔ بُرداری</string>
 	<string name="pref_overlay">لایهٔ رویی/لایهٔ زیری</string>
@@ -801,7 +801,7 @@
 	<string name="local_index_mi_upload_gpx">ارسال به OSM</string>
 	<string name="show_more_map_detail_descr">برخی جزئیات نقشهٔ بُرداری (جاده‌ها و...) را در زوم‌های کمتر نشان می‌دهد.</string>
 	<string name="favourites_delete_multiple_succesful">نقطه‌های برگزیده حذف شد.</string>
-	<string name="favorite_delete_multiple">دارید %1$d نقطهٔ برگزیده و %2$d گروه را پاک می‌کنید. آیا مطمئن هستید؟</string>
+	<string name="favorite_delete_multiple">آیا از حذف %1$d نقطهٔ برگزیده و %2$d گروه مطمئن هستید؟</string>
 	<string name="basemap_missing">نقشه پایهٔ جهان را دانلود کنید تا نمایی از سراسر جهان با امکان بزرگ‌نمایی اندک داشته باشید.</string>
 	<string name="local_index_installed">نسخهٔ محلی</string>
 	
@@ -858,7 +858,7 @@
 	<string name="shared_string_io_error">خطای ورودی/خروجی</string>
 	<string name="km">ک‌م</string>
 	<string name="m">متر</string>
-	<string name="map_tile_source">منبع نقشهٔ کاشی‌مانند</string>
+	<string name="map_tile_source">منبع کاشی‌های نقشه</string>
 	<string name="mark_point">هدف</string>
 	
 	
@@ -904,7 +904,7 @@
     <string name="incremental_search_building">جست‌وجوی حرف‌به‌حرف نام ساختمان‌ها</string>
 	<string name="incremental_search_street">جست‌وجوی حرف‌به‌حرف نام خیابان‌ها</string>
 	<string name="reload_tile">بارگیری مجدد کاشی</string>
-	<string name="save_track_to_gpx">ضبط‌کردن خودکار مسیر هنگام راهبری</string>
+	<string name="save_track_to_gpx">ضبط‌کردن خودکار مسیر هنگام ناوبری</string>
 	
 	<string name="loading_postcodes">بارگیری کدهای پستی…</string>
 	<string name="converting_names">در حال تبدیل اسامی محلی/انگلیسی…</string>
@@ -931,7 +931,7 @@
 	<string name="context_menu_item_update_map_confirm">داده‌های محلی از طریق اینترنت به‌روز شود؟</string>
 	<string name="update_poi_error_loading">بارگیری داده از سرور ناموفق بود</string>
 	<string name="update_poi_no_offline_poi_index">برای این ناحیه هیچ POIای به‌صورت آفلاین موجود نیست</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="shared_string_ok">خُب</string>
@@ -950,21 +950,21 @@
 	<string name="voice_provider">راهنمای گفتاری</string>
 	<string name="menu_mute_off">صدا روشن است</string>
 	<string name="menu_mute_on">صدا خاموش است</string>
-	<string name="voice_provider_descr">راهنمای گفتاری برای راهبری را انتخاب کنید.</string>
+	<string name="voice_provider_descr">راهنمای گفتاری را برای ناوبری انتخاب کنید.</string>
 	<string name="voice_data_initializing">در حال آماده‌سازی داده‌های گفتاری…</string>
 	<string name="voice_data_not_supported">این نسخه از دادهٔ گفتاری پشتیبانی نمی‌شود</string>
 	<string name="voice_data_corrupted">دادهٔ گفتاری انتخاب‌شده خراب است</string>
 	<string name="voice_data_unavailable">دادهٔ گفتاری انتخاب‌شده موجود نیست</string>
 	<string name="sd_mounted_ro">کارت حافظه در حالت فقط‌خواندنی است. 
 \nبا این حساب تنها می‌توانید نقشه‌هایی را ببینید که قبلاً دریافت شده‌اند و نمی‌توانید مناطق جدیدی را دانلود کنید.</string>
-	<string name="process_navigation_service">سرویس راهبری OsmAnd</string>
+	<string name="process_navigation_service">خدمات ناوبری OsmAnd</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">ارائه‌دهندهٔ موقعیت</string>
 	<string name="background_router_service_descr">زمانی که صفحه خاموش است موقعیت شما را ردگیری می‌کند.</string>
 	<string name="background_router_service">اجرای OsmAnd در پس‌زمینه</string>
-	<string name="off_router_service_no_gps_available">برای استفاده از سرویس راهبری موقعیت مکانی را روشن کنید.</string>
+	<string name="off_router_service_no_gps_available">برای استفاده از خدمات ناوبری موقعیت مکانی را روشن کنید.</string>
 	<string name="hide_poi_filter">مخفی‌کردن فیلتر</string>
 	<string name="show_poi_filter">نمایش فیلتر</string>
 	<string name="search_poi_filter">فیلتر</string>
@@ -1001,7 +1001,7 @@
 	<string name="loading_builds">بارگیری ساخت‌های OsmAnd…</string>
 	<string name="select_build_to_install">یک ساخت OsmAnd را برای نصب انتخاب کنید</string>
 	<string name="gps_status_app_not_found">این برنامهٔ وضعیت GPS نصب نیست. در بازار اندروید بگردیم؟</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="download_files_question">آیا {0} فایل دانلود شود ({1} مگابایت)؟</string>
 	<string name="filter_existing_indexes">دانلود شد</string>
@@ -1063,10 +1063,10 @@
     
     
 	
-	<string name="osmand_long_description_1000_chars">برنامهٔ OsmAnd (مخفف OSM Automated Navigation Directions به‌معنی راهبری خودکار بر پایهٔ OSM) یک نرم‌افزار مسیریابی متن‌باز است که به گسترهٔ وسیعی از داده‌های جهانی OSM دسترسی دارد. 
+	<string name="osmand_long_description_1000_chars">برنامهٔ OsmAnd (مخفف OSM Automated Navigation Directions به‌معنی ناوبری خودکار بر پایهٔ OSM) یک نرم‌افزار مسیریابی متن‌باز است که به گسترهٔ وسیعی از داده‌های جهانی OSM دسترسی دارد. 
 \n 
 \nتمام داده‌های نقشه (بُرداری یا کاشی) را می‌توانید برای استفادهٔ آفلاین روی کارت حافظه ذخیره کنید. 
-\nهمچنین OsmAnd می‌تواند به‌صورت آنلاین و آفلاین مسیریابی کند و با راهنمای گفتاری شما را گام‌به‌گام هدایت کند.
+\nهمچنین OsmAnd می‌تواند به‌صورت آنلاین و آفلاین مسیریابی کند و با راهنمای گفتاری شما را گام‌به‌گام هدایت کند. 
 \n 
 \n* از ویژگی‌های مهم: 
 \n- کارایی کامل در حالت آفلاین (قابلیت ذخیره‌سازی نقشه‌های بُرداری یا کاشی در حافظهٔ دستگاه) 
@@ -1089,11 +1089,11 @@
 \n 
 \n* لطفاً OsmAnd+‎ را بخرید یا برای ویژگی‌های تازه و خاص سرمایه‌گذاری کنید. همچنین می‌توانید از طریق سایت https://osmand.net مبلغی هدیه کنید.</string>
 	
-	<string name="osmand_plus_long_description_1000_chars">برنامهٔ OsmAnd (مخفف OSM Automated Navigation Directions به‌معنی راهبری خودکار بر پایهٔ OSM) یک نرم‌افزار مسیریابی متن‌باز است که به گسترهٔ وسیعی از داده‌های جهانی OSM دسترسی دارد. 
+	<string name="osmand_plus_long_description_1000_chars">برنامهٔ OsmAnd (مخفف OSM Automated Navigation Directions به‌معنی ناوبری خودکار بر پایهٔ OSM) یک نرم‌افزار مسیریابی متن‌باز است که به گسترهٔ وسیعی از داده‌های جهانی OSM دسترسی دارد. 
 \n 
 \nتمام داده‌های نقشه (بُرداری یا کاشی) را می‌توانید برای استفادهٔ آفلاین روی کارت حافظه ذخیره کنید. 
-\nهمچنین OsmAnd می‌تواند به‌صورت آنلاین و آفلاین مسیریابی کند و با راهنمای گفتاری شما را گام‌به‌گام هدایت کند.
-\n
+\nهمچنین OsmAnd می‌تواند به‌صورت آنلاین و آفلاین مسیریابی کند و با راهنمای گفتاری شما را گام‌به‌گام هدایت کند. 
+\n 
 \n‏OsmAnd+‎ نسخهٔ پولی این برنامه است. با خریدن آن از این پروژه حمایت می‌کنید، سرمایه‌ای برای توسعهٔ قابلیت‌های جدید فراهم می‌کنید و آخرین به‌روزرسانی‌ها در اختیارتان قرار می‌گیرد. 
 \n 
 \n* از ویژگی‌های مهم: 
@@ -1115,11 +1115,11 @@
 	
 	
 	<string name="asap">دراسرع‌وقت</string>
-	<string name="osmand_rastermaps_plugin_description">با استفاده از این افزونه به انواع مختلفی از نقشه‌های آنلاین (کاشی‌مانند یا شطرنجی) دسترسی پیدا می‌کنید. این نقشه‌ها از کاشی‌های پیش‌فرض OpenStreetMap (مانند مَپنیک) تا تصاویر ماهواره‌ای و لایه‌های خاص مانند نقشه‌های آب‌و‌هوایی، هواشناسی، جغرافیایی و لایه‌های سایه‌روشن و... را در بر می‌گیرد. 
+	<string name="osmand_rastermaps_plugin_description">با استفاده از این افزونه به انواع مختلفی از نقشه‌های آنلاینِ کاشی‌کاشی (tile map) یا شطرنجی (raster map) دسترسی پیدا می‌کنید؛ از قبیل کاشی‌های پیش‌فرض OpenStreetMap (مانند مَپنیک)، تصاویر ماهواره‌ای، لایه‌های خاص مانند نقشه‌های آب‌و‌هوایی، هواشناسی، جغرافیایی، لایه‌های سایه‌روشن و... . 
 \n 
-\nهرکدام از این نقشه‌ها هم به‌عنوان نقشهٔ پایه و هم به‌عنوان لایهٔ رویی یا زیری برای لایهٔ پایه (مثلاً نقشه‌های آفلاین و استاندارد OsmAnd) قابل‌نمایش هستند. برای اینکه لایهٔ زیری را نمایان‌تر کنید می‌توانید اجزای خاصی را در نقشه‌های بُرداری OsmAnd از طریق منوی «پیکربندی نقشه» مخفی کنید. 
+\nهرکدام از این نقشه‌ها هم به‌عنوان نقشهٔ پایه و هم به‌عنوان لایهٔ رویی یا زیری برای لایهٔ پایه (مثلاً نقشه‌های آفلاین OsmAnd) قابل‌تنظیم هستند. برای اینکه لایهٔ زیری را نمایان‌تر کنید می‌توانید اجزای خاصی را در نقشه‌های بُرداری OsmAnd از طریق منوی «پیکربندی نقشه» مخفی کنید. 
 \n 
-\nنقشه‌های کاشی‌مانند مستقیماً از طریق منابع آنلاین قابل‌دریافت هستند. همچنین می‌توانید آن‌ها را به‌صورت پایگاه‌دادهٔ SQLite برای استفادهٔ آفلاین آماده کنید و سپس در پوشهٔ داده‌های OsmAnd قرار دهید. نرم‌افزارهای مختلفی برای انجام این کار وجود دارد.</string>
+\nنقشه‌ها مستقیماً از طریق منابع آنلاین قابل‌دریافت هستند. همچنین می‌توانید آن‌ها را به‌صورت پایگاه‌دادهٔ SQLite برای استفادهٔ آفلاین آماده کنید و سپس در پوشهٔ داده‌های OsmAnd قرار دهید. نرم‌افزارهای مختلفی برای انجام این کار وجود دارد.</string>
 	
 	<string name="osmand_accessibility_description">این افزونه امکانات قابلیت‌دسترسی (accessibility) در دستگاهتان را مستقیماً در OsmAnd به‌کار می‌گیرد و تسهیلاتی را در اختیارتان می‌گذارد؛ مانند تنظیم‌کردن سرعت گفتار موتور صوتی، تبدیل متن به گفتار (مثل اعلام موقعیت شما)، پیمایش صفحه به‌کمک صفحهٔ جهت‌دار و استفاده از توپک برای تنظیم بزرگ‌نمایی.</string>
 	
@@ -1157,7 +1157,7 @@
 	
 	<string name="update_poi_file_not_found">فایل محلی برای نگهداری تغییرات POI وجود ندارد و قابل‌ایجاد نیست.</string>
 	<string name="map_version_changed_info">برای استفاده از فایل‌های جدید نقشه نسخهٔ جدید برنامه را دانلود کنید.</string>
-	<string name="poi_filter_nominatim">جست‌وجوی آنلاین با Nominatim</string>
+	<string name="poi_filter_nominatim">‏Nominatim‏ آنلاین</string>
 	
 	<string name="vector_data_missing">برای استفاده از نقشه‌های آفلاین، داده‌های «آفلاین» را دانلود کنید.</string>
 	<string name="local_index_gpx_info_show">"
@@ -1184,7 +1184,7 @@
 	<string name="overlay_transparency">شفافیت لایهٔ رویی</string>
 	<string name="map_transparency_descr">شفافیت نقشهٔ پایه را تغییر دهید.</string>
 	<string name="map_transparency">شفافیت نقشهٔ پایه</string>
-	<string name="select_tile_source_to_install">نقشه‌ها (کاشی) را برای نصب یا به‌روزرسانی انتخاب کنید.</string>
+	<string name="select_tile_source_to_install">نقشه‌ها(ی کاشی‌کاشی) را برای نصب یا به‌روزرسانی انتخاب کنید.</string>
 	<string name="level_to_switch_vector_raster">کمترین سطح زوم بُرداری</string>
 	
 	
@@ -1302,7 +1302,7 @@
     <string name="speech_rate_descr">سرعت گفتار موتور صوتی را مشخص کنید.</string>
     <string name="speech_rate">سرعت گفتار</string>
     <string name="guidance_preferences_descr">تنظیمات ناوبری</string>
-    <string name="disable_complex_routing_descr">مسیریابی دو-مرحله‌ای را برای راهبری خودرویی غیرفعال می‌کند.</string>
+    <string name="disable_complex_routing_descr">مسیریابی دو-مرحله‌ای را برای ناوبری خودرویی غیرفعال می‌کند.</string>
     <string name="disable_complex_routing">غیرفعال‌کردن مسیریابی پیچیده</string>
     
     <string name="complex_route_calculation_failed">محاسبهٔ سریع مسیر ناموفق بود (%s)، برای محاسبهٔ آهسته به عقب برگردید.</string>
@@ -1324,8 +1324,8 @@
 	<string name="routing_attr_avoid_toll_description">از مسیرهای دارای عوارضی پرهیز شود</string>
 	<string name="routing_attr_avoid_unpaved_name">پرهیز از مسیرهای خاکی</string>
 	<string name="routing_attr_avoid_unpaved_description">از راه‌های روسازی‌نشده پرهیز شود.</string>
-	<string name="routing_attr_avoid_ferries_name">پرهیز از گذرگاه‌های آبی</string>
-	<string name="routing_attr_avoid_ferries_description">از گذرگاه‌های آبی را پرهیز شود</string>
+	<string name="routing_attr_avoid_ferries_name">پرهیز از فرابَرها</string>
+	<string name="routing_attr_avoid_ferries_description">از فرابَرها (ferries) پرهیز شود</string>
 	<string name="routing_attr_avoid_motorway_name">پرهیز از آزادراه‌ها</string>
 	<string name="routing_attr_avoid_motorway_description">از آزادراه‌ها پرهیز شود</string>
 	<string name="routing_attr_weight_name">وزن مجاز</string>
@@ -1336,7 +1336,7 @@
     <string name="shared_string_favorite">نقطهٔ برگزیده</string>
     <string name="route_preferences">ترجیحات مسیر</string>
     <string name="route_info">اطلاعات مسیر</string>
-    <string name="use_displayed_track_for_navigation">از مسیر نمایش‌داده‌شده برای راهبری استفاده می‌کنید؟</string>
+    <string name="use_displayed_track_for_navigation">از مسیر نمایش‌داده‌شده برای ناوبری استفاده می‌کنید؟</string>
     <string name="keep_and_add_destination_point">افزودن به‌عنوان مقصد آخر</string>
     
     <string name="calculate_osmand_route_without_internet">محاسبهٔ مسیر بدون استفاده از اینترنت</string>
@@ -1406,8 +1406,8 @@
 	<string name="share_route_as_gpx">اشتراک‌گذاری مسیر در قالب فایل GPX</string>
 	<string name="share_route_subject">مسیر از طریق OsmAnd به‌اشتراک گذاشته شد</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="arrival_distance">اعلام رسیدن</string>
     
@@ -1506,7 +1506,7 @@
     <string name="selected_gpx_info_show">"
 \n
 \nبرای نمایش بر روی نقشه انگشت خود را چند لحظه بر روی صفحه نگه دارید"</string>
-    <string name="delay_navigation_start">شروع راهنمایی گام‌به‌گام به‌صورت خودکار</string>
+    <string name="delay_navigation_start">راهنمایی پیچ تا پیچ به‌صورت خودکار شروع شود</string>
     <string name="shared_string_selected_lowercase">انتخاب</string>
     <string name="gpx_split_interval">بازهٔ تقسیم</string>
     <string name="gpx_info_subtracks">زیرمسیرها: %1$s</string>
@@ -1535,8 +1535,8 @@
     <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="sort_by_distance">ترتیب براساس مسافت</string>
     <string name="sort_by_name">ترتیب براساس نام</string>
     <string name="none_selected_gpx">هیچ فایل GPXای انتخاب نشده است. یکی را با لمس طولانی انتخاب کنید.</string>
@@ -1578,7 +1578,7 @@
     <string name="way_alarms">هشدارهای ترافیکی</string>
     <string name="speak_favorites">نقاط برگزیدهٔ اطراف</string>
     <string name="speak_poi">مکان‌های POI نزدیک</string>
-    <string name="download_additional_maps">آیا نقشه‌هایی را که ندارید، دانلود می‌کنید %1$s ‏(%2$d مگابایت)؟</string>
+    <string name="download_additional_maps">آیا نقشه‌های ناموجود را دانلود می‌کنید %1$s ‏(%2$d مگابایت)؟</string>
     <string name="shared_string_more">بیشتر…</string>
     <string name="rendering_value_browse_map_name">مرور نقشه</string>  
     <string name="rendering_value_car_name">خودرو</string>
@@ -1588,8 +1588,8 @@
     
     
     
-    <string name="continue_navigation">ادامهٔ راهبری</string>
-    <string name="pause_navigation">مکث‌کردن در راهبری</string>
+    <string name="continue_navigation">ادامهٔ ناوبری</string>
+    <string name="pause_navigation">مکث در ناوبری</string>
     <string name="rendering_attr_subwayMode_name">مسیرهای مترو</string>
  	<string name="map_preferred_locale_descr">زبانی که برای نمایش نام‌های روی نقشه می‌پسندید (اگر نام به این زبان موجود نباشد، به‌جایش نام انگلیسی یا محلی نشان داده می‌شود).</string>
     <string name="local_map_names">نام‌های محلی</string>
@@ -1649,7 +1649,7 @@
 	<string name="share_note">به‌اشتراک‌گذاری یادداشت</string>
 	
     <string name="location_on_map">موقعیت: 
-\n عرض %1$s 
+\n عرض %1$s
 \n طول %2$s</string>
 	<string name="watch">مشاهده</string>
 	<string name="notes">یادداشت‌ها</string>
@@ -1736,11 +1736,11 @@
 	<string name="enable_proxy_title">فعال‌کردن پروکسی HTTP</string>
 	<string name="enable_proxy_descr">یک پروکسی HTTP برای همهٔ تقاضاهای شبکه تنظیم کنید.</string>
 	<string name="proxy_host_title">میزبان پروکسی</string>
-	<string name="proxy_port_title">پورت پروکسی</string>
+	<string name="proxy_port_title">درگاه پروکسی</string>
 	<string name="nautical_maps_missing">برای نمایش نقشه‌های دریایی باید نقشهٔ آفلاین آن را دانلود کنید</string>
 	<string name="version_settings">ساخت‌ها</string>
     <string name="settings_privacy">حریم خصوصی</string>
-    <string name="navigation_over_track">راهبری بر روی مسیر شروع شود؟</string>
+    <string name="navigation_over_track">ناوبری بر روی مسیر شروع شود؟</string>
 	<string name="avoid_roads_msg">با انتخاب راه‌های اجتنابی مسیر دیگری دریافت کنید</string>
     <string name="speak_pedestrian">گذرگاه‌های پیاده</string>
     <string name="traffic_warning_pedestrian">گذرگاه پیاده</string>
@@ -1755,14 +1755,14 @@
     <string name="shared_string_dismiss">بی‌خیال</string>
     <string name="use_opengl_render">استفاده از رندرگیری OpenGL</string>
     <string name="use_opengl_render_descr">از رندرگیری سرعت‌یافتهٔ سخت‌افزاری OpenGL استفاده کن (شاید مصرف باتری افزایش یابد یا روی دستگاه‌های خیلی قدیمی کار نکند).</string>
-    <string name="lock_screen_request_explanation">%1$s به این مجوز نیاز دارد تا برای صرفه‌جویی در انرژی، بتواند نمایشگر را خاموش کند.</string>
+    <string name="lock_screen_request_explanation">‏%1$s به این مجوز نیاز دارد تا برای صرفه‌جویی در انرژی بتواند نمایشگر را خاموش کند.</string>
     <string name="wake_on_voice_descr">هنگام نزدیک‌شدن به پیچ، نمایشگر روشن شود (اگر خاموش است).</string>
     <string name="shared_string_never">هرگز</string>
     <string name="rendering_attr_trolleybusRoutes_name">مسیرهای اتوبوس برقی</string>
     <string name="rendering_attr_busRoutes_name">مسیرهای اتوبوس</string>
     <string name="rendering_category_routes">مسیرها</string>
     <string name="fav_point_dublicate_message">نام نقطهٔ برگزیده تکراری است، برای جلوگیری از تکرار آن را به %1$s تغییر دادیم.</string>
-    <string name="proxy_port_descr">شمارهٔ پورت پروکسی را تنظیم کنید (مثلاً 8118).</string>
+    <string name="proxy_port_descr">شمارهٔ درگاه پروکسی را تنظیم کنید (مثلاً 8118).</string>
 	<string name="proxy_host_descr">نام میزبان پروکسی را تنظیم کنید (مثلاً 127.0.0.1).</string>
 	<string name="plugin_install_needs_network">برای نصب این افزونه به اینترنت وصل شوید.</string>
 	
@@ -1801,20 +1801,20 @@
     <string name="confirm_usage_speed_cameras">در بسیاری از کشورها (آلمان، فرانسه، ایتالیا و...) استفاده از هشداردهندهٔ دوربین‌های ترافیکی غیرقانونی است. با نقض قانون از سوی شما OsmAnd هیچ‌گونه مسئولیتی بر عهده نمی‌گیرد. لطفاً فقط اگر مجاز به استفاده از این ویژگی هستید «بله» را انتخاب کنید.</string>
 	<string name="welmode_download_maps">دانلود نقشه‌ها</string>
 	<string name="welcome_select_region">برای نمایش صحیح علائم و قوانین ترافیکی، لطفاً منطقهٔ رانندگی خود را انتخاب کنید:</string>
-	<string name="welcome_text">برنامهٔ OsmAnd نقشه‌گردی و راهبری آفلاین را برایتان به ارمغان می‌آورد.</string>
+	<string name="welcome_text">برنامهٔ OsmAnd نقشه‌گردی و ناوبری آفلاین را برایتان به ارمغان می‌آورد.</string>
 	<string name="welcome_header">خوش آمدید</string>
     <string name="current_route">مسیر فعلی</string>
     <string name="osm_changes_added_to_local_edits">تغییرات OSM به بستهٔ تغییرات محلی اضافه شد</string>
    	<string name="mark_to_delete">برای حذف‌کردن علامت بزنید</string>
 	
-	<string name="local_osm_changes_upload_all_confirm">دارید %1$d تغییر را به OSM ارسال می‌کنید. مطمئن هستید؟</string>
+	<string name="local_osm_changes_upload_all_confirm">آیا از بارگذاری این %1$d تغییر در OSM مطمئن هستید؟</string>
     <string name="confirmation_to_clear_history">سوابق را پاک می‌کنید؟</string>
-    <string name="delay_to_start_navigation_descr">مدت‌زمان ماندن در صفحهٔ طراحی مسیر تا شروع راهبری را مشخص کنید.</string>
-    <string name="delay_to_start_navigation">مسیریابی مرحله‌به‌مرحله را بعد از … شروع کن</string>
+    <string name="delay_to_start_navigation_descr">مدت‌زمان ماندن در صفحهٔ طراحی مسیر تا شروع ناوبری را مشخص کنید.</string>
+    <string name="delay_to_start_navigation">ناوبری پیچ تا پیچ را با این تأخیر شروع کن…</string>
     <string name="shared_string_go">برو</string>
 	<string name="osmand_parking_overdue">تأخیر دارید</string>
 	<string name="general_settings_2">تنظیمات کلی</string>
-	<string name="routing_settings_2">تنظیمات راهبری</string>
+	<string name="routing_settings_2">تنظیمات ناوبری</string>
     <string name="shared_string_do_not_use">استفاده نشود</string>
 	<string name="rendering_attr_OSMMapperAssistant_name">دستیار نقشه‌کش OSM</string>
 	<string name="osm_edits">ویرایش‌های OSM</string>
@@ -1916,7 +1916,7 @@
     <string name="contact_us">تماس</string>
     <string name="map_legend">علائم نقشه</string>
     <string name="save_poi_without_poi_type_message">آیا واقعاً POI را بدون ذکر نوع آن ذخیره می‌کنید؟</string>
-    <string name="navigation_item_description">تنظیمات راهبری را انجام دهید.</string>
+    <string name="navigation_item_description">تنظیمات ناوبری را انجام دهید.</string>
     <string name="planning_trip_item">طرح‌ریزی سفر</string>
     <string name="faq_item">سؤالات رایج</string>
     <string name="faq_item_description">سؤالاتی که زیاد پرسیده شده است</string>
@@ -2051,7 +2051,7 @@
     <string name="storage_permission_restart_is_required">اکنون برنامه مجاز به نوشتن در ذخیره‌گاه خارجی است اما نیاز است برنامه را ببندید و دوباره اجرا کنید.</string>
     <string name="shared_string_move_up">به ↑</string>
     <string name="shared_string_move_down">به ↓</string>
-    <string name="finish_navigation">پایان راهبری</string>
+    <string name="finish_navigation">پایان ناوبری</string>
     <string name="avoid_road">پرهیز از این راه</string>
     <string name="storage_directory_readonly_desc">پوشهٔ ذخیره‌سازی به حافظهٔ داخلی تغییر کرد، زیرا پوشهٔ انتخاب‌شده فقط‌خواندنی است. لطفاً پوشه‌ای را انتخاب کنید که ذخیره‌سازی در آن مجاز باشد.</string>
     <string name="storage_directory_shared">حافظهٔ اشتراکی</string>
@@ -2131,10 +2131,10 @@
     <string name="index_item_depth_points_northern_hemisphere">نقاط عمقی دریا در نیمکرهٔ شمالی</string>
     <string name="nautical_maps">نقشهٔ دریایی</string>
     <string name="routing_attr_relief_smoothness_factor_plains_name">کم‌تپه</string>
-    <string name="routing_attr_driving_style_safety_name">ترجیح‌دادن بیراهه</string>
+    <string name="routing_attr_driving_style_safety_name">ترجیح‌دادن راه‌های فرعی‌تر</string>
     <string name="relief_smoothness_factor_descr">اولویت ساختار زمین: هموار یا پرتپه.</string>
     <string name="shared_string_slope">شیب</string>
-    <string name="points_delete_multiple">دارید %1$d نقطه را حذف می‌کنید؛ مطمئن هستید؟</string>
+    <string name="points_delete_multiple">آیا از حذف این %1$d نقطه مطمئن هستید؟</string>
     <string name="track_points_category_name">نقاط بین‌راهی، نقاط محبوب (POI)، عارضه‌های دارای نام</string>
     <string name="shared_string_gpx_track">مسیر</string>
     <string name="shared_string_time_span">مدت‌زمان</string>
@@ -2201,9 +2201,9 @@
     <string name="show_on_map_after_saving">مشاهده بر روی نقشه پس از ذخیره‌شدن</string>
     <string name="measurement_tool_action_bar">نقشه را بپیمایید و نقاط را اضافه کنید</string>
     <string name="measurement_tool">اندازه‌گیری مسافت</string>
-    <string name="quick_action_resume_pause_navigation">مکث/ادامهٔ راهبری</string>
-    <string name="quick_action_show_navigation_finish_dialog">پیغام پایان‌یافتن راهبری را نشان بده</string>
-    <string name="quick_action_start_stop_navigation">شروع/اتمام راهبری</string>
+    <string name="quick_action_resume_pause_navigation">مکث/ادامهٔ ناوبری</string>
+    <string name="quick_action_show_navigation_finish_dialog">پیغام پایان‌یافتن ناوبری را نشان بده</string>
+    <string name="quick_action_start_stop_navigation">شروع/اتمام ناوبری</string>
     <string name="shared_string_reset">تنظیم مجدد</string>
     <string name="shared_string_reload">بارگیری مجدد</string>
     <string name="remove_from_map_markers">از نشانه‌های نقشه حذف شود</string>
@@ -2329,7 +2329,7 @@
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>
     <string name="shared_string_trip_recording">ضبط سفر</string>
-    <string name="shared_string_navigation">راهبری</string>
+    <string name="shared_string_navigation">ناوبری</string>
     <string name="osmand_running_in_background">اجرا در پس‌زمینه</string>
     <string name="favourites_edit_dialog_title">اطلاعات نقطهٔ برگزیده</string>
     <string name="simulate_your_location_stop_descr">شبیه‌سازی موقعیتتان را پایان دهید.</string>
@@ -2356,7 +2356,7 @@
     <string name="shared_string_import2osmand">واردکردن به OsmAnd</string>
     <string name="read_full_article">مقالهٔ کامل را بخوانید (آنلاین)</string>
     <string name="shared_string_wikipedia">ویکی‌پدیا</string>
-    <string name="local_recordings_delete_all_confirm">دارید %1$d یادداشت را پاک می‌کنید. مطمئن هستید؟</string>
+    <string name="local_recordings_delete_all_confirm">آیا از حدف این %1$d یادداشت مطمئن هستید؟</string>
     <string name="osmand_parking_hour">س</string>
     <string name="osmand_parking_minute">دق‍</string>
     <string name="shared_string_collapse">مخفی شود</string>
@@ -2369,7 +2369,7 @@
     <string name="navigate_point_olc_info_area">کد کامل و معتبر است؛
 \nپهنهٔ متناظر: %1$s × %2$s</string>
     <string name="increase_search_radius">محدودهٔ جست‌وجو را بزرگ‌تر کن</string>
-    <string name="nothing_found_descr">عبارت جست‌وجو را اصلاح کنید یا اینکه محدودهٔ جست‌وجو را بزرگ‌تر کنید.</string>
+    <string name="nothing_found_descr">عبارت جست‌وجو را اصلاح کنید یا محدودهٔ جست‌وجو را بزرگ‌تر کنید.</string>
     <string name="save_track_to_gpx_globally_headline">ضبط مسیر درصورت تقاضا</string>
     <string name="average">میانگین</string>
     <string name="of">%1$d از %2$d</string>
@@ -2415,8 +2415,8 @@
     <string name="shared_string_undo">خنثی‌کردن</string>
     <string name="shared_string_skip">ردکردن</string>
     <string name="app_name_osmand">OsmAnd</string>
-    <string name="offline_maps_and_navigation">نقشه‌های آفلاین
-\nو مسیریابی</string>
+    <string name="offline_maps_and_navigation">نقشه‌های آفلاین 
+\nو ناوبری</string>
     <string name="tab_title_basic">ساده</string>
     <string name="tab_title_advanced">پیشرفته</string>
     <string name="building_number">پلاک ساختمان</string>
@@ -2516,7 +2516,7 @@
     <string name="quick_action_take_photo_note_descr">با لمس این دکمهٔ عملیاتی یک یادداشت تصویری در مرکز صفحه ایجاد می‌شود.</string>
     <string name="quick_action_add_osm_bug_descr">با لمس این دکمهٔ عملیاتی یک توضیح ویرایشی OSM در مرکز صفحه ایجاد می‌شود.</string>
     <string name="quick_action_add_poi_descr">با لمس این دکمهٔ عملیاتی یک مکان POI در مرکز صفحه ایجاد می‌شود.</string>
-    <string name="quick_action_navigation_voice_descr">با لمس این دکمهٔ عملیاتی، راهنمای گفتاری در زمان راهبری فعال یا غیرفعال می‌شود.</string>
+    <string name="quick_action_navigation_voice_descr">با لمس این دکمهٔ عملیاتی، راهنمای گفتاری در زمان ناوبری فعال یا غیرفعال می‌شود.</string>
     <string name="quick_action_add_parking_descr">با لمس این دکمهٔ عملیاتی یک جای پارک در مرکز صفحه علامت‌گذاری می‌شود.</string>
     <string name="favorite_autofill_toast_text">" اینجا ذخیره شد: "</string>
     <string name="favorite_empty_place_name">مکان</string>
@@ -2532,7 +2532,7 @@
     <string name="quick_action_poi_hide">پنهان‌کردن %1$s</string>
     <string name="quick_action_add_category">افزودن دسته</string>
     <string name="quick_action_add_configure_map">پیکربندی نقشه</string>
-    <string name="quick_action_add_navigation">راهبری</string>
+    <string name="quick_action_add_navigation">ناوبری</string>
     <string name="quick_action_fav_name_descr">خالی بگذارید تا از نشانی یا نام محل استفاده شود.</string>
     <string name="quick_action_bug_descr">این نوشته به‌صورت خودکار در قسمت پیام درج می‌شود.</string>
     <string name="quick_action_bug_message">پیام</string>
@@ -2597,11 +2597,11 @@
     <string name="edit_line">اصلاح خط</string>
     <string name="add_point_before">افزودن نقطه به قبل</string>
     <string name="add_point_after">افزودن نقطه به بعد</string>
-    <string name="measurement_tool_snap_to_road_descr">برای پروفایل انتخابی، OsmAnd نقطه‌ها را به مسیرها متصل می‌کند.</string>
-    <string name="choose_navigation_type">پروفایل راهبری را انتخاب کنید</string>
+    <string name="measurement_tool_snap_to_road_descr">بر اساس پروفایل انتخابی، OsmAnd نقطه‌ها را به مسیر متصل می‌کند.</string>
+    <string name="choose_navigation_type">پروفایل ناوبری را انتخاب کنید</string>
     <string name="none_point_error">لطفاً حداقل یک نقطه اضافه کنید.</string>
-    <string name="quick_action_resume_pause_navigation_descr">برای مکث‌کردن در/ادامه‌دادن به راهبری این دکمه را لمس کنید.</string>
-    <string name="quick_action_start_stop_navigation_descr">این دکمه را لمس کنید تا راهبری را شروع کنید یا پایان دهید.</string>
+    <string name="quick_action_resume_pause_navigation_descr">برای مکث‌کردن در/ادامه‌دادن به ناوبری این دکمه را لمس کنید.</string>
+    <string name="quick_action_start_stop_navigation_descr">این دکمه را لمس کنید تا ناوبری را شروع کنید یا پایان دهید.</string>
     <string name="mapillary_menu_descr_tile_cache">کاشی‌ها را مجدداً بارگیری کنید تا اطلاعات به‌روز را ببینید.</string>
     <string name="mapillary_menu_title_tile_cache">حافظهٔ کاشی‌ها</string>
     <string name="wrong_user_name">نام کاربری اشتباه است</string>
@@ -2612,7 +2612,7 @@
     <string name="mapillary_menu_edit_text_hint">نام کاربری را بنویسید</string>
     <string name="mapillary_menu_descr_username">فقط تصاویری که کاربر زیر اضافه کرده است</string>
     <string name="mapillary_menu_title_username">نام کاربری</string>
-    <string name="mapillary_menu_filter_description">تصاویر را بر اساس تاریخ یا ارسال‌کنندهٔ آن فیلتر کنید. فقط در زوم نزدیک کار می‌کند.</string>
+    <string name="mapillary_menu_filter_description">فیلتر تصاویر بر اساس ارسال‌کننده، تاریخ یا نوع. فقط در زوم نزدیک کار می‌کند.</string>
     <string name="map_widget_ruler_control">خط‌کش شعاعی</string>
     <string name="shared_string_permissions">مجوزها</string>
     <string name="import_gpx_failed_descr">‏OsmAnd نمی‌تواند فایل را وارد کند. لطفاً بررسی کنید OsmAnd اجازهٔ خواندن فایل را داشته باشد.</string>
@@ -2747,7 +2747,7 @@
     <string name="save_route_point">ذخیره‌کردن نقطهٔ مسیر</string>
     <string name="route_point_one">نقطهٔ مسیر 1</string>
     
-    <string name="animate_my_location_desc">در هنگام راهبری نقشه بتواند برای نشان‌دادن موقعیت من جابه‌جا شود.</string>
+    <string name="animate_my_location_desc">در هنگام ناوبری نقشه بتواند برای نشان‌دادن موقعیت من جابه‌جا شود.</string>
     <string name="rendering_value_fine_name">خوب</string>
     <string name="plugin_nautical_descr">این افزونه قابلیت ارائهٔ نقشه‌های دریایی را به OsmAnd اضافه می‌کند. این نقشه‌ها برای قایقرانی، بادبانی‌رانی و دیگر انواع ورزش‌های آبی مفید است. 
 \n 
@@ -2757,10 +2757,10 @@
     <string name="plugin_ski_descr">با این افزونه اطلاعات جهانی سراشیبی‌های اسکی، مسابقات اسکی صحرایی، مسیرهای اسکی آلپاین، تله‌کابین‌ها و نقاله‌های اسکی کاملاً در اختیارتان است. مسیرها و پیست‌ها بر اساس دشواری رنگ‌بندی شده‌اند که در یک سبک زمستانی ارائه می‌شوند تا نمایی همگون با محیط زمستانی را برایتان ایجاد کند. 
 \n 
 \nبا فعال‌کردن این نما، سبک نقشه به «زمستان و اسکی» تغییر می‌کند که همهٔ خصوصیات زمین را با ظاهر زمستانی نشان می‌دهد. برای غیرفعال‌کردن این نما افزونه را غیرفعال کنید یا اینکه از طریق منو ← پیکربندی نقشه ← سبک نقشه، سبک دلخواهتان را انتخاب کنید.</string>
-    <string name="osmand_extended_description_part1">برنامهٔ OsmAnd (مخفف OSM Automated Navigation Directions به‌معنی راهبری خودکار بر پایهٔ OSM) یک نرم‌افزار نقشه و راهبری است که به گسترهٔ وسیعی از داده‌های نقشهٔ باز شهری (OpenStreetMap یا به‌صورت خلاصه OSM) دسترسی دارد. این داده‌های رایگان و جهانی با بالاترین کیفیت ارائه می‌شوند. 
+    <string name="osmand_extended_description_part1">برنامهٔ OsmAnd (مخفف OSM Automated Navigation Directions به‌معنی ناوبری خودکار بر پایهٔ OSM) یک نرم‌افزار نقشه و ناوبری است که به گسترهٔ وسیعی از داده‌های نقشهٔ باز شهری (OpenStreetMap یا به‌صورت خلاصه OSM) دسترسی دارد. این داده‌های رایگان و جهانی با بالاترین کیفیت ارائه می‌شوند. 
 \n 
-\nراهبر دیداری و شنیداری، مشاهدهٔ مکان‌های محبوب (POIها یا Points of interest)، ایجاد و مدیریت ردهای GPX، استفاده از تصویرسازی منحنی‌های تراز و اطلاعات ارتفاع (با استفاده از افزونه)، انتخاب حالت‌های پیاده، دوچرخه، خودرو، امکان ویرایش مکان‌ها و... چیزهایی هستند که تجربهٔ مؤثر و لذت‌بخشی در کار با نقشه را برایتان به ارمغان می‌آورند.</string>
-    <string name="osmand_extended_description_part2">راهبری با GPS 
+\nناوبری دیداری و شنیداری، مشاهدهٔ مکان‌های محبوب (POIها یا Points of interest)، ایجاد و مدیریت ردهای GPX، استفاده از تصویرسازی منحنی‌های تراز و اطلاعات ارتفاع (با استفاده از افزونه)، انتخاب حالت‌های پیاده، دوچرخه، خودرو، امکان ویرایش مکان‌ها و... چیزهایی هستند که تجربهٔ مؤثر و لذت‌بخشی در کار با نقشه را برایتان به ارمغان می‌آورند.</string>
+    <string name="osmand_extended_description_part2">ناوبری با GPS 
 \n • امکان انتخاب بین حالت آنلاین و آفلاین؛ در حالت آفلاین هزینهٔ دیگری بابت اینترنت نمی‌پردازید و در حالت آنلاین عملکرد سریع‌تری را تجربه می‌کنید 
 \n • راهنمای گام‌به‌گام گفتاری که در پیمودن مسیر راهنمایی‌تان می‌کند (با پیام‌های گفتاری انسانی و ماشینی) 
 \n • اگر از مسیر منحرف شوید، مسیر جدیدی برایتان پیدا می‌کند 
@@ -2778,11 +2778,11 @@
     <string name="osmand_extended_description_part3">نقشه 
 \n • نقاط محبوب (POI یا Points of interest) اطرافتان را نشان می‌دهد 
 \n • نقشه را در راستای حرکتتان (یا قطب‌نما) تنظیم می‌کند 
-\n • موقعیت و سوی جهت‌گیری‌تان را نشان می‌دهد
+\n • موقعیت و سوی جهت‌گیری‌تان را نشان می‌دهد 
 \n • موقعیتتان را با دوستانتان به‌اشتراک بگذارید تا شما را پیدا کنند 
 \n • جاهایی را که دوست دارید در قسمت نقاط برگزیده ذخیره کنید 
 \n • شیوهٔ نمایش نام‌های روی نقشه را انتخاب کنید: انگلیسی، محلی یا نویسه‌گردانی‌شده 
-\n • نمایش نقشه‌های تخصصی آنلاین، تصاویر ماهواره‌ای (بینگ) و رولایه‌های مختلف مانند مسیرهای گردشگردی یا راهبری GPX با امکان تنظیم شفافیت</string>
+\n • نمایش نقشه‌های تخصصی آنلاین، تصاویر ماهواره‌ای (بینگ) و رولایه‌های مختلف مانند مسیرهای GPX گردشگردی یا ناوبری با امکان تنظیم شفافیت</string>
     
     <string name="context_menu_item_delete_waypoint">نقطهٔ بین‌راهی GPX را حذف می‌کنید؟</string>
     <string name="context_menu_item_edit_waypoint">ویرایش نقطهٔ بین‌راهی GPX</string>
@@ -2803,8 +2803,8 @@
     
     
     
-    <string name="av_locations_descr">فایل GPX از مکان‌های یادداشت‌دار.</string>
-    <string name="osmand_plus_extended_description_part1">برنامهٔ OsmAnd+‎ (مخفف OSM Automated Navigation Directions به‌معنی راهبری خودکار بر پایهٔ OSM) یک نرم‌افزار نقشه و راهبری است که به گسترهٔ وسیعی از داده‌های نقشهٔ باز شهری (OpenStreetMap یا به‌صورت خلاصه OSM) دسترسی دارد. این داده‌های رایگان و جهانی با بالاترین کیفیت ارائه می‌شوند. 
+    <string name="av_locations_descr">از مکان یادداشت‌ها فایل GPX می‌سازد.</string>
+    <string name="osmand_plus_extended_description_part1">برنامهٔ OsmAnd+‎ (مخفف OSM Automated Navigation Directions به‌معنی ناوبری خودکار بر پایهٔ OSM) یک نرم‌افزار نقشه و ناوبری است که به گسترهٔ وسیعی از داده‌های نقشهٔ باز شهری (OpenStreetMap یا به‌صورت خلاصه OSM) دسترسی دارد. این داده‌های رایگان و جهانی با بالاترین کیفیت ارائه می‌شوند. 
 \n 
 \nراهبر دیداری و شنیداری، مشاهدهٔ مکان‌های محبوب (POIها یا Points of interest)، ایجاد و مدیریت ردهای GPX، استفاده از تصویرسازی منحنی‌های تراز و اطلاعات ارتفاع، انتخاب حالت‌های پیاده، دوچرخه، خودرو، امکان ویرایش مکان‌ها و... چیزهایی هستند که تجربهٔ مؤثر و لذت‌بخشی را در کار با نقشه برایتان به ارمغان می‌آورد. 
 \n 
@@ -2833,9 +2833,9 @@
 \n • با فعال‌کردن افزونه‌های دیگر می‌توانید منحنی‌های تراز و سایه‌روشن‌ها را فعال کنید</string>
     <string name="osmand_extended_description_part6">پیاده‌روی، پیاده‌گردی و گردش در شهر 
 \n • مسیرهای پیاده‌روی و پیاده‌گردی را نقشه نشانتان می‌دهد 
-\n • هنگام گشت‌زدن در شهر، با ویکی‌پدیا اطلاعات مفیدی به زبان خودتان در مورد مکان‌ها به‌دست آورید
+\n • هنگام گشت‌زدن در شهر، با ویکی‌پدیا اطلاعات مفیدی به زبان خودتان در مورد مکان‌ها به‌دست آورید 
 \n • برای شهرهای جدید، وجود ایستگاه‌های حمل‌ونقل عمومی (اتوبوس، تراموا، قطار) همراه با نام خطوط، کمک‌کار شما خواهد بود 
-\n • راهبری GPS در حالت پیاده مسیرتان را بر اساس راه‌های پیاده محاسبه می‌کند 
+\n • ناوبری GPS در حالت پیاده مسیرتان را بر اساس راه‌های پیاده محاسبه می‌کند 
 \n • مسیرهای GPX را دانلود کنید و بپیمایید یا اینکه مسیر خودتان را ضبط کنید و به‌اشتراک بگذارید</string>
     <string name="osmand_extended_description_part7">مشارکت در نقشهٔ باز شهری (OSM)
 \n • گزارش مشکل در داده‌ها
@@ -2858,7 +2858,7 @@
 \n • جنوبگان: * 
 \nبا این نرم‌افزار نقشهٔ بیشتر مناطق جهان را خواهید یافت! 
 \nاز یک مسیریاب معتبر و قابل‌اعتماد استفاده کنید. هر کجا که هستید؛ در فرانسه، آلمان، انگلستان، مکزیک، آمریکا، هلند، ایران، روسیه، برزیل یا هر جای دیگر، فرقی نمی‌کند.</string>
-    <string name="osmand_plus_extended_description_part2">راهبری 
+    <string name="osmand_plus_extended_description_part2">ناوبری 
 \n • امکان انتخاب بین حالت آنلاین (سریع) و آفلاین (بدون هزینهٔ اضافی بابت اینترنت) 
 \n • راهنمای گام‌به‌گام گفتاری (پیام‌های گفتاری انسانی و ماشینی) 
 \n • راهنمای خطوط عبوری، نام خیابان‌ها و زمان تخمینی رسیدن 
@@ -2879,12 +2879,12 @@
 \nبا این نرم‌افزار نقشهٔ بیشتر مناطق جهان را خواهید یافت. 
 \nهر کجا که باشید، فرقی نمی‌کند؛ در فرانسه، آلمان، انگلستان، مکزیک، آمریکا، هلند، ایران، روسیه، برزیل و... 
 \n</string>
-    <string name="osmand_plus_extended_description_part3">نمایش نقشه
-\n • نمایش موقعیت و جهت قرارگیری شما
-\n • نقشه را در راستای حرکتتان (یا قطب‌نما) تنظیم می‌کند
-\n • جاهایی را که دوست دارید در قسمت نقاط برگزیده ذخیره کنید
-\n • نقاط محبوب (POI یا Points of interest) اطرافتان را نشان می‌دهد
-\n • نمایش نقشه‌های تخصصی آنلاین، تصاویر ماهواره‌ای (بینگ) و رولایه‌های مختلف مانند مسیرهای گردشگردی یا راهبری GPX با امکان تنظیم شفافیت
+    <string name="osmand_plus_extended_description_part3">نمایش نقشه 
+\n • نمایش موقعیت و جهت قرارگیری شما 
+\n • نقشه را در راستای حرکتتان (یا قطب‌نما) تنظیم می‌کند 
+\n • جاهایی را که دوست دارید در قسمت نقاط برگزیده ذخیره کنید 
+\n • نقاط محبوب (POI یا Points of interest) اطرافتان را نشان می‌دهد 
+\n • نمایش نقشه‌های تخصصی آنلاین، تصاویر ماهواره‌ای (بینگ) و رولایه‌های مختلف مانند مسیرهای GPX گردشگردی یا ناوبری با امکان تنظیم شفافیت 
 \n • شیوهٔ نمایش نام‌های روی نقشه را انتخاب کنید: انگلیسی، محلی یا نویسه‌گردانی‌شده</string>
     <string name="osmand_plus_extended_description_part4">استفاده از اطلاعات ویکی‌پدیا و OSM
 \n • ارائهٔ اطلاعات درجه‌یک از طریق بهترین پروژه‌های گروهی در سرتاسر جهان
@@ -2992,8 +2992,8 @@
     <string name="will_open_at">ساعت بازکردن</string>
     <string name="will_open_on">زمان بازشدن</string>
     <string name="additional_actions">عملیات بیشتر</string>
-    <string name="av_locations_selected_desc">فایل GPX از مختصات و اطلاعات یادداشت‌های انتخابی.</string>
-    <string name="av_locations_all_desc">فایل GPX از مختصات و اطلاعات همهٔ یادداشت‌ها.</string>
+    <string name="av_locations_selected_desc">فایل GPX از مختصات و مشخصات یادداشت‌های انتخابی.</string>
+    <string name="av_locations_all_desc">فایل GPX از مختصات و مشخصات همهٔ یادداشت‌ها.</string>
     <string name="shared_string_actions">عملیات</string>
     <string name="shared_string_marker">نشانه</string>
     <string name="osm_recipient_stat">ویرایش‌ها: %1$s، مبلغ: %2$s هزارم بیت‌کوین</string>
@@ -3105,7 +3105,7 @@
 	<string name="travel_card_download_descr">راهنمای مسافرت از ویکی‌سفر را دانلود کنید تا بدون نیاز به اینترنت دربارهٔ مناطق مختلف جهان مطالعه کنید.</string>
 	<string name="update_is_available">به‌روزرسانی وجود دارد</string>
 	<string name="download_file">دانلود فایل</string>
-    <string name="start_editing_card_image_text">یک راهنمای رایگان جهانی برای سفر که همه می‌توانند آن را ویرایش کنند.</string>
+    <string name="start_editing_card_image_text">راهنمای سفر رایگان با پوشش جهانی که همه می‌توانند آن را ویرایش کنند.</string>
     <string name="welcome_to_open_beta_description">راهنمای «مسافرت» هم‌اکنون بر پایهٔ ویکی‌سفر ساخته شده است. در دورهٔ آزمایش همگانیِ نسخهٔ بتا می‌توانید همهٔ قابلیت‌های آن را به‌رایگان ارزیابی کنید. با پایان دورهٔ آزمایشی، «مسافرت» در اختیار مشترکان نسخهٔ نامحدود OsmAnd و دارندگان OsmAnd+‎ خواهد بود.</string>
     <string name="start_editing_card_description">شما می‌توانید هر یک از مقالات ویکی‌سفر را ویرایش کنید. امیدواریم با انجام این کار دیگران را در دانش، تجربه، استعداد و توجهتان سهیم کنید.</string>
     <string name="start_editing">شروع ویرایش</string>
@@ -3138,7 +3138,7 @@
 \nویژگی‌های اصلی: شناوه‌ها، فانوس‌های دریایی، راه‌های رودخانه‌ای، خطوط عبوری و نشانه‌های دریایی، بندرگاه‌ها، خدمات ساحلی و خطوط تراز عمقی.</string>
     <string name="ski_map_render_descr">سبک اسکی. 
 \nویژگی‌های اصلی: نمایش پیست‌ها، تله‌اسکی‌ها و سایر ویژگی‌های اسکی به‌شکلی ساده و مناسب. اجزای ثانویه و اضافی کمتر روی نقشه.</string>
-    <string name="light_rs_render_descr">سبکی ساده و پادنما برای راهبری خودرویی. در حالت شب چشم را آزار نمی‌دهد.
+    <string name="light_rs_render_descr">سبکی ساده و پادنما برای ناوبری خودرویی. در حالت شب چشم را آزار نمی‌دهد. 
 \nویژگی‌های اصلی: خطوط تراز، راه‌هایی با رنگ نارنجی و متضاد، اجزای ثانویه و اضافی کمتر روی نقشه.</string>
     <string name="topo_render_descr">سبکی پادنما که مخصوص پیاده‌گردی، راه‌نوردی و دوچرخه‌سواری در طبیعت است و در روشنایی بیرون خواناست.
 \nویژگی‌های اصلی: راه‌ها و عوارض طبیعیِ پادنما، انواع مختلف مسیرها، خطوط تراز با تنظیمات پیشرفته، جزئیات بیشتر نسبت به سبک پیشفرض در زوم‌های یکسان. نمایش انواع سطوح که در نتیجه راه‌ها را بر اساس کیفیت سطحشان مجزا می‌کند. حالت شب ندارد.</string>
@@ -3169,7 +3169,7 @@
     <string name="coord_input_save_as_track_descr">%1$s نقطه افزودید. نام فایل را بنویسید و روی «ذخیره» بزنید.</string>
     <string name="point_deleted">نقطهٔ %1$s پاک شد</string>
     <string name="shared_string_world">جهان</string>
-    <string name="send_search_query_description">ما عبارت جست‌وجویتان: <b>«%1$s»</b> و نیز مکانتان را ارسال خواهیم کرد.<br/><br/> ما اطلاعات خصوصی را جمع‌آوری نمی‌کنیم و داده‌های جست‌وجو را هم فقط به این خاطر نیاز داریم که الگوریتم جست‌وجو را بهتر کنیم.<br/></string>
+    <string name="send_search_query_description">عبارت جست‌وجوی شما: <b>«%1$s»</b> و همچنین مکانتان را ارسال خواهیم کرد.<br/><br/> ما اطلاعات خصوصی را جمع‌آوری نمی‌کنیم و داده‌های جست‌وجو را هم فقط به این خاطر نیاز داریم که الگوریتم جست‌وجو را بهتر سازیم.<br/></string>
     <string name="search_no_results_description">چیزی پیدا نشد؟
 \nدر این باره با ما صحبت کنید.</string>
     <string name="send_search_query">عبارت جست‌وجویتان ارسال شود؟</string>
@@ -3213,11 +3213,61 @@
     <string name="ask_for_location_permission">برای ادامه، لطفاً به OsmAnd اجازهٔ دسترسی به موقعیت مکانی را بدهید.</string>
     <string name="rendering_value_black_name">سیاه</string>
     <string name="search_street">جست‌وجوی خیابان</string>
-    <string name="start_search_from_city">آغاز جست‌وجو از شهر</string>
+    <string name="start_search_from_city">ابتدا شهر را انتخاب کنید</string>
     <string name="shared_string_restore">بازیابی</string>
     <string name="keep_passed_markers_descr">نشانه‌هایی که در قالب گروهی از برگزیده‌ها یا نقاط بین‌راهی GPX وارد شده‌اند و از آن‌ها عبور کرده‌اید روی نقشه باقی می‌مانند. اگر گروه مربوط به آن‌ها را غیرفعال کنید، نشانه‌ها از روی نقشه محو می‌شوند.</string>
     <string name="keep_passed_markers">نشانه‌های پشت سر گذاشته را روی نقشه نگه دار</string>
     <string name="markers_remove_dialog_msg">نشانهٔ %s حذف شود؟</string>
     <string name="edit_map_marker">ویرایش نشانه</string>
     <string name="third_party_application">برنامهٔ شخص ثالث</string>
-    </resources>
+    <string name="osm_live_plan_pricing">طرح و قیمت</string>
+    <string name="osm_live_payment_monthly_title">پرداخت ماهانه</string>
+    <string name="osm_live_payment_3_months_title">پرداخت سه‌ماهه</string>
+    <string name="osm_live_payment_annual_title">پرداخت سالانه</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s در ماه</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s در ماه</string>
+    <string name="osm_live_payment_discount_descr">%1$s ارزان‌تر!</string>
+	<string name="osm_live_payment_current_subscription">اشتراک کنونی شما</string>
+    <string name="osm_live_payment_renews_monthly">هر ماه تمدید می‌شود</string>
+    <string name="osm_live_payment_renews_quarterly">هر سه ماه تمدید می‌شود</string>
+    <string name="osm_live_payment_renews_annually">هر سال تمدید می‌شود</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">دورهٔ پرداخت مناسب خود را برگزینید:</string>
+    <string name="osm_live_payment_contribute_descr">بخشی از درآمد به مشارکت‌کنندگان نقشهٔ شهری باز اهدا می‌شود.</string>
+    <string name="more_transport_on_stop_hint">در این ایستگاه حمل‌ونقل بیشتری وجود دارد.</string>
+    <string name="osm_live_subscriptions">اشتراک‌ها</string>
+    <string name="powered_by_osmand">گروه OsmAnd</string>
+    <string name="mapillary_menu_title_pano">فقط نمایش عکس‌های ۳۶۰ درجه</string>
+    <string name="shared_string_launch">راه‌اندازی</string>
+    <string name="lang_gn_py">گوارانی</string>
+    <string name="run_full_osmand_msg">شما هم‌اکنون نقشهٔ {0} را بر بستر نرم‌افزار OsmAnd استفاده می‌کنید. دوست دارید نسخهٔ کامل OsmAnd را راه‌اندازی کنید؟</string>
+    <string name="run_full_osmand_header">‏OsmAnd ‌راه‌اندازی شود؟</string>
+    <string name="quick_action_switch_day_night_descr">با لمس این دکمهٔ عملیاتی بین حالت‌های شب و روز OsmAnd جابه‌جا شوید</string>
+    <string name="quick_action_switch_day_mode">حالت روز</string>
+    <string name="quick_action_switch_night_mode">حالت شب</string>
+    <string name="quick_action_day_night_switch_mode">تعویض حالت شب/روز</string>
+    <string name="swap_start_and_destination">تعویض مبدأ با مقصد</string>
+    <string name="add_destination_point">افزودن مقصد</string>
+    <string name="add_intermediate_point">افزودن نقطهٔ میانی</string>
+    <string name="add_start_point">افزودن نقطهٔ شروع</string>
+    <string name="intermediate_waypoint">نقطهٔ میانی: %1$s</string>
+    <string name="waypoints">نقاط بین‌راهی: %1$s</string>
+    <string name="transfers">انتقال‌ها: %1$s</string>
+    <string name="on_foot">روی پا: %1$s</string>
+    <string name="route_way">راه: %1$s</string>
+    <string name="points_of_interests">نقاط پرکاربرد (POI)</string>
+    <string name="waiting_for_route_calculation">در انتظار محاسبهٔ مسیر</string>
+    <string name="app_mode_public_transport">حمل‌ونقل عمومی</string>
+    <string name="avoid_roads_descr">جاده‌ای که می‌خواهید از آن پرهیز کنید را روی نقشه یا از لیست زیر انتخاب کنید:</string>
+    <string name="show_along_the_route">در امتداد مسیر نشان بده</string>
+    <string name="simulate_navigation">شبیه‌سازی ناوبری</string>
+    <string name="choose_track_file_to_follow">فایل رد را برای دنبال‌کردن انتخاب کنید</string>
+    <string name="voice_announcements">پیام‌های گفتاری</string>
+    <string name="intermediate_destinations">مقصدهای میانی: %1$s</string>
+    <string name="arrive_at_time">زمان رسیدن: %1$s</string>
+    <string name="cubic_m">مترمکعب</string>
+    <string name="metric_ton">تن</string>
+    <string name="shared_string_capacity">ظرفیت</string>
+    <string name="shared_string_width">عرض</string>
+    <string name="shared_string_height">طول</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 5a47f84800..3aa9b327f6 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="poi_10pin">Bowling américain</string>
 	<string name="poi_9pin">Bowling à 9 quilles</string>
@@ -105,7 +105,7 @@
 	<string name="poi_college">Enseignement supérieur</string>
 	<string name="poi_communication_tower">Tour de télécommunication</string>
 	<string name="poi_compressed_air">Station de gonflage des pneumatiques</string>
-	<string name="poi_confectionery">Confiserie</string>
+	<string name="poi_confectionery">Magasin de confiserie</string>
 	<string name="poi_construction">Construction</string>
 	<string name="poi_convenience">Épicerie</string>
 	<string name="poi_copyshop">Service de photocopies et d\'impression</string>
@@ -391,7 +391,7 @@
 
 	<string name="poi_service_tyres">Pneus</string>
 	<string name="poi_public_transport_platform_bus">Arrêt de bus</string>
-	<string name="poi_subway_station">Station de métro</string>
+	<string name="poi_subway_station">Oui</string>
 	<string name="poi_tunnel">Tunnel</string>
 	<string name="poi_register_office">Bureau d\'état civil</string>
 	<string name="poi_customs">Douanes</string>
@@ -1036,7 +1036,7 @@
 	<string name="poi_notary">Office de notaire</string>
 	<string name="poi_doors">Magasin de portes</string>
 	<string name="poi_landfill_waste_nuclear">Déchet nucléaire</string>
-	<string name="poi_capital">Capitale</string>
+	<string name="poi_capital">Oui</string>
 	<string name="poi_office_religion">Lieu de culte</string>
 	<string name="poi_association">Siège d\'association</string>
 	<string name="poi_financial">Société financière</string>
@@ -1565,7 +1565,7 @@
 
 	<string name="poi_payment_cheque_yes">Chèques</string>
 	<string name="poi_payment_cheque_no">Chèques non acceptés</string>
-	<string name="poi_microbrewery_yes">Microbrasserie</string>
+	<string name="poi_microbrewery_yes">Oui</string>
 	<string name="poi_microbrewery_no">Pas de microbrasserie</string>
 
 	<string name="poi_takeaway_no">Pas de vente à emporter</string>
@@ -3504,4 +3504,41 @@
 	<string name="poi_service_vehicle_car_repair_yes">Réparation de véhicules</string>
 	<string name="poi_appliance">Magasin d\'électroménager</string>
 
-	</resources>
+	<string name="poi_bulk_purchase">Vente en vrac</string>
+	<string name="poi_bulk_purchase_yes">Oui</string>
+	<string name="poi_bulk_purchase_only">Uniquement</string>
+
+	<string name="poi_atm">Distributeur de billets</string>
+	<string name="poi_substation_type">Type</string>
+
+<string name="poi_nuclear_explosion_type_underground_shaft">Type d\'explosion : sous-terrain, tunnel</string>
+	<string name="poi_nuclear_explosion_type_space">Type d\'explosion : espace (au delà de 80 km d\'altitude)</string>
+	<string name="poi_nuclear_explosion_type_underwater">Type d\'explosion : sous-marine</string>
+	<string name="poi_nuclear_explosion_type_underground_tunnel">Type d\'explosion : sous terre, tunnel</string>
+    <string name="poi_books_type">Livres</string>
+    <string name="poi_motorcycle_type_standard">Standard</string>
+    <string name="poi_direction_nne">Direction : nord nord-est</string>
+    <string name="poi_direction_ene">Direction : est nord-est</string>
+    <string name="poi_direction_ese">Direction : est sud-est</string>
+    <string name="poi_direction_sse">Direction : sud sud-est</string>
+    <string name="poi_direction_ssw">Direction : sud sud-ouest</string>
+    <string name="poi_direction_wsw">Direction : ouest sud-ouest</string>
+    <string name="poi_direction_wnw">Direction : ouest nord-ouest</string>
+    <string name="poi_direction_nnw">Direction : nord nord-ouest</string>
+    <string name="poi_direction_all">Direction : toutes</string>
+    <string name="poi_government_legislative">Institution législative</string>
+    <string name="poi_hill">Coline</string>
+    <string name="poi_shoe_repair">Cordonnier</string>
+    <string name="poi_substation_industrial">Industriel</string>
+    <string name="poi_substation_valve">Valve</string>
+    <string name="poi_shop_wholesale">Magasin de vente en gros</string>
+    <string name="poi_laboratory">Laboratoire médical</string>
+    <string name="poi_blood_donation">Don du sang</string>
+    <string name="poi_books_academic">Académique</string>
+    <string name="poi_books_children">Enfants</string>
+    <string name="poi_nuclear_explosion_shot_name_en">Nom du tir (anglais)</string>
+    <string name="poi_medical_system_sidda_yes">Sidda</string>
+    <string name="poi_agrarian">Grossiste en matériel agricole</string>
+    <string name="poi_cannabis">Boutique de cannabis</string>
+    <string name="poi_denotation">Dénotation</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index abc1a7c135..6896b10c53 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="offline_edition">Modifications hors-ligne</string>
     <string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne.</string>
@@ -1580,9 +1580,9 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="speak_poi">Points d\'intérêt à proximité</string>
     <string name="shared_string_all">Tout</string>
     <string name="index_tours">Tours</string>
-    <string name="record_plugin_description">Ce greffon permet d\'enregistrer vos itinéraires dans un fichier au format GPX : soit automatiquement soit manuellement grâce à un bouton supplémentaire affiché sur la carte.
-\n
-\nLes traces ainsi enregistrées peuvent être partagées avec vos amis ou utilisées pour contribuer à OSM. Les sportifs peuvent utiliser ces enregistrements pour leurs entraînements. Certaines analyses des traces peuvent être réalisées directement dans OmsAnd (comme la vitesse moyenne, la durée de l\'itinéraire, etc.). Enfin les fichiers GPX locaux peuvent être exportés pour être utilisés par d\'autres applications.</string>
+    <string name="record_plugin_description">Ce greffon permet d\'enregistrer vos itinéraires dans un fichier au format GPX : soit automatiquement soit manuellement grâce à un bouton supplémentaire affiché sur la carte. 
+\n 
+\nLes traces ainsi enregistrées peuvent être partagées avec vos amis ou utilisées pour contribuer à OSM. Les sportifs peuvent utiliser ces enregistrements pour leurs entraînements. Certaines analyses des traces peuvent être réalisées directement dans OsmAnd (comme la vitesse moyenne, la durée de l\'itinéraire, etc.). Enfin les fichiers GPX locaux peuvent être exportés pour être utilisés par d\'autres applications.</string>
     <string name="record_plugin_name">Enregistrement d\'itinéraire</string>
     <string name="int_hour">h</string>
     <string name="duration">Durée</string>
@@ -1772,7 +1772,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="shared_string_ellipsis">…</string>
     <string name="shared_string_deselect">Désélectionner</string>
     <string name="shared_string_deselect_all">Désélectionner tout</string>
-    <string name="shared_string_unexpected_error">Erreur inconnue</string>
+    <string name="shared_string_unexpected_error">Erreur inattendue</string>
     <string name="shared_string_action_template">Action {0}</string>
     <string name="shared_string_video">Vidéo</string>
     <string name="shared_string_photo">Photo</string>
@@ -2204,7 +2204,7 @@ Actuellement seuls {2} Mo sont disponibles.</string>
     <string name="osm_live_month_cost_desc">Règlement mensuel</string>
     <string name="osm_live_active">Actif</string>
     <string name="osm_live_not_active">Inactif</string>
-    <string name="osm_live_enter_email">Merci de saisir un courriel valide</string>
+    <string name="osm_live_enter_email">Veuillez saisir une adresse email valide</string>
     <string name="osm_live_thanks">Merci pour votre soutien à OsmAnd !
 \nPour activer toutes les nouvelles fonctionnalités, merci de redémarrer OsmAnd.</string>
     <string name="osm_live_subscription_settings">Paramétrage de l\'abonnement</string>
@@ -2354,7 +2354,7 @@ Si vous appréciez OsmAnd et OSM et que vous souhaitez soutenir ces projets, c\'
     <string name="get_it">Obtenir</string>
     <string name="osm_live_banner_desc">Téléchargez un nombre illimité de cartes et obtenez des mises à jour plus fréquentes (chaque semaine, chaque jour, chaque heure; au lieu de chaque mois).</string>
     <string name="osmand_plus_banner_desc">Téléchargements illimités des cartes, des mises à jour et des données pour le greffon Wikipédia.</string>
-    <string name="donation_to_osm">Faire un don à la communauté OpenStreetMap</string>
+    <string name="donation_to_osm">Don à la communauté OpenStreetMap</string>
     <string name="osm_live_subscription_desc">L\'abonnement permet de bénéficier des mises à jour horaires, quotidiennes, hebdomadaires et de télécharger de nouvelles cartes sans limite.</string>
     <string name="osm_live_payment_desc">Abonnement mensuel. Vous pouvez l\'annuler à tout moment sur Google Play.</string>
     <string name="donation_to_osm_desc">Une partie de votre don sera reversée aux contributeurs OSM qui mettent à jour OpenStreetMap. Le coût de l\'abonnement reste identique.</string>
@@ -2737,7 +2737,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="mapillary_menu_title_tile_cache">Cache des tuiles</string>
     <string name="mapillary_menu_descr_dates">Afficher uniquement les images ajoutées</string>
     <string name="mapillary_menu_descr_username">Afficher uniquement les images ajoutées par</string>
-    <string name="mapillary_menu_filter_description">Filtrer les images par date ou nom d\'utilisateur. Le filtre n\'est appliqué qu\'après avoir zoomé.</string>
+    <string name="mapillary_menu_filter_description">Filtrez les images par date, nom d\'utilisateur ou type. Le filtre n\'est appliqué qu\'après avoir zoomé.</string>
     <string name="shared_string_reset">Réinitialiser</string>
     <string name="average">Moyenne</string>
     <string name="ascent_descent">Croissant / Décroissant</string>
@@ -3189,11 +3189,60 @@ représentant la zone : %1$s x %2$s</string>
     <string name="rendering_value_black_name">Noir</string>
     <string name="more_transport_on_stop_hint">Il y a d\'autres moyens de transport à cet arrêt.</string>
     <string name="search_street">Rechercher une rue</string>
-    <string name="start_search_from_city">Recherche par nom de ville</string>
+    <string name="start_search_from_city">Tapez un nom de ville</string>
     <string name="shared_string_restore">Restaurer</string>
     <string name="keep_passed_markers_descr">Les marques visitées resteront affichées sur la carte, que les marques appartiennent à un groupe de favoris ou qu\'il s\'agisse de points de passage GPX. Ces marques ne disparaîtront que lorsque le groupe ou la trace sera désactivé.</string>
     <string name="keep_passed_markers">Afficher sur la carte les marques visitées</string>
     <string name="markers_remove_dialog_msg">Supprimer la marque \'%s\' \?</string>
     <string name="edit_map_marker">Modifier la marque</string>
     <string name="third_party_application">Application tierce</string>
-    </resources>
+    <string name="osm_live_payment_monthly_title">Payer chaque mois</string>
+    <string name="osm_live_payment_3_months_title">Payer tous les 3 mois</string>
+    <string name="osm_live_payment_annual_title">Payer chaque année</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mois</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mois</string>
+    <string name="osm_live_payment_discount_descr">Économisez %1$s !</string>
+	<string name="osm_live_payment_current_subscription">Votre abonnement actuel</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Sélectionnez la fréquence de règlement qui vous convient :</string>
+    <string name="osm_live_payment_contribute_descr">Une partie des revenus est reversée aux contributeurs OpenStreetMap.</string>
+    <string name="osm_live_plan_pricing">Plans et Tarifs</string>
+    <string name="osm_live_payment_renews_monthly">Abonnements mensuels</string>
+    <string name="osm_live_payment_renews_quarterly">Abonnements trimestriels</string>
+    <string name="osm_live_payment_renews_annually">Abonnements annuels</string>
+    <string name="powered_by_osmand">Propulsé par OsmAnd</string>
+    <string name="osm_live_subscriptions">Abonnements</string>
+    <string name="mapillary_menu_title_pano">N\'afficher que les images à 360°</string>
+    <string name="shared_string_launch">Ouvrir</string>
+    <string name="run_full_osmand_msg">Vous utilisez la carte {0} qui est proposée par OsmAnd. Souhaitez-vous lancer la version complète d\'OsmAnd \?</string>
+    <string name="run_full_osmand_header">Ouvrir OsmAnd \?</string>
+    <string name="quick_action_switch_day_night_descr">Ce bouton permet de basculer entre les modes Jour et Nuit d\'OsmAnd</string>
+    <string name="quick_action_switch_day_mode">Mode Jour</string>
+    <string name="quick_action_switch_night_mode">Mode Nuit</string>
+    <string name="quick_action_day_night_switch_mode">Bascule les modes Jour / Nuit</string>
+    <string name="lang_gn_py">Guarani</string>
+    <string name="swap_start_and_destination">Inverser départ et arrivée</string>
+    <string name="add_destination_point">Ajouter destination</string>
+    <string name="add_intermediate_point">Ajouter étape</string>
+    <string name="add_start_point">Ajouter départ</string>
+    <string name="intermediate_waypoint">Étape : %1$s</string>
+    <string name="waypoints">Points de passage : %1$s</string>
+    <string name="transfers">transferts : %1$s</string>
+    <string name="on_foot">à pied : %1$s</string>
+    <string name="route_way">Mode : %1$s</string>
+    <string name="points_of_interests">Points d\'intérêt (PI)</string>
+    <string name="waiting_for_route_calculation">Calcul de l\'itinéraire en cours</string>
+    <string name="app_mode_public_transport">Transports publics</string>
+    <string name="avoid_roads_descr">Sélectionnez la route, sur la carte ou parmi la liste ci-dessous, que vous souhaitez éviter pendant la navigation :</string>
+    <string name="show_along_the_route">Afficher sur l\'itinéraire</string>
+    <string name="simulate_navigation">Simuler la navigation</string>
+    <string name="choose_track_file_to_follow">Sélectionner un fichier de trace à suivre</string>
+    <string name="voice_announcements">Annonces vocales</string>
+    <string name="intermediate_destinations">Destinations intermédiaires : %1$s</string>
+    <string name="arrive_at_time">Arrivée à %1$s</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Сapacité</string>
+    <string name="shared_string_width">Largeur</string>
+    <string name="shared_string_height">Hauteur</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index 65c9c395a4..fbf2b540ab 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_palaeontological_site">Xacemento paleontolóxico</string>
 
 	<string name="poi_bakery">Panadaría</string>
@@ -17,7 +17,7 @@
 	<string name="poi_art">Tenda de arte</string>
 	<string name="poi_boutique">Tenda de moda</string>
 	<string name="poi_carpet">Tenda de alfombras</string>
-	<string name="poi_clothes_children">Roupa infantil</string>
+	<string name="poi_clothes_children">Roupa para cativos</string>
 	<string name="poi_shoes">Zapataría</string>
 	<string name="poi_computer">Tenda de informática</string>
 	<string name="poi_copyshop">Copistaría</string>
@@ -36,7 +36,7 @@
 	<string name="poi_mobile_phone">Tenda de telefonía móbil</string>
 	<string name="poi_motorcycle">Tenda de motos</string>
 	<string name="poi_musical_instrument">Instrumentos musicais</string>
-	<string name="poi_newsagent">Axencia de noticias</string>
+	<string name="poi_newsagent">Axencia de xornalismo</string>
 	<string name="poi_organic">Comida ecolóxica</string>
 	<string name="poi_paint">Tenda de pinturas</string>
 	<string name="poi_pet">Tenda de animais</string>
@@ -48,7 +48,7 @@
 	<string name="poi_vacuum_cleaner">Tenda de aspiradoras</string>
 	<string name="poi_department_store">Grandes almacéns</string>
 	<string name="poi_electronics">Tenda de electrónica</string>
-	<string name="poi_car_parts">Recambios de automóbil</string>
+	<string name="poi_car_parts">Recambios do automóbil</string>
 	<string name="poi_atv">Tenda de quads</string>
 	<string name="poi_cosmetics">Cosméticos</string>
 	<string name="poi_marketplace">Mercado</string>
@@ -62,11 +62,11 @@
 	<string name="poi_mountain_pass">Pasaxe de montaña</string>
 	<string name="poi_city_wall">Muralla</string>
 	<string name="poi_border_control">Control fronteirizo</string>
-	<string name="poi_traffic_calming_bump">Lomba</string>
+	<string name="poi_traffic_calming_bump">Lomba pequena de velocidade</string>
 	<string name="poi_service_tyres">Rodas</string>
 	<string name="poi_vehicle_inspection">Inspección técnica de vehículos</string>
 	<string name="poi_car_wash">Lavadura de automóbiles</string>
-	<string name="poi_fuel">Gasolineira</string>
+	<string name="poi_fuel">Gasolineira;Estación de combustíbel;Estación de servizo</string>
 	<string name="poi_compressed_air">Ar comprimido</string>
 	<string name="poi_parking">Aparcadoiro</string>
 	<string name="poi_motorcycle_parking">Aparcadoiro de motos</string>
@@ -79,7 +79,7 @@
 	<string name="poi_public_transport_platform_tram">Paraxe do tranvía</string>
 	<string name="poi_public_transport_station">Estación de transporte público</string>
 	<string name="poi_subway_entrance">Entrada de metro</string>
-	<string name="poi_subway_station">Estación de metro</string>
+	<string name="poi_subway_station">Si</string>
 	<string name="poi_taxi">Paraxe de taxis</string>
 
 	<string name="poi_aerodrome">Aeroporto</string>
@@ -114,7 +114,7 @@
 	<string name="poi_recycling">Reciclaxe</string>
 	<string name="poi_surveillance">Vixilancia</string>
 	<string name="poi_observatory">Observatorio</string>
-	<string name="poi_astronomical_observatory">Observatorio astronómico</string>
+	<string name="poi_astronomical_observatory">Astronómico</string>
 	<string name="poi_construction">Construción</string>
 	<string name="poi_works">Obras</string>
 	<string name="poi_mineshaft">Pozo mineiro</string>
@@ -239,7 +239,7 @@
 	<string name="poi_religion_christian">Cristiandade</string>
 	<string name="poi_religion_jewish">Xudaísmo</string>
 	<string name="poi_religion_muslim">Islam</string>
-	<string name="poi_religion_sikh"/>
+	<string name="poi_religion_sikh">Sixismo</string>
 	<string name="poi_religion_buddhist">Budismo</string>
 	<string name="poi_religion_hindu">Hinduísmo</string>
 	<string name="poi_religion_shinto">Xintoísmo</string>
@@ -247,12 +247,12 @@
 	<string name="poi_monastery">Mosteiro</string>
 	<string name="poi_historic_monastery">Mosteiro histórico</string>
 	<string name="poi_wayside_cross">Cruceiro</string>
-	<string name="poi_information">Información turística</string>
+	<string name="poi_information">Información</string>
 	<string name="poi_clock">Reloxo</string>
 	<string name="poi_travel_agent">Axencia de viaxes</string>
 	<string name="poi_camp_site">Cámping</string>
 	<string name="poi_caravan_site">Cámping de caravanas</string>
-	<string name="poi_picnic_site">Merendeiro</string>
+	<string name="poi_picnic_site">Área de merendeiro</string>
 	<string name="poi_spring">Fonte</string>
 	<string name="poi_hot_spring">Augas termais</string>
 	<string name="poi_geyser">Géyser</string>
@@ -310,7 +310,7 @@
 	<string name="poi_craft_dressmaker">Modista</string>
 	<string name="poi_craft_electrician">Electricista</string>
 	<string name="poi_craft_gardener">Xardineiro</string>
-	<string name="poi_craft_handicraft">Manualidades</string>
+	<string name="poi_craft_handicraft">Taballos manuais (artesán)</string>
 	<string name="poi_craft_hvac">Climatizacións</string>
 	<string name="poi_craft_insulation">Illamento</string>
 	<string name="poi_craft_jeweller">Xoeiro</string>
@@ -328,14 +328,14 @@
 	<string name="poi_funeral_directors">Tanatorio</string>
 	<string name="poi_craft_computer">Montaxe de computadores</string>
 	<string name="poi_beauty">Salón de beleza</string>
-	<string name="poi_beauty_salon_nails">Salón de uñas</string>
+	<string name="poi_beauty_salon_nails">Manicura</string>
 	<string name="poi_hairdresser">Perrucaría</string>
 	<string name="poi_massage">Salón de masaxes</string>
 	<string name="poi_tattoo">Salón de tatuaxes</string>
 	<string name="poi_dry_cleaning">Limpeza en seco</string>
 	<string name="poi_laundry">Lavandaría</string>
 	<string name="poi_car_rental">Aluguer de automóbiles</string>
-	<string name="poi_toilets">Aseos</string>
+	<string name="poi_toilets">Servizos</string>
 	<string name="poi_sauna">Sauna</string>
 	<string name="poi_brothel">Prostíbulo</string>
 	<string name="poi_mortuary">Tanatorio</string>
@@ -350,7 +350,7 @@
 	<string name="poi_bitcoin_yes">Pagamento con bitcoin</string>
 
 	<string name="poi_cave_entrance">Entrada de cova</string>
-	<string name="poi_peak">Cumio de montaña</string>
+	<string name="poi_peak">Cumio</string>
 	<string name="poi_volcano">Volcán</string>
 	<string name="poi_crater">Cráter</string>
 	<string name="poi_glacier">Glaciar</string>
@@ -360,7 +360,7 @@
 	<string name="poi_rapids">Rápidos</string>
 	<string name="poi_cape">Cabo</string>
 	<string name="poi_beach">Praia</string>
-	<string name="poi_bay">Baía</string>
+	<string name="poi_bay">Badía</string>
 	<string name="poi_fjord">Fiordo</string>
 	<string name="poi_reef">Arrecife</string>
 	<string name="poi_nature_reserve">Reserva natural</string>
@@ -383,7 +383,7 @@
 	<string name="poi_bag">Tenda de bolsos e/ou maletas</string>
 	<string name="poi_hardware">Ferraxaría</string>
 	<string name="poi_shop">Tenda</string>
-		<string name="poi_shop_food">Tenda de comestíbeis e supermercado</string>
+		<string name="poi_shop_food">Tenda de ultramarinos e supermercado</string>
 	<string name="poi_emergency">Urxencias</string>
 	<string name="poi_transportation">Transporte</string>
 		<string name="poi_road_obstacle">Obstáculo na estrada</string>
@@ -392,7 +392,7 @@
 		<string name="poi_public_transport">Transporte público</string>
 		<string name="poi_air_transport">Transporte aéreo</string>
 		<string name="poi_water_transport">Transporte acuático</string>
-		<string name="poi_bicycle_transport">Transporte ciclista</string>
+		<string name="poi_bicycle_transport">Transporte en bicicleta</string>
 		<string name="poi_aerialway_transport">Teleférico</string>
 		<string name="poi_node_networks">Nós da rede de sendeiros/bicicletas</string>
 		<string name="poi_hiking_routes">Roteiros de sendeirismo</string>
@@ -435,7 +435,7 @@
 	<string name="poi_perfumery">Perfumaría</string>
 
 	<string name="poi_toll_booth">Cabina de portaxe</string>
-	<string name="poi_fuel_diesel">Diesel</string>
+	<string name="poi_fuel_diesel">Diésel</string>
 	<string name="poi_fuel_biodiesel">Biodiesel</string>
 	<string name="poi_fuel_octane_80">Octano 80</string>
 	<string name="poi_fuel_octane_91">Octano 91</string>
@@ -456,7 +456,7 @@
 	<string name="poi_bell_tower">Campanario</string>
 	<string name="poi_recycling_centre">Centro de reciclaxe</string>
 	<string name="poi_recycling_glass">Vidro</string>
-	<string name="poi_recycling_container">Tipo: contedor</string>
+	<string name="poi_recycling_container">Contedor</string>
 	<string name="poi_recycling_paper">Papeis</string>
 	<string name="poi_recycling_clothes">Roupa</string>
 	<string name="poi_recycling_cans">Latas</string>
@@ -476,7 +476,7 @@
 	<string name="poi_recycling_aluminium">Aluminio</string>
 	<string name="poi_recycling_organic">Orgánico</string>
 	<string name="poi_recycling_beverage_cartons">Cartóns de bebidas</string>
-	<string name="poi_recycling_fluorescent_tubes">Tubos fluorescentes</string>
+	<string name="poi_recycling_fluorescent_tubes">Tubaxes fluorescentes</string>
 	<string name="poi_recycling_metal">Metal</string>
 	<string name="poi_recycling_cooking_oil">Aceite de cociña</string>
 	<string name="poi_recycling_engine_oil">Aceite de motor</string>
@@ -485,13 +485,13 @@
 	<string name="poi_recycling_computers">Computadores</string>
 	<string name="poi_recycling_tyres">Rodas</string>
 	<string name="poi_recycling_tv_monitor">TV, monitores</string>
-	<string name="poi_recycling_tetrapak">Tetrapak</string>
+	<string name="poi_recycling_tetrapak">Tetrapak (brics)</string>
 	<string name="poi_recycling_cds">CD</string>
 	<string name="poi_recycling_bottles">Botellas</string>
 	<string name="poi_recycling_cork">Rolla</string>
 	<string name="poi_recycling_printer_cartridges">Cartuchos de impresora</string>
 	<string name="poi_recycling_paint">Pintura</string>
-	<string name="poi_recycling_compost">Compost</string>
+	<string name="poi_recycling_compost">Compostaxe</string>
 	<string name="poi_recycling_christmas_trees">Árbores de Nadal</string>
 	<string name="poi_recycling_furniture">Mobiliario</string>
 	<string name="poi_recycling_diapers">Cueiros</string>
@@ -507,7 +507,7 @@
 
 	<string name="poi_recycling_fridge_and_freezer">Neveira e conxelador</string>
 	<string name="poi_meadow">Lameiro</string>
-	<string name="poi_canal">Canle</string>
+	<string name="poi_canal">Canle fluvial</string>
 	<string name="poi_pier">Peirao</string>
 	<string name="poi_tower">Torre</string>
 	<string name="poi_radar">Radar</string>
@@ -517,7 +517,7 @@
 	<string name="poi_storage_tank">Tanque de almacenamento</string>
 
 	<string name="poi_country">País</string>
-	<string name="poi_capital">Capital</string>
+	<string name="poi_capital">Si</string>
 	<string name="poi_isolated_dwelling">Vivenda illada</string>
 	<string name="poi_residential">Área residencial</string>
 
@@ -624,7 +624,7 @@
 	<string name="poi_denomination_iglesia_ni_cristo">Igrexa ni cristo</string>
 	<string name="poi_denomination_latter_day_saints">Santos dos derradeiros días</string>
 	<string name="poi_denomination_united_church_of_christ">Igrexa Unida de Cristo</string>
-	<string name="poi_tomb">Tumba</string>
+	<string name="poi_tomb">Tomba</string>
 	<string name="poi_piste">Pista</string>
 	<string name="poi_piste_downhill">Pista de esquí</string>
 	<string name="poi_piste_nordic">Pista de esquí nórdico</string>
@@ -650,7 +650,7 @@
 	<string name="poi_dyke">Dique</string>
 	<string name="poi_mooring">Amarre</string>
 	<string name="poi_military_landuse">Zona militar</string>
-	<string name="poi_military_nuclear_explosion_site">Lugar de explosión nuclear</string>
+	<string name="poi_military_nuclear_explosion_site">Lugar do estourido nuclear</string>
 
 	<string name="poi_wiki_place">Wikipedia</string>
 	<string name="poi_wiki_lang_en">Wiki en inglés</string>
@@ -720,19 +720,19 @@
 	<string name="vk">Vkontakte</string>
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_mobile">Móbil</string>
-	<string name="poi_maxheight">Altura máxima</string>
+	<string name="poi_maxheight">Altitude máxima</string>
 	<string name="poi_maxweight">Peso máximo</string>
 	<string name="poi_abandoned">Abandonado</string>
 	<string name="poi_abandoned_poi">Obxecto abandoado</string>
 	<string name="poi_disused">En desuso</string>
 
 	<string name="poi_brand">Marca</string>
-	<string name="poi_drinking_water_yes">Auga potábel: si</string>
-	<string name="poi_drinking_water_no">Auga potábel: non</string>
+	<string name="poi_drinking_water_yes">Si</string>
+	<string name="poi_drinking_water_no">Non</string>
 	<string name="poi_supervised_yes">Vixiado</string>
 	<string name="poi_supervised_no">Non vixiado</string>
-	<string name="poi_seasonal_yes">Temporal</string>
-	<string name="poi_seasonal_no">Non temporal</string>
+	<string name="poi_seasonal_yes">Si</string>
+	<string name="poi_seasonal_no">Non</string>
 	<string name="poi_seasonal_dry_season">Estación seca</string>
 	<string name="poi_seasonal_wet_season">Estación húmida</string>
 	<string name="poi_seasonal_spring">Primavera</string>
@@ -743,7 +743,7 @@
 	<string name="poi_crossing_uncontrolled">Sen semáforo</string>
 	<string name="poi_crossing_unmarked">Sen marcas</string>
 	<string name="poi_start_date">Data de comezo</string>
-	<string name="poi_wheelchair_yes">Cadeira de rodas</string>
+	<string name="poi_wheelchair_yes">Si</string>
 
 	<string name="poi_access_private">Acceso privado</string>
 	<string name="poi_access_no">Sen acceso</string>
@@ -772,16 +772,16 @@
 
 <string name="poi_content_grain">Contido: gran</string>
 
-	<string name="poi_animal_shelter_dog">To de refuxio: can</string>
-	<string name="poi_animal_shelter_cat">To de refuxio: gato</string>
-	<string name="poi_animal_shelter_dog_cat">To de refuxio: can, gato</string>
-	<string name="poi_animal_shelter_bird">To de refuxio: ave</string>
+	<string name="poi_animal_shelter_dog">Cans</string>
+	<string name="poi_animal_shelter_cat">Gatos</string>
+	<string name="poi_animal_shelter_dog_cat">Cans, gatos</string>
+	<string name="poi_animal_shelter_bird">Paxaros</string>
 
 	<string name="poi_service">Servizo</string>
-		<string name="poi_wine">Enoteca</string>
+		<string name="poi_wine">Tenda de viños</string>
 
 	<string name="poi_doors">Portas</string>
-	<string name="poi_leather">Curtidoría</string>
+	<string name="poi_leather">Peletaría</string>
 	<string name="poi_photo">Tenda de fotografía</string>
 	<string name="poi_video">Tenda de vídeo</string>
 	<string name="poi_fuel_gtl_diesel">Diesel GTL</string>
@@ -796,7 +796,7 @@
 	<string name="poi_internet_access_yes">Acceso á Internet: si</string>
 	<string name="poi_internet_access_no">Acceso á Internet: non</string>
 
-	<string name="poi_picnic_table">Mesa de pícnic</string>
+	<string name="poi_picnic_table">Táboa de merendeiro</string>
 	<string name="poi_marina">Porto deportivo</string>
 	<string name="poi_craft_carpet_layer">Moqueta</string>
 	<string name="poi_aeroway_terminal">Terminal do aeroporto</string>
@@ -805,7 +805,7 @@
 	<string name="poi_trash_disposal">Contedor de lixo</string>
 		<string name="poi_landuse">Uso do solo</string>
 	<string name="poi_accomodation">Aloxamento</string>
-		<string name="poi_farm">Produtos agrícolas polos labregos</string>
+		<string name="poi_farm">Produtos da granxa</string>
 	<string name="poi_greengrocer">Froitaría</string>
 	<string name="poi_confectionery">Dozaría ou confeitaría</string>
 	<string name="poi_pastry">Confeitaría</string>
@@ -814,10 +814,10 @@
 	<string name="poi_furnace">Tenda de calefacción</string>
 	<string name="poi_garden_furniture">Mobiliario do xardín</string>
 	<string name="poi_glaziery">Tenda de vidro</string>
-	<string name="poi_tableware">Tenda de vaixela</string>
-	<string name="poi_ticket">Billeteira</string>
+	<string name="poi_tableware">Tenda de vaixelas</string>
+	<string name="poi_ticket">Portelo</string>
 	<string name="poi_window_blind">Tenda de persianas</string>
-	<string name="poi_car">Concesionario de automóbiles</string>
+	<string name="poi_car">Venda de automóbiles</string>
 	<string name="poi_swimming_pool_shop">Tenda de materiais da piscina</string>
 	<string name="poi_gate">Canceleira</string>
 	<string name="poi_traffic_signals">Semáforo</string>
@@ -861,18 +861,18 @@
 	<string name="poi_cycle_barrier">Barreira para bicicletas</string>
 	<string name="poi_motorcycle_barrier">Barreira para motos</string>
 	<string name="poi_service_times">Horario de funcionamento</string>
-	<string name="poi_height">Altura</string>
+	<string name="poi_height">Altitude</string>
 	<string name="poi_ele">Elevación sobre o nivel do mar</string>
-	<string name="poi_wheelchair_no">Cadeira de rodas: inaccesíbel</string>
-	<string name="poi_wheelchair_limited">Cadeira de rodas: limitado</string>
+	<string name="poi_wheelchair_no">Non</string>
+	<string name="poi_wheelchair_limited">Con limitacións</string>
 	<string name="poi_content_oil">Contido: aceite</string>
 	<string name="poi_content_gas">Contido: gas</string>
 	<string name="poi_content_wastewater">Contido: augas residuais</string>
-	<string name="poi_nudism_yes">Nudismo: permitido</string>
-	<string name="poi_nudism_no">Nudismo: prohibido</string>
-	<string name="poi_nudism_obligatory">Nudismo: obrigatorio</string>
+	<string name="poi_nudism_yes">Permitido</string>
+	<string name="poi_nudism_no">Prohibido</string>
+	<string name="poi_nudism_obligatory">Obrigatorio</string>
 	<string name="poi_nudism_customary">Costume</string>
-	<string name="poi_nudism_permissive">Nudismo: permisivo</string>
+	<string name="poi_nudism_permissive">Permisivo</string>
 
 	<string name="poi_population">Poboación</string>
 	<string name="poi_species">Especie</string>
@@ -925,63 +925,63 @@
 	<string name="poi_old_name">Nome antigo</string>
 	<string name="poi_alt_name">Nome alternativo</string>
 
-	<string name="poi_pump_manual">Bomba manual</string>
-	<string name="poi_pump_powered">Bomba automática</string>
+	<string name="poi_pump_manual">Manual</string>
+	<string name="poi_pump_powered">Automática</string>
 	<string name="poi_pump_no">Sen bomba</string>
-	<string name="poi_pump_yes">Bomba</string>
+	<string name="poi_pump_yes">Si</string>
 
-	<string name="poi_water_characteristic_mineral">Característica da auga: mineral</string>
-	<string name="poi_water_characteristic_sulfuric">Característica da auga: sulfurosa</string>
+	<string name="poi_water_characteristic_mineral">Mineralizada</string>
+	<string name="poi_water_characteristic_sulfuric">Sulfurosa</string>
 
-	<string name="poi_information_board">Taboleiro informativo</string>
+	<string name="poi_information_board">Taboleiro</string>
 	<string name="poi_information_map">Mapa</string>
-	<string name="poi_information_office">Oficina de información</string>
+	<string name="poi_information_office">Oficina</string>
 	<string name="poi_information_sign">Sinal</string>
 	<string name="poi_information_audioguide">Audioguía</string>
 	<string name="poi_board_type_notice">Taboleiro de anuncios</string>
 	<string name="poi_horse_track">Hipódromo</string>
 	<string name="poi_resort">Lugar turístico</string>
-	<string name="poi_craft_winery">Vinoteca</string>
+	<string name="poi_craft_winery">Adega de viños</string>
 
 	<string name="poi_pawnbroker">Prestamista</string>
-	<string name="poi_information_nature">Marcador informativo: natureza</string>
+	<string name="poi_information_nature">Natureza</string>
 	<string name="poi_information_wildlife">Marcador informativo: vida salvaxe</string>
-	<string name="poi_information_history">Marcador informativo: historia</string>
+	<string name="poi_information_history">Historia</string>
 	<string name="poi_information_bicyclemap">Mapa ciclista</string>
 	<string name="poi_information_tactile_map">Mapa táctil</string>
-	<string name="poi_board_type_plants">Marcador informativo: plantas</string>
-	<string name="poi_board_type_geology">Marcador informativo: xeoloxía</string>
+	<string name="poi_board_type_plants">Plantas</string>
+	<string name="poi_board_type_geology">Xeoloxía</string>
 	<string name="poi_board_type_public_transport">Transporte público</string>
-	<string name="poi_board_type_technology">Marcador informativo: tecnoloxía</string>
-	<string name="poi_board_type_astronomy">Marcador informativo: astronomía</string>
+	<string name="poi_board_type_technology">Tecnoloxía</string>
+	<string name="poi_board_type_astronomy">Astronomía</string>
 
-	<string name="poi_smoking_no">Prohibido fumar</string>
-	<string name="poi_smoking_outside">Só está permitido fumar no exterior</string>
-	<string name="poi_smoking_yes">Permítese fumar</string>
+	<string name="poi_smoking_no">Non</string>
+	<string name="poi_smoking_outside">Só fóra</string>
+	<string name="poi_smoking_yes">Si</string>
 	<string name="poi_smoking_separated">Nunha sala separada</string>
 	<string name="poi_smoking_isolated">En dependencia illada</string>
 	<string name="poi_smoking_dedicated">Dedicado a fumadores</string>
 
 	<string name="poi_toll_yes">Portaxe</string>
 	<string name="poi_toll_no">Sen portaxe</string>
-	<string name="poi_traffic_signals_sound_yes">Con son</string>
-	<string name="poi_traffic_signals_sound_no">Sen son</string>
+	<string name="poi_traffic_signals_sound_yes">Si</string>
+	<string name="poi_traffic_signals_sound_no">Non</string>
 	<string name="poi_services">Área de servizo</string>
 	<string name="poi_bird_hide">Lugar para observar paxaros</string>
 	<string name="poi_farmland">Agras</string>
 	<string name="poi_sand">Area</string>
 
 	<string name="poi_level">Nivel</string>
-	<string name="poi_piste_difficulty_easy">Dificultade da pista: fácil</string>
-	<string name="poi_piste_difficulty_intermediate">Dificultade da pista: intermedia</string>
-	<string name="poi_piste_difficulty_advanced">Dificultade da pista: avanzada</string>
-	<string name="poi_piste_difficulty_novice">Dificultade da pista: novatos</string>
-	<string name="poi_piste_difficulty_expert">Dificultade da pista: expertos</string>
-	<string name="poi_piste_difficulty_freeride">Dificultade da pista: libre</string>
-	<string name="poi_piste_grooming_classic">Coidado da pista: clásico</string>
-	<string name="poi_piste_grooming_classic_skating">Coidado da pista: clásico e patinaxe</string>
-	<string name="poi_piste_grooming_skating">Coidado da pista: patinaxe</string>
-	<string name="poi_piste_grooming_no">Coidado da pista: non</string>
+	<string name="poi_piste_difficulty_easy">Doada</string>
+	<string name="poi_piste_difficulty_intermediate">Intermedia</string>
+	<string name="poi_piste_difficulty_advanced">Avanzada</string>
+	<string name="poi_piste_difficulty_novice">Noveis ou principiantes</string>
+	<string name="poi_piste_difficulty_expert">Expertos</string>
+	<string name="poi_piste_difficulty_freeride">Estilo ceibe ou libre</string>
+	<string name="poi_piste_grooming_classic">Clásico</string>
+	<string name="poi_piste_grooming_classic_skating">Patinaxe clásico</string>
+	<string name="poi_piste_grooming_skating">Patinaxe</string>
+	<string name="poi_piste_grooming_no">Non</string>
 	<string name="poi_garden_type_residential">Tipo do xardín: residencial</string>
 	<string name="poi_garden_type_community">Tipo do xardín: comunitario</string>
 	<string name="poi_garden_type_private">Tipo do xardín: privado</string>
@@ -1003,12 +1003,12 @@
 	<string name="poi_capacity_parent">Lugares reservados para familias</string>
 
 	<string name="poi_aerialway_capacity">Capacidade por hora</string>
-	<string name="poi_aerialway_duration">Tempo medio de viaxe, minutos</string>
-	<string name="poi_aerialway_heating_yes">Calefacción</string>
+	<string name="poi_aerialway_duration">Tempo medio da viaxe, minutos</string>
+	<string name="poi_aerialway_heating_yes">Si</string>
 	<string name="poi_aerialway_heating_no">Sen calefación</string>
-	<string name="poi_aerialway_bicycle_yes">Bicicleta: permitida</string>
+	<string name="poi_aerialway_bicycle_yes">Permitido</string>
 	<string name="poi_aerialway_bicycle_no">Bicicleta: non permitida</string>
-	<string name="poi_aerialway_bicycle_summer">Bicicleta: permitida só no verán</string>
+	<string name="poi_aerialway_bicycle_summer">Permitido só no verán</string>
 	<string name="poi_aerialway_access_entry">Só entrada</string>
 	<string name="poi_aerialway_access_exit">Só saída</string>
 	<string name="poi_aerialway_access_both">Entrada e saída</string>
@@ -1016,51 +1016,51 @@
 	<string name="poi_aerialway_summer_access_exit">Acceso no verán: só saida</string>
 	<string name="poi_aerialway_summer_access_both">Acceso no verán: entrada e saída</string>
 
-	<string name="poi_stars_1">Estrelas: 1 (Turista)</string>
+	<string name="poi_stars_1">1 (Turista)</string>
 	<string name="poi_stars_1s">1S (Turista superior)</string>
-	<string name="poi_stars_2">Estrelas: 2 (Normal)</string>
+	<string name="poi_stars_2">2 (Normal)</string>
 	<string name="poi_stars_2s">2S (Estándar superior)</string>
-	<string name="poi_stars_3">Estrelas: 3 (Comfort)</string>
+	<string name="poi_stars_3">3 (Comfortábel)</string>
 	<string name="poi_stars_3s">3S (Confortábel superior)</string>
-	<string name="poi_stars_4">Estrelas: 4 (Primeira clase)</string>
+	<string name="poi_stars_4">4 (Primeira clase)</string>
 	<string name="poi_stars_4s">4S (Primeira clase superior)</string>
-	<string name="poi_stars_5">Estrelas: 5 (Luxo)</string>
+	<string name="poi_stars_5">5 (Luxo)</string>
 	<string name="poi_stars_5s">5S (Luxoso superior)</string>
 	<string name="poi_stars_6">Estrelas: 6</string>
 	<string name="poi_stars_7">Estrelas: 7</string>
 	<string name="poi_rooms">Cuartos</string>
 
-	<string name="poi_payment_coins_yes">Acéptanse moedas</string>
+	<string name="poi_payment_coins_yes">Moedas</string>
 	<string name="poi_payment_coins_no">Non se admiten moedas</string>
-	<string name="poi_payment_coins_50c12">Acéptanse moedas de 50c, 1€ e 2€</string>
-	<string name="poi_payment_telephone_cards_yes">Acéptanse tarxetas de teléfono</string>
+	<string name="poi_payment_coins_50c12">Moedas de 50c, 1€ e 2€</string>
+	<string name="poi_payment_telephone_cards_yes">Tarxetas de teléfono</string>
 	<string name="poi_payment_telephone_cards_no">Non se admiten cartóns telefónicos</string>
-	<string name="poi_payment_credit_cards_yes">Acéptanse tarxetas de crédito</string>
+	<string name="poi_payment_credit_cards_yes">Tarxetas de crédito</string>
 	<string name="poi_payment_credit_cards_no">Non se admiten tarxetas de crédito</string>
-	<string name="poi_payment_notes_yes">Acéptanse billetes</string>
+	<string name="poi_payment_notes_yes">Billetes</string>
 	<string name="poi_payment_notes_no">Non se admiten billetes</string>
-	<string name="poi_payment_electronic_purses_yes">Acéptanse moedeiros electrónicos</string>
+	<string name="poi_payment_electronic_purses_yes">Moedeiros electrónicos</string>
 	<string name="poi_payment_electronic_purses_no">Non se admiten moedeiros electrónicos</string>
-	<string name="poi_payment_cash_yes">Acéptase metálico</string>
+	<string name="poi_payment_cash_yes">Cartos en metálico</string>
 	<string name="poi_payment_cash_no">Non se admiten cartos en metálico</string>
-	<string name="poi_payment_debit_cards_yes">Acéptanse tarxetas de débito</string>
+	<string name="poi_payment_debit_cards_yes">Tarxetas de débito</string>
 	<string name="poi_payment_debit_cards_no">Non se admiten tarxetas de débito</string>
-	<string name="poi_payment_bitcoin_yes">Acéptase bitcoin</string>
+	<string name="poi_payment_bitcoin_yes">Bitcoin</string>
 	<string name="poi_payment_bitcoin_no">Non se admite Bitcoin</string>
-	<string name="poi_payment_visa_yes">Acéptanse tarxetas Visa</string>
+	<string name="poi_payment_visa_yes">Visa</string>
 	<string name="poi_payment_visa_no">Non se admiten tarxetas Visa</string>
-	<string name="poi_payment_mastercard_yes">Acéptase MasterCard</string>
+	<string name="poi_payment_mastercard_yes">MasterCard</string>
 	<string name="poi_payment_mastercard_no">Non se admite MasterCard</string>
 	<string name="poi_payment_none">Gratis</string>
-	<string name="poi_payment_maestro_yes">Acéptanse tarxetas Maestro</string>
+	<string name="poi_payment_maestro_yes">Tarxetas Maestro</string>
 	<string name="poi_payment_maestro_no">Non se admiten tarxetas Maestro</string>
-	<string name="poi_payment_american_express_yes">Acéptanse tarxetas American Expres (AMEX)</string>
+	<string name="poi_payment_american_express_yes">American Expres (AMEX)</string>
 	<string name="poi_payment_american_express_no">Non se admiten tarxetas American Expres (AMEX)</string>
-	<string name="poi_payment_diners_club_yes">Acéptanse tarxetas Diners Club</string>
+	<string name="poi_payment_diners_club_yes">Diners Club</string>
 	<string name="poi_payment_diners_club_no">Non se admiten tarxetas Diners Club</string>
-	<string name="poi_payment_visa_electron_yes">Acéptanse tarxetas Visa Electron</string>
+	<string name="poi_payment_visa_electron_yes">Visa Electron</string>
 	<string name="poi_payment_visa_electron_no">Non se admiten tarxetas Visa Electron</string>
-	<string name="poi_payment_others_yes">Acéptanse outros métodos de pagamento</string>
+	<string name="poi_payment_others_yes">Outros</string>
 	<string name="poi_payment_others_no">Non se admiten outros xeitos de pagamento</string>
 	<string name="poi_fuel_type">Tipo do combustíbel</string>
 	<string name="poi_fuel_avia_type">Tipo do combustíbel (avións)</string>
@@ -1137,7 +1137,7 @@
 	<string name="poi_free_flying_characteristic">Característica</string>
 
 <string name="poi_emergency_infrastructure">Infraestrutura de emerxencia</string>
-	<string name="poi_craft">Artesanía</string>
+	<string name="poi_craft">Traballos manuais (artesanía)</string>
 	<string name="poi_bathroom_furnishing">Mobiliario de baño</string>
 	<string name="poi_bed">Tenda de roupa de cama</string>
 	<string name="poi_chemist">Drogaría</string>
@@ -1166,7 +1166,7 @@
 
 	<string name="poi_fire_hydrant">Boca de incendio</string>
 	<string name="poi_grit_bin">Contedor de sal</string>
-	<string name="poi_traffic_calming_hump">Lomba</string>
+	<string name="poi_traffic_calming_hump">Lomba grande de velocidade</string>
 	<string name="poi_traffic_calming_rumble_strip">Banda sonora</string>
 	<string name="poi_fuel_1_25">Combustíbel 1:25</string>
 	<string name="poi_fuel_1_50">Combustíbel 1:50</string>
@@ -1265,9 +1265,9 @@
 	<string name="poi_buoy_safe_water">Boia de augas seguras</string>
 	<string name="poi_buoy_special_purpose">Boia de propósito especial</string>
 	<string name="poi_distance_mark">Marca de distancia</string>
-	<string name="poi_wiki_lang_af"/>
+	<string name="poi_wiki_lang_af">Wiki en afrikaans</string>
 	<string name="poi_wiki_lang_als">Wiki en alsaciano</string>
-	<string name="poi_wiki_lang_az">Wiki en azerí</string>
+	<string name="poi_wiki_lang_az">Wiki en azarí ou acerbaixano</string>
 	<string name="poi_wiki_lang_bn">Wiki en bengalí</string>
 	<string name="poi_wiki_lang_bpy">Wiki en bishnupriya</string>
 	<string name="poi_wiki_lang_br">Wiki en bretón</string>
@@ -1329,14 +1329,14 @@
 	<string name="poi_block">Bloqueo</string>
 	<string name="poi_debris">Escombros</string>
 	<string name="poi_jersey_barrier">Barreira de Nova Jersey</string>
-	<string name="poi_height_restrictor">Limitador de altura</string>
+	<string name="poi_height_restrictor">Limitador da altitude</string>
 	<string name="poi_horse_stile">Pasaxe para cabalos</string>
 	<string name="poi_operator">Operador</string>
 	<string name="poi_fee_yes">Si</string>
 	<string name="poi_fee_no">Non</string>
 	<string name="poi_wheelchair_accessibility">Accesibilidade para cadeiras de rodas</string>
 	<string name="poi_access_destination">Acceso do destino</string>
-	<string name="poi_content_silage"/>
+	<string name="poi_content_silage">Contido: ensilado</string>
 	<string name="poi_content_manure">Contido: estrume</string>
 	<string name="poi_trade_building_supplies">Materiais da construción</string>
 	<string name="poi_trade_plumbing">Materiais da fontanaría</string>
@@ -1354,7 +1354,7 @@
 	<string name="poi_covered_yes">Si</string>
 	<string name="poi_fireplace_no">Sen lareira</string>
 
-	<string name="poi_covered_no">Descuberto</string>
+	<string name="poi_covered_no">Descoberto</string>
 
 	<string name="poi_tactile_paving_yes">Si</string>
 	<string name="poi_railway_level_crossing">Pasaxe a nivel</string>
@@ -1438,7 +1438,7 @@
 	<string name="poi_parking_underground">Subterráneo</string>
 	<string name="poi_public_bath">Baño público</string>
 
-	<string name="poi_toilets_access_public">Acceso ós aseos: público</string>
+	<string name="poi_toilets_access_public">Acceso ós servizos: público</string>
 
 	<string name="poi_vending_public_transport_tickets">Billetes de transporte público</string>
 	<string name="poi_vending_parking_tickets_public_transport_tickets">Billetes de aparcamento e transporte público</string>
@@ -1456,9 +1456,9 @@
 
 	<string name="poi_historic_period_roman_republic">Período histórico: República romana (do 508 ó 27 a.C.)</string>
 	<string name="poi_square">Praza</string>
-	<string name="poi_nuclear_explosion_type_underground_shaft">Tipo da explosión: subterránea, escavación</string>
-	<string name="poi_nuclear_explosion_type_underground_tunnel">Tipo da explosión: subterránea, túnel</string>
-	<string name="poi_nuclear_explosion_type_underground">Tipo da explosión: subterránea</string>
+	<string name="poi_nuclear_explosion_type_underground_shaft">Tipo do estourido: subterráneo, escavación</string>
+	<string name="poi_nuclear_explosion_type_underground_tunnel">Tipo do estourido: subterráneo, túnel</string>
+	<string name="poi_nuclear_explosion_type_underground">Tipo do estourido: subterráneo</string>
 	<string name="poi_fire_hydrant_type_underground">Subterráneo</string>
 	<string name="poi_health_amenity_type_scales">Básculas públicas</string>
 
@@ -1490,7 +1490,7 @@
 	<string name="poi_glacier_type">Tipo do glaciar</string>
 	<string name="poi_checkpoint_type">Tipo do posto de control</string>
 
-<string name="poi_convenience">Tenda de comestíbeis</string>
+<string name="poi_convenience">Tenda de ultramarinos</string>
 	<string name="poi_halt">Paraxe de trens</string>
 	<string name="poi_railway_buffer_stop">Fin da vía</string>
 	<string name="poi_food_court">Estabelecemento de comidas</string>
@@ -1500,7 +1500,7 @@
 	<string name="poi_general_barrier">Barreira xeral</string>
 	<string name="poi_highway_crossing">Paso de peóns</string>
 
-	<string name="poi_bicycle_parking_stands">Anclaxes en forma de U invertida</string>
+	<string name="poi_bicycle_parking_stands">Ancoraxes en forma de U invertida</string>
 	<string name="poi_enforcement_traffic_signals">Control de semáforos</string>
 	<string name="poi_payment_account_cards_no">Non se admiten tarxetas de conta</string>
 	<string name="poi_payment_dkv_no">Non se admite DKV</string>
@@ -1538,12 +1538,12 @@
 	<string name="poi_outdoor_seating_patio">Mesas ó ar libre: patio</string>
 
 	<string name="poi_indoor_no">Ó ar libre</string>
-	<string name="poi_toilets_no">Aseos: non</string>
-	<string name="poi_toilets_wheelchair_yes">Aseos para persoas en cadeiras de rodas: si</string>
-	<string name="poi_toilets_wheelchair_no">Aseos para persoas en cadeiras de rodas: non</string>
-	<string name="poi_toilets_access_customers">Acceso ós aseos: clientes</string>
-	<string name="poi_toilets_access_permissive">Acceso ós aseos: permisivo</string>
-	<string name="poi_toilets_access_community">Acceso ós aseos: comunidade</string>
+	<string name="poi_toilets_no">Servizos: non</string>
+	<string name="poi_toilets_wheelchair_yes">Servizos para persoas en cadeiras de rodas: si</string>
+	<string name="poi_toilets_wheelchair_no">Servizos para persoas en cadeiras de rodas: non</string>
+	<string name="poi_toilets_access_customers">Acceso ós servizos: clientes</string>
+	<string name="poi_toilets_access_permissive">Acceso ós servizos: permisivo</string>
+	<string name="poi_toilets_access_community">Acceso ós servizos: comunidade</string>
 	<string name="poi_memorial_statue">Estatua</string>
 	<string name="poi_resource_barite">Barita</string>
 	<string name="poi_resource_platinum">Platino</string>
@@ -1554,19 +1554,19 @@
 
 	<string name="poi_internet_access_type_terminal">Por terminal</string>
 	<string name="poi_internet_access_type_service">Tipo do acceso á Internet: servizo</string>
-	<string name="poi_artwork_type_sculpture">Tipo de obra: escultura</string>
-	<string name="poi_artwork_type_statue">Tipo de obra: estatua</string>
-	<string name="poi_artwork_type_mural">Tipo de obra: mural</string>
-	<string name="poi_artwork_type_architecture">Tipo de obra: arquitectónica</string>
-	<string name="poi_artwork_type_painting">Tipo de obra: pintura</string>
-	<string name="poi_artwork_type_stone">Tipo de obra: pedra</string>
-	<string name="poi_artwork_type_bust">Tipo de obra: busto</string>
-	<string name="poi_artwork_type_installation">Tipo de obra: instalación</string>
-	<string name="poi_artwork_type_mosaic">Tipo de obra: mosaico</string>
-	<string name="poi_artwork_type_relief">Tipo de obra: relevo</string>
-	<string name="poi_artwork_type_graffiti">Tipo de obra: pintada ou graffiti</string>
-	<string name="poi_artwork_type_stele">Tipo de obra: estela</string>
-	<string name="poi_artwork_type_fountain">Tipo de obra: fonte</string>
+	<string name="poi_artwork_type_sculpture">Tipo da obra: escultura</string>
+	<string name="poi_artwork_type_statue">Tipo da obra: estatua</string>
+	<string name="poi_artwork_type_mural">Tipo da obra: mural</string>
+	<string name="poi_artwork_type_architecture">Tipo da obra: arquitectónica</string>
+	<string name="poi_artwork_type_painting">Tipo da obra: pintura</string>
+	<string name="poi_artwork_type_stone">Tipo da obra: pedra</string>
+	<string name="poi_artwork_type_bust">Tipo da obra: busto</string>
+	<string name="poi_artwork_type_installation">Tipo da obra: instalación</string>
+	<string name="poi_artwork_type_mosaic">Tipo da obra: mosaico</string>
+	<string name="poi_artwork_type_relief">Tipo da obra: relevo</string>
+	<string name="poi_artwork_type_graffiti">Tipo da obra: pintada ou graffiti</string>
+	<string name="poi_artwork_type_stele">Tipo da obra: estela</string>
+	<string name="poi_artwork_type_fountain">Tipo da obra: fonte</string>
 
 	<string name="poi_architecture_baroque">Arquitectura: barroca</string>
 	<string name="poi_bridge_type_movable">Tipo da ponte: móbil</string>
@@ -1694,16 +1694,16 @@
 	<string name="poi_building_type_pyramid">Tipo do edificio: pirámide</string>
 
 	<string name="poi_parking_surface">Tipo do aparcadoiro: na superficie</string>
-	<string name="poi_nuclear_explosion_type_atmospheric">Tipo da explosión: atmosférica</string>
-	<string name="poi_nuclear_explosion_type_atmospheric_airdrop">Tipo da explosión: atmosférica, lanzamento aéreo</string>
-	<string name="poi_nuclear_explosion_type_atmospheric_surface_tower">Tipo da explosión: atmosférica, na superficie, torre</string>
-	<string name="poi_nuclear_explosion_type_atmospheric_balloon">Tipo da explosión: atmosférica, globo</string>
-	<string name="poi_nuclear_explosion_type_atmospheric_atmospheric_surface">Tipo da explosión: atmosférica, na superficie</string>
-	<string name="poi_nuclear_explosion_type_atmospheric_water_surface_barge">Tipo da explosión: atmosférica, na superficie da auga, barquiña</string>
-	<string name="poi_nuclear_explosion_type_cratering_burst">Tipo da explosión: estoupido do cráter (subsolo pouco afundido)</string>
-	<string name="poi_nuclear_explosion_type_atmospheric_rocket_or_missile">Tipo da explosión: atmosférica, foguete ou mísil</string>
-	<string name="poi_nuclear_explosion_type_space">Tipo da explosión: espacial (altitude &gt; 80 km)</string>
-	<string name="poi_nuclear_explosion_type_underwater">Tipo da explosión: mergullada ou submariña</string>
+	<string name="poi_nuclear_explosion_type_atmospheric">Tipo do estourido: atmosférico</string>
+	<string name="poi_nuclear_explosion_type_atmospheric_airdrop">Tipo do estourido: atmosférico, lanzamento aéreo</string>
+	<string name="poi_nuclear_explosion_type_atmospheric_surface_tower">Tipo do estourido: atmosférico, na superficie, torre</string>
+	<string name="poi_nuclear_explosion_type_atmospheric_balloon">Tipo do estourido: atmosférico, globo</string>
+	<string name="poi_nuclear_explosion_type_atmospheric_atmospheric_surface">Tipo do estourido: atmosférico, na superficie</string>
+	<string name="poi_nuclear_explosion_type_atmospheric_water_surface_barge">Tipo do estourido: atmosférico, na superficie da auga, barquiña</string>
+	<string name="poi_nuclear_explosion_type_cratering_burst">Tipo do estourido: estoupido do cráter (subsolo pouco afundido)</string>
+	<string name="poi_nuclear_explosion_type_atmospheric_rocket_or_missile">Tipo do estourido: atmosférico, foguete ou mísil</string>
+	<string name="poi_nuclear_explosion_type_space">Tipo do estourido: espacial (altitude &gt; 80 km)</string>
+	<string name="poi_nuclear_explosion_type_underwater">Tipo do estourido: mergullado ou submariño</string>
 	<string name="poi_addr_housename">Nome do edificio</string>
 
 
@@ -1831,7 +1831,7 @@
 	<string name="poi_surface_snow">Superficie: neve</string>
 
 	<string name="poi_consulting">Oficina de consultoría</string>
-	<string name="poi_nuclear_explosion_date_utc">Data da explosión (UTC)</string>
+	<string name="poi_nuclear_explosion_date_utc">Data do estourido (UTC)</string>
 	<string name="poi_date_yes">Amosado da data</string>
 	<string name="poi_date_no">Amosado da data: non</string>
 
@@ -1843,7 +1843,7 @@
 	<string name="poi_vending_bicycle_tube">Válvulas de bicicleta</string>
 	<string name="poi_bridge_bicycle">Ponte ciclista</string>
 	<string name="poi_service_bicycle_retail_no">Venda de bicicletas: non</string>
-	<string name="poi_service_bicycle_repair_no">Reparación de bicicletas: non</string>
+	<string name="poi_service_bicycle_repair_no">Arranxo de bicicletas: non</string>
 	<string name="poi_service_bicycle_rental_no">Aluguer de bicicletas: non</string>
 	<string name="poi_service_bicycle_pump_no">Inchado de bicicletas: non</string>
 	<string name="poi_service_bicycle_diy_no">Ferramentas para autoarranxado: non</string>
@@ -1863,4 +1863,2049 @@
 	<string name="poi_additional_atm_yes">Caixeiro automático: si</string>
 	<string name="poi_atm_no">Caixeiro automático: non</string>
 
-	</resources>
+	<string name="poi_brushless">Sen vasoira</string>
+	<string name="poi_pharmacy_dispensing">Dispensa recetas médicas</string>
+	<string name="poi_scout_camp">Campamento de exploradores</string>
+	<string name="poi_backcountry">Acampada libre</string>
+	<string name="poi_drive_in">Conducir por dentro</string>
+	<string name="poi_drive_through">Servizo no automóbil</string>
+	<string name="poi_microbrewery">Cervexaría artesanal</string>
+	<string name="poi_seasonal">Estacional</string>
+	<string name="poi_motorcycle_services">Servizos</string>
+	<string name="poi_animal_shelter_purpose">Obxectivo</string>
+	<string name="poi_boat_rental_type">Aluguer de embarcacións</string>
+	<string name="poi_operational_status">Estado operativo</string>
+	<string name="poi_water_purification">Depuración das aguas</string>
+	<string name="poi_water_place_access">Acceso á fonte da auga</string>
+	<string name="poi_climbing_style">Estilo da escalada</string>
+	<string name="poi_socket">Conector</string>
+	<string name="poi_socket_chademo_output_filter">Saída CHAdeMO</string>
+	<string name="poi_socket_cee_blue_output_filter">Saída CEE azul</string>
+	<string name="poi_socket_schuko_output_filter">Saída Schuko</string>
+	<string name="poi_service_car">Servizo para o automóbil</string>
+	<string name="poi_bulk_purchase">Merca ó por maior</string>
+	<string name="poi_substation_type">Tipo da subestación</string>
+
+<string name="poi_traffic_enforcement">Control do tráfico</string>
+	<string name="poi_transport_construction">Construcción de materiais de transporte</string>
+	<string name="poi_charity">Tenda da caridade</string>
+	<string name="poi_association">Asociación</string>
+	<string name="poi_village_green">Zona verde</string>
+	<string name="poi_animal_shelter_horse">Cabalos</string>
+	<string name="poi_backrest_yes">Respaldo: si</string>
+	<string name="poi_fireplace_yes">Si</string>
+	<string name="poi_drive_in_yes">Si</string>
+	<string name="poi_drive_through_yes">Si</string>
+	<string name="poi_takeaway_filter_yes">Si</string>
+	<string name="poi_delivery_filter_yes">Si</string>
+	<string name="poi_outdoor_seating_filter_yes">Si</string>
+	<string name="poi_cocktails_yes">Si</string>
+
+	<string name="poi_self_service_yes">Si</string>
+	<string name="poi_automated_yes">Si</string>
+	<string name="poi_brushless_yes">Si</string>
+	<string name="poi_toilets_yes">Si</string>
+	<string name="poi_resource_sand">Area</string>
+	<string name="poi_resource_sandstone">Arenito</string>
+	<string name="poi_beach_sand">Area</string>
+	<string name="poi_bench_yes">Si</string>
+	<string name="poi_surveillance_yes">Vixiancia: si</string>
+	<string name="poi_service_bicycle_charging_yes">Cargador eléctrico: si</string>
+	<string name="poi_backcountry_yes">Si</string>
+	<string name="poi_scout_yes">Si</string>
+	<string name="poi_group_only_yes">Só grupos: si</string>
+	<string name="poi_washing_machine_yes">Si</string>
+	<string name="poi_shower_filter_yes">Si</string>
+	<string name="poi_shower_yes">Ducha: si</string>
+	<string name="poi_caravans_yes">Si</string>
+	<string name="poi_impromptu_yes">Improvisado: si</string>
+	<string name="poi_sanitary_dump_station_yes">Estación de refugallos sanitarios: si</string>
+	<string name="poi_power_supply_yes">Si</string>
+	<string name="poi_social_facility_for_underprivileged">Desfavorecidos</string>
+	<string name="poi_handrail_yes">Varanda: si</string>
+	<string name="poi_ramp_yes">Rampla: si</string>
+	<string name="poi_ramp_wheelchair_yes">Rampla para cadeiras de rodas: si</string>
+	<string name="poi_ramp_stroller_yes">Rampla (cocheciños): si</string>
+	<string name="poi_ramp_luggage_yes">Rampla para bagaxes: si</string>
+	<string name="poi_defibrillator_yes">Desfibrilador: si</string>
+
+	<string name="poi_horse_yes">Cabalos: permitido</string>
+	<string name="poi_horse_no">Cabalos: non permitido</string>
+	<string name="poi_artist_name">Artista</string>
+	<string name="poi_summit_cross">Cruz no cumio: si</string>
+
+	<string name="poi_bathing_yes">Permítese o baño: si</string>
+	<string name="poi_microwave_oven_yes">Forno microondas: si</string>
+	<string name="poi_water_heater_yes">Quentador de auga: si</string>
+	<string name="poi_fair_trade_yes">Comercio xusto: si</string>
+	<string name="poi_compressed_air_yes">Si</string>
+	<string name="poi_car_wash_yes">Si</string>
+
+	<string name="poi_vacuum_cleaner_yes">Si</string>
+	<string name="poi_button_operated_yes">Operado por botóns: si</string>
+	<string name="poi_free_flying_official_yes">Oficial: si</string>
+	<string name="poi_free_flying_guest_guidelines_yes">Directrices do convidado: si</string>
+	<string name="poi_health_service_nursing_yes">Servizo de saúde: enfermaría: si</string>
+	<string name="poi_health_service_counselling_yes">Servizo de saúde: asesoramento: si</string>
+	<string name="poi_health_service_examination_yes">Servizo de saúde: revisión médica: si</string>
+	<string name="poi_health_service_child_care_yes">Servizo de saúde: coidados infantís: si</string>
+	<string name="poi_health_service_prevention_yes">Servizo de saúde: prevención: si</string>
+	<string name="poi_health_service_prevention_vaccination_yes">Servizo de saúde: vacinación: si</string>
+	<string name="poi_health_service_support_yes">Servizo de saúde: apoio: si</string>
+	<string name="poi_health_service_test_yes">Servizo de saúde: análise: si</string>
+	<string name="poi_counselling_type_addiction_yes">Asesoramento (adiccións): si</string>
+	<string name="poi_counselling_type_antenatal_yes">Asesoramento (prenatal): si</string>
+	<string name="poi_counselling_type_child_guidance_yes">Asesoramento (orientacións infantís): si</string>
+	<string name="poi_counselling_type_couple_yes">Asesoramento (parella): si</string>
+	<string name="poi_counselling_type_crisis_yes">Asesoramento (crise): si</string>
+	<string name="poi_counselling_type_drugs_yes">Asesoramento (drogas): si</string>
+	<string name="poi_counselling_type_education_yes">Asesoramento (educación): si</string>
+	<string name="poi_counselling_type_family_yes">Asesoramento (familiar): si</string>
+	<string name="poi_counselling_type_homeless_yes">Asesoramento (sen lar): si</string>
+	<string name="poi_counselling_type_immigrant_yes">Asesoramento (inmigrantes): si</string>
+	<string name="poi_counselling_type_marriage_yes">Asesoramento (casamento): si</string>
+	<string name="poi_counselling_type_nutrition_yes">Asesoramento (nutrición): si</string>
+	<string name="poi_counselling_type_sexual_yes">Asesoramento (sexual): si</string>
+	<string name="poi_cuisine_sandwich">Sandwiches</string>
+	<string name="poi_climbing_rock_sandstone">Escalada na rocha: arenito</string>
+	<string name="poi_counselling_type_sexual_abuse_yes">Asesoramento (abusos sexuais): si</string>
+	<string name="poi_radiotechnics">Tenda de radiotecnia</string>
+	<string name="poi_shop_craft">Tenda de materiais de artes e traballos manuais (artesanía)</string>
+	<string name="poi_fire_flapper">Cortalumes</string>
+	<string name="poi_fire_water_pond">Lagoa de auga para incendios</string>
+	<string name="poi_ses_station">Servizo de emerxencia (SES)</string>
+	<string name="poi_traffic_calming_cushion">Coxín berlinés</string>
+	<string name="poi_traffic_calming_chicane">Chicana</string>
+	<string name="poi_traffic_calming_table">Plataforma elevada</string>
+	<string name="poi_traffic_calming_choker">Estreitamento</string>
+	<string name="poi_fuel_lpg">GLP</string>
+	<string name="poi_fuel_cng">GNC (gas para vehículos)</string>
+	<string name="poi_fuel_svo">SVO (combustíbel vexetal)</string>
+	<string name="poi_aeroway_fuel">Estación de combustíbel das aeronaves</string>
+	<string name="poi_waterway_fuel">Estación de combustíbel para embarcacións</string>
+	<string name="poi_electricity_combined_charging">Estación de carga eléctrica</string>
+	<string name="poi_vehicle_ramp">Rampla de vehículos</string>
+	<string name="poi_turning_circle">Círculo de xiro</string>
+	<string name="poi_motorway_junction">Saída da autroestrada</string>
+	<string name="poi_standpipe">Boca de incendios</string>
+	<string name="poi_boatyard">Estaleiro</string>
+	<string name="poi_waterway_turning_point">Punto de manobra de embarcacións</string>
+	<string name="poi_weir">Vertedoiro</string>
+	<string name="poi_breakwater">Dique</string>
+	<string name="poi_groyne">Espigo</string>
+
+	<string name="poi_power_cable_distribution_cabinet">Cadro da distribución eléctrica</string>
+	<string name="poi_recycling_scrap_metal">Ferralla</string>
+	<string name="poi_recycling_hydrargyrum">Mercurio</string>
+	<string name="poi_recycling_waste_oil">Aceite usado</string>
+	<string name="poi_recycling_sheet_metal">Chapas metálicas</string>
+	<string name="poi_recycling_styrofoam">Poliestireno extruído</string>
+	<string name="poi_recycling_chipboard">Cartóns prensados</string>
+	<string name="poi_farmyard">Granxa</string>
+	<string name="poi_brownfield">Chan abandoado urbanizábel</string>
+	<string name="poi_greenfield">Chan virxe urbanizábel</string>
+	<string name="poi_adit">Boca da mina</string>
+	<string name="poi_bunker_silo">Silo búnquer</string>
+	<string name="poi_bailiff">Oficial de xustiza</string>
+	<string name="poi_quarter">Distrito</string>
+	<string name="poi_place_allotments">Hortas comunitarias</string>
+	<string name="poi_sanatorium">Sanatorio</string>
+	<string name="poi_audiologist">Audioloxía</string>
+	<string name="poi_newspaper">Oficina de xornal</string>
+	<string name="poi_architect">Oficina de arquitectura</string>
+	<string name="poi_office_religion">Oficina relixiosa</string>
+	<string name="poi_financial">Oficina financeira</string>
+	<string name="poi_raceway">Circuíto de carreiras</string>
+	<string name="poi_9pin">Birlos alemáns</string>
+	<string name="poi_10pin">Birlos americáns</string>
+	<string name="poi_base">Brinco base</string>
+	<string name="poi_bmx">Bicicross (BMX)</string>
+	<string name="poi_bowls">Birlos</string>
+	<string name="poi_ice_hockey">Hóquei sobre xeo</string>
+	<string name="poi_ice_stock">Icestock</string>
+	<string name="poi_korfbal">Baloncorf</string>
+	<string name="poi_attraction_swing_carousel">Cabaliños ou carrusel</string>
+	<string name="poi_cabin">Cabana</string>
+	<string name="poi_lean_to">Pendello</string>
+	<string name="poi_religious">Área relixiosa</string>
+	<string name="poi_wayside_shrine">Ermida no camiño</string>
+	<string name="poi_club_charity">Clube da caridade</string>
+	<string name="poi_club_scout">Clube de exploradores</string>
+
+	<string name="poi_piste_sled">Pista de zorras</string>
+	<string name="poi_piste_playground">Pista infantil</string>
+	<string name="poi_beach_resort">Complexo turístico de praia</string>
+	<string name="poi_hunting_stand">Cabana de caza</string>
+	<string name="poi_trail_riding_station">Estación de equitación</string>
+
+	<string name="poi_craft_basket_maker">Cesteiro</string>
+	<string name="poi_craft_boatbuilder">Fabricante de embarcacións</string>
+	<string name="poi_craft_caterer">Fornecedor de comidas (catering)</string>
+	<string name="poi_craft_glaziery">Vidreiro</string>
+	<string name="poi_craft_locksmith">Zarralleiro</string>
+	<string name="poi_craft_key_cutter">Duplicado de chaves</string>
+	<string name="poi_craft_metal_construction">Metalistaría</string>
+	<string name="poi_craft_plasterer">Xeseiro</string>
+	<string name="poi_craft_rigger">Armador ou montador</string>
+	<string name="poi_craft_saddler">Gornicioneiro ou seleiro</string>
+	<string name="poi_craft_sawmill">Serradoiro</string>
+	<string name="poi_craft_scaffolder">Montador das estadas ou andamiaxes</string>
+	<string name="poi_craft_stand_builder">Creador de estandes</string>
+	<string name="poi_craft_sun_protection">Tendais</string>
+	<string name="poi_craft_sweep">Varredor</string>
+	<string name="poi_craft_tiler">Albanel ou ladrilleiro</string>
+	<string name="poi_craft_tinsmith">Latoeiro</string>
+	<string name="poi_craft_upholsterer">Tapiceiro</string>
+	<string name="poi_car_sharing">Automóbil partillado ou compartido</string>
+	<string name="poi_car_pooling">Punto dos automóbiles compartidos</string>
+	<string name="poi_boat_sharing">Embarcacións compartidas</string>
+	<string name="poi_dock">Dársena</string>
+	<string name="poi_cutline">Cortalumes</string>
+	<string name="poi_ridge">Crista</string>
+	<string name="poi_wetland">Zona húmida</string>
+	<string name="poi_berth">Atracadoiro</string>
+	<string name="poi_seamark_building">Edificio náutico</string>
+	<string name="poi_seamark_bridge">Ponte náutica</string>
+	<string name="poi_buoy_cardinal">Boia cardinal</string>
+	<string name="poi_daymark">"Marcaxe do día "</string>
+	<string name="poi_seamark_dyke">Dique náutico</string>
+	<string name="poi_harbour_basin">Conca do porto</string>
+	<string name="poi_landmark">Referenza terrestre</string>
+	<string name="poi_seamark_light">Luz náutica</string>
+	<string name="poi_seamark_light_major">Luz náutica maior</string>
+	<string name="poi_seamark_light_minor">Luz náutica menor</string>
+	<string name="poi_seamark_light_float">Boia luminosa</string>
+	<string name="poi_seamark_light_vessel">Navío faro</string>
+	<string name="poi_lock_basin">Esclusa</string>
+	<string name="poi_notice">Sinal náutica</string>
+	<string name="poi_pile">Piar</string>
+	<string name="poi_radar_transponder">Radar transpoñedor</string>
+	<string name="poi_radio_station">Estación de radio náutica</string>
+	<string name="poi_signal_station_traffic">Estación de sinais do tráfico</string>
+	<string name="poi_signal_station_warning">Estación de sinais de perigo</string>
+	<string name="poi_topmark">Bordo náutico</string>
+	<string name="poi_seamark_rock">Rocha náutica, baixo</string>
+	<string name="poi_seamark_wreck">Afundimento ou naufraxio náutico</string>
+
+	<string name="poi_seamark_clearance_height">Altitude de seguranza</string>
+	<string name="poi_seamark_clearance_height_closed">Altitude de seguranza (fechada)</string>
+	<string name="poi_seamark_clearance_height_open">Altitude de seguranza (aberta)</string>
+	<string name="poi_seamark_clearance_width">Amplitude de seguranza</string>
+
+	<string name="poi_bus_trap">Trallo do bus</string>
+	<string name="poi_cattle_grid">Paso canadiense</string>
+	<string name="poi_full_height_turnstile">Muíño de altitude completa</string>
+	<string name="poi_bump_gate">Cancela</string>
+	<string name="poi_stile">Escada de paso</string>
+	<string name="poi_kissing_gate">Porta labiríntica</string>
+	<string name="poi_sally_port">Poterna</string>
+	<string name="poi_swing_gate">Barreira xiratoria</string>
+	<string name="poi_turnstile">Torno</string>
+	<string name="poi_kent_carriage_gap">Paso para carruaxes</string>
+	<string name="poi_route_hiking_iwn_poi">Roteiro internacional de sendeirismo</string>
+	<string name="poi_route_hiking_nwn_poi">Roteiro nacional de sendeirismo</string>
+	<string name="poi_route_hiking_rwn_poi">Roteiro rexional de sendeirismo</string>
+	<string name="poi_route_hiking_lwn_poi">Roteiro local de sendeirismo</string>
+	<string name="poi_route_hiking_ref_poi">Referenza do roteiro de sendeirismo</string>
+
+	<string name="poi_wholesale">Venda maiorista</string>
+
+	<string name="poi_content_slurry">Contido: mesturanza</string>
+	<string name="poi_content_sewage">Contido: augas residuais</string>
+	<string name="poi_trade_wood">Venda de madeira</string>
+	<string name="poi_trade_tile">Venda de tellas e azulexos</string>
+
+	<string name="poi_parking_multi_storey">Varios andares</string>
+
+	<string name="poi_bicycle_parking_anchors">Ancoraxes</string>
+	<string name="poi_bicycle_parking_wall_loops">Ancoraxes de roda</string>
+	<string name="poi_bicycle_parking_shed">Pendello</string>
+	<string name="poi_bicycle_parking_bollard">Pivote (bolardo)</string>
+	<string name="poi_leaf_type_broadleaved">Folla ampla</string>
+	<string name="poi_leaf_type_needleleaved">Folla acicular</string>
+	<string name="poi_leaf_type_mixed">Mesturado</string>
+	<string name="poi_leaf_type_leafless">Sen follas</string>
+	<string name="poi_trees_persimmon">Caqui</string>
+	<string name="poi_trees_meadow_orchard">Horta</string>
+	<string name="poi_enforcement_maxspeed">Control da velocidade</string>
+	<string name="poi_enforcement_maxheight">Control da altitude máxima</string>
+	<string name="poi_enforcement_mindistance">Control da distanza mínima</string>
+	<string name="poi_enforcement_check">Control de tráfico</string>
+	<string name="poi_enforcement_access">Control do acceso</string>
+	<string name="poi_enforcement_toll">Control de portaxe ou peaxe</string>
+
+	<string name="poi_animal_shelter_wildlife">Animais salvaxes</string>
+	<string name="poi_animal_shelter_mammal">Mamíferos</string>
+	<string name="poi_animal_shelter_fish">Peixes</string>
+
+	<string name="poi_backrest_no">Respaldo: non</string>
+
+	<string name="poi_deadlock">Sen saída</string>
+
+	<string name="poi_water_characteristic_mud">Trazos da auga: lama</string>
+	<string name="poi_information_trail_blaze">Marcaxe do camiño</string>
+	<string name="poi_information_route_marker">Marcaxe do roteiro</string>
+	<string name="poi_toll_hgv_yes">Portaxe ou peaxe para camións</string>
+	<string name="poi_tactile_paving_no">Pavimento táctil: non</string>
+	<string name="poi_traffic_signals_sound_walk">Só permítese ó camiñar</string>
+
+	<string name="poi_rescue_station">Estación do rescate</string>
+
+	<string name="poi_mini_roundabout">Rotonda pequena</string>
+	<string name="poi_railway_crossing">Cruzamento de trens</string>
+	<string name="poi_heath">Uceira ou uzal</string>
+	<string name="poi_grassland">Pradaría</string>
+	<string name="poi_scrub">Matogueira</string>
+	<string name="poi_logging">Cortado de árbores</string>
+	<string name="poi_windfall">Froito caído</string>
+	<string name="poi_dead_wood">Árbores mortas</string>
+
+	<string name="poi_passing_place">Lugar de pasaxe</string>
+	<string name="poi_rtsa_scale">Escala RTSA</string>
+
+	<string name="poi_piste_grooming_backcountry">Fóra da pista</string>
+	<string name="poi_piste_grooming_scooter">Scooter</string>
+	<string name="poi_piste_grooming_mogul">Mogul (esquí acrobático)</string>
+
+	<string name="poi_garden_style_rosarium">Estilo do xardín: roseiras</string>
+	<string name="poi_historic_aircraft">Aeronave histórica</string>
+
+	<string name="poi_counselling_type_victim_yes">Asesoramento (vítimas): si</string>
+	<string name="poi_counselling_type_violence_yes">Asesoramento (violencia): si</string>
+	<string name="poi_provided_for_infant_yes">"Atende meniños: si "</string>
+	<string name="poi_provided_for_toddler_yes">Atende crianzas pequenas: si</string>
+	<string name="poi_provided_for_child_yes">Atende crianzas: si</string>
+	<string name="poi_provided_for_adult_yes">Atende adultos: si</string>
+	<string name="poi_provided_for_woman_yes">Atende mulleres: si</string>
+	<string name="poi_provided_for_girl_yes">Atende mozas: si</string>
+	<string name="poi_provided_for_man_yes">"Atende homes: si "</string>
+	<string name="poi_provided_for_boy_yes">Atende mozos: si</string>
+	<string name="poi_treat_inpatient_yes">Servizos hospitalarios: si</string>
+	<string name="poi_counselling_yes">Asesoramento: si</string>
+	<string name="poi_home_visit_yes">Si</string>
+	<string name="poi_disease_malaria_yes">Paludismo ou malaria: si</string>
+	<string name="poi_disease_ebola_yes">Ébola: si</string>
+	<string name="poi_disease_autism_yes">Autismo: si</string>
+	<string name="poi_disease_aids_yes">Sida: si</string>
+	<string name="poi_in_service_yes">En servizo: si</string>
+
+	<string name="poi_dispensing_yes">Si</string>
+	<string name="poi_display_yes">Pantalla: si</string>
+	<string name="poi_passenger_information_display_yes">Pantalla da información ó pasaxeiro: si</string>
+	<string name="poi_organic_yes">Si</string>
+	<string name="poi_fast_food_cafeteria">Si</string>
+
+	<string name="poi_drink_wine_yes">Viño: si</string>
+	<string name="poi_motorcycle_sales_yes_used">Venda de motos: si, de segunda mán</string>
+	<string name="poi_animal_shelter_purpose_adoption_yes">Adopcións: si</string>
+	<string name="poi_animal_shelter_purpose_release_yes">En liberdade: si</string>
+	<string name="poi_winter_room_yes">Refuxio do inverno: si</string>
+	<string name="poi_reservation_yes">Reserva: si</string>
+	<string name="poi_boat_motorboat_rental_yes">Lanchas a motor: si</string>
+	<string name="poi_boat_houseboat_rental_yes">Casas flotantes: si</string>
+	<string name="poi_boat_pedalboat_rental_yes">Barcos a pedais: si</string>
+	<string name="poi_boat_jetski_rental_yes">Motos da auga: si</string>
+	<string name="poi_boat_sailboat_rental_yes">Veleiros: si</string>
+	<string name="poi_boat_dinghy_rental_rental_yes">Botes: si</string>
+	<string name="poi_boat_kayak_rental_rental_yes">Caiaques: si</string>
+	<string name="poi_boat_canoe_rental_rental_yes">Canoas: si</string>
+	<string name="poi_car_yes">Automóbil: si</string>
+	<string name="poi_scooter_yes">Scooter: si</string>
+	<string name="poi_truck_yes">Camións: si</string>
+	<string name="poi_climbing_sport_yes">Deporte: si</string>
+	<string name="poi_climbing_boulder_yes">Búlder: si</string>
+	<string name="poi_climbing_toprope_yes">Moulinette: si</string>
+	<string name="poi_climbing_trad_yes">Tradicional: si</string>
+	<string name="poi_climbing_multipitch_yes">Roteiros multipaso: si</string>
+	<string name="poi_climbing_multipitch_no">Roteiros multipaso: non</string>
+	<string name="poi_climbing_ice_yes">Xeo: si</string>
+	<string name="poi_climbing_mixed_yes">Mesturado: si</string>
+	<string name="poi_climbing_deepwater_yes">Psicobloc: si</string>
+	<string name="poi_climbing_bolted_yes">Áncoras fixas: si</string>
+	<string name="poi_climbing_summit_log_yes">Rexistro da escalada no cume: si</string>
+	<string name="poi_barbecue_grill">Grella do churrasco: si</string>
+
+	<string name="poi_bulk_purchase_yes">Si</string>
+	<string name="poi_aerialway_occupancy">Capacidade da cabina/cadeira/automóbil</string>
+	<string name="poi_aerialway_bubble_yes">Gurgulla</string>
+	<string name="poi_aerialway_bubble_no">Sen gurgulla</string>
+	<string name="poi_love_hotel">Hotel para parellas</string>
+
+	<string name="poi_payment_coins_0.5">Moedas de $0,5</string>
+	<string name="poi_payment_account_cards_yes">Tarxetas da cuenta</string>
+	<string name="poi_payment_dkv_yes">DKV</string>
+	<string name="poi_payment_uta_yes">UTA</string>
+	<string name="poi_payment_girocard_yes">Girocard</string>
+	<string name="poi_payment_discover_card_yes">Discover Card</string>
+	<string name="poi_payment_pikepass_yes">PIKEPASS</string>
+	<string name="poi_payment_pikepass_designated">PIKEPASS (indicado)</string>
+	<string name="poi_payment_icsf_yes">IC Stored Fare</string>
+	<string name="poi_payment_prepaid_ticket_yes">Tíquets de prepagamento</string>
+	<string name="poi_payment_jcb_yes">JCB</string>
+	<string name="poi_payment_ep_cash_yes">Tarxeta de cartos (Geldkarte)</string>
+	<string name="poi_payment_oyster_yes">Oyster</string>
+	<string name="poi_payment_sube_yes">SUBE</string>
+	<string name="poi_payment_via_verde_yes">Via Verde</string>
+	<string name="poi_payment_meal_voucher_yes">Vales da comida</string>
+	<string name="poi_payment_paypal_yes">PayPal</string>
+	<string name="poi_payment_u_key_yes">U-Key</string>
+	<string name="poi_payment_token_yes">Fichas ou tokens</string>
+	<string name="poi_payment_gift_card_yes">Tarxetas de agasallo</string>
+	<string name="poi_payment_golden_crown_yes">Golden Crown</string>
+	<string name="poi_payment_pro100_yes">PRO100</string>
+	<string name="poi_payment_union_card_yes">Union Card</string>
+	<string name="poi_payment_mtsmoney_yes">MTS-Money</string>
+	<string name="poi_payment_yandexmoney_yes">Yandex.Money</string>
+	<string name="poi_description_payment">Descrición do pagamento</string>
+
+	<string name="poi_events_venue">Salón de acontecementos</string>
+
+	<string name="poi_diet_vegetarian_filter_yes">Vexetariá</string>
+	<string name="poi_diet_vegetarian_few">Vexetariá (pouco)</string>
+	<string name="poi_diet_vegetarian_only">Só vexetariá</string>
+	<string name="poi_diet_vegetarian_yes">Vexetariá</string>
+	<string name="poi_diet_vegetarian_no">Dieta vexetariá: non</string>
+	<string name="poi_diet_vegan_filter_yes">Vegá</string>
+	<string name="poi_diet_vegan_only">Só vegá</string>
+	<string name="poi_diet_vegan_yes">Vegá</string>
+	<string name="poi_diet_vegan_no">Dieta vegá: non</string>
+	<string name="poi_diet_gluten_free_filter_yes">Sen glute</string>
+	<string name="poi_diet_gluten_free_only">Só sen glute</string>
+	<string name="poi_diet_gluten_free_yes">Sen glute</string>
+	<string name="poi_diet_gluten_free_no">Dieta sen glute: non</string>
+	<string name="poi_diet_kosher_filter_yes">Kosher</string>
+	<string name="poi_diet_kosher_only">Só kosher</string>
+	<string name="poi_diet_kosher_yes">Kosher</string>
+	<string name="poi_diet_kosher_no">Dieta kosher: non</string>
+	<string name="poi_diet_halal_filter_yes">Halal</string>
+	<string name="poi_diet_halal_only">Só halal</string>
+	<string name="poi_diet_halal_yes">Halal</string>
+	<string name="poi_diet_halal_no">Dieta halal: non</string>
+	<string name="poi_diet_lactose_free_filter_yes">Sen lactosa</string>
+	<string name="poi_diet_lactose_free_only">Só sen lactosa</string>
+	<string name="poi_diet_lactose_free_yes">Sen lactosa</string>
+	<string name="poi_diet_lactose_free_no">Dieta sen lactosa: non</string>
+	<string name="poi_diet_pescetarian_yes">Pescetariá</string>
+
+	<string name="poi_drive_in_no">Mercar no automóbil: non</string>
+	<string name="poi_drive_through_no">Servizo no automóbil: non</string>
+
+	<string name="poi_brewery_additional">Nome da cervexaría</string>
+	<string name="poi_microbrewery_yes">Si</string>
+	<string name="poi_microbrewery_no">Cervexaría artesá: non</string>
+
+	<string name="poi_delivery_yes">Servizo a domicilio: si</string>
+	<string name="poi_delivery_no">Servizo a domicilio: non</string>
+	<string name="poi_delivery_only">Só servizo a domicilio</string>
+
+	<string name="poi_second_hand_yes">Artigos de segunda mán</string>
+	<string name="poi_second_hand_no">Sen artigos de segunda mán</string>
+	<string name="poi_second_hand_only">Só artigos de segunda mán</string>
+
+	<string name="poi_service_parts">Partes</string>
+	<string name="poi_service_dealer">Venda</string>
+	<string name="poi_service_repair">Arranxo</string>
+	<string name="poi_service_repair_no">Non fan arranxos</string>
+	<string name="poi_service_electrical">Arranxo de automóbiles eléctricos</string>
+	<string name="poi_motorcycle_repair">Arranxo de motos</string>
+	<string name="poi_self_service_no">Non hai autoservizo</string>
+	<string name="poi_automated_no">Non automatizado</string>
+	<string name="poi_full_service_yes">Servizo completo</string>
+	<string name="poi_brushless_no">Vasoira xiratoria: non</string>
+	<string name="poi_car_wash_no">Lavadoiro de automóbiles: non</string>
+
+
+	<string name="poi_male_yes">Homes</string>
+	<string name="poi_male_no">Prohibido para homes</string>
+	<string name="poi_female_yes">Mulleres</string>
+	<string name="poi_female_no">Prohibido para mulleres</string>
+	<string name="poi_indoor_yes">Coberto</string>
+	<string name="poi_diaper_table_count">Cambiadoiro de cueiros</string>
+	<string name="poi_diaper_yes">Con cambiadoiro de cueiros</string>
+	<string name="poi_diaper_no">Sen cambiadoiro de cueiros</string>
+	<string name="poi_diaper_room">Habitación de cambiadoiro de cueiros</string>
+
+	<string name="poi_maxstay">Límite de tempo do aparcamento</string>
+
+	<string name="poi_vending_parking_tickets">Billetes de aparcamento</string>
+	<string name="poi_vending_cigarettes">Cigarros</string>
+	<string name="poi_vending_excrement_bags">Bolsas para feces</string>
+	<string name="poi_vending_drinks">Bebidas</string>
+	<string name="poi_vending_sweets">Doces</string>
+	<string name="poi_vending_parcel_pickup_mail_in">Instalación de paquetaría e correos</string>
+	<string name="poi_vending_condoms">Preservativos</string>
+	<string name="poi_vending_stamps">Selos</string>
+	<string name="poi_vending_food">Comida</string>
+	<string name="poi_vending_drinks_food">Comida e bebida</string>
+	<string name="poi_vending_fuel">Venda de combustíbel</string>
+	<string name="poi_vending_parcel_pickup">Instalación de paquetaría</string>
+	<string name="poi_vending_parcel_mail_in">Instalación de correos</string>
+	<string name="poi_vending_milk">Leite</string>
+	<string name="poi_vending_elongated_coin">Moeda alongada</string>
+	<string name="poi_vending_bread">Pan</string>
+	<string name="poi_vending_chewing_gums">Gomas de mascar</string>
+	<string name="poi_vending_toll">Billetes de portaxe ou peaxe</string>
+	<string name="poi_vending_tickets">Venda de billetes</string>
+	<string name="poi_vending_water">Venda de auga</string>
+	<string name="poi_vending_telephone_vouchers">Vales telefónicos</string>
+	<string name="poi_vending_animal_food">Comida para animais</string>
+	<string name="poi_vending_drinks_sweets">Bebidas e doces</string>
+	<string name="poi_vending_vouchers">Vales</string>
+	<string name="poi_vending_dvd">DVD</string>
+	<string name="poi_vending_candles">Candeas</string>
+	<string name="poi_vending_toys">Xoguetes</string>
+	<string name="poi_vending_ice_cream">Xeados</string>
+	<string name="poi_vending_sim_cards">Tarxetas SIM</string>
+
+	<string name="poi_branch">Sucursal ou cadea</string>
+
+	<string name="poi_memorial_war">Lembranza ou memorial de guerra</string>
+	<string name="poi_memorial_plaque">Placa</string>
+	<string name="poi_memorial_stone">Pedra</string>
+	<string name="poi_memorial_stele">Estela</string>
+	<string name="poi_memorial_bust">Busto</string>
+	<string name="poi_memorial_koshinto">Koshinto</string>
+	<string name="poi_memorial_blue_plaque">Placa azul</string>
+	<string name="poi_memorial_jizo">Jizo</string>
+	<string name="poi_memorial_cross">Cruceiro</string>
+	<string name="poi_memorial_vehicle">Vehículo</string>
+	<string name="poi_memorial_stolperstein">Stolpersteine</string>
+	<string name="poi_memorial_column">Columna</string>
+	<string name="poi_memorial_stupa">Estupa</string>
+	<string name="poi_memorial_prasat">Templo piramidal</string>
+	<string name="poi_memorial_fassade_decoration">Decoración da fronte</string>
+
+	<string name="poi_inscription">Inscrición</string>
+	<string name="poi_historic_quarry">Pedreira ou canteira histórica</string>
+
+	<string name="poi_resource_aggregate">Engadido</string>
+	<string name="poi_resource_antimony">Antimonio</string>
+	<string name="poi_resource_asbestos">Amianto</string>
+	<string name="poi_resource_basalt">Basalto</string>
+	<string name="poi_resource_bauxite">Bauxita</string>
+	<string name="poi_resource_beryl">Berilo</string>
+	<string name="poi_resource_bismuth">Bismuto</string>
+	<string name="poi_resource_chromite">Cromita</string>
+	<string name="poi_resource_clay">Arxila</string>
+	<string name="poi_resource_coal">Carbón</string>
+	<string name="poi_resource_copper">Cobre</string>
+	<string name="poi_resource_diamond">Diamante</string>
+	<string name="poi_resource_dimension_stone">Pedras grandes</string>
+	<string name="poi_resource_dolomite">Dolomita</string>
+	<string name="poi_resource_gas">Gas</string>
+	<string name="poi_resource_gold">Ouro</string>
+	<string name="poi_resource_graphite">Grafito</string>
+	<string name="poi_resource_gravel">Pedregullo</string>
+	<string name="poi_resource_gypsum">Xeso</string>
+	<string name="poi_resource_iron_ore">Mena de ferro</string>
+	<string name="poi_resource_lead">Chumbo</string>
+	<string name="poi_resource_lignite">Lignito</string>
+	<string name="poi_resource_limestone">Pedra calcaria</string>
+	<string name="poi_resource_marble">Mármore</string>
+	<string name="poi_resource_mercury">Azougue ou mercurio</string>
+	<string name="poi_resource_mica">Mica</string>
+	<string name="poi_resource_mineral_oil">Petróleo mineral</string>
+	<string name="poi_resource_nickel">Níquel</string>
+	<string name="poi_resource_oil">Petróleo</string>
+	<string name="poi_resource_opal">Ópalo</string>
+	<string name="poi_resource_peat">Turba</string>
+	<string name="poi_resource_radium">Radio</string>
+	<string name="poi_resource_ruby">Rubí</string>
+	<string name="poi_resource_rutile">Rútilo</string>
+	<string name="poi_resource_salt">Sal</string>
+	<string name="poi_resource_silica">Sílice</string>
+	<string name="poi_resource_silver">Prata</string>
+	<string name="poi_resource_slate_iron_ore_copper">Louxa;mena de ferro;cobre</string>
+	<string name="poi_resource_stone">Pedra</string>
+	<string name="poi_resource_tin">Estaño</string>
+	<string name="poi_resource_tuff">Tobo</string>
+	<string name="poi_resource_uranium">Uranio</string>
+	<string name="poi_resource_vanadium">Vanadio</string>
+	<string name="poi_resource_water">Auga</string>
+	<string name="poi_resource_zinc">Cinc</string>
+	<string name="poi_resource_zircon">Circón</string>
+
+	<string name="poi_wetland_wet_meadow">Pradaría humida</string>
+	<string name="poi_wetland_bog">Pantano</string>
+	<string name="poi_wetland_marsh">Marisma</string>
+	<string name="poi_wetland_reedbed">Canedo ou canaval</string>
+	<string name="poi_wetland_swamp">Lamazal</string>
+	<string name="poi_wetland_saltern">Salina</string>
+	<string name="poi_wetland_saltmarsh">Marisma salgada</string>
+	<string name="poi_wetland_mangrove">Mangleiral</string>
+	<string name="poi_wetland_string_bog">Cadea de humidais</string>
+	<string name="poi_wetland_fen">Humidal subterráneo</string>
+	<string name="poi_wetland_palsa_bog">Palsa</string>
+	<string name="poi_wetland_mud">Lameiro</string>
+
+	<string name="poi_beach_shingle">Croio</string>
+	<string name="poi_beach_rocky">Rochosa</string>
+
+	<string name="poi_chimney">Fumeira ou chaminea</string>
+	<string name="poi_palm">Palmeira</string>
+	<string name="poi_cypress">Alcipreste ou criprés</string>
+	<string name="poi_flagpole">Mastro da bandeira</string>
+
+	<string name="poi_bin_yes">Con cesto do lixo</string>
+	<string name="poi_bin_no">Sen cesto do lixo</string>
+
+	<string name="poi_shelter_type_picnic_shelter">Merendeiro</string>
+	<string name="poi_shelter_type_weather_shelter">Meteorolóxico</string>
+	<string name="poi_shelter_type_lean_to">Marquesiña</string>
+	<string name="poi_shelter_type_basic_hut">Cabana sinxela</string>
+	<string name="poi_shelter_type_building">Edificio</string>
+	<string name="poi_shelter_type_wildlife_hide">Observación agochada dos animais</string>
+	<string name="poi_shelter_type_rock_shelter">Refuxio da rocha</string>
+	<string name="poi_shelter_type_sun_shelter">Refuxio do sol</string>
+	<string name="poi_shelter_type_field_shelter">Refuxio do campo</string>
+	<string name="poi_internet_access_type_wlan">Wi-Fi</string>
+	<string name="poi_internet_access_type_wired">Por cabo</string>
+	<string name="poi_internet_access_type_no">Sen acceso á Internet</string>
+	<string name="poi_internet_access_type_yes">Con acceso á Internet</string>
+
+	<string name="poi_maxwidth">Amplo máximo</string>
+	<string name="poi_iata">Código IATA</string>
+	<string name="poi_icao">Código ICAO</string>
+	<string name="poi_faa">Código FAA</string>
+	
+	<string name="poi_width">Amplo</string>
+
+	<string name="poi_architect_name">Arquitecto</string>
+
+	<string name="poi_architecture_modern">Arquitectura: moderna</string>
+	<string name="poi_architecture_stalinist_neoclassicism">Arquitectura: neoclasicismo estalinista</string>
+	<string name="poi_architecture_eclectic">Arquitectura: ecléctica</string>
+	<string name="poi_architecture_new_objectivity">Arquitectura: nova obxectividade</string>
+	<string name="poi_architecture_contemporary">Arquitectura: contemporánea</string>
+	<string name="poi_architecture_constructivism">Arquitectura: constructivimo</string>
+	<string name="poi_architecture_umgebinde">Arquitectura: alemá</string>
+	<string name="poi_architecture_timber_frame">Arquitectura: estrutura de madeira</string>
+	<string name="poi_architecture_art_nouveau">Arquitectura: arte novo (art nouveau)</string>
+	<string name="poi_architecture_neoclassicism">Arquitectura: neoclasicismo</string>
+	<string name="poi_architecture_victorian">Arquitectura: vitoriana</string>
+	<string name="poi_architecture_classicism">Arquitectura: clasicismo</string>
+	<string name="poi_architecture_gothic">Arquitectura: gótica</string>
+	<string name="poi_architecture_oldrussian">Arquitectura: rusa antiga</string>
+	<string name="poi_architecture_postconstructivism">Arquitectura: post-constructivismo</string>
+	<string name="poi_architecture_wilhelminian_style">Arquitectura: estilo guillermenista</string>
+	<string name="poi_architecture_renaissance">Arquitectura: renascentista</string>
+	<string name="poi_architecture_romanesque">Arquitectura: románica</string>
+
+	<string name="poi_tunnel_waterway">Túnel fluvial</string>
+	<string name="poi_tunnel_car">Túnel da estrada</string>
+	<string name="poi_tunnel_pedestrian">Túnel peonil</string>
+	<string name="poi_tunnel_railway">Túnel ferroviario</string>
+	<string name="poi_bridge_car">Ponte da estrada</string>
+	<string name="poi_bridge_pedestrian">Ponte peonil</string>
+	<string name="poi_bridge_railway">Ponte ferroviaria</string>
+	<string name="poi_bridge_waterway">Ponte fluvial</string>
+	<string name="poi_bridge_structure_beam">Estrutura da ponte: viga</string>
+	<string name="poi_bridge_structure_simple_suspension">Estrutura da ponte: suspensión sinxela</string>
+	<string name="poi_bridge_structure_suspension">Estrutura da ponte: suspensión</string>
+	<string name="poi_bridge_structure_arch">Estrutura da ponte: arco</string>
+	<string name="poi_bridge_structure_truss">Estrutura da ponte: reticular</string>
+	<string name="poi_bridge_structure_floating">Estrutura da ponte: flotante</string>
+	<string name="poi_bridge_structure_humpback">Estrutura da ponte: gobelo ou xiba</string>
+	<string name="poi_bridge_structure_cable_stayed">Estrutura da ponte: atirantada</string>
+	<string name="poi_bridge_structure_boardwalk">Estrutura da ponte: pasarela</string>
+	<string name="poi_bridge_structure_simple_wooden">Estrutura da ponte: madeira sinxela</string>
+	<string name="poi_bridge_structure_viaduct">Estrutura da ponte: viaduto</string>
+	<string name="poi_bridge_structure_aqueduct">Estrutura da ponte: acueduto</string>
+	<string name="poi_bridge_structure_log">Estrutura da ponte: tronco</string>
+	<string name="poi_route_bus_ref">Bus</string>
+	<string name="poi_route_trolleybus_ref">Trolebus</string>
+	<string name="poi_route_tram_ref">Tranvía</string>
+	<string name="poi_route_train_ref">Tren</string>
+	<string name="poi_route_light_rail_ref">Tren lixeiro</string>
+	<string name="poi_route_monorail_ref">Monorraíl</string>
+	<string name="poi_route_funicular_ref">Funicular</string>
+	<string name="poi_route_ferry_ref">Ferri</string>
+	<string name="poi_route_subway_ref">Metro</string>
+
+	<string name="poi_route_railway_ref">Liña ferroviaria</string>
+
+	<string name="poi_historic_yes">Atracción histórica</string>
+	<string name="poi_shop_additional_yes">Con tenda</string>
+
+	<string name="poi_service_bicycle_retail_yes">Venda</string>
+	<string name="poi_service_bicycle_repair_yes">Arranxo</string>
+	<string name="poi_service_bicycle_rental_yes">Aluguer</string>
+	<string name="poi_service_bicycle_pump_yes">Inchadoiro</string>
+	<string name="poi_service_bicycle_diy_yes">Ferramentas para o autoarranxo</string>
+	<string name="poi_service_bicycle_cleaning_yes">Limpeza</string>
+	<string name="poi_service_bicycle_chaintool_yes">Ferramenta para as cadeas</string>
+	<string name="poi_service_bicycle_charging_no">Cargador eléctrico: non</string>
+	<string name="poi_wildlife_hide">Observatorio de vida salvaxe</string>
+
+	<string name="poi_training_language">Adestramento: lingua</string>
+	<string name="poi_training_music">Adestramento: música</string>
+	<string name="poi_training_dance">Adestramento: danza</string>
+	<string name="poi_training_sport">Adestramento: deporte</string>
+	<string name="poi_training_art">Adestramento: arte</string>
+	<string name="poi_training_cooking">Adestramento: cociña</string>
+	<string name="poi_training_computer">Adestramento: informática</string>
+	<string name="poi_training_yoga">Adestramento: ioga</string>
+	<string name="poi_training_martial_art">Adestramento: artes marciais</string>
+	<string name="poi_training_aviation">Adestramento: aviación</string>
+	<string name="poi_training_hairdressing">Adestramento: perrucaría</string>
+
+	<string name="poi_monument_yes">Monumento</string>
+
+	<string name="poi_note">Nota</string>
+	<string name="poi_watering_place">Augada</string>
+	<string name="poi_animal_boarding">Aloxamento dos animais</string>
+	<string name="poi_elevator_yes">Con elevadoiro</string>
+	<string name="poi_elevator_no">Sen elevadoiro</string>
+
+	<string name="poi_technical_monument">Monumento técnico</string>
+
+	<string name="poi_office_camping">Oficina do campamento</string>
+	<string name="poi_model_aerodrome">Aeródromo a escala</string>
+	<string name="poi_guide">Oficina do guía</string>
+	<string name="poi_quango">ONG case autónoma</string>
+	<string name="poi_cooperative">Oficina da cooperativa</string>
+	<string name="poi_office_forestry">Oficina forestal</string>
+	<string name="poi_logistics">Oficina loxística</string>
+	<string name="poi_parish">Oficina parroquial</string>
+	<string name="poi_fuel_91ul">Combustíbel 91UL</string>
+	<string name="poi_fuel_100ll">Combustíbel 100LL</string>
+	<string name="poi_fuel_autogas">Autogas</string>
+	<string name="poi_fuel_jeta1">Combustíbel Jet A-1</string>
+	<string name="poi_fuel_adblue">Combustíbel AdBlue</string>
+
+	<string name="poi_fuel_wood">Combustíbel: madeira</string>
+	<string name="poi_fuel_charcoal">Combustíbel: carbón vexetal</string>
+	<string name="poi_fuel_coal">Combustíbel: carbón</string>
+
+	<string name="poi_street_lamp">Lámpada da rúa</string>
+
+	<string name="poi_escape_lane">Camiño de emerxencia</string>
+
+	<string name="poi_crop_rice">Cultivo: arroz</string>
+	<string name="poi_crop_grass">Cultivo: céspede</string>
+	<string name="poi_crop_corn">Cultivo: millo</string>
+	<string name="poi_crop_cereal">Cultivo: cereais</string>
+	<string name="poi_crop_sugarcane">Cultivo: cana do azucre</string>
+	<string name="poi_crop_wheat">Cultivo: trigo</string>
+	<string name="poi_crop_soy">Cultivo: soia</string>
+	<string name="poi_crop_vegetables">Cultivo: verduras</string>
+	<string name="poi_crop_hop">Cultivo: lúpulo</string>
+	<string name="poi_crop_rape">Cultivo: colza</string>
+	<string name="poi_crop_beet">Cultivo: remolacha</string>
+	<string name="poi_crop_lavender">Cultivo: lavanda</string>
+	<string name="poi_crop_tea">Cultivo: té</string>
+	<string name="poi_crop_poultry">Cultivo: avícola</string>
+	<string name="poi_crop_sunflower">Cultivo: xirasois</string>
+	<string name="poi_crop_raspberry">Cultivo: framboesas</string>
+	<string name="poi_crop_tobacco">Cultivo: tabaco</string>
+	<string name="poi_crop_strawberry">Cultivo: amorodo ou morote</string>
+	<string name="poi_crop_vegetables_flowers">Cultivo: verduras, flores</string>
+	<string name="poi_crop_cassava">Cultivo: mandioca</string>
+	<string name="poi_crop_cranberry">Cultivo: arandos</string>
+	<string name="poi_crop_asparagus">Cultivo: esparragueira</string>
+	<string name="poi_crop_flowers">Cultivo: flores</string>
+
+	<string name="poi_surveillance_indoor">Vixiancia: interior</string>
+	<string name="poi_clothes_women">Muller</string>
+	<string name="poi_clothes_underwear">Roupa interior</string>
+	<string name="poi_clothes_men">Home</string>
+	<string name="poi_clothes_wedding">Vestidos das noivas</string>
+	<string name="poi_clothes_sports">Deportes</string>
+	<string name="poi_clothes_babies">Meniños</string>
+	<string name="poi_clothes_denim">Vaqueiros</string>
+	<string name="poi_clothes_workwear">Vestiario de traballo</string>
+	<string name="poi_clothes_hats">Chapeus ou sombreiros</string>
+	<string name="poi_clothes_fur">Peles</string>
+	<string name="poi_clothes_leather">Coiros</string>
+	<string name="poi_clothes_costumes">Disfraces</string>
+	<string name="poi_clothes_traditional">Tradicional</string>
+	<string name="poi_clothes_suits">Ternos ou traxes</string>
+	<string name="poi_clothes_maternity">Maternidade</string>
+	<string name="poi_clothes_vintage">Antiga</string>
+	<string name="poi_clothes_oversize">Talles grandes</string>
+	<string name="poi_clothes_schoolwear">Escolar</string>
+	<string name="poi_clothes_swimwear">Traxes de baño</string>
+	<string name="poi_clothes_socks">Meias e calcetíns</string>
+	<string name="poi_clothes_shirts">Camisolas</string>
+	<string name="poi_clothes_dance">Baile ou danza</string>
+	<string name="poi_historic_milestone">Fito histórico</string>
+
+	<string name="poi_shoes_children">Nenos</string>
+	<string name="poi_shoes_women">Mulleres</string>
+	<string name="poi_shoes_sport">Deportes</string>
+	<string name="poi_shoes_men">Homes</string>
+	<string name="poi_shoes_orthopedic">Ortopédico</string>
+
+	<string name="poi_historic_manor">Pazo histórico</string>
+	<string name="poi_massage_thai">Tailandés</string>
+	<string name="poi_massage_sexual">Sexual</string>
+	<string name="poi_massage_chinese">Chino</string>
+	<string name="poi_massage_therapeutic">Terapéutico</string>
+
+	<string name="poi_massage_yes">Servizo de masaxes</string>
+	<string name="poi_sauna_yes">Servizo de sauna</string>
+	<string name="poi_solarium_yes">Servizo de solario</string>
+
+	<string name="poi_tents_yes">Permitidas</string>
+	<string name="poi_tents_no">Tendas non permitidas</string>
+	<string name="poi_openfire_yes">Permitido acender lume</string>
+	<string name="poi_openfire_no">Prohibido acender lume</string>
+	<string name="poi_backcountry_no">Non</string>
+	<string name="poi_scout_no">Campamento de exploradores: non</string>
+	<string name="poi_group_only_no">Só grupos: non</string>
+	<string name="poi_washing_machine_no">Lavadora: non</string>
+	<string name="poi_shower_no">Ducha: non</string>
+	<string name="poi_shower_hot">Ducha: quente</string>
+	<string name="poi_shower_cold">Ducha: fría</string>
+	<string name="poi_shower_indoor">Ducha: interior</string>
+	<string name="poi_caravans_no">Caravanas: non</string>
+	<string name="poi_impromptu_no">Improvisado: non</string>
+	<string name="poi_sanitary_dump_station_no">Instalación de refugallos sanitarios: non</string>
+	<string name="poi_power_supply_no">Fonte de enerxía: non</string>
+	<string name="poi_power_supply_cee_17_blue">Fonte de enerxía (enchufe): CEE 17 azul</string>
+	<string name="poi_power_supply_cee_7_4">Fonte de enerxía (enchufe): CEE 7/4</string>
+	<string name="poi_power_supply_cee_7_5">Fonte de enerxía (enchufe): CEE 7/5</string>
+	<string name="poi_power_supply_nema_5_15">Fonte de enerxía (enchufe): NEMA 5-15</string>
+
+	<string name="poi_capacity_tents">Carpas máximas</string>
+	<string name="poi_capacity_caravans">Caravanas máximas</string>
+	<string name="poi_dog_yes">Permitidos cans</string>
+	<string name="poi_dog_no">Prohibidos cans</string>
+
+	<string name="poi_refugee_yes">Servizos para os refuxiados</string>
+	<string name="poi_refugee_no">Refuxiados: non</string>
+
+	<string name="poi_social_facility_group_home">Grupo residencial</string>
+	<string name="poi_social_facility_assisted_living">Vida asistida</string>
+	<string name="poi_social_facility_outreach">Divulgación</string>
+	<string name="poi_social_facility_food_bank">Banco de alimentos</string>
+	<string name="poi_social_facility_shelter">Refuxio</string>
+	<string name="poi_social_facility_ambulatory_care">Asistencia sanitaria</string>
+	<string name="poi_social_facility_workshop">Taller</string>
+	<string name="poi_social_facility_day_care">Asistencia de día</string>
+
+	<string name="poi_social_facility_for_child">Crianzas</string>
+	<string name="poi_social_facility_for_orphan">Orfos</string>
+	<string name="poi_social_facility_for_disabled">Persoas con discapacidade</string>
+	<string name="poi_social_facility_for_mental_health">Persoas con desordes mentais</string>
+	<string name="poi_social_facility_for_juvenile">Xoves</string>
+	<string name="poi_social_facility_for_homeless">Persoas sen lar</string>
+	<string name="poi_social_facility_for_migrant">Migrantes</string>
+	<string name="poi_social_facility_for_drug_addicted">Dependentes ás drogas</string>
+	<string name="poi_social_facility_for_unemployed">Desempregados</string>
+	<string name="poi_social_facility_for_diseased">Doentes</string>
+	<string name="poi_social_facility_for_child_juvenile">Nenos xoves</string>
+
+	<string name="poi_theatre_genre_philharmonic">Filarmónica</string>
+	<string name="poi_theatre_genre_musical">Musical</string>
+	<string name="poi_theatre_genre_drama">Drama</string>
+	<string name="poi_theatre_genre_opera">Ópera</string>
+	<string name="poi_theatre_genre_puppet">Monicreques ou monifates</string>
+	<string name="poi_theatre_genre_comedy">Comedia</string>
+	<string name="poi_theatre_genre_chamber_music">Música de cámara</string>
+	<string name="poi_theatre_genre_marionette">Monicreques ou monifates</string>
+	<string name="poi_theatre_genre_ballet">Balé</string>
+	<string name="poi_theatre_genre_shadow_play">Xogo de sombras</string>
+
+	<string name="poi_bandstand">Orquestra</string>
+	<string name="poi_kiln">Forno</string>
+	<string name="poi_product_brick">Produto: ladrillo</string>
+	<string name="poi_product_quicklime">Produto: cal viva</string>
+	<string name="poi_product_leather">Produto: coiro</string>
+	<string name="poi_product_lime">Produto: cal</string>
+	<string name="poi_product_beer">Produto: cervexa</string>
+	<string name="poi_product_charcoal">Produto: carbón vexetal</string>
+	<string name="poi_product_meat">Produto: carne</string>
+
+	<string name="poi_wheelchair_description">Descrición para usuarios nunha cadeira de rodas</string>
+	<string name="poi_blind_description">Descrición para cegos</string>
+	<string name="poi_deaf_description">Descrición para xordos</string>
+
+	<string name="poi_highway_steps">Escadas</string>
+	<string name="poi_handrail_no">Varanda: non</string>
+	<string name="poi_ramp_no">Rampla: non</string>
+	<string name="poi_ramp_wheelchair_no">Rampla para cadeiras de rodas: non</string>
+	<string name="poi_ramp_stroller_no">Rampla para carriños: non</string>
+	<string name="poi_ramp_luggage_no">Rampla para bagaxes: non</string>
+	<string name="poi_step_count">Cantidade de chanzos</string>
+	<string name="poi_xmas_location">Nadal: localización</string>
+	<string name="poi_xmas_url">Nadal: páxina web</string>
+
+	<string name="poi_cuisine_pizza">Pizzas</string>
+	<string name="poi_cuisine_burger">Hamburguesas</string>
+	<string name="poi_cuisine_kebab">Kebabs</string>
+	<string name="poi_cuisine_doner">Döner kebab (shawarma)</string>
+	<string name="poi_cuisine_chicken">Polos</string>
+	<string name="poi_cuisine_ice_cream">Xeados</string>
+	<string name="poi_cuisine_sushi">Sushis</string>
+	<string name="poi_cuisine_fish_and_chips">Peixes fritidos e patacas fritidas</string>
+	<string name="poi_cuisine_seafood">Mariscos</string>
+	<string name="poi_cuisine_barbecue">Churrasco</string>
+	<string name="poi_cuisine_noodle">Tallaríns</string>
+	<string name="poi_cuisine_donut">Rosquillas</string>
+	<string name="poi_cuisine_ramen">Ramens</string>
+	<string name="poi_cuisine_crepe">Filloas ou creps</string>
+	<string name="poi_cuisine_breakfast">Almorzos</string>
+	<string name="poi_cuisine_beef_bowl">Gyūdon</string>
+	<string name="poi_cuisine_steak">Biestés ou filetes</string>
+	<string name="poi_cuisine_tapas">Tapas</string>
+	<string name="poi_cuisine_gastropub">Gastrobar</string>
+	<string name="poi_cuisine_heuriger">Heuriger</string>
+	<string name="poi_cuisine_curry">Curri</string>
+	<string name="poi_cuisine_buschenschank">Buschenschank</string>
+	<string name="poi_cuisine_grill">Grella</string>
+	<string name="poi_cuisine_bagel">Bagel</string>
+	<string name="poi_cuisine_diner">Ceas</string>
+	<string name="poi_cuisine_sausage">Salchichas</string>
+	<string name="poi_cuisine_cake">Doces e pasteis</string>
+	<string name="poi_cuisine_pancake">Panquiñas</string>
+	<string name="poi_cuisine_pasta">Pastas</string>
+	<string name="poi_cuisine_fast_food">Comida rápida</string>
+	<string name="poi_cuisine_juice">Zumes</string>
+	<string name="poi_cuisine_soba">Soba</string>
+	<string name="poi_cuisine_fine_dining">Alta cociña</string>
+	<string name="poi_cuisine_tea">Tés</string>
+	<string name="poi_cuisine_tea_shop">Tenda de tés</string>
+	<string name="poi_cuisine_soup">Sopas</string>
+	<string name="poi_cuisine_pie">Tortas</string>
+	<string name="poi_cuisine_hotdog">Hotdogs</string>
+	<string name="poi_cuisine_deli">Delicatessen</string>
+	<string name="poi_cuisine_salad">Ensaladas</string>
+	<string name="poi_cuisine_frozen_yogurt">Iogures xeados</string>
+	<string name="poi_cuisine_fried_food">Comida fritida</string>
+	<string name="poi_cuisine_savory_pancakes">Panquiñas salgadas</string>
+	<string name="poi_cuisine_bistro">Bistró</string>
+	<string name="poi_cuisine_bakery">Panadaría ou tafona</string>
+	<string name="poi_cuisine_couscous">Cuscús</string>
+	<string name="poi_cuisine_fried_chicken">Polo fritido</string>
+	<string name="poi_cuisine_dessert">Sobremesas</string>
+	<string name="poi_cuisine_canteen">Cantina</string>
+	<string name="poi_cuisine_tacos">Tacos</string>
+	<string name="poi_cuisine_piadina">Piadinas</string>
+	<string name="poi_cuisine_falafel">Falafeles</string>
+	<string name="poi_cuisine_smoothie">Smoothies</string>
+	<string name="poi_cuisine_souvlaki">Souvlakis</string>
+	<string name="poi_cuisine_snack">Petiscos</string>
+	<string name="poi_cuisine_yogurt">Iogures</string>
+	<string name="poi_cuisine_gyros">Gyros</string>
+	<string name="poi_cuisine_empanada">Empanadas</string>
+	<string name="poi_cuisine_crepes">Filloas ou creps</string>
+	<string name="poi_cuisine_yakiniku">Yakiniku</string>
+	<string name="poi_cuisine_suki">Sukis</string>
+	<string name="poi_cuisine_udon">Udons</string>
+	<string name="poi_cuisine_brasserie">Brasaría</string>
+	<string name="poi_cuisine_bubble_tea">Té de gurgullas</string>
+	<string name="poi_cuisine_yakitori">Yakitori</string>
+	<string name="poi_cuisine_sagardotegia">Sidraría</string>
+	<string name="poi_cuisine_meat">Carnes</string>
+	<string name="poi_cuisine_wings">Ás</string>
+	<string name="poi_cuisine_waffle">Gofres</string>
+	<string name="poi_cuisine_chocolate">Chocolates</string>
+	<string name="poi_cuisine_wine">Viños</string>
+	<string name="poi_cuisine_potato">Patacas</string>
+	<string name="poi_cuisine_brunch">Almorzo e xantar (brunch)</string>
+	<string name="poi_cuisine_sub">Sándwich submarino</string>
+	<string name="poi_cuisine_pita">Pan de pita</string>
+	<string name="poi_cuisine_fondue">Fundís</string>
+	<string name="poi_cuisine_baguette">Baguetes</string>
+	<string name="poi_cuisine_pastel">Pasteis</string>
+	<string name="poi_cuisine_burrito">Burritos</string>
+	<string name="poi_cuisine_teriyaki">Teriyakis</string>
+	<string name="poi_cuisine_shawarma">Shawarmas</string>
+
+	<string name="poi_cuisine_regional">Rexional</string>
+	<string name="poi_cuisine_italian">Italiana</string>
+	<string name="poi_cuisine_chinese">Chinesa</string>
+	<string name="poi_cuisine_mexican">Mexicana</string>
+	<string name="poi_cuisine_japanese">Xaponesa</string>
+	<string name="poi_cuisine_german">Alemá</string>
+	<string name="poi_cuisine_indian">India</string>
+	<string name="poi_cuisine_american">Americana</string>
+	<string name="poi_cuisine_asian">Asiática</string>
+	<string name="poi_cuisine_french">Francesa</string>
+	<string name="poi_cuisine_greek">Grega</string>
+	<string name="poi_cuisine_thai">Tailandesa</string>
+	<string name="poi_cuisine_international">Internacional</string>
+	<string name="poi_cuisine_turkish">Turca</string>
+	<string name="poi_cuisine_vietnamese">Vietnamita</string>
+	<string name="poi_cuisine_korean">Coreana</string>
+	<string name="poi_cuisine_mediterranean">Mediterránea</string>
+	<string name="poi_cuisine_bavarian">Bavaresa</string>
+	<string name="poi_cuisine_lebanese">Libanesa</string>
+	<string name="poi_cuisine_russian">Rusa</string>
+	<string name="poi_cuisine_filipino">Filipina</string>
+	<string name="poi_cuisine_portuguese">Portuguesa</string>
+	<string name="poi_cuisine_georgian">Xeorxiana</string>
+	<string name="poi_cuisine_polish">Polonesa</string>
+	<string name="poi_cuisine_brazilian">Brasileira</string>
+	<string name="poi_cuisine_arab">Árabe</string>
+	<string name="poi_cuisine_danish">Dinamarquesa</string>
+	<string name="poi_cuisine_indonesian">Indonesa</string>
+	<string name="poi_cuisine_african">Africana</string>
+	<string name="poi_cuisine_caribbean">Caribeña</string>
+	<string name="poi_cuisine_argentinian">Arxentina</string>
+	<string name="poi_cuisine_balkan">Balcanesa</string>
+	<string name="poi_cuisine_peruvian">Peruana</string>
+	<string name="poi_cuisine_croatian">Croata</string>
+	<string name="poi_cuisine_bolivian">Boliviana</string>
+	<string name="poi_cuisine_malagasy">Malgaxe</string>
+	<string name="poi_cuisine_persian">Persa</string>
+	<string name="poi_cuisine_moroccan">Marroquina</string>
+	<string name="poi_cuisine_austrian">Austríaca</string>
+	<string name="poi_cuisine_malaysian">Malaia</string>
+	<string name="poi_cuisine_irish">Irlandesa</string>
+	<string name="poi_cuisine_ethiopian">Etíope</string>
+	<string name="poi_cuisine_hungarian">Maxiar ou húngara</string>
+	<string name="poi_cuisine_lao">Laosiana</string>
+	<string name="poi_cuisine_european">Europea</string>
+	<string name="poi_cuisine_uzbek">Uzbeca</string>
+	<string name="poi_cuisine_czech">Checa</string>
+	<string name="poi_cuisine_cuban">Cubana</string>
+	<string name="poi_cuisine_british">Británica</string>
+	<string name="poi_cuisine_latin_american">Latinoamericana</string>
+	<string name="poi_cuisine_nepalese">Nepalesa</string>
+	<string name="poi_cuisine_mongolian">Mongola</string>
+	<string name="poi_cuisine_middle_eastern">Oriente medio</string>
+	<string name="poi_cuisine_ukrainian">Ucraína</string>
+	<string name="poi_cuisine_afghan">Afgá</string>
+	<string name="poi_cuisine_belgian">Belga</string>
+	<string name="poi_cuisine_basque">Vasca</string>
+	<string name="poi_cuisine_swiss">Helvérica ou suíza</string>
+	<string name="poi_cuisine_cantonese">Cantonesa</string>
+	<string name="poi_cuisine_swedish">Sueca</string>
+	<string name="poi_cuisine_jamaican">Xamaicana</string>
+	<string name="poi_cuisine_armenian">Arménica</string>
+	<string name="poi_cuisine_hawaiian">Hawaiana</string>
+	<string name="poi_cuisine_english">Inglesa</string>
+	<string name="poi_cuisine_pakistani">Paquistaní</string>
+	<string name="poi_cuisine_taiwanese">Taiwanesa</string>
+	<string name="poi_cuisine_tex_mex">Tex-mex</string>
+	<string name="poi_cuisine_dutch">Holandesa</string>
+	<string name="poi_cuisine_syrian">Siria</string>
+	<string name="poi_cuisine_australian">Australiana</string>
+	<string name="poi_cuisine_cajun">Caxún</string>
+	<string name="poi_cuisine_egyptian">Exipcíaca</string>
+	<string name="poi_cuisine_senegalese">Senegalesa</string>
+	<string name="poi_cuisine_jewish">Xudiaca</string>
+	<string name="poi_cuisine_bulgarian">Búlgara</string>
+	<string name="poi_cuisine_tibetan">Tibetana</string>
+
+	<string name="poi_party">Artigos de festas</string>
+	<string name="poi_electrical">Tenda de electricidade</string>
+	<string name="poi_locksmith">Zarralleiro</string>
+	<string name="poi_lighting">Materiais da iluminación</string>
+	<string name="poi_gambling">Sala de apostas</string>
+
+	<string name="poi_gambling_pachinko">Pachinko</string>
+	<string name="poi_gambling_slot_machines">Comecartos</string>
+	<string name="poi_gambling_betting">Apostas</string>
+	<string name="poi_gambling_bingo">Bingo</string>
+
+	<string name="poi_e_cigarette">Tenda de cigarros electrónicos</string>
+
+	<string name="poi_locomotive">Locomotora</string>
+
+	<string name="poi_nutrition_supplements">Sumplementos nutricionais</string>
+	<string name="poi_photo_studio">Estudio de fotografía</string>
+
+	<string name="poi_cliff">Cantil</string>
+
+	<string name="poi_animal_keeping">Refuxio de animais</string>
+	<string name="poi_animal_keeping_horse">Refuxio: cabalos</string>
+	<string name="poi_animal_keeping_sheep">Refuxio: ovellas</string>
+	<string name="poi_tower_construction_lattice">Construción: celosía</string>
+	<string name="poi_tower_construction_freestanding">Construción: independente</string>
+	<string name="poi_tower_construction_dish">Construción: parabólica</string>
+	<string name="poi_tower_construction_dome">Construción: cúpula</string>
+	<string name="poi_tower_construction_concealed">Construción: agochada</string>
+
+	<string name="poi_railway_yard">Estación de trens de mercadorías</string>
+
+	<string name="poi_step_condition_even">Condicións dos chanzos: boas</string>
+	<string name="poi_step_condition_uneven">Condicións dos chanzos: malas</string>
+	<string name="poi_step_condition_rough">Condicións dos chanzos: pésimas</string>
+
+	<string name="poi_cairn">Morea de pedras</string>
+
+	<string name="poi_defibrillator">Desfibrilador</string>
+	<string name="poi_historic_civilization_ancient_roman">Civilización: Roma antiga (do 753 a.C. ó 284 d.C.)</string>
+	<string name="poi_historic_civilization_nuragic">Civilización: nurague (do século XVIII a.C. ó II d.C.)</string>
+	<string name="poi_historic_civilization_etruscan">Civilização: etrusca (do século XII ó VI a.C.)</string>
+	<string name="poi_coworking_space">Espazo de traballo conxunto (coworking)</string>
+
+	<string name="poi_charging_station_output">Saída da estación de carrega</string>
+
+	<string name="poi_map_size_site">Tamaño do mapa: lugar</string>
+	<string name="poi_map_size_city">Tamaño do mapa: cidade</string>
+	<string name="poi_map_size_region">Tamaño do mapa: rexión</string>
+
+	<string name="poi_charging_station_filter">Estación de carrega</string>
+
+	<string name="poi_depot">Depósito</string>
+
+	<string name="poi_letter_box">Caixa das postais</string>
+	<string name="poi_post_street">Rúa</string>
+	<string name="poi_post_housenumber">Número da casa</string>
+	<string name="poi_post_flats">Apartamento</string>
+
+	<string name="poi_payment_centre">Centro de pagamentos</string>
+	<string name="poi_money_transfer">Transferencia de cartos</string>
+
+	<string name="poi_ref_post">Código postal</string>
+
+	<string name="poi_climbing_sport_no">Deportiva: non</string>
+	<string name="poi_climbing_boulder_no">Escalada en bloque: non</string>
+	<string name="poi_climbing_toprope_no">Moulinette: non</string>
+	<string name="poi_climbing_trad_no">Tradicional: non</string>
+	<string name="poi_climbing_ice_no">Xeo: non</string>
+	<string name="poi_climbing_mixed_no">Mesturado: non</string>
+	<string name="poi_climbing_deepwater_no">Psicobloc: non</string>
+
+	<string name="poi_climbing_length">Lonxitude da escalada</string>
+	<string name="poi_climbing_length_min">Lonxitude mínima da escalada</string>
+	<string name="poi_climbing_length_max">Lonxitude máxima da escalada</string>
+	<string name="poi_climbing_rock_limestone">Escalada na rocha: pedra calcaria</string>
+	<string name="poi_climbing_rock_granite">Escalada na rocha: granito</string>
+	<string name="poi_climbing_rock_quartzite">Escalada na rocha: cuarcita</string>
+	<string name="poi_climbing_rock_gneiss">Escalada na rocha: gneis</string>
+	<string name="poi_climbing_rock_porphyry">Escalada na rocha: pórfiro</string>
+	<string name="poi_climbing_quality_solid">Escalada na rocha: sólido</string>
+	<string name="poi_climbing_quality_fragile">Calidade da escalada: feble</string>
+	<string name="poi_climbing_bolted_no">Ancoraxes fixas: non</string>
+	<string name="poi_climbing_orientation_n">Orientación da parede: N</string>
+	<string name="poi_climbing_orientation_ne">Orientación da parede: NL</string>
+	<string name="poi_climbing_orientation_e">Orientación da parede: L</string>
+	<string name="poi_climbing_orientation_se">Orientación da parede: SL</string>
+	<string name="poi_climbing_orientation_s">Orientación da parede: S</string>
+	<string name="poi_climbing_orientation_sw">Orientación da parede: SO</string>
+	<string name="poi_climbing_orientation_w">Orientación da parede: O</string>
+	<string name="poi_climbing_orientation_nw">Orientación da parede: NO</string>
+	<string name="poi_climbing_summit_log_no">Rexistro da escalada no cumio: non</string>
+	<string name="poi_climbing_routes">Roteiros de escalada</string>
+
+	<string name="poi_circumference">Circunferencia</string>
+	<string name="poi_diameter_crown">Diámetro da coroa</string>
+
+	<string name="poi_frozen_food">Comida conxelada</string>
+
+	<string name="poi_agrarian">Tenda agrícola</string>
+
+	<string name="poi_shop_fireplace">Tenda de chemineas e lareiras</string>
+
+	<string name="poi_shop_boat">Tenda de embarcacións</string>
+
+	<string name="poi_cannabis">Tenda de cánnabis</string>
+
+	<string name="poi_socket_cee_blue_yes">CEE azul</string>
+	<string name="poi_socket_cee_red_16a_yes">CEE vermella 16A</string>
+	<string name="poi_socket_cee_red_32a_yes">CEE vermella 32A</string>
+	<string name="poi_socket_cee_red_64a_yes">CEE vermella 64A</string>
+	<string name="poi_socket_cee_red_125a_yes">CEE vermella 125A</string>
+	<string name="poi_socket_chademo_yes">CHAdeMO</string>
+	<string name="poi_socket_tesla_standard_yes">Tesla estándar</string>
+	<string name="poi_socket_tesla_supercharger_yes">Tesla Supercharger</string>
+	<string name="poi_socket_tesla_roadster_yes">Tesla Roadster</string>
+	<string name="poi_socket_nema_5_15_yes">NEMA 5-15R</string>
+	<string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
+	<string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
+	<string name="poi_socket_nema_14_50_yes">NEMA 14-50</string>
+	<string name="poi_socket_schuko_yes">Schuko</string>
+	<string name="poi_socket_bs1363_yes">BS 1363</string>
+	<string name="poi_socket_as3112_yes">AS/NZS 3112</string>
+
+	<string name="poi_socket_chademo_output_high">Alta</string>
+	<string name="poi_socket_chademo_output_medium">Media</string>
+	<string name="poi_socket_chademo_output_low">Baixa</string>
+	<string name="poi_socket_type2_output_high">Alta</string>
+	<string name="poi_socket_type2_output_medium">Media</string>
+	<string name="poi_socket_type2_output_low">Baixa</string>
+	<string name="poi_socket_type2_combo_output_high">Alta</string>
+	<string name="poi_socket_type2_combo_output_medium">Media</string>
+	<string name="poi_socket_type2_combo_output_low">Baixa</string>
+	<string name="poi_socket_type3_output_high">Alta</string>
+	<string name="poi_socket_type3_output_medium">Media</string>
+	<string name="poi_socket_type3_output_low">Baixa</string>
+	<string name="poi_socket_cee_blue_output_high">Alta</string>
+	<string name="poi_socket_cee_blue_output_medium">Media</string>
+	<string name="poi_socket_cee_blue_output_low">Baixa</string>
+	<string name="poi_socket_schuko_output_high">Alta</string>
+	<string name="poi_socket_schuko_output_medium">Media</string>
+	<string name="poi_socket_schuko_output_low">Baixa</string>
+
+	<string name="poi_flooring">Tenda de chans</string>
+	<string name="poi_pottery">Oleiro</string>
+
+	<string name="poi_whitewater_rapid_name">Nome dos rápidos do río</string>
+
+	<string name="poi_outpost">Punto da entrega da tenda</string>
+
+	<string name="poi_water_utility">Ofinina do servizo das augas</string>
+
+	<string name="poi_adult_gaming_centre">Centro de xogos para adultos</string>
+
+	<string name="poi_service_vehicle_car_repair_yes">Teller mecánico</string>
+	<string name="poi_service_vehicle_oil_change_yes">Troco do aceite</string>
+	<string name="poi_service_vehicle_used_car_sales_yes">Venda de automóbiles usados</string>
+	<string name="poi_service_vehicle_brakes_yes">Freos</string>
+	<string name="poi_service_vehicle_new_car_sales_yes">Venda de automóbiles novos</string>
+	<string name="poi_service_vehicle_diagnostics_yes">Diagnósticos</string>
+	<string name="poi_service_vehicle_car_parts_yes">Pezas dos automóbiles</string>
+	<string name="poi_service_vehicle_batteries_yes">Baterías</string>
+	<string name="poi_service_vehicle_air_conditioning_yes">Ar acondicionado</string>
+	<string name="poi_service_vehicle_body_repair_yes">Arranxo da carrozaría</string>
+	<string name="poi_service_vehicle_electrical_yes">Eléctrico</string>
+	<string name="poi_service_vehicle_wheels_yes">Rodas</string>
+	<string name="poi_service_vehicle_glass_yes">Vidro</string>
+	<string name="poi_service_vehicle_truck_repair_yes">Taller mecánico para camións</string>
+	<string name="poi_service_vehicle_muffler_yes">Silenciador</string>
+	<string name="poi_service_vehicle_alignment_yes">Aliñamento</string>
+	<string name="poi_service_vehicle_transmission_repair_yes">Arranxo da transmisión</string>
+	<string name="poi_service_vehicle_motor_yes">Motor</string>
+	<string name="poi_service_vehicle_insurance_yes">Seguro</string>
+	<string name="poi_service_vehicle_tyres_yes">Pneumáticos</string>
+
+	<string name="poi_aerialway_zip_line">Tirolesa</string>
+
+	<string name="poi_climbing_adventure">Aventura da escalada</string>
+
+	<string name="poi_via_ferrata">Vía ferrata</string>
+	<string name="poi_cable_number">Número do cabo</string>
+	<string name="poi_via_ferrata_scale">Dificuldade</string>
+
+	<string name="poi_glacier_type_icecap">Capa de xeo</string>
+	<string name="poi_glacier_type_icefield">Campo de xeo</string>
+	<string name="poi_glacier_type_plateau">Chaira</string>
+	<string name="poi_glacier_type_valley">Val</string>
+	<string name="poi_glacier_type_outlet">Saída</string>
+	<string name="poi_glacier_type_tidewater">Costeiro</string>
+	<string name="poi_glacier_type_mountain">Montaña</string>
+	<string name="poi_glacier_type_hanging">Pendurado</string>
+	<string name="poi_glacier_type_icefall">Fervenza de xeo</string>
+	<string name="poi_glacier_type_rock">Rocha</string>
+	<string name="poi_glacier_type_shelf">Plataforma</string>
+	<string name="poi_glacier_type_remnant">Remanencia</string>
+	<string name="poi_glacier_type_ice_tongue">Lingua de xeo</string>
+
+	<string name="poi_glacier_ele_top">Punto máis alto</string>
+	<string name="poi_glacier_ele_bottom">Punto máis baixo</string>
+	<string name="poi_glacier_slope">Pendente media</string>
+
+	<string name="poi_checkpoint_hiking">Posto de control do sendeirismo</string>
+	<string name="poi_checkpoint_type_stamp">Posto de selado</string>
+	<string name="poi_checkpoint_type_code">Código</string>
+	<string name="poi_checkpoint_type_notebook">Caderno</string>
+	<string name="poi_checkpoint_type_needler">Perforadora</string>
+	<string name="poi_checkpoint_type_electronic">Electrónico</string>
+	<string name="poi_course">Circuíto</string>
+
+	<string name="poi_rock">Rocha</string>
+
+	<string name="poi_appliance">Tenda de electrodomésticos</string>
+
+	<string name="poi_outcrop">Afloramento</string>
+
+	<string name="poi_payment_contactless_yes">Sen contacto</string>
+	<string name="poi_hazard_nuclear">Risco nuclear</string>
+	<string name="poi_hazard_erosion">Risco de erosión</string>
+	<string name="poi_hazard_avalanche">Risco de alude</string>
+	<string name="poi_hazard_slippery_road">Estrada esvaradía</string>
+	<string name="poi_hazard_flood">Risco de inundación</string>
+	<string name="poi_hazard_minefield">Campo de minas</string>
+
+	<string name="poi_ruins">Ruínas</string>
+
+	<string name="poi_license_classes">Clases de licenza</string>
+
+	<string name="poi_hill">Outeiro</string>
+
+	<string name="poi_shoe_repair">Arranxo do calzado</string>
+
+	<string name="poi_bulk_purchase_only">Só</string>
+
+	<string name="poi_pipeline_substation">Subestación de tubaxes</string>
+	<string name="poi_substation_transmission">Transmisión</string>
+	<string name="poi_substation_distribution">Distribución</string>
+	<string name="poi_substation_minor_distribution">Distribución menor</string>
+	<string name="poi_substation_industrial">Industrial</string>
+	<string name="poi_substation_transition">Transición</string>
+	<string name="poi_substation_traction">Tracción</string>
+	<string name="poi_substation_converter">Convertedora</string>
+	<string name="poi_substation_compensation">Compensación</string>
+
+	<string name="poi_substation_compression">Compresión</string>
+	<string name="poi_substation_measurement">Medición</string>
+	<string name="poi_substation_valve">Válvula</string>
+	<string name="poi_substation_valve_group">Conxunto de válvulas</string>
+	<string name="poi_substation_inspection_gauge">Calibre de inspeción</string>
+	<string name="poi_substation_field_gathering">Recolleita de campo</string>
+
+<string name="poi_historic_civilization_prehistoric">Civilización: prehistórica</string>
+	<string name="poi_historic_civilization_ancient_greek">Civilización: grega antiga</string>
+	<string name="poi_historic_civilization_roman">Civilización: romana</string>
+	<string name="poi_historic_civilization_byzantine">Civilización: bizantina (do 285 d.C. ó 1453 d.C.)</string>
+	<string name="poi_historic_civilization_ancient_egyptian">Civilización: exipcia antiga (até o 332 a.C.)</string>
+	<string name="poi_historic_civilization_celtic">Civilización: celta</string>
+	<string name="poi_historic_civilization_western_roman">Civilización: romana occidental (do 285 d.C. ó 476 d.C.)</string>
+	<string name="poi_historic_civilization_mycenaean">Civilización: micénica</string>
+	<string name="poi_historic_civilization_dacian">Civilización: dacios</string>
+	<string name="poi_historic_civilization_hernici">Civilización: hérnicos</string>
+	<string name="poi_historic_civilization_greek_egyptian">Civilización: grego-exipcia (do 332 a.C. ó 30 a.C.)</string>
+	<string name="poi_historic_civilization_roman_and_byzantine_egyptian">Civilización: romana e bizantino-exipcia</string>
+	<string name="poi_historic_civilization_helladic">Civilización: heládica</string>
+	<string name="poi_historic_civilization_cycladic">Civilización: cicládica</string>
+	<string name="poi_historic_civilization_minoan">Civilización: cretense ou minoica</string>
+	<string name="poi_historic_civilization_tiahuanacota">Civilización: tiahuanaca</string>
+
+	<string name="poi_animal_training">Adestramento de animais</string>
+	<string name="poi_animal_training_dog">Cans</string>
+	<string name="poi_animal_training_horse">Cabalos</string>
+
+	<string name="poi_animal_yes">Permitidos animais</string>
+	<string name="poi_animal_no">Prohibidos animais</string>
+
+	<string name="poi_historic_period_nuragic">Período histórico: nuráxico</string>
+	<string name="poi_historic_period_stone_bronze_undetermined">Período histórico: idade da pedra/bronce (indeterminado)</string>
+	<string name="poi_historic_period_bronze_age">Período histórico: idade do bronce</string>
+	<string name="poi_historic_period_principate">Período histórico: principado (do 27 a.C. ó 284 d.C.)</string>
+	<string name="poi_historic_period_classical_greece">Período histórico: Grecia clásica (do século V ó IV a.C.)</string>
+	<string name="poi_historic_period_archaic_greece">Período histórico: Grecia arcaica</string>
+	<string name="poi_historic_period_iron_age">Período histórico: idade do ferro</string>
+	<string name="poi_historic_period_hellenistic_greece">Período histórico: Grecia helenística</string>
+	<string name="poi_historic_period_new_kingdom">Período histórico: novo reinado (do 1550 ó 1069 a.C.)</string>
+	<string name="poi_historic_period_middle_kingdom">Período histórico: medio reinado (do 2055 ó 1650 a.C.)</string>
+	<string name="poi_historic_period_predynastic_egypt">Período histórico: Exipto pre-dinástico</string>
+	<string name="poi_historic_period_early_dynastic_period">Período histórico: período dinástico cedo (do 3100 ó 2686 a.C.)</string>
+	<string name="poi_historic_period_old_kingdom">Período histórico: antigo reinado (do 2686 ó 2181 a.C.)</string>
+	<string name="poi_historic_period_first_intermediate_period">Período histórico: primeiro período intermedio (do 2181 ó 2055 a.C.)</string>
+	<string name="poi_historic_period_second_intermediate_period">Período histórico: segundo período intermedio (do 1650 ó 1550 a.C.)</string>
+	<string name="poi_historic_period_third_intermediate_period">Período histórico: terceiro período intermedio (do 1069 ó 664 a.C.)</string>
+	<string name="poi_historic_period_first_persian_period">Período histórico: primeiro período persa</string>
+	<string name="poi_historic_period_late_period">Período histórico: derradeiro período (do 664 ó 332 a.C.)</string>
+	<string name="poi_historic_period_second_persian_period">Período histórico: segundo período persa</string>
+	<string name="poi_historic_period_alexander_the_great">Período histórico: Alexandre o Grande</string>
+	<string name="poi_historic_period_ptolemaic_egypt">Período histórico: Exipto ptolemaico (do 305 ó 30 a.C.)</string>
+	<string name="poi_historic_period_christian_egypt">Período histórico: Exipto cristián</string>
+	<string name="poi_historic_period_byzantine_egypt">Período histórico: Exipto bizantino (do 30 a.C. ó 641 d.C.)</string>
+	<string name="poi_historic_period_persian_occupation">Período histórico: ocupación persa</string>
+	<string name="poi_historic_period_greek_dark_ages">Período histórico: Idade escura grega (do 1100 ó 800 a.C.)</string>
+	<string name="poi_historic_period_roman_greece">Período histórico: Grecia romana (do 146 a.C. ó 330 d.C.)</string>
+	<string name="poi_historic_period_roman_kingdom">Período histórico: Reinado romano (do 753 ó 509 a.C.)</string>
+	<string name="poi_historic_period_dominate">Período histórico: dominato (do 285 ó 476 d.C.)</string>
+	<string name="poi_historic_period_villager">Período histórico: aldeáns (época I, II, do 1580 a.C. ó 133 d.C.)</string>
+	<string name="poi_historic_period_urban">Período histórico: urbá (época III do 133 ó 374 d.C.)</string>
+	<string name="poi_historic_period_classical">Período histórico: clásica (época IV do 374 ó 900 d.C.)</string>
+	<string name="poi_historic_stone">Pedra histórica</string>
+	<string name="poi_site_type_tumulus">Catafalco</string>
+	<string name="poi_site_type_fortification">Fortificación</string>
+	<string name="poi_site_type_settlement">Asentamento</string>
+	<string name="poi_site_type_city">Cidade</string>
+	<string name="poi_site_type_hut_circle">Círculo de cabana</string>
+	<string name="poi_site_type_necropolis">Necrópole</string>
+	<string name="poi_site_type_petroglyph">Petróglifo</string>
+	<string name="poi_site_type_earthwork">Obra na terra</string>
+	<string name="poi_pa">Pā (asentamento fortificado maorí)</string>
+
+	<string name="poi_historic_farm">Granxa histórica</string>
+	<string name="poi_historic_railway_station">Estación de trens histórica</string>
+
+	<string name="poi_historic_threshing_floor">Era histórica</string>
+	<string name="poi_historic_gallows">Forcada histórica</string>
+	<string name="poi_historic_railway">Vía ferroviaria histórica</string>
+
+	<string name="poi_sculptor">Escultor</string>
+
+	<string name="poi_cross">Cruz</string>
+	<string name="poi_prison_camp">Antigo campo de prisioneiros</string>
+	<string name="poi_temperature">Temperatura</string>
+	<string name="poi_bathing_no">Baño: non</string>
+
+	<string name="poi_boat_storage">Almacenaxe das embarcacións</string>
+
+	<string name="poi_bridge_ref">Referencia da ponte</string>
+	<string name="poi_tunnel_ref">Referencia do túnel</string>
+
+	<string name="poi_ref">Referencia</string>
+
+	<string name="poi_cargo_passengers">Pasaxeiros</string>
+	<string name="poi_cargo_vehicle">Vehículos</string>
+	<string name="poi_cargo_container">Contedores</string>
+	<string name="poi_cargo_hgv">Vehículos pesados</string>
+
+	<string name="poi_fitness_station">Ximnasio ó ar libre</string>
+
+	<string name="poi_hackerspace">Xuntanza de hackers</string>
+
+
+	<string name="poi_craft_electronics_repair">Arranxo de electrónicos</string>
+	<string name="poi_fireworks">Tenda de fogos artificiais</string>
+
+	<string name="poi_aerialway_length">Lonxitude</string>
+
+	<string name="poi_health_specialty_general_yes">Médico xeral</string>
+	<string name="poi_health_specialty_ophthalmology_yes">Oftalmoloxía</string>
+	<string name="poi_health_specialty_gynaecology_yes">Xinecoloxía</string>
+	<string name="poi_health_specialty_internal_medicine_yes">Medicina interna</string>
+	<string name="poi_health_specialty_orthopaedics_yes">Ortopedia</string>
+	<string name="poi_health_specialty_otolaryngology_yes">Otorrinolaringoloxía</string>
+	<string name="poi_health_specialty_paediatrics_yes">Pediatría</string>
+	<string name="poi_health_specialty_paediatrics_no">Especialidade en saúde: sen pediatría</string>
+	<string name="poi_health_specialty_dermatology_yes">Dermatoloxía</string>
+	<string name="poi_health_specialty_urology_yes">Uroloxía</string>
+	<string name="poi_health_specialty_surgery_yes">Cirurxía xeral</string>
+	<string name="poi_health_specialty_radiology_yes">Radioloxía</string>
+	<string name="poi_health_specialty_psychiatry_yes">Psiquiatría</string>
+	<string name="poi_health_specialty_neurology_yes">Neuroloxía</string>
+	<string name="poi_health_specialty_dermatovenereology_yes">Dermatovenereoloxía</string>
+	<string name="poi_health_specialty_cardiology_yes">Cardioloxía</string>
+	<string name="poi_health_specialty_trauma_yes">Traumatoloxía</string>
+	<string name="poi_health_specialty_biology_yes">Bioloxía clínica</string>
+	<string name="poi_health_specialty_osteopathy_yes">Osteopatía</string>
+	<string name="poi_health_specialty_anaesthetics_yes">Anestesioloxía</string>
+	<string name="poi_health_specialty_pulmonology_yes">Pneumoloxía</string>
+	<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Cirurxía dental, oral e maxilofacial</string>
+	<string name="poi_health_specialty_maternity_yes">Maternidade</string>
+	<string name="poi_health_specialty_plastic_surgery_yes">Cirurxía plástica</string>
+	<string name="poi_health_specialty_orthodontics_yes">Ortodoncia</string>
+	<string name="poi_health_specialty_physiotherapy_yes">Psicoterapia</string>
+	<string name="poi_health_specialty_biochemistry_yes">Bioquímica</string>
+	<string name="poi_health_specialty_occupational_yes">Terapia ocupacional</string>
+	<string name="poi_health_specialty_child_psychiatry_yes">Psiquiatría infantil</string>
+	<string name="poi_health_specialty_maxillofacial_surgery_yes">Cirurxía maxilofacial</string>
+	<string name="poi_health_specialty_diagnostic_radiology_yes">Radioloxía diagnóstica</string>
+	<string name="poi_health_specialty_gastroenterology_yes">Gastroenteroloxía</string>
+	<string name="poi_health_specialty_dentistry_yes">Odontoloxía</string>
+	<string name="poi_health_specialty_nephrology_yes">Nefroloxía (doenzas renais)</string>
+	<string name="poi_health_specialty_neurosurgery_yes">Neurocirurxía</string>
+	<string name="poi_health_specialty_neuropsychiatry_yes">Neuropsiquiatría</string>
+	<string name="poi_health_specialty_endocrinology_yes">Endocrinoloxía</string>
+	<string name="poi_health_specialty_nuclear_medicine_yes">Medicina nuclear</string>
+	<string name="poi_health_specialty_pathology_yes">Anatomía patolóxica</string>
+	<string name="poi_health_specialty_oncology_yes">Oncoloxía</string>
+	<string name="poi_health_specialty_tropical_medicine_yes">Medicina tropical</string>
+	<string name="poi_health_specialty_tropical_medicine_no">Especialidade en saúde: sen medicina tropical</string>
+	<string name="poi_health_specialty_obstetrics_postnatal_yes">Obstetricia (postnatal)</string>
+	<string name="poi_health_specialty_obstetrics_postnatal_no">Especialidade en saúde: sen obstetricia (postnatal)</string>
+	<string name="poi_health_specialty_obstetrics_antenatal_yes">Obstetricia (prenatal</string>
+	<string name="poi_health_specialty_obstetrics_antenatal_no">Especialidade en saúde: sen obstetricia (prenatal)</string>
+	<string name="poi_health_specialty_social_paediatrics_yes">Pediatría social</string>
+	<string name="poi_health_specialty_social_paediatrics_no">Especialidade en saúde: sen pediatría social</string>
+	<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Obstetricia (cesárea)</string>
+	<string name="poi_health_specialty_obstetrics_caesarean_section_no">Especialidade en saúde: sen obstetricia (cesárea)</string>
+	<string name="poi_health_specialty_addiction_medicine_yes">Medicina toxicolóxica</string>
+	<string name="poi_health_specialty_optometry_yes">Optometría</string>
+	<string name="poi_health_specialty_clinical_pathology_yes">Patoloxía clínica</string>
+	<string name="poi_health_specialty_speech_therapy_yes">Terapia da fala</string>
+	<string name="poi_health_specialty_manual_therapy_yes">Terapia manual</string>
+	<string name="poi_health_specialty_sports_medicine_yes">Medicina deportiva</string>
+	<string name="poi_health_specialty_podology_yes">Podoloxía</string>
+	<string name="poi_health_specialty_adult_psychiatry_yes">Psiquiatría adulta</string>
+	<string name="poi_health_specialty_acupuncture_yes">Acupuntura</string>
+	<string name="poi_health_specialty_homeopathy_yes">Homeopatía</string>
+	<string name="poi_health_specialty_traditional_chinese_medicine_yes">Medicina chinesa tradicional</string>
+	<string name="poi_health_specialty_reiki_yes">Reiki</string>
+	<string name="poi_health_specialty_herbalism_yes">Herbolaria</string>
+	<string name="poi_health_specialty_chiropractic_yes">Quiropraxia</string>
+	<string name="poi_health_specialty_naturopathy_yes">Naturopatía</string>
+	<string name="poi_health_specialty_depth_psychology_yes">Psicoloxía profunda</string>
+	<string name="poi_health_specialty_behavior_yes">Comportamento</string>
+	<string name="poi_health_specialty_palliative_medicine_yes">Medicina paliativa</string>
+
+	<string name="poi_fitness_centre">Ximnasio</string>
+	<string name="poi_fitness">Exercicio físico</string>
+
+	<string name="poi_billiards">Billar</string>
+
+	<string name="poi_microwave_oven_no">Forno microondas: non</string>
+	<string name="poi_water_heater_no">Quentador de auga: non</string>
+
+	<string name="poi_parking_garage_boxes">Cocheira comunitaria individual</string>
+	<string name="poi_parking_carports">Cocheira aberta</string>
+
+	<string name="poi_dojo">Dojo</string>
+
+	<string name="poi_gaelic_games">Xogos gaélicos</string>
+	<string name="poi_running">Correr</string>
+	<string name="poi_netball">Netball</string>
+	<string name="poi_karting">Karting</string>
+	<string name="poi_badminton">Bádminton</string>
+	<string name="poi_judo">Judo</string>
+	<string name="poi_disc_golf">Disco golf</string>
+	<string name="poi_futsal">Fútbol sala</string>
+	<string name="poi_rc_car">Automóbil de carreiras teledirixido</string>
+	<string name="poi_squash">Squash</string>
+	<string name="poi_shuffleboard">Texo ou shuffleboard</string>
+	<string name="poi_lacrosse">Lacrosse</string>
+	<string name="poi_boxing">Boxeo</string>
+
+	<string name="poi_official_name">Nome oficial</string>
+
+	<string name="poi_dolphin">Golfiño</string>
+
+	<string name="poi_forestry_compartment">Sinal: compartimento forestal</string>
+	<string name="poi_forestry_allotment">Sinal: terreo forestal</string>
+	<string name="poi_inscription_n">Inscrición: N</string>
+	<string name="poi_inscription_nw">Inscrición: NO</string>
+	<string name="poi_inscription_w">Inscrición: O</string>
+	<string name="poi_inscription_sw">Inscrición: SO</string>
+	<string name="poi_inscription_s">Inscrición: S</string>
+	<string name="poi_inscription_se">Inscrición: SE</string>
+	<string name="poi_inscription_e">Inscrición: E</string>
+	<string name="poi_inscription_ne">Inscrición: NE</string>
+
+	<string name="poi_construction_yes">Baixo construción</string>
+	<string name="poi_firepit">Cacharela</string>
+	<string name="poi_street_cabinet">Distribuidor na rúa</string>
+
+	<string name="poi_fair_trade_no">Comercio xusto: non</string>
+	<string name="poi_fair_trade_only">Só produtos de comercio xusto</string>
+
+
+	<string name="poi_bandy">Bandy</string>
+
+	<string name="poi_protected_area">Área protexida</string>
+	<string name="poi_protection_title">Nome da protección</string>
+	<string name="poi_protection_object_historic">Protección do obxecto: histórico</string>
+	<string name="poi_protection_object_nature">Protección do obxecto: natureza</string>
+	<string name="poi_protection_object_habitat">Protección do obxecto: habitat</string>
+	<string name="poi_protection_object_water">Protección do obxecto: auga</string>
+
+	<string name="poi_nuclear_explosion_country">Estourido: país</string>
+	<string name="poi_nuclear_explosion_site">Estourido: lugar</string>
+	<string name="poi_nuclear_explosion_shot_name_en">Nome do disparo (en)</string>
+	<string name="poi_nuclear_explosion_series">Serie de estouridos</string>
+	<string name="poi_nuclear_explosion_purpose_nuclear_weapons_related">Obxectivo do estourido: relacionado con armas nucleares</string>
+	<string name="poi_nuclear_explosion_purpose_weapons_effects">Obxectivo do estourido: efectos das armas</string>
+	<string name="poi_nuclear_explosion_purpose_safety_experiment">Obxectivo do estourido: experimento de seguridade</string>
+	<string name="poi_nuclear_explosion_purpose_research_for_peaceful_applications">Obxectivo do estourido: pescudar para aplicacións científicas</string>
+	<string name="poi_nuclear_explosion_purpose_fundamental_science">Obxectivo do estourido: ciencia sinxela</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_cavity_excavation">Obxectivo do estourido: aplicación industrial, excavación de cavidade</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_seismic_sounding">Obxectivo do estourido: aplicación industrial, sondaxe sísmica</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_oil_stimulation">Obxectivo do estourido: aplicación industrial, estimulación petroleira</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application">Obxectivo do estourido: aplicación industrial</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_earth_moving">Obxectivo do estourido: aplicación industrial, movemento da terra</string>
+	<string name="poi_nuclear_explosion_time_utc">Hora do estourido (UTC)</string>
+	<string name="poi_nuclear_explosion_yield">Rendemento do estourido</string>
+	<string name="poi_nuclear_explosion_hole">Buraco do estourido</string>
+	<string name="poi_nuclear_explosion_height_of_burst">Altitude do estourido</string>
+	<string name="poi_nuclear_explosion_ground_zero_altitude">Altitude da zona cero</string>
+	<string name="poi_nuclear_explosion_body_wave_magnitude">Magnitude das ondas de propagación</string>
+	<string name="poi_voltage">Voltaxe</string>
+	<string name="poi_diplomatic_consulate_general">Consulado xeral</string>
+	<string name="poi_diplomatic_honorary_consulate">Consulado honorario</string>
+	<string name="poi_diplomatic_permanent_mission">Misión permanente</string>
+	<string name="poi_diplomatic_delegation">Delegación</string>
+	<string name="poi_diplomatic_ambassadors_residence">Residencia do embaixador</string>
+	<string name="poi_diplomatic_high_commission">Alto comisionado</string>
+
+	<string name="poi_fire_operator">Operador de incendios</string>
+
+	<string name="poi_water_tank">Depósito de auga</string>
+
+	<string name="poi_length">Lonxitude</string>
+
+	<string name="poi_wiki_link">Wikipedia</string>
+
+	<string name="poi_xmas">Nadal</string>
+	<string name="poi_xmas_event">Acontecemento do Nadal</string>
+	<string name="poi_xmas_market">Mercado de Nadal</string>
+	<string name="poi_xmas_pyramid">Pirámide do Nadal</string>
+	<string name="poi_xmas_shop">Tenda de Nadal</string>
+	<string name="poi_xmas_shop_christmas_tree">Tenda de árbores</string>
+	<string name="poi_xmas_tree">Árbore de Nadal</string>
+	<string name="poi_xmas_day_date">Nadal: período para o acontecemento</string>
+	<string name="poi_xmas_note">Nadal: nota</string>
+	<string name="poi_xmas_opening_hours">Nadal: horario de apertura</string>
+	<string name="poi_drink_wine_retail">Viño: venda</string>
+	<string name="poi_drink_wine_served">Viño: servido</string>
+
+	<string name="poi_energy_supplier">Oficina de fornecedor da enerxía</string>
+
+	<string name="poi_electronics_repair_computer">Arranxo de electrónicos: computadores</string>
+	<string name="poi_electronics_repair_appliance">Arranxo de electrónicos: electrodomésticos</string>
+	<string name="poi_electronics_repair_phone">Arranxo de electrónicos: teléfonos móbiles</string>
+	<string name="poi_electronics_repair_tv">Arranxo de electrónicos: televisores</string>
+
+	<string name="poi_resort_kids_camp">Campamento de nenos</string>
+	<string name="poi_language_school">Escola de idiomas</string>
+
+	<string name="poi_life_ring">Aro salvavidas</string>
+
+	<string name="poi_zoo_petting_zoo">Zoolóxico interactivo</string>
+	<string name="poi_zoo_wildlife_park">Reserva da natureza</string>
+	<string name="poi_zoo_enclosure">Recinto</string>
+	<string name="poi_zoo_safari_park">Parque safari</string>
+	<string name="poi_zoo_birds">Paxaros</string>
+	<string name="poi_zoo_aviary">Paxareira</string>
+	<string name="poi_zoo_falconry">Falcoaría</string>
+	<string name="poi_zoo_reptile">Réptís</string>
+
+	<string name="poi_motorcycle_sales_yes">Venda</string>
+	<string name="poi_motorcycle_sales_no">Venda: non</string>
+	<string name="poi_motorcycle_sales_used">Venda: usado</string>
+	<string name="poi_motorcycle_rental_yes">Aluguer</string>
+	<string name="poi_motorcycle_rental_no">Aluguer: non</string>
+	<string name="poi_motorcycle_repair_yes">Arranxo</string>
+	<string name="poi_motorcycle_repair_no">Arranxo: non</string>
+	<string name="poi_motorcycle_parts_yes">Pezas ou repostos</string>
+	<string name="poi_motorcycle_parts_no">Repostos: non</string>
+	<string name="poi_motorcycle_tyres_yes">Pneumáticos</string>
+	<string name="poi_motorcycle_tyres_no">Pneumáticos: non</string>
+	<string name="poi_motorcycle_clothes_yes">Roupa de moto</string>
+	<string name="poi_motorcycle_clothes_no">Roupa de moto: non</string>
+	<string name="poi_motorcycle_type_scooter">Scooter</string>
+	<string name="poi_motorcycle_type_sportbike">Deportiva</string>
+	<string name="poi_motorcycle_type_chopper">Chopper</string>
+	<string name="poi_motorcycle_type_offroad">Todo terreo</string>
+	<string name="poi_motorcycle_type_dualsport">Duplo propósito</string>
+	<string name="poi_motorcycle_type_standard">Estándar</string>
+
+	<string name="poi_generator_output_electricity_no">Saída (electricidade): non</string>
+
+	<string name="poi_owner">Dono</string>
+
+	<string name="poi_animal_shelter_purpose_adoption_no">Adopción: non</string>
+	<string name="poi_animal_shelter_purpose_release_no">Rehabilitación e liberación: non</string>
+
+	<string name="poi_spaceport">Porto espacial</string>
+
+	<string name="poi_direction_n">Dirección: norte</string>
+	<string name="poi_direction_nne">Dirección: norte-nordeste</string>
+	<string name="poi_direction_ne">Dirección: nordeste</string>
+	<string name="poi_direction_ene">Dirección: leste-nordeste</string>
+	<string name="poi_direction_e">Dirección: leste</string>
+	<string name="poi_direction_ese">Dirección: leste-sureste</string>
+	<string name="poi_direction_se">Dirección: sureste</string>
+	<string name="poi_direction_sse">Dirección: sur-sureste</string>
+	<string name="poi_direction_s">Dirección: sur</string>
+	<string name="poi_direction_ssw">Dirección: sur-suroeste</string>
+	<string name="poi_direction_sw">Dirección: suroeste</string>
+	<string name="poi_direction_wsw">Dirección: oeste-suroeste</string>
+	<string name="poi_direction_w">Dirección: oeste</string>
+	<string name="poi_direction_wnw">Dirección: oeste-noroeste</string>
+	<string name="poi_direction_nw">Dirección: noroeste</string>
+	<string name="poi_direction_nnw">Dirección: norte-noroeste</string>
+	<string name="poi_direction_forward">Dirección: no sentido da vía</string>
+	<string name="poi_direction_backward">Dirección: no sentido contrario da vía</string>
+	<string name="poi_direction_clockwise">Dirección: cara a dereita (segundo as agullas do reloxo)</string>
+	<string name="poi_direction_anticlockwise">Dirección: cara a esquerda (contrario ás agullas do reloxo)</string>
+	<string name="poi_direction_up">Dirección: cara enriba</string>
+	<string name="poi_direction_down">Dirección: cara embaixo</string>
+	<string name="poi_direction_entrance">Dirección: entrada</string>
+	<string name="poi_direction_exit">Dirección: saída</string>
+	<string name="poi_direction_all">Dirección: todas</string>
+
+	<string name="poi_winter_room_no">Refuxio do inverno: non</string>
+	<string name="poi_reservation_required">Reserva: requirida</string>
+	<string name="poi_reservation_recommended">Reserva: recomendada</string>
+	<string name="poi_reservation_no">Reserva: non</string>
+	<string name="poi_reservation_members_only">Reserva: só membros</string>
+
+	<string name="poi_beds">Leitos</string>
+
+	<string name="poi_boat_rental">Aluguer de embarcacións</string>
+	<string name="poi_boat_motorboat_rental_no">Embarcacións a motor: non</string>
+	<string name="poi_boat_houseboat_rental_no">Casas flotantes: non</string>
+	<string name="poi_boat_pedalboat_rental_no">Embarcacións a pedais: non</string>
+	<string name="poi_boat_jetski_rental_no">Motos de auga: non</string>
+	<string name="poi_boat_sailboat_rental_no">Veleiros: non</string>
+	<string name="poi_boat_dinghy_rental_rental_no">Botes: non</string>
+	<string name="poi_boat_kayak_rental_rental_no">Caiaques: non</string>
+	<string name="poi_boat_canoe_rental_rental_no">Canoas: non</string>
+
+	<string name="poi_government_archive">Arquivo</string>
+	<string name="poi_government_ministry">Ministerio</string>
+	<string name="poi_government_social_security">Seguridade social</string>
+	<string name="poi_government_social_services">Servizos sociais</string>
+	<string name="poi_government_treasury">Facenda pública</string>
+	<string name="poi_vhf">Canle VHF</string>
+
+	<string name="poi_gorge">Desfiladeiro</string>
+	<string name="poi_couloir">Cavorco</string>
+	<string name="poi_mountain_area">Área montañosa</string>
+
+	<string name="poi_surface_clay">Arxila</string>
+	<string name="poi_surface_tartan">Tartán</string>
+	<string name="poi_surface_artificial_turf">Céspede artificial</string>
+	<string name="poi_surface_decoturf">Decoturf</string>
+	<string name="poi_surface_metal_grid">Grella metálica</string>
+
+	<string name="poi_location_underwater">Localización: mergullado</string>
+	<string name="poi_location_overground">Localización: na superficie</string>
+	<string name="poi_location_overhead">Localización: suspendido</string>
+	<string name="poi_location_roof">Localización: teito</string>
+	<string name="poi_location_rooftop">Localización: tellado</string>
+	<string name="poi_location_indoor">Localización: interior</string>
+	<string name="poi_location_platform">Localización: plataforma</string>
+	<string name="poi_location_kiosk">Localización: quiosque</string>
+	<string name="poi_location_bridge">Localización: ponte</string>
+	<string name="poi_location_wall">Localización: muro</string>
+	<string name="poi_location_entrance">Localización: entrada</string>
+
+	<string name="poi_visibility_house">Localización: casa</string>
+	<string name="poi_visibility_street">Localización: rúa</string>
+	<string name="poi_visibility_area">Localización: área</string>
+
+	<string name="poi_operational_status_open">Aberto</string>
+	<string name="poi_operational_status_closed">Pechado</string>
+	<string name="poi_operational_status_restricted">Restrinxido</string>
+	<string name="poi_operational_status_broken">Rachado</string>
+	<string name="poi_operational_status_needs_maintenance">Precisa dun mantemento</string>
+
+	<string name="poi_water_place_durability_durable">Durabilidade da fonte de auga: duradeira</string>
+	<string name="poi_water_purification_none">Ningunha</string>
+	<string name="poi_water_purification_chlorine">Cloro</string>
+	<string name="poi_water_purification_reverse_osmosis">Osmose inversa</string>
+	<string name="poi_water_purification_aquatabs">Pastillas</string>
+
+	<string name="poi_water_supply_water_well">Pozo de auga</string>
+	<string name="poi_water_supply_pipeline">Tubaxe</string>
+	<string name="poi_water_supply_running_water">Auga corrente</string>
+	<string name="poi_water_supply_pump">Bomba</string>
+	<string name="poi_water_supply_borehole">Pozo artesán</string>
+	<string name="poi_water_supply_water_trucking">Camión de auga</string>
+	<string name="poi_water_supply_water_tank">Tanque de auga</string>
+	<string name="poi_water_supply_bottled_water">Auga embotellada</string>
+
+	<string name="poi_water_place_access_community">Comunidade</string>
+	<string name="poi_water_place_access_family">Familia</string>
+	<string name="poi_water_place_access_multifamilies">Múltiples familias</string>
+
+	<string name="poi_socket_cee_blue">Enchufe: CEE azul</string>
+	<string name="poi_socket_cee_blue_current">Enchufe: CEE azul: corrente</string>
+	<string name="poi_socket_cee_blue_output">Enchufe: CEE azul: saída</string>
+	<string name="poi_socket_cee_red_16a">Enchufe: CEE vermello 16A</string>
+	<string name="poi_socket_cee_red_16a_current">Enchufe: CEE vermello 16A: corrente</string>
+	<string name="poi_socket_cee_red_16a_output">Enchufe: CEE vermello 16A: saída</string>
+	<string name="poi_socket_cee_red_32a">Enchufe: CEE vermello 32A</string>
+	<string name="poi_socket_cee_red_32a_current">Enchufe: CEE vermello 32A: corrente</string>
+	<string name="poi_socket_cee_red_32a_output">Enchufe: CEE vermello 32A: saída</string>
+	<string name="poi_socket_cee_red_64a">Enchufe: CEE vermello 64A</string>
+	<string name="poi_socket_cee_red_64a_current">Enchufe: CEE vermello 64A: corrente</string>
+	<string name="poi_socket_cee_red_64a_output">Enchufe: CEE vermello 64A: saída</string>
+	<string name="poi_socket_cee_red_125a">Enchufe: CEE vermello 125A</string>
+	<string name="poi_socket_cee_red_125a_current">Enchufe: CEE vermello 125A: corrente</string>
+	<string name="poi_socket_cee_red_125a_output">Enchufe: CEE vermello 125A: saída</string>
+	<string name="poi_socket_chademo">Enchufe: CHAdeMO</string>
+	<string name="poi_socket_chademo_current">Enchufe: CHAdeMO: corrente</string>
+	<string name="poi_socket_chademo_output">Enchufe: CHAdeMO: saída</string>
+	<string name="poi_socket_tesla_standard">Enchufe: Tesla estándar</string>
+	<string name="poi_socket_tesla_standard_current">Enchufe: Tesla estándar: corrente</string>
+	<string name="poi_socket_tesla_standard_output">Enchufe: Tesla estándar: saída</string>
+	<string name="poi_socket_tesla_supercharger">Enchufe: Supercargador Tesla</string>
+	<string name="poi_socket_tesla_supercharger_current">Enchufe: Supercargador Tesla: corrente</string>
+	<string name="poi_socket_tesla_supercharger_output">Enchufe: Supercargador Tesla: saída</string>
+	<string name="poi_socket_tesla_roadster">Enchufe: Tesla Roadster</string>
+	<string name="poi_socket_tesla_roadster_current">Enchufe: Tesla Roadster: corrente</string>
+	<string name="poi_socket_tesla_roadster_output">Enchufe: Tesla Roadster: saída</string>
+	<string name="poi_socket_nema_5_15">Enchufe: NEMA 5-15R</string>
+	<string name="poi_socket_nema_5_15_current">Enchufe: NEMA 5-15R: corrente</string>
+	<string name="poi_socket_nema_5_15_output">Enchufe: NEMA 5-15R: saída</string>
+	<string name="poi_nuclear_explosion_salvo_first_detonation">Estourido de salva: primeira detonación de proba</string>
+	<string name="poi_nuclear_explosion_salvo_second_or_later_detonation">Estourido de salva: segundo ou seguinte detonación de proba</string>
+	<string name="poi_nuclear_explosion_crater_diameter">Estourido: diámetro do buraco</string>
+	<string name="poi_nuclear_explosion_warhead">Estourido: oxiva</string>
+	<string name="poi_nuclear_explosion_device">Estourido: dispositivo</string>
+
+	<string name="poi_plant_nursery">Viveiro de plantas</string>
+
+	<string name="poi_compressed_air_no">Ar comprimido: non</string>
+
+	<string name="poi_vacuum_cleaner_no">Aspirador: non</string>
+	<string name="poi_amenity_vacuum_cleaner">Aspirador</string>
+
+	<string name="poi_sport_free_flying">Á delta (deporte)</string>
+
+	<string name="poi_water_tap">Billa de auga</string>
+	<string name="poi_button_operated_no">Operado por botóns: non</string>
+
+	<string name="poi_free_flying_site_takeoff">Engalaxe</string>
+	<string name="poi_free_flying_site_landing">Aterraxe</string>
+	<string name="poi_socket_nema_5_20">Enchufe: NEMA 5-20</string>
+	<string name="poi_socket_nema_5_20_current">Enchufe: NEMA 5-20: corrente</string>
+	<string name="poi_socket_nema_5_20_output">Enchufe: NEMA 5-20: saída</string>
+	<string name="poi_socket_nema_14_30">Enchufe: NEMA 14-30</string>
+	<string name="poi_socket_nema_14_30_current">Enchufe: NEMA 14-30: corrente</string>
+	<string name="poi_socket_nema_14_30_output">Enchufe: NEMA 14-30: saída</string>
+	<string name="poi_socket_nema_14_50">Enchufe: NEMA 14-50</string>
+	<string name="poi_socket_nema_14_50_current">Enchufe: NEMA 14-50: corrente</string>
+	<string name="poi_socket_nema_14_50_output">Enchufe: NEMA 14-50: saída</string>
+	<string name="poi_socket_schuko">Enchufe: Schuko</string>
+	<string name="poi_socket_schuko_current">Enchufe: Schuko: corrente</string>
+	<string name="poi_socket_schuko_output">Enchufe: Schuko: saída</string>
+	<string name="poi_socket_bs1363">Enchufe: BS 1363</string>
+	<string name="poi_socket_bs1363_current">Enchufe: BS 1363: corrente</string>
+	<string name="poi_socket_bs1363_output">Enchufe: BS 1363: saída</string>
+	<string name="poi_socket_as3112">Enchufe: AS/NZS 3112</string>
+	<string name="poi_socket_as3112_current">Enchufe: AS/NZS 3112: corrente</string>
+	<string name="poi_socket_as3112_output">Enchufe: AS/NZS 3112: saída</string>
+
+	<string name="poi_car_no">Automóbil: non</string>
+	<string name="poi_scooter_no">Scooter: non</string>
+	<string name="poi_truck_no">Camión: non</string>
+
+	<string name="poi_amperage">Amperaxe</string>
+	<string name="poi_free_flying_site_toplanding">Aterraxe elevado</string>
+	<string name="poi_free_flying_site_towing">Remolque</string>
+	<string name="poi_free_flying_site_training">Adestramento</string>
+	<string name="poi_free_flying_official_no">Oficial: non</string>
+	<string name="poi_free_flying_paragliding_yes">Parapente</string>
+	<string name="poi_free_flying_paragliding_no">Parapente: non</string>
+	<string name="poi_free_flying_hanggliding_yes">Á delta</string>
+	<string name="poi_free_flying_hanggliding_no">Á delta: non</string>
+	<string name="poi_free_flying_rigid_yes">Á delta ríxida</string>
+	<string name="poi_free_flying_rigid_no">Á delta ríxida: non</string>
+	<string name="poi_free_flying_site_orientation_n">Orientación do lugar para a á delta: N</string>
+	<string name="poi_free_flying_site_orientation_ne">Orientación do lugar para a á delta: NL</string>
+	<string name="poi_free_flying_site_orientation_e">Orientación do lugar para a á delta: L</string>
+	<string name="poi_free_flying_site_orientation_se">Orientación do lugar para a á delta: SL</string>
+	<string name="poi_free_flying_site_orientation_s">Orientación do lugar para a á delta: S</string>
+	<string name="poi_free_flying_site_orientation_sw">Orientación do lugar para a á delta: SO</string>
+	<string name="poi_free_flying_site_orientation_w">Orientación do lugar para a á delta: O</string>
+	<string name="poi_free_flying_site_orientation_nw">Orientación do lugar para a á delta: NO</string>
+	<string name="poi_free_flying_no_flight_time">Sen horario de voo (á delta)</string>
+	<string name="poi_free_flying_guest_guidelines_no">Directrices de convidado: non</string>
+
+	<string name="poi_tanning_salon">Solario</string>
+
+	<string name="poi_sanitary_dump_station">Estación de refugallos sanitarios</string>
+
+	<string name="poi_medical_system_western_yes">Occidental</string>
+	<string name="poi_medical_system_chinese_yes">Chinés tradicional</string>
+	<string name="poi_medical_system_ayurveeda_yes">Aiurveda</string>
+	<string name="poi_medical_system_kampo_yes">Campo</string>
+	<string name="poi_medical_system_mongolian_yes">Mongol tradicional</string>
+	<string name="poi_medical_system_tibetan_yes">Tibetano tradicional</string>
+	<string name="poi_medical_system_sidda_yes">Sidda</string>
+	<string name="poi_medical_system_unani_yes">Unani</string>
+
+	<string name="poi_health_service_nursing_no">Servizo de saúde: enfermaría: non</string>
+	<string name="poi_health_service_counselling_no">Servizo de saúde: asesoramento: non</string>
+	<string name="poi_health_service_examination_no">Servizo de saúde: recoñecemento médico: non</string>
+	<string name="poi_health_service_child_care_no">Servizo de saúde: coidados infantís: non</string>
+	<string name="poi_health_service_prevention_no">Servizo de saúde: prevención: non</string>
+	<string name="poi_health_service_prevention_vaccination_no">Servizo de saúde: vacinación: non</string>
+	<string name="poi_health_service_support_no">Servizo de saúde: apoio: non</string>
+	<string name="poi_health_service_test_no">Servizo de saúde: análise: non</string>
+
+	<string name="poi_health_facility_type_office">Consultorio médico</string>
+	<string name="poi_suction_point">Punto de succión</string>
+
+	<string name="poi_fire_hydrant_type_pillar">Piar</string>
+	<string name="poi_fire_hydrant_type_dry_barrel">Bocoi seco</string>
+	<string name="poi_fire_hydrant_type_pond">Lagoa</string>
+	<string name="poi_fire_hydrant_type_wall">Parede</string>
+
+	<string name="poi_health_amenity_type_first_aid_kit">Caixa de urxencias</string>
+	<string name="poi_health_person_type_assistant">Rol do traballador en saúde: asistente</string>
+	<string name="poi_health_person_type_healer">Rol do traballador en saúde: curandeiro</string>
+	<string name="poi_health_person_type_midwife">Rol do traballador en saúde: parteira</string>
+	<string name="poi_health_person_type_nurse">Rol do traballador en saúde: enfermeiro</string>
+	<string name="poi_health_person_type_paramedic">Rol do traballador en saúde: paramédico</string>
+	<string name="poi_health_person_type_physician">Rol do traballador en saúde: médico</string>
+	<string name="poi_health_person_type_podologist">Rol do traballador en saúde: podólogo</string>
+	<string name="poi_health_person_type_psychologist">Rol do traballador en saúde: psicólogo</string>
+	<string name="poi_health_person_type_therapist">Rol do traballador en saúde: terapeuta</string>
+	<string name="poi_health_person_type_physician_assitant">Rol do traballador en saúde: axudante médico</string>
+	<string name="poi_health_person_type_technician">Rol do traballador en saúde: técnico</string>
+	<string name="poi_health_person_type_witchdoctor">Rol do traballador en saúde: bruxo</string>
+
+	<string name="poi_counselling_type_addiction_no">Asesoramento (adicción): non</string>
+	<string name="poi_counselling_type_antenatal_no">Asesoramento (prenatal): non</string>
+	<string name="poi_counselling_type_child_guidance_no">Asesoramento (orientacións infantís): non</string>
+	<string name="poi_counselling_type_couple_no">Asesoramento (parella): non</string>
+	<string name="poi_counselling_type_crisis_no">Asesoramento (crise): non</string>
+	<string name="poi_counselling_type_drugs_no">Asesoramento (drogas): non</string>
+	<string name="poi_counselling_type_education_no">Asesoramento (educación): non</string>
+	<string name="poi_counselling_type_family_no">Asesoramento (familia): non</string>
+	<string name="poi_counselling_type_homeless_no">Asesoramento (sen lar): non</string>
+	<string name="poi_counselling_type_immigrant_no">Asesoramento (inmigrantes): non</string>
+	<string name="poi_counselling_type_marriage_no">Asesoramento (casamento): non</string>
+	<string name="poi_counselling_type_nutrition_nfire_hydo">Asesoramento (nutrición): non</string>
+	<string name="poi_counselling_type_sexual_no">Asesoramento (sexual): non</string>
+	<string name="poi_counselling_type_sexual_abuse_no">Asesoramento (abusos sexuais): non</string>
+	<string name="poi_counselling_type_victim_no">Asesoramento (vítimas): non</string>
+	<string name="poi_counselling_type_violence_no">Asesoramento (violencia): non</string>
+
+	<string name="poi_provided_for_infant_no">Atende meniños: non</string>
+	<string name="poi_provided_for_toddler_no">Atende crianzas pequenas: non</string>
+	<string name="poi_provided_for_child_no">Atende crianzas: non</string>
+	<string name="poi_provided_for_adult_no">Atende adultos: non</string>
+	<string name="poi_provided_for_woman_no">Atende mulleres: non</string>
+	<string name="poi_provided_for_girl_no">Atende rapazas: non</string>
+	<string name="poi_provided_for_man_no">Atende homes: non</string>
+	<string name="poi_provided_for_boy_no">Atende rapaces: non</string>
+
+	<string name="poi_capacity_beds">Capacidade (leitos)</string>
+
+	<string name="poi_treat_inpatient_no">Servizos hospitalarios: non</string>
+	<string name="poi_treat_inpatient_only">Servizos hospitalarios: soamente</string>
+	<string name="poi_counselling_no">Asesoramento: non</string>
+	<string name="poi_home_visit_no">Visitas a domicilio: non</string>
+
+	<string name="poi_disease_malaria_no">Malaria: non</string>
+	<string name="poi_disease_ebola_no">Ébola: non</string>
+	<string name="poi_disease_autism_no">Autismo: non</string>
+	<string name="poi_disease_aids_no">SIDA: non</string>
+
+	<string name="poi_office_physician">Consultorio médico</string>
+	<string name="poi_office_therapist">Oficina de terapeuta</string>
+	<string name="poi_office_podologist">Oficina de podólogo</string>
+	<string name="poi_office_healer">Oficina de curandeiro</string>
+	<string name="poi_office_psychologist">Oficina de psicólogo</string>
+	<string name="poi_office_nursing_service">Servizo de enfermaría</string>
+	<string name="poi_office_midwife">Oficina de parteira</string>
+
+	<string name="poi_fire_hydrant_diameter">Diámetro do hidrante</string>
+	<string name="poi_fire_hydrant_pressure">Presión do hidrante</string>
+	<string name="poi_fire_hydrant_count">Cantidade de hidrantes</string>
+	<string name="poi_fire_hydrant_flow_capacity">Capacidade de caudal do hidrante</string>
+	<string name="poi_fire_hydrant_position_sidewalk">Na beirarrúa</string>
+	<string name="poi_fire_hydrant_position_green">No céspede</string>
+	<string name="poi_fire_hydrant_position_lane">No carril</string>
+	<string name="poi_fire_hydrant_position_parking_lot">No aparcadoiro</string>
+	<string name="poi_fire_hydrant_position_street">Na rúa</string>
+	<string name="poi_fire_hydrant_style_wsh">Estilo do hidrante: wsh</string>
+	<string name="poi_fire_hydrant_style_water_source_main">Principal</string>
+	<string name="poi_fire_hydrant_style_water_source_pond">Lagoa</string>
+	<string name="poi_fire_hydrant_style_water_source_stream">Regato</string>
+	<string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
+	<string name="poi_military_checkpoint">Posto de control militar</string>
+
+	<string name="poi_bicycle_parking_lockers">Portelos</string>
+	<string name="poi_bicycle_parking_streetpod">Rañura plástica</string>
+
+	<string name="poi_depth">Afundimento</string>
+
+	<string name="poi_salt_yes">Salgado</string>
+	<string name="poi_salt_no">Salgado: non</string>
+	<string name="poi_wheelchair_designated">Sinalado</string>
+	<string name="poi_spoil_heap">Escombreira</string>
+	
+	<string name="poi_summer_camp">Campamento de verán</string>
+	<string name="poi_recreation_center">Centro de lecer</string>
+
+	<string name="poi_crossing_activation_automatic">Activación do cruzamento: automático</string>
+	<string name="poi_crossing_activation_local">Activación do cruzamento: local</string>
+	<string name="poi_crossing_activation_remote">Activación do cruzamento: remoto</string>
+	<string name="poi_crossing_barrier_no">Cruzamento de barreiras: non</string>
+	<string name="poi_crossing_barrier_yes">Cruzamento de barreiras: si</string>
+	<string name="poi_crossing_barrier_full">Cruzamento de barreiras: total</string>
+	<string name="poi_crossing_barrier_half">Cruzamento de barreiras: á metade</string>
+	<string name="poi_crossing_barrier_double_half">Cruzamento de barreiras: dupla metade</string>
+	<string name="poi_crossing_bell_yes">Sinal de son</string>
+	<string name="poi_crossing_bell_no">Cruzamento de son: non</string>
+	<string name="poi_crossing_light_yes">Cruzamento de luz</string>
+	<string name="poi_crossing_light_no">Cruzamento de luz: non</string>
+	<string name="poi_crossing_on_demand_yes">Cruzamento baixo demanda</string>
+	<string name="poi_crossing_on_demand_no">Cruzamento baixo demanda: non</string>
+	<string name="poi_crossing_saltire_yes">Sinal de paso a nivel</string>
+	<string name="poi_crossing_saltire_no">Sinal de paso a nivel: non</string>
+	<string name="poi_crossing_supervision_yes">Cruzamento vixiado</string>
+	<string name="poi_crossing_supervision_no">Cruzamento vixiado: non</string>
+	<string name="poi_crossing_supervision_attendant">Cruzamento vixiado: en persoa</string>
+	<string name="poi_crossing_supervision_camera">Cruzamento vixiado: cámara</string>
+
+	<string name="poi_dispensing_no">Receita médica: non</string>
+
+	<string name="poi_aerodrome_type_international">Internacional</string>
+	<string name="poi_aerodrome_type_regional">Rexional</string>
+	<string name="poi_aerodrome_type_military">Militar</string>
+	<string name="poi_aerodrome_type_private">Privado</string>
+
+	<string name="poi_valley_balka">Balka (pequeno val)</string>
+
+	<string name="poi_ventilation_shaft">Conducto da ventilación</string>
+
+	<string name="poi_pump_style_modern">Estilo da bomba: moderna</string>
+	<string name="poi_pump_style_historic">Estilo da bomba: antiga</string>
+	<string name="poi_pump_status_ok">Estado da bomba: bo</string>
+	<string name="poi_pump_status_broken">Estado da bomba: rachada</string>
+	<string name="poi_pump_status_locked">Estado da bomba: bloqueada</string>
+
+	<string name="poi_payment_troika_yes">Troika</string>
+	<string name="poi_telescope">Telescopio</string>
+	<string name="poi_telescope_type_optical">Óptico</string>
+	<string name="poi_telescope_type_radio">Radiotelescopio</string>
+	<string name="poi_telescope_type_gamma">Raios gamma</string>
+	<string name="poi_telescope_diameter">Diámetro</string>
+	<string name="poi_telescope_spectrum">Espectro</string>
+	<string name="poi_telescope_usage_education">Emprego: educativo</string>
+	<string name="poi_telescope_usage_espionage">Emprego: espionaxe</string>
+	<string name="poi_telescope_usage_research">Emprego: pesquisa</string>
+
+	<string name="poi_observatory_type_espionage">Emprego: espionaxe</string>
+	<string name="poi_observatory_type_meteorological">Meteorolóxico</string>
+	<string name="poi_observatory_type_gravitational">Gravitacional</string>
+
+	<string name="poi_greenhouse_horticulture">Horticultura no invernadoiro</string>
+
+	<string name="poi_generator_output_electricity">Potencia da saída</string>
+	<string name="poi_generator_output_electricity_yes">Saída: eletricidade</string>
+	<string name="poi_generator_output_hot_water">Potencia da saída de auga quente</string>
+	<string name="poi_generator_output_hot_water_yes">Saída: auga quente</string>
+	<string name="poi_generator_output_steam_yes">Saída: vapor</string>
+	<string name="poi_generator_output_hot_air_yes">Saída: ar quente</string>
+	<string name="poi_generator_output_cold_water_yes">Saída: auga fría</string>
+	<string name="poi_generator_output_compressed_air">Potencia da saída de ar comprimido</string>
+	<string name="poi_generator_output_compressed_air_yes">Saída: ar comprimido</string>
+	<string name="poi_generator_output_vacuum_yes">Saída: baleiro</string>
+	<string name="poi_generator_output_biogas">Potencia da saída de biogás</string>
+	<string name="poi_generator_output_biogas_yes">Saída: biogás</string>
+
+	<string name="poi_pumping_station">Estación do bombeo</string>
+
+	<string name="poi_display_no">Pantalla: non</string>
+	<string name="poi_display_analog_yes">Pantalla analóxica</string>
+	<string name="poi_display_digital_yes">Pantalla dixital</string>
+	<string name="poi_display_sundial_yes">Reloxo de sol</string>
+
+	<string name="poi_barometer_yes">Barómetro</string>
+	<string name="poi_barometer_no">Barómetro: non</string>
+	<string name="poi_thermometer_yes">Termómetro</string>
+	<string name="poi_thermometer_no">Termómetro: non</string>
+	<string name="poi_hygrometer_yes">Higrómetro</string>
+	<string name="poi_hygrometer_no">Higrómetro: non</string>
+	<string name="poi_support_pole">Subxección: poste</string>
+	<string name="poi_support_wall_mounted">Subxección: muro</string>
+	<string name="poi_support_tree">Subxección: árbore</string>
+	<string name="poi_support_pedestal">Subxección: pedestal</string>
+	<string name="poi_support_ground">Subxección: chan</string>
+	<string name="poi_support_billboard">Subxección: cateleira</string>
+	<string name="poi_support_ceiling">Subxección: teito</string>
+	<string name="poi_support_suspended">Subxección: pendurado</string>
+	<string name="poi_support_roof">Subxección: tellado</string>
+	<string name="poi_support_tower">Subxección: torre</string>
+
+	<string name="poi_passenger_information_display_no">Pantalla da información ó pasaxeiro: non</string>
+
+	<string name="poi_aquaculture">Acuicultura</string>
+	<string name="poi_aquaculture_shrimp">Acuicultura: camarón</string>
+	<string name="poi_aquaculture_fish">Acuicultura: peixes</string>
+	<string name="poi_aquaculture_mussels">Acuicultura: mexillóns</string>
+
+	<string name="poi_mdf">Rede da distribución principal (MDF)</string>
+	<string name="poi_min_age">Idade mínima</string>
+
+	<string name="poi_organic_no">Non</string>
+	<string name="poi_organic_only">Soamente</string>
+
+	<string name="poi_traffic_mirror">Espello de tráfico</string>
+
+	<string name="poi_diplomatic_consulate">Consulado</string>
+    <string name="poi_craft_confectionery">Elaboración de doces e confeitaría</string>
+    <string name="poi_shop_wholesale">Tenda maiorista</string>
+    <string name="poi_books_type">Libros</string>
+    <string name="poi_laboratory">Laboratorio médico</string>
+    <string name="poi_blood_donation">Doazón de sangue</string>
+    <string name="poi_books_comic">Banda deseñada</string>
+    <string name="poi_books_antiquarian">Anticuario</string>
+    <string name="poi_books_religion">Relixión</string>
+    <string name="poi_books_academic">Académico</string>
+    <string name="poi_books_children">Infantís</string>
+    <string name="poi_atoll">Atol</string>
+    <string name="poi_denotation">Denotación</string>
+    <string name="poi_toll_gantry">Caseto de portaxe</string>
+    <string name="poi_childcare">Coidado de nenos</string>
+    <string name="poi_denotation_natural_monument">Monumento da natureza</string>
+    <string name="poi_denotation_landmark">Referencia terrestre</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index dd94f861f3..b9bdda65b9 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -1,14 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="fav_point_dublicate_message">O nome do Favorito xa está en uso, mudado a \"%1$s\" para evita-la duplicación.</string>
     <string name="text_size_descr">Configura-lo tamaño da letra no mapa.</string>
     <string name="text_size">Tamaño da letra</string>
-    <string name="traffic_warning_speed_limit">Límite de velocidade</string>
+    <string name="traffic_warning_speed_limit">Límite da velocidade</string>
     <string name="traffic_warning_border_control">Control fronteirizo</string>
-    <string name="traffic_warning_payment">Portaxe</string>
+    <string name="traffic_warning_payment">Portaxe ou peaxe</string>
     <string name="traffic_warning_stop">Sinal de stop</string>
-    <string name="traffic_warning_speed_camera">Radar</string>
+    <string name="traffic_warning_speed_camera">Radar de velocidade</string>
     <string name="speak_favorites">Favoritos pretos</string>
-	<string name="speak_poi">Puntos de interese próximos</string>
+	<string name="speak_poi">Puntos de interese (PDI) pretos</string>
 	
 	
 	
@@ -19,7 +19,7 @@
     
     
     <string name="traffic_warning_calming">Lomba</string>
-    <string name="traffic_warning">Aviso de tráfico</string>
+    <string name="traffic_warning">Aviso do tráfico</string>
 	<string name="way_alarms">Avisos de tráfico</string>
 	<string name="background_service_is_enabled_question">O servizo do OsmAnd está aínda en execución. Desexas detelo tamén\?</string>
 	<string name="sleep_mode_stop_dialog">Deter o modo de segundo plano do GPS?</string>
@@ -34,20 +34,20 @@
 	<string name="save_current_track_descr">Garda a pista actual coma ficheiro GPX agora.</string>
 	<string name="save_current_track">Garda-la pista actual</string>
 	<string name="save_track_to_gpx">Rexistra-la pista de xeito automático durante a navigación</string>
-	<string name="save_track_to_gpx_descrp">Unha pista do GPX gardarase de xeito automático no cartafol das pistas durante a navigación.</string>
+	<string name="save_track_to_gpx_descrp">Unha pista do GPX gárdarase de xeito automático no cartafol das pistas durante a navigación.</string>
 	<string name="save_track_interval_globally">Intervalo de rexistro</string>
-	<string name="save_track_interval">Intervalo de rexistro durantea a navegación</string>
+	<string name="save_track_interval">Intervalo de rexistro durante a navegación</string>
 	<string name="save_track_interval_descr">Elixi-lo intervalo do rexistro das pistas durante a navigación.</string>
 	<string name="voice_provider_descr">Escolle a voz das indicacións para a navigación.</string>
-	<string name="voice_provider">Orientación por voz</string>
-	<string name="rendering_attr_publicTransportMode_name">Rotas dos buses, trolebúses e lanzadeiras</string>
+	<string name="voice_provider">Indicacións por voz</string>
+	<string name="rendering_attr_publicTransportMode_name">Liñas dos buses, trolebúses e lanzadeiras</string>
 	
 	
 	
     <string name="monitoring_settings">Gravación de viaxes</string>
     <string name="monitoring_settings_descr">Configure de que xeito gravar as súas viaxes.</string>
-    <string name="record_plugin_description">Este engadido activa a funcionalidade de gravar e garda-as pistas premendo o trebello de rexistro de GPX na pantalla do mapa ou tamén de rexistrar de xeito automático tódalas rotas de navegación nun ficheiro GPX.
-\n
+    <string name="record_plugin_description">Este engadido activa a funcionalidade de gravar e garda-las pistas premendo o trebello de rexistro de GPX na pantalla do mapa ou tamén de rexistrar de xeito automático tódalas rotas de navegación nun ficheiro GPX. 
+\n 
 \nAs pistas gravadas pódense compartir ou empregar colaborando co OSM. Os atletas poden empregar pistas gravadas para estudar os seus adestramentos. Co OsmAnd é posíbel realizar directamente algunhas análises básicas, coma tempos, velocidade media, etc. e as pistas tamén pódense analizar posteriormente con ferramentas de análise de terceiros.</string>
     <string name="record_plugin_name">Gravación de viaxes</string>
     <string name="int_hour">h</string>
@@ -58,10 +58,10 @@
     <string name="shared_string_waypoints">Puntos de pasaxe</string>
     
     
-    <string name="download_additional_maps">Descargar os mapas que faltan, %1$s (%2$d MB)?</string>
+    <string name="download_additional_maps">Baixar os mapas que fallan, %1$s (%2$d MB)\?</string>
     <string name="shared_string_more">Máis…</string>
     <string name="rendering_value_browse_map_name">Ollar mapa</string>  
-    <string name="rendering_value_car_name">Coche</string>
+    <string name="rendering_value_car_name">Automóbil</string>
     <string name="rendering_value_bicycle_name">Bicicleta</string>
     <string name="rendering_value_pedestrian_name">A pé</string>
     <string name="rendering_attr_coloredBuildings_name">Edificios cun código de cores segundo o seu tipo</string>
@@ -70,7 +70,7 @@
     
     <string name="continue_navigation">Continuar coa navegación</string>
     <string name="pause_navigation">Deter a navegación</string>
-    <string name="rendering_attr_subwayMode_name">Rotas dos metros</string>
+    <string name="rendering_attr_subwayMode_name">Liñas do metro</string>
  	<string name="keep_navigation_service">Manter</string>
 	<string name="gps_wake_up_timer">Intervalo para espertar o GPS</string>
 	<string name="map_preferred_locale_descr">Lingua preferida para os nomes no mapa (de non estaren dispoñíbeis pasará ó inglés ou ás linguas locais).</string>
@@ -95,9 +95,9 @@
     <string name="rendering_attr_moreDetailed_name">Máis detalles</string>
     <string name="rendering_attr_lessDetailed_name">Menos detalles</string>
     <string name="rendering_attr_hideAccess_name">Restricións de acceso</string>
-    <string name="rendering_attr_showAccess_name">Amosar restricións do acceso e portaxes</string>
-    <string name="rendering_attr_showSurfaceGrade_name">Amosar calidade da estrada</string>
-    <string name="rendering_attr_showSurfaces_name">Amosar superficie da estrada</string>
+    <string name="rendering_attr_showAccess_name">Amosar restricións do acceso e portaxes ou peaxes</string>
+    <string name="rendering_attr_showSurfaceGrade_name">Amosar calidade das estradas</string>
+    <string name="rendering_attr_showSurfaces_name">Amosar superficie das estradas</string>
     <string name="rendering_attr_showCycleRoutes_name">Amosar ciclovías</string>
     
     
@@ -110,8 +110,8 @@
     
     
     
-    <string name="no_index_file_to_download">Non foi posíbel atopar descargas; comproba a túa conexión á Internet.</string>
-    <string name="select_index_file_to_download">Non se atopou ren. Se non dá atopado a súa rexión, pódea facer vostede mesmo (vexa https://osmand.net).</string>
+    <string name="no_index_file_to_download">Non foi posíbel atopar as baixadas; comproba a túa conexión á Internet.</string>
+    <string name="select_index_file_to_download">Non se atopou ren. Se non dás atopado a túa rexión, a podes facer ti mesmo (ollar https://osmand.net).</string>
     <string name="none_selected_gpx">Sen ficheiros GPX seleccionados. Mantén premido para escoller un.</string>
     
     <string name="local_index_select_gpx_file">Escolle para amosar</string>
@@ -122,10 +122,10 @@
     <string name="show_zoom_buttons_navigation_descr">Amosa-los botóns de achegamento durante a navegación.</string>
     <string name="show_zoom_buttons_navigation">Amosa-los botóns de achegamento</string>
     <string name="save_as_favorites_points">Gardar coma grupo dos Favoritos</string>
-    <string name="select_destination_and_intermediate_points">Seleccionar destinos</string>
+    <string name="select_destination_and_intermediate_points">Escolla os destinos</string>
     <string name="layer_amenity_label">Nomes dos PDI sobrepostos</string>
     <string name="loading_smth">A cargar %1$s…</string>
-    <string name="map_widget_plain_time">Hora actual</string>
+    <string name="map_widget_plain_time">Tempo actual</string>
     <string name="shared_string_waypoint">Punto de pasaxe</string>
     <string name="selected_gpx_info_show">"
 \n
@@ -183,7 +183,7 @@
 	
 	<string name="rendering_value_pink_name">rosa</string>
 	
-	<string name="rendering_value_brown_name">marrón</string>
+	<string name="rendering_value_brown_name">Marrón</string>
 	
 	
 	
@@ -309,19 +309,19 @@
     <string name="calculate_osmand_route_without_internet">Cálculo sen conexión do segmento da rota do OsmAnd</string>
     <string name="gpx_option_calculate_first_last_segment">Calcula-la rota do OsmAnd para o primeiro e o derradeiro segmento</string>
     <string name="use_displayed_track_for_navigation">Desexa empregar a pista amosada para a navegación\?</string>
-    <string name="keep_and_add_destination_point">Engadir coma derradeiro destino</string>
-    <string name="select_gpx">Seleccionar GPX…</string>
-    <string name="route_descr_select_destination">Seleccionar destino</string>
+    <string name="keep_and_add_destination_point">Engadir coma seguinte destino</string>
+    <string name="select_gpx">Elixir GPX…</string>
+    <string name="route_descr_select_destination">Elixir destino</string>
     <string name="shared_string_select_on_map">Seleccionar no mapa</string>
     <string name="shared_string_favorite">Favorito</string>
     <string name="route_preferences">Preferencias da rota</string>
     <string name="route_info">Información da rota</string>
-    <string name="routing_attr_prefer_motorway_name">Preferir as autoestradas</string>
+    <string name="routing_attr_prefer_motorway_name">Preferi-las autoestradas</string>
 	<string name="routing_attr_prefer_motorway_description">Preferi-las autoestradas</string>
 	
 	
-	<string name="routing_attr_avoid_toll_name">Evita-las estradas de portaxe</string>
-	<string name="routing_attr_avoid_toll_description">Evita-las estradas de portaxe</string>
+	<string name="routing_attr_avoid_toll_name">Evita-las estradas de portaxe ou peaxe</string>
+	<string name="routing_attr_avoid_toll_description">Evita-las estradas de portaxe ou peaxe</string>
 	<string name="routing_attr_avoid_unpaved_name">Evita-las estradas sen asfaltar</string>
 	<string name="routing_attr_avoid_unpaved_description">Evita-las estradas sen asfaltar.</string>
 	<string name="routing_attr_avoid_ferries_name">Evita-los ferris</string>
@@ -330,7 +330,7 @@
 	<string name="routing_attr_avoid_motorway_description">Evita-las autoestradas</string>
 	<string name="routing_attr_weight_name">Peso máximo</string>
 	<string name="routing_attr_weight_description">Indica o peso do vehículo permitido nos itinerarios.</string>
-    <string name="android_19_location_disabled">Dende a versión 4.4 (KitKat) non é posíbel descargar e actualiza-los mapas no lugar de almacenaxe anterior (%s). Desexa mudar cara un sitio con permiso e copiar nel tódolos ficheiros\? Nota 1: Os ficheiros antigos fican sen seren tocados (poden ser eliminados de xeito manual). Nota 2: No novo almacenaxe non é posíbel partillar ou compartir ficheiros entre o OsmAnd e ó OsmAnd+.</string>
+    <string name="android_19_location_disabled">Dende a versión 4.4 (KitKat) non é posíbel baixar e actualiza-los mapas no lugar de almacenaxe anterior (%s). Desexas mudar cara un sitio con permiso e copiar nel tódolos ficheiros\? Nota 1: Os ficheiros antigos fican sen ser tocados (poden ser eliminados de xeito manual). Nota 2: No novo almacenaxe non é posíbel partillar ou compartir ficheiros entre o OsmAnd e o OsmAnd+.</string>
     
     <string name="copying_osmand_one_file_descr">Estase a copia-lo ficheiro (%s) ó seu novo destino…</string>
     <string name="copying_osmand_files_descr">Estase a copia-los ficheiros do OsmAnd ó seu novo destino (%s)…</string>
@@ -342,7 +342,7 @@
     <string name="speech_rate_descr">Indica-la velocidade na que fala o TTS.</string>
     <string name="speech_rate">Velocidade da fala</string>
     
-    <string name="complex_route_calculation_failed">Fallou o cálculo axiña da rota (%s), voltando para cálculo lento.</string>
+    <string name="complex_route_calculation_failed">Fallou o cálculo rápido da rota (%s), voltando para cálculo lento.</string>
     <string name="disable_complex_routing_descr">Desactiva-lo cálculo da rota de dúas fases para a navigación no automóbil.</string>
     <string name="disable_complex_routing">Desactivar navigación complexa</string>
     <string name="amenity_type_seamark">Baliza</string>
@@ -356,7 +356,7 @@
     <string name="app_mode_aircraft">Aeronave</string>
     
     
-    <string name="local_osm_changes_delete_all_confirm">Está a piques de eliminar %1$d cambios en OSM. Confírmao?</string>
+    <string name="local_osm_changes_delete_all_confirm">Está a piques de eliminar %1$d mudanzas no OSM. Confírmao\?</string>
     <string name="shared_string_delete_all">Eliminar todo</string>
     <string name="animate_routing_route_not_calculated">Calcula-la rota primeiro</string>
     <string name="animate_routing_route">"Simular empregando a rota calculada "</string>
@@ -367,9 +367,9 @@
     <string name="shared_string_or">ou</string>
 	
 	<string name="auto_zoom_none">Sen achegamento de xeito automático</string>
-	<string name="auto_zoom_close">A primeiro plano</string>
-	<string name="auto_zoom_far">A media distancia</string>
-	<string name="auto_zoom_farthest">A longa distancia</string>
+	<string name="auto_zoom_close">Cara o primeiro plano</string>
+	<string name="auto_zoom_far">Cara a media distancia</string>
+	<string name="auto_zoom_farthest">Cara a longa distancia</string>
 	<string name="map_magnifier">Achegamento do mapa</string>
 	<string name="base_world_map">Mapa base mundial</string>
 	
@@ -379,12 +379,12 @@
     <string name="about_settings_descr">Información sobre a versión, licenzas, participantes no proxecto</string>
 
     
-    <string name="local_index_tile_data_zooms">Achegamentos descargados: %1$s</string>
+    <string name="local_index_tile_data_zooms">Achegamentos baixados: %1$s</string>
     <string name="local_index_tile_data_expire">Caducidade (minutos): %1$s</string>
-    <string name="local_index_tile_data_downloadable">Descargábel: %1$s</string>
+    <string name="local_index_tile_data_downloadable">Baixábel: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Achegamento máximo: %1$s</string>
     <string name="local_index_tile_data_minzoom">Achegamento mínimo: %1$s</string>
-    <string name="local_index_tile_data_name">Datos das deselas: %1$s</string>
+    <string name="local_index_tile_data_name">Datos das teselas: %1$s</string>
     <string name="edit_tilesource_successfully">A fonte das teselas \"%1$s\" foi gardada</string>
     <string name="edit_tilesource_elliptic_tile">Mercator elíptico</string>
     <string name="edit_tilesource_maxzoom">Achegamento máximo</string>
@@ -404,9 +404,9 @@
     <string name="speak_title">Anunciar…</string>
 	<string name="speak_descr">Configura-lo anuncio dos nomes das rúas, os avisos de tráfico (detencións forzosas, bandas sonoras), os avisos de radar e os límites de velocidade.</string>
 	<string name="speak_street_names">Nomes das rúas (TTS)</string>
-    <string name="speak_speed_limit">Límite de velocidade</string>
-    <string name="speak_cameras">Radares de velocidade</string>
-	<string name="speak_traffic_warnings">Avisos de tráfico</string>
+    <string name="speak_speed_limit">Límite da velocidade</string>
+    <string name="speak_cameras">Radares da velocidade</string>
+	<string name="speak_traffic_warnings">Avisos do tráfico</string>
     
     <string name="osb_author_or_password_not_specified">Indique o usuario e contrasinal no OSM nos \"Axustes\"</string>
     <string name="clear_intermediate_points">Limpar os destinos intermedios</string>
@@ -423,10 +423,10 @@
 	
 	<string name="app_mode_default">Ollar mapa</string>
 	<string name="settings_preset">Perfil predeterminado</string>
-	<string name="settings_preset_descr">A vista do mapa e as opcións de navegación son lembradas segundo cada perfil de usuario. Indique aquí o seu perfil predeterminado.</string>
+	<string name="settings_preset_descr">A vista do mapa e as opcións da navegación son lembradas segundo cada perfil de usuario. Velaquí escolla o seu perfil predeterminado.</string>
     <string name="destination_point">Destino %1$s</string>
     <string name="context_menu_item_destination_point">Estabelecer como destino</string>
-    <string name="please_select_address">Seleccione primeiro a cidade ou rúa</string>
+    <string name="please_select_address">Escolla primeiro a cidade ou rúa</string>
     
     <string name="search_street_in_neighborhood_cities">Procura das rúas nas poboacións viciñas</string>
     <string name="intermediate_items_sort_return">Orde optimizada dos destinos intermedios no itinerario cara o destino.</string>
@@ -458,16 +458,16 @@
     <string name="wait_current_task_finished">Agarde até que remate a tarefa actual</string>
     <string name="use_kalman_filter_compass_descr">Diminúe o ruído nas lecturas do compás mais engade inercia.</string>
     <string name="use_kalman_filter_compass">Empregar o filtro Kalman</string>
-    <string name="use_magnetic_sensor_descr">Para a lectura do compás, emprega o sensor magnético en lugar do sensor da orientación.</string>
+    <string name="use_magnetic_sensor_descr">Para a lectura do compás, emprega o sensor magnético no canto do sensor da orientación.</string>
     <string name="use_magnetic_sensor">Empregar o sensor magnético</string>
     <string name="other_location">Outra</string>
     <string name="files_limit">Fican %1$d ficheiros</string>
-    <string name="available_downloads_left">%1$d ficheiros restantes para descarregar</string>
+    <string name="available_downloads_left">Aínda fican %1$d ficheiros para baixar</string>
     <string name="install_paid">Versión completa</string>
     <string name="cancel_route">Rexeitar rota</string>
     <string name="cancel_navigation">Para-la navigación</string>
     <string name="clear_destination">Limpar o destino</string>
-    <string name="download_using_mobile_internet">Non está conectado a unha rede Wi-Fi. Emprega-la conexión actual á Internet para descarregar\?</string>
+    <string name="download_using_mobile_internet">Non estás conectado a unha rede Wi-Fi. Emprega-la conexión actual á Internet para baixar\?</string>
     <string name="street_name">Nome da rúa</string>
 	<string name="hno">Número do edificio</string>
     <string name="website">Sitio web</string>
@@ -478,7 +478,7 @@
     <string name="choose_osmand_theme_descr">Escolle-lo aspecto do aplicativo.</string>
     <string name="choose_osmand_theme">Tema do aplicativo</string>
     <string name="accessibility_options">Opcións de accesibilidade</string>
-    <string name="select_address_activity">Seleccionar o enderezo</string>
+    <string name="select_address_activity">Elixi-lo enderezo</string>
     <string name="favourites_list_activity">Elixir Favorito</string>
     <string name="local_openstreetmap_act_title">Modificacións de OSM</string>
     <string name="shared_string_more_actions">Outras accións</string>
@@ -486,12 +486,12 @@
     <string name="layer_hillshade">Capa de sombreado</string>
     <string name="map_widget_gps_info">Información sobre o GPS</string>
     
-    <string name="access_arrival_time">Hora de chegada</string>
+    <string name="access_arrival_time">Hora da chegada</string>
     <string name="item_checked">escollido</string>
     <string name="item_unchecked">non escollido</string>
     <string name="shared_string_map">Mapa</string>
     <string name="prefer_motorways">Preferir as autoestradas</string>
-	<string name="prefer_in_routing_title">Preferir…</string>
+	<string name="prefer_in_routing_title">Prefirir…</string>
 	<string name="prefer_in_routing_descr">Preferir empregar autoestradas.</string>
     <string name="max_speed_none">none</string>
     <string name="index_name_openmaps">OpenMaps EU</string>
@@ -502,7 +502,7 @@
     
     <string name="local_indexes_cat_srtm">Curvas de nivel</string>
     <string name="local_indexes_cat_av">Datos de son/vídeo</string>
-    <string name="stop_routing_confirm">Confirma que desexa parar a navegación?</string>
+    <string name="stop_routing_confirm">Está na certeza de que desexa dete-la navigación\?</string>
     <string name="clear_dest_confirm">Confirma que desexa limpar o destino (e os destinos intermedios)?</string>
     <string name="precise_routing_mode_descr">Calcular rutas precisas sen interferencias. Aínda está limitado polas distancias e é tardo.</string>
     <string name="precise_routing_mode">Navigación precisa (alfa)</string>
@@ -512,10 +512,10 @@
     <string name="recording_context_menu_precord">Fotografar</string>
     <string name="dropbox_plugin_description">O engadido do Dropbox permite sincronizar pistas e notas de son/vídeo cunha conta do Dropbox.</string>
     <string name="dropbox_plugin_name">Engadido do Dropbox</string>
-    <string name="intermediate_points_change_order">Cambiar a orde</string>
+    <string name="intermediate_points_change_order">Muda-la orde</string>
     <string name="srtm_paid_version_msg">Considere a posibilidade de merca-lo engadido das \"Curvas do nivel\" para así contribuíres co desenvolvemento.</string>
     <string name="srtm_paid_version_title">Engadido das curvas do nivel</string>
-    <string name="av_def_action_choose">Seleccionar ao ser pedido</string>
+    <string name="av_def_action_choose">Elixi-la petición</string>
     <string name="av_def_action_video">Gravar vídeo</string>
     <string name="av_def_action_audio">Gravar son</string>
     <string name="av_widget_action_descr">Elixi-la acción predeterminada do trebello.</string>
@@ -560,18 +560,18 @@
     <string name="audionotes_plugin_name">Notas de son/vídeo</string>
     <string name="index_srtm_parts">partes</string>
     <string name="index_srtm_ele">Curvas de nivel</string>
-    <string name="srtm_plugin_description">Este engadido fornece unha capa de sobreposición das curvas do nivel e unha capa de sombras da altitude (relevo) que poden ser amosadas nos mapas sen conexión do OsmAnd. Esta funcionalidade pode ser moi apreciada por atletas, camiñantes, sendeiristas e calquera que teña interese pola estrutura de relevo da paisaxe. (Teña en conta que as curvas do nivel e/u os datos do relevo están dispoñíbeis en descarregas adicionais separadas logo de activares o engadido.) 
-\n
-\nOs datos globais (entre os 70 graos norte e os 70 graos sul) están baseados nas medicións de SRTM (Misión Topográfica con Radar da Lanzadeira Espacial) e ASTER (Radiómetro Espacial Avanzado de Emisión Térmica e Reflexión) e instrumentos de imaxes a bordo do Terra, o satélite máis importante do Sistema de Observación Terrestre da NASA. ASTER é un esforzo cooperativo entre a NASA, o Ministerio de Economía do Xapón, Comercio e Industria (METI) e Sistemas Espaciais Xaponeses (J-spaceystems).</string>
+    <string name="srtm_plugin_description">Este engadido fornece unha capa de sobreposición das curvas do nivel e unha capa de sombras da altitude (relevo) que poden ser amosadas nos mapas sen conexión do OsmAnd. Esta funcionalidade pode ser moi apreciada por atletas, camiñantes, sendeiristas e calquera que teña interese pola estrutura de relevo da paisaxe. (Ten en conta que as curvas do nivel e/ou os datos do relevo están dispoñíbeis en baixadas adicionais separadas logo de activares o engadido.) 
+\n 
+\nOs datos globais (entre os 70 graos norte e os 70 graos sul) están baseados nas medicións do SRTM (Misión Topográfica con Radar da Lanzadeira Espacial) e o ASTER (Radiómetro Espacial Avanzado de Emisión Térmica e Reflexión) e instrumentos de imaxes a bordo do Terra, o satélite máis importante do Sistema de Observación Terrestre da NASA. O ASTER é un esforzo cooperativo entre a NASA, o Ministerio de Economía do Xapón, Comercio e Industria (METI) e Sistemas Espaciais Xaponeses (J-spaceystems).</string>
     <string name="srtm_plugin_name">Curvas do nivel</string>
     <string name="download_select_map_types">Outros mapas</string>
     <string name="download_roads_only_item">Só as estradas</string>
     <string name="download_srtm_maps">Curvas de nivel</string>
     <string name="download_regular_maps">Mapa normal</string>
     <string name="download_roads_only_maps">Mapa só de estradas</string>
-    <string name="rendering_attr_alpineHiking_name">Escala de excursionismo alpino (SAC)</string>
+    <string name="rendering_attr_alpineHiking_name">Escala de sendeirismo alpino (SAC)</string>
     <string name="rendering_attr_alpineHiking_description">Amosar rotas seguindo a escala SAC.</string>
-    <string name="rendering_attr_hikingRoutesOSMC_name">Sobreposición de símbolos de sendeirismo</string>
+    <string name="rendering_attr_hikingRoutesOSMC_name">Sobreposición dos símbolos de sendeirismo</string>
     <string name="rendering_attr_hikingRoutesOSMC_description">Renderiza-los camiños segundo as pistas do OSMC.</string>
     
 	<string name="rendering_attr_noAdminboundaries_name">Fronteiras</string>
@@ -581,7 +581,7 @@
     
 	
 	
-    <string name="map_widget_max_speed">Límite de velocidade</string>
+    <string name="map_widget_max_speed">Límite da velocidade</string>
     <string name="monitoring_control_start">GPX</string>
     <string name="no_buildings_found">Non se atopou ningún edificio.</string>
     <string name="incremental_search_city">Procurar cidades a incrementos</string>
@@ -595,7 +595,7 @@
     
     <string name="close_changeset">Fecha-lo conxunto de trocos</string>
 	<string name="zxing_barcode_scanner_not_found">O dixitalizador do códigos de barras ZXing non está instalado. Quéreo procurar na Google Play\?</string>
-	<string name="rendering_attr_roadColors_description">Seleccionar un esquema de cores de estrada:</string>
+	<string name="rendering_attr_roadColors_description">Escoller un esquema de cores das estradas:</string>
 	<string name="rendering_attr_roadColors_name">Esquema de cores de estrada</string>
     <string name="map_widget_show_destination_arrow">Amosar en que dirección está o destino</string>
     <string name="enable_plugin_monitoring_services">Permitir que o engadido da gravación de viaxes empregue os servizos de rexistro da posición (rexistro do GPX, seguemento na rede)</string>
@@ -609,17 +609,17 @@
     <string name="intermediate_point">Destino intermedio %1$s</string>
     <string name="context_menu_item_last_intermediate_point">Engadir como último destino intermedio</string>
     <string name="context_menu_item_first_intermediate_point">Engadir como primeiro destino intermedio</string>
-    <string name="add_as_last_destination_point">Engadir como último destino intermedio</string>
-    <string name="add_as_first_destination_point">Engadir como primeiro destino intermedio</string>
+    <string name="add_as_last_destination_point">Engadir coma derradeiro destino intermedio</string>
+    <string name="add_as_first_destination_point">Engadir coma primeiro destino intermedio</string>
 
-    <string name="replace_destination_point">Substituír o destino</string>
+    <string name="replace_destination_point">Substituí-lo destino</string>
     <string name="new_destination_point_dialog">Xa existe un destino:</string>
     <string name="shared_string_target_points">Destinos</string>
     <string name="intermediate_point_too_far">O destino intermedio %1$s está demasiado lonxe da estrada máis preta.</string>
-    <string name="arrived_at_intermediate_point">Chegou ao destino intermedio</string>
+    <string name="arrived_at_intermediate_point">Chegou ó destino intermedio</string>
     <string name="context_menu_item_intermediate_point">Engadir un destino intermedio</string>
     <string name="map_widget_intermediate_distance">Destino intermedio</string>
-    <string name="ending_point_too_far">O punto final está demasiado lonxe da estrada máis próxima.</string>
+    <string name="ending_point_too_far">O derradeiro punto está moi lonxe da estrada máis preta.</string>
     <string name="add_tag">Engadir unha etiqueta</string>
     <string name="btn_advanced_mode">Modo avanzado…</string>
     <string name="poi_filter_parking">Aparcamento</string>
@@ -641,59 +641,96 @@
 	<string name="auto_zoom_map_descr">Varia-lo achegamento do mapa segundo a velocidade (mentres o mapa estiver sincronizado ca ubicación actual).</string>
 	<string name="auto_zoom_map">Achegamento automático do mapa</string>
 	<string name="snap_to_road_descr">Axusta-la ubicación ás estradas durante a navigación.</string>
-	<string name="snap_to_road">Aferrar á estrada</string>
-	<string name="interrupt_music_descr">O aviso por voz, pausa a reprodución da música (non só baixa o volume).</string>
+	<string name="snap_to_road">Axustar á estrada</string>
+	<string name="interrupt_music_descr">O aviso por voz, detén a reprodución da música (non só baixa o volume).</string>
 	<string name="interrupt_music">Deter a música</string>
 	
 	<string name="osmand_play_title_30_chars">Mapas e navegación OsmAnd</string>
 	<string name="osmand_short_description_80_chars">Visualización e navegación móbil de mapas globais para mapas de OSM con e sen conexión</string>
-	<string name="osmand_long_description_1000_chars">"OsmAnd (Indicacións de navegación automatizadas do OSM)
+	<string name="osmand_long_description_1000_chars">"OsmAnd (Indicacións de navegación automatizadas do OSM) 
 \n
-\n  OsmAnd é un aplicativo de navegación de código aberto con acceso a unha ampla variedade de datos globais do OpenStreetMap (OSM). Tódolos mapas dos datos (mapas vectoriais ou teselas) poden seren almacenados no cartón de memoria do teléfono móbil para empregalos sen conexión. OsmAnd tamen fornece funcionalidade de cálculo de rotas sen conexión, incluíndo a guía por voz paso a paso.
+\n 
 \n
-\n  Algunhas das funcionalidades principais:
-\n  - Funcionalidade completa sen conexión (os mapas vectoriais ou de teselas descargados almacénanse no cartafol que se seleccione)
-\n  - Mapas vectoriais compactos sen conexión para todo o mundo
-\n  - Pódense descargar mapas de países ou rexións directamente dende o aplicativo
-\n  - É posíbel sobrepor varias capas de mapas, como pistas de GPX ou de navegación, puntos de interese, favoritos, curvas do nivel, paraxes de transporte público ou mapas adicionais con transparencia regulábel.
-\n  - Procura sen conexión dos enderezos e lugares (PDI)
-\n  - Cálculo de rotas sen conexión para distancias curtas (experimental)
-\n  - Modos para coche, bicicleta e peóns, con:
-\n  - Vistas de día e noite automatizadas opcionais
-\n  - Achegamento opcional do mapa dependendo da velocidade
-\n  - Aliñamento opcional do mapa dependendo do compás ou da dirección do movemento
-\n  - Guía opcional de faixas ou carrís da estrada, límites de velocidade e voces gravadas e TTS
+\n  O OsmAnd é un aplicativo de navegación de código aberto con acceso a unha ampla variedade de datos globais do OpenStreetMap (OSM). Tódolos mapas dos datos (mapas vectoriais ou teselas) poden seren almacenados no cartón de memoria do teléfono móbil para empregalos sen conexión. O OsmAnd tamen fornece a funcionalidade de cálculo de rotas sen conexión, incluíndo a guía por voz paso a paso. 
 \n
-\n  Limitacións desta versión de balde do OsmAnd:
-\n  - O número de mapas descargados está limitado
-\n  - Non hai acceso ós puntos de interese (PDI) da Wikipedia sen conexión
+\n 
 \n
-\n  OsmAnd está a ser desenvolvido activamente e o noso proxecto e o seu progreso futuro depende da contribución financeira para financiar o desenvolvemento e as probas das funcionalidades novas. Considere a posibilidade de comprar OsmAnd+ ou de financiar funcionalidades novas específicas ou de realizar unha doazón xeral no osmand.net."</string>
+\n  Algunhas das funcións principais: 
+\n
+\n  - Funcionalidade completa sen conexión (os mapas vectoriais ou de teselas baixados almacénanse no cartafol que se escolla) 
+\n
+\n  - Mapas vectoriais compactos sen conexión para todo o mundo 
+\n
+\n  - Pódense baixar mapas de países ou rexións de xeito directo dende o aplicativo 
+\n
+\n  - É posíbel sobrepór varias capas de mapas, coma pistas de GPX ou de navegación, puntos de interese (PDI), favoritos, curvas do nivel, paraxes de transporte público ou mapas adicionais con transparencia regulábel. 
+\n
+\n  - Procura sen conexión dos enderezos e lugares (PDI) 
+\n
+\n  - Cálculo de rotas sen conexión para distancias curtas (experimental) 
+\n
+\n  - Modos para automóbil, bicicleta e peóns, con: 
+\n
+\n  - Vistas de día e noite automatizadas opcionais 
+\n
+\n  - Achegamento opcional do mapa dependendo da velocidade 
+\n
+\n  - Aliñamento opcional do mapa dependendo do compás ou da dirección do movemento 
+\n
+\n  - Guía opcional de faixas ou carrís da estrada, límites de velocidade, voces gravadas e TTS 
+\n
+\n 
+\n
+\n  Limitacións desta versión de balde do OsmAnd: 
+\n
+\n  - O número de mapas a baixar está limitado 
+\n
+\n  - Non hai acceso ós puntos de interese (PDI) da Wikipedia sen conexión 
+\n
+\n 
+\n
+\n  O OsmAnd está a ser desenvolvido activamente e o noso proxecto e o seu progreso futuro depende da contribución financeira para financia-lo desenvolvemento e as probas das funcionalidades novas. Coida a posibilidade de merca-lo OsmAnd+ ou de financiar funcións novas específicas ou de facer unha doazón xeral no osmand.net."</string>
 	
 	<string name="osmand_plus_play_title_30_chars">Mapas e navegación de OsmAnd+</string>
 	<string name="osmand_plus_short_description_80_chars">Visualización e navegación móbil de mapas globais para mapas de OSM con e sen conexión</string>
-	<string name="osmand_plus_long_description_1000_chars">"O OsmAnd+ (Indicacións da navigación automatizadas do OSM) é un aplicativo de navegación de código aberto con acceso a unha ampla variedade de datos globais do OpenStreetMap (OSM). Tódolos mapas dos datos (mapas vectoriais ou teselas) poden seren almacenados no cartón de memoria do teléfono para empregalos sen conexión. OsmAnd tamén fornece funcionalidade de cálculo de rotas sen conexión, incluíndo a guía por voz paso a paso. 
+	<string name="osmand_plus_long_description_1000_chars">"O OsmAnd+ (Indicacións da navigación automatizadas do OSM) é un aplicativo de navegación de código aberto con acceso a unha ampla variedade de datos globais do OpenStreetMap (OSM). Tódolos mapas dos datos (mapas vectoriais ou teselas) poden seren almacenados no cartón de memoria do teléfono para empregalos sen conexión. O OsmAnd tamén fornece funcionalidade de cálculo de rotas sen conexión, incluíndo a guía por voz paso a paso. 
 \n
-\nO OsmAnd+ é a versión de pagamento, mais ó mercala vostede apoia o proxecto, financia o desenvolvemento de funcionalidades novas e recibe as últimas actualizacións. \t\t \t\t
+\n 
+\n 
 \n
-\nAlgunhas das funcionalidades principais:
+\nO OsmAnd+ é a versión de pagamento, mais ó mercala estás a apoia-lo proxecto, financia-lo desenvolvemento de funcións novas e tes a oportunidade de recibi-las últimas actualizacións. \t\t \t\t 
+\n
+\n 
+\n
+\nAlgunhas das funcións principais son: 
+\n
+\n 
+\n
+\n- Funcionalidade completa sen conexión (os mapas vectoriais ou de teselas baixados almacénanse no cartafol que se escolleu) 
+\n
+\n-Mapas vectoriais compactos sen conexión para todo o mundo. 
+\n
+\n-Pódense baixar mapas de países ou rexións de xeito directo dende o aplicativo. 
+\n
+\n-É posíbel sobrepór varias capas de mapas, coma pistas de GPX ou de navegación, puntos de interese (PDI), favoritos, curvas do nivel, paraxes de transporte público ou mapas adicionais con transparencia regulábel. \t\t - Procura sen conexión de enderezos e lugares (PDI). 
+\n
+\n-Cálculo de rotas sen conexión para distancias curtas (distancias medias) \t\t - Modos para automóbil, bicicleta e peóns, con: 
+\n
+\n-Vistas de noite e día automatizadas opcionais. 
+\n
+\n-Achegamento opcional do mapa dependendo da velocidade 
+\n
+\n-Aliñamento opcional do mapa dependendo do compás ou da dirección do movemento. 
+\n
+\n-Guía opcional de faixas ou carrís da estrada, límites de velocidade, voces gravadas e TTS 
 \n
-\n- Funcionalidade completa sen conexión (os mapas vectoriais ou de teselas descargados almacénanse no cartafol que se seleccionado)
-\n-Mapas vectoriais compactos sen conexión para todo o mundo.
-\n-Pódense descargar mapas de países ou rexións directamente dende o aplicativo.
-\n-É posíbel sobrepor varias capas de mapas, como pistas de GPX ou de navegación, puntos de interese, favoritos, curvas do nivel, paradas de transporte público ou mapas adicionais con transparencia regulábel. \t\t - Procura sen conexión de enderezos e lugares (PDI).
-\n-Cálculo de rotas sen conexión para distancias curtas (distancias medias) \t\t - Modos para coche, bicicleta e peóns, con:
-\n-Vistas de noite e día automatizadas opcionais.
-\n-Achegamento opcional do mapa dependendo da velocidade
-\n-Aliñamento opcional do mapa dependendo do compás ou da dirección do movemento.
-\n-Guía opcional de faixas ou carrís da estrada, límites de velocidade e voces gravadas e TTS
 \n "</string>
 	
 	
 	
 	<string name="filterpoi_activity">Crear un filtro de PDI</string>
 	<string name="recalculate_route_to_your_location">Modode transporte:</string>
-	<string name="select_navigation_mode">Seleccionar o modo de transportemode</string>
+	<string name="select_navigation_mode">Elixi-lo xeito de transporte</string>
 	<string name="day_night_info_description">Amencer: %1$s
 \nSolpor: %2$s</string>
 	<string name="day_night_info">Información sobre o día e a noite</string>
@@ -701,11 +738,11 @@
 	<string name="map_widget_vector_attributes">Atributos de renderizado</string>
 	<string name="map_widget_renderer">Estilo do mapa</string>
 	<string name="layer_map_appearance">Configura-la pantalla</string>
-	<string name="show_lanes">Amosar carrís da estrada</string>
+	<string name="show_lanes">Faixas ou carrís</string>
 	<string name="avoid_unpaved">Evita-las estradas sen asfaltar</string>
 	<string name="avoid_ferries">Evita-los ferris</string>
 	<string name="avoid_in_routing_title">Evitar…</string>
-	<string name="avoid_in_routing_descr">Evitar estradas de portaxe, sen asfaltar ou ferris e outros.</string>
+	<string name="avoid_in_routing_descr">Evitar estradas de portaxe ou peaxe, sen asfaltar ou ferris e outros.</string>
 	<string name="map_widget_fluorescent">Rotas fluorescentes</string>
 	<string name="map_widget_show_ruler">Regra</string>
 	<string name="map_widget_view_direction">Dirección da vista</string>
@@ -729,7 +766,7 @@
 	<string name="map_widget_speed">Velocidade</string>
 	<string name="map_widget_distance">Destino</string>
 	<string name="map_widget_altitude">Altitude</string>
-	<string name="map_widget_time">Tempo que falta</string>
+	<string name="map_widget_time">Tempo para chegar</string>
 	<string name="map_widget_next_turn">Manobra seguinte</string>
 	<string name="map_widget_next_turn_small">Manobra seguinte (pequena)</string>
 	<string name="map_widget_next_next_turn">Segunda manobra seguinte</string>
@@ -738,9 +775,9 @@
 	<string name="bg_service_screen_unlock">Desbloquear a pantalla</string>
 	<string name="bg_service_screen_lock_toast">A pantalla está bloqueada</string>
 	<string name="bg_service_interval">Estabelecer o intervalo para espertar:</string>
-	<string name="show_cameras">Amosar radares de velocidade</string>
-	<string name="show_traffic_warnings">Amosar avisos do tráfico</string>
-	<string name="avoid_toll_roads">Evita-las estradas de portaxe</string>
+	<string name="show_cameras">Radares da velocidade</string>
+	<string name="show_traffic_warnings">Avisos do tráfico</string>
+	<string name="avoid_toll_roads">Evita-las estradas de portaxe ou peaxe</string>
 	<string name="continue_follow_previous_route_auto">Desexa continua-la navigación anterior non rematada\? (%1$s segundos)</string>
 	<string name="route_updated_loc_found">Estase a agarda-la ubicación para calcula-la rota</string>
 	<string name="osmand_parking_hours">Horas</string>
@@ -754,13 +791,13 @@
 \nMemoria proporcional %4$s MB (O límite do Android é %5$s MB, Dalvik %6$s MB).</string>
 	<string name="native_app_allocated_memory">Memoria nativa total</string>
 	
-	<string name="starting_point_too_far">O punto de partida está demasiado lonxo da estrada máis próxima.</string>
+	<string name="starting_point_too_far">O punto de comezo está demasiado lonxe da estrada máis preta.</string>
 	<string name="shared_location">Localización partillada ou compartida</string>
-	<string name="osmand_parking_event">Recoller o coche de onde está aparcado</string>
+	<string name="osmand_parking_event">Recolle-lo automóbil de onde está aparcado</string>
 	<string name="osmand_parking_warning">Aviso</string>
 	<string name="osmand_parking_warning_text">Con anterioridade engadiuse ó calendario unha notificación para que recolla o seu automóbil. Ficará nel até que se elimine de xeito manual.</string>    
 	<string name="osmand_parking_time_limit_title">Estabelece-lo tempo límite do aparcamento</string>
-	<string name="osmand_parking_delete_confirm">Elimina-la localización do aparcamento\?</string>
+	<string name="osmand_parking_delete_confirm">Elimina-la posición do aparcamento\?</string>
 	<string name="osmand_parking_delete">Elimina-la marcaxe de aparcamento</string>
 	<string name="osmand_parking_choose_type">Escoller o tipo de aparcamento</string>
 	<string name="osmand_parking_lim_text">Tempo limitado</string>
@@ -768,14 +805,14 @@
 	<string name="osmand_parking_add_event">Engadir unha notifación á aplicación do calendario</string>
 	<string name="osmand_parking_time_limit">Aparcamento de tempo limitado</string>
 	<string name="osmand_parking_time_no_limit">Aparcamento de tempo ilimitado</string>
-	<string name="osmand_parking_position_description">A localización do coche aparcado. %1$s</string>
+	<string name="osmand_parking_position_description">A posición do automóbil aparcado. %1$s</string>
 	<string name="osmand_parking_position_description_add">Recolle-lo automóbil ás:</string>
 	<string name="osmand_parking_pm">PM</string>
 	<string name="osmand_parking_am">AM</string>
-	<string name="osmand_parking_position_name">Localización do aparcamento</string>
-	<string name="osmand_parking_plugin_description">O engadido da localización do aparcamento permite gardar onde se deixou aparcado o coche e canto tempo falla (se hai un límite temporal). Tanto a localización coma o tempo son visíbeis no taboleiro de control do OsmAnd, así coma nun trebello na pantalla do mapa. Pódeselle engadir unha alarma ó calendario do Android coma lembranza.</string>
-	<string name="osmand_parking_plugin_name">Localización do aparcamento</string>
-	<string name="context_menu_item_add_parking_point">Marcar coma localización do aparcamento</string>
+	<string name="osmand_parking_position_name">Posición do aparcamento</string>
+	<string name="osmand_parking_plugin_description">O engadido da posición do aparcamento permite gardar onde se deixou aparcado o automóbil e canto tempo falla (se hai un límite temporal). Tanto a posición coma o tempo son visíbeis no taboleiro de control do OsmAnd, así coma nun trebello na pantalla do mapa. Pódeselle engadir unha alarma ó calendario do Android coma lembranza.</string>
+	<string name="osmand_parking_plugin_name">Posición do aparcamento</string>
+	<string name="context_menu_item_add_parking_point">Marcar coma posición do aparcamento</string>
 	<string name="context_menu_item_delete_parking_point">Eliminar marcaxe de aparcamento</string>
 	<string name="gpxup_public">Público</string>
 	<string name="gpxup_identifiable">Identificábel</string>
@@ -809,27 +846,27 @@
 	<string name="left_side_navigation_descr">Para os países nos que se conduza pola esquerda da estrada.</string>
 	<string name="local_index_description">Prema en calquera elemento existente para ollar máis detalles, manteña premido para desactivar ou eliminar. Datos actualmente no dispositivo (%1$s libre):</string>
 	<string name="unknown_from_location">Punto de partida aínda non determinado</string>
-	<string name="unknown_location">A posición é aínda descoñecida</string>
+	<string name="unknown_location">A ubicación é aínda descoñecida</string>
 	<string name="modify_transparency">Modificar a transparencia (0 - transparente, 255 - opaco)</string>
-	<string name="confirm_interrupt_download">Desexa desbota-la descarga dos ficheiros\?</string>
-	<string name="first_time_msg">Grazas por emprega-lo OsmAnd. Para moitas das funcionalidades deste aplicativo fan falla algúns datos rexionais sen conexión que poden ser descarregados dende «Axustes» → «Xestionar os ficheiros de mapas». Posteriormente é posíbel ollar mapas, atopar enderezos, consultar puntos de interese (PDI) e atopar transporte público.</string>    
-	<string name="basemap_was_selected_to_download">Marcouse para descarrega-lo mapa base, para que a aplicación funcione.</string>
-	<string name="local_indexes_cat_tile">Mapas con conexión e en teselas descargadas</string>
+	<string name="confirm_interrupt_download">Desexas desbota-la baixada dos ficheiros\?</string>
+	<string name="first_time_msg">Grazas por emprega-lo OsmAnd. Para moitas das funcións deste aplicativo fan falla algúns datos rexionais sen conexión que poden ser baixados dende «Axustes» → «Xestiona-los ficheiros de mapas». Despois é posíbel ollar mapas, atopar enderezos, consultar puntos de interese (PDI) e atopar transporte público.</string>    
+	<string name="basemap_was_selected_to_download">Marcouse para baixa-lo mapa base, para que a aplicación funcione.</string>
+	<string name="local_indexes_cat_tile">Mapas con conexión e en teselas baixadas</string>
 	<string name="local_indexes_cat_map">Mapas normais (vectoriais)</string>
-	<string name="index_settings_descr">Descarregar e xestionar mapas sen conexión almacenados no dispositivo.</string>
-	<string name="map_online_plugin_is_not_installed">Activa-lo engadido dos mapas con conexión para seleccionares fontes de mapas diferentes</string>
+	<string name="index_settings_descr">Baixar e xestionar mapas sen conexión almacenados no dispositivo.</string>
+	<string name="map_online_plugin_is_not_installed">Activa-lo engadido dos mapas con conexión para escolleres fontes de mapas diferentes</string>
 	<string name="map_online_data">Mapas con conexión e en teselas</string>
-	<string name="map_online_data_descr">Empregar mapas con conexión (descargar e garda-las teselas no cartón SD).</string>
+	<string name="map_online_data_descr">Empregar mapas con conexión (baixar e garda-las teselas no cartón SD).</string>
 	<string name="shared_string_online_maps">Mapas con conexión</string>
 	<string name="online_map_settings_descr">Configura-las fontes das teselas dos mapas con conexión ou gardados temporalmente na caché.</string>
 	
 	
-	<string name="osmand_rastermaps_plugin_description">Con este engadido pódese acceder a moitos tipos de mapas da rede (chamados teselas ou ráster), dende teselas predefinidas do OpenStreetMap (coma Mapnik) a imaxes do satélite e capas para propósitos determinados, coma mapas climatolóxicos, mapas xeolóxicos, capas co sombreado das pendentes, etc.
-\n
-\n
-\nCalquera destes mapas pode ser empregado coma mapa principal (base) para que apareza na pantalla dos mapas do OsmAnd ou coma unha superposición doutro mapa base (coma os mapas sen conexión normais do OsmAnd). Para que un mapa submetido sexa máis visíbel algúns elementos dos mapas vectoriais do OsmAnd poden ser agochados sinxelamente mediante o menú «Configura-lo mapa».
-\n
-\n
+	<string name="osmand_rastermaps_plugin_description">Con este engadido pódese acceder a moitos tipos de mapas da rede (chamados teselas ou ráster), dende teselas predefinidas do OpenStreetMap (coma o Mapnik) a imaxes do satélite e capas para propósitos determinados, coma mapas climatolóxicos, mapas xeolóxicos, capas co sombreado das pendentes, etc. 
+\n 
+\n 
+\nCalquera destes mapas pode ser empregado coma mapa principal (base) para que apareza na pantalla dos mapas do OsmAnd ou coma unha sobreposición doutro mapa base (coma os mapas sen conexión normais do OsmAnd). Para que un mapa submetido sexa máis visíbel algúns elementos dos mapas vectoriais do OsmAnd poden ser agochados sinxelamente mediante o menú «Configura-lo mapa». 
+\n 
+\n 
 \nOs mapas en teselas pódense obter directamente a través de recursos na rede ou poden ser preparados para seren empregados sen conexión (e copiarse manualmente a un cartafol de datos do OsmAnd) coma base de datos SQLite, que pode ser xerada con diversas ferramentas de preparación de mapas de terceiros.</string>
 	
 	<string name="osmand_accessibility_description">Este engadido pon as funcións da accesibilidade do dispositivo a disposición directamente dende o OsmAnd. Fai máis doado que, por exemplo, se poida axusta-la velocidade da fala nas voces do TTS, configurase a navegación da pantalla, emprégase unha bola de desprazamento para controla-lo achegamento ou se empregue a resposta de texto a fala, coma cando se anuncia de xeito automático a posición.</string>
@@ -848,7 +885,7 @@
 	<string name="debugging_and_development">Desenvolvemento do OsmAnd</string>
 	<string name="native_rendering">Renderizado nativo</string>
 	<string name="test_voice_prompts">Probar as instrucións de voz</string>    
-	<string name="switch_to_raster_map_to_see">Non hai mapas vectoriais presentes para esta localización. Pode descarregar un en \"Axustes\" (Xestionar ficheiros mapas) ou mude ós mapas con conexión (active o engadido dos mapas en liña para isto).</string>
+	<string name="switch_to_raster_map_to_see">Non hai mapas vectoriais presentes para esta localización. Podes baixar un nos \"Axustes\" (Xestionar ficheiros mapas) ou muda ós mapas con conexión (activa o engadido dos mapas en liña para isto).</string>
 	
 	<string name="send_files_to_osm">Enviar ficheiros GPX a OSM?</string>
 	<string name="gpx_visibility_txt">Visibilidade</string>
@@ -866,7 +903,7 @@
 	<string name="accessibility_mode">Modo de accesibilidade</string>
 	<string name="accessibility_mode_descr">Activa as funcionalidades para usuarios con discapacidade.</string>
 	<string name="shared_string_on">Activar</string>
-	<string name="shared_string_off">Desactivado</string>
+	<string name="shared_string_off">Non</string>
 	<string name="accessibility_default">Segundo os axustes do sistema Android</string>
 	<string name="backToMenu">Voltar ó menú</string>
 	<string name="zoomOut">Afastar</string>
@@ -916,15 +953,15 @@
     <string name="arrival_distance_factor_normally">Normal</string>
     <string name="arrival_distance_factor_late">Tardo</string>
     <string name="arrival_distance_factor_at_last">Nos derradeiros metros</string>
-    <string name="arrival_distance">Anuncio de chegada</string>
-    <string name="arrival_distance_descr">Con que antelación desexa o anuncio de chegada?</string>
+    <string name="arrival_distance">Anuncio da chegada</string>
+    <string name="arrival_distance_descr">Cando desexa o anuncio da chegada\?</string>
     <string name="rendering_out_of_memory">Non abonda a memoria do procesamento para amosa-la área escollida</string>
 	<string name="use_fluorescent_overlays">Sobreposicións fluorescentes</string>
 	<string name="use_fluorescent_overlays_descr">Empregar cores fluorescentes para amosa-las pistas e rotas.</string>
 	<string name="offline_edition">Edición sen conexión</string>
 	<string name="offline_edition_descr">Empregar sempre a edición sen conexión.</string>
 	
-	<string name="update_poi_does_not_change_indexes">As mudanzas nos puntos de interese (PDI) dentro do aplicativo non afectan ós ficheiros dos mapas descarregados, pois esas mudanzas gárdanse coma un ficheiro no teu dispositivo.</string>
+	<string name="update_poi_does_not_change_indexes">As mudanzas nos puntos de interese (PDI) dentro do aplicativo non afectan ós ficheiros dos mapas baixados, pois esas mudanzas gárdanse coma un ficheiro no teu dispositivo.</string>
 	<string name="local_openstreetmap_uploading">Estase a subir…</string>
 	<string name="local_openstreetmap_were_uploaded">Enviáronse {0} PDI/Notas</string>
 	<string name="local_openstreetmap_uploadall">Actualizar todo</string>
@@ -941,7 +978,7 @@
 	<string name="gpx_monitoring_disabled_warn">Rexistre a pista empregando o trebello de GPX ou mediante as opcións de «Gravación de viaxe».</string>
 	<string name="show_current_gpx_title">Amosar pista actual</string>
 	    
-	<string name="free_version_message">Podes descargar ou actualizar %1$s mapas.</string>
+	<string name="free_version_message">Podes baixar ou actualizar %1$s mapas.</string>
 	<string name="free_version_title">Versión libre</string>
 	<string name="poi_context_menu_showdescription">Amosar descrición do punto de interese (PDI).</string>
 	<string name="index_name_north_america">Norteamérica</string>
@@ -974,7 +1011,7 @@
 	<string name="open_street_map_login_descr">Precísase para os envíos cara a openstreetmap.org.</string>
 	<string name="user_password">O seu contrasinal en OSM</string>
 	
-	<string name="osmand_service">Modo de segundo plano</string>
+	<string name="osmand_service">Modo no segundo plano</string>
 	<string name="osmand_service_descr">O OsmAnd execútase no segundo plano ca pantalla apagada.</string>
 	
 	
@@ -983,29 +1020,29 @@
 		
 	
 	
-	<string name="download_files_not_enough_space">Non fica moito espazo libre para descargar %1$s MB (libre: %2$s).</string>
-	<string name="download_files_question_space">Descarregar {0} ficheiros(s)\? O espazo do almacenaxe empregado é de {1} MB. (O espazo dispoñíbel é de {2} MB.)</string>
+	<string name="download_files_not_enough_space">Non fica moito espazo libre para baixar %1$s MB (libre: %2$s).</string>
+	<string name="download_files_question_space">Baixar {0} ficheiros(s)\? O espazo do almacenaxe empregado é de {1} MB. (O espazo dispoñíbel é de {2} MB.)</string>
 	
 	<string name="use_transparent_map_theme">Tema transparente</string>
 	<string name="native_library_not_supported">A bibioteca nativa non é compatíbel con este dispositivo.</string>
 	<string name="init_native_library">A inicializar a biblioteca nativa …</string>
-	<string name="choose_auto_follow_route">Centrar automaticamente a vista do mapa</string>
+	<string name="choose_auto_follow_route">Centrar de xeito automático a vista do mapa</string>
 	<string name="choose_auto_follow_route_descr">Tempo até que a vista do mapa volva a sincronizarse ca ubicación actual.</string>
 	
-	<string name="keep_informing_never">Nunca</string>
+	<string name="keep_informing_never">Só de xeito manual (prema a frecha)</string>
     <string name="keep_informing_descr">Anunciar de novo as instrucións de navigación a intervalos regulares.</string>
-    <string name="keep_informing">Repetir as instrucións de navegación</string>
+    <string name="keep_informing">Repeti-las instrucións da navigación</string>
 	<string name="auto_follow_route_navigation">Centrar automaticamente só ao navegar</string>
 	<string name="auto_follow_route_navigation_descr">Centrar automaticamente a vista do mapa só ao navegar.</string>
-	<string name="auto_follow_location_enabled">Centrar automaticamente a vista do mapa en uso.</string>
+	<string name="auto_follow_location_enabled">Centrar de xeito automático a vista do mapa en emprego.</string>
 	<string name="pref_vector_rendering">Opcións específicas do rendereizador vectorial</string>
 	<string name="pref_overlay">Sobreposición / submisión</string>
 	<string name="pref_raster_map">Axustes da fonte do mapa</string>
 	<string name="pref_vector_map">Axustes dos mapas vectoriais</string>
 	<string name="delete_confirmation_msg">Eliminar %1$s?</string>
-	<string name="city_type_suburb">Zona residencial</string>
-	<string name="city_type_hamlet">Lugar</string>
-	<string name="city_type_village">Vila pequena</string>
+	<string name="city_type_suburb">Barrio</string>
+	<string name="city_type_hamlet">Aldea</string>
+	<string name="city_type_village">Vila</string>
 	<string name="city_type_town">Vila grande</string>
 	<string name="city_type_city">Cidade</string>
 	
@@ -1019,9 +1056,9 @@
 	<string name="data_to_search_poi_not_available">Non hai datos locais presentes para procurar puntos de interese.</string>
 	<string name="poi_filter_by_name">Procurar polo nome</string>
 	<string name="old_poi_file_should_be_deleted">O ficheiro de datos do PDI «%1$s» é redundante e pode ser eliminado.</string>
-	<string name="update_poi_file_not_found">Non foi posíbel atopar un ficheiro local para manter os cambios nos PDI e tampouco foi posíbel crealo.</string>
+	<string name="update_poi_file_not_found">Non foi posíbel atopar un ficheiro local para mante-las mudanzas nos PDI e tampouco foi posíbel crealo.</string>
 	<string name="button_upgrade_osmandplus">Actualizar OsmAnd+</string>
-	<string name="map_version_changed_info">Descarrega a nova versión da aplicación, para poder emprega-los novos ficheiros dos mapas.</string>
+	<string name="map_version_changed_info">Baixa a nova versión da aplicación, para poder emprega-los novos ficheiros dos mapas.</string>
 	<string name="shared_string_rename">Mudar o nome</string>
 	
 	<string name="poi_filter_nominatim">Nominatim con conexión</string>
@@ -1056,8 +1093,8 @@
 	<string name="shared_string_name">Nome</string>
 	<string name="favourites_edit_dialog_category">Categoría</string>
 	<string name="shared_string_no_thanks">Non, grazas</string>
-	<string name="basemap_missing">Descarga o mapa base mundial para una ollada xeral global nos achegamentos pequenos.</string>
-	<string name="vector_data_missing">Descarrega os datos («sen conexión») para emprega-los mapas sen conexión.</string>
+	<string name="basemap_missing">Baixa o mapa base mundial para una ollada xeral global nos achegamentos pequenos.</string>
+	<string name="vector_data_missing">Baixa os datos («sen conexión») para emprega-los mapas sen conexión.</string>
 	<string name="local_index_installed">Versión local</string>
 	<string name="local_index_items_backuped">%1$d elemento(s) de %2$d foron desactivados.</string>
 	<string name="local_index_items_deleted">%1$d elemento(s) de %2$d foron eliminados.</string>
@@ -1070,7 +1107,7 @@
 	
 	
 	
-	<string name="shared_string_download">Descargar</string>
+	<string name="shared_string_download">Baixar</string>
 	<string name="local_index_poi_data">Datos de PDI</string>
 	<string name="local_index_address_data">Datos de enderezos</string>
 	<string name="local_index_transport_data">Datos de transporte público</string>
@@ -1090,24 +1127,24 @@
 	
 	
 	
-	<string name="installing_new_resources">A desempaquetar datos novos…</string>
-	<string name="internet_connection_required_for_online_route">Hai un servizo de navigación con conexión seleccionado mais non hai ningunha conexión á Internet.</string>
+	<string name="installing_new_resources">Estasen a desempaquetar datos novos…</string>
+	<string name="internet_connection_required_for_online_route">Hai un servizo de navigación con conexión seleccionadoo, mais non hai ningunha conexión á Internet.</string>
 	<string name="tts_language_not_supported_title">Esta lingua non está dispoñíbel</string>
-	<string name="tts_language_not_supported">A lingua seleccionada non está dispoñíbel no motor TTS (texto lido) do Android. Desexa procurar outro motor do TTS na Google Play\? Se non, tense que emprega-la lingua do TTS predeterminado.</string>
+	<string name="tts_language_not_supported">A lingua elixida non está dispoñíbel no motor TTS (texto lido) do Android. Desexa procurar outro motor do TTS na Google Play\? Se non, tense que emprega-la lingua do TTS predeterminado.</string>
 	<string name="tts_missing_language_data_title">faltan datos</string>
-	<string name="tts_missing_language_data">Ir cara a tenda de aplicacións para descarga-la lingua elixida\?</string>
-	<string name="gpx_option_reverse_route">Inverter a dirección do GPX</string>
+	<string name="tts_missing_language_data">Ir á tenda de aplicacións para baixa-la lingua elixida\?</string>
+	<string name="gpx_option_reverse_route">Inverte-la dirección do GPX</string>
 	<string name="gpx_option_destination_point">Empregar o destino actual</string>
-	<string name="gpx_option_from_start_point">Pasar por toda a pista</string>
+	<string name="gpx_option_from_start_point">Percorrer toda a pista</string>
 	<string name="switch_to_vector_map_to_see">Hai un mapa vectorial sen conexión para este sitio.
 \n\t
 \n\tPara empregalo active «Menú» → «Configura-lo mapa» → «Fonte dos mapas…» → «Mapas vectoriais sen conexión».</string>
-	<string name="choose_audio_stream">Saída da orientación por voz</string>
+	<string name="choose_audio_stream">Saída das indicacións por voz</string>
 	<string name="choose_audio_stream_descr">Escolle-la canle pola que reproduci-las indicacións por voz.</string>
 	<string name="voice_stream_voice_call">Son de chamada telefónica (tamén nos altavoces estéreos co Bluetooth)</string>
 	<string name="voice_stream_notification">Son de notificaión</string>
 	<string name="voice_stream_music">Son de música</string>
-	<string name="warning_tile_layer_not_downloadable">O aplicativo non pode descarga-la capa do mapa \"%1$s\"; tente reinstalala, podería axudar.</string>
+	<string name="warning_tile_layer_not_downloadable">O aplicativo non pode baixa-la capa do mapa \"%1$s\"; tenta reinstalala, podería axudar.</string>
 	<string name="overlay_transparency_descr">Modifica-la transparencia da sobreposición.</string>
 	<string name="overlay_transparency">Transparencia da sobreposición</string>
 	<string name="map_transparency_descr">Modifica-la transparencia do mapa base.</string>
@@ -1150,14 +1187,14 @@
 	<string name="si_mi_feet">Millas/pés</string>
 	<string name="si_mi_yard">Millas/iardas</string>
 	<string name="si_km_m">Quilómetros/metros</string>
-	<string name="yard">yd</string>
-	<string name="foot">ft</string>
-	<string name="mile_per_hour">mph</string>
+	<string name="yard">id</string>
+	<string name="foot">pés</string>
+	<string name="mile_per_hour">mi/h</string>
 	<string name="mile">mi</string>
 	<string name="send_location_way_choose_title">Partillar ou comparti-la localización empregando</string>
 	<string name="send_location_sms_pattern">Localización: %1$s
 \n%2$s</string>
-	<string name="send_location_email_pattern">Para ver a localización siga a ligazón do navigador web %1$s ou a ligazón do Android %2$s</string>
+	<string name="send_location_email_pattern">Para ollar a localización segue a ligazón do navigador web %1$s ou a ligazón do Android %2$s</string>
 	<string name="send_location">Envia-la localización</string>
 	<string name="context_menu_item_share_location">Partillar ou comparti-la localización</string>
 	<string name="add_waypoint_dialog_added">O punto de pasaxe do GPX «{0}» foi engadido de xeito correcto</string>
@@ -1209,32 +1246,32 @@
 	
 	<string name="osmand_net_previously_installed">Tódolos datos sen conexión na versión vella do OsmAnd son compatíbeis ca nova versión, pero os puntos dos Favoritos deben exportarse dende a versión viella e despois, importarse na nova.</string>
 	<string name="build_installed">A compilación {0} foi instalada ({1}).</string>
-	<string name="downloading_build">A descargar a compilación…</string>
+	<string name="downloading_build">Estase a baixa-la compilación…</string>
 	<string name="install_selected_build">Instala-lo OsmAnd - {0} de {1} {2} MB\?</string>
-	<string name="loading_builds_failed">Fallou a obtención da lista de compilacións de OsmAnd</string>
+	<string name="loading_builds_failed">Fallou a obtención da listaxe das compilacións do OsmAnd</string>
 	<string name="loading_builds">A cargar as compilacións de OsmAnd…</string>
-	<string name="select_build_to_install">Seleccione a compilación de OsmAnd que desexe instalar</string>
+	<string name="select_build_to_install">Elixi-la compilación do OsmAnd que desexe instalar</string>
 	<string name="gps_status_app_not_found">A aplicación de estado do GPS non está instalado. Desexa procuralo na Google Play\?</string>
-	<string name="voice_is_not_available_msg">A orientación por voz non está dispoñíbel. Vaia a «Axustes» → «Xeral» →«Indicacións con voz» e seleccione ou descargue un paquete de datos de voz.</string>
-	<string name="voice_is_not_available_title">A orientación por voz non está seleccionada</string>
-	<string name="daynight_mode_day">Diúrno</string>
+	<string name="voice_is_not_available_msg">A orientación por voz non está dispoñíbel. Vai ós «Axustes» → «Xeral» →«Indicacións con voz» e escolle ou baixa un paquete de datos de voz.</string>
+	<string name="voice_is_not_available_title">A orientación por voz non está elixida</string>
+	<string name="daynight_mode_day">Día</string>
 	<string name="daynight_mode_night">Noite</string>
 	<string name="daynight_mode_auto">Amencer/Solpor</string>
 	<string name="daynight_mode_sensor">Sensor luminoso</string>
 	<string name="daynight_descr">Escolle o motivo do mudado entre o modo noite e o día.</string>
 	<string name="daynight">Modo día ou noite</string>
-	<string name="download_files_question">Descargar {0} ficheiro(s) ({1} MB)?</string>
-	<string name="items_were_selected">{0} elemento(s) seleccionados</string>
-	<string name="filter_existing_indexes">Descargado</string>
+	<string name="download_files_question">Baixar {0} ficheiro(s) ({1} MB)\?</string>
+	<string name="items_were_selected">{0} elemento(s) seleccionado(s)</string>
+	<string name="filter_existing_indexes">Baixados</string>
 	
-	<string name="shared_string_select_all">Seleccionar todo</string>
+	<string name="shared_string_select_all">Selecciónao todo</string>
 	<string name="shared_string_refresh">Anovar</string>
-	<string name="fast_route_mode">Itinerario máis rápido</string>
-	<string name="fast_route_mode_descr">Active isto para calcula-la rota máis axiña ou desactíveo para a máis eficiencia no combustíbel.</string>
-	<string name="tiles_to_download_estimated_size">No achegamento {0}, descarregar {1} teselas ({2} MB)</string>
-	<string name="shared_string_download_map">Descargar mapa</string>
+	<string name="fast_route_mode">Rota máis rápida</string>
+	<string name="fast_route_mode_descr">Active isto para calcula-la rota máis rápida ou desactíveo para a máis eficiencia no combustíbel.</string>
+	<string name="tiles_to_download_estimated_size">No achegamento {0}, baixar {1} teselas ({2} MB)</string>
+	<string name="shared_string_download_map">Baixar mapa</string>
 	<string name="select_max_zoom_preload_area">Escolle-lo achegamento máximo que precarregar</string>
-	<string name="maps_could_not_be_downloaded">Non foi posíbel descargar este mapa</string>
+	<string name="maps_could_not_be_downloaded">Non foi posíbel baixar este mapa</string>
 	<string name="continuous_rendering">Renderizado continuo</string>
 	<string name="continuous_rendering_descr">Amosar renderizado continuo no canto dunha imaxe de cada vez.</string>
 	<string name="rendering_exception">Non foi posíbel debuxa-la área elixida</string>
@@ -1281,7 +1318,7 @@
 	<string name="no_fav_to_save">Non hai puntos dos Favoritos que gardar</string>
 	<string name="shared_string_import">Importar</string>
 	
-	<string name="shared_string_share">Partillar ou compartir</string>
+	<string name="shared_string_share">Compartillar</string>
 	<string name="share_fav_subject">Favoritos compartidos mediante OsmAnd</string>
 	<string name="error_occurred_loading_gpx">Non foi posíbel carrega-los datos do GPX</string>
 	<string name="send_report">Send report</string>
@@ -1295,7 +1332,7 @@
 	<string name="shared_string_favorites">Favoritos</string>
 	<string name="layer_osm_bugs">Notas de OSM (con conexión)</string>
 	
-	<string name="layer_poi">Superposición do PDI…</string>
+	<string name="layer_poi">Sobreposición do PDI…</string>
 	<string name="layer_map">Fonte dos mapas…</string>
 	<string name="menu_layers">Capas do mapa</string>
 	<string name="context_menu_item_search_poi">Procurar PDI</string>
@@ -1305,7 +1342,7 @@
 	<string name="background_service_wait_int">Tempo de espera</string>
 	
 	<string name="where_am_i">Onde estou?</string>
-	<string name="process_navigation_service">OsmAnd navigation service</string>
+	<string name="process_navigation_service">Servizo de navigación do OsmAnd</string>
 	<string name="network_provider">Network</string>
 	<string name="gps_provider">GPS</string>
 	<string name="int_seconds">segundos</string>
@@ -1318,28 +1355,28 @@
 	<string name="off_router_service_no_gps_available">O servizo de navigación en segundo plano precisa que se active un fornecedor de localización.</string>
 	<string name="hide_poi_filter">Agochar o filtro</string>
 	<string name="show_poi_filter">Amosar filtro</string>
-	<string name="search_poi_filter">Filter</string>
+	<string name="search_poi_filter">Filtro</string>
 	<string name="menu_mute_off">O son está activado</string>
 	<string name="menu_mute_on">O son está desactivado</string>
 	<string name="voice_data_initializing">A inicializar os datos de voz…</string>
 	<string name="voice_data_not_supported">Esta versión dos datos de voz é incompatíbel</string>
 	<string name="voice_data_corrupted">Os datos de voz indicados están estragados</string>
-	<string name="voice_data_unavailable">Os datos de voz seleccionados non están dispoñíbeis</string>
+	<string name="voice_data_unavailable">Os datos de voz elixidos non están dispoñíbeis</string>
 	<string name="sd_unmounted">O cartón de memoria non está accesíbel.
 \nNon poderás ollar mapas nin atopar cousas.</string>
-	<string name="sd_mounted_ro">O cartón de memoria só pode ser lido.
-\nAgora só é posíbel olla-lo mapa precargado e non poden descarregarse novas áreas.</string>
+	<string name="sd_mounted_ro">O cartón de memoria só pode ser lido. 
+\nAgora só é posíbel olla-lo mapa precargado e non poden baixarse novas áreas.</string>
 	<string name="unzipping_file">A descomprimir o ficheiro…</string>
 	<string name="route_tr">Vire á dereita e continúe</string>
-	<string name="route_tshr">Vire bastante á dereita e continúe</string>
-	<string name="route_tslr">Vire lixeiramente á dereita e continúe</string>
+	<string name="route_tshr">Vire de xeito forte á dereita e continúe</string>
+	<string name="route_tslr">Vire de xeito lixeiro á dereita e continúe</string>
 	<string name="route_tl">Vire á esquerda e continúe</string>
-	<string name="route_tshl">Vire bastante á esquerda e continúe</string>
-	<string name="route_tsll">Vire lixeiramente á esquerda e continúe</string>
-	<string name="route_tu">Dea media volta e continúe</string>
-	<string name="route_head">Diríxase a</string>
+	<string name="route_tshl">Vire de xeito forte á esquerda e continúe</string>
+	<string name="route_tsll">Vire de xeito lixeiro á esquerda e continúe</string>
+	<string name="route_tu">Faga un cambio de sentido e continúe</string>
+	<string name="route_head">Diríxase cara</string>
 	<string name="first_time_continue">Despois</string>
-	<string name="first_time_download">Descargar rexións</string>
+	<string name="first_time_download">Baixar rexións</string>
 	<string name="search_poi_location">Estase a agarda-lo sinal…</string>
 	<string name="search_near_map">Procurar preto do centro actual do mapa</string>
 	<string name="search_nearby">Procurar preto</string>
@@ -1364,7 +1401,7 @@
 	<string name="transport">Transporte</string>
 	<string name="shared_string_ok">Feito</string>
 	<string name="show_transport_over_map_description">Amosar paraxes do transporte público no mapa.</string>
-	<string name="show_transport_over_map">Amosar paraxes de transporte</string>
+	<string name="show_transport_over_map">Amosar paraxes do transporte</string>
 	<string name="hello">OsmAnd, aplicativo de navigación</string>
 	<string name="update_poi_success">Os datos do PDI foron actualizados ({0} foron carregados)</string>
 	<string name="update_poi_error_local">Non é posíbel actualiza-la listaxe dos PDI locais</string>
@@ -1393,16 +1430,16 @@
 	<string name="max_level_download_tile_descr">Non procurar nas teselas dos mapas en liña para niveis do achegamento alén disto.</string>
 	<string name="route_general_information">Distancia total %1$s, tempo da viaxe %2$d h %3$d min.</string>
 	<string name="router_service_descr">Escoller un servizo da navigación con conexión ou sen ela.</string>
-	<string name="router_service">Navigation service</string>
+	<string name="router_service">Servizo de navigación</string>
 	<string name="sd_dir_not_accessible">O cartafol do almacenaxe dos datos na tarxeta da memoria non é accesíbel!</string>
 	<string name="download_question">Download {0} - {1} ?</string>
 	<string name="download_question_exist">Xa existen datos sen conexión ({1}) para {0}. Desexa actualizalos ({2})\?</string>
 	<string name="address">Enderezo</string>
-	<string name="shared_string_download_successful">Descarregado</string>
+	<string name="shared_string_download_successful">Baixouse</string>
 	
-	<string name="shared_string_downloading">A descargar</string>
+	<string name="shared_string_downloading">Estase a baixar</string>
 	
-	<string name="downloading_list_indexes">A descargar a lista de rexións dispoñíbeis…</string>
+	<string name="downloading_list_indexes">Estase a baixa-la listaxe das rexións dispoñíbeis…</string>
 	<string name="list_index_files_was_not_loaded">A listaxe das rexións non puido ser obtida dende https://osmand.net.</string>
 	
 	<string name="fav_points_edited">Editouse o punto favorito</string>
@@ -1447,7 +1484,7 @@
 	<string name="use_online_routing_descr">Emprega-la Internet para calcula-la rota.</string>
 	<string name="use_online_routing">Empregar a navegación con conexión</string>
 	<string name="osm_settings_descr">Indica-los axustes do OpenStreetMap.org (OSM) precisados para os envíos ó OSM.</string>
-	<string name="data_settings_descr">Indique a lingua, descargar/recargar datos.</string>
+	<string name="data_settings_descr">Indica a lingua, baixar/recarregar datos.</string>
 	<string name="data_settings">Data</string>
 	
 	<string name="osm_settings">Edición do OSM</string>
@@ -1472,16 +1509,16 @@
 	<string name="map_view_3d_descr">Activa-la vista 3D do mapa.</string>
 	<string name="map_view_3d">Vista do mapa en 3D</string>
 	<string name="show_poi_over_map_description">Amosa-los PDI no mapa (emprega-lo derradeiro filtro escollido).</string>
-	<string name="show_poi_over_map">Amosar superposición dos PDI</string>
+	<string name="show_poi_over_map">Amosar sobreposición dos PDI</string>
 	<string name="map_tile_source_descr">Escolle-la fonte das teselas do mapa con conexión ou gardadas de xeito temporal (na caché).</string>
-	<string name="map_tile_source">Fonte das deselas do mapa</string>
+	<string name="map_tile_source">Fonte das teselas do mapa</string>
 	<string name="map_source">Fonte do mapa</string>
 	<string name="use_internet">Emprega-la Internet</string>
 	<string name="show_location">Amosa-la súa ubicación</string>
 	
 	
 	<string name="show_gps_coordinates_text">Amosar coordenadas do GPS no mapa</string>
-	<string name="use_internet_to_download_tile">Descarrega-las teselas do mapa que fallen</string>
+	<string name="use_internet_to_download_tile">Baixa-las teselas do mapa que fallen</string>
 	<string name="app_description">Aplicativo de navigación</string>
 	<string name="shared_string_exit">Saír</string>
 	
@@ -1493,7 +1530,7 @@
 	<string name="search_POI_level_btn">Atopar máis</string>
 	<string name="incremental_search_street">Procurar rúas de xeito incremental</string>
 	<string name="incremental_search_building">Procurar edificios de xeito incremental</string>
-	<string name="choose_available_region">Escoller a rexión na lista</string>
+	<string name="choose_available_region">Escolle-la rexión na listaxe</string>
 	<string name="choose_intersected_street">Escoller a rúa transversal</string>
 	<string name="Closest_Amenities">Instalacións máis próximas</string>
 	<string name="app_mode_car">Automóbil</string>
@@ -1501,7 +1538,7 @@
 	<string name="app_mode_pedestrian">Peón</string>
 	<string name="position_on_map_center">Centro</string>
 	<string name="position_on_map_bottom">Abaixo</string>
-	<string name="navigate_point_top_text">Introduza a latitude e a lonxitude no formato seleccionado (D - graos, M - minutos, S - segundos)</string>
+	<string name="navigate_point_top_text">Insira a latitude e a lonxitude no formato elixido (D - graos, M - minutos, S - segundos)</string>
 	<string name="navigate_point_latitude">Latitude</string>
 	<string name="navigate_point_longitude">Lonxitude</string>
 	<string name="navigate_point_format_D">DDD.DD</string>
@@ -1509,7 +1546,7 @@
 	<string name="navigate_point_format_DMS">DDD MM SS.SS</string>
 	<string name="shared_string_show_on_map">Amosar no mapa</string>
 	
-	<string name="search_address_top_text">Seleccionar o enderezo</string>
+	<string name="search_address_top_text">Elixi-lo enderezo</string>
 	<string name="search_address_region">Rexión</string>
 	<string name="search_address_city">Cidade</string>
 	<string name="search_address_street">Rúa</string>
@@ -1557,21 +1594,21 @@
 	<string name="shared_string_delete">Eliminar</string>
 	<string name="poi_remove_success">O PDI foi eliminado</string>
 	<string name="poi_action_add">engadir</string>
-	<string name="poi_action_change">cambiar</string>
+	<string name="poi_action_change">mudar</string>
 	<string name="poi_action_succeded_template">A acción {0} foi completada.</string>
 	<string name="poi_error_unexpected_template">Non foi posíbel realiza-la acción {0}.</string>
 	<string name="poi_error_io_error_template">Erro do E/S ó realiza-la acción {0}.</string>
 	<string name="poi_error_info_not_loaded">A información sobre o nó non foi cargada</string>
 	<string name="poi_dialog_opening_hours">Aberto</string>
 	<string name="poi_dialog_comment">Comentario</string>
-	<string name="poi_dialog_comment_default">Cambio de PDI</string>
+	<string name="poi_dialog_comment_default">Mudanza do PDI</string>
 	<string name="poi_dialog_other_tags_message">O resto das etiquetas consérvase</string>
 	<string name="default_buttons_commit">Enviar</string>
 	<string name="shared_string_clear">Limpar</string>
-	<string name="filter_current_poiButton">Filtrar</string>
+	<string name="filter_current_poiButton">Filtro</string>
 	
-	<string name="edit_filter_save_as_menu_item">Gardar como</string>
-	<string name="edit_filter_delete_dialog_title">Eliminar o filtro seleccionado?</string>
+	<string name="edit_filter_save_as_menu_item">Gardar coma</string>
+	<string name="edit_filter_delete_dialog_title">Elimina-lo filtro elixido\?</string>
 	<string name="edit_filter_delete_message">Creouse o filtro {0}</string>
 	<string name="edit_filter_create_message">Creouse o filtro {0}</string>
 	
@@ -1590,19 +1627,19 @@
 	<string name="av_camera_pic_size_descr">Escolle o tamaño interno da imaxe.</string>
     <string name="navigation_intent_invalid">O formato é incorrecto: %s</string>
     
-<string name="speed_limit_exceed">Tolerancia no límite de velocidade</string>
-	<string name="speed_limit_exceed_message">Seleccione a marxe de tolerancia do límite de velocidade por riba da cal desexa ser avisado por voz.</string>
-    <string name="dash_download_msg_none">Descarregar mapas sen conexión\?</string>
-    <string name="dash_download_msg">Ten descargados %1$s mapas</string>
-    <string name="dash_download_new_one">Descargar un mapa novo</string>
+<string name="speed_limit_exceed">Tolerancia no límite da velocidade</string>
+	<string name="speed_limit_exceed_message">Escolla a marxe de tolerancia do límite de velocidade por riba da cal desexa ser avisado por voz.</string>
+    <string name="dash_download_msg_none">Baixar mapas sen conexión\?</string>
+    <string name="dash_download_msg">Ten baixados %1$s mapas</string>
+    <string name="dash_download_new_one">Baixar un mapa novo</string>
     <string name="dash_download_manage">Xestionar</string>
     <string name="map_locale">Lingua do mapa</string>
     <string name="rendering_attr_transportStops_name">Paradas do transporte</string>
     <string name="navigate_point_zone">Zona</string>
-    <string name="download_tab_downloads">Tódalas descargas</string>
+    <string name="download_tab_downloads">Tódalas baixadas</string>
     <string name="download_tab_updates">Actualizacións</string>
     <string name="download_tab_local">Local</string>
-	<string name="no_internet_connection">Imposíbel descarregar, comproba a conexión á Internet.</string>
+	<string name="no_internet_connection">Imposíbel de baixar, comproba a conexión á Internet.</string>
     <string name="shared_string_dismiss">Rexeitar</string>
     <string name="everything_up_to_date">Tódolos ficheiros están actualizados</string>
     <string name="use_opengl_render">Empregar o renderizado con OpenGL</string>
@@ -1617,11 +1654,11 @@
 	
 	<string name="shared_string_show_all">AMOSAR TODO</string>
 	<string name="coordinates">Coordenadas</string>
-	<string name="rendering_attr_tramTrainRoutes_name">Rotas dos tranvías e trens</string>
+	<string name="rendering_attr_tramTrainRoutes_name">Liñas dos tranvías e trens</string>
 	<string name="lock_screen_request_explanation">%1$s require este permiso para apagar a pantalla para a funcionalidade de aforro de enerxía.</string>
-    <string name="wake_on_voice">Acender a pantalla</string>
+    <string name="wake_on_voice">Acende-la pantalla</string>
     <string name="wake_on_voice_descr">Acende a pantalla do dispositivo (se estiver apagada) ó aproximarse a unha manobra.</string>
-    <string name="shared_string_never">Nunca</string>
+    <string name="shared_string_never">Endexamais</string>
     
     <string name="impassable_road">Evitar estradas…</string>
     
@@ -1635,30 +1672,30 @@
     <string name="rendering_category_details">Detalles</string>
     <string name="rendering_category_transport">Transporte</string>
     <string name="rendering_category_others">Outros atributos do mapa</string>
-    <string name="map_widget_appearance_rem">Elementos restantes</string>
+    <string name="map_widget_appearance_rem">Elementos pendentes</string>
     <string name="map_widget_top">Barra de estado</string>
 	<string name="map_widget_right">Panel dereito</string>
 	<string name="map_widget_left">Panel esquerdo</string>
     <string name="shared_string_show">Amosar</string>
 	<string name="configure_map">Configura-lo mapa</string>
-    <string name="search_radius_proximity">A unha distancia de</string>
+    <string name="search_radius_proximity">A menos dos</string>
     
     
-    <string name="anonymous_user_hint">Os usuarios anónimos non poden:
-\n - Crear grupos;
-\n - Sincronizar grupos e dispositivos co servidor;
+    <string name="anonymous_user_hint">Os usuarios anónimos non poden: 
+\n - Facer grupos; 
+\n - Sincronizar grupos e dispositivos co servidor; 
 \n - Xestionar grupos e dispositivos nun taboleiro de control persoal da páxina web.</string>
     <string name="anonymous_user">Usuario anónimo</string>
     <string name="logged_as">Identificado como %1$s</string>
 	
-	<string name="speak_pedestrian">Pasos de peón</string>
-    <string name="rendering_attr_roadStyle_name">Estilo de estrada</string>
+	<string name="speak_pedestrian">Pasos de peóns</string>
+    <string name="rendering_attr_roadStyle_name">Estilo da estradas</string>
     <string name="rendering_value_default_name">Predeterminado</string>
     <string name="rendering_value_orange_name">Laranxa</string>
-    <string name="rendering_value_germanRoadAtlas_name">Atlas de estradas alemáns</string>
+    <string name="rendering_value_germanRoadAtlas_name">Atlas de estradas alemás</string>
 	<string name="traffic_warning_pedestrian">Paso de peóns</string>
 	<string name="show_pedestrian_warnings">Pasos de peóns</string>
-    <string name="rendering_value_americanRoadAtlas_name">Atlas de estradas norteamericanos</string>
+    <string name="rendering_value_americanRoadAtlas_name">Atlas de estradas norteamericanas</string>
     <string name="routing_attr_no_new_routing_name">Non seguir as regras de v1.9</string>
     <string name="routing_attr_no_new_routing_description">Non empregar regras de navigación engadidas na versión 1.9.</string>
     <string name="plugin_settings">Engadidos</string>
@@ -1716,7 +1753,7 @@
     <string name="lang_et">Estoniano</string>
     <string name="lang_ceb">Cebuano ou sugbuanon</string>
     <string name="archive_wikipedia_data">Ten datos vellos da Wikipedia, que son incompatíbeis. Desexa arquivalos\?</string>
-    <string name="download_wikipedia_files">Descarregar datos adicionais da Wikipedia (%1$s MB)\?</string>
+    <string name="download_wikipedia_files">Baixar datos adicionais da Wikipedia (%1$s MB)\?</string>
     <string name="gps_network_not_enabled">O servizo da ubicación non está activado. Desexa activalo\?</string>
     <string name="disable_recording_once_app_killed">Evita-lo rexistro autónomo</string>
     <string name="shared_string_import2osmand">Importar ó OsmAnd</string>
@@ -1746,8 +1783,8 @@
 	<string name="shared_string_search">Procurar</string>
 	<string name="shared_string_show_description">Amosar descrición.</string>
 	<string name="shared_string_message">Mensaxe</string>
-	<string name="confirm_usage_speed_cameras">En moitos países (Alemaña, Francia, Italia e outros) a lei non permite o uso de avisos de radares de velocidade. OsmAnd non asume ningunha responsabilidade se vostede viola a lei. Prema en «Si», só se podes empregar esta funcionalidade.</string>
-	<string name="welmode_download_maps">Descargar mapas</string>
+	<string name="confirm_usage_speed_cameras">En moitos países (Alemaña, Francia, Italia e outros) a lei non permite o emprego de avisos de radares de velocidade. O OsmAnd non asume ningunha responsabilidade se ti violas a lei. Preme en «Si», só se podes empregar esta funcionalidade.</string>
+	<string name="welmode_download_maps">Baixar mapas</string>
 	<string name="welcome_select_region">Para reflectir de xeito correcto os seus sinais de tráfico e as normas, indique a rexión pola que conduce:</string>
 	<string name="welcome_text">O OsmAnd fornece mapas globais sen conexión e navigación global sen conexión.</string>
 	<string name="welcome_header">Reciba a benvida</string>
@@ -1755,10 +1792,10 @@
     <string name="mark_to_delete">Marcar para eliminar</string>
 	
 	<string name="local_recordings_delete_all_confirm">Está a piques de eliminar %1$d notas. Confírmao?</string>
-	<string name="local_osm_changes_upload_all_confirm">Está a piques de enviar %1$d cambio(s) a OSM. Confírmao?</string>
+	<string name="local_osm_changes_upload_all_confirm">Está a piques de enviar %1$d mudanza(s) ó OSM. Confírmao\?</string>
     <string name="confirmation_to_clear_history">Limpa-lo historial\?</string>
     <string name="shared_string_go">Ir</string>
-	<string name="osm_edits">Edicións de OSM</string>
+	<string name="osm_edits">Edicións do OSM</string>
 	<string name="osmand_parking_hour">h</string>
 	<string name="osmand_parking_minute">min</string>
 	<string name="osmand_parking_time_left">esquerda</string>
@@ -1766,11 +1803,11 @@
     <string name="waypoint_visit_after">Visitar despois</string>
     <string name="waypoint_visit_before">Visitar antes</string>
     <string name="simulate_your_location">Simular a súa posición</string>
-    <string name="drawer">Lista sinxela</string>
+    <string name="drawer">Listaxe sinxela</string>
     <string name="short_location_on_map">Lat %1$s
 Lon %2$s</string>
-    <string name="tips_and_tricks_descr">Cuestión frecuentes, cambios recentes e outros.</string>
-    <string name="routing_settings_2">Axustes da navegación</string>
+    <string name="tips_and_tricks_descr">Cuestións frecuentes, mudanzas recentes e outros.</string>
+    <string name="routing_settings_2">Axustes da navigación</string>
     <string name="general_settings_2">Axustes xerais</string>
 	<string name="shared_string_ellipsis">…</string>
 	<string name="shared_string_do_not_use">Non empregar</string>
@@ -1798,16 +1835,16 @@ Lon %2$s</string>
 	<string name="roads_only">Só estradas</string>
     <string name="rendering_attr_pisteRoutes_name">Pistas de esquí</string>
 	<string name="device_memory">Memoria do dispositivo</string>
-    <string name="world_ski_missing">Para poder amosar mapas de esquí hai que descargar mapas especiais sen conexión</string>
-    <string name="remove_the_tag">RETIRAR A ETIQUETA</string>
+    <string name="world_ski_missing">Para poder amosar mapas de esquí hai que baixar mapas especiais sen conexión</string>
+    <string name="remove_the_tag">ELIMINAR ETIQUETA</string>
     <string name="gps_status">Estado do GPS</string>
-    <string name="rendering_attr_streetLighting_name">Iluminación da rúa</string>
+    <string name="rendering_attr_streetLighting_name">Alumeado da rúa</string>
     <string name="proxy_pref_title">Proxy</string>
     <string name="proxy_pref_descr">Especifica un servidor proxy.</string>
     <string name="settings_privacy">Privacidade</string>
     <string name="shared_string_gpx_points">Puntos</string>
-	<string name="navigation_over_track">Comezar a navegación seguindo a pista?</string>
-	<string name="avoid_roads_msg">Obter unha rota alternativa seleccionando as estradas que desexe evitar</string>
+	<string name="navigation_over_track">Comeza-la navigación ó longo da pista\?</string>
+	<string name="avoid_roads_msg">Obter unha rota alternativa elixindo as estradas que desexe evitar</string>
 	<string name="rendering_value__name">Predeterminado</string>
     <string name="rendering_value_highContrastRoads_name">Estradas con contraste alto</string>
 	<string name="traffic_warning_railways">Cruzamento ferroviario</string>
@@ -1820,7 +1857,7 @@ Lon %2$s</string>
 	<string name="proxy_port_descr">Configure o número do porto do seu proxy (p.ex. 8118).</string>
 	
 	<string name="routing_attr_avoid_borders_description">Evitar cruzar fronteiras nacionais</string>
-	<string name="routing_attr_height_name">Gálibo</string>
+	<string name="routing_attr_height_name">Límite da altitude</string>
 	<string name="routing_attr_height_description">Especifique a altitude dos vehículos permitida nas rotas.</string>
     <string name="route_descr_destination">Destino</string>
     <string name="download_wikipedia_maps">Wikipedia</string>
@@ -1835,8 +1872,8 @@ Lon %2$s</string>
 	<string name="rate_this_app">Cualificar este aplicativo</string>
 	<string name="rate_this_app_long">Déalle unha puntuación ao OsmAnd en Google Play</string>
 	<string name="user_hates_app_get_feedback">Díganos o porque.</string>
-	<string name="user_hates_app_get_feedback_long">Díganos o que desexa cambiar neste aplicativo.</string>
-	<string name="delete_change">Eliminar o cambio</string>
+	<string name="user_hates_app_get_feedback_long">Díganos o que desexa mudar neste aplicativo.</string>
+	<string name="delete_change">Elimina-la mudanza</string>
 	<string name="successfully_uploaded_pattern">Subido {0}/{1}</string>
 	<string name="try_again">Tentar de novo</string>
 	<string name="error_message_pattern">Erro: {0}</string>
@@ -1846,17 +1883,17 @@ Lon %2$s</string>
 	<string name="offline_maps_and_navigation">Mapas e navegación\nsen conexión</string>
 	<string name="tab_title_basic">Básico</string>
 	<string name="tab_title_advanced">Avanzado</string>
-	<string name="building_number">Número de versión</string>
+	<string name="building_number">Número do edificio</string>
 	<string name="next_proceed">Seguinte</string>
 	
 	<string name="contact_info">información de contacto</string>
 	<string name="description">Descrición</string>
 	<string name="poi_dialog_poi_type">Tipo do PDI</string>
 	<string name="please_specify_poi_type">Indique o tipo de PDI.</string>
-<string name="shared_string_deselect">Anular a selección</string>
-	<string name="shared_string_deselect_all">Non seleccionar nada</string>
+<string name="shared_string_deselect">Desbota-la selección</string>
+	<string name="shared_string_deselect_all">Desbota-la selección toda</string>
 	<string name="osm_edit_context_menu_delete">Eliminar edición do OSM</string>
-    <string name="rendering_attr_OSMMapperAssistant_name">Axudante de creación de mapas de OSM</string>
+    <string name="rendering_attr_OSMMapperAssistant_name">Axudante cartográfico do OSM</string>
 	<string name="osm_changes_added_to_local_edits">As mudanzas no OSM foron engadidas ó conxunto das mudanzas locais</string>
    	<string name="osmand_parking_overdue">vencido</string>
 	<string name="action_create">Creacción de acción</string>
@@ -1871,10 +1908,10 @@ Lon %2$s</string>
     <string name="rename_failed">Falla ó renomear.</string>
 	<string name="days_behind">días de atraso</string>
 	<string name="rendering_attr_pisteGrooming_name">Coidado de pistas</string>
-    <string name="nautical_maps_missing">Para poder amosar mapas náuticos hai que descarga-lo mapa especial sen conexión</string>
+    <string name="nautical_maps_missing">Para poder amosar mapas náuticos hai que baixa-lo mapa especial sen conexión</string>
 	<string name="edit_group">Editar o grupo</string>
-    <string name="parking_place">Lugar de aparcamento</string>
-    <string name="version_settings_descr">Descarregar versións para noite.</string>
+    <string name="parking_place">Lugar do aparcamento</string>
+    <string name="version_settings_descr">Baixar versións de noite.</string>
     <string name="version_settings">Construcións (versións)</string>
     <string name="voices">Indicacións con voz</string>
 	<string name="poi_action_delete">eliminar</string>
@@ -1891,7 +1928,7 @@ Lon %2$s</string>
     <string name="lang_nv">Navaho</string>
     <string name="disable_recording_once_app_killed_descrp">Detén o rexistro de GPX cando se pecha o aplicativo (mediante apps recentes). (A indicación do OsmAnd desaparece da barra das notificacións do Android.)</string>
     <string name="agps_info">Información de A-GPS</string>
-	<string name="agps_data_last_downloaded">Datos de A-GPS descargados por última vez: %1$s</string>
+	<string name="agps_data_last_downloaded">Datos de A-GPS baixados por última vez: %1$s</string>
     <string name="delay_to_start_navigation_descr">Indica-lo tempo de agarda durante o que ficar na pantalla de planificación das rotas.</string>
     <string name="delay_to_start_navigation">Iniciar a navegación paso a paso despois de…</string>
     <string name="parking_place_limited">Tempo de aparcamento limitado a</string>
@@ -1908,7 +1945,7 @@ Lon %2$s</string>
     <string name="favorite_category_select">Escoller categoría</string>
     <string name="default_speed_system_descr">Define a unidade de velocidade.</string>
     <string name="default_speed_system">Unidade de velocidade</string>
-    <string name="nm">mni</string>
+    <string name="nm">nmi</string>
     <string name="si_nm">Millas náuticas</string>
     <string name="si_kmh">Quilómetros por hora</string>
     <string name="si_mph">Millas por hora</string>
@@ -1930,50 +1967,50 @@ Lon %2$s</string>
     <string name="osm_edit_created_poi">Crear un PDI de OSM</string>
     
     <string name="shared_string_qr_code">Código QR</string>
-    <string name="map_downloaded">Mapa descargado</string>
+    <string name="map_downloaded">Mapa baixado</string>
     <string name="map_downloaded_descr">O mapa de %1$s está disposto para empregarse.</string>
     <string name="go_to_map">Amosar mapa</string>
     <string name="share_menu_location">Partillar ou comparti-la localización</string>
-    <string name="min_mile">min/m</string>
+    <string name="min_mile">min/mi</string>
     <string name="min_km">min/km</string>
-    <string name="m_s">m/s</string>
+    <string name="m_s">m/seg</string>
     <string name="shared_string_trip_recording">Gravación da viaxe</string>
     <string name="routing_attr_avoid_shuttle_train_name">Evitar trens lanzadeira</string>
 	<string name="routing_attr_avoid_shuttle_train_description">Evitar coller trens lanzadeira</string>
     <string name="shared_string_wikipedia">Wikipedia</string>
-    <string name="shared_string_currently_recording_track">Estase a grava-la pista neste momento</string>
+    <string name="shared_string_currently_recording_track">Estase a grava-la pista neste intre</string>
 	<string name="favourites_context_menu_add">Engadir ós Favorito</string>
 	<string name="dahboard_options_dialog_title">Configura-lo taboleiro de control</string>
 	<string name="show_on_start">Amosar no inicio</string>
 	<string name="commit_poi">Enviar o PDI</string>
 	<string name="saved_at_time">Gardado agora coma: %1$s</string>
-	<string name="poi_deleted_localy">O punto de interese será eliminado unha vez enviados os cambios</string>
+	<string name="poi_deleted_localy">O punto de interese (PDI) será eliminado unha vez enviadas as mudanzas</string>
 	<string name="show_gpx">Amosar datos GPX</string>
 	<string name="count_of_lines">Número de liñas</string>
 	<string name="are_you_sure">Confírmao?</string>
-	<string name="unsaved_changes_will_be_lost">Hanse perder os cambios non gardados. Continuar?</string>
-	<string name="downloads_left_template">Fican %1$s descargas</string>
+	<string name="unsaved_changes_will_be_lost">Vanse perde-las mudanzas non gardadas. Proseguer\?</string>
+	<string name="downloads_left_template">Fican %1$s baixadas</string>
 	<string name="roads">Estradas</string>
-    <string name="downloading_number_of_files">A descargar - ficheiro %1$d</string>
+    <string name="downloading_number_of_files">Estase a baixar - ficheiro %1$d</string>
     <string name="buy">Mercar</string>
     <string name="activate_srtm_plugin">Activa o engadido das \"Curvas do nivel\"</string>
-    <string name="later">Noutro momento</string>
+    <string name="later">Noutro intre</string>
     <string name="get_full_version">Versión completa</string>
-    <string name="downloads">Descargas</string>
-    <string name="confirm_download_roadmaps">O mapa de só estradas non é preciso, xa que ten o mapa estándar (completo). Desexa descarregalo de todos xeitos\?</string>
+    <string name="downloads">Baixadas</string>
+    <string name="confirm_download_roadmaps">O mapa de só estradas non é preciso, xa que ten o mapa estándar (completo). Desexas baixalo de todos xeitos\?</string>
     <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Actualizar todo (%1$s MB)</string>
-    <string name="free_downloads_used">Descarregas de balde empregadas</string>
+    <string name="free_downloads_used">Baixadas de balde empregadas</string>
     <string name="application_dir_description">Escolle onde desexas garda-los mapas e outros ficheiros de datos.</string>
-    <string name="enter_country_name">Introduza o nome do país</string>
+    <string name="enter_country_name">Insira o nome do país</string>
     <string name="new_version">Versión nova</string>
     <string name="begin_with_osmand_menu_group">Primeiros pasos co OsmAnd</string>
     <string name="features_menu_group">Funcionalidades</string>
     <string name="help_us_to_improve_menu_group">Axudar a mellora-lo OsmAnd</string>
     <string name="plugins_menu_group">Engadidos</string>
     <string name="first_usage_item">Primeiro emprego</string>
-    <string name="first_usage_item_description">De que xeito descarregar mapas e axusta-las opcións básicas.</string>
+    <string name="first_usage_item_description">De que xeito baixar mapas e axusta-las opcións básicas.</string>
     <string name="navigation_item_description">Axustes da navigación.</string>
     <string name="planning_trip_item">Planificación dunha viaxe</string>
     <string name="faq_item">Cuestións frecuentes (FAQ)</string>
@@ -1983,22 +2020,22 @@ Lon %2$s</string>
     <string name="instalation_troubleshooting_item">Instalación e resolución de problemas</string>
     <string name="techical_articles_item">Artigos técnicos</string>
     <string name="versions_item">Versións</string>
-    <string name="feedback">Opinións</string>
+    <string name="feedback">Enquisa</string>
     <string name="contact_us">Contacto</string>
     <string name="map_legend">Lenda do mapa</string>
     <string name="hillshade_layer_disabled">A capa de curvas de nivel está desactivada</string>
     <string name="av_locations_descr">Ficheiro GPX con notas de ubicacións.</string>
     <string name="plugin_touringview_name">Vista de mapa turístico</string>
-	<string name="plugin_touringview_descr">Ó activares esta vista múdase o estilo do mapa do OsmAnd cara a «Vista turística», que é unha vista especial moi detallada para viaxeiros e condutores profesionais.
-\n
-\nEsta vista fornece, en tódolos achegamentos do mapa, o nivel máximo de detalles de viaxe dispoñíbeis cos datos do mapa (en concreto, estradas, pistas, camiños e marcaxes de orientación).
-\n
-\nTamén amosa de xeito claro tódolos tipos de estrada, destinguíndoas sen ambigüidades pola súa cor, o que é útil especialmente cando se conducen vehículos grandes.
-\n
-\nTamén fornece opcións de turismo especiais, como roteiros de ciclismo ou roteiros de montaña.
-\n
-\nNon se precisa descarregar ningún mapa especial, xa que a vista se xera a partires dos mapas normais.
-\n
+	<string name="plugin_touringview_descr">Ó activares esta vista múdase o estilo do mapa do OsmAnd cara a «Vista turística», que é unha vista especial moi detallada para viaxeiros e condutores profesionais. 
+\n 
+\nEsta vista fornece, en tódolos achegamentos do mapa, o nivel máximo de detalles de viaxe dispoñíbeis cos datos do mapa (en concreto, estradas, pistas, camiños e marcaxes de orientación). 
+\n 
+\nTamén amosa de xeito claro tódolos tipos de estrada, destinguíndoas sen ambigüidades pola súa cor, o que é útil de xeito especial cando se conducen vehículos grandes. 
+\n 
+\nTamén fornece opcións de turismo especiais, coma roteiros de ciclismo ou roteiros de montaña. 
+\n 
+\nNon se precisa baixar ningún mapa especial, xa que a vista se xera a partir dos mapas normais. 
+\n 
 \nPódese pechar esta vista desactivándoa eiquí ou mudando o «Estilo do mapa» en «Configura-lo mapa» coma se desexe.</string>
 	<string name="plugin_nautical_descr">Este engadido enriquece o aplicativo de mapas de navegación OsmAnd para que amose tamén mapas náuticos para viaxes en barco e outros tipos de deportes acuáticos.
 \n
@@ -2040,7 +2077,7 @@ Lon %2$s</string>
     <string name="osm_edit_deleted_poi">Eliminouse o PDI do OSM</string>
     <string name="shared_string_type">Tipo</string>
     <string name="starting_point">Punto de partida</string>
-    <string name="shared_string_not_selected">Non seleccionada</string>
+    <string name="shared_string_not_selected">Non seleccionado</string>
     <string name="rec_split_storage_size">Espazo do almacenaxe</string>
     <string name="rec_split_storage_size_desc">Cantidade de espazo que poden ocupar tódolos vídeos gravados.</string>
     <string name="live_updates">Actualizacións ao vivo</string>
@@ -2057,41 +2094,41 @@ Lon %2$s</string>
     <string name="share_osm_edits_subject">Edicións do OSM compartidas a través do OsmAnd</string>
     <string name="lang_nds">Baixo alemán</string>
     <string name="lang_mk">Macedonio</string>
-    <string name="world_map_download_descr">O mapa base mundial (abrangue todo o mundo en achegamentos pequenos), falla ou está desactualizado. Coida descargalo para unha ollada xeral.</string>
+    <string name="world_map_download_descr">O mapa base mundial (abrangue todo o mundo en achegamentos pequenos), falla ou está desactualizado. Coida baixalo para unha ollada xeral.</string>
     <string name="simulate_initial_startup">Simular o primeiro inicio do aplicativo</string>
     <string name="looking_up_address">Estase a procura-lo enderezo</string>
     <string name="rendering_attr_currentTrackColor_description">Cor de GPX</string>
     <string name="rendering_attr_currentTrackWidth_description">Largo do GPX</string>
     <string name="free">"Libre %1$s "</string>
-    <string name="rendering_attr_roadStyle_description">Estilo de estrada</string>
+    <string name="rendering_attr_roadStyle_description">Estilo das estradas</string>
     <string name="routing_attr_avoid_stairs_name">Evitar escadas</string>
     <string name="routing_attr_avoid_stairs_description">Evitar escadas</string>
     <string name="routing_attr_avoid_borders_name">Evitar pasaxes fronteirizas</string>
     <string name="shared_string_others">Outros</string>
     <string name="poi_dialog_reopen">Reabrir</string>
     <string name="shared_string_card_was_hidden">A lapela ficou agochada</string>
-    <string name="free_downloads_used_description">Amosa a cantidade das descargas de balde que fallan.</string>
+    <string name="free_downloads_used_description">Amosa a cantidade de baixadas de balde dispoñíbeis.</string>
 
-    <string name="save_poi_without_poi_type_message">Está na seguranza de que desexa garda-lo PDI sen especifica-lo tipo\?</string>
+    <string name="save_poi_without_poi_type_message">Está na certeza de que desexa garda-lo PDI sen especifica-lo tipo\?</string>
     <string name="use_dashboard_btn">Emprega-lo taboleiro de control</string>
     <string name="use_drawer_btn">Empregar o menú</string>
     <string name="dashboard_or_drawer_title">Taboleiro de control ou menú de control</string>
     <string name="dashboard_or_drawer_description">Hai unha escolla nova para controlar o aplicativo principalmente mediante o flexíbel taboleiro de control ou mediante un menú estático. O que escolla pode ser mudado en calquera intre na configuración do taboleiro de control.</string>
     <string name="update">Actualizar</string>
-    <string name="only_download_over_wifi">Descarregar só con Wi-Fi</string>
+    <string name="only_download_over_wifi">Baixar só co Wi-Fi</string>
     <string name="live_update">Actualización ao vivo</string>
     <string name="update_now">Actualizar agora</string>
     <string name="missing_write_external_storage_permission">O OsmAnd non ten permiso para emprega-lo cartón de memoria</string>
     <string name="last_update">Última actualización: %s</string>
     <string name="update_time">Hora da actualización</string>
     <string name="updates_size">Tamaño da actualización</string>
-    <string name="last_map_change">Último cambio do mapa: %s</string>
+    <string name="last_map_change">Última mudanza do mapa: %s</string>
     <string name="hourly">Cada hora</string>
     <string name="daily">Cada día</string>
     <string name="weekly">Cada semana</string>
     <string name="morning">Mañá</string>
     <string name="night">Noite</string>
-    <string name="select_month_and_country">Seleccione o mes e o país</string>
+    <string name="select_month_and_country">Escolla o mes e o país</string>
 <string name="report">Informe</string>
     <string name="shared_string_move_up">Sobe ↑</string>
     <string name="shared_string_move_down">Baixa ↓</string>
@@ -2113,8 +2150,8 @@ Lon %2$s</string>
     <string name="select_map_marker">Escoller marcaxe do mapa</string>
     <string name="map_markers_other">Outras marcaxes</string>
     <string name="upload_anonymously">Enviar de maneira anónima</string>
-    <string name="download_files_question_space_with_temp">Descarregar {0} ficheiro(s)\?
-\nO espazo de almacenaxe de xeito temporal empregado son {3} MB e {1} MB de xeito permanente.
+    <string name="download_files_question_space_with_temp">Baixar {0} ficheiro(s)\? 
+\nO espazo de almacenaxe de xeito temporal empregado son {3} MB e {1} MB de xeito permanente. 
 \n(O espazo dispoñíbel é de {2} MB.)</string>
     <string name="map_marker_1st">Primeira marcaxe do mapa</string>
     <string name="map_marker_2nd">Segunda marcaxe do mapa</string>
@@ -2132,7 +2169,7 @@ Lon %2$s</string>
     <string name="show_polygons">Amosar polígonos</string>
     <string name="find_parking">Atopar aparcamento</string>
     <string name="shared_string_status">Estado</string>
-    <string name="shared_string_save_changes">Gardar os cambios</string>
+    <string name="shared_string_save_changes">Garda-las mudanzas</string>
     <string name="shared_string_email_address">Enderezo de correo</string>
     <string name="rendering_attr_hideUnderground_name">Obxectos subterráneos</string>
     <string name="data_is_not_available">Datos non dispoñíbeis</string>
@@ -2140,7 +2177,7 @@ Lon %2$s</string>
     <string name="shared_string_read_more">Ler máis</string>
     <string name="road_blocked">Estrada bloqueada</string>
     <string name="shared_string_select">Seleccionar</string>
-    <string name="switch_start_finish">Inverter o punto de partida e o destino</string>
+    <string name="switch_start_finish">Inverte-lo punto de partida e o destino</string>
     <string name="rendering_attr_hideIcons_name">Iconas de puntos de interese</string>
     <string name="item_removed">Elemento retirado</string>
     <string name="n_items_removed">elementos retirados</string>
@@ -2157,7 +2194,7 @@ Lon %2$s</string>
     <string name="routing_attr_allow_motorway_name">Permitir autoestradas</string>
     <string name="routing_attr_allow_motorway_description">Permitir autoestradas.</string>
     <string name="upload_osm_note_description">Subir notas do OSM de xeito anónimo ou empregando o teu perfil do OpenStreetMap.org.</string>
-    <string name="wiki_around">Artigos das proximidades da Wikipedia</string>
+    <string name="wiki_around">Artigos da Wikipedia pretos</string>
     <string name="search_map_hint">Procurar cidade ou rexión</string>
     <string name="route_roundabout_short">Colla a %1$d saída e siga</string>
     <string name="upload_poi">Enviar PDI</string>
@@ -2169,20 +2206,20 @@ Lon %2$s</string>
     
     
     
-    <string name="trip_rec_notification_settings">Activar comezo axiña da gravación</string>
+    <string name="trip_rec_notification_settings">Activar comezo rápido da gravación</string>
     <string name="trip_rec_notification_settings_desc">Amosar unha notificación que permita comezar a gravar a viaxe premendo no botón de gravar.</string>
     <string name="shared_string_notifications">Notificacións</string>
-    <string name="shared_string_continue">Continuar</string>
+    <string name="shared_string_continue">Proseguer</string>
     <string name="shared_string_pause">Deter</string>
     <string name="shared_string_trip">Viaxe</string>
     <string name="shared_string_recorded">Gravada</string>
     <string name="shared_string_record">Gravar</string>
     <string name="gpx_logging_no_data">Sen datos</string>
     <string name="rendering_attr_contourColorScheme_description">Esquema de cores das liñas de nivel</string>
-    <string name="save_track_min_speed">Velocidade de rexistro mínima</string>
+    <string name="save_track_min_speed">Mínima velocidade para o rexistro</string>
     <string name="save_track_min_speed_descr">Filtro: Non rexistrar puntos embaixo desta velocidade.</string>
-    <string name="save_track_min_distance_descr">Filtro: Define a distancia mínima do rexistro entre puntos da ubicación.</string>
-    <string name="save_track_precision">Precisión mínima do rexistro</string>
+    <string name="save_track_min_distance_descr">Filtro: Define a distancia mínima entre puntos para que se rexistre un novo.</string>
+    <string name="save_track_precision">Precisión mínima para o rexistro</string>
     <string name="save_track_precision_descr">Filtro: Non rexistrar, alo menos que se acade esta precisión.</string>
     <string name="christmas_poi">PDI de Nadal</string>
     <string name="christmas_desc">Anticipando as vacacións de Nadal e de Aninovo, pode decidir amosar puntos de interese asociados co Nadal: árbores de Nadal, mercados, etc.</string>
@@ -2192,44 +2229,44 @@ Lon %2$s</string>
     <string name="rendering_attr_contourColorScheme_name">Esquema de cores das liñas de nivel</string>
     <string name="search_hint">Insire o nome da cidade, do enderezo ou do PDI</string>
     <string name="translit_names">Transliterar os nomes</string>
-    <string name="edit_filter">Editar as categorías</string>
+    <string name="edit_filter">Edita-las categorías</string>
     <string name="subcategories">Subcategorías</string>
-    <string name="selected_categories">Categorías seleccionadas</string>
+    <string name="selected_categories">Categorías escollidas</string>
     <string name="create_custom_poi">Crear un filtro personalizado</string>
     <string name="custom_search">Procura personalizada</string>
     <string name="shared_string_filters">Filtros</string>
     <string name="apply_filters">Aplica-los filtros</string>
-    <string name="save_filter">Gardar o filtro</string>
+    <string name="save_filter">Garda-lo filtro</string>
     <string name="delete_filter">Eliminar o filtro</string>
     <string name="new_filter">Filtro novo</string>
     <string name="new_filter_desc">Insire o nome do novo filtro, que se engadirá na túa lapela das \"Categorías\".</string>
-    <string name="osm_live_payment_desc">Cobraráselle unha subscrición mensual. Pode desbotar a súa subscrición na Google Play en calquera momento.</string>
+    <string name="osm_live_payment_desc">Cobraráselle unha subscrición mensual. Pode desbota-la súa subscrición na Google Play en calquera intre.</string>
     <string name="donation_to_osm">Doazón á comunidade de OpenStreetMap</string>
     <string name="donation_to_osm_desc">Un anaco da súa doazón envíase ós usuarios do OSM que fagan mudanzas no OpenStreetMap. O custo da subscrición fica igual.</string>
-    <string name="osm_live_subscription_desc">A subscrición permite actualizacións a cada hora, día ou semana e descargas ilimitadas de xeito global para tódolos mapas.</string>
+    <string name="osm_live_subscription_desc">A subscrición permite actualizacións a cada hora, día ou semana e baixadas ilimitadas de xeito global para tódolos mapas.</string>
     <string name="get_it">Obtéñaa</string>
     <string name="get_for">Obtéñaa por %1$s</string>
     <string name="get_for_month">Obtéñaa por %1$s mes</string>
     <string name="si_mi_meters">Millas/metros</string>
-    <string name="skip_map_downloading">Omitir a descarga de mapas</string>
-    <string name="skip_map_downloading_desc">Non hai ningún mapa descargado. Pode escoller un dos mapas da lista ou descargar mapas máis tarde dende o Menú - %1$s.</string>
-    <string name="search_another_country">Seleccionar outra rexión</string>
+    <string name="skip_map_downloading">Rexeita-la baixada dos mapas</string>
+    <string name="skip_map_downloading_desc">Non hai ningún mapa baixado. Pode escoller un dos mapas da listaxe ou baixar mapas máis tarde dende o Menú - %1$s.</string>
+    <string name="search_another_country">Elixir outra rexión</string>
     <string name="search_map">Estase a procurar mapas…</string>
-    <string name="first_usage_wizard_desc">Deixa que o OsmAnd determine a túa ubicación e suxira mapas a descarregar para esa rexión.</string>
-    <string name="location_not_found">Localización non atopada</string>
+    <string name="first_usage_wizard_desc">Deixa que o OsmAnd pescude a túa ubicación e suxira mapas a baixar para esa rexión.</string>
+    <string name="location_not_found">Ubicación non atopada</string>
     <string name="no_inet_connection">Non hai conexión á Internet</string>
     <string name="storage_free_space">Espazo baleiro</string>
     <string name="storage_place_description">Almacenaxe dos datos do OsmAnd (para mapas, ficheiros GPX, etc.): %1$s.</string>
     <string name="give_permission">Fornecer permiso</string>
     <string name="allow_access_location">Permitir acceso á ubicación</string>
-    <string name="first_usage_greeting">Obteña indicacións e descobra lugares novos sen conexión á Internet</string>
+    <string name="first_usage_greeting">Obtén indicacións e descobre lugares novos sen conexión á Internet</string>
     <string name="search_my_location">Procurar na miña ubicación</string>
     <string name="no_update_info_desc">Non comprobar as actualizacións de versións novas nin descontos relacionados co OsmAnd</string>
     <string name="no_update_info">Non mostrar as actualizacións</string>
     <string name="update_all_maps_now">Desexa actualizar tódolos mapas agora\?</string>
     <string name="clear_tile_data">Limpar tódalas teselas</string>
     <string name="replace_favorite_confirmation">Confirma que desexa substituí-lo favorito \"%1$s\"\?</string>
-    <string name="coords_search">Procura por coordenadas</string>
+    <string name="coords_search">Procura de coordenadas</string>
     <string name="advanced_coords_search">Procura avanzada por coordenadas</string>
     <string name="back_to_search">Voltar á procura</string>
     <string name="confirmation_to_delete_history_items">Desexa elimina-los elementos seleccionados do historial\?</string>
@@ -2238,7 +2275,7 @@ Lon %2$s</string>
     <string name="share_history_subject">partillado ou compartido vía OsmAnd</string>
     <string name="search_categories">Categorías</string>
     <string name="postcode">Código postal</string>
-    <string name="shared_string_from">por</string>
+    <string name="shared_string_from">dende</string>
     <string name="city_type_district">Distrito</string>
     <string name="city_type_neighbourhood">Barrio</string>
     <string name="map_widget_search">Procurar</string>
@@ -2262,32 +2299,32 @@ Lon %2$s</string>
     <string name="access_autoannounce_period_descr">Intervalo de tempo mínimo entre os avisos.</string>
     <string name="access_default_color">Cor por omisión</string>
     <string name="access_category_choice">Escolla a categoría</string>
-    <string name="access_hint_enter_name">Introduza o nome</string>
-    <string name="access_hint_enter_category">Introduza a categoría</string>
-    <string name="access_hint_enter_description">Insira descrición.</string>
-    <string name="access_collapsed_list">Lista contraída</string>
-    <string name="access_expanded_list">Lista expandida</string>
-    <string name="access_empty_list">Lista baleira</string>
-    <string name="access_tree_list">Lista en árbore</string>
+    <string name="access_hint_enter_name">Insira o nome</string>
+    <string name="access_hint_enter_category">Insira a categoría</string>
+    <string name="access_hint_enter_description">Inserir descrición.</string>
+    <string name="access_collapsed_list">Listaxe agochada</string>
+    <string name="access_expanded_list">Listaxe despregada</string>
+    <string name="access_empty_list">Listaxe baleira</string>
+    <string name="access_tree_list">Listaxe en árbore</string>
     <string name="number_of_gpx_files_selected_pattern">%s ficheiros GPX seleccionados</string>
-    <string name="osmand_plus_banner_desc">Descargas ilimitadas dos mapas, actualizacións e engadido da Wikipedia.</string>
-    <string name="routing_attr_short_way_name">Camiño con economía de combustíbel</string>
-    <string name="routing_attr_short_way_description">Emprega-lo camiño con economía do combustíbel (normalmente máis curto).</string>
-    <string name="shared_string_change">Cambiar</string>
+    <string name="osmand_plus_banner_desc">Baixadas ilimitadas dos mapas, actualizacións e engadido da Wikipedia.</string>
+    <string name="routing_attr_short_way_name">Camiño con aforro no combustíbel</string>
+    <string name="routing_attr_short_way_description">Emprega-lo camiño con aforro no combustíbel (normalmente máis curto).</string>
+    <string name="shared_string_change">Mudar</string>
     <string name="get_started">Comezar</string>
     <string name="route_stops_before">%1$s paraxes antes</string>
     <string name="access_direction_haptic_feedback_descr">Inseri-lo enderezo do destino mediante vibración.</string>
-    <string name="use_osm_live_routing_description">Activa-la navegación por cambios do OsmAnd ao Vivo.</string>
+    <string name="use_osm_live_routing_description">Activa-la navegación por mudanzas do OsmAnd ao Vivo.</string>
 	<string name="access_disable_offroute_recalc">Non recalculares a rota ó saírme da mesma</string>
     <string name="access_disable_offroute_recalc_descr">Non recalcula a rota, ó afastarss da mesma.</string>
     <string name="access_disable_wrong_direction_recalc">Non recalculares a rota cando se estea na dirección contraria</string>
     <string name="access_disable_wrong_direction_recalc_descr">Evitar calcular de xeito automático a rota de novo cando se estea a mover na dirección errada.</string>
-    <string name="map_widget_magnetic_bearing">Rumbo magnético</string>
-    <string name="map_widget_bearing">Rumbo relativo</string>
+    <string name="map_widget_magnetic_bearing">Traxectoria magnética</string>
+    <string name="map_widget_bearing">Traxectoria relativa</string>
     <string name="rendering_attr_surfaceIntegrity_name">Integridade da superficie da estrada</string>
     <string name="translit_name_if_miss">Transliterar se falta o nome en %1$s</string>
-    <string name="osm_live_banner_desc">Obteña descarregas dos mapas sen límites e actualizacións dos mapas máis dunha vez ó mes: cada semana, día ou hora.</string>
-    <string name="no_inet_connection_desc_map">Obrigatorio para descargar mapas.</string>
+    <string name="osm_live_banner_desc">Obteña baixadas dos mapas sen límites e actualizacións dos mapas máis dunha vez ó mes: cada semana, día ou hora.</string>
+    <string name="no_inet_connection_desc_map">Obrigatorio para baixar mapas.</string>
     <string name="search_location">Estase a procura-la localización…</string>
     <string name="rendering_attr_hideOverground_name">Obxectos por riba do chan</string>
     <string name="access_shared_string_not_installed">Non instalado</string>
@@ -2318,7 +2355,7 @@ Lon %2$s</string>
     <string name="osm_live_thanks">Grazas por apoiar ó OsmAnd!
 \n
 \nPara activares tódalas características novas, debes reinicia-lo OsmAnd.</string>
-    <string name="osm_live_region_desc">Parte da súa doazón será enviada ós usuarios do OSM que fagan cambios do mapa desa rexión.</string>
+    <string name="osm_live_region_desc">Parte da súa doazón será enviada ós usuarios do OSM que fagan mudanzas do mapa desa rexión.</string>
     <string name="osm_live_ask_for_purchase">Merque primeiro unha subscrición ó OsmAnd ao Vivo</string>
 
     <string name="osm_live_header">Esta subscrición permite actualizacións cada hora para tódolos mapas do mundo. Un anaco dos ingresos voltan á comunidade do OSM e págase por cada contribución ó OSM. Se che gosta o OsmAnd, o OSM e queres apoialos e ser apoiado por eles, esta é un perfecto xeito de facelo.</string>
@@ -2330,10 +2367,10 @@ Lon %2$s</string>
     <string name="add_points_to_map_markers_q">Desexa engadir tódolos puntos ás marcaxes do mapa\?</string>
     <string name="consider_turning_polygons_off">Recoméndase agocha-la visualización dos polígonos.</string>
     <string name="rendering_attr_showMtbRoutes_name">Amosar roteiros para bicicletas da montaña</string>
-    <string name="clear_updates_proposition_message">Elimina-las actualizacións descarregadas e voltar á versión orixinal do mapa</string>
+    <string name="clear_updates_proposition_message">Elimina-las actualizacións baixadas e voltar á versión orixinal do mapa</string>
     <string name="add_time_span">Engadir intervalo de tempo</string>
     <string name="select_voice_provider">Escoller a orientación por voz</string>
-    <string name="select_voice_provider_descr">Escolla ou descargue a orientación por voz para a súa lingua.</string>
+    <string name="select_voice_provider_descr">Escolle ou baixa a orientación por voz para a túa lingua.</string>
     <string name="lang_als">Albanés (Tosco)</string>
     <string name="favourites_edit_dialog_title">Información do favorito</string>
     <string name="lang_es_us">Español de América</string>
@@ -2349,19 +2386,19 @@ Lon %2$s</string>
     <string name="show_free_version_banner_description">Amosa o anuncio da versión de balde, mesmo na versión de pago.</string>
     <string name="activate_seamarks_plugin">Activa o engadido da \"Vista náutica\"</string>
     <string name="other_menu_group">Outros</string>
-    <string name="poi_context_menu_modify_osm_change">Modificar cambio de OSM</string>
+    <string name="poi_context_menu_modify_osm_change">Modificar mudanza do OSM</string>
     <string name="number_of_contributors">Número de colaboradores</string>
     <string name="number_of_edits">Número de edicións</string>
     <string name="reports_for">Informe para</string>
     <string name="file_name_containes_illegal_char">O nome de ficheiro contén un carácter incorrecto</string>
-    <string name="configure_screen_quick_action">Acción axiña</string>
+    <string name="configure_screen_quick_action">Acción rápida</string>
 
     <string name="quick_action_item_action">Acción %d</string>
     <string name="quick_action_item_screen">Pantalla %d</string>
     <string name="quick_action_add_marker">Engadir unha marcaxe do mapa</string>
     <string name="quick_action_add_poi">Engadir un PDI</string>
-    <string name="quick_action_map_style">Cambiar o estilo do mapa</string>
-    <string name="quick_action_map_style_switch">Cambiouse o estilo do mapa a «%s».</string>
+    <string name="quick_action_map_style">Muda-lo estilo do mapa</string>
+    <string name="quick_action_map_style_switch">Mudouse o estilo do mapa a «%s».</string>
     <string name="quick_action_take_audio_note">Nova nota de son</string>
     <string name="quick_action_take_video_note">Nova nota de vídeo</string>
     <string name="quick_action_take_photo_note">Nova nota da imaxe</string>
@@ -2381,11 +2418,11 @@ Lon %2$s</string>
     <string name="quick_action_add_osm_bug_descr">Ó premer neste botón de acción engádese unha nota do OSM na posición central da pantalla.</string>
     <string name="quick_action_add_poi_descr">Ó premer neste botón de acción engádese un PDI na posición central da pantalla.</string>
     <string name="quick_action_navigation_voice_descr">Ó premer neste botón de acción actívase ou desactívase a orientación por voz durante a navigación.</string>
-    <string name="quick_action_add_parking_descr">Ó premer no botón de acción engádese unha localización de aparcamento na posición central da pantalla.</string>
+    <string name="quick_action_add_parking_descr">Ó premer no botón de acción engádese unha posición de aparcamento na posición central da pantalla.</string>
     <string name="favorite_autofill_toast_text">" gárdase en "</string>
     <string name="favorite_empty_place_name">Lugar</string>
-    <string name="quick_action_duplicates">Este nome da acción axiña indicado xa está a ser usado; mudouse cara \"%1$s\" para evitar duplicidades.</string>
-    <string name="quick_action_duplicate">Duplicidade do nome da acción axiña</string>
+    <string name="quick_action_duplicates">Este nome da acción rápida indicado xa está a ser usado; mudouse cara \"%1$s\" para evitar duplicidades.</string>
+    <string name="quick_action_duplicate">Duplicidade do nome da acción rápida</string>
     <string name="quick_action_showhide_favorites_descr">Ó premer no botón de acción amósanse ou agóchanse os puntos favoritos no mapa.</string>
     <string name="quick_action_showhide_poi_descr">Ó premer no botón de acción amósanse ou agóchanse os puntos de interese (PDI) no mapa.</string>
     <string name="quick_action_showhide_favorites_title">Amosar/Agochar os Favoritos</string>
@@ -2401,32 +2438,32 @@ Lon %2$s</string>
     <string name="quick_action_fav_name_descr">Deixar baleiro o campo para emprega-lo enderezo ou o nome do lugar.</string>
     <string name="quick_action_bug_descr">Esta mensaxe inclúese no campo do comentario.</string>
     <string name="quick_action_bug_message">Mensaxe</string>
-    <string name="quick_action_category_descr">Selecciona a categoría na que garda-lo Favorito.</string>
+    <string name="quick_action_category_descr">Escolla a categoría na que garda-lo Favorito.</string>
     <string name="quick_action_gpx_category_descr">Escolle unha categoría opcional.</string>
-    <string name="quick_action_poi_list">Lista de PDI</string>
+    <string name="quick_action_poi_list">Listaxe dos PDI</string>
     <string name="quick_action_sh_poi_descr">Engade unha ou máis categorías de puntos de interese (PDI) para amosar no mapa.</string>
-    <string name="quick_action_page_list_descr">Este botón de acción, amosa a seguinte listaxe.</string>
+    <string name="quick_action_page_list_descr">Premendo neste botón de acción, amosa a seguinte listaxe.</string>
     <string name="quick_action_map_style_action">Engadir un estilo do mapa</string>
     <string name="quick_action_empty_param_error">Rechear tódolos parámetros</string>
     <string name="quick_action_map_styles">Estilos de mapa</string>
-    <string name="quick_action_map_source">Cambiar a fonte do mapa</string>
+    <string name="quick_action_map_source">Muda-la fonte do mapa</string>
     <string name="quick_action_map_source_title">Fontes de mapas</string>
     <string name="quick_action_map_source_action">Engadir unha fonte de mapas</string>
-    <string name="quick_action_map_source_switch">Cambiouse a fonte de mapas para «%s».</string>
-    <string name="quick_action_btn_tutorial_title">Cambiar a posición do botón</string>
+    <string name="quick_action_map_source_switch">Mudouse a fonte dos mapas para «%s».</string>
+    <string name="quick_action_btn_tutorial_title">Muda-la posición do botón</string>
     <string name="quick_action_btn_tutorial_descr">Prema e arrastre neste botón para muda-la súa ubicación na pantalla.</string>
 	<string name="shared_string_action_name">Nome da acción</string>
 <string name="animate_my_location_desc">Activa-lo desprazamento animado do mapa para \"A miña ubicación\" durante a navigación.</string>
     <string name="animate_my_location">Anima-la miña ubicación</string>
     <string name="shared_string_overview">Vista xeral</string>
-    <string name="select_street">Seleccionar rúa</string>
+    <string name="select_street">Elixir rúa</string>
     <string name="shared_string_in_name">en %1$s</string>
     <string name="type_address">Insire o enderezo</string>
     <string name="type_city_town">Insire a cidade ou vila</string>
     <string name="type_postcode">Insire o código postal</string>
-    <string name="nearest_cities">Cidades máis próximas</string>
-    <string name="select_city">Seleccione a cidade</string>
-    <string name="select_postcode">Seleccione o código postal</string>
+    <string name="nearest_cities">Cidades máis pretas</string>
+    <string name="select_city">Elixir cidade ou vila</string>
+    <string name="select_postcode">Escolle o código postal</string>
     <string name="quick_action_auto_zoom">Activar ou desactivar achegamento automático do mapa</string>
     <string name="quick_action_auto_zoom_desc">Ó premer no botón da acción activa ou desactiva o achegamento automático do mapa segundo a velocidade.</string>
     <string name="quick_action_auto_zoom_on">Activa-lo achegamento automático do mapa</string>
@@ -2436,14 +2473,14 @@ Lon %2$s</string>
     <string name="quick_action_add_destination_desc">Ó premer no botón da acción engádese un destino da rota na posición central da pantalla. Calquera destino estabelecido anteriormente convértese no derradeiro punto intermedio.</string>
     <string name="quick_action_replace_destination_desc">Ó premer no botón da acción engade un novo destino do mapa na posición central da pantalla, reemplazando o anterior destino (se existe).</string>
     <string name="quick_action_add_first_intermediate_desc">Ó prener no botón da acción engádese un destino intermedio na posición central da pantalla.</string>
-    <string name="no_overlay">Sen capas superpostas</string>
+    <string name="no_overlay">Sen capas sobrepostas</string>
     <string name="subscribe_email_error">Erro</string>
     <string name="nautical_maps">Mapas náuticos</string>
     <string name="analyze_on_map">Analizar no mapa</string>
     <string name="shared_string_visible">Visíbel</string>
     <string name="restore_purchases">Restaura-las adquisicións</string>
     <string name="fonts_header">Fontes das letras do mapa</string>
-    <string name="right_side_navigation">Condución pola faixa ou carril dereito</string>
+    <string name="right_side_navigation">Condución pola dereita</string>
     <string name="driving_region_automatic">Automático</string>
     <string name="do_not_send_anonymous_app_usage">Non enviar estatísticas anónimas de uso da aplicación</string>
     <string name="do_not_show_startup_messages">Non amosar mensaxes do inicio</string>
@@ -2453,7 +2490,7 @@ Lon %2$s</string>
     <string name="routing_attr_relief_smoothness_factor_plains_name">Pouco inclinado</string>
     <string name="routing_attr_relief_smoothness_factor_more_plains_name">Chairo</string>
     <string name="routing_attr_driving_style_speed_name">Rotas máis curtas</string>
-    <string name="routing_attr_driving_style_balance_name">Balanceado</string>
+    <string name="routing_attr_driving_style_balance_name">Equilibrado</string>
     <string name="routing_attr_driving_style_safety_name">Prefirir camiños secudarios</string>
     <string name="relief_smoothness_factor_descr">Terreo prefirido: chairo ou inclinado.</string>
     <string name="shared_string_slope">Costa</string>
@@ -2461,7 +2498,7 @@ Lon %2$s</string>
     <string name="points_delete_multiple_succesful">Punto(s) eliminado(s).</string>
     <string name="points_delete_multiple">Vai eliminar %1$d punto(s). Confírmao?</string>
     <string name="track_points_category_name">Puntos da rota, puntos de interese, características nomeadas</string>
-    <string name="route_points_category_name">Viraxes que descartar na rota</string>
+    <string name="route_points_category_name">Viraxes a pasar nesta rota</string>
     <string name="max_speed">Velocidade máxima</string>
     <string name="average_speed">Velocidade media</string>
     <string name="shared_string_time_moving">Tempo en movemento</string>
@@ -2474,7 +2511,7 @@ Lon %2$s</string>
     <string name="file_can_not_be_moved">Non é posíbel mover o ficheiro.</string>
     <string name="shared_string_move">Mover</string>
     <string name="shared_string_gpx_tracks">Pistas</string>
-    <string name="routing_attr_driving_style_name">Estilo de condución</string>
+    <string name="routing_attr_driving_style_name">Estilo da condución</string>
     <string name="route_altitude">Altitude da rota</string>
     <string name="altitude_descent">Descenso</string>
     <string name="altitude_ascent">Ascenso</string>
@@ -2486,9 +2523,9 @@ Lon %2$s</string>
     <string name="shared_string_plugin">Engadido</string>
     <string name="srtm_purchase_header">Para olla-las curvas do nivel no mapa hai que mercar e instalar o engadido das \"Curvas do nivel\"</string>
     <string name="srtm_color_scheme">Esquema de cores</string>
-    <string name="routing_attr_allow_private_name">Permitir acceso privado</string>
+    <string name="routing_attr_allow_private_name">Permiti-lo acceso privado</string>
     <string name="routing_attr_allow_private_description">Permitir acceso ás zonas privadas.</string>
-    <string name="change_color">Cambiar a cor</string>
+    <string name="change_color">Muda-la cor</string>
     <string name="edit_name">Editar o nome</string>
     <string name="lang_fy">Frisón</string>
     <string name="favorite_category_add_new">Engadir novo</string>
@@ -2497,10 +2534,10 @@ Lon %2$s</string>
     <string name="shared_string_install">Instalar</string>
     <string name="improve_coverage_mapillary">Mellora-la cobertura das imaxes co Mapillary</string>
     <string name="open_mapillary">Abrir Mapillary</string>
-    <string name="improve_coverage_install_mapillary_desc">Instala Mapillary para engadir unha ou máis imaxes a esta localización do mapa.</string>
+    <string name="improve_coverage_install_mapillary_desc">Instala o Mapillary para engadir unha ou máis imaxes a esta localización do mapa.</string>
     <string name="online_photos">Imaxes da rede</string>
-    <string name="quick_action_resume_pause_navigation">Pausar/Voltar a navigación</string>
-    <string name="quick_action_resume_pause_navigation_descr">Preme neste botón para pausar ou reemprender a navigación.</string>
+    <string name="quick_action_resume_pause_navigation">Deter/Voltar á navigación</string>
+    <string name="quick_action_resume_pause_navigation_descr">Preme neste botón para deter ou voltar á navigación.</string>
     <string name="quick_action_start_stop_navigation">Iniciar/Parar a navigación</string>
     <string name="quick_action_start_stop_navigation_descr">Prema neste botón para iniciar a navegación, ou para detela se xa estaba iniciada.</string>
     <string name="store_tracks_in_monthly_directories">Almacenar as pistas gravadas en cartafoles mensuais</string>
@@ -2517,7 +2554,7 @@ Lon %2$s</string>
     <string name="mapillary_menu_edit_text_hint">Insire o nome do usuario</string>
     <string name="mapillary_menu_descr_username">Ollar só imaxes engadidas por</string>
     <string name="mapillary_menu_title_username">Nome de usuario</string>
-    <string name="mapillary_menu_filter_description">Filtrar imaxes polo usuario ou por data. Só activado nos primeiros achegamentos.</string>
+    <string name="mapillary_menu_filter_description">Filtrar imaxes polo usuario, pola data ou polo tipo. Só activado nos primeiros achegamentos.</string>
     <string name="shared_string_permissions">Permisos</string>
     <string name="import_gpx_failed_descr">O OsmAnd non pode importa-lo ficheiro. Comprobe se o OsmAnd ten permiso para ler o ficheiro neste sitio.</string>
     <string name="distance_moving">Distancia corrixida</string>
@@ -2549,8 +2586,8 @@ Lon %2$s</string>
     <string name="coordinates_format">Formato das coordenadas</string>
     <string name="use_system_keyboard">Empregar teclado do sistema</string>
     <string name="fast_coordinates_input_descr">Escolla o formato de inserimento das coordenadas. Pódeas mudar en \"Opcións\" sempre que quixer.</string>
-    <string name="fast_coordinates_input">Inserimento axiña das coordenadas</string>
-    <string name="routing_attr_avoid_ice_roads_fords_name">evitar estradas de xeo, vaos</string>
+    <string name="fast_coordinates_input">Inserimento rápido das coordenadas</string>
+    <string name="routing_attr_avoid_ice_roads_fords_name">Evitar estradas de xeo e vaos</string>
     <string name="routing_attr_avoid_ice_roads_fords_description">Evitar estradas de xeo e vaos.</string>
     <string name="use_location">Empregar posición</string>
     <string name="add_location_as_first_point_descr">Engada a súa ubicación coma primeiro punto para indagar nunha rota perfecta.</string>
@@ -2558,7 +2595,7 @@ Lon %2$s</string>
     <string name="shared_string_finish">Rematar</string>
     <string name="plan_route">Planificar rota</string>
     <string name="shared_string_sort">Ordenar</string>
-    <string name="coordinate_input">Introdución de coordenada</string>
+    <string name="coordinate_input">Inserir coordenadas</string>
     <string name="is_saved">foi gardado</string>
     <string name="marker_save_as_track_descr">Exporte as súas marcaxes cara un ficheiro que pode fornecer eiquí:</string>
     <string name="move_to_history">Mover ao historial</string>
@@ -2570,13 +2607,13 @@ Lon %2$s</string>
     <string name="ascendingly">ascendente</string>
     <string name="date_added">Data engadida</string>
     <string name="order_by">Ordenar por:</string>
-    <string name="marker_show_distance_descr">Seleccione de que xeito indicar a distancia e a dirección ás marcaxes do mapa na lapela do mapa:</string>
+    <string name="marker_show_distance_descr">Escolla de que xeito indica-la distancia e a dirección ás marcaxes do mapa na lapela do mapa:</string>
     <string name="map_orientation_change_in_accordance_with_speed">Limiar de orientación do mapa</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Seleccione embaixo a velocidade á que a orientación do mapa pasa de «Para a dirección do movemento» a «Para o compás».</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Escolla embaixo a velocidade á que a orientación do mapa muda de «Para a dirección do movemento» cara «Para o compás».</string>
     <string name="all_markers_moved_to_history">Tódalas marcaxes do mapa foron movidas cara o historial</string>
     <string name="marker_moved_to_history">A marcaxe do mapa foi movida cara o historial</string>
     <string name="marker_moved_to_active">A marcaxe do mapa foi movida cara os activos</string>
-    <string name="shared_string_list">Lista</string>
+    <string name="shared_string_list">Listaxe</string>
     <string name="shared_string_groups">Grupos</string>
     <string name="make_active">Activar</string>
     <string name="today">Hoxe</string>
@@ -2599,13 +2636,13 @@ Lon %2$s</string>
     <string name="shared_string_options">Opcións</string>
     <string name="measurement_tool_snap_to_road_descr">OsmAnd vai conecta-los puntos ós recursos do perfil elixido.</string>
     <string name="measurement_tool_save_as_new_track_descr">Garda-los puntos, xa sexa coma puntos da rota coma unha liña.</string>
-    <string name="choose_navigation_type">Seleccionar o perfil de navegación</string>
+    <string name="choose_navigation_type">Elixi-lo perfil da navegación</string>
     <string name="none_point_error">Engada ao menos un punto.</string>
     <string name="enter_gpx_name">Nome do ficheiro GPX:</string>
     <string name="show_on_map_after_saving">Amosar no mapa despois de gardar</string>
     <string name="measurement_tool">Medir distancia</string>
     <string name="appearance_on_the_map">Aparencia no mapa</string>
-    <string name="add_track_to_markers_descr">Seleccione os puntos de pasaxe da pista que quere que OsmAnd engada ás marcaxes.</string>
+    <string name="add_track_to_markers_descr">Escolla os puntos de pasaxe da pista que quere que OsmAnd engada ás marcaxes.</string>
     <string name="add_group">Engadir un grupo</string>
     <string name="empty_state_markers_active_desc">Preme en \"Lugares\" e despois preme na bandeira da marcaxe.</string>
     <string name="empty_state_markers_groups">Importar grupos</string>
@@ -2629,7 +2666,7 @@ Lon %2$s</string>
     <string name="import_as_gpx">Importar coma ficheiro GPX</string>
     <string name="import_as_favorites">Importar coma Favoritos</string>
     <string name="import_file">Importar ficheiro</string>
-	<string name="enter_new_name">Introduza o novo nome</string>
+	<string name="enter_new_name">Insira o novo nome</string>
 	<string name="shared_string_back">Voltar</string>
 	<string name="shared_string_view">Ver</string>
 	<string name="wrong_format">Formato erróneo</string>
@@ -2638,9 +2675,9 @@ Lon %2$s</string>
     <string name="rendering_attr_whiteWaterSports_name">Deportes de augas bravas</string>
     <string name="distance_farthest">Distancia: o máis lonxe primeiro</string>
     <string name="distance_nearest">Distancia: o máis preto primeiro</string>
-    <string name="enter_lon">Introduza a lonxitude</string>
-    <string name="enter_lat">Introduza a latitude</string>
-    <string name="enter_lat_and_lon">Introduza a latitude e a lonxitude</string>
+    <string name="enter_lon">Insira a lonxitude</string>
+    <string name="enter_lat">Insira a latitude</string>
+    <string name="enter_lat_and_lon">Insira a latitude e a lonxitude</string>
 	<string name="dd_mm_ss_format">GG°MM′SS″</string>
 	<string name="dd_dddddd_format">GG,GGGGGG°</string>
 	<string name="dd_ddddd_format">GG.GGGGG°</string>
@@ -2652,11 +2689,11 @@ Lon %2$s</string>
 	<string name="north_abbreviation">N</string>
 	<string name="optional_point_name">Nome do punto opcional</string>
     <string name="transport_nearby_routes_within">Liñas pretas a menos dos</string>
-    <string name="transport_nearby_routes">Preto de</string>
+    <string name="transport_nearby_routes">Preto dos</string>
     <string name="enter_the_file_name">Insire o nome do ficheiro.</string>
     <string name="map_import_error">Erro de importación de mapa</string>
     <string name="map_imported_successfully">Mapa importado</string>
-    <string name="make_as_start_point">Converter punto do inicio</string>
+    <string name="make_as_start_point">Converter isto no punto do inicio</string>
     <string name="shared_string_current">Actual</string>
     <string name="last_intermediate_dest_description">Engade unha paraxe intermedia</string>
     <string name="first_intermediate_dest_description">Engade a primeira paraxe do percorrido</string>
@@ -2686,7 +2723,7 @@ Lon %2$s</string>
     <string name="will_open_at">Abre ás</string>
     <string name="will_open_on">Abre ás</string>
     <string name="additional_actions">Accións adicionais</string>
-    <string name="av_locations_selected_desc">Ficheiro GPX con coordenadas e datos das notas seleccionadas.</string>
+    <string name="av_locations_selected_desc">Ficheiro GPX con coordenadas e datos das notas escollidas.</string>
     <string name="av_locations_all_desc">Ficheiro GPX cas coordenadas e datos de tódalas notas.</string>
     <string name="modify_the_search_query">Modifica-la consulta da procura.</string>
     <string name="shared_string_actions">Accións</string>
@@ -2706,10 +2743,10 @@ Lon %2$s</string>
     <string name="by_type">Por tipo</string>
     <string name="looking_for_tracks_with_waypoints">Estase a procurar pistas con puntos de pasaxe</string>
     <string name="shared_string_more_without_dots">Máis</string>
-    <string name="add_favourites_group_to_markers_descr">Seleccione unha categoría favorita para engadir ás marcaxes.</string>
+    <string name="add_favourites_group_to_markers_descr">Escolla unha categoría favorita para engadir ás marcaxes.</string>
     <string name="favourites_group">Categoría de favoritos</string>
     <string name="empty_state_markers_active">Faga marcaxes do mapa!</string>
-    <string name="empty_state_markers_history_desc">As marcaxes marcadas coma descartadas amósanse nesta lapela.</string>
+    <string name="empty_state_markers_history_desc">As marcaxes marcadas coma desbotadas amósanse nesta lapela.</string>
     <string name="tap_on_map_to_hide_interface_descr">Un toque no mapa alterna entre os botóns de control e os trebellos.</string>
     <string name="mark_passed">Marcaxe xa ollada</string>
     <string name="shared_string_gpx_track">Pista</string>
@@ -2723,20 +2760,20 @@ Lon %2$s</string>
     <string name="edit_map_marker">Editar marcaxe do mapa</string>
     <string name="third_party_application">Aplicación de terceiros</string>
     <string name="search_street">Procurar rúa</string>
-    <string name="start_search_from_city">Comezar procura da cidade</string>
+    <string name="start_search_from_city">Escolla a cidade primeiro</string>
     <string name="shared_string_restore">Restaurar</string>
-    <string name="keep_passed_markers">Manter no mapa as marcaxes descartadas</string>
+    <string name="keep_passed_markers">Manter no mapa as marcaxes desbotadas</string>
     <string name="more_transport_on_stop_hint">Hai máis transportes nesta paraxe.</string>
     <string name="ask_for_location_permission">Para proseguer, debe permiti-la ubicación ó OsmAnd.</string>
     <string name="thank_you_for_feedback">Grazas polo seu comentario</string>
     <string name="poi_cannot_be_found">O nó ou camiño non pode ser atopado.</string>
-    <string name="search_no_results_feedback">Sen resultados da procura\? Mandenos as súas opinións</string>
+    <string name="search_no_results_feedback">Sen resultados da procura\? Mándenos as súas opinións</string>
     <string name="commiting_way">Estase a envíar camiño…</string>
     <string name="increase_search_radius_to">Aumenta-lo raio da procura para %1$s</string>
     <string name="shared_string_world">Mundo</string>
     <string name="coord_input_save_as_track">Gardar coma pista</string>
     <string name="coord_input_save_as_track_descr">Engadiches %1$s puntos. Insire un nome do ficheiro e preme en \"Gardar\".</string>
-    <string name="get_osmand_live">Obter OsmAnd ao Vivo para desbloqueares tódalas funcionalidades: actualizacións dos mapas diarias cas descarregas ilimitadas, tódolos engadidos de pagamento e de balde, Wikipedia, Wikiviaxes e moito máis.</string>
+    <string name="get_osmand_live">Obter OsmAnd ao Vivo para desbloqueares tódalas funcionalidades: actualizacións dos mapas diarias cas baixadas ilimitadas, tódolos engadidos de pagamento e de balde, Wikipedia, Wikiviaxes e moito máis.</string>
     <string name="read_wikipedia_offline_description">Obteña unha subscrición do OsmAnd ao Vivo para ler artigos da Wikipedia e Wikiviaxes, sen conexión.</string>
     <string name="purchase_cancelled_dialog_title">Cancelaches a subscrición do OsmAnd ao Vivo</string>
     <string name="osmand_team">Equipa do OsmAnd</string>
@@ -2765,7 +2802,7 @@ Lon %2$s</string>
     <string name="import_track">Importar ficheiro GPX</string>
     <string name="import_track_desc">O ficheiro %1$s non contén puntos de pasaxe, queres importalo coma unha pista\?</string>
     <string name="copy_location_name">Copiar nome do punto/PDI</string>
-    <string name="keep_passed_markers_descr">As marcaxes engadidas coma un grupo de Favoritos ou puntos de rota GPX descartados ficarán no mapa. Se o grupo non está dispoñíbel, as marcaxes agocharanse do mapa.</string>
+    <string name="keep_passed_markers_descr">As marcaxes engadidas coma un grupo de Favoritos ou puntos de rota GPX desbotados ficarán no mapa. Se o grupo non está dispoñíbel, as marcaxes agocharanse do mapa.</string>
     <string name="release_3_2_pre">• Corrixido o erro no inicio que se producía nalgúns dispositivos
 \n
 \n • Nova función das marcaxes: amosa as marcaxes que xa foran atravesadas.
@@ -2817,20 +2854,20 @@ Lon %2$s</string>
     <string name="open_wikipedia_link_online_description">A ligazón abrirase nun navigador web.</string>
     <string name="how_to_open_link">De que xeito abri-la ligazón\?</string>
     <string name="read_wikipedia_offline">Ler a Wikipedia sen conexión</string>
-    <string name="download_all">Descarregar todo</string>
+    <string name="download_all">Baixar todo</string>
     <string name="shared_string_restart">Reinicia-la aplicación</string>
     <string name="show_images">Amosar imaxes</string>
     <string name="purchase_cancelled_dialog_descr">Renova a subscrición para seguer a empregar tódalas funcionalidades:</string>
 
-    <string name="maps_you_need_descr">Baseado nos artigos favoritos, recoméndase descarrega-los seguintes mapas:</string>
+    <string name="maps_you_need_descr">Baseado nos artigos favoritos, recoméndase baixa-los seguintes mapas:</string>
     <string name="maps_you_need">Mapas que ti precisas</string>
     <string name="popular_destinations">Destinos populares</string>
     <string name="paid_app">Aplicativo de pago</string>
     <string name="paid_plugin">Engadido de pagamento</string>
     <string name="travel_card_update_descr">Novos datos dispoñíbeis do Wikiviaxes, actualiza para desfrutalos.</string>
-	<string name="travel_card_download_descr">Descarrega os guieiros de viaxes do Wikiviaxes para ollar artigos sobre os lugares arredor do mundo, sen unha conexión á Internet.</string>
+	<string name="travel_card_download_descr">Baixa os guieiros de viaxes do Wikiviaxes para ollar artigos sobre os lugares darredor do mundo, sen unha conexión á Internet.</string>
 	<string name="update_is_available">Actualización dispoñíbel</string>
-	<string name="download_file">Descarregar ficheiro</string>
+	<string name="download_file">Baixar ficheiro</string>
     <string name="start_editing_card_image_text">O guieiro de viaxe libre e global que calquera pode editar.</string>
     <string name="start_editing_card_description">Podes e debes editar calquera artigo no Wikiviaxes. Partilla ou comparte o teu coñecemento, experiencia, dote e atención</string>
     <string name="start_editing">Comezar edición</string>
@@ -2845,7 +2882,7 @@ Lon %2$s</string>
     <string name="purchase_unlim_title">Mercar - %1$s</string>
     <string name="purchase_subscription_title">Subscrición - %1$s</string>
     <string name="wikivoyage_offline">Wikiviaxes sen conexión</string>
-    <string name="unlimited_downloads">Descarregas ilimitadas</string>
+    <string name="unlimited_downloads">Baixadas sen límite</string>
     <string name="wikipedia_offline">Wikipedia sen conexión</string>
     <string name="contour_lines_hillshade_maps">Curvas do nivel e mapas de asombreado</string>
     <string name="purchase_dialog_travel_description">Mercar un dos seguintes elementos para recibires a característica do guieiro de viaxe sen conexión:</string>
@@ -2853,16 +2890,16 @@ Lon %2$s</string>
     <string name="shared_string_dont">Non</string>
     <string name="shared_string_do">Si</string>
     <string name="shared_string_only_with_wifi">Só co Wi-Fi</string>
-    <string name="wikivoyage_download_pics">Descarregar imaxes</string>
-    <string name="wikivoyage_download_pics_descr">As imaxes do artigo poden descarregarse para o seu emprego sen conexión. 
-\nSempre dispoñíbel na lapela \"Pescudar\" → \"Opcións\".</string>
+    <string name="wikivoyage_download_pics">Baixar imaxes</string>
+    <string name="wikivoyage_download_pics_descr">As imaxes do artigo poden baixarse para o seu emprego sen conexión. 
+\nSempre dispoñíbel na lapela de \"Pescudar\" → \"Opcións\".</string>
     <string name="shared_string_wifi_only">Só co Wi-Fi</string>
     <string name="select_travel_book">Escoller un libro de viaxe</string>
     <string name="shared_string_travel_book">Libro de viaxes</string>
     <string name="online_webpage_warning">A páxina só está dispoñíbel en liña. Abrila nun navigador web\?</string>
     <string name="images_cache">Caché das imaxes</string>
     <string name="delete_search_history">Eliminar historial das procuras</string>
-    <string name="download_images">Descarregar imaxes</string>
+    <string name="download_images">Baixar imaxes</string>
     <string name="shared_string_wikivoyage">Wikiviaxes</string>
     <string name="article_removed">Artigo eliminado</string>
     <string name="wikivoyage_search_hint">Procurar: país, cidade, provincia</string>
@@ -2879,26 +2916,26 @@ Lon %2$s</string>
     <string name="show_closed_notes">Amosar notas do OSM pechadas</string>
     <string name="wrong_input">Entrada non correcta</string>
 	<string name="waypoints_added_to_map_markers">Puntos de pasaxe engadidos nas \"Marcaxes do mapa\"</string>
-	<string name="show_passed">Amosar descartados</string>
-    <string name="hide_passed">Agochar descartados</string>
+	<string name="show_passed">Amosar desbotados</string>
+    <string name="hide_passed">Agochar desbotados</string>
     <string name="keep_showing_on_map">Manter amosado no mapa</string>
     <string name="quick_action_show_navigation_finish_dialog">Amosar diálogo \"Navigación rematada\"</string>
     <string name="map_widget_ruler_control">Regra de raio</string>
     <string name="mapillary_action_descr">Contribúe ca túa propia vista a nivel da rúa desta localización a través do Mapillary.</string>
     <string name="mapillary_widget_descr">Permite facer contribucións axiña ó Mapillary.</string>
-    <string name="mapillary_descr">Imaxes a nivel de rúa en línea para todos. Descobre lugares, contribúe, captura o mundo.</string>
+    <string name="mapillary_descr">Imaxes a nivel de rúa en liña para todos. Descobre lugares, contribúe, captura o mundo.</string>
     <string name="plugin_mapillary_descr">Imaxes a nivel de rúa para todos. Descobre lugares, contribúe, captura o mundo.</string>
     <string name="private_access_routing_req">O destino ubícase nunha área de acceso privado. Permiti-lo acceso ós camiños privados para esta viaxe\?</string>
     <string name="nothing_found_descr">Modifica-la consulta da procura ou aumenta-lo raio da procura.</string>
     <string name="quick_action_showhide_osmbugs_descr">Premendo neste botón de acción, amosa ou agocha as notas do OSM no mapa.</string>
-    <string name="hillshade_menu_download_descr">Para ollar o asombreado do relevo no mapa, debes descarrega-la superposición do asombreado desta rexión.</string>
+    <string name="hillshade_menu_download_descr">Para ollar o asombreado do relevo no mapa, debes baixa-la sobreposición do asombreado desta rexión.</string>
     <string name="hillshade_purchase_header">Para ollar o asombreado do relevo no mapa, debes mercares e instalares o engadido das \"Curvas do nivel\"</string>
     <string name="hide_from_zoom_level">Agochar dende o nivel do achegamento</string>
-    <string name="srtm_menu_download_descr">Descarrega o mapa das \"Curvas do nivel\" para empregalas nesta rexión.</string>
+    <string name="srtm_menu_download_descr">Baixa o mapa das \"Curvas do nivel\" para empregalo nesta rexión.</string>
     <string name="show_from_zoom_level">Amosar dende o nivel do achegamento</string>
     <string name="quick_action_add_first_intermediate">Engadir primeiro destino intermedio</string>
     <string name="no_underlay">Sen subxacencia</string>
-    <string name="subscribe_email_desc">Subscríbete á nosa listaxe do correo electrónico para recibires descontos da aplicación e obter 3 descarregas de mapas máis!</string>
+    <string name="subscribe_email_desc">Subscríbete á nosa listaxe de correo electrónico para recibires descontos da aplicación e obter 3 baixadas de mapas máis!</string>
     <string name="depth_contour_descr">Curvas do afundimento e marcaxes náuticas.</string>
     <string name="sea_depth_thanks">Grazas por mercar \"Curvas do afundimento náuticos\"</string>
     <string name="index_item_depth_contours_osmand_ext">Curvas do afundimento náuticos</string>
@@ -2906,16 +2943,16 @@ Lon %2$s</string>
     <string name="index_item_depth_points_southern_hemisphere">Puntos do afundimento náuticos do hemisferio sul</string>
     <string name="index_item_depth_points_northern_hemisphere">Puntos do afundimento náuticos do hemisferio norte</string>
     <string name="download_depth_countours">Curvas do afundimento náuticos</string>
-    <string name="do_not_send_anonymous_app_usage_desc">O OsmAnd recompila información sobre as seccións que abres na aplicación. Non estamos a recompilar datos da ubicación, datos inseridos na aplicación ou datos relacionados cas áreas que ollas, procuras ou descarregas.</string>
+    <string name="do_not_send_anonymous_app_usage_desc">O OsmAnd recompila información sobre as seccións que abres na aplicación. Non estamos a recompilar datos da ubicación, datos inseridos na aplicación ou datos relacionados cas áreas que ollas, procuras ou baixadas.</string>
     <string name="do_not_show_startup_messages_desc">Agocha os descontos da aplicación e as mensaxes especiais dos acontecementos locais.</string>
-    <string name="routing_attr_relief_smoothness_factor_name">Elixir fluctuación da altitude</string>
+    <string name="routing_attr_relief_smoothness_factor_name">Elixir variación da altitude</string>
     <string name="routing_attr_height_obstacles_description">Inclúe coma factor, a altitude do terreo (segundo datos do SRTM, ASTER e EU-DEM).</string>
     <string name="rendering_attr_depthContours_description">Amosar curvas e puntos do afundimento.</string>
     <string name="rendering_attr_depthContours_name">Curvas do afundimento náuticos</string>
     <string name="auto_split_recording_title">División automática das gravacións en intervalos</string>
     <string name="auto_split_recording_descr">Comezar novo segmento despois dun intre de 6 min, nova pista despois dun intre de 2 h, ou novo ficheiro despois dun intre máis longo se mudaches a data.</string>
-    <string name="shared_string_paused">Pausado</string>
-    <string name="save_track_min_distance">Rexistro do desprazamento mínimo</string>
+    <string name="shared_string_paused">Detido</string>
+    <string name="save_track_min_distance">Mínimo desprazamento para o rexistro</string>
     <string name="access_direction_audio_feedback">Indicacións por son</string>
     <string name="access_direction_haptic_feedback">Indicacións polo tacto</string>
     <string name="access_shared_string_navigate_up">Navigar até</string>
@@ -2957,23 +2994,23 @@ Lon %2$s</string>
 \n Desfruta do navigador por voz e óptico, a visualización dos PDI (puntos de interese), a creación e xestión das pistas GPX, emprega a información de visualización e a altitude das curvas do nivel (mediante un engadido), escolle entre modos de automóbil, bicicleta ou peón, edita no OSM e moito máis.</string>
     <string name="osmand_extended_description_part4">Esquí
 \nO engadido do OsmAnd para o estilo do mapa de inverno, amosa pistas co nivel de complexidade e algunha información adicional, coma a localización dos elevadoiros e outras instalacións invernais.</string>
-    <string name="osmand_extended_description_part8">*OsmAnd É activamente software de fonte aberto desenvolvido. Todo o mundo pode contribuír ao *app por informar bechos, mellorando traducións ou @coding características novas. Ademais o proxecto confía en contribucións financeiras para financiar @coding e probando de funcionalidades novas.
-\n Cobertura de mapa e calidade:
-\n • Europa Occidental: ****
-\n • Europa Oriental: ***
-\n • Rusia: ***
-\n • Norte América: ***
-\n • América Do sur: **
-\n • Asia: **
-\n • Corea &amp; de Xapón: ***
-\n • Oriente Medio: **
-\n • África: **
-\n • *Antarctica: *
-\n A maioría de países ao redor dos globos son dispoñíbeis para descarga!
+    <string name="osmand_extended_description_part8">O OsmAnd é activamente software de código aberto desenvolvido. Todo o mundo pode contribuír á aplicación ó informar de erros, mellorando traducións ou desenvolvendo funcións novas. Ademais o proxecto confía en contribucións financeiras para financia-lo desenvolvemento e probando de funcións novas. 
+\n Cobertura do mapa e calidade: 
+\n • Europa Occidental: **** 
+\n • Europa Oriental: *** 
+\n • Rusia: *** 
+\n • América do norte: *** 
+\n • América do sur: ** 
+\n • Asia: ** 
+\n • Corea e Xapón: *** 
+\n • Oriente medio: ** 
+\n • África: ** 
+\n • Antártida: * 
+\n A maioría de países ó redor do mundo están dispoñíbeis para baixar! 
 \n Conseguir un explorador fiábel no voso país - selo Francia, Alemaña, México, UK, España, Países Baixos, EE.UU., Rusia, Brasil ou algún outro.</string>
     <string name="live_monitoring_max_interval_to_send">Tempo do carregado (búfer) para o seguemento en liña</string>
     <string name="live_monitoring_max_interval_to_send_desrc">Especifica o tempo que o carregado (búfer) manterá as localizacións para enviar sen conexión</string>
-    <string name="number_of_rows_in_dash">Número de filas no panel %1$s</string>
+    <string name="number_of_rows_in_dash">Número de filas no taboleiro %1$s</string>
     <string name="save_poi_too_many_uppercase">O nome contén demasiadas maiúsculas. Proseguer\?</string>
     <string name="quick_action_navigation_voice">Activar ou desactivar voz</string>
     <string name="quick_action_navigation_voice_off">Voz desactivada</string>
@@ -3011,8 +3048,8 @@ Lon %2$s</string>
     <string name="toast_empty_name_error">Localización sen nome</string>
     <string name="tunnel_warning">Túnel adiante</string>
     <string name="show_tunnels">Túneis</string>
-    <string name="download_wikipedia_description">Descarrega os artigos da Wikipedia de %1$s para lelos sen conexión.</string>
-    <string name="download_wikipedia_label">Descarregar datos da Wikipedia</string>
+    <string name="download_wikipedia_description">Baixa os artigos da Wikipedia de %1$s para lelos sen conexión.</string>
+    <string name="download_wikipedia_label">Baixar datos da Wikipedia</string>
     <string name="open_in_browser_wiki">Abrir artigo en liña</string>
     <string name="open_in_browser_wiki_description">Olla-lo artigo nun navigador web.</string>
     <string name="download_wiki_region_placeholder">esta rexión</string>
@@ -3030,24 +3067,33 @@ Lon %2$s</string>
 \n 
 \n • A subscrición do OsmAnd Live, suporta agora tódalas características do OsmAnd "</string>
     <string name="osmand_extended_description_part2">"Navigación GPS 
-\n • Escolle entre os modos sen conexión (sen pagamentos do roaming ó viaxar ó extranxeiro) ou en liña (máis axiña) 
+\n
+\n • Escolle entre os modos sen conexión (sen pagamentos do roaming ó viaxar ó extranxeiro) ou en liña (máis rápido) 
+\n
 \n • A guía por voz xiro-a-xiro ou guía ó longo do camiño (voces gravadas e sintetizadas) 
+\n
 \n • A rota recalcúlase ó saírse da mesma 
+\n
 \n • Guía dos carrís, nomes das rúas e tempo estimado ó destino, axudaráo ó longo da rota 
+\n
 \n • Para facer o seu viaxe seguro, os modos día/noite altérnanse de xeito automático 
+\n
 \n • Amosa os límites de velocidade e obtén un aviso ó excederche do mesmo 
-\n • O achegamento do mapa axústase á velocidade
+\n
+\n • O achegamento do mapa axústase á velocidade 
 \n • Procura destinos por enderezo, por tipo (por exemplo: aparcadoiros, restaurantes, hoteis, gasolineiras, museos), ou por coordenadas xeográficas 
+\n
 \n • Suporta puntos intermedios no itinerario 
+\n
 \n • Grave a súa viaxe ou soba unha pista GPX e séguea "</string>
     <string name="osmand_extended_description_part3">Navigación GPS 
-\n • Escolle entre os modos sen conexión (sen pagamentos do roaming ó viaxar ó extranxeiro) ou en liña (máis axiña) 
+\n • Escolle entre os modos sen conexión (sen pagamentos do roaming ó viaxar ó extranxeiro) ou en liña (máis rápido) 
 \n • A guía por voz xiro-a-xiro ou guía ó longo do camiño (voces gravadas e sintetizadas) 
 \n • A rota recalcúlase ó saírse da mesma 
 \n • Guía dos carrís, nomes das rúas e tempo estimado ó destino, axudaráo ó longo da rota 
 \n • Para facer o seu viaxe seguro, os modos día/noite altérnanse de xeito automático 
 \n • Amosa os límites de velocidade e obtén un aviso ó excederche do mesmo 
-\n • O achegamento do mapa axústase á velocidade
+\n • O achegamento do mapa axústase á velocidade 
 \n • Procura destinos por enderezo, por tipo (por exemplo: aparcadoiros, restaurantes, hoteis, gasolineiras, museos), ou por coordenadas xeográficas 
 \n • Suporta puntos intermedios no itinerario 
 \n • Grave a súa viaxe ou soba unha pista GPX e séguea 
@@ -3075,16 +3121,16 @@ Lon %2$s</string>
 \n 
 \nAlgunhas das principais funcións son:</string>
     <string name="osmand_plus_extended_description_part2">Navigación GPS 
-\n • Funciona en liña (axiña) ou sen conexión (sen pagamentos do roaming ó viaxares ó extranxeiro)
-\n
+\n • Funciona en liña (rápido) ou sen conexión (sen pagamentos do roaming ó viaxares ó extranxeiro) 
+\n 
 \n • Guía por voz xiro-a-xiro (voces gravadas e sintetizadas) 
-\n
+\n 
 \n • (Opcional) Guía dos carrís, nomes das rúas e tempo estimado ó destino 
-\n
+\n 
 \n • Suporta puntos intermedios no itinerario 
-\n
+\n 
 \n • A rota recalcúlase ó saírse da mesma 
-\n
+\n 
 \n • Procura destinos por enderezo, por tipo (por exemplo: Restaurantes, hoteis, gasolineiras, museos), ou por coordenada xeográfica 
 \n</string>
     <string name="osmand_plus_extended_description_part3">Vista do mapa 
@@ -3094,12 +3140,12 @@ Lon %2$s</string>
 \n • Amosa os PDI (puntos de interese) ó seu arredor 
 \n • Amosa teselas en liña especiais, ollada satelital (do Bing), diferentes sobreposicións coma pistas da travesía/navegación GPX e capas adicionais con transparencia personalizábel
 \n • Permite elixir de que xeito amosa-los nomes no mapa: en inglés, local, ou ortografía fonética</string>
-    <string name="osmand_plus_extended_description_part4">Emprego dos datos do OSM e Wikipedia 
+    <string name="osmand_plus_extended_description_part4">Emprego dos datos do OSM e da Wikipedia 
 \n • Información de alta calidade do mellor proxecto colaborativo do mundo 
 \n • Datos do OSM dispoñíbeis por país ou rexión 
 \n • PDI da Wikipedia, ideal para o turismo 
-\n • Descarregas de balde ilimitadas, directamente dende a aplicación 
-\n • Mapas vectoriais reducidos sen conexión, actualizados ó menos unha vez cada mes 
+\n • Baixadas de balde ilimitadas, de xeito directo dende a aplicación 
+\n • Mapas vectoriais reducidos sen conexión, actualizados polo menos unha vez cada mes 
 \n • Escolle entre datos completos da rexión ou só a rede de estradas (Exemplo: Todo o Xapón ten 700 MB ou só 200 MB para a rede de estradas)</string>
     <string name="osmand_plus_extended_description_part5">Funcións da seguridade 
 \n • (Opcional) O modo día/noite alternase de xeito automático 
@@ -3127,16 +3173,77 @@ Lon %2$s</string>
 \n  O OsmAnd é un software de código aberto, desenvolvido de xeito activo. Calquera pode contribuír ca aplicación informando sobre erros, mellorando as traducións ou desenvolvendo novas funcións. Ademais, o proxecto tamén depende das contribucións financeiras para desenvolver e probar novas funcionalidades. 
 \n"</string>
     <string name="osmand_plus_extended_description_part8">"Cobertura e calidade aproximada do mapa: 
+\n
 \n • Europa Occidental: **** 
+\n
 \n • Europa Oriental: *** 
+\n
 \n • Rusia: *** 
+\n
 \n • Norteamérica: *** 
+\n
 \n • Suramérica: ** 
+\n
 \n • Asia: ** 
+\n
 \n • Xapón e Corea: *** 
+\n
 \n • Medio Oriente: ** 
+\n
 \n • África: ** 
+\n
 \n • Antártida: * 
+\n
 \n 
-\n Máis países arredor do globo están dispoñíbeis para descarregar! Dende Afganistán a Zimbabue, dende Australia a Estados Unidos. A Arxentina, Brasil, Canadá, Francia, Alemaña, México, Reino Unido, España, … "</string>
-    </resources>
+\n
+\n Máis países darredor do globo están dispoñíbeis para baixar! Dende Afganistán a Zimbabue, dende Australia a Estados Unidos. A Arxentina, Brasil, Canadá, Francia, Alemaña, México, Reino Unido, España, … "</string>
+    <string name="osm_live_plan_pricing">Plans e prezos</string>
+    <string name="osm_live_payment_monthly_title">Pagamento mensual</string>
+    <string name="osm_live_payment_3_months_title">Pagamento trimestral</string>
+    <string name="osm_live_payment_annual_title">Pagamento anual</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
+    <string name="osm_live_payment_discount_descr">Aforra un %1$s!</string>
+	<string name="osm_live_payment_current_subscription">A súa subscrición actual</string>
+    <string name="osm_live_payment_renews_monthly">Renovación mensual</string>
+    <string name="osm_live_payment_renews_quarterly">Renovación trimestral</string>
+    <string name="osm_live_payment_renews_annually">Renovación anual</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Escolle o período de pagamento convinte para ti:</string>
+    <string name="osm_live_payment_contribute_descr">Un anaco dos ingresos vai ós contribuíntes do OpenStreetMap.</string>
+    <string name="powered_by_osmand">Desenvolvido polo OsmAnd</string>
+    <string name="osm_live_subscriptions">Subscricións</string>
+    <string name="mapillary_menu_title_pano">Amosar só imaxes 360°</string>
+    <string name="shared_string_launch">Executar</string>
+    <string name="run_full_osmand_msg">Estás a emprega-lo mapa {0} que funciona co OsmAnd. Desexas executar a versión completa do OsmAnd\?</string>
+    <string name="run_full_osmand_header">Executar OsmAnd\?</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Capacidade</string>
+    <string name="shared_string_width">Anchura</string>
+    <string name="shared_string_height">Altura</string>
+    <string name="swap_start_and_destination">Trocar inicio e destino</string>
+    <string name="add_destination_point">Engadir destino</string>
+    <string name="add_intermediate_point">Engadir punto intermedio</string>
+    <string name="add_start_point">Engadir punto inicial</string>
+    <string name="intermediate_waypoint">Punto intermedio: %1$s</string>
+    <string name="waypoints">Puntos de pasaxe: %1$s</string>
+    <string name="transfers">transferencias: %1$s</string>
+    <string name="on_foot">a pé: %1$s</string>
+    <string name="route_way">Vía: %1$s</string>
+    <string name="points_of_interests">Puntos de interese (PDI)</string>
+    <string name="waiting_for_route_calculation">Estase a agardar polo cálculo da rota</string>
+    <string name="app_mode_public_transport">Transporte público</string>
+    <string name="avoid_roads_descr">Escolle a estrada a evitar durante a navegación, dende o mapa ou da seguinte listaxe:</string>
+    <string name="show_along_the_route">Amosar ó longo da rota</string>
+    <string name="simulate_navigation">Simular navegación</string>
+    <string name="choose_track_file_to_follow">Escolle o ficheiro da pista a seguir</string>
+    <string name="voice_announcements">Anuncios de voz</string>
+    <string name="intermediate_destinations">Destinos intermedios: %1$s</string>
+    <string name="arrive_at_time">Chegada ás %1$s</string>
+    <string name="lang_gn_py">Guaraní</string>
+    <string name="quick_action_switch_day_night_descr">Premendo neste botón de acción, troca entre o modo \"Noite\" e \"Día\" para o OsmAnd</string>
+    <string name="quick_action_switch_day_mode">Modo día</string>
+    <string name="quick_action_switch_night_mode">Modo noite</string>
+    <string name="quick_action_day_night_switch_mode">Trocar entre os modos día/noite</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-gn/phrases.xml b/OsmAnd/res/values-gn/phrases.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/OsmAnd/res/values-gn/phrases.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-gn/strings.xml b/OsmAnd/res/values-gn/strings.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/OsmAnd/res/values-gn/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-he/phrases.xml b/OsmAnd/res/values-he/phrases.xml
index 52e09fb106..6c83328167 100644
--- a/OsmAnd/res/values-he/phrases.xml
+++ b/OsmAnd/res/values-he/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_shop_food">חנות נוחות וסופרמרקט</string>
 	<string name="poi_shop">חנות</string>
 		<string name="poi_emergency">שרותי חירום</string>
@@ -2270,4 +2270,13 @@
 	<string name="poi_pump_status_broken">מצב המשאבה: פגומה</string>
 	<string name="poi_pump_status_locked">מצב המשאבה: נעולה</string>
 
-	</resources>
+	<string name="poi_dispensing_yes">כן</string>
+	<string name="poi_observatory_type_espionage">שימוש: ריגול</string>
+	<string name="poi_telescope_usage_espionage">שימוש: ריגול</string>
+	<string name="poi_telescope_usage_education">שימוש: חינוך</string>
+	<string name="poi_telescope_usage_research">שימוש: מחקר</string>
+
+	<string name="poi_observatory_type_meteorological">מטאורולוגי</string>
+	<string name="poi_observatory_type_gravitational">כבידתי</string>
+    <string name="poi_blood_donation">תרומת דם</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 577f5fd74f..9a2dfe97ff 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="shared_string_no">לא</string>
 	<string name="shared_string_yes">כן</string>
@@ -531,7 +531,7 @@
 	<string name="si_km_m">קילומטרים/מטרים</string>
 	<string name="yard">יארד</string>
 	<string name="foot">רגל</string>
-	<string name="mile_per_hour">מיילשעה</string>
+	<string name="mile_per_hour">מייל לשעה</string>
 	<string name="mile">מייל</string>
 	<string name="send_location_way_choose_title">שיתוף המיקום באמצעות</string>
 	<string name="send_location_sms_pattern">מיקום: %1$s\n%2$s</string>
@@ -1272,7 +1272,7 @@
     <string name="mapillary_menu_edit_text_hint">הקלדת שם משתמש</string>
     <string name="mapillary_menu_descr_username">הצגת תמונות שנוספו רק על ידי</string>
     <string name="mapillary_menu_title_username">שם משתמש</string>
-    <string name="mapillary_menu_filter_description">ניתן לסנן תמונות לפי השולח או לפי תאריך. פעיל רק במבט מקרוב.</string>
+    <string name="mapillary_menu_filter_description">ניתן לסנן תמונות לפי השולח, לפי תאריך או לפי סוג. פעיל רק במבט מקרוב.</string>
     <string name="map_widget_ruler_control">מד זווית</string>
     <string name="shared_string_permissions">הרשאות</string>
     <string name="import_gpx_failed_descr">ל־OsmAnd אין אפשרות לייבא את הקובץ. נא לוודא של־OsmAnd יש הרשאה לקרוא קבצים מהמיקום הזה.</string>
@@ -2134,12 +2134,12 @@
     <string name="favorite_category_select">בחירת קטגוריה</string>
     <string name="default_speed_system_descr">הגדרת יחידת מהירות.</string>
     <string name="default_speed_system">יחידת מהירות</string>
-    <string name="si_nm">מילים ימיים</string>
+    <string name="si_nm">מיילים ימיים</string>
     <string name="si_kmh">קילומטרים לשעה</string>
-    <string name="si_mph">מילים לשעה</string>
+    <string name="si_mph">מיילים לשעה</string>
     <string name="si_m_s">מטרים לשנייה</string>
     <string name="si_min_km">דקות לקילומטר</string>
-    <string name="si_min_m">דקות למיל</string>
+    <string name="si_min_m">דקות למייל</string>
     <string name="si_nm_h">מיל ימי לשעה (קשר)</string>
     <string name="nm_h">קשר</string>
     <string name="m_s">מ/שנ׳</string>
@@ -2585,7 +2585,7 @@
     <string name="get_for_month">הרשמה למשך חודש</string>
     <string name="osm_live_banner_desc">קבלת כמות הורדות בלתי מוגבלת ועדכונים מפות בתדירות שהיא יותר מפעם בחודש: שבועית, יומית או שעתית.</string>
     <string name="osmand_plus_banner_desc">עדכונים והורדות של המפה באופן בלתי מוגבל לרבות תוסף ויקיפדיה.</string>
-    <string name="si_mi_meters">מילים/מטרים</string>
+    <string name="si_mi_meters">מיילים/מטרים</string>
     <string name="skip_map_downloading">דילוג על הורדת המפות</string>
     <string name="skip_map_downloading_desc">אין לך מפות בלתי מקוונות מותקנות. ניתן לבחור במפה מהרשימה או להוריד מאוחר יותר באמצעות ‚תפריט - %1$s’.</string>
     <string name="search_another_country">נא לבחור באזור אחר</string>
@@ -3007,7 +3007,7 @@
 \n ניתן לקבל נווט אמין למדינה שלך - בין אם זו ישראל, צרפת, גרמניה, מקסיקו, אנגליה, ספרד, הולנד, ארה״ב, רוסיה, ברזיל או כל מדינה אחרת.</string>
     
     
-    <string name="nm">nmi</string>
+    <string name="nm">מייל ימי</string>
     <string name="rendering_attr_hikingRoutesOSMC_description">עיבוד מסלולים לפי עקבות OSMC.</string>
     <string name="routing_attr_height_obstacles_description">מקדם נתוני גובה פני קרקע (נתונים של SRTM,‏ ASTER ו־EU-DEM).</string>
     
@@ -3103,11 +3103,60 @@
     <string name="rendering_value_black_name">שחור</string>
     <string name="more_transport_on_stop_hint">יש תחבורה נוספת בתחנה הזו.</string>
     <string name="search_street">חיפוש רחוב</string>
-    <string name="start_search_from_city">התחלת חיפוש מעיר</string>
+    <string name="start_search_from_city">נא לבחור עיר תחילה</string>
     <string name="shared_string_restore">שחזור</string>
     <string name="keep_passed_markers_descr">סמנים נוספים כקבוצות של מועדפים או נקודות דרך GPX שמסומנות ככאלו שעברת יישארו על המפה. אם הקבוצה אינה פעילה, הסמנים ייעלמו מהמפה.</string>
     <string name="keep_passed_markers">להשאיר סמנים שעברת בהם על המפה</string>
     <string name="markers_remove_dialog_msg">למחוק את סמן המפה ‚%s’\?</string>
     <string name="edit_map_marker">עריכת סמן מפה</string>
     <string name="third_party_application">יישום צד שלישי</string>
-    </resources>
+    <string name="osm_live_plan_pricing">תכנית ומחיר</string>
+    <string name="osm_live_payment_monthly_title">תשלום חודשי</string>
+    <string name="osm_live_payment_3_months_title">תשלום אחת ל־3 חודשים</string>
+    <string name="osm_live_payment_annual_title">תשלום אחת לשנה</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s לחודש</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s לחודש</string>
+    <string name="osm_live_payment_discount_descr">חיסכון של %1$s!</string>
+	<string name="osm_live_payment_current_subscription">המינוי הנוכחי שלך</string>
+    <string name="osm_live_payment_renews_monthly">מתחדש חודשית</string>
+    <string name="osm_live_payment_renews_quarterly">מתחדש רבעונית</string>
+    <string name="osm_live_payment_renews_annually">מתחדש שנתית</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">נא לבחור את מחזור התשלום המועדף עליך:</string>
+    <string name="osm_live_payment_contribute_descr">חלק מההכנסות נתרמות לטובת מתנדבי OpenStreetMap.</string>
+    <string name="powered_by_osmand">מופעל על ידי OsmAnd</string>
+    <string name="osm_live_subscriptions">מינויים</string>
+    <string name="mapillary_menu_title_pano">הצגת תמונות 360° בלבד</string>
+    <string name="shared_string_launch">הפעלה</string>
+    <string name="run_full_osmand_msg">המפה שבשימוש היא {0} שמוגשת על ידי OsmAnd. להפעיל את הגרסה המלאה של OsmAnd\?</string>
+    <string name="run_full_osmand_header">להפעיל את OsmAnd\?</string>
+    <string name="lang_gn_py">גוארני</string>
+    <string name="swap_start_and_destination">החלפת היעד עם המוצא</string>
+    <string name="add_destination_point">הוספת יעד</string>
+    <string name="add_intermediate_point">הוספת נקודת ביניים</string>
+    <string name="add_start_point">הוספת נקודת התחלה</string>
+    <string name="intermediate_waypoint">נקודת ביניים: %1$s</string>
+    <string name="waypoints">נקודות דרך: %1$s</string>
+    <string name="transfers">החלפות: %1$s</string>
+    <string name="on_foot">ברגל: %1$s</string>
+    <string name="route_way">דרך: %1$s</string>
+    <string name="points_of_interests">נקודות עניין (נ״ע)</string>
+    <string name="waiting_for_route_calculation">בהמתנה לחישוב מסלול</string>
+    <string name="app_mode_public_transport">תחבורה ציבורית</string>
+    <string name="avoid_roads_descr">נא לבחור סוג דרך במפה או מהרשימה שלהלן שברצונך להימנע ממנה במהלך ניווט:</string>
+    <string name="show_along_the_route">הצגה לאורך המסלול</string>
+    <string name="simulate_navigation">הדמיית ניווט</string>
+    <string name="choose_track_file_to_follow">נא לבחור קובץ מסלול להצגה</string>
+    <string name="voice_announcements">הכרזות קוליות</string>
+    <string name="intermediate_destinations">יעדי ביניים: %1$s</string>
+    <string name="arrive_at_time">הגעה ב־%1$s</string>
+    <string name="quick_action_switch_day_night_descr">נגיעה בכפתור פעולה זה תחליף בין מצבי יום ולילה עבור OsmAnd</string>
+    <string name="quick_action_switch_day_mode">מצב יום</string>
+    <string name="quick_action_switch_night_mode">מצב לילה</string>
+    <string name="quick_action_day_night_switch_mode">החלפה בין מצבי יום/לילה</string>
+    <string name="cubic_m">מ״ק</string>
+    <string name="metric_ton">ט׳</string>
+    <string name="shared_string_capacity">נפח</string>
+    <string name="shared_string_width">רוחב</string>
+    <string name="shared_string_height">גובה</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml
index 696209c338..ad1551e4b8 100644
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_palaeontological_site">Őslénytani lelőhely</string>
 
 	<string name="poi_bakery">Pékség</string>
@@ -68,7 +68,7 @@
 	<string name="poi_public_transport_platform_trolleybus">Trolibuszmegálló</string>
 	<string name="poi_public_transport_platform_tram">Villamosmegálló</string>
 	<string name="poi_subway_entrance">Metrólejárat</string>
-	<string name="poi_subway_station">Metróállomás</string>
+	<string name="poi_subway_station">igen</string>
 	<string name="poi_taxi">Taxiállomás</string>
 
 	<string name="poi_aerodrome">Repülőtér</string>
@@ -98,7 +98,7 @@
 	<string name="poi_landfill">Hulladéklerakó</string>
 	<string name="poi_pier">Móló</string>
 	<string name="poi_windmill">Szélmalom</string>
-	<string name="poi_quarry">Kőfejtő</string>
+	<string name="poi_quarry">Külszíni fejtés, kőfejtő</string>
 	<string name="poi_vineyard">Szőlő</string>
 	<string name="poi_orchard">Gyümölcsös</string>
 	<string name="poi_salt_pond">Sólepárló medence</string>
@@ -486,7 +486,7 @@
 	<string name="poi_internet_access_service">Internetcsatlakozás: segítenek</string>
 
 	<string name="poi_historic_monastery">Régi kolostor</string>
-	<string name="poi_religious">Vallási terület</string>
+	<string name="poi_religious">Egyházi terület</string>
 	<string name="poi_wayside_shrine">Útmenti kegyhely</string>
 	<string name="poi_travel_agent">Utazási iroda</string>
 	<string name="poi_picnic_table">Piknikezőasztal</string>
@@ -772,7 +772,7 @@
 	<string name="poi_migration">Bevándorlás</string>
 	<string name="poi_tax_inspection">Adóellenőrzés</string>
 	<string name="poi_country">Ország</string>
-	<string name="poi_capital">Főváros</string>
+	<string name="poi_capital">igen</string>
 	<string name="poi_healthcare_alternative">Alternatív gyógyászat</string>
 	<string name="poi_audiologist">Hallásspecialista</string>
 	<string name="poi_optometrist">Optometrikus</string>
@@ -1259,7 +1259,7 @@
 	<string name="poi_diet_pescetarian_yes">Peszketáriánus</string>
 
 	<string name="poi_brewery_additional">Sörfőzde neve</string>
-	<string name="poi_microbrewery_yes">Házi sörfőzés</string>
+	<string name="poi_microbrewery_yes">van</string>
 	<string name="poi_microbrewery_no">Házi sörfőzés nincs</string>
 
 	<string name="poi_takeaway_yes">Elvitelre</string>
@@ -1364,7 +1364,7 @@
 	<string name="poi_memorial_obelisk">Obeliszk</string>
 	<string name="poi_memorial_column">Oszlop</string>
 	<string name="poi_memorial_stupa">Sztúpa</string>
-	<string name="poi_historic_quarry">Történelmi kőfejtő</string>
+	<string name="poi_historic_quarry">Történelmi külszíni fejtés, kőfejtő</string>
 
 	<string name="poi_wetland_wet_meadow">Láprét</string>
 	<string name="poi_wetland_swamp">Erdős mocsár</string>
@@ -2144,7 +2144,7 @@
 	<string name="poi_service_bicycle_chaintool_no">Kerékpárlánc-szerszám nincs</string>
 	<string name="poi_service_bicycle_second_hand_yes">Használtkerékpár-kereskedés</string>
 	<string name="poi_service_bicycle_second_hand_no">Használtkerékpár-kereskedés nincs</string>
-	<string name="poi_service_bicycle_charging_yes">Töltés: van</string>
+	<string name="poi_service_bicycle_charging_yes">Töltés van</string>
 	<string name="poi_service_bicycle_charging_no">Töltés: nincs</string>
 	<string name="poi_bicycle_repair_station">Önálló kerékpárszerelő pont</string>
 
@@ -2853,7 +2853,7 @@
 
 	<string name="poi_min_age">Alsó korhatár</string>
 
-	<string name="poi_organic_yes">Igen</string>
+	<string name="poi_organic_yes">igen</string>
 	<string name="poi_organic_no">Nem</string>
 	<string name="poi_organic_only">Kizárólagosan</string>
 
@@ -3893,5 +3893,38 @@
 
 <string name="poi_atm">Bankautomata</string>
 	<string name="poi_hill">Domb</string>
-
-</resources>
+    <string name="poi_substation_type">Típus</string>
+    <string name="poi_shop_wholesale">Nagykereskedés</string>
+    <string name="poi_bulk_purchase">Ömlesztett (csomagolás nélküli) áru</string>
+    <string name="poi_books_type">Könyv</string>
+    <string name="poi_denotation">Jelentőség</string>
+    <string name="poi_shoe_repair">Cipőjavítás</string>
+    <string name="poi_bulk_purchase_yes">van</string>
+    <string name="poi_bulk_purchase_only">kizárólag</string>
+    <string name="poi_pipeline_substation">Csővezeték-alállomás</string>
+    <string name="poi_substation_transmission">átmeneti</string>
+    <string name="poi_substation_distribution">elosztó</string>
+    <string name="poi_substation_minor_distribution">háztartási elosztó</string>
+    <string name="poi_substation_industrial">ipari</string>
+    <string name="poi_substation_transition">átmeneti</string>
+    <string name="poi_substation_traction">vasúti vagy trolibusz</string>
+    <string name="poi_substation_converter">konverter</string>
+    <string name="poi_substation_compensation">kiegyenlítő</string>
+    <string name="poi_substation_compression">kompressziós</string>
+    <string name="poi_substation_measurement">mérő</string>
+    <string name="poi_substation_valve">szelep</string>
+    <string name="poi_substation_valve_group">szelepcsoport</string>
+    <string name="poi_craft_confectionery">Édességkészítő</string>
+    <string name="poi_laboratory">Orvosi labor</string>
+    <string name="poi_blood_donation">Véradás</string>
+    <string name="poi_books_comic">képregény</string>
+    <string name="poi_books_antiquarian">antikvárium</string>
+    <string name="poi_books_religion">vallási</string>
+    <string name="poi_books_academic">akadémiai</string>
+    <string name="poi_books_children">gyermekkönyv</string>
+    <string name="poi_atoll">Atoll</string>
+    <string name="poi_toll_gantry">Útdíjellenőrző kapu</string>
+    <string name="poi_childcare">Gyermekgondozás (bölcsőde)</string>
+    <string name="poi_denotation_natural_monument">Természeti emlék</string>
+    <string name="poi_denotation_landmark">Tájékozódási pont</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 26e6a489a4..082489f1dc 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="send_files_to_osm">GPX fájl küldése OSM-re?</string>
     <string name="gpx_visibility_txt">Láthatóság</string>
@@ -720,7 +720,7 @@ Ehhez {1} MB helyre van szükség.
     <string name="poi_edit_title">POI szerkesztése</string>
     <string name="poi_create_title">POI létrehozása</string>
     <string name="poi_error_poi_not_found">A pont nem található, vagy a létesítmény több pontból áll, ami pillanatnyilag nem támogatott.</string>
-    <string name="poi_remove_confirm_template">{0} törlése (írj megjegyzést)?</string>
+    <string name="poi_remove_confirm_template">{0} törlése (megjegyzés)\?</string>
     <string name="poi_remove_title">POI törlése</string>
     <string name="shared_string_delete">Törlés</string>
     <string name="poi_remove_success">POI törölve</string>
@@ -985,7 +985,7 @@ Proporcionális memória %4$s MB (Android korlát %5$s MB, Dalvik %6$s MB).</str
     <string name="gps_not_available">Kérlek engedélyezd a GPS-t a beállításokban</string>
     <string name="map_widget_show_destination_arrow">Célpont irányának megjelenítése</string>
     <string name="enable_plugin_monitoring_services">A pozíciónaplózási szolgáltatások (GPX naplózás, online útvonalrögzítés) használatához engedélyed az Útvonalrögzítés bővítményt</string>
-    <string name="non_optimal_route_calculation">Esetleg nem optimális útvonal számítása nagyobb távolságokra</string>
+    <string name="non_optimal_route_calculation">Esetleg nem optimális útvonal kiszámítása nagyobb távolságokra</string>
     <string name="rendering_attr_roadColors_description">Útszínséma kiválasztása:</string>
     <string name="rendering_attr_roadColors_name">Útszín sémája</string>
     <string name="close_changeset">Módosításcsomag lezárása</string>
@@ -1003,7 +1003,7 @@ Proporcionális memória %4$s MB (Android korlát %5$s MB, Dalvik %6$s MB).</str
     <string name="incomplete_locale">hiányos</string>
     <string name="no_buildings_found">Nem található épület.</string>
     <string name="search_villages_and_postcodes">További települések/irányítószám keresése</string>
-    <string name="route_descr_lat_lon">szél. %1$.3f, hossz. %2$.3f</string>
+    <string name="route_descr_lat_lon">%1$.3f szélesség, %2$.3f hosszúság</string>
     
 
 
@@ -1243,7 +1243,7 @@ Proporcionális memória %4$s MB (Android korlát %5$s MB, Dalvik %6$s MB).</str
     <string name="app_modes_choose_descr">Válaszd ki az alkalmazásban megjelenő profilokat.</string>
     <string name="app_modes_choose">Alkalmazás profilok</string>
     <string name="map_widget_map_rendering">Térkép megjelenítése</string>
-    <string name="app_mode_hiking">Gyalogtúra</string>
+    <string name="app_mode_hiking">Túrázás</string>
     <string name="app_mode_motorcycle">Motorkerékpár</string>
     <string name="app_mode_boat">Hajó</string>
     <string name="app_mode_aircraft">Légi jármű</string>
@@ -2161,7 +2161,7 @@ Hosszúság: %2$s</string>
     <string name="osm_user_stat">Szerkesztések: %1$s, helyezés: %2$s, összes szerkesztés: %3$s</string>
     <string name="osm_editors_ranking">OSM szerkesztők rangsora</string>
     <string name="osm_live_subscription">OsmAnd Live előfizetés</string>
-    <string name="osm_live_subscribe_btn">Előfizetés</string>
+    <string name="osm_live_subscribe_btn">Feliratkozás</string>
     <string name="osm_live_user_public_name">Nyilvános név</string>
     <string name="osm_live_hide_user_name">Ne jelenjen meg a nevem a jelentésekben</string>
     <string name="osm_live_support_region">Támogatott régió</string>
@@ -2517,7 +2517,7 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="shared_string_gpx_tracks">Nyomvonalak</string>
     <string name="routing_attr_driving_style_name">Vezetési stílus</string>
     
-    <string name="route_altitude">Útvonal magassága</string>
+    <string name="route_altitude">Útvonal magassági profilja</string>
     <string name="altitude_descent">Lejtő</string>
     <string name="altitude_ascent">Emelkedő</string>
     <string name="altitude_range">Magasságtartomány</string>
@@ -2623,7 +2623,7 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="animate_my_location">Saját pozícióm animálása</string>
     <string name="animate_my_location_desc">A saját pozíció mozgásának animálása navigáció közben.</string>
     <string name="shared_string_overview">Áttekintés</string>
-    <string name="route_is_too_long_v2">Kérlek adj hozzá köztes célpontokat, ha 10 percen belül nem kapsz eredményt erre a hosszú útvonalra.</string>
+    <string name="route_is_too_long_v2">Ha 10 percen belül nem kapsz eredményt erre a hosszú útvonalra, kérlek adj hozzá köztes célpontokat.</string>
     <string name="osmand_extended_description_part1">OsmAnd (OSM Automated Navigation Directions) egy térkép- és navigációs alkalmazás, amellyel hozzáférhetsz az ingyenes, globális és kiváló minőségű OpenStreetMap (OSM) adataihoz.
 \n
 \nÉlvezd a hangalapú és vizuális navigációs szolgáltatást, tekints meg érdekes helyeket (POI-kat), hozz létre és kezelj GPX nyomvonalakat, szintvonalak és magasságinformációk használatával (egy plugin segítségével), válassz az autós, kerékpáros és gyalogos üzemmód közül, szerkessz OSM-et és használd ki a számos egyéb lehetőséget.</string>
@@ -2897,7 +2897,7 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="rendering_attr_hidePOILabels_name">POI-feliratok</string>
     <string name="shared_string_without_name">Névtelen</string>
     <string name="empty_state_markers_history_desc">Ezen a képernyőn az elvégzett térképjelölők fognak megjelenni.</string>
-    <string name="mark_passed">Térképjelölő megjelölése elvégzettként</string>
+    <string name="mark_passed">Megjelölés elhagyottként</string>
     <string name="lang_lo">laoszi</string>
     <string name="day_off_label">zárva</string>
     <string name="winter_and_ski_renderer">Tél és síelés</string>
@@ -3028,7 +3028,7 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="touring_view_render_descr">"Nagyon részletes stílus utazásokhoz. Tartalmazza az alapértelmezett stílus összes beállítási lehetőségét, valamint: annyi részletet jelenít meg, amennyit csak lehetséges, különösen az utak, ösvények és más utazásnál hasznos utak tekintetében.  Tisztán elkülönülnek a különféle úttípusok, felidézve az utazóatlaszok stílusát. Nagy kontrasztú színvilág kültéri használatra, nappali és éjszakai móddal."</string>
     <string name="default_render_descr">Általános célú stílus. Egyszerű, tiszta kinézet sűrűn lakott településeken. Főbb tulajdonságok: szintvonalak, útvonalak, útminőség, behajtási korlátozások, útszám pajzsok, ösvények megjelenítése SAC-skála szerint, vadvízi sportok.</string>
     <string name="shared_string_gpx_files">GPX fájlok</string>
-    <string name="quick_action_edit_actions">Szerkesztés műveletek</string>
+    <string name="quick_action_edit_actions">Műveletek szerkesztése</string>
     <string name="shared_string_dont">Nem</string>
     <string name="shared_string_do">Igen</string>
     <string name="shared_string_total">Összesen</string>
@@ -3040,4 +3040,72 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="coord_input_add_point">Pont hozzáadása</string>
     <string name="coord_input_save_as_track">Mentés nyomvonalként</string>
     <string name="more_transport_on_stop_hint">Ebben a megállóban több közlekedési eszköz is előfordul.</string>
-    </resources>
+    <string name="send_search_query">Elküldöd a keresést\?</string>
+    <string name="osmand_extended_description_part5">Kerékpározás
+\n • A kerékpárutak megjelennek a térképen
+\n • A GPS navigáció kerékpáros módban kerékpárutakat használva tervez utat
+\n • Láthatod a sebességed és milyen magasan jársz
+\n • GPX felvétel opcióval felveheted és megoszthatod a túráidat
+\n • Bővítményen keresztül bekapcsolhatóak a szintvonalak és a domborzatárnyékolás</string>
+    <string name="osm_live_subscriptions">Előfizetések</string>
+    <string name="osm_live_plan_pricing">Csomag &amp; Árak</string>
+    <string name="osm_live_payment_monthly_title">Fizetés havonta</string>
+    <string name="osm_live_payment_3_months_title">Fizetés három havonta</string>
+    <string name="osm_live_payment_annual_title">Fizetés évente egyszer</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / hó</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / hó</string>
+    <string name="osm_live_payment_discount_descr">Takaríts meg ennyit: %1$s!</string>
+    <string name="osm_live_payment_current_subscription">Jelenlegi előfizetéseid</string>
+    <string name="osm_live_payment_renews_monthly">Havonta megújul</string>
+    <string name="osm_live_payment_renews_quarterly">Negyedévente megújul</string>
+    <string name="osm_live_payment_renews_annually">Évente megújul</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Válaszd ki a számodra kényelmes fizetési időszakot:</string>
+    <string name="osm_live_payment_contribute_descr">A bevétel egy részét az OpenStreetMap közreműködői kapják.</string>
+    <string name="markers_remove_dialog_msg">Törlöd „%s” térképjelölőt\?</string>
+    <string name="edit_map_marker">Térképjelölő szerkesztése</string>
+    <string name="search_street">Utca keresése</string>
+    <string name="start_search_from_city">Előbb a város kiválasztása</string>
+    <string name="shared_string_restore">Visszaállítás</string>
+    <string name="keep_passed_markers">Elhagyott jelölők megtartása a térképen</string>
+    <string name="ask_for_location_permission">A folytatáshoz kérlek engedélyezd a helymeghatározást az OsmAnd számára.</string>
+    <string name="thank_you_for_feedback">Köszönjük a visszajelzést</string>
+    <string name="release_3_2_pre">• Pár eszközt érintő indításkori összeomlás javítása
+\n
+\n • Új térképjelölők lehetőség: a már elhagyott jelölők térképen tartása
+\n
+\n • A keresési előzmények a korábban keresett kategóriákat is megjeleníti
+\n
+\n • A nem latin betűs térképek okozta indításkori összeomlás javítása
+\n
+\n • Térkép megjelentési sebesség javítása Android 8.0 eszközön
+\n
+\n • Sokszögkén ábrázolt objektumok (nem szolgáltatás) szerkesztése
+\n
+\n • Távolságmérés: Mérés gomb hozzáadva Műveletekhez a helyi menüben
+\n
+\n</string>
+    <string name="release_3_1">• Navigáció: folyamatjelző sáv javítása, az út kezdő és célpontjának gyors felcserélése
+\n
+\n • Térképjelölők: csoportok ki-be kapcsolásának javítása, lehetőség a jelölők eltüntetésére
+\n
+\n • OSM szerkesztés: Nem pontként ábrázolt objektumok és vonalak címkéinek szerkesztése, hiányzó megjegyzések javítása a jegyzeteken, szerkesztések biztonsági mentése
+\n
+\n • Wikipédia és Wikivoyage cikkek feldolgozásának javítása, a frissített fájlok már elérhetőek
+\n
+\n • Helyi menü: pajzsok javítása éjszakai módban, további menüméretek javítása
+\n
+\n • Hajós navigáció: vízi utak támogatása
+\n
+\n • Egyéb hibajavítások
+\n
+\n</string>
+    <string name="commiting_way">Vonal beküldése…</string>
+    <string name="increase_search_radius_to">Keresési sugár növelése: %1$s</string>
+    <string name="point_deleted">%1$s pont törölve</string>
+    <string name="coord_input_save_as_track_descr">%1$s pontot hoztál létre. Adj meg egy fájlnevet és nyomj a „Mentés”-re.</string>
+    <string name="error_notification_desc">Kérlek, küldj egy képernyőképet erről a figyelmeztetésről a support@osmand.net-re</string>
+    <string name="mapillary_menu_title_pano">Csak 360°-os képek megjelenítése</string>
+    <string name="rendering_value_black_name">Fekete</string>
+    <string name="test_voice_desrc">Nyomj egy gombra és hallgasd meg a hangutasítást, hogy megtaláld a hiányzó, vagy hibás utasításokat.</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-hy/strings.xml b/OsmAnd/res/values-hy/strings.xml
index 340a3b6d59..36961e9319 100644
--- a/OsmAnd/res/values-hy/strings.xml
+++ b/OsmAnd/res/values-hy/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
     <string name="download_hillshade_maps">Տարածքի մգեցված ռելիեֆով քարտեզներ (Hillshades)</string>
     
     <string name="local_indexes_cat_av">Ձայնա/Տեսանյութեր</string>
@@ -47,7 +48,7 @@
     
     <string name="choose_osmand_theme_descr">Ընտրեք ծրագրի թեման։</string>
     <string name="select_address_activity">Ընտրել հասցեն</string>
-    <string name="favourites_list_activity">Ընտրել նախնտրածներից</string>
+    <string name="favourites_list_activity">Ընտրել «Սիրված»-եր</string>
     <string name="local_openstreetmap_act_title">OSM փոփոխություններ</string>
     <string name="shared_string_more_actions">Այլ գործողություններ</string>
     
@@ -67,7 +68,7 @@
     <string name="distance_measurement_finish_editing">Ավարտել խմբագրելը</string>
     <string name="distance_measurement_clear_route">Մաքրել բոլոր կետերը</string>
     
-    <string name="distance_measurement_load_gpx">Բացել առկա GPX track-ը</string>
+    <string name="distance_measurement_load_gpx">Բացել առկա GPX ֆայլը</string>
     <string name="wait_current_task_finished">Խնդրում ենք սպասել մինջև տվյալ պրոցեսը կվերջանա</string>
     <string name="distance_measurement_finish_subtrack">Սկսել նոր ենթաճանապարհ</string>
     <string name="osmand_distance_planning_plugin_name">Հեռավորության հաշվիչ և Պլանավորման Գործիք</string>
@@ -102,10 +103,10 @@
     <string name="av_def_action_choose">Ընտրել ըստ հարցման</string>
     <string name="av_widget_action_descr">Ընտրել default Widget գործողություն։</string>
     <string name="av_widget_action">Default վիդջետի գործողություն</string>
-    <string name="recording_is_recorded">Կատարվում է Աուդիո/վիդեո ձայնագրում, դադարեցնելու համար սեխմեք \"Վերջ\"։</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_delete_confirm">Ջնջել այս գրառումը\?</string>
     <string name="recording_unavailable">անհասանելի է</string>
     <string name="recording_context_menu_arecord">Կատարել աուդիո նշում</string>
     <string name="recording_context_menu_vrecord">Կատարել վիդեո նշում</string>
@@ -168,8 +169,8 @@
     <string name="shared_string_sort">Տեսակավորել</string>
     <string name="coordinate_input">Կոորդինատների մուտքագրում</string>
     <string name="is_saved">պահպանված է</string>
-    <string name="marker_save_as_track_descr">Արտահանեք ձեր մարկերները այն ֆայլի մեջ, որը կարող եք նշել այստեղ:</string>
-    <string name="marker_save_as_track">Պահպանել որպես հետեւել</string>
+    <string name="marker_save_as_track_descr">Արտահանեք ձեր մարկերները հետևյալ GPX ֆայլի մեջ:</string>
+    <string name="marker_save_as_track">Պահպանել որպես GPX ֆայլ</string>
     <string name="move_to_history">Տեղափոխեք պատմություն</string>
     <string name="group_will_be_removed_after_restart">Ծրագրի հերթական վերագործարկվելուց հետո խումբը կհեռացվի։</string>
     <string name="show_guide_line">Ցույց տալ ուղեցույցներ</string>
@@ -179,7 +180,7 @@
     <string name="remove_from_map_markers">Ջնջել քարտեզի Մարկերներից</string>
     <string name="descendingly">նվազում</string>
     <string name="ascendingly">աճող</string>
-    <string name="date_added">Ամսաթիվ ավելացված է</string>
+    <string name="date_added">"Ավելացման ամսաթիվ "</string>
     <string name="order_by">Դասավորել ըստ:</string>
     <string name="marker_show_distance_descr">Ընտրեք, թե ինչպես ցույց տա քարտեզի էկրանին մարկերները քարտեզագրելու հեռավորությունը եւ ուղղությունը:</string>
     <string name="map_orientation_change_in_accordance_with_speed">Քարտեզի կողմնորոշման շեմը</string>
@@ -256,7 +257,7 @@
     <string name="mapillary_descr">Առցանց փողոցային նկարներ բոլորի համար: Բացահայտեք վայրերը, համագործակցեք, նկարեք աշխարհը:</string>
     <string name="mapillary">Մափիլարի(Mapillary)</string>
     <string name="plugin_mapillary_descr">Փողոցային նկարներ բոլորի համար: Բացահայտեք վայրերը, համագործակցեք, նկարեք աշխարհը:</string>
-    <string name="private_access_routing_req">"Նպատակակետը գտնվում է մասնավորի տարածքում: Թույլատրել այս ուղևորությանը  մասնավոր ճանապարհներ մուտք գործել?"</string>
+    <string name="private_access_routing_req">"Նպատակակետը գտնվում է մասնավոր տարածքում: Թույլատրել այս ուղևորությանը  մասնավոր ճանապարհներ մուտք գործել\?"</string>
     <string name="restart_search">Նորից որոնեք</string>
     <string name="increase_search_radius">Ավելացնել որոնման շառավղը</string>
     <string name="nothing_found">Ոչինչ չի գտնվել</string>
@@ -264,7 +265,7 @@
     <string name="quick_action_showhide_osmbugs_title">Ցույց տալ/թաքցնել OSM նշումները</string>
     <string name="quick_action_osmbugs_show">Ցույց տալ OSM նշումները</string>
     <string name="quick_action_osmbugs_hide">Թաքցնել OSM նշումները</string>
-    <string name="quick_action_showhide_osmbugs_descr">Գործողությունների կոճակը սխմելով, քարտեզի վրա ցույց կտա կամ կթաքցնի OSM-ի նշումները:</string>
+    <string name="quick_action_showhide_osmbugs_descr">Գործողությունների կոճակը սխմելով, քարտեզի վրա ցույց կտա կամ կթաքցնի OSM-ի Նշումները:</string>
     <string name="sorted_by_distance">Դասավորված է ըստ հեռավորության</string>
     <string name="search_favorites">Որոնում Սիրվածում</string>
     <string name="hillshade_menu_download_descr">Ներբեռնել \"Ռելիեֆի ստվերները\" հատուկ քարտեզ այս տարածքի համար:</string>
@@ -326,7 +327,7 @@
     <string name="routing_attr_driving_style_speed_name">Կարճ երթուղիները</string>
     <string name="routing_attr_driving_style_balance_name">Հավասարակշռված</string>
     <string name="routing_attr_driving_style_safety_name">նախընտրում անընդմեջ</string>
-    <string name="relief_smoothness_factor_descr">Նախընտրելի տեղանք`Հարթ կամ լեռնոտ։</string>
+    <string name="relief_smoothness_factor_descr">Նախընտրելի տեղանք`հարթ կամ լեռնոտ։</string>
     <string name="shared_string_slope">Լանջ</string>
     <string name="add_new_folder">Ավելացնել նոր թղթապանակ</string>
     <string name="points_delete_multiple_succesful">Կետ(եր)ը ջնջված է:</string>
@@ -338,10 +339,10 @@
     <string name="shared_string_time_moving">Ժամանակն շարժման մեջ</string>
     <string name="shared_string_time_span">Ընդհանուր ժամանակը</string>
     <string name="shared_string_max">Առավելագույն</string>
-    <string name="shared_string_start_time">Մեկնում</string>
-    <string name="shared_string_end_time">Ժամանում</string>
+    <string name="shared_string_start_time">Մեկնելու ժամը</string>
+    <string name="shared_string_end_time">Ժամաննամ ժամկետը</string>
     <string name="shared_string_color">Գույնը</string>
-    <string name="select_gpx_folder">Ընտրեք թղթապանակ տրեկերի համար</string>
+    <string name="select_gpx_folder">Ընտրեք թղթապանակ GPX համար</string>
     <string name="file_can_not_be_moved">Ֆայլը չի կարող տեղափոխվել:</string>
     <string name="shared_string_move">Տեղափոխել</string>
     <string name="shared_string_gpx_tracks">Տրեկեր</string>
@@ -377,9 +378,9 @@
     <string name="route_roundabout_short">Վերցրեք %1$d ելքը</string>
     <string name="upload_poi">Վերբեռնեք POI</string>
     <string name="route_calculation">Ուղևորության հաշվարկ</string>
-    <string name="gpx_no_tracks_title">Դուք դեռ չունեք տրեկներ</string>
-    <string name="gpx_no_tracks_title_folder">Դուք նաև կարող եք ավելացնել տրեկները թղթապանակ</string>
-    <string name="gpx_add_track">Ավելացնել տրեկը</string>
+    <string name="gpx_no_tracks_title">Դուք դեռ չունեք GPX ֆայլեր</string>
+    <string name="gpx_no_tracks_title_folder">Դուք նաև կարող եք ավելացնել GPX թղթապանակի մեջ</string>
+    <string name="gpx_add_track">Ավելացնել…</string>
     <string name="gpx_appearance">Տեսակ</string>
     
     
@@ -424,7 +425,7 @@
     <string name="no_inet_connection_desc_map">Պահանջվում է ներբեռնել քարտեզներ։</string>
     <string name="search_location">Դիրքի որոնմում…</string>
     <string name="storage_free_space">Ազատ տեղ</string>
-    <string name="storage_place_description">OsmAnd-ը կպահպանի տվյալները (քարտեզներ, երթուղիներ և այլն) %1$s։</string>
+    <string name="storage_place_description">OsmAnd-ը կպահպանի տվյալները (քարտեզներ, GPX, երթուղիներ և այլն) %1$s։</string>
     <string name="give_permission">Տալ թույլտվություն</string>
     <string name="animate_my_location_desc">"Միացնել  \"Իմ Դիրքի\" անիմացումը քարտեզի համայնապատկերում նավիգացիայի ժամանակ։"</string>
     <string name="index_item_depth_points_southern_hemisphere">Ծովային խորության կետերը հարավային կիսագնդում</string>
@@ -453,7 +454,7 @@
     <string name="clear_tile_data">"Ջնջել  բոլոր տայլերը"</string>
     <string name="routing_attr_short_way_name">Վառելիք տնտեսող ճանապարհ</string>
     <string name="routing_attr_short_way_description">Կիրառել վառելիք տնտեսող ճանապարհ (սովորաբար ավելի կարճ)։</string>
-    <string name="replace_favorite_confirmation">Վստահ եք, որ ցանկանում եք փոխարինել սիրածները %1$s?</string>
+    <string name="replace_favorite_confirmation">Վստահ եք, որ ցանկանում եք փոխարինել Սիրածները %1$s\?</string>
     <string name="rendering_attr_hideOverground_name">Վերգետնյա օբյեկտներ</string>
     <string name="shared_string_change">Փոխել</string>
     <string name="get_started">Սկսել</string>
@@ -554,7 +555,7 @@
     <string name="osm_editors_ranking">OSM քարտեզագրողների վարկանիշը</string>
     <string name="osm_live_subscription">OsmAnd Live բաժանորդագրություն</string>
     <string name="osm_live_subscribe_btn">Բաժանորդագրվել</string>
-    <string name="osm_live_email_desc">Ի գիտություն ձեզ ներդրումների մասին:</string>
+    <string name="osm_live_email_desc">Անհրաժեշտ է Ձեզ տրամադրել տեղեկություններ ներդրումների մասին:</string>
     <string name="osm_live_user_public_name">Հանրային անուն</string>
     <string name="osm_live_hide_user_name">Մի ցուցադրեք իմ անունը զեկույցներում</string>
     <string name="osm_live_support_region">Աջակցվող տարածաշրջան</string>
@@ -914,7 +915,7 @@
     <string name="shared_string_clear">Մաքրել</string>
     <string name="shared_string_clear_all">Մաքրել բոլորը</string>
     <string name="shared_string_save">Պահպանել</string>
-    <string name="shared_string_save_as_gpx">Պահել որպես նոր GPX երթուղի</string>
+    <string name="shared_string_save_as_gpx">Պահել որպես նոր GPX ֆայլ</string>
     <string name="shared_string_rename">Վերանվանել</string>
     <string name="shared_string_delete">Ջնջել</string>
     <string name="shared_string_delete_all">Ջնջել բոլորը</string>
@@ -1119,7 +1120,7 @@
     <string name="traffic_warning_calming">Նվազեցրեք արագությունը</string>
     <string name="traffic_warning_speed_camera">Արագաչափ տեսախցիկ</string>
     <string name="traffic_warning">Արագության սահմանափակում</string>
-    <string name="speak_favorites">Մոտակա սիրված-եր</string>
+    <string name="speak_favorites">Մոտակա «Սիրված»-եր</string>
     <string name="speak_poi">Մոտակա POI</string>
     <string name="way_alarms">Երթևեկության նախազգուշացումներ</string>
     <string name="background_service_is_enabled_question">Ֆոնային ռեժիմի դեռ աշխատում է։ Ընդհատել այն էլ?</string>
@@ -1133,8 +1134,8 @@
     <string name="save_track_to_gpx_globally">Գրանցել տրեկը GPX ֆայլի տեքով</string>
     <string name="save_track_to_gpx_globally_headline">Տրեկի գրանցումը ըստ պահանջի</string>
     <string name="save_track_to_gpx_globally_descr">Ընդհանուր դիրքի գրանցումը GPX ֆայլի տեսքով կարող եք միացնել կամ անջատել GPX վիջետի միջոցով քարտեզի էկրանից։</string>
-    <string name="save_current_track_descr">Պահպանել ընթացիկ տրեկը հիմա։</string>
-    <string name="save_current_track">Պահպանել ընթացիկ GPX տրեկը</string>
+    <string name="save_current_track_descr">Պահպանել ընթացիկ տրեկը որպես GPX ֆայլ։</string>
+    <string name="save_current_track">Պահպանել ընթացիկ տրեկը</string>
     <string name="save_track_to_gpx">Նավիգացիայի ընթացքում ավտոմատ գրանցել տրեկը</string>
     <string name="save_track_to_gpx_descrp">Նավիգացիայի ընթացքում GPX տրեկները ինքնաբերաբար կպահպանվեն տրեկների թղթապանակում։</string>
     <string name="save_track_interval_globally">Մուտքագրման ժամանակի ընդմիջումը</string>
@@ -1251,7 +1252,7 @@
 \nԿետեր</string>
     <string name="gpx_selection_track">%1$s
 \nՏրակ %2$s</string>
-    <string name="gpx_file_is_empty">GPX տրեկը դատարկ է</string>
+    <string name="gpx_file_is_empty">GPX ֆայլը դատարկ է</string>
     
     
     
@@ -1406,7 +1407,7 @@
     <string name="disable_complex_routing_descr">Անջատեք 2 փուլային երթուղին ավտոմեքենայի նավարկության համար։</string>
     <string name="disable_complex_routing">Անջատել բարդ երթուղին</string>
     <string name="amenity_type_seamark">Նավիգացիոն նշաններ (լճակներ)</string>
-    <string name="app_modes_choose_descr">"Ընտրեք օգտվողի պրոֆիլները  հավելվածում տեսանելի լինելու համար։"</string>
+    <string name="app_modes_choose_descr">Ընտրեք պրոֆիլները որոնք տեսանելի կլինեն հավելվածում։</string>
     <string name="app_modes_choose">Հավելվածի պրոֆիլներ</string>
     <string name="map_widget_map_rendering">Քարտեզի ցուցադրումը</string>
     <string name="app_mode_hiking">Ոտքով զբոսնելն (Hiking)</string>
@@ -1477,11 +1478,11 @@
     <string name="intermediate_items_sort_by_distance">Դասավորել ըստ հեռավորության</string>
     <string name="local_osm_changes_backup_failed">OSM-ի փոփոխությունների կրկնօրինակումը ձախողվել է</string>
     <string name="local_osm_changes_backup">Կրկնօրինակել OSM-ի փոփոխությունները</string>
-    <string name="osmand_background_plugin_description">Այս plugin-նը ապահովում է էներգախնայողության ռեժիմում նավարկություն և երթուղիների գրանցում: Plugin-նը գործարկում է ֆոնային ռեժիմում և պարբերաբար ակտիվացնում GPS-ը երթուղին գրանցելու կամ ձայնային հրամանները նվագելու համար:</string>
+    <string name="osmand_background_plugin_description">Այս plugin-նը ապահովում է էներգախնայողության ռեժիմում նավարկություն և երթուղիների գրանցում: Plugin-նը գործարկում է ֆոնային ռեժիմում և պարբերաբար ակտիվացնում GPS-ը:</string>
     <string name="contribution_activity">Տեղադրել տարբերակը</string>
     <string name="download_wikipedia_maps">Վիքիպեդիա</string>
     <string name="map_widget_distancemeasurement">Հեռավորության չափում</string>
-    <string name="audionotes_location_not_defined">"Դիրքը դեռ հայտնի չէ, որպեսզի կապել նշումի հետ:\"Օգտագործեք դիրղը ...\" նշումը  նշված դիրքին նշանակելու համար։"</string>
+    <string name="audionotes_location_not_defined">"Դիրքը դեռ հայտնի չէ, որպեսզի կապել նշումի հետ:«Օգտագործեք դիրղը...» նշումը  նշված դիրքին նշանակելու համար։"</string>
     <string name="map_widget_audionotes">Աուդիո նշումներ</string>
     <string name="index_srtm_parts">մասեր</string>
     <string name="index_srtm_ele">Բարձունքների գծեր</string>
@@ -1503,7 +1504,7 @@
     <string name="search_villages_and_postcodes">Որոնել ըստ գյուղի և փոստային բաժանմունքի(ինդեքսի)</string>
     <string name="rendering_attr_showRoadMaps_description">Ընտրեք, թե ինչպես ցույց տալ միայն ճանապարհային քարտեզները՝</string>
     <string name="rendering_attr_showRoadMaps_name">Միայն ճանապարհների քարտեզները</string>
-    <string name="safe_mode_description">"Գործարկել  անվտանգ ռեժիմում (դանդաղեցնում է հավելվածի աշխատանքը, օգտագործելով միայն Android գործառույթները):"</string>
+    <string name="safe_mode_description">"Գործարկել  հավելվածը անվտանգ ռեժիմում (դանդաղեցնում է հավելվածի աշխատանքը, օգտագործելով միայն Android գործառույթները):"</string>
     <string name="safe_mode">Անվտանգ ռեժիմ</string>
     <string name="native_library_not_running">Հավելվածը գործարկվել է անվտանգ ռեժիմով (անջատել «Կարգավորումներ»-ում):</string>
     <string name="close_changeset">Փոխել «changeset»</string>
@@ -1549,7 +1550,7 @@
     <string name="use_compass_navigation_descr">Նավարկել կողմնացույցի օգնությամբ, եթե շարժման ուղղությունը հայտնի չէ։</string>
     <string name="use_compass_navigation">Օգտագործեք կողմնացույցը</string>
     <string name="avoid_motorway">Խուսափել ավտոմայրուղիներից</string>
-    <string name="auto_zoom_map_descr">Ավտոմատ կերպով փոխել քարտեզի մասշտաբը արագությունը փոխելու դեպքում։</string>
+    <string name="auto_zoom_map_descr">Ավտոմատ կերպով փոխել քարտեզի մասշտաբը ըստ արագությանը։</string>
     <string name="auto_zoom_map">Ավտո-մասշտաբ</string>
     <string name="snap_to_road_descr">Կապել ընթացիկ դիրքը ճանապարհին։</string>
     <string name="snap_to_road">Կապել ճանապարհին</string>
@@ -1558,9 +1559,15 @@
     <string name="osmand_play_title_30_chars">OsmAnd քարտեզներ և նավիգացիա</string>
     <string name="osmand_short_description_80_chars">OsmAnd - ճանապարհորդելու համար նավիգացիոն ծրագիր է բաց կոդով</string>
     <string name="osmand_long_description_1000_chars">"OsmAnd (OSM Automated Navigation Directions) OsmAnd-ը բաց կոդով նավիգացիոն ծրագիր է, որը հնարավորություն է տալիս մուտք գործել համաշխարհային OpenStreetMap (OSM) տվյալների լայն շրջանակ: Բոլոր քարտեզները (վեկտորային կամ կղմինդր) և դրա հետ կապված տվյալները կարող են պահվել հեռախոսի հիշողության քարտում անցանց օգտագործման համար: OsmAnd-ն առաջարկում է նաև անցանց և առցանց երթուղիների ֆունկցիոնալություն, այդ թվում`մանրամասն ձայնային ուղեցույց: Հիմնական առանձնահատկություններից մի քանիսը`- Ամբողջությամբ անցանց ֆունկցիոնալությունը (պահեստավորվող վեկտոր կամ կղմինդր քարտեզներ սարքի հիշողութունում)։ - Կոմպակտ անցանց քարտեզներ ամբողջ աշխարհի համար։ - Երկրի կամ տարածաշրջանի քարտեզները ներբեռնում ուղղակիորեն հավելվածից։ - Հնարավոր է մի քանի քարտեզի շերտերի կափարիչ , ինչպիսիք են GPX-ը կամ նավիգացիոն ուղիները(tracks), POI, «Սիրված»(Favorites), Եզրագծերը(Contour lines), հասարակական տրանսպորտի կանգառները, հարմարեցված թափանցիկությամբ լրացուցիչ քարտեզներ։ - Հասցեների և տեղերի (POIs) անցանց որոնում։ - Ավտոմատ կերպով երթուղու հաշվարկ միջին հեռավորությունների համար։ - Մեքենա, հեծանիվ և հետիոտն ռեժիմներ։ - Ընտրովի՝  ցերեկային / գիշերային ռեժիմների ավտոմատացված դիտում։ - Ընտրովի՝ արագություննից կախված քարտեզի ընդլայնում։ - Ընտրովի՝ քարտեզի հավասարեցում, ըստ կողմնացույցի կամ շարժման ուղղության։ - Ընտրովի՝ գծի ուղեցույց, արագության սահմանափակուման ցուցադռումը, արձանագրված և TTS ձայներ: OsmAnd-ի այս անվճար տարբերակի սահմանափակումները. - Քարտեզների ներբեռնումների քանակը սահմանափակ է, - Հասանելի չեն Վիքիպեդիա  POIs-ները: Osm-ը ակտիվորեն զարգանում է, և մեր նախագիծը և դրա հետագա առաջընթացը հիմնված են ֆինանսական ներդրումները վրա, որը հնարավորություն է տալիս մշակել և փորձարկել է նոր ֆունկցիոնալությունըԽնդրեմ։  Խնդրում ենք մտածեք OsmAnd+ գնելու մասին կամ ֆինանսավորեք կոնկրետ նոր հատկություններ, կամ  նվիրատվություն արեք osmand.net կայքում։"</string>
-    <string name="osmand_extended_description_part1">"OsmAnd (OSM Automated Navigation Directions) հանդիսանում է որպեսզ քարտեզ և նավիգացիոն հավելված ազատ մուտթով բարձրորակ OpenStreetMap (OSM) տվյալներին։ Վայելեք ձայնային և օպտիկական նավիգատորի հնարավորությունները, դիտելով POIs, ստեղծեք և կառավարեք GPX track-րը, օգտագործելով եզրագծերի(contour lines) արտացոլման և բարձրությանների տեղեկատվություն (plugin-ի միջոցով), մեքենավարման, հեծանվավազքի, հետիոտների ռեժիմների  միջև ընտրում, OSM խմբագրում և այլնի:"</string>
+    <string name="osmand_extended_description_part1">"OsmAnd (OSM Automated Navigation Directions) հանդիսանում է որպեսզ քարտեզ և նավիգացիոն հավելված ազատ մուտթով բարձրորակ OpenStreetMap (OSM) տվյալներին։ 
+\nՎայելեք ձայնային և օպտիկական նավիգատորի հնարավորությունները, դիտելով POIs, ստեղծեք և կառավարեք GPX track-րը, օգտագործելով եզրագծերի(contour lines) արտացոլման և բարձրությանների տեղեկատվություն (plugin-ի միջոցով), մեքենավարման, հեծանվավազքի, հետիոտների ռեժիմների  միջև ընտրում, OSM խմբագրում և այլնի:"</string>
     <string name="osmand_extended_description_part2">"GPS նավիգացիան • Դուք կարող եք ընտրել անցանց (չկա ռոումինգի վճարներ, արտերկրում) կամ առցանց (արագ) ռեժիմ • Ձայնային ուղեկցումը առաջնորդում է Ձեզ  ճանապարհով (ձայնագրված և սինթեզված(TTS) ձայն) • Երթուղին վերահաշվարկվում է եթե դուք շեղվում եք նրանից • Ճանապարհային ուղեցույցը, փողոցների անունները և նախատեսված ժամանման ժամանակը կօգնեն Ձեզ ճանապարհին  • Ձեր ճանապարհորդությունը ավելի անվտանգ դարձնելու համար, օրվա/գիշերային ռեժիմը փոփոխվոմ է ավտոմատ կերպով • Դուք կարող եք ընտրել  ցույց տալ արագության սահմանափակմները և ստանալ զգուշացումներ, եթե գերազանցեք այն • Քարտեզի ընդլայնումը հարմարվում է ըստ ձեր արագությանը • Դուք կարող եք որոնել Ձեր նպատակակետը ըստ հասցեյի, ըստ տեսակի (օրինակ`ավտոկանգառ, ռեստորան, հյուրանոց, բենզալցակայան, թանգարան) կամ ըստ աշխարհագրական կոորդինատների  • Աջակցում է  երթուղու միջանկյալ կետերը ձեր երթուղու վրա • Դուք կարող եք արձանագրել ձեր սեփական կամ բեռնել GPX track, և հետեւել նրան"</string>
-    <string name="osmand_extended_description_part3">"Քարտեզ • Ցուցադրում է Ձեր շուրջը գտնվող POIs (հետաքրքրության կետ) • Կարգավորում է քարտեզը ըստ Ձեր շարժման ուղղությամբ • Ցույց է տալիս, թե որտեղ եք գտնվում և որտեղ եք նայում • Փոխանցում է ձեր գտնվելու վայրը, որպեսզի ձեր ընկերները կարողանան գտնել ձեզ • Պահպանում է ձեր ամենակարևոր տեղերը  «Սիրված»-ում (Favorites) • Թույլ է տալիս ընտրել, թե ինչպես ցուցադրել անունները քարտեզի վրա`անգլերեն, տեղական կամ հնչյունական ուղղագրությամբ • Ցուցադրում է մասնագիտացված օնլայն սալիկներ, արբանյակային դիտում (Bing-ից), տարբեր կափարիչներ, ինչպիսիք են շրջագայությունը/նավիգացիան GPX tracks և լրացուցիչ շերտերով`հարմարեցված թափանցիկությամբ"</string>
+    <string name="osmand_extended_description_part3">Քարտեզ 
+\n• Ցուցադրում է Ձեր շուրջը գտնվող POIs (հետաքրքրության կետ) \t\t
+\n• Կարգավորում է քարտեզը ըստ Ձեր շարժման ուղղությամբ 
+\n• Ցույց է տալիս, թե որտեղ եք գտնվում և որտեղ եք նայում 
+\n• Թույլ է տալիս ընտրել, թե ինչպես ցուցադրել անունները քարտեզի վրա`անգլերեն, տեղական կամ հնչյունական ուղղագրությամբ 
+\n• Ցուցադրում է մասնագիտացված օնլայն սալիկներ, արբանյակային դիտում (Bing-ից), տարբեր կափարիչներ, ինչպիսիք են շրջագայությունը/նավիգացիան GPX tracks և լրացուցիչ շերտերով`հարմարեցված թափանցիկությամբ</string>
     <string name="osmand_extended_description_part4">"OsmAnd-ի  լեռնադահուկային քարտեզների plugin-նը հնարավորություն է տալիս տեսնել լեռնադահուկային ուղիները բարդության աստիճանի և որոշ լրացուցիչ տեղեկություններ, ինչպես նաև վերելակների տեղակայման և այլ օբյեկտների:"</string>
     <string name="osmand_extended_description_part5">"Հեծանվավազք • Դուք կարող եք գտնել հեծանվային ուղիներ քարտեզի վրա • Հեծանվային ռեժիմում GPS նավիգացիան, կառուցում է ձեր երթուղին հեծանվային ուղիներով • Դուք կարող եք տեսնել ձեր արագությունը և բարձրությունը • GPX ձայնագրման տարբերակը թույլ է տալիս արձանագրել ձեր ուղևորությունը և կիսել այն • Լրացուցիչ plugin-ի միջոցով կարող եք միացնել  եզրագծերի(contour lines) և բլուր-ստվերում(hill-shading) ցուցադրումը"</string>
     <string name="osmand_extended_description_part6">"Քայլում, արշավ, քաղաքային շրջագայություն • Քարտեզը ցույց է տալիս, որ դուք քայլում եք և արշավներ եք անում • Վիքիպեդիան ձեր նախընտրած լեզվով կարող է պատմել ձեզ շրջագայության ժամանակ քաղաքներում  • Հասարակական տրանսպորտի կանգառները (ավտոբուս, տրամվայ, գնացք), ներառյալ գծի անունները, օգնում են նավարկելու նոր քաղաքում • GPS նավիգացիան հետիոտնային ռեժիմում կառուցում է ձեր երթուղին, օգտագործելով քայլելու ճանապարհները • Դուք կարող եք վերբեռնել և հետեւել GPX երթուղին կամ գրանցել և կիսվել ձեր սեփական"</string>
@@ -1575,15 +1582,16 @@
     <string name="map_widget_bearing">Հարաբերական կրող</string>
     <string name="osmand_plus_long_description_1000_chars">"OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+-ը բաց կոդով նավիգացիոն ծրագիր է, որը հնարավորություն է տալիս մուտք գործել համաշխարհային OpenStreetMap (OSM) տվյալների լայն շրջանակ: Բոլոր քարտեզները (վեկտորային կամ կղմինդր) և դրա հետ կապված տվյալները կարող են պահվել հեռախոսի հիշողության քարտում անցանց օգտագործման համար: OsmAnd+-ն առաջարկում է նաև անցանց և առցանց երթուղիների ֆունկցիոնալություն, այդ թվում`մանրամասն ձայնային ուղեցույց: OsmAnd+ - հավելվածի վճարովի  տարբերակն է, ձեռք բերելով այն, աջակցեկցում եք նախագծին, ֆինանսավորում եք նոր առանձնահատկությունների զարգացումը և ստանում եք վերջին թարմացումները: Հիմնական առանձնահատկություններից մի քանիսը`- Ամբողջությամբ անցանց ֆունկցիոնալությունը (պահեստավորվող վեկտոր կամ կղմինդր քարտեզներ սարքի հիշողութունում)։ - Կոմպակտ անցանց քարտեզներ ամբողջ աշխարհի համար։ - Երկրի կամ տարածաշրջանի քարտեզները անսահմանափակ ներբեռնում ուղղակիորեն հավելվածից։  - Անցանց Վիքիպեդիա տվյալներ (ներբեռնել Վիքիպեդիա POIs), տեսարժան վայրերի համար։ -  Հնարավոր է մի քանի քարտեզի շերտերի կափարիչ , ինչպիսիք են GPX-ը կամ նավիգացիոն ուղիները(tracks), POI, «Սիրված»(Favorites), Եզրագծերը(Contour lines), հասարակական տրանսպորտի կանգառները, հարմարեցված թափանցիկությամբ լրացուցիչ քարտեզներ։ - Հասցեների և տեղերի (POIs) անցանց որոնում։ - Ավտոմատ կերպով երթուղու հաշվարկ միջին հեռավորությունների համար։ - Մեքենա, հեծանիվ և հետիոտն ռեժիմներ։ - Ընտրովի՝  ցերեկային / գիշերային ռեժիմների ավտոմատացված դիտում։ - Ընտրովի՝ արագություննից կախված քարտեզի ընդլայնում։ - Ընտրովի՝ քարտեզի հավասարեցում, ըստ կողմնացույցի կամ շարժման ուղղության։ - Ընտրովի՝ գծի ուղեցույց, արագության սահմանափակուման ցուցադռումը, արձանագրված և TTS ձայներ"</string>
     <string name="osmand_plus_extended_description_part1">"OsmAnd+ (OSM Automated Navigation Directions) հանդիսանում է որպեսզ քարտեզ և նավիգացիոն հավելված ազատ մուտթով բարձրորակ OpenStreetMap (OSM) տվյալներին։ Վայելեք ձայնային և օպտիկական նավիգատորի հնարավորությունները, դիտելով POIs, ստեղծեք և կառավարեք GPX track-րը, օգտագործելով եզրագծերի(contour lines) արտացոլման և բարձրությանների տեղեկատվություն (plugin-ի միջոցով), մեքենավարման, հեծանվավազքի, հետիոտների ռեժիմների  միջև ընտրում, OSM խմբագրում և այլնի: OsmAnd+ - հավելվածի վճարովի  տարբերակն է, ձեռք բերելով այն, աջակցեկցում եք նախագծին, ֆինանսավորում եք նոր առանձնահատկությունների զարգացումը և ստանում եք վերջին թարմացումները: Հիմնական առանձնահատկություններից մի քանիսը`"</string>
-    <string name="osmand_plus_extended_description_part2">"Նավիգացիան • Աշխատում է առցանց (արագ) կամ անցանց (չկա ռոումինգի վճարներ, արտերկրում) • Ձայնային ուղեկցումը առաջնորդում է Ձեզ  ճանապարհով (ձայնագրված և սինթեզված(TTS) ձայն)  • Ճանապարհային ուղեցույցը, փողոցների անունները և նախատեսված ժամանման ժամանակը • Աջակցում է  երթուղու միջանկյալ կետերը ձեր երթուղու վրա  • Երթուղին վերահաշվարկվում է եթե դուք շեղվում եք նրանից • Դուք կարող եք որոնել Ձեր նպատակակետը ըստ հասցեյի, ըստ տեսակի (օրինակ`ավտոկանգառ, ռեստորան, հյուրանոց, բենզալցակայան, թանգարան) կամ ըստ աշխարհագրական կոորդինատների"</string>
+    <string name="osmand_plus_extended_description_part2">"Նավիգացիան • Աշխատում է առցանց (արագ) կամ անցանց (չկա ռոումինգի վճարներ, արտերկրում) • Ձայնային ուղեկցումը առաջնորդում է Ձեզ  ճանապարհով (ձայնագրված և սինթեզված(TTS) ձայն)  • Ճանապարհային ուղեցույցը, փողոցների անունները և նախատեսված ժամանման ժամանակը • Աջակցում է  երթուղու միջանկյալ կետերը ձեր երթուղու վրա  • Երթուղին վերահաշվարկվում է եթե դուք շեղվում եք նրանից • Դուք կարող եք որոնել Ձեր նպատակակետը ըստ հասցեյի, ըստ տեսակի (օրինակ`Ավտոկանգառ, ռեստորան, հյուրանոց, բենզալցակայան, թանգարան) կամ ըստ աշխարհագրական կոորդինատների"</string>
     <string name="show_legacy_search_desc">"Ավելացնել  մենյուի ցանկում հին որոնումը։"</string>
     <string name="rec_split_desc">"Վերագրանցել  կլիպները(clips), երբ սահմանվաշ պահեստային ծավալը գերազանցում է։"</string>
     <string name="osmand_plus_extended_description_part3">"Քարտեզի դիտում  • Ցուցադրում է ձեր դիրքը և կողմնորոշումը  • Կարգավորում է քարտեզը ըստ Ձեր շարժման ուղղությամբ • Պահպանում է ձեր ամենակարևոր տեղերը  «Սիրված»-ում (Favorites) • Ցուցադրում է Ձեր շուրջը գտնվող POIs (հետաքրքրության կետ) • Ցուցադրում է մասնագիտացված օնլայն սալիկներ, արբանյակային դիտում (Bing-ից), տարբեր կափարիչներ, ինչպիսիք են շրջագայությունը/նավիգացիան GPX tracks և լրացուցիչ շերտերով`հարմարեցված թափանցիկությամբ • Թույլ է տալիս ընտրել, թե ինչպես  ցուցադրել անունները քարտեզի վրա`անգլերեն, տեղական կամ հնչյունական ուղղագրությամբ"</string>
     <string name="osmand_plus_extended_description_part4">"Հհարավորություն է տալիս օգտագործել OSM և Wikipedia տվյալները • Բարձրորակ տեղեկատվություն աշխարհի լավագույն համագործակցային նախագծերից • OSM տվյալներ ըստ երկրի կամ տարածաշրջանի • Վիքիպեդիա POIs, մեծ տեսարժան վայրեր դիտելու համար • Անսահմանափակ անվճար ներլցումներ, անմիջապես հավելվածից • Կոմպակտ անցանց վեկտորային քարտեզները թարմացվում են առնվազն ամիսը մեկ անգամ • Ընտրություն միջև ամբողջական տարածաշրջանային տվյալների և ճանապարհային ցանցի  (օրինակ, ամբողջ Ճապոնիայն 700 ՄԲ կամ 200 ՄԲ միայն ճանապարհային ցանցի համար)"</string>
     <string name="osmand_plus_extended_description_part5">Անվտանգության հատկություններ • Լրացուցիչ ավտոմատացված օրվա/գիշերային դիտման անցում • Լրացուցիչ արագության ցուցադրման ցուցադրություն, հիշեցում, եթե այն գերազանցում է • Արագության սահմանափակումների ցուցադռումը և զգուշացում այն գերազանցելու դեպկում • Փոխանակեք ձեր գտնվելու վայրը, որպեսզի ձեր ընկերները կարողանան գտնել ձեզ</string>
     <string name="osmand_plus_extended_description_part6">"Հեծանվի և հետիոտն հատկություններ • Դիտեք ոտքով, արշավային և հեծանվային ուղիները • Հեծանվային և հետիոտնային հատուկ երթուղիների ցուցադրման ռեժիմներ  • Հասարակական տրանսպորտի կանգառները (ավտոբուս, տրամվայ, գնացք), ներառյալ գծի անունները, օգնում են նավարկելու անծանոթ քաղաքում  • Դուք կարող եք տեսնել ձեր արագությունը և բարձրությունը • Լրացուցիչ plugin-ի միջոցով կարող եք միացնել  եզրագծերի(contour lines) և բլուր-ստվերում(hill-shading) ցուցադրումը"</string>
-    <string name="osmand_plus_extended_description_part7">"Ուղղակի նպաստել OSM-ին • Զեկուցել սխալների մասին • Վերբեռնել GPX track-եր OSM ուղղակիորեն հավելվածից  • Ավելացրեք POIs և ուղղակիորեն վերբեռնել դրանք OSM-ում (կամ ավելի ուշ, եթե անցանց եք) • Ուղեւորության գրանցումը նաև ֆոնային ռեժիմում (սարքը գտնվում է քնի ռեժիմում)։ Osmand-ը ակտիվորեն զարգացող նախագիծ է`բաց կոդով: Յուրաքանչյուրը կարող է նպաստել նախագծին, հաղորդելով է սխալները,  բարելավելով թարգմանությունները կամ  նոր առանձնահատկություններ կոդավորման: Ծրագիրն անընդհատ կատարելագործման  վիճակում է, մշակողների և օգտագործողների միջև բոլոր այդ ձևերի փոխհարաբերությունների շնորհիվ: Ծրագրի առաջընթացը նաև կախված է ֆինանսական գործառույթներից, նոր ֆունկցիաների գրելու և փորձարկելու համար:"</string>
-    <string name="osmand_plus_extended_description_part8">"Քարտեզի մոտավոր լուսաբանում և որակը. • Արևմտյան Եվրոպայում **** • Արևելյան Եվրոպա: *** • Ռուսաստան: *** • Հյուսիսային Ամերիկա: *** • Հարավային Ամերիկա: ** • ** • Ասիա, Ճապոնիա և Հարավային Կորեա: * ** • Մերձավոր Արեւելք։ **  • Աֆրիկա։ ** • Antarctica: * Շատ երկրներում հասանելի է ներբեռնման համար: Ստացեք մի հուսալի նավարկում ձեր երկրի համար, լինի դա Ֆրանսիան, Գերմանիան, Մեքսիկա, Միացյալ Թագավորություն, Իսպանիան, Նիդերլանդները, ԱՄՆ, Ռուսաստան, Բրազիլիա, կամ որեւէ այլ…"</string>
+    <string name="osmand_plus_extended_description_part7">"Ուղղակի նպաստել OSM-ին • Զեկուցել սխալների մասին • Վերբեռնել GPX track-եր OSM ուղղակիորեն հավելվածից  • Ավելացրեք POIs և ուղղակիորեն վերբեռնել դրանք OSM-ում (կամ ավելի ուշ, եթե անցանց եք) • Ուղեւորության գրանցումը նաև ֆոնային ռեժիմում (սարքը գտնվում է քնի ռեժիմում)։ Osmand-ը ակտիվորեն զարգացող նախագիծ է`բաց կոդով: Յուրաքանչյուրը կարող է նպաստել նախագծին, հաղորդելով է սխալները,  բարելավելով թարգմանությունները կամ  նոր առանձնահատկություններ կոդավորման: Ծրագիրն անընդհատ կատարելագործման  վիճակում է, մշակողների և օգտագործողների միջև բոլոր այդ ձևերի փոխհարաբերությունների շնորհիվ: Ծրագրի առաջընթացը նաև կախված է ֆինանսական գործառույթներից, նոր ֆունկցիաների գրելու և փորձարկելու համար․"</string>
+    <string name="osmand_plus_extended_description_part8">"Քարտեզի մոտավոր լուսաբանում և որակը. • Արևմտյան Եվրոպայում **** • Արևելյան Եվրոպա: *** • Ռուսաստան: *** • Հյուսիսային Ամերիկա: *** • Հարավային Ամերիկա: ** • ** • Ասիա, Ճապոնիա և Հարավային Կորեա: * ** • Մերձավոր Արեւելք։ **  • Աֆրիկա։ ** • Antarctica: * Շատ երկրներում հասանելի է ներբեռնման համար: Ստացեք մի հուսալի նավարկում ձեր երկրի համար, լինի դա Ֆրանսիան, Գերմանիան, Մեքսիկա, Միացյալ Թագավորություն, Իսպանիան, Նիդերլանդները, ԱՄՆ, Ռուսաստան, Բրազիլիա, կամ որեւէ այլ,…
+\n"</string>
     <string name="filterpoi_activity">Ստեղծել ֆիլտր POI համար</string>
     <string name="recalculate_route_to_your_location">Տրանսպորտի տեսակը՝</string>
     <string name="select_navigation_mode">Ընտրեք տրանսպորտի տեսակը</string>
@@ -1651,10 +1659,10 @@
     <string name="osmand_parking_choose_type">Ընտրեք կայանատեղի տեսակը</string>
     <string name="osmand_parking_lim_text">Ժամանակային սահմանափակումով</string>
     <string name="osmand_parking_no_lim_text">Առանց ժամանակի սահմանափակման</string>
-    <string name="osmand_parking_add_event">Ավելացնել հիշեցումը օրացույցին</string>
+    <string name="osmand_parking_add_event">Ավելացնել հիշեցումը օրացույցում</string>
     <string name="osmand_parking_time_limit">Կանգառի ժամանակը սահմանափակ է</string>
     <string name="osmand_parking_time_no_limit">Կանգառն անսահմանափակ է</string>
-    <string name="osmand_parking_position_description">Ձեր կայանված մեքենայի գտնվելու վայրը: %1$s</string>
+    <string name="osmand_parking_position_description">Ձեր կայանված մեքենայի գտնվելու վայրը՝ %1$s</string>
     <string name="osmand_parking_position_description_add">Վերցնել մեքենան`</string>
     <string name="osmand_parking_pm">PM</string>
     <string name="osmand_parking_am">AM</string>
@@ -1668,7 +1676,7 @@
     <string name="asap">Հնարավորինս շուտ</string>
     <string name="share_route_as_gpx">Կիսվել(ուղարկել) երթուղին GPX ֆայլի տեսքով</string>
     <string name="share_route_subject">Երթուղին տրամադրվել է OsmAnd-ի միջոցով</string>
-    <string name="route_roundabout">"Շրջանաձև երթեւեկությունը,  %1$d ելք"</string>
+    <string name="route_roundabout">"Շրջանաձև երթևեկություն  %1$d ելք"</string>
     <string name="route_kl">Պահեք ձախ կողմում</string>
     <string name="route_kr">Պահեք աջ կողմում</string>
     <string name="native_app_allocated_memory_descr">"Ընդհանուր համակարգային հիշողությունն առանձնացված հավելվածին %1$s ՄԲ  (Dalvik %2$s ՄԲ, other %3$s ՄԲ)։ Համամասնական հիշողություն  %4$s ՄԲ  (Android-ի սահմանափակումը   %5$s ՄԲ, Dalvik %6$s ՄԲ)."</string>
@@ -1686,21 +1694,21 @@
     <string name="address_search_desc">"Որոնում  ըստ հասցեի"</string>
     <string name="navpoint_search_desc">Կոորդինատներ</string>
     <string name="transport_search_desc">Հանրային տրանսպորտի որոնում</string>
-    <string name="favourites_search_desc">Որոնում «Սիրված»-ում(Favorites)</string>
+    <string name="favourites_search_desc">Որոնում «Սիրված»-ում(Favorites) ըստ</string>
     <string name="offline_navigation_not_available">OsmAnd անցանց նավարկությունը ժամանակավորապես հասանելի չէ:</string>
-    <string name="left_side_navigation">Ձախակողմյան նավարկություն</string>
+    <string name="left_side_navigation">Ձախակողմյան երթևեկություն</string>
     <string name="left_side_navigation_descr">Ընտրեք ձախակողմյան երթևեկող երկրների համար։</string>
     <string name="local_index_description">"Սխմեք  ցանկացած տարր,տեսնել ավելի մանրամասն տեղեկություններ տեսնելու համար, սխմեք և երկար պահեք`անջատելու կամ ջնջելու համար: Սարքի ընթացիկ տվյալները (%1$s ազատ է)՝"</string>
     <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">"Հավելվածի հիմնական հնարավորությունները օգտագործելու համար պահանջվում  են մանրամասն քարտեզներ, որոնք կարելի է ներբեռնել Ինտերնետից հետևյալ կերպ \"Կառավարում\" → \" Քարտեզների կառավարում\". Ներբեռնումից  հետո Դուք կարող եք դիտել քարտեզներ, որոնել հասցեներ, POI և հասարակական տրանսպորտ։"</string>
+    <string name="first_time_msg">"Շնորհակալություն OsmAnd-ի օգտագործման համար:Հավելվածըօգտագործելու համար պահանջվում  են մանրամասն քարտեզներ, որոնք կարելի է ներբեռնել հետևյալ կերպ \"Կառավարում\" → \" Քարտեզների կառավարում\". Ներբեռնումից  հետո Դուք կարող եք դիտել քարտեզներ, որոնել հասցեներ, POI և հասարակական տրանսպորտ։"</string>
     <string name="basemap_was_selected_to_download">"Հիմնական քարտեզը անհրաժեշտ է  հավելվածի ճիշտ աշխատանքի համար և ավտոմատ ընտրված է ներբեռնելու համար:"</string>
     <string name="local_indexes_cat_tile">Առցանց և քեշավորված քարտեզներ (tile maps)</string>
     <string name="local_indexes_cat_map">Ստանդարտ քարտեզներ (վեկտորային)</string>
     <string name="index_settings_descr">"Քարտեզների ֆայլերը ներբեռնում և կառավարում  ձեր սարքում։"</string>
-    <string name="map_online_plugin_is_not_installed">"Միացրեք առցանց քարտեզների plugin-ը  տարբեր քարտեզային աղբյուրներ ընտրելու համար"</string>
+    <string name="map_online_plugin_is_not_installed">"Միացրեք «Online maps» plugin-ը  տարբեր քարտեզային աղբյուրներ ընտրելու համար"</string>
     <string name="map_online_data">Առցանց քարտեզներ</string>
     <string name="map_online_data_descr">Օգտագործեք առցանց քարտեզներ (ներբեռնեք և քեշավորեք սալիկներ(tiles) SD քարտում)։</string>
     <string name="online_map_settings_descr">«Կարգավորումներ» առցանց քարտեզների և շերտերի(tile) աղբյուրների։</string>
@@ -1711,12 +1719,12 @@
     <string name="play_commands_of_currently_selected_voice">Ընտրեք ձայնը և ստուգեք աշխատեցնելով հրահանգները</string>
     <string name="native_rendering">Արագ մատուցում (ցուցադրում)</string>
     <string name="test_voice_prompts">Ձայնային հրահանգների ստուգում</string>
-    <string name="switch_to_raster_map_to_see">"Ընթացիկ դիրքի համար քարտեզները բացակայում են։ Դուք կարող եք ներբեռնել քարտեզներ օգտագործելով մենյուն \"Կառավարում\" → \"Քարտեզների կառավարում\" կամ անցնել առցանց քարտեզների օգտագործմանը  (դրա համար անհրաժեշտ է միացնել plugin «Առցանց քարտեզներ»)."</string>
+    <string name="switch_to_raster_map_to_see">"Ընթացիկ դիրքի համար քարտեզները բացակայում են։  Ներբեռնեք քարտեզներ օգտագործելով մենյուն «Կառավարում» → «Քարտեզների կառավարում» կամ միացրեք «Online maps» plugin-ը  («Առցանց քարտեզներ»)."</string>
     <string name="send_files_to_osm">Ուղարկել GPX ֆայլերը OSM-ին?</string>
     <string name="gpx_visibility_txt">Տեսանելիություն</string>
     <string name="gpx_tags_txt">Թեգեր(Tags)</string>
     <string name="gpx_description_txt">Նկարագրություն</string>
-    <string name="validate_gpx_upload_name_pwd">Նշեք OSM-ի օգտվողի անունը և գաղտնաբառը, GPX ֆայլերը OpenStreetMap վերբեռնելու համար:</string>
+    <string name="validate_gpx_upload_name_pwd">Նշեք Ձեր OSM-ի գրանցման անունը և գաղտնաբառը, GPX ֆայլերը OpenStreetMap վերբեռնելու համար:</string>
     <string name="default_buttons_support">Աջակցում</string>
     <string name="support_new_features">Աջակցել նոր հատկությունների զարգացումը</string>
     <string name="support_new_features_descr">Նվիրատվություն կատարեք նոր հատկությունները հավելվածում տեսնելու համար։</string>
@@ -1725,7 +1733,7 @@
     <string name="back_to_location">Վերադառնալ</string>
     <string name="accessibility_mode">Հատուկ հնարավորությունների ռեժիմ</string>
     <string name="accessibility_mode_descr">Միացնում է հատուկ հնարավորություններ։</string>
-    <string name="accessibility_default">Օգտագործել համակարգի պարամետրերը</string>
+    <string name="accessibility_default">Օգտագործել Android համակարգի պարամետրերը</string>
     <string name="backToMenu">Վերադառնալ Մենյուին</string>
     <string name="zoomOut">Մանրացնել</string>
     <string name="zoomIn">Խոշորացնել. մոտեցնել</string>
@@ -1781,14 +1789,14 @@
     <string name="offline_edition">Անցանց խմբագրում</string>
     <string name="offline_edition_descr">Միշտ օգտագործել անցանց խմբագրումը։</string>
     <string name="update_poi_does_not_change_indexes">POI-ի փոփոխությունը հավելվածի մեջ չի ազդում ներբեռնված POI-րի վրա, փոփոխությունները պահպանվում են տեղական ֆայլում:</string>
-    <string name="local_openstreetmap_uploading">Վերբեռնուն …</string>
+    <string name="local_openstreetmap_uploading">Վերբեռնուն…</string>
     <string name="local_openstreetmap_were_uploaded">{0} POI/Նշումները վերբեռնվեցին</string>
     <string name="local_openstreetmap_uploadall">Վերբեռնել բոլորը</string>
     <string name="local_openstreetmap_upload">Վերբեռնել փոփոխությունը OSM-ը</string>
     <string name="local_openstreetmap_delete">Ջնջել փոփոխությունները</string>
     <string name="local_openstreetmap_descr_title">Asynchronous OSM խմբագրում՝</string>
     <string name="local_openstreetmap_settings">Անցանց(տեղում) պահպանված OSM POIs/Նշումները</string>
-    <string name="local_openstreetmap_settings_descr">Ցույց տալ և կառավարել OSM POIs/Նշումները, որոնք տեղադրված են տեղական տվյալների բազայում։</string>
+    <string name="local_openstreetmap_settings_descr">Ցույց տալ և կառավարել OSM POIs/Նշումները, որոնք տեղադրված են տեղական(սարի վհա) տվյալների բազայում։</string>
     <string name="live_monitoring_interval_descr">Նշել առցանց դիտարկման ժամանակահատվածը։</string>
     <string name="live_monitoring_interval">"Առցանց վերահսկողության  ժամանակահատված"</string>
     <string name="live_monitoring_url_descr">Նշեք կայքի հասցեն`պարամետրերի շարադրանքով` lat={0}, lon ={1}, timestamp ={2}, hdop ={3}, բարձրությունը ={4}, արագ ={5}, bearing={6}։</string>
@@ -1797,7 +1805,7 @@
     <string name="live_monitoring_max_interval_to_send_desrc">"Նշեք ժամանակի բուֆերը,  դիրքերի պահպանման համար ցանցի բացակայության դեպքում"</string>
     <string name="gpx_monitoring_disabled_warn">Դուք կարող եք գրանցել track-ը օգտագործելով GPX վիջեթը կամ ընտրել «Ուղևորության գրանցում» «Կարգավորումներում»:</string>
     <string name="show_current_gpx_title">Ցուցադրել ընթացիկ երթուղին</string>
-    <string name="free_version_message">Այս անվճար OsmAnd-ի տարբերակը սահմանափակվում է %1$s ներբեռնումով (քարտեզների ավելացում կամ թարմացում) և չի աջակցում անցանց Վիքիպեդիա հոդվածները:</string>
+    <string name="free_version_message">Դուք կարող եք ներբեռնել կամ թարմացնել %1$s քարտեզներ։</string>
     <string name="free_version_title">Անվճար տարբերակ</string>
     <string name="poi_context_menu_showdescription">Ցույց տալ POI նկարագրությունը։</string>
     <string name="index_name_north_america">Հյուսիսային Ամերիկա</string>
@@ -1818,7 +1826,7 @@
     <string name="index_name_tts_voice">Ձայնային հուշում (TTS-սինթեզված, նախընտրելի է)</string>
     <string name="amenity_type_osmwiki">Վիքիպեդիա (անցանց)</string>
     <string name="amenity_type_user_defined">Օգտվողի կողմից սահմանված</string>
-    <string name="fav_export_confirmation">«Սիրված»(Favorites) ֆայլը արդեն գոյություն ունի: Ցանկանում եք փոխարինել այն?</string>
+    <string name="fav_export_confirmation">«Սիրված»(Favorites) ֆայլը արդեն գոյություն ունի: Փոխարինել այն\?</string>
     <string name="profile_settings">Պրոֆիլի կարգավորումները</string>
     <string name="routing_settings">Նավիգացիա</string>
     <string name="routing_settings_descr">Նշեք նավարկության ընտրանքները։</string>
@@ -1864,7 +1872,7 @@
     <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="poi_filter_nominatim">"Nominatim  (ըստ անվան)"</string>
     <string name="search_position_current_location_search">Դիրքի որոնում…</string>
     <string name="search_position_current_location_found">Իմ դիրքը (որոշված է)</string>
@@ -1874,11 +1882,11 @@
     <string name="search_position_map_view">Ընթացիկ քարտեզի կենտրոնը</string>
     <string name="select_search_position">Սկիզբ՝</string>
     <string name="context_menu_item_search">Որոնել մոտակայքում</string>
-    <string name="route_successfully_saved_at">Երթուղին հաջողությամբ պահպանվեց \'%1$s\'։</string>
+    <string name="route_successfully_saved_at">Երթուղին պահպանվեց \'%1$s\'։</string>
     <string name="filename_input">Ֆայլի անունը՝</string>
     <string name="file_with_name_already_exist">"Նման անվանումով  Ֆայլը արդեն գոյություն ունի:"</string>
-    <string name="local_index_upload_gpx_description">Կիսվել GPX ֆայլերով OSM համայնքի հետ: Նրանք կօգտագործվեն քարտեզի բարելավման համար և վերբեռնվելու են osm.org:</string>
-    <string name="local_index_items_uploaded">%1$d из %2$d օբյեկտ(ներ) հաջողությամբ վերբեռնվեց:</string>
+    <string name="local_index_upload_gpx_description">Կիսվել GPX ֆայլերով OSM համայնքի հետ,քարտեզի բարելավման համար:</string>
+    <string name="local_index_items_uploaded">%1$d из %2$d օբյեկտ(ներ) վերբեռնվեց:</string>
     <string name="local_index_mi_upload_gpx">Ուղարկել OSM-ին</string>
     <string name="show_more_map_detail">Մանրամասն քարտեզ</string>
     <string name="show_more_map_detail_descr">Ցույց տալ մանրամասները (ճանապարհներ և այլն), սկսած փոքր մասշտաբից։</string>
@@ -1891,13 +1899,13 @@
     <string name="shared_string_name">Անուն</string>
     <string name="favourites_edit_dialog_category">Կատեգորիա</string>
     <string name="shared_string_no_thanks">Ոչ, շնորհակալություն</string>
-    <string name="basemap_missing">"Հիմնական քարտեզը (ամբողջ աշխարհը փոքր մասշտաբով) բացակայում է: Խնդրում ենք ներբեռնել World_basemap_x.obf  քարտեզը հավելվածի լիարժեք աշխատանքի համար:"</string>
+    <string name="basemap_missing">"Խնդրում ենք ներբեռնել World_basemap_x.obf  քարտեզը հավելվածի լիարժեք աշխատանքի համար:"</string>
     <string name="vector_data_missing">Տեղական(\'offline\') տվյալներ բացակայում են SD քարտի վրա: Խնդրում ենք ներբեռնել դրանք`հավելվածը առանց ինտերնետի օգտագործելու համար:</string>
     <string name="shared_string_release">Թողարկման ամսաթիվ</string>
     <string name="local_index_installed">Ներբեռնված է</string>
-    <string name="local_index_items_backuped">%1$d օբյեկտներից %2$d հաջողությամբ արխիվացվել է:</string>
-    <string name="local_index_items_deleted">%1$d օբյեկտներից %2$d հաջողությամբ ջնջված է:</string>
-    <string name="local_index_items_restored">%1$d օբյեկտներից %2$d հաջողությամբ ակտիվացված է:</string>
+    <string name="local_index_items_backuped">%1$d օբյեկտներից %2$d արխիվացվել է:</string>
+    <string name="local_index_items_deleted">"%1$d օբյեկտներից %2$d  ջնջված է:"</string>
+    <string name="local_index_items_restored">%1$d օբյեկտներից %2$d ակտիվացված է:</string>
     <string name="local_index_no_items_to_do">Չկա օբյեկտներ, որ %1$s</string>
     <string name="local_index_action_do">Դուք պատրաստվում եք %1$s %2$s օբյեկտ(ներ): Համոզված եք?</string>
     <string name="local_index_descr_title">Քարտեզների կառավարում։</string>
@@ -1921,7 +1929,7 @@
     <string name="installing_new_resources">Բացվում են նոր տվյալները…</string>
     <string name="internet_connection_required_for_online_route">"Դուք պատրաստվում եք օգտագործել Ինտերնետ  երթուղիները, սակայն ակտիվ ինտերնետ կապ չեք ունենում:"</string>
     <string name="tts_language_not_supported_title">Լեզուն չի աջակցվում</string>
-    <string name="tts_language_not_supported">Ընտրված լեզուն չի աջակցվում ակտիվ Android TTS-ի կողմից( text-to-speech): Նախադրված լեզուն կօգտագործվի: Ցանկանում եք գտնել մեկ այլ TTS Google Play-ում? Հակառակ դեպքում, օգտագործվում է նախադրված TTS լեզուն:</string>
+    <string name="tts_language_not_supported">Ընտրված լեզուն չի աջակցվում ակտիվ Android TTS-ի կողմից( text-to-speech): Գտեք մեկ այլ TTS Google Play-ում\? Հակառակ դեպքում, կօգտագործվվի նախադրված TTS լեզուն:</string>
     <string name="tts_missing_language_data_title">Տվյալները բացակայում են</string>
     <string name="tts_missing_language_data">Տվյալ լեզվի համար TTS տվյալներ չկան: Ցանկանում եք ներբեռնել դրանք Google Play-ից?</string>
     <string name="gpx_option_reverse_route">Ընտրել հակառակ ուղղությունը</string>
@@ -1946,23 +1954,23 @@
     <string name="layer_overlay">Կափարիչ քարտեզ…</string>
     <string name="map_overlay">Կափարիչ քարտեզ</string>
     <string name="map_overlay_descr">Ընտրեք կափարիչ շերտը հինական քարտեզի համար։</string>
-    <string name="tile_source_already_installed">Քարտեզը արդեն տեղադրված է, պարամետրերը կթարմացվեն։</string>
+    <string name="tile_source_already_installed">Քարտեզը արդեն տեղադրված է, «Կարգավորումները» կթարմացվեն։</string>
     <string name="select_tile_source_to_install">Ընտրեք քարտեզ տեղադրելու կամ թարմացնելու համար։</string>
-    <string name="internet_not_available">Այս գործողության համար անհրաժեշտ է ինտերնետ կապ, սակայն այն մատչելի չէ։</string>
+    <string name="internet_not_available">Այս գործողության համար անհրաժեշտ է ինտերնետ կապ։</string>
     <string name="install_more">Տեղադրել ավելին…</string>
     <string name="level_to_switch_vector_raster_descr">Առավելագույն սանդղակը(մասշտաբ) վեկտորային քարտեզների օգտագործման համար ուղղորդված քարտեզների փոխարեն։</string>
     <string name="level_to_switch_vector_raster">Սանդղակը(մասշտաբ) վեկտորային քարտեզների օգտագործման համար</string>
     <string name="create_poi_link_to_osm_doc"><u>1Online OSM</u>2 քարտեզ նկաներով։</string>
-    <string name="error_doing_search">Անցանց որոնման սխալ։</string>
+    <string name="error_doing_search">Հնարավոր չէ կատարել անցանց(offline) որոնում:</string>
     <string name="search_offline_geo_error">Հնարավոր չէ վերլուծել հարցումը \'%s\'։</string>
-    <string name="search_osm_offline">Որոնում ըստ հասցեյի տեղական(offlne) քարտեզներում</string>
+    <string name="search_osm_offline">Որոնում ըստ աշխարհագրական դիրքի</string>
     <string name="system_locale">Համակարգային</string>
     <string name="plugin_nautical_descr">"Այս plugin-ը հարստացնում է OsmAnd նավարկության հավելվածը  ինչպես նաևւ ծովային քարտեզներով նավակների համար, ծովագնացության և  այլ տեսակի ջրային շրջաններում
 \n
 \nOsmAnd-ի հատուկ քարտեզների add-on-ը  կտրամադրի բոլոր ծովային նավագնացության նշանները և աղյուսակը, ներքին, ինչպես նաև մոտակա նավարկության համար: Յուրաքանչյուր նավագնացության նշանի նկարագրությունը ապահովում է նրանց և դրանց իմաստը  հայտնաբերելու համար անհրաժեշտ մանրամասները(կատեգորիա, ձև, գույն, հաջորդականություն, հղում և այլն):
 \n
 \nOsmAnd-ի ավանդական քարտեզի ոճերից մեկին վերադառնալու համար պարզապես  կամ  ապաակտիվացրեք այս հավելվածը կամ ըստ ցանկության փոխեք «Քարտեզի ոճը» «Քարտեզի կարգավորում» մենույում:"</string>
-    <string name="preferred_locale_descr">Ընտրել ծրագրի լեզուն (Վերագործարկեք OsmAnd փոփոխությունից հետո)։</string>
+    <string name="preferred_locale_descr">Ընտրել ծրագրի լեզուն (ուժի մեջ է մտնում OsmAnd-ի վերագործարկից հետո)։</string>
     <string name="preferred_locale">Տեղայնացումը (լեզուն)</string>
     <string name="incomplete_locale">թերի</string>
     <string name="unit_of_length_descr">Երկարության և արագության չափման միավորներ։</string>
@@ -1980,7 +1988,7 @@
     <string name="send_location_email_pattern">Դիրքը տեսնելու համար հետևեք հղումը %1$s կամ Android հղումը %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_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>
@@ -2018,19 +2026,19 @@
     <string name="reading_cached_tiles">Ռաստրային(tiles) քարտեզները օգտագործում…</string>
     <string name="version_index_is_big_for_memory">Տեղական(offline) քարտեզի «{0}» համար հիշողությունը բավարար չէ</string>
     <string name="version_index_is_not_supported">Տեղական քարտեզի(offline) տարբերակը «{0}» չի աջակցվում</string>
-    <string name="osmand_routing_experimental">"OsmAnd-ի ինքնավար նավարկությունը  փորձարարական է և չի աշխատում ավելի քան 20 կիլոմետր հեռավորության վրա:
-\n
-\nԱյս դեպքում օգտագործվում է CloudMade առցանց ծառայությունը երթուղին հաշվարկելու համար:"</string>
+    <string name="osmand_routing_experimental">"OsmAnd-ի offline նավարկությունը  փորձարարական է և չի աշխատում ավելի քան 20 կիլոմետր հեռավորության վրա: 
+\n 
+\nԱյս դեպքում ժամանակավորապես կօգտագործվի CloudMade առցանց ծառայությունը երթուղին հաշվարկելու համար:"</string>
     <string name="specified_dir_doesnt_exist">Նշված գրացուցակը(folder) հնարավոր չէ գտնել:</string>
-    <string name="osmand_net_previously_installed">Դուք ունեք OsmAnd-ի նախորդ տարբերակը: Բոլոր տեղական(offline) տվյալները աջակցվում են նոր տարբերակում: Այնուամենայնիվ «Սիրված»(Favorite) կետերը պետք է բեռնաթափվեն հավելվածի նախորդ տարբերակից և բեռնվեն նորի մեջ:</string>
-    <string name="build_installed">Հավաքացուն {0} հաջողությամբ տեղադրված ({1}):</string>
+    <string name="osmand_net_previously_installed">Հին տեղադրված հավելվածում բոլոր անցանց(offline) տվյալները աջակցվում են հավելվածի նոր տարբերակում,այնուամենայնիվ «Սիրված»(Favorite) կետերը պետք է բեռնաթափվեն հավելվածի նախորդ տարբերակից և բեռնվեն նորի մեջ:</string>
+    <string name="build_installed">Հավաքացուն {0} տեղադրված ({1}):</string>
     <string name="downloading_build">Հավաքացուն ներբեռնվում է…</string>
-    <string name="install_selected_build">Ցանկանում եք տեղադրել OsmAnd-ը - {0} of {1} {2} ՄԲ ?</string>
+    <string name="install_selected_build">Տեղադրեք OsmAnd-ը - {0} of {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 status\" հավելվածը չի գտնվել: Որոնել Google Play-ում?</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>
@@ -2050,7 +2058,7 @@
     <string name="continuous_rendering_descr">Ընտրեք քարտեզի ցուցադրուման ձևը։</string>
     <string name="rendering_exception">Քարտեզը ցուցադրելու ժամանակ անսպասելի սխալ տեղի ունեցավ</string>
     <string name="show_point_options">Համատեքստային մենյու…</string>
-    <string name="renderer_load_sucess">Ոճը հաջողությամբ ներբեռնված է</string>
+    <string name="renderer_load_sucess">Ոճը ներբեռնված է</string>
     <string name="renderer_load_exception">Այս ոճը տեղադրելու ընթացքում սխալ տեղի ունեցավ</string>
     <string name="renderers">Վեկտորային քարտեզի մատուցման ոճ</string>
     <string name="renderers_descr">Ընտրեք քարտեզի ցուցադրելու ոճը։</string>
@@ -2067,7 +2075,7 @@
     <string name="no_vector_map_loaded">Վեկտորային(offline) քարտեզները ներբեռնված չեն հավելվածի մեջ</string>
     
     <string name="gpx_files_not_found">GPX ֆայլերը չեն գտնվել թղթապանակում</string>
-    <string name="layer_gpx_layer">GPX տրեկ…</string>
+    <string name="layer_gpx_layer">GPX ֆայլեր…</string>
     <string name="error_reading_gpx">GPX տվյալների ընթերցման սխալ</string>
     <string name="vector_data">Տեղական վեկտորային(Offline) քարտեզներ</string>
     <string name="transport_context_menu">Տրանսպորտի որոնում կանգառում</string>
@@ -2079,14 +2087,14 @@
     <string name="rotate_map_to_bearing_descr">Ընտրեք քարտեզի պտտման ձևը։</string>
     <string name="rotate_map_to_bearing">Քարտեզի կողմնորոշումը</string>
     <string name="show_route">Ցույց տալ երթուղին</string>
-    <string name="fav_imported_sucessfully">«Սիրվածները» հաջողությամբ ներմուծվել են</string>
+    <string name="fav_imported_sucessfully">«Սիրվածները» ներմուծվել են</string>
     <string name="no_fav_to_save">«Սիրված» կետեր չկան պահպանելու համար</string>
     <string name="share_fav_subject">«Սիրված» կետերը կիսեցին(ուղարկված) OsmAnd-ի միջոցով</string>
-    <string name="error_occurred_loading_gpx">GPX-ի ներբեռնման ժամանակ սխալ տեղի ունեցավ</string>
+    <string name="error_occurred_loading_gpx">Հնարավոր չէ բեռնել GPX</string>
     <string name="send_report">Ուղարկել զեկույց</string>
     <string name="poi_namefinder_query_empty">Մուտքագրեք հարցում POI որոնման համար</string>
     <string name="any_poi">Ցանկացած</string>
-    <string name="thanks_yandex_traffic">Շնորհակալություն Yandex-ին, երթևեկության մասին տեղեկատվություն տրամադրման համար:</string>
+    <string name="thanks_yandex_traffic">Շնորհակալություն Yandex-ին, երթևեկության մասին տեղեկատվություն տրամադրելու համար:</string>
     <string name="layer_yandex_traffic">Yandex.Խցաններ</string>
     <string name="layer_route">Երթուղի</string>
     <string name="layer_osm_bugs">OSM նշումներ (online)</string>
@@ -2097,7 +2105,7 @@
     <string name="use_trackball_descr">Քարտեզը շարժելու համար օգտագործեք trackball։</string>
     <string name="use_trackball">Օգտագործել trackball</string>
     <string name="import_file_favourites">Պահպանել տվյալները որպես GPX ֆայլ թե պահպանել որպես «Սիրված» կետեր?</string>
-    <string name="fav_file_to_load_not_found">Կետեր պարունակող GPX ֆայլ չի գտնվել {0} մեջ</string>
+    <string name="fav_file_to_load_not_found">GPX ֆայլ չի գտնվել, որը պարունակում է «Սիրված» կետեր {0} մեջ</string>
     <string name="fav_saved_sucessfully">«Սիրված» կետերը պահպանվեցին {0} մեջ</string>
     <string name="none_region_found">"Տեղական վեկտորային(offline) քարտեզներ  չեն գտնվել: Ներբեռնեք դրանք Ինտերնետից:"</string>
     <string name="background_service_wait_int_descr">Ընտրեք առավելագույն ժամանակը դիրքի որոնման համար։</string>
@@ -2111,7 +2119,7 @@
     <string name="background_service_int_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_descr">Հետևում է ձեր գտնվելու վայրը, երբ էկրանը անջատված է:</string>
     <string name="background_router_service">Միացնում է OsmAnd-ը ֆոնին ռեժիմում</string>
     <string name="off_router_service_no_gps_available">OsmAnd-ի երթուղայնացման ծառայությունը միացված է, եթե անջատեք դիրքավորումը, այն կդադարի երթուղով շարժվել:</string>
     <string name="hide_poi_filter">Թաքցնել ֆիլտր</string>
@@ -2125,8 +2133,8 @@
     <string name="voice_data_unavailable">Ընտրված ձայնային տվյալները հասանելի չեն</string>
     <string name="sd_unmounted">SD քարտը հասանելի չէ:
 \nԴուք չեք կարողանա աշխատել քարտի հետ:</string>
-    <string name="sd_mounted_ro">SD քարտը հասանելի է միայն կարդալու համար:
-\nԴուք չեք կարողանա ներբեռնել քարտեզներ Ինտերնետից:</string>
+    <string name="sd_mounted_ro">SD քարտը միայն կարդալու համար: 
+\nԱյժմ կարող եք դիտել միայն նախապես բեռնված քարտեզը, այլ ոչ թե ներբեռնել քարտեզներ Ինտերնետից:</string>
     <string name="unzipping_file">Ֆայլը արդյունահանվում է…</string>
     <string name="route_tr">Աջ թեքվեք և շարժվեք</string>
     <string name="route_tshr">Կտրուկ աջ թեքվեք և շարժվեք</string>
@@ -2139,7 +2147,7 @@
     <string name="shared_string_left">Ձախ</string>
     <string name="shared_string_paste">Տեղադրել</string>
     <string name="go_to_next_field">Հաջորդ դաշտը</string>
-    <string name="import_gpx_file_description">կարող են ներմուծվել որպես «Սիրելի», կամ որպես track ֆայլ:</string>
+    <string name="import_gpx_file_description">կարող են ներմուծվել որպես «Սիրելի», կամ որպես GPX ֆայլ:</string>
     
     
     
@@ -2149,7 +2157,7 @@
     <string name="search_poi_location">Ազդանշանի որոնում…</string>
     <string name="search_near_map">Որոնել ընթացիկ քարտեզի կենտրոնի շուրջ</string>
     <string name="search_nearby">Որոնել մոտակայքում</string>
-    <string name="opening_hours_not_supported">Ժամանակի ձևաչափը չի աջակցվում խմբագրման համար</string>
+    <string name="opening_hours_not_supported">Ժամանակի ձևաչափը խմբագրման ենթակա չէ</string>
     <string name="add_new_rule">Ավելացնել նոր կանոն</string>
     <string name="transport_Routes">Երթուղիներ</string>
     <string name="transport_Stop">Կանգառ</string>
@@ -2166,8 +2174,8 @@
     <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>
+    <string name="update_poi_success">POI-ի տվյալները թարմացվեցին ({0} բեռնված էին)</string>
+    <string name="update_poi_error_local">Չհաջողվեց թարմացնել տեղական POI ցուցակը</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>
@@ -2192,10 +2200,10 @@
     <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} տեղական(offline) քարտեզը արդեն առկա է ({1}): Ցանկանում եք թարմացնել այն ({2})?</string>
+    <string name="download_question_exist">{0} տեղական(offline) քարտեզը արդեն առկա է ({1}): Թարմացնել այն ({2})\?</string>
     <string name="address">Հասցե</string>
     <string name="downloading_list_indexes">Հասանելի շրջանների ցուցակը ներբեռնվում է…</string>
-    <string name="list_index_files_was_not_loaded">Անհնար է ստանալ հասանելի շրջանների ցուցակը osmand.net -ից։</string>
+    <string name="list_index_files_was_not_loaded">Անհնար է ստանալ շրջանների ցուցակը osmand.net -ից։</string>
     <string name="fav_points_edited">«Սիրված» կետը խմբագրվեց</string>
     <string name="fav_points_not_exist">Չկան «Սիրված» կետեր</string>
     <string name="update_existing">Փոխարինել</string>
@@ -2216,18 +2224,18 @@
     <string name="loading_streets">Բեռնվում են փողոցները…</string>
     <string name="loading_cities">Բեռնվում են քաղաքները…</string>
     <string name="poi">POI</string>
-    <string name="error_occurred_saving_gpx">GPX-ը պահպանելու ընթացքում սխալ առաջացավ</string>
-    <string name="error_calculating_route">Երթուղու հաշվարկի սխալ</string>
-    <string name="error_calculating_route_occured">Սխալ երթուղու հաշվարկման ժամանակ</string>
-    <string name="empty_route_calculated">Հնարավոր չէ երթուղոին հաշվարկել</string>
+    <string name="error_occurred_saving_gpx">Չհաջողվեց պահպանել GPX ֆայլը</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="invalid_locations">Սխալ կոորդինատներ!</string>
+    <string name="invalid_locations">Սխալ կոորդինատներ</string>
     <string name="go_back_to_osmand">Վերադառնալ OsmAnd քարտեզին</string>
     <string name="loading_data">Տվյալների բեռնում…</string>
     <string name="reading_indexes">Տեղական(offline) տվյալների ընթերցում…</string>
     <string name="previous_run_crashed">Հավելվածը ճիշտ չի ավարտվել իր աշխատանքը: «Log» ֆայլը գտնվում է {0}։ Տեղեկացրեք ծրագրավորողներին սխալի մասին և կցեք «Log» ֆայլը:</string>
-    <string name="saving_gpx_tracks">Պահպանում GPX տրեկները SD քարտում…</string>
+    <string name="saving_gpx_tracks">Պահպանում GPX ֆայլը…</string>
     <string name="finished_task">Ավարտված է</string>
     <string name="use_online_routing_descr">Օգտվեք Ինտերնետից երթուղին հաշվարկելու համար:</string>
     <string name="use_online_routing">Օգտագործել առցանց նավարկություն</string>
@@ -2238,7 +2246,7 @@
     <string name="update_tile">Թարմացնել քարտեզը</string>
     <string name="reload_tile">Թարմացնել քարտեզի մի մասը</string>
     <string name="mark_point">Նպատակետ</string>
-    <string name="use_english_names">Քարտեզներում օգտագործել անգլերեն անունները</string>
+    <string name="use_english_names">Քարտեզում օգտագործել անգլերեն անունները</string>
     <string name="app_settings">Հավելվածի կարգավորումները</string>
     <string name="search_address">Որոնել հասցեն</string>
     <string name="choose_building">Ընտրեք շենքը</string>
@@ -2253,8 +2261,8 @@
     <string name="use_internet">Օգտագործել Ինտերնետը</string>
     <string name="show_location">Ցույց տալ ձեր դիրքը</string>
     <string name="show_gps_coordinates_text">Ցույց տալ GPS կոորդինատները քարտեզի վրա</string>
-    <string name="use_english_names_descr">Ընտրեք մայրենի և անգլերեն անունների միջև:</string>
-    <string name="use_internet_to_download_tile">Օգտվել Ինտերնետից բացակայող քարտեզները ներբեռնելու համար</string>
+    <string name="use_english_names_descr">Ընտրեք տեղական և անգլերեն անունների միջև:</string>
+    <string name="use_internet_to_download_tile">Ներբեռնեք բացակայող քարտեզների սալիկները</string>
     <string name="app_description">Նավիգացիոն հավելված</string>
     <string name="search_button">Որոնում</string>
     <string name="search_activity">Որոնում</string>
@@ -2285,23 +2293,23 @@
     <string name="search_address_street_option">Խաչմերուկ</string>
     <string name="context_menu_item_update_map">Թարմացնել քարտեզը</string>
     <string name="context_menu_item_create_poi">Ստեղծել POI</string>
-    <string name="add_favorite_dialog_top_text">Մուտքագրեք կետի անունը</string>
+    <string name="add_favorite_dialog_top_text">Մուտքագրեք «Սիրված»-ի անունը</string>
     <string name="add_favorite_dialog_default_favourite_name">«Սիրված»</string>
-    <string name="add_favorite_dialog_favourite_added_template">Կետ «{0}» հաջողությամբ ավելացվել է «Սիրված»-ին։</string>
+    <string name="add_favorite_dialog_favourite_added_template">Կետ «{0}» ավելացվել է «Սիրված»-ին։</string>
     <string name="favourites_context_menu_add">Ավելացնել «Սիրված»</string>
-    <string name="favourites_context_menu_edit">Խմբագրել կետը</string>
-    <string name="favourites_context_menu_delete">Ջնջել կետը</string>
-    <string name="favourites_remove_dialog_msg">Ջնջել կետը «%s» «Սիրված»-ից?</string>
-    <string name="favourites_remove_dialog_success">Կետ «{0}» հաջողությամբ ջնջվել է «Սիրված»-ին։</string>
+    <string name="favourites_context_menu_edit">Խմբագրել «Սիրված» կետը</string>
+    <string name="favourites_context_menu_delete">Ջնջել «Սիրված» կետը</string>
+    <string name="favourites_remove_dialog_msg">Ջնջել «Սիրված» կետը «%s»\?</string>
+    <string name="favourites_remove_dialog_success">Կետ «{0}» ջնջվել է «Սիրված»-ից։</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_confirm_template">Ջնջել {0} (comment)\?</string>
     <string name="poi_remove_title">POI ջնջում</string>
-    <string name="poi_remove_success">POI հաջողությամբ ջնջվել է</string>
+    <string name="poi_remove_success">POI ջնջվել է</string>
     <string name="poi_action_delete">ջնջել</string>
-    <string name="poi_action_succeded_template">{0} գործողությունը հաջողությամբ ավարտվեց:</string>
-    <string name="poi_error_unexpected_template">Անսպասելի սխալ գործողություն {0} կատարման ժամանակ։</string>
+    <string name="poi_action_succeded_template">{0} գործողությունը ավարտվեց:</string>
+    <string name="poi_error_unexpected_template">Չհաջողվեց կատարել գործողությունը {0}։</string>
     <string name="poi_error_io_error_template">I/O սխալ գործողություն {0} կատարման ժամանակ։</string>
     <string name="poi_error_info_not_loaded">POI-ի տեղեկություն վերբեռնման ընթացքում սխալ տեղի ունեցավ</string>
     <string name="poi_dialog_opening_hours">Աշխատանքային ժամերը</string>
@@ -2330,19 +2338,19 @@
     <string name="use_fast_recalculation">Երթուղու խելացի վերահաշվարկ</string>
     <string name="use_fast_recalculation_desc">Երկար ուղեւորությունների ժամանակ միայն վերահաշվարկել երթուղու նախնական մասը:</string>
     <string name="do_you_like_osmand">Ձեզ դուր է գալիս OsmAnd?</string>
-    <string name="we_really_care_about_your_opinion">Մենք շատ ենք հետաքրքրված ձեր կարծիքով, և կարեւոր է ստանալ ձեր արձագանքը:</string>
+    <string name="we_really_care_about_your_opinion">Մենք շատ ենք հետաքրքրված ձեր կարծիքով, և մեր համար կարևոր է ձեր արձագանքը:</string>
     <string name="rate_this_app">Գնահատել հավելվածը</string>
     <string name="rate_this_app_long">Խնդրում ենք գնահատել OsmAnd-ը Google Play-ում</string>
     <string name="user_hates_app_get_feedback">Ասեք մեզ, թե ինչու։</string>
     <string name="user_hates_app_get_feedback_long">Խնդրում ենք ասել մեզ, թե ինչ եք ուզում փոխել այս հավելվածում:</string>
     <string name="failed_to_upload">Չհաջողվեց վերբեռնել</string>
     <string name="delete_change">Ջնջել փոփոխությունները</string>
-    <string name="successfully_uploaded_pattern">Հաջողությամբ վերբեռնվեց {0}/{1}</string>
+    <string name="successfully_uploaded_pattern">Վերբեռնվեց {0}/{1}</string>
     <string name="try_again">Կրկին փորձեք</string>
     <string name="error_message_pattern">Սխալ՝ {0}</string>
     <string name="dahboard_options_dialog_title">Վահանակի կարգավորումները</string>
     <string name="shared_string_card_was_hidden">Քարտը թաքնված էր</string>
-    <string name="shared_string_undo">ՉԵՂԱՐԿԵԼ</string>
+    <string name="shared_string_undo">Չեղարկել</string>
     <string name="shared_string_skip">Բաց թողնել</string>
     <string name="app_name_osmand">OsmAnd</string>
     <string name="offline_maps_and_navigation">Անցանց քարտեզներ
@@ -2363,9 +2371,9 @@
     <string name="working_days">Աշխատանքային օրեր</string>
     <string name="recent_places">Վերջին վայրերը</string>
     <string name="favourites">«Սիրված»</string>
-    <string name="saved_at_time">Հաջողությամբ պահպանվեց՝ %1$s</string>
+    <string name="saved_at_time">Պահպանվեց՝ %1$s</string>
     <string name="poi_deleted_localy">POI-րը կհեռացվեն ձեր փոփոխությունները վերբեռնելուց հետո</string>
-    <string name="show_gpx">Ցույց տալ GPX</string>
+    <string name="show_gpx">Ցույց տալ GPX տվյալները</string>
     <string name="count_of_lines">Տողերի քանակը</string>
     <string name="are_you_sure">Վստա՞հ եք?</string>
     
@@ -2377,13 +2385,13 @@
     <string name="downloading_number_of_files">Ֆայլի ներբեռնում - %1$d</string>
     <string name="show_free_version_banner">Ցույց տալ անվճար տարբերակների պաստառը</string>
     <string name="show_free_version_banner_description">Ցույց տալ անվճար տարբերակների պաստառը նաև վճարովի տարբերակում։</string>
-    <string name="buy">ԳՆԵԼ</string>
-    <string name="activate_seamarks_plugin">Խնդրում ենք ակտիվացնել Ծովային քարտեզների plugin-ը</string>
-    <string name="activate_srtm_plugin">Խնդրում ենք ակտիվացնել SRTM plugin-ը</string>
+    <string name="buy">Գնել</string>
+    <string name="activate_seamarks_plugin">Խնդրում ենք ակտիվացնել «Ծովային քարտեզներ»-ի plugin-ը</string>
+    <string name="activate_srtm_plugin">Խնդրում ենք ակտիվացնել «Contour lines» plugin-ը</string>
     <string name="later">Ավելի ուշ</string>
     <string name="get_full_version">Ամբողջական տարբերակը</string>
     <string name="downloads">Ներբեռնումներ</string>
-    <string name="confirm_download_roadmaps">Վստահ եք, որ ցանկանում եք ներբեռնել ճանապարհային քարտեզը, թեև արդեն ունեք ստանդարտ (ամբողջական) քարտեզ?</string>
+    <string name="confirm_download_roadmaps">Ճանապարհային քարտեզի կարիք չկա, դուք արդեն ունեք ստանդարտ (ամբողջական) քարտեզ, ներբեռնել ճանապարհային քարտեզը\?</string>
     <string name="value_downloaded_of_max">"%1$.1f   %2$.1f  ՄԲ"</string>
     <string name="file_size_in_mb">%.1f ՄԲ</string>
     <string name="update_all">"Թարմացնել բոլորը  (%1$s ՄԲ)"</string>
@@ -2394,7 +2402,7 @@
     <string name="new_version">Նոր տարբերակ</string>
     <string name="begin_with_osmand_menu_group">Առաջին քայլերը OsmAnd-ի հետ</string>
     <string name="features_menu_group">Հնարավորությունները</string>
-    <string name="help_us_to_improve_menu_group">Օգնեք մեզ բարելավել OsmAnd-ը</string>
+    <string name="help_us_to_improve_menu_group">Օգնեք բարելավել OsmAnd-ը</string>
     <string name="other_menu_group">Այլ</string>
     <string name="plugins_menu_group">Պլագիններ (Plugins)</string>
     <string name="first_usage_item">Առաջին մեկնարկը</string>
@@ -2408,18 +2416,18 @@
     <string name="feedback">Արձագանք</string>
     <string name="contact_us">Կապ մեզ հետ</string>
     <string name="map_legend">Քարտեզի նշումներ</string>
-    <string name="save_poi_too_many_uppercase">Անունը պարունակում է չափազանց շատ մեծ տառեր: Դուք իսկապես ուզում եք շարունակել?</string>
+    <string name="save_poi_too_many_uppercase">Անունը պարունակում է չափազանց շատ մեծ տառեր: Շարունակել\?</string>
     <string name="save_poi_without_poi_type_message">Վստահ եք, որ ցանկանում եք POI-ին պահպանել առանց տեսակը նշելու?</string>
     <string name="poi_context_menu_modify_osm_change">Խմբագրել POI</string>
     <string name="use_dashboard_btn">Օգտագործել Վահանակը</string>
     <string name="use_drawer_btn">Օգտագործել Մենյու</string>
     <string name="dashboard_or_drawer_title">Վահանակը կամ Մենյու</string>
-    <string name="dashboard_or_drawer_description">Ստատիկ Մենյուի փոխարեն, դուք կարող եք օգտագործել նոր ինտերֆեյսը որպես Վահանակ էջ: Ձեր ընտրությունը միշտ կարող է փոփոխվել գլխավոր էջի կարգավորումներում:</string>
+    <string name="dashboard_or_drawer_description">Ստատիկ Մենյուի փոխարեն, դուք կարող եք օգտագործել նոր ինտերֆեյսը որպես Վահանակ էջ: Ձեր ընտրությունը միշտ կարող է փոփոխվել վահանակի կարգավորումներում:</string>
     <string name="update">Թարմացնել</string>
     <string name="only_download_over_wifi">Ներբեռնել միայն WiFi-ի միջոցով</string>
     <string name="live_update">Ավտո-թարմացում</string>
     <string name="update_now">Թարմացնել հիմա</string>
-    <string name="missing_write_external_storage_permission">Հավելվածը SD քարտի օգտագործման թույլտվություն չունի</string>
+    <string name="missing_write_external_storage_permission">Հավելվածը SD(հիշողության) քարտի օգտագործման թույլտվություն չունի</string>
     <string name="last_update">Վերջին թարմացումը՝ %s</string>
     <string name="update_time">Թարմացնան ժամը</string>
     <string name="updates_size">Թարմացման չափը</string>
@@ -2441,9 +2449,9 @@
     <string name="quick_action_add_poi">Ավելացնել POI</string>
     <string name="quick_action_map_style">Փոխել քարտեզի ոճը</string>
     <string name="quick_action_map_style_switch">Քարտեզի ոճը փոխվել է «%s»։</string>
-    <string name="quick_action_take_audio_note">Ձայնագրել աուդիո նշում</string>
-    <string name="quick_action_take_video_note">Ձայնագրել վիդեո նշում</string>
-    <string name="quick_action_take_photo_note">Անել լուսանկար-նշում</string>
+    <string name="quick_action_take_audio_note">Ձայնագրել նոր աուդիո նշում</string>
+    <string name="quick_action_take_video_note">Ձայնագրել նոր վիդեո նշում</string>
+    <string name="quick_action_take_photo_note">Անել նոր լուսանկար-նշում</string>
     <string name="quick_action_add_osm_bug">"Ավելացնել OSM  Նշում"</string>
     <string name="quick_action_navigation_voice">Ձայնը on/off</string>
     <string name="quick_action_navigation_voice_off">Ձայնը անջատված է</string>
@@ -2456,8 +2464,8 @@
     <string name="dialog_add_action_title">Ավելացնել գործողություն</string>
     <string name="quick_actions_delete">Ջնջել գործողությունը</string>
     <string name="quick_actions_delete_text">Վստահ եք, որ ցանկանում եք ջնջել գործողությունըվ «%s»?</string>
-    <string name="quick_favorites_show_favorites_dialog">Ցուցադրել «Սիրված» երկխոսությունը</string>
-    <string name="quick_action_add_marker_descr">Սեղմելով գործողության կոճակը, էկրանին կտեղադրվի մարկեր:</string>
+    <string name="quick_favorites_show_favorites_dialog">Ցուցադրել «Սիրված» համար երկխոսությունը</string>
+    <string name="quick_action_add_marker_descr">Սեղմելով գործողության կոճակը, էկրանի կենտրոնում կտեղադրվի մարկեր:</string>
     <string name="quick_action_add_gpx_descr">Սեղմելով գործողության կոճակը, էկրանի կենտրոնում կտեղադրվի GPX կետ:</string>
     <string name="quick_action_take_audio_note_descr">Սեղմելով գործողության կոճակը, էկրանի կենտրոնում կտեղադրվի աուդիո նշում:</string>
     <string name="quick_action_take_video_note_descr">Սեղմելով գործողության կոճակը, էկրանի կենտրոնում կտեղադրվի վիդեո նշում:</string>
@@ -2483,16 +2491,16 @@
     <string name="quick_action_add_create_items">"Ստեղծել  գործողություններ"</string>
     <string name="quick_action_add_configure_map">Կարգավորել քարտեզը</string>
     <string name="quick_action_add_navigation">Նավիգացիա</string>
-    <string name="quick_action_fav_name_descr">Թողնել դատարկ, որ ավտոմատ կերպով օգտագործել հասցե կամ վայրի անվանումը.</string>
-    <string name="quick_action_bug_descr">Այս հաղորդագրությունը կուղարկվի որպես մեկնաբանություն:</string>
+    <string name="quick_action_fav_name_descr">Թողնել դատարկ, որ օգտագործել հասցե կամ վայրի անվանումը.</string>
+    <string name="quick_action_bug_descr">Այս հաղորդագրությունը ներառված է մեկնաբանության դաշտում:</string>
     <string name="quick_action_bug_message">Հաղորդագրություն</string>
     <string name="quick_action_category_descr">Ընտրեք կատեգորիա, «Սիրված»-ում պահպանելու համար:</string>
     <string name="quick_action_gpx_category_descr">Ընտրեք լրացուցիչ կատեգորիա:</string>
     <string name="quick_action_poi_list">POI ցուցակ</string>
     <string name="quick_action_sh_poi_descr">Քարտեզի վրա ցուցադրելու համար կարող եք ավելացնել մեկ կամ ավելի POI դասակարգեր:</string>
-    <string name="quick_action_page_list_descr">"Սեղմելով գործողության կոճակը թույլ կտա ցիկլային  եղանակով անցնել տարբեր տարրերը այս ցանկում։"</string>
+    <string name="quick_action_page_list_descr">Սեղմելով գործողության կոճակը թույլ կտա ցիկլային եղանակով անցնել տարբեր տարրերը այս ցանկում։</string>
     <string name="quick_action_map_style_action">Ավելացնել քարտեզի ոճը</string>
-    <string name="quick_action_empty_param_error">Պարամետրերը չպետք է դատարկ լինեն</string>
+    <string name="quick_action_empty_param_error">Լրացրեք բոլոր պարամետրերը</string>
     <string name="quick_action_map_styles">Քարտեզների ոճը</string>
     <string name="quick_action_map_overlay">Փոխել արտեզը</string>
     <string name="quick_action_map_overlay_title">Քարտեզներ</string>
@@ -2507,9 +2515,9 @@
     <string name="quick_action_map_source_action">Ավելացնել քարտեզի աղբյուրները</string>
     <string name="quick_action_map_source_switch">Քարտեզի աղբյուրը փոխվել է «%»։</string>
     <string name="quick_action_btn_tutorial_title">Փոխել կոճակի դիրքը</string>
-    <string name="quick_action_btn_tutorial_descr">Երկար սեղմումը և քաշեքը փոխում է կոճակի դիրքը։</string>
+    <string name="quick_action_btn_tutorial_descr">Երկարատև սեղմումը և քաշելը փոխում է կոճակի դիրքը էկրանի վրա։</string>
     <string name="shared_string_action_name">Գործողության անունը</string>
-    <string name="mappilary_no_internet_desc">Mapillary-ից լուսանկարներ դիտելու համար Ձեզ անհրաժեշտ է ինտերնետ:</string>
+    <string name="mappilary_no_internet_desc">Mapillary-ից լուսանկարներ դիտելու համար Ձեզ անհրաժեշտ է Ինտերնետ:</string>
     <string name="retry">Կրկնել</string>
     <string name="shared_string_gpx_waypoints">Տրեկի (track) կետերը</string>
     <string name="add_group">Ավելացնել խումբ</string>
@@ -2524,17 +2532,17 @@
     <string name="save_route_point">Պահպանել երթուղու կետը</string>
     <string name="waypoint_one">Կետ 1</string>
     <string name="route_point_one">Երթուղու կետ 1</string>
-    <string name="empty_state_my_tracks">Ավելացնել և Գրանցել Տրեկները</string>
-    <string name="empty_state_my_tracks_desc">Գրանցել կամ ներմուծել տրեկներ նաելու համար։</string>
+    <string name="empty_state_my_tracks">Ավելացնել GPX ֆայլերը</string>
+    <string name="empty_state_my_tracks_desc">Ներմուծեք GPX ֆայլեր կամ տրեկների գրառում կատարեք:</string>
     <string name="empty_state_favourites">Ավելացնել «Սիրված»-եր</string>
-    <string name="empty_state_favourites_desc">Ավելացնել «Սիրված»-եր քարտեզի վրա կամ ներմուծել իրենց ֆայլից։</string>
-    <string name="import_track">Ներմուծել տրեկ</string>
+    <string name="empty_state_favourites_desc">Ավելացնել «Սիրված»-եր քարտեզի վրա կամ ներմուծեք ֆայլից։</string>
+    <string name="import_track">Ներմուծել GPX ֆայլը</string>
     <string name="import_track_desc">Ֆայլ %1$s չի պարունակում կետեր, ներմուծել այդ որպես տրեկ?</string>
     <string name="move_point">Տեղափոխել կետը</string>
-    <string name="add_segment_to_the_track">Ավելացնել սեգմենտը GPX-ին</string>
+    <string name="add_segment_to_the_track">Ավելացնել սեգմենտը GPX ֆայլին</string>
 <string name="shared_string_more_without_dots">Ավելին</string>
     <string name="appearance_on_the_map">Տեսքը քարտեզի վրա</string>
-    <string name="add_track_to_markers_descr">"Ճանապարհային կետերը կարող եք ավելացնել մարկերներին ընտրելով այս տրեկերից մեկը, որը պարունակոմ է  ճանապարհային կետեր(waypoints)։"</string>
+    <string name="add_track_to_markers_descr">Ընտրեք տրեկերից մեկը որպեսզի ձեր Ճանապարհային կետերը (waypoints) ավելացնել մարկերներին։</string>
     <string name="add_favourites_group_to_markers_descr">Ընտրեք «Սիրված» խումբը, որը ցանկանում եք ավելացնել մարկերներին։</string>
     <string name="favourites_group">«Սիրված»-ի կատեգորիան</string>
     <string name="empty_state_markers_active">Ստեղծեք քարտեզի մարկերներ!</string>
@@ -2564,16 +2572,15 @@
     <string name="additional_actions">Լրացուցիչ գործողություններ</string>
     <string name="av_locations_selected_desc">GPX ֆայլը կոորդինատներով և ընտրված գրառումների տվյալներով:</string>
     <string name="av_locations_all_desc">GPX ֆայլը կոորդինատներով և բոլոր նշումների տվյալները։</string>
-    <string name="release_3_0"> 
-\nՆոր Ճամփորդության մենյու. Դիտեք WikiVoyage- ի հոդվածները առանց ինտերնետի օգտագործման
-\n
-\n • Wikipedia՝ նոր տեսք, ակտիվ հղումներ, պատկերներ
-\n
-\n • Open Track UI՝ ցուցադրում waypoint խմբերը
-\n
-\n • Քարտեզի մարկերներ՝ Ընտրված խմբերի ներմուծում GPX ֆայլերից, կոորդինատների մուտքագրման նոր տեսքը
-\n
-\n • OsmAnd Live բաժանորդագրությունը այժմ ներառում է բոլոր OsmAnd առանձնահատկությունները
+    <string name="release_3_0">• Նոր Ճամփորդության մենյու. Դիտեք WikiVoyage- ի հոդվածները առանց ինտերնետի օգտագործման 
+\n 
+\n • Wikipedia՝ նոր տեսք, ակտիվ հղումներ, պատկերներ 
+\n 
+\n • Open Track UI՝ ցուցադրում waypoint խմբերը 
+\n 
+\n • Քարտեզի մարկերներ՝ Ընտրված խմբերի ներմուծում GPX ֆայլերից, կոորդինատների մուտքագրման նոր տեսքը 
+\n 
+\n • OsmAnd Live բաժանորդագրությունը այժմ ներառում է բոլոր OsmAnd առանձնահատկությունները 
 \n 
 \n 
 \n</string>
@@ -2610,7 +2617,7 @@
     <string name="map_orientation_landscape">Լանդշաֆտ (Landscape)</string>
     <string name="map_screen_orientation">Էկրանի կողմնորոշումը (Screen orientation)</string>
     <string name="map_screen_orientation_descr">Ընտրեք էկրանի կողմնորոշումը (Portrait, landscape, or device):</string>
-    <string name="update_poi_error_loading">Խնդիր առաջացավ սերվերից տվյալների ներբեռման ժամանակ</string>
+    <string name="update_poi_error_loading">Հնարավոր չէ բեռնել տվյալների սերվերից</string>
     <string name="max_level_download_tile_descr">Նշեք առավելագույն մաշտաբը առցանց քարտեզի սալիկները ներբեռնելու համար:</string>
     <string name="map_tile_source">Սալիկային(ռաստրային) քարտեզների աղբյուրը</string>
     <string name="navigation_item_description">Կարգավորում(Setup) նավարկության:</string>
@@ -2691,19 +2698,19 @@
     <string name="purchase_cancelled_dialog_descr">Վերսկսել բաժանորդագրությունը, որպեսզի շարունակել օգտագործել բոլոր հնարավորությունները՝</string>
 
     <string name="start_editing_card_description">Դուք կարող եք և պետք է խմբագրեք Wikivoyage-ի ցանկացած հոդված։ Կիսվել գիտելիքներով, փորձով, տաղանդով, և Ձեր ուշադրությունը</string>
-    <string name="wikivoyage_travel_guide">Wikivoyage Ճանապարհորդական ուղեցույց</string>
-    <string name="download_images">Ցուցադրել նկարները</string>
+    <string name="wikivoyage_travel_guide">Ճանապարհորդական ուղեցույցներ</string>
+    <string name="download_images">Ներբեռնել նկարներ</string>
     <string name="shared_string_wikivoyage">Վիկիուղեցույց / Wikivoyage</string>
     <string name="article_removed">Հոդվածը հեռացվել է</string>
-    <string name="wikivoyage_search_hint">Որոնում `Երկիր, քաղաք, մարզ</string>
+    <string name="wikivoyage_search_hint">Որոնում`երկիր, քաղաք, մարզ</string>
     <string name="shared_string_read">Կարդալ</string>
     <string name="read_wikipedia_offline_description">Ստացեք բաժանորդագրություն OsmAnd Live-ում և կարդացեք հոդվածներ Wikivoyage-ում և Wikipedia-ում:</string>
     <string name="maps_you_need_descr">Հիմնվելով ձեր պահպանած հոդվածներից, խորհուրդ ենք տալիս ներբեռնել հետեւյալ քարտեզները՝</string>
-    <string name="travel_card_download_descr">Ներբեռնեք այս Wikivoyage-ի ուղևորության ուղեցույցները` աշխարհի նշանավոր տեղերի մասին հոդվածներ դիտելու համար առանց ինտերնետի:</string>
+    <string name="travel_card_download_descr">Ներբեռնեք Wikivoyage-ի ուղևորության ուղեցույցները` աշխարհի նշանավոր տեղերի մասին հոդվածներ դիտելու համար առանց ինտերնետի:</string>
 	<string name="start_editing_card_image_text">Աշխարհի ուղեցույց, որը կարող է խմբագրել ցանկացած մեկը:</string>
-    <string name="welcome_to_open_beta_description">Փորձեք անվճար բոլոր հնարավորությունները բետա տեստավորման ժամանակ: Հետագայում ուղեցույցը հասանելի կլինի OsmAnd Unlimited-ի և OsmAnd+ սեփականատերերի համար</string>
+    <string name="welcome_to_open_beta_description">Ուղեւորության ուղեցույցները ներկայումս հիմնված են Wikivoyage-ի վրա: Փորձեք անվճար բոլոր հնարավորությունները բետա տեստավորման ժամանակ: Հետագայում ուղեցույցը հասանելի կլինի OsmAnd Unlimited-ի և OsmAnd+ սեփականատերերի համար։</string>
     <string name="wikivoyage_travel_guide_descr">"Տեսեք  ուղեցույցները, OsmAnd-ում աշխարհի ամենահետաքրքիր վայրերը, առանց ինտերնետին միանալու:"</string>
-    <string name="purchase_dialog_travel_description">Գնեք հետեւյալներից մեկը, որպեսզի ընթերցեք ճանապարհորդական հոդվածներ անցանց՝</string>
+    <string name="purchase_dialog_travel_description">Գնեք հետեւյալներից մեկը, որպեսզի ստանաք ճանապարհորդական հոդվածները անցանց՝</string>
     <string name="purchase_dialog_subtitle">Ընտրեք համապատասխան կետը՝</string>
     <string name="shared_string_dont">Ոչ</string>
     <string name="shared_string_do">Կատարել</string>
@@ -2715,7 +2722,7 @@
     <string name="select_travel_book">Ընտրեք ճանապարհորդական օրագիրը</string>
     <string name="shared_string_travel_book">Ճանապարհորդական օրագիր</string>
     <string name="online_webpage_warning">Էջը հասանելի է միայն առցանց: Ցանկանում եք բացել ձեր բրաուզերում?</string>
-    <string name="images_cache">Նկարների cache</string>
+    <string name="images_cache">Նկարների կեշը (cache)</string>
     <string name="delete_search_history">Ջնջել որոնման պատմությունը</string>
     <string name="download_maps_travel">Ճանապարհորդական ուղեցույցներ</string>
     <string name="saved_articles">Էջանշված հոդվածներ</string>
@@ -2731,8 +2738,8 @@
     <string name="clear_all_intermediates">Մաքրել բոլոր միջանկյալ կետերը</string>
     <string name="group_deleted">Խումբը ջնջվել է</string>
     <string name="rendering_attr_whiteWaterSports_name">Սպորտային համաձուլվածքներ</string>
-    <string name="distance_farthest">Հեռավորությունը `Սկզբում հեռավորը</string>
-    <string name="distance_nearest">Հեռավորություն՝ Սկզբում մոտակա</string>
+    <string name="distance_farthest">Հեռավորությունը`սկզբում հեռավորը</string>
+    <string name="distance_nearest">Հեռավորություն՝ սկզբում մոտակա</string>
     <string name="enter_lon">Մուտքագրեք երկայնությունը</string>
     <string name="enter_lat">Մուտքագրեք լայնությունը</string>
     <string name="enter_lat_and_lon">Մուտքագրեք լայնությունը և երկայնությունը</string>
@@ -2747,7 +2754,7 @@
 	<string name="north_abbreviation">N</string>
 	<string name="optional_point_name">Կետի անունը (լրացուցիչ)</string>
     <string name="transport_nearby_routes_within">Մոտակա երթուղիները</string>
-    <string name="transport_nearby_routes">Մոտ</string>
+    <string name="transport_nearby_routes">Ներսում</string>
     <string name="enter_the_file_name">Մուտքագրեք ֆայլի անունը:</string>
     <string name="map_import_error">Սխալ քարտեզի ներմուծման ժամանակ</string>
     <string name="map_imported_successfully">Քարտեզը ներմուծված է</string>
@@ -2765,4 +2772,58 @@
     <string name="wiki_article_search_text">Որոնել համապատասխան վիքիի հոդվածը</string>
     <string name="wiki_article_not_found">Հոդվածը չի գտնվել</string>
     <string name="how_to_open_wiki_title">Ինչպես բացել Վիքիպեդիանյի հոդվածները?</string>
-</resources>
\ No newline at end of file
+<string name="markers_remove_dialog_msg">Հեռացնել մարկերը \'%s\'\?</string>
+    <string name="edit_map_marker">Խմբագրել մարկերը</string>
+    <string name="third_party_application">Երրորդ կողմի հավելված</string>
+    <string name="search_street">Որոնել փողոց</string>
+    <string name="start_search_from_city">Սկսել որոնումը քաղաքից</string>
+    <string name="shared_string_restore">Վերականգնել</string>
+    <string name="keep_passed_markers_descr">"Մարկերները, որոնք ավելացված են որպես «Սիրված» խումբ կամ  GPX կետեր և նշված են որպես անցած կետեր կմնամ քարտեզի վրա։ Եթե խումբը ակտիվ ճէ ապա կետերը կհեռացվեն քարտեզից։"</string>
+    <string name="keep_passed_markers">Պահպանեք մարկերները քարտեզի վրա</string>
+    <string name="more_transport_on_stop_hint">Այս կանգառում ավելի շատ տրանսպորտային միջոցներ կա:</string>
+    <string name="ask_for_location_permission">Խնդրում ենք, շարունակելու համար OsmAnd-ին թույլտվություն տրամադրել գտնվելու վայրը որոշելու համար:</string>
+    <string name="thank_you_for_feedback">Շնորհակալություն արձագանքի համար</string>
+    <string name="poi_cannot_be_found">Հանգույցը կամ ճանապարհը հնարավոր չէ գտնել:</string>
+    <string name="search_no_results_feedback">Որոնման արդյունքներ չկան\?
+\nՀետադարձ կապ հաստատեք մեզ հետ</string>
+    <string name="release_3_2_pre">• Ուղղած է հավելվածի փլուզումը մեկնարկի ժամանակ որոշ սարքերի վրա
+\n
+\n• Նոր ֆունկցիա մարկերների համար
+\n
+\n• Որոնման պատմությունը ցույց է տալիս, նախկինում որոնված կատեգորիաները</string>
+    <string name="release_3_1">"•Նավիգացիա. Ֆիկսված է առաջընթացի ցուցանիշ և երթուղու մեկնարկային և վերջնական կետի արագ փոխարինում
+\n
+\n• Քարտեզի մարկերներ. Ֆիկսված է խմբերի միացում/անջատում և քարտեզից մարկերները թաքցնելու ունակությունը
+\n
+\n• OSM Edit: Ոչ պիտանի օբյեկտների և ուղիների պիտակների խմբագրման հբարավորություն
+\n
+\n• Բարելավել Wikipedia-ի և Wikivoyage-ի վերլուծությունը, թարմացված ֆայլերը արդեն հասանելի են
+\n
+\n• Համատեքստի մենյու. Գիշերային ռեժիմում ֆիկսվեց փոխադրամիջոցների վահաններ, ֆիկսվեց լրացուցիչ մենյուի չափերը
+\n
+\n • Այլ սխալների ուղղում
+\n
+\n
+\n "</string>
+    <string name="commiting_way">Ճանապարհի ուղղում…</string>
+    <string name="increase_search_radius_to">Ավելացնել որոնման շառավիղը</string>
+    <string name="send_search_query_description">Մենք կուղարկենք ձեր որոնման հարցումը՝ <b>\"%1$s\"</b>, ինչպես նաև ձեր գտնվելու վայրը։ <br/><br/>" Մենք  չենք հավաքում անձնական տեղեկություններ, մենք միայն որոնման տվյալներ պետք, որոնման ալգորիթմը բարելավելու համար:"<br/></string>
+    <string name="send_search_query">Ուղարկեք որոնման հարցումը\?</string>
+    <string name="shared_string_world">Աշխարհ</string>
+    <string name="point_deleted">Կետը %1$s հեռացված է</string>
+    <string name="coord_input_edit_point">Խմբագրել կետը</string>
+    <string name="coord_input_add_point">Ավելացնել նոր կետ</string>
+    <string name="coord_input_save_as_track">Պահպանել որպես տրեկ</string>
+    <string name="coord_input_save_as_track_descr">Դուք ավելացրեցիք կետեր - %1$s։ Մուտքագրեք ֆայլի անունը և սղմեք «Պահպանել»։</string>
+    <string name="error_notification_desc">Խնդրում ենք ուղարկել այս սխալի ծանուցումը support@osmand.net</string>
+    <string name="quick_action_edit_actions">Խմբագրել գործողությունը</string>
+    <string name="get_osmand_live">"Ձեռք բերեք OsmAnd Live, որպեսզի կարողանաք օգտվել բոլոր հնարավորություններից՝ քարտեզների օրական թարմացում անսահմանափակ ներբեռնում, բոլոր  plugin-րը Wikipedia, Wikivoyage և շատ ավելին։"</string>
+    <string name="unirs_render_descr">Հիմնական ոճի ձևափոխում, հետիոտնային և հեծանվավազք ճանապարհների հակադրությունը ավելացնելու համար։ Օգտագործում է ժառանգական Mapnik գույները։</string>
+    <string name="contour_lines_hillshade_maps">Contour lines &amp; Hillshade Քարտեզներ</string>
+    <string name="rendering_value_black_name">Սև</string>
+    <string name="shared_string_gpx_files">GPX ֆայլեր</string>
+    <string name="access_intermediate_arrival_time">Միջանկյալ նպատակակետ ժամանելու ժամը</string>
+    <string name="map_widget_intermediate_time">Միջանկյալ նպատակակետ ժամանելու ժամը</string>
+    <string name="auto_follow_location_enabled">Քարտեզի ավտոմատ վերադարձումը միացված է։</string>
+    <string name="test_voice_desrc">Սեղմեք կոճակը և լսեք համապատասխան ձայնային հրահանգները ու բացահայտեք բացակա կամ սխալ հրահանգները։</string>
+</resources>
diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml
index 84cfc5dffe..9c975a6f43 100644
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_traffic_signals_sound">Hljóð</string>
 	<string name="poi_bicycle_parking_type">Tegund</string>
 	<string name="poi_piste_grooming">Verið að troða leið</string>
@@ -43,7 +43,7 @@
 	<string name="poi_customs">Tollafgreiðsla</string>
 	<string name="poi_country">Land</string>
 	<string name="poi_city">Borg</string>
-	<string name="poi_capital">Höfuðborg</string>
+	<string name="poi_capital">Já</string>
 	<string name="poi_town">Bær</string>
 	<string name="poi_village">Þorp</string>
 	<string name="poi_hamlet">Byggðakjarni</string>
@@ -1836,7 +1836,7 @@
 	<string name="poi_railway_station">Járnbrautarstöð</string>
 	<string name="poi_halt">Járnbrautarpallur</string>
 	<string name="poi_subway_entrance">Inngangur í neðanjarðarlest</string>
-	<string name="poi_subway_station">Neðanjarðarlestarstöð</string>
+	<string name="poi_subway_station">Já</string>
 	<string name="poi_taxi">Leigubílastaur</string>
 
 	<string name="poi_bicycle_rental">Reiðhjólaleiga</string>
@@ -2430,7 +2430,7 @@
 	<string name="poi_drive_through_no">Bílaafgreiðsla: nei</string>
 
 	<string name="poi_brewery_additional">Nafn á brugghúsi</string>
-	<string name="poi_microbrewery_yes">Bruggað á staðnum</string>
+	<string name="poi_microbrewery_yes">Já</string>
 	<string name="poi_microbrewery_no">Ekki bruggað á staðnum</string>
 
 	<string name="poi_service_electrical">Viðgerðir rafknúinna ökutækja</string>
@@ -3868,4 +3868,41 @@
 <string name="poi_atm">Hraðbanki</string>
 	<string name="poi_shoe_repair">Skóviðgerðir</string>
 
-</resources>
+<string name="poi_bulk_purchase">Magnkaup</string>
+	<string name="poi_substation_type">Tegund</string>
+
+<string name="poi_bulk_purchase_yes">Já</string>
+	<string name="poi_bulk_purchase_only">Einungis</string>
+
+	<string name="poi_substation_distribution">Dreifing</string>
+	<string name="poi_substation_industrial">Iðnaðar</string>
+	<string name="poi_substation_valve">Loki</string>
+	<string name="poi_substation_inspection_gauge">Mælir</string>
+    <string name="poi_books_type">Bækur</string>
+    <string name="poi_substation_compression">Þjöppun</string>
+    <string name="poi_substation_measurement">Mæling</string>
+    <string name="poi_substation_valve_group">Ventlahópur</string>
+    <string name="poi_craft_confectionery">Sælgætisframleiðsla</string>
+    <string name="poi_shop_wholesale">Heildsöluverslun</string>
+    <string name="poi_laboratory">Læknisfræðirannsóknastofa</string>
+    <string name="poi_blood_donation">Blóðgjöf</string>
+    <string name="poi_books_comic">Myndasögur</string>
+    <string name="poi_books_religion">Trúarbrögð</string>
+    <string name="poi_books_academic">Akademískar</string>
+    <string name="poi_books_children">Barnabækur</string>
+    <string name="poi_atoll">Kóralrif</string>
+    <string name="poi_pipeline_substation">Millistöð leiðslu</string>
+    <string name="poi_substation_transmission">Spennuvirki</string>
+    <string name="poi_substation_minor_distribution">Minni háttar dreifing</string>
+    <string name="poi_substation_transition">Millistöð</string>
+    <string name="poi_substation_traction">Spennustöð lestakerfis</string>
+    <string name="poi_substation_converter">Umbreytir</string>
+    <string name="poi_substation_compensation">Mótvægisjöfnun</string>
+    <string name="poi_substation_field_gathering">Safnstöð</string>
+    <string name="poi_books_antiquarian">Gamlar bækur</string>
+    <string name="poi_denotation">Staða</string>
+    <string name="poi_toll_gantry">Tollhlið</string>
+    <string name="poi_childcare">Barnagæsla</string>
+    <string name="poi_denotation_natural_monument">Náttúruvætti</string>
+    <string name="poi_denotation_landmark">Landmerki</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index 81fd2cb004..6f6747f509 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="search_map_hint">Leita að borg eða héraði</string>
     
     
@@ -850,7 +850,7 @@
     <string name="agps_info">Upplýsingar A-GPS</string>
     <string name="current_route">Núverandi leið</string>
     <string name="shared_string_download_successful">Tókst að sækja</string>
-    <string name="shared_string_io_error">I/O-villa kom upp</string>
+    <string name="shared_string_io_error">I/O villa</string>
     <string name="shared_string_unexpected_error">Óvænt villa kom upp</string>
     <string name="shared_string_currently_recording_track">Er að skrá feril</string>
     <string name="track_segments">Bútar ferils</string>
@@ -2250,7 +2250,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="mapillary_menu_edit_text_hint">Ritaðu notandanafn</string>
     <string name="mapillary_menu_descr_username">Skoða myndir sem bætt hefur verið við af</string>
     <string name="mapillary_menu_title_username">Notandanafn</string>
-    <string name="mapillary_menu_filter_description">Síaðu myndir eftir sendanda eða dagsetningu. Síum er aðeins beitt í miklum aðdrætti.</string>
+    <string name="mapillary_menu_filter_description">Síaðu myndir eftir sendanda, dagsetningu eða tegund. Aðeins beitt í miklum aðdrætti.</string>
     <string name="shared_string_reset">Frumstilla</string>
     <string name="improve_coverage_install_mapillary_desc">Settu upp Mapillary til að setja myndir eða myndarunur inn á þessa staðsetningu á kortinu.</string>
     <string name="mapillary_action_descr">Legðu þitt af mörkum með þínum eigin götumyndum frá þessari staðsetningu í gegnum Mapillary.</string>
@@ -2982,7 +2982,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
 \n</string>
     <string name="rendering_value_black_name">Svart</string>
     <string name="search_street">Leita að götu</string>
-    <string name="start_search_from_city">Hefja leit út frá borg</string>
+    <string name="start_search_from_city">Veldu fyrst borgina</string>
     <string name="shared_string_restore">Endurheimta</string>
     <string name="keep_passed_markers_descr">Kortamerki sem bætt er inn sem hópi eftirlæta eða sem GPX-ferli og sem þegar hefur verið farið um, verða áfram á kortinu. Ef hópurinn er ekki virkur, munu kortamerkin hverfa.</string>
     <string name="keep_passed_markers">Halda merkjum sem þegar hefur verið farið um á kortinu</string>
@@ -2990,4 +2990,53 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="markers_remove_dialog_msg">Eyða kortamerkinu \'%s\'\?</string>
     <string name="edit_map_marker">Breyta kortamerki</string>
     <string name="third_party_application">Utanaðkomandi forrit</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Áskrift og verð</string>
+    <string name="osm_live_payment_monthly_title">Greiða mánaðarlega</string>
+    <string name="osm_live_payment_3_months_title">Greiða á þriggja mánaða fresti</string>
+    <string name="osm_live_payment_annual_title">Greiða árlega</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mánuði</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mánuði</string>
+    <string name="osm_live_payment_discount_descr">Sparaðu %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Núverandi áskrift þín</string>
+    <string name="osm_live_payment_renews_monthly">Endurnýjast mánaðarlega</string>
+    <string name="osm_live_payment_renews_quarterly">Endurnýjast ársfjórðungslega</string>
+    <string name="osm_live_payment_renews_annually">Endurnýjast árlega</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Veldu þann greiðslumáta sem þér hentar:</string>
+    <string name="osm_live_payment_contribute_descr">Hluti innkomunnar fer til þeirra sem leggja OpenStreetMap lið.</string>
+    <string name="powered_by_osmand">Keyrt með OsmAnd</string>
+    <string name="osm_live_subscriptions">Áskriftir</string>
+    <string name="mapillary_menu_title_pano">Einungis birta 360° myndir</string>
+    <string name="shared_string_launch">Keyra</string>
+    <string name="run_full_osmand_msg">Þú ert að nota kortið {0} sem er keyrt með OsmAnd. Myndirðu vilja keyra fulla útgáfu af OsmAnd\?</string>
+    <string name="run_full_osmand_header">Ræsa OsmAnd\?</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Rýmd</string>
+    <string name="shared_string_width">Breidd</string>
+    <string name="shared_string_height">Hæð</string>
+    <string name="swap_start_and_destination">Skipta á upphafi og áfangastað</string>
+    <string name="add_destination_point">Bæta við áfangastað</string>
+    <string name="add_intermediate_point">Bæta við milliáfanga</string>
+    <string name="add_start_point">Bæta við upphafspunkti</string>
+    <string name="intermediate_waypoint">Millipunktur: %1$s</string>
+    <string name="waypoints">Ferilpunktar: %1$s</string>
+    <string name="transfers">millifærslur: %1$s</string>
+    <string name="on_foot">gangandi: %1$s</string>
+    <string name="route_way">Leið: %1$s</string>
+    <string name="points_of_interests">Merkisstaðir (POI)</string>
+    <string name="waiting_for_route_calculation">Bíð eftir útreikningi leiðar</string>
+    <string name="app_mode_public_transport">Almenningssamgöngur</string>
+    <string name="avoid_roads_descr">Veldu veg á korti eða af lista sem þú vilt forðast á meðan leiðsögn stendur:</string>
+    <string name="show_along_the_route">Birta meðfram leiðinni</string>
+    <string name="simulate_navigation">Herma eftir leiðsögn</string>
+    <string name="choose_track_file_to_follow">Veldu ferilskrá til að fylgja</string>
+    <string name="voice_announcements">Raddtilkynningar</string>
+    <string name="intermediate_destinations">Milliáfangar: %1$s</string>
+    <string name="arrive_at_time">Koma klukkan %1$s</string>
+    <string name="lang_gn_py">Guaraní</string>
+    <string name="quick_action_switch_day_night_descr">Ef ýtt er á þennan aðgerðahnapp verður skipt á milli Dags- og Næturhams í OsmAnd</string>
+    <string name="quick_action_switch_day_mode">Dagshamur</string>
+    <string name="quick_action_switch_night_mode">Næturhamur</string>
+    <string name="quick_action_day_night_switch_mode">Skipta á milli Dags/Næturhams</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index 67ae8a74bb..a621b04776 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -72,7 +72,7 @@
 	<string name="poi_public_transport_station">Stazione trasporto pubblico</string>
 	<string name="poi_bus_station">Stazione autobus</string>
 	<string name="poi_subway_entrance">Entrata metropolitana</string>
-	<string name="poi_subway_station">Stazione metropolitana</string>
+	<string name="poi_subway_station">Sì</string>
 	<string name="poi_aerodrome">Aeroporto</string>
 	<string name="poi_helipad">Eliporto</string>
 	<string name="poi_bicycle_rental">Noleggio bici</string>
@@ -967,8 +967,8 @@
 	<string name="poi_collection_times">Tempi di raccolta</string>
 	<string name="poi_email">Email</string>
 	<string name="poi_fax">Fax</string>
-	<string name="facebook">"Facebook "</string>
-	<string name="twitter">"Twitter "</string>
+	<string name="facebook">Facebook</string>
+	<string name="twitter">Twitter</string>
 	<string name="poi_skype">Skype</string>
 	<string name="poi_youtube">YouTube</string>
 	<string name="poi_instagram">Instagram</string>
@@ -1450,7 +1450,7 @@
 	<string name="poi_drive_in_yes">Sì</string>
 	<string name="poi_drive_in_no">"Drive-in: no "</string>
 	<string name="poi_drive_through_yes">Sì</string>
-	<string name="poi_microbrewery_yes">Microbirrificio</string>
+	<string name="poi_microbrewery_yes">Sì</string>
 	<string name="poi_takeaway_filter_yes">Sì</string>
 	<string name="poi_takeaway_yes">A portar via</string>
 	<string name="poi_takeaway_no">No a portar via</string>
@@ -2329,7 +2329,7 @@
 	<string name="poi_allotments">Orti urbani</string>
 	<string name="poi_basin">Bacino</string>
 
-	<string name="poi_capital">Capitale</string>
+	<string name="poi_capital">Sì</string>
 	<string name="poi_place_allotments">Orti di città</string>
 	<string name="poi_ice_hockey">Hockey su ghiaccio</string>
 	<string name="poi_denomination_lutheran">Luterana</string>
@@ -2509,7 +2509,7 @@
 	<string name="poi_fire_hydrant_style_water_source_stream">Ruscello</string>
 	<string name="poi_valley_balka">"Balka "</string>
 
-	<string name="poi_display_yes">Display: Sì</string>
+	<string name="poi_display_yes">Display: sì</string>
 	<string name="poi_display_no">"Display: no "</string>
 	<string name="poi_display_analog_yes">Display analogico</string>
 	<string name="poi_display_digital_yes">Display digitale</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index bd7f2497b7..47dbaed51a 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
     <string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi.</string>
@@ -48,11 +48,11 @@
     <string name="open_street_map_login_descr">Necessario per inviare contributi a openstreetmap.org</string>
     <string name="user_password">Password in OSM</string>
     
-    <string name="osmand_service">"Modalità  background"</string>
+    <string name="osmand_service">In secondo piano</string>
     <string name="osmand_service_descr">OsmAnd, a schermo spento, è eseguito in background</string>
 
 
-    <string name="switch_to_raster_map_to_see">Nessuna mappa vettoriale è presente per questa posizione. Ne puoi scaricare una in Impostazioni (Gestisci i file mappe), o passa alle mappe online (abilita il plugin delle mappe online).</string>
+    <string name="switch_to_raster_map_to_see">Nessuna mappa vettoriale è presente per questa posizione. Ne puoi scaricare una in \'Impostazioni\' (\'Gestisci i file mappe\'), o passa al componente aggiuntivo \'Mappe online\'.</string>
 
 
     <string name="download_files_not_enough_space">Non c\'è abbastanza spazio per scaricare %1$s MB (liberi: %2$s).</string>
@@ -207,13 +207,13 @@ La memoria utilizzata è  {1} MB.
 
     <string name="unit_of_length_descr">Cambia le unità di misura di lunghezza</string>
     <string name="unit_of_length">Unità di misura di lunghezza</string>
-    <string name="si_mi_feet">Miglia/piede</string>
+    <string name="si_mi_feet">Miglia/piedi</string>
     <string name="si_mi_yard">Miglia/iarde</string>
     <string name="si_km_m">Chilometri/metri</string>
-    <string name="yard">iarda</string>
-    <string name="foot">piedi</string>
-    <string name="mile_per_hour">mph</string>
-    <string name="mile">miglia</string>
+    <string name="yard">yd</string>
+    <string name="foot">ft</string>
+    <string name="mile_per_hour">mi/h</string>
+    <string name="mile">mi</string>
     <string name="send_location_way_choose_title">Condividi la posizione usando</string>
     <string name="send_location_sms_pattern">Posizione: %1$s\n%2$s</string>
     <string name="send_location_email_pattern">Per vedere la posizione segui il collegamento web %1$s o il collegamento %2$s</string>
@@ -401,7 +401,7 @@ La memoria utilizzata è  {1} MB.
     <string name="route_head">Avanti</string>
     <string name="first_time_continue">Dopo</string>
     <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, calcolare percorsi e trovare trasporti pubblici.</string>
+    <string name="first_time_msg">Grazie di utilizzare OsmAnd. Scarica i dati delle regioni per l\'uso offline da \'Impostazioni\'→\'Gestisci i file mappe\' per visualizzare le mappe, localizzare indirizzi, cercare PDI, trovare trasporti pubblici e altro.</string>
     <string name="search_poi_location">Ricerca segnale GPS…</string>
     <string name="search_near_map">Ricerca vicino all\'attuale centro della mappa</string>
     <string name="search_nearby">Ricerca vicino</string>
@@ -508,10 +508,10 @@ La memoria utilizzata è  {1} MB.
     <string name="data_settings">Dati</string>
 
     <string name="osm_settings">Modifiche OSM</string>
-    <string name="auto_zoom_map_descr">Zoom mappa automatico in base alla velocità (fintanto che la mappa è sincronizzata con la posizione corrente).</string>
+    <string name="auto_zoom_map_descr">Livello di Zoom automatico in base alla velocità (fintanto che la mappa è sincronizzata con la posizione corrente).</string>
     <string name="auto_zoom_map">Zoom automatico mappa</string>
     <string name="additional_settings">Impostazioni aggiuntive</string>
-    <string name="save_current_track_descr">Salva adesso la traccia corrente nella scheda SD.</string>
+    <string name="save_current_track_descr">Salva adesso la traccia come file GPX.</string>
     <string name="save_current_track">Salva la traccia corrente</string>
     <string name="save_track_interval_descr">Scegli l\'intervallo di registrazione per la traccia durante la navigazione.</string>
     <string name="save_track_interval">Intervallo di registrazione durante la navigazione</string>
@@ -599,8 +599,8 @@ La memoria utilizzata è  {1} MB.
     <string name="osb_comment_dialog_author">Nome autore</string>
 
 
-    <string name="osb_comment_dialog_success">Il commento è stato aggiunto correttamente</string>
-    <string name="osb_comment_dialog_error">Si è verificata un\'eccezione: il commento non è stato aggiunto</string>
+    <string name="osb_comment_dialog_success">Commento aggiunto</string>
+    <string name="osb_comment_dialog_error">Impossibile aggiungere il commento</string>
 
 
 
@@ -632,15 +632,15 @@ La memoria utilizzata è  {1} MB.
 
     <string name="offline_navigation_not_available">La navigazione offline di OsmAnd è temporaneamente non disponibile.</string>
     <string name="left_side_navigation">Guida a sinistra</string>
-    <string name="left_side_navigation_descr">Abilita nei paesi in cui si guida tenendo la sinistra.</string>
+    <string name="left_side_navigation_descr">Per i paesi in cui si guida tenendo la sinistra della strada.</string>
 
-    <string name="unknown_from_location">La posizione di partenza non è ancora stata determinata</string>
-    <string name="confirm_interrupt_download">Vuoi annullare il download del file?</string>
-    <string name="basemap_was_selected_to_download">La mappa di base è richiesta per il funzionamento corretto dell\'applicazione ed è stata selezionata per il download.</string>
+    <string name="unknown_from_location">Posizione di partenza non ancora determinata</string>
+    <string name="confirm_interrupt_download">Annullare il download del file\?</string>
+    <string name="basemap_was_selected_to_download">Per il funzionamento dell\'app la mappa di base è selezionata per download.</string>
 
-    <string name="map_online_plugin_is_not_installed">Abilita il plugin Mappe Online per scegliere altre sorgenti di mappe</string>
+    <string name="map_online_plugin_is_not_installed">Abilita il plugin \'Mappe Online\' per scegliere altre sorgenti di mappe</string>
     <string name="map_online_data">Mappe online e a tasselli</string>
-    <string name="map_online_data_descr">Usa le mappe online (scarica e archivia i tasselli nella scheda SD).</string>
+    <string name="map_online_data_descr">Usa le mappe online (scarica e archivia i tasselli nella scheda di memoria).</string>
     <string name="shared_string_online_maps">Mappe online</string>
     <string name="online_map_settings_descr">Configura le sorgenti delle mappe online o dei tasselli in cache.</string>
   
@@ -651,7 +651,7 @@ La memoria utilizzata è  {1} MB.
 \n
 \nLe mappe a tasselli possono essere ricevuto direttamente dalle risorse online oppure preparate in precedenza per l\'uso offline (e copiate manualmente nella cartella dati di OsmAnd) come un database sqlite che può essere prodotto da molteplici strumenti per la costruzione di mappe di terze parti.</string>
     <string name="osmand_background_plugin_description">Visualizza le impostazioni per abilitare il tracking e navigazione in background (a schermo spento) tramite il risveglio periodico del GPS.</string>
-    <string name="osmand_accessibility_description">Questo componente aggiuntivo rende disponibili le funzioni per l\'accessibilità direttamente in OsmAnd. Facilita per esempio la regolazione della velocità di lettura per le voci TTS, la configurazione del pad direzionale di navigazione a schermo, l\'utilizzo di un trackball per il controllo dello zoom, oppure utilizzare il feedback text-to-speech, come per annunciare automaticamente la vostra posizione.</string>
+    <string name="osmand_accessibility_description">Questo componente aggiuntivo rende disponibili le funzioni per l\'accessibilità direttamente in OsmAnd. Facilita per esempio la regolazione della velocità di lettura per le voci TTS, la configurazione del pad direzionale di navigazione a schermo, l\'utilizzo di una trackball per il controllo dello zoom, oppure l\'utilizzo del feedback text-to-speech, ad esempio per annunciare automaticamente la vostra posizione.</string>
 
 
     <string name="osmand_development_plugin_description">Questo plugin visualizza le impostazioni per le funzionalità di sviluppo e debug come il test o la simulazione di navigazione, la prestazione del rendering o le indicazioni vocali. Queste impostazioni sono utili agli sviluppatori e non sono necessarie per gli utenti finali.</string>
@@ -751,7 +751,7 @@ La memoria utilizzata è  {1} MB.
     <string name="address_search_desc">Ricerca degli indirizzi</string>
     <string name="navpoint_search_desc">Coordinate</string>
     <string name="transport_search_desc">Ricerca dei trasporti pubblici</string>
-    <string name="favourites_search_desc">Ricerca dei preferiti</string>
+    <string name="favourites_search_desc">Un modo per la ricerca dei Preferiti</string>
 
     <string name="rendering_attr_noPolygons_description">Rendi trasparenti nella mappa tutte le aree del terreno.</string>
     <string name="rendering_attr_noPolygons_name">Poligoni</string>
@@ -759,9 +759,9 @@ La memoria utilizzata è  {1} MB.
     <string name="rendering_attr_appMode_description">Ottimizza la mappa per</string>
     <string name="rendering_attr_contourLines_description">Visualizza dal livello di zoom (necessita dei dati delle isoipse):</string>
     <string name="rendering_attr_contourLines_name">Visualizza le isoipse</string>
-    <string name="rendering_attr_hmRendered_description">Aumenta la quantità di dettagli della mappa visualizzati</string>
+    <string name="rendering_attr_hmRendered_description">Aumenta la quantità dei dettagli della mappa visualizzati.</string>
     <string name="rendering_attr_hmRendered_name">Visualizza più dettagli della mappa</string>
-    <string name="route_roundabout">Alla rotonda prendere la %1$d uscita e proseguire</string>
+    <string name="route_roundabout">Rotatoria: prendere la %1$d uscita e proseguire</string>
     <string name="route_kl">Tieni la sinistra e prosegui</string>
     <string name="route_kr">Tieni la destra e prosegui</string>
 
@@ -773,9 +773,9 @@ La memoria utilizzata è  {1} MB.
     <string name="gpxup_private">Privato</string>
     <string name="osmand_parking_event">Prendi l\'auto dal parcheggio</string>
     <string name="osmand_parking_warning">Attenzione</string>
-    <string name="osmand_parking_warning_text">Un notifica per recuperare l\'auto è stata aggiunta al tuo Calendar. Ci rimarrà finché non la eliminerai manualmente.</string>
+    <string name="osmand_parking_warning_text">Un notifica per recuperare l\'auto è stata aggiunta al tuo calendario. Ci rimarrà finché non la eliminerai manualmente.</string>
     <string name="osmand_parking_time_limit_title">Imposta il limite d\'orario del parcheggio</string>
-    <string name="osmand_parking_delete_confirm">Vuoi cancellare il marcatore della posizione di parcheggio?</string>
+    <string name="osmand_parking_delete_confirm">Cancellare il marcatore della posizione di parcheggio\?</string>
     <string name="osmand_parking_delete">Elimina un marcatore di parcheggio</string>
     <string name="osmand_parking_choose_type">Scegli il tipo di parcheggio</string>
     <string name="osmand_parking_lim_text">A tempo</string>
@@ -788,11 +788,13 @@ La memoria utilizzata è  {1} MB.
     <string name="osmand_parking_pm">PM</string>
     <string name="osmand_parking_am">AM</string>
     <string name="osmand_parking_position_name">Punto di parcheggio</string>
-  <string name="osmand_parking_plugin_description">Il plugin posizione di parcheggio ti permette di memorizzare quando l\'auto è stata stata parcheggiata e quanto tempo rimane, se il parcheggio è a tempo.
-\n\nPuoi trovare il luogo di parcheggio e il tempo rimanente nella scheda del plugin e nel widget sulla mappa.\nAggiunge una notifica al calendario se vuoi che te lo ricordi.</string>
+  <string name="osmand_parking_plugin_description">Il plugin della posizione di parcheggio ti permette di memorizzare dove l\'auto è parcheggiata e quanto tempo rimane (se il parcheggio è a tempo). 
+\n
+\nPuoi trovare il luogo di parcheggio e il tempo rimanente nella scheda del plugin e nel widget sulla mappa.
+\nSi può aggiungere un promemoria al calendario di Android per ricordarsi della scadenza.</string>
     <string name="osmand_parking_plugin_name">Posizione parcheggio</string>
     <string name="context_menu_item_add_parking_point">Marca come posizione di parcheggio</string>
-    <string name="context_menu_item_delete_parking_point">Elimina un marcatore di parcheggio</string>
+    <string name="context_menu_item_delete_parking_point">Elimina marcatore di parcheggio</string>
     <string name="starting_point_too_far">Punto di partenza troppo distante dalla strada più vicina.</string>
     <string name="shared_location">Posizione condivisa</string>
 
@@ -807,8 +809,8 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="osmand_parking_position_description_add_time">L\'automobile è stata parcheggiata alle</string>
     <string name="use_compass_navigation_descr">Usa la bussola quando la direzione non è altrimenti individuata.</string>
     <string name="use_compass_navigation">Usa la bussola</string>
-    <string name="route_updated_loc_found">Il percorso verrà calcolato a posizione acquisita</string>
-    <string name="continue_follow_previous_route_auto">La precedente navigazione non è stata completata. Continuare a seguirla? (%1$s secondi)</string>
+    <string name="route_updated_loc_found">In attesa della posizione per il calcolo del percorso</string>
+    <string name="continue_follow_previous_route_auto">Continuare la precedente navigazione incompleta\? (%1$s secondi)</string>
 
 
     <string name="show_cameras">Autovelox</string>
@@ -857,9 +859,9 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="avoid_unpaved">Evita le strade non asfaltate</string>
     <string name="avoid_ferries">Evita i traghetti</string>
     <string name="avoid_in_routing_title">Evita…</string>
-    <string name="avoid_in_routing_descr">Evita strade a pagamento, sterrate, traghetti.</string>
+    <string name="avoid_in_routing_descr">Evita es. strade a pagamento, sterrate, traghetti.</string>
     <string name="show_warnings_title">Mostra avvisi…</string>
-    <string name="show_warnings_descr">Configura gli avvisi sul traffico (limiti velocità, fermate forzate, dossi rallentatori), avvisi autovelox e indicazioni di corsia.</string>
+    <string name="show_warnings_descr">Configura gli avvisi sul traffico (limiti velocità, fermate forzate, dossi rallentatori, tunnel), avvisi autovelox e indicazioni di corsia.</string>
     <string name="map_widget_fluorescent">Itinerari fluorescenti</string>
     <string name="map_widget_show_ruler">Righello</string>
 
@@ -873,33 +875,45 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
 
 
     <string name="osmand_short_description_80_chars">OsmAnd è un\'applicazione di navigazione opensource per mappe offline e online</string>
-<string name="osmand_long_description_1000_chars">"
- ↵
-→→OsmAnd (OSM Automatizzata Navigazione Direzioni)↵
-↵
-→→OsmAnd è una applicazione di navigazione, a sorgente aperto, con accesso a una grande varietà di dati mondiali di OpenStreetMap (OSM). Tutte le mappe (vettoriali o a tasselli) posso essere memorizzate nella scheda di memoria del telefono per essere utilizzate offline. OsmAnd offre anche la funzionalità del calcolo dell\'itinerario online che offline compreso la voce guida curva per curva.↵
-↵
-→→Alcune delle caratteristiche principali:↵
-→→- Funzionalità completa anche disconnessi dalla rete (conserva le mappe vettoriali o a tasselli in una cartella selezionabile)↵
-→→- Mappe vettoriali offline compatte per tutto il mondo intero a disposizione↵
-→→- Scarica le mappe delle nazioni o delle regioni direttamente dal programma↵
-→→- Possibilità di sovrapposizione di diversi strati, come tracce GPX o di navigazione, punti di interesse, preferiti, curve di livello, fermate dei mezzi pubblici, mappe aggiuntive con trasparenza personalizzabile↵
-→→- Ricerca offline per indirizzi e luoghi (PDI)↵
-→→- Calcolo del percorso per distanze a medio raggio↵
-→→- Modalità automobile, bicicletta e pedonale con:↵
-→→- Commutazione opzionale automatica della vista giorno/notte↵
-→→- Zoom automatico opzionale in base alla velocità↵
-→→- Allineamento della mappa in base alla direzione o alla bussola↵
-↵
-→→Limitazioni di questa versione gratuita di OsmAnd:↵
-→→- Numero di mappe scaricabili limitato↵
-→→- Non funziona l\'accesso ai PDI offline di Wikipedia↵
-↵
-→→OsmAnd è continuamente in fase di sviluppo e il nostri progetto e il suo ulteriore progresso si basa su contribuiti finanziari per lo sviluppo e la prova di nuove funzionalità. Ti preghiamo di considerare l\'acquisto di OsmAnd+ o il finanziamento di specifiche nuove funzioni o una donazione generica su osmand.net↵
-→
- "</string>
+<string name="osmand_long_description_1000_chars">OsmAnd (OSM Automatizzata Navigazione Direzioni)↵ ↵
+\nOsmAnd è un\'applicazione di navigazione, a sorgente aperto, con accesso a una grande varietà di dati mondiali di OpenStreetMap (OSM). Tutte le mappe (vettoriali o a tasselli) posso essere memorizzate nella scheda di memoria del telefono per essere utilizzate offline. OsmAnd offre anche la funzionalità del calcolo dell\'itinerario online che offline compreso la voce guida svolta per svolta.↵
+\n↵
+\n Alcune delle caratteristiche principali:↵
+\n - Funzionalità completa anche disconnessi dalla rete (conserva le mappe vettoriali o a tasselli in una cartella selezionabile)↵
+\n - Mappe vettoriali offline compatte per tutto il mondo intero a disposizione↵
+\n - Scarica le mappe delle nazioni o delle regioni direttamente dal programma↵
+\n - Possibilità di sovrapposizione di diversi strati, come tracce GPX o di navigazione, punti di interesse, Preferiti, curve isoipse, fermate dei mezzi pubblici, mappe aggiuntive con trasparenza personalizzabile↵ 
+\n - Ricerca offline per indirizzi e luoghi (PDI)↵
+\n - Calcolo del percorso per distanze a medio raggio↵
+\n - Modalità automobile, bicicletta e pedonale con:↵
+\n - Commutazione automatica della vista giorno/notte↵ 
+\n - Zoom automatico in base alla velocità↵ 
+\n - Allineamento della mappa in base alla direzione o alla bussola↵ ↵ 
+\n - Limitazioni di questa versione gratuita di OsmAnd:↵
+\n - Numero di mappe scaricabili limitato↵ 
+\n - Non funziona l\'accesso ai PDI offline di Wikipedia↵ ↵ 
+\n OsmAnd è continuamente in sviluppo e il nostri progetto e il suo ulteriore progresso si basa su contribuiti finanziari per lo sviluppo e la prova di nuove funzionalità. Ti preghiamo di considerare l\'acquisto di OsmAnd+ o il finanziamento di specifiche nuove funzioni o una donazione generica su https://osmand.net.</string>
     <string name="osmand_plus_short_description_80_chars">Visualizzazione &amp; navigazione mobile con le mappe mondiali OSM online e offline</string>
-    <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automatizzate Navigazione e Direzioni) OsmAnd+ è un\'applicazione di navigazione open source con accesso a una grande varietà di dati mondiali di OpenStreetMap (OSM). Tutte le mappe (vettoriali o a mattonelle) possono essere memorizzate nella scheda di memoria del telefono per essere utilizzate offline. OsmAnd offre anche la funzionalità di calcolo dell\'itinerario sia online che offline, compresa la voce guida svolta per svolta. OsmAnd+ è la versione a pagamento, tramite l\'acquisto dell\'applicazione sostieni il progetto, finanzi lo sviluppo di nuove funzionalità, e ricevi gli ultimi aggiornamenti. Alcune delle caratteristiche principali: - Funzionalità completa anche disconnessi dalla rete (conserva le mappe vettoriali o a mattonelle in una cartella selezionabile) - Mappe vettoriali offline compatte per tutto il mondo a disposizione - Scarica le mappe delle nazioni o delle regioni direttamente dall\'applicazione, senza limiti - Wikipedia Offline (scarica i PDI Wikipedia), ottimo per i giri turistici - Possibilità di sovrapposizione di diversi strati, come tracce GPX o di navigazione, punti di interesse, preferiti, curve di livello, fermate dei mezzi pubblici, mappe aggiuntive con trasparenza personalizzabile - Ricerca offline per indirizzi e luoghi (PDI) - Calcolo del percorso per brevi distanze (sperimentale) - Modalità automobile, bicicletta e pedonale con: - commutazione opzionale automatica della vista giorno/notte - zoom automatico opzionale in base alla velocità - allineamento della mappa in base alla direzione o alla bussola - opzionali: indicazione di corsia indicazione del limite di velocità voci registrate e TTS</string>
+    <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automatizzate Navigazione e Direzioni)
+\n
+\n OsmAnd+ è un\'applicazione di navigazione open source con accesso a una grande varietà di dati mondiali di OpenStreetMap (OSM). Tutte le mappe (vettoriali o a mattonelle) possono essere memorizzate nella scheda di memoria del telefono per essere utilizzate offline. OsmAnd offre anche la funzionalità di calcolo dell\'itinerario sia online che offline, compresa la voce guida svolta per svolta.
+\n
+\n OsmAnd+ è la versione a pagamento, tramite l\'acquisto dell\'applicazione sostieni il progetto, finanzi lo sviluppo di nuove funzionalità, e ricevi gli ultimi aggiornamenti.
+\n
+\n Alcune delle caratteristiche principali:
+\n - Funzionalità completa anche disconnessi dalla rete (conserva le mappe vettoriali o a mattonelle in una cartella selezionabile)
+\n - Mappe vettoriali offline compatte per tutto il mondo a disposizione
+\n - Scarica le mappe delle nazioni o delle regioni direttamente dall\'applicazione, senza limiti
+\n - Wikipedia Offline (scarica i PDI Wikipedia), ottimo per i giri turistici
+\n - Possibilità di sovrapposizione di diversi strati, come tracce GPX o di navigazione, punti di interesse, Preferiti, linee isoipse, fermate dei mezzi pubblici, mappe aggiuntive con trasparenza personalizzabile
+\n
+\n - Ricerca offline per indirizzi e luoghi (PDI)
+\n - Calcolo del percorso per medie distanze
+\n - Modalità automobile, bicicletta e pedonale con opzionali:
+\n - commutazione automatica della vista giorno/notte
+\n - zoom automatico in base alla velocità
+\n - allineamento della mappa in base alla direzione o alla bussola
+\n - indicazioni di corsia, indicazione del limite di velocità, voci registrate e TTS</string>
 
     <string name="snap_to_road_descr">Blocca la posizione sulle strade durante la navigazione.</string>
     <string name="snap_to_road">Blocca sulle strade</string>
@@ -937,11 +951,11 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="enable_plugin_monitoring_services">Abilita il plugin di registrazione del viaggio per utilizzare i servizi di registrazione della posizione (registrazione GPX, monitoraggio in tempo reale)</string>
     <string name="rendering_attr_roadColors_description">Seleziona una combinazione di colori per le strade:</string>
     <string name="rendering_attr_roadColors_name">Schema di colorazioni per le strade</string>
-    <string name="zxing_barcode_scanner_not_found">L\'applicazione ZXing Barcode Scanner non è installata. Cercarla in Google Play?</string>
+    <string name="zxing_barcode_scanner_not_found">L\'app ZXing Barcode Scanner non è installata. Cercarla in Google Play\?</string>
     <string name="close_changeset">Chiudi le modifiche</string>
-    <string name="safe_mode_description">Avvia l\'applicazione in modalità sicura (usando il più lento Android invece del codice nativo).</string>
+    <string name="safe_mode_description">Avvia l\'app in modalità sicura (usando il più lento codice Android invece del nativo).</string>
     <string name="safe_mode">Modalità sicura</string>
-    <string name="native_library_not_running">L\'applicazione è in esecuzione in modalità sicura (disabilitala nelle Impostazioni).</string>
+    <string name="native_library_not_running">L\'applicazione è in esecuzione in modalità sicura (disabilitala nelle \'Impostazioni\').</string>
     <string name="background_service_is_enabled_question">Il servizio OsmAnd è ancora in esecuzione in background. Si desidera arrestare anche questo?</string>
 
     <string name="route_descr_lat_lon">Lat %1$.3f lon %2$.3f</string>
@@ -968,9 +982,9 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="download_select_map_types">Altre mappe</string>
     <string name="download_srtm_maps">Linee isoipse</string>
     <string name="srtm_plugin_name">Linee isoipse</string>
-    <string name="srtm_plugin_description">Questo plugin fornisce sia le curve di livello che lo strato ombreggiamento dei rilievi che possono essere visualizzati sopra alle mappe standard di OsmAnd. Questa funzionalità sarà molto apprezzata dagli atleti, dagli escursionisti, e tutti coloro che sono interessati all\'orografia del paesaggio. (Per favore notare che linee isoipse e dati elevazione sono separati, una volta attivato il componente aggiuntivo saranno disponibili altri file scaricare.)
-\n
-\nI dati globali (fra i 70 gradi nord e 70 gradi sud) sono basati su misurazioni del SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), lo strumento per raccogliere immagini a bordo Terra, il satellite fiore all\'occhiello del Sistema Nasa di Osservazione della Terra . ASTER è uno sforzo di cooperazione tra NASA, il Ministero dell\'Economia del Giappone, Commercio e Industria (METI) e sistema spaziale giapponese (J-spacesystems).</string>
+    <string name="srtm_plugin_description">Questo plugin fornisce sia le curve di livello che lo strato di ombreggiatura (dei rilievi) che possono essere visualizzati sopra alle mappe standard di OsmAnd. Questa funzionalità sarà molto apprezzata dagli atleti, escursionisti, e tutti coloro che sono interessati all\'orografia del paesaggio. (Per favore notare che le linee isoipse e i dati di elevazione sono separati, una volta attivato il componente aggiuntivo saranno disponibili altri file da scaricare.)
+\n 
+\nI dati globali (fra i 70° nord e 70° sud) sono basati su misurazioni del SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), uno strumento per raccogliere immagini a bordo di Terra, il satellite fiore all\'occhiello del Sistema di Osservazione della Terra della NASA. ASTER è un lavoro di cooperazione tra NASA, il Ministero dell\'Economia, Commercio e Industria del Giappone (METI) e il Sistema Spaziale Giapponese (J-spacesystems).</string>
     <string name="index_srtm_ele">Linee isoipse</string>
     <string name="audionotes_plugin_description">Il componente aggiuntivo note Audio/video fornisce la funzionalità per prendere note audio/video/foto durante il viaggio, usando pulsante sulla schermata della mappa, oppure direttamente nel menù contestuale per ogni posizione sulla mappa.</string>
     <string name="audionotes_plugin_name">Note audio/video</string>
@@ -979,9 +993,9 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="audionotes_location_not_defined">La posizione da associare con la nota non è ancora definita. \"Usa posizione …\" per assegnare una nota alla posizione specificata.</string>
 
     <string name="osmand_srtm_short_description_80_chars">Plugin OsmAnd per le curve di livello offline</string>
-    <string name="osmand_srtm_long_description_1000_chars">Questo plugin fornisce sia le curve di livello che lo strato ombreggiamento dei rilievi che possono essere visualizzate nelle mappe standard di OsmAnd. Questa funzionalità sarà molto apprezzata dagli atleti, dagli escursionisti, e tutti coloro che sono interessati all\'orografia e al paesaggio.
-\n
-\nI dati globali (fra i 70 gradi nord e 70 gradi sud) sono basati su misurazioni del SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), lo strumento misuratore a bordo Terra, il satellite della NASA del sistema di osservazione della terra. ASTER è uno sforzo di cooperazione tra NASA, il Ministero dell\'Economia del Giappone, Commercio e Industria (METI) e sistema spaziale giapponese (J-spacesystems).</string>
+    <string name="osmand_srtm_long_description_1000_chars">Questo plugin fornisce sia le curve di livello che lo strato ombreggiamento dei rilievi che possono essere visualizzate nelle mappe standard di OsmAnd. Questa funzionalità sarà molto apprezzata dagli atleti, dagli escursionisti, e tutti coloro che sono interessati all\'orografia e al paesaggio. 
+\n 
+\nI dati globali (fra i 70° nord e 70° sud) sono basati su misurazioni del SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), lo strumento misuratore a bordo Terra, il satellite della NASA del sistema di osservazione della terra. ASTER è uno sforzo di cooperazione tra NASA, il Ministero dell\'Economia del Giappone, Commercio e Industria (METI) e sistema spaziale giapponese (J-spacesystems).</string>
 
 
     <string name="map_widget_distancemeasurement">Misurazione della distanza</string>
@@ -997,12 +1011,12 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="av_use_external_recorder">Utilizza il registratore di sistema</string>
     <string name="av_settings_descr">Configura le impostazioni audio e video.</string>
     <string name="av_settings">Impostazioni audio/video </string>
-    <string name="recording_error">Errore durante la registrazione </string>
-    <string name="recording_camera_not_available">La fotocamera non è disponibile</string>
-    <string name="recording_is_recorded">L\'audio/video sta per essere registrato. Per fermarlo tocca il widget AV.</string>
+    <string name="recording_error">Registrazione fallita</string>
+    <string name="recording_camera_not_available">Fotocamera non disponibile</string>
+    <string name="recording_is_recorded">Audio/video in registrazione. Per fermarlo tocca il widget AV.</string>
     <string name="recording_playing">L\'audio della registrazione specificata sta per essere riprodotto.\n%1$s</string>
     <string name="recording_open_external_player">Apri riproduttore esterno</string>
-    <string name="recording_delete_confirm">Vuoi cancellare questa registrazione?</string>
+    <string name="recording_delete_confirm">Vuoi cancellare questo elemento\?</string>
 
     <string name="recording_unavailable">non disponibile</string>
     <string name="recording_context_menu_arecord">Prendi una nota audio</string>
@@ -1014,7 +1028,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="recording_description">Registrazione %1$s %3$s %2$s</string>
     <string name="recording_default_name">Registrazione in corso</string>
     <string name="map_widget_av_notes">Note audio/video</string>
-    <string name="srtm_paid_version_msg">Per favore valuta l\'acquisto sul Market del plugin per le linee isoipse per sostenere lo sviluppo futuro.</string>
+    <string name="srtm_paid_version_msg">Per favore valuta l\'acquisto del plugin per le \'Linee isoipse\' per sostenerne lo sviluppo futuro.</string>
     <string name="srtm_paid_version_title">Plugin linee isoipse</string>
 
     <string name="intermediate_points_change_order">Modifica l\'ordine</string>
@@ -1026,14 +1040,14 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="recording_photo_description">Foto %1$s %2$s</string>
     <string name="stop_routing_confirm">Sei sicuro di voler interrompere la navigazione?</string>
     <string name="clear_dest_confirm">Sei sicuro di voler eliminare la tua destinazione (e le destinazioni intermedie)?</string>
-    <string name="precise_routing_mode_descr">Abilita per calcolare percorsi precisi senza intoppi. È lento e limitato in distanza.</string>
+    <string name="precise_routing_mode_descr">Calcola percorsi precisi senza intoppi. È ancora lento e limitato in distanza.</string>
     <string name="precise_routing_mode">Calcolo della rotta preciso (alfa)</string>
     <string name="local_indexes_cat_av">Dati audio/video</string>
 
 
     <string name="download_hillshade_maps">Ombreggiamento rilievi</string>
 
-    <string name="support_new_features_descr">Fai una donazione per avere nuove funzionalità implementate nell\'applicazione.</string>
+    <string name="support_new_features_descr">Fai una donazione per avere nuove funzionalità implementate nell\'app.</string>
     <string name="av_use_external_camera_descr">Usa l\'applicazione di sistema per le foto.</string>
     <string name="index_name_openmaps">OpenMaps UE</string>
     <string name="av_use_external_camera">Usa l\'app fotocamera</string>
@@ -1061,19 +1075,19 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="monitoring_settings_descr">Configura come registrare i tuoi viaggi.</string>
 
 
-    <string name="choose_osmand_theme_descr">Scegli il tema dell\'applicazione.</string>
+    <string name="choose_osmand_theme_descr">Scegli l\'aspetto dell\'applicazione.</string>
     <string name="choose_osmand_theme">Tema dell\'app</string>
     <string name="accessibility_options">Opzioni di accessibilità</string>
     <string name="select_address_activity">Seleziona l\'indirizzo</string>
-    <string name="favourites_list_activity">Seleziona preferito</string>
+    <string name="favourites_list_activity">Seleziona Preferito</string>
     <string name="local_openstreetmap_act_title">Modifiche OSM</string>
-    <string name="download_using_mobile_internet">La connessione WiFi non è attualmente attiva. Vuoi continuare a scaricare con la connessione internet attuale?</string>
+    <string name="download_using_mobile_internet">Non connesso al Wi-Fi. Usare la connessione a Internet attuale per il download\?</string>
     <string name="cancel_route">Cancella il percorso</string>
     <string name="cancel_navigation">Interrompere la navigazione</string>
     <string name="clear_destination">Cancella la destinazione</string>
     <string name="other_location">Altra</string>
     <string name="files_limit">hai ancora %1$d file</string>
-    <string name="available_downloads_left">Disponibili %1$d file da scaricare</string>
+    <string name="available_downloads_left">Ancora %1$d file da scaricare</string>
     <string name="install_paid">Versione completa</string>
     <string name="use_magnetic_sensor_descr">Per utilizzare il valore della bussola invece del sensore di orientamento, utilizza il utilizza il sensore magnetico.</string>
     <string name="use_magnetic_sensor">Utilizza il sensore magnetico (bussola)</string>
@@ -1087,26 +1101,26 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="plugin_distance_point_ele">altitudine</string>
     <string name="plugin_distance_point">Punto</string>
     <string name="gpx_file_name">Nome del file GPX</string>
-    <string name="gpx_saved_sucessfully">File GPX salvato con successo in {0}</string>
-    <string name="osmand_distance_planning_plugin_description">Questo plugin fornisce un widget nella finestra della mappa che permette di creare percorsi toccando la mappa o usare o modificare file GPX esistenti, per pianificare un viaggio e misurare la distanza tra i punti. I risultati possono essere salvati come file GPX, che possono essere utilizzati in seguito come guida.</string>
+    <string name="gpx_saved_sucessfully">File GPX salvato in {0}</string>
+    <string name="osmand_distance_planning_plugin_description">Questo plugin fornisce un widget nella finestra della mappa che permette di creare percorsi toccando la mappa o usare o modificare file GPX esistenti, per pianificare un viaggio e misurare la distanza tra dei punti. I risultati possono essere salvati come file GPX, che può essere usato in seguito per la navigazione.</string>
     <string name="osmand_distance_planning_plugin_name">Strumento calcolatore di distanza &amp; pianificazione</string>
-    <string name="use_distance_measurement_help">* Toccare per segnare un punto.
-\n* Premere e tenere premuto sulla mappa per eliminare il punto precedente.
-\n* Premere e tenere premuto sul punto per vedere e allegare una descrizione.
-\n* Fare clic sul widget di misura per vedere ulteriori azioni.</string>
+    <string name="use_distance_measurement_help">* Toccare per segnare un punto. 
+\n* Premere e tenere premuto sulla mappa per eliminare il punto precedente. 
+\n* Premere e tenere premuto sul punto per vedere e allegare una descrizione. 
+\n* Toccare sul widget di misura per vedere ulteriori azioni.</string>
     <string name="distance_measurement_start_editing">Inizia a modificare</string>
     <string name="distance_measurement_finish_editing">Finisci di modificare</string>
     <string name="distance_measurement_finish_subtrack">Inizia una nuova sottotraccia</string>
     <string name="distance_measurement_clear_route">Cancella tutti i punti</string>
 
-    <string name="distance_measurement_load_gpx">Apri GPX esistente</string>
+    <string name="distance_measurement_load_gpx">Apri un file GPX esistente</string>
     <string name="delete_point">Elimina punto</string>
-    <string name="local_osm_changes_backup_successful">Creazione file di modifica OSM %1$s completata</string>
+    <string name="local_osm_changes_backup_successful">Creazione file di modifica OSM %1$s generato</string>
     <string name="local_osm_changes_backup_failed">Backup modifiche OSM fallito</string>
     <string name="local_osm_changes_backup">Backup come modifica OSM</string>
 
     <string name="search_street_in_neighborhood_cities">Cerca la strada nelle località vicine</string>
-    <string name="intermediate_items_sort_return">Destinazioni intermedie riordinate in modo da ottimizzare il percorso dalla posizione attuale verso la destinazione.</string>
+    <string name="intermediate_items_sort_return">Destinazioni intermedie riordinate in modo da ottimizzare il percorso verso la destinazione.</string>
     <string name="intermediate_items_sort_by_distance">Ordina porta a porta</string>
     <string name="please_select_address">Scegli prima la città o la strada</string>
     <string name="context_menu_item_destination_point">Imposta come destinazione</string>
@@ -1128,7 +1142,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="speak_cameras">Autovelox</string>
     <string name="speak_traffic_warnings">Avvisi di traffico</string>
 
-    <string name="osb_author_or_password_not_specified">Prego specificare il nome utente OSM e la password nelle Impostazioni</string>
+    <string name="osb_author_or_password_not_specified">Prego specificare il nome utente OSM e la password nelle \'Impostazioni\'</string>
     <string name="clear_intermediate_points">Cancella le destinazioni intermedie</string>
     <string name="keep_intermediate_points">Mantieni le destinazioni intermedie</string>
     <string name="new_directions_point_dialog">Hai già delle destinazioni intermedie impostate.</string>
@@ -1159,7 +1173,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="local_index_tile_data_maxzoom">Zoom massimo: %1$s</string>
     <string name="local_index_tile_data_minzoom">Zoom minimo: %1$s</string>
     <string name="local_index_tile_data_name">Dati tasselli: %1$s</string>
-    <string name="edit_tilesource_successfully">Sorgente mattonelle : %1$s è stata salvata con successo</string>
+    <string name="edit_tilesource_successfully">Sorgente mattonelle %1$s salvata</string>
     <string name="edit_tilesource_maxzoom">Zoom massimo</string>
     <string name="edit_tilesource_expiration_time">Scadenza (minuti)</string>
     <string name="edit_tilesource_minzoom">Zoom minimo</string>
@@ -1201,21 +1215,21 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
 
 
     <string name="complex_route_calculation_failed">Calcolo veloce del percorso fallita (%s), rinvio al calcolo lento.</string>
-    <string name="disable_complex_routing_descr">Disabilita il calcolo del percorso in due fasi per l\'uso in automobile.</string>
+    <string name="disable_complex_routing_descr">Disabilita il calcolo del percorso in due fasi per la navigazione automobilistica.</string>
     <string name="disable_complex_routing">Disabilita il calcolo complesso del percorso</string>
     <string name="speech_rate_descr">Imposta la velocità della sintesi vocale TTS.</string>
     <string name="speech_rate">Velocità di lettura</string>
     <string name="guidance_preferences_descr">Preferenze di navigazione</string>
     <string name="routing_preferences_descr">Preferenze di calcolo del percorso</string>
     <string name="app_mode_truck">Camion</string>
-    <string name="android_19_location_disabled">Dalla versione KitKat non è più possibile scaricare e aggiornare le mappe nel precedente indirizzo di memorizzazione (%s). Vuoi sostituirlo con quello consentito e copiare lì tutti i file?
-\n Nota: i file precedenti non verranno modificati.
-\n Nota: non sarà possibile condividere i files fra OsmAnd and OsmAnd+.</string>
+    <string name="android_19_location_disabled">Dalla versione di Android 4.4 (KitKat) puoi scaricare e aggiornare le mappe nella vecchia cartella di memorizzazione (%s). Vuoi copiare tutti i file nella nuova cartella di memorizzazione\? 
+\n Nota 1: i file precedenti non verranno modificati (ma potranno essere cancellati manualmente). 
+\n Nota 2: nella nuova cartella di memorizzazione non sarà possibile condividere i files fra OsmAnd and 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="calculate_osmand_route_gpx">Calcolo 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>
     
@@ -1235,9 +1249,9 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="route_preferences">Preferenze di percorso</string>
     <string name="route_info">Informazioni sul percorso</string>
     <string name="keep_and_add_destination_point">Aggiungi come destinazione successiva</string>
-    <string name="use_displayed_track_for_navigation">Vuoi usare la traccia visualizzata per la navigazione?</string>
+    <string name="use_displayed_track_for_navigation">Usare la traccia visualizzata per la navigazione\?</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">Calcolo offline OsmAnd di un tratto di percorso</string>
     <string name="gpx_option_calculate_first_last_segment">Calcola percorso OsmAnd per i tratti prima e dopo il GPX</string>
 
     <string name="lang_en">Inglese</string>
@@ -1266,7 +1280,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="lang_lv">Lettone</string>
     <string name="lang_lt">Lituano</string>
     <string name="lang_mr">Marathi</string>
-    <string name="lang_no">Norvegese</string>
+    <string name="lang_no">Norvegese Bokmål</string>
     <string name="lang_pl">Polacco</string>
     <string name="lang_pt">Portoghese</string>
     <string name="lang_ro">Rumeno</string>
@@ -1396,7 +1410,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
 
 
     
-    <string name="gpx_file_is_empty">La traccia GPX è vuota</string>
+    <string name="gpx_file_is_empty">Traccia GPX vuota</string>
     <string name="gpx_info_start_time">Orario di partenza: %1$tF, %1$tT </string>
     <string name="gpx_info_average_speed">Velocità media: %1$s </string>
     <string name="gpx_info_maximum_speed">Velocità massima: %1$s </string>
@@ -1423,19 +1437,19 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <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>
     <string name="map_widget_plain_time">Orario attuale</string>
-    <string name="save_as_favorites_points">Salva come gruppo di preferiti</string>
+    <string name="save_as_favorites_points">Salva come gruppo di Preferiti</string>
     <string name="select_destination_and_intermediate_points">Scegli le destinazioni</string>
-    <string name="layer_amenity_label">Visualizza etichette PDI</string>
+    <string name="layer_amenity_label">Sovrapposizione etichette PDI</string>
     <string name="show_zoom_buttons_navigation">Mostra i pulsanti dello zoom</string>
     <string name="show_zoom_buttons_navigation_descr">Mostra i pulsanti dello zoom durante la navigazione.</string>
 
     <string name="sort_by_distance">Ordina per distanza</string>
     <string name="sort_by_name">Ordina per nome</string>
-    <string name="none_selected_gpx">Nessun file GPX selezionato. Per selezionarlo tieni premuto su una delle tracce disponibili.</string>
+    <string name="none_selected_gpx">Nessun file GPX selezionato. Selezionalo tenendo premuto.</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">Non è stato trovato 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 controlla la connessione internet.</string>
     
     
     
@@ -1517,7 +1531,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="speak_favorites">Preferiti nelle vicinanze</string>
     <string name="speak_poi">PDI nelle vicinanze</string>
     <string name="index_tours">Itinerari</string>
-    <string name="shared_string_all">Tutto</string>
+    <string name="shared_string_all">Tutti</string>
     <string name="record_plugin_description">Questo componente aggiuntivo attiva la funzionalità di registrare e salvare le tue tracce, o manualmente attraverso il pulsante dedicato nello schermo della mappa, oppure automaticamente tenendo traccia di tutti i tuoi spostamenti in un file GPX.
 \n
 \n
@@ -1544,11 +1558,11 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="text_size_descr">Imposta la dimensione del testo sulla mappa.</string>
     <string name="text_size">Dimensione del testo</string>
     <string name="fav_point_dublicate">Duplicato del nome del punto preferito</string>
-    <string name="fav_point_dublicate_message">Il nome indicato per i preferiti esiste già, per evitare duplicati il nome è stato modificato in %1$s.</string>
+    <string name="fav_point_dublicate_message">Il nome indicato per i Preferiti esiste già, per evitare duplicati il nome è stato modificato in %1$s.</string>
 
 
     <string name="print_route">Stampa percorso</string>
-    <string name="fav_point_emoticons_message">Abbiamo cambiato il nome del tuo punto preferito in %1$s perché non è possibile salvare stringhe con emoticon nel file.</string>
+    <string name="fav_point_emoticons_message">Abbiamo cambiato il nome del tuo Preferito in %1$s per facilitare il salvataggio corretto di stringhe con emoticon nel file.</string>
     <string name="speed_limit_exceed">Tolleranza del limite di velocità</string>
     <string name="speed_limit_exceed_message">Seleziona il valore di superamento del limite di velocità dal quale si desidera avere l\'avviso vocale.</string>
     
@@ -1589,9 +1603,9 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
 
     <string name="error_avoid_specific_road">Nessuna alternativa trovata</string>
     <string name="use_opengl_render">Utilizzare il rendering OpenGL</string>
-    <string name="use_opengl_render_descr">Utilizzare il rendering OpenGL accelerato via hardware (potrebbe non funzionare in alcuni dispositivi).</string>
+    <string name="use_opengl_render_descr">Utilizzare il rendering OpenGL accelerato via hardware (potrebbe utilizzare più batteria o non funzionare in dispositivi molto vecchi).</string>
     <string name="everything_up_to_date">Tutti i file sono aggiornati</string>
-    <string name="no_internet_connection">Non è possibile scaricare. Prego, verifica la connessione a internet.</string>
+    <string name="no_internet_connection">Non sono in grado di scaricare. Prego, verifica la connessione a internet.</string>
     <string name="download_tab_downloads">Tutti i download</string>
     <string name="download_tab_updates">Aggiornabili</string>
     <string name="download_tab_local">Nel dispositivo</string>
@@ -1601,7 +1615,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="map_locale">Lingua della mappa</string>
     <string name="rendering_attr_transportStops_name">Fermate mezzi pubblici</string>
     <string name="voices">Annunci vocali</string>
-    <string name="dash_download_msg_none">Vuoi scaricare delle mappe offline?</string>
+    <string name="dash_download_msg_none">Scaricare delle mappe offline\?</string>
     <string name="dash_download_msg">Hai scaricato %1$s mappe</string>
     <string name="dash_download_new_one">Scarica una nuova mappa</string>
     <string name="dash_download_manage">Gestisci</string>
@@ -1619,7 +1633,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="speak_pedestrian">Attraversamenti pedonali</string>
 
     <string name="navigation_over_track">Iniziare la navigazione sulla traccia?</string>
-    <string name="avoid_roads_msg">Puoi variare il percorso selezionando le strade da evitare</string>
+    <string name="avoid_roads_msg">Varia il percorso selezionando le strade da evitare</string>
     <string name="save_track_to_gpx_globally_headline">Registrazione della traccia su richiesta</string>
 
     <string name="enable_proxy_title">Abilita Proxy HTTP</string>
@@ -1628,7 +1642,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="proxy_host_descr">Configura l\'hostname del tuo proxy (es. 127.0.0.1).</string>
     <string name="proxy_port_title">Porta proxy</string>
     <string name="proxy_port_descr">Configura il numero di porta del tuo proxy (es. 8118).</string>
-    <string name="proxy_pref_descr">Imposta una connessione a Internet proxy.</string>
+    <string name="proxy_pref_descr">Specifica un server proxy.</string>
     <string name="settings_privacy">Privacy</string>
     <string name="rendering_attr_streetLighting_name">Illuminazione stradale</string>
     <string name="proxy_pref_title">Proxy</string>
@@ -1649,7 +1663,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="plugin_nautical_name">Visualizzazione mappa nautica</string>
     <string name="world_ski_missing">Per visualizzare le mappe per lo sci è necessario scaricare la mappa speciale offline</string>
     <string name="nautical_maps_missing">Per visualizzare le mappe nautiche è necessario scaricare la mappa speciale offline</string>
-    <string name="rendering_attr_pisteGrooming_name">Finitura della pista</string>
+    <string name="rendering_attr_pisteGrooming_name">Piste per sci da fondo</string>
     <string name="free">Libera %1$s</string>
     <string name="device_memory">Memoria dispositivo</string>
     <string name="rendering_attr_pisteRoutes_name">Piste da sci</string>
@@ -1663,15 +1677,20 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
 		\n\nÈ disponibile la mappa contenente tutta la simbologia nautica come singolo download sotto il nome \"World seamarks\".
 		\n\nCiò può essere invertito sia disattivandolo nuovamente da qui che cambiando lo \'Stile della mappa\' in \' Configura mappa\' come desiderato.
 	</string>
-    <string name="plugin_ski_descr">"Questo plugin per OsmAnd ti mette a portata di mano i dettagli delle piste da sci di fondo e alpino mondiali, funivie e ski lift di tutto il mondo. I percorsi e le piste vengono codificate per colore in base alla difficoltà e raffigurate in uno stile mappa speciale \'Inverno\', che sembra un paesaggio imbiancato dalla neve.
-
-Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostrando tutte le caratteristiche dello scenario nelle condizioni invernali. Questa visualizzazione può essere ripristinata o disattivata nuovamente da qui o cambiando lo \'Stile della mappa\' in \'Configura mappa\' come desiderato.
- "</string>
-	<string name="plugin_touringview_descr">"Attivando questa visualizzazione lo stile della mappa cambierà in \'Vista turistica\', questa è una visualizzazione speciale particolarmente dettagliata per i turisti e autisti professionali.
-\n\nQuesta visualizzazione fornisce, per ogni livello di zoom, il massimo dei dettagli di viaggio disponibili nei dati della mappa (particolari delle strade, sentieri e segni di orientamento).
-\n\nRappresenta anche chiaramente tutte le strade ambigue tramite la colorazione distintiva, ciò risulta utile per esempio guidando autoveicoli di grandi dimensioni.
-\n\nInoltre fornisce opzioni speciali dedicate ai viaggi quali la visualizzazione degli itinerari per bicicletta o quelli per l\'alpinismo.\n\nNon è necessaria una mappa speciale, la visualizzazione è creata dalle mappe standard.
-\n\nQuesta visualizzazione può essere ripristinata sia disattivandola nuovamente da qui che cambiando lo \'Stile della mappa\' in \' Configura mappa\' come desiderato. "</string>
+    <string name="plugin_ski_descr">Questo plugin per OsmAnd mette a portata di mano i dettagli delle piste da sci di fondo e alpino, funivie e ski lift di tutto il mondo. I percorsi e le piste vengono codificate per colore in base alla difficoltà e raffigurate in uno speciale stile \'Inverno\' della mappa, che con esso sembra un paesaggio imbiancato dalla neve.
+\n
+\nAttivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostrando tutte le caratteristiche dello scenario nelle condizioni invernali. Questa visualizzazione può essere disattivata da qui oppure cambiando lo \'Stile della mappa\' in \'Configura mappa\' come si desidera.</string>
+	<string name="plugin_touringview_descr">Attivando questa visualizzazione lo stile della mappa cambierà in \'Vista turistica\', questa è una visualizzazione speciale particolarmente dettagliata per i turisti e autisti professionali. 
+\n
+\nQuesta visualizzazione fornisce, per ogni livello di zoom, il massimo dei dettagli di viaggio disponibili nei dati della mappa (particolari delle strade, sentieri e segni di orientamento). 
+\n
+\nRappresenta anche chiaramente tutti i vari tipi di strade tramite la colorazione distintiva, ciò risulta utile per esempio guidando autoveicoli di grandi dimensioni. 
+\n
+\nInoltre fornisce opzioni speciali quali la visualizzazione degli itinerari per bicicletta o quelli per l\'alpinismo.
+\n
+\nNon è necessaria una mappa speciale, la visualizzazione è creata dalle nostre mappe standard. 
+\n
+\nQuesta visualizzazione può essere ripristinata sia disattivandola nuovamente da qui che cambiando lo \'Stile della mappa\' in \' Configura mappa\' come desiderato.</string>
 
     <string name="plugin_touringview_name">Visualizzazione mappa turistica</string>
     <string name="location_on_map">Localizzazione:\n Lat %1$s\n Lon %2$s</string>
@@ -1685,9 +1704,9 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="route_points">Punti del percorso</string>
     <string name="shared_string_release">Rilasciata</string>
     <string name="shared_string_ellipsis">…</string>
-    <string name="shared_string_ok">Ok</string>
+    <string name="shared_string_ok">OK</string>
     <string name="shared_string_cancel">Annulla</string>
-    <string name="shared_string_dismiss">Chiudi</string>
+    <string name="shared_string_dismiss">Scarta</string>
     <string name="shared_string_yes">Sì</string>
     <string name="shared_string_no">No</string>
     <string name="shared_string_on">Acceso</string>
@@ -1695,7 +1714,7 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="shared_string_previous">Precedente</string>
     <string name="shared_string_next">Successivo</string>
     <string name="shared_string_enable">Abilita</string>
-    <string name="shared_string_disable">Disabilita</string>
+    <string name="shared_string_disable">Disattiva</string>
     <string name="shared_string_enabled">Abilitato</string>
     <string name="shared_string_disabled">Disabilitato</string>
     <string name="shared_string_selected">Selezionato</string>
@@ -1714,7 +1733,7 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="shared_string_clear">Pulisci</string>
 
     <string name="shared_string_save">Salva</string>
-    <string name="shared_string_save_as_gpx">Salva come nuova traccia gpx</string>
+    <string name="shared_string_save_as_gpx">Salva come nuovo file gpx</string>
     <string name="shared_string_rename">Rinomina</string>
     <string name="shared_string_delete">Elimina</string>
     <string name="shared_string_delete_all">Elimina tutto</string>
@@ -1732,9 +1751,9 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="shared_string_refresh">Ricarica</string>
     <string name="shared_string_download">Scarica</string>
     <string name="shared_string_downloading">Scaricamento in corso</string>
-    <string name="shared_string_download_successful">Scaricamento completato</string>
-    <string name="shared_string_io_error">Errore di lettura/scrittura</string>
-    <string name="shared_string_unexpected_error">Si è verificato un errore imprevisto</string>
+    <string name="shared_string_download_successful">Scaricato</string>
+    <string name="shared_string_io_error">Errore di input/output</string>
+    <string name="shared_string_unexpected_error">Errore imprevisto</string>
     <string name="shared_string_action_template">"Azione {0}"</string>
     <string name="shared_string_close">Chiudi</string>
     <string name="shared_string_exit">Esci</string>
@@ -1744,7 +1763,7 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="shared_string_map">Mappa</string>
     <string name="shared_string_favorite">Preferito</string>
     <string name="shared_string_favorites">Preferiti</string>
-    <string name="shared_string_add_to_favorites">Aggiungi ai preferiti</string>
+    <string name="shared_string_add_to_favorites">Aggiungi ai \'Preferiti\'</string>
 
     <string name="shared_string_my_places">I miei luoghi</string>
 
@@ -1755,13 +1774,14 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
 
     <string name="simulate_your_location">Simula la tua posizione</string>
     <string name="drawer">Solo lista</string>
-    <string name="short_location_on_map">Lat %1$s\n Lon %2$s</string>
+    <string name="short_location_on_map">Lat %1$s
+\nLon %2$s</string>
     <string name="tips_and_tricks_descr">Domande frequenti, ultimi cambiamenti e altro.</string>
     <string name="routing_settings_2">Impostazioni di navigazione</string>
     <string name="general_settings_2">Impostazioni generali</string>
     <string name="shared_string_clear_all">Cancella tutto</string>
     <string name="shared_string_my_location">La mia posizione</string>
-    <string name="shared_string_my_favorites">I miei preferiti</string>
+    <string name="shared_string_my_favorites">Preferiti</string>
     <string name="shared_string_tracks">Le mie tracce</string>
     <string name="shared_string_currently_recording_track">Traccia in corso di registrazione</string>
     <string name="waypoint_visit_after">Visita dopo</string>
@@ -1774,21 +1794,21 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="osmand_parking_hour">h</string>
     <string name="osmand_parking_minute">min</string>
     <string name="osmand_parking_time_left">rimasto</string>
-    <string name="parking_place_limited">Parcheggio a tempo limitato a</string>
+    <string name="parking_place_limited">Parcheggio a tempo fino a</string>
     <string name="your_edits">Le tue modifiche</string>
     <string name="osmand_parking_overdue">obsoleto</string>
     <string name="delay_to_start_navigation_descr">Specifica il tempo di permanenza nella schermata di pianificazione dell\'itinerario.</string>
     <string name="delay_to_start_navigation">Avvia la navigazione svolta per svolta dopo…</string>
     <string name="shared_string_go">Vai</string>
 
-    <string name="confirmation_to_clear_history">Vuoi cancellare la cronologia?</string>
+    <string name="confirmation_to_clear_history">Cancellare la cronologia\?</string>
     <string name="local_osm_changes_upload_all_confirm">Stai per inviare %1$d cambiamento/i a OSM. Sei sicuro?</string>
     <string name="agps_info">Info A-GPS</string>
     <string name="agps_data_last_downloaded">ultimo aggiornamento dei dati dell\'A-GPS: %1$s</string>
-    <string name="welmode_download_maps">Gestione mappe</string>
+    <string name="welmode_download_maps">Scarica mappe</string>
     <string name="welcome_select_region">Per rappresentare correttamente i segnali stradali e le restrizioni per favore seleziona la tua regione di guida:</string>
-    <string name="confirm_usage_speed_cameras">In molti Paesi (Germania, Francia, Italia, e altri) l\'utilizzo degli avvertimenti di presenza di autovelox non è legale. OsmAnd non si assume alcuna responsabilità in caso di violazione della legge. Si prega di accettare solo in caso di utilizzo autorizzato di questa funzionalità.</string>
-    <string name="welcome_text">OsmAnd fornisce mappe consultabili e di navigazione offline globali!</string>
+    <string name="confirm_usage_speed_cameras">In molti Paesi (Germania, Francia, Italia, e altri) l\'uso degli avvertimenti di autovelox è illegale. OsmAnd non si assume alcuna responsabilità in caso di violazione della legge. Si prega di premere \'Sì\' solo nel caso in cui sia autorizzato l\'uso di questa funzionalità.</string>
+    <string name="welcome_text">OsmAnd fornisce mappe consultabili e di navigazione offline globali.</string>
     <string name="welcome_header">Benvenuto</string>
     <string name="current_route">Percorso attuale</string>
     <string name="osm_changes_added_to_local_edits">Modifiche a OsmAnd aggiunte alle modifiche locali</string>
@@ -1809,7 +1829,7 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="index_name_netherlands">Europa - Paesi Bassi</string>
     <string name="copying_osmand_file_failed">Copia dei file fallita</string>
     <string name="storage_directory_external">Memoria esterna</string>
-    <string name="application_dir_change_warning3">Vuoi che OsmAnd copi anche i suoi file di dati nella nuova destinazione?</string>
+    <string name="application_dir_change_warning3">Copiare i file dei dati OsmAnd nella nuova destinazione\?</string>
     <string name="specified_directiory_not_writeable">Le mappe non possono essere create nella destinazione specificata</string>
     <string name="storage_directory_manual">Specificata manualmente</string>
     <string name="storage_directory_default">Memoria interna</string>
@@ -1830,10 +1850,10 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="shared_string_logoff">Esci</string>
     <string name="rendering_value_disabled_name">Disabilitato</string>
     <string name="rendering_value_walkingRoutesScopeOSMC_name">Colora per rete di appartenenza</string>
-    <string name="rendering_value_walkingRoutesOSMC_name">Colore in base ai simboli escursionistici OSMC</string>
+    <string name="rendering_value_walkingRoutesOSMC_name">Colora in base ai simboli escursionistici OSMC</string>
     <string name="osm_edit_context_menu_delete">Cancella la modifica di OSM</string>
-    <string name="archive_wikipedia_data">Ci sono dati Wikipedia scaricati vecchi e incompatibili. Vuoi archiviarli?</string>
-    <string name="download_wikipedia_files">Vuoi scaricare i dati aggiuntivi di Wikipedia (%1$s MB)?</string>
+    <string name="archive_wikipedia_data">Sono presenti vecchi dati di Wikipedia incompatibili. Vuoi archiviarli\?</string>
+    <string name="download_wikipedia_files">Scaricare i dati aggiuntivi di Wikipedia (%1$s MB)\?</string>
     <string name="gps_network_not_enabled">Il servizio di localizzazione non è attivo. Vuoi avviarlo?</string>
     <string name="disable_recording_once_app_killed">Previeni il login remoto</string>
     <string name="disable_recording_once_app_killed_descrp">Metterà in pausa la registrazione GPX quando l\'app viene chiusa (attraverso le app recenti). L\'indicatore della modalità background di OsmAnd sparisce dalla barra delle notifiche di Android</string>
@@ -1845,11 +1865,11 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="local_recordings_delete_all_confirm">Stai per cancellare %1$d nota/e. Sei sicuro?</string>
     <string name="download_wikipedia_maps">Wikipedia</string>
     <string name="lang_es_ar">Spagnolo (Argentina)</string>
-    <string name="lang_nb">Norvegese (Bokmål)</string>
+    <string name="lang_nb">Norvegese bokmål</string>
     <string name="lang_vo">Volapuk</string>
     <string name="lang_th">Thailandese</string>
     <string name="lang_te">Telugu</string>
-    <string name="lang_nn">Norvegese (Nynorsk)</string>
+    <string name="lang_nn">Norvegese nynorsk</string>
     <string name="light_theme">Chiaro</string>
     <string name="dark_theme">Scuro</string>
     <string name="lang_pms">Piemontese</string>
@@ -1890,7 +1910,7 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="rendering_value_translucent_blue_name">Blu traslucido</string>
     <string name="rendering_value_purple_name">Viola</string>
     <string name="rendering_value_translucent_purple_name">Viola traslucido</string>
-    <string name="restart_is_required">Per applicare le modifiche è necessario un riavvio manuale dell\'app.</string>
+    <string name="restart_is_required">Riavvia manualmente l\'applicazione per applicare tutte le modifiche.</string>
     <string name="rendering_value_default13_name">Predefinito (13)</string>
     <string name="rendering_value_defaultTranslucentCyan_name">Predefinito (ciano traslucido)</string>
     <string name="rendering_value_red_name">Rosso</string>
@@ -1952,7 +1972,7 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="simulate_your_location_stop_descr">Arresta la simulazione della posizione.</string>
     <string name="simulate_your_location_descr">Simula la posizione utilizzando un GPX registrato o una percorso calcolato.</string>
     <string name="downloads_left_template">%1$s download rimanenti</string>
-    <string name="favourites_edit_dialog_title">Informazioni preferite</string>
+    <string name="favourites_edit_dialog_title">Informazioni sui preferiti</string>
     <string name="favourites_context_menu_add">Aggiungi preferito</string>
     <string name="roads">Strade</string>
     <string name="shared_string_trip_recording">Registrazione viaggio</string>
@@ -1960,15 +1980,15 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="osmand_running_in_background">Esecuzione in background</string>
     <string name="default_speed_system_descr">Specifica l\'unità di misura della velocità.</string>
     <string name="default_speed_system">Unità di misura della velocità</string>
-    <string name="nm">NM</string>
+    <string name="nm">nmi</string>
     <string name="si_nm">Miglia nautiche</string>
     <string name="si_kmh">Chilometri all\'ora</string>
-    <string name="si_mph">Miglia per ora</string>
+    <string name="si_mph">Miglia all\'ora</string>
     <string name="si_m_s">Metri al secondo</string>
     <string name="si_min_km">Minuti al chilometro</string>
-    <string name="si_min_m">Minuti per miglia</string>
+    <string name="si_min_m">Minuti al miglio</string>
     <string name="si_nm_h">Miglia nautiche per ora (nodi)</string>
-    <string name="nm_h">nm/h</string>
+    <string name="nm_h">kn</string>
     <string name="min_mile">min/m</string>
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>
@@ -1992,7 +2012,7 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="world_maps">Mappe mondiali</string>
 
     <string name="downloads">Download</string>
-    <string name="favorite_category_dublicate_message">Il nome della categoria specificata esiste già. Specifica un nome diverso.</string>
+    <string name="favorite_category_dublicate_message">Per favore scegli un nome che non esiste già per la categoria.</string>
     <string name="favorite_category_name">Nome della categoria</string>
     <string name="favorite_category_add_new_title">Aggiungi una nuova categoria</string>
     <string name="confirm_download_roadmaps">Sei sicuro di volere scaricare mappe solo stradali anche se disponi già di mappe standard complete?</string>
@@ -2003,7 +2023,7 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="free_downloads_used_description">Mostra i download gratuiti utilizzati</string>
     <string name="share_geo">geo:</string>
     <string name="shared_string_send">Invia</string>
-    <string name="simulate_initial_startup_descr">Imposta la spunta del primo avvio dell\'app, mantiene tutte le altre impostazioni inalterate.</string>
+    <string name="simulate_initial_startup_descr">Imposta la spunta che indica il primo avvio dell\'app, mantinendo tutte le altre impostazioni inalterate.</string>
     <string name="simulate_initial_startup">Simula il primo avvio dell\'app</string>
     <string name="share_menu_location">Condividi la posizione</string>
 
@@ -2012,9 +2032,9 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
 
     <string name="shared_string_qr_code">codice QR</string>
     <string name="map_downloaded">Mappa scaricata</string>
-    <string name="map_downloaded_descr">La mappa %1$s è stata scaricata, ora puoi iniziare a utilizzarla.</string>
+    <string name="map_downloaded_descr">La mappa %1$s è pronta all\'uso.</string>
     <string name="go_to_map">Mostra la mappa</string>
-    <string name="show_on_start_description">\'Spegni\' lancia direttamente la schermata della mappa.</string>
+    <string name="show_on_start_description">\'Spento\' lancia direttamente la schermata della mappa.</string>
     <string name="enter_country_name">Inserisci il nome della nazione</string>
     <string name="new_version">Nuova versione</string>
     <string name="begin_with_osmand_menu_group">Primi passi con OsmAnd</string>
@@ -2057,7 +2077,7 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="context_menu_item_edit_waypoint">Modifica i waypoint del GPX</string>
     <string name="shared_string_location">Posizione</string>
     <string name="poi_context_menu_modify_osm_change">Modifica i cambiamenti di OSM</string>
-    <string name="access_from_map_description">Il pulsante del menù apre il pannello di controllo, non il menù.</string>
+    <string name="access_from_map_description">Il pulsante del menù apre il pannello di controllo, non il menù</string>
     <string name="access_from_map">Accedi dalla mappa</string>
     <string name="copied_to_clipboard">Copiato negli appunti</string>
     <string name="osm_save_offline">Salva offline</string>
@@ -2073,10 +2093,10 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
 	<string name="osn_comment_dialog_title">Aggiungi un commento</string>
 	<string name="osn_reopen_dialog_title">Riapri la nota</string>
 	<string name="osn_close_dialog_title">Chiudi la nota</string>
-	<string name="osn_add_dialog_success">Nota creata con successo</string>
-	<string name="osn_add_dialog_error">C\'è stato un errore: la nota non è stata creata</string>
-	<string name="osn_close_dialog_success">La nota è stata chiusa con successo</string>
-	<string name="osn_close_dialog_error">È stato generato un errore: la nota non è stata chiusa</string>
+	<string name="osn_add_dialog_success">Nota creata</string>
+	<string name="osn_add_dialog_error">Impossibile creare la nota</string>
+	<string name="osn_close_dialog_success">La nota è stata chiusa</string>
+	<string name="osn_close_dialog_error">Impossibile chiudere la nota</string>
 	<string name="shared_string_commit">Invia</string>
 
     <string name="rendering_attr_currentTrackColor_description">Colore del GPX</string>
@@ -2128,7 +2148,7 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     
 <string name="rec_split_desc">Sovrascrivi le note quando lo spazio utilizzato supera la dimensione della memoria.</string>
     <string name="rec_split_clip_length">Lunghezza della nota</string>
-    <string name="rec_split_clip_length_desc">Limite massimo durata delle clip registrate.</string>
+    <string name="rec_split_clip_length_desc">Limite massimo della durata delle clip registrate.</string>
     <string name="rec_split_storage_size">Dimensione della memoria</string>
     <string name="rec_split_storage_size_desc">Quantità di spazio che può essere occupata dal totale delle clip.</string>
     <string name="update_time">Ora di aggiornamento</string>
@@ -2141,12 +2161,12 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="night">Notte</string>
 <string name="shared_string_not_selected">Non selezionato</string>
     
-<string name="shared_string_type">Tipo</string>
+<string name="shared_string_type">Digita</string>
     <string name="starting_point">Punto di partenza</string>
     <string name="select_month_and_country">Scegli il mese e lo stato</string>
 <string name="item_removed">Oggetto rimosso</string>
     <string name="n_items_removed">oggetti cancellati</string>
-    <string name="shared_string_undo_all">ANNULLA TUTTO</string>
+    <string name="shared_string_undo_all">Annulla tutto</string>
     <string name="switch_start_finish">Inverti punti di partenza e destinazione</string>
     <string name="rendering_attr_hideIcons_name">Icone dei PDI</string>
     <string name="number_of_edits">Numero di modifiche</string>
@@ -2154,7 +2174,7 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="shared_string_select">Seleziona</string>
     <string name="reports_for">Rapporto per</string>
 <string name="shared_string_remove">Rimuovi</string>
-    <string name="clear_updates_proposition_message">Puoi eliminare gli aggiornamenti scaricati e tornare alla mappa originale</string>
+    <string name="clear_updates_proposition_message">Elimina gli aggiornamenti scaricati e torna alla mappa originale</string>
     <string name="road_blocked">Strada bloccata</string>
     <string name="add_time_span">Aggiungi durata</string>
     <string name="data_is_not_available">Dati non disponibili</string>
@@ -2176,7 +2196,7 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="active_markers">Marcatori attivi</string>
     <string name="map_markers">Marcatori</string>
     <string name="map_marker">Marcatore</string>
-    <string name="add_points_to_map_markers_q">Vuoi aggiungere tutti i punti ai marcatori?</string>
+    <string name="add_points_to_map_markers_q">Vuoi aggiungere tutti i punti come marcatori\?</string>
     <string name="shared_string_add_to_map_markers">Aggiungi ai marcatori</string>
     <string name="consider_turning_polygons_off">È consigliato disabilitare il disegno dei poligoni.</string>
     
@@ -2200,12 +2220,12 @@ Sono disponibili solo {2} MB.</string>
     <string name="osm_editors_ranking">Classifica contributori OSM</string>
     <string name="osm_live_subscription">Sottoscrizione OsmAnd Live</string>
     <string name="osm_live_subscribe_btn">Sottoscrivi</string>
-    <string name="osm_live_email_desc">Necessario per fornirti informazioni sui contributi.</string>
+    <string name="osm_live_email_desc">È necessario per fornirti informazioni sui contributi.</string>
     <string name="osm_live_user_public_name">Nome pubblico</string>
     <string name="osm_live_hide_user_name">Non mostrare il mio nome nei rapporti</string>
     <string name="osm_live_support_region">Sostieni la regione</string>
     <string name="osm_live_month_cost">Costo mensile</string>
-    <string name="osm_live_month_cost_desc">Pagamento mensile.</string>
+    <string name="osm_live_month_cost_desc">Pagamento mensile</string>
     <string name="osm_live_active">Attivo</string>
     <string name="osm_live_not_active">Non attivo</string>
     <string name="osm_live_enter_email">Per favore inserisci un indirizzo email valido</string>
@@ -2216,12 +2236,10 @@ Sono disponibili solo {2} MB.</string>
     <string name="osm_live_subscription_settings">Impostazioni della sottoscrizione</string>
     <string name="osm_live_ask_for_purchase">Per favore acquista prima la sottoscrizione a OsmAnd Live</string>
 
-    <string name="osm_live_header">La sottoscrizione abilita gli aggiornamenti orari per tutte le mappe del mondo.
-Parte degli incassi ritornano alla comunità OSM ed è corrisposto per ogni contributo OSM.
-Se ami OsmAnd e OSM e vuoi sostenerli, questo è un modo perfetto per farlo.</string>
+    <string name="osm_live_header">La sottoscrizione abilita gli aggiornamenti orari per tutte le mappe del mondo. Parte degli incassi ritornano alla comunità OSM e sono corrisposti per ogni contributo a OSM. Se ti piacciono OsmAnd e OSM e vuoi sostenerli ed essere sostenuto da questi, questo è il miglior modo per farlo.</string>
     
     <string name="upload_anonymously">Carica anonimamente</string>
-    <string name="show_transparency_seekbar">Mostra la barra di regolazione della trasparenza</string>
+    <string name="show_transparency_seekbar">Mostra la barra di ricerca trasparente</string>
     <string name="shared_string_topbar">Barra superiore</string>
     <string name="recalculate_route">Ricalcola il percorso</string>
     <string name="shared_string_move_up">Sposta ↑</string>
@@ -2229,7 +2247,7 @@ Se ami OsmAnd e OSM e vuoi sostenerli, questo è un modo perfetto per farlo.</st
     <string name="finish_navigation">Termina la navigazione</string>
     <string name="avoid_road">Evita strada</string>
     <string name="storage_directory_shared">Memoria condivisa</string>
-    <string name="storage_directory_readonly_desc">La cartella di memorizzazione selezionata è in sola lettura. La cartella di memorizzazione è stata temporaneamente spostata nella memoria interna. Per favore scegli una cartella di destinazione valida.</string>
+    <string name="storage_directory_readonly_desc">Dato che la cartella di memorizzazione selezionata è in sola lettura, la cartella di memorizzazione è stata temporaneamente spostata nella memoria interna. Per favore scegli una cartella di destinazione scrivibile.</string>
     <string name="report">Rapporto</string>
     <string name="storage_permission_restart_is_required">L\'applicazione è ora in grado di scrivere sulla memoria esterna, ma deve essere riavviata per farlo.</string>
     <string name="full_report">Rapporto completo</string>
@@ -2238,7 +2256,7 @@ Se ami OsmAnd e OSM e vuoi sostenerli, questo è un modo perfetto per farlo.</st
 <string name="no_map_markers_found">Aggiungi i marcatori sulla mappa</string>
     <string name="no_waypoints_found">Nessun punto intermedio trovato</string>
     
-    <string name="rec_split">Frazionatore delle registrazioni</string>
+    <string name="rec_split">Suddivisione delle registrazioni</string>
     <string name="rec_split_title">Usa il frazionamento delle registrazioni</string>
     <string name="rendering_value_thin_name">Sottile</string>
     <string name="rendering_value_medium_name">Medio</string>
@@ -2319,10 +2337,10 @@ Se ami OsmAnd e OSM e vuoi sostenerli, questo è un modo perfetto per farlo.</st
     <string name="shared_string_change">Cambia</string>
     <string name="get_started">Inizia</string>
     <string name="skip_map_downloading">Salta download delle mappe</string>
-    <string name="first_usage_greeting">Ottieni indicazioni e scopri nuovi luoghi offline</string>
+    <string name="first_usage_greeting">Ottieni indicazioni e scopri nuovi luoghi senza una connessione a Internet</string>
     <string name="search_another_country">Scegli un\'altra regione</string>
     <string name="skip_map_downloading_desc">Non hai mappe offline installate. Si può scegliere una mappa dalla lista o scaricarle in seguito andando su \'Menù - %1$s\'.</string>
-    <string name="osm_live_payment_desc">Il costo di sottoscrizione verrà addebitato ogni mese. Puoi scegliere di annullare la sottoscrizione su Google Play in ogni momento.</string>
+    <string name="osm_live_payment_desc">Il costo della sottoscrizione verrà addebitato ogni mese. Puoi scegliere di annullare la sottoscrizione su Google Play in ogni momento.</string>
     <string name="donation_to_osm">Donazione per la comunità di OpenStreetMap</string>
     <string name="donation_to_osm_desc">Parte della tua donazione verrà inviata agli utenti che fanno modifiche su OpenStreetMap. Il costo della sottoscrizione rimane inalterato.</string>
     <string name="osm_live_subscription_desc">La sottoscrizione attiva aggiornamenti orari, quotidiani e settimanali e la possibilità di scaricare senza limiti tutte le mappe del mondo.</string>
@@ -2360,18 +2378,18 @@ Se ami OsmAnd e OSM e vuoi sostenerli, questo è un modo perfetto per farlo.</st
     <string name="save_filter">Salva filtro</string>
     <string name="delete_filter">Elimina filtro</string>
     <string name="new_filter">Nuovo filtro</string>
-    <string name="new_filter_desc">Inserisci il nome del nuovo filtro, verrà aggiunto nella tua scheda delle Categorie.</string>
+    <string name="new_filter_desc">Inserisci il nome del nuovo filtro, verrà aggiunto nella tua scheda delle \'Categorie\'.</string>
     <string name="christmas_poi">POI di Natale</string>
     <string name="christmas_desc">Anticipando le vacanze di Natale e Capodanno, è possibile scegliere di visualizzare i PDI associati al Natale: l\'alberi di Natale, i mercati, ecc.</string>
     <string name="christmas_desc_q">Mostrare PDI Natale?</string>
     <string name="rendering_value_light_brown_name">Marrone chiaro</string>
     <string name="rendering_value_dark_brown_name">Marrone scuro</string>
     <string name="rendering_attr_surfaceIntegrity_name">Integrità della superficie stradale</string>
-    <string name="save_track_min_speed_descr">Filtro: imposta la velocità minima per la registrazione di un punto.</string>
+    <string name="save_track_min_speed_descr">Filtro: nessuna registrazione di punti al di sotto di questa velocità.</string>
     <string name="save_track_min_distance">Soglia minima dello spostamento per la registrazione</string>
     <string name="save_track_min_distance_descr">Filtro: imposta la distanza minima dal precedente punto a cui avverrà la registrazione di un nuovo punto.</string>
     <string name="save_track_precision">Precisione minima per la registrazione</string>
-    <string name="save_track_precision_descr">Filtro: imposta la minima precisione per la registrazione di un punto.</string>
+    <string name="save_track_precision_descr">Filtro: nessuna registrazione se tale precisione non è raggiunta.</string>
     <string name="rendering_attr_contourColorScheme_name">Colorazione delle linee isoipse</string>
     <string name="search_hint">Digitare città, indirizzo, PDI nome</string>
     <string name="shared_string_continue">Continua</string>
@@ -2533,7 +2551,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="points_delete_multiple_succesful">Punti cancellati.</string>
     <string name="points_delete_multiple">Stai cancellando %1$d punto(i). Confermi?</string>
     <string name="route_points_category_name">Svolte di questo percorso</string>
-    <string name="track_points_category_name">Waypoint, punti di interesse, denominato caratteristiche</string>
+    <string name="track_points_category_name">Punti di passaggio, punti di interesse, caratteristiche notevoli</string>
     <string name="shared_string_gpx_track">Traccia</string>
     <string name="max_speed">Velocità massima</string>
     <string name="add_new_folder">Aggiungi una nuova cartella</string>
@@ -2576,7 +2594,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="quick_action_replace_destination">Sostituisci la destinazione</string>
     <string name="quick_action_add_first_intermediate">Aggiungi il primo intermedio</string>
     <string name="quick_action_add_destination_desc">Toccando il pulsante azione il centro dello schermo diviene la destinazione del percorso, la destinazione impostata in precedenza diverrà l\'ultimo punto intermedio.</string>
-    <string name="quick_action_replace_destination_desc">Toccando il pulsante azione sostituirai la destinazione con la posizione al centro dello schermo.</string>
+    <string name="quick_action_replace_destination_desc">Toccando questo pulsante azione centrerai lo schermo sulla nuova destinazione, sostituendo la destinazione scelta in precedenza (se esiste).</string>
     <string name="quick_action_add_first_intermediate_desc">Toccando il pulsante azione renderai il centro dello schermo il primo punto intermedio.</string>
     <string name="no_overlay">Nessun stato sovrapposto</string>
     <string name="no_underlay">Nessun strato di sfondo</string>
@@ -2617,38 +2635,51 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="routing_attr_allow_private_name">Permetti l\'accesso alle proprietà private</string>
     <string name="routing_attr_allow_private_description">Permetti l\'accesso alle aree private.</string>
     <string name="edit_name">Modifica il nome</string>
-    <string name="route_is_too_long_v2">Questo percorso è troppo lungo per essere calcolato. Per favore aggiungere delle mete intermedie se non si ottiene un risultato in 10 minuti.</string>
+    <string name="route_is_too_long_v2">Per favore aggiungere delle mete intermedie se non si ottiene un risultato per questo percorso entro 10 minuti.</string>
     <string name="save_poi_too_many_uppercase">Il nome contiene troppe maiuscole. Vuoi continuare?</string>
-    <string name="osmand_plus_extended_description_part8">"
- Copertura e qualità approssimativamente:
- • Ovest Europa: ****
- • Este Europa: ***
- • Russia: ***
- • Nord America: ***
- • Sud America: **
- • Asia: **
- • Giappone e Korea: ***
- • Medio Oriente: **
- • Africa: **
- • Antartide: *
- Molte nazioni del mondo disponibili come download!
- Dall\'Afghanistan al Zimbabwe, dall\'Australia agli USA. Argentina, Brasile, Canada, Francia, Germania, Messico, UK, Spagna, …
- "</string>
-    <string name="osmand_plus_extended_description_part7">"
- Contribuisci direttamente a OSM
- • Segnala errori nei dati direttamente dall\'app
- • Aggiungi PDI e caricali direttamente in OSM (o successivamente se sei offline)
- • Registrazione opzionale del viaggio anche in modalità background (mentre il dispositivo è in modalità sleep)
- OsmAnd è open-source e attivamente in fase di sviluppo. Chiunque può contribuire all\'applicazione riportando degli errori, migliorando la traduzione o programmando nuove funzionalità. Il progetto è in una vitale fase di continuo sviluppo tramite tutte queste forme di interazione fra sviluppatori e utilizzatori. L\'avanzamento del progetto si basa anche nei contributi finanziari per finanziare la programmazione e il test di nuove funzionalità.
- "</string>
-    <string name="osmand_extended_description_part8">OsmAnd è open-source e attivamente in fase di sviluppo. Chiunque può contribuire all\'applicazione riportando degli errori, migliorando la traduzione o programmando nuove funzionalità. Il progetto è in una vitale fase di continuo sviluppo tramite tutte queste forme di interazione fra sviluppatori e utilizzatori. L\'avanzamento del progetto si basa anche nei contributi finanziari per finanziare la programmazione e il test di nuove funzionalità. Copertura e qualità approssimativamente: • Ovest Europa: **** • Este Europa: *** • Russia: *** • Nord America: *** • Sud America: ** • Asia: ** • Giappone e Korea: *** • Medio Oriente: ** • Africa: ** • Antartide: * Molte nazioni del mondo disponibili come download! Ottieni un affidabile navigatore nella tuo paese - sia che sia Francia, Germania, Messico, UK, Spagna, Olanda, USA, Russia, Brasile o qualunque altro.</string>
-    <string name="osmand_extended_description_part7">Contribuisci a OSM • Segnala errori nei dati • Carica tracce GPX in OSM direttamente dall\'app • Aggiungi PDI e caricali direttamente in OSM (o successivamente se sei offline)</string>
-    <string name="mapillary">Mapillary</string>
-    <string name="osmand_extended_description_part1">"
-\n OsmAnd (OSM Automatica Navigazione Direzioni ) è un\'app di navigazione e mappe con accesso ai dati gratuiti, mondiali e di alta qualità di OpenStreetMap (OSM).
-\n
-\n Goditelo attraverso la navigazione vocale e visuale, visualizzando i PDI (punti di interesse), creando e gestendo tracce GPX, utilizzando la visualizzazione delle linee isoipse e delle informazioni di altitudine (attraverso un componente aggiuntivo), la scelta tra le modalità automobile, bici, a piedi, con le modifiche OSM e molto altro.
+    <string name="osmand_plus_extended_description_part8">"Copertura e qualità approssimativamente:
+\n • Ovest Europa: ****
+\n • Este Europa: ***
+\n • Russia: ***
+\n • Nord America: ***
+\n • Sud America: **
+\n • Asia: **
+\n • Giappone e Korea: ***
+\n • Medio Oriente: **
+\n • Africa: **
+\n • Antartide: *
+\n Molte nazioni del mondo disponibili come download!
+\n Dall\'Afghanistan al Zimbabwe, dall\'Australia agli USA. Argentina, Brasile, Canada, Francia, Germania, Messico, UK, Spagna, …
 \n "</string>
+    <string name="osmand_plus_extended_description_part7">"Contribuisci direttamente a OSM
+\n • Segnala errori nei dati
+\n • Contribuisci tracce GPX a OSM direttamente dall\'app
+\n • Aggiungi PDI e caricali direttamente in OSM (o successivamente se sei offline)
+\n • Registrazione opzionale del viaggio anche in modalità background (mentre il dispositivo è in modalità sleep)
+\n OsmAnd è open-source attivamente in fase di sviluppo. Chiunque può contribuire all\'applicazione riportando degli errori, migliorando la traduzione o programmando nuove funzionalità. Inoltre il progetto si basa sui contributi finanziari per finanziare la programmazione e il test di nuove funzionalità.
+\n "</string>
+    <string name="osmand_extended_description_part8">OsmAnd è un software open-source attivamente sviluppato. Chiunque può contribuire all\'app riportando degli errori, migliorando la traduzione o programmando nuove funzionalità. Inoltre il progetto si basa anche sui contributi finanziari per finanziare la programmazione e il test di nuove funzionalità.
+\n Copertura e qualità della mappa approssimativa:
+\n • Ovest Europa: ****
+\n • Este Europa: ***
+\n • Russia: ***
+\n • Nord America: ***
+\n • Sud America: **
+\n • Asia: **
+\n • Giappone e Korea: ***
+\n • Medio Oriente: **
+\n • Africa: **
+\n • Antartide: *
+\n Maggior parte nazioni del mondo disponibili come download!
+\n Ottieni un affidabile navigatore nel tuo paese - sia che tu sia in Francia, Germania, Messico, UK, Spagna, Olanda, USA, Russia, Brasile o qualunque altro.</string>
+    <string name="osmand_extended_description_part7">Contribuire a OSM
+\n • Segnala errori nei dati
+\n • Carica tracce GPX in OSM direttamente dall\'app
+\n • Aggiungi PDI e caricali direttamente in OSM (o successivamente se sei offline)</string>
+    <string name="mapillary">Mapillary</string>
+    <string name="osmand_extended_description_part1">OsmAnd (OSM Automatizzata Navigazione Direzioni ) è un\'app di navigazione e mappe con accesso ai dati gratuiti, mondiali e di alta qualità di OpenStreetMap (OSM). 
+\n 
+\n Goditi la navigazione vocale e visuale, visualizzando i PDI (punti di interesse), creando e gestendo tracce GPX, utilizzando la visualizzazione delle linee isoipse e delle informazioni di altitudine (attraverso un componente aggiuntivo), la scelta tra le modalità automobile, bici, a piedi, con le modifiche OSM e molto altro.</string>
     <string name="mapillary_widget">Widget di Mapillary</string>
     <string name="mapillary_widget_descr">Permette di contribuire facilmente a Mapillary.</string>
     <string name="mapillary_descr">Foto a livello stradale per tutti. Scopri luoghi, collabora, fotografa il mondo.</string>
@@ -2700,7 +2731,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="none_point_error">Aggiungi almeno un punto.</string>
     <string name="enter_gpx_name">Nome del file GPX:</string>
     <string name="show_on_map_after_saving">Dopo averlo salvato mostralo sulla mappa</string>
-    <string name="mappilary_no_internet_desc">Hai bisogno di internet per vedere le foto di Mapillary</string>
+    <string name="mappilary_no_internet_desc">Hai bisogno di essere connesso a Internet per vedere le foto da Mapillary.</string>
     <string name="add_waypoint">Aggiungi punto intermedio</string>
     <string name="save_gpx_waypoint">Salva Waypoint GPX</string>
     <string name="waypoint_one">Waypoint 1</string>
@@ -2728,7 +2759,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="add_line">Aggiungi una linea</string>
     <string name="save_route_point">Salva il Punto Percorso</string>
     <string name="route_point_one">Punto Percorso 1</string>
-    <string name="empty_state_my_tracks">Aggiungi e registra Tracce</string>
+    <string name="empty_state_my_tracks">Aggiungi file GPX</string>
     <string name="move_all_to_history">Sposta tutto nella cronologia</string>
     
     <string name="show_direction">Indicazione della direzione</string>
@@ -2775,24 +2806,52 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="show_arrows_on_the_map">Mostra le frecce nella mappa</string>
     <string name="show_passed">Mostra superati</string>
     <string name="hide_passed">Nascondi i superati</string>
-    <string name="osmand_extended_description_part2">Navigazione GPS • Puoi scegliere fra la modalità offline (nessun costo di roaming quando sei all\'estero) oppure online (più veloce) • La guida vocale svolta per svolta ti guida lungo il percorso (voci registrate e sintetizzate) • Il percorso viene ricalcolato quando devii • Indicazioni di corsia, nomi delle strade e tempo di arrivo stimato saranno d\'aiuto lungo il percorso • Per rendere il percorso più veloce il passaggio dalla modalità diurna/notturna automatico •Puoi scegliere di visualizzare i limiti di velocità, ed essere avvisato quando li superi • Lo zoom della mappa si adegua alla velocità • Puoi cercare le destinazioni per indirizzo, per categoria (es.: parcheggio, ristorante, hotel, stazione di rifornimento, museo), oppure tramite le coordinate geografiche • Supporta i punti intermedi nel tuo itinerario • Puoi registrare la tua traccia GPX oppure caricarne una e seguirla</string>
-    <string name="osmand_extended_description_part3">Mappa • Mostra i PDI (punti di interesse) vicino a te • Disponi la mappa nella direzione del movimento (o della bussola) • Mostra dove sei e dove stai andando • Condividi la tua posizione perché i tuoi amici possano trovarti • Raccogli i luoghi più importanti nei Favoriti • Ti permette di scegliere come visualizzare i nomi nella mappa: in inglese, locale, oppure la pronuncia • Visualizza mattonelle online speciali, vista satellitare (di Bing), diverse sovrapposizioni come turistico/navigazione tracce GPX e strati aggiuntivi con trasparenze personalizzabili</string>
-    <string name="osmand_plus_extended_description_part1">OsmAnd+ (OSM Automatizzata Navigazione Direzioni) è un\'applicazione di navigazione con l\'accesso ai dati delle mappe mondiali, gratuite e di grande qualità OpenStreetMap (OSM). Goditi la navigazione con indicazioni visive e vocali, la visualizzazione dei PDI (punti di interesse), creando e gestendo le tracce GPX, usando visualizzazione delle linee isoipse e dell\'altitudine, scegliendo fra le modalità auto, bici, pedone, modifiche OSM e molto altro. OsmAnd+ è la versione dell\'app a pagamento. Acquistandola supporti il progetto, finanzi lo sviluppo di nuove funzionalità e ricevi gli ultimi aggiornamenti. Alcune delle maggiori caratteristiche:</string>
+    <string name="osmand_extended_description_part2">Navigazione GPS
+\n • Puoi scegliere fra la modalità offline (nessun costo di roaming quando sei all\'estero) oppure online (più veloce)
+\n • La guida vocale svolta per svolta ti guida lungo il percorso (voci registrate e sintetizzate)
+\n • Il percorso viene ricalcolato quando devii
+\n • Indicazioni di corsia, nomi delle strade e tempo di arrivo stimato saranno d\'aiuto lungo il percorso
+\n • Per rendere il percorso più veloce il passaggio dalla modalità diurna/notturna automatico
+\n •Puoi scegliere di visualizzare i limiti di velocità, ed essere avvisato quando li superi
+\n • Lo zoom della mappa si adegua alla velocità
+\n • Puoi cercare le destinazioni per indirizzo, per categoria (es.: parcheggio, ristorante, hotel, stazione di rifornimento, museo), oppure tramite le coordinate geografiche
+\n • Supporta i punti intermedi nel tuo itinerario
+\n • Registra la tua traccia GPX oppure caricarne una e seguirla</string>
+    <string name="osmand_extended_description_part3">"Mappa 
+\n • Mostra i PDI (punti di interesse) vicino a te 
+\n • Disponi la mappa nella direzione del movimento (o della bussola) 
+\n • Mostra dove sei e  la direzione verso cui sei rivolto 
+\n • Condividi la tua posizione così i tuoi amici possano trovarti 
+\n • Raccogli i luoghi più importanti nei \'Favoriti\' 
+\n • Ti permette di scegliere come visualizzare i nomi nella mappa: in inglese, in lingua locale, oppure secondo la pronuncia 
+\n • Visualizza mattonelle online speciali, vista satellitare (da Bing), diverse sovrapposizioni come turistico/navigazione tracce GPX e strati aggiuntivi con trasparenze personalizzabili"</string>
+    <string name="osmand_plus_extended_description_part1">OsmAnd+ (OSM Automatizzata Navigazione Direzioni) è un\'applicazione di navigazione con l\'accesso ai dati delle mappe mondiali, gratuite e di grande qualità OpenStreetMap (OSM).
+\n Goditi la navigazione con indicazioni visive e vocali, la visualizzazione dei PDI (punti di interesse), creando e gestendo le tracce GPX, usando visualizzazione delle linee isoipse e dell\'altitudine, scegliendo fra le modalità auto, bici, pedone, modifiche OSM e molto altro.
+\n
+\n OsmAnd+ è la versione dell\'app a pagamento. Acquistandola supporti il progetto, finanzi lo sviluppo di nuove funzionalità e ricevi gli ultimi aggiornamenti.
+\n
+\n Alcune delle maggiori caratteristiche:</string>
     <string name="osn_modify_dialog_title">Modifica la nota</string>
     <string name="context_menu_item_modify_note">Modifica la nota OSM</string>
     <string name="make_round_trip_descr">Aggiungi una copia del punto di partenza come destinazione.</string>
     <string name="make_round_trip">Costruisci un percorso circolare</string>
     
     <string name="shared_string_markers">Marcatori</string>
-    <string name="osmand_extended_description_part4">Skiing OsmAnd mappe sciistiche è un componente aggiuntivo che ti permette di vedere le piste da sci con il livello di difficoltà e alcune altre informazioni come la localizzazione degli skilift e altri servizi.</string>
-    <string name="osmand_extended_description_part5">Bicicletta • Puoi individuare sulla mappa i percorsi ciclabili • La navigazione GPS nella modalità bicicletta crea percorsi utilizzando i percorsi ciclabili • Puoi vedere velocità e altitudine • L\'opzione registrazione del GPX ti permette di registrare il tuo percorso e di condividerlo • Con un componente aggiuntivo puoi abilitare la visualizzazione delle isoipse e dell\'ombreggiatura dei rilievi</string>
-    <string name="empty_state_my_tracks_desc">Registra o importa le tracce per visualizzarle</string>
-    <string name="empty_state_favourites">Aggiungi Luoghi preferiti</string>
-    <string name="empty_state_favourites_desc">Aggiungi dei luoghi favoriti sulla mappa o importali dal filesystem</string>
-    <string name="import_track">Importa traccia</string>
+    <string name="osmand_extended_description_part4">Skiing
+\n OsmAnd mappe sciistiche è un componente aggiuntivo che ti permette di vedere le piste da sci con il livello di difficoltà e alcune altre informazioni come la localizzazione degli skilift e altri servizi.</string>
+    <string name="osmand_extended_description_part5">Bicicletta
+\n • Trova sulla mappa i percorsi ciclabili
+\n • La navigazione GPS nella modalità bicicletta crea percorsi utilizzando i percorsi ciclabili
+\n • Vedi al tua velocità e altitudine
+\n • L\'opzione registrazione GPX ti permette di registrare il tuo percorso e di condividerlo
+\n • Con un componente aggiuntivo puoi abilitare la visualizzazione delle isoipse e dell\'ombreggiatura dei rilievi</string>
+    <string name="empty_state_my_tracks_desc">Importa i file GPX o registra delle tracce.</string>
+    <string name="empty_state_favourites">Aggiungi Preferiti</string>
+    <string name="empty_state_favourites_desc">Importa i Preferiti o aggiungili come marcatori sulla mappa.</string>
+    <string name="import_track">Importa il file GPX</string>
     <string name="import_track_desc">Il file %1$s non contiene punti intermedi, importarlo come traccia?</string>
-    <string name="move_point">Sposta il punto</string>
-    <string name="add_segment_to_the_track">Aggiungi a una traccia GPX</string>
+    <string name="move_point">Sposta il Punto</string>
+    <string name="add_segment_to_the_track">Aggiungi a un file GPX</string>
 <string name="osn_modify_dialog_error">Non è possibile modificare la nota</string>
     <string name="shared_string_road">Strada</string>
     <string name="show_map">Mostra la mappa</string>
@@ -2858,7 +2917,12 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="by_date">Per data</string>
     <string name="by_type">Per tipo</string>
     <string name="modify_the_search_query">Modifica la richiesta di ricerca.</string>
-    <string name="osmand_extended_description_part6">Pedone, escursionismo, visita della città • La mappa mostra i percorsi pedonali ed escursionistici • Wikipedia nel tuo linguaggio preferito può dirti molto nelle visite alle città • Fermate dei trasporti pubblici (bus, tram, treni), inclusi i nomi delle linee, aiuta a navigare in una nuova città • Nella navigazione GPS nella modalità pedone costruisce il tuo percorso usando i sentieri • Puoi caricare e seguire un percorso GPX o registrarne uno e condividerlo</string>
+    <string name="osmand_extended_description_part6">Pedone, escursionismo, turistico 
+\n • La mappa mostra i percorsi pedonali ed escursionistici 
+\n • Wikipedia può dirti molto nelle visite alle città nel tuo linguaggio preferito 
+\n • Le fermate dei trasporti pubblici (bus, tram, treni), inclusi i nomi delle linee, aiutano a navigare in una nuova città 
+\n • Nella navigazione GPS nella modalità pedone costruisce il tuo percorso usando i percorsi pedonali 
+\n • Carica e segui un percorso GPX o registrarne uno e condividilo</string>
     <string name="what_is_here">Cosa c\'è qui:</string>
     <string name="parked_at">parcheggiato alle</string>
     <string name="pick_up_till">Pagato sono alle</string>
@@ -2924,7 +2988,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="map_import_error">Errore importazione mappa</string>
     <string name="map_imported_successfully">Mappa importata</string>
     <string name="winter_and_ski_renderer">Inverno e sci</string>
-    <string name="touring_view_renderer">Vista turistica (contrasto e dettagli)</string>
+    <string name="touring_view_renderer">Vista turistica</string>
     <string name="group_deleted">Gruppo cancellato</string>
     <string name="clear_all_intermediates">Cancella tutti i punti intermedi</string>
     <string name="osm_recipients_label">Riceventi OSM</string>
@@ -3031,14 +3095,14 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="download_all">Scarica tutto</string>
     <string name="shared_string_bookmark">Segnalibro</string>
     <string name="off_road_render_descr">Adatto all’uso durante la guida fuoristrada. Adatto all’uso con immagini satellitari come sfondo. Caratteristiche principali: Larghezza delle strade principali ridotta, larghezza di sentieri, carrarecce, piste ciclabili ed altri percorsi aumentata. Basato sullo stile ‘Topo’.</string>
-    <string name="touring_view_render_descr">Stile molto dettagliato per le necessità turistiche. Include tutte le opzioni di configurazioni dello stile predefinito e in più: Mostra più dettagli possibili, in particolare, tutte le strade, i sentieri, e altri itinerari per chi viaggia. Distinzione chiara dei vari tipi di strada, come avviene negli atlanti per turisti. Schema dei colori ad alto contrasto per l’uso all’esterno, modalità diurna e notturna.</string>
-    <string name="osmand_plus_extended_description_part3">Visualizzazione della mappa
-\n • Mostra la tua posizione e l’orientamento
-\n • Scegli se orientare la mappa in base alla bussola oppure la direzione del tuo movimento
-\n • Salva i tuoi posti più importanti come preferiti
-\n • Mostra i PDI (punti di interesse) attorno a te
-\n • Mostra tasselli online specializzati, immagini satellitari (da Bing), varie informazioni sovrimpresse come per esempio tracce GPX per il turismo, la navigazione e ulteriori livelli con trasparenza personalizzabile
-\n • Scegli se mostrare il nome dei luoghi in Inglese, nella lingua locale oppure mediante l’alfabeto fonetico
+    <string name="touring_view_render_descr">Stile molto dettagliato per le necessità turistiche. Include tutte le opzioni di configurazioni dello stile predefinito e in più: mostra più dettagli possibili, in particolare, tutte le strade, i sentieri, e altri itinerari per chi viaggia. Distinzione chiara dei vari tipi di strada, come avviene negli atlanti per turisti. Schema dei colori ad alto contrasto per l’uso all’esterno, modalità diurna e notturna.</string>
+    <string name="osmand_plus_extended_description_part3">Visualizzazione della mappa 
+\n • Mostra la tua posizione e l’orientamento 
+\n • Scegli se orientare la mappa in base alla bussola oppure la direzione del tuo movimento 
+\n • Salva i tuoi posti più importanti come Preferiti 
+\n • Mostra i PDI (punti di interesse) attorno a te 
+\n • Mostra tasselli online specializzati, immagini satellitari (da Bing), varie informazioni sovrimpresse come per esempio tracce GPX per il turismo, la navigazione e ulteriori livelli con trasparenza personalizzabile 
+\n • Scegli se mostrare il nome dei luoghi in Inglese, nella lingua locale oppure mediante l’alfabeto fonetico 
 \n</string>
     <string name="osmand_plus_extended_description_part4">Usa OSM e i dati di Wikipedia 
 \n • informazioni di alta qualità dal miglior progetto collaborativo del mondo 
@@ -3107,7 +3171,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="coord_input_add_point">Aggiungi punto</string>
     <string name="coord_input_save_as_track">Salva come traccia</string>
     <string name="coord_input_save_as_track_descr">Hai aggiunto %1$s punti. Digita il nome del file e tappa su \"Salva\".</string>
-    <string name="test_voice_desrc">Tap sul pulsante e ascolta l\'avviso vocale corrispondente per identificare gli avvisi errati o mancanti</string>
+    <string name="test_voice_desrc">Tap sul pulsante e ascolta l\'avviso vocale corrispondente per identificare gli avvisi errati o mancanti.</string>
 <string name="release_3_2_pre">• Sistemato il crash all\'avvio che avveniva con alcuni dispositivi
 \n
 \n • Nuova funzione Marcatori: mostra i marcatori che sono stati già superati
@@ -3125,7 +3189,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="ask_for_location_permission">Per favore concedi il permesso a OsmAnd di accedere alla geolocalizzazione per continuare.</string>
     <string name="thank_you_for_feedback">Grazie per il feedback</string>
     <string name="search_street">Ricerca strada</string>
-    <string name="start_search_from_city">Inizia la ricerca dalla città</string>
+    <string name="start_search_from_city">Inizia dalla scelta della città</string>
     <string name="shared_string_restore">Ripristina</string>
     <string name="keep_passed_markers">Tenere i marcatori superati sulla mappa</string>
     <string name="more_transport_on_stop_hint">C\'è più trasporto su questa fermata.</string>
@@ -3134,4 +3198,23 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="markers_remove_dialog_msg">Eliminare il marcatore \'%s\'\?</string>
     <string name="edit_map_marker">Modifica marcatore</string>
     <string name="third_party_application">Applicazione di terze parti</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Piani &amp; Tariffe</string>
+    <string name="osm_live_payment_monthly_title">Paga mensilmente</string>
+    <string name="osm_live_payment_3_months_title">Paga ogni 3 mesi</string>
+    <string name="osm_live_payment_annual_title">Paga annualmente</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mese</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mese</string>
+    <string name="osm_live_payment_discount_descr">Risparmia %1$s!</string>
+	<string name="osm_live_payment_current_subscription">La tua attuale sottoscrizione</string>
+    <string name="osm_live_payment_renews_monthly">Abbonamento mensile</string>
+    <string name="osm_live_payment_renews_quarterly">Rinnovo trimestrale</string>
+    <string name="osm_live_payment_renews_annually">Rinnovo annuale</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Scegli la frequenza di pagamento che preferisci:</string>
+    <string name="osm_live_payment_contribute_descr">Parte del ricavato va ai contributori OpenStreetMap.</string>
+    <string name="powered_by_osmand">Sviluppato da OsmAnd</string>
+    <string name="osm_live_subscriptions">Sottoscrizioni</string>
+    <string name="mapillary_menu_title_pano">Mostra solo immagini a 360°</string>
+    <string name="shared_string_launch">Lancia</string>
+    <string name="lang_gn_py">Guaraní</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ja/phrases.xml b/OsmAnd/res/values-ja/phrases.xml
index 1359fa6ac7..78c8375ee8 100644
--- a/OsmAnd/res/values-ja/phrases.xml
+++ b/OsmAnd/res/values-ja/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="poi_aerodrome">空港(Aireport)</string>
 	<string name="poi_bank">銀行(Bank)</string>
@@ -73,7 +73,7 @@
 	<string name="poi_farm">農作物直売所(Farm store)</string>
 	<string name="poi_greengrocer">青果店(Greengrocery)</string>
 	<string name="poi_seafood">魚屋(Seafood store)</string>
-	<string name="poi_confectionery">菓子屋(Confectionery)</string>
+	<string name="poi_confectionery">菓子店(Confectionery)</string>
 	<string name="poi_ice_cream">アイスクリーム屋(Ice cream parlor)</string>
 	<string name="poi_supermarket">スーパーマーケット(Supermarket)</string>
 	<string name="poi_tea">ティーショップ(Tea shop)</string>
@@ -348,7 +348,7 @@
 	<string name="poi_isolated_dwelling">孤立住居(Isolated dwelling)</string>
 	<string name="poi_suburb">区・区画(Suburb)</string>
 	<string name="poi_quarter">大字(Quarter)</string>
-	<string name="poi_neighbourhood">町丁(Neighbourhood)</string>
+	<string name="poi_neighbourhood">小字・丁目(Neighbourhood)</string>
 	<string name="poi_locality">非居住地(Locality)</string>
 	<string name="poi_place_allotments">住居付き農園(Allotments)</string>
 	<string name="poi_place_farm">農場(Farm)</string>
@@ -850,7 +850,7 @@
 	<string name="poi_recycling_organic">生ごみ(Organic)</string>
 	<string name="poi_recycling_beverage_cartons">飲食物の紙パック(Beverage cartons)</string>
 	<string name="poi_recycling_garden_waste">木質系廃棄物(Garden waste)</string>
-	<string name="poi_recycling_low_energy_bulbs">蛍光灯型電球(Low energy bulbs)</string>
+	<string name="poi_recycling_low_energy_bulbs">電球型蛍光灯(Low energy bulbs)</string>
 	<string name="poi_recycling_fluorescent_tubes">蛍光管(Fluorescent tubes)</string>
 	<string name="poi_recycling_metal">金属(Metal)</string>
 	<string name="poi_recycling_electrical_items">大型家電製品(Electrical items)</string>
@@ -1639,7 +1639,7 @@
 	<string name="poi_health_specialty_behavior_yes">行動療法(Behavior)</string>
 	<string name="poi_health_specialty_palliative_medicine_yes">緩和医療・ホスピス(Health specialty: palliative medicine)</string>
 
-	<string name="poi_social_facility_type">福祉施設種(Type)</string>
+	<string name="poi_social_facility_type">福祉施設種類(Type)</string>
 	<string name="poi_social_facility_for">対象者(Target group)</string>
 	<string name="poi_social_facility_group_home">グループホーム・集団生活型介護施設(Group home)</string>
 	<string name="poi_social_facility_assisted_living">居住型支援施設(Assisted living)</string>
@@ -1665,7 +1665,7 @@
 	<string name="poi_social_facility_for_child_juvenile">子供;少年(Child;juvenile)</string>
 
 	<string name="poi_free_flying_characteristic">スカイスポーツの対応要素(Characteristic)</string>
-	<string name="poi_seasonal">営業期(Seasonal)</string>
+	<string name="poi_seasonal">季節営業(Seasonal)</string>
 	<string name="poi_drive_in">ドライブイン(Drive in)</string>
 	<string name="poi_drive_in_no">無し</string>
 	<string name="poi_power_supply_yes">有り</string>
@@ -1823,7 +1823,7 @@
 	<string name="poi_cuisine_sagardotegia">_形式_バスク伝統サイダーハウス(リンゴ酒・ワイン)(Sagardotegia)</string>
 	<string name="poi_automated_yes">肯定</string>
 	<string name="poi_automated_no">非自動化</string>
-	<string name="poi_brushless">非回転ブラシ洗車の有無（Brushless)</string>
+	<string name="poi_brushless">ノンブラシ洗車の有無（Brushless)</string>
 	<string name="poi_brushless_yes">有り</string>
 	<string name="poi_brushless_no">非回転ブラシ洗車:無し</string>
 	<string name="poi_capacity_disabled">障害者専用コーナーの有無(Dedicated places for disabled)</string>
@@ -1939,7 +1939,7 @@
 	<string name="poi_beach_rocky">丸石</string>
 
 	<string name="poi_beauty_salon_service">美容サービス</string>
-	<string name="poi_city_capital">首都検索</string>
+	<string name="poi_city_capital">首都</string>
 	<string name="poi_xmas">クリスマスや年越し限定物</string>
 	<string name="poi_xmas_event">クリスマスイベント</string>
 	<string name="poi_xmas_market">クリスマス市場</string>
@@ -3242,4 +3242,4 @@
 
 	<string name="poi_generator_output_electricity_no">出力(電力):無し</string>
 
-	</resources>
+	</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index 587e257a99..55ff1124f3 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="installing_new_resources">新しいデータを展開中…</string>
      <string name="internet_connection_required_for_online_route">オンライン経路案内を使用しようとしていますが
 インターネット接続されていません。</string>
@@ -676,7 +676,7 @@ POIの更新は利用できません</string>
 	<string name="destination_point">目的地 %1$s</string>
     <string name="context_menu_item_destination_point">目的地として設定</string>
     <string name="please_select_address">最初に都市か通りを選択してください</string>
-    <string name="search_street_in_neighborhood_cities">近くの都市の通りを探す</string>
+    <string name="search_street_in_neighborhood_cities">近隣市街の道路を探す</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>
@@ -1816,7 +1816,7 @@ POIの更新は利用できません</string>
 	<string name="shared_string_export">エクスポート</string>
 	<string name="shared_string_unexpected_error">予期しないエラーが発生</string>
 	<string name="shared_string_action_template">アクション {0}</string>
-	<string name="shared_string_collapse">折り畳み表示</string>
+	<string name="shared_string_collapse">詳細を閉じる</string>
 	<string name="shared_string_currently_recording_track">現在の経路を記録</string>
 	<string name="shared_string_audio">音声</string>
 	<string name="shared_string_video">動画</string>
@@ -1968,7 +1968,7 @@ POIの更新は利用できません</string>
     <string name="rendering_value_translucent_blue_name">半透明ブルー</string>
     <string name="rendering_value_purple_name">パープル</string>
     <string name="rendering_value_translucent_purple_name">半透明パープル</string>
-    <string name="restart_is_required">変更を適用するには手動でアプリケーションを再起動する必要があります。</string>
+    <string name="restart_is_required">全ての変更を適用するためはアプリを再起動する必要があります。</string>
     <string name="archive_wikipedia_data">互換性のない古いWikipediaデータがあります。アーカイブ化しますか？</string>
     <string name="download_wikipedia_files">Wikipediaの追加データ(%1$s MB)をダウンロードしますか？</string>
     <string name="gps_network_not_enabled">位置取得機能(現在地、GPS、位置情報サービス等)がオフになっています。オンにしますか？</string>
@@ -2021,7 +2021,7 @@ POIの更新は利用できません</string>
 	
 	
 	<string name="contact_info">連絡先</string>
-	<string name="description">説明</string>
+	<string name="description">詳細</string>
 	<string name="add_opening_hours">開店時間を追記</string>
 	<string name="poi_dialog_poi_type">POIの種類</string>
 	<string name="number_of_rows_in_dash">ダッシュボードでの表示数： %1$s</string>
@@ -2071,7 +2071,7 @@ POIの更新は利用できません</string>
     <string name="simulate_your_location_descr">計算されたルート、またはGPXに記録されたルートを使用して移動のシミュレーションをします</string>
     <string name="favourites_context_menu_add">お気に入りに追加</string>
 	<string name="are_you_sure">よろしいですか？</string>
-	<string name="unsaved_changes_will_be_lost">未保存の変更は失われます。続行しますか？</string>
+	<string name="unsaved_changes_will_be_lost">このまま終了すると変更した部分が失われます。続行しますか？</string>
 	<string name="downloads_left_template">残りダウンロード %1$s</string>
 	<string name="roads">道路</string>
     <string name="downloading_number_of_files">%1$d のファイルをダウンロード中</string>
@@ -2315,7 +2315,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="reports_for">表示レポート</string>
     <string name="share_geo">geo:</string>
     <string name="coords_format">座標の形式</string>
-    <string name="coords_format_descr">地理座標で表示される形式を指定します</string>
+    <string name="coords_format_descr">地理座標で表示される形式を指定します。</string>
   	<string name="app_mode_bus">バス</string>
  	<string name="app_mode_train">鉄道</string>
     <string name="current_track">現在の経路</string>
@@ -2323,16 +2323,16 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="change_markers_position">マーカーの位置を変更</string>
     <string name="move_marker_bottom_sheet_title">マップ画面のドラッグでマーカー位置を調整できます</string>
     <!-- string name="lat_lon_pattern">"緯度:%1$.5f  経度:%2$.5f"</string -->
-    <string name="access_direction_audio_feedback_descr">進行方向をビープ音で示して案内します</string>
-    <string name="access_direction_haptic_feedback_descr">進行方向を振動で示して案内します</string>
-    <string name="use_osm_live_routing_description">OSMライブ更新でのナビゲーションを有効化</string>
+    <string name="access_direction_audio_feedback_descr">進行方向を通知音で示して案内します。</string>
+    <string name="access_direction_haptic_feedback_descr">進行方向を振動で示して案内します。</string>
+    <string name="use_osm_live_routing_description">OSMライブ更新でのナビゲーションを有効化します。</string>
 	<string name="use_osm_live_routing">OsmAnd Live ナビゲーション</string>
     <string name="access_no_destination">目的地が設定されていません</string>
     <string name="access_disable_offroute_recalc">指定の道を外れた後にルート再計算を行わない</string>
     <string name="access_disable_wrong_direction_recalc">反対方向へ向かった場合ルートを変更しない</string>
-    <string name="access_disable_wrong_direction_recalc_descr">ルートと反対方向に移動しても、自動的にルートの再計算をしないようにします</string>
+    <string name="access_disable_wrong_direction_recalc_descr">ルートと反対方向に移動しても、自動的にルートの再計算をしないようにします。</string>
     <string name="access_smart_autoannounce">スマート音声案内</string>
-    <string name="access_smart_autoannounce_descr">目的地への方向が変更されたときのみ通知します</string>
+    <string name="access_smart_autoannounce_descr">目的地への方向が変更されたときのみ通知します。</string>
     <string name="access_autoannounce_period">自動音声案内間隔</string>
     <string name="access_autoannounce_period_descr">音声案内間隔の最小時間を設定します</string>
     <string name="access_default_color">既定色</string>
@@ -2360,7 +2360,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="follow_us">フォローはこちらから</string>
     <string name="access_direction_audio_feedback">音シグナルで案内</string>
     <string name="access_direction_haptic_feedback">振動シグナルで案内</string>
-    <string name="access_disable_offroute_recalc_descr">ルートから離れた場合に、自動的にルートの再計算をしないようにします</string>
+    <string name="access_disable_offroute_recalc_descr">ルートから離れた場合に、自動的にルートの再計算をしないようにします。</string>
     <string name="back_to_search">検索に戻る</string>
     <string name="confirmation_to_delete_history_items">選択された履歴を削除しますか？</string>
     <string name="show_something_on_map">マップ上に%1$sを表示</string>
@@ -2385,7 +2385,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="show_legacy_search">レガシー検索を表示</string>
     <string name="show_legacy_search_desc">メニューリストで旧型検索も使用できるようにします</string>
     <string name="routing_attr_allow_motorway_name">高速道路を許可</string>
-    <string name="routing_attr_allow_motorway_description">高速道路を使用可能とみなします</string>
+    <string name="routing_attr_allow_motorway_description">高速道路を使用可能とみなします。</string>
     
 	<string name="auto_split_recording_title">空白検知で自動分割記録</string>
 	<string name="auto_split_recording_descr">6分、2時間、あるいは日付変更後に長い空白があった場合に新しいセグメントを開始します。</string>
@@ -2484,20 +2484,20 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="shared_string_time">時間</string>
     <string name="total_distance">総走行距離</string>
     <string name="routing_attr_height_obstacles_name">標高データを使用</string>
-    <string name="routing_attr_height_obstacles_description">SRTM、ASTER、EU-DEMによる地形標高データを使用します</string>
+    <string name="routing_attr_height_obstacles_description">SRTM、ASTER、EU-DEMによる地形標高データを使用します。</string>
 
     <string name="rendering_attr_hideWaterPolygons_description">水域</string>
     <string name="rendering_attr_hideWaterPolygons_name">水域を非表示</string>
     <string name="wiki_around">近隣にWikipedia記載地点有り</string>
     <string name="trip_rec_notification_settings">記録機能のクイックスタートを有効化</string>
-    <string name="trip_rec_notification_settings_desc">旅程記録開始時にシステム通知を表示します</string>
+    <string name="trip_rec_notification_settings_desc">旅程記録開始時にシステム通知を表示します。</string>
     <string name="shared_string_notifications">通知</string>
     <string name="shared_string_trip">旅行</string>
     <string name="shared_string_recorded">記録</string>
     <string name="shared_string_record">記録</string>
     <string name="gpx_logging_no_data">データなし</string>
     <string name="routing_attr_short_way_name">燃費を抑えたルート</string>
-    <string name="routing_attr_short_way_description">燃費を抑えることを重視した(通常より短い)ルートにします</string>
+    <string name="routing_attr_short_way_description">燃費を抑えることを重視した(通常より短い)ルートにします。</string>
     <string name="clear_tile_data">すべてのタイルを消去</string>
     <string name="navigate_point_olc">オープンロケーションコード(OLC)</string>
     <string name="navigate_point_olc_info_invalid">OLCの値が正しくありません</string>
@@ -2591,7 +2591,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="change_color">色を変更</string>
     <string name="edit_name">名前の編集</string>
     <string name="animate_my_location">現在地を目立たせる</string>
-    <string name="animate_my_location_desc">ナビゲーション中も、現在地カーソルの周りを点滅させて目立たせます</string>
+    <string name="animate_my_location_desc">ナビゲーション中も、現在地カーソルの周りを点滅させて目立たせます。</string>
     <string name="shared_string_overview">概要</string>
     <string name="select_street">道路を選択</string>
     <string name="type_address">住所を入力</string>
@@ -2615,7 +2615,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="subscribe_email_error">エラー</string>
     <string name="subscribe_email_desc">メーリングリストをご購読いただけると、アプリの割引やさらに３つのマップをダウンロード可能になります！</string>
     <string name="depth_contour_descr">点と等深線による海底地形図がマップに表示されます。</string>
-    <string name="sea_depth_thanks">海洋等深線データを購入していただき、ありがとうございます！</string>
+    <string name="sea_depth_thanks">海洋等深線データを購入していただき、ありがとうございます</string>
     <string name="index_item_depth_contours_osmand_ext">海洋等深線データ</string>
     <string name="download_depth_countours">海洋等深線データ</string>
     <string name="nautical_maps">航海マップ</string>
@@ -2627,27 +2627,27 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="do_not_send_anonymous_app_usage_desc">OsmAndは実行中のどのメニューを開いたかの情報を収集します。ユーザーの現在地、入力した地域、閲覧情報、検索、ダウンロードなどの情報を送信することはありません。</string>
     <string name="do_not_send_anonymous_app_usage">アプリケーションの匿名使用統計情報を送信しない</string>
     <string name="do_not_show_startup_messages">起動時にメッセージを表示しない</string>
-    <string name="do_not_show_startup_messages_desc">アプリ割引＆特別なローカルイベントメッセージを表示しないようにします</string>
+    <string name="do_not_show_startup_messages_desc">アプリ割引＆特別なローカルイベントメッセージを表示しないようにします。</string>
     <string name="parking_options">駐車場オプション</string>
-    <string name="full_version_thanks">OsmAndのフルバージョンのご購入、ありがとうございます！</string>
+    <string name="full_version_thanks">OsmAndのフルバージョンのご購入、ありがとうございます。</string>
     <string name="routing_attr_relief_smoothness_factor_hills_name">丘陵可</string>
     <string name="routing_attr_relief_smoothness_factor_plains_name">丘陵の少ない地形</string>
     <string name="routing_attr_relief_smoothness_factor_more_plains_name">平坦優先</string>
     <string name="routing_attr_driving_style_speed_name">短いルート</string>
     <string name="routing_attr_driving_style_balance_name">バランス</string>
     <string name="routing_attr_driving_style_safety_name">脇道を選り抜く</string>
-    <string name="relief_smoothness_factor_descr">平原から丘陵まで、経路設定時優先したい地形を設定します</string>
+    <string name="relief_smoothness_factor_descr">優先して経路設定する地形を設定します（平坦または起伏あり）。</string>
     <string name="route_points_category_name">このルートで通過が必要な場所</string>
     <string name="routing_attr_relief_smoothness_factor_name">標高の変動許容選択</string>
-    <string name="rendering_attr_depthContours_description">等深線や深度を表示します</string>
+    <string name="rendering_attr_depthContours_description">等深線や深度を表示します。</string>
     <string name="rendering_attr_depthContours_name">海洋等深線データ</string>
     <string name="shared_string_paused">一時停止</string>
     <string name="save_track_min_speed">ログに記録する最低速度</string>
-    <string name="save_track_min_speed_descr">フィルター: ログに記録を許可する最低速度を設定します</string>
+    <string name="save_track_min_speed_descr">フィルター: ログに記録を許可する最低速度を設定します。</string>
     <string name="save_track_min_distance">ログに記録する最低移動距離</string>
-    <string name="save_track_min_distance_descr">フィルター: ログに記録を許可する最後に記録した地点からの最低移動距離を設定します</string>
+    <string name="save_track_min_distance_descr">フィルター: ログに記録を許可する最後に記録した地点からの最低移動距離を設定します。</string>
     <string name="save_track_precision">ログに記録する最小精度</string>
-    <string name="save_track_precision_descr">フィルター: ログに記録を許可する最低精度を設定します</string>
+    <string name="save_track_precision_descr">フィルター: ログに記録を許可する最低精度を設定します。</string>
     <string name="restore_purchases">購入情報の復元</string>
     <string name="get_for">%1$sで入手</string>
     <string name="first_usage_wizard_desc">位置情報(GPS)機能が有効でOsmAndで現在地を取得できれば、ダウンロードすべき地域のマップが表示されます。</string>
@@ -2657,19 +2657,17 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="route_is_too_long_v2">現在の経路は計算するには長すぎるようです。10分以内に結果が出なければ中間に目的地(経由地点)を追加してください。</string>
     <string name="osmand_extended_description_part1">" OsmAnd(OSM Automated Navigation Directions～自動ナビ案内)は、『無償利用可、ワールドワイド対応、高品質のOpenStreetMap(OSM)データ』を使用した、地図＆ナビゲーションアプリです。
 \n音声と視覚による案内、POI(Point Of Interest～興味的地点)表示、GPX経路の作成と管理、等高線を使った地形情報(要プラグイン)、ドライブ、サイクリング、徒歩移動各移動手段別のモード、OSMの編集等々に対応。 "</string>
-    <string name="osmand_extended_description_part2">"
- GPSナビゲーション
- • オフライン(海外の場合はローミング料金が不要に)、またはオンライン(高速)モードのいずれかを選択できます
- • ターンバイターン形式の音声案内が、道中のあなたを案内します(録音された音声とリアルタイムで合成される音声を選択できます）
- • 予定のルートから大きく外れるとルートが再検索されます
- • 車線案内、道路名、到着予定時刻が道中の助けになります
- • 旅行をより安全にするために、昼/夜モードが自動的に切り替わります
- • 速度制限の表示選択の他に、それを超えた場合に警告を表示するように選択できます
- • 移動速度に伴ったマップのズームを行えます
- • 目的地を住所、種類(駐車場、レストラン、ホテル、ガソリンスタンド、博物館など)、座標の数値でも検索することもできます
- • 旅程上の中間地点をサポートします。
- • GPX経路を自分で使う為の記録や、アップロードしたり等の機能もフォローしています
- "</string>
+    <string name="osmand_extended_description_part2">"GPSナビゲーション
+\n • オフライン(海外の場合はローミング料金が不要に)、またはオンライン(高速)モードのいずれかを選択できます
+\n • ターンバイターン形式の音声案内が、道中のあなたを案内します(録音された音声とリアルタイムで合成される音声を選択できます）
+\n • 予定のルートから大きく外れるとルートが再検索されます
+\n • 車線案内、道路名、到着予定時刻が道中の助けになります
+\n • 旅行をより安全にするために、昼/夜モードが自動的に切り替わります
+\n • 速度制限の表示選択の他に、それを超えた場合に警告を表示するように選択できます
+\n • 移動速度に伴ったマップのズームを行えます
+\n • 目的地を住所、種類(駐車場、レストラン、ホテル、ガソリンスタンド、博物館など)、座標の数値でも検索することもできます
+\n • 旅程上の中間経由地点をサポートします。
+\n • GPX経路を自分で使う為の記録や、アップロードしたり等の機能も備えています "</string>
     <string name="osmand_extended_description_part3">"
  マップ機能
  • 周囲のPOI(Point Of Interests～興味を引く施設)を表示できます
@@ -2728,15 +2726,13 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
 \n音声と視覚による案内、POI(Point Of Interest～興味的地点)表示、GPX経路の作成と管理、等高線を使った地形情報(要プラグイン)、ドライブ、サイクリング、徒歩移動各移動手段別のモード、OSMの編集等々に対応。
 \n OsmAnd+は有料のアプリケーションです。購入することで同プロジェクトの資金、新機能開発への援助となり、最新アップデートも利用可能になります。
 \nいくつかの主な機能: "</string>
-    <string name="osmand_plus_extended_description_part2">"
- ナビゲーション
- • オンライン（高速）またはオフライン(海外の場合はローミング料金が不要に）どちらでも動作可能です
- • ターンバイターンの音声案内（録音された音声と合成音声）が可能です
- • 車線案内、道路名、到着予定時刻等の様々なオプションが利用できます
- • 旅程上の中間経由地点をサポートしています
- • ルートから大きく外れると自動的に再ルート検索します
- • 住所別、種類別（例：レストラン、ホテル、ガソリンスタンド、博物館）、または座標の数値で場所を検索可能です
- "</string>
+    <string name="osmand_plus_extended_description_part2">ナビゲーション
+\n • オンライン（高速）またはオフライン(海外の場合はローミング料金が不要に）どちらでも動作可能です
+\n • ターンバイターンの音声案内（録音された音声と合成音声）が可能です
+\n • 車線案内、道路名、到着予定時刻等の様々なオプションが利用できます
+\n • 旅程上の中間経由地点をサポートしています
+\n • ルートから大きく外れると自動的に再ルート検索します
+\n • 住所別、種類別（例：レストラン、ホテル、ガソリンスタンド、博物館）、または座標の数値で場所を検索可能です</string>
     <string name="osmand_plus_extended_description_part3">"
  マップ表示
  • 現在地と現在の方向を表示できます
@@ -2786,7 +2782,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="srtm_purchase_header">等高線をマップ上で見るには、等高線プラグインの購入とインストールが必要です</string>
     <string name="show_from_zoom_level">表示ズームレベル</string>
     <string name="routing_attr_allow_private_name">専有エリア(私有地など)を通行可とみなす</string>
-    <string name="routing_attr_allow_private_description">専有エリア(業者用通路、私有地など)を通行可能と見なします</string>
+    <string name="routing_attr_allow_private_description">専有エリア(業者用通路、私有地など)を通行可能と見なします。</string>
     <string name="display_zoom_level">表示ズームレベル: %1$s</string>
     <string name="index_item_depth_points_southern_hemisphere">南半球の海洋深度マップ</string>
     <string name="index_item_depth_points_northern_hemisphere">北半球の海洋深度マップ</string>
@@ -2796,7 +2792,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="private_access_routing_req">目的地の位置が専有エリア(私有地)内にあります。専有道路あるいは私道を通ることを許可しますか？</string>
     <string name="quick_action_page_list_descr">アクションボタンをタップすると以下のリスト順にマップスタイルを変更します。</string>
     <string name="nothing_found">見つかりませんでした(´д｀)</string>
-    <string name="nothing_found_descr">検索単語を変更したり、検索の距離を広げてみてください</string>
+    <string name="nothing_found_descr">検索単語を変更したり、検索の距離を広げてみてください。</string>
     <string name="increase_search_radius">検索範囲を広げる</string>
     <string name="restart_search">再検索</string>
     <string name="srtm_color_scheme">配色</string>
@@ -2823,7 +2819,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
  "</string>
     <string name="save_poi_too_many_uppercase">名前に大文字が多すぎます。 続行しますか？</string>
     <string name="shared_string_add_photos">写真を追加</string>
-    <string name="no_photos_descr">この近辺の写真はありません</string>
+    <string name="no_photos_descr">この近辺の写真はありません。</string>
     <string name="online_photos">近隣の写真(要オンライン)</string>
     <string name="mapillary_descr">情報共有のための路上写真です(要オンライン)。新たな場所の発見に、協力しあい、この世界を写真で保存しましょう。</string>
     <string name="improve_coverage_mapillary">Mapillaryにて写真の有効領域を広げましょう</string>
@@ -2834,8 +2830,8 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="mapillary">Mapillary(ストリート写真)</string>
     <string name="mapillary_widget">Mapillaryウィジェット</string>
     <string name="mapillary_image">Mapillary画像</string>
-    <string name="mapillary_action_descr">Mapillaryにて、この場所の路上表示に貢献します</string>
-    <string name="mapillary_widget_descr">Mapillaryへワンタッチ貢献を許可します</string>
+    <string name="mapillary_action_descr">Mapillaryにこの場所のあなた自身の路上写真を投稿します。</string>
+    <string name="mapillary_widget_descr">Mapillaryへのワンタッチ投稿を許可します。</string>
     <string name="plugin_mapillary_descr">皆で共有する路上写真です。新たな場所の発見に、協力しあい、この世界を写真で保存しましょう。</string>
     <string name="shared_string_install">インストール</string>
     <string name="import_gpx_failed_descr">OsmAndは指定したファイルをインポートできません。OsmAndにその場所からファイルを読み取る権限があるか確認して下さい。</string>
@@ -2847,13 +2843,13 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="shared_string_reload">再読み込み</string>
     <string name="mapillary_menu_descr_tile_cache">最新データを見るためにタイルを再読み込みします。</string>
     <string name="mapillary_menu_title_tile_cache">タイルキャッシュ</string>
-    <string name="wrong_user_name">存在しないユーザー名です！</string>
+    <string name="wrong_user_name">存在しないユーザー名です</string>
     <string name="shared_string_to">この日付以前</string>
     <string name="mapillary_menu_date_from">この日付以降</string>
-    <string name="mapillary_menu_descr_dates">指定の期間に追加された画像だけを表示します。</string>
+    <string name="mapillary_menu_descr_dates">指定の期間に追加された画像だけを表示します</string>
     <string name="mapillary_menu_title_dates">日付</string>
     <string name="mapillary_menu_edit_text_hint">ユーザー名を入力</string>
-    <string name="mapillary_menu_descr_username">指定のユーザーに追加された画像だけを表示します。</string>
+    <string name="mapillary_menu_descr_username">指定のユーザーに追加された画像だけを表示します</string>
     <string name="mapillary_menu_title_username">ユーザー名</string>
     <string name="mapillary_menu_filter_description">投稿者と日付で投稿された画像をフィルタリングできます。
 \nマップが一定値以上に拡大された場合のみフィルタは適用されます。</string>
@@ -2879,7 +2875,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="fast_coordinates_input_descr">座標の入力形式を選択します。設定をタップすることでいつでも変更できます。</string>
     <string name="fast_coordinates_input">高速座標入力</string>
     <string name="routing_attr_avoid_ice_roads_fords_name">氷の道、川の浅瀬は避ける</string>
-    <string name="routing_attr_avoid_ice_roads_fords_description">川や貯水池などが凍っている期間のみ通行可能な道、通常ならば渡れる川の浅瀬部分などを避けます</string>
+    <string name="routing_attr_avoid_ice_roads_fords_description">川や貯水池などが凍っている期間のみ通行可能な道、通常ならば渡れる川の浅瀬部分などを避けます。</string>
     <string name="add_location_as_first_point_descr">現在地を最初の地点として追加することでより完璧なルートプランが立てられます。</string>
     <string name="my_location">現在地</string>
     <string name="shared_string_finish">完了</string>
@@ -2890,7 +2886,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="marker_save_as_track_descr">マーカーは以下に指定したファイル名でエクスポートされます:</string>
     <string name="marker_save_as_track">経路を保存</string>
     <string name="move_to_history">履歴に移動</string>
-    <string name="group_will_be_removed_after_restart">グループは再起動後に削除されます</string>
+    <string name="group_will_be_removed_after_restart">グループは再起動後に削除されます。</string>
     <string name="show_guide_line">案内線を表示</string>
     <string name="show_arrows_on_the_map">マップ上に矢印を表示</string>
     <string name="remove_from_map_markers">マップマーカーを削除</string>
@@ -2902,7 +2898,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="do_not_use_animations">描画処理の省略</string>
     <string name="do_not_use_animations_descr">アプリ内画面のアニメーション描写(各モーション)を無効化します。</string>
     <string name="map_orientation_change_in_accordance_with_speed">マップ向きのしきい値</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">マップの向きが「移動方向」から「方位」に切り替わる速度を選択します</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">マップの向きが「移動方向」から「方位」に切り替わる速度を選択します。</string>
     <string name="all_markers_moved_to_history">すべてのマップマーカーを履歴に移動</string>
     <string name="marker_moved_to_history">マップマーカーを履歴に移動させました</string>
     <string name="marker_moved_to_active">マップマーカーをアクティブ化させました</string>
@@ -2990,15 +2986,15 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="tap_on_map_to_hide_interface">フルスクリーンモード</string>
     <string name="live_monitoring_max_interval_to_send">オンライン追跡用のバッファ指定</string>
     <string name="live_monitoring_max_interval_to_send_desrc">送信用現在地データをネット接続せずにどのくらいの時間記録するか、バッファを指定します</string>
-    <string name="release_3_0">\\022 新しい旅行メニュー:インターネットに接続しなくてもWikiVoyage(ウィキボヤージュ)の旅行ガイドを見られるように変更
-\n
-\n• Wikipedia:新しい外見、アクティブリンク、画像の参照
-\n
-\n• 経路の参照UI:経由地点グループの表示
-\n
-\n• マップマーカー:選択した複数GPXファイルからの取り込みに対応、新しい外見の採用
-\n
-\n• OsmAnd LiveサブスクリプションでOsmAndの全ての機能を利用可能に
+    <string name="release_3_0">• 新しい旅行メニュー:インターネットに接続しなくてもWikiVoyage(ウィキボヤージュ)の旅行ガイドを見られるように変更 
+\n 
+\n• Wikipedia:新しい外見、アクティブリンク、画像の参照 
+\n 
+\n• 経路の参照UI:経由地点グループの表示 
+\n 
+\n• マップマーカー:選択した複数GPXファイルからの取り込みに対応、新しい外見の採用 
+\n 
+\n• OsmAnd LiveサブスクリプションでOsmAndの全ての機能を利用可能に 
 \n</string>
     <string name="rendering_attr_hidePOILabels_name">POIのラベル</string>
     <string name="context_menu_read_article">記事を読む</string>
@@ -3026,7 +3022,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="enter_lat_and_lon">緯度と経度を入力してください</string>
 	<string name="optional_point_name">任意の地点名を入力</string>
     <string name="subsequent_dest_description">選択した地点を、最終目的地として設定します</string>
-    <string name="get_osmand_live">OsmAnd Liveに加入すると全ての機能がアンロックされます:毎日更新されるマップを無制限にダウンロード・すべての有料と無料のプラグイン・Wikipedia、Wikivoyageなどの旅行ガイドの利用。</string>
+    <string name="get_osmand_live">OsmAnd Liveに加入すると以下の機能がアンロックされます:毎日更新されるマップを制限なしでダウンロード・有料＆無料プラグイン全ての利用・Wikipedia、Wikivoyageなど旅行ガイドの利用。</string>
     <string name="unirs_render_descr">歩行者と自転車道路のコントラストを強調するようにデフォルトスタイルを変更します。 その際従来のMapnikカラーが適用されます。</string>
     <string name="shared_string_bookmark">ブックマーク</string>
     <string name="hide_full_description">詳しい説明文を非表示</string>
@@ -3041,7 +3037,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="coord_input_add_point">座標の追加</string>
     <string name="coord_input_save_as_track">経路として保存</string>
     <string name="coord_input_save_as_track_descr">%1$sヶ所の座標を追加しました。ファイル名を付けて\"保存\"をタップしてください。</string>
-    <string name="error_notification_desc">この通知画面のスクリーンショットを、support@osmand.netに送信してください。</string>
+    <string name="error_notification_desc">この通知画面のスクリーンショットを、support@osmand.netに送信してください</string>
     <string name="quick_action_edit_actions">アクションの編集</string>
     <string name="clear_all_intermediates">中間経由地点を全て消去</string>
     <string name="add_waypoint">経由地点を追加</string>
@@ -3054,7 +3050,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="empty_state_my_tracks">GPXファイルに追加しよう</string>
     <string name="empty_state_my_tracks_desc">GPXファイルまたは記録した経路からインポートします。</string>
     <string name="import_track">GPXファイルからインポート</string>
-    <string name="access_intermediate_arrival_time">中間経由地点への到着時間</string>
+    <string name="access_intermediate_arrival_time">中間経由地点への到着時刻</string>
     <string name="send_search_query">検索クエリを送信しますか？</string>
     <string name="read_wikipedia_offline_description">OsmAnd Liveサブスクリプションに登録すると、WikipediaとWikivoyageの旅行に関した各記事をオフラインで読むことができます。</string>
     <string name="read_wikipedia_offline">オフラインでWikipedia記事を読む</string>
@@ -3148,7 +3144,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="shared_string_contents">コンテンツ</string>
     <string name="shared_string_result">結果</string>
     <string name="waypoints_removed_from_map_markers">マップマーカーから経由地点を削除しました</string>
-    <string name="nothing_found_in_radius">何も見つかりませんでした:</string>
+    <string name="nothing_found_in_radius">指定距離間内には見つかりませんでした:</string>
     <string name="select_waypoints_category_description">経路内の全ての経由地点を追加する、もしくはカテゴリ別に選択してください。</string>
     <string name="shared_string_total">トータル</string>
     <string name="group_deleted">グループを削除しました</string>
@@ -3248,7 +3244,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="markers_remove_dialog_msg">マップマーカー「%s」を削除しますか？</string>
     <string name="edit_map_marker">マップマーカーの編集</string>
     <string name="third_party_application">サードパーティーアプリ</string>
-    <string name="search_street">道路を検索</string>
+    <string name="search_street">指定エリアの道路を検索</string>
     <string name="start_search_from_city">市街から検索を始める</string>
     <string name="keep_passed_markers_descr">GPX経由地点のマーカーで通過済みのマーカーをグループとしてお気に入りに追加します。それらグループマーカーはアクティブにはならずマップ上から削除されます。</string>
     <string name="keep_passed_markers">通過済みマーカーをマップ上に保持</string>
@@ -3260,4 +3256,6 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="wiki_article_not_found">記事が見つかりませんでした</string>
     <string name="how_to_open_wiki_title">どの方法でWikipedia記事を開きますか？</string>
     <string name="test_voice_desrc">ボタンをタップし対応する音声案内を実際に聞いてみて、欠落しているか間違っている文字列や案内用語を特定します。</string>
-</resources>
+<string name="shared_string_restore">通過前に戻す</string>
+    <string name="map_widget_intermediate_time">中間経由地点までの移動時間</string>
+    </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index deeeb14884..735f2d1a2a 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="offline_navigation_not_available">OsmAnd-ით ნავიგაცია გათიშულ რეჟიმში დროებით მიუწვდომელია.</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="offline_navigation_not_available">OsmAnd-ით ნავიგაცია გათიშულ რეჟიმში დროებით მიუწვდომელია.</string>
   <string name="left_side_navigation">მარცხენა ხელით ტარება</string>
   <string name="left_side_navigation_descr">აირჩიეთ მარცხენა მხარეს საჭის გამომყენებელი ქვეყნებისათვის</string>
   
@@ -1363,4 +1364,31 @@
     <string name="shared_string_edited">ჩასწორებულია</string>
     <string name="shared_string_added">დამატებულია</string>
     <string name="shared_string_action_name">მოქმედების სახელი</string>
-    </resources>
\ No newline at end of file
+    <string name="osm_live_plan_pricing">ფასი</string>
+    <string name="osm_live_payment_monthly_title">თვიური გადასახადი</string>
+    <string name="osm_live_payment_3_months_title">ყოველ 3 თვეში გადახდა</string>
+    <string name="osm_live_payment_annual_title">წელიწადში ერთხელ გადახდა</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s თვეში</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s თვეში</string>
+    <string name="osm_live_payment_discount_descr">დაზოგეთ %1$s !</string>
+    <string name="osm_live_payment_current_subscription">თქვენი მიმდინარე გამოწერა</string>
+    <string name="osm_live_payment_renews_monthly">თვიური განახლება</string>
+    <string name="osm_live_payment_renews_annually">წლიური განახლება</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">აირჩიეთ გადახდის თქვენთვის ხელსაყრელი პერიოდი:</string>
+    <string name="osm_live_payment_contribute_descr">გადასახადის ნაწილი მიედინება OpenStreetMap-ის ავტორებთან.</string>
+    <string name="edit_map_marker">რუკის სანიშნის ჩასწორება</string>
+    <string name="third_party_application">სხვა აპლიკაცია</string>
+    <string name="search_street">ქუჩის ძებნა</string>
+    <string name="start_search_from_city">ქალაქის არჩევა</string>
+    <string name="shared_string_restore">აღდგენა</string>
+    <string name="commiting_way">გზის ატვირთვა…</string>
+    <string name="increase_search_radius_to">ძებნის რადიუსის გაზრდა %1$s-მდე</string>
+    <string name="shared_string_world">სამყარო</string>
+    <string name="point_deleted">წერტილი %1$s წაშლილია</string>
+    <string name="coord_input_edit_point">წერტილის ჩასწორება</string>
+    <string name="coord_input_add_point">წერტილის დამატება</string>
+    <string name="shared_string_bookmark">სანიშნი</string>
+    <string name="hide_full_description">სრული აღწერის დამალვა</string>
+    <string name="show_full_description">სრული აღწერის ჩვენება</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 6340037300..bed5a6585f 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -176,8 +176,15 @@
 	<dimen name="route_info_directions_margin">72dp</dimen>
 	<dimen name="route_info_icon_padding_left">18dp</dimen>
 	<dimen name="route_info_icon_padding_right">24dp</dimen>
-	<dimen name="route_info_divider_margin">66dp</dimen>
 	<dimen name="route_info_modes_height">72dp</dimen>
+	<dimen name="route_info_start_divider_margin">96dp</dimen>
+	<dimen name="route_info_end_divider_margin">84dp</dimen>
+	<dimen name="route_info_list_item_height">72dp</dimen>
+	<dimen name="route_info_buttons_height">54dp</dimen>
+	<dimen name="route_info_details_padding">18dp</dimen>
+	<dimen name="route_info_icon_vertical_padding">9dp</dimen>
+	<dimen name="route_info_settings_buttons_height">48dp</dimen>
+	<dimen name="route_info_app_modes_padding">60dp</dimen>
 
 	<dimen name="multi_selection_header_height">78dp</dimen>
 
diff --git a/OsmAnd/res/values-lt/phrases.xml b/OsmAnd/res/values-lt/phrases.xml
index 49bcedd5c8..caf31f7a1c 100644
--- a/OsmAnd/res/values-lt/phrases.xml
+++ b/OsmAnd/res/values-lt/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_shop">Parduotuvė</string>
 		<string name="poi_shop_food">Maisto parduotuvė ir supermarketas</string>
 	<string name="poi_emergency">Pagalbos tarnybos</string>
@@ -189,7 +189,7 @@
 	<string name="poi_medical_supply">Medicinos priemonės</string>
 	<string name="poi_massage_type">Masažo tipas</string>
 	<string name="poi_washing_machine">Skalbyklė</string>
-	<string name="poi_dish">Valgis</string>
+	<string name="poi_dish">Valgiai</string>
 	<string name="poi_social_facility_type">Tipas</string>
 	<string name="poi_social_facility_for">Tikslinė grupė</string>
 	<string name="poi_vacuum_cleaner_filter">Dulkių siurblys</string>
@@ -234,7 +234,7 @@
 	<string name="poi_railway_station">Geležinkelio stotis</string>
 	<string name="poi_railway_platform">Geležinkelio platforma</string>
 	<string name="poi_subway_entrance">Įėjimas į metro</string>
-	<string name="poi_subway_station">Metro stotis</string>
+	<string name="poi_subway_station">Taip</string>
 	<string name="poi_aerodrome">Oro uostas</string>
 	<string name="poi_runway">Pakilimo juosta</string>
 	<string name="poi_aeroway_terminal">Oro uosto terminalas</string>
@@ -346,7 +346,7 @@
 	<string name="poi_customs">Muitinė</string>
 	<string name="poi_country">Šalis</string>
 	<string name="poi_city">Miestas</string>
-	<string name="poi_capital">Sostinė</string>
+	<string name="poi_capital">Taip</string>
 	<string name="poi_town">Miestelis</string>
 	<string name="poi_village">Kaimas</string>
 	<string name="poi_isolated_dwelling">Vienkiemis</string>
@@ -406,4 +406,4 @@
 	<string name="poi_car">Automobilių pardavėjas</string>
 	<string name="poi_cosmetics">Kosmetika</string>
 	<string name="poi_watches">Laikrodžių parduotuvė</string>
-	</resources>
+	</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 49bfa3a783..612723ee38 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string>
     <string name="shared_location">Bendrinta vieta</string>
@@ -2220,7 +2220,7 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="move_marker_bottom_sheet_title">Slinkite žemėlapį, norėdami pakeisti žymeklio vietą</string>
     <string name="access_direction_audio_feedback">Garsinis krypties indikavimas</string>
     <string name="access_disable_offroute_recalc">Neperskaičiuoti maršruto jei jo nebesekate</string>
-    <string name="access_disable_offroute_recalc_descr">Automatiškai neperskaičiuoja maršruto kai jūs nuo jo nesekate.</string>
+    <string name="access_disable_offroute_recalc_descr">Automatiškai neperskaičiuoti maršruto nuo jo nukrypus.</string>
     <string name="access_disable_wrong_direction_recalc">Neperskaičiuoti maršruto važiuojant priešinga kryptimi</string>
     <string name="access_disable_wrong_direction_recalc_descr">Nevykdyti automatinio maršruto perskaičiavimo, kai jūs judate į priešingą pusę.</string>
     <string name="access_smart_autoannounce">Išmanus autopranešėjas</string>
@@ -2364,7 +2364,7 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="average_speed">Vidutinis greitis</string>
     <string name="shared_string_color">Spalva</string>
     <string name="shared_string_time">Laikas</string>
-    <string name="gpx_add_track">Pridėti GPX failą</string>
+    <string name="gpx_add_track">Pridėti dar…</string>
     <string name="quick_action_item_action">Veiksmas %d</string>
     <string name="quick_action_add_poi">Pridėti LV</string>
     <string name="quick_action_map_style">Pakeisti žemėlapio stilių</string>
@@ -2427,11 +2427,11 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="add_new_folder">Pridėti naują aplanką</string>
     <string name="shared_string_slope">Nuolydis</string>
     <string name="routing_attr_driving_style_speed_name">Trumpesni maršrutai</string>
-    <string name="routing_attr_driving_style_safety_name">Saugus</string>
+    <string name="routing_attr_driving_style_safety_name">Pasirinkti gatvelę</string>
     <string name="shared_string_time_moving">Važiavimo trukmė</string>
     <string name="shared_string_max">Maks.</string>
-    <string name="shared_string_start_time">Išvykimas</string>
-    <string name="shared_string_end_time">Atvykimas</string>
+    <string name="shared_string_start_time">Pradžios laikas</string>
+    <string name="shared_string_end_time">Pabaigos laikas</string>
     <string name="file_can_not_be_moved">Failas negali būti perkeltas.</string>
     <string name="shared_string_move">Perkelti</string>
     <string name="routing_attr_driving_style_name">Vairavimo stilius</string>
@@ -2510,7 +2510,7 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="mapillary_menu_descr_tile_cache">Užkrauti žemėlapio lakštus iš naujo kad pamatytumėte naujus duomenis.</string>
     <string name="mapillary_menu_title_tile_cache">Žemėlapio lakštų talpykla</string>
     <string name="shared_string_to">Iki</string>
-    <string name="mapillary_menu_filter_description">Vaizdus galima filtruoti pagal pateikėją arba pagal datą. Filtrai veikia tik labai priartinus.</string>
+    <string name="mapillary_menu_filter_description">Vaizdus galima filtruoti pagal pateikėją, datą arba tipą. Filtrai veikia tik labai priartinus.</string>
     
     <string name="map_widget_ruler_control">Spindulio liniuotė</string>
     <string name="improve_coverage_install_mapillary_desc">Įdiekite Mapillary jei norite pridėti vieną ar daugiau fotografijų šioje žemėlapio vietoje.</string>
@@ -2561,7 +2561,7 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="total_distance">Bendras atstumas</string>
     <string name="routing_attr_relief_smoothness_factor_name">Pasirinkite aukščio kaitos diapazoną</string>
     <string name="routing_attr_height_obstacles_name">Naudoti aukščio informaciją</string>
-    <string name="routing_attr_height_obstacles_description">Naudoti SRTM, ASTER ir EU-DEM pateikiamus vietovės aukščio duomenis.</string>
+    <string name="routing_attr_height_obstacles_description">Vietovės reljefo faktorius (SRTM, ASTER ir EU-DEM duomenimis).</string>
     <string name="rendering_attr_depthContours_description">Rodyti gylio kontūrus ir taškus.</string>
     <string name="rendering_attr_depthContours_name">Vandenyno gylio kontūrai</string>
     
@@ -2650,20 +2650,20 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
 \n• Įkelkite GPX maršrutus į OSM tiesiai iš programos 
 \n• Pridėkite LV-as ir tiesiogiai jas įkelkite į OSM (arba vėliau, jei neprisijungę)
 \n</string>
-    <string name="osmand_extended_description_part8">"OsmAnd yra atviro kodo ir aktyviai plėtojama. Kiekvienas gali prisidėti prie plėtros pranešdamas apie klaidas, tobulindamas vertimus ar kurdamas naujas funkcijas. Projektas yra  nuolat gerinamas sąveikaujant programuotojamas ir vartotojams. Projekto eiga taip pat priklauso nuo finansinių įnašų paremiant programavimą ir naujų funkcijų testavimą.
+    <string name="osmand_extended_description_part8">OsmAnd yra atviro kodo ir aktyviai plėtojama. Kiekvienas gali prisidėti prie plėtros pranešdamas apie klaidas, tobulindamas vertimus ar kurdamas naujas funkcijas. Projekto eiga taip pat priklauso nuo finansinių įnašų paremiant programavimą ir naujų funkcijų testavimą. 
 \n Apytikslė žemėlapyje aprėptis ir kokybė: 
-\n• Vakarų Europa: *** 
-\n• Rytų Europa: *** 
+\n• Vakarų Europa: ****
+\n• Rytų Europa: ***
 \n• Rusija: *** 
 \n• Šiaurės Amerika: *** 
-\n• Pietų Amerika: ** 
+\n• Pietų Amerika: **
 \n• Azija: ** 
 \n• Japonija ir Korėja: *** 
 \n• Artimieji Rytai: ** 
 \n• Afrika: ** 
 \n• Antarktida: * 
-\nGalima atsisiųsti didžiąją dalį šalių!
-\n Gaukite patikimą navigatorius jūsų šalyje - ar tai būtų Prancūzija, Vokietija, Meksika, Jungtinė Karalystė, Ispanija, Nyderlandai, JAV, Rusija, Brazilija ar kita."</string>
+\nGalima atsisiųsti didžiąją dalį šalių! 
+\n Gaukite patikimą navigatorius jūsų šalyje - ar tai būtų Prancūzija, Vokietija, Meksika, Jungtinė Karalystė, Ispanija, Nyderlandai, JAV, Rusija, Brazilija ar kita.</string>
     <string name="quick_action_navigation_voice">Balso įj/išj</string>
     <string name="quick_action_navigation_voice_off">Balso išjungtas</string>
     <string name="quick_action_navigation_voice_on">Balsas įjungtas</string>
@@ -2891,4 +2891,13 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="map_widget_intermediate_time">Tarpinis laikas</string>
     <string name="empty_state_my_tracks">Pridėti GPX failus</string>
     <string name="download_wikipedia_label">Atsisiųsti Vikipedijos duomenys</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Planas ir kainos</string>
+    <string name="osm_live_payment_monthly_title">Mokėti kas mėnesį</string>
+    <string name="osm_live_payment_3_months_title">Mokėti kas 3-is mėnesius</string>
+    <string name="osm_live_payment_annual_title">Mokėti kartą per metus</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mėnuo</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mėnuo</string>
+    <string name="osm_live_payment_discount_descr">Sutaupyk %1$s!</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="start_search_from_city">Pirmiausiai parinkite miestą</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ml/strings.xml b/OsmAnd/res/values-ml/strings.xml
index b59704ac6f..5c1865d4b9 100644
--- a/OsmAnd/res/values-ml/strings.xml
+++ b/OsmAnd/res/values-ml/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="city_type_district">ജില്ല</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="city_type_district">ജില്ല</string>
     <string name="city_type_neighbourhood">സമീപദേശം</string>
     <string name="map_widget_search">തെരച്ചില്‍</string>
 	<string name="app_mode_bus">ബസ്</string>
@@ -138,8 +139,8 @@
     <string name="navpoint_search_desc">കോര്‍ഡിനേറ്റുകള്‍</string>
     <string name="gpx_visibility_txt">കാഴ്ച</string>
     <string name="gpx_description_txt">വിവരണം</string>
-    <string name="zoomOut">വലിപ്പം കുറക്കുക</string>
-    <string name="zoomIn">വലിപ്പം കൂട്ടുക</string>
+    <string name="zoomOut">ചെറുതാക്കുക</string>
+    <string name="zoomIn">വലുതാക്കുക</string>
     <string name="arrival_distance_factor_normally">സാധാരണ</string>
     <string name="index_name_north_america">വടക്കേ അമേരിക്ക</string>
     <string name="index_name_europe">യൂറോപ്പ്</string>
@@ -187,7 +188,7 @@
     <string name="data_settings">വിവരങ്ങള്‍</string>
     <string name="search_button">തെരച്ചില്‍</string>
     <string name="search_activity">തെരച്ചില്‍</string>
-    <string name="app_mode_bicycle">സൈക്കിള്‍</string>
+    <string name="app_mode_bicycle">സൈക്ളിങ്ങ്</string>
     <string name="position_on_map_center">മദ്ധ്യത്തില്‍</string>
     <string name="search_address_city">നഗരം</string>
     <string name="search_address_street">തെരുവ്</string>
@@ -212,7 +213,7 @@
     <string name="no_waypoints_found">"വഴിത്തിരിവുകളൊന്നും കണ്ടെത്താനായില്ല "</string>
     
     <string name="osm_editors_ranking">ഓ എസ് എം എഡിറ്ററുഡെ റാങ്കിങ്ങ്</string>
-    <string name="osm_live_month_cost_desc">ബിട്കോയിന്‍ പെയ്മെന്റ്</string>
+    <string name="osm_live_month_cost_desc">മാസവരി.</string>
     <string name="select_map_marker">മാപ് മാര്‍ക്കര്‍ തിരഞ്ഞെടുക്കുക</string>
     <string name="map_markers_other">മറ്റു മാര്‍ക്കറുകള്‍</string>
     <string name="shared_string_add_to_map_markers">മാപ്പ് മാര്‍ക്കറില്‍ ചേര്‍ക്കുക</string>
@@ -377,7 +378,7 @@
     <string name="tts_language_not_supported_title">"സപ്പോര്‍ട്ട് ചെയ്യാത്ത ഭാഷ  "</string>
     <string name="gpx_option_destination_point">"നിലവിലെ ലക്ഷ്യസ്ഥാനം ഉപയോഗിക്കുക "</string>
     <string name="choose_audio_stream">വോയിസ് ഗൈഡന്സ് ഔട്ട്പുട്ട്</string>
-    <string name="error_doing_search">ഓഫ് ലൈന്‍ തിരച്ചിലില്‍ പിശകു് ഉണ്ടായിരിക്കുന്നു</string>
+    <string name="error_doing_search">"ഓഫ്‌ലൈന്‍ തെരച്ചില്‍ നടത്താനാകുന്നില്ല "</string>
     <string name="unit_of_length_descr">"ദൂരത്തിന്റെ യൂണിറ്റ് മാറ്റുക "</string>
     <string name="amenity_type_other">മറ്റുളളവ</string>
     <string name="daynight_mode_sensor">ലൈറ്റ് സെന്‍സര്‍</string>
@@ -414,7 +415,7 @@
     <string name="access_direction_haptic_feedback_descr">ലക്ഷ്യബിന്ദുവിലെക്കുള്ള ദിശ തുള്ളിയറിയിക്കുക</string>
     <string name="access_no_destination">"ലക്ഷ്യസ്ഥാനം ഉറപ്പിച്ചിട്ടില്ല "</string>
     <string name="access_disable_offroute_recalc">പാതയില്‍ നിന്നു മാറിയാലും സഞ്ചാരമാര്‍ഗം മാറ്റാതിരിക്കുക</string>
-    <string name="access_disable_offroute_recalc_descr">പാതയില്‍ നിന്നും വളരെ മാറിയാലും പുതിയ റൂട്ട് കണ്ട്പിടിക്കാതിരിക്കുക</string>
+    <string name="access_disable_offroute_recalc_descr">"പാതയില്‍ നിന്നും  മാറിയാലും പുതിയ റൂട്ട് കണ്ട്പിടിക്കാതിരിക്കുക"</string>
     <string name="access_disable_wrong_direction_recalc">സഞ്ചാരദിശ മാറിയാലും റൂട്ട് മാറ്റാതിരിക്കുക</string>
     <string name="access_disable_wrong_direction_recalc_descr">"നിങ്ങള്‍ തെറ്റായ  ദിശയില്‍ പോയാലും പുതിയ റൂട്ട് കണ്ട് പിടിക്കാതിരിക്കുക "</string>
     <string name="access_smart_autoannounce">സമര്‍ത്ഥമായി അനൗണ്‍സ് ചെ</string>
@@ -473,12 +474,12 @@
     <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="avoid_in_routing_descr">"ടോള്‍ റോഡുകള്‍ , ടാര്‍ ചെയ്യാത്ത(പാകാത്ത) റോഡുകള്‍, കടത്ത് .... എന്നിവ ഒഴിവാക്കുക "</string>
     <string name="avoid_toll_roads">ടോള്‍ റോഡുകള്‍ ഒഴിവാക്കുക</string>
     <string name="asap">"സംഭവ്യമായ അത്രയും വേഗതയില്‍ "</string>
     <string name="accessibility_mode">പ്രാപ്യത വിധം</string>
-    <string name="accessibility_mode_descr">പ്രാപ്യത സവിശേഷതകള്‍ സജീവമാക്കുക</string>
-    <string name="accessibility_default">"പൊതുവായ സിസ്റ്റം സജ്ജീകര്ണമനുസരിച്ച് "</string>
+    <string name="accessibility_mode_descr">പ്രാപ്യത സവിശേഷതകള്‍ സജീവമാക്കുക.</string>
+    <string name="accessibility_default">"ആന്‍ഡ്രോയ്ഡ് സിസ്റ്റം സജ്ജീകര്ണമനുസരിച്ച് "</string>
     <string name="accuracy">കൃത്യത</string>
     <string name="altitude">ഉയരം</string>
     <string name="auto_announce_on">തനിയേയുള്ള അനൗണ്സ്മെന്റുകള് തുടങ്ങുക</string>
@@ -509,14 +510,14 @@
     <string name="loading_data">വിവരങ്ങള്‍ നിറച്ചുകൊണ്ടിരിക്കുന്നു…</string>
     <string name="app_settings">ആപ്പ്ളിക്കേഷന്‍ സജ്ജീകരണങ്ങള്‍</string>
     <string name="app_mode_car">കാര്‍</string>
-    <string name="app_mode_pedestrian">കാല്‍നടയാത്രക്കാരന്‍</string>
+    <string name="app_mode_pedestrian">കാല്‍നടയാത്ര</string>
     <string name="add_favorite_dialog_default_favourite_name">താല്‍പര്യമുള്ളവ</string>
-    <string name="add_favorite_dialog_favourite_added_template">താല്‍പര്യ ബിന്ദു \'\'{0}\'\' വിജയകരമായി ചേര്‍ത്തിരിക്കുന്നു.</string>
+    <string name="add_favorite_dialog_favourite_added_template">"താല്‍പര്യ ബിന്ദു \'\'{0}\'\'  ചേര്‍ത്തിരിക്കുന്നു."</string>
     <string name="av_photo_play_sound">ഫോട്ടൊയെടുക്കുമ്പോള്‍ ശബ്ദമുണ്ടാക്കുക</string>
     <string name="av_photo_play_sound_descr">"ഫോട്ടൊയുടെ കൂടെ ശബ്ദം  വേണോ എന്ന് തെരഞ്ഞെടുക്കുക"</string>
     <string name="app_name_osmand">ഓഎസ്എം ആന്റ്</string>
-    <string name="activate_seamarks_plugin">സീമാര്‍ക്ക് പ്ളഗ്-ഇന്‍ സജീവമാക്കുക</string>
-    <string name="activate_srtm_plugin">"എസ്ആര്‍ടിഎം പ്ളഗ്-ഇന്‍ സജീവമാക്കുക "</string>
+    <string name="activate_seamarks_plugin">"ദയവായ് നോട്ടിക്കല്‍ മാപ്പ്  പ്ളഗ്-ഇന്‍ സജീവമാക്കുക"</string>
+    <string name="activate_srtm_plugin">"കോണ്ടൂര്‍ ലൈനുകളുടെ പ്ളഗ് ഇന്‍ സജീവമാക്കുക "</string>
     <string name="edit_filter">വിഭാഗങ്ങള്‍ എഡിറ്റ് ചെയ്യുക</string>
     <string name="delete_filter">ഫില്‍റ്റര്‍ നീക്കം ചെയ്യുക</string>
     <string name="donation_to_osm_desc">"സംഭാവനകളുടെ ഒരു ഭാഗം ഓഎസ്എംആന്റ് -ന്റെ കോണ്ട്രിബ്യൂട് ചെയ്തവര്‍ക്ക് കൊടുക്കുന്നതാണ്. സബ്സ്ക്രിപ്ഷന്‍ വില  മാറ്റമില്ലാതെ തുടരും."</string>
@@ -606,12 +607,12 @@
     <string name="routing_attr_avoid_unpaved_name">" ടാര്‍ ചെയ്യാത്ത(പാകാത്ത) റോഡുകള്‍ ഒഴിവാക്കുക "</string>
     <string name="routing_attr_avoid_unpaved_description">" ടാര്‍ ചെയ്യാത്ത(പാകാത്ത) റോഡുകള്‍ ഒഴിവാക്കുക "</string>
     <string name="routing_attr_avoid_ferries_name">"കടത്ത്  ഒഴിവാക്കുക"</string>
-    <string name="routing_attr_avoid_ferries_description">"കടത്ത്  ഒഴിവാക്കുക"</string>
+    <string name="routing_attr_avoid_ferries_description">കടത്തുവള്ളം ഒഴിവാക്കുക</string>
     <string name="routing_attr_avoid_motorway_name">അതിവേഗപാതകള്‍ ഒഴിവാക്കുക</string>
     <string name="routing_attr_avoid_motorway_description">അതിവേഗപാതകള്‍ ഒഴിവാക്കുക</string>
     <string name="routing_attr_avoid_stairs_name">സ്ടേയര്‍കേസ് ഒഴിവാക്കുക</string>
     <string name="routing_attr_avoid_stairs_description">സ്ടേയര്‍കേസ് ഒഴിവാക്കുക</string>
-    <string name="routing_attr_avoid_borders_description">"വേറോരു രാജ്യത്തെക്കുള്ള അതിര്‍ത്തി കടക്കാതിരിക്കുക "</string>
+    <string name="routing_attr_avoid_borders_description">"രാജ്യാന്തര  അതിര്‍ത്തി മറികടക്കാതിരിക്കുക "</string>
     <string name="routing_attr_weight_description">റൂട്ടില്‍ അനുവദനീയമാണോയെന്നറിയാന്‍ വാഹനത്തിന്റെ ഭാരം ചേര്‍ക്കുക</string>
     <string name="routing_attr_height_description">റൂട്ടില്‍ അനുവദനീയമാണോയെന്നറിയാന്‍ വാഹനത്തിന്റെ ഉയരം ചേര്‍ക്കുക</string>
     <string name="calculate_osmand_route_gpx">റൂട്ട് കണ്ട്പിടിക്കുക (ഓഎസ്എം ആന്റ് ഓഫ് ലൈന്‍ )</string>
@@ -747,7 +748,7 @@
     <string name="download_question">" ഡൗണ്‍ലോഡ് {0} - {1} ?"</string>
     <string name="update_existing">പകരംവെക്കുക</string>
     <string name="follow">വഴികാട്ടി ആരംഭിക്കുക</string>
-    <string name="error_calculating_route">റൂട്ട് കണ്ടെത്തുന്നതില്‍ പിശകുണ്ടായിരിക്കുന്നു</string>
+    <string name="error_calculating_route">"റൂട്ട് കണ്ടെത്താനായില്ല "</string>
     <string name="update_tile">"ഭൂപടം  പരിഷ്ക്കരിക്കുക"</string>
     <string name="choose_building">"കെട്ടിടം തെരഞ്ഞെടുക്കുക "</string>
     <string name="choose_street">"തെരുവ് തെരഞ്ഞെടുക്കുക "</string>
@@ -791,7 +792,7 @@
     <string name="donation_to_osm">"ഓപ്പണ്‍സ്ട്രീറ്റ്മാപ്  സമൂഹത്തിനുള്ള സംഭാവന"</string>
     <string name="osm_live_subscription_desc">സബ്സ്ക്രിപ്ഷന്‍ എടുത്തവര്‍ക്ക് മണിക്കൂര്‍ , ദിന, വാര അപ്ഡേറ്റുകളും ലോകത്തെവിടെയുള്ള മാപ്പുകളും സൗജന്യമായി പരിധിയില്ലാതെ ഡൗണ്‍ലോഡ് ചെയ്യാന്‍ സാധിക്കും.</string>
     <string name="get_it">മനസിലായി</string>
-    <string name="osm_live_banner_desc">പരിധിയില്ലാത്ത ഭൂപട ഡൗണ്‍ലോഡുകളും മണിക്കൂര്‍, ദിന, വാര അപ്ഡേറ്റുകളും വേണം.</string>
+    <string name="osm_live_banner_desc">പരിധിയില്ലാത്ത ഭൂപട ഡൗണ്‍ലോഡുകളും മണിക്കൂര്‍, ദിന, വാര അപ്ഡേറ്റുകളും നേടു.</string>
     <string name="osmand_plus_banner_desc">ഓഎസ്എംആന്റ് സംപൂര്‍ണ പതിപ്പ് പരിധിയില്ലാത്ത ഭൂപട ഡൗണ്‍ലോഡുകളും മാസത്തിലൊരിക്കലുള്ള പരിഷ്കരിച്ച ഭൂപടവുമായി.</string>
     <string name="skip_map_downloading_desc">"ഓഫ്ലൈന്‍ ഭൂപടങ്ങള്‍ ഒന്നും നിങ്ങള്‍ ഇന്സ്റ്റാള്‍ ചെയ്തിട്ടില്ല.  തന്നിരിക്കുന്ന പട്ടികയില്‍ നിന്നും ഒരു ഭൂപടം തെരഞ്ഞെടുക്കുക, അല്ലെങ്കില്‍ മെനുവില്‍ നിന്നു ഭൂപടങ്ങള്‍ പിന്നീട് ഡൗണ്‍ലോഡ് ചെയ്യാവുന്നതാണ് - %1$s."</string>
     <string name="search_another_country">"വേറോരു പ്രദേശം(region) തെരഞ്ഞെടുക്കുക "</string>
@@ -825,11 +826,11 @@
     
     
     
-    <string name="shared_string_move_up">മുകളിലോട്ട് കയറ്റുക</string>
-    <string name="shared_string_move_down">താഴോട്ട് ഇറക്കുക</string>
+    <string name="shared_string_move_up">മുകളിലോട്ട് കയറ്റുക ↑</string>
+    <string name="shared_string_move_down">താഴോട്ട് ഇറക്കുക ↓</string>
     <string name="finish_navigation">"വഴികാട്ടി നിര്‍ത്തുക "</string>
     <string name="recalculate_route">റൂട്ട് വീണ്ടും കണക്കാക്കുക</string>
-    <string name="open_street_map_login_and_pass">ഓപ്പണ്‍സ്ട്രീറ്റ് മാപ്പ് ലോഘിന് പാസ്വോഡ്</string>
+    <string name="open_street_map_login_and_pass">ഓപ്പണ്‍സ്ട്രീറ്റ് മാപ്പ് ഉപയോക്തൃനാമം, പാസ്വോഡ്</string>
     <string name="osm_live_user_public_name">സമൂഹ നാമം</string>
     <string name="download_files_question_space_with_temp">" {0} ഫയല്‍(കള്‍ ) ഡൗണ്‍ലോഡ് ചെയ്യണോ?
  ഇതിനായി തല്‍ക്കാലം  {3} MB യും സ്ഥിരമായി  {1} MB യും ആവശ്യമുണ്ട് .
@@ -897,7 +898,7 @@
     <string name="favorite_category_dublicate_message">നിര്‍ദ്ദിഷ്‌ടമായ ഇനം പേര് നിലവിലുണ്ട്. ദയവായ് വേറൊരു പേര് ഉപയോഗിക്കൂ.</string>
     <string name="regions">പ്രദേശങ്ങള്‍</string>
     <string name="si_nm_h">നോടിക്കല്‍ മൈല്‍ / മണിക്കൂര്‍ (ക്നോട്)</string>
-    <string name="nm_h">നോ. മൈല്‍/മണി</string>
+    <string name="nm_h">നോ. മൈഎല്‍</string>
     <string name="min_mile">മിനു/മൈല്‍</string>
     <string name="min_km">മിനു/കിമി</string>
     <string name="m_s">മീ/സെ.</string>
@@ -1007,7 +1008,7 @@
 
 കുറിപ്പ് 2. ഓഎസ്എംആന്ഡിനും  ഓഎസ്എംആന്ഡ്+നും പുതിയ സംഭരണ സ്ഥലത്ത് ഫയലുകള്‍ പങ്ക്വയ്ക്കാന്‍ പറ്റില്ല."</string>
     <string name="speech_rate">സംസാരത്തിന്റെ തോത്</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="base_world_map">അടിസ്ഥാന ലോക ഭൂപടം</string>
     <string name="clear_destination">ലക്ഷ്യസ്ഥാനങ്ങള്‍ കളയുക</string>
@@ -1081,8 +1082,8 @@
     <string name="error_occurred_loading_gpx">ജിപിഎക്സ് നിറക്കുന്നതില്‍ പിശകുണ്ടായിരിക്കുന്നു</string>
     <string name="download_question_exist">" {0} യുടെ വിവരങ്ങള്‍ ഓഫ് ലൈനായി ഉണ്ട് ({1}). അത്  ({2}) പരിഷ്കരിക്കണോ?"</string>
     <string name="error_occurred_saving_gpx">ജിപിഎക്സ് സംഭരിക്കുന്നതില്‍ പിശകുണ്ടായിരിക്കുന്നു</string>
-    <string name="error_calculating_route_occured">റൂട്ട് കണ്ടെത്തുന്നതില്‍ പിശകുണ്ടായിരിക്കുന്നു</string>
-    <string name="empty_route_calculated">"തെറ്റ്: കണ്ട് പിടിച്ച റൂട്ട് ശൂന്യമാണ് "</string>
+    <string name="error_calculating_route_occured">"റൂട്ട് കണ്ടെത്താനായില്ല "</string>
+    <string name="empty_route_calculated">"കണ്ട് പിടിച്ച റൂട്ട് ശൂന്യമാണ് "</string>
     <string name="favourites_context_menu_edit">താല്‍പര്യമുള്ളവ ക്രമീകരിക്കുക</string>
     <string name="edit_filter_delete_message">"{0} അരിപ്പ (ഫില്‍ട്ടര്‍) നീക്കം ചെയ്തിരിക്കുന്നു "</string>
     <string name="edit_filter_create_message">{0} അരിപ്പക്ക് (ഫില്‍ട്ടര്‍) രൂപം നല്‍കിയിരിയിരിക്കുന്നു</string>
@@ -1101,7 +1102,7 @@
     <string name="dash_download_msg_none">"ഓഫ്ലൈന്‍  ഭൂപടങ്ങള്‍ ഡൗണ്‍ലോഡ് ചെയ്യട്ടെ?"</string>
     <string name="dash_download_msg">നിങ്ങള്‍ %1$s ഭൂപടങ്ങള്‍ ഡൗണ്‍ലോഡ് ചെയ്തു</string>
     <string name="dash_download_manage">നിയന്ത്രിക്കുക</string>
-    <string name="navigate_point_zone">സമയമേഖല</string>
+    <string name="navigate_point_zone">മേഖല</string>
     <string name="map_widget_appearance_rem">ശേഷിക്കുന്ന അംശങ്ങള്‍</string>
     <string name="map_widget_vector_attributes">വരച്ച് കാണിക്കുന്നതിന്റെ (റെണ്ടര്‍)സവിശേഷതകള്‍</string>
     <string name="map_widget_top">സ്ഥിതി പലക</string>
@@ -1151,7 +1152,7 @@
     <string name="native_rendering">സഹജമായ വരച്ച് കാണിക്കല്‍(നേറ്റിവ് റെണ്ടര്‍)</string>
     <string name="no_info">"വിവരമൊന്നുമില്ല "</string>
     <string name="native_library_not_supported">ഈ ഡിവൈസ് നേറ്റിവ് ലൈബ്രറിയെ പിന്തുണയ്ക്കുന്നില്ല.</string>
-    <string name="context_menu_item_search">സമീപത്ത് തെരയുക</string>
+    <string name="context_menu_item_search">സമീപത്തു തിരയുക</string>
     <string name="choose_audio_stream_descr">ശബ്ദ മാര്‍ഗനിര്‍ദേശത്തിനുള്ള ഉച്ചഭാഷിണി തെരഞ്ഞെടുക്കുക</string>
     <string name="map_transparency">അടിസ്ഥാന ഭൂപടത്തിന്റെ സുതാര്യത</string>
     <string name="map_underlay">കീഴ്ഭൂപടം</string>
@@ -1162,7 +1163,7 @@
     <string name="foot">അടി</string>
     <string name="mile">മൈ.</string>
     <string name="context_menu_item_add_waypoint">ജിപിഎക്സ് പാതയില്‍ പാതബിന്ദു ചേര്‍ക്കുക</string>
-    <string name="build_installed">{0}/{1} വിജയകരമായി ഇന്സ്റ്റാള്‍ ചെയതിരിക്കുന്നു ({1}).</string>
+    <string name="build_installed">{0} വിജയകരമായി ഇന്സ്റ്റാള്‍ ചെയതിരിക്കുന്നു ({1}).</string>
     <string name="maps_could_not_be_downloaded">"ഈ ഭൂപടം ഡൗണ്‍ലോഡ് ചെയ്യാനാവില്ല "</string>
     <string name="continuous_rendering">തുടര്‍ച്ചയായി വരച്ച് കാണിക്കുക</string>
     <string name="context_menu_item_search_transport">"പൊതു ഗതാഗത സംവിധാനം തെരയുക "</string>
@@ -1199,7 +1200,7 @@
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="new_version">"പുതിയ പതിപ്പ് "</string>
     <string name="map_viewing_item">ഭൂപടം കാണിക്കുക</string>
-    <string name="contact_us">ഞങ്ങളെ ബന്ധപെടാന്‍</string>
+    <string name="contact_us">"സമ്പര്‍ക്കം "</string>
     <string name="dashboard_or_drawer_title">"മെനുവോ  ഡാഷ് ബോര്‍ഡോ  തീരുമാനം"</string>
     <string name="daily">ദിവസവും</string>
     <string name="shared_string_filters">അരിപ്പകള്‍</string>
@@ -1239,7 +1240,7 @@
     <string name="shared_string_clear">വൃത്തിയാക്കുക</string>
     <string name="shared_string_clear_all">എല്ലാം വൃത്തിയാക്കുക(കളയുക -ക്ളീയര്‍)</string>
     <string name="shared_string_save">സൂക്ഷിക്കുക</string>
-    <string name="shared_string_save_as_gpx">ജിപിഎക്സ് പാതയായ് സൂക്ഷിക്കുക</string>
+    <string name="shared_string_save_as_gpx">"പുതിയ ജിപിഎക്സ്  ഫയലായി സൂക്ഷിക്കുക "</string>
     <string name="shared_string_delete_all">എല്ലാം നീക്കം ചെയ്യുക</string>
     <string name="shared_string_share">പങ്ക് വക്കുക</string>
     <string name="shared_string_apply">പ്രയോഗിക്കുക</string>
@@ -1249,13 +1250,13 @@
     <string name="shared_string_remember_my_choice">എന്റെ താല്‍പര്യം ഓര്‍ത്തിരിക്കുക</string>
     <string name="shared_string_refresh">റീഫ്രെഷ്</string>
     <string name="shared_string_downloading">ഡൌണ്‍ലോഡ്‌ ചെയ്തുകൊണ്ടിരിക്കുന്നു</string>
-    <string name="shared_string_download_successful">" ഡൗണ്‍ലോഡ് വിജകരമായി പൂര്‍ത്തിയായിരിക്കുന്നു "</string>
+    <string name="shared_string_download_successful">ഡൗണ്‍ലോഡ് ചെയ്തവ</string>
     <string name="shared_string_io_error">ഇന്‍പുട്ട്/ഔട്ട്പുട്ട് പിശകുണ്ടായിരിക്കുന്നു</string>
     <string name="shared_string_unexpected_error">"അപ്രതീക്ഷിതമായി  പിശകു് ഉണ്ടായിരിക്കുന്നു"</string>
     <string name="shared_string_action_template">{0} പ്രവര്‍ത്തി</string>
     <string name="shared_string_my_location">"എന്റെ സ്ഥാനം "</string>
     <string name="shared_string_my_places">"എന്റെ സ്ഥലങ്ങള്‍ "</string>
-    <string name="shared_string_my_favorites">എനിക്ക് ഇഷ്ടമുളളവ</string>
+    <string name="shared_string_my_favorites">ഇഷ്ടമുളളവ</string>
     <string name="shared_string_tracks">"എന്റെ  പാതകള്‍"</string>
     <string name="shared_string_audio">ശബ്ദം</string>
     <string name="shared_string_photo">ഫോട്ടോ</string>
@@ -1316,7 +1317,7 @@
     <string name="send_files_to_osm">ജിപിഎക്സ് ഫയലുകള്‍ ഓഎസ്എംലേക്ക് അയയ്ക്കട്ടെ?</string>
     <string name="settings_direction_style">മാര്‍ഗദിശ ശൈലി</string>
     <string name="use_fluorescent_overlays">തിളങ്ങുന്ന മേല്‍പാളികള്‍</string>
-    <string name="local_openstreetmap_settings">"പ്രാദേശികമായി സംഭരിച്ച ഓഎസ്എം പിഓഐ/കുറിപ്പുകള്‍ "</string>
+    <string name="local_openstreetmap_settings">" ഉപകരണത്തില്‍ സംഭരിച്ച ഓഎസ്എം പിഓഐ/കുറിപ്പുകള്‍ "</string>
     <string name="live_monitoring_url_descr">വെബ് വിലാസം നിര്‍ദേശിക്കൂ ;parameter syntax(ഘടക വിന്യാസം ): lat(അക്ഷാംശം)={0}, lon(രേഖാംശം)={1}, timestamp(സമയം)={2}, hdop(തെറ്റ്)={3}, altitude(ഉയരം)={4}, speed(വേഗത)={5}, bearing(ബെയറിങ്ങ്)={6}</string>
     <string name="use_transparent_map_theme">സുതാര്യമായ തീം</string>
     <string name="keep_informing_descr">വഴികാട്ടിയുടെ നി‌ര്‍ദേശങ്ങള്‍ ഇടക്കിടെ വീണ്ടും വിളംബരം ചെയ്യുക</string>
@@ -1328,12 +1329,12 @@
     <string name="search_position_undefined">നിഷ്കര്‍ഷിക്കപെടാത്തത്</string>
     <string name="select_search_position">മൂലസ്ഥാനം:</string>
     <string name="local_index_upload_gpx_description">ഓഎസ്എം കംമ്മ്യൂണിറ്റിക്ക് ജിപിഎക്സ് ഫയലുകള്‍ കയറ്റി അയക്കുക (അപ്ലോഡ്). അവര്‍ക്ക് ഇത് ഭൂപടങ്ങള്‍ മെച്ച്പ്പെടുത്താന്‍ ഉപകരിക്കും.</string>
-    <string name="local_index_items_uploaded">%2$d യില്‍ %1$d യും വിജയകരമായ് കയറ്റിയിരിക്കുന്നു(അപ്ലോഡ്).</string>
+    <string name="local_index_items_uploaded">%2$d യില്‍ %1$d ഇനങ്ങള്‍ വിജയകരമായ് കയറ്റിയിരിക്കുന്നു(അപ്ലോഡ്).</string>
     <string name="show_more_map_detail">"കൂടുതല്‍  ഭൂപടവിവരങ്ങള്‍ കാണിക്കുക"</string>
-    <string name="basemap_missing">"അടിസ്ഥാന ലോകഭൂപടം കാണനില്ല. ഭൂമിയുടെ വിശ്വവിശാലമായ കാഴ്ചക്ക് ദയവായ് World_basemap_x.obf  ഡൗണ്‍ലോഡ് ചെയ്യുക."</string>
-    <string name="local_index_items_backuped">%2$d യില്‍ %1$d യും വിജയകരമായ് നിര്‍ജീവമാക്കിയിരിക്കുന്നു.</string>
-    <string name="local_index_items_deleted">%2$d യില്‍ %1$d യും വിജയകരമായ് നീക്കംചെയ്യപ്പെട്ടിരിക്കുന്നു.</string>
-    <string name="local_index_items_restored">%2$d യില്‍ %1$d യും വിജയകരമായ് സജീവമാക്കിയിരിക്കുന്നു.</string>
+    <string name="basemap_missing">" ഭൂമിയുടെ വിശ്വവിശാലമായ കാഴ്ചക്ക് ദയവായ് World_basemap_x.obf  ഡൗണ്‍ലോഡ് ചെയ്യുക."</string>
+    <string name="local_index_items_backuped">%2$d യില്‍ %1$d ഇനങ്ങള്‍ നിര്‍ജീവമാക്കിയിരിക്കുന്നു.</string>
+    <string name="local_index_items_deleted">%2$d യില്‍ നിന്ന് %1$d വിജയകരമായ് നീക്കംചെയ്യപ്പെട്ടിരിക്കുന്നു.</string>
+    <string name="local_index_items_restored">%2$d യില്‍ %1$d വിജയകരമായ് സജീവമാക്കിയിരിക്കുന്നു.</string>
     <string name="local_index_action_do">" %2$s ഇനങ്ങള്‍ നിങ്ങള്‍  %1$s ചെയ്യാന്‍ പോവുന്നു. തുടരട്ടെ?"</string>
     <string name="local_indexes_cat_backup">നിര്‍ജീവം</string>
     <string name="internet_not_available">ഈ പ്രവര്‍ത്തിക്ക് ഇന്റെര്‍നെറ്റ് കണക്ഷന്‍ ആവശ്യമാണ്, പക്ഷെ ലഭ്യമല്ല</string>
@@ -1354,7 +1355,7 @@
     <string name="search_nothing_found">"ഒന്നും കണ്ടെത്താനായില്ല "</string>
     <string name="searching_address">വിലാസം തെരഞ്ഞുകൊണ്ടിരിക്കുന്നു…</string>
     <string name="search_online_address">ഓണ്‍ലൈനില്‍ തെരയുക</string>
-    <string name="list_index_files_was_not_loaded">ഓഎസ്എംആന്ഡ്.നെറ്റ്(osmand.net) നിന്നും പ്രദേശങ്ങളുടെ(റീജിയന്‍) പട്ടിക പുതുക്കാനായില്ല.</string>
+    <string name="list_index_files_was_not_loaded">ഓഎസ്എംആന്ഡ്.നെറ്റ്(https://osmand.net) നിന്നും പ്രദേശങ്ങളുടെ(റീജിയന്‍) പട്ടിക പുതുക്കാനായില്ല.</string>
     <string name="auth_failed">"പ്രവേശനാനുമതി കിട്ടിയില്ല "</string>
     <string name="use_online_routing_descr">"ഇന്റര്‍നെറ്റ് ഉപയോഗിച്ച്  റൂട്ട്  കണ്ട്പിടിക്കുക "</string>
     <string name="use_online_routing">ഓണ്‍ലൈന്‍ വഴികാട്ടി ഉപയോഗിക്കൂ</string>
@@ -1369,7 +1370,7 @@
     <string name="av_camera_focus_hiperfocal">ഹൈപ്പര്‍ഫോക്കല്‍ ഫോക്കസ്</string>
     <string name="av_camera_focus_infinity">"അനന്തതയിലുള്ള  ഫോക്കസ് "</string>
     <string name="av_camera_pic_size">"ക്യാമറയിലെ പടത്തിന്റെ വലിപ്പം "</string>
-    <string name="show_gpx">ജിപിഎക്സ് കാണിക്കുക</string>
+    <string name="show_gpx">"ജിപിഎക്സ്  വിവരങ്ങള്‍ കാണിക്കുക"</string>
     <string name="update_all">എല്ലാം പരിഷ്കരിക്കട്ടെ (%1$s MB)</string>
     <string name="search_on_the_map_item">"ഭൂപടത്തില്‍ തിരയുന്നു "</string>
     <string name="updates_size">" പരിഷ്ക്കരണത്തിന്റെ വലിപ്പം"</string>
@@ -1421,7 +1422,7 @@
     
     <string name="save_global_track_interval">സാധാരണ റിക്കോഡിങ്ങിന്റെ ഇടവേള</string>
     <string name="save_track_to_gpx_globally">"ജിപിഎക്സ് ഫയലിലോട്ട്  പാത റിക്കോഡ് ചെയ്യുക"</string>
-    <string name="save_current_track">ഇപ്പോഴത്തെ ജിപിഎക്സ് പാത സംഭരിക്കുക</string>
+    <string name="save_current_track">ഇപ്പോഴത്തെ ട്രാക്ക് സംഭരിക്കുക</string>
     <string name="save_track_interval">വഴികാട്ടുമ്പോളുള്ള റിക്കോഡിങ്ങിന്റെ ഇടവേള</string>
     <string name="lang_sw">"സ്വാഹിലി "</string>
     <string name="rendering_attr_hideBuildings_name">കെട്ടിടങ്ങ</string>
@@ -1471,7 +1472,7 @@
     <string name="lang_hu_formal">ഹംഗറിയിലെ (ഫോര്‍മല്‍‌)</string>
     <string name="lang_id">"ഇന്‍ഡോനേഷ്യന്‍ "</string>
     <string name="lang_it">"ഇറ്റാലിയന്‍ "</string>
-    <string name="lang_no">"നോര്‍വീജിയന്‍ "</string>
+    <string name="lang_no">നോര്‍വീജിയന്‍ ബോക്മാല്‍</string>
     <string name="lang_fa">"പേര്‍ഷ്യന്‍ "</string>
     <string name="lang_pl">"പോളീഷ് "</string>
     <string name="lang_pt">"പോര്‍ട്ടുഗീസ് "</string>
@@ -1498,7 +1499,7 @@
     <string name="index_name_us">അമേരിക്കന്‍ ഐക്യനാടുകള്‍</string>
     <string name="index_name_south_america">തെക്കെ അമേരിക്കാ</string>
     <string name="search_position_map_view">നിലവിലെ ഭൂപടത്തിന്റെ മദ്ധ്യസ്ഥാനം</string>
-    <string name="route_successfully_saved_at">\'%1$s\'ആയി സഞ്ചാരപാത വിജയകരമായി സംഭരിച്ചിരിക്കുന്നു.</string>
+    <string name="route_successfully_saved_at">"\'%1$s\'ആയി സഞ്ചാരപാത  സംഭരിച്ചിരിക്കുന്നു."</string>
     <string name="search_osm_offline">" ഭൂമിശാസ്‌ത്രപരമായ സ്ഥാനം തെരയുക "</string>
     <string name="km_h">കി.മീ/മണി.</string>
     <string name="transport_searching_transport">ഗതാഗത പരിണതഫലം(ലക്ഷ്യസ്ഥാനമില്ല):</string>
@@ -1516,7 +1517,7 @@
     <string name="uploading_data">വിവരങ്ങള്‍ അപ്ലോഡ് ചെയ്തുകൊണ്ടിരിക്കുന്നു…</string>
     <string name="searching">തെരഞ്ഞുകൊണ്ടിരിക്കുന്നു…</string>
     <string name="router_service">വഴികാട്ടി സേവനങ്ങള്‍</string>
-    <string name="saving_gpx_tracks">എസ്ഡിയിലേക്ക് ജിപിഎക്സ് പാതകള്‍ സംഭരിക്കുന്നു…</string>
+    <string name="saving_gpx_tracks">" ജിപിഎക്സ് പാതകള്‍ സംഭരിക്കുന്നു…"</string>
     <string name="use_english_names">ഭൂപടങ്ങളില്‍ ഇംഗ്ളീഷ് നാമങ്ങള്‍ ഉപയോഗിക്കുക</string>
     <string name="search_address">വിലാസം തെരയുക</string>
     <string name="show_gps_coordinates_text">" ജിപിഎസ് വിവരങ്ങള്‍ ഭൂപടത്തില്‍ കാണിക്കുക"</string>
@@ -1578,7 +1579,7 @@
     <string name="poi_filter_closest_poi">അടുത്തുള്ള താല്‍പര്യബിന്ദുക്കള്‍ (പിഓഐ)</string>
     <string name="poi_filter_custom_filter">കസ്റ്റം അരിപ്പ</string>
     <string name="poi_filter_namefinder">ഓണ്‍ലൈനില്‍ പേര് തെരയുക</string>
-    <string name="layer_gpx_layer">ജിപിഎക്സ് പാത…</string>
+    <string name="layer_gpx_layer">"ജിപിഎക്സ് ഫയലുകള്‍ "</string>
     <string name="layer_osm_bugs">"ഓണ്‍ലൈനിലുള്ള ഓഎസ്എം കുറിപ്പുകള്‍ "</string>
     <string name="layer_poi">താല്‍പര്യ ബിന്ദു (പി ഓ ഐ )…</string>
     <string name="layer_map">ഭൂപടഉറവിടം…</string>
@@ -1628,7 +1629,7 @@
     <string name="rendering_attr_moreDetailed_name">കൂടുതല്‍ വിവരങ്ങള്‍</string>
     <string name="rendering_attr_lessDetailed_name">കുറച്ച് വിവരങ്ങള്‍</string>
     <string name="shared_string_waypoint">പാതബിന്ദു(വേപോയിന്റ്)</string>
-    <string name="gpx_file_is_empty">ജിപിഎക്സ് പാത ശൂന്യമാണ്</string>
+    <string name="gpx_file_is_empty">"ജിപിഎക്സ്  ഫയല്‍ ശൂന്യമാണ്"</string>
     
     
     
@@ -1662,7 +1663,7 @@
     <string name="osmand_parking_time_limit_title">പാര്‍ക്ക് ചെയ്യാവുന്ന സമയ പരിധി ചൂണ്ടിക്കാണിക്കുക</string>
     <string name="osmand_parking_delete_confirm">പാര്‍ക്കിങ്ങ് സ്ഥാനം അടയാളം നീക്കം ചെയ്യട്ടെ?</string>
     <string name="osmand_parking_lim_text">സമയ പരിമിതം</string>
-    <string name="osmand_parking_no_lim_text">സമയ-അപരിമിതം</string>
+    <string name="osmand_parking_no_lim_text">"സമയ-പരിമിതിയില്ലാത്തത് "</string>
     <string name="osmand_parking_position_description">നിങ്ങളുടെ കാറിന്റെ പാര്‍ക്കിങ്ങ് സ്ഥാനം. %1$s</string>
     <string name="rendering_attr_noPolygons_name">"ബഹുഭുജങ്ങള്‍(പോളിഗണ്‍ ) മറയ്ക്കുക "</string>
     <string name="favourites_search_desc">ഇഷ്ടമുള്ളവ തെരയുക</string>
@@ -1714,7 +1715,7 @@
     <string name="user_hates_app_get_feedback_long">ഈ ആപ്പില്‍ എന്തെങ്കിലും മാറ്റമാവശ്യമെങ്കില്‍ ഞങ്ങളോട് പറയുക.</string>
     <string name="show_free_version_banner_description">"നിങ്ങളുടെ പണം മുടക്കി വാങ്ങിയ  ആപ്പാണെങ്കിലും,സൗജന്യ പതിപ്പിന്റെ അറിയിപ്പുകള്‍ കാണാം"</string>
     <string name="value_downloaded_of_max">"%1$.1f യുടെ  %2$.1f MB"</string>
-    <string name="free_downloads_used_description">ഇതുവരെയുപയോഗിച്ച സൗജന്യ ഡൗണ്‍ലോഡുകള്‍</string>
+    <string name="free_downloads_used_description">"മിച്ചമുള്ള  സൗജന്യ ഡൗണ്‍ലോഡുകള്‍"</string>
 
     <string name="features_menu_group">" സവിശേഷതകള്‍ "</string>
     <string name="first_usage_item_description">എങ്ങിനെയാണ് ഭൂപടം ഡൗണ്‍ലോഡ് ചെയ്യുന്നത്, അടിസ്ഥാന സജ്ജീകരണങ്ങള്‍ ചെയ്യുന്നത്</string>
@@ -1728,7 +1729,7 @@
     <string name="shared_string_paste">ഒട്ടിക്കുക</string>
     <string name="coordinate_input_accuracy_description">"%1$d അക്കങ്ങള്‍ക്ക് ശേഷം തനിയെ അടുത്ത കളത്തിലേക്ക്  പോവുക "</string>
     <string name="coordinate_input_accuracy">%1$d അക്കങ്ങള്‍</string>
-    <string name="go_to_next_field">അടുത്ത കളത്തിലേക്ക് പോവു</string>
+    <string name="go_to_next_field">"അടുത്ത ഫീല്‍ഡ് "</string>
     <string name="rename_marker">"അടയാളത്തിന്റെ പേരുമാറ്റുക "</string>
     
     <string name="mark_passed">"പൂര്‍ണമായതായി അടയാളപ്പെടുത്തുക "</string>
@@ -1774,8 +1775,8 @@
     <string name="shared_string_permissions">അനുമതികള്‍</string>
     <string name="import_gpx_failed_descr">"ഓഎസ്എംആന്‍ഡിന് ഫയല്‍ തുറക്കാനായില്ല. ദയവായ് ഓഎസ്എംആന്‍ഡിന് ആ ഫയല്‍ വായിക്കാനുള്ള അനുമതിയുണ്ട്  എന്ന് ഉറപ്പാക്കുക "</string>
     <string name="distance_moving">ദൂരം (തെറ്റുതിരുത്തിയത് )</string>
-    <string name="improve_coverage_install_mapillary_desc">"നിങ്ങള്‍ക്ക് ഒന്നോ അതിലധികമോ ഫോട്ടോകള്‍ ഭൂപടത്തിലേ സ്ഥലവുമായ് ബന്ദിപ്പിക്കാവുന്നതാണ്. .
-\n
+    <string name="improve_coverage_install_mapillary_desc">"മാപ്പില്ലാരി ഇന്സ്റ്റാള്‍ ചെയ്താല്‍ നിങ്ങള്‍ക്ക് ഒന്നോ അതിലധികമോ ഫോട്ടോകള്‍ ഭൂപടത്തിലേ സ്ഥലവുമായ് ബന്ദിപ്പിക്കാവുന്നതാണ്. . 
+\n 
 \nഅതിനായ്  നിങ്ങള്‍ മാപ്പില്ലാരി ആപ് ഗൂഗിള്‍ പ്ളേ കടയില്‍ നിന്നും ഇന്‍സ്റ്റാള്‍ ചെയ്യണം"</string>
     <string name="online_photos">"ഓണ്‍ലൈന്‍ ഫോട്ടോകള്‍ "</string>
     <string name="shared_string_add_photos">"ഫോട്ടോകള്‍ ചേര്‍ക്കുക "</string>
@@ -1783,11 +1784,11 @@
     <string name="private_access_routing_req">"നിങ്ങളുടെ ലക്ഷ്യസ്ഥാനം പൊതുസ്ഥലമല്ല. ഈ യാത്രയില്‍ സ്വകാര്യ വഴികളില്‍ പ്രവേശിക്കാമോ? "</string>
     <string name="restart_search">"വീണ്ടും തെരയുക "</string>
     <string name="increase_search_radius">"തെരച്ചില്‍ വൃത്തം വലുതാക്കുക "</string>
-    <string name="nothing_found">ഒന്നും കണ്ടെത്താനായില്ല :(</string>
+    <string name="nothing_found">"ഒന്നും കണ്ടെത്താനായില്ല "</string>
     <string name="quick_action_showhide_osmbugs_title">"ഓഎസ് എം കുറിപ്പുകള്‍ (നോട്ട്സ്) കാണിക്കുക/കാണിക്കാതിരിക്കുക "</string>
     <string name="quick_action_osmbugs_show">ഓഎസ് എം കുറിപ്പുകള്‍ (നോട്ട്സ്) കാണിക്കുക</string>
     <string name="quick_action_osmbugs_hide">"ഓഎസ് എം കുറിപ്പുകള്‍ (നോട്ട്സ്) കാണിക്കാതിരിക്കുക "</string>
-    <string name="quick_action_showhide_osmbugs_descr">ഓഎസ് എം കുറിപ്പുകള്‍ (നോട്ട്സ്) കാണാന്‍/കാണാതിരിക്കാന്‍ ആക്ഷന്‍ ബട്ടണ്‍ അമത്തുക</string>
+    <string name="quick_action_showhide_osmbugs_descr">ഓഎസ് എം കുറിപ്പുകള്‍ (നോട്ട്സ്) കാണാന്‍/കാണാതിരിക്കാന്‍ ഈ ആക്ഷന്‍ ബട്ടണ്‍ അമത്തുക</string>
     <string name="sorted_by_distance">"ദൂരക്രമത്തിലടുക്കുക "</string>
     <string name="search_favorites">"താല്‍പര്യമുള്ളവയില്‍ തെരയുക "</string>
     <string name="shared_string_plugin">പ്ളഗ്-ഇന്‍</string>
@@ -1815,7 +1816,7 @@
     <string name="shared_string_time_moving">ഓടിയ സമയം</string>
     <string name="shared_string_time_span">സമയ ദൈര്‍ഖ്യം</string>
     <string name="shared_string_max">"കൂടിയ "</string>
-    <string name="shared_string_start_time">"തുടക്ക സമയം "</string>
+    <string name="shared_string_start_time">പ്രാരംഭ സമയം</string>
     <string name="altitude_descent">ഇറക്കം</string>
     <string name="altitude_ascent">കയറ്റം</string>
     <string name="altitude_range">" ഉയര വ്യത്യാസം"</string>
@@ -1861,4 +1862,236 @@
     <string name="quick_action_add_navigation">ഗതിനിയന്ത്രണം</string>
     <string name="quick_action_bug_message">സന്ദേശം</string>
     <string name="add_route_points">പാതബിന്ദുക്കള്‍ ചേര്‍ക്കു</string>
-    </resources>
\ No newline at end of file
+    <string name="shared_string_restore">പുനഃസ്ഥാപിക്കുക</string>
+    <string name="osm_live_plan_pricing">"വിലവിവരങ്ങൾ "</string>
+    <string name="osm_live_payment_monthly_title">മാസത്തിലൊരിക്കൽ പണമടക്കുക</string>
+    <string name="osm_live_payment_3_months_title">മൂന്നുമാസത്തിലൊരിക്കൽ പണമടക്കുക</string>
+    <string name="osm_live_payment_annual_title">"വര്ഷത്തിലൊരിക്കൽ പണമടക്കുക "</string>
+    <string name="osm_live_payment_month_cost_descr">"പ്റതിമാസം  %1$s"</string>
+    <string name="osm_live_payment_month_cost_descr_ex">"പ്റതിമാസം %1$.2f %2$s "</string>
+    <string name="osm_live_payment_discount_descr">%1$s ലാഭിക്കുക !</string>
+	<string name="osm_live_payment_current_subscription">"നിങ്ങളൂടെ നിലവിലെ വരിസംഖ്യ "</string>
+    <string name="osm_live_payment_renews_monthly">മാസത്തിലൊരിക്കൽ ആവര്‍ത്തിക്കുക</string>
+    <string name="osm_live_payment_renews_quarterly">മൂന്നുമാസത്തിലൊരിക്കൽ ആവര്‍ത്തിക്കുക</string>
+    <string name="osm_live_payment_renews_annually">"വര്‍ഷത്തിലൊരിക്കല്‍ ആവര്‍ത്തിക്കുക "</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">വരിസംഖ്യ അടക്കാനുള്ള ഇടവേള തെരഞ്ഞെടുക്കുക:</string>
+    <string name="osm_live_payment_contribute_descr">"വരുമാനം ഭാഗികമായി ഓപ്പണ്‍സ്ട്രീറ്റ്മാപ്പ്  അംശദാതാവിനാ‌ണ്."</string>
+    <string name="markers_remove_dialog_msg">"മാപ്പ് മാര്‍ക്കര്‍  \'%s\' നീക്കം ചെയ്യട്ടെ\?"</string>
+    <string name="edit_map_marker">മാപ്പ് മാര്‍ക്കര്‍ തിരുത്തുക</string>
+    <string name="third_party_application">അന്യ ആപ്പ്ളിക്കേഷന്‍</string>
+    <string name="search_street">"തെരുവ് തെരയുക "</string>
+    <string name="start_search_from_city">"ആദ്യം നഗരം തെരഞ്ഞെടുക്കുക "</string>
+    <string name="keep_passed_markers_descr">"ഫേവറൈറ്റുകളുടെയോ ജിപിഎക്സ്  വേപോയിന്റുകളൂടെയോ ഗ്രൂപ്പില്‍ ചേര്‍ത്തിട്ടുള്ള മാര്‍ക്കറുകള്‍ മറികടന്നാലും മാപ്പില്‍ കാണിക്കും. ഗ്രൂപ്പ് നിര്‍ജ്ജീവമാണങ്കില്‍, മാര്‍ക്കറുകളൂം അപ്രത്യ്ഷമാകും."</string>
+    <string name="keep_passed_markers">"കടന്നുപോയ മാര്‍ക്കറുകള്‍ മാപ്പില്‍ നിലനിര്‍ത്തുക "</string>
+    <string name="more_transport_on_stop_hint">ഈ സ്ടോപ്പില്‍ ഒന്നിലധികം പൊതുഗതാഗതസംവിധാനം ലഭ്യമാണ് .</string>
+    <string name="ask_for_location_permission">ഓഎസ്എംആന്റിനു തുടരാനായി ദയവായ് ലൊക്കേഷന്‍ അനുമതി നല്കുക.</string>
+    <string name="thank_you_for_feedback">"നിങ്ങളൂടെ  ഫീഡ്ബാക്കിനു നന്ദി "</string>
+    <string name="poi_cannot_be_found">സ്ഥലമോ, വഴിയോ കണ്ടെത്താനായില്ല.</string>
+    <string name="search_no_results_feedback">"തെരച്ചിലില്‍ ഒന്നും കണ്ടെത്തിയില്ലെ\?
+\nദയവായ് നിങ്ങളുടെ ഫീഡ്ബാക്ക്  തരുക"</string>
+    <string name="release_3_2_pre">"ചില ഉപകരണങ്ങളില്‍ തുടക്കത്തിലേ ക്രാഷ് പരിഹരിച്ചു
+\n
+\nപുതിയ മാര്‍ക്കര്‍ ഫീച്ചറുകള്‍ : ഇതുവരെ കടന്നുപോയ മാര്‍ക്കറുകള്‍ കാണിക്കുക 
+\n
+\nതെരച്ചില്‍ ചരിത്രം , നേരത്തെ തെരഞ്ഞ ഇനങ്ങള്‍ കൂടി കാണിക്കും
+\n
+\nലാറ്റിന്‍  ലിപിയല്ലാത്ത മാപ്പുകളില്‍ തുടക്കത്തിലേ ക്രാഷ് പരിഹരിച്ചു
+\n
+\nആന്ഡ്രോയ്ഡ് 8.0 ലെ ഗ്രാഫിക്സ് പെര്‍ഫോമന്‍സ് നന്നാക്കി 
+\n
+\nബഹുഭുജ-വസ്തുക്കള്‍ ക്രമീകരിക്കാം
+\n
+\nദൂരം അളക്കാന്‍: അളക്കാനുള്ള ബട്ടണ്‍ സന്ദര്‍ഭമെനുവിലെ പ്രവര്‍ത്തികളില്‍ ചേര്‍ക്കാം
+\n
+\n
+\n
+\n"</string>
+    <string name="commiting_way">വഴി ഉള്‍പെടുത്തുക…</string>
+    <string name="increase_search_radius_to">"തിരച്ചില്‍  വൃത്തം  %1$s ലേക്ക് കൂട്ടുക "</string>
+    <string name="send_search_query_description">"ഞങ്ങള്‍ നിങ്ങളൂടെ ചോദ്യം:  "<b>\"%1$s\"</b> , നിങ്ങളൂടെ സ്ഥാനം എന്നിവ അയക്കും. <br/><br/> ഞങ്ങള്‍ നിങ്ങളൂടെ പേര്‍സണല്‍ ആയിട്ടുള്ള ഒരു വിവരവും ശേഖരിക്കുന്നില്ല , തെരച്ചില്‍ വിവരങ്ങള്‍ , സേര്‍ച്ച് അല്‍ഗോരിതം നന്നാക്കാനായ് മാത്രമാണ് ഉപയോഗിക്കുന്നത്.<br/></string>
+    <string name="send_search_query">തെരച്ചില്‍ ചോദ്യം അയക്കട്ടെ\?</string>
+    <string name="shared_string_world">ലോകം</string>
+    <string name="point_deleted">"%1$s പോയിന്റ് മായിച്ചിരിക്കുന്നു "</string>
+    <string name="coord_input_edit_point">"പോയിന്റ് എഡിറ്റ് ചെയ്യുക "</string>
+    <string name="coord_input_add_point">"പോയിന്റ്  ചേര്‍ക്കു"</string>
+    <string name="coord_input_save_as_track">"പാതയായ്  സൂക്ഷിക്കുക "</string>
+    <string name="coord_input_save_as_track_descr">"നിങ്ങള്‍ %1$s പോയിന്റുകള്‍ ചേര്‍ത്തിരിക്കുന്നു.  ഒരു ഫയല്‍ നാമം എഴുതി  \"സൂക്ഷിക്കുക\"  ഞെക്കുക "</string>
+    <string name="error_notification_desc">"ദയവായ്  ഈ അറിയിപ്പിന്റെ ഒരു സ്ക്രീന്‍ഷോട്ട് എടുത്ത്  support@osmand.net ലേക്ക് അയക്കു"</string>
+    <string name="quick_action_edit_actions">"പ്രവര്‍ത്തനരീതികള്‍ ക്രമീകരിക്കുക "</string>
+    <string name="get_osmand_live">"എല്ലാ പ്ളഗ്ഗിനുകളും, വിക്കിപ്പീഡിയ, വിക്കിവൊയേജ്, എല്ലാദിവസവും പുതുക്കുന്ന ഭൂപടങ്ങള്‍  നിയന്ത്രണങ്ങളില്ലാതെ ഡൗണ്ലോഡ്  ചെയ്യുക തുടങ്ങിയ   സവിശേഷകള്‍ക്ക്    ഓഎസ്എംആന്‍ഡ്  ലൈവ് നേടുക. "</string>
+    <string name="unirs_render_descr">"ഡീഫാള്‍ട്ട് സ്ടൈല്‍ നവീകരിച്ച്  നടപ്പാതകളൂം സൈക്കിള്‍ പാതകളൂം എടുത്ത് കാണിച്ചിരിക്കുന്നു. മാപ്നിക് കളറൂകളാണ് ഉപയോഗിച്ചിരിക്കുന്നത്. "</string>
+    <string name="shared_string_bookmark">ബുക്ക്മാര്‍ക്ക്</string>
+    <string name="hide_full_description">"പൂര്‍ണ്ണ വിവരണം  മറക്കുക "</string>
+    <string name="show_full_description">"പൂര്‍ണ്ണവിവരങ്ങള്‍  കാണിക്കുക "</string>
+    <string name="open_wikipedia_link_online">വിക്കിപ്പീഡിയ ലേഖനം ഓണ്‍ലൈനില്‍ തുറക്കുക</string>
+    <string name="download_all">എല്ലാം ഡൗണ്‍ലോഡ് ചെയ്യുക</string>
+    <string name="shared_string_restart">"ആപ്പ് റീസ്റ്റാര്‍ട്ട് ചെയ്യുക "</string>
+    <string name="show_images">ഇമേജുകള്‍ കാണിക്കുക</string>
+    <string name="purchase_cancelled_dialog_title">"നിങ്ങള്‍  നിങ്ങളുടെ ഓഎസ് എംആന്റ് ലൈവ്  അംഗത്വം റദ്ചെയ്തിരിക്കുന്നു."</string>
+    <string name="maps_you_need">നിങ്ങള്‍ക്ക് ആവശ്യമുള്ള ഭൂപടങ്ങള്‍</string>
+    <string name="osmand_team">"ഓഎസ്എം ആന്റ്  ടീം"</string>
+    <string name="popular_destinations">ജനപ്രിയ ലക്ഷ്യസ്ഥാനങ്ങള്‍</string>
+    <string name="travel_card_update_descr">"പുതുക്കിയ വിക്കിവോയേജ്  വിവരങ്ങള്‍ ലഭ്യമാണ്,അപ്ഡേറ്റ് ചെയ്യുക  "</string>
+	<string name="travel_card_download_descr">"ലോകത്തെ വിവിധ സ്ഥലങ്ങളെക്കുറിച്ചുള്ള ലേഖനങ്ങള്‍ ഇന്റെര്‍നെറ്റ് ഇല്ലാതെ കാണാന്‍ വിക്കിവൊയേജ് യാത്രസഹായികള്‍ ഡൗണ്‍ലോഡ് ചെയ്യുക "</string>
+	<string name="update_is_available">പുതിയ പതിപ്പ് ലഭ്യമാണ്</string>
+	<string name="download_file">"ഫയല്‍ ഡൗണ്‍ലോഡ് ചെയ്യുക "</string>
+    <string name="start_editing">"എഡിറ്റിങ്ങ് ആരംഭിക്കുക "</string>
+    <string name="shared_string_only_with_wifi">വൈ-ഫൈ യിൽ മാത്രം</string>
+    <string name="shared_string_wifi_only">വൈ-ഫൈ യിൽ മാത്രം</string>
+    <string name="shared_string_contents">ഉള്ളടക്കം</string>
+    <string name="east_abbreviation">കിഴക്ക് (E)</string>
+	<string name="west_abbreviation">പടിഞ്ഞാറ് (W)</string>
+	<string name="south_abbreviation">തെക്ക് (S)</string>
+	<string name="north_abbreviation">വടക്ക് (N)</string>
+	<string name="transport_nearby_routes">"അകത്ത് "</string>
+    <string name="will_open_tomorrow_at">"നാളെ തുറക്കുന്ന സമയം "</string>
+    <string name="parked_at">"പാര്‍ക്ക് ചെയ്ത സമയം "</string>
+    <string name="without_time_limit">"സമയപരിധിയില്ലാത്തത്  "</string>
+    <string name="context_menu_read_full_article">"പൂര്‍ണ്ണ ലേഖനം വായിക്കുക "</string>
+    <string name="context_menu_read_article">"ലേഖനം വായിക്കുക "</string>
+    <string name="open_from">"ആരംഭിച്ച് "</string>
+    <string name="open_till">"പ്രവര്‍ത്തന സമയം "</string>
+    <string name="will_close_at">"അടക്കുന്ന സമയം "</string>
+    <string name="will_open_at">തുറക്കുന്ന സമയം</string>
+    <string name="will_open_on">തുറക്കുന്ന സമയം</string>
+    <string name="shared_string_marker">"മാര്‍ക്കര്‍ "</string>
+    <string name="shared_string_deleted">"നീക്കം ചെയ്തത് "</string>
+    <string name="shared_string_edited">"തിരുത്തിയത് "</string>
+    <string name="empty_state_av_notes">"കുറിപ്പെഴുതുക! "</string>
+    <string name="by_date">ദിനം</string>
+    <string name="by_type">ഇനം</string>
+    <string name="appearance_on_the_map">"മാപ്പിലെ ആകാരം "</string>
+    <string name="empty_state_markers_active">"മാപ്പ്  മാര്‍ക്കര്‍ നിര്‍മ്മിക്കുക"</string>
+    <string name="distance_indication_descr">ആക്ടീവ് മാര്‍ക്കറിലേക്കുള്ള ദൂരം കാണിക്കുന്ന വിധം തെരഞ്ഞെടുക്കുക</string>
+    <string name="coordinate_input">"കോഓര്‍ഡിനേറ്റ്  ഇന്‍പുട്ട് "</string>
+    <string name="ascendingly">"മുകളിലോട്ട് "</string>
+    <string name="date_added">"തിയതി ചേര്‍ത്തിരിക്കുന്നു "</string>
+    <string name="analyze_on_map">"ഭൂപടത്തില്‍   വിശകലനം ചെയ്യുക "</string>
+    <string name="add_new_folder">പുതിയ ഫോള്‍ഡര്‍ ചേര്‍ക്കുക</string>
+    <string name="shared_string_time">സമയം</string>
+    <string name="gpx_no_tracks_title">"ജിപിഎക്സ്  ഫയലുകളൊന്നും നിങ്ങളുടെയടുത്തില്ല "</string>
+    <string name="gpx_no_tracks_title_folder">"നിങ്ങള്‍ക്ക്  ജിപിഎക്സ് ഫയലുകളും ഫോള്‍ഡറില്‍ ചേര്‍ക്കാം"</string>
+    <string name="rendering_value_black_name">കറുപ്പ്</string>
+    <string name="copying_osmand_file_failed">"ഫയലുകള്‍ കോപ്പിചെയ്യുന്നത്  പരജയപ്പെട്ടിരിക്കുന്നു "</string>
+    <string name="ascent_descent">"മുകളിലോട്ട് /താഴോട്ട് "</string>
+    <string name="local_openstreetmap_uploading">വിവരങ്ങള്‍ അപ്ലോഡ് ചെയ്തുകൊണ്ടിരിക്കുന്നു…</string>
+    <string name="amenity_type_geocache">"ജിയോകാച്ചേ "</string>
+    <string name="update_poi_is_not_available_for_zoom">പിഓഐകള്‍ പുതുക്കുന്നതനുവദിക്കാന്‍ വലുതാക്കു</string>
+    <string name="count_of_lines">വരികളുടെ എണ്ണം</string>
+    <string name="quick_action_map_source_title">ഭൂപടഉറവിടങ്ങള്‍</string>
+    <string name="quick_action_map_source_action">ഭൂപട ഉറവിടം ചേര്‍ക്കു</string>
+    <string name="quick_action_map_source_switch">"\"%s\" ലേക്ക്  ഭൂപട ഉറവിടം മാറ്റിയിരിക്കുന്നു "</string>
+    <string name="quick_action_btn_tutorial_title">ബട്ടണിന്റെ സ്ഥാനം മാറ്റുക</string>
+    <string name="quick_action_btn_tutorial_descr">"ബട്ടണിന്റെ അമര്‍ത്തി വലിച്ചാല്‍  അതിന്റെ സ്ഥാനം മാറും  "</string>
+    <string name="shared_string_action_name">പ്ര‌വൃത്തിയുടെ പേ</string>
+    <string name="mappilary_no_internet_desc">മാപ്പില്ലാരിയിലേ ചിത്രങ്ങള്‍ കാണാന്‍ ഇന്റെര്‍നെറ്റ് ആവശ്യമാണ്.</string>
+    <string name="retry">വീണ്ടും ശ്രമിയ്ക്കുക</string>
+    <string name="add_waypoint">"പാതബിന്ദു ചേര്‍ക്കുക "</string>
+    <string name="save_gpx_waypoint">ജിപിഎക്സ് പോയിന്റ് ചേര്‍ക്കുക</string>
+    <string name="save_route_point">"റൂട്ട് പോയിന്റ് സൂക്ഷിക്കുക "</string>
+    <string name="waypoint_one">വേപോയിന്റ് 1</string>
+    <string name="route_point_one">റൂട്ട് പോയിന്റ് 1</string>
+    <string name="empty_state_my_tracks">"ജിപിഎക്സ് ഫയലുകള്‍  ചേര്‍ക്കു"</string>
+    <string name="empty_state_my_tracks_desc">"ജിപിഎക്സ്  ഫയലുകള്‍ ഇംപോര്‍ട്ടോ  , ട്രാക്കുകള്‍ റിക്കോ ചെയ്യുക"</string>
+    <string name="empty_state_favourites">ഫേവറൈറ്റുകള്‍ ചേര്‍ക്കു</string>
+    <string name="total_donations">"ആകെ സംഭാവനകള്‍ "</string>
+    <string name="day_off_label">ഓഫ്</string>
+    <string name="winter_and_ski_renderer">"വിന്റെര്‍ ആന്‍ഡ് സ്കീ "</string>
+    <string name="touring_view_renderer">ടൂറിങ്ങ് വ്യൂ</string>
+    <string name="nautical_renderer">നോട്ടിക്കല്‍</string>
+    <string name="copy_location_name">"പോയിന്റ്/പിഓഐ യുടെ പേര് കോപ്പി ചെയ്യുക "</string>
+    <string name="show_tunnels">"തുരങ്കങ്ങള്‍ "</string>
+    <string name="download_wikipedia_description">%1$s വിക്കിപീഡിയ ലേഖനങ്ങള്‍ ഓഫ്ലൈനില്‍ വായിക്കാനായ് ഡൗണ്‍ലോഡ് ചെയ്യു</string>
+    <string name="download_wikipedia_label">"വിക്കിപ്പീഡിയ വിവരങ്ങള്‍ ഡൗണ്‍ലോഡ്  ചെയ്യുക "</string>
+    <string name="open_in_browser_wiki">"പൂര്‍ണ്ണ ലേഖനം ഓണ്‍ലൈനില്‍ വായിക്കുക "</string>
+    <string name="open_in_browser_wiki_description">"വെബ് ബ്റൗസറില്‍ ലേഖനം കാണുക  "</string>
+    <string name="download_wiki_region_placeholder">ഈ പ്രദേശം</string>
+    <string name="wiki_article_search_text">"സമാനമായ വിക്കിലേഖനം തെരയുന്നു "</string>
+    <string name="wiki_article_not_found">"ലേഖനം   കണ്ടെത്താനായില്ല "</string>
+    <string name="how_to_open_wiki_title">വിക്കിപ്പീഡിയ ലേഖനം എങ്ങനെ തുറക്കാം</string>
+    <string name="osm_live_subscriptions">സബ്സ്ക്രിപ്ഷനുകള്‍</string>
+    <string name="powered_by_osmand">പവേര്‍ഡ് ബൈ ഓഎസ്എംആന്‍ഡ്</string>
+    <string name="release_3_1">"നാവിഗേഷന്‍: പ്രോഗ്രസ് ബാര്‍ ശരിയാക്കി, റൂട്ടിന്റെ തുടക്കവും ഒടുക്കവും വേഗത്തില്‍ തിരിച്ചിടാം 
+\n
+\nമാപ്പ് മാര്‍ക്കറുകള്‍: ഗ്രൂപ്പ് ഓണ്‍/ഓഫ് ശരിയാക്കി, മാര്‍ക്കറുകള്‍ മറയ്ക്കാനാവും 
+\n
+\nഓഎസ്എം തിരുത്തലുകള്‍: വഴികളും മറ്റു വസ്തുക്കളും ചേര്‍ക്കാം , കുറിപ്പുകളില്‍ കമന്റുകള്‍ ചേര്‍ക്കാം, തിരുത്തുകള്‍ക്ക് ബാക്ക് അപ്പ് 
+\n
+\nവിക്കിപ്പീഡിയ, വിക്കിവോയേജ്  എന്നിവയുടെ പ്രവര്‍ത്തനങ്ങള്‍ മെച്ചപ്പെടുത്തിയിരിക്കുന്നു , പുതുക്കിയ ഫയലുകള്‍ ലഭ്യമാണ് 
+\n
+\nകോന്റെക്സ്ട് മെനു: ട്രാന്സ്പോര്‍ട്ട് ഷീല്‍ഡ് കളര്‍ രാത്രിക്കാഴ്ചക്കായ് ശരിപ്പെടുത്തിയിരിക്കുന്നു, കൂടുതല്‍ മെനു സൈസ്  ചേര്‍ത്തിരിക്കുന്നു
+\n
+\nബോട്ട് നാവിഗേഷന്‍: മെച്ചപ്പെടുത്തിയിരിക്കുന്നു 
+\n
+\nമറ്റു ബഗ് ഫിക്സുകള്‍ 
+\n"</string>
+    <string name="off_road_render_descr">❢</string>
+    <string name="read_wikipedia_offline_description">"വിക്കിപീഡിയയും വിക്കിവൊയേജ് ലേഖനങ്ങള്‍ ഓഫ്ലൈനായ് വായിക്കാന്‍ ഓഎസ്എം ആന്‍ഡ് ലൈവ്  വരിക്കാരനാവുക."</string>
+    <string name="how_to_open_link">ലിങ്ക് എങ്ങനെ തുറക്കണം\?</string>
+    <string name="read_wikipedia_offline">വിക്കിപീഡിയ ഓഫ്ലൈനായ് വായിക്കുക</string>
+    <string name="purchase_cancelled_dialog_descr">എല്ല സവിശേഷതകളും ലഭ്യമാകാന്‍ സബ്സ്ക്റിപ്ഷന്‍ പുതുക്കുക:</string>
+    <string name="maps_you_need_descr">"നിങ്ങള്‍ ബുക്ക്മാര്‍ക്ക്  ചെയ്തിരിക്കുന്നതിനെ ആസ്പദമാക്കി  താഴെതന്നിരിക്കുന്ന മാപ്പുകള്‍ ഡൗണ്‍ലോഡ്  നിര്‍ദേശിച്ചിരിക്കുന്നു:     "</string>
+    <string name="paid_app">"പെയ്ഡ് ആപ്പ് "</string>
+    <string name="paid_plugin">"പെയ്ഡ് പ്ളഗ്ഗിന്‍ "</string>
+    <string name="unlimited_downloads">"പരിധിയില്ലാത്ത  ഡൌണ്‍ലോഡുകള്‍"</string>
+    <string name="wikipedia_offline">ഓഫ്‌ലൈന്‍ വിക്കിപീഡിയ</string>
+    <string name="shared_string_travel_book">യാത്റ പുസ്തകം</string>
+    <string name="delete_search_history">"തെരച്ചിലിന്റെ നാള്‍വഴി മായിച്ചു കളയുക "</string>
+    <string name="download_images">"പടങ്ങള്‍ ഡൗണ്‍ലോഡ് ചെയ്യുക "</string>
+    <string name="download_maps_travel">"യാത്റാ സഹായികള്‍ "</string>
+    <string name="shared_string_wikivoyage">"വിക്കി വൊയേജ് "</string>
+    <string name="article_removed">"ലേഖനം നീക്കം ചെയ്തിരിക്കുന്നു "</string>
+    <string name="wikivoyage_search_hint">"തെരയുക : രാജ്യം, നഗരം , സംസ്ഥാനം "</string>
+    <string name="shared_string_read">"വായിക്കുക "</string>
+    <string name="saved_articles">ബുക്ക് മാര്‍ക്ക് ചെയ്തിട്ടുള്ള ലേഖനങ്ങള്‍</string>
+    <string name="shared_string_explore">"തെരയുക "</string>
+    <string name="shared_string_result">"ഫലം "</string>
+    <string name="shared_string_travel_guides">"യാത്റാ സഹായികള്‍  "</string>
+    <string name="shared_string_total">മൊത്തം</string>
+    <string name="enter_lon">"രേഖാംശം ചേര്‍ക്കുക "</string>
+    <string name="enter_lat">"അക്ഷാംശം ചേര്‍ക്കുക "</string>
+    <string name="enter_lat_and_lon">"അക്ഷാംശവും രേഖാംശവും ചേര്‍ക്കുക "</string>
+    <string name="dd_mm_ss_format">"ഡിഡി°എംഎം\' എസ്എസ്\'\' "</string>
+    <string name="dd_dddddd_format">ഡിഡി.ഡിഡിഡിഡിഡിഡി°</string>
+    <string name="dd_ddddd_format">ഡിഡി.ഡിഡിഡിഡിഡി°</string>
+    <string name="dd_mm_mmmm_format">"ഡിഡി°എംഎം.എംഎംഎംഎം\' "</string>
+    <string name="dd_mm_mmm_format">"ഡിഡി°എംഎം.എംഎംഎം\' "</string>
+    <string name="shared_string_current">ഇപ്പോഴത്തേത്</string>
+    <string name="last_intermediate_dest_description">"ഇടലക്ഷ്യസ്ഥാനം ചേര്‍ക്കുക "</string>
+    <string name="additional_actions">കൂടുതല്‍ പ്രവര്‍ത്തികള്‍</string>
+    <string name="one_tap_active">ഒറ്റ ഞെക്കില്‍ അക്ടീവാക്കുക</string>
+    <string name="notes_by_date">"കുറിപ്പുകള്‍ ദിനമനുസരിച്ച് "</string>
+    <string name="looking_for_tracks_with_waypoints">വേ പോയിന്റുകളുള്ള പാതകള്‍ തെരയുന്നു</string>
+    <string name="add_track_to_markers_descr">മാര്‍ക്കറാക്കാനുള്ള വേപോയിന്റുകളുള്ള പാത തിരഞ്ഞെടുക്കുക.</string>
+    <string name="add_favourites_group_to_markers_descr">"മാര്‍ക്കറിലേക്ക് ചേര്‍ക്കാനായുള്ള  ഫേവറൈറ്റുകളുടെ ഇനം തിരഞ്ഞെടുക്കുക."</string>
+    <string name="shared_string_gpx_waypoints">വേപോയിന്റ് ട്രാക്ക് ചെയ്യു</string>
+    <string name="favourites_group">"ഫേവറൈറ്റുകളുടെ ഇനം "</string>
+    <string name="routing_attr_avoid_ice_roads_fords_name">"മഞ്ഞിലുള്ള (ice) റോഡുകള്‍, കടത്തുകള്‍ (ford) എന്നിവ ഒഴിവാക്കുക "</string>
+    <string name="routing_attr_avoid_ice_roads_fords_description">"മഞ്ഞിലുള്ള (ice) റോഡുകളും  കടത്തുകളും (ford)  ഒഴിവാക്കുക "</string>
+    <string name="use_location">സ്ഥാനം ഉപയോഗിക്കു</string>
+    <string name="shared_string_gpx_tracks">"ജിപിഎക്സ്  പാതകള്‍"</string>
+    <string name="osmand_plus_extended_description_part8">"മാപ്പിന്റെ ഏകദേശ വ്യാപ്തിയും നിലവാരവും:
+\n. പടിഞ്ഞാറന്‍ യൂറോപ്പ് : ****
+\n .കിഴക്കന്‍ യൂറോപ്പ്  : ***
+\n.റഷ്യ: ***
+\n. വടക്കേ അമേരിക്ക: *** 
+\n. തെക്കേ അമേരിക്ക:**
+\n. ഏഷ്യ: **
+\n. ജപ്പാന്‍ &amp; കൊറിയ :***
+\n. ഗള്‍ഫ് : **
+\n. ആഫ്റിക്ക : **
+\n. അന്റാര്‍ട്ടിക്ക:*
+\nഅഫ്ഗാനിസ്ഥാന്‍ തുടങ്ങി സിംബാവേ വരെ ലോകത്തെ മിക്കവാറും എല്ലാ രാജ്യങ്ങളുടെ ഭൂപടങ്ങളും ഡൗണ്‍ലോഡ് ചെയ്യാനായ് ലഭ്യമാണ്, ഇന്ത്യ, അമേരിക്ക , ആസ്ട്രേലിയ, ഫ്രാന്‍സ്, റഷ്യ, ഇംഗ്ളണ്ട്  , സ്പെയ്ന്‍, ......   
+\n"</string>
+    <string name="recalculate_route_to_your_location">ഗതാഗത രീതി:</string>
+    <string name="show_lanes">ലേനുകള്‍</string>
+    <string name="int_continuosly">തുടരെയുളള</string>
+    <string name="screen_is_locked">ലോക്ക് ബട്ടണില്‍ ഞെക്കി തുറക്കുക</string>
+    <string name="osmand_parking_event">കാര്‍ പാര്‍ക്ക് ചെയ്ത സ്ഥാനത്ത് നിന്ന് കൂട്ടു</string>
+    <string name="osmand_parking_add_event">"കലണ്ടറില്‍ നോട്ടിഫിക്കേഷന്‍ ചേര്‍ക്കുക "</string>
+    <string name="osmand_parking_am">ഏഎം</string>
+    <string name="gpxup_identifiable">"തിരിച്ചറിയാവുന്ന "</string>
+    <string name="gpxup_trackable">"പിന്തുടരാവുന്ന "</string>
+    <string name="route_roundabout">"റൗണ്ടാന: %1$d പുറത്തേക്കുള്ള വഴി എടുത്ത് പോവുക "</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-nb/phrases.xml b/OsmAnd/res/values-nb/phrases.xml
index 6b1986e0e3..aacb4f60be 100644
--- a/OsmAnd/res/values-nb/phrases.xml
+++ b/OsmAnd/res/values-nb/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_shop">Butikk</string>
 	<string name="poi_attraction">Turistattraksjon</string>
 	<string name="poi_viewpoint">Utsiktspunkt</string>
@@ -1334,4 +1334,26 @@
 	<string name="poi_checkpoint_type_code">Kode</string>
 	<string name="poi_checkpoint_type_notebook">Notatbok</string>
 	<string name="poi_ford">Vadested</string>
-	</resources>
+    <string name="poi_glacier_type">Isbretype</string>
+    <string name="poi_substation_type">Type</string>
+    <string name="poi_books_type">Bøker</string>
+    <string name="poi_office_administrative">Administrativt kontor</string>
+    <string name="poi_estate_agent">Eiendomsmegler</string>
+    <string name="poi_attraction_big_wheel">Pariserhjul</string>
+    <string name="poi_attraction_roller_coaster">Berg og dalbane</string>
+    <string name="poi_attraction_slide">Rutsjebane</string>
+    <string name="poi_attraction_summer_toboggan">Sommeraking</string>
+    <string name="poi_attraction_swing_carousel">Tivolikarusell</string>
+    <string name="poi_attraction_train">Tog (attraksjon)</string>
+    <string name="poi_attraction_water_slide">Vannrutsjebane</string>
+    <string name="poi_hostel">Vandrehjem</string>
+    <string name="poi_motel">Motell</string>
+    <string name="poi_alpine_hut">Alpehytte</string>
+    <string name="poi_religion_sikh">Sikhisme</string>
+    <string name="poi_religion_shinto">Shintōisme</string>
+    <string name="poi_religion_jain">Jainisme</string>
+    <string name="poi_religion_bahai">Bahai</string>
+    <string name="poi_religion_scientologist">Scientologi</string>
+    <string name="poi_religion_pagan">Paganisme</string>
+    <string name="poi_denomination_jehovahs_witness">Jehovas vitner</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 6d033cc0e6..e36c015929 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string>
     <string name="rendering_attr_roadColors_name">Veifargeskjema</string>
@@ -221,7 +221,7 @@
     
     <string name="pref_raster_map">Kartkilde-innstillinger</string>
     <string name="pref_vector_map">Vektorkart-innstillinger</string>
-    <string name="delete_confirmation_msg">Slette %1$s?</string>
+    <string name="delete_confirmation_msg">Slett %1$s\?</string>
     <string name="city_type_suburb">Bydel</string>
     <string name="city_type_hamlet">Grend</string>
     <string name="city_type_village">Landsby</string>
@@ -543,13 +543,13 @@
     <string name="add_favorite_dialog_favourite_added_template">Favorittpunkt \'\'{0}\'\' er lagt til.</string>
     <string name="favourites_context_menu_edit">Rediger favoritt</string>
     <string name="favourites_context_menu_delete">Slett favoritt</string>
-    <string name="favourites_remove_dialog_msg">Slette favorittpunkt \'%s\'?</string>
-    <string name="favourites_remove_dialog_success">Favorittpunkt {0} er slettet.</string>
+    <string name="favourites_remove_dialog_msg">Slett favorittpunkt \'%s\'\?</string>
+    <string name="favourites_remove_dialog_success">Favorittpunkt {0} slettet.</string>
     
     <string name="osb_comment_dialog_message">Melding</string>
     <string name="poi_edit_title">Rediger interessepunkt</string>
     <string name="poi_create_title">Opprett interessepunkt</string>
-    <string name="poi_remove_confirm_template">Slette {0} (kommentar)?</string>
+    <string name="poi_remove_confirm_template">Slett {0} (kommentar)\?</string>
     <string name="poi_remove_title">Slett interessepunkt</string>
     <string name="poi_remove_success">Interessepunkt slettet</string>
     <string name="poi_action_add">legg til</string>
@@ -562,7 +562,7 @@
     <string name="filter_current_poiButton">Filter</string>
 
     <string name="edit_filter_save_as_menu_item">Lagre som</string>
-    <string name="edit_filter_delete_dialog_title">Slette valgte filter?</string>
+    <string name="edit_filter_delete_dialog_title">Slett valgte filter\?</string>
     <string name="edit_filter_delete_message">Filter {0} har blitt slettet</string>
     <string name="edit_filter_create_message">Filter {0} har blitt opprettet</string>
 
@@ -709,7 +709,7 @@
     <string name="show_zoom_buttons_navigation">Vis zoom-knapper</string>
     <string name="map_widget_plain_time">Nåtid</string>
     <string name="osmo_edit_color">Visningsfarge</string>
-    <string name="always_center_position_on_map">Vis posisjon alltid i midten</string>
+    <string name="always_center_position_on_map">Sentrer posisjon på kart</string>
     <string name="guidance_preferences_descr">Navigeringsinnstillinger</string>
     <string name="routing_preferences_descr">Ruteplanleggingsinnstillinger</string>
     <string name="rendering_attr_noAdminboundaries_name">Grenser</string>
@@ -1292,7 +1292,7 @@
     <string name="av_camera_pic_size_descr">Velg bildestørrelsen for det interne kameraet.</string>
     <string name="action_create">Aksjon opprette</string>
     <string name="action_modify">Aksjon endre</string>
-    <string name="action_delete">Aksjon slette</string>
+    <string name="action_delete">Slettingshandling</string>
     <string name="drawer">Flat liste</string>
     <string name="shared_string_export">Eksporter</string>
     <string name="shared_string_collapse">Fold sammen</string>
@@ -1447,7 +1447,7 @@
     <string name="access_from_map">Tilgang fra kart</string>
     <string name="show_on_start">Vis ved start</string>
     <string name="copied_to_clipboard">Kopiert til utklippstavle</string>
-    <string name="context_menu_item_delete_waypoint">Slette GPX-rutepunkt?</string>
+    <string name="context_menu_item_delete_waypoint">Slett GPX-rutepunkt\?</string>
     <string name="context_menu_item_edit_waypoint">Rediger GPX-rutepunkt</string>
     <string name="lang_nds">Lavtysk</string>
     <string name="lang_mk">Makedonsk</string>
@@ -2157,7 +2157,7 @@
     <string name="quick_action_map_overlay_switch">Kartoverlegget er endret til \"%s\".</string>
     <string name="points_delete_multiple_succesful">Punkt(er) slettet.</string>
     <string name="points_delete_multiple">Du skal slette %1$d punkt(er). Er du sikker?</string>
-    <string name="average_speed">Gjennomsnittshastighet</string>
+    <string name="average_speed">Gjennomsnittsfart</string>
     <string name="select_gpx_folder">Velg mappe for GPX-fil</string>
     <string name="osmand_extended_description_part1">OsmAnd (OSM Automated Navigation Directions) er et kart- og navigeringsprogram med tilgang til gratis, verdensomspennende og høykvalitets data fra OpenStreetMap (OSM).
 \n
@@ -2227,7 +2227,7 @@
     <string name="altitude_descent">Fall</string>
     <string name="altitude_ascent">Stigning</string>
     <string name="altitude_range">Høydeintervall</string>
-    <string name="average_altitude">Gjennomsnittshøyde</string>
+    <string name="average_altitude">Gjennomsnittlig høyde</string>
     <string name="route_head">Følg</string>
     <string name="shared_string_action_name">Handlingsnavn</string>
 <string name="display_zoom_level">Visningszoomnivå: %1$s</string>
@@ -2370,7 +2370,7 @@
     <string name="marker_moved_to_active">Kartmarkør flyttet til aktive</string>
     <string name="shared_string_list">Liste</string>
     <string name="passed">Sist brukt: %1$s</string>
-    <string name="mapillary_menu_filter_description">Filtrer bilder etter innsender eller etter dato. Kun aktiv på høyere zoomnivåer.</string>
+    <string name="mapillary_menu_filter_description">Filtrer bilder etter innsender, dato eller type. Kun aktivt på nærgående forstørrelsesnivå.</string>
     <string name="improve_coverage_install_mapillary_desc">Installer Mapillary for å legge til et eller flere bilder til denne kartposisjonen.</string>
     <string name="plugin_mapillary_descr">Foto på gatenivå for alle. Oppdag plasser, samarbeid, fang inn verden.</string>
     <string name="quick_action_showhide_osmbugs_title">Vis/skjul OSM-notater</string>
@@ -2449,7 +2449,7 @@
     <string name="rendering_exception">Kunne ikke tegne valgt område</string>
     <string name="renderer_load_sucess">Kartgenerator lastet</string>
     <string name="error_reading_gpx">Kunne ikke lese GPX-data</string>
-    <string name="any_poi">Alle</string>
+    <string name="any_poi">Hvilke som helst</string>
     <string name="thanks_yandex_traffic">Takk til Yandex for trafikkinfo.</string>
     <string name="layer_yandex_traffic">Yandex-trafikk</string>
     <string name="background_service_provider">Stedsbestemmelsestjeneste</string>
@@ -2556,14 +2556,14 @@
     <string name="shared_string_added">Lagt til</string>
     <string name="marker_activated">Markøren %s er aktivert.</string>
     <string name="one_tap_active_descr">Trykk en markør på kartet for å flytte den til toppen av de aktive markørene uten å åpne kontekstmenyen.</string>
-    <string name="one_tap_active">Ett-trykk aktiv</string>
+    <string name="one_tap_active">«Ett-trykk» aktiv</string>
     <string name="empty_state_av_notes">Ta notater!</string>
     <string name="empty_state_av_notes_desc">Legg til lyd-, video- eller bildenotat til hvert punkt på kartet, ved bruk av modul eller kontekstmeny.</string>
     <string name="notes_by_date">Notater etter dato</string>
     <string name="by_date">Etter dato</string>
     <string name="by_type">Etter type</string>
     <string name="shared_string_more_without_dots">Mer</string>
-    <string name="add_favourites_group_to_markers_descr">Velg en favorittkategori å legge til markørene.</string>
+    <string name="add_favourites_group_to_markers_descr">Velg en favorittkategori å legge til markørene i.</string>
     <string name="show_number_pad">Vis numerisk tastatur</string>
     <string name="wrong_input">Feil inndata</string>
 	<string name="osn_modify_dialog_title">Endre notat</string>
@@ -2583,9 +2583,9 @@
     <string name="mark_passed">Marker som passert</string>
     <string name="osn_modify_dialog_error">Kunne ikke endre notatet</string>
     <string name="quick_action_auto_zoom_desc">Trykking på denne handlingsknappen slår av/på automatisk kartforstørrelse i henhold til hastigheten din.</string>
-    <string name="quick_action_add_destination_desc">Trykking på denne handlingsknappen gjør skjermsenteret til rutemål, ethvert tidligere valgt mål blir det siste mellomliggende målet.</string>
-    <string name="quick_action_replace_destination_desc">Trykking på denne handlingsknappen gjør skjermsenteret det nye rutemålet, og erstatter det tidligere valgte målet (hvis noe).</string>
-    <string name="quick_action_add_first_intermediate_desc">Trykking på denne handlingsknappen gjør skjermsenteret til det første mellomliggende målet.</string>
+    <string name="quick_action_add_destination_desc">Trykking på denne handlingsknappen gjør skjermsenteret til rutemål, ethvert tidligere valgt reisemål blir det siste mellomliggende målet.</string>
+    <string name="quick_action_replace_destination_desc">Trykking på denne handlingsknappen gjør skjermsenteret det nye rutemålet, og erstatter det tidligere valgte reisemålet (hvis noe).</string>
+    <string name="quick_action_add_first_intermediate_desc">Trykking på denne handlingsknappen gjør skjermsenteret til det første mellomliggende reisemålet.</string>
     <string name="subscribe_email_desc">Abonner på vår e-postliste om programrabatter og få tre kartnedlastinger til!</string>
     <string name="index_item_depth_points_southern_hemisphere">Havdybdepunkter for sørlige halvkule</string>
     <string name="index_item_depth_points_northern_hemisphere">Havdybdepunkter for nordlige halvkule</string>
@@ -2597,7 +2597,7 @@
     <string name="local_openstreetmap_were_uploaded">{0} interessepunkter/notater opplastet</string>
     <string name="local_openstreetmap_settings">Lokalt lagrede OSM-interessepunkter/notater</string>
     <string name="local_openstreetmap_settings_descr">Vis og behandle OSM-interessepunkter/notater i databasen på enheten.</string>
-    <string name="gpx_monitoring_disabled_warn">Logg spor ved bruk av GPX-miniprogram eller via \"Turopptak\"-innstillinger.</string>
+    <string name="gpx_monitoring_disabled_warn">Spar spor ved bruk av GPX-miniprogram eller via \"Turopptak\"-innstillinger.</string>
     <string name="native_library_not_supported">Innebygd bibliotek støttes ikke på denne enheten.</string>
     <string name="init_native_library">Igangsetter innebygget bibliotek…</string>
     <string name="local_index_upload_gpx_description">Last opp GPX-filer til OSM-fellesskapet, og forbedre kartene.</string>
@@ -2767,13 +2767,13 @@
     <string name="nothing_found_in_radius">Ingenting funnet innen radiusen:</string>
     <string name="select_waypoints_category_description">Legg til alle sporets rutepunkter, eller velg separate kategorier.</string>
     <string name="rendering_attr_whiteWaterSports_name">Rafting</string>
-    <string name="poi_error_info_not_loaded">Info om knutepunktet ble ikke innlastet</string>
+    <string name="poi_error_info_not_loaded">Info om knutepunktet ble ikke lastet inn</string>
     <string name="poi_dialog_other_tags_message">Alle andre etiketter beholdes</string>
     <string name="we_really_care_about_your_opinion">Vi bryr oss om din mening og din tilbakemelding er viktig.</string>
-    <string name="number_of_rows_in_dash">Antall rader %1$s</string>
+    <string name="number_of_rows_in_dash">Antall rader i oversikt: %1$s</string>
     <string name="show_free_version_banner">Vis gratisversjonsbanner</string>
     <string name="show_free_version_banner_description">Vis gratisversjonsbanneret selv i den betalte versjonen.</string>
-    <string name="commiting_node">Overfører knutepunkt…</string>
+    <string name="commiting_node">Sjekker inn knutepunkt…</string>
     <string name="previous_run_crashed">Den siste kjøringen av OsmAnd kræsjet. Loggfilen finnes i {0}. Rapporter hendelsen og legg ved loggfilen.</string>
     <string name="poi_error_poi_not_found">Knutepunktet ble ikke funnet, eller så består fasiliteten av flere knutepunkter som ikke støttes ennå.</string>
     <string name="android_19_location_disabled">Siden Android-versjon 4.4 (KitKat) kan du ikke laste ned og oppdatere kart til den gamle lagringsmappen (%s). Kopiere alle OsmAnd-filer til nytt lagringssted? 
@@ -3052,23 +3052,91 @@
 \n• Andre feilrettinger 
 \n</string>
     <string name="commiting_way">Sender inn vei…</string>
-    <string name="send_search_query_description">Ditt søk <b>\"%1$s\"</b>, vil bli sent inn sammen med din plassering.<br/><br/> Ingen personvernsinfo samles inn, søkedata trengs kun til forbedring av søket.<br/></string>
+    <string name="send_search_query_description">Vi kommer til å sende inn ditt søk <b>\"%1$s\"</b>, sammen med din plassering.<br/><br/> Vi samler ikke på personlig informasjon, vi treger bare søkedata for å forbedre søkealgoritmen.<br/></string>
     <string name="test_voice_desrc">Trykk på en knapp og lytt til tilhørende talemelding for å identifisere manglende eller feilaktige meldinger.</string>
-<string name="release_3_2_pre">• Fikset oppstartskræsj som følge av ikke-latinske bindinger
+<string name="release_3_2_pre">• Fikset krasj ved oppstart som skjedde på noen enheter
 \n
-\n • Forbedret opptegningshastighet på Android 8.0-enheter
+\n • Ny mulighet med markører: vis markører som allerede er passert
+\n
+\n • Søkehistorien viser nå hvilke kategorier du har søkt etter tidligere
+\n
+\n • Fikset krasj ved oppstart som skjedde med ikke-latinske kart
+\n
+\n • Forbedret utfordring med opptegningshastighet på Android 8.0-enheter
+\n
+\n • Støtte for endring av polygon-objekter (ikke-bekvemmelighet)
+\n
+\n • Mål avstand: la til Avstand-knapp til handlingslisten i kontekstmenyen
 \n
-\n • Støtte for redigering av polygoner (ikke-omgivelsesforhold)
 \n</string>
     <string name="ask_for_location_permission">Gi OsmAnd tilgang til plassering for å fortsette.</string>
     <string name="rendering_value_black_name">Svart</string>
-    <string name="more_transport_on_stop_hint">Det er mer transport på dette stoppet.</string>
+    <string name="more_transport_on_stop_hint">Det er flere ruter på dette stoppestedet.</string>
     <string name="markers_remove_dialog_msg">Slett kartmarkør \"%s\"\?</string>
     <string name="edit_map_marker">Rediger kartmarkør</string>
     <string name="third_party_application">Tredjepartsprogram</string>
     <string name="search_street">Gatesøk</string>
-    <string name="start_search_from_city">Start søk fra by</string>
+    <string name="start_search_from_city">Velg byen først</string>
     <string name="shared_string_restore">Gjenopprett</string>
-    <string name="keep_passed_markers_descr">Markører lagt til som favorittgrupper eller GPX-veipunkter markert som passert vil forbli på kartet. Hvis gruppen ikke er aktiv, vil markørene forsvinne fra kartet.</string>
+    <string name="keep_passed_markers_descr">Markører lagt til som favorittgrupper eller GPX-rutepunkter markert som passert vil forbli på kartet. Hvis gruppen ikke er aktiv, vil markørene forsvinne fra kartet.</string>
     <string name="keep_passed_markers">Behold passerte markører på kartet</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Betalingsplan og pris</string>
+    <string name="osm_live_payment_monthly_title">Betal månedlig</string>
+    <string name="osm_live_payment_3_months_title">Betal hver tredje måned</string>
+    <string name="osm_live_payment_annual_title">Betal årlig</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s per måned</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s per måned</string>
+    <string name="osm_live_payment_discount_descr">Lagre %1$s.</string>
+	<string name="osm_live_payment_current_subscription">Ditt nåværende abonnement</string>
+    <string name="osm_live_payment_renews_monthly">Fornyes månedlig</string>
+    <string name="osm_live_payment_renews_quarterly">Fornyes kvartalsvis</string>
+    <string name="osm_live_payment_renews_annually">Fornyes årlig</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Velg betalingsfrekvensen som passer for deg:</string>
+    <string name="osm_live_payment_contribute_descr">Deler av inntekten går til OpenStreetMap-bidragsytere.</string>
+    <string name="powered_by_osmand">Muliggjort av OsmAnd</string>
+    <string name="osm_live_subscriptions">Abonnementer</string>
+    <string name="mapillary_menu_title_pano">Vis kun 360°-bilder</string>
+    <string name="release_3_0">• New: Støtte for verdensomspennende reiseguider. Nevnte plasseringer lenkes til på kartet. Initiell data fra Wikivoyage.
+\n
+\n • Wikipedia: Nytt utseende, aktive lenker og støtte for bilder
+\n
+\n • Open Track UI: Støtte for rutepunktgrupper
+\n
+\n • Kartmarkører: Import av valgte grupper fra GPX-filer, koordiner inndata, nytt utseende
+\n
+\n • OsmAnd Live-abonnement støtter nå alle OsmAnd-funksjoner
+\n</string>
+    <string name="shared_string_launch">Kjør</string>
+    <string name="run_full_osmand_msg">Du bruker {0}-kart, muliggjort av OsmAnd. Ønsker du å kjøre fullversjonen av OsmAnd\?</string>
+    <string name="run_full_osmand_header">Kjør OsmAnd\?</string>
+    <string name="lang_gn_py">Guaraní</string>
+    <string name="quick_action_switch_day_night_descr">Å trykke på denne knappen bytter mellom dag- og nattmodus i OsmAnd.</string>
+    <string name="quick_action_switch_day_mode">Dagmodus</string>
+    <string name="quick_action_switch_night_mode">Nattmodus</string>
+    <string name="quick_action_day_night_switch_mode">Veksle dag-/nattmodus</string>
+    <string name="app_mode_public_transport">Offentlig transport</string>
+    <string name="swap_start_and_destination">Bytt utgangspunkt og reisemål</string>
+    <string name="add_destination_point">Legg til reisemål</string>
+    <string name="add_intermediate_point">Legg til mellomliggende</string>
+    <string name="add_start_point">Legg til startpunkt</string>
+    <string name="intermediate_waypoint">Mellomliggende punkt: %1$s</string>
+    <string name="waypoints">Rutepunkter: %1$s</string>
+    <string name="transfers">overføringer: %1$s</string>
+    <string name="on_foot">til fots: %1$s</string>
+    <string name="route_way">Vei: %1$s</string>
+    <string name="points_of_interests">Interessepunkter (POI)</string>
+    <string name="waiting_for_route_calculation">Regner ut rute…</string>
+    <string name="avoid_roads_descr">Velg vei på kartet fra listen nedenfor som du ønsker å unngå under navigering:</string>
+    <string name="show_along_the_route">Vis langs ruten</string>
+    <string name="simulate_navigation">Simuler navigering</string>
+    <string name="choose_track_file_to_follow">Velg sporfil å følge</string>
+    <string name="voice_announcements">Stemmeveivisning</string>
+    <string name="intermediate_destinations">Mellomliggende mål: %1$s</string>
+    <string name="arrive_at_time">Ankom klokken %1$s</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Kapasitet</string>
+    <string name="shared_string_width">Bredde</string>
+    <string name="shared_string_height">Høyde</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-nl/phrases.xml b/OsmAnd/res/values-nl/phrases.xml
index e1664e6129..6e38f4ce9e 100644
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@@ -1499,9 +1499,9 @@
 	<string name="poi_vending_ice_cream">IJs</string>
 	<string name="poi_cuisine_ice_cream">IJs</string>
 	<string name="poi_fuel_avia_type">Brandstoftype (avia)</string>
-	<string name="poi_internet_access_type">Internet</string>
+	<string name="poi_internet_access_type">Internet verbinding type</string>
 	<string name="poi_vending_type">Verkoop</string>
-	<string name="poi_bicycle_service">Fietsreparatie</string>
+	<string name="poi_bicycle_service">Fietsonderhoud</string>
 	<string name="poi_clothes_type">Soort</string>
 	<string name="poi_shoes_type">Soort</string>
 	<string name="poi_fire_hydrant_type">Soort</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index f090f434d4..46b67580b2 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   
   <string name="layer_map_appearance">Configureer scherm</string>
@@ -1984,7 +1984,7 @@ Lengtegraad:\t\t%2$s</string>
     <string name="shared_string_navigation">Navigatie</string>
     <string name="favourites_edit_dialog_title">Informatie over favoriet</string>
     <string name="simulate_your_location_stop_descr">Positiesimulatie beëindigen.</string>
-    <string name="simulate_your_location_descr">Positiesimulatie met een berekende route of een opgenomen GPX-track.</string>
+    <string name="simulate_your_location_descr">Routesimulatie met een berekende route of een opgeslagen GPX-track</string>
     <string name="av_locations_descr">GPX-bestand met notities.</string>
     <string name="av_locations">Locaties van geselecteerde AV-Notities</string>
     <string name="plugin_settings">Plugins</string>
@@ -2213,24 +2213,24 @@ Lengtegraad:\t\t%2$s</string>
     <string name="osm_editors_ranking">OSM-Bijdragers Ranglijst</string>
     <string name="osm_live_subscription">OsmAnd Live abonnement</string>
     <string name="osm_live_subscribe_btn">Abonneren</string>
-    <string name="osm_live_email_desc">Dit is nodig om je informatie te geven over bijdragen.</string>
+    <string name="osm_live_email_desc">Nodig om je informatie te geven over bijdragen.</string>
     <string name="osm_live_user_public_name">Openbare Naam</string>
     <string name="osm_live_hide_user_name">Mijn naam niet tonen in verslagen</string>
     <string name="osm_live_support_region">Ondersteunde regio</string>
     <string name="osm_live_month_cost">Maandelijkse kosten</string>
-    <string name="osm_live_month_cost_desc">Abonnementskosten per maand.</string>
+    <string name="osm_live_month_cost_desc">Abonnementskosten per maand</string>
     <string name="osm_live_active">Actief</string>
     <string name="osm_live_not_active">Niet actief</string>
     <string name="osm_live_enter_email">Voer een geldig emailadres in</string>
     <string name="osm_live_enter_user_name">Voer je Openbare Naam in</string>
-    <string name="osm_live_thanks">Bedankt voor je OSM Live Abonnement!</string>
+    <string name="osm_live_thanks">Bedankt voor je OSM Live Abonnement! Een herstart van OsmAnd is nodig.</string>
     <string name="osm_live_region_desc">Een gedeelte van je betaling gaat naar OSM-bijdragers in deze regio.</string>
     <string name="osm_live_subscription_settings">Abonnementsgegevens</string>
-    <string name="osm_live_ask_for_purchase">Neem alsjeblieft eerst een OsmAnd Live Abonnement</string>
+    <string name="osm_live_ask_for_purchase">Neem alsjeblieft eerst een
+\nabonnement op OsmAnd Live</string>
 
-    <string name="osm_live_header">"Met dit abonnement ontvang je dagelijks updates voor kaarten over de hele wereld. 
-Een  gedeelte van uw bijdrage gaat naar de OSM-gemeenschap en wordt uitbetaald naar het aantal OSM-bewerkingen.
-Als je OsmAnd en OSM wil ondersteunen, is dit de perfecte manier om dat te doen."</string>
+    <string name="osm_live_header">Met dit abonnement ontvang je dagelijks updates voor kaarten over de hele wereld. 
+\nEen gedeelte van uw bijdrage gaat naar de OSM-gemeenschap en wordt uitbetaald naar het aantal OSM-bewerkingen. Als je OsmAnd en OSM wil ondersteunen, en ondersteund wilt worden door hen, is dit de perfecte manier om dat te doen.</string>
     
     <string name="select_map_marker">Kies markeervlaggetjes</string>
     <string name="map_markers_other">Andere markeervlaggetjes</string>
@@ -2239,9 +2239,7 @@ Als je OsmAnd en OSM wil ondersteunen, is dit de perfecte manier om dat te doen.
     <string name="download_files_error_not_enough_space">Niet genoeg opslagruimte! 
 Tijdelijk is {3} MB nodig en permanent {1} MB extra
 Nu is maar {2} MB beschikbaar.</string>
-    <string name="download_files_question_space_with_temp">{0} bestanden downloaden? 
-Tijdelijk is {3} MB nodig en permanent {1} MB. 
-Er is nu {2} MB beschikbaar</string>
+    <string name="download_files_question_space_with_temp">{0} bestanden downloaden\? Tijdelijk is {3} MB nodig en permanent {1} MB. Er is nu {2} MB beschikbaar.</string>
     <string name="upload_osm_note_description">Je kunt OSM Opmerkingen anoniem uploaden of je OpenStreetMap.org profiel gebruiken.</string>
     <string name="upload_osm_note">Upload OSM-notitie</string>
     <string name="map_marker_1st">Eerste Markeervlaggetje</string>
@@ -2261,11 +2259,11 @@ Er is nu {2} MB beschikbaar</string>
     
     <string name="recalculate_route">Route opnieuw berekenen</string>
     <string name="shared_string_topbar">Bovenste balk</string>
-    <string name="storage_directory_readonly_desc">De geselecteerde opslagmap is niet schrijfbaar. Daarom wordt nu intern geheugen gebruikt. Kies een geldige opslagmap.</string>
+    <string name="storage_directory_readonly_desc">De geselecteerde opslagmap is niet beschrijfbaar. Daarom wordt nu intern geheugen gebruikt. Kies een geldige opslagmap.</string>
     <string name="storage_directory_shared">Gedeeld geheugen</string>
     <string name="avoid_road">Deze weg vermijden</string>
-    <string name="shared_string_move_up">Omhoog</string>
-    <string name="shared_string_move_down">Omlaag</string>
+    <string name="shared_string_move_up">Omhoog↑</string>
+    <string name="shared_string_move_down">Omlaag↓</string>
     <string name="finish_navigation">Navigatie stoppen</string>
     
     <string name="storage_permission_restart_is_required">OsmAnd heeft nu toestemming om de externe opslag te gebruiken. Een handmatige herstart is noodzakelijk.</string>
@@ -2296,9 +2294,9 @@ Er is nu {2} MB beschikbaar</string>
     <string name="access_sort">Sorteren</string>
     <string name="map_widget_bearing">Relatieve koers</string>
     <string name="access_disable_offroute_recalc">Geen herberekeing als u van de berekende route afwijkt</string>
-    <string name="access_disable_offroute_recalc_descr">Voorkom automatische hercalculatie van de route wanneer u van de route afwijkt.</string>
+    <string name="access_disable_offroute_recalc_descr">Geen automatische herberekening van de route, wanneer u van de route afwijkt.</string>
     <string name="access_disable_wrong_direction_recalc">Wijzig de route niet als u de verkeerde kant op gaat</string>
-    <string name="access_disable_wrong_direction_recalc_descr">Voorkom automatische herberekening van de route als u in tegenovergestelde richting beweegt.</string>
+    <string name="access_disable_wrong_direction_recalc_descr">Geen automatische herberekening van de route als u in tegenovergestelde richting beweegt.</string>
     <string name="access_smart_autoannounce">Slimme aankondigingen</string>
     <string name="access_smart_autoannounce_descr">Geef alleen instructie als de richting naar het doel veranderd is.</string>
     <string name="access_autoannounce_period">Tijd tussen meldingen</string>
@@ -2351,8 +2349,8 @@ Er is nu {2} MB beschikbaar</string>
     <string name="get_started">Aan de slag</string>
     <string name="routing_attr_short_way_name">Economische route</string>
     <string name="routing_attr_short_way_description">Economische route gebruiken (meestal korter).</string>
-    <string name="replace_favorite_confirmation">Wil je favoriet %1$s inderdaad vervangen?</string>
-    <string name="update_all_maps_now">Wil u alle kaarten nu updaten?</string>
+    <string name="replace_favorite_confirmation">Wil je Favoriet %1$s inderdaad vervangen\?</string>
+    <string name="update_all_maps_now">Nu alle kaarten updaten\?</string>
     <string name="si_mi_meters">Mijlen/meters</string>
     <string name="skip_map_downloading">Kaarten later downloaden</string>
     <string name="search_another_country">Kies een andere regio</string>
@@ -2377,9 +2375,9 @@ Er is nu {2} MB beschikbaar</string>
     <string name="get_for_month">Abonneren voor %1$s per maand</string>
     <string name="osm_live_banner_desc">Krijg onbeperkte downloads van kaarten en updates vaker dan eens per maand: wekelijks, dagelijks of elk uur.</string>
     <string name="osmand_plus_banner_desc">Onbeperkte downloads van kaarten, updates, en Wikipedia plugin.</string>
-    <string name="skip_map_downloading_desc">Er is geen kaart geïnstalleerd. Kies een kaart uit de lijst, of download later kaarten via Menu - %1$s.</string>
+    <string name="skip_map_downloading_desc">"Er is geen kaart geïnstalleerd. Kies een kaart uit de lijst, of download later kaarten via \'Menu - %1$s\'. "</string>
     <string name="first_usage_wizard_desc">Kies kaarten om te downloaden aan de hand van uw huidige locatie.</string>
-    <string name="storage_place_description">OsmAnd bewaart gegevens (kaarten, tracks, enz.) in: %1$s</string>
+    <string name="storage_place_description">OsmAnd bewaart gegevens (kaarten, GPX-tracks, enz.) in: %1$s.</string>
     <string name="no_update_info_desc">Controleer niet op nieuwe versies en aanbiedingen van OsmAnd.</string>
     <string name="driving_region_australia">Australië</string>
     <string name="lang_kab">Kabylisch</string>
@@ -2396,7 +2394,7 @@ Er is nu {2} MB beschikbaar</string>
     <string name="subcategories">Subcategorieën</string>
     <string name="translit_names">Transliteratie van namen</string>
     <string name="translit_name_if_miss">Weergeven in westers schrift als naam in %1$s ontbreekt</string>
-    <string name="search_hint">Tik stad, adres of naam</string>
+    <string name="search_hint">Plaatsnaam, adres of naam invoeren</string>
     <string name="rendering_value_light_brown_name">Lichtbruin</string>
     <string name="rendering_value_dark_brown_name">Donkerbruin</string>
     <string name="rendering_attr_contourColorScheme_name">Kleur van hoogtelijnen</string>
@@ -2406,7 +2404,7 @@ Er is nu {2} MB beschikbaar</string>
     <string name="christmas_desc_q">Kerst-POI tonen?</string>
     <string name="rendering_attr_contourColorScheme_description">Kleur van hoogtelijnen</string>
     <string name="save_track_min_speed">Minimum snelheid om te registreren</string>
-    <string name="save_track_min_speed_descr">Filter: Kies minimumsnelheid waarboven GPX-opname actief wordt.</string>
+    <string name="save_track_min_speed_descr">Filter: Geen GPX-opname bij lagere snelheid.</string>
     <string name="save_track_min_distance">GPX-opname: minimale afstand</string>
     <string name="save_track_min_distance_descr">Filter: kies de minumumafstand vanaf het vorige punt, waarboven een nieuw GPX-punt wordt opgenomen.</string>
     <string name="save_track_precision">Minimale GPS-nauwkeurigheid</string>
@@ -2420,7 +2418,7 @@ Er is nu {2} MB beschikbaar</string>
     
     <string name="gpx_no_tracks_title">Je hebt nog geen GPX-tracks</string>
     <string name="gpx_no_tracks_title_folder">Je kunt ook GPX-tracks toevoegen aan de map</string>
-    <string name="gpx_add_track">GPX-track toevoegen</string>
+    <string name="gpx_add_track">"GPX-track toevoegen... "</string>
     <string name="gpx_appearance">GPX-stijl</string>
     
     
@@ -2446,8 +2444,8 @@ Er is nu {2} MB beschikbaar</string>
     <string name="rendering_value_high_name">Hoog</string>
     <string name="rendering_value_medium_w_name">Gemiddeld</string>
     <string name="rendering_value_low_name">Laag</string>
-    <string name="rendering_attr_contourWidth_description">Hoogtelijnen dikte</string>
-    <string name="rendering_attr_contourWidth_name">Hoogtelijnen dikte</string>
+    <string name="rendering_attr_contourWidth_description">Hoogtelijnen: dikte</string>
+    <string name="rendering_attr_contourWidth_name">Hoogtelijnen: dikte</string>
     <string name="rendering_attr_hideWaterPolygons_description">Watervlakten</string>
     <string name="rendering_attr_hideWaterPolygons_name">Verberg watervlakten</string>
     
@@ -2538,7 +2536,7 @@ voor Gebied: %1$s x %2$s</string>
 	<string name="shared_string_action_name">Titel voor de Actie (eventueel wijzigen)</string>
 <string name="rendering_attr_depthContours_description">Toon dieptelijnen en -punten.</string>
     <string name="rendering_attr_depthContours_name">Zeedieptelijnen</string>
-	<string name="select_gpx_folder">Kies map voor GPX-tracks</string>
+	<string name="select_gpx_folder">Kies map voor GPX bestanden</string>
     <string name="file_can_not_be_moved">Bestand kan niet verplaatst worden.</string>
     <string name="shared_string_move">Verplaats</string>
     <string name="shared_string_gpx_tracks">Tracks</string>
@@ -2580,7 +2578,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="select_city">Plaatsnaam kiezen</string>
     <string name="select_postcode">Postcode kiezen</string>
     <string name="quick_action_auto_zoom">Autozoom aan/uit</string>
-    <string name="quick_action_auto_zoom_desc">Een drukop op de sneltoets zet de automatische zoom volgens de snelheid aan of uit.</string>
+    <string name="quick_action_auto_zoom_desc">Een druk op op de sneltoets zet de automatische zoom volgens de snelheid aan of uit.</string>
     <string name="quick_action_auto_zoom_on">Autozoom aan</string>
     <string name="quick_action_auto_zoom_off">Autozoom uit</string>
     <string name="quick_action_add_destination">Bestemming toevoegen</string>
@@ -2594,7 +2592,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="subscribe_email_error">Foutmelding</string>
     <string name="subscribe_email_desc">Abonneer op de mailinglist voor aanbiedingen en ontvang 3 extra kaart-downloads!</string>
     <string name="depth_contour_descr">Deze kaarten tonen de dieptepunten en -contouren van zeeën en oceanen.</string>
-    <string name="sea_depth_thanks">Bedankt voor het aanschaffen van Zeediepten en -contouren!</string>
+    <string name="sea_depth_thanks">Bedankt voor het aanschaffen van Zeediepten en -contouren</string>
     <string name="index_item_depth_contours_osmand_ext">Zeediepte-contourlijnen</string>
     <string name="index_item_depth_points_southern_hemisphere">Zeediepten Zuidelijk Halfrond</string>
     <string name="index_item_depth_points_northern_hemisphere">Zeediepten Noordelijk Halfrond</string>
@@ -2604,7 +2602,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="shared_string_visible">Zichtbaar</string>
     <string name="restore_purchases">Aankopen herstellen</string>
     <string name="fonts_header">Lettertypes voor de kaart</string>
-    <string name="do_not_show_startup_messages_desc">Onderdruk meldingen van app-aanbiedingen en speciale lokale gebeurtenissen.</string>
+    <string name="do_not_show_startup_messages_desc">Geen meldingen van app-aanbiedingen en speciale lokale gebeurtenissen tonen.</string>
     <string name="parking_options">Parkeermogelijkheden</string>
     <string name="full_version_thanks">Dank voor het aanschaffen van de volledige versie van OsmAnd!</string>
     <string name="routing_attr_relief_smoothness_factor_hills_name">Heuvelachtige wegen</string>
@@ -2621,17 +2619,17 @@ voor Gebied: %1$s x %2$s</string>
     <string name="animate_my_location_desc">De kaart vloeiend weergeven tijdens navigatie.</string>
     <string name="shared_string_slope">Helling</string>
     <string name="add_new_folder">Nieuwe map ttoevoegen</string>
-    <string name="points_delete_multiple_succesful">Punt(en) met succes verwijderd.</string>
+    <string name="points_delete_multiple_succesful">Punt(en) verwijderd.</string>
     <string name="points_delete_multiple">Er worden %1$d punt(en) verwijderd. Doorgaan ?</string>
     <string name="route_points_category_name">Afslagen op de route</string>
     <string name="track_points_category_name">Belangrijke punten op deze route</string>
     <string name="routing_attr_relief_smoothness_factor_name">Kies voorkeur voor hoogteverschillen</string>
     <string name="shared_string_paused">In pauze</string>
     <string name="lang_ber">Berbers</string>
-    <string name="hillshade_menu_download_descr">Om reliëfschaduw weer te geven, moet je de reliëfschaduwkaart voor deze regio downloaden.</string>
-    <string name="hillshade_purchase_header">Om reliëfschaduw op de kaart weer te geven, moet je de Hoogtelijnen-plugin kopen en installeren.</string>
+    <string name="hillshade_menu_download_descr">Om reliëfschaduw weer te geven, de reliëfschaduwkaart voor deze regio downloaden.</string>
+    <string name="hillshade_purchase_header">Om reliëfschaduw op de kaart weer te geven, de Hoogtelijnen-plugin kopen en installeren</string>
     <string name="hide_from_zoom_level">Niet tonen vanaf zoom-niveau</string>
-    <string name="srtm_menu_download_descr">Download de hoogtelijnenkaart voor deze regio om hoogtelijnen te zien.</string>
+    <string name="srtm_menu_download_descr">Download de hoogtelijnenkaart voor deze regio.</string>
     <string name="shared_string_plugin">Plugin</string>
     <string name="srtm_purchase_header">Om hoogtelijnen weer te geven, moet je de Hoogtelijnen-plugin kopen en installeren</string>
     <string name="srtm_color_scheme">Kleurschema</string>
@@ -2687,13 +2685,13 @@ voor Gebied: %1$s x %2$s</string>
 \n • Afrika: ** 
 \n • Antarctica: * Van bijna alle landen is een kaart te downloaden: van Afghanistan tot Zimbabwe, Australië tot de VS, Nederland, Duitsland, Spanje, Japan, …</string>
     <string name="save_poi_too_many_uppercase">Naam bevat erg veel hoofdletters, toch doorgaan?</string>
-    <string name="search_favorites">Zoek favorieten</string>
+    <string name="search_favorites">Zoek Favorieten</string>
     <string name="quick_action_showhide_osmbugs_title">OSM-opmerkingen tonen/verbergen</string>
     <string name="quick_action_osmbugs_show">Toon OSM-opmerkingen</string>
     <string name="quick_action_osmbugs_hide">Verberg OSM-opmerkingen</string>
     <string name="quick_action_showhide_osmbugs_descr">Een druk op de sneltoets toont of verbergt OSM-opmerkingen.</string>
     <string name="sorted_by_distance">Gesorteerd op afstand</string>
-    <string name="private_access_routing_req">Uw bestemming ligt in een gebied dat particulier eigendom is. Wilt u gebruik van particuliere wegen voor deze route toestaan?</string>
+    <string name="private_access_routing_req">Uw bestemming ligt in een gebied dat particulier eigendom is. Wilt je gebruik van particuliere wegen voor deze route toestaan\?</string>
     <string name="restart_search">Opnieuw zoeken</string>
     <string name="increase_search_radius">Zoekgebied vergroten</string>
     <string name="nothing_found">Niets gevonden</string>
@@ -2709,7 +2707,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="improve_coverage_mapillary">Verbeter de fotocollectie van Mapillary</string>
     <string name="improve_coverage_install_mapillary_desc">Installeer Mapillary om een of meerdere foto\'s aan deze locatie toe te voegen.</string>
     <string name="mapillary_action_descr">Voeg zelf foto\'s van deze plek toe via Mapillary.</string>
-    <string name="mapillary_widget_descr">Voeg eenvoudig info toe aan Mapillary.</string>
+    <string name="mapillary_widget_descr">Snel bijdragen aan Mapillary.</string>
     <string name="mapillary_descr">Foto\'s van buiten voor iedereen. Ondek plaatsen, werk samen, en leg de wereld vast.</string>
     <string name="plugin_mapillary_descr">Foto\'s van buiten voor iedereen. Ondek plaatsen, werk samen, en leg de wereld vast.</string>
     <string name="shared_string_permissions">Rechten</string>
@@ -2769,7 +2767,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="osn_modify_dialog_title">Wijzig notitie</string>
     <string name="context_menu_item_modify_note">Wijzig OSM-notitie</string>
     <string name="make_round_trip_descr">Kopieer het beginpunt en voeg het toe als bestemming.</string>
-    <string name="make_round_trip">Ga heen en terug</string>
+    <string name="make_round_trip">Een rondreis maken</string>
     
     <string name="shared_string_markers">Markeringen</string>
     <string name="coordinates_format">Coördinatenformaat</string>
@@ -2781,29 +2779,29 @@ voor Gebied: %1$s x %2$s</string>
     <string name="use_location">Gebruik mijn positie</string>
     <string name="add_location_as_first_point_descr">Voeg je positie toe als startpunt voor de optimale route.</string>
     <string name="my_location">Mijn positie</string>
-    <string name="shared_string_finish">Einde</string>
+    <string name="shared_string_finish">Afsluiten</string>
     <string name="plan_route">Plan route</string>
     <string name="shared_string_sort">Sorteer</string>
     <string name="coordinate_input">Invoer van coördinaten</string>
     <string name="is_saved">is opgeslagen</string>
-    <string name="marker_save_as_track_descr">Exporteer uw markeringen naar een bestand dat u hier opgeeft:</string>
-    <string name="marker_save_as_track">Bewaar als spoor</string>
+    <string name="marker_save_as_track_descr">Exporteer uw Markeervlaggetjes naar het volgende bestand:</string>
+    <string name="marker_save_as_track">Opslaan als GPX-track</string>
     <string name="move_to_history">Verplaats naar geschiedenis</string>
-    <string name="group_will_be_removed_after_restart">De groep wordt verwijderd na een herstart van de app.</string>
+    <string name="group_will_be_removed_after_restart">De groep is verwijderd na een herstart van de app.</string>
     <string name="show_guide_line">Richtingslijnen tonen</string>
     <string name="show_arrows_on_the_map">Toon pijlen op de kaart</string>
-    <string name="show_passed">Toon afgelopen</string>
-    <string name="hide_passed">Verberg afgelopen</string>
+    <string name="show_passed">Afgehandelde tonen</string>
+    <string name="hide_passed">Afgehandelde verbergen</string>
     <string name="remove_from_map_markers">Uit kaartmarkeringen verwijderen</string>
     <string name="date_added">Toegevoegd op</string>
     <string name="order_by">Sorteer op:</string>
     <string name="marker_show_distance_descr">Weergave van afstand en richting naar markeingen op het kaartscherm:</string>
-    <string name="map_orientation_change_in_accordance_with_speed">Kaart naar beweegrichting draaien vanaf</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Kies de snelheid waarboven de kaart gedraaid wordt van \'In richting van beweging\' naar \'volgens kompasrichting\'.</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Snelheidsdrempel beweegrichting</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Kies de snelheid waarboven Kaartrotatie wijzigt van \'Volgens kompas\' naar \'In beweegrichting\'.</string>
     <string name="all_markers_moved_to_history">Alle kaartmarkeringen zijn naar de geschiedenis verplaatst</string>
     <string name="marker_moved_to_history">Kaartmerkering naar geschiedenis verplaatst</string>
     <string name="marker_moved_to_active">Kaartmarkering actief gemaakt</string>
-    <string name="passed">Laatst gebruikte: %1$s</string>
+    <string name="passed">Laatst gebruikt: %1$s</string>
     <string name="make_active">Maak actief</string>
     <string name="measurement_tool_snap_to_road_descr">OsmAnd zal de punten verbinden met een route voor het gekozen profiel.</string>
     <string name="measurement_tool_save_as_new_track_descr">Sla de punten op als routepunten of als een lijn.</string>
@@ -2815,7 +2813,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="store_tracks_in_monthly_directories">Bewaar opgenomen sporen per maand in een map</string>
     <string name="store_tracks_in_monthly_directories_descrp">Bewaar opgenomen sporen in een map voor elke maand (bijvoorbeeld 2018-01).</string>
     <string name="mapillary_menu_descr_tile_cache">Herlaad de tegels om de gegevens te verversen.</string>
-    <string name="mapillary_menu_title_tile_cache">Tegel-cache</string>
+    <string name="mapillary_menu_title_tile_cache">Tegel-cachegeheugen</string>
     <string name="mapillary_menu_descr_username">Alleen afbeeldingen bekijken die zijn toegevoegd door</string>
     <string name="rendering_value_translucent_pink_name">Transparant roze</string>
     <string name="ascent_descent">Stijgen/Dalen</string>
@@ -2842,7 +2840,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="import_track_desc">Bestand %1$s bevat geen waypoints. Importeren als een track?</string>
     <string name="move_point">Verplaats punt</string>
     <string name="add_segment_to_the_track">Voeg toe aan GPX-track</string>
-<string name="mapillary_menu_filter_description">Filter afbeeldingen op gebruikersnaam of datum. Alleen actief wanneer ingezoomd.</string>
+<string name="mapillary_menu_filter_description">"Filter afbeeldingen op gebruikersnaam,  datum of type. Alleen actief wanneer ingezoomd."</string>
     <string name="show_map">Kaart weergeven</string>
     <string name="route_is_calculated">Route berekend</string>
     <string name="round_trip">Retour</string>
@@ -2859,9 +2857,9 @@ voor Gebied: %1$s x %2$s</string>
     <string name="tap_on_map_to_hide_interface">Volledig scherm</string>
     
     <string name="mark_passed">Markering gepasseerd</string>
-    <string name="import_gpx_file_description">kan worden geïmporteerd als favoriet of trackbestand.</string>
+    <string name="import_gpx_file_description">kan worden geïmporteerd als Favorieten of als GPX-track.</string>
     <string name="import_as_gpx">importeer als GPX bestand</string>
-    <string name="import_as_favorites">Importeren als favoriet</string>
+    <string name="import_as_favorites">"Importeren als Favorieten "</string>
     <string name="import_file">Importeer bestand</string>
 	<string name="appearance_on_the_map">Weergave op de kaart</string>
     <string name="favourites_group">Favorietencategorie</string>
@@ -2869,7 +2867,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="empty_state_markers_active">Maak markeringen aan op de kaart!</string>
     <string name="shared_string_two">Twee</string>
     <string name="shared_string_one">Een</string>
-    <string name="active_markers_descr">Kies hoeveel richtingaanwijzers u wilt zien.</string>
+    <string name="active_markers_descr">"Kies hoeveel richtingaanwijzers getoond worden. "</string>
     <string name="digits_quantity">Aantal decimalen</string>
     <string name="shared_string_right">Rechts</string>
     <string name="shared_string_left">Links</string>
@@ -2909,28 +2907,28 @@ voor Gebied: %1$s x %2$s</string>
     <string name="by_type">Op type</string>
     <string name="shared_string_more_without_dots">Meer</string>
     <string name="show_number_pad">Toon cijfertoetsenbord</string>
-    <string name="shared_string_restart">"Herstarten "</string>
+    <string name="shared_string_restart">"App herstarten "</string>
     <string name="show_images">Afbeeldingen tonen</string>
-    <string name="purchase_cancelled_dialog_title">"Je hebt het abonnement op OsmAnd Live opgezegd "</string>
+    <string name="purchase_cancelled_dialog_title">"U hebt het abonnement op OsmAnd Live opgezegd "</string>
     <string name="purchase_cancelled_dialog_descr">"Vernieuw het abonnement om alle mogelijkheden te blijven gebruiken: "</string>
 
-    <string name="maps_you_need_descr">"Op basis van je opgeslagen artikelen, raden we je aan de volgende kaarten te downloaden: "</string>
+    <string name="maps_you_need_descr">"Op basis van je bladwijzers, raden we je aan de volgende kaarten te downloaden: "</string>
     <string name="maps_you_need">Kaarten die je nodig hebt</string>
     <string name="osmand_team">OsmAnd-team</string>
     <string name="popular_destinations">"Populaire bestemmingen "</string>
     <string name="paid_app">Betaalde app</string>
     <string name="paid_plugin">"Betaalde plugin "</string>
     <string name="travel_card_update_descr">"Nieuwe Wikivoyage-bestanden beschikbaar, updaten om deze te gebruiken. "</string>
-	<string name="travel_card_download_descr">"Download deze Wikivoyage-reisgidsen om artikelen te lezen over plaatsen wereldwijd, zonder internetverbinding. "</string>
+	<string name="travel_card_download_descr">"Download Wikivoyage-reisgidsen om artikelen te lezen over plaatsen wereldwijd, zonder internetverbinding. "</string>
 	<string name="update_is_available">"Update beschikbaar "</string>
 	<string name="download_file">"Bestand downloaden "</string>
     <string name="start_editing_card_image_text">Wikivoyage is de vrije, wereldwijde reisgids die iedereen kan bewerken.</string>
-    <string name="welcome_to_open_beta_description">Reisgids in gebaseerd op Wikivoyage. Test gratis alle mogelijkheden tijdens de open-beta-testfase. Hierna is Reisgids beschikbaar voor abonnees van OsmAnd Unlimited en in OsmAnd+</string>
+    <string name="welcome_to_open_beta_description">"Reisgids in gebaseerd op Wikivoyage. Test gratis alle mogelijkheden tijdens de open-beta-testfase. Hierna is Reisgids beschikbaar voor abonnees van OsmAnd Unlimited en in OsmAnd+. "</string>
     <string name="start_editing_card_description">"Je kunt artikelen bewerken op Wikivoyage.org. Deel jouw kennis, ervaringen, talent en interesses "</string>
     <string name="start_editing">"Begin met bewerken "</string>
     <string name="get_unlimited_access">"Krijg onbegrensde toegang "</string>
     <string name="welcome_to_open_beta">Welkom bij de open beta</string>
-    <string name="wikivoyage_travel_guide">Wikivoyage Reisgids</string>
+    <string name="wikivoyage_travel_guide">Reisgids</string>
     <string name="wikivoyage_travel_guide_descr">Voert je binnen OsmAnd naar de meest interessante plaatsen op aarde, zonder internetverbinding.</string>
     <string name="monthly_map_updates">Kaartupdates: <b>Elke maand</b></string>
     <string name="daily_map_updates">Kaartupdates: <b>Elk uur</b></string>
@@ -2948,7 +2946,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="unlock_all_features">"Alle mogelijkheden van OsmAnd gebruiken "</string>
 
     <string name="purchase_dialog_title">Kies je aankoop</string>
-    <string name="purchase_dialog_travel_description">Kies een van onderstaande aankopen om reisartikelen offline te lezen:</string>
+    <string name="purchase_dialog_travel_description">Kies een van onderstaande aankopen om Reisgids offline te gebruiken:</string>
     <string name="purchase_dialog_subtitle">Kies een passend product:</string>
     <string name="shared_string_dont">Niet doen</string>
     <string name="shared_string_do">Wel doen</string>
@@ -2956,13 +2954,13 @@ voor Gebied: %1$s x %2$s</string>
     <string name="wikivoyage_download_pics">"Afbeeldingen downloaden "</string>
     <string name="wikivoyage_download_pics_descr">Afbeeldingen bij de artikelen kunnen gedownload worden voor offline gebruik. Je kan deze instelling altijd wijzigen via Opties.</string>
     <string name="shared_string_wifi_only">Alleen met Wifi</string>
-    <string name="select_travel_book">"Reisgids kiezen "</string>
+    <string name="select_travel_book">"Een reisgids kiezen "</string>
     <string name="shared_string_travel_book">"Reisgids "</string>
     <string name="online_webpage_warning">Pagina is alleen online beschikbaar. Openen in webbrowser?</string>
     <string name="images_cache">Afbeeldingen-cache</string>
     <string name="delete_search_history">"Zoekgeschiedenis wissen "</string>
-    <string name="download_images">Afbeeldingen tonen</string>
-    <string name="download_maps_travel">Reiskaarten</string>
+    <string name="download_images">"Afbeeldingen downloaden "</string>
+    <string name="download_maps_travel">Reisgidsen</string>
     <string name="shared_string_wikivoyage">Wikivoyage</string>
     <string name="article_removed">Artikel verwijderd</string>
     <string name="wikivoyage_search_hint">"Zoek: Land, Provincie, Stad "</string>
@@ -2992,8 +2990,8 @@ voor Gebied: %1$s x %2$s</string>
 	<string name="south_abbreviation">Z</string>
 	<string name="north_abbreviation">N</string>
 	<string name="optional_point_name">"Naam (niet verplicht) "</string>
-    <string name="transport_nearby_routes_within">"Lijnen vanaf nabije halte, afstand "</string>
-    <string name="transport_nearby_routes">"in de buurt "</string>
+    <string name="transport_nearby_routes_within">Lijnen vanaf nabije halte, binnen</string>
+    <string name="transport_nearby_routes">Binnen</string>
     <string name="enter_the_file_name">Bestandsnaam invoeren.</string>
     <string name="map_import_error">"Fout bij kaartimport "</string>
     <string name="map_imported_successfully">"Kaart geïmporteerd "</string>
@@ -3038,7 +3036,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="read_wikipedia_offline">Wikipedia offline lezen</string>
     <string name="download_all">Alles downloaden</string>
     <string name="will_open_on">Gaat open om</string>
-    <string name="add_favourites_group_to_markers_descr">Kies een categorie favorieten om aan de markeringen toe te voegen.</string>
+    <string name="add_favourites_group_to_markers_descr">Kies een categorie Favorieten avorieten om aan de markeringen toe te voegen.</string>
     <string name="empty_state_markers_groups">Groepen importeren</string>
     <string name="distance_indication_descr">Kies hoe de afstand naar actieve markeringen weergegeven wordt.</string>
     <string name="index_item_world_wikivoyage">Wereldwijde Wikivoyage-artikelen</string>
@@ -3104,4 +3102,33 @@ voor Gebied: %1$s x %2$s</string>
 \n • Ondersteuning voor het wijzigen van polygon-(non-faciliteits)voorwerpen
 \n</string>
     <string name="test_voice_desrc">Druk op een knop en luister naar de bijhorende gesproken melding om ontbrekende of foutieve meldingen te identificeren.</string>
-</resources>
+    <string name="osm_live_subscriptions">Abonnementen</string>
+    <string name="powered_by_osmand">Mogelijk gemaakt door OsmAnd</string>
+    <string name="osm_live_plan_pricing">Tariefoverzicht</string>
+    <string name="osm_live_payment_monthly_title">Betaal maandelijks</string>
+    <string name="osm_live_payment_3_months_title">Betaling per kwartaal</string>
+    <string name="osm_live_payment_annual_title">"Jaarlijkse betaling "</string>
+    <string name="osm_live_payment_month_cost_descr">"%1$s per maand "</string>
+    <string name="osm_live_payment_month_cost_descr_ex">"%1$.2f %2$s per maand "</string>
+    <string name="osm_live_payment_discount_descr">Bespaar %1$s!</string>
+    <string name="osm_live_payment_current_subscription">"Uw huidige abonnement "</string>
+    <string name="osm_live_payment_renews_monthly">Wordt maandelijks verlengd</string>
+    <string name="osm_live_payment_renews_quarterly">"Wordt per kwartaal verlengd "</string>
+    <string name="osm_live_payment_renews_annually">"Wordt per jaar verlengd "</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Kies de gewenste betalingsperiode:</string>
+    <string name="osm_live_payment_contribute_descr">"Een gedeelte van de inkomsten gaat naar  OS-medewerkers. "</string>
+    <string name="markers_remove_dialog_msg">Markeervlaggetje \'%s\' verwijderen\?</string>
+    <string name="edit_map_marker">"Markeervlaggetje bewerken "</string>
+    <string name="third_party_application">App van derde partij</string>
+    <string name="search_street">Straatnaam zoeken</string>
+    <string name="start_search_from_city">Plaatsnaam kiezen</string>
+    <string name="shared_string_restore">"Herstellen "</string>
+    <string name="keep_passed_markers">Gepasseerde vlaggetjes op de kaart behouden</string>
+    <string name="more_transport_on_stop_hint">"Op deze halte zijn er meerdere verbindingen. "</string>
+    <string name="ask_for_location_permission">"Geef OsmAnd toegang tot Locatievoorzieningen om door te gaan. "</string>
+    <string name="keep_passed_markers_descr">Markeervlaggetjes die als Favorieten of als GPX-track toegevoegd zijn, en afgehandeld zijn, blijven zichtbaar op de kaart. Als die groep niet meer actief is, zullen ze verdwijnen.</string>
+    <string name="mapillary_menu_title_pano">Alleen 360°-foto\'s tonen</string>
+    <string name="rendering_value_black_name">Zwart</string>
+    <string name="copy_location_name">"Naam kopiëren "</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index 12bec60535..1a25e295de 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -1,20 +1,20 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_bakery">Piekarnia</string>
 	<string name="poi_alcohol">Sklep monopolowy</string>
 	<string name="poi_convenience">Sklep ogólnospożywczy</string>
 	<string name="poi_mall">Centrum handlowe</string>
-	<string name="poi_beverages">Napoje</string>
+	<string name="poi_beverages">Sklep z napojami</string>
 	<string name="poi_butcher">Sklep mięsny</string>
 	<string name="poi_deli">Delikatesy</string>
-	<string name="poi_farm">Produkty rolne</string>
+	<string name="poi_farm">Sklep z produktami rolnymi</string>
 	<string name="poi_greengrocer">Warzywniak</string>
-	<string name="poi_seafood">Owoce morza</string>
-	<string name="poi_confectionery">Cukiernia</string>
+	<string name="poi_seafood">Sklep z owocami morza</string>
+	<string name="poi_confectionery">Sklep cukierniczy</string>
 	<string name="poi_ice_cream">Lodziarnia</string>
 	<string name="poi_palaeontological_site">Stanowisko paleontologiczne</string>
 
 	<string name="poi_supermarket">Supermarket</string>
-	<string name="poi_tea">Sklep herbaciany</string>
+	<string name="poi_tea">Sklep z herbatą</string>
 	<string name="poi_dairy">Sklep z nabiałem</string>
 	<string name="poi_vending_machine">Automat sprzedający</string>
 
@@ -27,7 +27,7 @@
 	<string name="poi_bag">Sklep z torbami</string>
 	<string name="poi_bathroom_furnishing">Wyposażenie łazienek</string>
 	<string name="poi_bed">Sklep z pościelą</string>
-	<string name="poi_boutique">Butik</string>
+	<string name="poi_boutique">Butik modowy</string>
 	<string name="poi_carpet">Sklep z dywanami</string>
 	<string name="poi_chemist">Drogeria</string>
 	<string name="poi_clothes">Sklep odzieżowy</string>
@@ -40,7 +40,7 @@
 	<string name="poi_dive">Sprzęt do nurkowania</string>
 	<string name="poi_copyshop">Punkt ksero i drukowania</string>
 	<string name="poi_doityourself">Sklep dla majsterkowiczów</string>
-	<string name="poi_erotic">Seks-sklep</string>
+	<string name="poi_erotic">Sklep z artykułami erotycznymi</string>
 	<string name="poi_fishing">Sklep wędkarski</string>
 	<string name="poi_florist">Kwiaciarnia</string>
 	<string name="poi_frame">Ramy obrazowe</string>
@@ -61,34 +61,34 @@
 	<string name="poi_kiosk">Kiosk</string>
 	<string name="poi_kitchen">Meble kuchenne</string>
 	<string name="poi_mobile_phone">Telefony komórkowe</string>
-	<string name="poi_motorcycle">Motocykle</string>
+	<string name="poi_motorcycle">Sklep z motocyklami</string>
 	<string name="poi_musical_instrument">Instrumenty muzyczne</string>
 	<string name="poi_newsagent">Kiosk gazetowy</string>
 	<string name="poi_optician">Optyk</string>
 	<string name="poi_organic">Żywność ekologiczna</string>
 	<string name="poi_outdoor">Artykuły wyposażenia zewnętrznego</string>
 	<string name="poi_paint">Farby</string>
-	<string name="poi_pet">Zoologiczny</string>
+	<string name="poi_pet">Sklep zoologiczny</string>
 	<string name="poi_radiotechnics">Sklep elektroniczny</string>
 	<string name="poi_second_hand">Sklep z używanymi towarami</string>
 	<string name="poi_ship_chandler">Armator</string>
-	<string name="poi_sports">Sportowy</string>
-	<string name="poi_stationery">Papierniczy</string>
+	<string name="poi_sports">Sklep sportowy</string>
+	<string name="poi_stationery">Sklep papierniczy</string>
 	<string name="poi_tableware">Zastawy stołowe</string>
-	<string name="poi_ticket">Bilety</string>
-	<string name="poi_tobacco">Tytoniowy</string>
-	<string name="poi_toys">Zabawki</string>
+	<string name="poi_ticket">Sprzedaż biletów</string>
+	<string name="poi_tobacco">Sklep z wyrobami tytoniowymi</string>
+	<string name="poi_toys">Sklep z zabawkami</string>
 	<string name="poi_trade">Stoisko handlowe</string>
 	<string name="poi_vacuum_cleaner">Odkurzacze</string>
 	<string name="poi_variety_store">Sklep z tanimi rzeczami</string>
 	<string name="poi_video">Filmy</string>
 	<string name="poi_window_blind">Zasłony</string>
 	<string name="poi_department_store">Dom handlowy</string>
-	<string name="poi_electronics">RTV</string>
+	<string name="poi_electronics">Sklep z RTV</string>
 	<string name="poi_car">Salon/komis samochodowy</string>
 	<string name="poi_car_parts">Części samochodowe</string>
 	<string name="poi_atv">Quady</string>
-	<string name="poi_cosmetics">Drogeria</string>
+	<string name="poi_cosmetics">Sklep z kosmetykami</string>
 	<string name="poi_marketplace">Targowisko</string>
 	<string name="poi_sewing">Pasmanteria</string>
 
@@ -101,7 +101,7 @@
 	<string name="poi_fire_hose">Wąż pożarniczy</string>
 	<string name="poi_fire_water_pond">Zbiornik przeciwpożarowy</string>
 	<string name="poi_grit_bin">Piasek gaśniczy</string>
-	<string name="poi_ambulance_station">Stacja karetek</string>
+	<string name="poi_ambulance_station">Stacja karetek pogotowia</string>
 	<string name="poi_ses_station">Powiadamianie kryzysowe</string>
 	<string name="poi_mountain_pass">Przejście górskie</string>
 	<string name="poi_ford">Bród</string>
@@ -132,18 +132,18 @@
 	<string name="poi_parking_entrance">Wjazd na parking</string>
 	<string name="poi_garages">Garaże</string>
 
-	<string name="poi_public_transport_platform">Przystanek transportu miejskiego</string>
+	<string name="poi_public_transport_platform">Przystanek transportu publicznego</string>
 	<string name="poi_public_transport_platform_bus">Przystanek autobusowy</string>
 	<string name="poi_public_transport_platform_trolleybus">Przystanek trolejbusowy</string>
 	<string name="poi_bus_stop">Przystanek autobusowy</string>
 	<string name="poi_public_transport_platform_tram">Przystanek tramwajowy</string>
 	<string name="poi_tram_stop">Przystanek tramwajowy</string>
-	<string name="poi_public_transport_station">Dworzec transportu miejskiego</string>
+	<string name="poi_public_transport_station">Dworzec transportu publicznego</string>
 	<string name="poi_bus_station">Dworzec autobusowy</string>
 	<string name="poi_railway_station">Stacja kolejowa</string>
 	<string name="poi_railway_platform">Peron kolejowy</string>
 	<string name="poi_subway_entrance">Wejście do metra</string>
-	<string name="poi_subway_station">Stacja metra</string>
+	<string name="poi_subway_station">Tak</string>
 	<string name="poi_taxi">Postój taksówek</string>
 
 	<string name="poi_aerodrome">Lotnisko</string>
@@ -209,7 +209,7 @@
 	<string name="poi_landfill">Składowisko odpadów</string>
 	<string name="poi_waste_disposal">Śmietnik</string>
 	<string name="poi_pier">Molo</string>
-	<string name="poi_surveillance">Centrum nadzoru</string>
+	<string name="poi_surveillance">Obserwacja</string>
 	<string name="poi_observatory">Obserwatorium</string>
 	<string name="poi_astronomical_observatory">Astronomiczne</string>
 	<string name="poi_tower">Wieża</string>
@@ -235,12 +235,12 @@
 	<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">Instytucja publiczna</string>
+	<string name="poi_government">Instytucja rządowa</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_office_administrative">Urząd</string>
+	<string name="poi_tax_inspection">Urząd skarbowy</string>
+	<string name="poi_office_administrative">Urząd administracyjny</string>
 	<string name="poi_customs">Urząd celny</string>
 	<string name="poi_city">Miasto</string>
 	<string name="poi_town">Małe miasto</string>
@@ -296,7 +296,7 @@
 	<string name="poi_cricket">Krykiet</string>
 	<string name="poi_cycling">Kolarstwo</string>
 	<string name="poi_diving">Nurkowanie</string>
-	<string name="poi_scuba_diving">Nurkowanie</string>
+	<string name="poi_scuba_diving">Nurkowanie z akwalungiem</string>
 	<string name="poi_dog_racing">Wyścigi psów</string>
 	<string name="poi_golf">Golf</string>
 	<string name="poi_gymnastics">Gimnastyka</string>
@@ -316,7 +316,7 @@
 	<string name="poi_volleyball">Siatkówka</string>
 
 	<string name="poi_museum">Muzeum</string>
-	<string name="poi_memorial">Pomnik</string>
+	<string name="poi_memorial">Miejsce pamięci</string>
 	<string name="poi_archaeological_site">Wykopalisko archeologiczne</string>
 	<string name="poi_boundary_stone">Kamień graniczny</string>
 	<string name="poi_historic_cannon">Zabytkowa armata</string>
@@ -328,7 +328,7 @@
 	<string name="poi_rune_stone">Kamień runiczny</string>
 	<string name="poi_wreck">Wrak statku</string>
 	<string name="poi_historic_ship">Zabytkowy statek</string>
-	<string name="poi_monument">Monument</string>
+	<string name="poi_monument">Pomnik</string>
 	<string name="poi_zoo">Zoo</string>
 	<string name="poi_aquarium">Akwarium</string>
 	<string name="poi_theme_park">Park rozrywki</string>
@@ -381,7 +381,7 @@
 	<string name="poi_craft_blacksmith">Kowal</string>
 	<string name="poi_craft_brewery">Browar</string>
 	<string name="poi_craft_bookbinder">Introligator</string>
-	<string name="poi_craft_carpenter">Cieśla</string>
+	<string name="poi_craft_carpenter">Stolarz</string>
 	<string name="poi_craft_clockmaker">Zegarmistrz</string>
 	<string name="poi_craft_dressmaker">Krawiec (damskie ubrania)</string>
 	<string name="poi_craft_electrician">Elektryk</string>
@@ -428,7 +428,7 @@
 	<string name="poi_accountant">Księgowy</string>
 	<string name="poi_bitcoin_yes">Płatność bitcoinami</string>
 
-	<string name="poi_peak">Szczyt</string>
+	<string name="poi_peak">Szczyt góry</string>
 	<string name="poi_volcano">Wulkan</string>
 	<string name="poi_crater">Krater</string>
 	<string name="poi_waterfall">Wodospad</string>
@@ -501,34 +501,34 @@
 	<string name="poi_military_nuclear_explosion_site">Miejsce eksplozji jądrowej</string>
 <string name="poi_military_naval_base">Wojskowa baza morska</string>
 	<string name="poi_military_danger_area">Strefa zagrożenia</string>
-	<string name="poi_military_landuse">Strefa wojskowa</string>
+	<string name="poi_military_landuse">Teren wojskowy</string>
 	<string name="poi_accomodation">Noclegi</string>
 		<string name="poi_club">Klub</string>
 	<string name="poi_cafe_and_restaurant">Kawiarnia i restauracja</string>
 	<string name="poi_fuel_biodiesel">Biodiesel</string>
 	<string name="poi_fuel_lpg">LPG</string>
 	<string name="poi_fuel_cng">CNG</string>
-	<string name="poi_public_transport_stop_position">Przystanek transportu publicznego</string>
+	<string name="poi_public_transport_stop_position">Miejsce zatrzymywania transportu publicznego</string>
 	<string name="poi_halt">Przystanek kolejowy</string>
 	<string name="poi_rest_area">Miejsce obsługi podróżnych (bez sklepu)</string>
 
-	<string name="poi_industrial">Tereny przemysłowe</string>
+	<string name="poi_industrial">Obszar przemysłowy</string>
 	<string name="poi_emergency">Służby ratunkowe</string>
 	<string name="poi_aerialway_transport">Transport linowy</string>
 	<string name="poi_landuse">Przeznaczenie obszaru</string>
 	<string name="poi_service">Usługi</string>
-		<string name="poi_craft">Rzemieślnik</string>
+		<string name="poi_craft">Profesja</string>
 	<string name="poi_seamark">Żeglarstwo</string>
 	<string name="poi_medical_supply">Artykuły medyczne</string>
 	<string name="poi_fuel_diesel">Olej napędowy</string>
 	<string name="poi_fuel_gtl_diesel">Modyfikowany olej napędowy</string>
 	<string name="poi_fuel_hgv_diesel">Olej napędowy (ciężarówki)</string>
-	<string name="poi_fuel_octane_80">Benzyna 80 oktanów</string>
-	<string name="poi_fuel_octane_91">Benzyna 91 oktanów</string>
-	<string name="poi_fuel_octane_92">Benzyna 92 oktany</string>
-	<string name="poi_fuel_octane_95">Benzyna 95 oktanów</string>
-	<string name="poi_fuel_octane_98">Benzyna 98 oktanów</string>
-	<string name="poi_fuel_octane_100">Benzyna 100 oktanów</string>
+	<string name="poi_fuel_octane_80">Benzyna 80-oktanowa</string>
+	<string name="poi_fuel_octane_91">Benzyna 91-oktanowa</string>
+	<string name="poi_fuel_octane_92">Benzyna 92-oktanowa</string>
+	<string name="poi_fuel_octane_95">Benzyna 95-oktanowa</string>
+	<string name="poi_fuel_octane_98">Benzyna 98-oktanowa</string>
+	<string name="poi_fuel_octane_100">Benzyna 100-oktanowa</string>
 	<string name="poi_fuel_1_25">Paliwo 1:25</string>
 	<string name="poi_fuel_1_50">Paliwo 1:50</string>
 	<string name="poi_fuel_ethanol">Paliwo: etanol</string>
@@ -544,7 +544,7 @@
 	<string name="poi_junction">Skrzyżowanie</string>
 	<string name="poi_lock_gate">Śluza wodna</string>
 	<string name="poi_allotments">Ogródki działkowe</string>
-	<string name="poi_forest">Las</string>
+	<string name="poi_forest">Las zarządzany przez człowieka</string>
 	<string name="poi_farmyard">Podwórze w gospodarstwie</string>
 	<string name="poi_meadow">Łąka</string>
 	<string name="poi_landuse_railway">Obszar kolejowy</string>
@@ -561,13 +561,13 @@
 	<string name="poi_training">Sala treningowa</string>
 	<string name="poi_migration">Migracja</string>
 	<string name="poi_isolated_dwelling">Chatka</string>
-	<string name="poi_suburb">Dzielnica</string>
-	<string name="poi_quarter">Kwatera</string>
+	<string name="poi_suburb">Przedmieście</string>
+	<string name="poi_quarter">Dzielnica</string>
 	<string name="poi_neighbourhood">Osiedle</string>
 	<string name="poi_locality">Miejscowość</string>
 	<string name="poi_place_allotments">Ogródki działkowe</string>
 	<string name="poi_place_farm">Gospodarstwo rolne</string>
-	<string name="poi_residential">Teren zamieszkania</string>
+	<string name="poi_residential">Obszar zamieszkania</string>
 
 	<string name="poi_podiatrist">Podolog</string>
 	<string name="poi_it">Biuro IT</string>
@@ -615,7 +615,7 @@
 	<string name="poi_club_game">Klub gier</string>
 	<string name="poi_club_automobile">Klub motoryzacyjny</string>
 	<string name="poi_club_chess">Klub szachowy</string>
-	<string name="poi_club_cinema">Klub kinowy</string>
+	<string name="poi_club_cinema">Klub filmowy</string>
 	<string name="poi_club_fan">Fanklub</string>
 	<string name="poi_club_fishing">Klub wędkarski</string>
 	<string name="poi_club_veterans">Klub weteranów</string>
@@ -633,8 +633,8 @@
 
 	<string name="poi_charity">Sklep charytatywny</string>
 	<string name="poi_photo">Sklep fotograficzny</string>
-	<string name="poi_10pin">Bowling (10 pionów)</string>
-	<string name="poi_bowls">Bowls</string>
+	<string name="poi_10pin">Kręgle klasyczne (10 pionów)</string>
+	<string name="poi_bowls">Gra w kule</string>
 	<string name="poi_sport_motor">Sporty motorowe</string>
 	<string name="poi_rugby_union">Rugby union</string>
 	<string name="poi_rugby_league">Rugby league</string>
@@ -706,7 +706,7 @@
 	<string name="poi_wilderness_hut">Pustelnia</string>
 	<string name="poi_internet_access_service">Dostęp do Internetu: z obsługą</string>
 	
-	<string name="poi_wine_cellar">Winiarnia</string>
+	<string name="poi_wine_cellar">Piwniczka z winem</string>
 	<string name="poi_ski_rental">Wypożyczalnia nart</string>
 
 	<string name="poi_gallery">Galeria sztuki</string>
@@ -739,7 +739,7 @@
 
 	<string name="poi_craft_agricultural_engines">Silniki rolnicze (wystawa)</string>
 	<string name="poi_craft_carpet_layer">Kładzenie dywanów</string>
-	<string name="poi_craft_caterer">Dostawca</string>
+	<string name="poi_craft_caterer">Firma cateringowa</string>
 	<string name="poi_craft_glaziery">Szklarz</string>
 	<string name="poi_craft_insulation">Ocieplanie</string>
 	<string name="poi_craft_key_cutter">Dorabianie kluczy</string>
@@ -843,7 +843,7 @@
 	<string name="poi_music">Sklep muzyczny</string>
 	<string name="poi_tyres">Sklep z oponami</string>
 	<string name="poi_watches">Sklep z zegarkami</string>
-	<string name="poi_model">Modelarski</string>
+	<string name="poi_model">Sklep modelarski</string>
 	<string name="poi_weapons">Sklep z bronią</string>
 
 	<string name="poi_highway_crossing">Przejście dla pieszych</string>
@@ -851,7 +851,7 @@
 <string name="poi_entrance">Wejście</string>
 	<string name="poi_entrance_exit">Wyjście</string>
 
-	<string name="poi_barrier_entrance">Przejście</string>
+	<string name="poi_barrier_entrance">Przejście w murze lub płocie</string>
 	<string name="poi_entrance_main">Wejście główne</string>
 	<string name="poi_height_restrictor">Ogranicznik wysokości</string>
 	<string name="poi_religious">Obszar religijny</string>
@@ -863,7 +863,7 @@
 	<string name="poi_swimming_pool_shop">Sklep z akcesoriami basenowymi</string>
 	<string name="poi_games">Gry</string>
 	<string name="poi_trophy">Puchary, nagrody</string>
-	<string name="poi_video_games">Gry video</string>
+	<string name="poi_video_games">Gry wideo</string>
 	<string name="poi_pyrotechnics">Materiały pirotechniczne</string>
 	<string name="poi_bollard">Słupek</string>
 	<string name="poi_cycle_barrier">Bariera rowerowa</string>
@@ -922,7 +922,7 @@
 	<string name="poi_abandoned_poi">Obiekt opuszczony</string>
 	<string name="poi_disused">Wyłączony z użycia</string>
 
-	<string name="poi_operator">Operator</string>
+	<string name="poi_operator">Zarządzający</string>
 	<string name="poi_brand">Marka</string>
 	<string name="poi_fee_yes">Tak</string>
 
@@ -955,7 +955,7 @@
 	<string name="poi_recycling_cartons">Kartony</string>
 	<string name="poi_recycling_cardboard">Tektury</string>
 	<string name="poi_recycling_magazines">Czasopisma</string>
-	<string name="poi_recycling_paper_packaging">Papierowe opakowania</string>
+	<string name="poi_recycling_paper_packaging">Opakowania papierowe</string>
 	<string name="poi_recycling_small_appliances">Drobny sprzęt</string>
 	<string name="poi_recycling_wood">Drewno</string>
 	<string name="poi_recycling_books">Książki</string>
@@ -971,13 +971,13 @@
 	<string name="poi_recycling_white_goods">Sprzęt AGD</string>
 	<string name="poi_recycling_cooking_oil">Olej spożywczy</string>
 	<string name="poi_recycling_engine_oil">Olej silnikowy</string>
-	<string name="poi_recycling_plastic_bags">Plastikowe torby</string>
-	<string name="poi_recycling_hazardous_waste">Niebezpieczne odpady</string>
+	<string name="poi_recycling_plastic_bags">Torby plastikowe</string>
+	<string name="poi_recycling_hazardous_waste">Odpady niebezpieczne</string>
 	<string name="poi_recycling_mobile_phones">Telefony komórkowe</string>
 	<string name="poi_recycling_hydrargyrum">Rtęć</string>
 	<string name="poi_recycling_computers">Komputery</string>
 	<string name="poi_recycling_tyres">Opony</string>
-	<string name="poi_recycling_tv_monitor">telewizory, monitory</string>
+	<string name="poi_recycling_tv_monitor">Telewizory, monitory</string>
 	<string name="poi_recycling_tetrapak">Tetra Pak</string>
 	<string name="poi_recycling_rubble">Gruz</string>
 	<string name="poi_recycling_cds">Płyty CD</string>
@@ -1020,7 +1020,7 @@
 
 	<string name="poi_denomination_catholic">Katolicyzm</string>
 	<string name="poi_denomination_baptist">Baptyzm</string>
-	<string name="poi_denomination_roman_catholic">Rzymski katolicyzm</string>
+	<string name="poi_denomination_roman_catholic">Katolicyzm rzymski</string>
 	<string name="poi_denomination_orthodox">Prawosławie</string>
 	<string name="poi_denomination_lutheran">Luteranizm</string>
 	<string name="poi_denomination_sunni">Sunnizm</string>
@@ -1029,11 +1029,11 @@
 	<string name="poi_denomination_anglican">Anglikanizm</string>
 	<string name="poi_denomination_presbyterian">Prezbiterianizm</string>
 	<string name="poi_denomination_evangelical">Ewangelicyzm</string>
-	<string name="poi_denomination_russian_orthodox">Rosyjskie prawosławie</string>
+	<string name="poi_denomination_russian_orthodox">Prawosławie rosyjskie</string>
 	<string name="poi_denomination_pentecostal">Pentekostalizm</string>
 	<string name="poi_denomination_mormon">Mormonizm</string>
 	<string name="poi_denomination_jehovahs_witness">Świadkowie Jehowy</string>
-	<string name="poi_denomination_greek_orthodox">Greckie prawosławie</string>
+	<string name="poi_denomination_greek_orthodox">Prawosławie greckie</string>
 	<string name="poi_denomination_reformed">Kościół reformowany</string>
 	<string name="poi_denomination_seventh_day_adventist">Adwentyści Dnia Siódmego</string>
 	<string name="poi_denomination_new_apostolic">Kościół Nowoapostolski</string>
@@ -1165,7 +1165,7 @@
 	<string name="poi_monitoring_station">Stacja monitoringu</string>
 	<string name="poi_office_religion">Biuro religijne</string>
 	<string name="poi_highway_steps">Schody</string>
-	<string name="poi_political_party">Biuro partii</string>
+	<string name="poi_political_party">Biuro partii politycznej</string>
 	<string name="poi_foundation">Biuro fundacji</string>
 	<string name="poi_tax_advisor">Biuro doradcy podatkowego</string>
 
@@ -1173,7 +1173,7 @@
 	<string name="poi_denomination_church_of_england">Kościół Anglii</string>
 	<string name="poi_denomination_church_of_scotland">Kościół Szkocji</string>
 	<string name="poi_denomination_salvation_army">Armia Zbawienia</string>
-	<string name="poi_denomination_bulgarian_orthodox">Bułgarski ortodoksyjny</string>
+	<string name="poi_denomination_bulgarian_orthodox">Prawosławie bułgarskie</string>
 	<string name="poi_denomination_united_methodist">Zjednoczeni metodyści</string>
 	<string name="poi_power_pole">Słup energetyczny</string>
 
@@ -1185,7 +1185,7 @@
 
 	<string name="poi_lighting_tower">Maszt oświetleniowy</string>
 	<string name="poi_greenfield">Teren niezagospodarowany</string>
-	<string name="poi_capital">Stolica</string>
+	<string name="poi_capital">Tak</string>
 	<string name="poi_religion_multifaith">Wielowyznaniowość</string>
 	<string name="poi_denomination_shia">Szyityzm</string>
 	<string name="poi_denomination_united">Zjednoczony Kościół Kanady</string>
@@ -1197,22 +1197,22 @@
 	<string name="poi_denomination_adventist">Adwentyści</string>
 	<string name="poi_denomination_nazarene">Kościół Nazarejczyka</string>
 	<string name="poi_denomination_old_believers">Staroobrzędowcy</string>
-	<string name="poi_denomination_serbian_orthodox">Serbski prawosławny</string>
+	<string name="poi_denomination_serbian_orthodox">Prawosławie serbskie</string>
 	<string name="poi_denomination_armenian_apostolic">Apostolski Kościół Ormiański</string>
 	<string name="poi_denomination_dutch_reformed">Holenderski Kościół Reformowany</string>
 	<string name="poi_denomination_apostolic">Kościół Apostolski</string>
 	<string name="poi_denomination_latter_day_saints">Kościół Jezusa Chrystusa Świętych w Dniach Ostatnich</string>
 	<string name="poi_denomination_church_of_christ">Kościół Chrystusowy</string>
-	<string name="poi_denomination_georgian_orthodox">Gruziński prawosławny</string>
-	<string name="poi_denomination_romanian_orthodox">Rumuński prawosławny</string>
+	<string name="poi_denomination_georgian_orthodox">Prawosławie gruzińskie</string>
+	<string name="poi_denomination_romanian_orthodox">Prawosławie rumuńskie</string>
 	<string name="poi_denomination_coptic_orthodox">Koptyjski</string>
 	<string name="poi_denomination_shaktism">Śaktyzm</string>
 	<string name="poi_denomination_shingon_shu">Shingon</string>
 	<string name="poi_denomination_maronite">Maronityzm</string>
 	<string name="poi_denomination_mahayana">Mahajana</string>
 
-	<string name="poi_internet_access_yes">Dostęp do internetu: tak</string>
-	<string name="poi_internet_access_no">Dostęp do internetu: nie</string>
+	<string name="poi_internet_access_yes">Dostęp do Internetu: tak</string>
+	<string name="poi_internet_access_no">Dostęp do Internetu: nie</string>
 
 	<string name="poi_mobile">Telefon komórkowy</string>
 	<string name="poi_drinking_water_no">Nie</string>
@@ -1256,7 +1256,7 @@
 	<string name="poi_bunker_silo">Silos bunkrowy</string>
 	<string name="poi_denomination_nondenominational">Bezwyznaniowy</string>
 	<string name="poi_denomination_congregational">Kongregacyjny</string>
-	<string name="poi_denomination_spiritist">Spirytyczny</string>
+	<string name="poi_denomination_spiritist">Spirytyzm</string>
 	<string name="poi_denomination_united_church_of_christ">Zjednoczony Kościół Chrystusowy</string>
 	<string name="poi_denomination_ethiopian_orthodox_tewahedo">Etiopski ortodoksyjny tewahedo</string>
 	<string name="poi_denomination_iglesia_ni_cristo">Iglesia ni Cristo</string>
@@ -1270,11 +1270,11 @@
 	<string name="poi_disease_aids_yes">AIDS: tak</string>
 	<string name="poi_disease_aids_no">AIDS: nie</string>
 
-	<string name="poi_delivery_yes">Dostawa do domu</string>
+	<string name="poi_delivery_yes">Dostawa</string>
 	<string name="poi_delivery_no">Brak dostawy</string>
 	<string name="poi_delivery_only">Wyłącznie dostawa</string>
 
-	<string name="poi_microbrewery_yes">Browar rzemieślniczy</string>
+	<string name="poi_microbrewery_yes">Tak</string>
 	<string name="poi_microbrewery_no">Brak browaru rzemieślniczego</string>
 
 	<string name="poi_takeaway_yes">Na wynos</string>
@@ -1411,7 +1411,7 @@
 	<string name="poi_supervised_yes">Nadzorowany</string>
 	<string name="poi_rural">Wiejski</string>
 
-	<string name="poi_military_office">Koszary</string>
+	<string name="poi_military_office">Urząd wojskowy</string>
 	<string name="poi_debris">Ruiny</string>
 	<string name="poi_supervised_no">Bez nadzoru</string>
 	<string name="poi_wheelchair_limited">Ograniczony</string>
@@ -1592,7 +1592,7 @@
 	<string name="poi_content_sewage">Zawartość: ścieki</string>
 	<string name="poi_content_wastewater">Zawartość: ścieki</string>
 	<string name="poi_content_fodder">Zawartość: pasza</string>
-	<string name="poi_trade_wood">Drewno</string>
+	<string name="poi_trade_wood">Materiały drewniane</string>
 	<string name="poi_trade_tile">Kafelki</string>
 
 	<string name="poi_bicycle_parking_anchors">Kotwice</string>
@@ -1833,8 +1833,8 @@
 	<string name="poi_payment_sube_no">Karty SUBE nieakceptowane</string>
 	<string name="poi_payment_via_verde_yes">Via Verde</string>
 	<string name="poi_payment_via_verde_no">Via Verde nieakceptowane</string>
-	<string name="poi_payment_meal_voucher_yes">Kartki na mięso</string>
-	<string name="poi_payment_meal_voucher_no">Kartki na mięso nieakceptowane</string>
+	<string name="poi_payment_meal_voucher_yes">Kupon posiłkowy</string>
+	<string name="poi_payment_meal_voucher_no">Kupony posiłkowe nieakceptowane</string>
 	<string name="poi_payment_paypal_yes">PayPal</string>
 	<string name="poi_payment_paypal_no">PayPal nieakceptowany</string>
 	<string name="poi_payment_u_key_yes">U-Key</string>
@@ -1973,7 +1973,7 @@
 	<string name="poi_memorial_blue_plaque">Niebieska tablica</string>
 	<string name="poi_memorial_cross">Krzyż</string>
 	<string name="poi_memorial_vehicle">Pojazd</string>
-	<string name="poi_memorial_stolperstein">Stolperstein</string>
+	<string name="poi_memorial_stolperstein">Kamień pamięci</string>
 	<string name="poi_memorial_obelisk">Obelisk</string>
 	<string name="poi_memorial_column">Kolumna</string>
 	<string name="poi_memorial_stupa">Stupa</string>
@@ -2126,7 +2126,7 @@
 	<string name="poi_animal_boarding">Hotel dla zwierząt</string>
 	<string name="poi_craft_electronics_repair">Naprawa elektroniki</string>
 	<string name="poi_architecture_modern">Architektura: modernizm</string>
-	<string name="poi_architecture_stalinist_neoclassicism">Architektura: socrealizm (stalinistyczny neoklasycyzm)</string>
+	<string name="poi_architecture_stalinist_neoclassicism">Architektura: socrealizm (stalinowski neoklasycyzm)</string>
 	<string name="poi_architecture_eclectic">Architektura: eklektyzm</string>
 	<string name="poi_architecture_new_objectivity">Architektura: Nowa Rzeczowość (Realizm Magiczny)</string>
 	<string name="poi_architecture_contemporary">Architektura: współczesna</string>
@@ -2235,8 +2235,8 @@
 	<string name="poi_elevator_no">Brak windy</string>
 
 	<string name="poi_model_aerodrome">Lotnisko modelarskie</string>
-	<string name="poi_fuel_91ul">Benzyna 91 oktanów bezołowiowa</string>
-	<string name="poi_fuel_100ll">Benzyna 100 oktanów ołowiowa</string>
+	<string name="poi_fuel_91ul">Benzyna 91-oktanowa bezołowiowa</string>
+	<string name="poi_fuel_100ll">Benzyna 100-oktanowa ołowiowa</string>
 	<string name="poi_fuel_autogas">LPG samolotowy</string>
 	<string name="poi_fuel_jeta1">Paliwo Jet A-1</string>
 	<string name="poi_fuel_adblue">Dodatek AdBlue (wodny roztwór mocznika)</string>
@@ -2305,7 +2305,7 @@
 	<string name="poi_power_supply_no">Prąd: nie</string>
 	<string name="poi_power_supply_cee_17_blue">Prąd (wtyczka): CEE 17 niebieska (IEC 60309)</string>
 	<string name="poi_power_supply_cee_7_4">Prąd (wtyczka): CEE 7/4 (typ F)</string>
-	<string name="poi_power_supply_cee_7_5">Prąd wtyczka: CEE 7/5 (typ E))</string>
+	<string name="poi_power_supply_cee_7_5">Prąd (wtyczka): CEE 7/5 (typ E)</string>
 	<string name="poi_power_supply_nema_5_15">Prąd (wtyczka): NEMA 5-15 (typ B)</string>
 
 	<string name="poi_capacity_tents">Pojemność pola (namiotów)</string>
@@ -2342,7 +2342,7 @@
 	<string name="poi_theatre_genre_philharmonic">Filharmonia</string>
 	<string name="poi_theatre_genre_musical">Teatr muzyczny</string>
 	<string name="poi_theatre_genre_drama">Teatr dramatyczny</string>
-	<string name="poi_theatre_genre_puppet">Lalkowy</string>
+	<string name="poi_theatre_genre_puppet">Teatr lalek</string>
 	<string name="poi_theatre_genre_comedy">Teatr bulwarowy</string>
 	<string name="poi_theatre_genre_chamber_music">Teatr kameralny (solisty)</string>
 	<string name="poi_theatre_genre_marionette">Marionetkowy</string>
@@ -3056,7 +3056,7 @@
 	<string name="poi_fire_hydrant_water_source">Źródło wody</string>
 	<string name="poi_payment_toll_type">Metoda płatności</string>
 	<string name="poi_traffic_signals_sound">Sygnał dźwiękowy</string>
-	<string name="poi_highway_crossing_type">Typ</string>
+	<string name="poi_highway_crossing_type">Rodzaj</string>
 	<string name="poi_tactile_paving">Wypustki dla niewidomych</string>
 	<string name="poi_service_general">Usługa</string>
 	<string name="poi_brushless">Bezszczotkowa</string>
@@ -3090,7 +3090,7 @@
 	<string name="poi_resort_type">Rodzaj</string>
 	<string name="poi_piste_difficulty">Trudność stoku</string>
 	<string name="poi_piste_grooming">Typ ratrakowania</string>
-	<string name="poi_theatre_genre">Typ</string>
+	<string name="poi_theatre_genre">Gatunek</string>
 	<string name="poi_outdoor_seating">Siedzenia na zewnątrz</string>
 	<string name="poi_fee">Opłata</string>
 	<string name="poi_smoking">Palenie</string>
@@ -3801,7 +3801,7 @@
 	<string name="poi_cable_number">Numer przewodu</string>
 	<string name="poi_via_ferrata_scale">Trudność</string>
 
-<string name="poi_glacier_type">Typ lodowca</string>
+<string name="poi_glacier_type">Rodzaj lodowca</string>
 
 <string name="poi_glacier_type_icecap">Czapa lodowa</string>
 	<string name="poi_glacier_type_icefield">Pole lodowe</string>
@@ -3908,4 +3908,42 @@
 <string name="poi_atm">ATM</string>
 	<string name="poi_shoe_repair">Naprawa obuwia</string>
 
-</resources>
+<string name="poi_bulk_purchase">Zakup hurtowy</string>
+	<string name="poi_substation_type">Rodzaj</string>
+
+<string name="poi_bulk_purchase_yes">Tak</string>
+	<string name="poi_bulk_purchase_only">Tylko</string>
+
+	<string name="poi_pipeline_substation">Podstacja rurociągów</string>
+	<string name="poi_substation_transmission">Transmisja</string>
+	<string name="poi_substation_distribution">Dystrybucja</string>
+	<string name="poi_substation_minor_distribution">Mniejsza dystrybucja</string>
+	<string name="poi_substation_industrial">Przemysłowy</string>
+	<string name="poi_substation_transition">Przejście</string>
+	<string name="poi_substation_traction">Trakcja</string>
+	<string name="poi_substation_converter">Konwerter</string>
+	<string name="poi_substation_compensation">Odszkodowanie</string>
+
+	<string name="poi_substation_compression">Kompresja</string>
+	<string name="poi_substation_measurement">Pomiar</string>
+	<string name="poi_substation_valve">Zawór</string>
+	<string name="poi_substation_valve_group">Grupa zaworów</string>
+	<string name="poi_substation_inspection_gauge">Wskaźnik inspekcji</string>
+	<string name="poi_substation_field_gathering">Pole gromadzenia</string>
+    <string name="poi_craft_confectionery">Produkcja słodyczy</string>
+    <string name="poi_shop_wholesale">Hurtownia</string>
+    <string name="poi_books_type">Książki</string>
+    <string name="poi_laboratory">Laboratorium medyczne</string>
+    <string name="poi_blood_donation">Punkt poboru krwi</string>
+    <string name="poi_books_comic">Komiksy</string>
+    <string name="poi_books_antiquarian">Antykwariat</string>
+    <string name="poi_books_religion">Religijne</string>
+    <string name="poi_books_academic">Akademickie</string>
+    <string name="poi_books_children">Dla dzieci</string>
+    <string name="poi_atoll">Atol</string>
+    <string name="poi_denotation">Denotacja</string>
+    <string name="poi_toll_gantry">Brama poboru opłat</string>
+    <string name="poi_childcare">Opieka nad dziećmi</string>
+    <string name="poi_denotation_natural_monument">Pomnik przyrody</string>
+    <string name="poi_denotation_landmark">Punkt orientacyjny</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 8da9dacf92..3bab0d0199 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="use_transparent_map_theme">Przezroczysty styl</string>
@@ -1979,7 +1979,7 @@ Długość %2$s</string>
     <string name="default_speed_system_descr">Zdefiniuj jednostkę prędkości.</string>
     <string name="default_speed_system">Jednostki prędkości</string>
     <string name="si_nm">Mile morskie</string>
-    <string name="nm">nmi</string>
+    <string name="nm">Mm</string>
     <string name="si_kmh">Kilometry na godzinę</string>
     <string name="si_mph">Mile na godzinę</string>
     <string name="si_m_s">Metry na sekundę</string>
@@ -2234,15 +2234,15 @@ Długość %2$s</string>
     <string name="osm_live_subscription">Subskrypcja OsmAnd Live</string>
     <string name="osm_live_email_desc">Do informowania Ciebie o wkładzie.</string>
     <string name="osm_live_user_public_name">Nazwa publiczna</string>
-    <string name="osm_live_hide_user_name">Ukrywanie nazwy w raportach</string>
+    <string name="osm_live_hide_user_name">Nie pokazuj mojej nazwy w raportach</string>
     <string name="osm_live_support_region">Wspierane regiony</string>
     <string name="osm_live_month_cost">Koszt miesięczny</string>
     <string name="osm_live_month_cost_desc">Miesięczna płatność</string>
     <string name="osm_live_active">Aktywny</string>
     <string name="osm_live_not_active">Nieaktywny</string>
-    <string name="osm_live_enter_user_name">Proszę wprowadź nazwę publiczną</string>
+    <string name="osm_live_enter_user_name">Proszę wpisać nazwę publiczną</string>
     <string name="osm_live_region_desc">Część wpłat zostanie wysłana do użytkowników OSM, którzy prześlą zmiany na mapie w tym regionie.</string>
-    <string name="osm_live_ask_for_purchase">Należy najpierw zakupić subskrypcję OsmAnd Live</string>
+    <string name="osm_live_ask_for_purchase">Proszę najpierw zakupić subskrypcję OsmAnd Live</string>
 
     <string name="osm_live_header">Ten abonament umożliwia cogodzinną aktualizację dla map z całego świata. Część dochodów powraca do społeczności OSM i jest wypłacana za każdą edycję OSM. Jeśli lubisz OsmAnd i OSM i chcesz je wspierać i być przez nie wspierany, jest to doskonały sposób, aby to zrobić.</string>
     
@@ -2352,7 +2352,7 @@ Długość %2$s</string>
     <string name="update_all_maps_now">Uaktualnić wszystkie mapy?</string>
     <string name="clear_tile_data">Wyczyść wszystkie kafelki</string>
     <string name="osm_live_payment_desc">Opłata za subskrypcję na miesiąc. Anuluj ją w Google Play w dowolnym momencie.</string>
-    <string name="donation_to_osm">Dotacja dla społeczności OpenStreetMap</string>
+    <string name="donation_to_osm">Darowizna dla społeczności OpenStreetMap</string>
     <string name="donation_to_osm_desc">Część z dotacji jest przekazywana użytkownikom OSM, którzy wprowadzają zmiany na mapie OpenStreetMap. Koszt subskrypcji pozostaje taki sam.</string>
     <string name="osm_live_subscription_desc">Subskrypcje pozwalają na cogodzinne, codzienne i cotygodniowe uaktualnienia i nieograniczone liczbą pobieranie map całego świata.</string>
     <string name="driving_region_australia">Australia</string>
@@ -2588,7 +2588,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="subscribe_email_desc">Zapisz się do naszej subskrypcji dotyczącej rabatów na aplikację i zgarnij 3 dodatkowe pobrania map!</string>
     <string name="depth_contour_descr">Mapy przedstawiające punkty głębokości i poziomice dna morskiego.</string>
     <string name="sea_depth_thanks">Dziękujemy za zakup map batymetrycznych</string>
-    <string name="index_item_depth_contours_osmand_ext">Mapy batymetryczne</string>
+    <string name="index_item_depth_contours_osmand_ext">Morskie kontury głębokości</string>
     <string name="index_item_depth_points_southern_hemisphere">Mapa batymetryczna półkuli południowej</string>
     <string name="index_item_depth_points_northern_hemisphere">Mapa batymetryczna półkuli północnej</string>
     <string name="download_depth_countours">Mapy batymetryczne</string>
@@ -2683,7 +2683,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="mapillary_menu_title_tile_cache">Pamięć podręczna kafelków</string>
     <string name="mapillary_menu_descr_dates">Wyświetl tylko dodane obrazy</string>
     <string name="mapillary_menu_edit_text_hint">Proszę wprowadzić nazwę użytkownika</string>
-    <string name="mapillary_menu_filter_description">Filtruje obrazy według nazwy użytkownika lub daty. Są aktywne tylko dla większych przybliżeń.</string>
+    <string name="mapillary_menu_filter_description">Filtrowanie obrazów przez zgłaszającego, według daty lub typu. Tylko aktywne w zbliżenie zoom.</string>
     <string name="mapillary_menu_descr_username">Wyświetl obrazy dodane tylko przez</string>
     <string name="store_tracks_in_monthly_directories">Ślady w miesięcznych katalogach</string>
     <string name="store_tracks_in_monthly_directories_descrp">Przechowuje zarejestrowane ślady w podkatalogach odpowiadającym miesiącom (np. 2018-01).</string>
@@ -2776,7 +2776,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="ascendingly">rosnąco</string>
     <string name="date_added">Data dodania</string>
     <string name="order_by">Porządkowanie według:</string>
-    <string name="show_guide_line">Pokaż linie przewodnie</string>
+    <string name="show_guide_line">Linie przewodnie</string>
     <string name="show_arrows_on_the_map">Strzałki na mapie</string>
     <string name="show_passed">Wyświetl ominięte</string>
     <string name="hide_passed">Ukryj ominięte</string>
@@ -2829,7 +2829,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="show_guide_line_descr">Wyświetla na mapie linię łączącą aktualne położenie z położeniem aktywnego znacznika.</string>
     <string name="show_arrows_descr">Wyświetla na mapie jedną lub dwie strzałki wskazujące kierunek do aktywnych znaczników.</string>
     <string name="distance_indication_descr">Wybiera sposób wyświetlania odległości od aktywnego znacznika.</string>
-    <string name="active_markers_descr">Wybierz liczbę wskaźników kierunku do wyświetlenia.</string>
+    <string name="active_markers_descr">Wybiera liczbę wyświetlanych wskaźników kierunku.</string>
     <string name="looking_for_tracks_with_waypoints">Wyszukiwanie ścieżek z punktami</string>
     <string name="shared_string_more_without_dots">Więcej</string>
     <string name="appearance_on_the_map">Wygląd na mapie</string>
@@ -2894,7 +2894,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="av_locations_selected_desc">Plik GPX ze współrzędnymi i danymi wybranych notatek.</string>
     <string name="av_locations_all_desc">Plik GPX ze współrzędnymi i danymi wszystkich notatek.</string>
     <string name="modify_the_search_query">Modyfikuj zapytanie.</string>
-    <string name="one_tap_active_descr">Naciśnij znacznik na mapie, by przesunąć do na górę listy aktywnych znaczników bez otwierania menu kontekstowego.</string>
+    <string name="one_tap_active_descr">Dotknięciem znacznika na mapie przenosi go na górę listy aktywnych znaczników, bez otwierania menu kontekstowego.</string>
     <string name="one_tap_active">Aktywacja jednym dotknięciem</string>
     <string name="show_tunnels">Tunele</string>
 <string name="import_as_gpx">Zapisz plik w formacie GPX</string>
@@ -2967,17 +2967,17 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="daily_map_updates">Uaktualnienia map: <b>co godzinę</b></string>
     <string name="wikivoyage_offline">Wikipodróże offline</string>
     
-    <string name="unlimited_downloads">Nieograniczone pobrania</string>
+    <string name="unlimited_downloads">Nieograniczone pobieranie</string>
     <string name="images_cache">Pamięć podręczna obrazów</string>
     <string name="wikivoyage_travel_guide">Przewodnik podróży</string>
     <string name="wikivoyage_travel_guide_descr">Przewodniki po najciekawszych miejscach na świecie w aplikacji OsmAnd, bez połączenia z Internetem.</string>
     <string name="in_app_purchase">Zakupy w aplikacji</string>
     <string name="in_app_purchase_desc">Płatność jednorazowa</string>
-    <string name="in_app_purchase_desc_ex">Raz zakupiony, będzie stale dostępny.</string>
+    <string name="in_app_purchase_desc_ex">Po zakupie będzie on trwale dostępny.</string>
     <string name="purchase_unlim_title">Kup - %1$s</string>
     <string name="purchase_subscription_title">Subskrybuj - %1$s</string>
 
-    <string name="unlock_all_features">Odblokowanie wszystkich funkcji OsmAnd</string>
+    <string name="unlock_all_features">Odblokuj wszystkie funkcje OsmAnd</string>
 
     <string name="purchase_dialog_title">Wybierz plan</string>
     <string name="purchase_dialog_subtitle">Wybierz odpowiedni element:</string>
@@ -3080,9 +3080,9 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="mapnik_render_descr">Stary, domyślny styl renderowania wzorowany na stylu „Mapnik”. Kluczowe cechy: kolory podobne do użytych w stylu „Mapnik”.</string>
     <string name="touring_view_render_descr">Styl o dużej ilości szczegółów, przeznaczony do podróżowania. Zawiera wszystkie opcje konfiguracyjne domyślnego stylu i dodatkowo wyświetla możliwie dużo szczegółów, a zwłaszcza wszystkie drogi, ścieżki i inne obiekty związane z podróżowaniem. Odróżnia wizualnie różne rodzaje dróg, przypominając w tym wiele atlasów podróżniczych. Zapewnia duży kontrast podczas używania na zewnątrz budynków oraz tryb dzienny i nocny.</string>
     <string name="default_render_descr">Styl ogólnego przeznaczenia. Zapewnia uproszczone renderowanie w gęsto zaludnionych miastach. Kluczowe cechy: poziomice, drogi, jakość nawierzchni, ograniczenia dostępu, oznaczenia dróg, renderowanie ścieżek z uwzględnieniem klasyfikacji trudności, obiekty sportów spływowych.</string>
-    <string name="contour_lines_hillshade_maps">Poziomice i cieniowanie rzeźby terenu</string>
+    <string name="contour_lines_hillshade_maps">Linie konturowe i Mapy wzgórz</string>
     <string name="get_osmand_live">Zdobądź OsmAnd Live i odblokuj wszystkie funkcjonalności: dzienne uaktualnienia map z nieograniczoną liczbą pobrań, wszystkie płatne i nieodpłatne wtyczki, Wikipedię, przewodniki Wikipodróży i wiele innych.</string>
-    <string name="purchase_dialog_travel_description">Proszę zakupić jeden z następujących, aby otrzymać funkcjonalność przewodnika podróży bez połączenia sieciowego:</string>
+    <string name="purchase_dialog_travel_description">Kup jedną z poniższych opcji, aby otrzymać funkcję przewodnika offline:</string>
     <string name="open_wikipedia_link_online">Otwórz odnośnik do Wikipedii online</string>
     <string name="read_wikipedia_offline_description">Zasubskrybuj OsmAnd Live, by czytać artykuły Wikipedii i Wikipodróży offline.</string>
     <string name="read_wikipedia_offline">Czytaj Wikipedię offline</string>
@@ -3189,10 +3189,59 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="shared_string_restore">Przywróć</string>
     <string name="keep_passed_markers">Zachowanie miniętych znaczników na mapie</string>
     <string name="more_transport_on_stop_hint">Na tym przystanku zatrzymuje się więcej środków transportu.</string>
-    <string name="markers_remove_dialog_msg">Usuń znacznik mapy \'%s\'\?</string>
+    <string name="markers_remove_dialog_msg">Usunąć znacznik mapy „%s”\?</string>
     <string name="edit_map_marker">Edytuj znacznik mapy</string>
     <string name="third_party_application">Aplikacja innej firmy</string>
     <string name="search_street">Wyszukaj ulicę</string>
-    <string name="start_search_from_city">Rozpocznij wyszukiwanie z miasta</string>
+    <string name="start_search_from_city">Najpierw wybierz miasto</string>
     <string name="keep_passed_markers_descr">Znaczniki dodane jako grupa ulubionych lub punkty trasy GPX oznaczone jako przekazane pozostaną na mapie. Jeśli grupa nie jest aktywna, znaczniki znikną z mapy.</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Plan i ceny</string>
+    <string name="osm_live_payment_monthly_title">Płać co miesiąc</string>
+    <string name="osm_live_payment_3_months_title">Zapłać raz na 3 miesiące</string>
+    <string name="osm_live_payment_annual_title">Zapłać raz w roku</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / miesiąc</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / miesiąc</string>
+    <string name="osm_live_payment_discount_descr">Zapisz %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Twoja aktualna subskrypcja</string>
+    <string name="osm_live_payment_renews_monthly">Odnawia się co miesiąc</string>
+    <string name="osm_live_payment_renews_quarterly">Odnawia się co kwartał</string>
+    <string name="osm_live_payment_renews_annually">Odnawia się co roku</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Wybierz dogodny okres płatności:</string>
+    <string name="osm_live_payment_contribute_descr">Część dochodu przeznacza się na współtwórców OpenStreetMap.</string>
+    <string name="powered_by_osmand">Obsługiwane przez OsmAnd</string>
+    <string name="osm_live_subscriptions">Subskrypcje</string>
+    <string name="mapillary_menu_title_pano">Wyświetlaj tylko obrazy 360°</string>
+    <string name="shared_string_launch">Włącz</string>
+    <string name="lang_gn_py">Guarani</string>
+    <string name="run_full_osmand_msg">Korzystasz z mapy {0}, która jest udostępniona przez OsmAnd. Czy chcesz włączyć pełną wersję OsmAnd\?</string>
+    <string name="run_full_osmand_header">Włączyć OsmAnd\?</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Pojemność</string>
+    <string name="shared_string_width">Szerokość</string>
+    <string name="shared_string_height">Wysokość</string>
+    <string name="swap_start_and_destination">Odwróć start i cel</string>
+    <string name="add_destination_point">Dodaj cel trasy</string>
+    <string name="add_intermediate_point">Dodaj punkt pośredni</string>
+    <string name="add_start_point">Dodaj punkt początkowy</string>
+    <string name="intermediate_waypoint">Punkt pośredni: %1$s</string>
+    <string name="waypoints">Punkty trasy: %1$s</string>
+    <string name="transfers">przesiadki: %1$s</string>
+    <string name="on_foot">pieszo: %1$s</string>
+    <string name="route_way">Trasa: %1$s</string>
+    <string name="points_of_interests">Użyteczne miejsca (UM)</string>
+    <string name="waiting_for_route_calculation">Oczekiwanie na wyznaczenie trasy</string>
+    <string name="app_mode_public_transport">Transport publiczny</string>
+    <string name="avoid_roads_descr">Wybierz, na mapie lub z listy poniżej, drogę, którą chcesz unikać podczas nawigacji:</string>
+    <string name="show_along_the_route">Pokaż na trasie</string>
+    <string name="simulate_navigation">Symulacja nawigacji</string>
+    <string name="choose_track_file_to_follow">Wybierz plik trasy do śledzenia</string>
+    <string name="voice_announcements">Komunikaty głosowe</string>
+    <string name="intermediate_destinations">Pośrednie cele podróży: %1$s</string>
+    <string name="arrive_at_time">Dotrzesz do celu o %1$s</string>
+    <string name="quick_action_switch_day_night_descr">Naciśnięcie przycisku zmieni pomiędzy trybem Dziennym i Nocnym w OsmAndzie</string>
+    <string name="quick_action_switch_day_mode">Tryb Dzienny</string>
+    <string name="quick_action_switch_night_mode">Tryb Nocny</string>
+    <string name="quick_action_day_night_switch_mode">Zmień tryb Dzienny/Nocny</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index e0c566bf47..99f13e22d8 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_shop">Loja</string>
 		<string name="poi_shop_food">Loja de conveniência e supermercado</string>
 	<string name="poi_emergency">Emergência</string>
@@ -21,7 +21,7 @@
 	<string name="poi_education">Educação</string>
 	<string name="poi_administrative">Administrativo</string>
 	<string name="poi_healthcare">Saúde</string>
-	<string name="poi_office">Escritório</string>
+	<string name="poi_office">Ponto de informação</string>
 	<string name="poi_sport">Esporte</string>
 	<string name="poi_tourism">Turismo</string>
 		<string name="poi_accomodation">Alojamento</string>
@@ -165,9 +165,9 @@
 	<string name="poi_lift_gate">Cancela elevatória</string>
 	<string name="poi_toll_booth">Pedágio</string>
 	<string name="poi_border_control">Alfândega</string>
-	<string name="poi_traffic_calming_bump">Lombada (curta)</string>
+	<string name="poi_traffic_calming_bump">Lombada curta</string>
 	<string name="poi_traffic_calming_hump">Lombada rápida</string>
-	<string name="poi_traffic_calming_cushion">Lomanda cushion</string>
+	<string name="poi_traffic_calming_cushion">Almofada</string>
 	<string name="poi_traffic_calming_chicane">Chicana</string>
 	<string name="poi_traffic_calming_rumble_strip">Sonorizador</string>
 	<string name="poi_traffic_calming_choker">Estreitamento</string>
@@ -220,7 +220,7 @@
 	<string name="poi_railway_platform">Plataforma ferroviária</string>
 	<string name="poi_halt">Parada ferroviária</string>
 	<string name="poi_subway_entrance">Entrada do metrô</string>
-	<string name="poi_subway_station">Estação de metrô</string>
+	<string name="poi_subway_station">Sim</string>
 	<string name="poi_vacuum_cleaner">Loja de aspiradores de pó</string>
 	<string name="poi_variety_store">Loja de variedades</string>
 	<string name="poi_video">Loja/locadora de vídeos</string>
@@ -806,7 +806,7 @@
 	<string name="poi_wiki_lang_ko">Coreano wiki</string>
 	<string name="poi_wiki_lang_lt">Lituano wiki</string>
 	<string name="poi_wiki_lang_ms">Malaio wiki</string>
-	<string name="poi_wiki_lang_new">Newar wiki</string>
+	<string name="poi_wiki_lang_new">Neuaris wiki</string>
 	<string name="poi_wiki_lang_nl">Holandês wiki</string>
 	<string name="poi_wiki_lang_nn">Norueguês Nynorsk wiki</string>
 	<string name="poi_wiki_lang_no">Norueguês wiki</string>
@@ -944,7 +944,7 @@
 	<string name="poi_access_agricultural">Acesso agrícola</string>
 
 	<string name="poi_monitoring_station">Estação de medição ambiental</string>
-	<string name="poi_capital">Capital</string>
+	<string name="poi_capital">Sim</string>
 	<string name="poi_fee_no">Não</string>
 
 	<string name="poi_email">Email</string>
@@ -1272,7 +1272,7 @@
 <string name="poi_information_guidepost">Poste com direções</string>
 	<string name="poi_information_board">Painel</string>
 	<string name="poi_information_map">Mapa</string>
-	<string name="poi_information_office">Centro de informação</string>
+	<string name="poi_information_office">Ponto de informação</string>
 	<string name="poi_information_trail_blaze">Marca de caminho</string>
 	<string name="poi_information_terminal">Terminal</string>
 	<string name="poi_information_route_marker">Marcador de rota</string>
@@ -1343,7 +1343,7 @@
 	<string name="poi_dead_wood">Árvores mortas</string>
 
 	<string name="poi_passing_place">Lugar de passagem</string>
-	<string name="poi_level">Nível</string>
+	<string name="poi_level">Andar</string>
 
 <string name="poi_bird_hide">Observatório de aves</string>
 	<string name="poi_internet_access_yes">Com acesso à Internet</string>
@@ -1374,7 +1374,7 @@
 	<string name="poi_garden_type_private">Jardim privado</string>
 	<string name="poi_garden_type_botanical">Jardim botânico</string>
 
-	<string name="poi_garden_style_kitchen">Jardim horta</string>
+	<string name="poi_garden_style_kitchen">Estilo de jardim: cozinha</string>
 	<string name="poi_garden_style_rosarium">Jardim de rosas</string>
 	<string name="poi_garden_style_french">Jardim francês</string>
 	<string name="poi_garden_style_english">Jardim inglês</string>
@@ -1408,16 +1408,16 @@
 	<string name="poi_aerialway_summer_access_exit">Acesso de verão: apenas saída</string>
 	<string name="poi_aerialway_summer_access_both">Acesso de verão: entrada e saída</string>
 
-	<string name="poi_stars_1">Estrelas: 1 (Turista)</string>
-	<string name="poi_stars_1s">Estrelas: 1S (Turista Superior)</string>
-	<string name="poi_stars_2">Estrelas: 2 (Standard)</string>
-	<string name="poi_stars_2s">Estrelas: 2S (Superior Standard)</string>
-	<string name="poi_stars_3">Estrelas: 3 (Conforto)</string>
-	<string name="poi_stars_3s">Estrelas: 3S (Conforto Superior)</string>
-	<string name="poi_stars_4">Estrelas: 4 (Primeira Classe)</string>
-	<string name="poi_stars_4s">Estrelas: 4S (Primeira Classe Superior)</string>
-	<string name="poi_stars_5">Estrelas: 5 (Luxo)</string>
-	<string name="poi_stars_5s">Estrelas: 5S (Luxo Superior)</string>
+	<string name="poi_stars_1">1 (Turista)</string>
+	<string name="poi_stars_1s">1S (Turista Superior)</string>
+	<string name="poi_stars_2">2 (Standard)</string>
+	<string name="poi_stars_2s">2S (Standard Superior)</string>
+	<string name="poi_stars_3">3 (Conforto)</string>
+	<string name="poi_stars_3s">3S (Conforto Superior)</string>
+	<string name="poi_stars_4">4 (Primeira Classe)</string>
+	<string name="poi_stars_4s">4S (Primeira Classe Superior)</string>
+	<string name="poi_stars_5">5 (Luxo)</string>
+	<string name="poi_stars_5s">5S (Luxo Superior)</string>
 	<string name="poi_stars_6">Estrelas: 6</string>
 	<string name="poi_stars_7">Estrelas: 7</string>
 	<string name="poi_rooms">Quartos</string>
@@ -1458,96 +1458,96 @@
 	<string name="poi_payment_american_express_no">Não aceita cartão American Express (AMEX)</string>
 	<string name="poi_payment_diners_club_yes">Diners Club</string>
 	<string name="poi_payment_diners_club_no">Não aceita cartão Diners Club</string>
-	<string name="poi_payment_dkv_yes">Aceita DKV</string>
+	<string name="poi_payment_dkv_yes">DKV</string>
 	<string name="poi_payment_dkv_no">Não aceita DKV</string>
-	<string name="poi_payment_uta_yes">Aceita cartão UTA</string>
+	<string name="poi_payment_uta_yes">UTA</string>
 	<string name="poi_payment_uta_no">Não aceita cartão UTA</string>
 	<string name="poi_payment_efectivo_yes">Efectivo</string>
 	<string name="poi_payment_efectivo_no">Não aceita Efectivo</string>
-	<string name="poi_payment_girocard_yes">Aceita Girocard</string>
+	<string name="poi_payment_girocard_yes">Girocard</string>
 	<string name="poi_payment_girocard_no">Não aceita Girocard</string>
-	<string name="poi_payment_discover_card_yes">Aceita Discover Card</string>
+	<string name="poi_payment_discover_card_yes">Discover Card</string>
 	<string name="poi_payment_discover_card_no">Não aceita Discover Card</string>
-	<string name="poi_payment_visa_electron_yes">Aceita Visa Electron</string>
+	<string name="poi_payment_visa_electron_yes">Visa Electron</string>
 	<string name="poi_payment_visa_electron_no">Não aceita Visa Electron</string>
-	<string name="poi_payment_litecoin_yes">Aceita Litecoin</string>
+	<string name="poi_payment_litecoin_yes">Litecoin</string>
 	<string name="poi_payment_litecoin_no">Não aceita Litecoin</string>
 	<string name="poi_payment_cheque_yes">Cheque</string>
 	<string name="poi_payment_cheque_no">Não aceita cheque</string>
-	<string name="poi_payment_pikepass_yes">Aceita PIKEPASS</string>
+	<string name="poi_payment_pikepass_yes">PIKEPASS</string>
 	<string name="poi_payment_pikepass_no">Não aceita PIKEPASS</string>
-	<string name="poi_payment_pikepass_designated">Aceita PIKEPASS (designated)</string>
-	<string name="poi_payment_visa_debit_yes">Aceita cartão Visa Débito</string>
+	<string name="poi_payment_pikepass_designated">PIKEPASS (designado)</string>
+	<string name="poi_payment_visa_debit_yes">Cartão Visa Débito</string>
 	<string name="poi_payment_visa_debit_no">Não aceita cartão Visa Débito</string>
 	<string name="poi_payment_cryptocurrencies_no">Não aceita criptomoedas</string>
 	<string name="poi_payment_others_yes">Outros</string>
 	<string name="poi_payment_others_no">Não aceita outras formas de pagamento</string>
-	<string name="poi_payment_routex_yes">Aceita cartão de combustível Routex</string>
+	<string name="poi_payment_routex_yes">Routex</string>
 	<string name="poi_payment_routex_no">Não aceita cartão de combustível Routex</string>
-	<string name="poi_payment_bancomat_yes">Aceita Bancomat</string>
+	<string name="poi_payment_bancomat_yes">Bancomat</string>
 	<string name="poi_payment_bancomat_no">Não aceita Bancomat</string>
-	<string name="poi_payment_icsf_yes">Aceita cartão IC Stored Fare</string>
+	<string name="poi_payment_icsf_yes">IC Stored Fare</string>
 	<string name="poi_payment_icsf_no">Não aceita cartão IC Stored Fare</string>
-	<string name="poi_payment_prepaid_ticket_yes">Aceita bilhetes pré-pagos</string>
-	<string name="poi_payment_jcb_yes">Aceita cartão JCB</string>
+	<string name="poi_payment_prepaid_ticket_yes">Bilhetes pré-pagos</string>
+	<string name="poi_payment_jcb_yes">JCB</string>
 	<string name="poi_payment_jcb_no">Não aceita cartão JCB</string>
-	<string name="poi_payment_laser_yes">Aceita cartão Laser</string>
+	<string name="poi_payment_laser_yes">Laser</string>
 	<string name="poi_payment_laser_no">Não aceita cartão Laser</string>
-	<string name="poi_payment_ep_quick_yes">Aceita cartão Quick</string>
+	<string name="poi_payment_ep_quick_yes">Quick</string>
 	<string name="poi_payment_ep_quick_no">Não aceita cartão Quick</string>
-	<string name="poi_payment_eurowag_yes">Aceita cartão Eurowag</string>
+	<string name="poi_payment_eurowag_yes">Eurowag</string>
 	<string name="poi_payment_eurowag_no">Não aceita cartão Eurowag</string>
-	<string name="poi_payment_e_zpass_yes">Aceita E-ZPass</string>
+	<string name="poi_payment_e_zpass_yes">E-ZPass</string>
 	<string name="poi_payment_e_zpass_no">Não aceita E-ZPass</string>
-	<string name="poi_payment_euroshell_yes">Aceita cartão de combustível Euroshell</string>
+	<string name="poi_payment_euroshell_yes">Euroshell</string>
 	<string name="poi_payment_euroshell_no">Não aceita cartão de combustível Euroshell</string>
-	<string name="poi_payment_kitcard_yes">Aceita KITCard</string>
+	<string name="poi_payment_kitcard_yes">KITCard</string>
 	<string name="poi_payment_kitcard_no">Não aceita KITCard</string>
-	<string name="poi_payment_westfalen_card_yes">Aceita cartão Westfalen</string>
+	<string name="poi_payment_westfalen_card_yes">Westfalen</string>
 	<string name="poi_payment_westfalen_card_no">Não aceita cartão Westfalen</string>
-	<string name="poi_payment_v_pay_yes">Aceita cartão V PAY</string>
+	<string name="poi_payment_v_pay_yes">V PAY</string>
 	<string name="poi_payment_v_pay_no">Não aceita cartão V PAY</string>
-	<string name="poi_payment_dogecoin_yes">Aceita Dogecoin</string>
+	<string name="poi_payment_dogecoin_yes">Dogecoin</string>
 	<string name="poi_payment_dogecoin_no">Não aceita Dogecoin</string>
-	<string name="poi_payment_cibus_yes">Aceita cartão Cibus</string>
+	<string name="poi_payment_cibus_yes">Cibus</string>
 	<string name="poi_payment_cibus_no">Não aceita cartão Cibus</string>
-	<string name="poi_payment_wire_transfer_yes">Aceita transferência eletrônica</string>
+	<string name="poi_payment_wire_transfer_yes">Transferência eletrônica</string>
 	<string name="poi_payment_wire_transfer_no">Não aceita transferência eletrônica</string>
-	<string name="poi_payment_ep_cash_yes">Aceita cartão de dinheiro (Geldkarte)</string>
+	<string name="poi_payment_ep_cash_yes">Cartão de dinheiro (Geldkarte)</string>
 	<string name="poi_payment_ep_cash_no">Não aceita cartão de dinheiro (Geldkarte)</string>
-	<string name="poi_payment_ep_proton_yes">Aceita cartão Proton</string>
+	<string name="poi_payment_ep_proton_yes">Proton</string>
 	<string name="poi_payment_ep_proton_no">Não aceita cartão Proton</string>
-	<string name="poi_payment_ep_avant_yes">Aceita AvantCard</string>
+	<string name="poi_payment_ep_avant_yes">AvantCard</string>
 	<string name="poi_payment_ep_avant_no">Não aceita cartão AvantCard</string>
-	<string name="poi_payment_ep_mep_yes">Aceita MEP</string>
+	<string name="poi_payment_ep_mep_yes">MEP</string>
 	<string name="poi_payment_ep_mep_no">Não aceita MEP</string>
-	<string name="poi_payment_ep_minipay_yes">Aceita Minipay</string>
+	<string name="poi_payment_ep_minipay_yes">Minipay</string>
 	<string name="poi_payment_ep_minipay_no">Não aceita Minipay</string>
-	<string name="poi_payment_ep_minicash_yes">Aceita MiniCash</string>
+	<string name="poi_payment_ep_minicash_yes">MiniCash</string>
 	<string name="poi_payment_ep_minicash_no">Não aceita MiniCash</string>
-	<string name="poi_payment_ep_moneo_yes">Aceita Moneo</string>
+	<string name="poi_payment_ep_moneo_yes">Moneo</string>
 	<string name="poi_payment_ep_moneo_no">Não aceita Moneo</string>
-	<string name="poi_payment_ep_monedero4b_yes">Aceita Monedero 4B</string>
+	<string name="poi_payment_ep_monedero4b_yes">Monedero 4B</string>
 	<string name="poi_payment_ep_monedero4b_no">Não aceita Monedero 4B</string>
-	<string name="poi_payment_ep_monedero_yes">Aceita Monedero</string>
+	<string name="poi_payment_ep_monedero_yes">Monedero</string>
 	<string name="poi_payment_ep_monedero_no">Não aceita Monedero</string>
-	<string name="poi_payment_bankaxess_yes">Aceita BankAxess</string>
+	<string name="poi_payment_bankaxess_yes">BankAxess</string>
 	<string name="poi_payment_bankaxess_no">Não aceita BankAxess</string>
-	<string name="poi_payment_coinkite_yes">Aceita Coinkite</string>
+	<string name="poi_payment_coinkite_yes">Coinkite</string>
 	<string name="poi_payment_coinkite_no">Não aceita Coinkite</string>
-	<string name="poi_payment_roadrunner_yes">Aceita cartão Roadrunner</string>
+	<string name="poi_payment_roadrunner_yes">Roadrunner</string>
 	<string name="poi_payment_roadrunner_no">Não aceita cartão Roadrunner</string>
-	<string name="poi_payment_svg_yes">Aceita SVG</string>
+	<string name="poi_payment_svg_yes">SVG</string>
 	<string name="poi_payment_svg_no">Não aceita SVG</string>
 	<string name="poi_payment_sms_yes">Aceita pagamento por SMS</string>
 	<string name="poi_payment_sms_no">Não aceita pagamento por SMS</string>
-	<string name="poi_payment_ov_chipkaart_yes">Aceita OV-Chipkaart</string>
+	<string name="poi_payment_ov_chipkaart_yes">OV-Chipkaart</string>
 	<string name="poi_payment_ov_chipkaart_no">Não aceita OV-Chipkaart</string>
-	<string name="poi_payment_oyster_yes">Aceita cartão Oyster</string>
+	<string name="poi_payment_oyster_yes">Oyster</string>
 	<string name="poi_payment_oyster_no">Não aceita cartão Oyster</string>
-	<string name="poi_payment_paypal_yes">Aceita PayPal</string>
+	<string name="poi_payment_paypal_yes">PayPal</string>
 	<string name="poi_payment_paypal_no">Não aceita PayPal</string>
-	<string name="poi_payment_gift_card_yes">Aceita cartões de presente</string>
+	<string name="poi_payment_gift_card_yes">Cartões de presente</string>
 	<string name="poi_payment_gift_card_no">Não aceita cartão presente</string>
 	<string name="poi_description_payment">Detalhes de pagamento</string>
 
@@ -1556,65 +1556,65 @@
 
 	<string name="poi_events_venue">Salão de eventos</string>
 
-	<string name="poi_diet_vegetarian_only">Apenas dieta vegetariana</string>
-	<string name="poi_diet_vegetarian_yes">Dieta vegetariana</string>
+	<string name="poi_diet_vegetarian_only">Apenas vegetariana</string>
+	<string name="poi_diet_vegetarian_yes">Vegetariana</string>
 	<string name="poi_diet_vegetarian_no">Dieta vegetariana: não</string>
-	<string name="poi_diet_vegetarian_few">Dieta vegetariana: alguns</string>
-	<string name="poi_diet_vegan_only">Apenas dieta vegana</string>
-	<string name="poi_diet_vegan_yes">Dieta vegana</string>
+	<string name="poi_diet_vegetarian_few">Dieta vegetariana (alguns)</string>
+	<string name="poi_diet_vegan_only">Apenas vegana</string>
+	<string name="poi_diet_vegan_yes">Vegana</string>
 	<string name="poi_diet_vegan_no">Dieta vegana: não</string>
-	<string name="poi_diet_gluten_free_only">Apenas dieta livre de glúten</string>
-	<string name="poi_diet_gluten_free_yes">Dieta livre de glúten</string>
-	<string name="poi_payment_sube_yes">Aceita cartão SUBE</string>
+	<string name="poi_diet_gluten_free_only">Apenas livre de glúten</string>
+	<string name="poi_diet_gluten_free_yes">Livre de glúten</string>
+	<string name="poi_payment_sube_yes">SUBE</string>
 	<string name="poi_payment_sube_no">Não aceita cartão SUBE</string>
-	<string name="poi_payment_via_verde_yes">Aceita Via Verde</string>
+	<string name="poi_payment_via_verde_yes">Via Verde</string>
 	<string name="poi_payment_via_verde_no">Não aceita Via Verde</string>
-	<string name="poi_payment_meal_voucher_yes">Aceita vale refeição</string>
+	<string name="poi_payment_meal_voucher_yes">Vale refeição</string>
 	<string name="poi_payment_meal_voucher_no">Não aceita vale refeição</string>
-	<string name="poi_payment_u_key_yes">Aceita U-Key</string>
+	<string name="poi_payment_u_key_yes">U-Key</string>
 	<string name="poi_payment_u_key_no">Não aceita U-Key</string>
-	<string name="poi_payment_token_yes">Aceita Token</string>
+	<string name="poi_payment_token_yes">Token</string>
 	<string name="poi_payment_token_no">Não aceita Token</string>
-	<string name="poi_payment_golden_crown_yes">Aceita cartão Golden Crown</string>
+	<string name="poi_payment_golden_crown_yes">Golden Crown</string>
 	<string name="poi_payment_golden_crown_no">Não aceita cartão Golden Crown</string>
-	<string name="poi_payment_pro100_yes">Aceita cartão PRO100</string>
+	<string name="poi_payment_pro100_yes">PRO100</string>
 	<string name="poi_payment_pro100_no">Não aceita cartão PRO100</string>
-	<string name="poi_payment_union_card_yes">Não aceita Union Card</string>
+	<string name="poi_payment_union_card_yes">Union Card</string>
 	<string name="poi_payment_union_card_no">Não aceita Union Card</string>
-	<string name="poi_payment_mtsmoney_yes">Aceita MTS-Money</string>
+	<string name="poi_payment_mtsmoney_yes">MTS-Money</string>
 	<string name="poi_payment_mtsmoney_no">Não aceita cartão MTS-Money</string>
-	<string name="poi_payment_yandexmoney_yes">Aceita Yandex.Money</string>
+	<string name="poi_payment_yandexmoney_yes">Yandex.Money</string>
 	<string name="poi_payment_yandexmoney_no">Não aceita Yandex.Money</string>
 	<string name="poi_diet_gluten_free_no">Dieta livre de glúten: não</string>
-	<string name="poi_diet_kosher_only">Apenas dieta kosher</string>
-	<string name="poi_diet_kosher_yes">Dieta kosher</string>
+	<string name="poi_diet_kosher_only">Apenas kosher</string>
+	<string name="poi_diet_kosher_yes">kosher</string>
 	<string name="poi_diet_kosher_no">Dieta kosher: não</string>
-	<string name="poi_diet_halal_only">Apenas dieta halal</string>
-	<string name="poi_diet_halal_yes">Dieta halal</string>
+	<string name="poi_diet_halal_only">Apenas halal</string>
+	<string name="poi_diet_halal_yes">Halal</string>
 	<string name="poi_diet_halal_no">Dieta halal: não</string>
-	<string name="poi_diet_lactose_free_only">Apenas dieta livre de lactose</string>
-	<string name="poi_diet_lactose_free_yes">Dieta livre de lactose</string>
+	<string name="poi_diet_lactose_free_only">Apenas livre de lactose</string>
+	<string name="poi_diet_lactose_free_yes">Livre de lactose</string>
 	<string name="poi_diet_lactose_free_no">Dieta livre de lactose: não</string>
-	<string name="poi_diet_pescetarian_yes">Dieta piscitariana</string>
+	<string name="poi_diet_pescetarian_yes">Piscitariana</string>
 
-	<string name="poi_drive_in_yes">Drive-in: sim</string>
+	<string name="poi_drive_in_yes">Sim</string>
 	<string name="poi_drive_in_no">Drive-in: não</string>
-	<string name="poi_drive_through_yes">Drive-thru: sim</string>
+	<string name="poi_drive_through_yes">Sim</string>
 	<string name="poi_drive_through_no">Drive-thru: não</string>
 
 	<string name="poi_brewery_additional">Nome da cervejaria</string>
-	<string name="poi_microbrewery_yes">Microcervejaria</string>
+	<string name="poi_microbrewery_yes">Sim</string>
 	<string name="poi_microbrewery_no">Sem microcervejaria</string>
 
-	<string name="poi_takeaway_yes">Encomenda</string>
-	<string name="poi_takeaway_no">Sem encomenda</string>
-	<string name="poi_takeaway_only">Apenas encomenda</string>
+	<string name="poi_takeaway_yes">Para viagem</string>
+	<string name="poi_takeaway_no">Sem para viagem</string>
+	<string name="poi_takeaway_only">Apenas para viagem</string>
 
 	<string name="poi_delivery_yes">Entrega</string>
 	<string name="poi_delivery_no">Sem entrega</string>
 	<string name="poi_delivery_only">Apenas entrega</string>
 
-	<string name="poi_outdoor_seating_yes">Lugar ao ar livre</string>
+	<string name="poi_outdoor_seating_yes">Lugar ao ar livre: sim</string>
 	<string name="poi_outdoor_seating_no">Sem lugar ao ar livre</string>
 	<string name="poi_outdoor_seating_terrace">Lugar ao ar livre: terraço</string>
 	<string name="poi_outdoor_seating_sidewalk">Lugar ao ar livre: calçada</string>
@@ -1622,7 +1622,7 @@
 	<string name="poi_outdoor_seating_garden">Lugar ao ar livre: jardim</string>
 	<string name="poi_outdoor_seating_patio">Lugar ao ar livre: pátio</string>
 
-	<string name="poi_cocktails_yes">Coquetéis</string>
+	<string name="poi_cocktails_yes">Sim</string>
 
 	<string name="poi_second_hand_yes">Artigos de segunda mão</string>
 	<string name="poi_second_hand_no">Sem artigos de segunda mão</string>
@@ -1634,9 +1634,9 @@
 	<string name="poi_service_repair_no">Sem retífica</string>
 	<string name="poi_service_electrical">Retífica de veículos elétricos</string>
 	<string name="poi_motorcycle_repair">Retífica de motos</string>
-	<string name="poi_self_service_yes">Autoatendimento</string>
+	<string name="poi_self_service_yes">Sim</string>
 	<string name="poi_self_service_no">Sem autoatendimento</string>
-	<string name="poi_automated_yes">Automatizado</string>
+	<string name="poi_automated_yes">Sim</string>
 	<string name="poi_automated_no">Não automatizado</string>
 	<string name="poi_full_service_yes">Serviço completo</string>
 	<string name="poi_car_wash_no">Lavação de carro: não</string>
@@ -1648,11 +1648,11 @@
 	<string name="poi_male_no">Proibido para homens</string>
 	<string name="poi_female_yes">Feminino</string>
 	<string name="poi_female_no">Proibido para mulheres</string>
-	<string name="poi_brushless_yes">Sem escova</string>
+	<string name="poi_brushless_yes">Sim</string>
 	<string name="poi_brushless_no">Sem escova: não</string>
 	<string name="poi_indoor_yes">Interno</string>
 	<string name="poi_indoor_no">Ao ar livre</string>
-	<string name="poi_toilets_yes">Com banheiros</string>
+	<string name="poi_toilets_yes">Sim</string>
 	<string name="poi_toilets_no">Sem banheiros</string>
 	<string name="poi_toilets_wheelchair_yes">Acesso aos banheiros para cadeirantes: sim</string>
 	<string name="poi_toilets_wheelchair_no">Acesso aos banheiros para cadeirantes: não</string>
@@ -1781,7 +1781,7 @@
 	<string name="poi_chimney">Chaminé</string>
 	<string name="poi_palm">Palmeira</string>
 	<string name="poi_cypress">Cipreste</string>
-	<string name="poi_bench_yes">Com assento</string>
+	<string name="poi_bench_yes">Sim</string>
 	<string name="poi_bench_no">Sem assento</string>
 	<string name="poi_bin_yes">Com lixeira</string>
 	<string name="poi_bin_no">Sem lixeira</string>
@@ -1796,7 +1796,7 @@
 
 	<string name="poi_aerialway_bubble_yes">Bolha</string>
 	<string name="poi_aerialway_bubble_no">Sem bolha</string>
-	<string name="poi_vending_bicycle_tube">Tubos para bicicletas</string>
+	<string name="poi_vending_bicycle_tube">Câmaras de ar para bicicleta</string>
 	<string name="poi_branch">Seção</string>
 
 	<string name="poi_memorial_cross">Cruzeiro</string>
@@ -1808,9 +1808,9 @@
 	<string name="poi_wetland_palsa_bog">Pântano palsa</string>
 	<string name="poi_wetland_mud">Lama</string>
 
-	<string name="poi_beach_sand">Tipo de praia: areia</string>
-	<string name="poi_beach_shingle">Tipo de praia: cascalho</string>
-	<string name="poi_beach_rocky">Tipo de praia: rocha</string>
+	<string name="poi_beach_sand">Areia</string>
+	<string name="poi_beach_shingle">Cascalho</string>
+	<string name="poi_beach_rocky">Rocha</string>
 
 	<string name="poi_flagpole">Mastro de bandeira</string>
 
@@ -1949,21 +1949,21 @@
 	<string name="poi_surveillance_yes">Vigilância: sim</string>
 	<string name="poi_shop_additional_yes">Com loja</string>
 
-	<string name="poi_service_bicycle_retail_yes">Venda de bicicletas: sim</string>
+	<string name="poi_service_bicycle_retail_yes">Varejo</string>
 	<string name="poi_service_bicycle_retail_no">Venda de bicicletas: não</string>
-	<string name="poi_service_bicycle_repair_yes">Conserto de bicicletas: sim</string>
+	<string name="poi_service_bicycle_repair_yes">Reparação</string>
 	<string name="poi_service_bicycle_repair_no">Conserto de bicicletas: não</string>
-	<string name="poi_service_bicycle_rental_yes">Aluguel de bicicletas: sim</string>
+	<string name="poi_service_bicycle_rental_yes">Varejo</string>
 	<string name="poi_service_bicycle_rental_no">Aluguel de bicicletas: não</string>
-	<string name="poi_service_bicycle_pump_yes">Bomba de bicicleta: sim</string>
+	<string name="poi_service_bicycle_pump_yes">Bomba</string>
 	<string name="poi_service_bicycle_pump_no">Bomba de bicicleta: não</string>
-	<string name="poi_service_bicycle_diy_yes">Ferramentas para reparação de bicicleta DIY: sim</string>
+	<string name="poi_service_bicycle_diy_yes">"Ferramentas para reparação "</string>
 	<string name="poi_service_bicycle_diy_no">Ferramentas para reparação de bicicleta DIY: não</string>
-	<string name="poi_service_bicycle_cleaning_yes">Limpeza de bicicletas: sim</string>
+	<string name="poi_service_bicycle_cleaning_yes">"Limpeza "</string>
 	<string name="poi_service_bicycle_cleaning_no">Limpeza de bicicletas: não</string>
-	<string name="poi_service_bicycle_chaintool_yes">Ferramenta para correia de bicicleta: sim</string>
+	<string name="poi_service_bicycle_chaintool_yes">"Correia "</string>
 	<string name="poi_service_bicycle_chaintool_no">Ferramenta para correia de bicicleta: não</string>
-	<string name="poi_service_bicycle_second_hand_yes">Venda de bicicletas de segunda mão: sim</string>
+	<string name="poi_service_bicycle_second_hand_yes">Venda de bicicletas de segunda mão</string>
 	<string name="poi_service_bicycle_second_hand_no">Venda de bicicletas de segunda mão: não</string>
 
 	<string name="poi_wildlife_hide">Observatório de vida selvagem</string>
@@ -2074,37 +2074,37 @@
 	<string name="poi_surveillance_outdoor">Vigilância: exterior</string>
 	<string name="poi_surveillance_public">Vigilância: público</string>
 
-	<string name="poi_clothes_women">Roupas femininas</string>
+	<string name="poi_clothes_women">Femininas</string>
 	<string name="poi_clothes_underwear">Roupa íntima</string>
-	<string name="poi_clothes_men">Roupas masculinas</string>
+	<string name="poi_clothes_men">Masculinas</string>
 	<string name="poi_clothes_wedding">Vestidos de noiva</string>
-	<string name="poi_clothes_sports">Roupas esportivas</string>
-	<string name="poi_clothes_babies">Roupas de bebês</string>
-	<string name="poi_clothes_denim">Roupas de brim</string>
+	<string name="poi_clothes_sports">Esportivas</string>
+	<string name="poi_clothes_babies">Bebês</string>
+	<string name="poi_clothes_denim">Jeans</string>
 	<string name="poi_clothes_workwear">Vestuário de trabalho</string>
 	<string name="poi_clothes_hats">Chapéus</string>
 	<string name="poi_clothes_fur">Peles</string>
 	<string name="poi_clothes_leather">Couro</string>
 	<string name="poi_clothes_costumes">Trajes</string>
-	<string name="poi_clothes_traditional">Roupas tradicionais</string>
+	<string name="poi_clothes_traditional">Tradicionais</string>
 	<string name="poi_clothes_suits">Ternos</string>
-	<string name="poi_clothes_maternity">Roupa de maternidade</string>
-	<string name="poi_clothes_vintage">Roupas vintage</string>
-	<string name="poi_clothes_oversize">Roupas tamanho grande</string>
-	<string name="poi_clothes_schoolwear">Roupas escolares</string>
+	<string name="poi_clothes_maternity">Maternidade</string>
+	<string name="poi_clothes_vintage">Vintage</string>
+	<string name="poi_clothes_oversize">Tamanho grande</string>
+	<string name="poi_clothes_schoolwear">Escolar</string>
 	<string name="poi_clothes_swimwear">Roupas de banho</string>
 	<string name="poi_clothes_socks">Meias</string>
 	<string name="poi_clothes_shirts">Camisas</string>
-	<string name="poi_clothes_dance">Roupas de dança</string>
-	<string name="poi_clothes_military">Roupas militares</string>
+	<string name="poi_clothes_dance">Dança</string>
+	<string name="poi_clothes_military">Militares</string>
 
 	<string name="poi_historic_milestone">Marco histórico</string>
 
-	<string name="poi_shoes_children">Calçados infantis</string>
-	<string name="poi_shoes_women">Calçados femininos</string>
-	<string name="poi_shoes_sport">Calçados esportivos</string>
-	<string name="poi_shoes_men">Calçados masculinos</string>
-	<string name="poi_shoes_orthopedic">Calçados ortopédicos</string>
+	<string name="poi_shoes_children">Crianças</string>
+	<string name="poi_shoes_women">femininos</string>
+	<string name="poi_shoes_sport">esportivos</string>
+	<string name="poi_shoes_men">Masculinos</string>
+	<string name="poi_shoes_orthopedic">Ortopédicos</string>
 
 	<string name="poi_historic_manor">Mansão histórica</string>
 	<string name="poi_castle_type_stately">Tipo de castelo: majestoso</string>
@@ -2115,16 +2115,16 @@
 	<string name="poi_castle_type_defensive_stately">Tipo de castelo: defensivo, majestoso</string>
 	<string name="poi_castle_type_shiro">Tipo de castelo: shiro</string>
 
-	<string name="poi_massage_thai">Massagem: tailandesa</string>
-	<string name="poi_massage_sexual">Massagem: sexual</string>
-	<string name="poi_massage_chinese">Massagem: chinesa</string>
+	<string name="poi_massage_thai">Tailandesa</string>
+	<string name="poi_massage_sexual">Sexual</string>
+	<string name="poi_massage_chinese">Chinesa</string>
 	<string name="poi_massage_yes">Serviços de massagem</string>
-	<string name="poi_massage_therapeutic">Massagem: terapêutica</string>
+	<string name="poi_massage_therapeutic">Terapêutica</string>
 
 	<string name="poi_sauna_yes">Serviços de sauna</string>
 	<string name="poi_solarium_yes">Serviços de solário</string>
 
-	<string name="poi_tents_yes">Tendas permitidas</string>
+	<string name="poi_tents_yes">Permitidas</string>
 	<string name="poi_tents_no">Tendas não permitidas</string>
 	<string name="poi_openfire_yes">Fogueira permitida</string>
 	<string name="poi_openfire_no">Fogueira proibida</string>
@@ -2132,7 +2132,7 @@
 	<string name="poi_scout_no">Não</string>
 	<string name="poi_group_only_yes">Apenas grupos: sim</string>
 	<string name="poi_group_only_no">Apenas grupos: não</string>
-	<string name="poi_washing_machine_yes">Máquina de lavar roupa: sim</string>
+	<string name="poi_washing_machine_yes">Sim</string>
 	<string name="poi_washing_machine_no">Máquina de lavar roupa: não</string>
 	<string name="poi_shower_yes">Chuveiro: sim</string>
 	<string name="poi_shower_no">Chuveiro: não</string>
@@ -2140,12 +2140,12 @@
 	<string name="poi_shower_outdoor">Chuveiro: exterior</string>
 	<string name="poi_shower_cold">Chuveiro: frio</string>
 	<string name="poi_shower_indoor">Chuveiro: interior</string>
-	<string name="poi_caravans_yes">Caravanas: Sim</string>
+	<string name="poi_caravans_yes">Sim</string>
 	<string name="poi_caravans_no">Caravanas: não</string>
 	<string name="poi_sanitary_dump_station_yes">Estação de descarga sanitária: sim</string>
 	<string name="poi_sanitary_dump_station_no">Estação de descarga sanitária: não</string>
 	<string name="poi_sanitary_dump_station_customers">Estação de descarga sanitária: apenas para clientes</string>
-	<string name="poi_power_supply_yes">Fonte de energia: sim</string>
+	<string name="poi_power_supply_yes">Sim</string>
 	<string name="poi_power_supply_no">Fonte de energia: não</string>
 	<string name="poi_power_supply_cee_17_blue">Fonte de energia (tomada): CEE 17 azul</string>
 	<string name="poi_power_supply_cee_7_4">Fonte de energia (tomada): CEE 7/4</string>
@@ -2191,11 +2191,11 @@
 	<string name="poi_theatre_genre_opera">Ópera</string>
 	<string name="poi_theatre_genre_cabaret">Cabaré</string>
 	<string name="poi_theatre_genre_puppet">Fantoche</string>
-	<string name="poi_theatre_genre_comedy">Gênero: comédia</string>
-	<string name="poi_theatre_genre_chamber_music">Gênero: música de câmara</string>
-	<string name="poi_theatre_genre_marionette">Gênero: marionete</string>
-	<string name="poi_theatre_genre_ballet">Gênero: balé</string>
-	<string name="poi_theatre_genre_shadow_play">Gênero: jogo de sombras</string>
+	<string name="poi_theatre_genre_comedy">Comédia</string>
+	<string name="poi_theatre_genre_chamber_music">Música de câmara</string>
+	<string name="poi_theatre_genre_marionette">Marionete</string>
+	<string name="poi_theatre_genre_ballet">Balé</string>
+	<string name="poi_theatre_genre_shadow_play">Jogo de sombras</string>
 
 	<string name="poi_bandstand">Coreto</string>
 	<string name="poi_kiln">Forno</string>
@@ -2251,8 +2251,8 @@
 	<string name="poi_historic_civilization_tiahuanacota">Civilization: tiahuanaco</string>
 
 	<string name="poi_animal_training">Treinamento animal</string>
-	<string name="poi_animal_training_dog">Treinamento canino</string>
-	<string name="poi_animal_training_horse">Treinamento equino</string>
+	<string name="poi_animal_training_dog">Canino</string>
+	<string name="poi_animal_training_horse">Equino</string>
 
 	<string name="poi_horse_yes">Permitido cavalos</string>
 	<string name="poi_horse_no">Proibido cavalos</string>
@@ -2310,7 +2310,7 @@
 	<string name="poi_material_plastic">Material: plástico</string>
 	<string name="poi_material_sandstone">Material: arenito</string>
 	<string name="poi_material_granite_stone">Material: pedra de granito</string>
-	<string name="poi_material_metal_wood">Material: metal;madeira</string>
+	<string name="poi_material_metal_wood">Material: metal, madeira</string>
 	<string name="poi_material_glass">Material: vidro</string>
 	<string name="poi_material_bronze">Material: bronze</string>
 	<string name="poi_material_earth">Material: terra</string>
@@ -2554,7 +2554,7 @@
 	<string name="poi_craft_electronics_repair">Conserto de eletrônicos</string>
 	<string name="poi_fireworks">Loja de fogos de artifício</string>
 
-	<string name="poi_memorial_fassade_decoration">Decoração da fachada</string>
+	<string name="poi_memorial_fassade_decoration">Decoração de fachada</string>
 	<string name="poi_site_type_hut_circle">Círculo de cabana</string>
 	<string name="poi_fortification_type_ring_ditch">Tipo de fortificação: vala circular</string>
 
@@ -3203,9 +3203,9 @@
 	<string name="poi_map_type_street">Tipo de mapa: rua</string>
 	<string name="poi_map_type_scheme">Tipo de mapa: esquema</string>
 	<string name="poi_map_type_toposcope">Tipo de mapa: toposcópio</string>
-	<string name="poi_map_size_site">Tamanho do mapa: local</string>
-	<string name="poi_map_size_city">Tamanho do mapa: cidade</string>
-	<string name="poi_map_size_region">Tamanho do mapa: região</string>
+	<string name="poi_map_size_site">Cobertura do mapa: local</string>
+	<string name="poi_map_size_city">Cobertura do mapa: cidade</string>
+	<string name="poi_map_size_region">Cobertura do mapa: região</string>
 
 	<string name="poi_charging_station_filter">Eletroposto</string>
 
@@ -3891,4 +3891,48 @@
 	<string name="poi_hazard_minefield">Campo minado</string>
 
 
-</resources>
+<string name="poi_car_pooling">Ponto de compartilhamento de carros</string>
+	<string name="poi_atm">Caixa eletrônico</string>
+	<string name="poi_ruins">Ruínas</string>
+
+	<string name="poi_hill">Colina</string>
+
+	<string name="poi_shoe_repair">Conserto de sapatos</string>
+
+<string name="poi_license_classes">Categorias</string>
+    <string name="poi_bulk_purchase">Compra a granel</string>
+    <string name="poi_substation_type">Tipo</string>
+    <string name="poi_books_type">Livros</string>
+    <string name="poi_bulk_purchase_yes">Sim</string>
+    <string name="poi_bulk_purchase_only">Somente</string>
+    <string name="poi_pipeline_substation">Subestação de oleoduto</string>
+    <string name="poi_substation_transmission">Transmissão</string>
+    <string name="poi_substation_distribution">Distribuição</string>
+    <string name="poi_substation_minor_distribution">Distribuição menor</string>
+    <string name="poi_substation_industrial">Industrial</string>
+    <string name="poi_substation_transition">Transição</string>
+    <string name="poi_substation_traction">Tração</string>
+    <string name="poi_substation_converter">Conversor</string>
+    <string name="poi_substation_compensation">Compensação</string>
+    <string name="poi_substation_compression">Compressão</string>
+    <string name="poi_substation_measurement">Medição</string>
+    <string name="poi_substation_valve">Válvula</string>
+    <string name="poi_substation_valve_group">Grupo de válvulas</string>
+    <string name="poi_substation_inspection_gauge">Medidor de inspeção</string>
+    <string name="poi_substation_field_gathering">Recolhimento de campo</string>
+    <string name="poi_craft_confectionery">Produção de confeitos</string>
+    <string name="poi_shop_wholesale">Loja de atacado</string>
+    <string name="poi_laboratory">Laboratório médico</string>
+    <string name="poi_blood_donation">Doação de sangue</string>
+    <string name="poi_books_comic">Quadrinho</string>
+    <string name="poi_books_antiquarian">Antiquário</string>
+    <string name="poi_books_religion">Religião</string>
+    <string name="poi_books_academic">Acadêmicos</string>
+    <string name="poi_books_children">Crianças</string>
+    <string name="poi_atoll">Atol</string>
+    <string name="poi_toll_gantry">"Portal de pedágio "</string>
+    <string name="poi_childcare">Creche</string>
+    <string name="poi_denotation">Denotação</string>
+    <string name="poi_denotation_natural_monument">Monumento natural</string>
+    <string name="poi_denotation_landmark">Ponto de referência</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 30f0f4d9dc..f5e916415b 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -1,2189 +1,2213 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="shared_string_my_places">Meus lugares</string>
-	<string name="days_behind">dias atrás</string>
-	<string name="watch">Ver</string>
-	<string name="rendering_attr_pisteGrooming_name">Pista de preparação</string>
-    <string name="routing_attr_no_new_routing_name">Evitar regras de roteamento da v1.9</string>
-    <string name="navigate_point_northing">Norte (N)</string>
-    <string name="navigate_point_easting">Leste (E)</string>
-    <string name="home_button">Início</string>
-    <string name="first_time_msg">Obrigado por usar OsmAnd. Para usufruir de todos os recursos do aplicativo, você precisa de alguns dados regionais off-line, que você pode baixar em \'Configurações\' → \'Gerenciar mapas\'. Depois, você poderá procurar por um endereço, um Ponto de Interesse (POI) ou um meio de transporte público.</string>    
-	<string name="favorite_home_category">Casa</string>
-	<string name="local_index_action_do">Você está prestes a %1$s %2$s item(s). Continuar?</string>
-	<string name="rendering_attr_hideHouseNumbers_name">Números de casa</string>
-    <string name="application_dir_change_warning3">Você quer que o OsmAnd também copie seus arquivos de dados para o novo destino?</string>
-    <string name="specified_directiory_not_writeable">Mapas não podem ser criados no diretório especificado</string>
-	<string name="copying_osmand_file_failed">A cópia de arquivos falhou</string>    
-    <string name="storage_directory_external">Armazenamento externo</string>
-    <string name="storage_directory_multiuser">Armazenamento multiusuário</string>
-    <string name="storage_directory_internal_app">Memória interna do aplicativo</string>
-    <string name="storage_directory_manual">Especificado manualmente</string>
-    <string name="storage_directory_default">Memória interna</string>
-    <string name="application_dir">Diretório de armazenamento</string>
-    <string name="storage_directory">Armazenamento do mapa</string>
-    <string name="shared_string_copy">Copiar</string>
-    <string name="filter_poi_hint">Filtrar por nome</string>
-    <string name="search_poi_category_hint">Digite para pesquisar por todos</string>
-    <string name="shared_string_is_open">Aberto agora</string>
-    <string name="rendering_attr_OSMMapperAssistant_name">Assistente de mapeador OSM</string>
-	<string name="agps_info">Informação A-GPS</string>
-	<string name="shared_string_manage">Gerenciar</string>
-	<string name="shared_string_edit">Editar</string>
-	<string name="shared_string_places">Lugares</string>
-	<string name="shared_string_search">Pesquisar</string>
-	<string name="shared_string_show_description">Mostrar descrição.</string>
-	<string name="shared_string_message">Mensagem</string>
-	<string name="agps_data_last_downloaded">Últimos dados A-GPS baixados: %1$s</string>
-    <string name="confirm_usage_speed_cameras">Em diversos países (Alemanha, França, Itália, etc.) o uso de alertas de radar é proibido por lei. OsmAnd não assume qualquer responsabilidade se você violar a lei. Por favor, toque em \"sim\" somente se você pode aceitar o uso deste recurso.</string>
-	<string name="welmode_download_maps">Baixar mapas</string>
-	<string name="welcome_select_region">Para refletir corretamente seus sinais e regras de trânsito, por favor, selecione a região que você dirige:</string>
-	<string name="welcome_text">OsmAnd oferece um explorador de mapa e navegador GPS off-line!</string>
-	<string name="welcome_header">Boas vindas</string>
-    <string name="current_route">Rota atual</string>
-    <string name="osm_changes_added_to_local_edits">Mudanças no OSM adicionadas ao conjunto de alterações locais</string>
-   	<string name="mark_to_delete">Selecione para apagar</string>
-	
-	<string name="local_osm_changes_upload_all_confirm">Você enviará %1$d alterações ao OSM. Tem certeza?</string>
-    <string name="confirmation_to_clear_history">Você quer limpar o histórico?</string>
-    <string name="delay_to_start_navigation_descr">Especifique o tempo de espera para permanecer na tela de planejamento de rota.</string>
-    <string name="delay_to_start_navigation">Iniciar navegação curva a curva depois de…</string>
-    <string name="shared_string_go">Ir</string>
-	<string name="osmand_parking_overdue">vencido</string>
-	<string name="action_create">Criar ação</string>
-	<string name="action_modify">Modificar ação</string>
-	<string name="action_delete">Apagar ação</string>
-	<string name="osm_edits">Edições no OSM</string>
-	<string name="osmand_parking_hour">h</string>
-	<string name="osmand_parking_minute">min</string>
-	<string name="parking_place_limited">Tempo de estacionamento limitado a</string>
-	<string name="osmand_parking_time_left">restante</string>
-	<string name="your_edits">Suas edições</string>
-    <string name="waypoint_visit_after">Passar depois</string>
-    <string name="waypoint_visit_before">Passar antes</string>
-    <string name="simulate_your_location">Simular rota</string>
-    <string name="drawer">Lista simples</string>
-    <string name="short_location_on_map">Lat %1$s
+<string name="days_behind">dias atrás</string>
+<string name="watch">Ver</string>
+<string name="rendering_attr_pisteGrooming_name">Pista de preparação</string>
+<string name="routing_attr_no_new_routing_name">Evitar regras de roteamento da v1.9</string>
+<string name="navigate_point_northing">Norte (N)</string>
+<string name="navigate_point_easting">Leste (E)</string>
+<string name="home_button">Início</string>
+<string name="first_time_msg">Obrigado por usar o OsmAnd. Faça o download de dados regionais para uso off-line via \'Configurações\' → \'Gerenciar arquivos de mapa\' para visualizar mapas, localizar endereços, procurar POIs, encontrar transporte público e muito mais.</string>    
+<string name="favorite_home_category">Casa</string>
+<string name="local_index_action_do">Você está prestes a %1$s %2$s item(s). Continuar?</string>
+<string name="rendering_attr_hideHouseNumbers_name">Números de casa</string>
+<string name="application_dir_change_warning3">Copiar arquivos de dados OsmAnd para o novo destino\?</string>
+<string name="specified_directiory_not_writeable">Mapas não podem ser criados no diretório especificado</string>
+<string name="copying_osmand_file_failed">A cópia de arquivos falhou</string>    
+<string name="storage_directory_external">Armazenamento externo</string>
+<string name="storage_directory_multiuser">Armazenamento multiusuário</string>
+<string name="storage_directory_internal_app">Memória interna do aplicativo</string>
+<string name="storage_directory_manual">Especificado manualmente</string>
+<string name="storage_directory_default">Memória interna</string>
+<string name="application_dir">Diretório de armazenamento</string>
+<string name="storage_directory">Armazenamento do mapa</string>
+<string name="shared_string_copy">Copiar</string>
+<string name="filter_poi_hint">Filtrar por nome</string>
+<string name="search_poi_category_hint">Digite para pesquisar</string>
+<string name="shared_string_is_open">Aberto agora</string>
+<string name="rendering_attr_OSMMapperAssistant_name">Assistente de mapeador OSM</string>
+<string name="agps_info">Informação A-GPS</string>
+<string name="shared_string_manage">Gerenciar</string>
+<string name="shared_string_edit">Editar</string>
+<string name="shared_string_places">Lugares</string>
+<string name="shared_string_search">Pesquisar</string>
+<string name="shared_string_show_description">Mostrar descrição.</string>
+<string name="shared_string_message">Mensagem</string>
+<string name="agps_data_last_downloaded">Últimos dados A-GPS baixados: %1$s</string>
+<string name="confirm_usage_speed_cameras">Em diversos países (Alemanha, França, Itália, etc.) o uso de alertas de radar é ilegal. OsmAnd não assume qualquer responsabilidade se você violar a lei. Por favor, toque em \"Sim\" somente se você pode aceitar o uso deste recurso.</string>
+<string name="welmode_download_maps">Baixar mapas</string>
+<string name="welcome_select_region">Para refletir corretamente seus sinais e regras de trânsito, por favor, selecione a região que você dirige:</string>
+<string name="welcome_text">OsmAnd oferece um explorador de mapa e navegador GPS off-line.</string>
+<string name="welcome_header">Boas vindas</string>
+<string name="current_route">Rota atual</string>
+<string name="osm_changes_added_to_local_edits">Mudanças no OSM adicionadas ao conjunto de alterações locais</string>
+<string name="mark_to_delete">Selecione para apagar</string>
+
+<string name="local_osm_changes_upload_all_confirm">Você enviará %1$d alterações ao OSM. Tem certeza?</string>
+<string name="confirmation_to_clear_history">Limpar o histórico\?</string>
+<string name="delay_to_start_navigation_descr">Especifique o tempo de espera para permanecer na tela de planejamento de rota.</string>
+<string name="delay_to_start_navigation">Iniciar navegação curva a curva depois de…</string>
+<string name="shared_string_go">Ir</string>
+<string name="osmand_parking_overdue">vencido</string>
+<string name="action_create">Criar ação</string>
+<string name="action_modify">Modificar ação</string>
+<string name="action_delete">Apagar ação</string>
+<string name="osm_edits">Edições no OSM</string>
+<string name="osmand_parking_hour">h</string>
+<string name="osmand_parking_minute">min</string>
+<string name="parking_place_limited">Tempo de estacionamento limitado a</string>
+<string name="osmand_parking_time_left">restante</string>
+<string name="your_edits">Suas edições</string>
+<string name="waypoint_visit_after">Passar depois</string>
+<string name="waypoint_visit_before">Passar antes</string>
+<string name="simulate_your_location">Simular rota</string>
+<string name="drawer">Lista simples</string>
+<string name="short_location_on_map">Lat %1$s
 \nLon %2$s</string>
-    <string name="tips_and_tricks_descr">Respostas às perguntas frequentes, mudanças recentes e outras.</string>
-    <string name="routing_settings_2">Configurações de navegação</string>
-    <string name="general_settings_2">Configurações gerais</string>
-	<string name="shared_string_ellipsis">…</string>
-	<string name="shared_string_ok">Ok</string>
-	<string name="shared_string_cancel">Cancelar</string>
-	<string name="shared_string_dismiss">Descartar</string>
-	<string name="shared_string_yes">Sim</string>
-	<string name="shared_string_do_not_use">Não use</string>
-	<string name="shared_string_no">Não</string>
-	<string name="shared_string_on">Ativado</string>
-	<string name="shared_string_off">Desativado</string>
-	<string name="shared_string_previous">Anterior</string>
-	<string name="shared_string_next">Próximo</string>
-	<string name="shared_string_enable">Ativar</string>
-	<string name="shared_string_disable">Desativar</string>
-	<string name="shared_string_enabled">Ativado</string>
-	<string name="shared_string_disabled">Desativado</string>
-	<string name="shared_string_selected">Selecionado(s)</string>
-	<string name="shared_string_selected_lowercase">selecionado(s)</string>
-	<string name="shared_string_never">Nunca</string>
-	<string name="shared_string_none">Nenhum</string>
-	<string name="shared_string_and">e</string>
-	<string name="shared_string_or">ou</string>
-	<string name="shared_string_help">Ajuda</string>
-	<string name="shared_string_settings">Configurações</string>
-	<string name="shared_string_history">Histórico</string>
-	<string name="shared_string_select_on_map">Selecione no mapa</string>
-	<string name="shared_string_select_all">Marcar tudo</string>
-	<string name="shared_string_deselect">Desmarcar</string>
-	<string name="shared_string_deselect_all">Desmarcar tudo</string>
-	<string name="shared_string_clear">Limpar</string>
-	<string name="shared_string_clear_all">Limpar tudo</string>
-	<string name="shared_string_save">Salvar</string>
-	<string name="shared_string_save_as_gpx">Salvar como trilha GPX</string>
-	<string name="shared_string_rename">Renomear</string>
-	<string name="shared_string_delete">Apagar</string>
-	<string name="shared_string_delete_all">Apagar tudo</string>
-	<string name="shared_string_share">Compartilhar</string>
-	<string name="shared_string_apply">Aplicar</string>
-	<string name="shared_string_control_start">Iniciar</string>
-	<string name="shared_string_control_stop">Pare</string>
-	<string name="shared_string_import">Importar</string>
-	<string name="shared_string_export">Exportar</string>
-	<string name="shared_string_more">Mais…</string>
-	<string name="shared_string_more_actions">Outras ações</string>
-	<string name="shared_string_do_not_show_again">Não mostrar novamente</string>
-	<string name="shared_string_remember_my_choice">Memorizar escolha</string>
-	<string name="shared_string_refresh">Atualizar</string>
-	<string name="shared_string_download">Baixar</string>
-	<string name="shared_string_downloading">Baixando</string>
-	<string name="shared_string_download_successful">Baixado com êxito</string>
-	<string name="shared_string_io_error">Erro de entrada/saída</string>
-	<string name="shared_string_unexpected_error">Ocurreu um erro inesperado</string>
-	<string name="shared_string_action_template">Ação {0}</string>
-	<string name="shared_string_close">Fechar</string>
-	<string name="shared_string_exit">Sair</string>
-	<string name="shared_string_show">Mostrar</string>
-	<string name="shared_string_show_all">Mostrar todos</string>
-	<string name="shared_string_collapse">Contrair</string>
-	<string name="shared_string_show_on_map">Mostrar no mapa</string>
-	<string name="shared_string_map">Mapa</string>
-	<string name="shared_string_favorite">Favorito</string>
-	<string name="shared_string_favorites">Favoritos</string>
-	<string name="shared_string_address">Endereço</string>
-	<string name="shared_string_add">Adicionar</string>
-	<string name="shared_string_add_to_favorites">Adicionar aos \'Favoritos\'</string>
-	<string name="shared_string_my_location">Minha posição</string>
-	<string name="shared_string_my_favorites">Favoritos</string>
-	<string name="shared_string_tracks">Trilhas</string>
-	<string name="shared_string_currently_recording_track">Gravando trilha</string>
-	<string name="shared_string_audio">Áudio</string>
-	<string name="shared_string_video">Vídeo</string>
-	<string name="shared_string_photo">Foto</string>
-	<string name="route_points">Pontos da rota</string>
-	<string name="track_segments">Segmentos da trilha</string>
-	<string name="shared_string_online_maps">Mapas on-line</string>
-	<string name="osmand_rastermaps_plugin_description">"Com este complemento você pode acessar muitos tipos de mapas online (chamados de quadrícula ou ladrilho), tais como quadrículas predefinidas do OpenStreetMap (como Mapnik) para imagens de satélite e camadas especiais como mapas aquáticos, climáticos, geológicos, camadas de sombra de relevo, etc.\n\nQuaisquer desses mapas podem ser usados como mapa principal (base) para ser mostrado no OsmAnd ou como uma sobreposição ou subcamada para outro mapa base (como o mapa offline padrão do OsmAnd). A fim de fazer qualquer subcamada do mapa mais visível, certos elementos do mapa vetorial do OsmAnd podem facilmente ser ocultados através do menu \'Configurar mapa\' conforme desejado.\n\nQuadrículas de mapas podem ser obtidas diretamente através de fontes online ou podem ser preparados para uso offline (e copiadas manualmente para o diretório de dados do OsmAnd) como um banco de dados sqlite, que pode ser produzido por uma variedade de ferramentas de terceiros para preparação de mapas. "</string>
-	<string name="record_plugin_name">Gravação de viagem</string>
-	<string name="record_plugin_description">"Este complemento ativa a funcionalidade para gravar e salvar suas trilhas manualmente tocando o widget de registro de GPX na tela do mapa ou também fazendo automaticamente o registro de todas as suas rotas de navegação para um arquivo GPX.
-\n\nTrilhas gravadas podem ser compartilhadas com seus amigos ou serem usadas para contribuições ao OSM. Atletas podem usar trilhas gravadas para monitorar seus treinos. Algumas análises básicas da trilha podem ser feitas diretamente no OsmAnd, como tempos de percurso, velocidade média, etc. E, claro, trilhas também podem ser analisadas mais tarde em ferramentas de terceiros. "</string>
-	
-	
-	<string name="srtm_paid_version_title">Plugin de curvas de nível</string>
-	<string name="osmand_srtm_short_description_80_chars">Plugin do OsmAnd para curvas de nível off-line</string>
-	<string name="srtm_plugin_name">Curvas de nível</string>
-	<string name="plugin_touringview_name">Visão de mapa turístico</string>
-	<string name="plugin_touringview_descr">"Ativar este modo de exibição altera o estilo do mapa do OsmAnd para \'Visão turística\', que é uma visão detalhada especial para os viajantes e motoristas profissionais.
-\n\nEssa visão fornece, em qualquer zoom determinado do mapa, o máximo de detalhes de viagem disponíveis nos dados de mapa (particularmente as estradas, trilhas, caminhos e marcas de orientação).
-\n\nTambém retrata claramente todos os tipos de estradas pela codificação por cores, que é útil quando, por exemplo, dirigir veículos grandes.
-\n\nE ele oferece opções de turismo especiais como mostrando rotas de bicicleta ou rotas de montanha.
-\n\nNão é necessário baixar mapa especial, pois esse modo de exibição é criado a partir do mapa padrão.
-\n\nEssa visão pode ser revertida desativando aqui mesmo ou alterando o \'Estilo do mapa\' em \'Configurar mapa\' quando desejar. "</string>
-	<string name="plugin_nautical_name">Mapa náutico</string>
-	<string name="plugin_nautical_descr">"Este complemento enriquece o mapa do OsmAnd para também produzir mapas náuticos para passeios de barco, vela e outros tipos de desportos aquáticos.
-\n\nUm complemento de mapa especial para OsmAnd fornecerá todas as marcas de navegação náutica e símbolos cartográficos, para o interior assim como para navegação próxima à costa. A descrição de cada marca de navegação fornece os detalhes necessários para identificá-las e o seu significado (categoria, forma, cor, sequência, referência, etc.).
-\n\nPara retornar a um estilo convencional de mapa do OsmAnd, simplesmente desative este complemento ou altere o \'Estilo de mapa\' em \'Configurar mapa\' quando desejado. "</string>
-	<string name="plugin_ski_name">Mapa de esqui</string>
-	<string name="plugin_ski_descr">"Este complemento para o OsmAnd coloca ao seu alcance detalhes de pistas de descida de esqui, de travessia, rotas de esqui alpino, teleféricos e elevadores de esqui. Rotas e pistas são mostradas com codificação de cores por dificuldade e retratadas em um estilo especial de mapa \'Inverno\' que assimila uma paisagem de inverno cor de neve.
-\n\nAtivando esta mudança na visão do estilo de mapa de \'Inverno e esqui\', mostrando todas as características da paisagem em condições invernais. Essa visão pode ser revertida desativando aqui ou alterando o \'Estilo de mapa\' em \'Configurar mapa\' quando desejado. "</string>
-	<string name="audionotes_plugin_name">Notas de áudio/vídeo</string>
-	<string name="audionotes_plugin_description">O plugin de notas de áudio/vídeo fornece a funcionalidade para tomar notas de áudio/fotografia/vídeo durante uma viagem, usando um botão na tela do mapa ou diretamente do menu de contexto para qualquer posição no mapa.</string>
-	<string name="osmand_parking_plugin_name">Estacionamento</string>
-	<string name="osmand_distance_planning_plugin_name">Calculadora de distância e ferramenta de planeamento</string>
-	<string name="osmand_distance_planning_plugin_description">Este complemento fornece um widget da tela mapa permitindo criar caminhos tocando no mapa, ou usar ou modificar arquivos GPX existentes, para planejar uma viagem e medir a distância entre pontos. Os resultados podem ser salvos como um arquivo GPX, que mais tarde pode ser usado para orientação.</string>
-	<string name="shared_string_accessibility">Acessibilidade</string>
-	<string name="osmand_accessibility_description">Este complemento disponibiliza recursos de acessibilidade do dispositivo diretamente no OsmAnd. Facilita, por exemplo, o ajuste da velocidade para vozes TTS, configuração da navegação direcional na tela, uso do trackball para controle de zoom, ou retorno de texto para fala, por exemplo para anunciar automaticamente sua posição.</string>
-	<string name="osm_settings">Edição no OSM</string>
-	<string name="debugging_and_development">Desenvolvimento OsmAnd</string>
-	<string name="rename_failed">Falha ao renomear.</string>
-	<string name="back_to_map">Voltar ao mapa</string>
-	<string name="share_note">Compartilhar nota</string>
-    <string name="location_on_map">Posição:\n Lat %1$s\n Lon %2$s</string>
-	<string name="notes">Notas</string>
-	<string name="online_map">Mapa on-line</string>
-	<string name="roads_only">Apenas estradas</string>
-    <string name="rendering_attr_pisteRoutes_name">Pistas de esqui</string>
-	<string name="free">"Livre %1$s "</string>
-	<string name="device_memory">Memória do aparelho</string>
-    <string name="world_ski_missing">Para mostrar mapas de esqui, o mapa off-line especial precisa ser baixado</string>
-    <string name="nautical_maps_missing">Para mostrar mapas náuticos, o mapa off-line especial precisa ser baixado</string>
-	<string name="edit_group">Editar grupo</string>
-    <string name="parking_place">Vaga de estacionamento</string>
-    <string name="remove_the_tag">REMOVER A ETIQUETA</string>
-    <string name="gps_status">Situação do GPS</string>
-    <string name="version_settings_descr">Baixar versões noturnas</string>
-    <string name="version_settings">Compilações</string>
-    <string name="rendering_attr_streetLighting_name">Iluminação pública</string>
-    <string name="proxy_pref_title">Proxy</string>
-    <string name="track_points">Pontos da trilha</string>
-	<string name="osmand_srtm_long_description_1000_chars">Fornece curvas de nível e camada de sombras de relevo por cima do mapa padrão do OsmAnd. Esta funcionalidade será muito apreciada por atletas, viajantes e alguém interessado na estrutura de relevo da paisagem. 
+<string name="tips_and_tricks_descr">Respostas às perguntas frequentes, mudanças recentes e outras.</string>
+<string name="routing_settings_2">Configurações de navegação</string>
+<string name="general_settings_2">Configurações gerais</string>
+<string name="shared_string_ellipsis">…</string>
+<string name="shared_string_ok">Ok</string>
+<string name="shared_string_cancel">Cancelar</string>
+<string name="shared_string_dismiss">Descartar</string>
+<string name="shared_string_yes">Sim</string>
+<string name="shared_string_do_not_use">Não use</string>
+<string name="shared_string_no">Não</string>
+<string name="shared_string_on">Ativado</string>
+<string name="shared_string_off">Desativado</string>
+<string name="shared_string_previous">Anterior</string>
+<string name="shared_string_next">Próximo</string>
+<string name="shared_string_enable">Ativar</string>
+<string name="shared_string_disable">Desabilitar</string>
+<string name="shared_string_enabled">Ativado</string>
+<string name="shared_string_disabled">Desativado</string>
+<string name="shared_string_selected">Selecionado(s)</string>
+<string name="shared_string_selected_lowercase">selecionado(s)</string>
+<string name="shared_string_never">Nunca</string>
+<string name="shared_string_none">Nenhum</string>
+<string name="shared_string_and">e</string>
+<string name="shared_string_or">ou</string>
+<string name="shared_string_help">Ajuda</string>
+<string name="shared_string_settings">Configurações</string>
+<string name="shared_string_history">Histórico</string>
+<string name="shared_string_select_on_map">Selecione no mapa</string>
+<string name="shared_string_select_all">Marcar tudo</string>
+<string name="shared_string_deselect">Desmarcar</string>
+<string name="shared_string_deselect_all">Desmarcar tudo</string>
+<string name="shared_string_clear">Limpar</string>
+<string name="shared_string_clear_all">Limpar tudo</string>
+<string name="shared_string_save">Salvar</string>
+<string name="shared_string_save_as_gpx">Salvar novo arquivo GPX</string>
+<string name="shared_string_rename">Renomear</string>
+<string name="shared_string_delete">Apagar</string>
+<string name="shared_string_delete_all">Apagar tudo</string>
+<string name="shared_string_share">Compartilhar</string>
+<string name="shared_string_apply">Aplicar</string>
+<string name="shared_string_control_start">Iniciar</string>
+<string name="shared_string_control_stop">Pare</string>
+<string name="shared_string_import">Importar</string>
+<string name="shared_string_export">Exportar</string>
+<string name="shared_string_more">Mais…</string>
+<string name="shared_string_more_actions">Outras ações</string>
+<string name="shared_string_do_not_show_again">Não mostrar novamente</string>
+<string name="shared_string_remember_my_choice">Memorizar escolha</string>
+<string name="shared_string_refresh">Atualizar</string>
+<string name="shared_string_download">Baixar</string>
+<string name="shared_string_downloading">Baixando</string>
+<string name="shared_string_download_successful">Baixado</string>
+<string name="shared_string_io_error">Erro de entrada/saída</string>
+<string name="shared_string_unexpected_error">Erro inesperado</string>
+<string name="shared_string_action_template">Ação {0}</string>
+<string name="shared_string_close">Fechar</string>
+<string name="shared_string_exit">Sair</string>
+<string name="shared_string_show">Mostrar</string>
+<string name="shared_string_show_all">Mostrar todos</string>
+<string name="shared_string_collapse">Contrair</string>
+<string name="shared_string_show_on_map">Mostrar no mapa</string>
+<string name="shared_string_map">Mapa</string>
+<string name="shared_string_favorite">Favorito</string>
+<string name="shared_string_favorites">Favoritos</string>
+<string name="shared_string_address">Endereço</string>
+<string name="shared_string_add">Adicionar</string>
+<string name="shared_string_add_to_favorites">Adicionar aos \'Favoritos\'</string>
+<string name="shared_string_my_location">Minha posição</string>
+<string name="shared_string_my_favorites">Favoritos</string>
+<string name="shared_string_tracks">Trilhas</string>
+<string name="shared_string_currently_recording_track">Gravando trilha</string>
+<string name="shared_string_audio">Áudio</string>
+<string name="shared_string_video">Vídeo</string>
+<string name="shared_string_photo">Foto</string>
+<string name="route_points">Pontos da rota</string>
+<string name="track_segments">Segmentos da trilha</string>
+<string name="shared_string_online_maps">Mapas on-line</string>
+<string name="osmand_rastermaps_plugin_description">Com este plugin você pode acessar muitos tipos de mapas online (chamados de quadrícula ou ladrilho), tais como quadrículas predefinidas do OpenStreetMap (como Mapnik) para imagens de satélite e camadas especiais como mapas aquáticos, climáticos, geológicos, camadas de sombra de relevo, etc. 
+\n 
+\nQuaisquer desses mapas podem ser usados como mapa principal (base) para ser mostrado no OsmAnd ou como uma sobreposição ou subcamada para outro mapa base (como o mapa offline padrão do OsmAnd). A fim de fazer qualquer subcamada do mapa mais visível, certos elementos do mapa vetorial do OsmAnd podem facilmente ser ocultados através do menu \'Configurar mapa\' conforme desejado. 
+\n 
+\nQuadrículas de mapas podem ser obtidas diretamente através de fontes online ou podem ser preparados para uso offline (e copiadas manualmente para o diretório de dados do OsmAnd) como um banco de dados sqlite, que pode ser produzido por uma variedade de ferramentas de terceiros para preparação de mapas.</string>
+<string name="record_plugin_name">Gravação de viagem</string>
+<string name="record_plugin_description">Este plugin ativa a funcionalidade de gravar e salvar suas trilhas manualmente tocando o widget de registro de GPX na tela do mapa ou também registrar automaticamente todas as suas rotas de navegação para um arquivo GPX. 
+\n 
+\nTrilhas gravadas podem ser compartilhadas com seus amigos ou serem usadas para contribuições ao OSM. Atletas podem usar trilhas gravadas para monitorar seus treinos. Algumas análises básicas da trilha podem ser feitas diretamente no OsmAnd, como tempos de percurso, velocidade média, etc. E, claro, trilhas também podem ser analisadas depois em ferramentas de terceiros.</string>
+
+
+<string name="srtm_paid_version_title">Plugin de curvas de nível</string>
+<string name="osmand_srtm_short_description_80_chars">Plugin do OsmAnd para curvas de nível off-line</string>
+<string name="srtm_plugin_name">Curvas de nível</string>
+<string name="plugin_touringview_name">Visão de mapa turístico</string>
+<string name="plugin_touringview_descr">Ativar este modo de exibição altera o estilo do mapa do OsmAnd para \'Visão turística\', que é uma visão detalhada especial para os viajantes e motoristas profissionais. 
+\n
+\nEssa visão fornece, em qualquer zoom determinado do mapa, o máximo de detalhes de viagem disponíveis nos dados de mapa (particularmente as estradas, trilhas, caminhos e marcas de orientação). 
+\n
+\nTambém retrata claramente todos os tipos de estradas pela codificação por cores, que é útil quando, por exemplo, dirigir veículos grandes. 
+\n
+\nE ele oferece opções de turismo especiais como mostrando rotas de bicicleta ou rotas de montanha. 
+\n
+\nNão é necessário baixar mapa especial, pois esse modo de exibição é criado a partir do mapa padrão. 
+\n
+\nEssa visão pode ser revertida desativando aqui mesmo ou alterando o \'Estilo do mapa\' em \'Configurar mapa\' quando desejar.</string>
+<string name="plugin_nautical_name">Mapa náutico</string>
+<string name="plugin_nautical_descr">Este plugin enriquece o mapa do OsmAnd para também produzir mapas náuticos para passeios de barco, vela e outros tipos de desportos aquáticos.
+\n
+\nUm complemento de mapa especial para OsmAnd fornecerá todas as marcas de navegação náutica e símbolos cartográficos, para o interior assim como para navegação próxima à costa. A descrição de cada marca de navegação fornece os detalhes necessários para identificá-las e o seu significado (categoria, forma, cor, sequência, referência, etc.).
+\n
+\nPara retornar a um estilo convencional de mapa do OsmAnd, simplesmente desative este complemento ou altere o \'Estilo de mapa\' em \'Configurar mapa\' quando desejado.</string>
+<string name="plugin_ski_name">Mapa de esqui</string>
+<string name="plugin_ski_descr">Este plugin para o OsmAnd coloca ao seu alcance detalhes de pistas de descida de esqui, de travessia, rotas de esqui alpino, teleféricos e elevadores de esqui. Rotas e pistas são mostradas com codificação de cores por dificuldade e retratadas em um estilo especial de mapa \'Inverno\' que assimila uma paisagem de inverno cor de neve. 
+\n
+\n 
+\nAtivando esta visão muda o estilo de mapa de \'Inverno e esqui\', mostrando todas as características da paisagem em condições invernais. Essa visão pode ser revertida desativando aqui ou alterando o \'Estilo de mapa\' em \'Configurar mapa\' quando desejado.</string>
+<string name="audionotes_plugin_name">Notas de áudio/vídeo</string>
+<string name="audionotes_plugin_description">O plugin de notas de áudio/vídeo fornece a funcionalidade para tomar notas de áudio/fotografia/vídeo durante uma viagem, usando um botão na tela do mapa ou diretamente do menu de contexto para qualquer posição no mapa.</string>
+<string name="osmand_parking_plugin_name">Estacionamento</string>
+<string name="osmand_distance_planning_plugin_name">Calculadora de distância e ferramenta de planeamento</string>
+<string name="osmand_distance_planning_plugin_description">Este plugin fornece um widget da tela de mapa que permite a criação de caminhos tocando no mapa ou usando ou modificando arquivos GPX existentes, para planejar uma viagem e medir a distância entre pontos. Os resultados podem ser salvos como um arquivo GPX, que mais tarde pode ser usado para orientação.</string>
+<string name="shared_string_accessibility">Acessibilidade</string>
+<string name="osmand_accessibility_description">Este plugin disponibiliza os recursos de acessibilidade do dispositivo diretamente no OsmAnd. Facilita, por exemplo, ajustando a velocidade de fala para voz TTS, configurando a navegação por botões direcionais na tela, o uso de trackball para controle de zoom, ou retorno de texto-para-fala para, por exemplo, anunciar automaticamente a sua posição.</string>
+<string name="osm_settings">Edição no OSM</string>
+<string name="debugging_and_development">Desenvolvimento OsmAnd</string>
+<string name="rename_failed">Renomeação falhou.</string>
+<string name="back_to_map">Voltar ao mapa</string>
+<string name="share_note">Compartilhar nota</string>
+<string name="location_on_map">Posição:\n Lat %1$s\n Lon %2$s</string>
+<string name="notes">Notas</string>
+<string name="online_map">Mapa on-line</string>
+<string name="roads_only">Apenas estradas</string>
+<string name="rendering_attr_pisteRoutes_name">Pistas de esqui</string>
+<string name="free">"Livre %1$s "</string>
+<string name="device_memory">Memória do aparelho</string>
+<string name="world_ski_missing">Para mostrar mapas de esqui, o mapa off-line especial precisa ser baixado</string>
+<string name="nautical_maps_missing">Para mostrar mapas náuticos, o mapa off-line especial precisa ser baixado</string>
+<string name="edit_group">Editar grupo</string>
+<string name="parking_place">Vaga de estacionamento</string>
+<string name="remove_the_tag">REMOVER A ETIQUETA</string>
+<string name="gps_status">Situação do GPS</string>
+<string name="version_settings_descr">Baixar versões noturnas.</string>
+<string name="version_settings">Compilações</string>
+<string name="rendering_attr_streetLighting_name">Iluminação pública</string>
+<string name="proxy_pref_title">Proxy</string>
+<string name="track_points">Pontos da trilha</string>
+<string name="osmand_srtm_long_description_1000_chars">Fornece curvas de nível e camada de sombras de relevo por cima do mapa padrão do OsmAnd. Esta funcionalidade será muito apreciada por atletas, viajantes e alguém interessado na estrutura de relevo da paisagem. 
 \n 
 \nOs dados globais (entre as latitudes 70° norte e 70° sul) são baseados em medições do SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), um instrumento de imagens Terra, o satélite principal do Sistema de Observação da Terra da NASA. ASTER é um esforço conjunto da NASA, do Ministério da Economia, Comércio e Indústria do Japão (METI) e do Sistema Espacial Japonês (J-spacesystems).</string>
-	<string name="srtm_plugin_description">Este plugin fornece curvas de nível e camada de sombras de relevo por cima do mapa padrão do OsmAnd. Esta funcionalidade será muito apreciada por atletas, viajantes e qualquer interessado na estrutura de relevo da paisagem. (Por favor, note que as curvas de nível e/ou dados de relevo são downloads adicionais separados disponíveis depois de ativar o plugin.)
+<string name="srtm_plugin_description">Este plugin fornece curvas de nível e camada de sombras de relevo por cima do mapa padrão do OsmAnd. Esta funcionalidade será muito apreciada por atletas, viajantes e qualquer interessado na estrutura de relevo da paisagem. (Por favor, note que as curvas de nível e/ou dados de relevo são downloads adicionais separados disponíveis depois de ativar o plugin.)
 \n 
 \nOs dados globais (entre as latitudes 70° norte e 70° sul) são baseados em medições do SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), um instrumento de imagens Terra, o satélite principal do Sistema de Observação da Terra da NASA. ASTER é um esforço conjunto da NASA, do Ministério da Economia, Comércio e Indústria do Japão (METI) e do Sistema Espacial Japonês (J-spacesystems).</string>
-	<string name="osmand_parking_plugin_description">O plugin de posição de estacionamento grava onde seu carro está estacionado e quanto tempo resta (se o estacionamento for de tempo limitado).
-\nVocê pode encontrar o seu lugar e tempo de estacionamento no painel de instrumentos e no widget do mapa. Pode ser adicionado um evento no calendário, se você quiser um lembrete.</string>
-	<string name="osm_editing_plugin_description">Este complemento do OsmAnd pode ser usado para fazer contribuições ao OSM como criar ou modificar POI, abertura ou comentários de erros do OSM e contribuir com arquivos GPX gravados. OSM é um projeto de mapeamento mundial dirigido pela comunidade e de domínio público. Para mais detalhes, consulte https://openstreetmap.org. Participação ativa é apreciada e as contribuições podem ser feitas diretamente do OsmAnd, se você especificar suas credenciais pessoais de OSM no app.</string>
-	<string name="osmand_development_plugin_description">Este complemento exibe configurações de desenvolvimento e recursos de depuração como testar ou simular o roteamento, o desempenho de renderização de tela ou instruções de voz. Essas configurações são destinadas a desenvolvedores e não são necessárias para o usuário comum.</string>
-	<string name="proxy_pref_descr">Configurar proxy</string>
-    <string name="settings_privacy">Privacidade</string>
-    <string name="shared_string_gpx_points">Pontos</string>
-	<string name="navigation_over_track">Iniciar a navegação pela trilha?</string>
-	<string name="speak_pedestrian">Travessias de pedestre</string>
-    <string name="rendering_attr_roadStyle_name">Estilo das vias</string>
-    <string name="avoid_roads_msg">Obter uma rota alternativa, selecionando quais vias evitar</string>
-	<string name="rendering_value__name">Predefinido</string>
-    <string name="rendering_value_default_name">Predefinido</string>
-    <string name="rendering_value_orange_name">Laranja</string>
-    <string name="rendering_value_germanRoadAtlas_name">Atlas de vias alemãs</string>
-    <string name="rendering_value_highContrastRoads_name">Vias em alto contraste</string>
-	<string name="traffic_warning_railways">Cruzamento de ferrovia</string>
-	<string name="traffic_warning_pedestrian">Travessia de pedestres</string>
-	<string name="show_railway_warnings">Cruzamento de ferrovia</string>
-	<string name="rendering_value_americanRoadAtlas_name">Atlas de vias americanas</string>
-    <string name="dash_download_msg_none">Deseja baixar mapas offline?</string>
-    <string name="dash_download_msg">Você baixou %1$s mapa(s)</string>
-    <string name="dash_download_manage">Gerenciar</string>
-    <string name="map_locale">Idioma do mapa</string>
-    <string name="rendering_attr_transportStops_name">Paradas de transporte</string>
-    
-    <string name="navigate_point_zone">Zona</string>
-    <string name="download_tab_downloads">Todos downloads</string>
-    <string name="download_tab_updates">Atualizações</string>
-    <string name="download_tab_local">Local</string>
-	<string name="no_internet_connection">Não foi possível baixar, por favor, verifique sua conexão com a Internet.</string>
-    <string name="everything_up_to_date">Todos os arquivos foram atualizados</string>
-    <string name="use_opengl_render">Usar renderização OpenGL</string>
-    <string name="use_opengl_render_descr">Usar aceleração de hardware OpenGL para renderização (talvez não funcione em alguns aparelhos)</string>
-    <string name="error_avoid_specific_road">Nenhum desvio encontrado</string>
-    
-    
-	<string name="search_for">Pesquisar por</string>
-	<string name="coordinates">Coordenadas</string>
-	<string name="rendering_attr_publicTransportMode_name">Rotas de ônibus e trólebus</string>
-	<string name="rendering_attr_tramTrainRoutes_name">Rotas de bonde e trem</string>
-	<string name="rendering_attr_subwayMode_name">Rotas de metrô</string>
-    <string name="lock_screen_request_explanation">%1$s precisa dessa permissão para desligar a tela para economizar energia.</string>
-    <string name="wake_on_voice">Ligar tela</string>
-    <string name="wake_on_voice_descr">Ligar tela do aparelho (se estiver desligada) quando se aproxima da manobra.</string>
-    <string name="impassable_road">Evitar estradas…</string>
-    <string name="rendering_attr_trainLightrailRoutes_name">Rotas de trem</string>
-    <string name="rendering_attr_tramRoutes_name">Rotas de bonde</string>
-    <string name="rendering_attr_shareTaxiRoutes_name">Compartilhar rota de táxi</string>
-    <string name="rendering_attr_trolleybusRoutes_name">Rotas de trólebus</string>
-    <string name="rendering_attr_busRoutes_name">Rotas de ônibus</string>
-    <string name="rendering_category_hide">Ocultar</string>
-    <string name="rendering_category_routes">Rotas</string>
-    <string name="rendering_category_details">Detalhes</string>
-    <string name="rendering_category_transport">Transporte</string>
-    <string name="rendering_category_others">Outros atributos do mapa</string>
-    <string name="map_widget_appearance_rem">Elementos restantes</string>
-    <string name="map_widget_vector_attributes">Atributos de renderização</string>
-    <string name="map_widget_top">Barra de estado</string>
-	<string name="map_widget_right">Painel direito</string>
-	<string name="map_widget_left">Painel esquerdo</string>
-	<string name="configure_map">Configurar mapa</string>
-    <string name="search_radius_proximity">Na proximidade de</string>
-    
-    
-    <string name="anonymous_user_hint">Um usuário anônimo não pode:
+<string name="osmand_parking_plugin_description">Este plugin grava onde o seu carro foi estacionado e quanto tempo de estacionamento resta (se houver um limite de tempo).
+\nA localização e o tempo ficam visíveis no painel de controle do OsmAnd e em um widget na tela do mapa. Um alarme pode ser adicionado ao calendário Android como lembrete.</string>
+<string name="osm_editing_plugin_description">Este plugin do OsmAnd pode ser usado para fazer contribuições ao OSM como criar ou modificar POI, abrir ou comentar Notas OSM e contribuir com arquivos GPX gravados. OSM é um projeto de mapeamento mundial dirigido pela comunidade e de domínio público. Para mais detalhes, consulte https://openstreetmap.org. Participação ativa é apreciada e as contribuições podem ser feitas diretamente do OsmAnd, se você especificar suas credenciais pessoais de OSM no app.</string>
+<string name="osmand_development_plugin_description">Este plugin exibe configurações de desenvolvimento e recursos de depuração como testar ou simular o roteamento, o desempenho de renderização de tela ou instruções de voz. Essas configurações são destinadas a desenvolvedores e não são necessárias para o usuário comum.</string>
+<string name="proxy_pref_descr">Especifique um servidor proxy.</string>
+<string name="settings_privacy">Privacidade</string>
+<string name="shared_string_gpx_points">Pontos</string>
+<string name="navigation_over_track">Iniciar a navegação pela trilha?</string>
+<string name="speak_pedestrian">Faixas de pedestre</string>
+<string name="rendering_attr_roadStyle_name">Estilo das vias</string>
+<string name="avoid_roads_msg">Obter uma rota alternativa, selecionando quais vias evitar</string>
+<string name="rendering_value__name">Predefinido</string>
+<string name="rendering_value_default_name">Predefinido</string>
+<string name="rendering_value_orange_name">Laranja</string>
+<string name="rendering_value_germanRoadAtlas_name">Atlas de vias alemãs</string>
+<string name="rendering_value_highContrastRoads_name">Vias em alto contraste</string>
+<string name="traffic_warning_railways">Cruzamento de ferrovia</string>
+<string name="traffic_warning_pedestrian">Travessia de pedestres</string>
+<string name="show_railway_warnings">Passagens de nível</string>
+<string name="rendering_value_americanRoadAtlas_name">Atlas de vias americanas</string>
+<string name="dash_download_msg_none">Baixar mapas offline\?</string>
+<string name="dash_download_msg">Você baixou %1$s mapa(s)</string>
+<string name="dash_download_manage">Gerenciar</string>
+<string name="map_locale">Idioma do mapa</string>
+<string name="rendering_attr_transportStops_name">Paradas de transporte</string>
+
+<string name="navigate_point_zone">Zona</string>
+<string name="download_tab_downloads">Todos downloads</string>
+<string name="download_tab_updates">Atualizações</string>
+<string name="download_tab_local">Local</string>
+<string name="no_internet_connection">Não é possível baixar. Favor verificar sua conexão com a internet.</string>
+<string name="everything_up_to_date">Todos os arquivos foram atualizados</string>
+<string name="use_opengl_render">Usar renderização OpenGL</string>
+<string name="use_opengl_render_descr">Usar a renderização OpenGL acelerada por hardware (pode usar mais bateria ou não funcionar em dispositivos muito antigos).</string>
+<string name="error_avoid_specific_road">Nenhum desvio encontrado</string>
+
+
+<string name="search_for">Pesquisar por</string>
+<string name="coordinates">Coordenadas</string>
+<string name="rendering_attr_publicTransportMode_name">Linhas de ônibus e trólebus</string>
+<string name="rendering_attr_tramTrainRoutes_name">Linhas de bonde e trem</string>
+<string name="rendering_attr_subwayMode_name">Linhas de metrô</string>
+<string name="lock_screen_request_explanation">%1$s precisa dessa permissão para desligar a tela para economizar energia.</string>
+<string name="wake_on_voice">Ligar tela</string>
+<string name="wake_on_voice_descr">Ligar tela do aparelho (se estiver desligada) quando se aproxima da manobra.</string>
+<string name="impassable_road">Evitar estradas…</string>
+<string name="rendering_attr_trainLightrailRoutes_name">Linhas de trem</string>
+<string name="rendering_attr_tramRoutes_name">Linhas de bonde</string>
+<string name="rendering_attr_shareTaxiRoutes_name">Compartilhar rota de táxi</string>
+<string name="rendering_attr_trolleybusRoutes_name">Linhas de trólebus</string>
+<string name="rendering_attr_busRoutes_name">Linhas de ônibus</string>
+<string name="rendering_category_hide">Ocultar</string>
+<string name="rendering_category_routes">Rotas</string>
+<string name="rendering_category_details">Detalhes</string>
+<string name="rendering_category_transport">Transporte</string>
+<string name="rendering_category_others">Outros atributos do mapa</string>
+<string name="map_widget_appearance_rem">Elementos restantes</string>
+<string name="map_widget_vector_attributes">Atributos de renderização</string>
+<string name="map_widget_top">Barra de estado</string>
+<string name="map_widget_right">Painel direito</string>
+<string name="map_widget_left">Painel esquerdo</string>
+<string name="configure_map">Configurar mapa</string>
+<string name="search_radius_proximity">Cerca de</string>
+
+
+<string name="anonymous_user_hint">Um usuário anônimo não pode:
 \n- Criar grupos;
 \n- Sincronizar aparelhos e grupos com o servidor;
 \n- Gerenciar grupos e aparelhos no painel de controle do website.</string>
-    <string name="anonymous_user">Usuário anônimo</string>
-    <string name="logged_as">Conectado como %1$s</string>
-	<string name="speed_limit_exceed">Tolerância do limite de velocidade</string>
-	<string name="speed_limit_exceed_message">Selecione a margem de tolerância de limite de velocidade, acima do qual você receberá um aviso de voz.</string>
-	<string name="fav_point_emoticons_message">O nome do Favorito foi modificado para %1$s para facilitar salvar corretamente a sequência de caracteres com emoticons para um arquivo.</string>
-    <string name="speak_title">Anunciar…</string>
-	<string name="show_pedestrian_warnings">Faixas de pedestre</string>
-    <string name="routing_attr_no_new_routing_description">Não use as regras de roteamento introduzidas na v1.9</string>
-    <string name="dash_download_new_one">Baixar um novo mapa</string>
-    <string name="map_update">Atualizações disponíveis para %1$s mapa(s)</string>
-	<string name="fav_point_dublicate_message">O nome do favorito já está em uso, mudamos para %1$s a fim de evitar nomes duplicados.</string>
-    <string name="traffic_warning_speed_camera">Radar</string>
-    <string name="speak_favorites">Favoritos próximos</string>
-	<string name="proxy_host_title">Servidor Proxy</string>
-	<string name="enable_proxy_descr">Configurar o Proxy HTTP para todas as solicitações de rede</string>
-	<string name="enable_proxy_title">Ativar Proxy HTTP</string>
-	
-    
-    
-    
-    
-    
-    <string name="minutes_ago">minutos atrás</string>
-    <string name="print_route">Imprimir rota</string>
-    <string name="fav_point_dublicate">Nome de favorito duplicado</string>
-    <string name="text_size_descr">Defina o tamanho do texto no mapa.</string>
-    <string name="text_size">Tamanho do texto</string>
-    <string name="traffic_warning_speed_limit">Limite de velocidade</string>
-    <string name="traffic_warning_border_control">Alfândega</string>
-    <string name="traffic_warning_payment">Pedágio</string>
-    <string name="traffic_warning_stop">Placa de pare</string>
-    <string name="traffic_warning_calming">Moderador de tráfego</string>
-    <string name="traffic_warning">Aviso de tráfego</string>
-	<string name="speak_poi">POIs próximos</string>
-	<string name="way_alarms">Moderadores de tráfego</string>
-	
-	
-	
-	
-	<string name="background_service_is_enabled_question">O serviço OsmAnd ainda está rodando em segundo plano. Você quer pará-lo, também?</string>
-	<string name="sleep_mode_stop_dialog">Parar o modo em segundo plano do GPS?</string>
-	<string name="stop_navigation_service">Parar</string>
-	<string name="confirm_every_run">Sempre perguntar</string>
-	<string name="save_global_track_interval_descr">Escolher o intervalo geral de registro para a gravação de trilha (habilitado através do widget de registro de GPX no mapa)</string>
-	<string name="save_global_track_interval">Intervalo de registro geral</string>
-	<string name="background_service_int">Intervalo de ativação do GPS</string>
-	<string name="enable_sleep_mode">Ativar o modo de GPS em segundo plano</string>
-	<string name="save_track_to_gpx_globally">Registrar trilha em arquivo GPX</string>
-	<string name="save_track_to_gpx_globally_headline">Registro de trilha sob demanda</string>
-	<string name="save_track_to_gpx_globally_descr">Posição geral de registro para um arquivo GPX pode ser ativada ou desativada usando o widget de registro de GPX na tela do mapa</string>
-	<string name="save_current_track_descr">Salvar a trilha atual no SD agora</string>
-	<string name="save_current_track">Salvar a trilha GPX atual</string>
-	<string name="save_track_to_gpx">Auto-registrar a trilha durante a navegação</string>
-	<string name="save_track_to_gpx_descrp">trilha serão salvas no diretório de trilhas durante a navegação</string>
-	<string name="save_track_interval_globally">Intervalo de registro</string>
-	<string name="save_track_interval">Intervalo de registro durante a navegação</string>
-	<string name="save_track_interval_descr">Escolher o intervalo de registro para a gravação de trilha durante a navegação.</string>
-	<string name="voice_provider_descr">Selecione a voz para instruções de navegação</string>
-	<string name="voice_provider">Instruções por voz</string>
-	
-	<string name="proxy_host_descr">Configurar o hostname do seu proxy (p. ex., 127.0.0.1)</string>
-	<string name="proxy_port_title">Porta do proxy</string>
-	<string name="proxy_port_descr">Configurar o número da porta do seu proxy (p. ex. 8118)</string>
-	
-    <string name="monitoring_settings">Gravação de viagem</string>
-    <string name="monitoring_settings_descr">Configurar como gravar suas viagens.</string>
-    <string name="gpx_option_calculate_first_last_segment">Calcular rota para o primeiro e último segmento</string>
-    <string name="use_displayed_track_for_navigation">Você quer usar a trilha apresentada para navegação?</string>
-    <string name="routing_attr_prefer_motorway_name">Preferir Autoestradas</string>
-	<string name="routing_attr_prefer_motorway_description">Preferir autoestradas na rota</string>
-	
-	
-	<string name="routing_attr_avoid_toll_name">Evitar pedágios</string>
-	<string name="routing_attr_avoid_toll_description">Evitar estradas com pedágio</string>
-	<string name="routing_attr_avoid_unpaved_name">Evitar vias não pavimentadas</string>
-	<string name="routing_attr_avoid_unpaved_description">Evitar estradas não pavimentadas</string>
-	<string name="routing_attr_avoid_ferries_description">Evitar as balsas</string>
-	<string name="routing_attr_weight_name">Peso máximo</string>
-	<string name="routing_attr_weight_description">Especificar o peso do veículo permitido nas rotas</string>
-    <string name="copying_osmand_files_descr">Copiar arquivos de dados para o novo destino (%s)…</string>
-    <string name="copying_osmand_files">Copiando arquivos de dados…</string>
-    <string name="calculate_osmand_route_gpx">Calcular rota off-line</string>
-    <string name="app_mode_truck">Caminhão</string>
-    <string name="auto_zoom_far">Visão intermediária</string>
-	<string name="local_index_tile_data_minzoom">Zoom mínimo: %1$s</string>
-    <string name="edit_tilesource_successfully">A fonte da quadrícula %1$s foi salva</string>
-    <string name="speak_traffic_warnings">Moderadores de tráfego</string>
-    <string name="context_menu_item_directions_from">Rota a partir daqui</string>
-    <string name="app_mode_default">Explorar</string>
-	<string name="local_indexes_cat_av">Dados de Áudio/Vídeo</string>
-    <string name="stop_routing_confirm">Confirma que quer parar a navegação?</string>
-    
-    <string name="int_hour">h</string>
-    <string name="duration">Duração</string>
-    <string name="distance">Distância</string>
-    <string name="index_tours">Excursões</string>
-    <string name="shared_string_all">Todos</string>
-    <string name="shared_string_waypoints">Marcos do trajeto</string>
-    
-    
-    <string name="download_additional_maps">Baixar mapas que faltam %1$s (%2$d MB)?</string>
-    <string name="rendering_value_browse_map_name">Explorar</string>  
-    <string name="rendering_value_car_name">Carro</string>
-    <string name="rendering_value_bicycle_name">Bicicleta</string>
-    <string name="rendering_value_pedestrian_name">A pé</string>
-    <string name="rendering_attr_coloredBuildings_name">Colorir edifícios conforme o tipo</string>
-    
-    
-    
-    <string name="continue_navigation">Continuar a navegação</string>
-    <string name="pause_navigation">Pausar navegação</string>
- 	<string name="keep_navigation_service">Manter</string>
-	<string name="gps_wake_up_timer">Intervalo para ativar GPS</string>
-	<string name="map_preferred_locale_descr">Idioma preferido para os rótulos no mapa (se indisponível, será usado o inglês ou nomes locais).</string>
-    <string name="map_preferred_locale">Idioma preferido do mapa</string>
-    <string name="local_map_names">Nomes locais</string>
-    <string name="lang_sw">Suaíli</string>
-    <string name="lang_he">Hebraico</string>
-    <string name="forward">Avançar</string>
-    <string name="home">Painel de controle</string>
-    <string name="live_monitoring_m_descr">Enviar o rastreamento para um serviço web especificado, se estiver ativado o registro de GPX.</string>
-	<string name="live_monitoring_m">Rastreamento on-line (requer GPX)</string>
-    <string name="live_monitoring_start">Iniciar rastreamento on-line</string>
-	<string name="live_monitoring_stop">Parar rastreamento on-line</string>
-	<string name="gpx_monitoring_start">Iniciar registro de GPX</string>
-	<string name="gpx_monitoring_stop">Parar registro de GPX</string>
-    <string name="gpx_start_new_segment">Iniciar novo rastreamento</string>
-    <string name="rendering_attr_hideBuildings_name">Edifícios</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Estradas não trafegáveis</string>
-    <string name="rendering_attr_hideText_name">Textos</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Matas e arbustos</string>
-    <string name="rendering_attr_buildings15zoom_name">Edifícios em zoom 15</string>
-    <string name="rendering_attr_moreDetailed_name">Mais detalhes</string>
-    <string name="rendering_attr_lessDetailed_name">Menos detalhes</string>
-    <string name="rendering_attr_hideAccess_name">Restrições de acesso</string>
-    <string name="rendering_attr_showAccess_name">Mostrar restrições de acesso</string>
-    <string name="rendering_attr_showSurfaceGrade_name">Mostrar qualidade da via</string>
-    <string name="rendering_attr_showSurfaces_name">Mostrar superfície da via</string>
-    <string name="rendering_attr_showCycleRoutes_name">Mostrar rotas para bicicletas</string>
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    <string name="no_index_file_to_download">Transferência não encontrada, por favor, verifique sua conexão com a Internet.</string>
-    <string name="select_index_file_to_download">Nada foi encontrado. Se você não encontrar a sua região, você pode criá-la (veja http://osmand.net).</string>
-    <string name="none_selected_gpx">Não há arquivos GPX selecionados. Para selecionar toque e segure a trilha disponível.</string>
-    <string name="local_index_select_gpx_file">Selecione para mostrar</string>
-    <string name="gpx_split_interval">Intervalo de divisão</string>
-    <string name="sort_by_distance">Ordenar por distância</string>
-    <string name="sort_by_name">Ordenar por nome</string>
-    <string name="show_zoom_buttons_navigation_descr">Mostrar botões de zoom durante a navegação</string>
-    <string name="show_zoom_buttons_navigation">Mostrar botões de zoom</string>
-    <string name="save_as_favorites_points">Salvar como grupo de favoritos</string>
-    <string name="select_destination_and_intermediate_points">Selecionar destinos</string>
-    <string name="layer_amenity_label">Rótulos do ponto</string>
-    <string name="loading_smth">Carregando %1$s…</string>
-    <string name="map_widget_plain_time">Hora atual</string>
-    <string name="selected_gpx_info_show">\n\nToque e segure para ver no mapa</string>
-    <string name="delay_navigation_start">Iniciar automaticamente instruções curva a curva</string>
-    <string name="local_index_gpx_info_show">\n\nToque e segure para opções</string>
-	<string name="gpx_info_subtracks">"Subtrilhas: %1$s "</string>
-	<string name="gpx_info_waypoints">Marco de trajeto: %1$s</string>
-	<string name="gpx_info_distance">"Distância: %1$s (%2$s pontos) "</string>
-	<string name="gpx_info_start_time">"Hora de início: %1$tF, %1$tT "</string>
-	<string name="gpx_info_end_time">"Hora de fim: %1$tF, %1$tT "</string>
-	<string name="gpx_info_average_speed">"Velocidade média: %1$s "</string>
-	<string name="gpx_info_maximum_speed">"Velocidade máxima: %1$s "</string>
-	<string name="gpx_info_avg_altitude">Altitude média: %1$s</string>
-	<string name="gpx_info_diff_altitude">Faixa de altitude: %1$s</string>
-	<string name="gpx_info_asc_altitude">Descida/Subida: %1$s</string>
-    <string name="gpx_timespan">Intervalo: %1$s</string>
-	<string name="gpx_timemoving">Tempo em movimento: %1$s</string>
-    <string name="gpx_selection_number_of_points">%1$s pontos</string>
-    <string name="gpx_selection_point">Ponto %1$s</string>
-    <string name="gpx_selection_route_points">%1$s ↵\nPontos de Rota %2$s</string>
-    <string name="gpx_selection_points">%1$s↵\nPontos</string>
-    <string name="gpx_selection_track">%1$s
+<string name="anonymous_user">Usuário anônimo</string>
+<string name="logged_as">Conectado como %1$s</string>
+<string name="speed_limit_exceed">Tolerância do limite de velocidade</string>
+<string name="speed_limit_exceed_message">Selecione a margem de tolerância de limite de velocidade, acima do qual você receberá um aviso de voz.</string>
+<string name="fav_point_emoticons_message">O nome do Favorito foi modificado para %1$s para facilitar salvar corretamente a sequência de caracteres com emoticons para um arquivo.</string>
+<string name="speak_title">Anunciar…</string>
+<string name="show_pedestrian_warnings">Faixas de pedestre</string>
+<string name="routing_attr_no_new_routing_description">Não use as regras de roteamento introduzidas na v1.9.</string>
+<string name="dash_download_new_one">Baixar um novo mapa</string>
+<string name="map_update">Atualizações disponíveis para %1$s mapa(s)</string>
+<string name="fav_point_dublicate_message">O nome do favorito já está em uso, mudamos para %1$s a fim de evitar nomes duplicados.</string>
+<string name="traffic_warning_speed_camera">Radar</string>
+<string name="speak_favorites">Favoritos próximos</string>
+<string name="proxy_host_title">Servidor Proxy</string>
+<string name="enable_proxy_descr">Configurar o proxy HTTP para todas as solicitações de rede.</string>
+<string name="enable_proxy_title">Ativar proxy HTTP</string>
+
+
+
+
+
+
+<string name="minutes_ago">minutos atrás</string>
+<string name="print_route">Imprimir rota</string>
+<string name="fav_point_dublicate">Nome de favorito duplicado</string>
+<string name="text_size_descr">Defina o tamanho do texto no mapa.</string>
+<string name="text_size">Tamanho do texto</string>
+<string name="traffic_warning_speed_limit">Limite de velocidade</string>
+<string name="traffic_warning_border_control">Alfândega</string>
+<string name="traffic_warning_payment">Pedágio</string>
+<string name="traffic_warning_stop">Placa de pare</string>
+<string name="traffic_warning_calming">Moderador de tráfego</string>
+<string name="traffic_warning">Aviso de tráfego</string>
+<string name="speak_poi">POIs próximos</string>
+<string name="way_alarms">Moderadores de tráfego</string>
+
+
+
+
+<string name="background_service_is_enabled_question">O processo de segundo plano do OsmAnd ainda está rodando. Deseja pará-lo também\?</string>
+<string name="sleep_mode_stop_dialog">Parar o modo em segundo plano do GPS?</string>
+<string name="stop_navigation_service">Parar</string>
+<string name="confirm_every_run">Sempre perguntar</string>
+<string name="save_global_track_interval_descr">Escolha o intervalo de registo para a gravação geral da pista (ativado via widget de registo GPX no mapa).</string>
+<string name="save_global_track_interval">Intervalo de registro geral</string>
+<string name="background_service_int">Intervalo de ativação do GPS</string>
+<string name="enable_sleep_mode">Ativar o modo de GPS em segundo plano</string>
+<string name="save_track_to_gpx_globally">Registrar trilha em arquivo GPX</string>
+<string name="save_track_to_gpx_globally_headline">Registro de trilha sob demanda</string>
+<string name="save_track_to_gpx_globally_descr">Posição geral de registro para um arquivo GPX pode ser ativada ou desativada usando o widget de registro de GPX na tela do mapa.</string>
+<string name="save_current_track_descr">Salvar a trilha atual como arquivo GPX agora.</string>
+<string name="save_current_track">Salvar a trilha atual</string>
+<string name="save_track_to_gpx">Auto-registrar a trilha durante a navegação</string>
+<string name="save_track_to_gpx_descrp">A trilha GPX será salva automaticamente no diretório de trilhas durante a navegação.</string>
+<string name="save_track_interval_globally">Intervalo de registro</string>
+<string name="save_track_interval">Intervalo de registro durante a navegação</string>
+<string name="save_track_interval_descr">Escolher o intervalo de registro para a gravação de trilha durante a navegação.</string>
+<string name="voice_provider_descr">Selecione a voz para instruções de navegação.</string>
+<string name="voice_provider">Instruções por voz</string>
+
+<string name="proxy_host_descr">Configurar o hostname do seu proxy (p. ex., 127.0.0.1).</string>
+<string name="proxy_port_title">Porta do proxy</string>
+<string name="proxy_port_descr">Configurar o número da porta do seu proxy (p. ex. 8118).</string>
+
+<string name="monitoring_settings">Gravação de viagem</string>
+<string name="monitoring_settings_descr">Configurar como gravar suas viagens.</string>
+<string name="gpx_option_calculate_first_last_segment">Calcular rota para o primeiro e último segmento</string>
+<string name="use_displayed_track_for_navigation">Use a trilha mostrada para navegação\?</string>
+<string name="routing_attr_prefer_motorway_name">Preferir Autoestradas</string>
+<string name="routing_attr_prefer_motorway_description">Preferir autoestradas na rota</string>
+
+
+<string name="routing_attr_avoid_toll_name">Evitar pedágios</string>
+<string name="routing_attr_avoid_toll_description">Evitar estradas com pedágio</string>
+<string name="routing_attr_avoid_unpaved_name">Evitar vias não pavimentadas</string>
+<string name="routing_attr_avoid_unpaved_description">Evitar estradas não pavimentadas.</string>
+<string name="routing_attr_avoid_ferries_description">Evitar as balsas</string>
+<string name="routing_attr_weight_name">Peso máximo</string>
+<string name="routing_attr_weight_description">Especifique o limite de peso do veículo nas rotas.</string>
+<string name="copying_osmand_files_descr">Copiar arquivos de dados para o novo destino (%s)…</string>
+<string name="copying_osmand_files">Copiando arquivos de dados…</string>
+<string name="calculate_osmand_route_gpx">"Calcular rota off-line "</string>
+<string name="app_mode_truck">Caminhão</string>
+<string name="auto_zoom_far">Visão intermediária</string>
+<string name="local_index_tile_data_minzoom">Zoom mínimo: %1$s</string>
+<string name="edit_tilesource_successfully">A fonte da quadrícula %1$s foi salva</string>
+<string name="speak_traffic_warnings">Moderadores de tráfego</string>
+<string name="context_menu_item_directions_from">Rota a partir daqui</string>
+<string name="app_mode_default">Explorar</string>
+<string name="local_indexes_cat_av">Dados de Áudio/Vídeo</string>
+<string name="stop_routing_confirm">Confirma que quer parar a navegação?</string>
+
+<string name="int_hour">h</string>
+<string name="duration">Duração</string>
+<string name="distance">Distância</string>
+<string name="index_tours">Excursões</string>
+<string name="shared_string_all">Todos</string>
+<string name="shared_string_waypoints">Marcos do trajeto</string>
+
+
+<string name="download_additional_maps">Baixar mapas que faltam %1$s (%2$d MB)?</string>
+<string name="rendering_value_browse_map_name">Explorar</string>  
+<string name="rendering_value_car_name">Carro</string>
+<string name="rendering_value_bicycle_name">Bicicleta</string>
+<string name="rendering_value_pedestrian_name">A pé</string>
+<string name="rendering_attr_coloredBuildings_name">Colorir edifícios conforme o tipo</string>
+
+
+
+<string name="continue_navigation">Continuar a navegação</string>
+<string name="pause_navigation">Pausar navegação</string>
+<string name="keep_navigation_service">Manter</string>
+<string name="gps_wake_up_timer">Intervalo para ativar GPS</string>
+<string name="map_preferred_locale_descr">Idioma preferido para os rótulos no mapa (se indisponível, será usado o inglês ou nomes locais).</string>
+<string name="map_preferred_locale">Idioma preferido do mapa</string>
+<string name="local_map_names">Nomes locais</string>
+<string name="lang_sw">Suaíli</string>
+<string name="lang_he">Hebraico</string>
+<string name="forward">Avançar</string>
+<string name="home">Painel de controle</string>
+<string name="live_monitoring_m_descr">Enviar o rastreamento para um serviço web especificado, se estiver ativado o registro de GPX.</string>
+<string name="live_monitoring_m">Rastreamento on-line (requer GPX)</string>
+<string name="live_monitoring_start">Iniciar rastreamento on-line</string>
+<string name="live_monitoring_stop">Parar rastreamento on-line</string>
+<string name="gpx_monitoring_start">Iniciar registro de GPX</string>
+<string name="gpx_monitoring_stop">Parar registro de GPX</string>
+<string name="gpx_start_new_segment">Iniciar novo rastreamento</string>
+<string name="rendering_attr_hideBuildings_name">Edifícios</string>
+<string name="rendering_attr_hideNonVehicleHighways_name">Estradas não trafegáveis</string>
+<string name="rendering_attr_hideText_name">Textos</string>
+<string name="rendering_attr_hideWoodScrubs_name">Matas e arbustos</string>
+<string name="rendering_attr_buildings15zoom_name">Edifícios em zoom 15</string>
+<string name="rendering_attr_moreDetailed_name">Mais detalhes</string>
+<string name="rendering_attr_lessDetailed_name">Menos detalhes</string>
+<string name="rendering_attr_hideAccess_name">Restrições de acesso</string>
+<string name="rendering_attr_showAccess_name">Mostrar restrições de acesso e pedágio</string>
+<string name="rendering_attr_showSurfaceGrade_name">Mostrar qualidade da via</string>
+<string name="rendering_attr_showSurfaces_name">Mostrar superfície da via</string>
+<string name="rendering_attr_showCycleRoutes_name">Mostrar rotas para bicicletas</string>
+
+
+
+
+
+
+
+
+
+<string name="no_index_file_to_download">Downloads não encontrados. Por favor, verifique sua conexão com a Internet.</string>
+<string name="select_index_file_to_download">Nada foi encontrado. Se você não encontrar a sua região, você pode criá-la (veja https://osmand.net).</string>
+<string name="none_selected_gpx">Não há arquivos GPX selecionados. Selecione um com um toque longo.</string>
+<string name="local_index_select_gpx_file">Selecione para mostrar</string>
+<string name="gpx_split_interval">Intervalo de divisão</string>
+<string name="sort_by_distance">Ordenar por distância</string>
+<string name="sort_by_name">Ordenar por nome</string>
+<string name="show_zoom_buttons_navigation_descr">Mostrar botões de zoom durante a navegação.</string>
+<string name="show_zoom_buttons_navigation">Mostrar botões de zoom</string>
+<string name="save_as_favorites_points">Salvar como grupo do Favoritos</string>
+<string name="select_destination_and_intermediate_points">Selecionar destinos</string>
+<string name="layer_amenity_label">Rótulos de sobreposição do ponto</string>
+<string name="loading_smth">Carregando %1$s…</string>
+<string name="map_widget_plain_time">Hora atual</string>
+<string name="selected_gpx_info_show">"
+\n
+\nToque longo para ver no mapa"</string>
+<string name="delay_navigation_start">Iniciar automaticamente instruções curva a curva</string>
+<string name="local_index_gpx_info_show">"
+\n
+\nToque longo para opções"</string>
+<string name="gpx_info_subtracks">"Subtrilhas: %1$s "</string>
+<string name="gpx_info_waypoints">Ponto de trajeto: %1$s</string>
+<string name="gpx_info_distance">"Distância: %1$s (%2$s pontos) "</string>
+<string name="gpx_info_start_time">"Hora de início: %1$tF, %1$tT "</string>
+<string name="gpx_info_end_time">"Hora de fim: %1$tF, %1$tT "</string>
+<string name="gpx_info_average_speed">"Velocidade média: %1$s "</string>
+<string name="gpx_info_maximum_speed">"Velocidade máxima: %1$s "</string>
+<string name="gpx_info_avg_altitude">Altitude média: %1$s</string>
+<string name="gpx_info_diff_altitude">Faixa de altitude: %1$s</string>
+<string name="gpx_info_asc_altitude">Descida/Subida: %1$s</string>
+<string name="gpx_timespan">Intervalo: %1$s</string>
+<string name="gpx_timemoving">Tempo em movimento: %1$s</string>
+<string name="gpx_selection_number_of_points">%1$s pontos</string>
+<string name="gpx_selection_point">Ponto %1$s</string>
+<string name="gpx_selection_route_points">%1$s ↵\nPontos de Rota %2$s</string>
+<string name="gpx_selection_points">%1$s↵\nPontos</string>
+<string name="gpx_selection_track">%1$s
 \nTrilha %2$s</string>
-    <string name="gpx_file_is_empty">A trilha GPX está vazia</string>
-    
-    
-    <string name="shared_string_waypoint">Marco de trajeto</string>
-    <string name="gpx_selection_segment_title">Segmento</string>
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-	
-	<string name="rendering_value_pink_name">rosa</string>
-	
-	<string name="rendering_value_brown_name">Marrom</string>
-	
-	
-	
-	
-	
-    
-    <string name="osmo_edit_color">Mostrar cor</string>
-    
-    
-    
-    
-    
-    
-    
-    
-    
-	
-    <string name="int_days">dias</string>
-    <string name="osmo_connect_menu">Conectar</string>
-    
-    <string name="osmo_group_description">Descrição</string>
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    <string name="hours_ago">horas atrás</string>
-    <string name="seconds_ago">segundos atrás</string>
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    <string name="use_points_as_intermediates">Calcular a rota entre pontos</string>
-    
-        
-    
-    
-    
-    
-   	<string name="always_center_position_on_map">Sempre centralizar a posição no mapa</string>
-    <string name="voice_pref_title">Voz</string>
-    <string name="misc_pref_title">Diversos</string>
-    <string name="localization_pref_title">Regionalização</string>
-    <string name="index_item_nation_addresses">endereços nacionais</string>
-	<string name="index_item_world_altitude_correction">Correção de altitude mundial</string>
-	<string name="index_item_world_seamarks">Marcas marítimas mundiais</string>
-	<string name="index_item_world_bitcoin_payments">Pagamentos mundiais de bitcoin</string>
-	<string name="index_item_world_basemap">Mapa de visão geral do mundo</string>
-    <string name="index_item_world_ski">Mapa mundial de esquí</string>
-    <string name="lang_zh">Chinês</string>
-    <string name="lang_pt_br">Português (Brasil)</string>
-    <string name="lang_en">Inglês</string>
-	<string name="lang_af">Africâner</string>
-	<string name="lang_al">Albanês</string>
-	<string name="lang_ar">Árabe</string>
-	<string name="lang_hy">Armênio</string>
-	<string name="lang_eu">Basco</string>
-	<string name="lang_be">Bielorrusso</string>
-	<string name="lang_bs">Bósnio</string>
-	<string name="lang_bg">Búlgaro</string>
-	<string name="lang_ca">Catalão</string>
-	<string name="lang_hr">Croata</string>
-	<string name="lang_cs">Tcheco</string>
-	<string name="lang_da">Dinamarquês</string>
-	<string name="lang_nl">Holandês</string>
-	<string name="lang_fi">Finlandês</string>
-	<string name="lang_fr">Francês</string>
-	<string name="lang_ka">Georgiano</string>
-	<string name="lang_de">Alemão</string>
-	<string name="lang_el">Grego</string>
-	<string name="lang_iw">Hebraico</string>
-	<string name="lang_hi">Hindi</string>
-	<string name="lang_hu">Húngaro</string>
-	<string name="lang_id">Indonésio</string>
-	<string name="lang_it">Italiano</string>
-	<string name="lang_ja">Japonês</string>
-	<string name="lang_ko">Coreano</string>
-	<string name="lang_lv">Letão</string>
-	<string name="lang_lt">Lituano</string>
-	<string name="lang_mr">Marata</string>
-	<string name="lang_no">Norueguês</string>
-	<string name="lang_fa">Persa</string>
-	<string name="lang_pl">Polonês</string>
-	<string name="lang_pt">Português</string>
-	<string name="lang_ro">Romeno</string>
-	<string name="lang_ru">Russo</string>
-	<string name="lang_sc">Sardenho</string>
-	<string name="lang_sr">Sérvio</string>
-	<string name="lang_zh_cn">Chinês simplificado</string>
-	<string name="lang_sk">Eslovaco</string>
-	<string name="lang_sl">Esloveno</string>
-	<string name="lang_es">Espanhol</string>
-	<string name="lang_sv">Sueco</string>
-	<string name="lang_zh_tw">Chinês tradicional</string>
-	<string name="lang_tr">Turco</string>
-	<string name="lang_uk">Ucraniano</string>
-	<string name="lang_vi">Vietnamita</string>
-	<string name="lang_cy">Galês</string>
-	<string name="index_name_canada">América do Norte - Canadá</string>
-    <string name="index_name_italy">Europa - Itália</string>
-    <string name="index_name_gb">Europa - Grã-Bretanha</string>
-    <string name="calculate_osmand_route_without_internet">Calcular segmento de rota OsmAnd sem Internet</string>
-    <string name="keep_and_add_destination_point">Adicionar como destino seguinte</string>
-    <string name="select_gpx">Selecionar GPX…</string>
-    <string name="route_descr_select_destination">Selecionar destino</string>
-    <string name="route_preferences">Preferências de rota</string>
-    <string name="route_info">Informações da rota</string>
-    <string name="routing_attr_avoid_ferries_name">Evitar balsas</string>
-	<string name="routing_attr_avoid_motorway_name">Evitar autoestradas</string>
-	<string name="routing_attr_avoid_motorway_description">Evitar autoestradas</string>
-	<string name="android_19_location_disabled">Desde a versão Android 4.4 (KitKat) você não pode baixar e atualizar os mapas para o diretório de armazenamento anterior (%s). Você quer mudar para o local de armazenamento permitido e copiar todos os arquivos do OsmAnd para lá?\n\n Nota 1: Seus arquivos antigos permanecerão intactos (mas podem ser excluídos manualmente).
+<string name="gpx_file_is_empty">Arquivo GPX vazio</string>
+
+
+<string name="shared_string_waypoint">Ponto de trajeto</string>
+<string name="gpx_selection_segment_title">Segmento</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<string name="rendering_value_pink_name">rosa</string>
+
+<string name="rendering_value_brown_name">Marrom</string>
+
+
+
+
+
+
+<string name="osmo_edit_color">Mostrar cor</string>
+
+
+
+
+
+
+
+
+
+
+<string name="int_days">dias</string>
+<string name="osmo_connect_menu">Conectar</string>
+
+<string name="osmo_group_description">Descrição</string>
+
+
+
+
+
+
+
+
+
+
+
+<string name="hours_ago">horas atrás</string>
+<string name="seconds_ago">segundos atrás</string>
+
+
+
+
+
+
+
+
+
+
+
+
+<string name="use_points_as_intermediates">Calcular a rota entre pontos</string>
+
+
+
+
+
+
+<string name="always_center_position_on_map">Sempre centralizar a posição no mapa</string>
+<string name="voice_pref_title">Voz</string>
+<string name="misc_pref_title">Diversos</string>
+<string name="localization_pref_title">Regionalização</string>
+<string name="index_item_nation_addresses">endereços nacionais</string>
+<string name="index_item_world_altitude_correction">Correção de altitude mundial</string>
+<string name="index_item_world_seamarks">Marcas marítimas mundiais</string>
+<string name="index_item_world_bitcoin_payments">Pagamentos mundiais de bitcoin</string>
+<string name="index_item_world_basemap">Mapa de visão geral do mundo</string>
+<string name="index_item_world_ski">Mapa mundial de esquí</string>
+<string name="lang_zh">Chinês</string>
+<string name="lang_pt_br">Português (Brasil)</string>
+<string name="lang_en">Inglês</string>
+<string name="lang_af">Africâner</string>
+<string name="lang_al">Albanês</string>
+<string name="lang_ar">Árabe</string>
+<string name="lang_hy">Armênio</string>
+<string name="lang_eu">Basco</string>
+<string name="lang_be">Bielorrusso</string>
+<string name="lang_bs">Bósnio</string>
+<string name="lang_bg">Búlgaro</string>
+<string name="lang_ca">Catalão</string>
+<string name="lang_hr">Croata</string>
+<string name="lang_cs">Tcheco</string>
+<string name="lang_da">Dinamarquês</string>
+<string name="lang_nl">Holandês</string>
+<string name="lang_fi">Finlandês</string>
+<string name="lang_fr">Francês</string>
+<string name="lang_ka">Georgiano</string>
+<string name="lang_de">Alemão</string>
+<string name="lang_el">Grego</string>
+<string name="lang_iw">Hebraico</string>
+<string name="lang_hi">Hindi</string>
+<string name="lang_hu">Húngaro</string>
+<string name="lang_id">Indonésio</string>
+<string name="lang_it">Italiano</string>
+<string name="lang_ja">Japonês</string>
+<string name="lang_ko">Coreano</string>
+<string name="lang_lv">Letão</string>
+<string name="lang_lt">Lituano</string>
+<string name="lang_mr">Marata</string>
+<string name="lang_no">Bokmål norueguesa</string>
+<string name="lang_fa">Persa</string>
+<string name="lang_pl">Polonês</string>
+<string name="lang_pt">Português</string>
+<string name="lang_ro">Romeno</string>
+<string name="lang_ru">Russo</string>
+<string name="lang_sc">Sardenho</string>
+<string name="lang_sr">Sérvio</string>
+<string name="lang_zh_cn">Chinês simplificado</string>
+<string name="lang_sk">Eslovaco</string>
+<string name="lang_sl">Esloveno</string>
+<string name="lang_es">Espanhol</string>
+<string name="lang_sv">Sueco</string>
+<string name="lang_zh_tw">Chinês tradicional</string>
+<string name="lang_tr">Turco</string>
+<string name="lang_uk">Ucraniano</string>
+<string name="lang_vi">Vietnamita</string>
+<string name="lang_cy">Galês</string>
+<string name="index_name_canada">América do Norte - Canadá</string>
+<string name="index_name_italy">Europa - Itália</string>
+<string name="index_name_gb">Europa - Grã-Bretanha</string>
+<string name="calculate_osmand_route_without_internet">"Cálculo offline do segmento de rota OsmAnd "</string>
+<string name="keep_and_add_destination_point">Adicionar como destino seguinte</string>
+<string name="select_gpx">Selecionar GPX…</string>
+<string name="route_descr_select_destination">Selecionar destino</string>
+<string name="route_preferences">Preferências de rota</string>
+<string name="route_info">Informações da rota</string>
+<string name="routing_attr_avoid_ferries_name">Evitar balsas</string>
+<string name="routing_attr_avoid_motorway_name">Evitar autoestradas</string>
+<string name="routing_attr_avoid_motorway_description">Evitar autoestradas</string>
+<string name="android_19_location_disabled">Desde a versão 4.4 do Android (KitKat) você não pode baixar e atualizar mapas para a pasta de armazenamento antiga (%s). Copiar todos os arquivos OsmAnd para novo local de armazenamento\?
+\n
+\n Nota 1: Seus arquivos antigos permanecerão intactos (mas podem ser excluídos manualmente). 
 \n Nota 2: No novo local de armazenamento não será possível compartilhar arquivos entre OsmAnd e OsmAnd+.</string>
-    <string name="copying_osmand_one_file_descr">Copiando arquivo (%s) para o novo destino…</string>
-    <string name="guidance_preferences_descr">Preferências de navegação</string>
-    <string name="routing_preferences_descr">Preferências de rota</string>
-    <string name="speech_rate_descr">Definir velocidade de fala do TTS</string>
-    <string name="speech_rate">Velocidade de fala</string>
-    
-    <string name="complex_route_calculation_failed">Cálculo rápido da rota falhou (%s), retorno ao cálculo lento.</string>
-    <string name="disable_complex_routing_descr">Desativar o roteamento de 2 fases para a navegação de carro</string>
-    <string name="disable_complex_routing">Desativar o roteamento complexo</string>
-    <string name="amenity_type_seamark">Marca náutica</string>
-    <string name="app_modes_choose_descr">Escolha os perfis disponíveis no aplicativo</string>
-    <string name="app_modes_choose">Perfis do aplicativo</string>
-	<string name="map_widget_map_rendering">Renderização do mapa</string>
-    <string name="app_mode_hiking">Caminhada</string>
-    <string name="app_mode_motorcycle">Motocicleta</string>
-    <string name="app_mode_boat">Barco</string>
-    <string name="app_mode_aircraft">Avião</string>
-    
-    
-    <string name="local_osm_changes_delete_all_confirm">Você vai apagar %1$d de alterações no OSM. Tem certeza?</string>
-    <string name="animate_routing_route_not_calculated">Por favor, calcular a rota primeiro</string>
-    <string name="animate_routing_route">"Simular usando a rota calculada "</string>
-    <string name="animate_routing_gpx">Simular usando trilha GPX</string>
-	
-	<string name="auto_zoom_none">Sem zoom automático</string>
-	<string name="auto_zoom_close">Aproximar</string>
-	<string name="auto_zoom_farthest">Afastar</string>
-	<string name="map_magnifier">Lupa</string>
-	<string name="base_world_map">Mapa base mundial</string>
-	
-	
-    <string name="about_version">Versão:</string>
-    <string name="shared_string_about">Sobre</string>
-    <string name="about_settings_descr">Versão, licenças, membros do projeto</string>
+<string name="copying_osmand_one_file_descr">Copiando arquivo (%s) para o novo destino…</string>
+<string name="guidance_preferences_descr">Preferências de navegação</string>
+<string name="routing_preferences_descr">Preferências de rota</string>
+<string name="speech_rate_descr">Definir velocidade de fala do TTS.</string>
+<string name="speech_rate">Velocidade de fala</string>
 
-    
-    <string name="local_index_tile_data_zooms">Zooms baixados: %1$s</string>
-    <string name="local_index_tile_data_expire">Expirar (minutos): %1$s</string>
-    <string name="local_index_tile_data_downloadable">Transferível: %1$s</string>
-    <string name="local_index_tile_data_maxzoom">Zoom máximo: %1$s</string>
-    <string name="local_index_tile_data_name">Dados da quadrícula: %1$s</string>
-    <string name="edit_tilesource_elliptic_tile">Mercator elíptico</string>
-    <string name="edit_tilesource_maxzoom">Zoom máximo</string>
-    <string name="edit_tilesource_expiration_time">Expirar (minutos)</string>
-    <string name="edit_tilesource_minzoom">Zoom mínimo</string>
-    <string name="edit_tilesource_url_to_load">URL</string>
-    <string name="edit_tilesource_choose_existing">Escolher existente…</string>
-    <string name="maps_define_edit">Definir/Editar…</string>
-	<string name="map_widget_fps_info">Informações de depuração FPS</string>
-	<string name="driving_region_descr">Selecionar a região de direção.</string>
-	<string name="driving_region">Região de direção</string>
-	<string name="driving_region_japan">Japão</string>
-	<string name="driving_region_us">Estados Unidos</string>
-	<string name="driving_region_canada">Canadá</string>
-	<string name="driving_region_europe_asia">Europa, Ásia, América Latina etc</string>
-	<string name="driving_region_uk">Reino Unido, Índia, Austrália e outras</string>
-    <string name="speak_descr">Configurar para anunciar nomes de ruas, moderadores de tráfego (paradas obrigatórias, lombadas), radares, limites de velocidade</string>
-	<string name="speak_street_names">Nome das ruas (TTS)</string>
-    <string name="speak_speed_limit">Limite de velocidade</string>
-    <string name="speak_cameras">Radares</string>
-	
-    <string name="osb_author_or_password_not_specified">Especificar o usuário e a senha nas Configurações</string>
-    <string name="clear_intermediate_points">Remover destinos intermediários</string>
-    <string name="keep_intermediate_points">Manter destinos intermediários</string>
-    <string name="new_directions_point_dialog">Os destinos intermediários já estão definidos.</string>
-    <string name="context_menu_item_directions_to">Direções para</string>
-    <string name="route_descr_map_location">"Mapa: "</string>
-    <string name="route_descr_lat_lon">Lat. %1$.3f, Lon. %2$.3f</string>
-    
-    <string name="route_descr_destination">Destino</string>
-    <string name="route_to">Para:</string>
-    <string name="clear_dest_confirm">Confirma que deseja remover o destino (inclusive os intermediários)?</string>
-    <string name="av_settings">"Configurar áudio/vídeo "</string>
-    <string name="route_via">Via:</string>
-    <string name="route_from">De:</string>
-	
-	
-    <string name="settings_preset">Perfil predefinido</string>
-	<string name="settings_preset_descr">Configurações de exibição e navegação de mapa são gravadas por perfil de uso. Defina seu perfil padrão aqui.</string>
-    <string name="snap_to_road_descr">Ajustar posição das vias durante a navegação</string>
-	<string name="snap_to_road">Ajustar à via</string>
-	<string name="osmand_short_description_80_chars">OsmAnd é um aplicativo de navegação de código aberto para mapas off-line e on-line</string>
-	<string name="osmand_long_description_1000_chars">" OsmAnd (Direções de Navegação Automatizada para OSM)\nOsmAnd é um aplicativo de navegação de código aberto com acesso a uma ampla variedade de dados globais do OpenStreetMap (OSM). Todos os dados de mapas (mapas vetoriais ou quadrículas) podem ser armazenados na memória do aparelho para uso off-line. OsmAnd também oferece funcionalidade de roteamento online e offline, incluindo orientação por voz curva a curva.\n\nAlgumas das principais características:\n - Completa funcionalidade offline (armazenar mapas vetoriais ou quadrículas no armazenamento do aparelho)\n - Mapas vetoriais offline compactos para todo o mundo disponível\n - Baixar mapas de país ou região diretamente do app\n - Sobreposição de várias camadas do mapa, como trilhas GPX ou navegação, pontos de interesse, favoritos, linhas de contorno, paradas de transporte público, mapas adicionais com transparência personalizável - Pesquisa off-line de endereços e lugares (POIs)\n - Roteamento off-line para distâncias curtas (experimental)\n - Modos para carro, bicicleta e pedestres com: mudança automatizada de visão dia/noite; opcional zoom dependente da velocidade; alinhamento de mapa de acordo com a bússola ou a direção do movimento; opcional orientação de faixas, exibição de limite de velocidade, gravação e vozes TTS\n\nLimitações nesta versão gratuita do OsmAnd:\n - número limitado de transferências de mapas\n - sem acesso off-line a POIs da Wikipédia\n\nOsmAnd é ativamente desenvolvido e nosso projeto e seus progressos se baseiam em contribuir economicamente para financiar o desenvolvimento e testar novas funcionalidades. Por favor, considere comprar OsmAnd+, financiar específicos recursos novos ou fazer uma doação geral em osmand.net. "</string>
-	<string name="day_night_info_description">Nascer do Sol: %1$s
+<string name="complex_route_calculation_failed">Cálculo rápido da rota falhou (%s), retorno ao cálculo lento.</string>
+<string name="disable_complex_routing_descr">Desativar o roteamento de dois fases para a navegação de carro.</string>
+<string name="disable_complex_routing">Desativar o roteamento complexo</string>
+<string name="amenity_type_seamark">Marca náutica</string>
+<string name="app_modes_choose_descr">Selecione os perfis para serem visíveis no aplicativo.</string>
+<string name="app_modes_choose">Perfis do aplicativo</string>
+<string name="map_widget_map_rendering">Renderização do mapa</string>
+<string name="app_mode_hiking">Caminhada</string>
+<string name="app_mode_motorcycle">Motocicleta</string>
+<string name="app_mode_boat">Barco</string>
+<string name="app_mode_aircraft">Avião</string>
+
+
+<string name="local_osm_changes_delete_all_confirm">Você vai apagar %1$d de alterações no OSM. Tem certeza?</string>
+<string name="animate_routing_route_not_calculated">Por favor, calcular a rota primeiro</string>
+<string name="animate_routing_route">"Simular usando a rota calculada "</string>
+<string name="animate_routing_gpx">Simular usando trilha GPX</string>
+
+<string name="auto_zoom_none">Sem zoom automático</string>
+<string name="auto_zoom_close">Aproximar</string>
+<string name="auto_zoom_farthest">Afastar</string>
+<string name="map_magnifier">Lupa</string>
+<string name="base_world_map">Mapa base mundial</string>
+
+
+<string name="about_version">Versão:</string>
+<string name="shared_string_about">Sobre</string>
+<string name="about_settings_descr">Versão, licenças, membros do projeto</string>
+
+
+<string name="local_index_tile_data_zooms">Zooms baixados: %1$s</string>
+<string name="local_index_tile_data_expire">Expirar (minutos): %1$s</string>
+<string name="local_index_tile_data_downloadable">Transferível: %1$s</string>
+<string name="local_index_tile_data_maxzoom">Zoom máximo: %1$s</string>
+<string name="local_index_tile_data_name">Dados da quadrícula: %1$s</string>
+<string name="edit_tilesource_elliptic_tile">Mercator elíptico</string>
+<string name="edit_tilesource_maxzoom">Zoom máximo</string>
+<string name="edit_tilesource_expiration_time">Expirar (minutos)</string>
+<string name="edit_tilesource_minzoom">Zoom mínimo</string>
+<string name="edit_tilesource_url_to_load">URL</string>
+<string name="edit_tilesource_choose_existing">Escolher existente…</string>
+<string name="maps_define_edit">Definir/Editar…</string>
+<string name="map_widget_fps_info">Informações de depuração FPS</string>
+<string name="driving_region_descr">Selecionar a região de direção.</string>
+<string name="driving_region">Região de direção</string>
+<string name="driving_region_japan">Japão</string>
+<string name="driving_region_us">Estados Unidos</string>
+<string name="driving_region_canada">Canadá</string>
+<string name="driving_region_europe_asia">Europa, Ásia, América Latina etc</string>
+<string name="driving_region_uk">Reino Unido, Índia e similares</string>
+<string name="speak_descr">Configurar para anunciar nomes de ruas, moderadores de tráfego (paradas obrigatórias, lombadas), radares, limites de velocidade.</string>
+<string name="speak_street_names">Nome das ruas (TTS)</string>
+<string name="speak_speed_limit">Limite de velocidade</string>
+<string name="speak_cameras">Radares</string>
+
+<string name="osb_author_or_password_not_specified">Especificar o usuário e a senha nas \'Configurações\'</string>
+<string name="clear_intermediate_points">Remover destinos intermediários</string>
+<string name="keep_intermediate_points">Manter destinos intermediários</string>
+<string name="new_directions_point_dialog">Os destinos intermediários já estão definidos.</string>
+<string name="context_menu_item_directions_to">Direções para</string>
+<string name="route_descr_map_location">Mapa:</string>
+<string name="route_descr_lat_lon">Lat. %1$.3f, Lon. %2$.3f</string>
+
+<string name="route_descr_destination">Destino</string>
+<string name="route_to">Para:</string>
+<string name="clear_dest_confirm">Confirma que deseja remover o destino (inclusive os intermediários)?</string>
+<string name="av_settings">"Configurar áudio/vídeo "</string>
+<string name="route_via">Via:</string>
+<string name="route_from">De:</string>
+
+
+<string name="settings_preset">Perfil predefinido</string>
+<string name="settings_preset_descr">Configurações de exibição e navegação de mapa são gravadas por perfil de uso. Defina seu perfil padrão aqui.</string>
+<string name="snap_to_road_descr">Ajustar posição às vias próximas durante a navegação.</string>
+<string name="snap_to_road">Ajustar com a via</string>
+<string name="osmand_short_description_80_chars">OsmAnd é um aplicativo de navegação de código aberto para mapas off-line e on-line</string>
+<string name="osmand_long_description_1000_chars">" OsmAnd (Direções de Navegação Automatizada para OSM)\nOsmAnd é um aplicativo de navegação de código aberto com acesso a uma ampla variedade de dados globais do OpenStreetMap (OSM). Todos os dados de mapas (mapas vetoriais ou quadrículas) podem ser armazenados na memória do aparelho para uso off-line. OsmAnd também oferece funcionalidade de roteamento online e offline, incluindo orientação por voz curva a curva.\n\nAlgumas das principais características:\n - Completa funcionalidade offline (armazenar mapas vetoriais ou quadrículas no armazenamento do aparelho)\n - Mapas vetoriais offline compactos para todo o mundo disponível\n - Baixar mapas de país ou região diretamente do app\n - Sobreposição de várias camadas do mapa, como trilhas GPX ou navegação, pontos de interesse, favoritos, linhas de contorno, paradas de transporte público, mapas adicionais com transparência personalizável - Pesquisa off-line de endereços e lugares (POIs)\n - Roteamento off-line para distâncias curtas (experimental)\n - Modos para carro, bicicleta e pedestres com: mudança automatizada de visão dia/noite; opcional zoom dependente da velocidade; alinhamento de mapa de acordo com a bússola ou a direção do movimento; opcional orientação de faixas, exibição de limite de velocidade, gravação e vozes TTS\n\nLimitações nesta versão gratuita do OsmAnd:\n - número limitado de transferências de mapas\n - sem acesso off-line a POIs da Wikipédia\n\nOsmAnd é ativamente desenvolvido e nosso projeto e seus progressos se baseiam em contribuir economicamente para financiar o desenvolvimento e testar novas funcionalidades. Por favor, considere comprar OsmAnd+, financiar específicos recursos novos ou fazer uma doação geral em osmand.net. "</string>
+<string name="day_night_info_description">Nascer do Sol: %1$s
 Pôr do Sol: %2$s</string>
-	<string name="avoid_unpaved">Vias não-pavimentadas</string>
-	<string name="avoid_in_routing_descr">Evitar vias com pedágio, não-pavimentadas, balsas</string>
-	<string name="bg_service_sleep_mode_off">Ativar\n modo segundo plano</string>
-	<string name="show_cameras">Radares</string>
-	<string name="show_traffic_warnings">Alertas de trânsito</string>
-	<string name="destination_point">Destino %1$s</string>
-    <string name="context_menu_item_destination_point">Definir como destino</string>
-    <string name="please_select_address">Selecionar primeiro a cidade ou rua</string>
-    
-    <string name="search_street_in_neighborhood_cities">Pesquisar rua na vizinhança</string>
-    <string name="intermediate_items_sort_return">Destinos intermediárias reordenados para otimizar o caminho do local atual até o destino final.</string>
-    <string name="intermediate_items_sort_by_distance">Ordem de porta em porta</string>
-    <string name="local_osm_changes_backup_successful">Arquivo de alterações do OSM gerado com sucesso %1$s</string>
-    <string name="local_osm_changes_backup_failed">Falha ao copiar as alterações no OSM</string>
-    <string name="local_osm_changes_backup">Copiar como alteração no OSM</string>
-    <string name="delete_point">Apagar ponto</string>
-    <string name="plugin_distance_point_time">tempo</string>
-    <string name="plugin_distance_point_hdop">precisão</string>
-    <string name="plugin_distance_point_speed">velocidade</string>
-    <string name="plugin_distance_point_ele">altitude</string>
-    <string name="plugin_distance_point">Ponto</string>
-    <string name="gpx_file_name">Nome do arquivo GPX</string>
-    <string name="gpx_saved_sucessfully">Arquivo GPX salvo com sucesso em {0}</string>
-    <string name="use_distance_measurement_help">* Toque para marcar um ponto.\n * Toque e segure no mapa para apagar pontos anteriores.\n * Toque e segure no ponto para ver e anexar descrição.\n * Toque no widget de medição para ver mais ações.</string>
-    <string name="distance_measurement_start_editing">Começar a edição</string>
-    <string name="distance_measurement_finish_editing">Finalizar a edição</string>
-    <string name="distance_measurement_finish_subtrack">Começar uma nova subtrilha</string>
-    <string name="distance_measurement_clear_route">Apagar todos os pontos</string>
-    <string name="distance_measurement_load_gpx">Abrir GPX</string>
-    <string name="wait_current_task_finished">Aguarde até que a tarefa seja concluída</string>
-    <string name="use_kalman_filter_compass_descr">Reduz o ruído em leituras da bússola, mas acrescenta inércia</string>
-    <string name="use_kalman_filter_compass">Usar filtro de Kalman</string>
-    <string name="use_magnetic_sensor_descr">Usar o sensor magnético para determinar a direção da bússola em vez do sensor de orientação</string>
-    <string name="use_magnetic_sensor">Usar sensor magnético</string>
-    <string name="other_location">Outro</string>
-    <string name="files_limit">Restando %1$d arquivos</string>
-    <string name="available_downloads_left">Disponível %1$d arquivos para download</string>
-    <string name="install_paid">Versão completa</string>
-    <string name="cancel_route">Descartar rota</string>
-    <string name="cancel_navigation">Parar navegação</string>
-    <string name="clear_destination">Apagar destino</string>
-    <string name="download_using_mobile_internet">O Wi-Fi não está conectado no momento. Você quer usar a conexão de Internet atual para baixar?</string>
-    <string name="street_name">Nome da rua</string>
-	<string name="hno">Número de porta</string>
-    <string name="website">Website</string>
-	<string name="phone">Telefone</string>
-    
-    <string name="osmand_background_plugin_description">Mostrar configurações para ativar o rastreamento e navegação em segundo plano, ativando periodicamente o dispositivo GPS (com tela desligada).</string>
-    <string name="contribution_activity">Instalar a versão</string>
-    <string name="choose_osmand_theme_descr">Escolher o tema do aplicativo</string>
-    <string name="choose_osmand_theme">Tema</string>
-    <string name="accessibility_options">Opções de acessibilidade</string>
-    <string name="select_address_activity">Selecionar endereço</string>
-    <string name="favourites_list_activity">Selecionar favorito</string>
-    <string name="local_openstreetmap_act_title">Modificações no OSM</string>
-	
-    <string name="layer_hillshade">Camadas de relevo</string>
-    <string name="map_widget_gps_info">Informação de GPS</string>
-    
-    <string name="access_arrival_time">Hora de chegada</string>
-    <string name="item_checked">marcado</string>
-    <string name="item_unchecked">desmarcado</string>
-    <string name="prefer_motorways">Preferir autoestradas</string>
-	<string name="prefer_in_routing_title">Preferir…</string>
-	<string name="prefer_in_routing_descr">Preferir autoestradas</string>
-    <string name="max_speed_none">nenhum</string>
-    <string name="index_name_openmaps">OpenMaps UE</string>
-    
-    <string name="download_hillshade_maps">Sombras de relevo</string>
-    
-    
-    <string name="precise_routing_mode_descr">Permitir calcular rotas precisas sem falhas. Está limitado pela distância e é lento.</string>
-    <string name="precise_routing_mode">Roteamento preciso (alfa)</string>
-    <string name="recording_context_menu_show">Mostrar</string>
-    <string name="recording_photo_description">Foto %1$s %2$s</string>
-    <string name="av_def_action_picture">Tirar uma foto</string>
-    <string name="recording_context_menu_precord">Tirar uma foto</string>
-    <string name="dropbox_plugin_description">O complemento do Dropbox permite sincronizar trilhas e notas de áudio/vídeo com a sua conta.</string>
-    <string name="dropbox_plugin_name">Complemento Dropbox</string>
-    <string name="intermediate_points_change_order">Alterar ordem</string>
-    <string name="srtm_paid_version_msg">Por favor, considere comprar o plugin \'Curvas de nível\' para apoiar o desenvolvimento.</string>
-    <string name="av_def_action_choose">Selecionar a pedido</string>
-    <string name="av_def_action_video">Gravar vídeo</string>
-    <string name="av_def_action_audio">Gravar áudio</string>
-    <string name="av_widget_action_descr">Selecionar ação predefinida do widget</string>
-    <string name="av_widget_action">Ação predefinida</string>
-    <string name="av_video_format_descr">Selecionar formato do vídeo de saída</string>
-    <string name="av_video_format">Formato do vídeo</string>
-    <string name="av_use_external_recorder_descr">Usar gravador do sistema para vídeo</string>
-    <string name="av_use_external_recorder">Usar gravador externo</string>
-    <string name="av_use_external_camera_descr">Usar o aplicativo de sistema para foto</string>
-    <string name="av_use_external_camera">Usar câmera externa</string>
-    <string name="av_settings_descr">Configurar áudio e vídeo</string>
-    <string name="recording_error">Ocorreu um erro durante a gravação</string>
-    <string name="recording_camera_not_available">Câmera indisponível</string>
-    <string name="recording_is_recorded">Gravando áudio/vídeo. Para parar, toque no widget AV.</string>
-    <string name="recording_playing">Reproduzindo áudio da gravação especificada.\n%1$s</string>
-    <string name="recording_open_external_player">Abrir reprodutor externo</string>
-    <string name="recording_delete_confirm">Você quer excluir esta gravação?</string>
-    
-    <string name="recording_unavailable">Indisponível</string>
-    <string name="recording_context_menu_arecord">Tomar uma nota de áudio</string>
-    <string name="recording_context_menu_vrecord">Tomar uma nota de vídeo</string>
-    <string name="layer_recordings">Camada de gravação</string>
-    <string name="recording_can_not_be_played">Gravação não pode ser reproduzida</string>
-    <string name="recording_context_menu_delete">Apagar gravação</string>
-    <string name="recording_context_menu_play">Tocar</string>
-    <string name="recording_description">Gravando %1$s %3$s %2$s</string>
-    <string name="recording_default_name">Gravando</string>
-    <string name="map_widget_av_notes">Notas de áudio/vídeo</string>
-    <string name="map_widget_distancemeasurement">Medição de distância</string>
-    <string name="audionotes_location_not_defined">Local para associar com a nota ainda não está definido. \"Usar posição…\" para atribuir uma nota para o local especificado</string>
-    <string name="map_widget_audionotes">Notas de áudio</string>
-    <string name="index_srtm_parts">peças</string>
-    <string name="download_select_map_types">Outros mapas</string>
-    <string name="download_roads_only_item">Apenas estradas</string>
-    <string name="download_regular_maps">Mapa padrão</string>
-    <string name="download_roads_only_maps">Apenas mapa de estradas</string>
-    <string name="rendering_attr_alpineHiking_description">Renderizar caminhos de acordo com a escala de SAC</string>
-    <string name="rendering_attr_hikingRoutesOSMC_name">Sobreposição de símbolo de montanhismo</string>
-    <string name="rendering_attr_hikingRoutesOSMC_description">Renderizar caminhos de acordo com traços OSMC</string>
-    
-	<string name="rendering_attr_noAdminboundaries_name">Limites</string>
-	<string name="rendering_attr_noAdminboundaries_description">Esconder limites regionais (níveis administrativos 5-9)</string>
-	
-	<string name="target_point">Destino %1$s</string>
-    <string name="intermediate_point">Destino intermediário %1$s</string>
-    <string name="map_widget_intermediate_distance">Destino intermediário</string>
-    <string name="use_compass_navigation">Usar bússola</string>
-	<string name="avoid_motorway">Evitar auto-estradas</string>
-	<string name="auto_zoom_map_descr">Zoom automático em função da sua velocidade (enquanto o mapa é sincronizado com a posição atual)</string>
-	<string name="auto_zoom_map">Zoom automático</string>
-	<string name="interrupt_music_descr">Interromper a música quando fazer anúncio</string>
-	<string name="interrupt_music">Interromper música</string>
-	
-	<string name="osmand_play_title_30_chars">OsmAnd Mapas &amp; Navegação</string>
-	
-	<string name="osmand_plus_play_title_30_chars">OsmAnd+ Mapas &amp; Navegação</string>
-	<string name="osmand_plus_short_description_80_chars">Visualizador Móvel de Mapa Global &amp; Navegação Off-line e On-line para Mapas OSM</string>
-	
-	<string name="filterpoi_activity">Criar filtro de POI</string>
-	<string name="recalculate_route_to_your_location">Meio de transporte:</string>
-	<string name="select_navigation_mode">Selecionar meio de transporte</string>
-	<string name="day_night_info">Informações dia/noite</string>
-	
-	<string name="map_widget_renderer">Estilo do mapa</string>
-	<string name="layer_map_appearance">Configurar tela</string>
-	<string name="show_lanes">Mostrar faixas de rolamento</string>
-	<string name="avoid_ferries">Evitar balsas</string>
-	<string name="avoid_in_routing_title">Evitar…</string>
-	<string name="map_widget_fluorescent">Rotas fluorescentes</string>
-	<string name="map_widget_show_ruler">Régua</string>
-	<string name="map_widget_view_direction">Direção da visão</string>
-	<string name="map_widget_transparent">Widgets transparentes</string>
-	<string name="bg_service_sleep_mode_on">Parar\n modo segundo plano</string>
-	<string name="gps_wakeup_interval">Intervalo de ativação do GPS: %s</string>
-	<string name="int_continuosly">Contínuo</string>
-	<string name="screen_is_locked">Para desbloquear a tela pressione o cadeado</string>
-	<string name="map_widget_top_text">Nome da rua</string>
-	<string name="map_widget_config">Configurar tela</string>
-	<string name="map_widget_back_to_loc">Onde estou</string>
-	<string name="map_widget_lock_screen">Bloquear tela</string>
-	<string name="map_widget_compass">Bússola</string>
-	<string name="map_widget_reset">Restaurar para predefinido</string>
-	<string name="map_widget_parking">Estacionamento</string>
-	<string name="map_widget_monitoring">Registro de GPX</string>
-	<string name="map_widget_speed">Velocidade</string>
-	<string name="map_widget_distance">Destino</string>
-	<string name="map_widget_altitude">Altitude</string>
-	<string name="map_widget_time">Tempo para chegar</string>
-	<string name="map_widget_next_turn">Próxima manobra</string>
-	<string name="map_widget_next_turn_small">Próxima manobra (menor)</string>
-	<string name="map_widget_next_next_turn">Segunda próxima manobra</string>
-	<string name="map_widget_mini_route">Minimapa da rota</string>
-	<string name="bg_service_screen_lock">Bloquear tela</string>
-	<string name="bg_service_screen_unlock">Desbloquear tela</string>
-	<string name="bg_service_screen_lock_toast">A tela está bloqueada</string>
-	<string name="bg_service_interval">Definir intervalo para ativar:</string>
-	<string name="avoid_toll_roads">Pedágios</string>
-	<string name="continue_follow_previous_route_auto">A navegação anterior não foi concluída, quer continuá-la? (%1$s segundos)</string>
-	<string name="route_updated_loc_found">Rota será recalculada quando a posição for encontrada</string>
-	<string name="osmand_parking_hours">Horas</string>
-	<string name="osmand_parking_minutes">Minutos</string>
-	<string name="osmand_parking_position_description_add_time">O carro foi estacionado em</string>
-	<string name="index_settings">Gerenciar mapas</string>
-	<string name="context_menu_item_search">Pesquisar aqui perto</string>
-	<string name="local_index_descr_title">Gerenciar mapas</string>
-	<string name="show_point_options">Usar posição…</string>
-	<string name="only_show">Exibir rota</string>
-	<string name="follow">Iniciar navegação</string>
-	<string name="get_directions">Direções</string>
-	<string name="local_indexes_cat_srtm">Curvas de nível</string>
-    <string name="index_srtm_ele">Curvas de nível</string>
-    <string name="download_srtm_maps">Curvas de nível</string>
-    <string name="rendering_attr_alpineHiking_name">Escala de montanhismo (SAC)</string>
-    <string name="rendering_attr_showRoadMaps_name">Apenas mapa de estradas</string>
-    <string name="safe_mode_description">Executar o aplicativo em modo seguro (usando código de Android, mais lento, em vez de código nativo).</string>
-    <string name="zxing_barcode_scanner_not_found">Aplicativo Barcode Scanner da ZXing não está instalado. Pesquisar na loja de apps?</string>
-	<string name="shared_location">Posição compartilhada</string>
-	<string name="osmand_parking_lim_text">Tempo limitado</string>
-	<string name="left_side_navigation">Condução pela faixa da esquerda</string>
-	<string name="index_settings_descr">Baixar e gerenciar mapas armazenados no seu aparelho</string>
-	<string name="plugins_screen">Complementos</string>
-	<string name="support_new_features">Apoiar novos recursos</string>
-	<string name="front">em frente</string>
-	<string name="oclock">em ponto</string>
-	<string name="direction_style_sidewise">Lateralmente (8 setores)</string>
-	<string name="auto_announce_on">Iniciar anúncio automático</string>
-	<string name="auto_announce_off">Parar anúncios automáticos</string>
-	<string name="local_openstreetmap_upload">Enviar modificação para OSM</string>
-	<string name="local_openstreetmap_delete">Apagar modificação</string>
-	<string name="live_monitoring_interval_descr">Especificar intervalo de monitoramento on-line</string>
-	<string name="daynight_mode_auto">Nascer/Pôr do Sol</string>
-	<string name="map_widget_max_speed">Limite de velocidade</string>
-    <string name="monitoring_control_start">GPX</string>
-    <string name="no_buildings_found">Nenhum edifício encontrado.</string>
-    <string name="incremental_search_city">Pesquisar cidade incrementalmente</string>
-    <string name="search_villages_and_postcodes">Pesquisar mais povoados/código postal</string>
-	<string name="rendering_attr_showRoadMaps_description">Selecionar quando exibir somente vias no mapa:</string>
-	<string name="safe_mode">Modo seguro</string>
-    <string name="native_library_not_running">O aplicativo está em modo seguro (desative nas configurações).</string>
-    
-    
-    <string name="close_changeset">Fechar conjunto de alterações</string>
-	<string name="rendering_attr_roadColors_description">Selecionar um esquema de cores das vias:</string>
-	<string name="rendering_attr_roadColors_name">Esquema de cores das vias</string>
-    <string name="map_widget_show_destination_arrow">Mostrar a direção do destino</string>
-    <string name="enable_plugin_monitoring_services">Ativar plugin de gravação de viagem para usar serviços de registro de posição (registro GPX, rastreamento on-line)</string>
-    <string name="non_optimal_route_calculation">Calcular rota possivelmente não ideal em longas distâncias</string>
-	<string name="gps_not_available">Por favor, ative o GPS nas configurações</string>
-    
-	<string name="map_widget_monitoring_services">Serviços de registro</string>
-	<string name="no_route">Sem rota</string>
-	<string name="delete_target_point">Remover destino</string>
-	<string name="context_menu_item_last_intermediate_point">Adicionar como último destino intermediário</string>
-    <string name="context_menu_item_first_intermediate_point">Adicionar como primeiro destino intermediário</string>
-    <string name="add_as_last_destination_point">Adicionar como último destino intermediário</string>
-    <string name="add_as_first_destination_point">Adicionar como primeiro destino intermediário</string>
+<string name="avoid_unpaved">Evitar vias não pavimentadas</string>
+<string name="avoid_in_routing_descr">Evitar p.ex. vias pedagiadas, não pavimentadas, balsas.</string>
+<string name="bg_service_sleep_mode_off">Ativar\n modo segundo plano</string>
+<string name="show_cameras">Radares</string>
+<string name="show_traffic_warnings">Alertas de trânsito</string>
+<string name="destination_point">Destino %1$s</string>
+<string name="context_menu_item_destination_point">Definir como destino</string>
+<string name="please_select_address">Selecionar primeiro a cidade ou rua</string>
+
+<string name="search_street_in_neighborhood_cities">Pesquisar para rua na vizinhança</string>
+<string name="intermediate_items_sort_return">Ordem otimizada de destinos intermediários em rota para o destino.</string>
+<string name="intermediate_items_sort_by_distance">Ordem de porta em porta</string>
+<string name="local_osm_changes_backup_successful">Arquivo de alterações do OSM foi gerado %1$s</string>
+<string name="local_osm_changes_backup_failed">Não foi possível fazer backup das alterações do OSM</string>
+<string name="local_osm_changes_backup">Copiar como alteração no OSM</string>
+<string name="delete_point">Apagar ponto</string>
+<string name="plugin_distance_point_time">tempo</string>
+<string name="plugin_distance_point_hdop">precisão</string>
+<string name="plugin_distance_point_speed">velocidade</string>
+<string name="plugin_distance_point_ele">altitude</string>
+<string name="plugin_distance_point">Ponto</string>
+<string name="gpx_file_name">Nome do arquivo GPX</string>
+<string name="gpx_saved_sucessfully">Arquivo GPX salvo em {0}</string>
+<string name="use_distance_measurement_help">* Toque para marcar um ponto.\n * Toque e segure no mapa para apagar pontos anteriores.\n * Toque e segure no ponto para ver e anexar descrição.\n * Toque no widget de medição para ver mais ações.</string>
+<string name="distance_measurement_start_editing">Começar a edição</string>
+<string name="distance_measurement_finish_editing">Finalizar a edição</string>
+<string name="distance_measurement_finish_subtrack">Começar uma nova subtrilha</string>
+<string name="distance_measurement_clear_route">Apagar todos os pontos</string>
+<string name="distance_measurement_load_gpx">Abrir o arquivo GPX</string>
+<string name="wait_current_task_finished">Aguarde até que a tarefa seja concluída</string>
+<string name="use_kalman_filter_compass_descr">Reduz o ruído em leituras da bússola, mas acrescenta inércia.</string>
+<string name="use_kalman_filter_compass">Usar filtro de Kalman</string>
+<string name="use_magnetic_sensor_descr">Usar o sensor magnético para determinar a direção da bússola em vez do sensor de orientação.</string>
+<string name="use_magnetic_sensor">Usar sensor magnético</string>
+<string name="other_location">Outro</string>
+<string name="files_limit">Restando %1$d arquivos</string>
+<string name="available_downloads_left">%1$d arquivos restantes para download</string>
+<string name="install_paid">Versão completa</string>
+<string name="cancel_route">Descartar rota</string>
+<string name="cancel_navigation">Parar navegação</string>
+<string name="clear_destination">Apagar destino</string>
+<string name="download_using_mobile_internet">Não conectado ao Wi-Fi. Use a conexão atual com a Internet para baixar\?</string>
+<string name="street_name">Nome da rua</string>
+<string name="hno">Número de porta</string>
+<string name="website">Site</string>
+<string name="phone">Telefone</string>
+
+<string name="osmand_background_plugin_description">Mostrar configurações para ativar o rastreamento e navegação em segundo plano, ativando periodicamente o dispositivo GPS (com tela desligada).</string>
+<string name="contribution_activity">Instalar a versão</string>
+<string name="choose_osmand_theme_descr">Escolher o tema do aplicativo.</string>
+<string name="choose_osmand_theme">Tema</string>
+<string name="accessibility_options">Opções de acessibilidade</string>
+<string name="select_address_activity">Selecionar endereço</string>
+<string name="favourites_list_activity">Selecionar favorito</string>
+<string name="local_openstreetmap_act_title">Modificações no OSM</string>
+
+<string name="layer_hillshade">Camadas de relevo</string>
+<string name="map_widget_gps_info">Informação de GPS</string>
+
+<string name="access_arrival_time">Hora de chegada</string>
+<string name="item_checked">marcado</string>
+<string name="item_unchecked">desmarcado</string>
+<string name="prefer_motorways">Preferir autoestradas</string>
+<string name="prefer_in_routing_title">Preferir…</string>
+<string name="prefer_in_routing_descr">Preferir autoestradas.</string>
+<string name="max_speed_none">nenhum</string>
+<string name="index_name_openmaps">OpenMaps UE</string>
+
+<string name="download_hillshade_maps">Sombras de relevo</string>
+
+
+<string name="precise_routing_mode_descr">Calcular rotas precisas sem falhas. Está limitado pela distância e é lento.</string>
+<string name="precise_routing_mode">Roteamento preciso (alfa)</string>
+<string name="recording_context_menu_show">Mostrar</string>
+<string name="recording_photo_description">Foto %1$s %2$s</string>
+<string name="av_def_action_picture">Tirar uma foto</string>
+<string name="recording_context_menu_precord">Tirar uma foto</string>
+<string name="dropbox_plugin_description">O plugin do Dropbox permite sincronizar trilhas e notas de áudio/vídeo com a sua conta.</string>
+<string name="dropbox_plugin_name">Plugin Dropbox</string>
+<string name="intermediate_points_change_order">Alterar ordem</string>
+<string name="srtm_paid_version_msg">Por favor, considere comprar o plugin \'Curvas de nível\' para apoiar o desenvolvimento.</string>
+<string name="av_def_action_choose">Selecionar a pedido</string>
+<string name="av_def_action_video">Gravar vídeo</string>
+<string name="av_def_action_audio">Gravar áudio</string>
+<string name="av_widget_action_descr">Selecionar ação predefinida do widget.</string>
+<string name="av_widget_action">Ação predefinida</string>
+<string name="av_video_format_descr">Selecionar formato do vídeo de saída.</string>
+<string name="av_video_format">Formato do vídeo</string>
+<string name="av_use_external_recorder_descr">Usar gravador do sistema para vídeo.</string>
+<string name="av_use_external_recorder">Usar gravador externo</string>
+<string name="av_use_external_camera_descr">Usar o aplicativo de sistema para fotos.</string>
+<string name="av_use_external_camera">Usar câmera externa</string>
+<string name="av_settings_descr">Configurar áudio e vídeo.</string>
+<string name="recording_error">Falha na gravação</string>
+<string name="recording_camera_not_available">Câmera indisponível</string>
+<string name="recording_is_recorded">Gravando áudio/vídeo. Para parar, toque no widget AV.</string>
+<string name="recording_playing">Reproduzindo áudio da gravação especificada.\n%1$s</string>
+<string name="recording_open_external_player">Abrir reprodutor externo</string>
+<string name="recording_delete_confirm">Apagar este item\?</string>
+
+<string name="recording_unavailable">Indisponível</string>
+<string name="recording_context_menu_arecord">Tomar nota de áudio</string>
+<string name="recording_context_menu_vrecord">Tomar nota de vídeo</string>
+<string name="layer_recordings">Camada de gravação</string>
+<string name="recording_can_not_be_played">Gravação não pode ser reproduzida</string>
+<string name="recording_context_menu_delete">Apagar gravação</string>
+<string name="recording_context_menu_play">Tocar</string>
+<string name="recording_description">Gravando %1$s %3$s %2$s</string>
+<string name="recording_default_name">Gravando</string>
+<string name="map_widget_av_notes">Notas de áudio/vídeo</string>
+<string name="map_widget_distancemeasurement">Medição de distância</string>
+<string name="audionotes_location_not_defined">Local para associar com a nota ainda não está definido. \"Usar posição…\" para atribuir uma nota para o local especificado.</string>
+<string name="map_widget_audionotes">Notas de áudio</string>
+<string name="index_srtm_parts">peças</string>
+<string name="download_select_map_types">Outros mapas</string>
+<string name="download_roads_only_item">Apenas estradas</string>
+<string name="download_regular_maps">Mapa padrão</string>
+<string name="download_roads_only_maps">Apenas mapa de estradas</string>
+<string name="rendering_attr_alpineHiking_description">Renderizar caminhos de acordo com a escala de SAC.</string>
+<string name="rendering_attr_hikingRoutesOSMC_name">Camada de símbolos de caminhada</string>
+<string name="rendering_attr_hikingRoutesOSMC_description">Renderizar caminhos de acordo com traços OSMC.</string>
+
+<string name="rendering_attr_noAdminboundaries_name">Limites</string>
+<string name="rendering_attr_noAdminboundaries_description">Esconder limites regionais (níveis administrativos 5-9).</string>
+
+<string name="target_point">Destino %1$s</string>
+<string name="intermediate_point">Destino intermediário %1$s</string>
+<string name="map_widget_intermediate_distance">Destino intermediário</string>
+<string name="use_compass_navigation">Usar bússola</string>
+<string name="avoid_motorway">Evitar autoestradas</string>
+<string name="auto_zoom_map_descr">Nível de zoom em função da sua velocidade (enquanto o mapa é sincronizado com a posição atual).</string>
+<string name="auto_zoom_map">Zoom automático</string>
+<string name="interrupt_music_descr">Interromper a música quando fazer anúncio.</string>
+<string name="interrupt_music">Pausar música</string>
+
+<string name="osmand_play_title_30_chars">OsmAnd Mapas &amp; Navegação</string>
+
+<string name="osmand_plus_play_title_30_chars">OsmAnd+ Mapas &amp; Navegação</string>
+<string name="osmand_plus_short_description_80_chars">Visualizador Móvel de Mapa Global &amp; Navegação Off-line e On-line para Mapas OSM</string>
+
+<string name="filterpoi_activity">Criar filtro de POI</string>
+<string name="recalculate_route_to_your_location">Meio de transporte:</string>
+<string name="select_navigation_mode">Selecionar meio de transporte</string>
+<string name="day_night_info">Informações dia/noite</string>
+
+<string name="map_widget_renderer">Estilo do mapa</string>
+<string name="layer_map_appearance">Configurar tela</string>
+<string name="show_lanes">Faixas de rolamento</string>
+<string name="avoid_ferries">Evitar balsas</string>
+<string name="avoid_in_routing_title">Evitar…</string>
+<string name="map_widget_fluorescent">Rotas fluorescentes</string>
+<string name="map_widget_show_ruler">Régua</string>
+<string name="map_widget_view_direction">Direção da visão</string>
+<string name="map_widget_transparent">Widgets transparentes</string>
+<string name="bg_service_sleep_mode_on">Parar\n modo segundo plano</string>
+<string name="gps_wakeup_interval">Intervalo de ativação do GPS: %s</string>
+<string name="int_continuosly">Contínuo</string>
+<string name="screen_is_locked">Toque no ícone de bloqueio para desbloquear a tela</string>
+<string name="map_widget_top_text">Nome da rua</string>
+<string name="map_widget_config">Configurar tela</string>
+<string name="map_widget_back_to_loc">Onde estou</string>
+<string name="map_widget_lock_screen">Bloquear tela</string>
+<string name="map_widget_compass">Bússola</string>
+<string name="map_widget_reset">Restaurar para predefinido</string>
+<string name="map_widget_parking">Estacionamento</string>
+<string name="map_widget_monitoring">Registro de GPX</string>
+<string name="map_widget_speed">Velocidade</string>
+<string name="map_widget_distance">Destino</string>
+<string name="map_widget_altitude">Altitude</string>
+<string name="map_widget_time">Tempo para chegar</string>
+<string name="map_widget_next_turn">Próxima manobra</string>
+<string name="map_widget_next_turn_small">Próxima manobra (menor)</string>
+<string name="map_widget_next_next_turn">Segunda próxima manobra</string>
+<string name="map_widget_mini_route">Minimapa da rota</string>
+<string name="bg_service_screen_lock">Bloquear tela</string>
+<string name="bg_service_screen_unlock">Desbloquear tela</string>
+<string name="bg_service_screen_lock_toast">A tela está bloqueada</string>
+<string name="bg_service_interval">Definir intervalo para ativar:</string>
+<string name="avoid_toll_roads">Pedágios</string>
+<string name="continue_follow_previous_route_auto">Continuar seguindo a navegação anterior inacabada\? (%1$s segundos)</string>
+<string name="route_updated_loc_found">Aguardando posição para calcular rota</string>
+<string name="osmand_parking_hours">Horas</string>
+<string name="osmand_parking_minutes">Minutos</string>
+<string name="osmand_parking_position_description_add_time">O carro foi estacionado em</string>
+<string name="index_settings">Gerenciar mapas</string>
+<string name="context_menu_item_search">Pesquisar nas proximidades</string>
+<string name="local_index_descr_title">Gerenciar mapas.</string>
+<string name="show_point_options">Usar posição…</string>
+<string name="only_show">Exibir rota</string>
+<string name="follow">Iniciar navegação</string>
+<string name="get_directions">Direções</string>
+<string name="local_indexes_cat_srtm">Curvas de nível</string>
+<string name="index_srtm_ele">Curvas de nível</string>
+<string name="download_srtm_maps">Curvas de nível</string>
+<string name="rendering_attr_alpineHiking_name">Escala de montanhismo (SAC)</string>
+<string name="rendering_attr_showRoadMaps_name">Apenas mapa de estradas</string>
+<string name="safe_mode_description">Executar o aplicativo em modo seguro (usando código Android, mais lento, em vez do código nativo).</string>
+<string name="zxing_barcode_scanner_not_found">Aplicativo Barcode Scanner da ZXing não está instalado. Pesquisar na Google Play\?</string>
+<string name="shared_location">Posição compartilhada</string>
+<string name="osmand_parking_lim_text">Tempo limitado</string>
+<string name="left_side_navigation">tráfego de mão esquerda</string>
+<string name="index_settings_descr">Baixar e gerenciar mapas armazenados no seu aparelho.</string>
+<string name="plugins_screen">Complementos</string>
+<string name="support_new_features">Apoiar novos recursos</string>
+<string name="front">em frente</string>
+<string name="oclock">em ponto</string>
+<string name="direction_style_sidewise">Lateralmente (8 setores)</string>
+<string name="auto_announce_on">Iniciar anúncio automático</string>
+<string name="auto_announce_off">Parar anúncios automáticos</string>
+<string name="local_openstreetmap_upload">Enviar modificação para OSM</string>
+<string name="local_openstreetmap_delete">Apagar modificação</string>
+<string name="live_monitoring_interval_descr">Especificar intervalo de monitoramento on-line.</string>
+<string name="daynight_mode_auto">Nascer/Pôr do Sol</string>
+<string name="map_widget_max_speed">Limite de velocidade</string>
+<string name="monitoring_control_start">GPX</string>
+<string name="no_buildings_found">Nenhum edifício encontrado.</string>
+<string name="incremental_search_city">Pesquisar cidade incrementalmente</string>
+<string name="search_villages_and_postcodes">Pesquisar mais povoados/código postal</string>
+<string name="rendering_attr_showRoadMaps_description">Selecionar quando exibir somente vias no mapa:</string>
+<string name="safe_mode">Modo seguro</string>
+<string name="native_library_not_running">O aplicativo está em modo seguro (desative nas \'configurações\').</string>
+
+
+<string name="close_changeset">Fechar conjunto de alterações</string>
+<string name="rendering_attr_roadColors_description">Selecionar um esquema de cores das vias:</string>
+<string name="rendering_attr_roadColors_name">Esquema de cores das vias</string>
+<string name="map_widget_show_destination_arrow">Mostrar a direção do destino</string>
+<string name="enable_plugin_monitoring_services">Ativar plugin de gravação de viagem para usar serviços de registro de posição (registro GPX, rastreamento on-line)</string>
+<string name="non_optimal_route_calculation">Calcular rota possivelmente não ideal em longas distâncias</string>
+<string name="gps_not_available">Por favor, ative o GPS nas configurações</string>
+
+<string name="map_widget_monitoring_services">Serviços de registro</string>
+<string name="no_route">Sem rota</string>
+<string name="delete_target_point">Remover destino</string>
+<string name="context_menu_item_last_intermediate_point">Adicionar como último destino intermediário</string>
+<string name="context_menu_item_first_intermediate_point">Adicionar como primeiro destino intermediário</string>
+<string name="add_as_last_destination_point">Adicionar como último destino intermediário</string>
+<string name="add_as_first_destination_point">Adicionar como primeiro destino intermediário</string>
+
+<string name="replace_destination_point">Substituir o destino</string>
+<string name="new_destination_point_dialog">Você já tem o destino definido:</string>
+<string name="shared_string_target_points">Destinos</string>
+<string name="show_warnings_descr">Configurar avisos de tráfego (limites de velocidade, paradas obrigatórias, lombadas, túneis), radares e faixas de rolamento.</string>
+<string name="intermediate_point_too_far">Destino intermediário %1$s está muito longe da via mais próxima.</string>
+<string name="arrived_at_intermediate_point">Você chegou no seu destino intermediário</string>
+<string name="context_menu_item_intermediate_point">Adicionar como destino intermediário</string>
+<string name="ending_point_too_far">Destino muito longe da via mais próxima.</string>
+<string name="add_tag">Adicionar etiqueta</string>
+<string name="btn_advanced_mode">Modo avançado…</string>
+<string name="poi_filter_parking">Estacionamento</string>
+<string name="poi_filter_emergency">Emergência</string>
+<string name="poi_filter_public_transport">Transporte público</string>
+<string name="poi_filter_entertainment">Entretenimento</string>
+<string name="poi_filter_accomodation">Alojamento</string>
+<string name="poi_filter_restaurants">Restaurante</string>
+<string name="poi_filter_sightseeing">Passeio</string>
+<string name="poi_filter_car_aid">Socorro veicular</string>
+<string name="poi_filter_food_shop">Mercearia</string>
+<string name="poi_filter_for_tourists">Para turistas</string>
+<string name="poi_filter_fuel">Combustível</string>
+<string name="show_warnings_title">Mostrar alertas…</string>
+<string name="use_compass_navigation_descr">Usar a bússola quando nenhuma direção é detectada.</string>
+
+<string name="select_animate_speedup">Selecionar velocidade de simulação da rota</string>
+<string name="global_app_allocated_memory_descr">Memória alocada %1$s MB (limite Android %2$s MB, Dalvik %3$s MB).</string>
+<string name="global_app_allocated_memory">Memória alocada</string>
+<string name="native_app_allocated_memory_descr">Memória nativa total alocada pelo app %1$s MB (Dalvik %2$s MB, outros %3$s MB). Memória proporcional %4$s MB (limite Android %5$s MB, Dalvik %6$s MB).</string>
+<string name="native_app_allocated_memory">Memória nativa total</string>
+<string name="starting_point_too_far">Ponto de partida muito longe da via mais próxima.</string>
+<string name="osmand_parking_event">Pegar o carro no estacionamento</string>
+<string name="osmand_parking_warning">Alerta</string>
+<string name="osmand_parking_warning_text">Uma notificação para pegar seu carro foi adicionada ao seu calendário. Ela permanecerá até que você a apague manualmente.</string>    
+<string name="osmand_parking_time_limit_title">Definir limite de tempo</string>
+<string name="osmand_parking_delete_confirm">Apagar o marcardor da posição de estacionamento?</string>
+<string name="osmand_parking_delete">Apagar um marcador de estacionamento</string>
+<string name="osmand_parking_choose_type">Escolher o tipo de estacionamento</string>
+<string name="osmand_parking_no_lim_text">Tempo ilimitado</string>
+<string name="osmand_parking_add_event">Adicionar uma notificação à Agenda</string>
+<string name="osmand_parking_time_limit">Tempo limitado</string>
+<string name="osmand_parking_time_no_limit">Sem limite de tempo</string>
+<string name="osmand_parking_position_description">A localização de estacionamento do seu veículo. %1$s</string>
+<string name="osmand_parking_position_description_add">Buscar o veículo em:</string>
+<string name="osmand_parking_pm">PM</string>
+<string name="osmand_parking_am">AM</string>
+<string name="osmand_parking_position_name">Vaga de estacionamento</string>
+<string name="context_menu_item_add_parking_point">Marcar estacionamento</string>
+<string name="context_menu_item_delete_parking_point">Apagar marcador de estacionamento</string>
+<string name="gpxup_public">Público</string>
+<string name="gpxup_identifiable">Identificável</string>
+<string name="gpxup_trackable">Rastreável</string>
+<string name="gpxup_private">Privado</string>
+<string name="asap">o quanto antes</string>
+<string name="share_route_as_gpx">Compartilhar rota como arquivo GPX</string>
+<string name="share_route_subject">Rota compartilhada via OsmAnd</string>
+<string name="route_roundabout">Rotatória: Pegue a %1$dª saída e siga</string>
+<string name="route_kl">Mantenha à esquerda e siga</string>
+<string name="route_kr">Mantenha à direita e siga</string>
+<string name="rendering_attr_noPolygons_description">Tornar transparente todas as características de terra no mapa.</string>
+<string name="rendering_attr_noPolygons_name">Polígonos de áreas</string>
+<string name="rendering_attr_appMode_name">Modo de renderização</string>
+<string name="rendering_attr_appMode_description">Otimizar o mapa para</string>
+<string name="rendering_attr_contourLines_description">Exibir a partir do nível de zoom (requer dados de contorno):</string>
+<string name="rendering_attr_contourLines_name">Mostrar curvas de nível</string>
+<string name="rendering_attr_hmRendered_description">Aumentar a quantidade de detalhe no mapa.</string>
+<string name="rendering_attr_hmRendered_name">Mostrar mais detalhes do mapa</string>
+<string name="local_index_routing_data">Dados de roteamento</string>
+<string name="navigate_point_format">Formato</string>
+<string name="poi_search_desc">Pesquisar POI (ponto de interesse)</string>
+<string name="address_search_desc">Pesquisar endereço</string>
+<string name="navpoint_search_desc">Coordenadas</string>
+<string name="transport_search_desc">Pesquisar transporte público</string>
+<string name="favourites_search_desc">Uma maneira de pesquisar por favoritos</string>
+<string name="offline_navigation_not_available">Navegação OsmAnd off-line está temporariamente indisponível.</string>
+<string name="left_side_navigation_descr">Para países onde as pessoas dirigem no lado esquerdo da estrada.</string>
+<string name="local_index_description">Toque em qualquer item para ver mais detalhes, toque longo para desativar ou excluir. Dados atuais no aparelho (%1$s livre):</string>
+<string name="unknown_from_location">Precisa definir um ponto de partida</string>
+<string name="unknown_location">Posição ainda desconhecida</string>
+<string name="modify_transparency">Modificar transparência (0 - transparente, 255 - opaco)</string>
+<string name="confirm_interrupt_download">Cancelar o download do arquivo\?</string>
+<string name="basemap_was_selected_to_download">O Mapa Base é selecionado para baixar para que o aplicativo funcione.</string>
+<string name="local_indexes_cat_tile">Quadrículas de mapa online e em cache</string>
+<string name="local_indexes_cat_map">Mapa padrão (vetorial)</string>
+<string name="map_online_plugin_is_not_installed">Ative o plugin \'Mapas on-line\' para selecionar diferentes fontes de mapa</string>
+<string name="map_online_data">Mapas e quadrículas on-line</string>
+<string name="map_online_data_descr">Usar mapas on-line (baixar e ladrilhos de cache no cartão de memória).</string>
+<string name="online_map_settings_descr">Configurar fontes de quadrículas de mapas on-line ou off-line.</string>
+<string name="prefs_plugins_descr">Complementos ativam as configurações avançadas e funcionalidades adicionais.</string>
+<string name="prefs_plugins">Complementos</string>
+
+<string name="vector_maps_may_display_faster_on_some_devices">Mapas vectoriais são visualizados mais rápido. Podem não funcionar bem em alguns aparelhos.</string>
+<string name="play_commands_of_currently_selected_voice">Selecione uma voz e teste, reproduzindo prompts</string>
+<string name="native_rendering">Renderização nativa</string>
+<string name="test_voice_prompts">Testar comandos de voz</string>    
+<string name="switch_to_raster_map_to_see">Não há mapa vetorial off-line presente para esta região. Baixe um em \'Configurações\' (\'Gerenciar mapas\'), ou mude para o plugin \'Mapas on-line\'.</string>
+
+<string name="send_files_to_osm">Enviar arquivos GPX para o OSM?</string>
+<string name="gpx_visibility_txt">Visibilidade</string>
+<string name="gpx_tags_txt">Etiquetas</string>
+<string name="gpx_description_txt">Descrição</string>
+<string name="validate_gpx_upload_name_pwd">Especificar seu nome e senha de usuário do OSM para enviar arquivos GPX.</string>
+<string name="default_buttons_support">Apoiar</string>
+<string name="support_new_features_descr">Doar para ver novos recursos implementados neste aplicativo.</string>
+<string name="show_ruler_level">Mostrar régua</string>	
+<string name="info_button">Informação</string>
+<string name="back_to_location">Voltar à posição</string>
+
+<string name="accessibility_mode">Modo de acessibilidade</string>
+<string name="accessibility_mode_descr">Ativa os recursos para usuários com deficiências.</string>
+<string name="accessibility_default">De acordo com a configuração do sistema Android</string>
+<string name="backToMenu">Voltar ao menu</string>
+<string name="zoomOut">Afastar</string>
+<string name="zoomIn">Aproximar</string>
+<string name="zoomIs">Nível de zoom é</string>
+<string name="north">norte</string>
+<string name="north_north_east">norte-nordeste</string>
+<string name="north_east">nordeste</string>
+<string name="east_north_east">leste-nordeste</string>
+<string name="east">leste</string>
+<string name="east_south_east">leste-sudeste</string>
+<string name="south_east">sudeste</string>
+<string name="south_south_east">sul-sudeste</string>
+<string name="south">sul</string>
+<string name="south_south_west">sul-sudoeste</string>
+<string name="south_west">sudoeste</string>
+<string name="west_south_west">oeste-sudoeste</string>
+<string name="west">oeste</string>
+<string name="west_north_west">oeste-noroeste</string>
+<string name="north_west">noroeste</string>
+<string name="north_north_west">norte-noroeste</string>
+<string name="front_right">em frente e à direita</string>
+<string name="right">à direita</string>
+<string name="back_right">para trás e à direita</string>
+<string name="back">para trás</string>
+<string name="back_left">para trás e à esquerda</string>
+<string name="left">à esquerda</string>
+<string name="front_left">em frente e à esquerda</string>
+<string name="towards">para</string>
+<string name="accuracy">Precisão</string>
+<string name="altitude">Altitude</string>
+<string name="no_info">Sem informação</string>
+<string name="direction_style_clockwise">No sentido horário (12 setores)</string>
+<string name="settings_direction_style">Estilo de direção</string>
+<string name="settings_direction_style_descr">Escolha o estilo em que sentidos relativos são expressos enquanto se move.</string>
+<string name="i_am_here">Estou aqui</string>
+<string name="zoom_by_trackball_descr">Alterar zoom do mapa por movimentos horizontais do trackball.</string>
+<string name="zoom_by_trackball">Usar trackball para controle de zoom</string>
+<string name="accessibility_preferences_descr">Preferências relacionadas com a acessibilidade.</string>
+<string name="arrival_distance_factor_early">Adiantado</string>
+<string name="arrival_distance_factor_normally">Normal</string>
+<string name="arrival_distance_factor_at_last">Nos últimos metros</string>
+<string name="arrival_distance">Anúncio de chegada</string>
+<string name="arrival_distance_descr">Em quanto tempo você quer o anúncio da chegada?</string>
+<string name="rendering_out_of_memory">Não há memória suficiente para exibir a área selecionada</string>
+<string name="use_fluorescent_overlays">Sobreposições fluorescentes</string>
+<string name="use_fluorescent_overlays_descr">Usar cores fluorescentes para exibir as trilhas e rotas.</string>
+<string name="offline_edition">Edição off-line</string>
+<string name="offline_edition_descr">Sempre usar edição off-line.</string>
+<string name="update_poi_does_not_change_indexes">As alterações de POIs dentro do aplicativo não tem efeito imediato nos mapas baixados, as alterações são salvas como um arquivo no seu dispositivo.</string>
+<string name="local_openstreetmap_uploading">Enviando…</string>
+<string name="local_openstreetmap_were_uploaded">{0} POIs/Notas enviados</string>
+<string name="local_openstreetmap_uploadall">Enviar todos</string>
+<string name="local_openstreetmap_descr_title">Edição assíncrona de OSM:</string>
+<string name="local_openstreetmap_settings">POIs/Notas OSM salvos no dispositivo</string>
+<string name="local_openstreetmap_settings_descr">Mostrar e gerenciar POIs/Notas OSM salvos no dispositivo.</string>
+<string name="live_monitoring_interval">Intervalo de rastreamento on-line</string>
+<string name="live_monitoring_url_descr">Especificar o endereço web com a sintaxe de parâmetros: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
+<string name="live_monitoring_url">Endereço web de rastreamento on-line</string>
+<string name="gpx_monitoring_disabled_warn">Registro de trilha usando o widget do GPX ou através das configurações de \'Gravação de viagem\'.</string>
+<string name="show_current_gpx_title">Mostrar trilha atual</string>
+<string name="free_version_message">Você pode fazer o download ou atualizar os mapas de % %1$s.</string>
+<string name="free_version_title">Versão gratuita</string>
+<string name="poi_context_menu_showdescription">Mostrar descrição do POI.</string>
+<string name="index_name_north_america">América do Norte</string>
+<string name="index_name_netherlands">Europa - Países Baixos</string>
+<string name="index_name_us">América do Norte - Estados Unidos</string>
+<string name="index_name_central_america">América Central</string>
+<string name="index_name_south_america">América do Sul</string>
+<string name="index_name_europe">Europa</string>
+<string name="index_name_france">Europa - França</string>
+<string name="index_name_germany">Europa - Alemanha</string>
+<string name="index_name_russia">Rússia</string>
+<string name="index_name_africa">África</string>
+<string name="index_name_asia">Ásia</string>
+<string name="index_name_oceania">Austrália e Oceania</string>
+<string name="index_name_other">Mapas globais e temáticos</string>
+<string name="index_name_wiki">POIs mundiais da Wikipédia</string>
+<string name="index_name_voice">Comandos de voz (gravados, recursos limitados)</string>
+<string name="index_name_tts_voice">Comandos de voz (sintetizador TTS, recomendado)</string>
+<string name="amenity_type_osmwiki">Wikipédia (off-line)</string>
+<string name="amenity_type_user_defined">Definido pelo usuário</string>
+<string name="fav_export_confirmation">O arquivo contendo favoritos exportados anteriormente já existe. Substitua-o\?</string>
+<string name="profile_settings">Configurações específicas de perfil</string>
+<string name="routing_settings">Navegação</string>
+<string name="routing_settings_descr">Especificar as opções para a navegação.</string>
+<string name="global_settings">Configurações globais</string>
+<string name="general_settings">Geral</string>
+<string name="general_settings_descr">Configurar exibição e configurações comuns para o aplicativo.</string>
+<string name="global_app_settings">Configurações globais do aplicativo</string>
+<string name="user_name">Seu nome de usuário OSM</string>
+<string name="open_street_map_login_descr">Necessário para envios ao openstreetmap.org.</string>
+<string name="user_password">Sua senha do OSM</string>
+
+<string name="osmand_service">Modo em segundo plano</string>
+<string name="osmand_service_descr">OsmAnd é executado em segundo plano com a tela desligada.</string>
+
+
+
+<string name="arrival_distance_factor_late">Atrasado</string>
+
+<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (Direções de Navegação Automatizada para OSM)\n OsmAnd+ é aplicativo de navegação de código aberto com acesso a uma ampla variedade de dados globais do OpenStreetMap (OSM). Todos os dados de mapa (vetores ou quadrículas) podem ser armazenados na memória do seu aparelho para uso off-line. OsmAnd também oferece a funcionalidade de roteamento on-line e off-line, incluindo orientação por voz curva a curva. OsmAnd+ é a versão paga do aplicativo, ao comprá-lo você ajuda o projeto, financiando o desenvolvimento de novas funcionalidades e recebe as últimas atualizações.\n\nAlgumas das principais características:\n- completa funcionalidade offline (armazena mapas vetorizados baixados ou quadrículas no armazenamento do aparelho)\n- mapas vetoriais off-line compactos e disponíveis para o mundo inteiro\n- transferência ilimitada de mapas por país ou região diretamente do app\n- recurso Wikipédia off-line (transferir POIs da Wikipédia), ótimo para passeios turísticos\n- possível sobreposição de várias camadas de mapa, como trilhas GPX, pontos de interesse, favoritos, curvas de nível e mapas adicionais com transparência personalizável\n- pesquisa off-line de endereços e lugares (POIs)\n- roteamento off-line para distâncias curtas (experimental)\n- modos carro, bicicleta e a pé com:\n- opcional mudança automática do modo dia/noite\n- opcional zoom dinâmico de acordo com a velocidade\n- opcional, alinhar o mapa de acordo com a bússola ou o seu sentido de movimento\n- opcional orientação de faixa, exibição do limite de velocidade, vozes gravadas e TTS "</string>
+<string name="init_native_library">Iniciando a biblioteca nativa…</string>
+
+
 
-    <string name="replace_destination_point">Substituir o destino</string>
-    <string name="new_destination_point_dialog">Você já tem o destino definido.</string>
-    <string name="shared_string_target_points">Destinos</string>
-    <string name="show_warnings_descr">Configurar para mostrar moderadores de tráfego (limites de velocidade, paradas obrigatórias, lombadas), radares e faixas de rolamento</string>
-	<string name="intermediate_point_too_far">Destino intermediário %1$s está muito longe da via mais próxima.</string>
-    <string name="arrived_at_intermediate_point">Você chegou no seu destino intermediário</string>
-    <string name="context_menu_item_intermediate_point">Adicionar como destino intermediário</string>
-    <string name="ending_point_too_far">Destino muito longe da via mais próxima.</string>
-    <string name="add_tag">Adicionar etiqueta</string>
-    <string name="btn_advanced_mode">Modo avançado…</string>
-    <string name="poi_filter_parking">Estacionamento</string>
-    <string name="poi_filter_emergency">Emergência</string>
-    <string name="poi_filter_public_transport">Transporte público</string>
-    <string name="poi_filter_entertainment">Entretenimento</string>
-    <string name="poi_filter_accomodation">Alojamento</string>
-    <string name="poi_filter_restaurants">Restaurante</string>
-    <string name="poi_filter_sightseeing">Passeio</string>
-    <string name="poi_filter_car_aid">Socorro veicular</string>
-	<string name="poi_filter_food_shop">Mercearia</string>
-	<string name="poi_filter_for_tourists">Para turistas</string>
-	<string name="poi_filter_fuel">Combustível</string>
-	<string name="show_warnings_title">Mostrar alertas…</string>
-	<string name="use_compass_navigation_descr">Usar a bússola quando nenhuma direção é detectada</string>
-	
-	<string name="select_animate_speedup">Selecionar velocidade de simulação da rota</string>
-    	<string name="global_app_allocated_memory_descr">Memória alocada %1$s MB (limite Android %2$s MB, Dalvik %3$s MB).</string>
-	<string name="global_app_allocated_memory">Memória alocada</string>
-	<string name="native_app_allocated_memory_descr">Memória nativa total alocada pelo app %1$s MB (Dalvik %2$s MB, outros %3$s MB). Memória proporcional %4$s MB (limite Android %5$s MB, Dalvik %6$s MB).</string>
-	<string name="native_app_allocated_memory">Memória nativa total</string>
-	<string name="starting_point_too_far">Ponto de partida muito longe da via mais próxima.</string>
-	<string name="osmand_parking_event">Pegar o carro no estacionamento</string>
-	<string name="osmand_parking_warning">Alerta</string>
-	<string name="osmand_parking_warning_text">Notificação para buscar seu carro foi adicionada ao seu calendário. Ela permanecerá até que você a apague manualmente.</string>    
-	<string name="osmand_parking_time_limit_title">Definir limite de tempo</string>
-	<string name="osmand_parking_delete_confirm">Apagar o marcardor da posição de estacionamento?</string>
-	<string name="osmand_parking_delete">Apagar um marcador de estacionamento</string>
-	<string name="osmand_parking_choose_type">Escolher o tipo de estacionamento</string>
-	<string name="osmand_parking_no_lim_text">Tempo ilimitado</string>
-	<string name="osmand_parking_add_event">Adicionar uma notificação à Agenda</string>
-	<string name="osmand_parking_time_limit">Tempo limitado</string>
-	<string name="osmand_parking_time_no_limit">Sem limite de tempo</string>
-	<string name="osmand_parking_position_description">A posição de estacionamento do seu carro. %1$s</string>
-	<string name="osmand_parking_position_description_add">Buscar o carro em:</string>
-	<string name="osmand_parking_pm">PM</string>
-	<string name="osmand_parking_am">AM</string>
-	<string name="osmand_parking_position_name">Vaga de estacionamento</string>
-	<string name="context_menu_item_add_parking_point">Marcar local de estacionamento</string>
-	<string name="context_menu_item_delete_parking_point">Apagar marcador de estacionamento</string>
-	<string name="gpxup_public">Público</string>
-	<string name="gpxup_identifiable">Identificável</string>
-	<string name="gpxup_trackable">Rastreável</string>
-	<string name="gpxup_private">Privado</string>
-	<string name="asap">o quanto antes</string>
-	<string name="share_route_as_gpx">Compartilhar rota como arquivo GPX</string>
-	<string name="share_route_subject">Rota compartilhada via OsmAnd</string>
-	<string name="route_roundabout">Rotatória: pegue a %1$dª saída e siga</string>
-	<string name="route_kl">Mantenha à esquerda e siga</string>
-	<string name="route_kr">Mantenha à direita e siga</string>
-	<string name="rendering_attr_noPolygons_description">Tornar transparente todas as características de terra no mapa</string>
-	<string name="rendering_attr_noPolygons_name">Polígonos de áreas</string>
-	<string name="rendering_attr_appMode_name">Modo de renderização</string>
-	<string name="rendering_attr_appMode_description">Otimizar o mapa para</string>
-	<string name="rendering_attr_contourLines_description">Exibir a partir do nível de zoom (requer dados de contorno):</string>
-	<string name="rendering_attr_contourLines_name">Mostrar curvas de nível</string>
-	<string name="rendering_attr_hmRendered_description">Aumentar a quantidade de detalhe no mapa</string>
-	<string name="rendering_attr_hmRendered_name">Mostrar mais detalhes do mapa</string>
-	<string name="local_index_routing_data">Dados de roteamento</string>
-	<string name="navigate_point_format">Formato</string>
-	<string name="poi_search_desc">Pesquisar POI (ponto de interesse)</string>
-	<string name="address_search_desc">Pesquisar endereço</string>
-	<string name="navpoint_search_desc">Coordenadas</string>
-	<string name="transport_search_desc">Pesquisar transporte público</string>
-	<string name="favourites_search_desc">Pesquisar favoritos</string>
-	<string name="offline_navigation_not_available">Navegação OsmAnd off-line está temporariamente indisponível.</string>
-	<string name="left_side_navigation_descr">Selecionar para países com direção pela esquerda</string>
-	<string name="local_index_description">Toque em qualquer item para ver mais detalhes, Toque e segure para desativar ou excluir. Dados atuais no aparelho (%1$s livre):</string>
-	<string name="unknown_from_location">Precisa definir um ponto de partida</string>
-	<string name="unknown_location">Posição ainda desconhecida</string>
-	<string name="modify_transparency">Modificar transparência (0 - transparente, 255 - opaco)</string>
-	<string name="confirm_interrupt_download">Você quer cancelar a transferência do arquivo?</string>
-	<string name="basemap_was_selected_to_download">O Mapa Base é necessário para o funcionamento adequado do aplicativo e foi selecionado para baixar.</string>
-	<string name="local_indexes_cat_tile">Quadrículas de mapa online e em cache</string>
-	<string name="local_indexes_cat_map">Mapa padrão (vetorial)</string>
-	<string name="map_online_plugin_is_not_installed">Ative o plugin \'Mapas on-line\' para selecionar diferentes fontes de mapa</string>
-	<string name="map_online_data">Mapas e quadrículas on-line</string>
-	<string name="map_online_data_descr">Usar mapas on-line (baixar e armazenar quadrículas)</string>
-	<string name="online_map_settings_descr">Configurar fontes de quadrículas de mapas on-line ou off-line</string>
-	<string name="prefs_plugins_descr">Complementos ativam as configurações avançadas e funcionalidades adicionais</string>
-	<string name="prefs_plugins">Complementos</string>
-	
-	<string name="vector_maps_may_display_faster_on_some_devices">Mapas vectoriais são visualizados mais rápido. Podem não funcionar bem em alguns aparelhos.</string>
-	<string name="play_commands_of_currently_selected_voice">Tocar comando de voz selecionado</string>
-	<string name="native_rendering">Renderização nativa</string>
-	<string name="test_voice_prompts">Testar comandos de voz</string>    
-	<string name="switch_to_raster_map_to_see">Não há mapa vetorial off-line presente para esta região. Baixe um em \'Configurações\' (\'Gerenciar mapas\'), ou mude para o plugin \'Mapas on-line\'.</string>
-	
-	<string name="send_files_to_osm">Enviar arquivos GPX para o OSM?</string>
-	<string name="gpx_visibility_txt">Visibilidade</string>
-	<string name="gpx_tags_txt">Etiquetas</string>
-	<string name="gpx_description_txt">Descrição</string>
-	<string name="validate_gpx_upload_name_pwd">Especificar nome e senha de usuário do OSM para enviar arquivos GPX.</string>
-    	<string name="default_buttons_support">Apoiar</string>
-	<string name="support_new_features_descr">Doar para ver novos recursos implementados neste aplicativo</string>
-	<string name="show_ruler_level">Mostrar régua</string>	
-	<string name="info_button">Informação</string>
-	<string name="back_to_location">Voltar à posição</string>
-	
-	<string name="accessibility_mode">Modo de acessibilidade</string>
-	<string name="accessibility_mode_descr">Ativar as opções de acessibilidade</string>
-	<string name="accessibility_default">De acordo com a configuração do sistema global</string>
-	<string name="backToMenu">Voltar ao menu</string>
-	<string name="zoomOut">Afastar</string>
-	<string name="zoomIn">Aproximar</string>
-	<string name="zoomIs">Nível de zoom é</string>
-	<string name="north">norte</string>
-	<string name="north_north_east">norte-nordeste</string>
-	<string name="north_east">nordeste</string>
-	<string name="east_north_east">leste-nordeste</string>
-	<string name="east">leste</string>
-	<string name="east_south_east">leste-sudeste</string>
-	<string name="south_east">sudeste</string>
-	<string name="south_south_east">sul-sudeste</string>
-	<string name="south">sul</string>
-	<string name="south_south_west">sul-sudoeste</string>
-	<string name="south_west">sudoeste</string>
-	<string name="west_south_west">oeste-sudoeste</string>
-	<string name="west">oeste</string>
-	<string name="west_north_west">oeste-noroeste</string>
-	<string name="north_west">noroeste</string>
-	<string name="north_north_west">norte-noroeste</string>
-	<string name="front_right">em frente e à direita</string>
-	<string name="right">à direita</string>
-	<string name="back_right">para trás e à direita</string>
-	<string name="back">para trás</string>
-	<string name="back_left">para trás e à esquerda</string>
-	<string name="left">à esquerda</string>
-	<string name="front_left">em frente e à esquerda</string>
-	<string name="towards">para</string>
-	<string name="accuracy">Precisão</string>
-	<string name="altitude">Altitude</string>
-	<string name="no_info">Sem informação</string>
-	<string name="direction_style_clockwise">No sentido horário (12 setores)</string>
-	<string name="settings_direction_style">Estilo de direção</string>
-	<string name="settings_direction_style_descr">Escolha o estilo em que sentidos relativos são expressos enquanto se move.</string>
-	<string name="i_am_here">Estou aqui</string>
-	<string name="zoom_by_trackball_descr">Alterar zoom do mapa por movimentos horizontais do trackball</string>
-	<string name="zoom_by_trackball">Usar trackball para controle de zoom</string>
-	<string name="accessibility_preferences_descr">Preferências relacionadas com a acessibilidade</string>
-    <string name="arrival_distance_factor_early">Adiantado</string>
-    <string name="arrival_distance_factor_normally">Normal</string>
-    <string name="arrival_distance_factor_at_last">Nos últimos metros</string>
-    <string name="arrival_distance">Anúncio de chegada</string>
-    <string name="arrival_distance_descr">Em quanto tempo você quer o anúncio da chegada?</string>
-    <string name="rendering_out_of_memory">Não há memória suficiente para exibir a área selecionada</string>
-	<string name="use_fluorescent_overlays">Sobreposições fluorescentes</string>
-	<string name="use_fluorescent_overlays_descr">Usar cores fluorescentes para exibir as trilhas e rotas</string>
-	<string name="offline_edition">Edição off-line</string>
-	<string name="offline_edition_descr">Sempre usar edição off-line</string>
-	<string name="update_poi_does_not_change_indexes">As alterações de POIs dentro do aplicativo não tem efeito imediato nos mapas baixados, pois são salvas em arquivo local.</string>
-	<string name="local_openstreetmap_uploading">Enviando…</string>
-	<string name="local_openstreetmap_were_uploaded">{0} POIs/Notas enviados</string>
-	<string name="local_openstreetmap_uploadall">Enviar todos</string>
-	<string name="local_openstreetmap_descr_title">Edição assíncrona de OSM:</string>
-	<string name="local_openstreetmap_settings">POIs/Notas OSM salvos localmente</string>
-	<string name="local_openstreetmap_settings_descr">Mostrar e gerenciar POIs/Notas OSM salvos localmente</string>
-	<string name="live_monitoring_interval">Intervalo de rastreamento on-line</string>
-	<string name="live_monitoring_url_descr">Especificar o endereço web com a sintaxe de parâmetros: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
-	<string name="live_monitoring_url">Endereço web de rastreamento on-line</string>
-	<string name="gpx_monitoring_disabled_warn">Registro de trilha usando o widget do GPX ou através das configurações de \'Gravação de viagem\'.</string>
-	<string name="show_current_gpx_title">Mostrar trilha atual</string>
-	<string name="free_version_message">Esta versão gratuita do OsmAnd é limitada a %1$s transferências e não suporta artigos off-line da Wikipédia.</string>
-	<string name="free_version_title">Versão gratuita</string>
-	<string name="poi_context_menu_showdescription">Mostrar descrição do POI</string>
-	<string name="index_name_north_america">América do Norte</string>
-	<string name="index_name_netherlands">Europa - Países Baixos</string>
-	<string name="index_name_us">América do Norte - Estados Unidos</string>
-	<string name="index_name_central_america">América Central</string>
-	<string name="index_name_south_america">América do Sul</string>
-	<string name="index_name_europe">Europa</string>
-	<string name="index_name_france">Europa - França</string>
-	<string name="index_name_germany">Europa - Alemanha</string>
-	<string name="index_name_russia">Rússia</string>
-	<string name="index_name_africa">África</string>
-	<string name="index_name_asia">Ásia</string>
-	<string name="index_name_oceania">Austrália e Oceania</string>
-	<string name="index_name_other">Mapas globais e temáticos</string>
-	<string name="index_name_wiki">POIs mundiais da Wikipédia</string>
-	<string name="index_name_voice">Comandos de voz (gravados, recursos limitados)</string>
-	<string name="index_name_tts_voice">Comandos de voz (sintetizador TTS, recomendado)</string>
-	<string name="amenity_type_osmwiki">Wikipédia (off-line)</string>
-	<string name="amenity_type_user_defined">Definido pelo usuário</string>
-	<string name="fav_export_confirmation">Já existe um arquivo de favoritos exportado anteriormente. Quer substituí-lo?</string>
-	<string name="profile_settings">Configurações específicas de perfil</string>
-	<string name="routing_settings">Navegação</string>
-	<string name="routing_settings_descr">Especificar as opções para a navegação</string>
-	<string name="global_settings">Configurações globais</string>
-	<string name="general_settings">Geral</string>
-	<string name="general_settings_descr">Configurar exibição e configurações comuns para o aplicativo</string>
-	<string name="global_app_settings">Configurações globais do aplicativo</string>
-	<string name="user_name">Seu nome de usuário OSM</string>
-	<string name="open_street_map_login_descr">Necessário para envios ao openstreetmap.org</string>
-	<string name="user_password">Sua senha do OSM</string>
-	
-	<string name="osmand_service">Modo em segundo plano</string>
-	<string name="osmand_service_descr">OsmAnd é executado em segundo plano com a tela desligada.</string>
-	
-	
-	
-	<string name="arrival_distance_factor_late">Atrasado</string>
-    
-	<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (Direções de Navegação Automatizada para OSM)\n OsmAnd+ é aplicativo de navegação de código aberto com acesso a uma ampla variedade de dados globais do OpenStreetMap (OSM). Todos os dados de mapa (vetores ou quadrículas) podem ser armazenados na memória do seu aparelho para uso off-line. OsmAnd também oferece a funcionalidade de roteamento on-line e off-line, incluindo orientação por voz curva a curva. OsmAnd+ é a versão paga do aplicativo, ao comprá-lo você ajuda o projeto, financiando o desenvolvimento de novas funcionalidades e recebe as últimas atualizações.\n\nAlgumas das principais características:\n- completa funcionalidade offline (armazena mapas vetorizados baixados ou quadrículas no armazenamento do aparelho)\n- mapas vetoriais off-line compactos e disponíveis para o mundo inteiro\n- transferência ilimitada de mapas por país ou região diretamente do app\n- recurso Wikipédia off-line (transferir POIs da Wikipédia), ótimo para passeios turísticos\n- possível sobreposição de várias camadas de mapa, como trilhas GPX, pontos de interesse, favoritos, curvas de nível e mapas adicionais com transparência personalizável\n- pesquisa off-line de endereços e lugares (POIs)\n- roteamento off-line para distâncias curtas (experimental)\n- modos carro, bicicleta e a pé com:\n- opcional mudança automática do modo dia/noite\n- opcional zoom dinâmico de acordo com a velocidade\n- opcional, alinhar o mapa de acordo com a bússola ou o seu sentido de movimento\n- opcional orientação de faixa, exibição do limite de velocidade, vozes gravadas e TTS "</string>
-	<string name="init_native_library">Iniciando a biblioteca nativa…</string>
-	
     
 	
-	    
-		
-	
-	
-	<string name="download_files_not_enough_space">Não há espaço livre suficiente para baixar %1$s MB (disponível: %2$s).</string>
-	<string name="download_files_question_space">Baixar {0} arquivo(s)? Espaço de armazenamento utilizado é {1} MB. (Espaço disponível é {2} MB.)</string>
-	
-	<string name="use_transparent_map_theme">Tema transparente</string>
-	<string name="native_library_not_supported">Biblioteca nativa não é suportada neste aparelho.</string>
-	<string name="choose_auto_follow_route">Centrar visualização do mapa</string>
-	<string name="choose_auto_follow_route_descr">Tempo para o mapa ser centrado na posição atual</string>
-	
-	<string name="keep_informing_never">Apenas manualmente (toque na seta)</string>
-    <string name="keep_informing_descr">Repetir as instruções de navegação em intervalos regulares</string>
-    <string name="keep_informing">Repetir as instruções de navegação</string>
-	<string name="auto_follow_route_navigation">Centralizar apenas na navegação</string>
-	<string name="auto_follow_route_navigation_descr">Centralizar a posição no mapa apenas durante a navegação.</string>
-	<string name="auto_follow_location_enabled">Mapa automaticamente centrado.</string>
-	<string name="pref_vector_rendering">Opções específicas para renderizar vetores</string>
-	<string name="pref_overlay">Sobreposição / Subjacente</string>
-	<string name="pref_raster_map">Configurações de fonte de mapa</string>
-	<string name="pref_vector_map">Configurações de mapa vetorial</string>
-	<string name="delete_confirmation_msg">Apagar %1$s?</string>
-	<string name="local_index_items_uploaded">%1$d de %2$d itens enviados com sucesso.</string>
-	<string name="internet_connection_required_for_online_route">Um serviço de navegação on-line está selecionado, mas não há conexão com a Internet.</string>
-	<string name="voice_stream_notification">Áudio de Notificação (viva voz)</string>
-	<string name="search_osm_offline">Pesquisar posição geográfica</string>
-	
-	
-	<string name="send_location_email_pattern">Para ver a posição siga o seguinte link %1$s ou o android intent link %2$s</string>
-	<string name="send_location">Enviar posição</string>
-	<string name="voice_is_not_available_msg">Nenhuma orientação por voz disponível, por favor vá a \'Configurações gerais\' → \'Instruções por voz\' e selecione ou baixe um pacote de comandos de voz.</string>
-	<string name="voice_is_not_available_title">Nenhuma orientação por voz selecionada</string>
-	<string name="fav_saved_sucessfully">Favoritos salvos em {0}</string>
-	<string name="no_fav_to_save">Nenhum favorito para salvar</string>
-	<string name="layer_osm_bugs">Notas do OSM (online)</string>
-	<string name="context_menu_item_search_poi">Pesquisar POI</string>
-	
-	<string name="where_am_i">Onde estou?</string>
-	<string name="process_navigation_service">Serviço de navegação OsmAnd</string>
-	<string name="network_provider">Rede</string>
-	<string name="menu_mute_off">Som ligado</string>
-	<string name="voice_data_initializing">Iniciando dados de voz…</string>
-	<string name="sd_unmounted">Cartão SD inacessível.\nVocê não poderá ver mapas ou encontrar itens.</string>
-	<string name="route_tr">Vire à direita e siga</string>
-	<string name="route_tshr">Vire acentuadamente à direita e siga</string>
-	<string name="route_tslr">Vire levemente à direita e siga</string>
-	<string name="route_tl">Vire à esquerda e siga</string>
-	<string name="route_tu">Faça um retorno e siga</string>
-	<string name="route_head">Siga</string>
-	<string name="first_time_continue">Depois</string>
-	<string name="first_time_download">Baixar regiões</string>
-	<string name="map_screen_orientation">Orientação do mapa</string>
-	<string name="transport_finish_search">Finalizar pesquisa</string>
-	<string name="map_screen_orientation_descr">Vertical, horizontal ou a mesma do aparelho</string>
-	<string name="opening_hours_not_supported">O formato do horário de funcionamento não é suportado para edição</string>
-	<string name="add_new_rule">Adicionar nova regra</string>
-	<string name="transport_Routes">Rotas</string>
-	<string name="transport_Stop">Parada</string>
-	<string name="transport_stops">paradas</string>
-	<string name="transport_search_after">Itinerário seguinte</string>
-	<string name="transport_search_before">Itinerário anterior</string>
-	<string name="use_english_names_descr">Escolher entre os nomes nativos ou em inglês</string>
-	<string name="use_english_names">Usar nomes em inglês nos mapas</string>
-	<string name="show_poi_over_map_description">Mostrar POI no mapa (usar o último filtro)</string>
-	<string name="show_poi_over_map">Mostrar POI</string>
-	
-	<string name="poi_edit_title">Modificar POI</string>
-	<string name="city_type_suburb">Bairro</string>
-	<string name="city_type_hamlet">Lugarejo</string>
-	<string name="city_type_village">Povoado</string>
-	<string name="city_type_town">Cidade pequena</string>
-	<string name="city_type_city">Cidade grande</string>
-	
-	<string name="animate_route_off">Parar simulação</string>
-	<string name="animate_route">Iniciar simulação</string>
-	<string name="file_can_not_be_renamed">O arquivo não pode ser renomeado.</string>
-	<string name="file_with_name_already_exists">Já existe um arquivo com esse nome.</string>
-	<string name="shared_string_gpx_route">Rota GPX</string>
-	<string name="poi_query_by_name_matches_categories">Encontradas várias categorias de POI que correspondem à consulta:</string>
-	<string name="data_to_search_poi_not_available">Não existem dados locais para pesquisa de POI.</string>
-	<string name="poi_filter_by_name">Pesquisar por nome</string>
-	<string name="old_poi_file_should_be_deleted">O arquivo POI \'%1$s\' é repetido e pode ser excluído.</string>
-	<string name="update_poi_file_not_found">Não foi encontrado e não pôde ser criado o arquivo local para salvar as mudanças de POI.</string>
-	<string name="button_upgrade_osmandplus">Alterar para OsmAnd+</string>
-	<string name="map_version_changed_info">Servidor contém arquivos de mapa incompatíveis com sua versão atual do Osmand. Para baixar e usá-los, por favor atualize o Osmand para a versão mais recente.</string>
-	<string name="poi_filter_nominatim">Nominatim on-line</string>
-	<string name="search_position_current_location_search">Procurando posição…</string>
-	<string name="search_position_current_location_found">Minha Posição (encontrada)</string>
-	<string name="search_position_address">Endereço…</string>
-	<string name="search_position_favorites">Favoritos…</string>
-	<string name="search_position_undefined">Indefinido</string>
-	
-	<string name="search_position_map_view">Centro atual do mapa</string>
-	<string name="select_search_position">Próximo a:</string>
-	<string name="route_successfully_saved_at">Rota salva como \'%1$s\'.</string>
-	<string name="filename_input">"Nome do arquivo: "</string>
-	<string name="file_with_name_already_exist">Já existe um arquivo com o mesmo nome.</string>
-	<string name="local_index_upload_gpx_description">Enviar arquivos GPX para a comunidade OSM. Eles serão usados para melhorar os mapas.</string>
-	<string name="local_index_mi_upload_gpx">Enviar para OSM</string>
-	<string name="show_more_map_detail">Mostrar mais detalhes do mapa</string>
-	<string name="show_more_map_detail_descr">Mostrar detalhes do mapa vetorial (estradas, etc.) quando em zoom mais distante</string>
-	<string name="favourites_delete_multiple_succesful">Ponto(s) favorito(s) excluído(s).</string>
-	<string name="favorite_delete_multiple">Você apagará %1$d favorito(s) e %2$d grupo(s) favorito(s). Continuar?</string>
-	<string name="favorite_friends_category">Amigos</string>
-	<string name="favorite_places_category">Lugares</string>
-	<string name="shared_string_others">Outros</string>
-	<string name="shared_string_name">Nome</string>
-	<string name="favourites_edit_dialog_category">Categori­a</string>
-	<string name="shared_string_no_thanks">Não, obrigado</string>
-	<string name="basemap_missing">Mapa base mundial (que abrange o mundo inteiro com poucos detalhes) está faltando. Por favor, considere baixar World_basemap_x.obf para um ambiente completo.</string>
-	<string name="vector_data_missing">Faltam os dados (\'off-line\') no cartão SD. Necessário baixar os mapas para usá-los off-line.</string>
-	<string name="shared_string_release">Lançado</string>
-	<string name="local_index_installed">Versão local</string>
-	<string name="local_index_items_backuped">%1$d de %2$d item(s) desativado(s).</string>
-	<string name="local_index_items_deleted">%1$d de %2$d item(s) excluído(s).</string>
-	<string name="local_index_items_restored">%1$d de %2$d item(s) ativado(s).</string>
-	<string name="local_index_no_items_to_do">Sem itens para %1$s</string>
-	<string name="local_index_mi_restore">Ativar</string>
-	<string name="local_index_mi_backup">Desativar</string>
-	
-	<string name="local_index_poi_data">Dados POI</string>
-	<string name="local_index_address_data">Dados de endereço</string>
-	<string name="local_index_transport_data">Dados de transporte público</string>
-	<string name="local_index_map_data">Dados de mapa</string>
-	<string name="local_indexes_cat_backup">Desativado</string>
-	<string name="local_indexes_cat_tts">Comandos de voz (TTS)</string>
-	<string name="local_indexes_cat_voice">Comandos de voz (gravados)</string>
-	<string name="local_indexes_cat_poi">POIs - Pontos de Interesse</string>
-	<string name="ttsvoice">Voz TTS</string>
-	<string name="search_offline_clear_search">Nova pesquisa</string>
-	<string name="map_text_size_descr">Selecionar o tamanho do texto para nomes no mapa</string>
-	<string name="map_text_size">Tamanho da letra no mapa</string>
-	<string name="trace_rendering">Informação de depuração de renderização</string>
-	<string name="trace_rendering_descr">Exibir o desempenho de renderização</string>
-	
-	<string name="installing_new_resources">Preparando novos dados…</string>
-	<string name="tts_language_not_supported_title">Idioma não suportado</string>
-	<string name="tts_language_not_supported">O idioma selecionado não é suportado pelo mecanismo instalado de TTS (texto para fala, do inglês text-to-speech) do Android. Você quer buscar outro mecanismo TTS na loja de apps? Caso contrário, será usado o idioma predefinido para o TTS.</string>
-	<string name="tts_missing_language_data_title">Faltam dados</string>
-	<string name="tts_missing_language_data">Nenhum dado para o idioma selecionado está instalado. Você quer ir para a loja de apps?</string>
-	<string name="gpx_option_reverse_route">Inverter direção GPX</string>
-	<string name="gpx_option_destination_point">Usar destino atual</string>
-	<string name="gpx_option_from_start_point">Percorrer toda a trilha</string>
-	<string name="switch_to_vector_map_to_see">Mapa vetorial off-line presente para esse local.
+
+
+<string name="download_files_not_enough_space">Não há espaço livre suficiente para baixar %1$s MB (disponível: %2$s).</string>
+<string name="download_files_question_space">Baixar {0} arquivo(s)? Espaço de armazenamento utilizado é {1} MB. (Espaço disponível é {2} MB.)</string>
+
+<string name="use_transparent_map_theme">Tema transparente</string>
+<string name="native_library_not_supported">Biblioteca nativa não é suportada neste aparelho.</string>
+<string name="choose_auto_follow_route">Centrar visualização do mapa</string>
+<string name="choose_auto_follow_route_descr">Tempo para o mapa ser centrado na posição atual.</string>
+
+<string name="keep_informing_never">Apenas manualmente (toque na seta)</string>
+<string name="keep_informing_descr">Repetir as instruções de navegação em intervalos regulares.</string>
+<string name="keep_informing">Repetir as instruções de navegação</string>
+<string name="auto_follow_route_navigation">Centralizar apenas na navegação</string>
+<string name="auto_follow_route_navigation_descr">Centralizar a posição no mapa apenas durante a navegação.</string>
+<string name="auto_follow_location_enabled">Mapa automaticamente centrado.</string>
+<string name="pref_vector_rendering">Opções específicas para renderizar vetores</string>
+<string name="pref_overlay">Camada superior / Camada inferior</string>
+<string name="pref_raster_map">Configurações de fonte de mapa</string>
+<string name="pref_vector_map">Configurações de mapa vetorial</string>
+<string name="delete_confirmation_msg">Apagar %1$s?</string>
+<string name="local_index_items_uploaded">%1$d de %2$d itens enviados.</string>
+<string name="internet_connection_required_for_online_route">Um serviço de navegação on-line está selecionado, mas você não está conectado à Internet.</string>
+<string name="voice_stream_notification">Áudio de Notificação (viva voz)</string>
+<string name="search_osm_offline">Pesquisar por posição geográfica</string>
+
+
+<string name="send_location_email_pattern">Para ver a posição, siga o link %1$s ou o Android intent link %2$s</string>
+<string name="send_location">Enviar posição</string>
+<string name="voice_is_not_available_msg">Nenhuma orientação por voz disponível, por favor vá a \'Configurações de navegação\' → \'Instruções por voz\' e selecione ou baixe um pacote de comandos de voz.</string>
+<string name="voice_is_not_available_title">Nenhuma orientação por voz selecionada</string>
+<string name="fav_saved_sucessfully">Favoritos salvos em {0}</string>
+<string name="no_fav_to_save">Nenhum favorito para salvar</string>
+<string name="layer_osm_bugs">Notas do OSM (online)</string>
+<string name="context_menu_item_search_poi">Pesquisar POI</string>
+
+<string name="where_am_i">Onde estou?</string>
+<string name="process_navigation_service">Serviço de navegação OsmAnd</string>
+<string name="network_provider">Rede</string>
+<string name="menu_mute_off">Som ligado</string>
+<string name="voice_data_initializing">Iniciando dados de voz…</string>
+<string name="sd_unmounted">Cartão de memória inacessível.
+\nVocê não poderá ver mapas ou encontrar itens.</string>
+<string name="route_tr">Vire à direita e siga</string>
+<string name="route_tshr">Vire acentuadamente à direita e siga</string>
+<string name="route_tslr">Vire levemente à direita e siga</string>
+<string name="route_tl">Vire à esquerda e siga</string>
+<string name="route_tu">Faça um retorno e siga</string>
+<string name="route_head">Siga</string>
+<string name="first_time_continue">Depois</string>
+<string name="first_time_download">Baixar regiões</string>
+<string name="map_screen_orientation">Orientação do mapa</string>
+<string name="transport_finish_search">Finalizar pesquisa</string>
+<string name="map_screen_orientation_descr">Vertical, horizontal ou a mesma do aparelho.</string>
+<string name="opening_hours_not_supported">O formato das horas de abertura não pode ser alterado</string>
+<string name="add_new_rule">Adicionar nova regra</string>
+<string name="transport_Routes">Linhas</string>
+<string name="transport_Stop">Parada</string>
+<string name="transport_stops">paradas</string>
+<string name="transport_search_after">Itinerário seguinte</string>
+<string name="transport_search_before">Itinerário anterior</string>
+<string name="use_english_names_descr">Escolher entre os nomes nativos ou em inglês.</string>
+<string name="use_english_names">Usar nomes em inglês nos mapas</string>
+<string name="show_poi_over_map_description">Mostrar a camada de POI selecionada por último no mapa.</string>
+<string name="show_poi_over_map">Mostrar camada de POI</string>
+
+<string name="poi_edit_title">Modificar POI</string>
+<string name="city_type_suburb">Bairro</string>
+<string name="city_type_hamlet">Lugarejo</string>
+<string name="city_type_village">Povoado</string>
+<string name="city_type_town">Cidade pequena</string>
+<string name="city_type_city">Cidade grande</string>
+
+<string name="animate_route_off">Parar simulação</string>
+<string name="animate_route">Iniciar simulação</string>
+<string name="file_can_not_be_renamed">O arquivo não pode ser renomeado.</string>
+<string name="file_with_name_already_exists">Já existe um arquivo com esse nome.</string>
+<string name="shared_string_gpx_route">Rota GPX</string>
+<string name="poi_query_by_name_matches_categories">Encontradas várias categorias de POI que correspondem à consulta:</string>
+<string name="data_to_search_poi_not_available">Não existem dados locais para pesquisa de POI.</string>
+<string name="poi_filter_by_name">Pesquisar por nome</string>
+<string name="old_poi_file_should_be_deleted">O arquivo POI \'%1$s\' é repetido e pode ser excluído.</string>
+<string name="update_poi_file_not_found">Não foi encontrado e não pôde ser criado o arquivo local para salvar as mudanças de POI.</string>
+<string name="button_upgrade_osmandplus">Alterar para OsmAnd+</string>
+<string name="map_version_changed_info">Baixe a nova versão do aplicativo para poder usar os novos arquivos de mapa.</string>
+<string name="poi_filter_nominatim">Nominatim on-line</string>
+<string name="search_position_current_location_search">Procurando posição…</string>
+<string name="search_position_current_location_found">Minha Posição (encontrada)</string>
+<string name="search_position_address">Endereço…</string>
+<string name="search_position_favorites">Favoritos…</string>
+<string name="search_position_undefined">Indefinido</string>
+
+<string name="search_position_map_view">Centro atual do mapa</string>
+<string name="select_search_position">Próximo a:</string>
+<string name="route_successfully_saved_at">Rota salva como \'%1$s\'.</string>
+<string name="filename_input">Nome do arquivo:</string>
+<string name="file_with_name_already_exist">Já existe um arquivo com o mesmo nome.</string>
+<string name="local_index_upload_gpx_description">Enviar arquivos GPX para a comunidade OSM, melhorando os mapas.</string>
+<string name="local_index_mi_upload_gpx">Enviar para OSM</string>
+<string name="show_more_map_detail">Mostrar mais detalhes do mapa</string>
+<string name="show_more_map_detail_descr">Mostrar detalhes do mapa vetorial (estradas, etc.) em níveis de zoom mais distante.</string>
+<string name="favourites_delete_multiple_succesful">Ponto(s) favorito(s) excluído(s).</string>
+<string name="favorite_delete_multiple">Você apagará %1$d favorito(s) e %2$d grupo(s) favorito(s). Continuar?</string>
+<string name="favorite_friends_category">Amigos</string>
+<string name="favorite_places_category">Lugares</string>
+<string name="shared_string_others">Outros</string>
+<string name="shared_string_name">Nome</string>
+<string name="favourites_edit_dialog_category">Categori­a</string>
+<string name="shared_string_no_thanks">Não, obrigado</string>
+<string name="basemap_missing">Faça o download do mapa do mundo base para obter uma visão geral cobrindo o mundo todo com níveis de baixos de zoom.</string>
+<string name="vector_data_missing">Faça o download de dados \"off-line\" para usar mapas off-line.</string>
+<string name="shared_string_release">Lançado</string>
+<string name="local_index_installed">Versão local</string>
+<string name="local_index_items_backuped">%1$d de %2$d item(s) desativado(s).</string>
+<string name="local_index_items_deleted">%1$d de %2$d item(s) excluído(s).</string>
+<string name="local_index_items_restored">%1$d de %2$d item(s) ativado(s).</string>
+<string name="local_index_no_items_to_do">Sem itens para %1$s</string>
+<string name="local_index_mi_restore">Ativar</string>
+<string name="local_index_mi_backup">Desativar</string>
+
+<string name="local_index_poi_data">Dados POI</string>
+<string name="local_index_address_data">Dados de endereço</string>
+<string name="local_index_transport_data">Dados de transporte público</string>
+<string name="local_index_map_data">Dados de mapa</string>
+<string name="local_indexes_cat_backup">Desativado</string>
+<string name="local_indexes_cat_tts">Comandos de voz (TTS)</string>
+<string name="local_indexes_cat_voice">Comandos de voz (gravados)</string>
+<string name="local_indexes_cat_poi">POIs - Pontos de Interesse</string>
+<string name="ttsvoice">Voz TTS</string>
+<string name="search_offline_clear_search">Nova pesquisa</string>
+<string name="map_text_size_descr">Selecionar o tamanho do texto para nomes no mapa.</string>
+<string name="map_text_size">Tamanho da letra no mapa</string>
+<string name="trace_rendering">Informação de depuração de renderização</string>
+<string name="trace_rendering_descr">Exibir o desempenho de renderização.</string>
+
+<string name="installing_new_resources">Preparando novos dados…</string>
+<string name="tts_language_not_supported_title">Idioma não suportado</string>
+<string name="tts_language_not_supported">O idioma selecionado não é suportado pelo mecanismo instalado de TTS (texto para fala, do inglês text-to-speech) do Android. Procure outro motor TTS na loja\? Caso contrário, será usado o idioma predefinido para o TTS.</string>
+<string name="tts_missing_language_data_title">Faltam dados</string>
+<string name="tts_missing_language_data">Ir a loja para baixar o idioma selecionado\?</string>
+<string name="gpx_option_reverse_route">Inverter direção GPX</string>
+<string name="gpx_option_destination_point">Usar destino atual</string>
+<string name="gpx_option_from_start_point">Percorrer toda a trilha</string>
+<string name="switch_to_vector_map_to_see">Mapa vetorial off-line presente para esse local.
 \n\t\n\tPara usá-lo, ative em \'Menu\' → \'Configurar mapa\' → \'Fonte de mapas…\' → \'Mapas vetoriais off-line\'.</string>
-	<string name="choose_audio_stream">Saída para orientação por voz</string>
-	<string name="choose_audio_stream_descr">Escolha o canal para orientação por voz</string>
-	<string name="voice_stream_voice_call">Áudio de chamada de voz</string>
-	<string name="voice_stream_music">Áudio de mídia/música</string>
-	<string name="warning_tile_layer_not_downloadable">Aplicativo não pode baixar camada %1$s do mapa, por favor, tente reinstalá-lo.</string>
-	<string name="overlay_transparency_descr">Modificar a transparência da sobreposição</string>
-	<string name="overlay_transparency">Transparência da sobreposição</string>
-	<string name="map_transparency_descr">Modificar transparência do mapa base</string>
-	<string name="map_transparency">Transparência do mapa base</string>
-	<string name="layer_underlay">Camada inferior…</string>
-	<string name="map_underlay">Mapa da camada inferior</string>
-	<string name="map_underlay_descr">Escolher mapa da camada inferior.</string>
-	<string name="layer_overlay">Camada superior…</string>
-	<string name="map_overlay">Mapa da camada superior</string>
-	<string name="map_overlay_descr">Escolher mapa da camada superior.</string>
-	<string name="tile_source_already_installed">Mapa já está instalado, as configurações serão atualizadas.</string>
-	<string name="select_tile_source_to_install">Selecione os mapas (quadrículas) para instalar ou atualizar.</string>
-	<string name="internet_not_available">Uma conexão com a Internet é necessária para esta operação, mas não está disponível.</string>
-	<string name="install_more">Instalar mais…</string>
-	<string name="level_to_switch_vector_raster_descr">Nível de zoom mínimo para usar mapas vetoriais</string>
-	<string name="level_to_switch_vector_raster">Mín. nível de zoom vetorial</string>
-	
-	
-	
-	
-	<string name="create_poi_link_to_osm_doc"> <u>OSM on-line</u> classificação de mapa com imagens</string>
-	<string name="error_doing_search">Erro na pesquisa off-line</string>
-	<string name="system_locale">Sistema</string>
-	<string name="preferred_locale_descr">Selecionar idioma de exibição (por favor, reinicie o OsmAnd depois de mudar)</string>
-	<string name="preferred_locale">Idioma de exibição</string>
-	<string name="incomplete_locale">incompleto</string>
-	
-	
-	
-	
-	<string name="unit_of_length_descr">Alterar unidades de distância e velocidade</string>
-	<string name="unit_of_length">Unidade de medida</string>
-	<string name="si_mi_feet">Milhas/pés</string>
-	<string name="si_mi_yard">Milhas/jardas</string>
-	<string name="si_km_m">Quilômetros/metros</string>
-	<string name="yard">yd</string>
-	<string name="foot">ft</string>
-	<string name="mile_per_hour">mph</string>
-	<string name="mile">mi</string>
-	<string name="send_location_way_choose_title">Compartilhar posição usando</string>
-	<string name="send_location_sms_pattern">Posição: %1$s\n%2$s</string>
-	<string name="context_menu_item_share_location">Compartilhar posição</string>
-	<string name="add_waypoint_dialog_added">Marco de trajeto GPX \'\'{0}\'\' foi adicionado</string>
-	<string name="add_waypoint_dialog_title">Adicionar parada à trilha GPX gravada</string>
-	<string name="context_menu_item_add_waypoint">Adicionar marco de trajeto GPX</string>
-	<string name="amenity_type_administrative">Administrativo</string>
-	<string name="amenity_type_barrier">Barreira</string>
-	<string name="amenity_type_education">Educação</string>
-	<string name="amenity_type_emergency">Emergência</string>
-	<string name="amenity_type_entertainment">Entretenimento</string>
-	<string name="amenity_type_finance">Finanças</string>
-	<string name="amenity_type_geocache">Cache geográfico</string>
-	<string name="amenity_type_healthcare">Saúde</string>
-	<string name="amenity_type_historic">Histórico</string>
-	<string name="amenity_type_landuse">Uso da terra</string>
-	<string name="amenity_type_leisure">Lazer</string>
-	<string name="amenity_type_man_made">Construção humana</string>
-	<string name="amenity_type_military">Militar</string>
-	<string name="amenity_type_natural">Natureza</string>
-	<string name="amenity_type_office">Escritório</string>
-	<string name="amenity_type_other">Outro</string>
-	<string name="amenity_type_shop">Loja</string>
-	<string name="amenity_type_sport">Esporte</string>
-	<string name="amenity_type_sustenance">Alimentação</string>
-	<string name="amenity_type_tourism">Turismo</string>
-	<string name="amenity_type_transportation">Transporte</string>
-	<string name="indexing_address">Indexando endereço…</string>
-	<string name="indexing_map">Indexando mapa…</string>
-	<string name="indexing_poi">Indexando POI…</string>
-	<string name="indexing_transport">Indexando transporte…</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">O formato obsoleto de mapa \'\'{0}\'\' não é suportado</string>
-	<string name="poi_filter_closest_poi">POIs próximos</string>
-	<string name="poi_filter_custom_filter">Filtro personalizado</string>
-	<string name="reading_cached_tiles">Lendo quadrículas salvas…</string>
-	<string name="version_index_is_big_for_memory">O índice \'\'{0}\'\' não coube na memória</string>
-	<string name="version_index_is_not_supported">A versão do índice \'\'{0}\'\' não é suportada</string>
-	
-	
-	<string name="osmand_routing_experimental">Navegação OsmAnd off-line é ainda uma função experimental e não funciona em distâncias superiores a cerca de 20 km.\n\nO serviço de navegação está temporariamente mudado para CloudMade on-line.</string>
-	<string name="specified_dir_doesnt_exist">Não se pode encontrar o diretório especificado.</string>
-	
-	
-	<string name="osmand_net_previously_installed">Uma versão anterior do OsmAnd está instalada. Todos os dados off-line serão suportados pelo novo aplicativo. Mas pontos favoritos devem ser exportados no antigo aplicativo e posteriormente importados pelo novo.</string>
-	<string name="build_installed">Compilação {0} foi instalada ({1}).</string>
-	<string name="downloading_build">Baixando compilação…</string>
-	<string name="install_selected_build">Você deseja instalar o OsmAnd - {0} de {1} {2} MB ?</string>
-	<string name="loading_builds_failed">Falha ao recuperar a lista de compilações do OsmAnd</string>
-	<string name="loading_builds">Carregando compilações OsmAnd…</string>
-	<string name="select_build_to_install">Selecionar uma compilação do OsmAnd para instalar</string>
-	<string name="gps_status_app_not_found">Aplicativo de situação do GPS não está instalado. Pesquisar na loja de apps?</string>
-	<string name="daynight_mode_day">Dia</string>
-	<string name="daynight_mode_night">Noite</string>
-	<string name="daynight_mode_sensor">Sensor de luz</string>
-	<string name="daynight_descr">Definir regra para mudança entre modo dia/noite</string>
-	<string name="daynight">Modo dia/noite</string>
-	<string name="download_files_question">Baixar {0} arquivo(s) ({1} MB)?</string>
-	<string name="items_were_selected">{0} elemento(s) selecionado(s)</string>
-	<string name="filter_existing_indexes">Baixado</string>
-	<string name="fast_route_mode">Rota mais rápida</string>
-	<string name="fast_route_mode_descr">"Ative para calcular a rota mais rápida ou desative para calcular a rota mais econômica "</string>
-	<string name="tiles_to_download_estimated_size">No zoom {0}: baixar {1} imagens ({2} MB)</string>
-	<string name="shared_string_download_map">Baixar mapa</string>
-	<string name="select_max_zoom_preload_area">Selecionar zoom máximo para pré-carregar</string>
-	<string name="maps_could_not_be_downloaded">Não é possível baixar este mapa</string>
-	<string name="continuous_rendering">Renderização contínua</string>
-	<string name="continuous_rendering_descr">Mostrar renderização contínua ao invés de imagem inteira de uma vez</string>
-	<string name="rendering_exception">Erro ao renderizar a área selecionada</string>
-	<string name="renderer_load_sucess">O renderizador foi carregado</string>
-	<string name="renderer_load_exception">Erro: renderizador não foi carregado</string>
-	<string name="renderers">Renderizador de vetor</string>
-	<string name="renderers_descr">Escolha a aparência dos mapas vetoriais</string>
-	<string name="poi_context_menu_website">Mostrar site do POI</string>
-	<string name="poi_context_menu_call">Mostrar o telefone do POI</string>
-	<string name="download_type_to_filter">digite o filtro</string>
-	<string name="use_high_res_maps">Exibir em alta resolução</string>
-	<string name="use_high_res_maps_descr">Não esticar (e borrar) quadrículas de mapas em telas de alta densidade</string>
-	<string name="context_menu_item_search_transport">Pesquisar transporte público</string>
-	<string name="transport_searching_transport">Resultados de transporte (sem destino):</string>
-	<string name="transport_searching_route">Resultados de transporte ({0} para o destino):</string>
-	<string name="transport_search_again">Reiniciar pesquisa de transporte</string>
-	<string name="voice">Voz gravada</string>
-	<string name="voices">Instruções de voz</string>
-	<string name="no_vector_map_loaded">Nenhum mapa vetorial foi carregado</string>
-	
-	<string name="gpx_files_not_found">Nenhum arquivo GPX encontrado no diretório de trilhas</string>
-	<string name="layer_gpx_layer">Trilha GPX…</string>
-	<string name="error_reading_gpx">Erro na leitura de dados GPX</string>
-	<string name="vector_data">Mapas vetoriais off-line</string>
-	<string name="transport_context_menu">Pesquisar transporte na parada</string>
-	
-	<string name="poi_context_menu_modify">Modificar POI</string>
-	<string name="poi_context_menu_delete">Apagar POI</string>
-	<string name="rotate_map_compass_opt">Na direção da bússola</string>
-	<string name="rotate_map_bearing_opt">Na direção do movimento</string>
-	<string name="rotate_map_none_opt">Não girar (norte acima)</string>
-	<string name="rotate_map_to_bearing_descr">Selecionar o alinhamento do mapa</string>
-	<string name="rotate_map_to_bearing">Orientação do mapa</string>
-	<string name="show_route">Detalhes da rota</string>
-	<string name="fav_imported_sucessfully">Favoritos importados</string>
-	<string name="import_file_favourites">Salvar pontos como arquivo GPX ou importar para os favoritos ?</string>
-	<string name="fav_file_to_load_not_found">O arquivo GPX contendo os favoritos não foi encontrado em {0}</string>
-	<string name="share_fav_subject">Favoritos compartilhados através do OsmAnd</string>
-	<string name="error_occurred_loading_gpx">Erro ao carregar o arquivo GPX</string>
-	<string name="send_report">Enviar o relatório</string>
-	<string name="none_region_found">Nenhum dado de região encontrado no cartão SD. Tente baixar da Internet.</string>
-	<string name="poi_namefinder_query_empty">Parâmetros de pesquisa para encontrar o POI</string>
-	<string name="any_poi">Todos</string>
-	
-	<string name="thanks_yandex_traffic">Obrigado à Yandex por fornecer informações de trânsito.</string>
-	<string name="layer_yandex_traffic">Trânsito Yandex</string>
-	<string name="layer_route">Rota</string>
-	
-	<string name="layer_poi">POI…</string>
-	<string name="layer_map">Fonte de mapa…</string>
-	<string name="menu_layers">Camadas de mapa</string>
-	<string name="use_trackball_descr">Usar trackball para mover o mapa</string>
-	<string name="use_trackball">Usar trackball</string>
-	<string name="background_service_wait_int_descr">Definir o tempo limite de espera para determinar a posição</string>
-	<string name="background_service_wait_int">Tempo de espera para posicionamento</string>
-	<string name="gps_provider">GPS</string>
-	<string name="int_seconds">segundos</string>
-	<string name="int_min">min.</string>
-	<string name="background_service_int_descr">Definir intervalo de ativação usado pelo serviço em segundo plano</string>
-	<string name="background_service_provider_descr">Escolher o provedor de posição usado pelo serviço em segundo plano.</string>
-	<string name="background_service_provider">Provedor de posição</string>
-	<string name="background_router_service_descr">Monitorar sua posição enquanto a tela estiver desligada.</string>
-	<string name="background_router_service">Executar em segundo plano</string>
-	<string name="off_router_service_no_gps_available">O serviço em segundo plano exige a ativação de algum provedor de posição.</string>
-	<string name="hide_poi_filter">Ocultar filtro</string>
-	<string name="show_poi_filter">Mostrar filtro</string>
-	<string name="search_poi_filter">Filtro</string>
-	<string name="menu_mute_on">Som desligado</string>
-	<string name="voice_data_not_supported">Versão de dados de voz sem suporte</string>
-	<string name="voice_data_corrupted">Dados de voz corrompidos</string>
-	<string name="voice_data_unavailable">Dados de voz selecionados indisponíveis</string>
-	<string name="sd_mounted_ro">Cartão SD é somente leitura.\nVocê só pode ver o mapa pré-carregado e não pode baixar da Internet.</string>
-	<string name="unzipping_file">Descompactando arquivo…</string>
-	<string name="route_tshl">Vire acentuadamente à esquerda e siga</string>
-	<string name="route_tsll">Vire levemente à esquerda e siga</string>
-	<string name="search_poi_location">Procurando sinal…</string>
-	<string name="search_near_map">Pesquisar próximo ao centro do mapa</string>
-	<string name="search_nearby">Pesquisar nas proximidades</string>
-	<string name="map_orientation_default">Mesma do aparelho</string>
-	<string name="map_orientation_portrait">Vertical</string>
-	<string name="map_orientation_landscape">Horizontal</string>
-	<string name="transport_stop_to_go_out">Escolha parada de saída</string>
-	<string name="transport_to_go_after">distância prévia</string>
-	<string name="transport_to_go_before">distância seguinte</string>
-	<string name="transport_stops_to_pass">paradas a passar</string>
-	<string name="search_offline_geo_error">Não foi possível analisar o geo intent \'%s\'</string>
-	<string name="transport_route_distance">Distância do itinerário</string>
-	<string name="transport">Transporte</string>
-	<string name="show_transport_over_map_description">Mostrar paradas de transporte público no mapa</string>
-	<string name="poi_filter_namefinder">NameFinder on-line</string>
-	<string name="show_transport_over_map">Mostrar paradas de transporte</string>
-	<string name="hello">Aplicativo de navegação OsmAnd</string>
-	<string name="update_poi_success">Dados de POI foram atualizados ({0} foram carregados)</string>
-	<string name="update_poi_error_local">Não pôde atualizar a lista local de POIs</string>
-	<string name="update_poi_error_loading">Erro ao carregar dados do servidor</string>
-	<string name="update_poi_no_offline_poi_index">Não há dados de POI off-line para esta região</string>
-	<string name="update_poi_is_not_available_for_zoom">Aproximar zoom permite atualizar POIs</string>
-	<string name="context_menu_item_update_poi">Atualizar POI</string>
-	<string name="context_menu_item_update_map_confirm">Atualizar dados locais da Internet?</string>
-	<string name="search_history_city">Cidade: {0}</string>
-	<string name="search_history_street">Rua: {0}, {1}</string>
-	<string name="search_history_int_streets">Interseção: {0} x {1} em {2}</string>
-	<string name="search_history_building">Número: {0}, {1}, {2}</string>
-	<string name="favorite">Favorito</string>
-	<string name="uploading_data">Enviando dados…</string>
-	<string name="uploading">Enviando…</string>
-	<string name="search_nothing_found">Nada foi encontrado</string>
-	<string name="searching">Pesquisando…</string>
-	<string name="searching_address">Pesquisando endereço…</string>
-	<string name="search_osm_nominatim">Pesquisa on-line usando OSM Nominatim</string>
-	<string name="hint_search_online">Pesquisa on-line: número de porta, rua, cidade</string>
-	<string name="search_offline_address">Pesquisa off-line</string>
-	<string name="search_online_address">Pesquisa on-line</string>
-	<string name="max_level_download_tile">Max. zoom on-line</string>
-	<string name="max_level_download_tile_descr">Escolher o nível de zoom máximo para baixar quadrículas de mapa on-line</string>
-	<string name="route_general_information">Distância total %1$s, tempo de viagem %2$d h %3$d min.</string>
-	<string name="router_service_descr">Escolher um serviço de navegação on-line ou off-line</string>
-	<string name="router_service">Serviço de navegação</string>
-	<string name="sd_dir_not_accessible">O diretório de armazenamento de dados no cartão SD não está acessível!</string>
-	<string name="download_question">Baixar {0} - {1} ?</string>
-	<string name="download_question_exist">Dados off-line para {0} já existem ({1}). Você quer fazer atualizá-los ({2}) ?</string>
-	<string name="address">Endereço</string>
-	<string name="downloading_list_indexes">Baixando lista de regiões disponíveis…</string>
-	<string name="list_index_files_was_not_loaded">A lista de regiões não foi recuperada de osmand.net.</string>
-	<string name="fav_points_edited">O favorito foi modificado</string>
-	<string name="fav_points_not_exist">Não existe nenhum favorito</string>
-	<string name="update_existing">Substituir</string>
-	<string name="mark_final_location_first">Por favor, primeiro selecione o destino</string>
-	<string name="opening_hours">Horário de funcionamento</string>
-	<string name="opening_changeset">Abrindo conjunto de alterações…</string>
-	<string name="closing_changeset">Fechando conjunto de alterações…</string>
-	<string name="commiting_node">Enviando nó…</string>
-	<string name="loading_poi_obj">Carregando POI…</string>
-	<string name="auth_failed">Falha na autorização</string>
-	<string name="failed_op">Falhou</string>
-	<string name="converting_names">Convertendo nomes nativos/ingleses…</string>
-	<string name="loading_streets_buildings">Carregando ruas/edifícios…</string>
-	<string name="loading_postcodes">Carregando códigos postais…</string>
-	<string name="loading_streets">Carregando ruas…</string>
-	<string name="loading_cities">Carregando cidades…</string>
-	<string name="poi">POI</string>
-	<string name="error_occurred_saving_gpx">Erro ao salvar GPX</string>
-	<string name="error_calculating_route">Erro no cálculo da rota</string>
-	<string name="error_calculating_route_occured">Ocorreu um erro ao calcular a rota</string>
-	<string name="empty_route_calculated">Erro: A rota calculada está vazia</string>					
-	<string name="new_route_calculated_dist">Nova rota calculada, distância</string>
-	<string name="arrived_at_destination">Você chegou no seu destino</string>
-	<string name="invalid_locations">As coordenadas são inválidas!</string>
-	<string name="go_back_to_osmand">Voltar ao mapa do OsmAnd</string>
-	<string name="loading_data">Carregando dados…</string>
-	<string name="reading_indexes">Lendo dados locais…</string>
-	<string name="previous_run_crashed">A última execução do OsmAnd falhou. O arquivo de log está em {0}. Por favor, informe o problema e inclua o arquivo de log.</string>
-	<string name="saving_gpx_tracks">Salvando trilhas GPX no cartão SD…</string>
-	<string name="finished_task">Concluído</string>
-	<string name="use_online_routing_descr">Usar a Internet para calcular a rota</string>
-	<string name="use_online_routing">Usar a navegação on-line</string>
-	<string name="osm_settings_descr">Especificar configurações de Openstreetmap.org (OSM) necessárias para envios ao OSM</string>
-	<string name="data_settings_descr">Especificar o idioma, baixar/atualizar dados.</string>
-	<string name="data_settings">Dados</string>
-	<string name="additional_settings">Configurações adicionais</string>
-	<string name="update_tile">Atualizar mapa</string>
-	<string name="reload_tile">Atualizar quadrículas</string>
-	<string name="mark_point">Destino</string>
-	<string name="app_settings">Configurações do aplicativo</string>
-	<string name="search_address">Pesquisar endereço</string>
-	<string name="choose_building">Escolher número</string>
-	<string name="choose_street">Escolher rua</string>
-	<string name="choose_city">Escolher cidade ou código postal</string>
-	<string name="ChooseCountry">Escolher país</string>
-	<string name="show_view_angle">Mostrar ângulo de visão</string>
-	<string name="map_view_3d_descr">Ativar a visualização em 3D do mapa</string>
-	<string name="map_view_3d">Visão em 3D</string>
-	<string name="map_tile_source_descr">Escolher a fonte de mapa on-line ou de quadrículas salvas.</string>
-	<string name="map_tile_source">Fonte do mapa de quadrículas</string>
-	<string name="map_source">Fonte do mapa</string>
-	<string name="use_internet">Usar a Internet</string>
-	<string name="show_location">Mostrar sua posição</string>
-	<string name="show_gps_coordinates_text">Mostrar coordenadas GPS no mapa</string>
-	<string name="use_internet_to_download_tile">Usar Internet para baixar quadrículas que faltam no mapa</string>
-	<string name="app_description">Aplicativo de navegação</string>
-	<string name="search_button">Pesquisar</string>
-	<string name="search_activity">Pesquisar</string>
-	<string name="searchpoi_activity">Escolher POI</string>
-	<string name="search_POI_level_btn">Encontrar mais</string>
-	<string name="incremental_search_street">Pesquisar rua incrementalmente</string>
-	<string name="incremental_search_building">Pesquisar número incrementalmente</string>
-	<string name="choose_available_region">Escolher região da lista</string>
-	<string name="choose_intersected_street">Escolher rua transversal</string>
-	<string name="Closest_Amenities">Lugares próximos</string>
-	<string name="app_mode_car">Carro</string>
-	<string name="app_mode_bicycle">Bicicleta</string>
-	<string name="app_mode_pedestrian">A pé</string>
-	<string name="position_on_map_center">Centro</string>
-	<string name="position_on_map_bottom">Embaixo</string>
-	<string name="navigate_point_top_text">Insira a latitude e longitude no formato selecionado (D - graus, M - minutos, S - segundos)</string>
-	<string name="navigate_point_latitude">Latitude</string>
-	<string name="navigate_point_longitude">Longitude</string>
-	<string name="navigate_point_format_D">GGG.GG</string>
-	<string name="navigate_point_format_DM">DDD MM.MM</string>
-	<string name="navigate_point_format_DMS">DDD MM SS.SS</string>
-	<string name="search_address_top_text">Escolher endereço</string>
-	<string name="search_address_region">País</string>
-	<string name="search_address_city">Cidade</string>
-	<string name="search_address_street">Rua</string>
-	<string name="search_address_building">Número</string>
-	<string name="search_address_building_option">Número</string>
-	<string name="search_address_street_option">Rua transversal</string>
-	
-	<string name="context_menu_item_update_map">Atualizar mapa</string>
-	<string name="context_menu_item_create_poi">Criar POI</string>
-	<string name="add_favorite_dialog_top_text">Digite o nome do favorito</string>
-	<string name="add_favorite_dialog_default_favourite_name">Favorito</string>
-	<string name="add_favorite_dialog_favourite_added_template">O ponto \'\'{0}\'\' foi adicionado aos favoritos.</string>
-	<string name="favourites_context_menu_edit">Modificar favorito</string>
-	<string name="favourites_context_menu_delete">Apagar favorito</string>
-	<string name="favourites_remove_dialog_msg">Apagar ponto favorito \'%s\'?</string>
-	<string name="favourites_remove_dialog_success">Ponto favorito {0} excluído.</string>
-	
-	
-	
-	<string name="osb_author_dialog_password">Senha do OSM (opcional)</string>
-	
-	<string name="osb_comment_dialog_message">Mensagem</string>
-	<string name="osb_comment_dialog_author">Autor</string>
-	
-	
-	<string name="osb_comment_dialog_success">Comentário adicionado</string>
-	<string name="osb_comment_dialog_error">Erro: o comentário não foi adicionado</string>
-	
-	
-	
-	
-	
-	<string name="poi_create_title">Criar POI</string>
-	<string name="poi_error_poi_not_found">Nó não pode ser encontrado ou POI não é um único nó</string>
-	<string name="poi_remove_confirm_template">Apagar {0} (inserir comentário)?</string>
-	<string name="poi_remove_title">Apagar POI</string>
-	<string name="poi_remove_success">POI excluído</string>
-	<string name="poi_action_add">adicionar</string>
-	<string name="poi_action_change">modificar</string>
-	<string name="poi_action_succeded_template">Ação {0} bem sucedida.</string>
-	<string name="poi_error_unexpected_template">Ocorreu um erro inesperado durante a execução de ação {0}.</string>
-	<string name="poi_error_io_error_template">Erro de entrada/saída na execução da ação {0}.</string>
-	<string name="poi_error_info_not_loaded">As informações sobre o ponto não foram carregadas</string>
-	<string name="poi_dialog_opening_hours">Aberto</string>
-	<string name="poi_dialog_comment">Comentário</string>
-	<string name="poi_dialog_comment_default">Alterando POI</string>
-	<string name="poi_dialog_other_tags_message">Todos os outros valores serão preservados</string>
-	<string name="default_buttons_commit">Enviar</string>
-	<string name="filter_current_poiButton">Filtro</string>
-	<string name="edit_filter_save_as_menu_item">Salvar como</string>
-	<string name="edit_filter_delete_dialog_title">Apagar filtro selecionado?</string>
-	<string name="edit_filter_delete_message">Filtro {0} foi excluído</string>
-	<string name="edit_filter_create_message">Filtro {0} foi criado</string>
-	<string name="email">e-mail</string>
-	<string name="av_camera_focus">Tipo de foco da câmera</string>
-	<string name="av_camera_focus_descr">Selecionar o tipo de foco da câmera interna</string>
-	<string name="av_camera_focus_auto">Foco automático</string>
-	<string name="av_camera_focus_hiperfocal">Foco hiperfocal</string>
-	<string name="av_camera_focus_edof">Profundidade de visão estendida (EDOF)</string>
-	<string name="av_camera_focus_infinity">Foco no infinito</string>
-	<string name="av_camera_focus_macro">Foco macro (close-up)</string>
-	<string name="av_camera_focus_continuous">A câmera tenta focar continuamente</string>
-	<string name="av_photo_play_sound">Som ao fotografar</string>
-	<string name="av_photo_play_sound_descr">Escolher se tocará som quando tirar fotos.</string>
-	<string name="av_camera_pic_size">Tamanho da foto</string>
-	<string name="av_camera_pic_size_descr">Selecionar tamanho de imagem da foto</string>
-    <string name="navigation_intent_invalid">Formato inválido: %s</string>
-	<string name="plugin_description_title">Descrição</string>
-	<string name="plugin_install_needs_network">Você precisa estar conectado à Internet para instalar este plugin.</string>
-	<string name="get_plugin">Obter</string>
-	
-	
-	
-	
-    <string name="shared_string_logoff">Desconectar</string>
-    
-	<string name="routing_attr_avoid_borders_description">Evitar cruzar fronteiras nacionais</string>
-	<string name="routing_attr_height_name">Limite de altura</string>
-	<string name="routing_attr_height_description">Especificar a altura do veículo para ser permitida nas rotas</string>
-    <string name="use_fast_recalculation">Recálculo de rota inteligente</string>
-	<string name="use_fast_recalculation_desc">Recalcular apenas a parte inicial da rota para viagens longas</string>
-<string name="rendering_value_disabled_name">Desativado</string>
-    <string name="rendering_value_walkingRoutesScopeOSMC_name">Cor por afiliação da rede</string>
-    <string name="rendering_value_walkingRoutesOSMC_name">Colorir conforme símbolo de caminhadas OSMC</string>
-    <string name="osm_edit_context_menu_delete">Apagar edição no OSM</string>
-    <string name="shared_string_show_details">Mostrar detalhes</string>
-    <string name="read_full_article">Leia o artigo completo (on-line)</string>
-    <string name="shared_string_wikipedia">Wikipédia</string>
-    <string name="local_indexes_cat_wiki">Wikipédia</string>
-    <string name="download_wikipedia_maps">Wikipédia</string>
-    <string name="shared_string_import2osmand">Importar para OsmAnd</string>
-    <string name="local_recordings_delete_all_confirm">Você vai apagar %1$d notas. Tem certeza?</string>
-	<string name="disable_recording_once_app_killed">Impedir o registro autônomo</string>
-    <string name="gps_network_not_enabled">Serviço de posição está desativado. Você quer ativá-lo?</string>
-    <string name="disable_recording_once_app_killed_descrp">Pausará o registro de GPX após o encerramento do app (via apps recentes). (Indicação de OsmAnd em segundo plano desaparecerá da barra de notificação do Android.)</string>
-	<string name="archive_wikipedia_data">Você tem dados baixados da Wikipédia antigos e incompatíveis. Quer arquivá-los?</string>
-    <string name="download_wikipedia_files">Você quer baixar dados adicionais da wikipédia (%1$s MB)?</string>
-    <string name="lang_vo">Volapuque</string>
-    <string name="lang_th">Tailandês</string>
-    <string name="lang_te">Telugu</string>
-    <string name="lang_nn">Norueguês (Nynorsk)</string>
-    <string name="lang_new">Neuari / Nepalbhasa</string>
-    <string name="lang_ms">Malásio</string>
-    <string name="lang_ht">Haitiano</string>
-    <string name="lang_gl">Galego</string>
-    <string name="lang_et">Estoniano</string>
-    <string name="lang_ceb">Cebuano</string>
-    <string name="lang_es_ar">Espanhol Argentino</string>
-    <string name="lang_nb">Norueguês Bokmål</string>
-    <string name="light_theme">Claro</string>
-    <string name="dark_theme">Escuro</string>
-    <string name="lang_pms">Piemontês</string>
-    <string name="lang_bn">Bengali</string>
-    <string name="lang_tl">Tagalo</string>
-    <string name="lang_sh">Servo-croata</string>
-    <string name="lang_az">Azeri</string>
-    <string name="lang_br">Bretão</string>
-    <string name="lang_sq">Albanês</string>
-    <string name="lang_is">Islandês</string>
-    <string name="lang_bpy">Bishnupriya Manipuri</string>
-    <string name="lang_nv">Navajo</string>
-    <string name="lang_ga">Irlandês</string>
-    <string name="lang_la">Latim</string>
-    <string name="lang_ku">Curdo</string>
-    <string name="lang_ta">Tâmil</string>
-    <string name="lang_ml">Malaiala</string>
-    <string name="lang_lb">Luxemburguês</string>
-    <string name="lang_os">Osseta</string>
-    <string name="lang_eo">Esperanto</string>
-    <string name="restart_is_required">Para aplicar as alterações, é necessário reiniciar o aplicativo.</string>
-    <string name="rendering_attr_currentTrackColor_name">Cor do GPX</string>
-    <string name="rendering_attr_currentTrackWidth_name">Largura do GPX</string>
-    <string name="rendering_value_red_name">Vermelho</string>
-    <string name="rendering_value_translucent_red_name">Vermelho translúcido</string>
-    <string name="rendering_value_translucent_orange_name">Laranja translúcido</string>
-    <string name="rendering_value_yellow_name">Amarelo</string>
-    <string name="rendering_value_translucent_yellow_name">Amarelo translúcido</string>
-    <string name="rendering_value_lightgreen_name">Verde claro</string>
-    <string name="rendering_value_translucent_lightgreen_name">Verde claro translúcido</string>
-    <string name="rendering_value_green_name">Verde</string>
-    <string name="rendering_value_translucent_green_name">Verde translúcido</string>
-    <string name="rendering_value_lightblue_name">Azul claro</string>
-    <string name="rendering_value_translucent_lightblue_name">Azul claro translúcido</string>
-    <string name="rendering_value_blue_name">Azul</string>
-    <string name="rendering_value_translucent_blue_name">Azul translúcido</string>
-    <string name="rendering_value_purple_name">Roxo</string>
-    <string name="rendering_value_translucent_purple_name">Roxo translúcido</string>
-    <string name="rendering_value_default13_name">Predefinido (13)</string>
-	<string name="rendering_value_defaultTranslucentCyan_name">Predefinido (ciano translúcido)</string>
-    <string name="do_you_like_osmand">Você curte o OsmAnd?</string>
-	<string name="rate_this_app">Avalie este app</string>
-	<string name="rate_this_app_long">Por favor, avalie o OsmAnd no Google Play</string>
-	<string name="user_hates_app_get_feedback">Diga-nos porquê.</string>
-	<string name="user_hates_app_get_feedback_long">Por favor, nos diga o que quer mudar neste app.</string>
+<string name="choose_audio_stream">Saída para orientação por voz</string>
+<string name="choose_audio_stream_descr">Escolha o canal para orientação por voz.</string>
+<string name="voice_stream_voice_call">Áudio de chamada de voz (também para interromper os aparelhos de som BT do carro)</string>
+<string name="voice_stream_music">Áudio de mídia/música</string>
+<string name="warning_tile_layer_not_downloadable">O aplicativo não pode fazer o download da camada de mapa %1$s, a reinstalação pode ajudar.</string>
+<string name="overlay_transparency_descr">Modificar a transparência da camada superior.</string>
+<string name="overlay_transparency">Transparência da camada superior</string>
+<string name="map_transparency_descr">Modificar transparência do mapa base.</string>
+<string name="map_transparency">Transparência do mapa base</string>
+<string name="layer_underlay">Camada inferior…</string>
+<string name="map_underlay">Mapa da camada inferior</string>
+<string name="map_underlay_descr">Escolher mapa da camada inferior.</string>
+<string name="layer_overlay">Camada superior…</string>
+<string name="map_overlay">Mapa da camada superior</string>
+<string name="map_overlay_descr">Escolher mapa da camada superior.</string>
+<string name="tile_source_already_installed">Mapa já está instalado, as \'configurações\' serão atualizadas.</string>
+<string name="select_tile_source_to_install">Selecione os mapas (quadrículas) para instalar ou atualizar.</string>
+<string name="internet_not_available">Não é possível executar a operação sem uma conexão com a Internet.</string>
+<string name="install_more">Instalar mais…</string>
+<string name="level_to_switch_vector_raster_descr">Use mapas raster para qualquer coisa além desse nível.</string>
+<string name="level_to_switch_vector_raster">Mínimo nível de zoom vetorial</string>
 
-	<string name="download_live_updates">Atualizações ao vivo</string>
-	<string name="failed_to_upload">Falha no envio</string>
-	<string name="delete_change">Apagar mudança</string>
-	<string name="successfully_uploaded_pattern">Enviado com sucesso {0}/{1}</string>
-	<string name="try_again">Tentar novamente</string>
-	<string name="error_message_pattern">Erro: {0}</string>
+
+
+
+<string name="create_poi_link_to_osm_doc"><u>OSM on-line</u> classificação de mapa com imagens.</string>
+<string name="error_doing_search">Não foi possível realizar a pesquisa off-line.</string>
+<string name="system_locale">Sistema</string>
+<string name="preferred_locale_descr">Selecionar idioma de exibição (entra em vigor quando OsmAnd é reiniciado).</string>
+<string name="preferred_locale">Idioma de exibição</string>
+<string name="incomplete_locale">incompleto</string>
+
+
+
+
+<string name="unit_of_length_descr">Alterar unidades de distância e velocidade.</string>
+<string name="unit_of_length">Unidades de medida</string>
+<string name="si_mi_feet">Milhas/pés</string>
+<string name="si_mi_yard">Milhas/jardas</string>
+<string name="si_km_m">Quilômetros/metros</string>
+<string name="yard">yd</string>
+<string name="foot">ft</string>
+<string name="mile_per_hour">mph</string>
+<string name="mile">mi</string>
+<string name="send_location_way_choose_title">Compartilhar posição usando</string>
+<string name="send_location_sms_pattern">Posição: %1$s\n%2$s</string>
+<string name="context_menu_item_share_location">Compartilhar posição</string>
+<string name="add_waypoint_dialog_added">Ponto de trajeto GPX \'\'{0}\'\' adicionado</string>
+<string name="add_waypoint_dialog_title">Adicionar parada à trilha GPX gravada</string>
+<string name="context_menu_item_add_waypoint">Adicionar ponto GPX</string>
+<string name="amenity_type_administrative">Administrativo</string>
+<string name="amenity_type_barrier">Barreira</string>
+<string name="amenity_type_education">Educação</string>
+<string name="amenity_type_emergency">Emergência</string>
+<string name="amenity_type_entertainment">Entretenimento</string>
+<string name="amenity_type_finance">Finanças</string>
+<string name="amenity_type_geocache">Cache geográfico</string>
+<string name="amenity_type_healthcare">Saúde</string>
+<string name="amenity_type_historic">Histórico</string>
+<string name="amenity_type_landuse">Uso da terra</string>
+<string name="amenity_type_leisure">Lazer</string>
+<string name="amenity_type_man_made">Construção humana</string>
+<string name="amenity_type_military">Militar</string>
+<string name="amenity_type_natural">Natureza</string>
+<string name="amenity_type_office">Escritório</string>
+<string name="amenity_type_other">Outro</string>
+<string name="amenity_type_shop">Loja</string>
+<string name="amenity_type_sport">Esporte</string>
+<string name="amenity_type_sustenance">Alimentação</string>
+<string name="amenity_type_tourism">Turismo</string>
+<string name="amenity_type_transportation">Transporte</string>
+<string name="indexing_address">Indexando endereço…</string>
+<string name="indexing_map">Indexando mapa…</string>
+<string name="indexing_poi">Indexando POI…</string>
+<string name="indexing_transport">Indexando transporte…</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">O formato obsoleto de mapa \'\'{0}\'\' não é suportado</string>
+<string name="poi_filter_closest_poi">POIs próximos</string>
+<string name="poi_filter_custom_filter">Filtro personalizado</string>
+<string name="reading_cached_tiles">Lendo quadrículas salvas…</string>
+<string name="version_index_is_big_for_memory">O índice \'\'{0}\'\' não coube na memória</string>
+<string name="version_index_is_not_supported">A versão do índice \'\'{0}\'\' não é suportada</string>
+
+
+<string name="osmand_routing_experimental">OsmAnd navegação offline é uma característica experimental e não funciona para distâncias maiores do que cerca de 20 km.
+\n
+\nNavegação temporariamente mudada para o serviço online CloudMade.</string>
+<string name="specified_dir_doesnt_exist">Não se pode encontrar o diretório especificado.</string>
+
+
+<string name="osmand_net_previously_installed">Todos os dados off-line no aplicativo antigo instalado serão suportados pelo novo, mas os pontos Favoritos devem ser exportados do aplicativo antigo e, em seguida, importados para o novo.</string>
+<string name="build_installed">Compilação {0} foi instalada ({1}).</string>
+<string name="downloading_build">Baixando compilação…</string>
+<string name="install_selected_build">Instalar o OsmAnd - {0} de {1} {2} MB \?</string>
+<string name="loading_builds_failed">Falha ao recuperar a lista de compilações do OsmAnd</string>
+<string name="loading_builds">Carregando compilações OsmAnd…</string>
+<string name="select_build_to_install">Selecionar uma compilação do OsmAnd para instalar</string>
+<string name="gps_status_app_not_found">Aplicativo de situação do GPS não está instalado. Pesquisar na loja de apps?</string>
+<string name="daynight_mode_day">Dia</string>
+<string name="daynight_mode_night">Noite</string>
+<string name="daynight_mode_sensor">Sensor de luz</string>
+<string name="daynight_descr">Definir regra para alternar entre o modo dia e noite.</string>
+<string name="daynight">Modo dia/noite</string>
+<string name="download_files_question">Baixar {0} arquivo(s) ({1} MB)?</string>
+<string name="items_were_selected">{0} elemento(s) selecionado(s)</string>
+<string name="filter_existing_indexes">Baixado</string>
+<string name="fast_route_mode">Rota mais rápida</string>
+<string name="fast_route_mode_descr">Ative para calcular a rota mais rápida ou desative para calcular a rota mais econômica.</string>
+<string name="tiles_to_download_estimated_size">No zoom {0}: baixar {1} imagens ({2} MB)</string>
+<string name="shared_string_download_map">Baixar mapa</string>
+<string name="select_max_zoom_preload_area">Selecionar zoom máximo para pré-carregar</string>
+<string name="maps_could_not_be_downloaded">Não é possível baixar este mapa</string>
+<string name="continuous_rendering">Renderização contínua</string>
+<string name="continuous_rendering_descr">Mostrar renderização contínua ao invés de imagem inteira de uma vez.</string>
+<string name="rendering_exception">Não foi possível desenhar a área selecionada</string>
+<string name="renderer_load_sucess">O renderizador foi carregado</string>
+<string name="renderer_load_exception">Não foi possível carregar o renderizador</string>
+<string name="renderers">Renderizador de vetor</string>
+<string name="renderers_descr">Escolha a aparência dos mapas vetoriais.</string>
+<string name="poi_context_menu_website">Mostrar site do POI</string>
+<string name="poi_context_menu_call">Mostrar o telefone do POI</string>
+<string name="download_type_to_filter">digite para filtrar</string>
+<string name="use_high_res_maps">Exibir em alta resolução</string>
+<string name="use_high_res_maps_descr">Não esticar (e borrar) quadrículas de mapas em telas de alta densidade.</string>
+<string name="context_menu_item_search_transport">Pesquisar transporte público</string>
+<string name="transport_searching_transport">Resultados de transporte (sem destino):</string>
+<string name="transport_searching_route">Resultados de transporte ({0} para o destino):</string>
+<string name="transport_search_again">Reiniciar pesquisa de transporte</string>
+<string name="voice">Voz gravada</string>
+<string name="voices">Instruções de voz</string>
+<string name="no_vector_map_loaded">Nenhum mapa vetorial foi carregado</string>
+
+<string name="gpx_files_not_found">Nenhum arquivo GPX encontrado no diretório de trilhas</string>
+<string name="layer_gpx_layer">Arquivos GPX…</string>
+<string name="error_reading_gpx">Não foi possível ler os dados do GPX</string>
+<string name="vector_data">Mapas vetoriais off-line</string>
+<string name="transport_context_menu">Pesquisar transporte na parada</string>
+
+<string name="poi_context_menu_modify">Modificar POI</string>
+<string name="poi_context_menu_delete">Apagar POI</string>
+<string name="rotate_map_compass_opt">Na direção da bússola</string>
+<string name="rotate_map_bearing_opt">Direção do movimento</string>
+<string name="rotate_map_none_opt">Não gire (o norte está para cima)</string>
+<string name="rotate_map_to_bearing_descr">Selecionar o alinhamento do mapa.</string>
+<string name="rotate_map_to_bearing">Orientação do mapa</string>
+<string name="show_route">Detalhes da rota</string>
+<string name="fav_imported_sucessfully">Favoritos importados</string>
+<string name="import_file_favourites">Salvar dados como arquivo GPX ou importar pontos para os \'Favoritos\'\?</string>
+<string name="fav_file_to_load_not_found">O arquivo GPX contendo os favoritos não foi encontrado em {0}</string>
+<string name="share_fav_subject">Favoritos compartilhados através do OsmAnd</string>
+<string name="error_occurred_loading_gpx">Não foi possível carregar o GPX</string>
+<string name="send_report">Enviar o relatório</string>
+<string name="none_region_found">Não foi possível encontrar nenhum mapa baixado no cartão de memória.</string>
+<string name="poi_namefinder_query_empty">Digite para encontrar um POI</string>
+<string name="any_poi">Todos</string>
+
+<string name="thanks_yandex_traffic">Obrigado à Yandex por fornecer informações de trânsito.</string>
+<string name="layer_yandex_traffic">Trânsito Yandex</string>
+<string name="layer_route">Rota</string>
+
+<string name="layer_poi">POI…</string>
+<string name="layer_map">Fonte de mapa…</string>
+<string name="menu_layers">Camadas de mapa</string>
+<string name="use_trackball_descr">Usar um dispositivo de trackball para mover o mapa.</string>
+<string name="use_trackball">Usar trackball</string>
+<string name="background_service_wait_int_descr">Define o maior tempo de espera permitido para cada correção de posição do plano de fundo.</string>
+<string name="background_service_wait_int">Tempo de espera para posicionamento</string>
+<string name="gps_provider">GPS</string>
+<string name="int_seconds">segundos</string>
+<string name="int_min">min.</string>
+<string name="background_service_int_descr">Definir intervalo de ativação usado pelo serviço em segundo plano.</string>
+<string name="background_service_provider_descr">Escolher o método de posição usado pelo serviço em segundo plano.</string>
+<string name="background_service_provider">Provedor de posição</string>
+<string name="background_router_service_descr">Monitorar sua posição enquanto a tela estiver desligada.</string>
+<string name="background_router_service">Executar em segundo plano</string>
+<string name="off_router_service_no_gps_available">O serviço em segundo plano exige a ativação de algum provedor de posição.</string>
+<string name="hide_poi_filter">Ocultar filtro</string>
+<string name="show_poi_filter">Mostrar filtro</string>
+<string name="search_poi_filter">Filtro</string>
+<string name="menu_mute_on">Som desligado</string>
+<string name="voice_data_not_supported">Versão de dados de voz sem suporte</string>
+<string name="voice_data_corrupted">Dados de voz corrompidos</string>
+<string name="voice_data_unavailable">Dados de voz selecionados indisponíveis</string>
+<string name="sd_mounted_ro">Cartão de memória é somente leitura.
+\nAgora só é possível ver o mapa pré-carregado, não baixar novas áreas.</string>
+<string name="unzipping_file">Descompactando arquivo…</string>
+<string name="route_tshl">Vire acentuadamente à esquerda e siga</string>
+<string name="route_tsll">Vire levemente à esquerda e siga</string>
+<string name="search_poi_location">Aguardando sinal…</string>
+<string name="search_near_map">Pesquisar próximo ao centro do mapa</string>
+<string name="search_nearby">Pesquisar nas proximidades</string>
+<string name="map_orientation_default">Mesma do aparelho</string>
+<string name="map_orientation_portrait">Vertical</string>
+<string name="map_orientation_landscape">Horizontal</string>
+<string name="transport_stop_to_go_out">Escolha parada de saída</string>
+<string name="transport_to_go_after">distância prévia</string>
+<string name="transport_to_go_before">distância seguinte</string>
+<string name="transport_stops_to_pass">paradas a passar</string>
+<string name="search_offline_geo_error">Não foi possível analisar o geo intent \'%s\'.</string>
+<string name="transport_route_distance">Distância do itinerário</string>
+<string name="transport">Transporte</string>
+<string name="show_transport_over_map_description">Mostrar paradas de transporte público no mapa.</string>
+<string name="poi_filter_namefinder">NameFinder on-line</string>
+<string name="show_transport_over_map">Mostrar paradas de transporte</string>
+<string name="hello">Aplicativo de navegação OsmAnd</string>
+<string name="update_poi_success">Dados de POI foram atualizados ({0} foram carregados)</string>
+<string name="update_poi_error_local">Não pôde atualizar a lista local de POIs</string>
+<string name="update_poi_error_loading">Não foi possível carregar dados do servidor</string>
+<string name="update_poi_no_offline_poi_index">Não há dados de POI off-line para esta região</string>
+<string name="update_poi_is_not_available_for_zoom">Aproximar zoom permite atualizar POIs</string>
+<string name="context_menu_item_update_poi">Atualizar POI</string>
+<string name="context_menu_item_update_map_confirm">Atualizar dados locais da Internet?</string>
+<string name="search_history_city">Cidade: {0}</string>
+<string name="search_history_street">Rua: {0}, {1}</string>
+<string name="search_history_int_streets">Interseção: {0} x {1} em {2}</string>
+<string name="search_history_building">Número: {0}, {1}, {2}</string>
+<string name="favorite">Favorito</string>
+<string name="uploading_data">Enviando dados…</string>
+<string name="uploading">Enviando…</string>
+<string name="search_nothing_found">Nada foi encontrado</string>
+<string name="searching">Pesquisando…</string>
+<string name="searching_address">Pesquisando endereço…</string>
+<string name="search_osm_nominatim">Pesquisa on-line usando OSM Nominatim</string>
+<string name="hint_search_online">Pesquisa on-line: número de porta, rua, cidade</string>
+<string name="search_offline_address">Pesquisa off-line</string>
+<string name="search_online_address">Pesquisa on-line</string>
+<string name="max_level_download_tile">Max. zoom on-line</string>
+<string name="max_level_download_tile_descr">Não procure blocos de mapas on-line para obter níveis de zoom além disso.</string>
+<string name="route_general_information">Distância total %1$s, tempo de viagem %2$d h %3$d min.</string>
+<string name="router_service_descr">Selecionar um serviço de navegação on-line ou off-line.</string>
+<string name="router_service">Serviço de navegação</string>
+<string name="sd_dir_not_accessible">O diretório de armazenamento de dados no cartão de memória não está acessível!</string>
+<string name="download_question">Baixar {0} - {1} ?</string>
+<string name="download_question_exist">Dados off-line para {0} já existem ({1}). Atualizá-los ({2}) \?</string>
+<string name="address">Endereço</string>
+<string name="downloading_list_indexes">Baixando lista de regiões disponíveis…</string>
+<string name="list_index_files_was_not_loaded">Não foi possível buscar a lista de regiões de osmand.net.</string>
+<string name="fav_points_edited">O favorito foi modificado</string>
+<string name="fav_points_not_exist">Não existe nenhum favorito</string>
+<string name="update_existing">Substituir</string>
+<string name="mark_final_location_first">Por favor, primeiro selecione o destino</string>
+<string name="opening_hours">Horário de funcionamento</string>
+<string name="opening_changeset">Abrindo conjunto de alterações…</string>
+<string name="closing_changeset">Fechando conjunto de alterações…</string>
+<string name="commiting_node">Enviando nó…</string>
+<string name="loading_poi_obj">Carregando POI…</string>
+<string name="auth_failed">Falha na autorização</string>
+<string name="failed_op">Falhou</string>
+<string name="converting_names">Convertendo nomes nativos/ingleses…</string>
+<string name="loading_streets_buildings">Carregando ruas/edifícios…</string>
+<string name="loading_postcodes">Carregando códigos postais…</string>
+<string name="loading_streets">Carregando ruas…</string>
+<string name="loading_cities">Carregando cidades…</string>
+<string name="poi">POI</string>
+<string name="error_occurred_saving_gpx">Não foi possível salvar o arquivo GPX</string>
+<string name="error_calculating_route">Não foi possível calcular a rota</string>
+<string name="error_calculating_route_occured">Não foi possível calcular a rota</string>
+<string name="empty_route_calculated">A rota calculada está vazia</string>					
+<string name="new_route_calculated_dist">Nova rota calculada, distância</string>
+<string name="arrived_at_destination">Você chegou no seu destino</string>
+<string name="invalid_locations">Coordenadas inválidas</string>
+<string name="go_back_to_osmand">Voltar ao mapa do OsmAnd</string>
+<string name="loading_data">Carregando dados…</string>
+<string name="reading_indexes">Lendo dados locais…</string>
+<string name="previous_run_crashed">A última execução do OsmAnd falhou. O arquivo de log está em {0}. Por favor, informe o problema e inclua o arquivo de log.</string>
+<string name="saving_gpx_tracks">Salvando o arquivo GPX…</string>
+<string name="finished_task">Concluído</string>
+<string name="use_online_routing_descr">Usar a Internet para calcular a rota.</string>
+<string name="use_online_routing">Usar a navegação on-line</string>
+<string name="osm_settings_descr">Especificar configurações de OpenStreetMap.org (OSM) necessárias para envios ao OSM.</string>
+<string name="data_settings_descr">Especificar o idioma, baixar/atualizar dados.</string>
+<string name="data_settings">Dados</string>
+<string name="additional_settings">Configurações adicionais</string>
+<string name="update_tile">Atualizar mapa</string>
+<string name="reload_tile">Atualizar quadrículas</string>
+<string name="mark_point">Destino</string>
+<string name="app_settings">Configurações do aplicativo</string>
+<string name="search_address">Pesquisar endereço</string>
+<string name="choose_building">Escolher número</string>
+<string name="choose_street">Escolher rua</string>
+<string name="choose_city">Escolher cidade ou código postal</string>
+<string name="ChooseCountry">Escolher país</string>
+<string name="show_view_angle">Mostrar ângulo de visão</string>
+<string name="map_view_3d_descr">Ativar a visualização em 3D do mapa.</string>
+<string name="map_view_3d">Visão em 3D</string>
+<string name="map_tile_source_descr">Escolher a fonte de mapa on-line ou de quadrículas salvas.</string>
+<string name="map_tile_source">Fonte do mapa de quadrículas</string>
+<string name="map_source">Fonte do mapa</string>
+<string name="use_internet">Usar a Internet</string>
+<string name="show_location">Mostrar sua posição</string>
+<string name="show_gps_coordinates_text">Mostrar coordenadas GPS no mapa</string>
+<string name="use_internet_to_download_tile">Baixar quadrículas que faltam no mapa</string>
+<string name="app_description">Aplicativo de navegação</string>
+<string name="search_button">Pesquisar</string>
+<string name="search_activity">Pesquisar</string>
+<string name="searchpoi_activity">Escolher POI</string>
+<string name="search_POI_level_btn">Encontrar mais</string>
+<string name="incremental_search_street">Pesquisar rua incrementalmente</string>
+<string name="incremental_search_building">Pesquisar número incrementalmente</string>
+<string name="choose_available_region">Escolher região da lista</string>
+<string name="choose_intersected_street">Escolher rua transversal</string>
+<string name="Closest_Amenities">Lugares próximos</string>
+<string name="app_mode_car">Carro</string>
+<string name="app_mode_bicycle">Bicicleta</string>
+<string name="app_mode_pedestrian">A pé</string>
+<string name="position_on_map_center">Centro</string>
+<string name="position_on_map_bottom">Embaixo</string>
+<string name="navigate_point_top_text">Insira a latitude e longitude no formato selecionado (G - graus, M - minutos, S - segundos)</string>
+<string name="navigate_point_latitude">Latitude</string>
+<string name="navigate_point_longitude">Longitude</string>
+<string name="navigate_point_format_D">GGG.GG</string>
+<string name="navigate_point_format_DM">GGG MM.MM</string>
+<string name="navigate_point_format_DMS">GGG MM SS.SS</string>
+<string name="search_address_top_text">Escolher endereço</string>
+<string name="search_address_region">País</string>
+<string name="search_address_city">Cidade</string>
+<string name="search_address_street">Rua</string>
+<string name="search_address_building">Número</string>
+<string name="search_address_building_option">Número</string>
+<string name="search_address_street_option">Rua transversal</string>
+
+<string name="context_menu_item_update_map">Atualizar mapa</string>
+<string name="context_menu_item_create_poi">Criar POI</string>
+<string name="add_favorite_dialog_top_text">Digite o nome do favorito</string>
+<string name="add_favorite_dialog_default_favourite_name">Favorito</string>
+<string name="add_favorite_dialog_favourite_added_template">O ponto \'\'{0}\'\' foi adicionado aos favoritos.</string>
+<string name="favourites_context_menu_edit">Modificar favorito</string>
+<string name="favourites_context_menu_delete">Apagar favorito</string>
+<string name="favourites_remove_dialog_msg">Apagar ponto favorito \'%s\'?</string>
+<string name="favourites_remove_dialog_success">Ponto favorito {0} excluído.</string>
+
+
+
+<string name="osb_author_dialog_password">Senha do OSM (opcional)</string>
+
+<string name="osb_comment_dialog_message">Mensagem</string>
+<string name="osb_comment_dialog_author">Autor</string>
+
+
+<string name="osb_comment_dialog_success">Comentário adicionado</string>
+<string name="osb_comment_dialog_error">Não foi possível adicionar comentário</string>
+
+
+
+
+
+<string name="poi_create_title">Criar POI</string>
+<string name="poi_error_poi_not_found">Nó não pode ser encontrado ou POI não é um único nó</string>
+<string name="poi_remove_confirm_template">Apagar {0} (comentário)\?</string>
+<string name="poi_remove_title">Apagar POI</string>
+<string name="poi_remove_success">POI excluído</string>
+<string name="poi_action_add">adicionar</string>
+<string name="poi_action_change">modificar</string>
+<string name="poi_action_succeded_template">Ação {0} bem sucedida.</string>
+<string name="poi_error_unexpected_template">Não foi possível executar a ação {0}.</string>
+<string name="poi_error_io_error_template">Erro de entrada/saída na execução da ação {0}.</string>
+<string name="poi_error_info_not_loaded">As informações sobre o ponto não foram carregadas</string>
+<string name="poi_dialog_opening_hours">Aberto</string>
+<string name="poi_dialog_comment">Comentário</string>
+<string name="poi_dialog_comment_default">Alterando POI</string>
+<string name="poi_dialog_other_tags_message">Todos os outros valores serão preservados</string>
+<string name="default_buttons_commit">Enviar</string>
+<string name="filter_current_poiButton">Filtro</string>
+<string name="edit_filter_save_as_menu_item">Salvar como</string>
+<string name="edit_filter_delete_dialog_title">Apagar filtro selecionado?</string>
+<string name="edit_filter_delete_message">Filtro {0} foi excluído</string>
+<string name="edit_filter_create_message">Filtro {0} foi criado</string>
+<string name="email">e-mail</string>
+<string name="av_camera_focus">Tipo de foco da câmera</string>
+<string name="av_camera_focus_descr">Selecionar o modo de foco da câmera interna.</string>
+<string name="av_camera_focus_auto">Foco automático</string>
+<string name="av_camera_focus_hiperfocal">Foco hiperfocal</string>
+<string name="av_camera_focus_edof">Profundidade de visão estendida (EDOF)</string>
+<string name="av_camera_focus_infinity">Foco no infinito</string>
+<string name="av_camera_focus_macro">Foco macro (close-up)</string>
+<string name="av_camera_focus_continuous">A câmera tenta focar continuamente</string>
+<string name="av_photo_play_sound">Som ao fotografar</string>
+<string name="av_photo_play_sound_descr">Escolher se tocará som quando tirar fotos.</string>
+<string name="av_camera_pic_size">Tamanho da foto</string>
+<string name="av_camera_pic_size_descr">Selecionar tamanho de imagem da foto.</string>
+<string name="navigation_intent_invalid">Formato inválido: %s</string>
+<string name="plugin_description_title">Descrição</string>
+<string name="plugin_install_needs_network">Você precisa estar conectado à Internet para instalar este plugin.</string>
+<string name="get_plugin">Obter</string>
+
+
+
+
+<string name="shared_string_logoff">Desconectar</string>
+
+<string name="routing_attr_avoid_borders_description">Evitar cruzar fronteiras nacionais</string>
+<string name="routing_attr_height_name">Limite de altura</string>
+<string name="routing_attr_height_description">Especifique a altura permitida do veículo nas rotas.</string>
+<string name="use_fast_recalculation">Recálculo de rota inteligente</string>
+<string name="use_fast_recalculation_desc">Recalcular apenas a parte inicial da rota para viagens longas.</string>
+<string name="rendering_value_disabled_name">Desativado</string>
+<string name="rendering_value_walkingRoutesScopeOSMC_name">Cor por afiliação da rede</string>
+<string name="rendering_value_walkingRoutesOSMC_name">Colorir conforme símbolo de caminhadas OSMC</string>
+<string name="osm_edit_context_menu_delete">Apagar edição no OSM</string>
+<string name="shared_string_show_details">Mostrar detalhes</string>
+<string name="read_full_article">Leia o artigo completo (on-line)</string>
+<string name="shared_string_wikipedia">Wikipédia</string>
+<string name="local_indexes_cat_wiki">Wikipédia</string>
+<string name="download_wikipedia_maps">Wikipédia</string>
+<string name="shared_string_import2osmand">Importar para OsmAnd</string>
+<string name="local_recordings_delete_all_confirm">Você vai apagar %1$d notas. Tem certeza?</string>
+<string name="disable_recording_once_app_killed">Impedir o registro autônomo</string>
+<string name="gps_network_not_enabled">Serviço de localização não ativado. Quer ligá-lo\?</string>
+<string name="disable_recording_once_app_killed_descrp">Pausará o registro de GPX após o encerramento do app (via apps recentes). (Indicação de OsmAnd em segundo plano desaparecerá da barra de notificação do Android.)</string>
+<string name="archive_wikipedia_data">Você tem dados da Wikipédia antigos e incompatíveis. Quer arquivá-los\?</string>
+<string name="download_wikipedia_files">Baixar dados adicionais da Wikipédia (%1$s MB)\?</string>
+<string name="lang_vo">Volapuque</string>
+<string name="lang_th">Tailandês</string>
+<string name="lang_te">Telugu</string>
+<string name="lang_nn">Norueguês Nynorsk</string>
+<string name="lang_new">Neuari / Nepalbhasa</string>
+<string name="lang_ms">Malásio</string>
+<string name="lang_ht">Haitiano</string>
+<string name="lang_gl">Galego</string>
+<string name="lang_et">Estoniano</string>
+<string name="lang_ceb">Cebuano</string>
+<string name="lang_es_ar">Espanhol Argentino</string>
+<string name="lang_nb">Norueguês Bokmål</string>
+<string name="light_theme">Claro</string>
+<string name="dark_theme">Escuro</string>
+<string name="lang_pms">Piemontês</string>
+<string name="lang_bn">Bengali</string>
+<string name="lang_tl">Tagalo</string>
+<string name="lang_sh">Servo-croata</string>
+<string name="lang_az">Azeri</string>
+<string name="lang_br">Bretão</string>
+<string name="lang_sq">Albanês</string>
+<string name="lang_is">Islandês</string>
+<string name="lang_bpy">Bishnupriya Manipuri</string>
+<string name="lang_nv">Navajo</string>
+<string name="lang_ga">Irlandês</string>
+<string name="lang_la">Latim</string>
+<string name="lang_ku">Curdo</string>
+<string name="lang_ta">Tâmil</string>
+<string name="lang_ml">Malaiala</string>
+<string name="lang_lb">Luxemburguês</string>
+<string name="lang_os">Osseta</string>
+<string name="lang_eo">Esperanto</string>
+<string name="restart_is_required">Reinicie o aplicativo para aplicar todas as alterações.</string>
+<string name="rendering_attr_currentTrackColor_name">Cor do GPX</string>
+<string name="rendering_attr_currentTrackWidth_name">Largura do GPX</string>
+<string name="rendering_value_red_name">Vermelho</string>
+<string name="rendering_value_translucent_red_name">Vermelho translúcido</string>
+<string name="rendering_value_translucent_orange_name">Laranja translúcido</string>
+<string name="rendering_value_yellow_name">Amarelo</string>
+<string name="rendering_value_translucent_yellow_name">Amarelo translúcido</string>
+<string name="rendering_value_lightgreen_name">Verde claro</string>
+<string name="rendering_value_translucent_lightgreen_name">Verde claro translúcido</string>
+<string name="rendering_value_green_name">Verde</string>
+<string name="rendering_value_translucent_green_name">Verde translúcido</string>
+<string name="rendering_value_lightblue_name">Azul claro</string>
+<string name="rendering_value_translucent_lightblue_name">Azul claro translúcido</string>
+<string name="rendering_value_blue_name">Azul</string>
+<string name="rendering_value_translucent_blue_name">Azul translúcido</string>
+<string name="rendering_value_purple_name">Roxo</string>
+<string name="rendering_value_translucent_purple_name">Roxo translúcido</string>
+<string name="rendering_value_default13_name">Predefinido (13)</string>
+<string name="rendering_value_defaultTranslucentCyan_name">Predefinido (ciano translúcido)</string>
+<string name="do_you_like_osmand">Você curte o OsmAnd?</string>
+<string name="rate_this_app">Avalie este app</string>
+<string name="rate_this_app_long">Por favor, avalie o OsmAnd no Google Play</string>
+<string name="user_hates_app_get_feedback">Diga-nos porquê.</string>
+<string name="user_hates_app_get_feedback_long">Por favor, nos diga o que quer mudar neste app.</string>
+
+<string name="download_live_updates">Atualizações ao vivo</string>
+<string name="failed_to_upload">Falha no envio</string>
+<string name="delete_change">Apagar mudança</string>
+<string name="successfully_uploaded_pattern">Enviado {0}/{1}</string>
+<string name="try_again">Tentar novamente</string>
+<string name="error_message_pattern">Erro: {0}</string>
 <string name="no_updates_available">Não há atualizações disponíveis</string>
-    <string name="we_really_care_about_your_opinion">A sua opinião e o seu comentário são importantes para nós.</string>
-	<string name="rendering_value_boldOutline_name">Títulos com contornos</string>
-    <string name="traffic_warning_hazard">Perigo</string>
-    <string name="dahboard_options_dialog_title">Configurar o painel de controle</string>
-	<string name="shared_string_card_was_hidden">Cartão estava escondido</string>
-	<string name="shared_string_undo">Desfazer</string>
-	<string name="shared_string_skip">Pular</string>
-	<string name="app_name_osmand">OsmAnd</string>
-	<string name="offline_maps_and_navigation">Mapas &amp; Navegação\nOffline</string>
+<string name="we_really_care_about_your_opinion">A sua opinião e o seu comentário são importantes para nós.</string>
+<string name="rendering_value_boldOutline_name">Títulos com contornos</string>
+<string name="traffic_warning_hazard">Perigo</string>
+<string name="dahboard_options_dialog_title">Configurar o painel de controle</string>
+<string name="shared_string_card_was_hidden">Cartão estava escondido</string>
+<string name="shared_string_undo">Desfazer</string>
+<string name="shared_string_skip">Pular</string>
+<string name="app_name_osmand">OsmAnd</string>
+<string name="offline_maps_and_navigation">Mapas &amp; Navegação\nOffline</string>
 <string name="commit_poi">Enviar POI</string>
 <string name="routing_attr_avoid_shuttle_train_name">Evitar transporte por trem</string>
-	<string name="routing_attr_avoid_shuttle_train_description">Evitar transporte por trem</string>
-    <string name="plugin_settings">Complementos</string>
-	<string name="tab_title_basic">Básico</string>
-	<string name="tab_title_advanced">Estendido</string>
-	<string name="building_number">Número de edifício</string>
-	<string name="next_proceed">Próximo</string>
-	<string name="opening_at">Abre às</string>
-	<string name="closing_at">Fecha às</string>
+<string name="routing_attr_avoid_shuttle_train_description">Evitar trem de conexão</string>
+<string name="plugin_settings">Complementos</string>
+<string name="tab_title_basic">Básico</string>
+<string name="tab_title_advanced">Estendido</string>
+<string name="building_number">Número de edifício</string>
+<string name="next_proceed">Próximo</string>
+<string name="opening_at">Abre às</string>
+<string name="closing_at">Fecha às</string>
 <string name="av_locations_descr">Arquivo GPX com notas de posição.</string>
-    <string name="av_locations">Posições</string>
-    
-	<string name="contact_info">Informações de contato</string>
-	<string name="description">Descrição</string>
-	<string name="add_opening_hours">Adicionar horário de funcionamento</string>
-	<string name="poi_dialog_poi_type">Tipo de POI</string>
-	<string name="number_of_rows_in_dash">Número de linhas no traço de %1$s</string>
+<string name="av_locations">Posições</string>
 
-	<string name="please_specify_poi_type">Por favor, especifique tipo de POI.</string>
+<string name="contact_info">Informações de contato</string>
+<string name="description">Descrição</string>
+<string name="add_opening_hours">Adicionar horário de funcionamento</string>
+<string name="poi_dialog_poi_type">Tipo de POI</string>
+<string name="number_of_rows_in_dash">Número de linhas no traço de %1$s</string>
+
+<string name="please_specify_poi_type">Por favor, especifique tipo de POI.</string>
 <string name="working_days">Dias úteis</string>
-	<string name="recent_places">Lugares recentes</string>
-	<string name="favourites">Favoritos</string>
+<string name="recent_places">Lugares recentes</string>
+<string name="favourites">Favoritos</string>
 <string name="poi_action_delete">apagar</string>
-	<string name="saved_at_time">Salvo com sucesso em: %1$s</string>
+<string name="saved_at_time">Salvo em: %1$s</string>
 <string name="poi_deleted_localy">POI será excluído quando você enviar suas alterações</string>
-	<string name="show_gpx">Mostrar GPX</string>
-    <string name="show_on_start">Mostrar no início</string>
-	<string name="count_of_lines">Número de linhas</string>
+<string name="show_gpx">Mostrar dados GPX</string>
+<string name="show_on_start">Mostrar no início</string>
+<string name="count_of_lines">Número de linhas</string>
 <string name="are_you_sure">Tem certeza?</string>
-	<string name="unsaved_changes_will_be_lost">Quaisquer alterações não salvas serão perdidas. Continuar?</string>
+<string name="unsaved_changes_will_be_lost">Quaisquer alterações não salvas serão perdidas. Continuar?</string>
 <string name="shared_string_update">Atualizar</string>
-    
-    
-    
-    <string name="shared_string_upload">Enviar</string>
-    <string name="osm_edit_created_poi">POI OSM criado</string>
-    
-    <string name="shared_string_qr_code">QR-code</string>
-    <string name="map_downloaded">Mapa baixado</string>
-    <string name="please_specify_poi_type_only_from_list">Especifique o tipo correto de POI ou ignore.</string>
-    <string name="access_from_map">Acessar a partir do mapa</string>
-    <string name="show_on_start_description">\'Desligado\' lança diretamente para a tela do mapa.</string>
-    <string name="copied_to_clipboard">Copiado para a área de transferência</string>
-    
-    <string name="access_from_map_description">O botão menu abre o painel de controle, não o menu.</string>
-    <string name="osm_save_offline">Salvar offline</string>
-    <string name="osm_edit_modified_poi">POI no OSM modificado</string>
-    <string name="osm_edit_deleted_poi">POI no OSM excluído</string>
-    <string name="context_menu_item_open_note">Abrir nota no OSM</string>
-    <string name="osm_edit_reopened_note">Nota no OSM reaberta</string>
-    <string name="osm_edit_commented_note">Nota no OSM comentada</string>
-    <string name="osm_edit_removed_note">Nota no OSM excluído</string>
-	<string name="osm_edit_created_note">Nota no OSM criada</string>
-	<string name="osn_bug_name">Nota no OSM</string>
-	<string name="osn_add_dialog_title">Criar nota</string>
-	<string name="osn_comment_dialog_title">Adicionar comentário</string>
-	<string name="osn_reopen_dialog_title">Reabrir nota</string>
-	<string name="osn_close_dialog_title">Fechar nota</string>
-	<string name="osn_add_dialog_success">Nota criada com sucesso</string>
-	<string name="osn_add_dialog_error">Erro: nota não foi criada</string>
-	<string name="osn_close_dialog_success">Nota foi fechada com sucesso</string>
-	<string name="osn_close_dialog_error">Erro: nota não foi fechada</string>
-	<string name="shared_string_commit">Enviar</string>
-	
-    <string name="context_menu_item_delete_waypoint">Apagar marco de trajeto GPX?</string>
-    <string name="context_menu_item_edit_waypoint">Editar marco de trajeto GPX</string>
-    <string name="shared_string_location">Posição</string>
-    <string name="share_osm_edits_subject">Edições no OSM compartilhadas via OsmAnd</string>
-    <string name="lang_nds">Baixo-alemão</string>
-    <string name="lang_mk">Macedônio</string>
-    <string name="lang_als">Albanês (Tosco)</string>
-    <string name="read_more">Ler mais</string>
-    <string name="whats_new">O que há de novo</string>
-    <string name="rendering_attr_hideProposed_name">Objetos propostos</string>
-    <string name="world_map_download_descr">Mapa-base mundial (abrangendo o mundo inteiro em pequenos zooms) está faltando ou desatualizado. Por favor, considere baixá-lo para uma visão global.</string>
-    <string name="map_downloaded_descr">Agora você pode usar o mapa baixado %1$s.</string>
-    <string name="go_to_map">Exibir o mapa</string>
-    <string name="simulate_initial_startup_descr">Define o sinalizador indicando a primeira inicialização do app, mantém todas as outras configurações inalteradas.</string>
-    <string name="simulate_initial_startup">Simular primeiro início do app</string>
-    <string name="share_geo">geo:</string>
-    <string name="share_menu_location">Compartilhar posição</string>
-    <string name="shared_string_send">Enviar</string>
-    <string name="favorite_category_dublicate_message">O nome da categoria escolhido já existe. Por favor, defina outro nome.</string>
-    <string name="favorite_category_name">Nome da categoria</string>
-    <string name="favorite_category_add_new_title">Adicionar nova categoria</string>
-    <string name="regions">Regiões</string>
-    <string name="world_maps">Mapas mundiais</string>
-    <string name="hillshade_layer_disabled">Camada de sombras de relevo desativada</string>
-    <string name="region_maps">Mapas regionais</string>
-    <string name="srtm_plugin_disabled">Curvas de nível desativadas</string>
-    <string name="favorite_category_add_new">Adicionar novo</string>
-    <string name="favorite_category_select">Selecione categoria</string>
-    <string name="default_speed_system_descr">Defina a unidade de velocidade.</string>
-    <string name="default_speed_system">Unidade de velocidade</string>
-    <string name="nm">mn</string>
-    <string name="si_nm">Milhas náuticas</string>
-    <string name="si_kmh">Quilômetros por hora</string>
-    <string name="si_mph">Milhas por hora</string>
-    <string name="si_m_s">Metros por segundo</string>
-    <string name="si_min_km">Minutos por quilômetro</string>
-    <string name="si_min_m">Minutos por milha</string>
-    <string name="si_nm_h">Milhas náuticas por hora (nó)</string>
-    <string name="nm_h">mn/h</string>
-    <string name="min_mile">min/m</string>
-    <string name="min_km">min/km</string>
-    <string name="m_s">m/s</string>
-    <string name="shared_string_trip_recording">Gravação de viagem</string>
-    <string name="shared_string_navigation">Navegação</string>
-    <string name="osmand_running_in_background">Rodando em segundo plano</string>
-    <string name="lang_fy">Frisão</string>
-    <string name="favourites_edit_dialog_title">Informação do Favorito</string>
-    <string name="simulate_your_location_stop_descr">Parar de simular sua posição.</string>
-    <string name="simulate_your_location_descr">Simular a sua posição usando uma rota calculada ou uma trilha GPX gravada.</string>
-    <string name="rendering_attr_currentTrackColor_description">Cor do GPX</string>
-    <string name="rendering_attr_currentTrackWidth_description">Largura do GPX</string>
-    <string name="rendering_attr_roadStyle_description">Estilo das vias</string>
-    <string name="routing_attr_avoid_stairs_name">Evitar escadas</string>
-	<string name="routing_attr_avoid_stairs_description">Evitar passar por escadas</string>
-	<string name="routing_attr_avoid_borders_name">Evitar passagem por fronteira</string>
-	<string name="favourites_context_menu_add">Adicionar favorito</string>
-	<string name="poi_dialog_reopen">Reabrir</string>
-	<string name="downloads_left_template">%1$s transferências restantes</string>
-	<string name="roads">Vias</string>
-    <string name="downloading_number_of_files">Baixando - %1$d arquivo</string>
-    <string name="show_free_version_banner">Mostrar banner da versão gratuita</string>
-    <string name="show_free_version_banner_description">Mesmo se você tem a versão paga você ainda pode ver o banner da versão gratuita</string>
-    <string name="buy">COMPRAR</string>
-    <string name="activate_seamarks_plugin">Favor ativar o plugin \'Mapa náutico\'</string>
-    <string name="activate_srtm_plugin">Favor ativar o plugin \'Curvas de nível\'</string>
-    <string name="later">Depois</string>
-    <string name="get_full_version">Versão completa</string>
-    <string name="downloads">Transferências</string>
-    <string name="confirm_download_roadmaps">Tem certeza que deseja baixar o mapa apenas de estradas, mesmo que você já tenha o mapa padrão (completo)?</string>
-    <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
-    <string name="file_size_in_mb">%.1f MB</string>
-    <string name="update_all">Atualizar tudo (%1$s MB)</string>
-    <string name="free_downloads_used">Transferências gratuitas usadas</string>
-    <string name="free_downloads_used_description">Exibe as transferências gratuitas usadas</string>
 
-    <string name="application_dir_description">Escolha onde deseja salvar os arquivos de mapa.</string>
-    
-    <string name="enter_country_name">Insira o nome do país</string>
-    <string name="new_version">Nova versão</string>
-    <string name="begin_with_osmand_menu_group">Primeiros passos com OsmAnd</string>
-    <string name="features_menu_group">Recursos</string>
-    <string name="help_us_to_improve_menu_group">Ajude-nos a melhorar o OsmAnd</string>
-    <string name="other_menu_group">Outros</string>
-    <string name="plugins_menu_group">Complementos</string>
-    <string name="first_usage_item">Primeiro uso</string>
-    <string name="first_usage_item_description">Como baixar mapas, defina as configurações básicas</string>
-    <string name="navigation_item_description">Configurar a navegação</string>
-    <string name="planning_trip_item">Planejando uma viagem</string>
-    <string name="faq_item">Perguntas frequentes</string>
-    <string name="faq_item_description">Respotas às perguntas frequentes</string>
-    <string name="map_viewing_item">Visualização de mapa</string>
-    <string name="search_on_the_map_item">Pesquisa no mapa</string>
-    <string name="instalation_troubleshooting_item">Instalação e solução de problemas</string>
-    <string name="techical_articles_item">Artigos técnicos</string>
-    <string name="versions_item">Versões</string>
-    <string name="feedback">Comente</string>
-    <string name="contact_us">Fale conosco</string>
-    <string name="map_legend">Legenda do mapa</string>
-    <string name="save_poi_without_poi_type_message">Você realmente quer salvar o POI sem especificar o tipo?</string>
-    <string name="poi_context_menu_modify_osm_change">Modificar alteração no OSM</string>
-    <string name="use_dashboard_btn">Usar painel de controle</string>
-    <string name="use_drawer_btn">Usar menu</string>
-    <string name="dashboard_or_drawer_title">Controle pelo painel ou menu</string>
-    <string name="dashboard_or_drawer_description">Há uma nova opção para controlar principalmente o app via painel de controle flexível ou um menu estático. Sua escolha sempre pode ser alterada nas configurações do painel de controle.</string>
+
+
+<string name="shared_string_upload">Enviar</string>
+<string name="osm_edit_created_poi">POI OSM criado</string>
+
+<string name="shared_string_qr_code">Código QR</string>
+<string name="map_downloaded">Mapa baixado</string>
+<string name="please_specify_poi_type_only_from_list">Especifique o tipo correto de POI ou ignore.</string>
+<string name="access_from_map">Acessar a partir do mapa</string>
+<string name="show_on_start_description">\'Desligado\' lança diretamente para a tela do mapa.</string>
+<string name="copied_to_clipboard">Copiado para a área de transferência</string>
+
+<string name="access_from_map_description">O botão menu inicia o painel, não em vez do menu</string>
+<string name="osm_save_offline">Salvar offline</string>
+<string name="osm_edit_modified_poi">POI no OSM modificado</string>
+<string name="osm_edit_deleted_poi">POI no OSM excluído</string>
+<string name="context_menu_item_open_note">Abrir nota no OSM</string>
+<string name="osm_edit_reopened_note">Nota no OSM reaberta</string>
+<string name="osm_edit_commented_note">Nota no OSM comentada</string>
+<string name="osm_edit_removed_note">Nota no OSM excluído</string>
+<string name="osm_edit_created_note">Nota no OSM criada</string>
+<string name="osn_bug_name">Nota no OSM</string>
+<string name="osn_add_dialog_title">Criar nota</string>
+<string name="osn_comment_dialog_title">Adicionar comentário</string>
+<string name="osn_reopen_dialog_title">Reabrir nota</string>
+<string name="osn_close_dialog_title">Fechar nota</string>
+<string name="osn_add_dialog_success">Nota criada</string>
+<string name="osn_add_dialog_error">Não se pôde criar nota</string>
+<string name="osn_close_dialog_success">Nota fechada</string>
+<string name="osn_close_dialog_error">Não se pôde fechar a nota</string>
+<string name="shared_string_commit">Enviar</string>
+
+<string name="context_menu_item_delete_waypoint">Apagar ponto de trajeto GPX\?</string>
+<string name="context_menu_item_edit_waypoint">Editar ponto de trajeto GPX</string>
+<string name="shared_string_location">Posição</string>
+<string name="share_osm_edits_subject">Edições no OSM compartilhadas via OsmAnd</string>
+<string name="lang_nds">Baixo-alemão</string>
+<string name="lang_mk">Macedônio</string>
+<string name="lang_als">Albanês (Tosco)</string>
+<string name="read_more">Ler mais</string>
+<string name="whats_new">O que há de novo</string>
+<string name="rendering_attr_hideProposed_name">Objetos propostos</string>
+<string name="world_map_download_descr">Mapa-base mundial (abrangendo o mundo inteiro em baixo nível de zoom) está faltando ou desatualizado. Por favor, considere baixá-lo para uma visão global.</string>
+<string name="map_downloaded_descr">O mapa %1$s está pronto para usar.</string>
+<string name="go_to_map">Exibir mapa</string>
+<string name="simulate_initial_startup_descr">Define o sinalizador indicando a primeira inicialização do app, mantém todas as outras configurações inalteradas.</string>
+<string name="simulate_initial_startup">Simular primeiro início do app</string>
+<string name="share_geo">geo:</string>
+<string name="share_menu_location">Compartilhar posição</string>
+<string name="shared_string_send">Enviar</string>
+<string name="favorite_category_dublicate_message">Por favor, use um nome de categoria que ainda não existe.</string>
+<string name="favorite_category_name">Nome da categoria</string>
+<string name="favorite_category_add_new_title">Adicionar nova categoria</string>
+<string name="regions">Regiões</string>
+<string name="world_maps">Mapas mundiais</string>
+<string name="hillshade_layer_disabled">Camada de sombras de relevo desativada</string>
+<string name="region_maps">Mapas regionais</string>
+<string name="srtm_plugin_disabled">Curvas de nível desativadas</string>
+<string name="favorite_category_add_new">Adicionar novo</string>
+<string name="favorite_category_select">Selecione categoria</string>
+<string name="default_speed_system_descr">Defina a unidade de velocidade.</string>
+<string name="default_speed_system">Unidade de velocidade</string>
+<string name="nm">mn</string>
+<string name="si_nm">Milhas náuticas</string>
+<string name="si_kmh">Quilômetros por hora</string>
+<string name="si_mph">Milhas por hora</string>
+<string name="si_m_s">Metros por segundo</string>
+<string name="si_min_km">Minutos por quilômetro</string>
+<string name="si_min_m">Minutos por milha</string>
+<string name="si_nm_h">Milhas náuticas por hora (nós)</string>
+<string name="nm_h">kn</string>
+<string name="min_mile">min/m</string>
+<string name="min_km">min/km</string>
+<string name="m_s">m/s</string>
+<string name="shared_string_trip_recording">Gravação de viagem</string>
+<string name="shared_string_navigation">Navegação</string>
+<string name="osmand_running_in_background">Rodar em segundo plano</string>
+<string name="lang_fy">Frisão</string>
+<string name="favourites_edit_dialog_title">Informação do Favorito</string>
+<string name="simulate_your_location_stop_descr">Parar de simular sua posição.</string>
+<string name="simulate_your_location_descr">Simular a sua posição usando uma rota calculada ou uma trilha GPX gravada.</string>
+<string name="rendering_attr_currentTrackColor_description">Cor do GPX</string>
+<string name="rendering_attr_currentTrackWidth_description">Largura do GPX</string>
+<string name="rendering_attr_roadStyle_description">Estilo das vias</string>
+<string name="routing_attr_avoid_stairs_name">Evitar escadas</string>
+<string name="routing_attr_avoid_stairs_description">Evitar passar por escadas</string>
+<string name="routing_attr_avoid_borders_name">Evitar passagem por fronteira</string>
+<string name="favourites_context_menu_add">Adicionar favorito</string>
+<string name="poi_dialog_reopen">Reabrir</string>
+<string name="downloads_left_template">%1$s transferências restantes</string>
+<string name="roads">Vias</string>
+<string name="downloading_number_of_files">Baixando - %1$d arquivo</string>
+<string name="show_free_version_banner">Mostrar banner da versão gratuita</string>
+<string name="show_free_version_banner_description">Mesmo se você tem a versão paga você ainda pode ver o banner da versão gratuita.</string>
+<string name="buy">Comprar</string>
+<string name="activate_seamarks_plugin">Favor ativar o plugin \'Mapa náutico\'</string>
+<string name="activate_srtm_plugin">Favor ativar o plugin \'Curvas de nível\'</string>
+<string name="later">Depois</string>
+<string name="get_full_version">Versão completa</string>
+<string name="downloads">Transferências</string>
+<string name="confirm_download_roadmaps">O mapa somente de estradas não é necessário, pois você tem o mapa padrão (completo). Baixar mesmo assim\?</string>
+<string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
+<string name="file_size_in_mb">%.1f MB</string>
+<string name="update_all">Atualizar tudo (%1$s MB)</string>
+<string name="free_downloads_used">Transferências gratuitas usadas</string>
+<string name="free_downloads_used_description">Exibe a quantidade de downloads gratuitos restantes.</string>
+
+<string name="application_dir_description">Escolha onde você deseja armazenar mapas e outros arquivos de dados.</string>
+
+<string name="enter_country_name">Insira o nome do país</string>
+<string name="new_version">Nova versão</string>
+<string name="begin_with_osmand_menu_group">Primeiros passos com OsmAnd</string>
+<string name="features_menu_group">Recursos</string>
+<string name="help_us_to_improve_menu_group">Ajude a melhorar o OsmAnd</string>
+<string name="other_menu_group">Outros</string>
+<string name="plugins_menu_group">Complementos</string>
+<string name="first_usage_item">Primeiro uso</string>
+<string name="first_usage_item_description">Como baixar mapas, defina as configurações básicas.</string>
+<string name="navigation_item_description">Configurar a navegação.</string>
+<string name="planning_trip_item">Planejando uma viagem</string>
+<string name="faq_item">Perguntas frequentes</string>
+<string name="faq_item_description">Respostas às perguntas frequentes</string>
+<string name="map_viewing_item">Visualização de mapa</string>
+<string name="search_on_the_map_item">Pesquisa no mapa</string>
+<string name="instalation_troubleshooting_item">Instalação e solução de problemas</string>
+<string name="techical_articles_item">Artigos técnicos</string>
+<string name="versions_item">Versões</string>
+<string name="feedback">Comente</string>
+<string name="contact_us">Fale conosco</string>
+<string name="map_legend">Legenda do mapa</string>
+<string name="save_poi_without_poi_type_message">Você realmente quer salvar o POI sem especificar o tipo?</string>
+<string name="poi_context_menu_modify_osm_change">Modificar alteração no OSM</string>
+<string name="use_dashboard_btn">Usar painel de controle</string>
+<string name="use_drawer_btn">Usar menu</string>
+<string name="dashboard_or_drawer_title">Controle pelo painel ou menu</string>
+<string name="dashboard_or_drawer_description">Uma escolha é oferecida para controlar principalmente o app via painel de controle flexível ou um menu estático. Sua escolha sempre pode ser alterada nas configurações do painel de controle.</string>
 <string name="shared_string_hide">Ocultar</string>
-    <string name="av_video_quality_low">Menor qualidade</string>
-    <string name="av_video_quality_high">Maior qualidade</string>
-    <string name="av_video_quality">Qualidade do vídeo</string>
-    <string name="av_video_quality_descr">Selecionar a qualidade de vídeo.</string>
-    <string name="av_audio_format">Formato de áudio</string>
-    <string name="av_audio_format_descr">Selecionar o formato de saída de áudio.</string>
-    <string name="av_audio_bitrate">Bitrate de áudio</string>
-    <string name="av_audio_bitrate_descr">Selecionar o bitrate de áudio.</string>
-    <string name="shared_string_near">Perto de</string>
-    <string name="no_address_found">Sem endereço determinado</string>
-	<string name="looking_up_address">Procurando endereço</string>
-    <string name="rendering_attr_horseRoutes_name">Rotas a cavalo</string>
-    <string name="update">Atualizar</string>
-    <string name="only_download_over_wifi">Somente baixar via Wi-Fi</string>
-    <string name="live_update">Atualização ao vivo</string>
-<string name="update_now">Atualizar</string>
+<string name="av_video_quality_low">Menor qualidade</string>
+<string name="av_video_quality_high">Maior qualidade</string>
+<string name="av_video_quality">Qualidade do vídeo</string>
+<string name="av_video_quality_descr">Selecionar a qualidade de vídeo.</string>
+<string name="av_audio_format">Formato de áudio</string>
+<string name="av_audio_format_descr">Selecionar o formato de saída de áudio.</string>
+<string name="av_audio_bitrate">Bitrate de áudio</string>
+<string name="av_audio_bitrate_descr">Selecionar o bitrate de áudio.</string>
+<string name="shared_string_near">Perto de</string>
+<string name="no_address_found">Sem endereço determinado</string>
+<string name="looking_up_address">Procurando endereço</string>
+<string name="rendering_attr_horseRoutes_name">Rotas para cavalos</string>
+<string name="update">Atualizar</string>
+<string name="only_download_over_wifi">Somente baixar via Wi-Fi</string>
+<string name="live_update">Atualização ao vivo</string>
+<string name="update_now">Atualizar agora</string>
 <string name="route_distance">Distância:</string>
-    <string name="route_duration">Tempo:</string>
-    <string name="missing_write_external_storage_permission">App não tem permissão para usar o cartão SD</string>
+<string name="route_duration">Tempo:</string>
+<string name="missing_write_external_storage_permission">OsmAnd não tem permissão para usar o cartão de memória</string>
 <string name="no_location_permission">O aplicativo não tem permissão para acessar os dados de localização.</string>
-    <string name="no_camera_permission">App não tem permissão para acessar a câmera.</string>
-    <string name="no_microphone_permission">App não tem permissão para acessar o microfone.</string>
-    <string name="impassable_road_desc">Escolha as vias que quer evitar durante a navegação.</string>
-    <string name="shared_string_sound">Som</string>
-    <string name="live_updates">Atualização ao vivo</string>
-    <string name="available_maps">Mapas disponíveis</string>
-    <string name="select_voice_provider">Selecione orientação por voz</string>
-    <string name="select_voice_provider_descr">Selecione ou baixe a instrução por voz para o seu idioma.</string>
-    <string name="last_update">Última atualização: %s</string>
+<string name="no_camera_permission">App não tem permissão para acessar a câmera.</string>
+<string name="no_microphone_permission">App não tem permissão para acessar o microfone.</string>
+<string name="impassable_road_desc">Escolha as vias que quer evitar durante a navegação.</string>
+<string name="shared_string_sound">Som</string>
+<string name="live_updates">Atualização ao vivo</string>
+<string name="available_maps">Mapas disponíveis</string>
+<string name="select_voice_provider">Selecione orientação por voz</string>
+<string name="select_voice_provider_descr">Selecione ou baixe a instrução por voz para o seu idioma.</string>
+<string name="last_update">Última atualização: %s</string>
 
-    <string name="update_time">Quando atualizar</string>
+<string name="update_time">Quando atualizar</string>
 <string name="updates_size">Tamanho da atualização</string>
 <string name="rec_split">Dividir gravação</string>
-    <string name="rec_split_title">Usar separador de gravação</string>
-    <string name="rec_split_desc">Sobrescrever clipes quando o espaço usado exceder o limite de armazenamento.</string>
-    <string name="rec_split_clip_length">Duração do clipe</string>
-    <string name="rec_split_clip_length_desc">Limite de tempo máximo para clipes gravados.</string>
-    <string name="rec_split_storage_size">Limite de armazenamento</string>
-    <string name="rec_split_storage_size_desc">Quantidade de espaço que pode ser ocupado por todos os clipes gravados.</string>
-    <string name="last_map_change">Última mudança: %s</string>
-    <string name="hourly">A cada hora</string>
-    <string name="daily">Diariamente</string>
-    <string name="weekly">Semanalmente</string>
-    <string name="morning">Pela manhã</string>
-    <string name="night">À noite</string>
+<string name="rec_split_title">Usar separador de gravação</string>
+<string name="rec_split_desc">Sobrescrever clipes quando o espaço usado exceder o limite de armazenamento.</string>
+<string name="rec_split_clip_length">Duração do clipe</string>
+<string name="rec_split_clip_length_desc">Limite de tempo máximo para clipes gravados.</string>
+<string name="rec_split_storage_size">Limite de armazenamento</string>
+<string name="rec_split_storage_size_desc">Quantidade de espaço que pode ser ocupado por todos os clipes gravados.</string>
+<string name="last_map_change">Última mudança: %s</string>
+<string name="hourly">A cada hora</string>
+<string name="daily">Diariamente</string>
+<string name="weekly">Semanalmente</string>
+<string name="morning">Pela manhã</string>
+<string name="night">À noite</string>
 <string name="shared_string_not_selected">Nada selecionado</string>
-    <string name="select_month_and_country">Selecione o mês e o país</string>
+<string name="select_month_and_country">Selecione o mês e o país</string>
 <string name="shared_string_type">Tipo</string>
-    <string name="starting_point">Ponto de partida</string>
-    <string name="item_removed">Item excluído</string>
-    <string name="n_items_removed">itens apagados</string>
-    <string name="shared_string_undo_all">DESFAZER TUDO</string>
-    <string name="rendering_attr_hideIcons_name">Ícones dos POIs</string>
-    <string name="switch_start_finish">Inverter pontos de partida e destino</string>
-    <string name="number_of_contributors">Número de contribuidores</string>
-    <string name="number_of_edits">Número de edições</string>
-    <string name="reports_for">Relatório para</string>
+<string name="starting_point">Ponto de partida</string>
+<string name="item_removed">Item excluído</string>
+<string name="n_items_removed">itens apagados</string>
+<string name="shared_string_undo_all">Desfazer tudo</string>
+<string name="rendering_attr_hideIcons_name">Ícones dos POIs</string>
+<string name="switch_start_finish">Inverter pontos de partida e destino</string>
+<string name="number_of_contributors">Número de contribuidores</string>
+<string name="number_of_edits">Número de edições</string>
+<string name="reports_for">Relatório para</string>
 <string name="shared_string_remove">Excluir</string>
-    <string name="clear_updates_proposition_message">Você pode excluir atualizações baixadas e voltar para a versão original do mapa</string>
-    <string name="add_time_span">Adicionar intervalo de tempo</string>
-    <string name="road_blocked">Estrada bloqueada</string>
-    <string name="shared_string_select">Selecionar</string>
-    <string name="data_is_not_available">Dados indisponíveis</string>
-    <string name="rendering_attr_hideUnderground_name">Objetos subterrâneos</string>
-    <string name="shared_string_read_more">Leia mais</string>
-    
-    <string name="shared_string_email_address">Endereço de e-mail</string>
-    <string name="shared_string_status">Estado</string>
-    <string name="shared_string_save_changes">Salvar alterações</string>
-    <string name="find_parking">Achar estacionamento</string>
-    <string name="show_polygons">Mostrar polígonos de áreas</string>
-    
-    <string name="add_points_to_map_markers_q">Adicionar todos os pontos como marcadores de mapa?</string>
-    <string name="shared_string_add_to_map_markers">Adicionar aos marcadores de mapa</string>
-    <string name="select_map_markers">Selecionar marcadores de mapa</string>
-    <string name="shared_string_reverse_order">Ordem inversa</string>
-    
-    <string name="show_map_markers_description">Ativar o recurso de marcadores de mapa.</string>
-    <string name="clear_active_markers_q">Você quer apagar todos os marcadores ativos?</string>
-    <string name="clear_markers_history_q">Você quer limpar o histórico de marcadores de mapa?</string>
-    <string name="map_markers">Marcadores de mapa</string>
-    <string name="map_marker">Marcador de mapa</string>
-    <string name="consider_turning_polygons_off">É recomendável desativar a visualização de polígonos.</string>
-    <string name="rendering_attr_showMtbRoutes_name">Mostrar rotas MTB</string>
-    <string name="active_markers">Ativar marcadores</string>
-    <string name="shared_string_topbar">Barra superior</string>
-    <string name="recalculate_route">Recalcular rota</string>
-    <string name="donations">Doações</string>
-    <string name="number_of_recipients">Número de destinatários</string>
-    <string name="osm_editors_ranking">Ranking de editores de OSM</string>
-    <string name="map_widget_battery">Nível da bateria</string>
-    <string name="move_marker_bottom_sheet_title">Movimente o mapa para posicionar o marcador</string>
-    <!-- string name="lat_lon_pattern">Lat: %1$.5f Lon: %2$.5f</string -->
-    <string name="use_osm_live_routing">Navegação OsmAnd Live</string>
-    <string name="access_no_destination">O destino não foi indicado</string>
-    <string name="access_disable_offroute_recalc_descr">Desabilitar recálculo automático de rota depois de ter deixado a rota.</string>
-    <string name="access_disable_wrong_direction_recalc_descr">Desabilitar recálculo automático da rota quando estiver se movendo na direção errada.</string>
-    <string name="follow_us">Siga-nos</string>
-    <string name="routing_attr_short_way_name">Caminho mais econômico</string>
-    <string name="routing_attr_short_way_description">Utilizar caminho econômico (geralmente mais curto).</string>
-    <string name="edit_filter">Editar categorias</string>
-    <string name="subcategories">Subcategorias</string>
-    <string name="selected_categories">Categorias selecionadas</string>
-    <string name="create_custom_poi">Criar filtro personalizado</string>
-    <string name="custom_search">Pesquisa personalizada</string>
-    <string name="shared_string_filters">Filtros</string>
-    <string name="apply_filters">Aplicar filtros</string>
-    <string name="save_filter">Salvar filtro</string>
-    <string name="delete_filter">Remover filtro</string>
-    <string name="new_filter">Novo filtro</string>
-    <string name="new_filter_desc">Por favor, inserir um nome para o novo filtro. Ele será adicionado à sua guia \'Categorias\'.</string>
-    <string name="donation_to_osm">Doação para a comunidade OpenStreetMap</string>
-    <string name="osmand_plus_banner_desc">Download ilimitado de mapas, atualizações e plugin Wikipédia.</string>
-    <string name="si_mi_meters">Milhas/metros</string>
-    <string name="skip_map_downloading">Pular download de mapas</string>
-    <string name="skip_map_downloading_desc">Você não possui mapas offlines. Você pode escolher um mapa da lista ou baixar mapas mais tarde pelo \'Menu - %1$s\'.</string>
-    <string name="search_another_country">Selecione um outro local</string>
-    <string name="search_map">Procurando mapas…</string>
-    <string name="first_usage_wizard_desc">Deixe o OsmAnd determinar o seu local e sugerir mapas da região para baixar.</string>
-    <string name="location_not_found">Local não encontrado</string>
-    <string name="no_inet_connection">Sem conexão à Internet</string>
-    <string name="no_inet_connection_desc_map">É necessário baixar os mapas.</string>
-    <string name="search_location">Procurando localização…</string>
-    <string name="storage_free_space">Espaço livre</string>
-    <string name="give_permission">Dar permissão</string>
-    <string name="allow_access_location">Permitir acesso à localização</string>
-    <string name="search_my_location">Encontrar a minha posição</string>
-    <string name="no_update_info_desc">Não verificar se há novas versões ou descontos relacionados ao OsmAnd.</string>
-    <string name="no_update_info">Não mostrar novas versões</string>
-    <string name="update_all_maps_now">Atualizar todos os mapas agora?</string>
-    <string name="clear_tile_data">Limpar todos os títulos</string>
-    <string name="replace_favorite_confirmation">Você tem certeza que deseja substituir o Favorito %1$s?</string>
-    <string name="shared_string_change">Mudar</string>
-    <string name="coords_search">Busca de coordenadas</string>
-    <string name="advanced_coords_search">Busca avançada de coordenadas</string>
-    <string name="back_to_search">Voltar para as buscas</string>
-    <string name="confirmation_to_delete_history_items">Remover os itens selecionados do \'Histórico\'?</string>
-    <string name="show_something_on_map">Mostrar %1$s no mapa</string>
-    <string name="share_history_subject">compartilhado via OsmAnd</string>
-    <string name="search_categories">Categorias</string>
-    <string name="postcode">Código postal</string>
-    <string name="shared_string_from">de</string>
-    <string name="city_type_district">Distrito</string>
-    <string name="city_type_neighbourhood">Vizinhança</string>
-    <string name="map_widget_search">Procurar</string>
-	<string name="storage_directory_card">Cartão de memória</string>
-    <string name="coords_format">Formato de coordenada</string>
-    <string name="app_mode_bus">Ônibus</string>
- 	<string name="app_mode_train">Trem</string>
-    <string name="change_markers_position">Mudar posição do marcador</string>
-    <string name="access_smart_autoannounce_descr">Notificar somente quando a direção para o alvo for modificada.</string>
-    <string name="access_autoannounce_period_descr">Intervalo mínimo entre anúncios.</string>
-    <string name="access_default_color">Cor padrão</string>
-    <string name="access_category_choice">Escolher categoria</string>
-    <string name="access_hint_enter_name">Digite um nome</string>
-    <string name="access_hint_enter_category">Digite uma categoria</string>
-    <string name="access_hint_enter_description">Digite uma descrição.</string>
-    <string name="access_expanded_list">Expandir lista</string>
-    <string name="access_empty_list">Lista vazia</string>
-    <string name="access_shared_string_not_installed">Não instalado</string>
-    <string name="access_widget_expand">Expandir</string>
-    <string name="access_sort">Ordenar</string>
-    <string name="map_mode">Modo mapa</string>
-    <string name="rendering_value_medium_name">Médio</string>
-    <string name="report">Relatório</string>
-    <string name="shared_string_is_open_24_7">Aberto 24 horas</string>
-    <string name="average_speed">Velocidade média</string>
-    <string name="average_altitude">Altitude média</string>
-    <string name="altitude_ascent">Subida</string>
-    <string name="altitude_descent">Descida</string>
-    <string name="altitude_range">Faixa de altitude</string>
-    <string name="shared_string_time">Tempo</string>
-    <string name="total_distance">Distância total</string>
-    <string name="shared_string_slope">Inclinação</string>
-    <string name="open_street_map_login_and_pass">Usuário e senha do OpenStreetMap</string>
-    <string name="osn_modify_dialog_error">Não foi possível modificar a nota</string>
-    <string name="osn_modify_dialog_title">Modificar anotação</string>
-    <string name="context_menu_item_modify_note">Modificar anotação do OSM</string>
-    <string name="make_round_trip_descr">Adicionar cópia do ponto de partida como destino.</string>
-    
-    <string name="shared_string_markers">Marcações</string>
-    <string name="coordinates_format">Formato das coordenadas</string>
-    <string name="use_system_keyboard">Usar teclado do sistema</string>
-    <string name="fast_coordinates_input_descr">Escolha o formato de inserção de coordenadas. Você sempre pode alterá-la tocando em \'Opções\'.</string>
-    <string name="fast_coordinates_input">Inserção de coordenadas rápida</string>
-    <string name="use_location">Usar posição</string>
-    <string name="add_location_as_first_point_descr">Adicione sua posição como ponto de partida para planejar a rota perfeita.</string>
-    <string name="my_location">Minha posição</string>
-    <string name="shared_string_finish">Terminar</string>
-    <string name="plan_route">Planejar rota</string>
-    <string name="shared_string_sort">Classificar</string>
-    <string name="coordinate_input">Inserção de coordenada</string>
-    <string name="is_saved">está salvo</string>
-    <string name="marker_save_as_track_descr">Exporte seus marcadores para o seguinte arquivo GPX:</string>
-    <string name="marker_save_as_track">Salvar como arquivo GPX</string>
-    <string name="move_to_history">Mover para o histórico</string>
-    <string name="group_will_be_removed_after_restart">O grupo será excluído na próxima vez em que reiniciar o aplicativo.</string>
-    <string name="show_arrows_on_the_map">Mostrar setas no mapa</string>
-    <string name="remove_from_map_markers">Excluir dos marcadores de mapa</string>
-    <string name="descendingly">decrescente</string>
-    <string name="ascendingly">ascendente</string>
-    <string name="date_added">Data adicionada</string>
-    <string name="order_by">Ordenar por:</string>
-    <string name="marker_show_distance_descr">Selecionar como indicar distância e orientação para marcadores de mapa na tela do mapa:</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Selecione a baixo em qual velocidade a orientação do mapa muda de \'Na direção do movimento\' para \'Pela bússola\'.</string>
-    <string name="all_markers_moved_to_history">Todas as marcações de mapa foram movidas para o histórico</string>
-    <string name="marker_moved_to_history">O marcador de mapa foi movido para o histórico</string>
-    <string name="marker_moved_to_active">O marcador de mapa foi movido para ativo</string>
-    <string name="shared_string_list">Lista</string>
-    <string name="shared_string_groups">Grupos</string>
-    <string name="passed">Último uso: %1$s</string>
-    <string name="make_active">Ativar</string>
-    <string name="today">Hoje</string>
-    <string name="yesterday">Ontem</string>
-    <string name="last_seven_days">Os últimos 7 dias</string>
-    <string name="this_year">Este ano</string>
-    <string name="move_all_to_history">Mover tudo para o histórico</string>
-    <string name="show_direction">Indicação de distância</string>
-    <string name="sort_by">Classificar por</string>
-    <string name="do_not_use_animations">Sem animações</string>
-    <string name="do_not_use_animations_descr">Desabilitar animações no aplicativo.</string>
-    <string name="keep_showing_on_map">Manter mostrando no aplicativo</string>
-    <string name="exit_without_saving">Sair sem salvar?</string>
-    <string name="line">Linha</string>
-    <string name="save_as_route_point">Salvar como pontos da rota</string>
-    <string name="save_as_line">Salvar como linha</string>
-    <string name="route_point">Ponto de rota</string>
-    <string name="edit_line">Alterar linha</string>
-    <string name="add_point_before">Adicionar ponto antes</string>
-    <string name="add_point_after">Adicionar ponto após</string>
-    <string name="shared_string_options">Opções</string>
-    <string name="measurement_tool_snap_to_road_descr">OsmAnd irá conectar os pontos com rotas para o perfil selecionado.</string>
-    <string name="measurement_tool_save_as_new_track_descr">Salve os pontos ou como pontos da rota ou como uma linha.</string>
-    <string name="choose_navigation_type">Selecionar perfil de navegação</string>
-    <string name="none_point_error">Favor adicionar ao menos um ponto.</string>
-    <string name="enter_gpx_name">Nome do arquivo GPX:</string>
-    <string name="show_on_map_after_saving">Mostrar no mapa após salvar</string>
-    <string name="measurement_tool_action_bar">Procurar no mapa e adicionar pontos</string>
-    <string name="measurement_tool">Medir distância</string>
-    <string name="quick_action_resume_pause_navigation">Pausar/voltar navegação</string>
-    <string name="quick_action_resume_pause_navigation_descr">Toque neste botão para pausar ou retomar a navegação.</string>
-    <string name="quick_action_start_stop_navigation">Iniciar/parar navegação</string>
-    <string name="quick_action_start_stop_navigation_descr">Toque neste botão para iniciar ou parar a navegação.</string>
-    <string name="store_tracks_in_monthly_directories">Armazenar trilhas gravadas em pastas mensais</string>
-    <string name="store_tracks_in_monthly_directories_descrp">Armazenar trilhas gravadas em subpastas por mês (ex.: 2018-01).</string>
+<string name="clear_updates_proposition_message">Excluir atualizações baixadas e voltar para a versão original do mapa</string>
+<string name="add_time_span">Adicionar intervalo de tempo</string>
+<string name="road_blocked">Estrada bloqueada</string>
+<string name="shared_string_select">Selecionar</string>
+<string name="data_is_not_available">Dados indisponíveis</string>
+<string name="rendering_attr_hideUnderground_name">Objetos subterrâneos</string>
+<string name="shared_string_read_more">Leia mais</string>
+
+<string name="shared_string_email_address">Endereço de e-mail</string>
+<string name="shared_string_status">Status</string>
+<string name="shared_string_save_changes">Salvar alterações</string>
+<string name="find_parking">Achar estacionamento</string>
+<string name="show_polygons">Mostrar polígonos de áreas</string>
+
+<string name="add_points_to_map_markers_q">Adicionar todos os pontos como marcadores de mapa?</string>
+<string name="shared_string_add_to_map_markers">Adicionar aos marcadores de mapa</string>
+<string name="select_map_markers">Selecionar marcadores de mapa</string>
+<string name="shared_string_reverse_order">Ordem inversa</string>
+
+<string name="show_map_markers_description">Ativar o recurso de marcadores de mapa.</string>
+<string name="clear_active_markers_q">Excluir todos os marcadores ativos\?</string>
+<string name="clear_markers_history_q">Limpar o histórico de marcadores de mapa\?</string>
+<string name="map_markers">Marcadores de mapa</string>
+<string name="map_marker">Marcador de mapa</string>
+<string name="consider_turning_polygons_off">É recomendável desativar a visualização de polígonos.</string>
+<string name="rendering_attr_showMtbRoutes_name">Mostrar rotas MTB</string>
+<string name="active_markers">Ativar marcadores</string>
+<string name="shared_string_topbar">Barra superior</string>
+<string name="recalculate_route">Recalcular rota</string>
+<string name="donations">Doações</string>
+<string name="number_of_recipients">Número de destinatários</string>
+<string name="osm_editors_ranking">Ranking de editores de OSM</string>
+<string name="map_widget_battery">Nível da bateria</string>
+<string name="move_marker_bottom_sheet_title">Mova o mapa para reposicionar o marcador</string>
+<!-- string name="lat_lon_pattern">Lat: %1$.5f Lon: %2$.5f</string -->
+<string name="use_osm_live_routing">Navegação OsmAnd Live</string>
+<string name="access_no_destination">Destino não definido</string>
+<string name="access_disable_offroute_recalc_descr">Desabilitar recálculo de rota depois de ter saído de rota.</string>
+<string name="access_disable_wrong_direction_recalc_descr">Desabilitar recálculo de rota se só estiver se movendo na direção oposta.</string>
+<string name="follow_us">Siga-nos</string>
+<string name="routing_attr_short_way_name">Caminho mais econômico</string>
+<string name="routing_attr_short_way_description">Utilizar caminho econômico (geralmente mais curto).</string>
+<string name="edit_filter">Editar categorias</string>
+<string name="subcategories">Subcategorias</string>
+<string name="selected_categories">Categorias selecionadas</string>
+<string name="create_custom_poi">Criar filtro personalizado</string>
+<string name="custom_search">Pesquisa personalizada</string>
+<string name="shared_string_filters">Filtros</string>
+<string name="apply_filters">Aplicar filtros</string>
+<string name="save_filter">Salvar filtro</string>
+<string name="delete_filter">Remover filtro</string>
+<string name="new_filter">Novo filtro</string>
+<string name="new_filter_desc">Por favor, inserir um nome para o novo filtro. Ele será adicionado à sua guia \'Categorias\'.</string>
+<string name="donation_to_osm">Doação para a comunidade OpenStreetMap</string>
+<string name="osmand_plus_banner_desc">Download ilimitado de mapas, atualizações e plugin Wikipédia.</string>
+<string name="si_mi_meters">Milhas/metros</string>
+<string name="skip_map_downloading">Pular download de mapas</string>
+<string name="skip_map_downloading_desc">Você não possui mapas offlines. Você pode escolher um mapa da lista ou baixar mapas mais tarde pelo \'Menu - %1$s\'.</string>
+<string name="search_another_country">Selecione um outro local</string>
+<string name="search_map">Procurando mapas…</string>
+<string name="first_usage_wizard_desc">Deixe o OsmAnd determinar o seu local e sugerir mapas da região para baixar.</string>
+<string name="location_not_found">Local não encontrado</string>
+<string name="no_inet_connection">Sem conexão à Internet</string>
+<string name="no_inet_connection_desc_map">É necessário baixar os mapas.</string>
+<string name="search_location">Procurando localização…</string>
+<string name="storage_free_space">Espaço livre</string>
+<string name="give_permission">Dar permissão</string>
+<string name="allow_access_location">Permitir acesso à localização</string>
+<string name="search_my_location">Encontrar a minha posição</string>
+<string name="no_update_info_desc">Não verificar se há novas versões ou descontos relacionados ao OsmAnd.</string>
+<string name="no_update_info">Não mostrar novas versões</string>
+<string name="update_all_maps_now">Atualizar todos os mapas agora?</string>
+<string name="clear_tile_data">Limpar todos os títulos</string>
+<string name="replace_favorite_confirmation">Você tem certeza que deseja substituir o Favorito %1$s?</string>
+<string name="shared_string_change">Mudar</string>
+<string name="coords_search">Busca de coordenadas</string>
+<string name="advanced_coords_search">Busca avançada de coordenadas</string>
+<string name="back_to_search">Voltar para as buscas</string>
+<string name="confirmation_to_delete_history_items">Remover os itens selecionados do \'Histórico\'?</string>
+<string name="show_something_on_map">Mostrar %1$s no mapa</string>
+<string name="share_history_subject">compartilhado via OsmAnd</string>
+<string name="search_categories">Categorias</string>
+<string name="postcode">Código postal</string>
+<string name="shared_string_from">de</string>
+<string name="city_type_district">Distrito</string>
+<string name="city_type_neighbourhood">Vizinhança</string>
+<string name="map_widget_search">Procurar</string>
+<string name="storage_directory_card">Cartão de memória</string>
+<string name="coords_format">Formato de coordenada</string>
+<string name="app_mode_bus">Ônibus</string>
+<string name="app_mode_train">Trem</string>
+<string name="change_markers_position">Mudar posição do marcador</string>
+<string name="access_smart_autoannounce_descr">Notificar somente quando a direção para o alvo mudar.</string>
+<string name="access_autoannounce_period_descr">Intervalo mínimo entre anúncios.</string>
+<string name="access_default_color">Cor padrão</string>
+<string name="access_category_choice">Escolher categoria</string>
+<string name="access_hint_enter_name">Digite um nome</string>
+<string name="access_hint_enter_category">Digite uma categoria</string>
+<string name="access_hint_enter_description">Digite uma descrição.</string>
+<string name="access_expanded_list">Expandir lista</string>
+<string name="access_empty_list">Lista vazia</string>
+<string name="access_shared_string_not_installed">Não instalado</string>
+<string name="access_widget_expand">Expandir</string>
+<string name="access_sort">Ordenar</string>
+<string name="map_mode">Modo mapa</string>
+<string name="rendering_value_medium_name">Médio</string>
+<string name="report">Relatório</string>
+<string name="shared_string_is_open_24_7">Aberto 24 horas</string>
+<string name="average_speed">Velocidade média</string>
+<string name="average_altitude">Altitude média</string>
+<string name="altitude_ascent">Subida</string>
+<string name="altitude_descent">Descida</string>
+<string name="altitude_range">Faixa de altitude</string>
+<string name="shared_string_time">Tempo</string>
+<string name="total_distance">Distância total</string>
+<string name="shared_string_slope">Inclinação</string>
+<string name="open_street_map_login_and_pass">Usuário e senha do OpenStreetMap</string>
+<string name="osn_modify_dialog_error">Não foi possível modificar a nota</string>
+<string name="osn_modify_dialog_title">Modificar anotação</string>
+<string name="context_menu_item_modify_note">Modificar anotação do OSM</string>
+<string name="make_round_trip_descr">Adicionar cópia do ponto de partida como destino.</string>
+
+<string name="shared_string_markers">Marcações</string>
+<string name="coordinates_format">Formato das coordenadas</string>
+<string name="use_system_keyboard">Usar teclado do sistema</string>
+<string name="fast_coordinates_input_descr">Escolha o formato de inserção de coordenadas. Você sempre pode alterá-la tocando em \'Opções\'.</string>
+<string name="fast_coordinates_input">Inserção de coordenadas rápida</string>
+<string name="use_location">Usar posição</string>
+<string name="add_location_as_first_point_descr">Adicione sua posição como ponto de partida para planejar a rota perfeita.</string>
+<string name="my_location">Minha posição</string>
+<string name="shared_string_finish">Terminar</string>
+<string name="plan_route">Planejar rota</string>
+<string name="shared_string_sort">Ordenar</string>
+<string name="coordinate_input">Inserção de coordenada</string>
+<string name="is_saved">está salvo</string>
+<string name="marker_save_as_track_descr">Exporte seus marcadores para o seguinte arquivo GPX:</string>
+<string name="marker_save_as_track">Salvar como arquivo GPX</string>
+<string name="move_to_history">Mover para o histórico</string>
+<string name="group_will_be_removed_after_restart">O grupo será excluído na próxima vez em que reiniciar o aplicativo.</string>
+<string name="show_arrows_on_the_map">Mostrar setas no mapa</string>
+<string name="remove_from_map_markers">Excluir dos marcadores de mapa</string>
+<string name="descendingly">decrescente</string>
+<string name="ascendingly">ascendente</string>
+<string name="date_added">Data adicionada</string>
+<string name="order_by">Ordenar por:</string>
+<string name="marker_show_distance_descr">Selecionar como indicar distância e orientação para marcadores de mapa na tela do mapa:</string>
+<string name="map_orientation_change_in_accordance_with_speed_descr">Selecione sob qual velocidade a orientação do mapa muda de \'Na direção do movimento\' para \'Na direção da bússola\'.</string>
+<string name="all_markers_moved_to_history">Todas as marcações de mapa foram movidas para o histórico</string>
+<string name="marker_moved_to_history">O marcador de mapa foi movido para o histórico</string>
+<string name="marker_moved_to_active">O marcador de mapa foi movido para ativo</string>
+<string name="shared_string_list">Lista</string>
+<string name="shared_string_groups">Grupos</string>
+<string name="passed">Último uso: %1$s</string>
+<string name="make_active">Ativar</string>
+<string name="today">Hoje</string>
+<string name="yesterday">Ontem</string>
+<string name="last_seven_days">Os últimos 7 dias</string>
+<string name="this_year">Este ano</string>
+<string name="move_all_to_history">Mover tudo para o histórico</string>
+<string name="show_direction">Indicação de distância</string>
+<string name="sort_by">Classificar por</string>
+<string name="do_not_use_animations">Sem animações</string>
+<string name="do_not_use_animations_descr">Desabilitar animações no aplicativo.</string>
+<string name="keep_showing_on_map">Manter mostrando no aplicativo</string>
+<string name="exit_without_saving">Sair sem salvar?</string>
+<string name="line">Linha</string>
+<string name="save_as_route_point">Salvar como pontos da rota</string>
+<string name="save_as_line">Salvar como linha</string>
+<string name="route_point">Ponto de rota</string>
+<string name="edit_line">Alterar linha</string>
+<string name="add_point_before">Adicionar ponto antes</string>
+<string name="add_point_after">Adicionar ponto após</string>
+<string name="shared_string_options">Opções</string>
+<string name="measurement_tool_snap_to_road_descr">OsmAnd irá conectar os pontos com rotas para o perfil selecionado.</string>
+<string name="measurement_tool_save_as_new_track_descr">Salve os pontos ou como pontos da rota ou como uma linha.</string>
+<string name="choose_navigation_type">Selecionar perfil de navegação</string>
+<string name="none_point_error">Favor adicionar ao menos um ponto.</string>
+<string name="enter_gpx_name">Nome do arquivo GPX:</string>
+<string name="show_on_map_after_saving">Mostrar no mapa após salvar</string>
+<string name="measurement_tool_action_bar">Procurar no mapa e adicionar pontos</string>
+<string name="measurement_tool">Medir distância</string>
+<string name="quick_action_resume_pause_navigation">Pausar/voltar navegação</string>
+<string name="quick_action_resume_pause_navigation_descr">Toque neste botão para pausar ou retomar a navegação.</string>
+<string name="quick_action_start_stop_navigation">Iniciar/parar navegação</string>
+<string name="quick_action_start_stop_navigation_descr">Toque neste botão para iniciar ou parar a navegação.</string>
+    <string name="store_tracks_in_monthly_directories">Salvar trilhas em pastas mensais</string>
+    <string name="store_tracks_in_monthly_directories_descrp">Salvar trilhas gravadas em subpastas por mês (ex.: 2018-01).</string>
     <string name="shared_string_reset">Redefinir</string>
     <string name="shared_string_reload">Recarregar</string>
     <string name="mapillary_menu_descr_tile_cache">Recarregar para ver dados atualizados.</string>
@@ -2195,7 +2219,7 @@ Pôr do Sol: %2$s</string>
     <string name="mapillary_menu_edit_text_hint">Digite o nome de usuário</string>
     <string name="mapillary_menu_descr_username">Ver somente imagens adicionadas por</string>
     <string name="mapillary_menu_title_username">Nome de usuário</string>
-    <string name="mapillary_menu_filter_description">Filtre imagens por quem submeteu ou por data. Ativo somente com um zoom bem próximo.</string>
+    <string name="mapillary_menu_filter_description">Filtrar imagens por quem enviou, por data ou por tipo. Ativo só com um zoom bem próximo.</string>
     <string name="shared_string_permissions">Permissões</string>
     <string name="import_gpx_failed_descr">O OsmAnd não pôde importar o arquivo. Favor verificar se o OsmAnd tem permissão para ler arquivo de sua localização.</string>
     <string name="distance_moving">Distância corrigida</string>
@@ -2235,7 +2259,7 @@ Pôr do Sol: %2$s</string>
     <string name="routing_attr_avoid_ice_roads_fords_name">Evitar estradas de gelo, vaus</string>
     <string name="routing_attr_avoid_ice_roads_fords_description">Evitar estradas de gelo e vaus.</string>
     <string name="map_orientation_change_in_accordance_with_speed">Limite para orientação do mapa</string>
-    <string name="quick_action_show_navigation_finish_dialog">Mostrar \'Navegação finalizada\'</string>
+    <string name="quick_action_show_navigation_finish_dialog">Exibir \'Navegação finalizada\'</string>
     <string name="mapillary_menu_title_tile_cache">Cache de quadrícula</string>
     <string name="map_widget_ruler_control">Régua de raio</string>
     <string name="show_from_zoom_level">Exibir a partir do nível de zoom</string>
@@ -2250,9 +2274,9 @@ Pôr do Sol: %2$s</string>
     <string name="shared_string_overview">Visão geral</string>
     <string name="select_street">Selecionar rua</string>
     <string name="shared_string_in_name">em %1$s</string>
-    <string name="type_address">Digitar endereço</string>
-    <string name="type_city_town">Digitar a cidade ou vila</string>
-    <string name="type_postcode">Digitar código postal</string>
+    <string name="type_address">Digite um endereço</string>
+    <string name="type_city_town">Digite uma cidade</string>
+    <string name="type_postcode">Digite um código postal</string>
     <string name="nearest_cities">Cidades mais próximas</string>
     <string name="select_city">Selecionar cidade</string>
     <string name="select_postcode">Selecionar código postal</string>
@@ -2297,11 +2321,11 @@ Pôr do Sol: %2$s</string>
     <string name="shared_string_gpx_waypoints">Pontos de passagem de trilhas</string>
     <string name="favourites_group">Categoria favoritos</string>
     <string name="add_group">Adicionar um grupo</string>
-    <string name="add_group_descr">Importar grupos dos Favoritos ou pontos de passagem de trilhas.</string>
+    <string name="add_group_descr">Importe grupos dos Favoritos ou pontos de passagem GPX.</string>
     <string name="empty_state_markers_active">Crie marcadores de mapa!</string>
     <string name="empty_state_markers_active_desc">Toque longo ou rápido em \'Lugares\', e em seguida toque no botão de bandeira.</string>
-    <string name="empty_state_markers_groups">Importar grupos</string>
-    <string name="empty_state_markers_groups_desc">Importar grupos de Favoritos ou pontos de passagem de trilhas como marcadores.</string>
+    <string name="empty_state_markers_groups">Importe grupos</string>
+    <string name="empty_state_markers_groups_desc">Importar grupos de Favoritos ou pontos de passagem como marcadores.</string>
     <string name="empty_state_markers_history_desc">Marcadores marcados como visitados aparecerão nesta tela.</string>
     <string name="shared_string_two">Dois</string>
     <string name="shared_string_one">Um</string>
@@ -2426,12 +2450,12 @@ Pôr do Sol: %2$s</string>
     <string name="rendering_value_dark_brown_name">Marrom escuro</string>
     <string name="rendering_attr_contourColorScheme_name">Esquema de cores das curvas de nível</string>
     <string name="rendering_attr_surfaceIntegrity_name">Integridade da superfície da via</string>
-    <string name="search_hint">Digite a cidade, endereço, nome do POI</string>
+    <string name="search_hint">Digite cidade, endereço, nome do POI</string>
     <string name="translit_name_if_miss">Transliterar se o nome %1$s for ausente</string>
     <string name="translit_names">Transliterar nomes</string>
     <string name="import_track_desc">Arquivo %1$s não possui pontos de passagem, importe-o como uma trilha?</string>
     <string name="add_segment_to_the_track">Adicionar a um arquivo GPX</string>
-<string name="empty_state_av_notes_desc">Adicionar nota de áudio, vídeo ou foto para cada ponto no mapa, usando o widget ou o menu de contexto.</string>
+<string name="empty_state_av_notes_desc">Adicione nota de áudio, vídeo ou foto em qualquer ponto do mapa, usando o widget ou o menu de contexto.</string>
     <string name="quick_action_add_destination_desc">Tocar neste botão de ação marcará o centro da tela como o destino da rota, qualquer destino anteriormente definido se torna o último destino intermediário.</string>
     <string name="quick_action_replace_destination_desc">Tocar no botão de ação marcará o centro da tela como novo destino da rota, substituindo o destino selecionado anteriormente (se houver).</string>
     <string name="quick_action_add_first_intermediate_desc">Tocar neste botão de ação adicionará o primeiro ponto intermédio no centro da tela.</string>
@@ -2449,7 +2473,7 @@ Pôr do Sol: %2$s</string>
     <string name="get_for">Adquira por %1$s</string>
     <string name="get_for_month">Adquira por %1$s mês</string>
     <string name="osm_live_banner_desc">Obtenha downloads ilimitados de mapa e atualizações de mapas mais de uma vez por mês: semanalmente, a cada dia ou hora.</string>
-    <string name="quick_action_add_gpx_descr">Tocar no botão de ação adicionará um ponto de passagem GPX no local do centro da tela.</string>
+    <string name="quick_action_add_gpx_descr">Tocar no botão de ação adicionará um ponto de passagem GPX no meio da tela.</string>
     <string name="av_locations_all_desc">Arquivo GPX com coordenadas e dados de todas as notas.</string>
 	<string name="storage_place_description">Armazenamento de dados do OsmAnd (para mapas, arquivos GPX, etc.): %1$s.</string>
     <string name="first_usage_greeting">Obtenha direções e descobra novos lugares sem precisar de conexão com a Internet</string>
@@ -2483,10 +2507,10 @@ Pôr do Sol: %2$s</string>
     <string name="osm_live_hide_user_name">Não mostre meu nome em relatórios</string>
     <string name="osm_live_support_region">Região de suporte</string>
     <string name="osm_live_month_cost">Custo mensal</string>
-    <string name="osm_live_month_cost_desc">Pagamento mensal.</string>
+    <string name="osm_live_month_cost_desc">Pagamento mensal</string>
     <string name="osm_live_active">Ativo</string>
     <string name="osm_live_not_active">Inativo</string>
-    <string name="osm_live_enter_email">Por favor insira um endereço de e-mail válido</string>
+    <string name="osm_live_enter_email">Por favor, digite um endereço de e-mail válido</string>
     <string name="total_donations">Total de doações</string>
 <string name="what_is_here">O que há aqui:</string>
     <string name="parked_at">estacionado em</string>
@@ -2511,17 +2535,18 @@ Pôr do Sol: %2$s</string>
     <string name="rendering_value_fine_name">Mais fino</string>
     <string name="rendering_value_thin_name">Fino</string>
     <string name="rendering_value_bold_name">Grosso</string>
-    <string name="storage_directory_readonly_desc">A pasta de armazenamento de dados selecionada é somente leitura. A pasta de armazenamento foi alterada temporariamente para memória interna. Por favor, escolha uma pasta de armazenamento válida.</string>
+    <string name="storage_directory_readonly_desc">Alterado para memória interna uma vez que a pasta de armazenamento de dados selecionada é somente leitura. Por favor, escolha um diretório de armazenamento gravável.</string>
     <string name="storage_directory_shared">Memória compartilhada</string>
     <string name="full_report">Relatório completo</string>
     <string name="osm_user_stat">Edições %1$s, classificação %2$s, total de edições %3$s</string>
     <string name="osm_recipient_stat">Edições %1$s, soma de %2$s mBTC</string>
-    <string name="osm_live_email_desc">Necessários para fornecer-lhe informações sobre as contribuições.</string>
-    <string name="osm_live_enter_user_name">Por favor, digite o Nome Público</string>
-    <string name="osm_live_thanks">Obrigado por assinar as atualizações ao vivo!</string>
+    <string name="osm_live_email_desc">Necessário para fornecer-lhe informações sobre as contribuições.</string>
+    <string name="osm_live_enter_user_name">Por favor, digite o nome público</string>
+    <string name="osm_live_thanks">Obrigado por apoiar o OsmAnd!
+\nPara ativar todos os novos recursos você precisa reiniciar o OsmAnd.</string>
     <string name="osm_live_region_desc">Parte da sua doação será enviada para os usuários OSM que enviam alterações para o mapa da região.</string>
     <string name="osm_live_subscription_settings">Configurações de assinatura</string>
-    <string name="osm_live_ask_for_purchase">Por favor, adquira a assinatura OsmAnd Live primeiro</string>
+    <string name="osm_live_ask_for_purchase">Favor adquirir uma assinatura do OsmAnd Live primeiro</string>
     <string name="osm_live_header">Esta assinatura permite atualizações a cada hora para todos os mapas ao redor do mundo. Parte da renda retorna à Comunidade OSM e é pago por cada contribuição OSM. Se você gosta do OsmAnd e OSM e deseja apoiar e ser apoiado por eles, esta é a maneira perfeita de fazê-lo.</string>
     <string name="select_map_marker">Selecione marcador de mapa</string>
     <string name="map_markers_other">Outros marcadores</string>
@@ -2555,7 +2580,7 @@ Pôr do Sol: %2$s</string>
     <string name="osmand_extended_description_part4">Esqui
 \n O plugin de mapas de ski Skiing OsmAnd permite que você veja pistas de ski com nível de complexidade e algumas informações adicionais, como localização de elevadores e outras facilidades.</string>
     <string name="live_monitoring_max_interval_to_send">Buffer de tempo para rastreamento on-line</string>
-    <string name="save_poi_too_many_uppercase">Nome contém muitas letras maiúsculas. Você quer continuar?</string>
+    <string name="save_poi_too_many_uppercase">O nome contém muitas letras maiúsculas. Continuar\?</string>
     <string name="file_name_containes_illegal_char">Nome do arquivo contém caracteres ilegais</string>
     <string name="configure_screen_quick_action">Ação rápida</string>
     <string name="quick_action_item_action">Ação %d</string>
@@ -2581,8 +2606,8 @@ Pôr do Sol: %2$s</string>
     <string name="quick_actions_delete_text">Tem certeza de que deseja apagar a ação \"%s\"?</string>
     <string name="quick_favorites_show_favorites_dialog">Mostrar diálogo Favoritos</string>
     <string name="quick_favorites_name_preset">Nome do preset</string>
-    <string name="quick_action_add_marker_descr">Tocar no botão de ação adicionará um marcador de mapa no local do centro da tela.</string>
-    <string name="quick_action_add_parking_descr">Tocar no botão de ação adicionará um lugar de estacionamento no local do centro da tela.</string>
+    <string name="quick_action_add_marker_descr">Tocar nesse botão de ação adicionará um marcador de GPX no meio da tela.</string>
+    <string name="quick_action_add_parking_descr">Tocar no botão de ação adicionará um lugar de estacionamento no local do meio da tela.</string>
     <string name="release_3_0">• Novo: suporte para guias de viagem off-line globais. Locais referenciados estão lincados ao mapa. Dados iniciais do Wikivoyage.
 \n
 \n• Wikipédia: novo visual, links ativos, imagens agora suportados.
@@ -2597,7 +2622,7 @@ Pôr do Sol: %2$s</string>
     
     
     <string name="download_files_error_not_enough_space">Não há espaço suficiente! O espaço de armazenamento necessário é {3} MB temporariamente, {1} MB permanentemente. O espaço disponível é de apenas {2} MB.</string>
-    <string name="download_files_question_space_with_temp">Baixar {0} arquivo(s)? O espaço de armazenamento usado é de {3} MB temporariamente, {1} MB permanentemente. (Espaço disponível é de {2} MB.)</string>
+    <string name="download_files_question_space_with_temp">Baixar {0} arquivo(s)\? O espaço de armazenamento usado é de {3} MB temporariamente, {1} MB permanentemente. ({2} MB de espaço disponível.)</string>
     <string name="lang_hsb">Alto sorábio</string>
     <string name="lang_kab">Cabila</string>
     <string name="lang_ber">Berberes</string>
@@ -2605,7 +2630,7 @@ Pôr do Sol: %2$s</string>
 \nPor favor, forneça um código completo</string>
     <string name="navigate_point_olc_info_area">OLC completo válido 
 \nRepresenta área: %1$s x %2$s</string>
-    <string name="route_is_too_long_v2">Esta rota pode ser muito longa para calcular. Por favor, adicione destinos intermediários se nenhum resultado for encontrado dentro de 10 minutos.</string>
+    <string name="route_is_too_long_v2">Por favor, adicione destinos intermediários se nenhum caminho for encontrado para esta rota longa em 10 minutos.</string>
     <string name="osmand_extended_description_part5">Ciclismo
 \n • Encontre caminhos de bicicleta no mapa
 \n • Navegação por GPS no modo ciclismo constrói a sua rota utilizando caminhos de bicicleta
@@ -2618,18 +2643,21 @@ Pôr do Sol: %2$s</string>
 \n• Paradas de transportes públicos (ônibus, troleibus, trem) incluindo nomes de linha, ajuda a navegar em uma nova cidade
 \n• Navegação GPS em modo pedestre constrói a sua rota usando caminhos para pedestres
 \n• Fazer upload e seguir uma rota GPX ou gravar e compartilhar a sua própria rota</string>
-    <string name="osmand_extended_description_part7">Contribua para o OSM • Comunique falha de dados • Carregue trilhas GPX diretamente do app • Adicione POIs e carregue-os diretamente ao OSM (ou mais tarde se off-line)</string>
+    <string name="osmand_extended_description_part7">Contribua para o OSM 
+\n• Comunique falha de dados 
+\n• Carregue trilhas GPX diretamente do app 
+\n• Adicione POIs e carregue-os diretamente ao OSM (ou mais tarde se off-line)</string>
     <string name="osmand_plus_extended_description_part5">Recursos de segurança
 \n• Alternância de exibição dia/noite automatizada opcional
 \n• Exibição de limite de velocidade opcional, com lembrete se você ultrapassá-lo
 \n• Zoom dependente da velocidade opcional
 \n• Compartilhe sua localização para que seus amigos possam encontrar você</string>
     <string name="live_monitoring_max_interval_to_send_desrc">Especificar um buffer de tempo para manter locais para enviar sem conexão</string>
-    <string name="quick_action_take_audio_note_descr">Tocar no botão de ação adicionará uma nota de áudio no local do centro da tela.</string>
-    <string name="quick_action_take_video_note_descr">Tocar no botão de ação adicionará uma nota de vídeo no local do centro da tela.</string>
-    <string name="quick_action_take_photo_note_descr">Tocar no botão de ação adicionará uma nota de foto no local do centro da tela.</string>
-    <string name="quick_action_add_osm_bug_descr">Tocar no botão de ação adicionará uma nota OSM no local do centro da tela.</string>
-    <string name="quick_action_add_poi_descr">Tocar no botão de ação adicionará um POI no local do centro da tela.</string>
+    <string name="quick_action_take_audio_note_descr">Tocar no botão de ação adicionará uma nota de áudio no meio da tela.</string>
+    <string name="quick_action_take_video_note_descr">Tocar no botão de ação adicionará uma nota de vídeo no meio da tela.</string>
+    <string name="quick_action_take_photo_note_descr">Tocar no botão de ação adicionará uma nota de foto no meio da tela.</string>
+    <string name="quick_action_add_osm_bug_descr">Tocar no botão de ação adicionará uma nota OSM no meio da tela.</string>
+    <string name="quick_action_add_poi_descr">Tocar no botão de ação adicionará um POI no meio da tela.</string>
     <string name="quick_action_navigation_voice_descr">Tocar no botão de ação irá ativar ou desativar a orientação por voz durante a navegação.</string>
     <string name="quick_action_interim_dialog">Mostrar um diálogo intermediário</string>
     <string name="favorite_autofill_toast_text">" está salvo no "</string>
@@ -2648,16 +2676,16 @@ Pôr do Sol: %2$s</string>
     <string name="quick_action_add_create_items">Criar itens</string>
     <string name="quick_action_add_configure_map">Configurar mapa</string>
     <string name="quick_action_add_navigation">Navegação</string>
-    <string name="quick_action_fav_name_descr">Deixe em branco para automaticamente usar o endereço ou nome de lugar.</string>
-    <string name="quick_action_bug_descr">Esta mensagem será autocompletada no campo de comentário.</string>
+    <string name="quick_action_fav_name_descr">Deixe em branco para usar o endereço ou nome de lugar.</string>
+    <string name="quick_action_bug_descr">Esta mensagem é incluído no campo de comentário.</string>
     <string name="quick_action_bug_message">Mensagem</string>
     <string name="quick_action_category_descr">Selecione a categoria para salvar o favorito.</string>
     <string name="quick_action_gpx_category_descr">Selecione uma categoria opcional.</string>
     <string name="quick_action_poi_list">Lista de POIs</string>
-    <string name="quick_action_sh_poi_descr">Você pode adicionar uma ou mais categorias de POI para exibir no mapa.</string>
-    <string name="quick_action_page_list_descr">Tocar no botão de ação irá percorrer a lista abaixo.</string>
+    <string name="quick_action_sh_poi_descr">Adicionar uma ou mais categorias de POI para exibir no mapa.</string>
+    <string name="quick_action_page_list_descr">Tocar nas páginas deste botão de ação na lista abaixo.</string>
     <string name="quick_action_map_style_action">Adicionar um estilo de mapa</string>
-    <string name="quick_action_empty_param_error">Parâmetros não podem ficar em branco</string>
+    <string name="quick_action_empty_param_error">Preencha todos os parâmetros</string>
     <string name="quick_action_map_styles">Estilos de mapa</string>
     <string name="quick_action_map_overlay">Mudar camada superior de mapa</string>
     <string name="quick_action_map_overlay_title">Camada superior de mapa</string>
@@ -2674,7 +2702,7 @@ Pôr do Sol: %2$s</string>
     <string name="quick_action_btn_tutorial_title">Mudar posição do botão</string>
     <string name="quick_action_btn_tutorial_descr">Segure e arraste o botão para mudar a sua posição na tela.</string>
     <string name="shared_string_action_name">Nome da ação</string>
-    <string name="mappilary_no_internet_desc">Você precisa de internet para ver as fotos do Mapillary.</string>
+    <string name="mappilary_no_internet_desc">Você precisa estar conectado à Internet para ver fotos do Mapillary.</string>
     <string name="retry">Repetir</string>
     <string name="add_route_points">Adicionar Pontos de Rota</string>
     <string name="add_waypoint">Adicionar Ponto de Passagem</string>
@@ -2683,11 +2711,11 @@ Pôr do Sol: %2$s</string>
     <string name="save_route_point">Salvar Ponto de Rota</string>
     <string name="waypoint_one">Ponto de Passagem 1</string>
     <string name="route_point_one">Ponto de Rota 1</string>
-    <string name="empty_state_my_tracks">Adicionar e Gravar Trilhas</string>
-    <string name="empty_state_my_tracks_desc">Grave e importe trilhas para ver.</string>
-    <string name="empty_state_favourites">Adicionar Favoritos</string>
-    <string name="empty_state_favourites_desc">Adicionar favoritos no mapa ou importá-los de um arquivo.</string>
-    <string name="import_track">Importar trilha</string>
+    <string name="empty_state_my_tracks">Adicione arquivos GPX</string>
+    <string name="empty_state_my_tracks_desc">Importe arquivos GPX ou grave trilhas.</string>
+    <string name="empty_state_favourites">Adicione Favoritos</string>
+    <string name="empty_state_favourites_desc">Importe Favoritos ou adicione novos marcando pontos do mapa.</string>
+    <string name="import_track">Importar arquivo GPX</string>
     <string name="move_point">Mover Ponto</string>
     <string name="osm_recipients_label">Destinatários OSM</string>
     <string name="osmand_plus_extended_description_part6">Recursos de ciclismo e pedestre
@@ -2735,7 +2763,7 @@ Pôr do Sol: %2$s</string>
     <string name="touring_view_renderer">Vista de turismo</string>
     <string name="nautical_renderer">Náutico</string>
     <string name="copy_location_name">Copiar nome de Ponto/POI</string>
-    <string name="toast_empty_name_error">O local não tem nome</string>
+    <string name="toast_empty_name_error">Localização sem nome</string>
     <string name="tunnel_warning">Túnel à frente</string>
     <string name="distance_farthest">Distância: o mais distante primeiro</string>
     <string name="distance_nearest">Distância: o mais próximo primeiro</string>
@@ -2752,7 +2780,7 @@ Pôr do Sol: %2$s</string>
 	<string name="south_abbreviation">S</string>
 	<string name="north_abbreviation">N</string>
 	<string name="optional_point_name">Nome do ponto opcional</string>
-    <string name="transport_nearby_routes_within">Rotas próximas a</string>
+    <string name="transport_nearby_routes_within">Linhas próximas a</string>
     <string name="transport_nearby_routes">Cerca de</string>
     <string name="enter_the_file_name">Digite o nome do arquivo.</string>
     <string name="map_import_error">Erro de importação de mapa</string>
@@ -2786,7 +2814,13 @@ Pôr do Sol: %2$s</string>
 \n• Exiba POIs (pontos de interesse) próximos
 \n• Exiba imagens online especializadas, vista de satélite (do Bing), diferentes camadas como trilhas de navegação GPX e camadas adicionais com transparência personalizável
 \n• Opcionalmente exiba nomes de lugares em inglês, língua local ou fonético</string>
-    <string name="osmand_plus_extended_description_part4">Use dados OSM e da Wikipédia • Informações de alta qualidade dos melhores projetos colaborativos do mundo • Dados OSM disponíveis por país ou região • POIs da Wikipédia, ótimo para visitas turísticas • Downloads grátis ilimitados, diretamente do aplicativo • Mapas vetoriais offline compactos e atualizados mensalmente • Seleção entre região completa ou apenas rede rodoviária (Exemplo: Japão inteiro tem 700 MB ou apenas 200 MB para rede rodoviária)</string>
+    <string name="osmand_plus_extended_description_part4">Use dados OSM e da Wikipédia 
+\n• Informações de alta qualidade dos melhores projetos colaborativos do mundo 
+\n• Dados OSM disponíveis por país ou região 
+\n• POIs da Wikipédia, ótimo para visitas turísticas 
+\n• Downloads grátis ilimitados, diretamente do aplicativo 
+\n• Mapas vetoriais offline compactos e atualizados mensalmente 
+\n• Seleção entre região completa ou apenas rede rodoviária (Exemplo: Japão inteiro tem 700 MB ou apenas 200 MB para rede rodoviária)</string>
     <string name="online_webpage_warning">Página disponível só online. Abrir num navegador web?</string>
     <string name="images_cache">Cache de imagens</string>
     <string name="delete_search_history">Apagar histórico de pesquisa</string>
@@ -2838,7 +2872,7 @@ Pôr do Sol: %2$s</string>
     <string name="purchase_dialog_subtitle">Escolha o item adequado:</string>
     <string name="download_wikipedia_label">Baixar dados da Wikipédia</string>
     <string name="open_in_browser_wiki">Abrir artigo online</string>
-    <string name="open_in_browser_wiki_description">Ver este artigo no navegador.</string>
+    <string name="open_in_browser_wiki_description">Veja o artigo em um navegador.</string>
     <string name="download_wiki_region_placeholder">esta região</string>
     <string name="unlock_all_features">Desbloquear todos os recursos OsmAnd</string>
 
@@ -2851,12 +2885,12 @@ Pôr do Sol: %2$s</string>
 
     <string name="maps_you_need_descr">Baseado nos artigos que você marcou, recomendamos você baixar os seguintes mapas:</string>
     <string name="maps_you_need">Mapas que você precisa</string>
-    <string name="travel_card_download_descr">Baixe guias de viagem Wikivoyage para ver os artigos sobre lugares ao redor do mundo sem uma conexão à Internet.</string>
+    <string name="travel_card_download_descr">Baixe os guias de viagem Wikivoyage para ver artigos sobre lugares ao redor do mundo sem conexão à Internet.</string>
 	<string name="welcome_to_open_beta_description">Os guias de viagem atualmente baseiam-se no Wikivoyage. Teste todos os recursos durante o teste beta aberto, de graça. Depois, os guias estarão disponíveis para assinantes OsmAnd Unlimited e proprietários do OsmAnd+.</string>
     
     <string name="download_wikipedia_description">Baixe artigos da Wikipédia por %1$s para lê-los offline.</string>
     <string name="wiki_article_search_text">Procurando o artigo wiki correspondente</string>
-    <string name="shared_string_bookmark">Marcador</string>
+    <string name="shared_string_bookmark">Marcar</string>
     <string name="hide_full_description">Ocultar descrição completa</string>
     <string name="show_full_description">Mostrar descrição completa</string>
     <string name="open_wikipedia_link_online_description">O link será aberto em um navegador web.</string>
@@ -2875,9 +2909,9 @@ Pôr do Sol: %2$s</string>
     <string name="open_wikipedia_link_online">Abrir link da Wikipedia online</string>
     <string name="read_wikipedia_offline_description">Assine OsmAnd Live para ler artigos da Wikipédia e Wikivoyage offline.</string>
     <string name="ski_map_render_descr">Estilo esqui. Principais características: processa pistas, teleféricos e outros recursos de esqui de forma conveniente. Objetos de mapa secundário menos distrativos.</string>
-    <string name="error_notification_desc">Favor enviar a captura de tela desta notificação para support@osmand.net</string>
+    <string name="error_notification_desc">Favor enviar uma captura de tela desta notificação para support@osmand.net</string>
     <string name="quick_action_edit_actions">Editar ações</string>
-    <string name="start_editing_card_description">Você pode e deve editar qualquer artigo do Wikivoyage. Compartilhe conhecimento, experiência, talento e sua atenção</string>
+    <string name="start_editing_card_description">Você pode e é convidado a editar qualquer artigo do Wikivoyage. Compartilhe conhecimento, experiência, talento e sua atenção</string>
     <string name="coord_input_edit_point">Editar ponto</string>
     <string name="coord_input_add_point">Adicionar ponto</string>
     <string name="coord_input_save_as_track">Salvar como trilha</string>
@@ -2938,17 +2972,100 @@ Pôr do Sol: %2$s</string>
     <string name="shared_string_world">Mundo</string>
     <string name="thank_you_for_feedback">Obrigado por comentar</string>
     <string name="poi_cannot_be_found">Nó ou caminho não pode ser encontrado.</string>
-    <string name="search_no_results_feedback">Nenhum resultado de pesquisa?
-\nMande-nos seu comentário</string>
+    <string name="search_no_results_feedback">Nenhum resultado de pesquisa\? 
+\nMande-nos o seu comentário</string>
     <string name="commiting_way">Enviando caminho…</string>
-    <string name="increase_search_radius_to">Aumentar o raio de pesquisa para %1$s</string>
+    <string name="increase_search_radius_to">Aumentar raio de pesquisa para %1$s</string>
     <string name="send_search_query">Enviar consulta de pesquisa?</string>
     <string name="ask_for_location_permission">Por favor, dê permissão ao OsmAnd para ver a sua localização para continuar.</string>
     <string name="markers_remove_dialog_msg">Apagar marcador de mapa \'%s\'\?</string>
     <string name="edit_map_marker">Editar marcador de mapa</string>
     <string name="third_party_application">Aplicativo de terceiros</string>
     <string name="search_street">Pesquisar rua</string>
-    <string name="start_search_from_city">Iniciar pesquisa a partir da cidade</string>
+    <string name="start_search_from_city">Selecione a cidade primeiro</string>
     <string name="shared_string_restore">Restaurar</string>
     <string name="rendering_value_black_name">Preto</string>
-    </resources>
+    <string name="more_transport_on_stop_hint">Esta parada tem outros meios de transporte.</string>
+    <string name="keep_passed_markers">Manter os marcadores visitados no mapa</string>
+    <string name="keep_passed_markers_descr">Marcadores adicionados como grupo de Favoritos ou pontos de passagem GPX marcados como Visitado permanecerão no mapa. Se o grupo não estiver ativo, os marcadores desaparecerão do mapa.</string>
+    <string name="release_3_2_pre">• Corrigida a falha na inicialização que ocorria em alguns dispositivos.
+\n
+\n• Novo recurso de Marcadores: apresenta os marcadores que já foram percorridos.
+\n
+\n• Histórico de pesquisa agora mostra as categorias que você pesquisou anteriormente.
+\n
+\n• Corrigida a falha na inicialização que ocorria com os mapas não-latinos.
+\n
+\n• Reduz problemas com a velocidade de processamento nos dispositivos Android 8.0.
+\n
+\n• Suporte para edição de objetos poligonais (exceto utilidades).
+\n
+\n• Medição de distância: adiciona botão Medição em Ações no menu de contexto.
+\n
+\n</string>
+    <string name="test_voice_desrc">Toque num botão e ouça a correspondente voz de comando para identificar os comandos faltantes ou com falha.</string>
+<string name="osm_live_plan_pricing">Planos</string>
+    <string name="osm_live_payment_monthly_title">Pague mensalmente</string>
+    <string name="osm_live_payment_3_months_title">Pague 3 meses</string>
+    <string name="osm_live_payment_annual_title">Pague 1 ano</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s ao mês</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s ao mês</string>
+    <string name="osm_live_payment_discount_descr">Menos %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Sua assinatura atual</string>
+    <string name="osm_live_payment_renews_monthly">Renova mensalmente</string>
+    <string name="osm_live_payment_renews_annually">Renova anualmente</string>
+    <string name="osm_live_payment_renews_quarterly">Renova trimestralmente</string>
+    <string name="powered_by_osmand">Distribuído por OsmAnd</string>
+    <string name="default_price_currency_format">%1$,2f %2$s</string>
+    <string name="osm_live_payment_header">Selecione o período de pagamento conveniente para você:</string>
+    <string name="osm_live_payment_contribute_descr">Parte da renda vai para os contribuidores do OpenStreetMap.</string>
+    <string name="release_3_1">• Navegação: corrige barra de progresso, inversão rápida de início e fim de rota
+\n
+\n• Marcadores de mapa: corrige ligar/desligar grupos, habilidade para ocultar os marcadores do mapa
+\n
+\n• Edição OSM: habilidade para editar etiquetas de objetos não pontuais e caminhos, corrige falta de comentários em notas, backup de edições
+\n
+\n• Melhora análise da Wikipédia e Wikivoyage, arquivos atualizados já estão disponíveis
+\n
+\n• Menu de contexto: corrige a cor de escudos de rodovias no modo noite, corrige tamanhos adicionais de menu
+\n
+\n• Navegação a barco: suporte para o canal navegável
+\n
+\n• Outras correções de bugs
+\n</string>
+    <string name="send_search_query_description">Enviaremos a sua pesquisa: <b>\"%1$s\"</b>, bem como a sua localização.<br/><br/> Não coletamos informação pessoal, só precisamos dos dados da pesquisa para melhorar o algorítimo de pesquisa.<br/></string>
+    <string name="osm_live_subscriptions">Assinaturas</string>
+    <string name="mapillary_menu_title_pano">Exibir só imagens 360°</string>
+    <string name="shared_string_launch">Iniciar</string>
+    <string name="run_full_osmand_header">Iniciar OsmAnd\?</string>
+    <string name="swap_start_and_destination">Trocar início e destino</string>
+    <string name="add_destination_point">Adicionar destino</string>
+    <string name="add_intermediate_point">Adicionar intermediário</string>
+    <string name="add_start_point">Adicionar ponto inicial</string>
+    <string name="intermediate_waypoint">Ponto intermediário: %1$s</string>
+    <string name="waypoints">Ponto de trajeto: %1$s</string>
+    <string name="transfers">transferências: %1$s</string>
+    <string name="on_foot">a pé: %1$s</string>
+    <string name="route_way">Via: %1$s</string>
+    <string name="points_of_interests">Ponto de interesse (PDI)</string>
+    <string name="waiting_for_route_calculation">Esperando por cálculo de rota</string>
+    <string name="app_mode_public_transport">Transporte público</string>
+    <string name="avoid_roads_descr">Selecione ruas no mapa ou da lista abaixo que você deseja evitar durante a navegação:</string>
+    <string name="show_along_the_route">Mostrar ao longo da rota</string>
+    <string name="simulate_navigation">Simular navegação</string>
+    <string name="choose_track_file_to_follow">Escolha arquivo de trilha para seguir</string>
+    <string name="voice_announcements">Avisos por voz</string>
+    <string name="intermediate_destinations">Destinos intermediários: %1$s</string>
+    <string name="arrive_at_time">Chegada em %1$s</string>
+    <string name="lang_gn_py">Guarani</string>
+    <string name="quick_action_switch_day_night_descr">Tocando neste botão de ação, alterne entre os modos Dia e Noite para OsmAnd</string>
+    <string name="quick_action_switch_day_mode">"Modo diurno "</string>
+    <string name="quick_action_switch_night_mode">"Modo noturno "</string>
+    <string name="quick_action_day_night_switch_mode">Alternar modo dia/noite</string>
+    <string name="run_full_osmand_msg">Você está usando {0} Mapa, que é alimentado por OsmAnd. Você quer iniciar a versão completa do OsmAnd\?</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Capacidade</string>
+    <string name="shared_string_width">Largura</string>
+    <string name="shared_string_height">Altura</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt/phrases.xml b/OsmAnd/res/values-pt/phrases.xml
index ee6a613595..d735e9f60d 100644
--- a/OsmAnd/res/values-pt/phrases.xml
+++ b/OsmAnd/res/values-pt/phrases.xml
@@ -325,4 +325,8 @@
 	<string name="poi_motorcycle_type">Tipo de motocicleta</string>
 	<string name="poi_animal_shelter_type">Animais aceites</string>
 	<string name="poi_operational_status">Estado operacional</string>
+	<string name="poi_fuel_avia_type">Tipo de combustível (aviação)</string>
+	<string name="poi_self_service">Self-Service</string>
+	<string name="poi_city_capital">Capital</string>
+	<string name="poi_pharmacy_dispensing">Dispensa</string>
 	</resources>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 7711efe44a..3f5033e5d2 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="amenity_type_administrative">Administrativo</string>
   <string name="amenity_type_barrier">Barreira</string>
   <string name="amenity_type_education">Educação</string>
@@ -50,7 +50,7 @@
   <string name="daynight_mode_sensor">Sensor de luz</string>
   <string name="daynight_descr">Definir regra para mudança entre modos dia e noite</string>
   <string name="daynight">Modo Dia/Noite</string>
-  <string name="download_files_question">Gostaria de baixar {0} arquivos ({1} MB)?</string>
+  <string name="download_files_question">Gostaria de descarregar {0} ficheiros ({1} MB)\?</string>
   <string name="items_were_selected">{0} objetos estão selecionados</string>
   <string name="filter_existing_indexes">Filtrar baixados</string>
   
@@ -60,8 +60,8 @@
   <string name="general_settings">Configurações Gerais</string>
   <string name="index_settings_descr">Obter e gerir dados para uso offline</string>
   <string name="index_settings">Gerir Ficheiros de mapa</string>
-  <string name="osmand_service">Serviço de segundo plano</string>
-  <string name="osmand_service_descr">Executar o serviço de segundo plano para usar OsmAnd enquanto a tela está desligada</string>
+  <string name="osmand_service">Modo de fundo</string>
+  <string name="osmand_service_descr">Executar o serviço de segundo plano para usar OsmAnd enquanto o ecrã está desligado.</string>
   <string name="fast_route_mode">Caminho mais rápido</string>
   <string name="fast_route_mode_descr">Ative para calcular a rota mais rápida ou desative para calcular a rota mais curta </string>
   <string name="tiles_to_download_estimated_size">Zoom {0}: baixar {1} imagens ({2} MB )</string>
@@ -79,11 +79,11 @@
   <string name="renderers_descr">Escolha a aparência dos mapas vetoriais</string>
   <string name="poi_context_menu_website">Veja o site do POI</string>
   <string name="poi_context_menu_call">Mostrar o número de telefone do POI</string>
-  <string name="website">Website</string>
+  <string name="website">Site</string>
   <string name="phone">Telefone</string>
   <string name="download_type_to_filter">Filtro</string>
   <string name="use_high_res_maps">Mapa de alta resolução</string>
-  <string name="use_high_res_maps_descr">Utilizar mapas de alta resolução para dispositivos com alta densidade de tela</string>
+  <string name="use_high_res_maps_descr">Utilizar mapas de alta resolução para dispositivos com alta densidade de ecrã.</string>
   <string name="unknown_location">Posição atual desconhecida</string>
   
   <string name="context_menu_item_search_transport">Procurar transportes</string>
@@ -96,7 +96,7 @@
   <string name="no_vector_map_loaded">Nenhum mapa vetorial foi carregado</string>
   <string name="gpx_option_reverse_route">Caminho reverso</string>
   
-  <string name="gpx_files_not_found">Nenhum arquivo GPX encontrado no diretório /tracks</string>
+  <string name="gpx_files_not_found">Nenhum ficheiro GPX encontrado na pasta tracks</string>
   <string name="layer_gpx_layer">Rota GPX…</string>
   <string name="error_reading_gpx">Erro na leitura de dados GPX</string>
   <string name="vector_data">Mapas vetoriais offline</string>
@@ -112,12 +112,12 @@
   <string name="rotate_map_to_bearing">Rotação do mapa</string>
   <string name="show_route">Mostrar rota</string>
   <string name="fav_imported_sucessfully">Importação dos Favoritos bem sucedida</string>
-  <string name="fav_file_to_load_not_found">O arquivo GPX contendo os favoritos não foi encontrado em {0}</string>
+  <string name="fav_file_to_load_not_found">O ficheiro GPX contendo os favoritos não foi encontrado em {0}</string>
   <string name="fav_saved_sucessfully">Favoritos gravados com sucesso em {0}</string>
   <string name="no_fav_to_save">Nenhum favorito para gravar</string>
   <string name="shared_string_import">Importar</string>
   
-  <string name="error_occurred_loading_gpx">Erro ao carregar o arquivo GPX</string>
+  <string name="error_occurred_loading_gpx">Erro ao carregar o ficheiro GPX</string>
   <string name="send_report">Enviar o relatório</string>
   <string name="none_region_found">Nenhuma região encontrada no cartão SD. Tente fazer o download a partir da Internet.</string>
   <string name="poi_namefinder_query_empty">Parâmetros de pesquisa para encontrar o POI</string>
@@ -127,7 +127,7 @@
   <string name="layer_yandex_traffic">Tráfego Yandex</string>
   <string name="layer_route">Rota</string>
   <string name="shared_string_favorites">Favoritos</string>
-  <string name="layer_osm_bugs">Bugs OSM</string>
+  <string name="layer_osm_bugs">Anotações OSM (on-line)</string>
   
   <string name="layer_poi">POI (Ponto de interesse)…</string>
   <string name="layer_map">Fonte dos mapas…</string>
@@ -169,7 +169,7 @@
   
   <string name="sd_unmounted">O cartão SD está inacessível. \n Será impossível ver mapas ou procurar coisas.</string>
   <string name="sd_mounted_ro">O cartão SD está disponível só para leitura. \nVocê não pode baixar da Internet, só pode visualizar os mapas pré-carregados.</string>
-  <string name="unzipping_file">Descomprimindo arquivo…</string>
+  <string name="unzipping_file">Descomprimindo ficheiro…</string>
   <string name="route_tr">Virar à direita e continuar em frente</string>
   <string name="route_tshr">Virar bruscamente à direita e continuar em frente</string>
   <string name="route_tslr">Virar levemente à direita e continuar em frente</string>
@@ -188,7 +188,7 @@
   <string name="map_orientation_portrait">Retrato</string>
   <string name="map_orientation_landscape">Paisagem</string>
   <string name="map_screen_orientation">Orientação do mapa</string>
-  <string name="map_screen_orientation_descr">Selecione a orientação da tela</string>
+  <string name="map_screen_orientation_descr">Retrato, paisagem ou dispositivo.</string>
   <string name="opening_hours_not_supported">O formato do horário de abertura não é suportado para edição</string>
   <string name="add_new_rule">Adicionar uma nova regra</string>
   <string name="transport_Routes">Rotas</string>
@@ -226,7 +226,7 @@
   <string name="search_nothing_found">Não foi encontrado nada</string>
   <string name="searching">Pesquisando…</string>
   <string name="searching_address">Pesquisando endereço …</string>
-  <string name="search_osm_nominatim">Pesquisar endereço via OSM Nominatim</string>
+  <string name="search_osm_nominatim">Pesquisa on-line usando OSM Nominatim</string>
   <string name="hint_search_online">Número, rua, cidade</string>
   <string name="search_offline_address">Offline</string>
   <string name="search_online_address">Internet</string>
@@ -239,12 +239,12 @@
   <string name="download_question">Quer fazer o download {0} - {1} ?</string>
   <string name="download_question_exist">Dados para {0} já existem ({1}). Você quer fazer atualizá-los ({2}) ?</string>
   <string name="address">Endereço</string>
-  <string name="shared_string_download_successful">Download do índice com sucesso</string>
+  <string name="shared_string_download_successful">Descarregado</string>
   
   
   
   <string name="downloading_list_indexes">Baixando lista de regiões disponíveis…</string>
-  <string name="list_index_files_was_not_loaded">Os arquivos de índice não puderam ser recuperados de osmand.net.</string>
+  <string name="list_index_files_was_not_loaded">Não foi possível obter uma lista de regiões em https://osmand.net.</string>
   <string name="select_index_file_to_download">Se você não encontra a sua região, você pode criá-la. (Veja http://osmand.net).</string>
   
   <string name="fav_points_edited">O favorito foi modificado</string>
@@ -282,7 +282,7 @@
   <string name="shared_string_close">Fechar</string>
   <string name="loading_data">Carregando dados…</string>
   <string name="reading_indexes">Lendo dados locais…</string>
-  <string name="previous_run_crashed">Uma execução anterior da aplicação foi interrompida inesperadamente. O arquivo de log encontra-se em {0}. Por favor, informe o problema e inclua o arquivo de log.</string>
+  <string name="previous_run_crashed">Uma execução anterior da aplicação foi interrompida inesperadamente. O ficheiro de log encontra-se em {0}. Por favor, informe o problema e inclua o ficheiro de log.</string>
   <string name="saving_gpx_tracks">Salvando trilhas GPX no cartão SD…</string>
   <string name="finished_task">Concluído</string>
   
@@ -292,14 +292,14 @@
   <string name="use_online_routing_descr">Utilizar Internet para calcular a rota</string>
   <string name="use_online_routing">Utilizar navegação online</string>
   
-  <string name="user_password">Senha</string>
+  <string name="user_password">Sua palavra-passe OSM</string>
   <string name="osm_settings_descr">Definir os parâmetros de conexão OpenStreetMap</string>
   
   <string name="data_settings_descr">Definir o idioma, atualizar os dados</string>
   <string name="data_settings">Dados</string>
   
   <string name="osm_settings">OSM</string>
-  <string name="auto_zoom_map_descr">Zoom automático em função da sua velocidade</string>
+  <string name="auto_zoom_map_descr">O nível de Zoom de acordo com a sua velocidade (enquanto o mapa é sincronizado com a posição atual).</string>
   <string name="auto_zoom_map">Zoom automático do mapa</string>
   <string name="additional_settings">Outras definições</string>
   <string name="settings_preset_descr">A visão do mapa e as configurações de navegação são guardadas por perfil. Defina aqui o seu.</string>
@@ -320,7 +320,7 @@
   
   
   
-  <string name="shared_string_add_to_favorites">Adicionar aos Favoritos</string>
+  <string name="shared_string_add_to_favorites">Adicionar aos \'Favoritos\'</string>
   <string name="use_english_names_descr">Escolher entre os nomes nativos e inglês</string>
   <string name="use_english_names">Utilizar nomes em inglês</string>
   <string name="app_settings">Configurações da aplicação</string>
@@ -335,8 +335,8 @@
   <string name="show_view_angle">Mostrar ângulo de visão</string>
   <string name="map_view_3d_descr">Ativar a visualização em 3D do mapa</string>
   <string name="map_view_3d">Visualização em 3D</string>
-  <string name="show_poi_over_map_description">Mostrar POI no mapa (use o último filtro)</string>
-  <string name="show_poi_over_map">Mostrar POI</string>
+  <string name="show_poi_over_map_description">Mostrar a camada superior últimamente selecionada de POI no mapa.</string>
+  <string name="show_poi_over_map">Mostrar camada superior de POI</string>
   <string name="map_tile_source_descr">Escolha a fonte de imagens de mapa online ou offline</string>
   <string name="map_tile_source">Fonte de imagens</string>
   <string name="map_source">Origem do mapa</string>
@@ -405,7 +405,7 @@
   
   
   <string name="osb_comment_dialog_success">Comentário adicionado</string>
-  <string name="osb_comment_dialog_error">Erro: o comentário não foi adicionado</string>
+  <string name="osb_comment_dialog_error">Não foi possível adicionar um comentário</string>
   
   
   
@@ -451,32 +451,32 @@
   
   <string name="unknown_from_location">Precisa definir um Ponto de partida</string>
   <string name="modify_transparency">Modificar a transparência (0 - transparente, 255 - opaco)</string>
-  <string name="confirm_interrupt_download">Quer interromper o download de arquivos?</string>
+  <string name="confirm_interrupt_download">Quer interromper o descarregamento de ficheiros\?</string>
   <string name="basemap_was_selected_to_download">O Mapa-Base é necessário para o funcionamento adequado da aplicação e foi seleccionado para download.</string>
-  <string name="local_indexes_cat_tile">Online maps (tiles)</string>
+  <string name="local_indexes_cat_tile">Quadrículas de mapa on-line e em cache</string>
   <string name="local_indexes_cat_map">Mapas offline (vectoriais)</string>
   
-  <string name="map_online_plugin_is_not_installed">Activar plugin de mapas on-line para seleccionar diferentes fontes de mapas</string>
-  <string name="map_online_data">Mapas Online e Mosaicos</string>
+  <string name="map_online_plugin_is_not_installed">Activar plugin de \'mapas on-line\' para seleccionar diferentes fontes de mapas</string>
+  <string name="map_online_data">Mapas On-line e Mosaicos</string>
   <string name="map_online_data_descr">Usar mapas on-line (obter e armazenar mosaicos no cartão SD)</string>
-  <string name="shared_string_online_maps">Mapas Online</string>
+  <string name="shared_string_online_maps">Mapas On-line</string>
   <string name="online_map_settings_descr">Configurar fontes de mosaicos ou de mapas on-line</string>
   
   
   <string name="osmand_rastermaps_plugin_description">"Com este plugin, pode ter acesso a muitos tipos de mapas on-line (também chamada de quadrícula ou ladrilho), de quadrículas pré-definidas do OpenStreetMap (como Mapnik) para imagens de satélite e camadas especiais, como mapas aquáticos, climáticos, geológicos, camadas de sombra de relevo, etc.\n\nQuaisquer desses mapas podem ser usados como mapa principal (base) para ser mostrado no OsmAnd, ou como uma sobreposição, ou sub-camada para outro mapa base (como o mapa off-line normal de OsmAnd). Para fazer qualquer sub-camada do mapa mais visível, certos elementos do mapa vetorial do OsmAnd podem facilmente ser ocultados através do menu \'Configurar mapa\'.
 \n\nQuadrículas de mapas podem ser obtidas diretamente através de fontes on-line ou podem ser preparados para uso off-line (e copiadas manualmente para o diretório de dados do OsmAnd) como um banco de dados sqlite, que pode ser produzido por uma variedade de ferramentas de terceiros para preparação de mapas. "</string>
-  <string name="osmand_background_plugin_description">This plugin allows tracking or navigation in sleep (screen off) mode by periodically waking up the GPS device.</string>
-  <string name="osmand_accessibility_description">Mostrar configurações de características especiais de acessibilidade.</string>
+  <string name="osmand_background_plugin_description">Mostra as configurações para ativar o rastreamento em segundo plano e a navegação, despertando periodicamente o dispositivo GPS (com o ecrã desligado).</string>
+  <string name="osmand_accessibility_description">Este plugin torna os recursos de acessibilidade do dispositivo disponíveis diretamente no OsmAnd. Ele facilita, p. ex., o ajuste da velocidade de fala para vozes TTS, configurando a navegação no ecrã do teclado direcional, usando um trackball para controle de zoom, ou feedback texto-para-fala, por exemplo, para anunciar automaticamente a sua posição.</string>
   
   
   
-  <string name="osmand_development_plugin_description">This plugin enables development and debugging features like animated navigation or rendering performance display.</string>
+  <string name="osmand_development_plugin_description">Este plugin exibe configurações para recursos de desenvolvimento e depuração como testar ou simular roteamento, o desempenho de renderização do ecrã ou solicitação de voz. Essas configurações são destinadas a desenvolvedores e não são necessárias para o usuário geral.</string>
   <string name="plugins_screen">Gerenciar plugins</string>
   
   <string name="prefs_plugins_descr">Plugins activam as configurações avançadas e funcionalidades adicionais</string>
   <string name="prefs_plugins">Gerenciar plugins</string>
   
-  <string name="osm_editing_plugin_description">This plugin facilitates OSM feedback like collecting / modifying OSM POI objects, opening / commenting OSM bugs, and contributing recorded GPX files (requires OSM credentials).</string>
+  <string name="osm_editing_plugin_description">Este complemento do OsmAnd pode ser usado para fazer contribuições ao OSM como criar ou modificar POI, abertura ou comentários de erros do OSM e contribuir com ficheiros GPX gravados. OSM é um projeto de mapeamento mundial dirigido pela comunidade e de domínio público. Para mais detalhes, consulte https://openstreetmap.org. Participação ativa é apreciada e as contribuições podem ser feitas diretamente do OsmAnd, se você especificar suas credenciais pessoais de OSM no app.</string>
   <string name="vector_maps_may_display_faster_on_some_devices">Mapas vectoriais são visualizados mais rápido. Podem não funcionar bem em alguns dispositivos.</string>
   
   <string name="play_commands_of_currently_selected_voice">Tocar comandos de voz actualmente seleccionada</string>
@@ -484,13 +484,13 @@
   <string name="native_rendering">Renderização nativa</string>
   
   <string name="test_voice_prompts">Testar comandos de voz</string>
-  <string name="switch_to_raster_map_to_see">Nenhum mapa vetorial presente para este local .  Você pode baixar um em Configurações (Gerenciar arquivos de mapas ) , ou mudar para mapas online ( activar mapas on-line do plugin para isso).</string>
+  <string name="switch_to_raster_map_to_see">"Nenhum mapa vetorial presente para este local. Você pode baixar um em Configurações (\'Gerenciar ficheiros de mapas\') ou mudar para mapas online  (activar mapas on-line do plugin para isso)."</string>
   
-  <string name="send_files_to_osm">Enviar arquivos GPX para o OSM?</string>
+  <string name="send_files_to_osm">Enviar ficheiros GPX para o OSM\?</string>
   <string name="gpx_visibility_txt">Visibilidade</string>
   <string name="gpx_tags_txt">Etiquetas</string>
   <string name="gpx_description_txt">Descrição</string>
-  <string name="validate_gpx_upload_name_pwd">Especifique o nome e senha de utilizador do OSM para upload de arquivos GPX.</string>
+  <string name="validate_gpx_upload_name_pwd">Especifique o nome e palavra-passe de utilizador do OSM para enviar ficheiros de GPX.</string>
   <string name="default_buttons_support">Apoiar</string>
   <string name="support_new_features">Apoiar novas funcionalidades</string>
   
@@ -555,20 +555,20 @@
   
   <string name="update_poi_does_not_change_indexes">As alterações são apenas armazenadas na memória local. Para serem introduzidas nos mapas tem que ir a \"Editar Offline\" -&gt; \"Enviar\".</string>
   <string name="local_openstreetmap_uploading">A enviar…</string>
-  <string name="local_openstreetmap_were_uploaded">{0} POI/Bugs foram enviados</string>
+  <string name="local_openstreetmap_were_uploaded">{0} POIs/Anotações enviados</string>
   <string name="local_openstreetmap_uploadall">Enviar todos</string>
   
   <string name="local_openstreetmap_upload">Enviar a modificação OSM</string>
   <string name="local_openstreetmap_delete">Apagar modificação</string>
   <string name="local_openstreetmap_descr_title">Edição assíncrona de OSM:</string>
-  <string name="local_openstreetmap_settings">POI/Bugs armazenados na memória local</string>
-  <string name="local_openstreetmap_settings_descr">Mostrar e gerir Pontos de Interesse e Erros guardados na memória local</string>
+  <string name="local_openstreetmap_settings">POI/Anotações armazenados na memória local</string>
+  <string name="local_openstreetmap_settings_descr">Mostrar e gerenciar POIs/anotações OSM salvos localmente.</string>
   
   
-  <string name="live_monitoring_interval_descr">Especificar intervalo de monitoramento ao vivo</string>
-  <string name="live_monitoring_interval">Live tracking interval</string>
+  <string name="live_monitoring_interval_descr">Especificar intervalo de monitoramento on-line</string>
+  <string name="live_monitoring_interval">Intervalo de rastreamento on-line</string>
   <string name="live_monitoring_url_descr">Especifique o endereço web com a sintaxe de parâmetros: lat={0}, lon={1}, data/hora={2}, hdop={3}, altitude={4}, velocidade={5}, bearing={6}</string>
-  <string name="live_monitoring_url">Live tracking web address</string>
+  <string name="live_monitoring_url">Endereço web de rastreamento on-line</string>
   <string name="gpx_monitoring_disabled_warn">Registro de trajeto usando widget GPX ou via \'Gravação de viagem\' nas configurações.</string>
   <string name="show_current_gpx_title">Mostrar rota atual</string>
   
@@ -592,7 +592,7 @@
   <string name="index_name_tts_voice">Pacotes de vozes (TTS-Sintetizados,preferência)</string>
   
   <string name="amenity_type_user_defined">Definido pelo utilizador</string>
-  <string name="fav_export_confirmation">Já existe um arquivo de favoritos exportados anteriormente. Quer substitui-lo?</string>
+  <string name="fav_export_confirmation">Já existe um ficheiro de favoritos exportados anteriormente. Quer substitui-lo\?</string>
   <string name="profile_settings">Configurações específicas de Perfil</string>
   <string name="global_settings">Configurações Globais</string>
   <string name="global_app_settings">Configurações globais da aplicação</string>
@@ -604,7 +604,7 @@
   
   
   <string name="download_files_not_enough_space">Espaço livre insuficiente, precisa de %1$s MB (só tem: %2$s disponíveis).</string>
-  <string name="download_files_question_space">Agora tem {2} MB de espaço livre! Quer fazer o download de {0} arquivo(s) ({1} MB)?</string>
+  <string name="download_files_question_space">Descarregar {0} ficheiro(s)\? O espaço de armazenamento usado é {1} MB. (O espaço disponível é {2} MB.)</string>
   
   
   
@@ -638,7 +638,7 @@
   <string name="poi_query_by_name_matches_categories">Several POI categories found matching the query :</string>
   <string name="data_to_search_poi_not_available">Não existem dados locais para busca de POI.</string>
   <string name="old_poi_file_should_be_deleted">O ficheiro POI \'%1$s\' é repetido e pode ser apagado.</string>
-  <string name="update_poi_file_not_found">Não foi encontrado (e não pôde ser criado) o arquivo local para guardar as mudanças de POI.</string>
+  <string name="update_poi_file_not_found">Não foi encontrado (e não pôde ser criado) o ficheiro local para guardar as mudanças de POI.</string>
   <string name="button_upgrade_osmandplus">Upgrade para OsmAnd+</string>
   <string name="map_version_changed_info">O servidor contém mapas incompatíveis com a sua versão actual do Osmand. Precisa de actualizar o Osmand para uma versão mais recente.</string>
   <string name="shared_string_rename">Mudar o nome</string>
@@ -655,13 +655,13 @@
   <string name="select_search_position">Pesquisar próximo a:</string>
   <string name="context_menu_item_search">Pesquisar aqui perto</string>
   
-  <string name="shared_string_save_as_gpx">Guardar a rota como trilha GPX</string>
+  <string name="shared_string_save_as_gpx">Gravar como novo ficheiro GPX</string>
   <string name="route_successfully_saved_at">Rota guardada como \'%1$s\'.</string>
-  <string name="filename_input">O nome do arquivo : </string>
-  <string name="file_with_name_already_exist">Já existe um arquivo com o mesmo nome.</string>
+  <string name="filename_input">Nome de ficheiro:</string>
+  <string name="file_with_name_already_exist">Já existe um ficheiro com o mesmo nome.</string>
   <string name="shared_string_save">Salvar</string>
   
-  <string name="local_index_upload_gpx_description">Fazer upload de arquivos GPX para a comunidade OSM, para ajudar a melhorar os mapas.</string>
+  <string name="local_index_upload_gpx_description">Enviar ficheiros de GPX para a comunidade OSM, para ajudar a melhorar os mapas.</string>
   <string name="local_index_items_uploaded">%1$d de %2$d items enviados com sucesso.</string>
   <string name="local_index_mi_upload_gpx">Enviar para OSM</string>
   <string name="show_more_map_detail">Ver mais detalhes de mapa</string>
@@ -789,7 +789,9 @@
   <string name="context_menu_item_add_waypoint">Acrescentar ponto GPX</string>
   
   
-  <string name="osmand_routing_experimental">Navegação offline OamAnd é ainda uma função experimental e não funciona em distâncias superiores a cerca de 20 km.\n\nO Serviço Navegação está temporariamente mudado para CloudMade online.</string>
+  <string name="osmand_routing_experimental">Navegação OsmAnd off-line ainda é uma função experimental e não funciona em distâncias superiores a cerca de 20 km.
+\n
+\nO serviço de navegação está temporariamente mudado para CloudMade on-line.</string>
   <string name="specified_dir_doesnt_exist">Não foi possível encontrar diretório especificado.</string>
   <string name="application_dir">Local de armazenamento</string>
   
@@ -808,7 +810,7 @@
   <string name="rendering_attr_noPolygons_name">Ocultar polígonos</string>
   <string name="rendering_attr_appMode_name">Modo de Visualização</string>
   <string name="rendering_attr_appMode_description">Map optimization for respective User Profile</string>
-  <string name="rendering_attr_contourLines_description">Exibir a partir do nível de zoom (precisa arquivo SRTM):</string>
+  <string name="rendering_attr_contourLines_description">Exibição do nível de zoom (requer dados de contorno):</string>
   <string name="rendering_attr_contourLines_name">Mostrar curvas de nível</string>
   <string name="rendering_attr_hmRendered_description">Aumentar a quantidade de detalhe no mapa</string>
   <string name="rendering_attr_hmRendered_name">Ver mais detalhes no mapa</string>
@@ -839,7 +841,8 @@
   <string name="osmand_parking_pm">PM</string>
   <string name="osmand_parking_am">AM</string>
   <string name="osmand_parking_position_name">Local de estacionamento</string>
-  <string name="osmand_parking_plugin_description">Este plugin permite armazenar a localização do seu estacionamento, e quanto tempo resta de parquímetro (se houver limite de tempo).\nTanto a localização como o tempo são visíveis no \'Dashboard\', bem como no widget do mapa. Um lembrete de alarme pode ser adicionado ao calendário Android.</string>
+  <string name="osmand_parking_plugin_description">Este plugin grava onde o seu carro foi estacionado e quanto tempo de estacionamento resta (se houver um limite de tempo). 
+\nA localização e o tempo ficam visíveis no painel de controle do OsmAnd e em um widget no ecrã do mapa. Um alarme pode ser adicionado ao calendário Android como lembrete.</string>
   <string name="osmand_parking_plugin_name">Local de estacionamento</string>
   <string name="context_menu_item_add_parking_point">Marcar como local de estacionamento</string>
   <string name="context_menu_item_delete_parking_point">Apagar um marcador de estacionamento</string>
@@ -854,29 +857,29 @@
   <string name="osmand_parking_hours">Horas</string>
   <string name="osmand_parking_minutes">Minutos</string>
   <string name="osmand_parking_position_description_add_time">Estacionado em:</string>
-  <string name="use_compass_navigation_descr">Use compass in navigation when diretion is not detected</string>
+  <string name="use_compass_navigation_descr">Usar a bússola quando nenhuma direção for detectado de outra forma.</string>
   <string name="use_compass_navigation">Usar bússola</string>
   <string name="route_updated_loc_found">Route will be recalculated when location will be found</string>
   <string name="continue_follow_previous_route_auto">A navegação anterior não foi terminada, quer continua-la? (%1$s segundos)</string>
   
   
   
-  <string name="show_cameras">Mostrar radares</string>
+  <string name="show_cameras">Câmaras de controlo de velocidade</string>
   <string name="show_traffic_warnings">Mostrar limites de velocidade</string>
   <string name="avoid_toll_roads">Evitar portagens</string>
   
   <string name="map_widget_top_text">Nome da Rua</string>
-  <string name="map_widget_config">Configuração da tela</string>
+  <string name="map_widget_config">Configuração do ecrã</string>
   
   <string name="map_widget_back_to_loc">Onde estou</string>
-  <string name="map_widget_lock_screen">Bloquear tela</string>
+  <string name="map_widget_lock_screen">Bloquear ecrã</string>
   <string name="map_widget_compass">Bússola</string>
   
   <string name="map_widget_reset">Resetar para original</string>
   
   
   <string name="map_widget_parking">Estacionamento</string>
-  <string name="map_widget_monitoring">Gravação GPX</string>
+  <string name="map_widget_monitoring">GPX registo</string>
   <string name="map_widget_speed">Velocidade</string>
   <string name="map_widget_distance">Destino</string>
   <string name="map_widget_altitude">Altitude</string>
@@ -885,22 +888,23 @@
   <string name="map_widget_next_turn_small">Próxima manobra (menor)</string>
   <string name="map_widget_next_next_turn">Segunda próxima manobra</string>
   <string name="map_widget_mini_route">Mini mapa da rota</string>
-  <string name="bg_service_screen_lock">Travar/Destravar tela</string>
-  <string name="bg_service_screen_lock_toast">A tela esta travada</string>
+  <string name="bg_service_screen_lock">Travar/Destravar ecrã</string>
+  <string name="bg_service_screen_lock_toast">O ecrã esta bloqueado</string>
   <string name="bg_service_interval">Definir intervalo para activar:</string>
-  <string name="screen_is_locked">Para destravar a tela precione o cadeado</string>
-  <string name="bg_service_screen_unlock">Destravar tela</string>
+  <string name="screen_is_locked">Toque no ícone de cadeado para desbloquear o ecrã</string>
+  <string name="bg_service_screen_unlock">Desbloquear ecrã</string>
   <string name="bg_service_sleep_mode_off">Desligar
  modo oculto</string>
-  <string name="bg_service_sleep_mode_on">Parar\n modo oculto</string>
-<string name="show_warnings_title">Mostrar alarmes…</string>
-<string name="show_warnings_descr">Mostrar os limites de velocidade, câmeras de velocidade, redutores de velocidade, e outros avisos</string>
+  <string name="bg_service_sleep_mode_on">Parar
+\n modo segundo plano</string>
+<string name="show_warnings_title">Mostrar alertas…</string>
+<string name="show_warnings_descr">Configure avisos de trânsito (limites de velocidade, paradas forçadas, redutores de velocidade, túneis), alertas de câmera de velocidade e informações de pista.</string>
 <string name="avoid_motorway">Sem auto-estradas</string>
 
-<string name="snap_to_road_descr">Encaixe posição de estradas durante a navegação</string>
+<string name="snap_to_road_descr">Encaixe posição de estradas durante a navegação.</string>
 <string name="snap_to_road">Ajustar à estrada</string>
-<string name="osmand_short_description_80_chars">OsmAnd é uma aplicação de navegação de código aberto para mapas offline e online</string>
-<string name="osmand_plus_short_description_80_chars">OsmAnd é uma aplicação de navegação de código aberto para mapas offline e online</string>
+<string name="osmand_short_description_80_chars">OsmAnd é uma aplicação de navegação de código aberto para mapas off-line e on-line</string>
+<string name="osmand_plus_short_description_80_chars">OsmAnd é uma aplicação de navegação de código aberto para mapas off-line e on-line</string>
 <string name="filterpoi_activity">Criar filtro de POI</string>
 <string name="select_navigation_mode">Selecione o meio de transporte</string>
 <string name="day_night_info_description">Nascer do sol: %1$s
@@ -911,17 +915,17 @@
 <string name="map_widget_renderer">Estilo de renderização</string>
 
 
-<string name="layer_map_appearance">Configurar tela</string>
-<string name="show_lanes">Mostrar pistas</string>
+<string name="layer_map_appearance">Configurar ecrã</string>
+<string name="show_lanes">Mostrar faixas</string>
 <string name="avoid_unpaved">Evitar estradas não pavimentadas</string>
 <string name="avoid_ferries">Evite ferries</string>
 <string name="avoid_in_routing_title">Evitar…</string>
-<string name="avoid_in_routing_descr">Evitar estradas com portagem, não pavimentadas, balsas</string>
+<string name="avoid_in_routing_descr">Evitar por exemplo estradas com portagem, não pavimentadas, balsas.</string>
 <string name="map_widget_fluorescent">Rotas fluorescentes</string>
 <string name="map_widget_show_ruler">Regua</string>
 
 <string name="map_widget_view_direction">A direção da visão</string>
-<string name="map_widget_transparent">Pele transparente</string>
+<string name="map_widget_transparent">Widgets transparentes</string>
 
 
 <string name="gps_wakeup_interval">GPS intervalo de despertar: %s</string>
@@ -942,22 +946,22 @@
 <string name="rendering_attr_roadColors_description">Selecione um esquema de cores de estrada:</string>
 	<string name="rendering_attr_roadColors_name">Esquema de cores</string>
     <string name="map_widget_show_destination_arrow">Ver direção para o destino</string>
-    <string name="enable_plugin_monitoring_services">Habilitar plugin de rastreamento para utilizar serviços de registro de posição (log, acompanhamento ao vivo)</string>
+    <string name="enable_plugin_monitoring_services">Ativar plugin de gravação de viagem para usar serviços de registro de posição (registro GPX, rastreamento on-line)</string>
     <string name="non_optimal_route_calculation">Calcular rota possivelmente não-ideal em longas distâncias</string>
     <string name="gps_not_available">Ative o GPS nas configurações</string>
     <string name="map_widget_monitoring_services">Serviços de registro</string>
 	<string name="no_route">Sem rota</string>
-	<string name="delete_target_point">Remover o waypoint</string>
-	<string name="target_point">Ponto de trilha %1$s</string>
-    <string name="intermediate_point">Pnto de trilha %1$s</string>
-    <string name="context_menu_item_last_intermediate_point">Adicionar como último waypoint</string>
-    <string name="context_menu_item_first_intermediate_point">Adicionar como primeiro waypoint</string>
+	<string name="delete_target_point">Remover o destino</string>
+	<string name="target_point">Destino %1$s</string>
+    <string name="intermediate_point">Destino intermediário %1$s</string>
+    <string name="context_menu_item_last_intermediate_point">Adicionar como último destino intermediário</string>
+    <string name="context_menu_item_first_intermediate_point">Adicionar como último destino intermediário</string>
     <string name="add_as_last_destination_point">Adicionar como último ponto de passagem</string>
     <string name="add_as_first_destination_point">Adicionar como primeiro ponto de passagem</string>
     <string name="replace_destination_point">Substituir o ponto de destino</string>
-    <string name="new_destination_point_dialog">Já existe um ponto de destino definido.</string>
+    <string name="new_destination_point_dialog">Já existe um ponto de destino definido:</string>
     <string name="shared_string_target_points">Pontos de parada</string>
-    <string name="intermediate_point_too_far">Waypoint %1$s distante da estrada mais próxima.</string>
+    <string name="intermediate_point_too_far">O destino intermediário %1$s é longe demais da estrada mais próxima.</string>
     <string name="btn_advanced_mode">Modo avançado…</string>
     <string name="poi_filter_parking">Estacionamento</string>
     <string name="poi_filter_emergency">Emergência</string>
@@ -967,9 +971,9 @@
     <string name="poi_filter_restaurants">Restaurantes</string>
     <string name="poi_filter_sightseeing">Turismo</string>
     
-	<string name="context_menu_item_intermediate_point">Adicionar como ponto de passagem</string>
-    <string name="arrived_at_intermediate_point">Você chegou ao seu ponto de passagem</string>
-    <string name="map_widget_intermediate_distance">Ponto de passagem</string>
+	<string name="context_menu_item_intermediate_point">Adicionar como destino intermediário</string>
+    <string name="arrived_at_intermediate_point">Você chegou ao seu destino intermediário</string>
+    <string name="map_widget_intermediate_distance">Destino intermediário</string>
     <string name="ending_point_too_far">Destino muito longe da estrada mais próxima.</string>
     <string name="add_tag">Adicionar tag</string>
     
@@ -977,35 +981,35 @@
 	<string name="rendering_attr_showRoadMaps_description">Selecione quando exibir mapas somente de estradas:</string>
 	<string name="rendering_attr_showRoadMaps_name">Mapas de estradas</string>
     <string name="download_roads_only_item">Só Estradas</string>
-    <string name="download_regular_maps">Mapas normais</string>
-    <string name="download_roads_only_maps">Mapas de estradas</string>
-    <string name="safe_mode_description">Executar a aplicação em modo seguro (menos eficiente).</string>
+    <string name="download_regular_maps">Mapa padrão</string>
+    <string name="download_roads_only_maps">Mapas só de estradas</string>
+    <string name="safe_mode_description">Execute o aplicativo em modo de segurança (usando do código do Android mais lento em vez do nativo).</string>
     <string name="safe_mode">Modo seguro</string>
-    <string name="native_library_not_running">O aplicativo está sendo executado em modo seguro (desabilite em Configurações).</string>
-    <string name="background_service_is_enabled_question">Serviço em segundo plano ainda em execução. Deseja cancelá-lo?</string>
+    <string name="native_library_not_running">O aplicativo está sendo executado em modo seguro (desativar em \'Configurações\').</string>
+    <string name="background_service_is_enabled_question">O serviço de segundo plano OsmAnd ainda está em execução. Tambẽm pará-lo\?</string>
     <string name="close_changeset">Fechar conjunto de alterações</string>
 	
     
     
-    <string name="search_villages_and_postcodes">Pesquisa por CEP</string>
-	<string name="dropbox_plugin_description">O plugin Dropbox permite sincronizar trilhos e notas de vídeo/audio com a sua conta Dropbox.</string>
+    <string name="search_villages_and_postcodes">"Pesquisa mais povoações  / código postal"</string>
+	<string name="dropbox_plugin_description">O plugin Dropbox permite sincronizar trilhos e anotações de vídeo/audio com a sua conta Dropbox.</string>
     
     <string name="av_def_action_video">Gravar vídeo</string>
     <string name="av_def_action_audio">Gravar audio</string>
-    <string name="av_widget_action_descr">Escolha a acção widget padrão</string>
+    <string name="av_widget_action_descr">Selecione a ação de widget padrão.</string>
     <string name="av_widget_action">Ação widget padrão</string>
     <string name="av_video_format">Formato de saída de vídeo</string>
     <string name="av_use_external_recorder">Usar gravador externo</string>
-    <string name="av_settings_descr">Configurar definições de áudio e vídeo</string>
+    <string name="av_settings_descr">Configurar definições de áudio e vídeo.</string>
     <string name="av_settings">"Definições de áudio e vídeo " </string>
-    <string name="recording_error">Ocorreu um erro durante a gravação</string>
-    <string name="recording_camera_not_available">Câmera não está disponível</string>
-    <string name="recording_is_recorded">Áudio/vídeo está a ser gravado. Para parar pressione o botão de stop no widget.</string>
+    <string name="recording_error">A gravação falhou</string>
+    <string name="recording_camera_not_available">Câmera não disponível</string>
+    <string name="recording_is_recorded">Áudio/vídeo está a ser gravado. Para parar toque no AV widget.</string>
     <string name="recording_open_external_player">Abrir leitor externo</string>
-    <string name="recording_delete_confirm">Quer remover esta gravação?</string>
+    <string name="recording_delete_confirm">Apagar este item\?</string>
     
-    <string name="recording_context_menu_arecord">Fazer uma nota de áudio</string>
-    <string name="recording_context_menu_vrecord">Fazer uma nota de vídeo</string>
+    <string name="recording_context_menu_arecord">Fazer uma anotação de áudio</string>
+    <string name="recording_context_menu_vrecord">Fazer uma anotação de vídeo</string>
     <string name="layer_recordings">Camada de gravação</string>
     <string name="recording_can_not_be_played">A gravação não pode ser exibida</string>
     <string name="recording_context_menu_delete">Apagar a gravação</string>
@@ -1015,58 +1019,62 @@
     <string name="shared_string_map">Mapa</string>
     <string name="prefer_motorways">Preferir auto-estradas</string>
 	<string name="prefer_in_routing_title">Preferir-…</string>
-	<string name="prefer_in_routing_descr">Preferir Auto-Estradas</string>
+	<string name="prefer_in_routing_descr">Preferir auto-estradas.</string>
     
     <string name="max_speed_none">Nenhum</string>
     <string name="index_name_openmaps">OpenMaps UE</string>
     
     <string name="local_indexes_cat_av">Dados de Áudio/Vídeo</string>
     <string name="stop_routing_confirm">Quer parar a navegação?</string>
-    <string name="clear_dest_confirm">Confirma que deseja apagar o seu ponto de destino?</string>
-    <string name="precise_routing_mode_descr">Ativar o roteamento preciso para calcular rotas precisas sem falhas. É muito limitado pela distância e não usa a biblioteca nativa.</string>
+    <string name="clear_dest_confirm">Tem certeza de que deseja limpar o seu destino (e destinos intermediários)\?</string>
+    <string name="precise_routing_mode_descr">Calcule rotas precisas sem falhas. Ainda com distância limitada e lenta.</string>
     <string name="precise_routing_mode">Roteamento preciso (alfa)</string>
     <string name="recording_context_menu_precord">Tire uma foto</string>
     <string name="dropbox_plugin_name">Plugin Dropbox</string>
     <string name="intermediate_points_change_order">Alterar ordem</string>
-    <string name="srtm_paid_version_msg">Por favor, considere comprar o plugin Curvas de Nível (Contour Lines) na loja do Market para apoiar o desenvolvimento.</string>
+    <string name="srtm_paid_version_msg">Por favor, considere comprar o plugin \'Curvas de Nível\' (Contour Lines) na loja do Market para apoiar o desenvolvimento.</string>
     <string name="srtm_paid_version_title">Plugin curvas de nível</string>
     <string name="av_def_action_choose">Selecionar na altura</string>
-    <string name="av_video_format_descr">Selecione o formato de saída de vídeo</string>
-    <string name="av_use_external_recorder_descr">Usar gravador do sistema para vídeo</string>
-    <string name="av_use_external_camera_descr">Utilize aplicação do sistema para a foto</string>
+    <string name="av_video_format_descr">Selecione o formato de saída de vídeo.</string>
+    <string name="av_use_external_recorder_descr">Usar gravador do sistema para vídeo.</string>
+    <string name="av_use_external_camera_descr">Utilize aplicação do sistema para fotos.</string>
     <string name="av_use_external_camera">Use aplicativo da câmera</string>
     <string name="recording_playing">A tocar o áudio da gravação. \n%1$s</string>
     <string name="recording_unavailable">Indisponível</string>
-    <string name="recording_description">Gravar %1$s %2$s de %3$s</string>
+    <string name="recording_description">Gravação %1$s %3$s %2$s</string>
     <string name="recording_default_name">Gravação</string>
     <string name="shared_string_control_stop">Parar</string>
     <string name="shared_string_control_start">Iniciar</string>
-    <string name="map_widget_av_notes">Notas de Áudio/vídeo</string>
+    <string name="map_widget_av_notes">Anotações de Áudio/vídeo</string>
     <string name="osmand_srtm_short_description_80_chars">Plugin OsmAnd para curvas de nível off-line</string>
     
     
     
     
     <string name="map_widget_distancemeasurement">Medição da distância</string>
-    <string name="audionotes_location_not_defined">Local para associar com a nota ainda não está definido. \"Usar localização…\" para atribuir uma nota para o local especificado</string>
+    <string name="audionotes_location_not_defined">Local para associar com a anotação ainda não está definido. \"Usar posição…\" para atribuir uma anotação para o local especificado.</string>
     
-    <string name="map_widget_audionotes">Notas de áudio</string>
-    <string name="audionotes_plugin_description">O plugin de notas de áudio/vídeo fornece a funcionalidade para tomar notas de áudio/fotografia/vídeo durante uma viagem, usando um botão na tela do mapa ou diretamente do menu de contexto para qualquer posição no mapa.</string>
-    <string name="audionotes_plugin_name">Notas de Audio/vídeo</string>
+    <string name="map_widget_audionotes">Anotações de áudio</string>
+    <string name="audionotes_plugin_description">O plugin de anotações de áudio/vídeo fornece a funcionalidade para tomar notas de áudio/fotografia/vídeo durante uma viagem, usando um botão no ecrã do mapa ou diretamente do menu de contexto para qualquer posição no mapa.</string>
+    <string name="audionotes_plugin_name">Anotações de audio/vídeo</string>
     <string name="index_srtm_parts">Partes</string>
     <string name="index_srtm_ele">Curvas de nível</string>
     
     <string name="recording_photo_description">Foto %1$s de %2$s</string>
     <string name="av_def_action_picture">Capture uma foto</string>
-    <string name="osmand_srtm_long_description_1000_chars">"Este plugin disponibiliza \'Curvas de Nível\' e \'Sombras de Relevo\', que podem ser aplicadas nos mapas standard do OsmAnd.
-\nEstas funcionalidades podem ser apreciadas por atletas, caminhantes, e qualquer pessoa interessada na informação de relevo de uma paisagem.\n\nOs dados globais (entre as latitudes 70° norte e 70° sul) são baseados nas medições do SRTM (Shuttle Radar Topography Mission) e do ASTER (Advanced Spaceborn Thermal Emission and Reflection Radiometer), um instrumento de imagens no \'Terra\', o satélite principal do Sistema de Observação da Terra da NASA. O ASTER é um esforço conjunto da NASA, do Ministério da Economia, Comércio e Indústria do Japão e do Sistema Espacial Japonês (J-spacesystems). "</string>
-    <string name="srtm_plugin_description">"Este plugin disponibiliza \'Curvas de Nível\' e \'Sombras de Relevo\', que podem ser aplicadas nos mapas standard do OsmAnd.
-\nEstas funcionalidades podem ser apreciadas por atletas, caminhantes, e qualquer pessoa interessada na informação de relevo de uma paisagem.\n\nOs dados globais (entre as latitudes 70° norte e 70° sul) são baseados nas medições do SRTM (Shuttle Radar Topography Mission) e do ASTER (Advanced Spaceborn Thermal Emission and Reflection Radiometer), um instrumento de imagens no \'Terra\', o satélite principal do Sistema de Observação da Terra da NASA. O ASTER é um esforço conjunto da NASA, do Ministério da Economia, Comércio e Indústria do Japão e do Sistema Espacial Japonês (J-spacesystems). "</string>
+    <string name="osmand_srtm_long_description_1000_chars">Este plugin disponibiliza \'Curvas de Nível\' e \'Sombreamento de relevo\', que podem ser aplicadas nos mapas standard do OsmAnd. 
+\nEstas funcionalidades podem ser apreciadas por atletas, caminhantes, e qualquer pessoa interessada na informação de relevo de uma paisagem.
+\n
+\nOs dados globais (entre as latitudes 70° norte e 70° sul) são baseados nas medições do SRTM (Shuttle Radar Topography Mission) e do ASTER (Advanced Spaceborn Thermal Emission and Reflection Radiometer), um instrumento de imagens no \'Terra\', o satélite principal do Sistema de Observação da Terra da NASA. O ASTER é um esforço conjunto da NASA, do Ministério da Economia, Comércio e Indústria do Japão e do Sistema Espacial Japonês (J-spacesystems).</string>
+    <string name="srtm_plugin_description">Este plugin disponibiliza \'Curvas de Nível\' e \'Sombreamento de relevo\', que podem ser aplicadas nos mapas standard do OsmAnd. 
+\nEstas funcionalidades podem ser apreciadas por atletas, caminhantes, e qualquer pessoa interessada na informação de relevo de uma paisagem.
+\n
+\nOs dados globais (entre as latitudes 70° norte e 70° sul) são baseados nas medições do SRTM (Shuttle Radar Topography Mission) e do ASTER (Advanced Spaceborn Thermal Emission and Reflection Radiometer), um instrumento de imagens no \'Terra\', o satélite principal do Sistema de Observação da Terra da NASA. O ASTER é um esforço conjunto da NASA, do Ministério da Economia, Comércio e Indústria do Japão e do Sistema Espacial Japonês (J-spacesystems).</string>
     <string name="srtm_plugin_name">Curvas de Nível</string>
     <string name="download_select_map_types">Outros mapas</string>
     <string name="download_srtm_maps">Curvas de nível</string>
-    <string name="rendering_attr_noAdminboundaries_name">Ocultar limites</string>
-	<string name="rendering_attr_noAdminboundaries_description">Esconder limites regionais (níveis 5 a 9)</string>
+    <string name="rendering_attr_noAdminboundaries_name">Limites</string>
+	<string name="rendering_attr_noAdminboundaries_description">Suprimir a exibição de limites regionais (níveis de administração 5 – 9).</string>
     <string name="recording_context_menu_show">Ver</string>
     
 	<string name="item_unchecked">desmarcado</string>
@@ -1074,51 +1082,51 @@
     
 	<string name="map_widget_max_speed">Limite de Velocidade</string>
     <string name="no_buildings_found">Nenhum edifício encontrado.</string>
-    <string name="zxing_barcode_scanner_not_found">Aplicação ZXing Barcode Scanner não está instalada. Procurar no Market?</string>
+    <string name="zxing_barcode_scanner_not_found">Aplicativo scanner de código de barras ZXing não instalado. Procurar no Google Play\?</string>
 	<string name="support_new_features_descr">Faça uma doação para ver novas funcionalidades implementadas nesta aplicação</string>
 	
 		
 	<string name="incomplete_locale">incompleto</string>
-	<string name="street_name">Rua</string>
+	<string name="street_name">Nome da rua</string>
 	<string name="hno">Número de casa</string>
     
     <string name="monitoring_settings">Serviços de monitoramento e Serviço em segundo plano</string>
-    <string name="choose_osmand_theme_descr">Escolha o tema da aplicação</string>
+    <string name="choose_osmand_theme_descr">Escolha o tema da aplicação.</string>
     <string name="choose_osmand_theme">Tema da aplicação</string>
     <string name="accessibility_options">Opções de acessibilidade</string>
     <string name="select_address_activity">Selecione o endereço</string>
     <string name="favourites_list_activity">Selecione favorito</string>
     <string name="local_openstreetmap_act_title">Modificaçoes OSM</string>
     <string name="shared_string_more_actions">Outras acções</string>
-    <string name="layer_hillshade">Camada de Sombras de relevo</string>
+    <string name="layer_hillshade">Camada de sombreamentos de relevo</string>
     <string name="map_widget_gps_info">Informação de GPS</string>
-    <string name="download_using_mobile_internet">A Wifi está desligada. Quer continuar o download com a ligação internet?</string>
+    <string name="download_using_mobile_internet">Não conectado ao Wi-Fi. Use a conexão atual com a Internet para fazer o download\?</string>
     
     <string name="monitoring_settings_descr">Cancelar rota</string>
     <string name="clear_destination">Apagar local de destino</string>
     
     
     
-    <string name="download_hillshade_maps">Sobreposições de Sombras de Colinas</string>
-    <string name="files_limit">Restando %1$d arquivos</string>
-    <string name="available_downloads_left">Disponível %1$d arquivos para download</string>
+    <string name="download_hillshade_maps">Sombras de Colinas</string>
+    <string name="files_limit">Restando %1$d ficheiros</string>
+    <string name="available_downloads_left">Ainda %1$d ficheiros para descarregar</string>
     <string name="install_paid">Versão completa</string>
     <string name="cancel_route">Descartar rota</string>
     <string name="cancel_navigation">Parar navegação</string>
     
-    <string name="local_osm_changes_backup_successful">Ficheiro de alterações OSM gerado com sucesso %1$s</string>
-    <string name="local_osm_changes_backup_failed">Falha ao copiar as alterações OSM</string>
-    <string name="local_osm_changes_backup">Copiar como alteração OSM</string>
+    <string name="local_osm_changes_backup_successful">Ficheiro de alterações OSM gerado %1$s</string>
+    <string name="local_osm_changes_backup_failed">Não foi possível fazer backup de alterações OSM</string>
+    <string name="local_osm_changes_backup">Fazer backup como mudança de OSM</string>
     <string name="delete_point">Eliminar ponto</string>
     <string name="plugin_distance_point_time">tempo</string>
     <string name="plugin_distance_point_hdop">precisão</string>
     <string name="plugin_distance_point_speed">Velocidade</string>
     <string name="plugin_distance_point_ele">Altitude</string>
     <string name="plugin_distance_point">Ponto</string>
-    <string name="gpx_file_name">Nome do arquivo GPX</string>
-    <string name="gpx_saved_sucessfully">Arquivo GPX guardado com sucesso em {0}</string>
+    <string name="gpx_file_name">Nome do ficheiro GPX</string>
+    <string name="gpx_saved_sucessfully">Ficheiro GPX gravado para {0}</string>
     <string name="osmand_distance_planning_plugin_name">Calculadora de Distância e Ferramenta de Planeamento</string>
-    <string name="osmand_distance_planning_plugin_description">Este plugin fornece um widget na tela do mapa que permite criar caminhos ao tocar no mapa, ou usar/modificar arquivos GPX existentes, para planear uma viagem e medir a distância entre os pontos. Os resultados podem ser guardados como um arquivo GPX, que pode ser usado posteriormente para orientação.</string>
+    <string name="osmand_distance_planning_plugin_description">Este plugin fornece um widget no ecrã do mapa que permite criar caminhos ao tocar no mapa, ou usar/modificar ficheiros GPX existentes, para planear uma viagem e medir a distância entre os pontos. Os resultados podem ser guardados como um ficheiro GPX, que pode ser usado posteriormente para orientação.</string>
     
 	<string name="driving_region_descr">Selecione região: EUA, Europa, RU, Ásia e outros</string>
 	<string name="driving_region">Região</string>
@@ -1136,10 +1144,10 @@
     <string name="speak_cameras">Anunciar radares</string>
 	<string name="speak_traffic_warnings">Anunciar avisos de tráfego</string>
     
-    <string name="osb_author_or_password_not_specified">Especifique o utilizador e a senha nas definições</string>
-    <string name="clear_intermediate_points">Remover pontos intermédios</string>
-    <string name="keep_intermediate_points">Manter pontos intermédios</string>
-    <string name="new_directions_point_dialog">Os pontos intermédios já estão definidos.</string>
+    <string name="osb_author_or_password_not_specified">Especifique o usuário e a palavra-passe do OSM em \"Configurações\"</string>
+    <string name="clear_intermediate_points">Remover destinos intermédios</string>
+    <string name="keep_intermediate_points">Manter destinos intermédios</string>
+    <string name="new_directions_point_dialog">Já tem destinos intermédios definidos.</string>
     <string name="context_menu_item_directions_to">Direções para</string>
     <string name="context_menu_item_directions_from">Direções desde</string>
     <string name="route_descr_map_location">Mapa: </string>
@@ -1153,27 +1161,27 @@
     <string name="context_menu_item_destination_point">Definir como destino</string>
     <string name="please_select_address">Selecione primeiro a cidade ou rua</string>
     
-    <string name="search_street_in_neighborhood_cities">Procurar rua na vizinhança</string>
+    <string name="search_street_in_neighborhood_cities">Procurar rua nas cidades da vizinhança</string>
     <string name="intermediate_items_sort_return">Pontos intermédios organizados para otimizar a ordem até ao destino.</string>
     <string name="intermediate_items_sort_by_distance">Ordem porta a porta</string>
-    <string name="use_distance_measurement_help">Toque para marcar um pont.\n
-Pressione e segure no mapa para apagar pontos anteriores.\n
-Pressione e segure no ponto para ver e anexar descrição.\n
-Clique no widget de medição para ver mais ações.</string>
+    <string name="use_distance_measurement_help">Toque para marcar um pont.
+\n * Pressione e segure no mapa para apagar pontos anteriores.
+\n * Pressione e segure no ponto para ver e anexar descrição.
+\n * Clique no widget de medição para ver mais ações.</string>
     <string name="shared_string_do_not_show_again">Não mostrar novamente</string>
     <string name="distance_measurement_start_editing">Comece edição</string>
     <string name="distance_measurement_finish_editing">Finalize edição</string>
     <string name="distance_measurement_finish_subtrack">Comece uma nova subrota</string>
     <string name="distance_measurement_clear_route">Apagar os pontos</string>
     
-    <string name="distance_measurement_load_gpx">Abrir GPX</string>
+    <string name="distance_measurement_load_gpx">Abrir ficheiro GPX existente</string>
     <string name="wait_current_task_finished">Aguarde até que a tarefa esteja concluída</string>
-    <string name="use_kalman_filter_compass_descr">Use filtro Kalman para evitar aberrações na bússola</string>
+    <string name="use_kalman_filter_compass_descr">Reduz o ruído nas leituras da bússola, mas acrescenta inércia.</string>
     <string name="use_kalman_filter_compass">Use filtro Kalman</string>
-    <string name="use_magnetic_sensor_descr">use o sensor magnético para determinar a direção da bússola em vez do sensor de orientação</string>
+    <string name="use_magnetic_sensor_descr">Para a leitura da bússola, use o sensor magnético em vez do sensor de orientação.</string>
     <string name="use_magnetic_sensor">Use sensor magnético</string>
     <string name="other_location">Outro</string>
-    <string name="local_indexes_cat_srtm">Dados de curvas de nível</string>
+    <string name="local_indexes_cat_srtm">Linhas de contorno</string>
     
     
     <string name="monitoring_control_start">GPX</string>
@@ -1227,7 +1235,7 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="animate_routing_route_not_calculated">Por favor calcule primeiro a rota</string>
     <string name="animate_routing_route">Simular usando rota calculada </string>
     <string name="animate_routing_gpx">Simular usando caminho GPX</string>
-    <string name="shared_string_remember_my_choice">Memorizar escolha</string>
+    <string name="shared_string_remember_my_choice">Lembrar-se da escolha</string>
     
     <string name="shared_string_and">e</string>
     <string name="shared_string_or">ou</string>
@@ -1370,13 +1378,13 @@ Clique no widget de medição para ver mais ações.</string>
 	<string name="routing_attr_avoid_motorway_description">Evitar auto-estradas</string>
 	<string name="routing_attr_weight_name">Peso máximo</string>
 	<string name="routing_attr_weight_description">Especificar a limitação de peso de veículo</string>
-    <string name="android_19_location_disabled">Desde a versão KitKat você não pode fazer o download e actualização de mapa no local de armazenamento anterior (%s).  Você deseja alterar para um local com permissão e copiar todos os arquivos para lá?
-         \n Nota: Os arquivos antigos permanecerão intocados.
-         \n Nota: não será possível compartilhar arquivos entre OsmAnd e OsmAnd + . </string>
+    <string name="android_19_location_disabled">Desde a versão KitKat você não pode fazer o download e actualização de mapa no local de armazenamento anterior (%s). Você deseja alterar para um local com permissão e copiar todos os ficheiros para lá\?          
+\n Nota: Os ficheiros antigos permanecerão intocados.          
+\n Nota: não será possível compartilhar ficheiros entre OsmAnd e OsmAnd + .</string>
     
-    <string name="copying_osmand_one_file_descr">Copiando o arquivo (%s) para novo destino …</string>
-    <string name="copying_osmand_files_descr">Cópia de arquivos Osmand para novo destino (%s)</string>
-    <string name="copying_osmand_files">Cópia de arquivos Osmand</string>
+    <string name="copying_osmand_one_file_descr">Copiando o ficheiro (%s) para novo destino …</string>
+    <string name="copying_osmand_files_descr">Cópia de ficheiros Osmand para o novo destino (%s)…</string>
+    <string name="copying_osmand_files">Copiando ficheiros Osmand…</string>
     <string name="calculate_osmand_route_gpx">Calcular rota offline OsmAnd</string>
     <string name="app_mode_truck">Camião</string>
     <string name="lang_eu">Basco</string>
@@ -1400,7 +1408,7 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="gpx_file_is_empty">O trilho Gpx está vazio</string>
     
     <string name="shared_string_tracks">Trajetos</string>
-    <string name="shared_string_my_favorites">Meus Favoritos</string>
+    <string name="shared_string_my_favorites">Favoritos</string>
     <string name="shared_string_my_places">Meus locais</string>
     
     
@@ -1445,9 +1453,9 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="complex_route_calculation_failed">Cálculo rápido de rota falhou (%s), voltando para cálculo lento.</string>
     <string name="disable_complex_routing_descr">Desativar encaminhamento de 2 fases para navegação automóvel</string>
     <string name="disable_complex_routing">Desativar roteamento complexo</string>
-    <string name="interrupt_music_descr">Interromper música quando faz o anúncio</string>
-	<string name="interrupt_music">Interromper música</string>
-	<string name="share_route_as_gpx">Partilhar rota como arquivo GPX</string>
+    <string name="interrupt_music_descr">Voz solicita pausa, não apenas suprimir, a reprodução de música.</string>
+	<string name="interrupt_music">Pausar a música</string>
+	<string name="share_route_as_gpx">Partilhar rota como ficheiro GPX</string>
 	<string name="share_route_subject">Rota partilhada via OsmAnd</string>
 	<string name="arrival_distance">Anúncio da chegada</string>
     <string name="arrival_distance_descr">Em quanto tempo você quer o anúncio da chegada ?</string>
@@ -1455,14 +1463,14 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="keep_informing_descr">Repetir as instruções de navegação em intervalos regulares</string>
     <string name="keep_informing">Repetir as instruções de navegação</string>
 	
-	<string name="import_file_favourites">Salvar como arquivo GPX ou importar nos favoritos ?</string>
+	<string name="import_file_favourites">Salvar como ficheiro GPX ou importar ponto de rota nos favoritos\?</string>
 	
 	<string name="shared_string_share">Partilhar</string>
 	<string name="share_fav_subject">Favoritos partilhados via OsmAnd</string>
 	<string name="navigation_intent_invalid">Formato inválido: %s</string>
 <string name="save_as_favorites_points">Salvar como grupo de favoritos</string>
     <string name="select_destination_and_intermediate_points">Selecionar pontos de parada</string>
-    <string name="layer_amenity_label">Rótulos de pontos</string>
+    <string name="layer_amenity_label">Rótulos de sobreposições de POI</string>
     <string name="loading_smth">Carregando %1$s …</string>
     <string name="map_widget_plain_time">Tempo atual</string>
     <string name="shared_string_waypoint">Ponto</string>
@@ -1470,7 +1478,7 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="delay_navigation_start">Iniciar navegação com atraso</string>
     <string name="shared_string_selected_lowercase">seleccionado</string>
     <string name="gpx_split_interval">Selecione intervalo de divisão</string>
-    <string name="gpx_info_waypoints">"Os pontos de parada: %1$s "</string>
+    <string name="gpx_info_waypoints">"ponto de rota: %1$s "</string>
 	<string name="gpx_info_distance">Distância: %1$s (%2$s pontos ) </string>
 	<string name="gpx_info_start_time">Hora de início: %1$tF, %1$tT </string>
 	<string name="gpx_info_end_time">Hora de fim: %1$tF, %1$tT </string>
@@ -1489,21 +1497,22 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="traffic_warning_calming">Acalmia de tráfego</string>
     <string name="traffic_warning_speed_camera">Câmara de velocidade</string>
     <string name="traffic_warning">Aviso de tráfego</string>
-	<string name="speak_favorites">Anunciar nas proximidades favoritos</string>
-	<string name="speak_poi">Anunciar nas proximidades de POI</string>
+	<string name="speak_favorites">Favoritos pertos</string>
+	<string name="speak_poi">POI perto</string>
 	<string name="way_alarms">Avisos de tráfego</string>
-	<string name="sleep_mode_stop_dialog">Interromper o modo de hibernação do GPS?</string>
-	<string name="stop_navigation_service">Interrupção</string>
+	<string name="sleep_mode_stop_dialog">Parar o modo de fundo do GPS\?</string>
+	<string name="stop_navigation_service">Parar</string>
 	<string name="confirm_every_run">Sempre perguntar</string>
 	<string name="save_global_track_interval_descr">Escolher o intervalo de log para a gravação de faixa geral (habilitado através do widget de gravação GPX no mapa)</string>
 	<string name="save_global_track_interval">Intervalo de log geral</string>
 	<string name="enable_sleep_mode">Ativar o modo de GPS em segundo plano</string>
 	<string name="save_track_to_gpx_globally">Salvar trilha GPX</string>
-	<string name="save_track_to_gpx_globally_descr">Posição geral de log para um arquivo GPX pode ser ativada ou desativado usando o GPX gravação widget na tela do mapa</string>
+	<string name="save_track_to_gpx_globally_descr">Posição geral de log para um ficheiro GPX pode ser ativada ou desativado usando o GPX gravação widget no ecrã do mapa.</string>
 	<string name="save_track_interval_globally">Intervalo de log</string>
 	<string name="rendering_attr_publicTransportMode_name">Rotas de ônibus, trólebus</string>
-	<string name="record_plugin_description">"Este plugin ativa a funcionalidade para gravar e salvar os seus trajetos manualmente, tocando o widget de gravação GPX na tela do mapa, ou também fazendo automaticamente o registro de todas as suas rotas de navegação para um arquivo GPX.
-\n\nTrajetos gravados podem ser compartilhadas com os seus amigos, ou serem usados para contribuições ao OSM. Atletas podem usar trajetos gravados para controlar os seus treinos. Algumas análises básicas do trajeto podem ser feitas diretamente no OsmAnd, como tempos de volta, velocidade média, etc. E, claro, trajetos também podem ser analisados mais tarde em ferramentas de terceiros. "</string>
+	<string name="record_plugin_description">Este plugin ativa a funcionalidade para gravar e salvar os seus trajetos manualmente, tocando o widget de gravação GPX no ecrã do mapa, ou também fazendo automaticamente o registro de todas as suas rotas de navegação para um ficheiro GPX. 
+\n 
+\nTrajetos gravados podem ser compartilhadas com os seus amigos, ou serem usados para contribuições ao OSM. Atletas podem usar trajetos gravados para controlar os seus treinos. Algumas análises básicas do trajeto podem ser feitas diretamente no OsmAnd, como tempos de volta, velocidade média, etc. E, claro, trajetos também podem ser analisados mais tarde em ferramentas de terceiros.</string>
     <string name="record_plugin_name">Gravação de viagem</string>
     <string name="int_hour">h</string>
     <string name="duration">Duração</string>
@@ -1514,7 +1523,7 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="shared_string_gpx_points">Pontos</string>
     <string name="shared_string_my_location">Minha localização</string>
     
-	<string name="avoid_roads_msg">Você pode inciar rotas alternativas selecionando estradas a serem evitadas</string>
+	<string name="avoid_roads_msg">Inciar rotas alternativas selecionando estradas a serem evitadas</string>
     
 	<string name="speak_pedestrian">Passadeiras</string>
     <string name="rendering_attr_roadStyle_name">Estilo das vias</string>
@@ -1523,13 +1532,13 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="rendering_value_germanRoadAtlas_name">Atlas de vias alemãs</string>
 	<string name="traffic_warning_railways">Cruzamento de ferrovia</string>
 	<string name="traffic_warning_pedestrian">Cruzamento de faixa de pedestre</string>
-	<string name="show_railway_warnings">Exibir cruzamento de ferrovia</string>
-	<string name="show_pedestrian_warnings">Exibir faixas de pedestre</string>
+	<string name="show_railway_warnings">Passagens de nível</string>
+	<string name="show_pedestrian_warnings">Faixas de pedestre</string>
     <string name="rendering_value_americanRoadAtlas_name">Atlas de vias americanas</string>
     <string name="routing_attr_no_new_routing_name">Evitar regras de roteamento da v1.9</string>
     <string name="remove_the_tag">REMOVA A TAG</string>
-    <string name="routing_attr_no_new_routing_description">Não use as regras de roteamento introduzidas na versão 1.9</string>
-    <string name="dash_download_msg_none">Deseja baixar mapas offline?</string>
+    <string name="routing_attr_no_new_routing_description">Não use as regras de roteamento introduzidas na v1.9.</string>
+    <string name="dash_download_msg_none">Baixar mapas offline\?</string>
     <string name="dash_download_msg">Você baixou %1$s mapas</string>
     <string name="dash_download_new_one">Baixe um novo mapa</string>
     <string name="map_locale">Idioma do mapa</string>
@@ -1537,8 +1546,8 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="download_tab_downloads">Todos os Downloads</string>
     <string name="download_tab_updates">Atualizações</string>
     <string name="download_tab_local">Local</string>
-	<string name="no_internet_connection">Download não é possível, por favor, verifique sua conexão com a internet.</string>
-    <string name="everything_up_to_date">Todos os arquivos foram atualizados</string>
+	<string name="no_internet_connection">Não é possível baixar, por favor, verifique sua conexão com a internet.</string>
+    <string name="everything_up_to_date">Todos os ficheiros foram atualizados</string>
     <string name="use_opengl_render">Use o renderizador OpenGL</string>
     <string name="home_button">Início</string>
     
@@ -1549,7 +1558,7 @@ Clique no widget de medição para ver mais ações.</string>
 	<string name="shared_string_show_all">EXIBIR TODOS</string>
 	<string name="coordinates">Coordenadas</string>
 	<string name="rendering_attr_subwayMode_name">Rotas de metrô</string>
-    <string name="lock_screen_request_explanation">%1$s precisa dessa permissão para desligar a tela para economizar energia.</string>
+    <string name="lock_screen_request_explanation">%1$s precisa dessa permissão para desligar o ecrã para economizar energia.</string>
     <string name="shared_string_never">Nunca</string>
     
     <string name="impassable_road">Evitar estradas…</string>
@@ -1563,10 +1572,10 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="map_widget_appearance_rem">Elementos restantes</string>
     <string name="plugin_install_needs_network">Você precisa de uma conexão com a internet para instalar este plugin.</string>
 <string name="welcome_select_region">Para refletir corretamente seus sinais e regras de trânsito, por favor, selecione a região que você dirige:</string>
-	<string name="rendering_attr_hideHouseNumbers_name">Ocultar números de porta</string>
-    <string name="application_dir_change_warning3">Você quer que o OsmAnd também copie seus arquivos de dados para o novo destino?</string>
+	<string name="rendering_attr_hideHouseNumbers_name">Números da casa</string>
+    <string name="application_dir_change_warning3">Copiar os ficheiros de dados OsmAnd para o novo destino\?</string>
     <string name="specified_directiory_not_writeable">Mapas não podem ser criados no diretório especificado</string>
-	<string name="copying_osmand_file_failed">A cópia de arquivos falhou</string>    
+	<string name="copying_osmand_file_failed">A cópia de ficheiros falhou</string>    
     <string name="storage_directory_external">Armazenamento externo</string>
     <string name="storage_directory_multiuser">Armazenamento multiusuário</string>
     <string name="storage_directory_manual">Especificado manualmente</string>
@@ -1582,7 +1591,7 @@ Clique no widget de medição para ver mais ações.</string>
 	<string name="shared_string_edit">Editar</string>
 	<string name="shared_string_places">Locais</string>
 	<string name="shared_string_search">Pesquisar</string>
-	<string name="shared_string_show_description">Mostrar descrição</string>
+	<string name="shared_string_show_description">Mostrar descrição.</string>
 	<string name="shared_string_message">Mensagem</string>
 	<string name="agps_data_last_downloaded">A-GPS últimos dados baixados: %1$s</string>
     <string name="confirm_usage_speed_cameras">Em diversos países (Alemanha, França, Itália, etc.) o uso de alertas de radar é proibido por lei. OsmAnd não assume qualquer responsabilidade se você violar a lei. Por favor, toque em \"sim\" somente se você pode aceitar o uso deste recurso.</string>
@@ -1596,23 +1605,23 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="shared_string_go">Ir</string>
 	<string name="routing_settings_2">Configurações de navegação</string>
     <string name="general_settings_2">"Configurações gerais  "</string>
-	<string name="version_settings_descr">Baixando visões noturnas</string>
-    <string name="proxy_pref_descr">Informe um proxy de comunicação com a internet</string>
+	<string name="version_settings_descr">Baixar compilações noturnas.</string>
+    <string name="proxy_pref_descr">Especifique um servidor proxy.</string>
     <string name="dash_download_manage">Gerenciador</string>
     <string name="rendering_category_transport">Transporte</string>
     <string name="rendering_attr_tramTrainRoutes_name">Rotas de bonde e trem</string>
 	<string name="rendering_attr_streetLighting_name">Iluminação pública</string>
     <string name="rendering_value__name">Predefinido</string>
     <string name="rendering_value_highContrastRoads_name">Vias em alto contraste</string>
-	<string name="welcome_text">OsmAnd oferece um explorador de mapa e navegador GPS offline!</string>
+	<string name="welcome_text">OsmAnd fornece mapas de navegação globais e navegação off-line.</string>
 	<string name="welcome_header">Bem-vindo</string>
     <string name="current_route">Rota atual</string>
     <string name="osm_changes_added_to_local_edits">Mudanças no OSM adicionadas ao conjunto de alterações local</string>
    	<string name="mark_to_delete">Selecione para apagar</string>
 	
-	<string name="local_osm_changes_upload_all_confirm">Você enviará %1$d de mudanças ao OSM. Você está certo?</string>
-    <string name="confirmation_to_clear_history">Você quer limpar o histórico?</string>
-    <string name="delay_to_start_navigation_descr">Especifique o tempo de espera para permanecer na tela de planejamento de rota</string>
+	<string name="local_osm_changes_upload_all_confirm">Você enviará %1$d mudanças ao OSM. Tem certeza\?</string>
+    <string name="confirmation_to_clear_history">Limpar histórico\?</string>
+    <string name="delay_to_start_navigation_descr">Especifique o tempo de espera para permanecer no ecrã de planejamento de rota.</string>
     <string name="delay_to_start_navigation">Iniciar navegação curva a curva depois de…</string>
     <string name="osmand_parking_overdue">atrasado</string>
 	<string name="action_create">Criar ação</string>
@@ -1628,10 +1637,11 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="waypoint_visit_before">Passar antes</string>
     <string name="simulate_your_location">Simular sua posição</string>
     <string name="drawer">Lista simples</string>
-    <string name="short_location_on_map">Lat %1$s\n Lon %2$s</string>
-    <string name="tips_and_tricks_descr">Respostas às perguntas frequentes, mudanças recentes e outras</string>
+    <string name="short_location_on_map">Lat %1$s
+\nLon %2$s</string>
+    <string name="tips_and_tricks_descr">Perguntas frequentes, alterações recentes e outras.</string>
     <string name="shared_string_ellipsis">…</string>
-	<string name="shared_string_do_not_use">Não usar</string>
+	<string name="shared_string_do_not_use">Não use</string>
 	<string name="shared_string_enable">Ativar</string>
 	<string name="shared_string_disable">Desativar</string>
 	<string name="shared_string_enabled">Ativado</string>
@@ -1641,7 +1651,7 @@ Clique no widget de medição para ver mais ações.</string>
 	<string name="shared_string_deselect_all">Desmarcar tudo</string>
 	<string name="shared_string_export">Exportar</string>
 	<string name="shared_string_more">Mais…</string>
-	<string name="shared_string_unexpected_error">Ocorreu um erro inesperado</string>
+	<string name="shared_string_unexpected_error">Erro inesperado</string>
 	<string name="shared_string_action_template">Ação {0}</string>
 	<string name="shared_string_show">Mostrar</string>
 	<string name="shared_string_collapse">Recolher</string>
@@ -1656,28 +1666,28 @@ Clique no widget de medição para ver mais ações.</string>
 	<string name="plugin_touringview_name">Ver mapa de turismo</string>
 	<string name="plugin_nautical_name">Ver mapa náutico</string>
 	<string name="plugin_ski_name">Ver mapa de esqui</string>
-	<string name="rename_failed">Falha ao renomear.</string>
+	<string name="rename_failed">Renomeação falhou.</string>
 	<string name="back_to_map">Voltar ao mapa</string>
-	<string name="share_note">Compartilhar nota</string>
+	<string name="share_note">Compartilhar anotação</string>
     <string name="location_on_map">Posição:\n Lat %1$s\n Lon %2$s</string>
-	<string name="notes">Notas</string>
+	<string name="notes">Anotações</string>
 	<string name="online_map">Mapa on-line</string>
 	<string name="roads_only">Apenas vias</string>
     <string name="rendering_attr_pisteRoutes_name">Pistas de esqui</string>
-	<string name="free">"Livre %1$s "</string>
+	<string name="free">Livre %1$s</string>
 	<string name="device_memory">Memória do aparelho</string>
     <string name="world_ski_missing">Para exibir mapas de esqui, o mapa offline especial precisa ser baixado</string>
     <string name="nautical_maps_missing">Para exibir mapas náuticos, o mapa offline especial precisa ser baixado</string>
 	<string name="edit_group">Editar grupo</string>
-    <string name="parking_place">Estacionamento</string>
+    <string name="parking_place">Vaga de estacionamento</string>
     <string name="version_settings">Compilações</string>
     <string name="navigation_over_track">Iniciar navegação através do trajeto?</string>
 	<string name="rendering_attr_transportStops_name">Parada de transporte</string>
     
-    <string name="use_opengl_render_descr">Usar aceleração de hardware OpenGL para renderização (pode não funcionar em alguns aparelhos)</string>
-    <string name="wake_on_voice">Acender a tela</string>
+    <string name="use_opengl_render_descr">Usar a renderização OpenGL acelerada por hardware (pode usar mais bateria ou não funcionar em dispositivos muito antigos).</string>
+    <string name="wake_on_voice">Ligar o ecrã</string>
     <string name="configure_map">Configurar mapa</string>
-    <string name="shared_string_waypoints">Pontos de parada</string>
+    <string name="shared_string_waypoints">ponto de rota</string>
     
     <string name="shared_string_dismiss">Descartar</string>
 	<string name="rendering_category_others">Outros atributos do mapa</string>
@@ -1691,44 +1701,44 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="rendering_attr_showCycleRoutes_name">Mostrar rotas para bicicletas</string>
     <string name="rendering_attr_hideBuildings_name">Ocultar edifícios</string>
     <string name="rendering_attr_trolleybusRoutes_name">Rotas de trólebus</string>
-    <string name="favorite_category_dublicate_message">O nome escolhido já existe nessa categoria. Por favor, defina outro nome.</string>
+    <string name="favorite_category_dublicate_message">Por favor, use um nome de categoria que ainda não existe.</string>
     <string name="favorite_category_name">Nome da Categoria</string>
     <string name="favorite_category_add_new_title">Adicionar nova Categoria</string>
     <string name="regions">Regiões</string>
     <string name="region_maps">Mapas de Regiões</string>
     <string name="world_maps">Mapas Mundiais</string>
-    <string name="hillshade_layer_disabled">Camada de Sombra de colinas desligada</string>
+    <string name="hillshade_layer_disabled">Camada de sombreamento de relevo desligada</string>
     <string name="srtm_plugin_disabled">Curvas de Nível desligadas</string>
     <string name="favorite_category_add_new">Adicionar novo</string>
     <string name="favorite_category_select">Seleccionar Categoria</string>
-    <string name="default_speed_system_descr">Definir unidades de medida para velocidade</string>
-    <string name="default_speed_system">Unidades de medida para velocidade</string>
+    <string name="default_speed_system_descr">Definir unidades de velocidade.</string>
+    <string name="default_speed_system">Unidade de velocidade</string>
     <string name="si_nm">Milhas Náuticas</string>
     <string name="si_kmh">Quilómetros por Hora</string>
     <string name="si_mph">Milhas por Hora</string>
     <string name="si_m_s">Metros por Segundo</string>
     <string name="si_min_km">Minutos por Quilómetro</string>
     <string name="si_min_m">Minutos por Milha</string>
-    <string name="si_nm_h">Milhas náuticas por hora (nó)</string>
-    <string name="nm_h">mn/h</string>
+    <string name="si_nm_h">Milhas náuticas por hora (nós)</string>
+    <string name="nm_h">kn</string>
     <string name="min_mile">min/m</string>
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>
     
     <string name="shared_string_trip_recording">Gravar Viagem</string>
     <string name="shared_string_navigation">Navegação</string>
-    <string name="nm">mn</string>
+    <string name="nm">mni</string>
     <string name="shared_string_update">Atualizar</string>
-    <string name="please_specify_poi_type_only_from_list">Escolha o tipo correcto de POI (ou ignore)</string>
-    <string name="access_from_map_description">O botão de Menu lança o Dashboard, em vez do Menu</string>
+    <string name="please_specify_poi_type_only_from_list">Por favor especifique o tipo de POI correcto ou ignore-o.</string>
+    <string name="access_from_map_description">O botão do menu lança o painel de instrumentos em vez do menu</string>
     <string name="access_from_map">Aceder a partir do mapa</string>
-    <string name="show_on_start_description">\'Desligado\' lança directamente para a vista do mapa</string>
+    <string name="show_on_start_description">\'Desligado\' lança diretamente para a vista do mapa.</string>
     <string name="show_on_start">Mostrar no arranque</string>
     <string name="copied_to_clipboard">Copiado para a Área de Transferências</string>
     
     <string name="osm_save_offline">Guardar off-line</string>
     <string name="osm_edit_modified_poi">Ponto de Interesse OSM modificado</string>
-    <string name="impassable_road_desc">Escolha as estradas que quer evitar durante a navegação</string>
+    <string name="impassable_road_desc">Escolha as estradas que quer evitar durante a navegação.</string>
     <string name="shared_string_sound">Som</string>
     <string name="no_location_permission">A aplicação não tem permissão para aceder à localização.</string>
     <string name="no_camera_permission">A aplicação não tem permissão para aceder à camera.</string>
@@ -1742,26 +1752,26 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="av_video_quality_low">Baixa Qualidade</string>
     <string name="av_video_quality_high">Alta Qualidade</string>
     <string name="av_video_quality">Qualidade de saída de Vídeo</string>
-    <string name="av_video_quality_descr">Escolha a qualidade de saída de vídeo</string>
+    <string name="av_video_quality_descr">Escolha a qualidade de vídeo.</string>
     <string name="av_audio_format">Formato de saída de Áudio</string>
-    <string name="av_audio_format_descr">Escolha o formato de saída de áudio</string>
+    <string name="av_audio_format_descr">Escolha o formato de saída de áudio.</string>
     <string name="av_audio_bitrate">Taxa bit de Áudio</string>
-    <string name="av_audio_bitrate_descr">Escolha a taxa bit de áudio</string>
+    <string name="av_audio_bitrate_descr">Escolha a taxa bit de áudio.</string>
     <string name="osm_edit_deleted_poi">POI OSM apagado</string>
-    <string name="context_menu_item_open_note">Abrir Nota OSM</string>
-    <string name="osm_edit_reopened_note">Re-abrir Nota OSM</string>
-    <string name="osm_edit_commented_note">Nota OSM comentada</string>
-    <string name="osm_edit_removed_note">Nota OSM apagada</string>
-    <string name="osm_edit_created_note">Nota OSM adicionada</string>
-    <string name="osn_bug_name">Nota OSM</string>
-    <string name="osn_add_dialog_title">Adicionar Nota OSM</string>
+    <string name="context_menu_item_open_note">Abrir anotação OSM</string>
+    <string name="osm_edit_reopened_note">Re-abrir anotação OSM</string>
+    <string name="osm_edit_commented_note">Anotação OSM comentada</string>
+    <string name="osm_edit_removed_note">Anotação OSM apagada</string>
+    <string name="osm_edit_created_note">Anotação OSM adicionada</string>
+    <string name="osn_bug_name">Anotação OSM</string>
+    <string name="osn_add_dialog_title">Adicionar anotação OSM</string>
     <string name="osn_comment_dialog_title">Adicionar comentário</string>
-    <string name="osn_reopen_dialog_title">Re-abrir Nota</string>
-    <string name="osn_close_dialog_title">Fechar Nota</string>
-    <string name="osn_add_dialog_success">Nota adicionada com sucesso</string>
-    <string name="osn_add_dialog_error">Erro: Nota não foi adicionada</string>
-    <string name="osn_close_dialog_success">Nota encerrada com sucesso</string>
-    <string name="osn_close_dialog_error">Erro: Nota não foi encerrada</string>
+    <string name="osn_reopen_dialog_title">Re-abrir anotação</string>
+    <string name="osn_close_dialog_title">Fechar anotação</string>
+    <string name="osn_add_dialog_success">Anotação adicionada com sucesso</string>
+    <string name="osn_add_dialog_error">Erro: anotação não foi adicionada</string>
+    <string name="osn_close_dialog_success">Anotação encerrada com sucesso</string>
+    <string name="osn_close_dialog_error">Erro: anotação não foi encerrada</string>
     <string name="shared_string_commit">Enviar</string>
 
     <string name="context_menu_item_delete_waypoint">Apagar ponto GPX?</string>
@@ -1770,31 +1780,31 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="share_osm_edits_subject">Edições OSM partilhadas via OsmAnd</string>
     <string name="read_more">Ler mais</string>
     <string name="whats_new">Novidades</string>
-    <string name="rendering_attr_hideProposed_name">Ocultar objectos propostos</string>
+    <string name="rendering_attr_hideProposed_name">Objectos propostos</string>
     <string name="shared_string_upload">Enviar</string>
     <string name="osm_edit_created_poi">POI OSM adicionado</string>
 
-    <string name="world_map_download_descr">"Mapa base mundial (que abrange o mundo inteiro) está ausente ou desactualizado. Por favor, considere fazer download do \'Mapa base mundial\'  para um ambiente de mapa completo."</string>
+    <string name="world_map_download_descr">Mapa base mundial (cobrindo o mundo inteiro em baixo nível de zoom) ausente ou ultrapassado. Por favor, considere descarrega-lo para uma visão global.</string>
     <string name="shared_string_qr_code">Código QR</string>
-    <string name="map_downloaded_descr">Mapa de %1$s obtido com sucesso. Volte ao mapa para o usar.</string>
+    <string name="map_downloaded_descr">O mapa %1$s está pronto para ser usado.</string>
     <string name="map_downloaded">Mapa obtido com sucesso</string>
-    <string name="go_to_map">Voltar ao mapa</string>
-    <string name="simulate_initial_startup_descr">Definir como se fosse a primeira vez que a aplicação liga, mantendo todas as restantes definições inalteradas</string>
+    <string name="go_to_map">Mostrar mapa</string>
+    <string name="simulate_initial_startup_descr">Define o sinalizador que indica a primeira inicialização do aplicativo, mantém todas as outras configurações inalteradas.</string>
     <string name="simulate_initial_startup">Simular arranque inicial da aplicação</string>
     <string name="share_geo">geo:</string>
     <string name="share_menu_location">Partilhar Localização</string>
     <string name="shared_string_send">Enviar</string>
-    <string name="osmand_running_in_background">A funcionar em segundo plano</string>
+    <string name="osmand_running_in_background">Executado em segundo plano</string>
     <string name="gps_wake_up_timer">Intervalo para sinal de GPS</string>
     <string name="favourites_edit_dialog_title">Informação de Favorito</string>
-    <string name="simulate_your_location_stop_descr">Parar de simular a sua posição</string>
-    <string name="simulate_your_location_descr">Simular usando uma rota calculada ou trilha GPX armazenada</string>
+    <string name="simulate_your_location_stop_descr">Parar de simular a sua posição.</string>
+    <string name="simulate_your_location_descr">Simule a sua posição utilizando uma rota calculada ou uma faixa GPX gravada.</string>
     <string name="looking_up_address">Procurar endereço</string>
-    <string name="av_locations_descr">Ficheiro GPX com anotações de posições</string>
+    <string name="av_locations_descr">Ficheiro GPX com anotações de posições.</string>
     <string name="av_locations">Localizações</string>
     <string name="plugin_settings">Plugins</string>
     <string name="routing_attr_avoid_shuttle_train_name">Evitar de transporte de comboio</string>
-    <string name="routing_attr_avoid_shuttle_train_description">Evitar de transporte de comboio</string>
+    <string name="routing_attr_avoid_shuttle_train_description">Evitar usar transporte de comboio</string>
     <string name="traffic_warning_hazard">Perigo</string>
     <string name="rendering_value_boldOutline_name">contorno em negrito</string>
     <string name="no_updates_available">Não há actualizações disponíveis</string>
@@ -1820,15 +1830,15 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="rendering_value_translucent_blue_name">Azul translúcido</string>
     <string name="rendering_value_purple_name">Roxo</string>
     <string name="rendering_value_translucent_purple_name">Roxo translúcido</string>
-    <string name="restart_is_required">Para aplicar completamente as alterações, requer uma reinicialização da aplicação.</string>
+    <string name="restart_is_required">Reinicie o aplicativo manualmente para aplicar todas as alterações.</string>
     <string name="light_theme">Claro</string>
     <string name="dark_theme">Escuro</string>
-    <string name="rec_split_desc">Sobrescrever ficheiros quando o espaço utilizado exceder o armazenamento disponível</string>
+    <string name="rec_split_desc">Sobrescrever clipes quando o espaço utilizado excede o armazenamento disponível.</string>
     <string name="rec_split_storage_size">Espaço de armazenamento</string>
-    <string name="rec_split_storage_size_desc">Total de espaço que pode ser ocupado por todos os clips gravados</string>
+    <string name="rec_split_storage_size_desc">Total de espaço que pode ser ocupado por todos os clipes gravados.</string>
     <string name="available_maps">Mapas disponíveis</string>
     <string name="select_voice_provider">Escolher orientação por voz</string>
-    <string name="select_voice_provider_descr">Escolher ou fazer download de \'orientação por voz\' para a sua linguagem</string>
+    <string name="select_voice_provider_descr">Escolher ou descarregar a orientação por voz para o seu idioma.</string>
     <string name="night">Noite</string>
 <string name="dashboard_or_drawer_description">Há uma nova opção para controlar principalmente o aplicativo através do painel flexível (Dashboard) ou um menu estático. A sua escolha pode sempre ser alterada nas configurações do painel.</string>
     <string name="dashboard_or_drawer_title">Dashboard ou menu de controle</string>
@@ -1849,9 +1859,9 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="lang_ga">Irlandês</string>
     <string name="lang_la">Latim</string>
     <string name="lang_ta">Tamil</string>
-    <string name="archive_wikipedia_data">Tem dados antigos Wikipédia incompatíveis guardados. Quer arquivá-los?</string>
-    <string name="download_wikipedia_files">Quer baixar dados Wikipédia adicionais (%1$s MB)?</string>
-    <string name="gps_network_not_enabled">Serviço de localização não está activado. Quer ligá-lo?</string>
+    <string name="archive_wikipedia_data">Tem dados antigos incompatíveis guardados da Wikipédia. Quer arquivá-los\?</string>
+    <string name="download_wikipedia_files">Quer descarregar dados adicionais da Wikipédia (%1$s MB)\?</string>
+    <string name="gps_network_not_enabled">Serviço de localização não activado. Ligá-lo\?</string>
     <string name="disable_recording_once_app_killed_descrp">Irá pausar o registo GPX quando o aplicativo é encerrado (via aplicativos recentes). (A indicação de serviço em segundo plano de Osmand desaparece da barra de notificação Android.)</string>
     <string name="shared_string_import2osmand">Importar para Osmand</string>
     <string name="read_full_article">Ler o artigo completo (on-line)</string>
@@ -1860,20 +1870,20 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="shared_string_show_details">Mostrar detalhes</string>
     <string name="osm_edit_context_menu_delete">Apagar edição OSM</string>
     <string name="rendering_value_disabled_name">Desactivado</string>
-    <string name="rendering_value_walkingRoutesScopeOSMC_name">Colorir de acordo com o estilo de rota</string>
-    <string name="rendering_value_walkingRoutesOSMC_name">Colorir de acordo com a OSMC</string>
+    <string name="rendering_value_walkingRoutesScopeOSMC_name">Cor pela afiliação da rede</string>
+    <string name="rendering_value_walkingRoutesOSMC_name">Cor pelo símbolo de caminhada de OSMC</string>
     
     <string name="shared_string_logoff">Sair</string>
-    <string name="local_recordings_delete_all_confirm">Vai apagar %1$d nota(s). Continuar?</string>
+    <string name="local_recordings_delete_all_confirm">Vai apagar %1$d anotação/anotações. Continuar\?</string>
     <string name="plugin_touringview_descr">"Esta opção muda o estilo de mapa do Osmand para a \"visão Touring \', uma visão especial de alto detalhe, para viajantes e motoristas profissionais.\n\nEsta exibição fornece, em qualquer zoom de mapa, a quantidade máxima de informação de viagem disponível no mapa (particularmente estradas, trilhas, caminhos, e marcas de orientação).\n\nTambém separa claramente todos os tipos de estradas de forma inequívoca com um código de cores, que se revela útil para a condução de veículos grandes (por exemplo).\n\nOferece opções especiais de turismo, como mostrar ciclovias ou rotas alpinas de montanha.\n\nNão é necessário fazer download dum mapa especial, a exibição é feita a partir dos mapas padrão.\n\nEssa visão pode ser revertida, basta desactiva-la, ou alterar o estilo de mapa em \'Configurar mapa\'. "</string>
     <string name="rendering_attr_roadStyle_description">Estilo de estrada</string>
     <string name="error_avoid_specific_road">Nenhum desvio encontrado</string>
     
-    <string name="wake_on_voice_descr">Acender o visor do dispositivo (se desligado) ao aproximar duma curva</string>
+    <string name="wake_on_voice_descr">Ligar o ecrã do dispositivo (se estiver desligado) ao aproximar a uma curva.</string>
     <string name="map_widget_top">Barra de estado</string>
     <string name="map_widget_right">Painel direito</string>
     <string name="map_widget_left">Painel esquerdo</string>
-    <string name="search_radius_proximity">Na proximidade de</string>
+    <string name="search_radius_proximity">Dentro</string>
     
     
     <string name="anonymous_user_hint">Um utilizador anónimo não pode:\n- Criar grupos;\n- Sincronizar grupos e dispositivos com o servidor;\n- Gerir grupos e dispositivos num painel de controle pessoal no sitio web.</string>
@@ -1886,21 +1896,21 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="use_dashboard_btn">Usar Painel</string>
     <string name="use_drawer_btn">Usar Menú</string>
     <string name="no_map_markers_found">Por favor, adicione os marcadores no mapa</string>
-    <string name="no_waypoints_found">Não há pontos intermédios</string>
+    <string name="no_waypoints_found">Não há pontos de rota</string>
     
     <string name="report">Relatório</string>
     <string name="map_widget_bearing">Rumo relativo</string>
     <string name="access_disable_offroute_recalc">Não mudar a rota quando está fora do percurso</string>
-    <string name="access_disable_offroute_recalc_descr">Impedir o recálculo automático da rota quando está bastante longe do caminho certo</string>
-    <string name="access_disable_wrong_direction_recalc">Não alterar a rota pelo caminho errado</string>
-    <string name="access_disable_wrong_direction_recalc_descr">Impedir o recálculo automático da rota quando está a mover-se numa direcção errada</string>
-    <string name="access_smart_autoannounce_descr">Notificar apenas quando a direção para o ponto de destino é alterada</string>
-    <string name="access_autoannounce_period_descr">Tempo mínimo de intervalo entre anúncios</string>
+    <string name="access_disable_offroute_recalc_descr">Nenhum recálculo de rota depois de sair da rota.</string>
+    <string name="access_disable_wrong_direction_recalc">Nenhum recálculo de rota para a direção oposta</string>
+    <string name="access_disable_wrong_direction_recalc_descr">Nenhum recálculo da rota ao apenas mover-se na direção oposta.</string>
+    <string name="access_smart_autoannounce_descr">Notificar apenas quando a direção para o ponto de destino é alterada.</string>
+    <string name="access_autoannounce_period_descr">Tempo mínimo de intervalo entre anúncios.</string>
     <string name="access_default_color">Cor predefinida</string>
     <string name="access_category_choice">Escolher categoria</string>
     <string name="access_hint_enter_name">Inserir nome</string>
     <string name="access_hint_enter_category">Inserir categoria</string>
-    <string name="access_hint_enter_description">Inserir descrição</string>
+    <string name="access_hint_enter_description">Inserir descrição.</string>
     <string name="access_map_linked_to_location">Mapa está ligado à posição</string>
     <string name="access_collapsed_list">Lista recolhida</string>
     <string name="access_expanded_list">Lista expandida</string>
@@ -1914,12 +1924,12 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="rendering_value_thin_name">Fino</string>
     <string name="rendering_value_medium_name">Médio</string>
     <string name="rendering_value_bold_name">Negrito</string>
-    <string name="storage_permission_restart_is_required">Agora a aplicação está autorizada a escrever no armazenamento externo. É necessário reiniciar a aplicação.</string>
-    <string name="shared_string_move_up">Mover para cima</string>
-    <string name="shared_string_move_down">Mover para baixo</string>
+    <string name="storage_permission_restart_is_required">Agora a aplicação está autorizada a escrever no armazenamento externo, mas primeiro é necessário reiniciar a aplicação.</string>
+    <string name="shared_string_move_up">Mover ↑</string>
+    <string name="shared_string_move_down">Mover ↓</string>
     <string name="finish_navigation">Terminar a navegação</string>
     <string name="avoid_road">Evitar estrada</string>
-    <string name="storage_directory_readonly_desc">A presente pasta de armazenamento de dados é só de leitura. A pasta de armazenamento foi temporariamente trocada para a memória interna. Favor escolher um directório de armazenamento válido.</string>
+    <string name="storage_directory_readonly_desc">Mudado para memória interna porque o diretório para o armazenamento de dados selecionado é só de leitura. Por favor, escolha um diretório de armazenamento gravável.</string>
     <string name="storage_directory_shared">Memória partilhada</string>
     <string name="shared_string_topbar">Barra superior</string>
     <string name="full_report">Relatório completo</string>
@@ -1929,9 +1939,9 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="number_of_recipients">Número de destinatários</string>
     <string name="osm_user_stat">Edições %1$s, posição %2$s, total de edições %3$s</string>
     <string name="osm_editors_ranking">Graduação dos Editores OSM</string>
-    <string name="osm_live_subscription">Subscrição OSM em directo</string>
+    <string name="osm_live_subscription">Assinatura do OsmAnd Live</string>
     <string name="osm_live_subscribe_btn">Subscrever</string>
-    <string name="osm_live_email_desc">Precisamos disso para lhe fornecer informações sobre as contribuições</string>
+    <string name="osm_live_email_desc">Necessário para lhe fornecer informações sobre contribuições.</string>
     <string name="osm_live_user_public_name">Nome Público</string>
     <string name="osm_live_hide_user_name">Não mostrar o meu nome nos relatórios</string>
     <string name="osm_live_support_region">Região de suporte</string>
@@ -1963,8 +1973,8 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="application_dir_description">Escolha onde quer guardar os ficheiros de mapas.</string>
 
     <string name="other_menu_group">Outros</string>
-    <string name="use_osm_live_routing_description">Ativar navegação para alterações OSM ao vivo (Beta)</string>
-	<string name="use_osm_live_routing">Navegação OSM ao vivo</string>
+    <string name="use_osm_live_routing_description">Ativar a navegação para mudanças do OsmAnd Live.</string>
+	<string name="use_osm_live_routing">Navegação OsmAnd Live</string>
     <string name="access_no_destination">Destino não definido</string>
     <string name="map_widget_magnetic_bearing">Rumo magnético</string>
     <string name="access_autoannounce_period">Período do anúncio automático</string>
@@ -1976,46 +1986,49 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="osm_live_month_cost_desc">Pagamento mensal</string>
     <string name="osm_live_active">Activo</string>
     <string name="osm_live_not_active">Inactivo</string>
-    <string name="osm_live_enter_email">Favor introduzir um endereço de E-mail válido</string>
-    <string name="osm_live_enter_user_name">Por favor introduza um nome Público</string>
-    <string name="osm_live_thanks">Obrigado por subscrever as actualizações ao vivo!</string>
-    <string name="osm_live_region_desc">Parte do seu donativo será enviado aos utilizadores OSM que submetem alterações ao mapa nessa região</string>
+    <string name="osm_live_enter_email">Favor introduzir um endereço de e-mail válido</string>
+    <string name="osm_live_enter_user_name">Por favor introduza um nome público</string>
+    <string name="osm_live_thanks">Obrigado por apoiar OsmAnd!
+\nPara ativar todos os novos recursos tem que reiniciar o OsmAnd.</string>
+    <string name="osm_live_region_desc">Parte da sua doação será enviada aos utilizadores OSM que submetem alterações ao mapa nessa região.</string>
     <string name="osm_live_subscription_settings">Configurações da subscrição</string>
-    <string name="osm_live_ask_for_purchase">Por favor, compre primeiro a subscrição OSM ao vivo</string>
+    <string name="osm_live_ask_for_purchase">Por favor primeiro compre a assinatura do OSM Live</string>
 
-    <string name="osm_live_header">Esta subscrição permite actualizações de hora a hora para todos os mapas do mundo. A maior parte da receita reverte para a comunidade OSM e é paga por cada contribuição OSM. No caso de gostar do OsmAnd e OSM e quiser apoiar, esta é a forma perfeita para o fazer.</string>
+    <string name="osm_live_header">Essa assinatura permite atualizações por hora para todos os mapas ao redor do mundo.
+\nParte da renda remonta à comunidade OSM e é pago para cada contribuição OSM.
+\nSe você gosta do OsmAnd e OSM e quer apoiar e ser apoiado por eles, esta é a maneira perfeita para fazê-lo.</string>
     
     <string name="select_map_marker">Seleccione o marcador do mapa</string>
     <string name="map_markers_other">Outros marcadores</string>
     <string name="upload_anonymously">Enviar anonimamente</string>
-    <string name="download_files_error_not_enough_space">Espaço insuficiente! São precisos {3} MB temporariamente e {1} MB permanentemente. Actualmente, apenas existem {2} MB disponíveis.</string>
-    <string name="download_files_question_space_with_temp">Descarregar mesmo {0} ficheiro(s)? Isso precisa de {3} MB temporariamente e {1} MB permanentemente. Actualmente, existem {2} MB disponíveis.</string>
-    <string name="upload_osm_note_description">Pode enviar a sua Nota OSM anonimamente ou utilizando o seu perfil do OpenStreetMap.org.</string>
-    <string name="upload_osm_note">Enviar a Nota OSM</string>
+    <string name="download_files_error_not_enough_space">Não há espaço suficiente! O espaço de armazenamento necessário é {3} MB temporariamente, {1} MB permanentemente. O espaço disponível é apenas {2} MB.</string>
+    <string name="download_files_question_space_with_temp">Descarregar mesmo {0} ficheiro(s)\? Isso precisa de {3} MB temporariamente e {1} MB permanentemente. ({2} MB disponíveis.)</string>
+    <string name="upload_osm_note_description">Pode enviar a sua anotação OSM anonimamente ou utilizando o seu perfil do OpenStreetMap.org.</string>
+    <string name="upload_osm_note">Enviar a anotação OSM</string>
     <string name="map_marker_1st">Primeiro marcador de mapa</string>
     <string name="map_marker_2nd">Segundo marcador de mapa</string>
     <string name="shared_string_toolbar">Barra de Ferramentas</string>
-    <string name="add_points_to_map_markers_q">Quer adicionar todos os pontos aos marcadores de mapa?</string>
+    <string name="add_points_to_map_markers_q">Adicionar todos os pontos como marcadores de mapa\?</string>
     <string name="shared_string_add_to_map_markers">Adicionar aos marcadores de mapa</string>
     <string name="select_map_markers">Seleccionar marcadores de mapa</string>
     <string name="shared_string_reverse_order">Ordem inversa</string>
-    <string name="show_map_markers_description">Activar a funcionalidade dos marcadores de mapa</string>
-    <string name="clear_active_markers_q">Quer remover todos os marcadores activos?</string>
-    <string name="clear_markers_history_q">Quer limpar o histórico dos marcadores de mapa?</string>
+    <string name="show_map_markers_description">Ativar a funcionalidade dos marcadores de mapa.</string>
+    <string name="clear_active_markers_q">Remover todos os marcadores activos\?</string>
+    <string name="clear_markers_history_q">Limpar o histórico dos marcadores de mapa\?</string>
     <string name="active_markers">Marcadores activos</string>
     <string name="map_markers">Marcadores de mapa</string>
     <string name="map_marker">Marcador de mapa</string>
-    <string name="consider_turning_polygons_off">É recomendável desactivar o processamento de polígonos.</string>
+    <string name="consider_turning_polygons_off">É recomendável desativar a renderização de polígono.</string>
     <string name="rendering_attr_showMtbRoutes_name">Mostrar rotas MTB</string>
     <string name="show_polygons">Mostrar polígonos</string>
-    <string name="find_parking">Encontrar um parque de estacionamento</string>
+    <string name="find_parking">Encontrar estacionamento</string>
     <string name="shared_string_status">Situação</string>
     <string name="shared_string_save_changes">Guardar alterações</string>
     <string name="shared_string_email_address">Endereço de E-mail</string>
     <string name="data_is_not_available">Dados não disponíveis</string>
     <string name="shared_string_remove">Remover</string>
     <string name="shared_string_read_more">Ler mais</string>
-    <string name="clear_updates_proposition_message">Pode remover actualizações descarregadas e voltar à edição do mapa original</string>
+    <string name="clear_updates_proposition_message">Remover actualizações descarregadas e voltar à edição do mapa original</string>
     <string name="add_time_span">Adicionar intervalo de tempo</string>
     <string name="road_blocked">Estrada bloqueada</string>
     <string name="shared_string_select">Seleccionar</string>
@@ -2023,13 +2036,13 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="rendering_attr_hideIcons_name">Ícones POI</string>
     <string name="item_removed">Item removido</string>
     <string name="n_items_removed">Itens removidos</string>
-    <string name="shared_string_undo_all">REVERTER TUDO</string>
+    <string name="shared_string_undo_all">Desfazer tudo</string>
     <string name="shared_string_type">Tipo</string>
     <string name="starting_point">Ponto de partida</string>
     <string name="rec_split">Divisão da Gravação</string>
     <string name="rec_split_title">Usar Divisão de Gravação</string>
     <string name="rec_split_clip_length">Duração do recorte</string>
-    <string name="rec_split_clip_length_desc">A duração de cada recorte gravado não será superior ao intervalo de tempo especificado</string>
+    <string name="rec_split_clip_length_desc">Limite de tempo superior para clipes gravados.</string>
     <string name="lang_mk">Macedónio(a)</string>
     <string name="lang_sh">Servo-Croata</string>
     <string name="lang_br">Bretão</string>
@@ -2050,23 +2063,23 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="current_track">Faixa atual</string>
     <string name="map_widget_battery">Nível de bateria</string>
     <string name="change_markers_position">Alterar posição do marcador</string>
-    <string name="move_marker_bottom_sheet_title">Mova o mapa para alterar a posição do marcador</string>
+    <string name="move_marker_bottom_sheet_title">Mover o mapa para alterar a posição do marcador</string>
     <!-- string name="lat_lon_pattern">Lat: %1$.5f Lon: %2$.5f</string -->
     <string name="follow_us">Siga-nos</string>
-    <string name="skip_map_downloading">Ir download de mapas</string>
-    <string name="first_usage_greeting">Obter direções e descobrir novos lugares sem ligação à Internet</string>
+    <string name="skip_map_downloading">Saltar o descarregamento de mapas</string>
+    <string name="first_usage_greeting">Obter direções e descobrir novos lugares sem coneção à Internet</string>
     <string name="shared_string_skip">Pular</string>
     <string name="search_another_country">Selecione outra região</string>
     <string name="shared_string_change">Alterar</string>
     <string name="storage_directory_card">Cartão de memória</string>
-    <string name="skip_map_downloading_desc">Você não tem o mapa offline instalado. Você pode escolher um mapa na lista ou fazer download de mapas mais tarde através do menu - %1$s.</string>
+    <string name="skip_map_downloading_desc">Você não tem o mapa offline instalado. Pode escolher um mapa na lista ou descarrgar mapas mais tarde através do \'menu - %1$s\'.</string>
     <string name="shared_string_markers">Marcadores</string>
     <string name="coordinates_format">Formato de coordenadas</string>
     <string name="use_system_keyboard">Usar teclado do sistema</string>
-    <string name="fast_coordinates_input_descr">Escolher formato de introdução de coordenada. Poderá sempre alterá-lo ao selecionar Opções.</string>
+    <string name="fast_coordinates_input_descr">Escolher formato de introdução de coordenada. Poderá sempre alterá-lo ao selecionar \'Opções\'.</string>
     <string name="fast_coordinates_input">Introdução rápida de coordenadas</string>
     <string name="routing_attr_avoid_ice_roads_fords_name">Evitar estradas com gelo, vales</string>
-    <string name="routing_attr_avoid_ice_roads_fords_description">Evitar estradas com gelo e vales</string>
+    <string name="routing_attr_avoid_ice_roads_fords_description">Evitar estradas de gelo e vales.</string>
     <string name="use_location">Usar posição</string>
     <string name="add_location_as_first_point_descr">Adicione a sua posição como primeiro ponto para planear o percurso perfeito.</string>
     <string name="my_location">A minha posição</string>
@@ -2075,22 +2088,22 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="shared_string_sort">Classificar</string>
     <string name="coordinate_input">Introdução de coordenada</string>
     <string name="is_saved">é gravado</string>
-    <string name="marker_save_as_track_descr">Exportar os seus marcadores para um arquivo que pode especificar aqui:</string>
-    <string name="marker_save_as_track">Gravar como faixa</string>
+    <string name="marker_save_as_track_descr">Exporte os seus marcadores para um ficheiro que pode especificar aqui:</string>
+    <string name="marker_save_as_track">Gravar como ficheiro GPX</string>
     <string name="move_to_history">Mover para histórico</string>
-    <string name="group_will_be_removed_after_restart">Grupo será removido após reinício</string>
-    <string name="show_guide_line">Mostrar linha guia</string>
+    <string name="group_will_be_removed_after_restart">O grupo terá desaparecido na próxima vez que iniciar a aplicação.</string>
+    <string name="show_guide_line">Mostrar linhas direcionais</string>
     <string name="show_arrows_on_the_map">Mostrar setas no mapa</string>
-    <string name="show_passed">Mostrar data \'Último uso\'</string>
-    <string name="hide_passed">Esconder data \'Último uso\'</string>
-    <string name="remove_from_map_markers">Remover a partir de Marcadores do Mapa</string>
+    <string name="show_passed">Mostrar passado</string>
+    <string name="hide_passed">Esconder o passado</string>
+    <string name="remove_from_map_markers">Remover dos marcadores do mapa</string>
     <string name="descendingly">descendente</string>
     <string name="ascendingly">ascendente</string>
     <string name="date_added">Data adicionada</string>
     <string name="order_by">Ordenar por:</string>
     <string name="marker_show_distance_descr">Selecionar como indicar a distância e direção aos marcadores do mapa no ecrã do mapa:</string>
     <string name="map_orientation_change_in_accordance_with_speed">Limiar de orientação do mapa</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Selecionar abaixo qual a velocidade que a orientação do mapa altera de \'Para a direção do movimento\' para \'Para bússola\'</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Selecione a velocidade de mudança de orientação do \'Direção de movimento\' a \'Direção de bússola\' abaixo.</string>
     <string name="all_markers_moved_to_history">Todos os marcadores do mapa movidos para histórico</string>
     <string name="marker_moved_to_history">Marcador do mapa movido para histórico</string>
     <string name="marker_moved_to_active">Marcador do mapa movido para ativo</string>
@@ -2105,9 +2118,9 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="move_all_to_history">Mover tudo para histórico</string>
     <string name="show_direction">Indicação da distância</string>
     <string name="sort_by">Ordenar por</string>
-    <string name="do_not_use_animations">Não usar animações</string>
-    <string name="do_not_use_animations_descr">Desativar animações na aplicação</string>
-    <string name="keep_showing_on_map">Mantém observável no mapa</string>
+    <string name="do_not_use_animations">Sem animações</string>
+    <string name="do_not_use_animations_descr">Desativar animações na aplicação.</string>
+    <string name="keep_showing_on_map">Manter o mapa observável</string>
     <string name="exit_without_saving">Sair sem guardar?</string>
     <string name="line">Linha</string>
     <string name="save_as_route_point">Guardar como pontos do percurso</string>
@@ -2118,80 +2131,78 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="add_point_after">Adicionar ponto depois</string>
     <string name="shared_string_options">Opções</string>
     <string name="measurement_tool_snap_to_road_descr">OsmAnd irá ligar os pontos com percursos para o perfil selecionado.</string>
-    <string name="measurement_tool_save_as_new_track_descr">Pode gravar os pontos como pontos de percurso ou como uma linha.</string>
+    <string name="measurement_tool_save_as_new_track_descr">Gravar os pontos como pontos de percurso ou como uma linha.</string>
     <string name="choose_navigation_type">Selecionar perfil de navegação</string>
     <string name="none_point_error">Por favor adicione pelo menos um ponto.</string>
-    <string name="enter_gpx_name">Nome de arquivo GPX:</string>
+    <string name="enter_gpx_name">Nome de ficheiro GPX:</string>
     <string name="show_on_map_after_saving">Mostrar no mapa após guardar</string>
     <string name="measurement_tool_action_bar">Explorar o mapa e adicionar pontos</string>
     <string name="measurement_tool">Medir distância</string>
-    <string name="quick_action_resume_pause_navigation">Retomar/Pausa navegação</string>
+    <string name="quick_action_resume_pause_navigation">Pausar/reatar navegação</string>
     <string name="quick_action_resume_pause_navigation_descr">Selecionar este botão para pausa ou retomar a navegação.</string>
-    <string name="quick_action_show_navigation_finish_dialog">Mostrar diálogo final de Navegação</string>
+    <string name="quick_action_show_navigation_finish_dialog">Mostrar diálogo \'Final de Navegação\'</string>
     <string name="quick_action_start_stop_navigation">Iniciar/parar navegação</string>
     <string name="quick_action_start_stop_navigation_descr">Selecionar este botão para parar ou terminar a navegação.</string>
     <string name="store_tracks_in_monthly_directories">Armazenar percursos gravados em diretórios mensais</string>
-    <string name="store_tracks_in_monthly_directories_descrp">Armazenar percursos gravados em subdiretórios por mês de gravação (como 2017-01).</string>
+    <string name="store_tracks_in_monthly_directories_descrp">Armazenar percursos gravados em subdiretórios por mês de gravação (como 2018-01).</string>
     <string name="shared_string_reset">Reiniciar</string>
     <string name="shared_string_reload">Recarregar</string>
     <string name="mapillary_menu_descr_tile_cache">Recarregar tiles para ver dados atualizados.</string>
     <string name="mapillary_menu_title_tile_cache">Cache de tile</string>
-    <string name="wrong_user_name">Nome de utilizador incorreto!</string>
+    <string name="wrong_user_name">Nome de usuário incorreto</string>
     <string name="shared_string_to">Para</string>
     <string name="mapillary_menu_date_from">A partir de</string>
-    <string name="mapillary_menu_descr_dates">Visualizar imagens adicionadas durante um período específico.</string>
-    <string name="mapillary_menu_title_dates">Datas</string>
+    <string name="mapillary_menu_descr_dates">Visualizar só imagens adicionadas</string>
+    <string name="mapillary_menu_title_dates">Data</string>
     <string name="mapillary_menu_edit_text_hint">Introduza nome de utilizador</string>
-    <string name="mapillary_menu_descr_username">Ver imagens adicionados por um utilizador específico.</string>
+    <string name="mapillary_menu_descr_username">Ver imagens adicionadas por</string>
     <string name="mapillary_menu_title_username">Nome de utilizador</string>
-    <string name="mapillary_menu_filter_description">Pode filtrar imagens por quem submeteu ou por data. Filtros aplicáveis apenas para zoom de proximidade.</string>
+    <string name="mapillary_menu_filter_description">Pode filtrar imagens por quem submeteu, por data our por tipo. Filtros aplicáveis apenas para zoom de proximidade.</string>
     <string name="map_widget_ruler_control">Régua de raio</string>
     <string name="shared_string_permissions">Permissões</string>
-    <string name="import_gpx_failed_descr">OsmAnd não pode importar o arquivo. Por favor confirme se OsmAnd tem permissão para ler o arquivo a partir da sua localização.</string>
+    <string name="import_gpx_failed_descr">OsmAnd não pode importar o ficheiro. Por favor confirme se OsmAnd tem permissão para ler o ficheiro da sua localização.</string>
     <string name="distance_moving">Distância corrigida</string>
     <string name="mapillary_image">Imagem Mapillary</string>
     <string name="open_mapillary">Abrir Mapillary</string>
     <string name="shared_string_install">Instalar</string>
     <string name="improve_coverage_mapillary">Melhorar cobertura fotográfica com Mapillary</string>
-    <string name="improve_coverage_install_mapillary_desc">Pode tirar as suas próprias fotos ou conjunto de fotos e anexá-las a este localização do mapa.
-\n
-\nPara fazer isto precisa de instalar a aplicação Mapillary a partir da Google Play Store.</string>
-    <string name="online_photos">Fotos online</string>
+    <string name="improve_coverage_install_mapillary_desc">Instale o Mapillary para adicionar uma ou mais fotos a este local do mapa.</string>
+    <string name="online_photos">Fotos on-line</string>
     <string name="shared_string_add_photos">Adicionar fotos</string>
-    <string name="no_photos_descr">Não temos fotos para esta localização</string>
-    <string name="mapillary_action_descr">Contribui com as suas fotos ao nível da rua desta localização a partir do Mapillary.</string>
+    <string name="no_photos_descr">Não temos fotos para esta localização.</string>
+    <string name="mapillary_action_descr">Contribua com as suas fotos ao nível da rua desta localização atravéz de Mapillary.</string>
     <string name="mapillary_widget">Widget Mapillary</string>
-    <string name="mapillary_widget_descr">Permite-lhe contribuir rapidamente para Mapillary</string>
-    <string name="mapillary_descr">Fotos online ao nível da rua para todos. Descubra locais, colabore, capture o mundo.</string>
+    <string name="mapillary_widget_descr">Permite contribuir rapidamente para Mapillary.</string>
+    <string name="mapillary_descr">Fotos on-line ao nível da rua para todos. Descubra locais, colabore, capture o mundo.</string>
     <string name="mapillary">Mapillary</string>
     <string name="plugin_mapillary_descr">Fotos ao nível da rua para todos. Descubra locais, colabore, capture o mundo.</string>
-    <string name="private_access_routing_req">O seu destino está localizado numa área de acesso privado. Gostaria de permitir o acesso a estradas privadas para esta viagem?</string>
+    <string name="private_access_routing_req">O seu destino está localizado numa área de acesso privado. Permitir o acesso a estradas privadas para esta viagem\?</string>
     <string name="restart_search">Reiniciar pesquisa</string>
     <string name="increase_search_radius">Aumentar raio de pesquisa</string>
-    <string name="nothing_found">Nada encontrado :(</string>
-    <string name="nothing_found_descr">Modifique termo de pesquisa ou aumente raio de pesquisa</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostrar/esconder Notas OSM</string>
-    <string name="quick_action_osmbugs_show">Mostrar Notas OSM</string>
-    <string name="quick_action_osmbugs_hide">Esconder Notas OSM</string>
-    <string name="quick_action_showhide_osmbugs_descr">Tocar no botão de ação irá mostrar ou esconder as Notas OSM no mapa.</string>
+    <string name="nothing_found">Nada encontrado</string>
+    <string name="nothing_found_descr">Modifique termo de pesquisa ou aumente raio de pesquisa.</string>
+    <string name="quick_action_showhide_osmbugs_title">Mostrar/esconder anotações OSM</string>
+    <string name="quick_action_osmbugs_show">Mostrar anotações OSM</string>
+    <string name="quick_action_osmbugs_hide">Esconder anotações OSM</string>
+    <string name="quick_action_showhide_osmbugs_descr">Tocar no botão de ação irá mostrar ou esconder as anotações OSM no mapa.</string>
     <string name="sorted_by_distance">Ordenar por distância</string>
     <string name="search_favorites">Favoritos de pesquisa</string>
-    <string name="hillshade_menu_download_descr">Para observar relief hillshading no mapa, precisa de descarregar o mapa de hillshade overlay desta região.</string>
-    <string name="hillshade_purchase_header">Para ver relief hillshading no mapa, precisa de comprar e instalar o plugin Contour Lines</string>
+    <string name="hillshade_menu_download_descr">Para observar relief sombreamento de relevo no mapa, precisa de descarregar o mapa de sobreposições de sombreamento de relevo desta região.</string>
+    <string name="hillshade_purchase_header">Para ver relief sobreamento de relevo no mapa, precisa de comprar e instalar o plugin \'Contour Lines\'</string>
     <string name="hide_from_zoom_level">Esconder do nível de zoom</string>
-    <string name="srtm_menu_download_descr">Para ver linhas de contorno deste mapa, precisa de descarregar o mapa de linha de contorno para esta região.</string>
+    <string name="srtm_menu_download_descr">Descarregue o mapa de \'linha de contorno\' para esta região.</string>
     <string name="shared_string_plugin">Plugin</string>
-    <string name="srtm_purchase_header">Para ver as linhas de contorno no mapa, precisa de comprar e instalar o plugin de Linhas de Contorno</string>
+    <string name="srtm_purchase_header">Para ver as linhas de contorno no mapa, precisa de comprar e instalar o plugin de \'Linhas de Contorno\'</string>
     <string name="srtm_color_scheme">Esquema de cores</string>
     <string name="show_from_zoom_level">Mostrar a partir do nível de zoom</string>
     <string name="routing_attr_allow_private_name">Permitir acesso privado</string>
-    <string name="routing_attr_allow_private_description">Permitir acesso a áreas privadas</string>
+    <string name="routing_attr_allow_private_description">Permitir acesso a áreas privadas.</string>
     <string name="display_zoom_level">Mostrar nível de zoom: %1$s</string>
     <string name="favorite_group_name">Nome de grupo</string>
     <string name="change_color">Mudar cor</string>
     <string name="edit_name">Editar nome</string>
     <string name="animate_my_location">Animar Minha Posição</string>
-    <string name="animate_my_location_desc">Ativar animação panorâmica do mapa da Minha Posição durante navegação</string>
+    <string name="animate_my_location_desc">Ativar animação panorâmica do mapa da \'Minha Posição\' durante navegação.</string>
     <string name="shared_string_overview">Visão Geral</string>
     <string name="select_street">Selecionar rua</string>
     <string name="shared_string_in_name">em %1$s</string>
@@ -2208,15 +2219,15 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="quick_action_add_destination">Adicionar destino</string>
     <string name="quick_action_replace_destination">Substituir destino</string>
     <string name="quick_action_add_first_intermediate">Adicionar primeiro intermediário</string>
-    <string name="quick_action_add_destination_desc">Selecionar o botão de ação irá adicionar um destino ao localização do centro do ecrã. Destino definidos anteriormente tornam-se o último ponto intermediário.</string>
-    <string name="quick_action_replace_destination_desc">Selecionar o botão de ação irá substituir o destino com o localização do centro do ecrã.</string>
-    <string name="quick_action_add_first_intermediate_desc">Selecionar o botão de ação irá adicionar um primeiro ponto intermédio na localização no centro do ecrã.</string>
-    <string name="no_overlay">Sem sobreposição</string>
+    <string name="quick_action_add_destination_desc">Tocando no botão de ação irá adicionar um destino ao localização do centro do ecrã. Destinos definidos anteriormente tornam-se o último ponto intermediário.</string>
+    <string name="quick_action_replace_destination_desc">Tocando neste botão de ação torna o centro do ecrã o novo destino de rota, substituindo o destino selecionado anteriormente (se houver).</string>
+    <string name="quick_action_add_first_intermediate_desc">Tocando neste botão de ação torna o centro do ecrã o primeiro destino intermediário.</string>
+    <string name="no_overlay">Sem camada superior</string>
     <string name="no_underlay">Sem subposição</string>
     <string name="subscribe_email_error">Erro</string>
     <string name="subscribe_email_desc">Subscreva à nossa lista de e-mail sobre descontos da aplicação e ganhe 3 mapas adicionais!</string>
-    <string name="depth_contour_descr">Conjunto de mapas que contém os pontos e linhas de contorno de profundidade marítima.</string>
-    <string name="sea_depth_thanks">Muito obrigado por comprar contornos de profundidade náutica!</string>
+    <string name="depth_contour_descr">Linhas de contorno de profundidade marítima e seamarks.</string>
+    <string name="sea_depth_thanks">Muito obrigado por comprar \'Contornos de profundidade náutica\'</string>
     <string name="index_item_depth_contours_osmand_ext">Contornos de profundidade náutica</string>
     <string name="index_item_depth_points_southern_hemisphere">Pontos de profundidade náutica do hemisfério sul</string>
     <string name="index_item_depth_points_northern_hemisphere">Pontos de profundidade náutica do hemisfério norte</string>
@@ -2225,38 +2236,38 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="analyze_on_map">Analise no mapa</string>
     <string name="shared_string_visible">Visível</string>
     <string name="restore_purchases">Restaurar compras</string>
-    <string name="fonts_header">Fontes para mapa</string>
+    <string name="fonts_header">Fontes do mapa</string>
     <string name="right_side_navigation">Condução destra</string>
     <string name="driving_region_automatic">Automático</string>
     <string name="do_not_send_anonymous_app_usage">Não envie estatísticas anónimas de utilização da aplicação</string>
-    <string name="do_not_send_anonymous_app_usage_desc">OsmAnd coleta informação sobre quais porções da aplicação estão abertas. A sua localização nunca é enviada, nem é nada que introduza na aplicação ou detalhes de áreas que observe, procure ou descarregue.</string>
-    <string name="do_not_show_startup_messages">Não mostres mensagens ao iniciar</string>
-    <string name="do_not_show_startup_messages_desc">Suprime mostrar descontos da aplicação e mensagens de eventos locais especiais</string>
+    <string name="do_not_send_anonymous_app_usage_desc">OsmAnd coleta informação sobre quais porções da aplicação que você abriu. A sua localização nunca é enviada, nem é nada que introduza na aplicação ou detalhes de áreas que observe, procure ou descarregue.</string>
+    <string name="do_not_show_startup_messages">Não mostrar mensagens ao iniciar</string>
+    <string name="do_not_show_startup_messages_desc">Nâo mostrar descontos da aplicação e mensagens de eventos locais especiais.</string>
     <string name="parking_options">Opções de estacionamento</string>
-    <string name="full_version_thanks">Muito obrigado por comprar a versão completa de OsmAnd!</string>
+    <string name="full_version_thanks">Muito obrigado por comprar a versão paga de OsmAnd.</string>
     <string name="routing_attr_relief_smoothness_factor_hills_name">Inclinado</string>
     <string name="routing_attr_relief_smoothness_factor_plains_name">Menos inclinado</string>
     <string name="routing_attr_relief_smoothness_factor_more_plains_name">Plano</string>
     <string name="routing_attr_driving_style_speed_name">Percursos mais curtos</string>
     <string name="routing_attr_driving_style_balance_name">Balanceado</string>
     <string name="routing_attr_driving_style_safety_name">Preferir ramais</string>
-    <string name="relief_smoothness_factor_descr">Terreno preferido: plano ou inclinado</string>
+    <string name="relief_smoothness_factor_descr">Terreno preferido: plano ou inclinado.</string>
     <string name="shared_string_slope">Encosta</string>
     <string name="add_new_folder">Adicionar nova pasta</string>
-    <string name="points_delete_multiple_succesful">Ponto(s) eliminados com sucesso.</string>
+    <string name="points_delete_multiple_succesful">Ponto(s) eliminado(s).</string>
     <string name="points_delete_multiple">Vai apagar %1$d ponto(s). Tem a certeza?</string>
     <string name="route_points_category_name">Mudanças de direção a passar neste percurso</string>
-    <string name="track_points_category_name">Pontos proeminentes neste percurso</string>
+    <string name="track_points_category_name">Pontos de passagem, pontos de interesse, características nomeadas</string>
     <string name="shared_string_gpx_track">Percurso</string>
     <string name="max_speed">Velocidade máxima</string>
     <string name="average_speed">Velocidade média</string>
     <string name="shared_string_time_moving">Tempo em movimento</string>
     <string name="shared_string_time_span">Período de tempo</string>
     <string name="shared_string_max">Máximo</string>
-    <string name="shared_string_start_time">Tempo início</string>
-    <string name="shared_string_end_time">Tempo final</string>
+    <string name="shared_string_start_time">Hora de início</string>
+    <string name="shared_string_end_time">Hora de fim</string>
     <string name="shared_string_color">Cor</string>
-    <string name="select_gpx_folder">Selecionar diretório do percurso</string>
+    <string name="select_gpx_folder">Selecionar diretório do ficheiro GPX</string>
     <string name="file_can_not_be_moved">Ficheiro não pode ser movido.</string>
     <string name="shared_string_move">Mover</string>
     <string name="shared_string_gpx_tracks">Percursos</string>
@@ -2270,8 +2281,8 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="total_distance">Distância total</string>
     <string name="routing_attr_relief_smoothness_factor_name">Selecionar flutuação de elevação</string>
     <string name="routing_attr_height_obstacles_name">Utilizar dados de elevação</string>
-    <string name="routing_attr_height_obstacles_description">Utilizar dados de elevação de terreno provenientes de SRTM, ASTER e EU-DEM</string>
-    <string name="rendering_attr_depthContours_description">Mostrar pontos e contornos de profundidade</string>
+    <string name="routing_attr_height_obstacles_description">Utilizar elevação de terreno (dos dados do SRTM, ASTER e EU-DEM).</string>
+    <string name="rendering_attr_depthContours_description">Mostrar pontos e contornos de profundidade.</string>
     <string name="rendering_attr_depthContours_name">Contornos de profundidade náuticos</string>
     
     <string name="show_transparency_seekbar">Mostra a transparência da barra de navegação</string>
@@ -2279,7 +2290,7 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="rendering_attr_hideUnderground_name">Objectos subterrâneos</string>
     
     <string name="auto_split_recording_title">Divisão automática de gravações após separação</string>
-    <string name="auto_split_recording_descr">Iniciar novo segmento após uma quebra de 6 min, novo percurso após quebra de 2 h, ou novo arquivo após quebra mais longa se a data se tiver alterado.</string>
+    <string name="auto_split_recording_descr">Iniciar novo segmento após uma quebra de 6 min, novo percurso após quebra de 2 h, ou novo ficheiro após uma quebra mais longa se a data se tiver alterada.</string>
     <string name="rendering_attr_contourDensity_description">Densidade de linhas de contorno</string>
     <string name="rendering_attr_contourDensity_name">Densidade de linhas de contorno</string>
     <string name="rendering_value_high_name">Alto</string>
@@ -2293,21 +2304,21 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="show_legacy_search">Mostrar pesquisa antiga</string>
     <string name="show_legacy_search_desc">Adicionar pesquisa antiga à lista da gaveta</string>
     <string name="routing_attr_allow_motorway_name">Permitir vias de motociclos</string>
-    <string name="routing_attr_allow_motorway_description">Permitir vias de motociclos</string>
+    <string name="routing_attr_allow_motorway_description">Permitir vias de motociclos.</string>
     <string name="wiki_around">Artigos de Wikipedia próximos</string>
     <string name="search_map_hint">Procurar cidade ou região</string>
     <string name="route_roundabout_short">Use a saída %1$d e continue</string>
     <string name="upload_poi">Enviar Pontos de Interesse (POI)</string>
     <string name="route_calculation">Cálculo da rota</string>
-    <string name="gpx_no_tracks_title">Não tem ainda nenhum percurso</string>
-    <string name="gpx_no_tracks_title_folder">Também pode adicionar percursos ao diretório</string>
-    <string name="gpx_add_track">Adicionar percurso</string>
+    <string name="gpx_no_tracks_title">Ainda não tem nenhum percurso</string>
+    <string name="gpx_no_tracks_title_folder">Também pode adicionar ficheiros GPX ao diretório</string>
+    <string name="gpx_add_track">Adicionar mais…</string>
     <string name="gpx_appearance">Aparência</string>
     
     
     
-    <string name="trip_rec_notification_settings">Gravação da viagem (sem dados)</string>
-    <string name="trip_rec_notification_settings_desc">Mostrar uma notificação de sistema que permite iniciar a gravação da viagem</string>
+    <string name="trip_rec_notification_settings">Ativar a gravação de início rápido</string>
+    <string name="trip_rec_notification_settings_desc">Mostrar uma notificação de sistema que permite iniciar a gravação da viagem.</string>
     <string name="shared_string_notifications">Notificações</string>
     <string name="shared_string_continue">Continuar</string>
     <string name="shared_string_pause">Pausa</string>
@@ -2319,11 +2330,11 @@ Clique no widget de medição para ver mais ações.</string>
     
     <string name="rendering_attr_contourColorScheme_description">Esquema de cores das linhas de contorno</string>
     <string name="save_track_min_speed">Velocidade mínima para registo</string>
-    <string name="save_track_min_speed_descr">Filtro: Definir velocidade mínima para um ponto poder ser registado</string>
+    <string name="save_track_min_speed_descr">Filtro: nenhum registro de pontos abaixo desta velocidade.</string>
     <string name="save_track_min_distance">Deslocamento mínimo para registo</string>
-    <string name="save_track_min_distance_descr">Filtro: Definir distância mínima da última posição para um ponto poder ser registado</string>
+    <string name="save_track_min_distance_descr">Filtro: definir a distância mínima de um ponto para registrar um novo.</string>
     <string name="save_track_precision">Acuidade mínima para registo</string>
-    <string name="save_track_precision_descr">Filtro: Definir acuidade mínima para um ponto poder ser registado</string>
+    <string name="save_track_precision_descr">Filtro: Definir acuidade mínima para um ponto poder ser registado.</string>
     <string name="christmas_poi">Pontos de interesse (POI) de Natal</string>
     <string name="christmas_desc">Antes do Natal e Ano Novo, pode escolher mostrar pontos de interesse (POI) relacionados com o Natal: Árvores de Natal, mercados, etc.</string>
     <string name="christmas_desc_q">Mostrar pontos de interesse (POI) de Natal?</string>
@@ -2331,7 +2342,7 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="rendering_value_dark_brown_name">Castanho escuro</string>
     <string name="rendering_attr_contourColorScheme_name">Esquema de cores das linhas de contorno</string>
     <string name="rendering_attr_surfaceIntegrity_name">Integridade da superfície da estrada</string>
-    <string name="search_hint">Escreva cidade, morada, nome do ponto de interesse (POI)</string>
+    <string name="search_hint">Escreva cidade, endereço, nome do ponto de interesse (POI)</string>
     <string name="translit_name_if_miss">Transliterar se %1$s nome está ausente</string>
     <string name="translit_names">Nomes transliterados</string>
     <string name="edit_filter">Editar categorias</string>
@@ -2344,15 +2355,15 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="save_filter">Guardar filtros</string>
     <string name="delete_filter">Apagar filtros</string>
     <string name="new_filter">Novo filtro</string>
-    <string name="new_filter_desc">Por favor introduza o nome do novo filtro, este vai ser adicionado ao seu separador Categorias.</string>
-    <string name="osm_live_payment_desc">Valor de subscrição vai ser taxada a cada mês. Pode cancelar a subscrição no Google Play a qualquer altura.</string>
+    <string name="new_filter_desc">Por favor introduza o nome do novo filtro, este vai ser adicionado ao seu separador \'Categorias\'.</string>
+    <string name="osm_live_payment_desc">A assinatura é cobrada mensalmente. Cancele a assinatura no Google Play a qualquer altura.</string>
     <string name="donation_to_osm">Doação para a comunidade OpenStreetMap</string>
-    <string name="donation_to_osm_desc">Parte da sua doação irá ser enviada para utilizadores OSM que submetem alterações ao OpenStreetMap. O custo da subscrição continua a ser o mesmo.</string>
+    <string name="donation_to_osm_desc">Parte da sua doação é enviada aos utilizadores OSM que submetem alterações ao OpenStreetMap. O custo da assinatura continua a ser o mesmo.</string>
     <string name="osm_live_subscription_desc">Subscrição permite atualizações a cada hora, diárias, semanais, e descarregamentos ilimitados de todos os mapas globalmente.</string>
     <string name="get_it">Comprá-lo</string>
     <string name="get_for">Comprar por %1$s</string>
     <string name="get_for_month">Comprar por %1$s mês</string>
-    <string name="osm_live_banner_desc">Obter descarregamentos ilimitados de mapas, e atualizações de mapas mais do que uma vez por mês: semanal, diário, ou a cada hora.</string>
+    <string name="osm_live_banner_desc">Obter descarregamentos ilimitados de mapas e atualizações de mapas mais do que uma vez por mês: semanal, diário, ou a cada hora.</string>
     <string name="osmand_plus_banner_desc">Descarregamentos ilimitados de mapas, atualizações, e plugin Wikipedia.</string>
     <string name="si_mi_meters">Milhas/metros</string>
     <string name="search_map">À procura de mapas…</string>
@@ -2362,24 +2373,24 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="no_inet_connection_desc_map">Necessário para descarregar mapas.</string>
     <string name="search_location">À procura de localização…</string>
     <string name="storage_free_space">Espaço livre</string>
-    <string name="storage_place_description">Armazenamento de dados de OsmAnd (para mapas, percursos, etc.): %1$s.</string>
-    <string name="give_permission">Dê permissão</string>
-    <string name="allow_access_location">Permitir acesso a localização</string>
+    <string name="storage_place_description">Armazenamento de dados de OsmAnd (para mapas, ficheiros GPX, etc.): %1$s.</string>
+    <string name="give_permission">Conceder permissão</string>
+    <string name="allow_access_location">Permitir acesso à localização</string>
     <string name="search_my_location">Encontrar a minha posição</string>
     <string name="no_update_info_desc">Não verifique atualizações de versão ou descontos relacionados com OsmAnd</string>
     <string name="no_update_info">Não mostrar atualizações</string>
-    <string name="update_all_maps_now">Quer atualizar todos os mapas agora?</string>
-    <string name="clear_tile_data">Apagar todos os tiles</string>
+    <string name="update_all_maps_now">Atualizar todos os mapas agora\?</string>
+    <string name="clear_tile_data">Limpar todas as telhas</string>
     <string name="routing_attr_short_way_name">Percurso económico</string>
-    <string name="routing_attr_short_way_description">Utilizar percurso económico (geralmente mais curto)</string>
-    <string name="replace_favorite_confirmation">Tem a certeza que quer substituir %1$s favorito?</string>
+    <string name="routing_attr_short_way_description">Utilizar percurso económico (geralmente mais curto).</string>
+    <string name="replace_favorite_confirmation">Tem a certeza que quer substituir o favorito %1$s\?</string>
     <string name="rendering_attr_hideOverground_name">Objetos à superfície</string>
     <string name="get_started">Começar</string>
     <string name="route_stops_before">%1$s paragens antes</string>
     <string name="coords_search">Pesquisa de coordenadas</string>
     <string name="advanced_coords_search">Pesquisa avançada de coordenadas</string>
     <string name="back_to_search">Retroceder para pesquisa</string>
-    <string name="confirmation_to_delete_history_items">Pretende remover os itens selecionados do histórico?</string>
+    <string name="confirmation_to_delete_history_items">Pretende remover os itens selecionados do \'histórico\'\?</string>
     <string name="show_something_on_map">Mostrar %1$s no mapa</string>
     <string name="poi_cannot_be_found">Nó ou caminho não pode ser encontrado.</string>
     <string name="search_no_results_feedback">Não há resultados de pesquisa?
@@ -2402,17 +2413,747 @@ Clique no widget de medição para ver mais ações.</string>
     <string name="hide_full_description">Esconder descrição completa</string>
     <string name="show_full_description">Mostrar a descrição completa</string>
     <string name="thank_you_for_feedback">Obrigado pelo feedback</string>
-    <string name="release_3_2_pre">• A falha na inicialização que ocorreu com mapas não-latinos corrigida
+    <string name="release_3_2_pre">• A falha na inicialização que ocorreu em alguns dispositivos corrigida
 \n
+\n• Novos Marcadores de recurso: apresentar os marcadores que já foi percorrida
+\n
+\n• Histórico de pesquisa agora mostra as categorias que você procurou anteriormente
+\n
+\n• A falha na inicialização que ocorreu com mapas não-latinos corrigida 
+\n 
 \n• Melhorar problemas de velocidade em dispositivos com 8.0 Android 
+\n 
+\n• Suporte para editar objetos de polígono de renderização (não-cortesia) 
 \n
-\n• Suporte para editar objetos de polígono de renderização (não-cortesia)
+\n• Medir a distância: adicionar botão de medição para ações no menu de contexto
 \n
 \n</string>
-    <string name="search_street"></string>
-    <string name="shared_string_restore"></string>
-    <string name="keep_passed_markers_descr"></string>
-    <string name="keep_passed_markers"></string>
-    <string name="more_transport_on_stop_hint"></string>
-    <string name="ask_for_location_permission"></string>
-    </resources>
+    <string name="search_street">Pesquisa de rua</string>
+    <string name="shared_string_restore">Restaurar</string>
+    <string name="keep_passed_markers_descr">Marcadores adicionados como um grupo de favoritos ou ponto de rota GPX marcados Passado permanecerão no mapa. Se o grupo não estiver ativo, os marcadores desaparecerão do mapa.</string>
+    <string name="keep_passed_markers">Manter marcadores passados no mapa</string>
+    <string name="more_transport_on_stop_hint">Há mais transportes nesta parada.</string>
+    <string name="ask_for_location_permission">Por favor, dê OsmAnd permissão para localização para continuar.</string>
+    <string name="markers_remove_dialog_msg">Apagar o marcador de mapa \'%s\'\?</string>
+    <string name="edit_map_marker">Editar marcador de mapa</string>
+    <string name="third_party_application">Aplicativo de terceiros</string>
+    <string name="start_search_from_city">Iniciar pesquisa a partir da cidade</string>
+    <string name="osm_live_plan_pricing">Plano e preços</string>
+    <string name="osm_live_payment_monthly_title">Pagar mensalmente</string>
+    <string name="osm_live_payment_3_months_title">Pagar uma vez em 3 meses</string>
+    <string name="osm_live_payment_annual_title">Pagar uma vez por ano</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mês</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mês</string>
+    <string name="osm_live_payment_discount_descr">Poupe %1$s!</string>
+	<string name="osm_live_payment_current_subscription">A sua subscrição actual</string>
+    <string name="osm_live_payment_renews_monthly">Renova mensalmente</string>
+    <string name="osm_live_payment_renews_quarterly">Renova trimestral</string>
+    <string name="osm_live_payment_renews_annually">Renova anualmente</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Selecione o período de pagamento conveniente para você:</string>
+    <string name="osm_live_payment_contribute_descr">Parte da renda vai para contribuidores do OpenStreetMap.</string>
+    <string name="release_3_1">• Navegação: Fix barra de progresso, troca rápida do ponto inicial e final da rota
+\n
+\n • Marcadores de mapa: corrigir ligar/desligar grupos, a capacidade de esconder os marcadores do mapa
+\n
+\n • OSM Edit: capacidade de editar tags para objetos não-ponto e caminhos, corrigir comentários ausentes em notas, backup de edições
+\n
+\n • Melhore análise Wikipedia e Wikivoyage, ficheiros atualizados já estão disponíveis
+\n
+\n • Menu de contexto: fixar a cor dos escudos de transporte no modo noturno, fixar tamanhos de menu adicionais
+\n
+\n • Navegação do barco: sustentação para o fairway do hidrovia
+\n
+\n • Outras correções de bugs</string>
+    <string name="off_road_render_descr">Adequado para uso durante a condução fora de estrada. Adequado para utilização com imagens de satélite verdes como uma subjacência mapa. Pontos-chave: Redução da espressura da estrada principal, aumento da espessura de trilhas, caminhos, de bicicleta e de outras rotas. Baseado no estilo de \"Topo\".</string>
+    <string name="nautical_render_descr">Estilo Náutico da navegação. Principais características: bóias, faróis, cursos de rios, vias marítimas e marcas, portos, serviços seamark, contornos de profundidade.</string>
+    <string name="ski_map_render_descr">Estilo de esqui. Características principais: processa Pistes, ski-elevadores e outras características de esqui de uma forma conveniente. Objetos secundários do mapa menos distraindos.</string>
+    <string name="light_rs_render_descr">Estilo simples e contrastante para a navegação do carro. Suave para os olhos no modo noturno. Características principais: linhas de contorno, estradas contrastantes de estilo laranja, objetos secundários do mapa menos distraindos.</string>
+    <string name="topo_render_descr">Estilo de contraste projetado principalmente para caminhadas, trekking e ciclismo na natureza. Boa legibilidade em iluminação externa complexa. Características P
+\nprincipais: contrastando estradas e objetos naturais, diferentes tipos de rotas, linhas de contorno com configurações avançadas, mais detalhes em níveis de zoom correspondentes do que o estilo padrão. A opção de integridade superficial permite distinguir a qualidade da superfície rodoviária. Não há modo noturno.</string>
+    <string name="mapnik_render_descr">Velho estilo de renderização padrão \'Mapnik\'. Características principais: as cores são semelhantes ao estilo \'Mapnik\'.</string>
+    <string name="touring_view_render_descr">Estilo de alto detalhe para excursos. Inclui todas as opções de configuração de estilo padrão e além disso: exibe o máximo de detalhes possível, em particular todas as estradas, caminhos e outras formas de viajar. Distinção Visual clara entre todos os tipos de estradas diferentes, reminiscente de muitos atlases de turismo. Esquema de cores de alto contraste para uso ao ar livre, modo de dia e de noite.</string>
+    <string name="default_render_descr">Estilo de propósito geral. Renderização simplificada e limpa em cidades densamente povoadas. Características principais: linhas de contorno, rotas, qualidade de superfície, restrições de acesso, escudos rodoviários, caminhos de renderização de acordo com a escala SAC, características esportivas Whitewater.</string>
+    <string name="open_wikipedia_link_online">Abrir link à Wikipedia on-line</string>
+    <string name="open_wikipedia_link_online_description">O link será aberto em um navegador da web.</string>
+    <string name="read_wikipedia_offline_description">Obtenha uma assinatura da OsmAnd Live para ler artigos offline da Wikipédia e da Wikivoyage.</string>
+    <string name="how_to_open_link">Como abrir o link\?</string>
+    <string name="read_wikipedia_offline">Ler a Wikipédia offline</string>
+    <string name="download_all">Descarregar tudo</string>
+    <string name="shared_string_restart">Reiníciar a aplicação</string>
+    <string name="show_images">Mostrar imagens</string>
+    <string name="purchase_cancelled_dialog_title">Você cancelou sua assinatura do OsmAnd Live</string>
+    <string name="purchase_cancelled_dialog_descr">Renovar assinatura para continuar a utilizar todas as funcionalidades:</string>
+
+    <string name="maps_you_need_descr">Com base nos artigos que você marcou, os mapas seguintes são recomendados para você fazer o download:</string>
+    <string name="maps_you_need">Mapas que você precisa</string>
+    <string name="osmand_team">Equipe do OsmAnd</string>
+    <string name="popular_destinations">Destinos populares</string>
+    <string name="paid_app">Aplicativo pago</string>
+    <string name="paid_plugin">Plugin pago</string>
+    <string name="travel_card_update_descr">Há novos dados disponíveis da Wikivoyage, atualize-os para desfrutar.</string>
+	<string name="travel_card_download_descr">Descarregue guias de viagem da Wikivoyage para ver artigos sobre lugares ao redor do mundo sem uma conexão com a Internet.</string>
+	<string name="update_is_available">Atualização disponível</string>
+	<string name="download_file">Descarregar ficheiro</string>
+    <string name="start_editing_card_image_text">O mundo livre guia de viagem, que qualquer pessoa pode editar.</string>
+    <string name="welcome_to_open_beta_description">Os guias de viagem estão atualmente baseados no Wikivoyage. Teste todos os recursos gratuitamente durante o teste aberto beta. Posteriormente os guias de viagem estarão disponíveis para assinantes do OsmAnd Unlimited e proprietários da OsmAnd+.</string>
+    <string name="start_editing_card_description">Você pode e deve editar qualquer artigo na Wikivoyage. Compartilhe saber, experiência, talento e sua atenção</string>
+    <string name="start_editing">Começar a editar</string>
+    <string name="get_unlimited_access">Obter acesso ilimitado</string>
+    <string name="welcome_to_open_beta">Bem-vindo ao beta aberto</string>
+    <string name="wikivoyage_travel_guide">Guias de viagem</string>
+    <string name="wikivoyage_travel_guide_descr">Guias para os lugares mais interessantes do mundo dentro do OsmAnd, sem uma conexão com a Internet.</string>
+    <string name="monthly_map_updates">Atualizações de mapa: <b>a cada mês</b></string>
+    <string name="daily_map_updates">Atualizações de mapa: <b>a cada hora</b></string>
+    <string name="in_app_purchase">Compra in-app</string>
+    <string name="in_app_purchase_desc">Pagamento de uma só vez</string>
+    <string name="in_app_purchase_desc_ex">Uma vez comprado, estará permanentemente disponível para você.</string>
+    <string name="purchase_unlim_title">Comprar - %1$s</string>
+    <string name="purchase_subscription_title">Assinar - %1$s</string>
+    <string name="wikivoyage_offline">Wikivoyage offline</string>
+    <string name="unlimited_downloads">Downloads ilimitados</string>
+    <string name="wikipedia_offline">A Wikipédia offline</string>
+    <string name="contour_lines_hillshade_maps">Linhas de contorno e mapas de sombreamento de relevo</string>
+    <string name="unlock_all_features">Desbloquear todas as características de OsmAnd</string>
+    <string name="purchase_dialog_title">Escolher plano</string>
+    <string name="purchase_dialog_travel_description">Compre uma das opções seguintes para receber a funcionalidade da guia de viagem offline:</string>
+    <string name="purchase_dialog_subtitle">Escolha o artigo adequado:</string>
+    <string name="shared_string_dont">Não</string>
+    <string name="shared_string_do">Fazer</string>
+    <string name="shared_string_only_with_wifi">Apenas em Wi-Fi</string>
+    <string name="wikivoyage_download_pics">Descarregar imagens</string>
+    <string name="wikivoyage_download_pics_descr">As imagens do artigo podem ser descarregadas para uso offline.
+\nSempre disponível em \'Explorar\' → \' Opções \'.</string>
+    <string name="shared_string_wifi_only">Apenas em Wi-Fi</string>
+    <string name="select_travel_book">Selecione um livro de viagem</string>
+    <string name="shared_string_travel_book">Livro de viagens</string>
+    <string name="online_webpage_warning">Página disponível apenas on-line. Abrir no navegador da web\?</string>
+    <string name="images_cache">Cache de imagens</string>
+    <string name="delete_search_history">Apagar histórico de pesquisa</string>
+    <string name="download_images">Descarregar imagens</string>
+    <string name="download_maps_travel">Guias de viagem</string>
+    <string name="shared_string_wikivoyage">Wikivoyage</string>
+    <string name="article_removed">Artigo removido</string>
+    <string name="wikivoyage_search_hint">Pesquisa: país, cidade, província</string>
+    <string name="shared_string_read">Ler</string>
+    <string name="saved_articles">Artigos marcados</string>
+    <string name="shared_string_explore">Explorar</string>
+    <string name="shared_string_contents">Conteúdo</string>
+    <string name="shared_string_result">Resultado</string>
+    <string name="use_two_digits_longitude">Use a longitude do dígito dobro</string>
+    <string name="shared_string_travel_guides">Guias de viagem</string>
+    <string name="waypoints_removed_from_map_markers">ponto de rota removidos de marcadores de mapa</string>
+    <string name="nothing_found_in_radius">Não foi possível encontrar nada:</string>
+    <string name="select_waypoints_category_description">Adicionar todos os da faixa de pontos de rota ou selecionar categorias separadas.</string>
+    <string name="shared_string_total">Total</string>
+    <string name="clear_all_intermediates">Limpar todos os pontos intermediários</string>
+    <string name="group_deleted">Grupo apagado</string>
+    <string name="rendering_attr_whiteWaterSports_name">Whitewater esportes</string>
+    <string name="distance_farthest">Distância: primeiro o mais distante</string>
+    <string name="distance_nearest">Distância: primeiro o mais próximo</string>
+    <string name="enter_lon">Digite a longitude</string>
+    <string name="enter_lat">Digite a latitude</string>
+    <string name="enter_lat_and_lon">Digite a latitude e a longitude</string>
+	<string name="dd_mm_ss_format">DD°MM′SS″</string>
+	<string name="dd_dddddd_format">DD.DDDDDD°</string>
+	<string name="dd_ddddd_format">DD.DDDDD°</string>
+	<string name="dd_mm_mmmm_format">DD°MM.MMMM′</string>
+	<string name="dd_mm_mmm_format">DD°MM.MMM′</string>
+	<string name="east_abbreviation">E</string>
+	<string name="west_abbreviation">O</string>
+	<string name="south_abbreviation">S</string>
+	<string name="north_abbreviation">N</string>
+	<string name="optional_point_name">Nome de ponto opcional</string>
+    <string name="transport_nearby_routes_within">Rotas pertas dentro</string>
+    <string name="transport_nearby_routes">Dentro</string>
+    <string name="enter_the_file_name">Digite o nome do ficheiro.</string>
+    <string name="map_import_error">Erro de importação de mapa</string>
+    <string name="map_imported_successfully">Mapa importado</string>
+    <string name="make_as_start_point">Faça este o ponto de partida</string>
+    <string name="shared_string_current">Atual</string>
+    <string name="last_intermediate_dest_description">Adiciona parada intermediária</string>
+    <string name="first_intermediate_dest_description">Adiciona parada inicial</string>
+    <string name="subsequent_dest_description">Mover o destino para cima e criá-lo</string>
+    <string name="show_closed_notes">Mostrar notas fechadas</string>
+    <string name="switch_osm_notes_visibility_desc">Mostrar/esconder notas do OSM no mapa.</string>
+    <string name="gpx_file_desc">GPX - adequado para exportar para o JOSM ou outros editores do OSM.</string>
+    <string name="osc_file_desc">OSC - adequado para exportar para o OpenStreetMap.</string>
+    <string name="shared_string_gpx_file">Ficheiro GPX</string>
+    <string name="osc_file">Ficheiro OSC</string>
+    <string name="choose_file_type">Escolha o tipo de ficheiro</string>
+    <string name="osm_edits_export_desc">Selecione o tipo de exportação: notas do OSM, POI ou ambos.</string>
+    <string name="all_data">Todos os dados</string>
+    <string name="osm_notes">Notas do OSM</string>
+    <string name="will_open_tomorrow_at">Abre amanhã às</string>
+    <string name="rendering_attr_hidePOILabels_name">Etiquetas de POI</string>
+    <string name="shared_string_without_name">Sem nome</string>
+    <string name="what_is_here">O que há aqui:</string>
+    <string name="parked_at">estacionado em</string>
+    <string name="pick_up_till">Buscar até</string>
+    <string name="without_time_limit">Sem limite de tempo</string>
+    <string name="context_menu_read_full_article">Ler o artigo completo</string>
+    <string name="context_menu_read_article">Ler o artigo</string>
+    <string name="context_menu_points_of_group">Todos os pontos do grupo</string>
+    <string name="open_from">Aberto desde</string>
+    <string name="open_till">Aberto até</string>
+    <string name="will_close_at">Fecha ás</string>
+    <string name="will_open_at">Abre em</string>
+    <string name="will_open_on">Abre em</string>
+    <string name="additional_actions">Ações adicionais</string>
+    <string name="av_locations_selected_desc">Ficheiro GPX com coordenadas e dados das notas selecionadas.</string>
+    <string name="av_locations_all_desc">Ficheiro GPX com coordenadas e dados de todas as notas.</string>
+    <string name="release_3_0">• Novo: suporte para guias de viagem offline globais. Locais referenciados estão lincados ao mapa. Dados iniciais do Wikivoyage. 
+\n 
+\n• Wikipédia: novo visual, links ativos, imagens agora suportados
+\n 
+\n• Interface Open Track: suporte para grupos de ponto de passagem
+\n 
+\n• Marcadores de mapa: importação de grupos selecionados de ficheiros GPX, entrada de coordenadas, novo visual
+\n 
+\n• Assinatura OsmAnd Live agora suporta todas as funcionalidades do OsmAnd
+\n
+\n</string>
+    <string name="modify_the_search_query">Modificar a consulta de pesquisa.</string>
+    <string name="shared_string_actions">Ações</string>
+    <string name="shared_string_marker">Marcador</string>
+    <string name="empty_state_osm_edits">Criar ou modificar objetos OSM</string>
+    <string name="empty_state_osm_edits_descr">Criar ou modifiquar POI OSM, abrir ou comentar notas do OSM e contribuir com ficheiros gravados GPX.</string>
+    <string name="shared_string_deleted">Eliminado</string>
+    <string name="shared_string_edited">Editado</string>
+    <string name="shared_string_added">Adicionado</string>
+    <string name="marker_activated">Marcador %s activado.</string>
+    <string name="one_tap_active_descr">Toque num marcador no mapa para movê-lo para a parte superior dos marcadores activos sem abrir o menu de contexto.</string>
+    <string name="one_tap_active">\'Um toque\' ativo</string>
+    <string name="empty_state_av_notes">Tomar notas!</string>
+    <string name="empty_state_av_notes_desc">Adicione nota de áudio, vídeo ou foto em qualquer ponto do mapa, usando o widget ou o menu de contexto.</string>
+    <string name="notes_by_date">Notas por data</string>
+    <string name="by_date">Por data</string>
+    <string name="by_type">Por tipo</string>
+    <string name="looking_for_tracks_with_waypoints">Procurando trilhas com pontos de rota</string>
+    <string name="shared_string_more_without_dots">Mais</string>
+    <string name="appearance_on_the_map">Aparência no mapa</string>
+    <string name="add_track_to_markers_descr">Selecione uma trilha para adicionar seus pontos de rota aos marcadores.</string>
+    <string name="add_favourites_group_to_markers_descr">Selecione uma categoria dos Favoritos para adicionar aos marcadores.</string>
+    <string name="shared_string_gpx_waypoints">Pontos de ponto de rota</string>
+    <string name="favourites_group">Categoria favoritos</string>
+    <string name="add_group">Adicionar um grupo</string>
+    <string name="add_group_descr">Importe grupos dos Favoritos ou pontos de rota GPX.</string>
+    <string name="empty_state_markers_active">Crie marcadores de mapa!</string>
+    <string name="empty_state_markers_active_desc">Toque longo ou rápido em \'Lugares\' e em seguida toque no botão de bandeira.</string>
+    <string name="empty_state_markers_groups">Importe grupos</string>
+    <string name="empty_state_markers_groups_desc">Importar grupos de Favoritos ou pontos de rota como marcadores.</string>
+    <string name="empty_state_markers_history_desc">Marcadores marcados como visitados aparecerão neste ecrã.</string>
+    <string name="shared_string_two">Dois</string>
+    <string name="shared_string_one">Um</string>
+    <string name="show_guide_line_descr">Mostrar linha direcional desde a sua posição até os locais dos marcadores ativos.</string>
+    <string name="show_arrows_descr">Mostrar uma ou duas setas indicando a direção para os marcadores ativos.</string>
+    <string name="distance_indication_descr">Escolher como exibir a distância para os marcadores ativos.</string>
+    <string name="active_markers_descr">Escolha o número de indicadores de direção a exibir.</string>
+    <string name="digits_quantity">Número de casas decimais</string>
+    <string name="shared_string_right">Direita</string>
+    <string name="shared_string_left">Esqueda</string>
+    <string name="show_number_pad">Mostrar teclado numérico</string>
+    <string name="shared_string_paste">Colar</string>
+    <string name="coordinate_input_accuracy_description">Alternar automaticamente para o próximo campo depois de entrar %1$d casas decimais.</string>
+    <string name="coordinate_input_accuracy">%1$d dígitos</string>
+    <string name="go_to_next_field">Próximo campo</string>
+    <string name="rename_marker">Renomear marcador</string>
+    <string name="tap_on_map_to_hide_interface_descr">Um toque no mapa mostra/esconde os botões de controle e widgets.</string>
+    <string name="tap_on_map_to_hide_interface">Modo ecrã cheio</string>
+    <string name="mark_passed">Marcador visitado</string>
+    <string name="import_gpx_file_description">pode ser importado como Favoritos ou ficheiro GPX.</string>
+    <string name="import_as_gpx">Importar como ficheiro GPX</string>
+    <string name="import_as_favorites">Importar como Favoritos</string>
+    <string name="import_file">Importar ficheiro</string>
+	<string name="wrong_input">Inserção errada</string>
+	<string name="enter_new_name">Inserir novo nome</string>
+	<string name="shared_string_back">Voltar</string>
+	<string name="shared_string_view">Ver</string>
+	<string name="waypoints_added_to_map_markers">Pontos de rota adicionados nos marcadores de mapa</string>
+	<string name="wrong_format">Formato errado</string>
+    <string name="shared_string_road">Estrada</string>
+    <string name="show_map">Exibir mapa</string>
+    <string name="route_is_calculated">Rota calculada</string>
+    <string name="round_trip">Ida e volta</string>
+    <string name="plan_route_no_markers_toast">Você precisa adicionar ao menos um marcador para usar esta função.</string>
+    <string name="osn_modify_dialog_error">Não foi possível modificar a nota</string>
+    <string name="osn_modify_dialog_title">Modificar nota</string>
+    <string name="context_menu_item_modify_note">Modificar anotação do OSM</string>
+    <string name="make_round_trip_descr">Adicionar cópia do ponto de partida como destino.</string>
+    <string name="make_round_trip">Fazer viagem de ida e volta</string>
+    <string name="index_item_world_wikivoyage">Artigos Wikivoyage mundiais</string>
+    <string name="dist_away_from_my_location">Pesquisar a %1$s daqui</string>
+    <string name="share_history_subject">compartilhado via OsmAnd</string>
+    <string name="search_categories">Categorias</string>
+    <string name="postcode">Código postal</string>
+    <string name="shared_string_from">de</string>
+    <string name="city_type_district">Distrito</string>
+    <string name="city_type_neighbourhood">Vizinhança</string>
+    <string name="map_widget_search">Procurar</string>
+    <string name="shared_string_is_open_24_7">Aberto todos dias por 24 horas</string>
+    <string name="coords_format">Formato de coordenada</string>
+    <string name="coords_format_descr">Formato para as coordenadas geográficas.</string>
+    <string name="app_mode_bus">Autocarro</string>
+    <string name="app_mode_train">Comboio</string>
+    <string name="access_direction_audio_feedback">Direções por áudio</string>
+    <string name="access_direction_audio_feedback_descr">Indicar a direção do ponto de destino por som.</string>
+    <string name="access_direction_haptic_feedback">Direções por tato</string>
+    <string name="access_direction_haptic_feedback_descr">Indica a direção do ponto de destino por vibração.</string>
+    <string name="rendering_value_fine_name">Mais fino</string>
+    <string name="osm_recipient_stat">Edições %1$s, soma de %2$s mBTC</string>
+    <string name="lang_nds">Baixo-alemão</string>
+    <string name="lang_fy">Frisão</string>
+    <string name="lang_als">Albanês (Tosco)</string>
+    <string name="rendering_value_darkyellow_name">Amarelo escuro</string>
+    <string name="rendering_value_translucent_pink_name">Rosa translúcida</string>
+    <string name="rendering_value_black_name">Preto</string>
+    <string name="lang_pms">Piemontês</string>
+    <string name="lang_bn">Bengali</string>
+    <string name="lang_tl">Tagalo</string>
+    <string name="lang_az">Azeri</string>
+    <string name="lang_bpy">Bishnupriya Manipuri</string>
+    <string name="lang_nv">Navajo</string>
+    <string name="lang_ku">Curdo</string>
+    <string name="lang_ml">Malaiala</string>
+    <string name="lang_lo">Laociano</string>
+    <string name="lang_os">Osseta</string>
+    <string name="lang_es_us">Espanhol (americano)</string>
+    <string name="lang_es_ar">Espanhol (Argentina)</string>
+    <string name="lang_nb">Norueguês Bokmål</string>
+    <string name="lang_vo">Volapuque</string>
+    <string name="lang_th">Tailandês</string>
+    <string name="lang_te">Telugu</string>
+    <string name="lang_nn">Norueguês (Nynorsk)</string>
+    <string name="lang_new">Neuari / Nepalbhasa</string>
+    <string name="lang_ms">Malásio</string>
+    <string name="lang_ht">Haitiano</string>
+    <string name="lang_gl">Galego</string>
+    <string name="lang_et">Estoniano</string>
+    <string name="lang_ceb">Cebuano</string>
+    <string name="lang_ast">Asturiano</string>
+    <string name="lang_hsb">Alto sorábio</string>
+    <string name="lang_kab">Cabila</string>
+    <string name="lang_ber">Berberes</string>
+    <string name="disable_recording_once_app_killed">Impedir o registro autônomo</string>
+    <string name="shared_string_gpx_files">Ficheiro s GPX</string>
+    <string name="plugin_nautical_descr">Este complemento enriquece o mapa do OsmAnd para também produzir mapas náuticos para passeios de barco, vela e outros tipos de desportos aquáticos. 
+\n
+\nUm complemento de mapa especial para OsmAnd fornecerá todas as marcas de navegação náutica e símbolos cartográficos, para o interior assim como para navegação próxima à costa. A descrição de cada marca de navegação fornece os detalhes necessários para identificá-las e o seu significado (categoria, forma, cor, sequência, referência, etc.). 
+\n
+\nPara retornar a um estilo convencional de mapa do OsmAnd, simplesmente desative este complemento ou altere o \'Estilo de mapa\' em \'Configurar mapa\' quando desejado.</string>
+    <string name="plugin_ski_descr">Este plugin para o OsmAnd coloca ao seu alcance detalhes de pistas de descida de esqui, de travessia, rotas de esqui alpino, teleféricos e elevadores de esqui. Rotas e pistas são mostradas com codificação de cores por dificuldade e retratadas em um estilo especial de mapa \'Inverno\' que assimila uma paisagem de inverno cor de neve. 
+\n
+\nAtivando esta mudança na visão do estilo de mapa de \'Inverno e esqui\', mostrando todas as características da paisagem em condições invernais. Essa visão pode ser revertida desativando aqui ou alterando o \'Estilo de mapa\' em \'Configurar mapa\' quando desejado.</string>
+    <string name="navigate_point_olc_info_invalid">OLC inválido
+\n</string>
+    <string name="navigate_point_olc_info_short">OLC curto 
+\nPor favor, forneça um código completo</string>
+    <string name="navigate_point_olc_info_area">OLC completo válido 
+\nRepresenta área: %1$s x %2$s</string>
+    <string name="speed_limit_exceed">Tolerância do limite de velocidade</string>
+    <string name="speed_limit_exceed_message">Selecione a margem de tolerância de limite de velocidade, acima do qual você receberá um aviso de voz.</string>
+    <string name="fav_point_emoticons_message">O nome do Favorito foi modificado para %1$s para facilitar gravar corretamente a sequência de caracteres com emoticons para um ficheiro.</string>
+    <string name="print_route">Imprimir rota</string>
+    <string name="fav_point_dublicate">Nome de favorito duplicado</string>
+    <string name="fav_point_dublicate_message">Nome favorito especificado já está em uso, foi alterado para %1$s para evitar a duplicação.</string>
+    <string name="save_track_to_gpx_globally_headline">Registro de trilha sob demanda</string>
+    <string name="enable_proxy_title">Ativar proxy HTTP</string>
+    <string name="enable_proxy_descr">Configurar o proxy HTTP para todas as solicitações de rede.</string>
+    <string name="proxy_host_title">Servidor Proxy</string>
+    <string name="proxy_host_descr">Configurar o hostname do seu proxy (p. ex., 127.0.0.1)</string>
+    <string name="proxy_port_title">Porta do proxy</string>
+    <string name="proxy_port_descr">Configurar o número da porta do seu proxy (p. ex. 8118)</string>
+    <string name="average">Média</string>
+    <string name="of">%1$d de %2$d</string>
+    <string name="ascent_descent">Subida/Descida</string>
+    <string name="moving_time">Tempo em movimento</string>
+    <string name="max_min">Máx/Mín</string>
+    <string name="min_max">Mín/Máx</string>
+    <string name="index_tours">Excursões</string>
+    <string name="shared_string_all">Todos</string>
+    <string name="download_additional_maps">Descarregar mapas que faltam %1$s (%2$d MB)\?</string>
+    <string name="rendering_value_browse_map_name">"Explorar o mapa "</string>
+    <string name="rendering_value_car_name">Carro</string>
+    <string name="rendering_value_bicycle_name">Bicicleta</string>
+    <string name="rendering_value_pedestrian_name">A pé</string>
+    <string name="continue_navigation">Continuar a navegação</string>
+    <string name="pause_navigation">Pausar navegação</string>
+    <string name="keep_navigation_service">Manter</string>
+    <string name="map_preferred_locale_descr">Idioma preferido para os rótulos no mapa (caso indisponível, inglês ou nomes locais serão usados).</string>
+    <string name="map_preferred_locale">Idioma preferido do mapa</string>
+    <string name="local_map_names">Nomes locais</string>
+    <string name="lang_sw">Suaíli</string>
+    <string name="lang_he">Hebraico</string>
+    <string name="forward">Avançar</string>
+    <string name="home">Painel de controle</string>
+    <string name="live_monitoring_m_descr">Enviar o rastreamento para um serviço web especificado, se estiver ativado o registro de GPX.</string>
+    <string name="live_monitoring_m">Rastreamento on-line (requer GPX)</string>
+    <string name="live_monitoring_start">Iniciar rastreamento on-line</string>
+    <string name="live_monitoring_stop">Parar rastreamento on-line</string>
+    <string name="gpx_monitoring_start">Iniciar registro de GPX</string>
+    <string name="gpx_monitoring_stop">Parar registro de GPX</string>
+    <string name="gpx_start_new_segment">Iniciar novo segmento</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Estradas não trafegáveis</string>
+    <string name="rendering_attr_hideText_name">Texto</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Matas e arbustos</string>
+    <string name="rendering_attr_buildings15zoom_name">Edifícios em zoom 15</string>
+    <string name="rendering_attr_lessDetailed_name">Menos detalhes</string>
+    <string name="rendering_attr_hideAccess_name">Restrições de acesso</string>
+    <string name="no_index_file_to_download">Decarregamentos não encontrados, por favor verifique sua conexão com a Internet.</string>
+    <string name="none_selected_gpx">Não há ficheiros GPX selecionados. Para selecionar toque e segure a trilha disponível.</string>
+    <string name="local_index_select_gpx_file">Selecione para mostrar</string>
+    <string name="sort_by_distance">Ordenar por distância</string>
+    <string name="sort_by_name">Ordenar por nome</string>
+    <string name="lang_en_gb">Inglês (Reino Unido)</string>
+    <string name="lang_al">Albanês</string>
+    <string name="lang_ar">Árabe</string>
+    <string name="lang_be_by">Bielo-russo (latim)</string>
+    <string name="lang_hu_formal">Húngaro (formal)</string>
+    <string name="lang_kn">Canarês</string>
+    <string name="lang_fa">Persa</string>
+    <string name="lang_sc">Sardenho</string>
+    <string name="lang_sr">Sérvio</string>
+    <string name="lang_sr_latn">Sérvio (latino)</string>
+    <string name="lang_zh_cn">Chinês (simplificado)</string>
+    <string name="lang_zh_hk">Chinês (Hong Kong)</string>
+    <string name="lang_zh_tw">"Chinês (tradicional) "</string>
+    <string name="routing_attr_avoid_stairs_name">Evitar escadas</string>
+    <string name="routing_attr_avoid_stairs_description">Evitar passar por escadas</string>
+    <string name="routing_attr_avoid_borders_name">Evitar passagem por fronteira</string>
+    <string name="routing_attr_avoid_borders_description">Evitar cruzar fronteiras nacionais</string>
+    <string name="routing_attr_height_name">Limite de altura</string>
+    <string name="routing_attr_height_description">Especifique a altura permitida do veículo nas rotas.</string>
+    <string name="route_is_too_long_v2">Por favor, adicione destinos intermediários se nenhum resultado for encontrado dentro de 10 minutos.</string>
+    <string name="driving_region_australia">Austrália</string>
+    <string name="access_intermediate_arrival_time">Hora de chegada intermediária</string>
+    <string name="download_wikipedia_maps">Wikipédia</string>
+    <string name="rendering_attr_alpineHiking_description">Renderizar caminhos de acordo com a escala de SAC.</string>
+    <string name="rendering_attr_hikingRoutesOSMC_description">Renderizar caminhos de acordo com traços OSMC.</string>
+    <string name="map_widget_intermediate_time">Hora intermediária</string>
+    <string name="osmand_extended_description_part1">OsmAnd (sigla em inglês de Direções de Navegação Automatizada do OSM) é um aplicativo de mapa e navegação com acesso a dados livres, mundiais e de alta qualidade do OpenStreetMap (OSM). 
+\n 
+\nPoderá usar o navegador visual e por voz, exibir POIs (pontos de interesse), criar e gerenciar trilhas GPX, usar (através de plugin) curvas de nível e dados de altitude, escolher entre os modos motorista, ciclista e pedestre, editar o OSM e muito mais.</string>
+    <string name="osmand_extended_description_part2">Navegação GPS 
+\n• Escolha entre modos off-line (sem tarifa de roaming quando estiver no exterior) ou on-line (mais rápido) 
+\n• Orientação por voz passo-a-passo lhe guia ao longo do caminho (vozes gravadas e sintetizadas) 
+\n• A rota se recalcula sempre que se desviar dela 
+\n• Orientação de pista, nomes de ruas e tempo estimado de chegada ajudará ao longo do caminho 
+\n• Para fazer sua viagem mais segura, modo dia/noite se alterna automaticamente 
+\n• Visualize limites de velocidade e receba aviso se ultrapassá-los 
+\n• Zoom do mapa se ajusta a sua velocidade 
+\n• Pesquise destinos pelo endereço, tipo (p. ex.: estacionamento, restaurante, hotel, posto de gasolina, museu) ou coordenadas geográficas 
+\n• Suporta pontos intermédios em seu itinerário 
+\n• Grave ou carregue uma trilha GPX e siga-a 
+\n</string>
+    <string name="osmand_extended_description_part3">Mapa 
+\n• Exibe POIs (ponto de interesse) perto de você 
+\n• Ajusta o mapa na sua direção de movimento (ou bússola) 
+\n• Mostra a sua posição e direção para onde está olhando 
+\n• Compartilhe sua posição para que seus amigos possam encontrá-lo 
+\n• Mantém seus lugares mais importantes em \'Favoritos\' 
+\n• Permite-lhe escolher como exibir nomes no mapa: em inglês, local ou escrita fonética 
+\n• Exibe mapas on-line especializados, vista de satélite (do Bing), camadas diferentes como trilhas GPX de navegação/turismo e camadas adicionais com transparência personalizável</string>
+    <string name="osmand_extended_description_part4">Esqui 
+\n O plugin de mapas de ski OsmAnd Ski permite que você veja pistas de ski com nível de complexidade e algumas informações adicionais, como localização de elevadores e outras facilidades.</string>
+    <string name="osmand_extended_description_part5">Ciclismo 
+\n • Encontre caminhos de bicicleta no mapa 
+\n • Navegação por GPS no modo ciclismo constrói a sua rota utilizando caminhos de bicicleta 
+\n • Ver a sua velocidade e altitude 
+\n • Opção de gravação GPX permite-lhe gravar a sua viagem e compartilhá-la 
+\n • Através de plugin adicionais, você pode ativar curvas de nível e sombreamento de relevo</string>
+    <string name="osmand_extended_description_part6">Passeio, caminhada, turismo pela cidade 
+\n• O mapa mostra caminhos para passeios e caminhadas 
+\n• A Wikipédia no seu idioma preferido pode dizer muito durante um turismo pela cidade 
+\n• Paradas de transportes públicos (autocarro, troleibus, trem) incluindo nomes de linha, ajuda a navegar em uma nova cidade 
+\n• Navegação GPS em modo pedestre constrói a sua rota usando caminhos para pedestres 
+\n• Fazer upload e seguir uma rota GPX ou gravar e compartilhar a sua própria rota</string>
+    <string name="osmand_extended_description_part7">"Contribua para o OSM  • Comunique falha de dados  • Carregue trilhas GPX diretamente do app  • Adicione POIs e carregue-os diretamente ao OSM (ou mais tarde caso off-line)"</string>
+    <string name="osmand_extended_description_part8">OsmAnd é um software aberto desenvolvido ativamente. Todos podem contribuir para o app reportando bugs, melhorando traduções ou programando novas funcionalidades. Além disso, o projeto conta com contribuições financeiras para financiar a programação e testes de novas funcionalidades. 
+\nCobertura de mapa e qualidade aproximada: 
+\n• Europa Ocidental: **** 
+\n• Europa Oriental: *** 
+\n• Rússia: *** 
+\n• América do Norte: *** 
+\n• América do Sul: ** 
+\n• Ásia: ** 
+\n• Japão e Coreia: *** 
+\n• Oriente Médio: ** 
+\n• África: ** 
+\n• Antártida: * 
+\nA maioria dos países ao redor do globo é disponível para download! 
+\nObtenha um navegador confiável em seu país - seja a França, Alemanha, México, Reino Unido, Espanha, Holanda, EUA, Rússia, Brasil ou qualquer outro.</string>
+    <string name="osmand_plus_extended_description_part1">OsmAnd+ (OSM Automated Navigation Directions) é um aplicativo de mapa e navegação com acesso a dados do OpenStreetMap (OSM) livre, em todo o mundo e de alta qualidade. 
+\nDesfrute da navegação visual ou por voz, exibindo POIs (pontos de interesse), criando e gerenciando trilhas GPX, usando informação de altitude e curvas de nível, escolher entre modos dirigir, andar de bicicleta e pedestres, editar o OSM e muito mais. 
+\n 
+\nOsmAnd+ é a versão paga do app. Ao comprá-lo, você apoia o projeto, financia o desenvolvimento de novas funcionalidades e recebe as últimas atualizações. 
+\n 
+\nAlgumas das principais características:</string>
+    <string name="osmand_plus_extended_description_part2">Navegação 
+\n• Funciona on-line (rápido) ou off-line (sem custo de roaming quando estiver no exterior) 
+\n• Orientação por voz passo-a-passo (vozes gravadas e sintetizadas) 
+\n• Orientação de faixas opcional, exibição do nome da rua e tempo estimado de chegada 
+\n• Suporta pontos intermediários do seu itinerário 
+\n• Correção de rota automático sempre que você sair da rota 
+\n• Busque lugares por endereço, pelo tipo (ex.: restaurante, hotel, posto de gasolina, museu), ou por coordenadas geográficas</string>
+    <string name="osmand_plus_extended_description_part3">Visualização de mapa 
+\n• Exiba sua posição e orientação 
+\n• Opcionalmente alinhe o ecrã de acordo com a bússola ou a direção de seu movimento 
+\n• Grave seus lugares mais importantes como favoritos 
+\n• Exiba POIs (pontos de interesse) pertos 
+\n• Exiba imagens online especializadas, vista de satélite (do Bing), diferentes camadas como trilhas de navegação GPX e camadas adicionais com transparência personalizável 
+\n• Opcionalmente exiba nomes de lugares em inglês, língua local ou fonéticos</string>
+    <string name="osmand_plus_extended_description_part4">Use dados OSM e da Wikipédia
+\n • Informações de alta qualidade dos melhores projetos colaborativos do mundo
+\n • Dados OSM disponíveis por país ou região
+\n • POIs da Wikipédia, ótimo para visitas turísticas
+\n • Descarregamentos grátis ilimitados, diretamente do aplicativo
+\n • Mapas vetoriais offline compactos e atualizados mensalmente
+\n • Seleção entre região completa ou apenas rede rodoviária (Exemplo: Japão inteiro tem 700 MB ou apenas 200 MB para rede rodoviária)</string>
+    <string name="osmand_plus_extended_description_part5">Recursos de segurança 
+\n• Alternância de exibição dia/noite automatizada opcional 
+\n• Exibição de limite de velocidade opcional, com lembrete se você ultrapassá-lo 
+\n• Zoom dependente da velocidade opcional 
+\n• Compartilhe sua localização para que seus amigos possam encontrar você</string>
+    <string name="osmand_plus_extended_description_part6">Recursos de ciclismo e pedestre 
+\n• Visualização de caminhos a pé, pistas de caminhadas e ciclovias, ideal para atividades ao ar livre 
+\n• Roteamento e modos de exibição especiais para bicicleta e pedestres 
+\n• Paradas de transporte público opcionais (autocarro, eléctrico, comboio) incluindo nomes de linhas 
+\n• Gravação opcional de viagem para ficheiro GPX local ou serviço on-line
+\n• Exibição opcional de velocidade e altitudes 
+\n• Exibição de curvas de nível e sombreamento de relevo (via plugin adicional)</string>
+    <string name="osmand_plus_extended_description_part7">Contribuia diretamente para o OSM 
+\n• Avisar erros de dados 
+\n• Fazer upload de trilhas GPX para o OSM diretamente do app 
+\n• Adicionar POIs e fazer o upload diretamente para OSM (ou mais tarde se off-line) 
+\n• Gravação de viagem opcional também em modo background (enquanto o dispositivo está no modo sleep) 
+\nOsmAnd é um software de código aberto desenvolvido ativamente. Todos podem contribuir para o app, reportando bugs, melhorando as traduções ou programando novas funcionalidades. Além disso, o projeto conta com contribuições financeiras para financiar o desenvolvimento e testes de novas funcionalidades.
+\n</string>
+    <string name="osmand_plus_extended_description_part8">Cobertura de mapa e qualidade aproximada: 
+\n• Europa Ocidental: **** 
+\n• Europa Oriental: *** 
+\n• Rússia: *** 
+\n• América do Norte: *** 
+\n• América do Sul: ** 
+\n• Ásia: ** 
+\n• Japão e Coreia: *** 
+\n• Oriente Médio: ** 
+\n• África: ** 
+\n• Antártida: * 
+\nA maioria dos países ao redor do globo disponível como descarregamentos! 
+\nDo Afeganistão ao Zimbabue, da Austrália aos Estados Unidos. Argentina, Brasil, Canadá, França, Alemanha, México, Reino Unido, Espanha, …
+\n</string>
+    <string name="local_index_description">Toque em qualquer item para ver mais detalhes, Toque e segure para desativar ou excluir. Dados atuais no aparelho (%1$s livre):</string>
+    <string name="arrival_distance_factor_early">Adiantado</string>
+    <string name="arrival_distance_factor_normally">Normal</string>
+    <string name="arrival_distance_factor_late">Atrasado</string>
+    <string name="arrival_distance_factor_at_last">Nos últimos metros</string>
+    <string name="live_monitoring_max_interval_to_send">Buffer de tempo para rastreamento on-line</string>
+    <string name="live_monitoring_max_interval_to_send_desrc">Especificar um buffer de tempo para manter locais para enviar sem conexão</string>
+    <string name="index_name_netherlands">Europa - Países Baixos</string>
+    <string name="shared_string_others">Outros</string>
+    <string name="shared_string_release">Lançado</string>
+    <string name="voices">Instruções de voz</string>
+    <string name="favourites_context_menu_add">Adicionar favorito</string>
+    <string name="poi_action_delete">apagar</string>
+    <string name="poi_dialog_reopen">Reabrir</string>
+    <string name="av_camera_pic_size">Tamanho da foto</string>
+    <string name="av_camera_pic_size_descr">Selecionar tamanho de imagem da foto</string>
+    <string name="plugin_description_title">Descrição</string>
+    <string name="get_plugin">Obter</string>
+    <string name="use_fast_recalculation">Recálculo de rota inteligente</string>
+    <string name="use_fast_recalculation_desc">Recalcular apenas a parte inicial da rota para viagens longas</string>
+    <string name="do_you_like_osmand">Está a gostar do OsmAnd\?</string>
+    <string name="we_really_care_about_your_opinion">A sua opinião e o seu comentário são importantes para nós.</string>
+    <string name="rate_this_app">Avalie este app</string>
+    <string name="rate_this_app_long">Por favor, avalie o OsmAnd no Google Play</string>
+    <string name="user_hates_app_get_feedback">Diga-nos porquê.</string>
+    <string name="user_hates_app_get_feedback_long">Por favor, diga-nos o que quer mudar neste app.</string>
+    <string name="failed_to_upload">Falha no envio</string>
+    <string name="delete_change">Apagar mudança</string>
+    <string name="successfully_uploaded_pattern">Enviado {0}/{1}</string>
+    <string name="try_again">Tentar novamente</string>
+    <string name="error_message_pattern">Erro: {0}</string>
+    <string name="dahboard_options_dialog_title">Configurar o painel de controle</string>
+    <string name="shared_string_card_was_hidden">Cartão estava escondido</string>
+    <string name="shared_string_undo">Desfazer</string>
+    <string name="app_name_osmand">OsmAnd</string>
+    <string name="offline_maps_and_navigation">Mapas &amp; Navegação
+\nOff-line</string>
+    <string name="commit_poi">Enviar POI</string>
+    <string name="tab_title_basic">Básico</string>
+    <string name="tab_title_advanced">Estendido</string>
+    <string name="building_number">Número de edifício</string>
+    <string name="next_proceed">Próximo</string>
+    <string name="opening_at">Abre às</string>
+    <string name="closing_at">Fecha às</string>
+    <string name="contact_info">Informações de contato</string>
+    <string name="description">Descrição</string>
+    <string name="add_opening_hours">Adicionar horário de funcionamento</string>
+    <string name="poi_dialog_poi_type">Tipo de POI</string>
+    <string name="number_of_rows_in_dash">Número de linhas no traço de %1$s</string>
+    <string name="please_specify_poi_type">Por favor, especifique tipo de POI.</string>
+    <string name="working_days">Dias úteis</string>
+    <string name="recent_places">Lugares recentes</string>
+    <string name="favourites">Favoritos</string>
+    <string name="saved_at_time">Gravado em: %1$s</string>
+    <string name="poi_deleted_localy">POI será excluído quando você enviar suas alterações</string>
+    <string name="show_gpx">Mostrar dados do GPX</string>
+    <string name="count_of_lines">Número de linhas</string>
+    <string name="are_you_sure">Tem certeza\?</string>
+    <string name="unsaved_changes_will_be_lost">Quaisquer alterações não gravadas serão perdidas. Continuar\?</string>
+    <string name="show_free_version_banner_description">Mesmo se você tem a versão paga você ainda pode ver o banner da versão gratuita</string>
+    <string name="activate_seamarks_plugin">Favor ativar o plugin \'Mapa náutico\'</string>
+    <string name="activate_srtm_plugin">Favor ativar o plugin \'Curvas de nível\'</string>
+    <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
+    <string name="file_size_in_mb">%.1f MB</string>
+    <string name="update_all">Atualizar tudo (%1$s MB)</string>
+    <string name="save_poi_too_many_uppercase">Nome contém muitas letras maiúsculas. Você quer continuar\?</string>
+    <string name="configure_screen_quick_action">Ação rápida</string>
+    <string name="quick_action_item_action">Ação %d</string>
+    <string name="quick_action_item_screen">Ecrã %d</string>
+    <string name="quick_action_add_marker">Adicionar marcador de mapa</string>
+    <string name="quick_action_add_poi">Adicionar POI</string>
+    <string name="quick_action_map_style">Mudar estilo de mapa</string>
+    <string name="quick_action_map_style_switch">O estilo do mapa foi alterado para \"%s\".</string>
+    <string name="quick_action_take_audio_note">Nova notificação de áudio</string>
+    <string name="quick_action_take_video_note">Nova notificação de vídeo</string>
+    <string name="quick_action_take_photo_note">Nova notificação de foto</string>
+    <string name="quick_action_add_osm_bug">Adicionar notificação OSM</string>
+    <string name="quick_action_navigation_voice">Ligar/desligar voz</string>
+    <string name="quick_action_navigation_voice_off">Voz desligada</string>
+    <string name="quick_action_navigation_voice_on">Voz ligada</string>
+    <string name="quick_action_add_gpx">Adicionar ponto de rota GPX</string>
+    <string name="quick_action_add_parking">Marcar estacionamento</string>
+    <string name="quick_action_new_action">Adicionar ação</string>
+    <string name="quick_action_edit_action">Editar ação</string>
+    <string name="quick_action_add_favorite">Adicionar favorito</string>
+    <string name="dialog_add_action_title">Adicionar ação</string>
+    <string name="quick_actions_delete">Apagar ação</string>
+    <string name="quick_actions_delete_text">Tem certeza de que deseja apagar a ação \"%s\"\?</string>
+    <string name="quick_favorites_show_favorites_dialog">Mostrar diálogo Favoritos</string>
+    <string name="quick_favorites_name_preset">Nome do preset</string>
+    <string name="quick_action_add_marker_descr">Tocar no botão de ação adicionará um marcador de mapa no local do centro do ecrã.</string>
+    <string name="quick_action_add_gpx_descr">Tocar no botão de ação adicionará um ponto de rota GPX no local do centro do ecrã.</string>
+    <string name="quick_action_take_audio_note_descr">Tocar no botão de ação adicionará uma notificação de áudio no local do centro do ecrã.</string>
+    <string name="quick_action_take_video_note_descr">Tocar no botão de ação adicionará uma notificação de vídeo no local do centro do ecrã.</string>
+    <string name="quick_action_take_photo_note_descr">Tocar no botão de ação adicionará uma notificação de foto no local do centro do ecrã.</string>
+    <string name="quick_action_add_osm_bug_descr">Tocar no botão de ação adicionará uma notificação OSM no local do centro do ecrã.</string>
+    <string name="quick_action_add_poi_descr">Tocar no botão de ação adicionará um POI no local do centro do ecrã.</string>
+    <string name="quick_action_navigation_voice_descr">Tocar no botão de ação irá ativar ou desativar a orientação por voz durante a navegação.</string>
+    <string name="quick_action_add_parking_descr">Tocar no botão de ação adicionará um lugar de estacionamento no local do centro do ecrã.</string>
+    <string name="quick_action_interim_dialog">Mostrar um diálogo intermediário</string>
+    <string name="favorite_autofill_toast_text">" está gravado no "</string>
+    <string name="favorite_empty_place_name">Lugar</string>
+    <string name="quick_action_duplicates">Nome de ação rápida especificada já em uso foi mudado para %1$s para evitar a duplicação.</string>
+    <string name="quick_action_duplicate">Nome de ação rápida duplicado</string>
+    <string name="quick_action_showhide_favorites_descr">Tocar neste botão de ação mostra ou esconde os pontos favoritos no mapa.</string>
+    <string name="quick_action_showhide_poi_descr">Tocar neste botão de ação mostra ou esconde POIs no mapa.</string>
+    <string name="quick_action_showhide_favorites_title">Mostrar/esconder favoritos</string>
+    <string name="quick_action_favorites_show">Mostrar Favoritos</string>
+    <string name="quick_action_favorites_hide">Esconder favoritos</string>
+    <string name="quick_action_showhide_poi_title">Mostrar/esconder POI</string>
+    <string name="quick_action_poi_show">Mostrar %1$s</string>
+    <string name="quick_action_poi_hide">Esconder %1$s</string>
+    <string name="quick_action_add_category">Adicionar uma categoria</string>
+    <string name="quick_action_add_create_items">Criar itens</string>
+    <string name="quick_action_add_configure_map">Configurar mapa</string>
+    <string name="quick_action_add_navigation">Navegação</string>
+    <string name="quick_action_fav_name_descr">Deixe em branco para automaticamente usar o endereço ou nome de lugar.</string>
+    <string name="quick_action_bug_descr">Esta mensagem será autocompletada no campo de comentário.</string>
+    <string name="quick_action_bug_message">Mensagem</string>
+    <string name="quick_action_category_descr">Selecione a categoria para gravar o favorito.</string>
+    <string name="quick_action_gpx_category_descr">Selecione uma categoria opcional.</string>
+    <string name="quick_action_poi_list">Lista de POIs</string>
+    <string name="quick_action_sh_poi_descr">Você pode adicionar uma ou mais categorias de POI para exibir no mapa.</string>
+    <string name="quick_action_page_list_descr">Tocar no botão de ação irá percorrer a lista abaixo.</string>
+    <string name="quick_action_map_style_action">Adicionar um estilo de mapa</string>
+    <string name="quick_action_empty_param_error">Parâmetros não podem ficar em branco</string>
+    <string name="quick_action_map_styles">Estilos de mapa</string>
+    <string name="quick_action_map_overlay">Mudar camada superior de mapa</string>
+    <string name="quick_action_map_overlay_title">Camada superior de mapa</string>
+    <string name="quick_action_map_overlay_action">Adicionar sobreposição</string>
+    <string name="quick_action_map_overlay_switch">A camada superior de mapa foi alterada para \"%s\".</string>
+    <string name="quick_action_map_underlay_switch">A camada inferior de mapa foi alterada para \"%s\".</string>
+    <string name="quick_action_map_underlay">Mudar camada inferior de mapa</string>
+    <string name="quick_action_map_underlay_title">Camadas inferiores de mapa</string>
+    <string name="quick_action_map_underlay_action">Adicionar camada inferior</string>
+    <string name="quick_action_map_source">Mudar fonte de mapa</string>
+    <string name="quick_action_map_source_title">Fontes do mapa</string>
+    <string name="quick_action_map_source_action">Adicionar fonte de mapa</string>
+    <string name="quick_action_map_source_switch">A fonte do mapa foi alterada para \"%s\".</string>
+    <string name="quick_action_btn_tutorial_title">Mudar posição do botão</string>
+    <string name="quick_action_btn_tutorial_descr">Segure e arraste o botão para mudar a sua posição no ecrã.</string>
+    <string name="shared_string_action_name">Nome da ação</string>
+    <string name="mappilary_no_internet_desc">Você precisa de coneçao à internet para ver as fotos do Mapillary.</string>
+    <string name="retry">Repetir</string>
+    <string name="add_route_points">Adicionar Pontos de Rota</string>
+    <string name="add_waypoint">Adicionar Ponto de Passagem</string>
+    <string name="add_line">Adicionar Linha</string>
+    <string name="save_gpx_waypoint">Gravar Ponto de Passagem GPX</string>
+    <string name="save_route_point">Gravar Ponto de Rota</string>
+    <string name="waypoint_one">Ponto de Passagem 1</string>
+    <string name="route_point_one">Ponto de Rota 1</string>
+    <string name="empty_state_my_tracks">Adicione ficheiros GPX</string>
+    <string name="empty_state_my_tracks_desc">Importe ficheiros GPX ou grave trilhas.</string>
+    <string name="empty_state_favourites">Adicione Favoritos</string>
+    <string name="empty_state_favourites_desc">Importe Favoritos ou adicione novos marcando pontos do mapa.</string>
+    <string name="import_track">Importar ficheiro GPX</string>
+    <string name="import_track_desc">Ficheiro %1$s não possui pontos de rota, importe-o como uma trilha\?</string>
+    <string name="move_point">Mover Ponto</string>
+    <string name="add_segment_to_the_track">Adicionar a um ficheiro GPX</string>
+    <string name="osm_recipients_label">Destinatários OSM</string>
+    <string name="total_donations">Total de doações</string>
+    <string name="day_off_label">desligado</string>
+    <string name="winter_and_ski_renderer">Inverno e esqui</string>
+    <string name="touring_view_renderer">Vista de turismo</string>
+    <string name="nautical_renderer">Náutico</string>
+    <string name="copy_location_name">Copiar nome de Ponto/POI</string>
+    <string name="toast_empty_name_error">Local sem nome</string>
+    <string name="tunnel_warning">Túnel à frente</string>
+    <string name="show_tunnels">Túneis</string>
+    <string name="download_wikipedia_description">Descarregue artigos da Wikipédia por %1$s para lê-los offline.</string>
+    <string name="download_wikipedia_label">Descarregar dados da Wikipédia</string>
+    <string name="open_in_browser_wiki">Abrir artigo on-line</string>
+    <string name="open_in_browser_wiki_description">Ver artigo no navegador web.</string>
+    <string name="download_wiki_region_placeholder">esta região</string>
+    <string name="wiki_article_search_text">Procurando o artigo wiki correspondente</string>
+    <string name="wiki_article_not_found">Artigo não encontrado</string>
+    <string name="how_to_open_wiki_title">Como se abre artigos da Wikipedia\?</string>
+    <string name="test_voice_desrc">Toque num botão e ouça a correspondente voz de comando para identificar os comandos faltantes ou com falha.</string>
+<string name="powered_by_osmand">Powered by OsmAnd</string>
+    <string name="navigate_point_olc">Código de localização aberto</string>
+    <string name="osm_live_subscriptions">Assinaturas</string>
+    <string name="mapillary_menu_title_pano">Exibir apenas imagens de 360°</string>
+    <string name="shared_string_launch">Lançar</string>
+    <string name="lang_gn_py">Guarani</string>
+    <string name="quick_action_switch_day_night_descr">Tocar neste botão de ação alterna entre os modos Dia e Noite para OsmAnd</string>
+    <string name="quick_action_switch_day_mode">Modo de Dia</string>
+    <string name="quick_action_switch_night_mode">Modo Nocturno</string>
+    <string name="quick_action_day_night_switch_mode">Mudar de modo Dia/Nocturno</string>
+    <string name="run_full_osmand_msg">Você está usando {0} Mapa que é alimentado por OsmAnd. Você quer lançar a versão completa do OsmAnd\?</string>
+    <string name="run_full_osmand_header">Lançar OsmAnd\?</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Capacidade</string>
+    <string name="shared_string_width">Largura</string>
+    <string name="shared_string_height">Altura</string>
+    <string name="swap_start_and_destination">Trocar o iniçio e o destino</string>
+    <string name="add_destination_point">Adicionar destino</string>
+    <string name="add_intermediate_point">Adicionar intermediário</string>
+    <string name="add_start_point">Adicionar ponto de partida</string>
+    <string name="intermediate_waypoint">Ponto intermédio: %1$s</string>
+    <string name="waypoints">Pontos de passagem: %1$s</string>
+    <string name="transfers">transferências: %1$s</string>
+    <string name="on_foot">a pé: %1$s</string>
+    <string name="route_way">Caminho: %1$s</string>
+    <string name="points_of_interests">Pontos de interesse (POI)</string>
+    <string name="waiting_for_route_calculation">Aguardando o cálculo da rota</string>
+    <string name="app_mode_public_transport">Transporte público</string>
+    <string name="avoid_roads_descr">Seleccione uma estrada no mapa ou na lista abaixo que pretende evitar durante a navegação:</string>
+    <string name="show_along_the_route">Mostrar ao longo da rota</string>
+    <string name="simulate_navigation">Simular navegação</string>
+    <string name="choose_track_file_to_follow">Escolha o ficheiro de caminho a seguir</string>
+    <string name="voice_announcements">Anúncios de voz</string>
+    <string name="intermediate_destinations">Destinos intermediários: %1$s</string>
+    <string name="arrive_at_time">Chegar às %1$s</string>
+</resources>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 44172ace89..62cf547cca 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources> 
 	<string name="poi_bakery">Булочная</string>
-	<string name="poi_alcohol">Винно-водочный магазин</string>
+	<string name="poi_alcohol">Вино-водочный магазин;Алкоголь</string>
 	<string name="poi_convenience">Продукты</string>
 	<string name="poi_mall">Торговый центр</string>
 	<string name="poi_beverages">Напитки</string>
-	<string name="poi_butcher">Мясная лавка</string>
+	<string name="poi_butcher">Мясная лавка;Мясо</string>
 	<string name="poi_deli">Деликатесы</string>
 	<string name="poi_greengrocer">Овощи и фрукты</string>
 	<string name="poi_seafood">Морепродукты</string>
 	<string name="poi_confectionery">Кондитерская</string>
 	<string name="poi_ice_cream">Мороженое</string>
-	<string name="poi_supermarket">Супермаркет</string>
+	<string name="poi_supermarket">Супермаркет;Универсам</string>
 	<string name="poi_tea">Чайный магазин</string>
-	<string name="poi_dairy">Молочный магазин</string>
+	<string name="poi_dairy">Молочный магазин;Молоко</string>
 	<string name="poi_vending_machine">Торговый автомат</string>
 	<string name="poi_cheese">Сыр</string>
 	<string name="poi_chocolate">Шоколад</string>
@@ -21,25 +21,25 @@
 	<string name="poi_pasta">Макаронные изделия</string>
 	<string name="poi_pastry">Хлебобулочные и кондитерские изделия</string>
 
-	<string name="poi_camera">Фотокамеры и объективы</string>
+	<string name="poi_camera">Фотокамеры и объективы;Фототехника</string>
 	<string name="poi_candles">Свечи и подсвечники</string>
 
-	<string name="poi_books">Книжный магазин</string>
-	<string name="poi_bicycle">Магазин велосипедов</string>
+	<string name="poi_books">Книжный магазин;Книги</string>
+	<string name="poi_bicycle">Магазин велосипедов;Веломагазин</string>
 	<string name="poi_anime">Магазин аниме</string>
 	<string name="poi_antiques">Антиквариат</string>
 	<string name="poi_art">Предметы искусства</string>
-	<string name="poi_baby_goods">Товары для детей</string>
+	<string name="poi_baby_goods">Товары для детей;Детские товары</string>
 	<string name="poi_bag">Сумки, чемоданы</string>
 	<string name="poi_bathroom_furnishing">Сантехника, ванные</string>
 	<string name="poi_bed">Магазин постельного белья</string>
 	<string name="poi_boutique">Бутик</string>
-	<string name="poi_carpet">Магазин ковров</string>
+	<string name="poi_carpet">Магазин ковров;Ковры</string>
 	<string name="poi_charity">Благотворительный магазин</string>
 	<string name="poi_chemist">Бытовая химия, косметика</string>
 	<string name="poi_clothes">Одежда</string>
 	<string name="poi_clothes_children">Детская одежда</string>
-	<string name="poi_shoes">Обувь</string>
+	<string name="poi_shoes">Обувь;Ботинки</string>
 	<string name="poi_computer">Компьютеры</string>
 	<string name="poi_copyshop">Ксерокопия, полиграфия</string>
 	<string name="poi_curtain">Шторы, портьеры</string>
@@ -48,9 +48,9 @@
 	<string name="poi_dive">Снаряжение для дайвинга</string>
 	<string name="poi_doityourself">Инструменты и стройматериалы</string>
 	<string name="poi_doors">Двери</string>
-	<string name="poi_erotic">Секс-шоп</string>
+	<string name="poi_erotic">Секс-шоп;Интим-салон;Магазин для взрослых</string>
 	<string name="poi_fishing">Рыболовный магазин</string>
-	<string name="poi_florist">Цветочный магазин</string>
+	<string name="poi_florist">Цветочный магазин;Цветы</string>
 	<string name="poi_frame">Рамки, багет</string>
 	<string name="poi_furniture">Мебель</string>
 	<string name="poi_garden_centre">Садово-огородный магазин</string>
@@ -62,63 +62,63 @@
 	<string name="poi_hearing_aids">Слуховые аппараты</string>
 	<string name="poi_herbalist">Травы (народная медицина)</string>
 	<string name="poi_hifi">Hi-Fi аппаратура</string>
-	<string name="poi_houseware">Хозяйственные товары</string>
+	<string name="poi_houseware">Хозяйственные товары;Хозтовары</string>
 	<string name="poi_hunting">Охотничий магазин</string>
 	<string name="poi_interior_decoration">Декор и оформление</string>
-	<string name="poi_jewelry">Ювелирный магазин</string>
+	<string name="poi_jewelry">Ювелирный магазин;Ювелирный салон</string>
 	<string name="poi_kiosk">Киоск, ларёк</string>
 	<string name="poi_kitchen">Кухни</string>
 	<string name="poi_mobile_phone">Салон связи</string>
 	<string name="poi_motorcycle">Мотоциклы</string>
 	<string name="poi_musical_instrument">Музыкальные инструменты</string>
-	<string name="poi_music">Аудиозаписи</string>
-	<string name="poi_newsagent">Журнальный киоск</string>
+	<string name="poi_music">Аудиозаписи;Музыкальный магазин</string>
+	<string name="poi_newsagent">Журнальный киоск;Журналы</string>
 	<string name="poi_optician">Оптика</string>
-	<string name="poi_organic">Биопродукты</string>
+	<string name="poi_organic">Биопродукты;Экологически чистые продукты;Органическая пища</string>
 	<string name="poi_outdoor">Товары для активного отдыха</string>
 	<string name="poi_paint">Краски</string>
-	<string name="poi_pet">Зоомагазин</string>
+	<string name="poi_pet">Зоомагазин;Товары для животных</string>
 	<string name="poi_radiotechnics">Радиодетали</string>
 	<string name="poi_second_hand">Секонд-хенд</string>
 	<string name="poi_ship_chandler">Яхты, запчасти, оснастка</string>
-	<string name="poi_sports">Спорттовары</string>
-	<string name="poi_stationery">Канцелярские товары</string>
+	<string name="poi_sports">Спорттовары;Товары для спорта;Спортивные товары</string>
+	<string name="poi_stationery">Канцелярские товары;Канцтовары</string>
 	<string name="poi_tableware">Кухонные принадлежности</string>
-	<string name="poi_ticket">Продажа, бронирование билетов</string>
-	<string name="poi_tobacco">Табак</string>
-	<string name="poi_toys">Игрушки</string>
+	<string name="poi_ticket">Продажа, бронирование билетов;Билеты</string>
+	<string name="poi_tobacco">Табак;Сигареты</string>
+	<string name="poi_toys">Игрушки;Детские игрушки</string>
 	<string name="poi_trade">Оптовый склад</string>
 	<string name="poi_vacuum_cleaner">Пылесосы и аксессуары</string>
 	<string name="poi_variety_store">Всё по одной цене</string>
-	<string name="poi_video">Продажа, прокат DVD</string>
+	<string name="poi_video">Видеосалон;Продажа, прокат DVD</string>
 	<string name="poi_window_blind">Жалюзи, ставни, маркизы</string>
 	<string name="poi_department_store">Универмаг</string>
 	<string name="poi_electronics">Электроника</string>
 	<string name="poi_car">Автосалон</string>
-	<string name="poi_car_parts">Автозапчасти</string>
+	<string name="poi_car_parts">Автозапчасти;Запчасти для автомобилей</string>
 	<string name="poi_atv">Квадроциклы</string>
 	<string name="poi_cosmetics">Косметика, парфюмерия</string>
 	<string name="poi_marketplace">Рынок</string>
 	<string name="poi_sewing">Шитьё и рукоделие</string>
 	<string name="poi_perfumery">Парфюмерия</string>
-	<string name="poi_energy">Элементы питания</string>
+	<string name="poi_energy">Элементы питания;Батарейки</string>
 	<string name="poi_fashion">Модная одежда</string>
 	<string name="poi_free_flying">Товары для свободного полёта</string>
-	<string name="poi_games">Магазин игр</string>
+	<string name="poi_games">Магазин игр;Игры</string>
 	<string name="poi_garden_furniture">Садовая мебель, аксессуары</string>
 	<string name="poi_furnace">Системы отопления</string>
-	<string name="poi_leather">Изделия из кожи</string>
-	<string name="poi_pyrotechnics">Пиротехника</string>
+	<string name="poi_leather">Изделия из кожи;Кожаные изделия</string>
+	<string name="poi_pyrotechnics">Пиротехника;Фейерверки</string>
 	<string name="poi_weapons">Оружие</string>
 	<string name="poi_model">Масштабные модели</string>
 	<string name="poi_trophy">Трофеи, награды</string>
 	<string name="poi_scuba_diving_shop">Товары для аквалангистов</string>
 	<string name="poi_swimming_pool_shop">Оборудование и аксессуары для плавательных бассейнов</string>
 	<string name="poi_tyres">Шины</string>
-	<string name="poi_video_games">Магазин видеоигр</string>
-	<string name="poi_watches">Магазин часов</string>
+	<string name="poi_video_games">Магазин видеоигр;Видеоигры</string>
+	<string name="poi_watches">Магазин часов;Часы</string>
 
-	<string name="poi_police">Отделение полиции</string>
+	<string name="poi_police">Отделение полиции;Полиция</string>
 	<string name="poi_fire_station">Пожарная часть</string>
 	<string name="poi_emergency_phone">Экстренный телефон</string>
 	<string name="poi_fire_hydrant">Пожарный гидрант</string>
@@ -127,7 +127,7 @@
 	<string name="poi_fire_hose">Пожарный шланг</string>
 	<string name="poi_fire_water_pond">Пожарный водоём</string>
 	<string name="poi_grit_bin">Ящик с песком</string>
-	<string name="poi_ambulance_station">Станция скорой помощи</string>
+	<string name="poi_ambulance_station">Станция скорой помощи;Скорая помощь</string>
 	<string name="poi_ses_station">Станция SES</string>
 	<string name="poi_emergency_access_point">Табличка с кодом для службы спасения</string>
 
@@ -152,9 +152,9 @@
 
 	<string name="poi_service_general">Услуги</string>
 	<string name="poi_service_tyres">Шиномонтаж</string>
-	<string name="poi_vehicle_inspection">Пункт техосмотра</string>
+	<string name="poi_vehicle_inspection">Пункт техосмотра;Техосмотр</string>
 	<string name="poi_car_wash">Автомойка</string>
-	<string name="poi_fuel">Автомобильная заправка;Автозаправка;Бензоколонка;АЗС;Бензозаправка</string>
+	<string name="poi_fuel">Автомобильная заправка;Автозаправка;Бензоколонка;АЗС;Бензозаправка;Заправка</string>
 	<string name="poi_electricity_combined_charging">Зарядная станция</string>
 	<string name="poi_vehicle_ramp">Ремонтная эстакада/яма</string>
 	<string name="poi_compressed_air">Подкачка шин</string>
@@ -177,7 +177,7 @@
 
 	<string name="poi_subway_station_filter">Станция метро</string>
 	<string name="poi_subway_station">Да</string>
-	<string name="poi_taxi">Стоянка такси</string>
+	<string name="poi_taxi">Стоянка такси;Такси</string>
 
 	<string name="poi_aerodrome">Аэропорт</string>
 	<string name="poi_helipad">Вертолётная площадка</string>
@@ -189,10 +189,10 @@
 	<string name="poi_ferry_terminal">Причал парома</string>
 	<string name="poi_lighthouse">Маяк</string>
 
-	<string name="poi_bicycle_rental">Прокат велосипедов</string>
-	<string name="poi_bicycle_parking">Велопарковка</string>
+	<string name="poi_bicycle_rental">Прокат велосипедов;Велопрокат</string>
+	<string name="poi_bicycle_parking">Велопарковка;Велосипедная парковка;Парковка для велосипедов</string>
 
-	<string name="poi_aerialway_station">Станция канатной дороги</string>
+	<string name="poi_aerialway_station">Станция канатной дороги;Канатка</string>
 	<string name="poi_aerialway_cable_car">Канатная дорога с кабинами</string>
 	<string name="poi_aerialway_gondola">Канатная дорога с небольшими кабинами</string>
 	<string name="poi_aerialway_chair_lift">Канатная дорога с открытыми креслами</string>
@@ -218,7 +218,7 @@
 	<string name="poi_boatyard">Шлюпочная мастерская</string>
 	<string name="poi_wastewater_plant">Очистные сооружения</string>
 	<string name="poi_water_tower">Водонапорная башня</string>
-	<string name="poi_lock_gate">Ворота шлюза</string>
+	<string name="poi_lock_gate">Ворота шлюза;Шлюз</string>
 	<string name="poi_waterway_turning_point">Поворотная точка на воде</string>
 	<string name="poi_weir">Небольшая плотина</string>
 	<string name="poi_dam">Дамба</string>
@@ -231,7 +231,7 @@
 	<string name="poi_power_tower">Опора линии электропередач</string>
 	<string name="poi_power_pole">Столб линии электропередач</string>
 
-	<string name="poi_post_office">Почта</string>
+	<string name="poi_post_office">Почта;Почтовое отделение</string>
 	<string name="poi_post_box">Почтовый ящик</string>
 	<string name="poi_telephone">Телефон</string>
 	<string name="poi_communication_tower">Вышка связи</string>
@@ -245,8 +245,8 @@
 	<string name="poi_waste_basket">Урна для мусора</string>
 
 	<string name="poi_recycling_type">Тип</string>
-	<string name="poi_recycling_centre">Пункт приёма</string>
-	<string name="poi_recycling_container">Контейнер</string>
+	<string name="poi_recycling_centre">Пункт приёма;Центр утилизации</string>
+	<string name="poi_recycling_container">Контейнер;Бак</string>
 
 	<string name="poi_recycling_accepted_waste">Принимаемые отходы</string>
 	<string name="poi_recycling_glass">Стекло</string>
@@ -338,24 +338,24 @@
 	<string name="poi_prison">Тюрьма</string>
 	<string name="poi_register_office">ЗАГС</string>
 	<string name="poi_embassy">Посольство</string>
-	<string name="poi_government">Государственное учреждение</string>
-	<string name="poi_bailiff">Служба судебных приставов</string>
+	<string name="poi_government">Государственное учреждение;Госучреждение</string>
+	<string name="poi_bailiff">Служба судебных приставов;Судебные приставы</string>
 	<string name="poi_prosecutor">Прокуратура</string>
 	<string name="poi_pension_fund">Пенсионый фонд</string>
 	<string name="poi_migration">Миграционная служба</string>
 	<string name="poi_tax_inspection">Налоговая инспекция</string>
 	<string name="poi_office_administrative">Административное учреждение</string>
-	<string name="poi_customs">Таможенный пункт</string>
+	<string name="poi_customs">Таможенный пункт;Таможня</string>
 
 	<string name="poi_pharmacy">Аптека</string>
 	<string name="poi_hospital">Больница</string>
-	<string name="poi_doctors">Врач</string>
+	<string name="poi_doctors">Врач;Доктор</string>
 	<string name="poi_clinic">Поликлиника, клиника</string>
 	<string name="poi_first_aid">Первая помощь</string>
-	<string name="poi_dentist">Стоматология</string>
+	<string name="poi_dentist">Стоматология;Лечение зубов;Зубной врач</string>
 	<string name="poi_nursing_home">Дом престарелых</string>
 	<string name="poi_baby_hatch">Бэби-бокс</string>
-	<string name="poi_veterinary">Ветеринарная лечебница</string>
+	<string name="poi_veterinary">Ветеринарная лечебница;Ветеринария</string>
 
 	<string name="poi_resort_type">Тип</string>
 	<string name="poi_sanatorium">Санаторий</string>
@@ -377,14 +377,14 @@
 	<string name="poi_company">Фирма</string>
 	<string name="poi_insurance">Страховая компания</string>
 	<string name="poi_estate_agent">Агентство недвижимости</string>
-	<string name="poi_lawyer">Юридические услуги</string>
+	<string name="poi_lawyer">Юридические услуги;Юрист</string>
 	<string name="poi_office_telecommunication">Телекоммуникационная компания</string>
 	<string name="poi_ngo">Общественная организация</string>
 	<string name="poi_townhall">Администрация населенного пункта</string>
 	<string name="poi_employment_agency">Биржа труда</string>
 	<string name="poi_research">Исследовательский центр</string>
 	<string name="poi_it">Информационные технологии</string>
-	<string name="poi_newspaper">Печатное издание</string>
+	<string name="poi_newspaper">Печатное издание;Офис газеты</string>
 	<string name="poi_architect">Архитектура, офис</string>
 	<string name="poi_advertising_agency">Рекламное агентство</string>
 	<string name="poi_educational_institution">Образовательное учреждение (администрация)</string>
@@ -398,10 +398,10 @@
 	<string name="poi_tax_advisor">Специалист по подготовке налоговых деклараций</string>
 
 	<string name="poi_stadium">Стадион</string>
-	<string name="poi_sports_centre">Спортивный центр</string>
+	<string name="poi_sports_centre">Спортивный центр;Спортцентр</string>
 	<string name="poi_golf_course">Поле для гольфа</string>
 	<string name="poi_ice_rink">Каток</string>
-	<string name="poi_pitch">Спортивная площадка, поле, корт</string>
+	<string name="poi_pitch">Спортивная площадка, поле, корт;Спортплощадка</string>
 	<string name="poi_running_track">Беговая дорожка</string>
 	<string name="poi_bicycle_track">Велотрек</string>
 	<string name="poi_horse_track">Ипподром</string>
@@ -421,7 +421,7 @@
 	<string name="poi_climbing">Скалолазание</string>
 	<string name="poi_cricket">Крикет</string>
 	<string name="poi_croquet">Крокет</string>
-	<string name="poi_cycling">Велосипедный спорт</string>
+	<string name="poi_cycling">Велосипедный спорт;Велоспорт</string>
 	<string name="poi_diving">Прыжки в воду</string>
 	<string name="poi_scuba_diving">Плавание с аквалангом</string>
 	<string name="poi_dog_racing">Собачьи бега</string>
@@ -464,7 +464,7 @@
 	<string name="poi_archaeological_site">Археологические раскопки</string>
 	<string name="poi_battlefield">Поле битвы</string>
 	<string name="poi_boundary_stone">Межевой камень</string>
-	<string name="poi_castle">Замок</string>
+	<string name="poi_castle">Замок;Крепость</string>
 	<string name="poi_city_gate">Городские ворота</string>
 	<string name="poi_fort">Фортификационные сооружения</string>
 	<string name="poi_fountain">Фонтан</string>
@@ -474,10 +474,10 @@
 	<string name="poi_historic_ship">Судно (музей)</string>
 	<string name="poi_historic_mine">Историческая шахта</string>
 	<string name="poi_monument">Монумент (памятник)</string>
-	<string name="poi_zoo">Зоопарк</string>
+	<string name="poi_zoo">Зоопарк;Зверинец;Зоологический парк</string>
 	<string name="poi_theme_park">Парк развлечений</string>
 
-	<string name="poi_hotel">Гостиница, отель</string>
+	<string name="poi_hotel">Гостиница;Отель</string>
 	<string name="poi_guest_house">Гостевой дом</string>
 	<string name="poi_hostel">Хостел</string>
 	<string name="poi_motel">Мотель</string>
@@ -502,8 +502,8 @@
 	<string name="poi_wayside_shrine">Придорожная святыня</string>
 	<string name="poi_information">Информация</string>
 	<string name="poi_clock">Часы</string>
-	<string name="poi_travel_agent">Турагентство</string>
-	<string name="poi_viewpoint">Место с хорошим видом</string>
+	<string name="poi_travel_agent">Турагентство;Туристическое агенство</string>
+	<string name="poi_viewpoint">Место с хорошим видом;Обзорная площадка</string>
 	<string name="poi_camp_site">Место для лагеря</string>
 	<string name="poi_caravan_site">Ночлег</string>
 	<string name="poi_picnic_site">Место для пикника</string>
@@ -550,7 +550,7 @@
 	<string name="poi_dance_floor">Танцплощадка</string>
 	<string name="poi_nightclub">Ночной клуб;Диско</string>
 	<string name="poi_stripclub">Стрипклуб</string>
-	<string name="poi_beach_resort">Пляжный комплекс</string>
+	<string name="poi_beach_resort">Пляжный комплекс;Пляжный курорт</string>
 	<string name="poi_dog_park">Площадка для выгула собак</string>
 	<string name="poi_leisure_fishing">Место для рыбалки</string>
 	<string name="poi_hunting_stand">Охотничья вышка</string>
@@ -627,18 +627,18 @@
 	<string name="poi_beauty_salon_nails">Маникюр</string>
 	<string name="poi_hairdresser">Парикмахерская</string>
 	<string name="poi_massage">Массажный салон</string>
-	<string name="poi_tattoo">Тату салон</string>
+	<string name="poi_tattoo">Тату салон;Татуировки</string>
 	<string name="poi_dry_cleaning">Химчистка</string>
 	<string name="poi_laundry">Прачечная</string>
 	<string name="poi_car_rental">Прокат автомобилей</string>
 	<string name="poi_car_sharing">Кратковременный прокат автомобилей</string>
 	<string name="poi_boat_sharing">Прокат лодок</string>
-	<string name="poi_toilets">Туалет</string>
+	<string name="poi_toilets">Туалет;Санузел</string>
 	<string name="poi_sauna">Сауна</string>
-	<string name="poi_brothel">Бордель</string>
+	<string name="poi_brothel">Бордель;Публичный дом</string>
 	<string name="poi_mortuary">Морг</string>
 	<string name="poi_crematorium">Крематорий</string>
-	<string name="poi_internet_cafe">Интернет-кафе</string>
+	<string name="poi_internet_cafe">Интернет-кафе;Интернет-салон;Киберкафе</string>
 
 	<string name="poi_bank">Банк</string>
 	<string name="poi_amenity_atm">Банкомат</string>
@@ -649,7 +649,7 @@
 	<string name="poi_bitcoin_yes">Оплата bitcoin</string>
 
 	<string name="poi_cave_entrance">Вход в пещеру</string>
-	<string name="poi_peak">Горная вершина</string>
+	<string name="poi_peak">Горная вершина;Пик</string>
 	<string name="poi_saddle">Седловая точка (перевал)</string>
 	<string name="poi_volcano">Вулкан</string>
 	<string name="poi_crater">Кратер</string>
@@ -720,7 +720,7 @@
 	<string name="poi_town">Город (небольшой)</string>
 	<string name="poi_village">Деревня</string>
 	<string name="poi_hamlet">Деревня (небольшая)</string>
-	<string name="poi_suburb">Пригород (suburb)</string>
+	<string name="poi_suburb">Пригород</string>
 	<string name="poi_isolated_dwelling">Хутор</string>
 	<string name="poi_locality">Урочище</string>
 
@@ -745,7 +745,7 @@
 	<string name="poi_bmx">Веломотокросс</string>
 	<string name="poi_canadian_football">Канадский футбол</string>
 	<string name="poi_surfing">Серфинг</string>
-	<string name="poi_historic_cannon">Исторические пушки</string>
+	<string name="poi_historic_cannon">Историческая пушка</string>
 	<string name="poi_harbour">Гавань</string>
 	<string name="poi_attraction_big_wheel">Колесо обозрения</string>
 	<string name="poi_attraction_carousel">Карусель</string>
@@ -832,7 +832,7 @@
 	<string name="poi_piste_sleigh">Трасса для санных повозок</string>
 	<string name="poi_piste_playground">Зимняя игровая площадка</string>
 	<string name="poi_ski_rental">Прокат лыж</string>
-	<string name="poi_smoking_area">Место для курения</string>
+	<string name="poi_smoking_area">Место для курения;Курилка</string>
 	<string name="poi_canal">Канал</string>
 	<string name="poi_water">Вода</string>
 	<string name="poi_wood">Лес</string>
@@ -852,7 +852,7 @@
 	<string name="poi_fuel_cng">Метан (CNG)</string>
 	<string name="poi_fuel_1_25">Смесь 1:25</string>
 	<string name="poi_fuel_1_50">Смесь 1:50</string>
-	<string name="poi_photo">Фото магазин</string>
+	<string name="poi_photo">Фотомагазин</string>
 	<string name="poi_power">Энергетика</string>
 		<string name="poi_landuse">Землепользование</string>
 	<string name="poi_craft">Мастерские</string>
@@ -905,7 +905,7 @@
 	<string name="poi_disused">Не используется по назначению</string>
 
 	<string name="poi_operator">Оператор</string>
-	<string name="poi_brand">Торговая марка</string>
+	<string name="poi_brand">Торговая марка;Бренд</string>
 	<string name="poi_fee">Оплата</string>
 	<string name="poi_fee_yes">Да</string>
 	<string name="poi_fee_no">Нет</string>
@@ -1146,10 +1146,10 @@
 	<string name="poi_garden">Сад</string>
 
 	<string name="poi_heath">Пустошь</string>
-	<string name="poi_grass">Газон</string>
+	<string name="poi_grass">Газон;Трава</string>
 	<string name="poi_grassland">Луг</string>
-	<string name="poi_scrub">Заросли кустарника</string>
-	<string name="poi_farmland">Сельскохозяйственные угодья</string>
+	<string name="poi_scrub">Заросли кустарника;Кусты</string>
+	<string name="poi_farmland">Сельскохозяйственные угодья;Сельхозугодья</string>
 	<string name="poi_logging">Вырубка</string>
 	<string name="poi_sand">Песок</string>
 	<string name="poi_village_green">Общественная территория</string>
@@ -1171,7 +1171,7 @@
 	<string name="poi_breakwater">Волнорез</string>
 	<string name="poi_groyne">Мол</string>
 
-	<string name="poi_animal_shelter">Приют для животных</string>
+	<string name="poi_animal_shelter">Приют для животных;Приют для бездомных животных</string>
 
 	<string name="poi_animal_shelter_dog">Собаки</string>
 	<string name="poi_animal_shelter_cat">Кошки</string>
@@ -1563,7 +1563,7 @@
 
 	<string name="poi_diaper_yes">Пеленальный столик</string>
 	<string name="poi_diaper_no">Пеленальный столик отсутствует</string>
-	<string name="poi_diaper_room">Пеленальная комната</string>
+	<string name="poi_diaper_room">Пеленальная комната;Комната матери и ребёнка</string>
 
 	<string name="poi_maxstay">Максимальное время стоянки</string>
 
@@ -1694,7 +1694,7 @@
 	<string name="poi_beach_surface_type">Поверхность</string>
 	<string name="poi_beach_sand">Песок</string>
 	<string name="poi_beach_shingle">Галька</string>
-	<string name="poi_beach_rocky">Камни</string>
+	<string name="poi_beach_rocky">Каменистая;Камни</string>
 
 	<string name="poi_chimney">Дымовая труба</string>
 
@@ -2465,9 +2465,9 @@
 	<string name="poi_boat_storage">Место для хранения лодок</string>
 
 	<string name="poi_kissing_gate">Калитка</string>
-	<string name="facebook">Фейсбук</string>
-	<string name="twitter">Твиттер</string>
-	<string name="poi_skype">Скайп</string>
+	<string name="facebook">Фейсбук;Facebook</string>
+	<string name="twitter">Твиттер;Twitter</string>
+	<string name="poi_skype">Скайп;Skype</string>
 	<string name="poi_garden_style_kitchen">Стиль сада: кухня</string>
 	<string name="poi_toilets_access_community">Туалет: общественный</string>
 	<string name="poi_internet_access_type_terminal">Терминал</string>
@@ -2638,7 +2638,7 @@
 	<string name="poi_fitness_centre">Фитнес-центр</string>
 	<string name="poi_fitness">Фитнес</string>
 
-	<string name="poi_billiards">Бильярд</string>
+	<string name="poi_billiards">Бильярд;Бильярдная</string>
 
 	<string name="poi_microwave_oven_yes">Микроволновая печь: присутствует</string>
 	<string name="poi_microwave_oven_no">Микроволновая печь: отсутствует</string>
@@ -2981,7 +2981,7 @@
 	<string name="poi_wheelchair_designated">Только для инвалидных кресел</string>
 	<string name="poi_spoil_heap">Отвал породы</string>
 
-	<string name="poi_summer_camp">Детский летний лагерь</string>
+	<string name="poi_summer_camp">Детский летний лагерь;Детский оздоровительный лагерь;Пионерлагерь</string>
 	<string name="poi_recreation_center">Оздоровительный центр</string>
 
 	<string name="poi_crossing_activation_automatic">Управление переездом: автоматическое</string>
@@ -3358,7 +3358,7 @@
 
 	<string name="poi_emergency_infrastructure">Аварийная инфраструктура</string>
 
-	<string name="poi_cliff">Отвесная скала</string>
+	<string name="poi_cliff">Отвесная скала;Утёс;Крутой обрыв</string>
 
 	<string name="poi_animal_keeping">Место содержания животных</string>
 	<string name="poi_animal_keeping_horse">Для лошадей</string>
@@ -3729,7 +3729,7 @@
 	<string name="poi_shop_fireplace">Магазин каминов</string>
 
 	<string name="poi_mountain_area">Горный массив</string>
-	<string name="poi_couloir">Ущелье</string>
+	<string name="poi_couloir">Ущелье;Кулуар;Ложбина</string>
 	<string name="poi_gorge">Теснина</string>
 
 	<string name="poi_shop_boat">Магазин лодок</string>
@@ -3833,4 +3833,51 @@
 
 	<string name="poi_shoe_repair">Ремонт обуви</string>
 
+	<string name="poi_bulk_purchase">Массовая закупка</string>
+	<string name="poi_bulk_purchase_yes">Есть</string>
+	<string name="poi_bulk_purchase_only">Исключительно</string>
+
+	<string name="poi_pipeline_substation">Трубопроводная подстанция</string>
+	<string name="poi_substation_type">Тип</string>
+	<string name="poi_substation_transmission">Передаточная</string>
+	<string name="poi_substation_distribution">Распределительная</string>
+	<string name="poi_substation_minor_distribution">Локальная распределительная</string>
+	<string name="poi_substation_industrial">Промышленная</string>
+	<string name="poi_substation_transition">Переходная</string>
+	<string name="poi_substation_traction">Тяговая</string>
+	<string name="poi_substation_converter">Преобразовательная</string>
+	<string name="poi_substation_compensation">Компенсаторная</string>
+
+	<string name="poi_substation_compression">Для сжатия</string>
+	<string name="poi_substation_measurement">Измерительная</string>
+	<string name="poi_substation_valve">Вентиль</string>
+	<string name="poi_substation_valve_group">Группа вентилей</string>
+	<string name="poi_substation_inspection_gauge">Контрольно-измерительная</string>
+	<string name="poi_substation_field_gathering">Собирательная</string>
+
+	<string name="poi_craft_confectionery">Кондитерская (производство)</string>
+
+	<string name="poi_shop_wholesale">Оптовый магазин</string>
+
+	<string name="poi_laboratory">Медицинская лаборатория</string>
+
+	<string name="poi_blood_donation">Станция переливания крови</string>
+
+	<string name="poi_books_type">Книги</string>
+	<string name="poi_books_comic">Комиксы</string>
+	<string name="poi_books_antiquarian">Антикварные</string>
+	<string name="poi_books_religion">Религиозные</string>
+	<string name="poi_books_academic">Академические</string>
+	<string name="poi_books_children">Детские</string>
+
+	<string name="poi_atoll">Атолл</string>
+
+	<string name="poi_toll_gantry">Рамка оплаты</string>
+
+	<string name="poi_childcare">Уход за детьми</string>
+
+	<string name="poi_denotation">Значение</string>
+	<string name="poi_denotation_natural_monument">Памятник природы</string>
+	<string name="poi_denotation_landmark">Ориентир</string>
+
 </resources>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 9c5a226600..aa39123e21 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1,5 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="intermediate_waypoint">Промежуточная точка: %1$s</string>
+    <string name="waypoints">Путевые точки: %1$s</string>
+    <string name="intermediate_destinations">Промежуточные точки: %1$s</string>
+    <string name="arrive_at_time">Прибытие в %1$s</string>
     <string name="av_locations_selected_desc">Файл GPX с координатами и данными выбранных заметок.</string>
     <string name="av_locations_all_desc">Файл GPX с координатами и данными всех заметок.</string>
     <string name="favorite_empty_place_name">Место</string>
@@ -115,7 +119,7 @@
     <string name="routing_attr_relief_smoothness_factor_name">Выберите пересеченность местности</string>
     
     <string name="routing_attr_height_obstacles_name">Использовать данные о высотах</string>
-    <string name="routing_attr_height_obstacles_description">Использовать данные о высоте местности, предоставленные SRTM, ASTER и EU-DEM.</string>
+    <string name="routing_attr_height_obstacles_description">Фактор рельефа местности (по данным SRTM, ASTER и EU-DEM).</string>
 
     <string name="quick_action_duplicates">Указанное имя для быстрого действия уже используется. Действие будет сохранено как %1$s, чтобы избежать дублирования.</string>
     <string name="quick_action_duplicate">Обнаружен дубликат имени</string>
@@ -170,7 +174,7 @@
 
     <string name="gpx_no_tracks_title">У вас пока нет файлов GPX</string>
     <string name="gpx_no_tracks_title_folder">Вы также можете добавить файлы GPX в папку</string>
-    <string name="gpx_add_track">Добавить</string>
+    <string name="gpx_add_track">Добавь еще…</string>
     <string name="gpx_appearance">Вид</string>
 
     
@@ -359,7 +363,7 @@
 \nЛюбая из этих карт может быть использована в качестве основной (базовой) карты для отображения на экране OsmAnd или в виде наложения или подложки к другой базовой карте (например стандартной офлайн-карте OsmAnd). Чтобы сделать какую-либо подложку лучше видимой, некоторые элементы векторной карты OsmAnd могут быть по желанию легко скрыты через меню «Настроить карту». 
 \n 
 \nТайловые карты можно получить непосредственно с помощью онлайн-источников или подготовить для использования в автономном режиме (и вручную скопировать в папку данных OsmAnd) в виде базы данных sqlite, которая может быть создана с помощью различных инструментов подготовки карт сторонних производителей.</string>
-    <string name="osmand_background_plugin_description">Этот плагин предоставляет навигацию и запись маршрутов в энергосберегающем режиме. Плагин работает в фоновом режиме и периодически активизирует GPS для записи маршрута или воспроизведения голосовых команд.</string>
+    <string name="osmand_background_plugin_description">Показывает настройки для включения фонового отслеживания и навигации путем периодического пробуждения устройства GPS (с выключенным экраном).</string>
     <string name="osmand_accessibility_description">"Плагин добавляет поддержку специальных возможностей устройства непосредственно в OsmAnd. Это облегчает, например, регулировку скорости речи для голоса TTS, настройку направленности  экрана навигации, управление масштабом при помощи трекбола или использование голосовых команд обратной связи для авто аннотации вашего местоположения."</string>
     <string name="osmand_development_plugin_description">Плагин отображает параметры для разработки и отладки функций, таких как, проверка или моделирование маршрута, отображение производительности отрисовки, проверка голосовых подсказок. Эти настройки предназначены для разработчиков и не требуются для обычного пользователя.</string>
     <string name="plugins_screen">Плагины</string>
@@ -400,7 +404,7 @@
     <string name="live_monitoring_url">Web адрес онлайн слежения</string>
     <string name="gpx_monitoring_disabled_warn">Записать трек можно с помощью виджета GPX или выбрав \"Запись поездки\" в Настройках.</string>
     <string name="show_current_gpx_title">Показывать текущий путь</string>
-    <string name="free_version_message">Бесплатная версия OsmAnd ограничена %1$s загрузками (добавлениями или обновлениями карт) и не поддерживает геостатьи из Википедии.</string>
+    <string name="free_version_message">Вы можете скачать или обновить карты %1$s.</string>
     <string name="free_version_title">Бесплатная версия</string>
     <string name="poi_context_menu_showdescription">Показать описание POI.</string>
     <string name="index_name_us">Северная Америка - США</string>
@@ -625,7 +629,7 @@
     <string name="general_settings">Общие</string>
     <string name="index_settings">Управление картами</string>
     <string name="osmand_service">Фоновый режим</string>
-    <string name="osmand_service_descr">Оставить OsmAnd работать в фоновом режиме при выключении экрана.</string>
+    <string name="osmand_service_descr">OsmAnd работает в фоновом режиме с выключенным экраном.</string>
     <string name="fast_route_mode">Скоростной маршрут</string>
     <string name="fast_route_mode_descr">Расчет скоростного маршрута вместо кратчайшего.</string>
     <string name="tiles_to_download_estimated_size">На масштабе {0} загрузить {1} тайлов ({2} Mb )</string>
@@ -1024,7 +1028,7 @@
     <string name="address_search_desc">Поиск по адресу</string>
     <string name="navpoint_search_desc">Координаты</string>
     <string name="transport_search_desc">Поиск общественного транспорта</string>
-    <string name="favourites_search_desc">Поиск в избранном</string>
+    <string name="favourites_search_desc">Способ поиска в избранных</string>
     <string name="rendering_attr_noPolygons_description">Отображать только контуры, без заливки.</string>
     <string name="rendering_attr_noPolygons_name">Полигоны</string>
     <string name="rendering_attr_appMode_name">Режим рендеринга</string>
@@ -1390,7 +1394,7 @@
     <string name="calculate_osmand_route_gpx">Рассчитать оффлайновый маршрут 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_descr">Выберите профили, которые будут отображаться в приложении.</string>
     <string name="app_modes_choose">Профили приложения</string>
     <string name="edit_tilesource_choose_existing">Выберите существующий…</string>
     <string name="maps_define_edit">Задать/отредактировать …</string>
@@ -1930,7 +1934,7 @@
     <string name="storage_directory_manual">Указать вручную</string>
     <string name="storage_directory">Хранилище карт</string>
     <string name="shared_string_copy">Копировать</string>
-    <string name="application_dir_change_warning3">Скопировать файлы данных в новое место назначения?</string>
+    <string name="application_dir_change_warning3">Скопировать файлы данных Osmand в новое место назначения\?</string>
     <string name="search_poi_category_hint">Напечатайте для поиска</string>
     <string name="rendering_attr_hideHouseNumbers_name">Номера домов</string>
     
@@ -2246,7 +2250,7 @@
     <string name="osm_live_not_active">Неактивные</string>
     <string name="osm_live_region_desc">Часть вашего пожертвования будет направляться пользователям OSM внесшим изменения в карту этого региона.</string>
     <string name="download_files_error_not_enough_space">Недостаточно места! Необходимо {3} Мб временно и {1} Мб на постоянной основе. Свободного места - {2} Мб.</string>
-    <string name="upload_osm_note_description">Вы можете загрузить свою заметку OSM анонимно или используя свой профиль OpenStreetMap.org.</string>
+    <string name="upload_osm_note_description">Загрузите свою заметку OSM анонимно или используя свой профиль OpenStreetMap.org.</string>
     <string name="upload_osm_note">Загрузить OSM заметку</string>
     <string name="use_drawer_btn">Использовать меню</string>
     <string name="use_dashboard_btn">Использовать панель управления</string>
@@ -2335,12 +2339,12 @@
     <string name="clear_tile_data">Очистить всю плитку</string>
     <string name="routing_attr_short_way_name">Экономичный путь</string>
     <string name="routing_attr_short_way_description">Использование топливо-сберегающего пути (обычно короче).</string>
-    <string name="replace_favorite_confirmation">Вы уверены, что хотите заменить любимые %1$s?</string>
+    <string name="replace_favorite_confirmation">Вы уверены, что хотите заменить избранные %1$s\?</string>
     <string name="shared_string_change">Изменить</string>
     <string name="get_started">Начать</string>
     <string name="shared_string_from">от</string>
     <string name="follow_us">Подписывайтесь на нас</string>
-    <string name="osm_live_email_desc">Необходимо предоставить информацию о взносах.</string>
+    <string name="osm_live_email_desc">Необходимо, чтобы предоставить вам информацию о вкладах.</string>
     <string name="download_files_question_space_with_temp">Скачать {0} файл (ов)? Используется {3} Мб временной и {1} Мб постоянной памяти. (Свободного места - {2} Мб.)</string>
     <string name="search_my_location">Найти мое местоположение</string>
     <string name="first_usage_greeting">Прокладывайте маршруты и открывайте новые для себя места без подключения к Интернету</string>
@@ -2362,7 +2366,7 @@
     <string name="get_for">Получить за %1$s</string>
     <string name="get_for_month">Получить за %1$s в месяц</string>
     <string name="get_it">Получить</string>
-    <string name="osm_live_banner_desc">Получите неограниченные загрузки для карт, а также обновления карт чаще, чем один раз в месяц: еженедельно, ежедневно или ежечасно.</string>
+    <string name="osm_live_banner_desc">Получайте неограниченное количество загрузок карт и обновлений карт более одного раза в месяц: еженедельно, ежедневно или ежечасно.</string>
     <string name="osmand_plus_banner_desc">Неограниченный доступ к картам, обновлениям и плагину Wikipedia.</string>
     <string name="select_voice_provider">Выберите голосовое сопровождение</string>
     <string name="osm_live_payment_desc">Абонентская плата взимается ежемесячно. Отменить подписку можно в Google Play в любой момент.</string>
@@ -2459,7 +2463,7 @@
     <string name="shared_string_to">До</string>
     <string name="mapillary_menu_date_from">От</string>
     <string name="shared_string_reload">Обновить</string>
-    <string name="mapillary_menu_filter_description">Фильтровать фотографии по отправителю или по дате. Фильтры применяются только для больших масштабов.</string>
+    <string name="mapillary_menu_filter_description">Фильтровать фотографии по отправителю, дате или типу. Фильтры применяются только для больших масштабов.</string>
     <string name="import_gpx_failed_descr">OsmAnd не удается импортировать файл. Проверьте имеет ли OsmAnd разрешение на чтение файла из его местоположения.</string>
     <string name="distance_moving">Откорректированное расстояние</string>
     <string name="improve_coverage_install_mapillary_desc">Установите Mapillary, чтобы добавить одну или несколько фотографий к этому месту на карте.</string>
@@ -2651,17 +2655,17 @@
     <string name="osmand_extended_description_part1">OsmAnd (OSM Automated Navigation Directions) - картографическая и навигационная программа с доступом к свободным, мировым и высококачественным данным OpenStreetMap (OSM). 
 \n 
 \nПолучайте наслаждение от голосовой и визуальной навигации, просматривайте точки интереса (англ. POI, points of interest), создавайте и управляйте треками GPX, используйте визуализацию контурных линий и данных высот (через плагин), переключайтесь между режимами автомобиль, велосипед и пешеход, редактируйте OSM данные и многое другое.</string>
-    <string name="osmand_extended_description_part2">GPS-навигация
-\n• Вы можете выбрать между автономным режимом (без платы за роуминг) и через Интернет (быстрее)
-\n• Пошаговые голосовые подсказки (записанные или синтезированные голоса) доставят вас к месту назначения
-\n• Повторный расчет маршрута после значительного отклонения от существующего
-\n• Полосы движения, названия улиц и приблизительное время прибытия помогут в дороге
-\n• Для того, чтобы сделать ваше путешествие более безопасным, режим дня/ночи переключается автоматически
-\n• Вы можете настроить отображение ограничений скорости и получать предупреждения при ее превышении
-\n• Карта масштабируется соответственно вашей скорости
-\n• Вы можете искать места по адресу, типу (паркинг, ресторан, отель, заправка, музей и т.д.) или географическим координатам
-\n• Поддержка промежуточных точек маршрута
-\n• Вы можете записать собственный GPX трек или загрузить готовый и придерживаться его</string>
+    <string name="osmand_extended_description_part2">GPS-навигация 
+\n• Выбор между автономным режимом (без платы за роуминг) и через Интернет (быстрее) 
+\n• Пошаговые голосовые подсказки (записанные или синтезированные голоса) доставят вас к месту назначения 
+\n• Повторный расчет маршрута после значительного отклонения от существующего 
+\n• Полосы движения, названия улиц и приблизительное время прибытия помогут в дороге 
+\n• Для того, чтобы сделать ваше путешествие более безопасным, режим дня/ночи переключается автоматически 
+\n• Отображение ограничений скорости и получение предупреждений при их превышении 
+\n• Карта масштабируется соответственно вашей скорости 
+\n• Поиск места по адресу, типу (паркинг, ресторан, отель, заправка, музей и т.д.) или географическим координатам 
+\n• Поддержка промежуточных точек маршрута 
+\n• Запись собственного или загрузка GPX трека и следование ему</string>
     <string name="osmand_extended_description_part3">Карта 
 \n• Отображает POI (точки интереса) около вас 
 \n• Адаптирует карту в направлении вашего движения (или компаса) 
@@ -2876,7 +2880,7 @@
     <string name="shared_string_dont">Нет</string>
     <string name="shared_string_do">Выполнить</string>
     <string name="purchase_dialog_title">Выберите план</string>
-    <string name="purchase_dialog_travel_description">Чтобы читать статьи путеводителя в автономном режиме, вам необходимо приобрести один из следующих пунктов.</string>
+    <string name="purchase_dialog_travel_description">Приобретите один из следующих планов, чтобы получить оффлайн путеводитель:</string>
     <string name="purchase_dialog_subtitle">Выберите подходящий пункт:</string>
     <string name="in_app_purchase">Покупка в приложении</string>
     <string name="in_app_purchase_desc">Разовый платеж.</string>
@@ -2895,13 +2899,13 @@
     <string name="in_app_purchase_desc_ex">После покупки этот план станет доступен для вас навсегда.</string>
     <string name="wikivoyage_travel_guide">Путеводитель</string>
     <string name="wikivoyage_travel_guide_descr">Просматривайте путеводители Викигида по самым интересным местам на планете внутри OsmAnd без подключения к интернету.</string>
-    <string name="travel_card_update_descr">Мы подготовили обновления и исправления в данных Викигида, обновите файл, чтобы увидеть их.</string>
+    <string name="travel_card_update_descr">Доступны новые данные Викигида, обновите файл, чтобы увидеть их.</string>
 	<string name="travel_card_download_descr">Скачайте путеводители Викигида для просмотра статей о местах по всему миру без подключения к Интернету.</string>
 	<string name="update_is_available">Доступно обновление</string>
 	<string name="download_file">Скачать файл</string>
     <string name="start_editing_card_image_text">Свободный всемирный путеводитель, который может редактировать каждый.</string>
-    <string name="welcome_to_open_beta_description">Проверьте бесплатно все функции во время открытого бета-тестирования. Впоследствии Путеводитель будет доступен подписчикам OsmAnd Unlimited и владельцам OsmAnd +</string>
-    <string name="start_editing_card_description">Вы можете редактировать любую статью Викигида, и мы надеемся, что вы это сделаете. Нам нужны ваши знания, ваш опыт, ваш талант и ваше внимание</string>
+    <string name="welcome_to_open_beta_description">В настоящее время путеводители основаны на Викигиде. Проверьте бесплатно все функции во время открытого бета-тестирования. Впоследствии путеводители будут доступны подписчикам OsmAnd Unlimited и владельцам OsmAnd+.</string>
+    <string name="start_editing_card_description">Вы можете отредактировать любую статью Викигида, этот проект написан такими же волонтерами как и вы. Нам нужны ваши знания, ваш опыт, ваш талант и ваше внимание</string>
     <string name="start_editing">Начать редактирование</string>
     <string name="get_unlimited_access">Получить неограниченный доступ</string>
     <string name="welcome_to_open_beta">Добро пожаловать на открытое бета-тестирование</string>
@@ -2980,18 +2984,24 @@
 \n</string>
     <string name="increase_search_radius_to">Увеличить радиус поиска до %1$s</string>
     <string name="commiting_way">Фиксируется путь…</string>
-    <string name="release_3_2_pre">• Исправлено аварийное завершение приложения при запуске с нелатинскими картами 
+    <string name="release_3_2_pre">• Исправлено падение приложения при запуске, которое происходило на некоторых устройствах
+\n
+\n• Новый функционал маркеров: отображение пройденных маркеров
+\n
+\n• История поиска теперь показывает категории, которые вы искали ранее
+\n
+\n• Исправлено падение приложения при запуске с нелатинскими картами 
 \n 
 \n• Повышена скорость рендеринга на устройствах с Android 8.0 
 \n 
-\n• Поддержка редактирования объектов полигонов (не amenity) 
-\n
-\n• Измерить расстояние: добавлена кнопка «Измерить» в пункт «Действия» контекстного меню
+\n• Поддержка редактирования полигональных объектов (не amenity) 
+\n 
+\n• Измерить расстояние: добавлена кнопка «Измерить» в пункт «Действия» контекстного меню 
 \n</string>
     <string name="ask_for_location_permission">Пожалуйста, для продолжения дайте OsmAnd разрешение на определение местоположения.</string>
     <string name="rendering_value_black_name">Чёрный</string>
     <string name="search_street">Поиск улицы</string>
-    <string name="start_search_from_city">Начать поиск с города</string>
+    <string name="start_search_from_city">Сначала выберите город</string>
     <string name="shared_string_restore">Восстановить</string>
     <string name="keep_passed_markers_descr">Маркеры, добавленные как группа избранных или путевых точек GPX и отмеченные как пройденные, останутся на карте. Если группа не активна, маркеры исчезнут с карты.</string>
     <string name="keep_passed_markers">Оставить пройденные маркеры на карте</string>
@@ -2999,4 +3009,49 @@
     <string name="markers_remove_dialog_msg">Удалить маркер \'%s\'\?</string>
     <string name="edit_map_marker">Редактировать маркер</string>
     <string name="third_party_application">Стороннее приложение</string>
-    </resources>
+    <string name="osm_live_plan_pricing">План и цены</string>
+    <string name="osm_live_payment_monthly_title">Платить ежемесячно</string>
+    <string name="osm_live_payment_3_months_title">Платить раз в 3 месяца</string>
+    <string name="osm_live_payment_annual_title">Платить раз в год</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / месяц</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / месяц</string>
+    <string name="osm_live_payment_discount_descr">Экономия %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Ваша текущая подписка</string>
+    <string name="osm_live_payment_renews_monthly">Продлевается ежемесячно</string>
+    <string name="osm_live_payment_renews_quarterly">Продлевается ежеквартально</string>
+    <string name="osm_live_payment_renews_annually">"Продлевается  ежегодно"</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Выберите удобный для вас период оплаты:</string>
+    <string name="osm_live_payment_contribute_descr">Часть доходов поступает участникам OpenStreetMap.</string>
+    <string name="osm_live_subscriptions">Подписки</string>
+    <string name="powered_by_osmand">Работает на OsmAnd</string>
+    <string name="mapillary_menu_title_pano">Только панорамы 360°</string>
+    <string name="shared_string_launch">Запуск</string>
+    <string name="lang_gn_py">Гуарани</string>
+    <string name="run_full_osmand_msg">Вы используете {0} карту, которая поставляется OsmAnd. Хотите запустить полную версию Osmand\?</string>
+    <string name="run_full_osmand_header">Запустить OsmAnd\?</string>
+    <string name="swap_start_and_destination">Поменять местами пункты отправления и назначения</string>
+    <string name="add_destination_point">Добавить пункт назначения</string>
+    <string name="add_intermediate_point">Добавить промежуточный пункт</string>
+    <string name="add_start_point">Добавить пункт отправления</string>
+    <string name="route_way">Путь: %1$s</string>
+    <string name="points_of_interests">Точки интереса (POI)</string>
+    <string name="waiting_for_route_calculation">Ожидание расчета маршрута</string>
+    <string name="app_mode_public_transport">Общественный транспорт</string>
+    <string name="avoid_roads_descr">Выберите дорогу на карте или из списка ниже, которую вы хотите избежать во время навигации:</string>
+    <string name="simulate_navigation">Моделировать навигацию</string>
+    <string name="choose_track_file_to_follow">Выберите файл трека для следования</string>
+    <string name="voice_announcements">Голосовые объявления</string>
+    <string name="quick_action_switch_day_night_descr">Нажатие на кнопку действия переключает дневной и ночной режимы для OsmAnd</string>
+    <string name="quick_action_switch_day_mode">Дневной режим</string>
+    <string name="quick_action_switch_night_mode">Ночной режим</string>
+    <string name="quick_action_day_night_switch_mode">Переключить дневной/ночной режим</string>
+    <string name="cubic_m">м³</string>
+    <string name="metric_ton">т</string>
+    <string name="shared_string_capacity">Объем</string>
+    <string name="shared_string_width">Ширина</string>
+    <string name="shared_string_height">Высота</string>
+    <string name="transfers">трансферы: %1$s</string>
+    <string name="on_foot">пешком: %1$s</string>
+    <string name="show_along_the_route">Показывать вдоль маршрута</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index eb764d3ab2..0056285186 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_palaeontological_site">Giassu paleontològicu</string>
 
 	<string name="poi_bakery">Furru de su pane</string>
@@ -121,7 +121,7 @@
 	<string name="poi_railway_station">Istatzione de sos trenos</string>
 	<string name="poi_railway_platform">Piattaredda ferroviària</string>
 	<string name="poi_subway_entrance">Intrada de sa metropolitana</string>
-	<string name="poi_subway_station">Istatzione de sa metropolitana</string>
+	<string name="poi_subway_station">Eja</string>
 	<string name="poi_taxi">Postèggiu de sos taxi</string>
 
 	<string name="poi_aerodrome">Aeroportu</string>
@@ -926,7 +926,7 @@
 	<string name="poi_brownfield">Terrinu abbandonadu</string>
 	<string name="poi_greenfield">Terrinu egadu</string>
 	<string name="poi_bunker_silo">Lòssia \"bunker\"</string>
-	<string name="poi_capital">Capitale</string>
+	<string name="poi_capital">Eja</string>
 	<string name="poi_office_religion">Ufìtziu religiosu</string>
 	<string name="poi_association">Ufìtziu de un’assòtziu</string>
 	<string name="poi_financial">Ufìtziu finantziàriu</string>
@@ -1121,8 +1121,8 @@
 	<string name="poi_crossing_traffic_signals">Cun semàforos</string>
 	<string name="poi_crossing_uncontrolled">Non controlladu</string>
 	<string name="poi_crossing_unmarked">Non sinnaladu</string>
-	<string name="poi_start_date">Data de cumintzu</string>
-	<string name="poi_wheelchair_yes">Cadira a rodas</string>
+	<string name="poi_start_date">Data de incumintzu</string>
+	<string name="poi_wheelchair_yes">Eja</string>
 	<string name="poi_wheelchair_no">Nono</string>
 	<string name="poi_wheelchair_limited">Limitada</string>
 	<string name="poi_access_private">Atzessu privadu</string>
@@ -2107,7 +2107,7 @@
 	<string name="poi_drive_through_no">Servìtziu pro automobilistas (drive-through): nono</string>
 
 	<string name="poi_brewery_additional">Nùmene birrifìtziu</string>
-	<string name="poi_microbrewery_yes">Micro-birrifìtziu</string>
+	<string name="poi_microbrewery_yes">Eja</string>
 	<string name="poi_microbrewery_no">Chene micro-birrifìtziu</string>
 
 	<string name="poi_takeaway_filter_yes">Eja</string>
@@ -3901,4 +3901,42 @@
 <string name="poi_atm">Bancomat</string>
 	<string name="poi_shoe_repair">Acontzu de iscarpas</string>
 
-</resources>
+<string name="poi_bulk_purchase">Còmpora a s\'ingrossu</string>
+	<string name="poi_substation_type">Casta</string>
+
+<string name="poi_bulk_purchase_yes">Eja</string>
+	<string name="poi_bulk_purchase_only">Petzi</string>
+
+	<string name="poi_pipeline_substation">Sutaistatzione de sas condutas</string>
+	<string name="poi_substation_transmission">Trasmissione</string>
+	<string name="poi_substation_distribution">Distributzione</string>
+	<string name="poi_substation_minor_distribution">Distributzione minore</string>
+	<string name="poi_substation_industrial">Industriale</string>
+	<string name="poi_substation_transition">Transitzione</string>
+	<string name="poi_substation_traction">Tratzione</string>
+	<string name="poi_substation_converter">Cunvertidore</string>
+	<string name="poi_substation_compensation">Cumpensatzione</string>
+
+	<string name="poi_substation_compression">Compressione</string>
+	<string name="poi_substation_measurement">Mèdida</string>
+	<string name="poi_substation_valve">Vàlvula</string>
+	<string name="poi_substation_valve_group">Grupu de vàlvulas</string>
+	<string name="poi_substation_inspection_gauge">Indicadore de ispetzione</string>
+	<string name="poi_substation_field_gathering">Regorta de campu</string>
+    <string name="poi_craft_confectionery">Produtzione de durches</string>
+    <string name="poi_shop_wholesale">Butega a s\'ingrussu</string>
+    <string name="poi_books_type">Libros</string>
+    <string name="poi_laboratory">Laboratòriu mèigu</string>
+    <string name="poi_blood_donation">Donatzione de sàmbene</string>
+    <string name="poi_books_comic">Fumetos</string>
+    <string name="poi_books_antiquarian">Anticuàriu</string>
+    <string name="poi_books_religion">Religione</string>
+    <string name="poi_books_academic">Acadèmicu</string>
+    <string name="poi_books_children">Pitzinnos</string>
+    <string name="poi_atoll">Atollu</string>
+    <string name="poi_toll_gantry">Incasteddadura de pedàgiu</string>
+    <string name="poi_childcare">Assistèntzia a sos pitzinnos</string>
+    <string name="poi_denotation">Denotatzione</string>
+    <string name="poi_denotation_natural_monument">Monumentu naturale</string>
+    <string name="poi_denotation_landmark">Puntu de riferimentu</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 76729d7809..9dd728c69a 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
     <string name="voice_pref_title">Boghe</string>
@@ -358,7 +358,7 @@
     <string name="map_widget_show_destination_arrow">Ammustra sa diretzione de sa destinatzione</string>
     <string name="enable_plugin_monitoring_services">"Abìlita s’estensione de registratzione biàgios pro impreare sos servìtzios de registratzione de sa positzione (registratzione GPX,  arrastamentu in lìnia)"</string>
     <string name="non_optimal_route_calculation">Càlcula un’àndala, s’in casu mai fintzas non primorosa, pro sas distantzias longas</string>
-    <string name="gps_not_available">Allue su GPS in sas impostatziones</string>
+    <string name="gps_not_available">Allughe su GPS in sas impostatziones</string>
 
     <string name="map_widget_monitoring_services">Servitzios de registratzione</string>
     <string name="no_route">Peruna àndala</string>
@@ -486,7 +486,7 @@
 \n
 \nMantene incarcadu pro sas optziones"</string>
     <string name="gpx_info_subtracks">Suta-rastas: %1$s</string>
-    <string name="gpx_info_waypoints">Puntu de coladòrgiu: %1$s</string>
+    <string name="gpx_info_waypoints">Puntos de coladòrgiu: %1$s</string>
     <string name="gpx_info_distance">Distàntzia: %1$s (%2$s points)</string>
     <string name="gpx_info_start_time">Oràriu de tzuccada: %1$tF, %1$tT</string>
     <string name="gpx_info_end_time">Oràriu de lòmpida: %1$tF, %1$tT</string>
@@ -740,7 +740,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
     <string name="navigate_point_format">Formatu</string>
     <string name="poi_search_desc">Chirca PDI (puntos de interesse)</string>
     <string name="address_search_desc">Chirca de sos indiritzos</string>
-    <string name="navpoint_search_desc">Coordinatas</string>
+    <string name="navpoint_search_desc">Coordinadas</string>
     <string name="transport_search_desc">Chirca de sos trasportos pùblicos</string>
     <string name="favourites_search_desc">Una manera de chircare preferidos</string>
     <string name="offline_navigation_not_available">Su nàvigu chene lìnia de OsmAnd est temporaneamente non disponìbile.</string>
@@ -1104,10 +1104,10 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
     <string name="si_mi_feet">Mìglios/pedes</string>
     <string name="si_mi_yard">Mìglios/iardas</string>
     <string name="si_km_m">Chilòmetros/metros</string>
-    <string name="yard">iarda</string>
-    <string name="foot">pedes</string>
+    <string name="yard">yd</string>
+    <string name="foot">ft</string>
     <string name="mile_per_hour">mph</string>
-    <string name="mile">mìgliu</string>
+    <string name="mile">mi</string>
     <string name="send_location_way_choose_title">Cumpartzi sa positzione impreende</string>
     <string name="send_location_sms_pattern">Positzione: %1$s\n%2$s</string>
     <string name="send_location_email_pattern">Pro bìdere sa positzione sighi su ligàmene web %1$s o su ligàmene %2$s</string>
@@ -1380,7 +1380,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
     <string name="empty_route_calculated">S’àndala calculada est bòida</string>
     <string name="new_route_calculated_dist">Àndala noa calculada, distàntzia</string>
     <string name="arrived_at_destination">Seis arribaos a sa destinatzione bostra</string>
-    <string name="invalid_locations">Coordinatas non vàlidas</string>
+    <string name="invalid_locations">Coordinadas non vàlidas</string>
     <string name="go_back_to_osmand">Torra a sa mapa OsmAnd</string>
     <string name="shared_string_close">Serra</string>
     <string name="loading_data">Carrigamentu datos…</string>
@@ -1430,10 +1430,10 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
     <string name="show_location">Ammustra sa positzione tua</string>
 
 
-    <string name="show_gps_coordinates_text">Ammustra coordinatas GPS in sa mapa</string>
+    <string name="show_gps_coordinates_text">Ammustra coordinadas GPS in sa mapa</string>
     <string name="use_internet_to_download_tile">Iscàrriga tasseddos fartantes de sa mapa</string>
     <string name="app_description">Aplicatzione de nàvigu</string>
-    <string name="shared_string_exit">Essida</string>
+    <string name="shared_string_exit">Essi</string>
 
 
     <string name="search_button">Chirca</string>
@@ -1470,7 +1470,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
     <string name="context_menu_item_update_map">Agiorna sa mapa</string>
     
     <string name="context_menu_item_create_poi">Crea PDI</string>
-    <string name="shared_string_cancel">Iscantzella</string>
+    <string name="shared_string_cancel">Annulla</string>
     <string name="shared_string_apply">Àplica</string>
     <string name="shared_string_add">Annanghe</string>
     <string name="add_favorite_dialog_top_text">Inserta su nùmene de su preferidu</string>
@@ -1610,7 +1610,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
     <string name="search_for">Chirca pro</string>
 
     <string name="shared_string_show_all">AMMUSTRA TOTU</string>
-    <string name="coordinates">Coordinatas</string>
+    <string name="coordinates">Coordinadas</string>
     <string name="map_update">Podes agiornare %1$s mapas</string>
     <string name="error_avoid_specific_road">No est istada agatada peruna tangentziale</string>
     <string name="everything_up_to_date">Totu agiornadu</string>
@@ -1765,7 +1765,7 @@ Lon %2$s</string>
     <string name="welmode_download_maps">Iscàrriga mapas</string>
     <string name="welcome_select_region">Pro ammustrare mègius sos cartellos e sas restritziones locales tuas, pro praghere ischerta sa regione tua:</string>
     <string name="welcome_text">OsmAnd frunit e ti cunsentit de impreare mapas globales e nàvigu chene lìnia.</string>
-    <string name="welcome_header">Benènnidu</string>
+    <string name="welcome_header">Bene bènnidu</string>
     <string name="current_route">Àndala atuale</string>
     <string name="mark_to_delete">Marca pro iscantzellare</string>
     <string name="confirm_usage_speed_cameras">In medas istados (Germània, Frantza, Itàlia, e àteros) s’impreu de avisos pro sos autovelox est illegale. OsmAnd non s’at a pigare responsabilidades s’in casu tue as a violare sa lege. Pro praghere incarca \'Eja\' petzi si podes impreare custa funtzionalidade.</string>
@@ -1942,12 +1942,12 @@ Lon %2$s</string>
     <string name="default_speed_system">Unidade de sa lestresa</string>
     <string name="nm">nmi</string>
     <string name="si_nm">Mìglios nàuticos</string>
-    <string name="si_kmh">Chilòmetros pro ora</string>
-    <string name="si_mph">Mìglios pro ora</string>
-    <string name="si_m_s">Metros pro segundu</string>
-    <string name="si_min_km">Minutos pro chilòmetru</string>
-    <string name="si_min_m">Minutos pro mìgliu</string>
-    <string name="si_nm_h">Mìglios nàuticos pro ora (knots)</string>
+    <string name="si_kmh">Chilòmetros a s\'ora</string>
+    <string name="si_mph">Mìglios a s\'ora</string>
+    <string name="si_m_s">Metros a su segundu</string>
+    <string name="si_min_km">Minutos a su chilòmetru</string>
+    <string name="si_min_m">Minutos a su mìgliu</string>
+    <string name="si_nm_h">Mìglios nàuticos a s\'ora (knots)</string>
     <string name="nm_h">nodos</string>
     <string name="min_mile">min/m</string>
     <string name="min_km">min/km</string>
@@ -2072,7 +2072,7 @@ Lon %2$s</string>
 	<string name="routing_attr_avoid_stairs_description">Istransi sas iscalas</string>
 	<string name="routing_attr_avoid_borders_name">Istransi sa rugradura de sas fronteras</string>
 	<string name="shared_string_near">A curtzu</string>
-    <string name="shared_string_hide">Cua</string>
+    <string name="shared_string_hide">Istichi</string>
     <string name="av_video_quality_low">Calidade prus bassa</string>
     <string name="av_video_quality_high">Calidade prus arta</string>
     <string name="av_video_quality">Calidade de su vìdeo</string>
@@ -2264,8 +2264,8 @@ Lon %2$s</string>
     <string name="lang_ast">Asturianu</string>
     <string name="app_mode_bus">Postale</string>
  	<string name="app_mode_train">Trenu</string>
-    <string name="coords_format">Formatu de sas coordinatas</string>
-    <string name="coords_format_descr">Formatu de sas coordinatas geogràficas.</string>
+    <string name="coords_format">Formatu de sas coordinadas</string>
+    <string name="coords_format_descr">Formatu de sas coordinadas geogràficas.</string>
   	<string name="storage_directory_card">Ischeda de memòria</string>
     <string name="shared_string_is_open_24_7">Abertu 24/7</string>
     <string name="postcode">Còdighe postale</string>
@@ -2281,8 +2281,8 @@ Lon %2$s</string>
     <string name="dist_away_from_my_location">Chirca a %1$s dae inoghe</string>
     <string name="back_to_search">Torra a sa chirca</string>
     <string name="confirmation_to_delete_history_items">Iscantzellare sos elementos ischertados de s\'istòria?</string>
-    <string name="coords_search">Chirca cun coordinatas</string>
-    <string name="advanced_coords_search">Chirca avantzada cun coordinatas</string>
+    <string name="coords_search">Chirca cun coordinadas</string>
+    <string name="advanced_coords_search">Chirca avantzada cun coordinadas</string>
     
     <string name="route_stops_before">%1$s firmadas in antis</string>
     <string name="routing_attr_short_way_name">Àndala prus de atòliu pro sos consumos</string>
@@ -2539,7 +2539,7 @@ Pro praghere iscrie su còdighe intreu</string>
 \n• Pro fàghere su biàgiu tuo prus seguru, sa modalidade die e sa modalidade note cambiant automaticamente sighinde s\'ora 
 \n• Ammustra sos lìmites de lestresa, e retzi avisos si los ses barighende 
 \n• S\'ismanniamentu mapa s\'adatat a sa lestresa tua 
-\n• Chirca destinatziones impreende s\'indiritzu, sa casta (es.: parchègiu, ristorante, albergu, istatzione de servìtziu, museu), o cun sas coordinatas geogràficas 
+\n• Chirca destinatziones impreende s\'indiritzu, sa casta (es.: parchègiu, ristorante, albergu, istatzione de servìtziu, museu), o cun sas coordinadas geogràficas 
 \n• Suportat puntos de coladòrgiu in s\'àndala tua 
 \n• Registra o càrriga e sighi una rasta GPX</string>
     <string name="osmand_extended_description_part3">Mapa 
@@ -2594,7 +2594,7 @@ Pro praghere iscrie su còdighe intreu</string>
 \n• Indicadore de corsia, nùmene de sas carreras e su tempus istimadu de arrivu 
 \n• Suportat puntos de coladòrgiu in s\'àndala tua 
 \n• S\'àndala benit torrada a èssere calculada cada borta chi b\'essis a foras 
-\n• Chirca destinatzione impreende s\'indiritzu, sa casta (es.: parchègiu, ristorante, albergu, istatzione de servìtziu, museu), o cun sas coordinatas geogràficas</string>
+\n• Chirca destinatzione impreende s\'indiritzu, sa casta (es.: parchègiu, ristorante, albergu, istatzione de servìtziu, museu), o cun sas coordinadas geogràficas</string>
     <string name="osmand_plus_extended_description_part3">Visualizatzione mapa 
 \n• Ammustra sa positzione e sa diretzione tua 
 \n• Alliniamentu optzionale de sa mapa regoladu sighinde sa diretzione o sa bùssola 
@@ -2735,7 +2735,7 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="mapillary_menu_edit_text_hint">Iscrie su nùmene de s\'impreadore</string>
     <string name="mapillary_menu_descr_username">Ammustra petzi sas immàgines annantas dae su</string>
     <string name="mapillary_menu_title_username">Nùmene impreadore</string>
-    <string name="mapillary_menu_filter_description">Filtra sas immàgines pro impreadore o data. Sos filtros s\'aplicant petzi a pustis de ismanniamentu.</string>
+    <string name="mapillary_menu_filter_description">Filtra sas immàgines pro impreadore, data o casta. Sos filtros s\'aplicant petzi a pustis de ismanniamentu.</string>
     <string name="shared_string_reset">Reimposta</string>
     <string name="store_tracks_in_monthly_directories">Sarva sas rastas registradas in cartellas diferentes pro cada mese</string>
     <string name="store_tracks_in_monthly_directories_descrp">Sarva sas rastas registradas in suta-cartellas diferentes pro mese de registratzione (es. 2018-01).</string>
@@ -2826,10 +2826,10 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="show_passed">Ammustra sos colados</string>
     <string name="hide_passed">Istichi sos colados</string>
     <string name="shared_string_markers">Marcadores</string>
-    <string name="coordinates_format">Formadu de sas coordinatas</string>
+    <string name="coordinates_format">Formadu de sas coordinadas</string>
     <string name="use_system_keyboard">Imprea su tecladu de sistema</string>
-    <string name="fast_coordinates_input_descr">Issèbera su formadu de sas coordinatas. L\'as a pòdere semper cambiare dae sas \'Optziones\'.</string>
-    <string name="fast_coordinates_input">Insertada lestra de sas coordinatas</string>
+    <string name="fast_coordinates_input_descr">Issèbera su formadu de sas coordinadas. L\'as a pòdere semper cambiare dae sas \'Optziones\'.</string>
+    <string name="fast_coordinates_input">Insertada lestra de sas coordinadas</string>
     <string name="routing_attr_avoid_ice_roads_fords_name">Istransi sas istradas de astra, sos bados</string>
     <string name="routing_attr_avoid_ice_roads_fords_description">Istransi sas istradas de astra e sos bados.</string>
     <string name="use_location">Imprea positzione</string>
@@ -2838,7 +2838,7 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="shared_string_finish">Acabba·la</string>
     <string name="plan_route">Pranìfica àndala</string>
     <string name="shared_string_sort">Òrdina</string>
-    <string name="coordinate_input">Insertada de sas coordinatas</string>
+    <string name="coordinate_input">Insertada de sas coordinadas</string>
     <string name="is_saved">est istadu sarvadu</string>
     <string name="marker_save_as_track_descr">Esporta sos marcadores tuos in custu documentu GPX:</string>
     <string name="marker_save_as_track">Sarva comente documentu GPX</string>
@@ -2914,13 +2914,13 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="by_date">Pro data</string>
     <string name="by_type">Pro casta</string>
     <string name="modify_the_search_query">Modìfica sa rechesta de chirca.</string>
-    <string name="release_3_0">• Nou: suportu pro ghias globales de biàgiu non in lìnia. Sos logos numenados sunt ligados a sa mapa. Datos initziales dae WikiVoyage.
+    <string name="release_3_0">• Nou: suportu pro ghias globales de biàgiu non in lìnia. Sos logos numenados sunt ligados a sa mapa. Datos initziales dae WikiVoyage. 
 \n 
 \n • Wikipedia: aspetu nou, ligàmenes ativos, immàgines 
 \n 
 \n • Interfache pro abèrrere sas rastas: ammustra sos puntos de coladòrgiu 
 \n 
-\n • Marcadores mapa: importatzione de grupos ischertados dae documentos GPX, aspetu noude s\'insertada de sas coordinatas 
+\n • Marcadores mapa: importatzione de grupos ischertados dae documentos GPX, aspetu noude s\'insertada de sas coordinadas 
 \n 
 \n • S\'abbonamentu a OsmAnd Live como incluet totu sas funtzionalidades de OsmAnd 
 \n 
@@ -2938,8 +2938,8 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="will_open_at">Aberit a sas</string>
     <string name="will_open_on">Aberit a sas</string>
     <string name="additional_actions">Atziones additzionales</string>
-    <string name="av_locations_selected_desc">Documentu GPX cun coordinatas e datos de sas notas ichertadas.</string>
-    <string name="av_locations_all_desc">Documentu GPX cun coordinatas e datos de totu sas notas.</string>
+    <string name="av_locations_selected_desc">Documentu GPX cun coordinadas e datos de sas notas ichertadas.</string>
+    <string name="av_locations_all_desc">Documentu GPX cun coordinadas e datos de totu sas notas.</string>
     <string name="shared_string_actions">Atziones</string>
     <string name="shared_string_marker">Marcadore</string>
     <string name="osm_recipient_stat">Modìficas %1$s, sum %2$s mBTC</string>
@@ -3150,11 +3150,60 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="rendering_value_black_name">Nieddu</string>
     <string name="more_transport_on_stop_hint">In custa firmada bi sunt àteros mesos de trasportu.</string>
     <string name="search_street">Chirca una carrera</string>
-    <string name="start_search_from_city">Incumintza sa chirca dae sa tzitade</string>
+    <string name="start_search_from_city">In antis issèbera sa tzitade</string>
     <string name="shared_string_restore">Riprìstina</string>
     <string name="keep_passed_markers_descr">Sos marcadores annantos comente grupu de Preferidos e sos puntos de coladòrgiu GPX sinnados comente colados ant a abarrare in sa mapa. Si su grupu no est ativu, sos marcadores ant a isparèssere dae sa mapa.</string>
     <string name="keep_passed_markers">Mantene sos marcadores colados in sa mapa</string>
     <string name="markers_remove_dialog_msg">Iscantzellare su marcadore mapa \'%s\'\?</string>
     <string name="edit_map_marker">Modìfica su marcadore mapa</string>
     <string name="third_party_application">Aplicatzione de tertza parte</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Pianos e tarifas</string>
+    <string name="osm_live_payment_monthly_title">Paga cada mese</string>
+    <string name="osm_live_payment_3_months_title">Paga cada 3 meses</string>
+    <string name="osm_live_payment_annual_title">Paga una borta a s\'annu</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mese</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mese</string>
+    <string name="osm_live_payment_discount_descr">Rispàrmia %1$s!</string>
+	<string name="osm_live_payment_current_subscription">S\'abbonamentu atuale tuo</string>
+    <string name="osm_live_payment_renews_monthly">Si rinnovat cada mese</string>
+    <string name="osm_live_payment_renews_quarterly">Si rinnovat cada tres meses</string>
+    <string name="osm_live_payment_renews_annually">Si rinnovat cada annu</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Issèbera sa manera de pagamentu prus discansosa pro tie:</string>
+    <string name="osm_live_payment_contribute_descr">Una parte de su balàngiu andat a sos contribuidores de OpenStreetMap.</string>
+    <string name="powered_by_osmand">Suportadu dae OsmAnd</string>
+    <string name="osm_live_subscriptions">Abbonamentos</string>
+    <string name="mapillary_menu_title_pano">Ammustra petzi immàgines a 360°</string>
+    <string name="shared_string_launch">Allughe</string>
+    <string name="run_full_osmand_msg">Ses impreende sa mapa {0} chi est frunida dae OsmAnd. Cheres allùghere sa versione intrea de OsmAnd\?</string>
+    <string name="run_full_osmand_header">Cheres allùghere OsmAnd\?</string>
+    <string name="lang_gn_py">Guaraní</string>
+    <string name="quick_action_switch_day_night_descr">Incarcare custu butone faghet colare intre sas modalidade pro sa die e pro sa note de OsmAnd</string>
+    <string name="quick_action_switch_day_mode">Modalidade pro sa die</string>
+    <string name="quick_action_switch_night_mode">Modalidade pro sa note</string>
+    <string name="quick_action_day_night_switch_mode">Cola intre Die/Note</string>
+    <string name="add_destination_point">Annanghe una destinatzione</string>
+    <string name="waypoints">Puntos de coladòrgiu: %1$s</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Capatzidade</string>
+    <string name="shared_string_width">Largària</string>
+    <string name="shared_string_height">Artària</string>
+    <string name="swap_start_and_destination">Cuncàmbia sa partèntzia e sa destinatzione</string>
+    <string name="add_intermediate_point">Annanghe unu puntu de coladòrgiu</string>
+    <string name="add_start_point">Annanghe unu puntu de incumintzu</string>
+    <string name="intermediate_waypoint">Puntu de coladòrgiu: %1$s</string>
+    <string name="transfers">tramudadas: %1$s</string>
+    <string name="on_foot">a pede: %1$s</string>
+    <string name="route_way">Modalidade: %1$s</string>
+    <string name="points_of_interests">Puntos de interesse (PDI)</string>
+    <string name="waiting_for_route_calculation">Isetende pro su càlculu de s\'àndala</string>
+    <string name="app_mode_public_transport">Trasportu pùblicu</string>
+    <string name="avoid_roads_descr">Ischerta su caminu chi cheres istransire durante su nàvigu in sa mapa o dae sa lista inoghe in suta:</string>
+    <string name="show_along_the_route">Ammustra in s\'àndala</string>
+    <string name="simulate_navigation">Sìmula su nàvigu</string>
+    <string name="choose_track_file_to_follow">Ischerta unu documentu de rasta de sighire</string>
+    <string name="voice_announcements">Annùntzios vocales</string>
+    <string name="intermediate_destinations">Destinatziones intermèdias: %1$s</string>
+    <string name="arrive_at_time">Arribada a sas %1$s</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index b3c5d8e95a..eb31520b1a 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_shop">Obchod</string>
 	<string name="poi_emergency">Núdzová situácia/Záchrana</string>
 	<string name="poi_transportation">Doprava</string>
@@ -159,7 +159,7 @@
 	<string name="poi_halt">Železničná zastávka</string>
 	<string name="poi_bus_station">Autobusová stanica</string>
 	<string name="poi_subway_entrance">Vchod do metra</string>
-	<string name="poi_subway_station">Stanica metra</string>
+	<string name="poi_subway_station">Áno</string>
 	<string name="poi_railway_buffer_stop">Železničná zarážka</string>
 	<string name="poi_taxi">Stanovište taxíkov</string>
 
@@ -957,7 +957,7 @@
 	<string name="poi_recycling_plastic_bags">Plastové tašky</string>
 	<string name="poi_recycling_hazardous_waste">Nebezpečný odpad</string>
 	<string name="poi_recycling_mobile_phones">Mobily</string>
-	<string name="poi_recycling_hydrargyrum">Hydrargyrum</string>
+	<string name="poi_recycling_hydrargyrum">Ortuť</string>
 	<string name="poi_recycling_computers">Počítače</string>
 	<string name="poi_recycling_tyres">Pneumatiky</string>
 	<string name="poi_recycling_tv_monitor">Obrazovky</string>
@@ -988,7 +988,7 @@
 	<string name="poi_recycling_bicycles">Bicykle</string>
 
 	<string name="poi_monitoring_station">Meracia stanica</string>
-	<string name="poi_capital">Hlavné mesto</string>
+	<string name="poi_capital">Áno</string>
 	<string name="poi_shower">Sprcha</string>
 	<string name="poi_animal_shelter_bird">Vtáky</string>
 
@@ -1564,7 +1564,7 @@
 	<string name="poi_drive_through_no">Prejazd autom: nie</string>
 
 	<string name="poi_brewery_additional">Názov pivovaru</string>
-	<string name="poi_microbrewery_yes">Minipivovar</string>
+	<string name="poi_microbrewery_yes">Áno</string>
 	<string name="poi_microbrewery_no">Žiadny minipivovar</string>
 
 	<string name="poi_takeaway_yes">Jedlo so sebou</string>
@@ -3024,7 +3024,7 @@
 	<string name="poi_cuisine_crepe">Palacinky</string>
 	<string name="poi_cuisine_breakfast">Raňajky</string>
 	<string name="poi_cuisine_beef_bowl">Gyudon</string>
-	<string name="poi_cuisine_steak">Steak</string>
+	<string name="poi_cuisine_steak">Stejk</string>
 	<string name="poi_cuisine_tapas">Tapas</string>
 	<string name="poi_cuisine_gastropub">Gastrokrčma</string>
 	<string name="poi_cuisine_heuriger">Heuriger</string>
@@ -3546,4 +3546,78 @@
 	<string name="poi_hazard_minefield">Mínové pole</string>
 
 
-</resources>
+<string name="poi_bulk_purchase">Množstevný predaj</string>
+	<string name="poi_substation_type">Typ</string>
+
+<string name="poi_climbing_orientation_n">Smerovanie steny: S</string>
+	<string name="poi_climbing_orientation_ne">Smerovanie steny: SV</string>
+	<string name="poi_climbing_orientation_e">Smerovanie steny: V</string>
+	<string name="poi_climbing_orientation_se">Smerovanie steny: JV</string>
+	<string name="poi_climbing_orientation_s">Smerovanie steny: J</string>
+	<string name="poi_climbing_orientation_sw">Smerovanie steny: JZ</string>
+	<string name="poi_climbing_orientation_w">Smerovanie steny: Z</string>
+	<string name="poi_climbing_orientation_nw">Smerovanie steny: SZ</string>
+	<string name="poi_socket_chademo_yes">CHAdeMO</string>
+	<string name="poi_socket_tesla_standard_yes">Tesla štandard</string>
+	<string name="poi_socket_tesla_supercharger_yes">Tesla Supercharger</string>
+	<string name="poi_socket_tesla_roadster_yes">Tesla Roadster</string>
+	<string name="poi_socket_nema_5_15_yes">NEMA 5-15R</string>
+	<string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
+	<string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
+	<string name="poi_socket_nema_14_50_yes">NEMA 14-50</string>
+	<string name="poi_outpost">Výdajňa tovaru</string>
+
+	<string name="poi_rock">Skala</string>
+
+	<string name="poi_end_date">Dátum ukončenia</string>
+
+	<string name="poi_ruins">Ruiny</string>
+
+	<string name="poi_hill">Pahorok</string>
+
+	<string name="poi_shoe_repair">Oprava obuvi</string>
+
+	<string name="poi_bulk_purchase_yes">Áno</string>
+	<string name="poi_bulk_purchase_only">Výhradne</string>
+    <string name="poi_books_type">Knihy</string>
+    <string name="poi_craft_confectionery">Výroba sladkostí</string>
+    <string name="poi_shop_wholesale">Veľkoobchod</string>
+    <string name="poi_laboratory">Zdravotnícke laboratórium</string>
+    <string name="poi_blood_donation">Darovanie krvi</string>
+    <string name="poi_books_comic">Komiksy</string>
+    <string name="poi_books_antiquarian">Starožitné</string>
+    <string name="poi_books_religion">Náboženské</string>
+    <string name="poi_books_academic">Odborné</string>
+    <string name="poi_books_children">Detské</string>
+    <string name="poi_atoll">Atol</string>
+    <string name="poi_childcare">Starostlivosť o deti</string>
+    <string name="poi_denotation_natural_monument">Prírodný monument</string>
+    <string name="poi_denotation">Výbuch</string>
+    <string name="poi_car_pooling">Miesto na spolujazdu autom</string>
+    <string name="poi_atm">Bankomat</string>
+    <string name="poi_pile">Hromada</string>
+    <string name="poi_seamark_clearance_height">Povolená výška</string>
+    <string name="poi_seamark_clearance_height_closed">Povolená výška (zatvorené)</string>
+    <string name="poi_seamark_clearance_height_open">Povolená výška (otvorené)</string>
+    <string name="poi_seamark_clearance_width">Povolená šírka</string>
+    <string name="poi_kent_carriage_gap">Bariéra pre vozy</string>
+    <string name="poi_health_specialty_acupuncture_yes">Akupunktúra</string>
+    <string name="poi_health_specialty_homeopathy_yes">Homeopatia</string>
+    <string name="poi_health_specialty_traditional_chinese_medicine_yes">Tradičná čínska medicína</string>
+    <string name="poi_health_specialty_reiki_yes">Reiki</string>
+    <string name="poi_health_specialty_herbalism_yes">Bylinkárstvo</string>
+    <string name="poi_bicycle_parking_tree">\"Strom\" na bicykle</string>
+    <string name="poi_tower_construction_lattice">Konštrukcia: mriežka</string>
+    <string name="poi_tower_construction_freestanding">Konštrukcia: voľne stojaca</string>
+    <string name="poi_tower_construction_dish">Konštrukcia: Parabola</string>
+    <string name="poi_tower_construction_dome">Konštrukcia: kupola</string>
+    <string name="poi_tower_construction_concealed">Konštrukcia: Skrytá/maskovaná</string>
+    <string name="poi_gorge">Tiesňava</string>
+    <string name="poi_mountain_area">Horská oblasť</string>
+    <string name="poi_surface_tartan">Tartan</string>
+    <string name="poi_agrarian">Poľnohospodárske potreby</string>
+    <string name="poi_service_vehicle_muffler_yes">Tlmiče zvuku</string>
+    <string name="poi_service_vehicle_alignment_yes">Geometria kolies</string>
+    <string name="poi_outcrop">Odkryté geologické vrstvy</string>
+    <string name="poi_license_classes">Skupiny vodičského oprávnenia</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index a49f0c24b9..fbe0787984 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="recording_context_menu_show">Zobraziť</string>
@@ -2595,7 +2595,7 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="mapillary_menu_edit_text_hint">Zadajte meno používateľa</string>
     <string name="mapillary_menu_descr_username">Zobraziť iba obrázky pridané</string>
     <string name="mapillary_menu_title_username">Meno používateľa</string>
-    <string name="mapillary_menu_filter_description">Filtrovať obrázky podľa odosielateľa alebo dátumu. Aktívne len pri vysokom priblížení.</string>
+    <string name="mapillary_menu_filter_description">Filtrovať obrázky podľa odosielateľa, dátumu alebo typu. Aktívne len pri vysokom priblížení.</string>
     <string name="store_tracks_in_monthly_directories">Ukladať zaznamenané stopy v priečinkoch po mesiacoch</string>
     <string name="store_tracks_in_monthly_directories_descrp">Ukladať zaznamenané stopy v podpriečinkoch podľa mesiaca záznamu (ako 2018-01).</string>
     <string name="average">Priemer</string>
@@ -3008,11 +3008,60 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="rendering_value_black_name">Čierna</string>
     <string name="more_transport_on_stop_hint">Na tejto zastávke je ešte ďalšia doprava.</string>
     <string name="search_street">Hľadať ulicu</string>
-    <string name="start_search_from_city">Začať hľadanie z mesta</string>
+    <string name="start_search_from_city">Najprv zvoľte mesto</string>
     <string name="shared_string_restore">Obnoviť</string>
     <string name="keep_passed_markers_descr">Značky pridané ako skupina Obľúbených alebo bodov GPX, označené ako Prejdené, zostanú na mape. Ak skupina nie je aktívna, značky zmiznú z mapy.</string>
     <string name="keep_passed_markers">Ponechať prejdené značky na mape</string>
     <string name="markers_remove_dialog_msg">Odstrániť mapovú značku \'%s\'\?</string>
     <string name="edit_map_marker">Upraviť mapovú značku</string>
     <string name="third_party_application">Aplikácia tretej strany</string>
-    </resources>
+    <string name="osm_live_plan_pricing">Predplatné &amp; Cenník</string>
+    <string name="osm_live_payment_monthly_title">Platiť mesačne</string>
+    <string name="osm_live_payment_3_months_title">Platiť štvrťročne</string>
+    <string name="osm_live_payment_annual_title">Platiť ročne</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mesiac</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mesiac</string>
+    <string name="osm_live_payment_discount_descr">Ušetríte %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Vaše aktuálne predplatné</string>
+    <string name="osm_live_payment_renews_monthly">Obnovuje sa mesačne</string>
+    <string name="osm_live_payment_renews_quarterly">Obnovuje sa štvrťročne</string>
+    <string name="osm_live_payment_renews_annually">Obnovuje sa ročne</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Zvoľte frekvenciu platieb, ktorá vám vyhovuje:</string>
+    <string name="osm_live_payment_contribute_descr">Časť príjmov je zasielaná prispievateľom do OpenStreetMap.</string>
+    <string name="osm_live_subscriptions">Predplatné</string>
+    <string name="mapillary_menu_title_pano">Zobraziť iba 360° obrázky</string>
+    <string name="powered_by_osmand">Beží na OsmAnd</string>
+    <string name="shared_string_launch">Spustiť</string>
+    <string name="run_full_osmand_msg">Používate mapu {0}, ktorá beží na aplikácii OsmAnd. Chcete spustiť plnú verziu OsmAnd\?</string>
+    <string name="run_full_osmand_header">Spustiť OsmAnd\?</string>
+    <string name="lang_gn_py">Guaraníjsky (Guaraní)</string>
+    <string name="quick_action_switch_day_night_descr">Aktivovaním tohto tlačidla sa prepne denný a nočný režim v OsmAnd</string>
+    <string name="quick_action_switch_day_mode">Denný režim</string>
+    <string name="quick_action_switch_night_mode">Nočný režim</string>
+    <string name="quick_action_day_night_switch_mode">Prepnúť Denný/Nočný režim</string>
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Kapacita</string>
+    <string name="shared_string_width">Šírka</string>
+    <string name="shared_string_height">Výška</string>
+    <string name="swap_start_and_destination">Vymeniť štart a cieľ</string>
+    <string name="add_destination_point">Pridať cieľ</string>
+    <string name="add_intermediate_point">Pridať medzicieľ</string>
+    <string name="add_start_point">Pridať štartovací bod</string>
+    <string name="intermediate_waypoint">Prechodný bod: %1$s</string>
+    <string name="waypoints">Body na ceste: %1$s</string>
+    <string name="transfers">prestupy: %1$s</string>
+    <string name="on_foot">peši: %1$s</string>
+    <string name="route_way">Cesta: %1$s</string>
+    <string name="points_of_interests">Body záujmu (POI)</string>
+    <string name="waiting_for_route_calculation">Čakám na výpočet trasy</string>
+    <string name="app_mode_public_transport">Verejná doprava</string>
+    <string name="avoid_roads_descr">Zvoľte cestu na mape alebo zo zoznamu dole, ktorej sa chcete počas navigácie vyhnúť:</string>
+    <string name="show_along_the_route">Zobraziť pozdĺž trasy</string>
+    <string name="simulate_navigation">Simulovať navigáciu</string>
+    <string name="choose_track_file_to_follow">Zvoľte súbor trasy, ktorú chcete nasledovať</string>
+    <string name="voice_announcements">Hlasové oznámenia</string>
+    <string name="intermediate_destinations">Medziciele: %1$s</string>
+    <string name="arrive_at_time">Príjazd o %1$s</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sl/phrases.xml b/OsmAnd/res/values-sl/phrases.xml
index e14a7e3592..92e4aad986 100644
--- a/OsmAnd/res/values-sl/phrases.xml
+++ b/OsmAnd/res/values-sl/phrases.xml
@@ -20,10 +20,10 @@
 	<string name="poi_education">Izobraževalne ustanove</string>
 	<string name="poi_butcher">Mesnica</string>
 	<string name="poi_deli">Delikatesa</string>
-	<string name="poi_transportation">Prevozi</string>
+	<string name="poi_transportation">Transport</string>
 		<string name="poi_road_obstacle">Ovire na cesti</string>
-		<string name="poi_filling_station">Bencinski servis</string>
-		<string name="poi_shop_food">Trgovina z živili</string>
+		<string name="poi_filling_station">Bencinski servisi</string>
+		<string name="poi_shop_food">Trgovine z živili</string>
 	<string name="poi_personal_transport">Zasebni prevozi</string>
 		<string name="poi_public_transport">Javni prevozi</string>
 		<string name="poi_air_transport">Letališča</string>
@@ -72,7 +72,7 @@
 	<string name="poi_mountain_pass">Gorski prelaz</string>
 	<string name="poi_city_wall">Mestno obzidje</string>
 	<string name="poi_car_wash">Avtopralnica</string>
-	<string name="poi_fuel">Bencinski servis</string>
+	<string name="poi_fuel">Bencinski servis;Polnilna postaja;Petrol;Bencinska črpalka;Bencinska pumpa</string>
 	<string name="poi_garages">Garaže</string>
 
 	<string name="poi_public_transport_platform_bus">Avtobusno postajališče</string>
@@ -146,7 +146,7 @@
 	<string name="poi_theatre_genre_circus">Cirkus</string>
 	<string name="poi_gallery">Galerija</string>
 	<string name="poi_dance_floor">Plesna dvorana</string>
-	<string name="poi_nightclub">Nočni klub</string>
+	<string name="poi_nightclub">Nočni klub;Disco;Disko;Dancing</string>
 	<string name="poi_harbour">Pristanišče</string>
 	<string name="poi_playground">Igrišče</string>
 	<string name="poi_restaurant">Restavracija</string>
@@ -211,7 +211,7 @@
 	<string name="poi_military_danger_area">Nevarno območje</string>
 	<string name="poi_military_naval_base">Vojaška pomorska baza</string>
 	<string name="poi_aerialway_station">Pogonska žičniška postaja</string>
-	<string name="poi_traffic_calming_table">Ležeče ovire</string>
+	<string name="poi_traffic_calming_table"/>
 	<string name="poi_picnic_site">Urejen prostor za izletnike</string>
 	<string name="poi_piste_sleigh">Sankaška steza</string>
 	<string name="poi_trail_riding_station">Jahaško počivališče</string>
@@ -432,7 +432,7 @@
 	<string name="poi_fire_hydrant_position">Položaj</string>
 	<string name="poi_parking_type">Vrsta</string>
 	<string name="poi_electricity_combined_charging">Polnilna postaja</string>
-	<string name="poi_charging_station_filter">Polnilna postaja</string>
+	<string name="poi_charging_station_filter">Polnilne postaje</string>
 
 	<string name="poi_tactile_paving">Taktilni tlak</string>
 	<string name="poi_service_general">Storitev</string>
@@ -457,4 +457,281 @@
 	<string name="poi_fee">Plačilo</string>
 	<string name="poi_smoking">Kajenje</string>
 	<string name="poi_delivery">Dostava</string>
+	<string name="poi_brushless">Brezkrtačna</string>
+	<string name="poi_subway_station_filter">Postaja podzemne železnice</string>
+	<string name="poi_aerialway_bicycle">Transport koles</string>
+	<string name="poi_observatory_designation">Uradna označba</string>
+	<string name="poi_pharmacy_dispensing">Izdaja zdravila na recept</string>
+	<string name="poi_free_flying_characteristics">Značilnosti</string>
+	<string name="poi_denomination">Denominacija</string>
+	<string name="poi_scout_camp">Taborniški kamp</string>
+	<string name="poi_resort_type">Vrsta</string>
+	<string name="poi_piste_difficulty">Zahtevnost proge</string>
+	<string name="poi_piste_grooming">Teptanje smučarskih prog</string>
+	<string name="poi_theatre_genre">Zvrst</string>
+	<string name="poi_outdoor_seating">Zunanji vrt</string>
+	<string name="poi_drive_in">Drive-in</string>
+	<string name="poi_cocktails">Koktajli</string>
+	<string name="poi_microbrewery">Mikropivovarna</string>
+	<string name="poi_beauty_salon_service">Storitev</string>
+	<string name="poi_recycling_type">Vrsta</string>
+	<string name="poi_recycling_accepted_waste">Sprejemanje odpadkov</string>
+	<string name="poi_shelter_type">Vrsta</string>
+	<string name="poi_fireplace">Ognjišče</string>
+	<string name="poi_seasonal">Sezonsko</string>
+	<string name="poi_water_characteristic">Značilnosti vode</string>
+	<string name="poi_beach_surface_type">Površina</string>
+	<string name="poi_nudism">Nudizem</string>
+	<string name="poi_massage_type">Vrsta masaže</string>
+	<string name="poi_tents">Šotorišče</string>
+	<string name="poi_washing_machine">Pralnica</string>
+	<string name="poi_caravans">Prikolice</string>
+	<string name="poi_payment_transport_type">Vrsta plačila (transport)</string>
+	<string name="poi_social_facility_type">Vrsta</string>
+	<string name="poi_social_facility_for">Ciljna skupina</string>
+	<string name="poi_vacuum_cleaner_filter">Vakumski sesalci</string>
+	<string name="poi_free_flying_characteristic">Značilnosti</string>
+	<string name="poi_cafeteria">Samopostrežna restavracija</string>
+	<string name="poi_zoo_type">Vrsta</string>
+	<string name="poi_motorcycle_services">Storitve</string>
+	<string name="poi_animal_shelter_purpose">Namen</string>
+	<string name="poi_boat_rental_type">Najeti čolni</string>
+	<string name="poi_climbing_style">Slog plezanja</string>
+	<string name="poi_glacier_type">Vrsta ledenika</string>
+	<string name="poi_substation_type">Vrsta</string>
+
+<string name="poi_doors">Vrata</string>
+	<string name="poi_recycling_glass">Steklo</string>
+	<string name="poi_recycling_paper">Papir</string>
+	<string name="poi_recycling_clothes">Obleke</string>
+	<string name="poi_recycling_cans">Pločevinke</string>
+	<string name="poi_recycling_glass_bottles">Steklenice</string>
+	<string name="poi_recycling_plastic">Plastika</string>
+	<string name="poi_recycling_scrap_metal">Odpadne kovine</string>
+	<string name="poi_recycling_batteries">Baterije</string>
+	<string name="poi_recycling_plastic_bottles">Plastenke</string>
+	<string name="poi_recycling_green_waste">Rastlinski odpadki</string>
+	<string name="poi_recycling_waste">Drugi odpadki (črne vreče)</string>
+	<string name="poi_recycling_plastic_packaging">Plastična embalaža</string>
+	<string name="poi_recycling_newspaper">Časopisi</string>
+	<string name="poi_recycling_cartons">Karton</string>
+	<string name="poi_recycling_cardboard">Lepenka</string>
+	<string name="poi_recycling_magazines">Revije</string>
+	<string name="poi_recycling_paper_packaging">Papirnata embalaža</string>
+	<string name="poi_recycling_small_appliances">Mali gospodinjski aparati</string>
+	<string name="poi_recycling_wood">Les</string>
+	<string name="poi_recycling_books">Knjige</string>
+	<string name="poi_recycling_shoes">Čevlji</string>
+	<string name="poi_recycling_aluminium">Aluminij</string>
+	<string name="poi_recycling_organic">Organski odpadki</string>
+	<string name="poi_recycling_beverage_cartons">Kartonska embalaža pijač</string>
+	<string name="poi_recycling_garden_waste">Vrtni odpadki</string>
+	<string name="poi_recycling_low_energy_bulbs">Varčne sijalke</string>
+	<string name="poi_recycling_fluorescent_tubes">Florescentne sijalke</string>
+	<string name="poi_recycling_metal">Kovine</string>
+	<string name="poi_recycling_electrical_items">Električni pripomočki</string>
+	<string name="poi_recycling_white_goods">Bela tehnika</string>
+	<string name="poi_recycling_cooking_oil">Kuhinjsko olje</string>
+	<string name="poi_recycling_engine_oil">Strojno olje</string>
+	<string name="poi_recycling_plastic_bags">Plastične vreče</string>
+	<string name="poi_recycling_hazardous_waste">Nevarni odpadki</string>
+	<string name="poi_recycling_mobile_phones">Mobilni telefoni</string>
+	<string name="poi_recycling_hydrargyrum">Živo srebro</string>
+	<string name="poi_recycling_computers">Računalniška oprema</string>
+	<string name="poi_recycling_tyres">Gume, pnevmatike</string>
+	<string name="poi_recycling_tv_monitor">TV, Zasloni</string>
+	<string name="poi_recycling_tetrapak">Tetrapak embalaža</string>
+	<string name="poi_recycling_rubble">Grušč</string>
+	<string name="poi_recycling_cds">Nosilci CD</string>
+	<string name="poi_recycling_waste_oil">Odpadno olje</string>
+	<string name="poi_recycling_bottles">Steklenice</string>
+	<string name="poi_recycling_cork">Plutovina</string>
+	<string name="poi_recycling_printer_cartridges">Tiskalniške kartuše</string>
+	<string name="poi_recycling_sheet_metal">Kovinske plošče</string>
+	<string name="poi_recycling_foil">Folija</string>
+	<string name="poi_recycling_paint">Barve</string>
+	<string name="poi_recycling_styrofoam">Stiropor</string>
+	<string name="poi_recycling_drugs">Zdravila</string>
+	<string name="poi_recycling_compost">Kompost</string>
+	<string name="poi_ski_resort">Smučarsko letovišče</string>
+	<string name="poi_beach_resort">Obmorsko letovišče</string>
+	<string name="poi_dog_park">Pasji park</string>
+	<string name="poi_hunting_stand">Lovska opazovalnica</string>
+	<string name="poi_marina">Marina</string>
+	<string name="poi_miniature_golf">Minigolf</string>
+	<string name="poi_swimming_pool">Plavalni bazen</string>
+	<string name="poi_water_park">Vodni park</string>
+	<string name="poi_park">Park</string>
+	<string name="poi_recreation_ground">Rekreacijsko igrišče</string>
+	<string name="poi_cafe">Kavarna</string>
+	<string name="poi_biergarten">Pivnica</string>
+	<string name="poi_fast_food">Hitra hrana</string>
+	<string name="poi_drinking_water">Pitna voda</string>
+	<string name="poi_barbecue">Žar</string>
+
+	<string name="poi_recycling_christmas_trees">Novoletna drevesca</string>
+	<string name="poi_recycling_light_bulbs">Žarnice</string>
+	<string name="poi_recycling_chipboard">Iverne plošče</string>
+	<string name="poi_recycling_polyester">Poliester</string>
+	<string name="poi_recycling_plasterboard">Mavčne plošče</string>
+	<string name="poi_recycling_animal_waste">Živalski odpadki</string>
+	<string name="poi_recycling_fridge_and_freezer">Hladilniki in zmrzovalniki</string>
+	<string name="poi_recycling_furniture">Pohištvo</string>
+	<string name="poi_recycling_diapers">Plenice</string>
+	<string name="poi_recycling_car_batteries">Avtomobilski akumulatorji</string>
+	<string name="poi_recycling_cars">Avtomobili</string>
+	<string name="poi_recycling_bicycles">Kolesa</string>
+
+	<string name="poi_landfill_waste_nuclear">Jedrski odpadki</string>
+	<string name="poi_surveillance">Nadzor</string>
+	<string name="poi_american_football">Ameriški nogomet</string>
+	<string name="poi_australian_football">Avstralski nogomet</string>
+	<string name="poi_baseball">Bejzbol</string>
+	<string name="poi_beachvolleyball">Odbojka na mivki</string>
+	<string name="poi_canadian_football">Kanadski nogomet</string>
+	<string name="poi_chess">Šah</string>
+	<string name="poi_climbing">Plezanje</string>
+	<string name="poi_cricket">Kriket</string>
+	<string name="poi_cycling">Kolesarjenje</string>
+	<string name="poi_diving">Potapljanje</string>
+	<string name="poi_scuba_diving">Potapljanje na dah</string>
+	<string name="poi_dog_racing">Pasje dirke</string>
+	<string name="poi_ice_hockey">Hokej na ledu</string>
+	<string name="poi_golf">Golf</string>
+	<string name="poi_gymnastics">Gimnastika</string>
+	<string name="poi_handball">Rokomet</string>
+	<string name="poi_hockey">Hokej</string>
+	<string name="poi_horse_racing">Konjske dirke</string>
+	<string name="poi_ice_skating">Drsanje na ledu</string>
+	<string name="poi_roller_skating">Rolanje</string>
+	<string name="poi_rowing">Veslanje</string>
+	<string name="poi_sailing">Jadranje</string>
+	<string name="poi_shooting">Streljanje</string>
+	<string name="poi_skating">Drsanje</string>
+	<string name="poi_skateboard">Rolkanje</string>
+	<string name="poi_skiing">Smučanje</string>
+	<string name="poi_soccer">Nogomet</string>
+	<string name="poi_swimming">Plavanje</string>
+	<string name="poi_table_tennis">Namizni tenis</string>
+	<string name="poi_tennis">Tenis</string>
+	<string name="poi_volleyball">Odbojka</string>
+
+	<string name="poi_craft_electrician">Električar</string>
+	<string name="poi_craft_gardener">Vrtnar</string>
+	<string name="poi_description">Opis</string>
+	<string name="poi_phone">Telefon</string>
+	<string name="poi_website">Spletna stran</string>
+	<string name="poi_email">Elektronski naslov</string>
+	<string name="poi_fax">Faks</string>
+	<string name="facebook">Facebook</string>
+	<string name="twitter">Twitter</string>
+	<string name="poi_skype">Skype</string>
+	<string name="poi_youtube">YouTube</string>
+	<string name="poi_instagram">Instagram</string>
+	<string name="vk">VKontakte</string>
+	<string name="poi_google_plus">Google+</string>
+	<string name="poi_service_times">Delovni čas</string>
+	<string name="poi_maxheight">Največja višina</string>
+	<string name="poi_maxweight">Največja teža</string>
+	<string name="poi_height">Višina</string>
+	<string name="poi_ele">Nadmorska višina</string>
+	<string name="poi_abandoned">Opuščeno</string>
+	<string name="poi_abandoned_poi">Opuščena zgradba</string>
+	<string name="poi_brand">Znamka</string>
+	<string name="poi_fee_yes">Da</string>
+	<string name="poi_fee_no">Ne</string>
+	<string name="poi_drinking_water_yes">Da</string>
+	<string name="poi_drinking_water_no">Ne</string>
+	<string name="poi_supervised_yes">Nadzorovano</string>
+	<string name="poi_supervised_no">Brez nadzora</string>
+	<string name="poi_seasonal_yes">Da</string>
+	<string name="poi_seasonal_no">Ne</string>
+	<string name="poi_bicycle_parking_building">Posebna zgradba</string>
+	<string name="poi_building">Zgradba</string>
+	<string name="poi_outdoor_seating_yes">Zunanji vrt: da</string>
+	<string name="poi_outdoor_seating_no">Brez zunanjega vrta</string>
+	<string name="poi_outdoor_seating_terrace">Zunanji vrt: terasa</string>
+	<string name="poi_outdoor_seating_sidewalk">Zunanji vrt: ob pločniku</string>
+	<string name="poi_outdoor_seating_pedestrian_zone">Zunanji vrt: na območju za pešče</string>
+	<string name="poi_outdoor_seating_garden">Zunanji vrt: večji vrt</string>
+	<string name="poi_outdoor_seating_patio">Zunanji vrt: tlakovan vrt</string>
+
+	<string name="poi_resource_clay">Glina</string>
+	<string name="poi_resource_coal">Premog</string>
+	<string name="poi_resource_copper">Baker</string>
+	<string name="poi_resource_diamond">Diamanti</string>
+	<string name="poi_resource_dolomite">Dolomit</string>
+	<string name="poi_resource_gas">Zemeljski plin</string>
+	<string name="poi_resource_gold">Zlato</string>
+	<string name="poi_resource_graphite">Grafit</string>
+	<string name="poi_resource_gypsum">Sadra</string>
+	<string name="poi_resource_iron_ore">Železova ruda</string>
+	<string name="poi_resource_lead">Svinec</string>
+	<string name="poi_resource_lignite">Lignit</string>
+	<string name="poi_resource_limestone">Apnenec</string>
+	<string name="poi_resource_marble">Marmor</string>
+	<string name="poi_resource_mercury">Živo srebro</string>
+	<string name="poi_resource_mica">Sljuda</string>
+	<string name="poi_resource_nickel">Nikelj</string>
+	<string name="poi_resource_opal">Opali</string>
+	<string name="poi_resource_peat">Šota</string>
+	<string name="poi_resource_platinum">Platina</string>
+	<string name="poi_resource_radium">Radij</string>
+	<string name="poi_resource_ruby">Rubini</string>
+	<string name="poi_resource_rutile">Rutil</string>
+	<string name="poi_resource_salt">Sol</string>
+	<string name="poi_resource_sand">Pesek</string>
+	<string name="poi_resource_sandstone">Peščenjak</string>
+	<string name="poi_resource_silica">Silicij</string>
+	<string name="poi_resource_silver">Srebro</string>
+	<string name="poi_resource_slate">Skrilavec</string>
+	<string name="poi_resource_stone">Kamenje</string>
+	<string name="poi_resource_tin">Kositer</string>
+	<string name="poi_resource_tuff">Tuf</string>
+	<string name="poi_resource_uranium">Uran</string>
+	<string name="poi_resource_vanadium">Vanadij</string>
+	<string name="poi_resource_water">Voda</string>
+	<string name="poi_resource_zinc">Cink</string>
+	<string name="poi_resource_zircon">Cirkon</string>
+
+	<string name="poi_shelter_type_building">Zgradba</string>
+	<string name="poi_material_wood">Material: les</string>
+	<string name="poi_material_metal">Material: kovina</string>
+	<string name="poi_material_reinforced_concrete">Material: armiran beton</string>
+	<string name="poi_material_concrete">Material: beton</string>
+	<string name="poi_material_steel">Material: jeklo</string>
+	<string name="poi_material_stone">Material: kamen</string>
+	<string name="poi_material_masonry">Material: zidovje</string>
+	<string name="poi_material_brick">Material: opeke</string>
+	<string name="poi_material_plastic">Material: plastika</string>
+	<string name="poi_material_sandstone">Material: peščenjak</string>
+	<string name="poi_material_granite_stone">Material: granit</string>
+	<string name="poi_material_metal_wood">Material: kovina in les</string>
+	<string name="poi_material_glass">Material: steklo</string>
+	<string name="poi_material_bronze">Material: bron</string>
+	<string name="poi_material_earth">Material: prst</string>
+	<string name="poi_material_composite">Material: kompozit</string>
+	<string name="poi_material_limestone">Material: apnenec</string>
+	<string name="poi_material_marble">Material: marmor</string>
+	<string name="poi_material_aluminium">Material: aluminij</string>
+
+	<string name="poi_building_type_church">Vrsta zgradbe: cerkev</string>
+	<string name="poi_building_type_chapel">Vrsta zgradbe: kapelica</string>
+	<string name="poi_building_type_mosque">Vrsta zgradbe: mošeja</string>
+	<string name="poi_building_type_temple">Vrsta zgradbe: temelj</string>
+	<string name="poi_building_type_cathedral">Vrsta zgradbe: katedrala</string>
+	<string name="poi_building_type_monastery">Vrsta zgradbe: samostan</string>
+	<string name="poi_building_type_basilica">Vrsta zgradbe: bazilika</string>
+	<string name="poi_building_type_synagogue">Vrsta zgradbe: sinagoga</string>
+	<string name="poi_building_type_shrine">Vrsta zgradbe: svetišče</string>
+
+	<string name="poi_building_type_pyramid">Vrsta zgradbe: piramida</string>
+
+	<string name="poi_addr_housename">Ime zgradbe</string>
+
+
+	<string name="poi_post_street">Ulica</string>
+	<string name="poi_post_housenumber">Hišna številka</string>
+	<string name="poi_ref_post">Poštna številka</string>
+
 	</resources>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index c6948c7692..09b4f4bb56 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -1,6 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="search_button">Poišči</string>
+    <string name="search_button">Iskanje ►</string>
     <string name="search_activity">Iskanje podatkov</string>
 
     <string name="choose_available_region">Izberi regijo s seznama</string>
@@ -13,7 +13,7 @@
     <string name="Closest_Amenities">Najbližje usluge</string>
     <string name="app_mode_car">Navigacija v avtomobilu</string>
     <string name="app_mode_bicycle">Kolesarska navigacija</string>
-    <string name="app_mode_pedestrian">Pešačenje in pohodništvo</string>
+    <string name="app_mode_pedestrian">Navigacija za pohodnike</string>
     <string name="app_mode_default">Iskanje na zemljevidu</string>
     <string name="position_on_map_center">Sredina</string>
     <string name="position_on_map_bottom">Dno</string>
@@ -46,20 +46,20 @@
     <string name="add_favorite_dialog_top_text">Vnesite ime priljubljene točke</string>
     <string name="favourites_context_menu_edit">Uredi priljubljeno točko</string>
     <string name="favourites_context_menu_delete">Izbriši priljubljeno točko</string>
-    <string name="add_favorite_dialog_favourite_added_template">Točka \'\'{0}\'\' je uspešno dodana med priljubljene.</string>
-    <string name="favourites_remove_dialog_msg">Ali res želite izbrisati priljubljeno točko \'%s\'?</string>
-    <string name="favourites_remove_dialog_success">Priljubljena točka {0} je uspešno izbrisana.</string>
+    <string name="add_favorite_dialog_favourite_added_template">Točka »{0}« je dodana med priljubljene.</string>
+    <string name="favourites_remove_dialog_msg">Ali res želite izbrisati priljubljeno točko »%s«\?</string>
+    <string name="favourites_remove_dialog_success">Priljubljena točka {0} je izbrisana.</string>
     <string name="poi_edit_title">Uredi točko POI</string>
     <string name="poi_create_title">Ustvari točko POI</string>
     <string name="poi_error_poi_not_found">Točke ni mogoče najti, ali pa ta združuje več vozlišč, kar trenutno še ni podprto.</string>
-    <string name="poi_remove_confirm_template">Ali želite izbrisati {0} (vpišite opombo)?</string>
+    <string name="poi_remove_confirm_template">Ali želite izbrisati {0} (opomba)\?</string>
     <string name="poi_remove_title">Izbriši točko POI</string>
     <string name="shared_string_delete">Izbriši</string>
-    <string name="poi_remove_success">Točka POI je uspešno izbrisana</string>
+    <string name="poi_remove_success">Točka POI je izbrisana</string>
     <string name="poi_action_add">dodaj</string>
     <string name="poi_action_change">spremeni</string>
-    <string name="poi_action_succeded_template">Opravilo {0} je bilo uspešno končano.</string>
-    <string name="poi_error_unexpected_template">Med izvajanjem opravila {0} prišlo do nepričakovane napake.</string>
+    <string name="poi_action_succeded_template">Opravilo {0} je končano.</string>
+    <string name="poi_error_unexpected_template">Ni mogoče izvesti dejanja {0}.</string>
     <string name="poi_error_io_error_template">Prišlo je do I/O napake med izvajanjem opravila {0}.</string>
     <string name="poi_error_info_not_loaded">Podrobnosti o točki niso naložene</string>
     <string name="poi_dialog_opening_hours">Odprto</string>
@@ -106,7 +106,7 @@
 
     <string name="show_gps_coordinates_text">Pokaži koordinate GPS na zemljevidu</string>
     <string name="show_location">Pokaži trenutno mesto</string>
-    <string name="use_internet_to_download_tile">Prejmi manjkajoče predmete zemljevida iz spleta</string>
+    <string name="use_internet_to_download_tile">Prejmi manjkajoče predmete zemljevida</string>
     <string name="app_description">Program za navigacijo</string>
     <string name="use_internet">Uporabi internet</string>
     <string name="show_poi_over_map">Prikaži točke POI</string>
@@ -116,9 +116,9 @@
     <string name="ChooseCountry">Izbor države</string>
     <string name="show_view_angle">Pokaži smer pogleda</string>
 
-    <string name="shared_string_add_to_favorites">Dodaj med priljubljene</string>
-    <string name="use_english_names_descr">Izbor prikaza izvornih oz. angleških imen.</string>
-    <string name="use_english_names">Na zemljevidu uporabi angleška imena</string>
+    <string name="shared_string_add_to_favorites">Dodaj med »Priljubljene«</string>
+    <string name="use_english_names_descr">Izbor prikaza krajevnih oz. angleških imen.</string>
+    <string name="use_english_names">Na zemljevidu uporabi angleško poimenovanje krajev</string>
     <string name="app_settings">Nastavitve programa</string>
     <string name="search_address">Iskanje naslova</string>
     <string name="poi_search_desc">Iskanje zanimivih točk POI</string>
@@ -159,7 +159,7 @@
     <string name="show_cameras">Hitrostne kamere</string>
     <string name="show_traffic_warnings">Opozorila o prometu</string>
     <string name="avoid_toll_roads">Izogni se cestninjenju</string>
-    <string name="continue_follow_previous_route_auto">Prejšnje vodenje še ni končano. Ali želite nadaljevati do tega cilja? (%1$s sekund)</string>
+    <string name="continue_follow_previous_route_auto">Ali želite nadaljevati z nedokončanim vodenjem\? (%1$s sekund)</string>
     <string name="route_updated_loc_found">Pot bo ponovno preračunana, ko bo določeno trenutno mesto</string>
     <string name="osmand_parking_hours">Ure</string>
     <string name="osmand_parking_minutes">Minute</string>
@@ -215,11 +215,11 @@
     <string name="send_files_to_osm">Ali želite poslati datoteko GPX na OSM?</string>
     <string name="validate_gpx_upload_name_pwd">Določite uporabniško ime in geslo OSM za nalaganje datotek GPX.</string>
 
-    <string name="unit_of_length_descr">Izbor enote za prikaz dolžine.</string>
+    <string name="unit_of_length_descr">Izbor enote za prikaz razdalje.</string>
     <string name="unit_of_length">Enote dolžine</string>
-    <string name="si_mi_feet">Milje / Čevlji</string>
-    <string name="si_mi_yard">Milje / Jardi</string>
-    <string name="si_km_m">Kilometri / Metri</string>
+    <string name="si_mi_feet">Milje/Čevlji</string>
+    <string name="si_mi_yard">Milje/Jardi</string>
+    <string name="si_km_m">Kilometri/Metri</string>
     <string name="yard">yd</string>
     <string name="foot">ft</string>
     <string name="mile_per_hour">mph</string>
@@ -255,7 +255,7 @@
     <string name="shared_string_import">Uvozi</string>
 
     <string name="show_current_gpx_title">Pokaži trenutno sled</string>
-    <string name="free_version_message">"Brezplačna različica programa OsmAnd je omejena na %1$s prenosov (dodajanje in posodabljanje)  in ne omogoča prikazovanja prispevkov z Wikipedije."</string>
+    <string name="free_version_message">Prejeti in posodobiti je mogoče %1$s zemljevidov.</string>
     <string name="free_version_title">Brezplačna različica</string>
     <string name="poi_context_menu_showdescription">Pokaži opise točk POI.</string>
     <string name="index_name_north_america">Severna Amerika</string>
@@ -283,7 +283,7 @@
     
     <string name="routing_settings_descr">Prilagajanje možnosti za določevanje poti in navigacijo.</string>
     <string name="general_settings">Splošne nastavitve</string>
-    <string name="general_settings_descr">Prilagajanje splošnih nastavitev programa.</string>
+    <string name="general_settings_descr">Prilagajanje zaslona in splošnih nastavitev programa.</string>
     <string name="global_app_settings">Splošne nastavitve programa</string>
     <string name="preferred_locale">Jezik vmesnika</string>
     <string name="preferred_locale_descr">Izbor jezika uporabniškega vmesnika (zahteva ponovni zagon programa).</string>
@@ -302,7 +302,7 @@
     <string name="poi_filter_food_shop">Trgovina s hrano</string>
     <string name="poi_filter_for_tourists">Za turiste</string>
     <string name="poi_filter_fuel">Gorivo</string>
-    <string name="auto_zoom_map_descr">Samodejno prilagajanje približanja zemljevida glede na hitrost vožnje (zemljevid se usklajuje s trenutnim mestom).</string>
+    <string name="auto_zoom_map_descr">Samodejno približanje zemljevida glede na hitrost vožnje (zemljevid se usklajuje s trenutnim mestom).</string>
     <string name="auto_zoom_map">Samodejna povečava zemljevida</string>
     <string name="snap_to_road_descr">Med navigacijo pripni položaj na ceste.</string>
     <string name="snap_to_road">Pripni na cesto</string>
@@ -363,7 +363,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
 
     <string name="shared_location">Objavljen položaj</string>
     <string name="osmand_parking_event">Odpeljite vozilo s parkirišča</string>
-    <string name="osmand_parking_warning_text">Obvestilo, da odpeljite vozilo s parkirišča, je bilo dodano v koledar. Ostalo bo zapisano, dokler ga ne izbrišete ročno.</string>
+    <string name="osmand_parking_warning_text">Obvestilo za odvoz vozila s parkirišča je bilo dodano v koledar. Ostalo bo zapisano, dokler ga ne izbrišete.</string>
     <string name="osmand_parking_time_limit_title">Nastavi časovno omejitev parkiranja</string>
     <string name="osmand_parking_delete_confirm">Ali želite izbrisati označbo mesta parkiranja\?</string>
     <string name="osmand_parking_delete">Izbriši označbo mesta parkiranja</string>
@@ -376,9 +376,8 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
     <string name="osmand_parking_position_description">Položaj parkiranega vozila: %1$s</string>
     <string name="osmand_parking_position_description_add">Prevzem vozila ob:</string>
     <string name="osmand_parking_position_name">Mesto parkiranja</string>
-    <string name="osmand_parking_plugin_description">Vstavek za parkiranje omogoča enostavno shranjevanje mesta parkiranja vozila in časa parkirne ure. Podatki so prikazani na zaslonu za enostavno opozarjanje.
-
-Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih parkiranja (letališča, letovišča …).</string>
+    <string name="osmand_parking_plugin_description">Vstavek za parkiranje omogoča enostavno beleženje mesta parkiranja vozila in časa parkirne ure (če je omejen čas parkiranja).
+\nPodatki so prikazani na nadzorni plošli za enostavno opozarjanje. Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih parkiranja (letališča, letovišča …).</string>
     <string name="osmand_parking_plugin_name">Parkiranje (mesto in čas)</string>
     <string name="context_menu_item_add_parking_point">Označi kot mesto parkiranja</string>
     <string name="context_menu_item_delete_parking_point">Izbriši označbo parkirnega mesta</string>
@@ -405,7 +404,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="local_index_gpx_info_show">\n\nZ zadržanim pritiskom se pokažejo možnosti</string>
     <string name="search_offline_clear_search">Novo iskanje</string>
     <string name="poi_filter_custom_filter">Filter po meri</string>
-    <string name="gps_status_app_not_found">Program za upravljanje GPS ni nameščen. Ali ga želite poiskati?</string>
+    <string name="gps_status_app_not_found">Program za prikaz stanja GPS ni nameščen. Ali ga želite poiskati\?</string>
     <string name="show_point_options">Uporabi mesto …</string>
     <string name="menu_layers">Sloji zemljevida</string>
     <string name="where_am_i">Kje sem?</string>
@@ -421,7 +420,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="prefs_plugins_descr">Vstavki omogočajo podporo za dodatne možnosti in nastavitve programa.</string>
     <string name="osmand_development_plugin_description">Vstavek omogoča prikaz nastavitev za razvoj in razhroščevanje programa. Med možnostmi so simuliranje vodenja poti, hitrost izrisovanja zemljevida na zaslonu, glasovni opomniki in podobno. Nastavitve so namenjene razvijalcem programske opreme.</string>
 
-    <string name="osmand_accessibility_description">Vstavek omogoča nastavljanje in uporabo možnosti dostopnosti pri uporabi programa OsmAnd. Podpira prilagajanje hitrosti govora med vodenjem, nastavljanje prikaza zaslona in prikaz sledilnika za nadzor pogleda zemljevida. Omogoča tudi glasovno objavljanje mesta.</string>
+    <string name="osmand_accessibility_description">Vstavek omogoča nastavljanje in uporabo možnosti dostopnosti pri delu s programom OsmAnd. Vstavek podpira prilagajanje hitrosti govora med vodenjem, nastavljanje prikaza zaslona in prikaz sledilnika za nadzor pogleda zemljevida. Omogoča tudi glasovne odzive, na primer pri objavljanju trenutnega mesta.</string>
     <string name="osmand_background_plugin_description">Prikaži nastavitve za sledenje in navigacijo v ozadnjem načinu (izklopljen zaslon) in občasno uporabo GPS.</string>
     <string name="shared_string_close">Zapri</string>
     <string name="opening_hours">Delovni čas</string>
@@ -454,7 +453,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="menu_mute_off">Zvok je vključen</string>
     <string name="menu_mute_on">Zvok je izključen</string>
     <string name="tts_language_not_supported_title">Izbrani jezik ni podprt</string>
-    <string name="tts_language_not_supported">"Izbrani jezik ni podprt preko vgrajenega sintetizatorja govora za Android (programnik pretvarjanja besedila  govor TTS – text-to-speech). Ali želite v trgovini Market poiskati drug sintetizator govora? Če drugega ne izberete, bo uporabljen sistemski jezik."</string>
+    <string name="tts_language_not_supported">Vgrajeni sintetizator govora za Android zapisa izbranega jezika ne podpira (programnik pretvarjanja besedila v govor TTS). Ali želite v trgovini Market poiskati drug program\? Če drug jezik ne bo izbran, bo uporabljen sistemski.</string>
     <string name="tts_missing_language_data">Ni nameščenih datotek izbranega jezika. Ali jih želite namestiti iz trgovine Market?</string>
     <string name="system_locale">Sistemski</string>
     <string name="support_new_features">Podpora nadaljnjemu razvoju</string>
@@ -484,13 +483,13 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="city_type_village">Vas</string>
     <string name="city_type_town">Kraj</string>
     <string name="favorite_friends_category">Naslovi prijateljev</string>
-    <string name="shared_string_name">Naziv</string>
+    <string name="shared_string_name">Ime</string>
     <string name="favourites_edit_dialog_category">Skupina</string>
     <string name="shared_string_others">Druge točke</string>
     <string name="favorite_home_category">Domači naslovi</string>
     <string name="favorite_places_category">Priljubljeni kraji</string>
     <string name="favorite_delete_multiple">Izbrisane bodo priljubljene točke (%1$d) in skupine (%2$d). Ali ste prepričani, da želite nadaljevati?</string>
-    <string name="favourites_delete_multiple_succesful">Priljubljene točke so uspešno izbrisane.</string>
+    <string name="favourites_delete_multiple_succesful">Priljubljene točke so izbrisane.</string>
 
     <string name="favorite">Priljubljene</string>
     <string name="fav_points_edited">Priljubljena točka je uspešno urejena.</string>
@@ -504,9 +503,9 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="local_index_mi_backup">Odklopi</string>
 
     <string name="local_index_descr_title">Upravljanje datotek zemljevidov.</string>
-    <string name="local_index_items_backuped">Predmeti (%1$d od %2$d) so uspešno izklopljeni.</string>
-    <string name="local_index_items_deleted">Predmeti (%1$d od %2$d) so uspešno izbrisani.</string>
-    <string name="local_index_items_restored">Predmeti (%1$d od %2$d) so uspešno omogočeni.</string>
+    <string name="local_index_items_backuped">Izbrani predmeti (%1$d od %2$d) so izklopljeni.</string>
+    <string name="local_index_items_deleted">Izbrani predmeti (%1$d od %2$d) so izbrisani.</string>
+    <string name="local_index_items_restored">Izbrani predmeti (%1$d od %2$d) so omogočeni.</string>
     <string name="local_index_no_items_to_do">Ni predmetov za %1$s</string>
     <string name="local_index_action_do">Opravilo: %1$s %2$s predmetov. Ali želite nadaljevati?</string>
     
@@ -528,7 +527,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="update_existing">Zamenjaj</string>
     <string name="send_location">Pošlji mesto</string>
     <string name="amenity_type_transportation">Prevoz</string>
-    <string name="old_map_index_is_not_supported">Podatki zemljevida v starejših zapisih \'\'{0}\'\' niso podprti</string>
+    <string name="old_map_index_is_not_supported">Podatki zemljevida v starejših zapisih »{0}« niso podprti</string>
     <string name="no_buildings_found">Ni najdenih zgradb.</string>
     <string name="amenity_type_sustenance">Prehrana</string>
     <string name="amenity_type_man_made">Zgradba</string>
@@ -546,19 +545,19 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
 
     <string name="installing_new_resources">Poteka odpakiranje novih podatkov …</string>
 
-    <string name="rotate_map_compass_opt">- obračanje zemljevida po kompasu</string>
-    <string name="rotate_map_bearing_opt">- obračanje zemljevida glede na smer premikanja</string>
-    <string name="rotate_map_none_opt">- brez obračanja zemljevida (sever je vedno zgoraj)</string>
+    <string name="rotate_map_compass_opt">– obračanje zemljevida po kompasu</string>
+    <string name="rotate_map_bearing_opt">– obračanje zemljevida glede na smer premikanja</string>
+    <string name="rotate_map_none_opt">– brez obračanja zemljevida (sever je vedno zgoraj)</string>
     <string name="search_villages_and_postcodes">Poišči več vasi ali poštnih številk</string>
     <string name="rendering_attr_showRoadMaps_description">Izberite kdaj naj bodo prikazani zemljevidi le s cestami:</string>
     <string name="rendering_attr_showRoadMaps_name">Zemljevidi le s cestami</string>
     <string name="download_roads_only_maps">Zemljevid le s cestami</string>
     <string name="background_service_is_enabled_question">Storitev v ozadju se še vedno izvaja. Ali jo želite končati?</string>
-    <string name="select_index_file_to_download">Ni najdenih ustreznih podatkov. Če izbranega področja ni, ga lahko ustvarite sami (več informacij na http://osmand.net).</string>
+    <string name="select_index_file_to_download">Ni najdenih ustreznih podatkov. Če izbranega področja ni, ga lahko ustvarite sami (več informacij na https://osmand.net).</string>
     <string name="local_indexes_cat_map">Standardni zemljevidi (vektorski)</string>
     <string name="index_settings_descr">Prejemanje in upravljanje datotek zemljevidov, shranjenih na napravi.</string>
-    <string name="map_online_plugin_is_not_installed">Omogočite vstavek spletnih zemljevidov za izbiro različnih virov zemljevidov</string>
-    <string name="map_online_data_descr">Uporabi spletne zemljevide (prejem in shranjevanje na kartici SD).</string>
+    <string name="map_online_plugin_is_not_installed">Omogočite vstavek »Spletnih zemljevidov« za izbiro različnih virov zemljevidov</string>
+    <string name="map_online_data_descr">Uporabi spletne zemljevide (prejete datoteke so shranjene na pomnilniški kartici).</string>
     <string name="shared_string_online_maps">Spletni zemljevidi</string>
     <string name="online_map_settings_descr">Nastavitev virov spletnih in shranjenih zemljevidov.</string>
     <string name="osmand_rastermaps_plugin_description">Vstavek omogoča dostop do različnih vrst zemljevidov od vektorskih OpenStreetMap do satelitskih slik ter posebnih prekrivnih zemljevidov, kot so vremenski, klimatski, geološki in drugi zemljevidi. Vstavek omogoča tudi podporo za izrisovanje izohips, senčenje hribovitih predelov in podobno. 
@@ -583,7 +582,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="accessibility_mode_descr">Vklopi zmožnosti dostopnosti.</string>
     <string name="shared_string_on">Omogočeno</string>
     <string name="shared_string_off">Onemogočeno</string>
-    <string name="accessibility_default">Glede na splošne sistemske nastavitve</string>
+    <string name="accessibility_default">Glede na sistemske nastavitve okolja</string>
     <string name="backToMenu">Nazaj v meni</string>
     <string name="auto_announce_on">Začni s samodejnimi najavami</string>
     <string name="auto_announce_off">Zaustavi samodejne najave</string>
@@ -598,7 +597,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     
     
     
-    <string name="osb_comment_dialog_success">Opomba je bila uspešno dodana</string>
+    <string name="osb_comment_dialog_success">Opomba je dodana</string>
     <string name="osb_comment_dialog_error">Opombe ni mogoče dodati</string>
     
     
@@ -623,15 +622,15 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="offline_edition">Krajevno urejanje</string>
     <string name="offline_edition_descr">Vedno uporabi krajevno urejanje.</string>
     <string name="update_poi_does_not_change_indexes">Spremembe točk POI v programu ne vplivajo na prejete datoteke zemljevidov. Spremembe so shranjene v krajevno datoteko.</string>
-    <string name="local_openstreetmap_uploading">Pošiljanje …</string>
-    <string name="local_openstreetmap_were_uploaded">{0} podatkov POI/hroščev je bilo poslanih</string>
+    <string name="local_openstreetmap_uploading">Poteka pošiljanje …</string>
+    <string name="local_openstreetmap_were_uploaded">Podatki točk POI in opombe so poslani ({0})</string>
     <string name="local_openstreetmap_uploadall">Pošlji vse</string>
 
     <string name="local_openstreetmap_upload">Pošlji spremembo na OSM</string>
     <string name="local_openstreetmap_delete">Izbriši spremembo</string>
     <string name="local_openstreetmap_descr_title">Asinhrono urejanje OSM:</string>
-    <string name="local_openstreetmap_settings">Krajevno shranjene točke POI in zaznamki OSM</string>
-    <string name="local_openstreetmap_settings_descr">Pokaži in upravljaj točke POI in zaznamke OSM, ki so zabeleženi v krajevni podatkovni zbirki.</string>
+    <string name="local_openstreetmap_settings">Točke POI in zaznamki OSM, shranjeni na napravi</string>
+    <string name="local_openstreetmap_settings_descr">Pokaži in upravljaj točke POI in zaznamke OSM, ki so zabeleženi v podatkovni zbirki na napravi.</string>
 
 
     <string name="live_monitoring_interval_descr">Določi interval sledenja v živo.</string>
@@ -668,7 +667,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="pref_vector_rendering">Možnosti vektorskega izrisovanja</string>
     <string name="pref_overlay">Prekrivna plast/Podloga zemljevida</string>
     <string name="pref_raster_map">Nastavitve vira zemljevidov</string>
-    <string name="pref_vector_map">Nastavitve vektorskega zemljevida</string>
+    <string name="pref_vector_map">Možnosti vektorskega zemljevida</string>
     <string name="delete_confirmation_msg">Ali želite izbrisati %1$s?</string>
     <string name="city_type_suburb">Predmestje</string>
 
@@ -676,7 +675,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="file_with_name_already_exists">Datoteka s tem imenom že obstaja.</string>
     <string name="shared_string_gpx_route">Pot GPX</string>
     <string name="poi_query_by_name_matches_categories">S poizvedbo je skladnih več kategorij POI:</string>
-    <string name="data_to_search_poi_not_available">Ni krajevnih podatkov za iskanje POI.</string>
+    <string name="data_to_search_poi_not_available">Ni krajevnih podatkov za iskanje točk POI.</string>
     <string name="old_poi_file_should_be_deleted">Podatkovna datoteka POI \'%1$s\' je zastarela in jo je priporočljivo izbrisati.</string>
     <string name="update_poi_file_not_found">Krajevne datoteke za shranjevanje podatkov POI ni mogoče najti niti je ni mogoče ustvariti.</string>
     <string name="button_upgrade_osmandplus">Nadgradi na OsmAnd+</string>
@@ -686,20 +685,20 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="poi_filter_nominatim">Spletni Nominatim</string>
     <string name="search_position_current_location_search">Iskanje trenutnega mesta …</string>
     <string name="search_position_current_location_found">Trenutno mesto (določeno)</string>
-    <string name="shared_string_save_as_gpx">Shrani kot novo sled GPX</string>
-    <string name="route_successfully_saved_at">Pot je bila uspešno shranjena kot \'%1$s\'.</string>
+    <string name="shared_string_save_as_gpx">Shrani kot novo datoteko GPX</string>
+    <string name="route_successfully_saved_at">Pot je bila shranjena kot »%1$s«.</string>
     <string name="filename_input">Ime datoteke: </string>
     <string name="file_with_name_already_exist">Datoteka z istim imenom že obstaja.</string>
     <string name="shared_string_save">Shrani</string>
 
-    <string name="local_index_upload_gpx_description">Pošlji datoteke GPX za skupnost OSM. Uporabljene bodo za izboljšavo zemljevidov.</string>
-    <string name="local_index_items_uploaded">%1$d od %2$d predmet(ov) je bilo uspešno poslanih.</string>
+    <string name="local_index_upload_gpx_description">Pošlji datoteke GPX skupnosti OSM za izboljšavo zemljevidov.</string>
+    <string name="local_index_items_uploaded">Poslani predmeti: %1$d od %2$d</string>
     <string name="local_index_mi_upload_gpx">Pošlji na OSM</string>
     <string name="show_more_map_detail">Pokaži več podrobnosti zemljevida</string>
     <string name="show_more_map_detail_descr">Pokaži nekaj podrobnosti vektorskih zemljevidov (ceste, itd.) že pri oddaljenem pogledu.</string>
     <string name="shared_string_no_thanks">Ne, hvala</string>
-    <string name="basemap_missing">Osnovni zemljevid sveta (pokriva cel svet pri majhnih povečavah) ni nameščen. Priporočljivo je prejeti datoteko world_basemap_x.obf za splošni pogled sveta.</string>
-    <string name="vector_data_missing">Podatkov za delo brez povezave na kartici SD ni. Priporočljivo je datoteke prejeti in omogočiti navigacijo tudi v načinu brez vzpostavljene povezave.</string>
+    <string name="basemap_missing">Prejem osnovnega zemljevida sveta omogoča pregled vseh celin pri zelo oddaljenem pogledu.</string>
+    <string name="vector_data_missing">Za uporabo zemljevidov pri delu brez povezave je treba prejeti datoteke s podatki.</string>
     <string name="local_index_installed">Datum shranjene različice</string>
     <string name="map_text_size_descr">Izbor velikosti besedila za imena na zemljevidu.</string>
     <string name="map_text_size">Velikost pisave zemljevida</string>
@@ -712,7 +711,9 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="gpx_option_reverse_route">Obratna smer GPX</string>
     <string name="gpx_option_destination_point">Uporabi trenutni cilj</string>
     <string name="gpx_option_from_start_point">Podaj celotno sled</string>
-    <string name="switch_to_vector_map_to_see">Za to območje zemljevida so na voljo vektorski zemljevidi za delo brez povezave.\n\t\n\tOmogočite jih lahko preko \'Menija\' → \'Nastavitve zemljevida\' → \'Vir zemljevida …\' → \'Vektorski zemljevidi za delo brez povezave\'.</string>
+    <string name="switch_to_vector_map_to_see">Za to območje so na voljo vektorski zemljevidi za delo brez povezave.
+\n\t
+\n\tMožnosti so na voljo v »Meniju« → »Možnosti zemljevida« → »Vir zemljevida …« → »Vektorski zemljevidi za delo brez povezave«.</string>
     <string name="voice_stream_notification">Zvok obvestila</string>
     <string name="voice_stream_music">Zvok glasbe</string>
     <string name="warning_tile_layer_not_downloadable">Program ne more prejeti podatkovnega sloja zemljevida %1$s. Poskusite ga ponovno namestiti.</string>
@@ -722,14 +723,14 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="map_transparency">Prozornost osnovnega zemljevida</string>
     <string name="layer_underlay">Podloga zemljevida …</string>
     <string name="map_underlay">Podloga zemljevida</string>
-    <string name="map_underlay_descr">Izbor podloge zemljevida</string>
+    <string name="map_underlay_descr">Izbor podloge uporabljenega zemljevida.</string>
     <string name="layer_overlay">Prekrivni zemljevid …</string>
     <string name="shared_string_none">Brez</string>
     <string name="map_overlay">Prekrivni zemljevid</string>
     <string name="map_overlay_descr">Izbor prekrivnega zemljevida</string>
     <string name="tile_source_already_installed">Zemljevid je že nameščen. Nastavitve bodo posodobljene.</string>
     <string name="select_tile_source_to_install">Izbor zemljevidov za namestitev ali posodobitev</string>
-    <string name="internet_not_available">To opravilo zahteva vzpostavljeno povezavo z internetom, ki pa ni na voljo.</string>
+    <string name="internet_not_available">Opravila ni mogoče izvesti brez vzpostavljene povezave z internetom.</string>
     <string name="install_more">Namesti več …</string>
     <string name="create_poi_link_to_osm_doc">Določitev <u>spletnega OSM</u> s slikami.</string>
     <string name="error_doing_search">Iskanja v načinu brez povezave ni mogoče izvesti.</string>
@@ -737,16 +738,16 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="search_osm_offline">Poišči mesto na zemljevidu</string>
 
 
-    <string name="send_location_email_pattern">Za ogled mesta sledite povezavi spletnega brskalnika %1$s ali povezavi namena android %2$s</string>
-    <string name="add_waypoint_dialog_added">Vmesna točka GPX \'\'{0}\'\' je uspešno dodana.</string>
+    <string name="send_location_email_pattern">Za ogled mesta sledite povezavi spletnega brskalnika %1$s ali povezavi Android %2$s</string>
+    <string name="add_waypoint_dialog_added">Vmesna točka GPX »{0}« je dodana.</string>
     <string name="add_waypoint_dialog_title">Dodaj vmesno točko na shranjeno sled GPX</string>
     <string name="context_menu_item_add_waypoint">Dodaj vmesno točko na sled GPX</string>
 
     <string name="transport">Prevoz</string>
     <string name="additional_settings">Dodatne nastavitve</string>
     <string name="shared_string_settings">Nastavitve</string>
-    <string name="save_current_track">Shrani trenutno sled GPX</string>
-    <string name="save_current_track_descr">Shrani trenutno pot GPX na kartico SD.</string>
+    <string name="save_current_track">Shrani trenutno sled</string>
+    <string name="save_current_track_descr">Shrani trenutno sled v datoteko GPX.</string>
     <string name="save_track_interval">Interval beleženja med navigacijo</string>
     <string name="save_track_interval_descr">Izberite časovni razmik beleženja za shranjevanje sledi med navigacijo.</string>
     <string name="save_track_to_gpx">Samodejno beleži sled med navigacijo</string>
@@ -765,11 +766,13 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="version_index_is_big_for_memory">Podatki \"{0}\" so preobsežni za razpoložljiv pomnilnik</string>
     <string name="version_index_is_not_supported">Različica kazala \"{0}\" ni podprta</string>
     
-    <string name="osmand_routing_experimental">Navigacija OsmAnd brez povezave je preizkusna zmožnost in ne deluje z razdaljami, ki so večje od 20 km.\n\nStoritev navigacije je začasno preklopljena na spletni CloudMade.</string>
+    <string name="osmand_routing_experimental">Navigacija OsmAnd brez povezave je preizkusna zmožnost in ne deluje z razdaljami, ki presegajo 20 km.
+\n
+\nStoritev navigacije je začasno preklopljena na spletno storitev CloudMade.</string>
     <string name="osmand_net_previously_installed">Nameščena je starejša različica programa OsmAnd. Vsi nepovezani podatki so podprti v novi različici, vendar je treba najprej izvoziti vse priljubljene točke in jih nato ponovno uvoziti v novejšo različico.</string>
-    <string name="build_installed">Različica izgradnje {0} je bila uspešno nameščena ({1}).</string>
+    <string name="build_installed">Različica izgradnje {0} je nameščena ({1}).</string>
     <string name="downloading_build">Prejemanje različice …</string>
-    <string name="install_selected_build">Ali želite namestiti program OsmAnd - {0} od {1} {2} MB?</string>
+    <string name="install_selected_build">Ali želite namestiti program OsmAnd – {0} od {1} {2} MB\?</string>
     <string name="loading_builds_failed">Pridobivanje seznama različic OsmAnd je spodletelo</string>
     <string name="loading_builds">Nalaganje različic OsmAnd …</string>
     <string name="select_build_to_install">Izbor različice programa OsmAnd za posodobitev</string>
@@ -785,8 +788,8 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="maps_could_not_be_downloaded">Tega zemljevida ni mogoče prejeti</string>
     <string name="continuous_rendering">Stalno izrisovanje</string>
     <string name="continuous_rendering_descr">Izvaja stalno izrisovanje namesto slike-po-sliko.</string>
-    <string name="rendering_exception">Med izrisovanjem izbranega področja je prišlo do napake</string>
-    <string name="renderer_load_sucess">Izrisovalnik je bil uspešno naložen</string>
+    <string name="rendering_exception">Ni mogoče izrisati izbranega področja</string>
+    <string name="renderer_load_sucess">Izrisovalnik je naložen</string>
     <string name="renderer_load_exception">Izrisovalnika ni mogoče naložiti</string>
     <string name="renderers">Vektorski izrisovalnik</string>
     <string name="renderers_descr">Izberite videz izrisovalnika.</string>
@@ -804,24 +807,62 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="no_vector_map_loaded">Vektorski zemljevidi niso naloženi</string>
     
     <string name="gpx_files_not_found">V mapi sledi ni najti mogoče nobene datoteke GPX.</string>
-    <string name="layer_gpx_layer">Sled GPX …</string>
+    <string name="layer_gpx_layer">Datoteke GPX …</string>
     <string name="error_reading_gpx">Napaka med branjem podatkov GPX</string>
     <string name="vector_data">Vektorski zemljevidi za delo brez povezave</string>
     <string name="transport_context_menu">Iskanje prevoza na postaji</string>
     
     <string name="rotate_map_to_bearing_descr">Izbor poravnave zaslona zemljevida.</string>
     <string name="show_route">Podrobnosti poti</string>
-    <string name="fav_imported_sucessfully">Priljubljene točke so uspešno uvožene</string>
+    <string name="fav_imported_sucessfully">Priljubljene točke so uvožene</string>
     <string name="fav_file_to_load_not_found">&gt;Datoteke GPX, ki vsebuje priljubljene točke, na {0} ni mogoče najti</string>
-    <string name="osmand_long_description_1000_chars">OsmAnd je odprtokodna programska oprema za navigacijo, ki za prikaz uporablja širok nabor zemljevidov OpenStreetMap (OSM). Vse podatke zemljevidov je mogoče shraniti v pomnilnik naprave (telefona ali tablice) za uporabo brez povezave. OsmAnd omogoča tudi izračun poti in glasovno vodenje od zavoja do zavoja. Pomembnejše lastnosti: - Popolnoma delujoč tudi brez povezave (shrani podatke vektorskih zemljevidov v mapo po izbiri) - Na voljo so stisnjeni vektorski podatki zemljevida za cel svet - Prenos podatkov zemljevida posameznih držav ali področij znotraj programa - Prekrivanje zemljevidov s podatkovnimi sloji; na primer sledi GPX, načrti poti, zanimive in priljubljene točke, izohipsami, postajališča javnega prometa, dodatni zemljevidi z nastavljivo prosojnostjo - Iskanje naslovov, krajev in zanimivih točk (POI) brez povezave - Vodenje poti v načinu brez povezave za srednje dolge poti - Način za avtomobiliste, kolesarje in pešce: - z nastavljivim samodejnim preklopom med dnevnim in nočnim prikazom - z nastavljivo povečavo zemljevida glede na hitrost gibanja - z nastavljivo usmerjenostjo zemljevida glede na kompas ali glede na smer gibanja - z 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 vsebin z Wikipedije. OsmAnd je v program razvoju. Napredek projekta je odvisen od finančnih prispevkov, s katerimi se financira razvoj in testiranje novih funkcionalnosti. Razmislite o nakupu aplikacije OsmAnd+, ali financiranju posamezne funkcionalnosti oziroma nenamensko donacijo na spletni strani osmand.net.</string>
-    <string name="osmand_plus_long_description_1000_chars">"OsmAnd je odprtokodna programska oprema za navigacijo, ki za prikaz uporablja širok nabor zemljevidov OpenStreetMap (OSM). Vse podatke zemljevidov je mogoče shraniti v pomnilnik naprave (telefona ali tablice) za uporabo brez povezave. OsmAnd omogoča tudi izračun poti in glasovno vodenje od zavoja do zavoja. Pomembnejše lastnosti:  - Popolnoma delujoč tudi brez povezave (shrani podatke vektorskih zemljevidov v mapo po izbiri) - Na voljo so stisnjeni vektorski podatki zemljevida za cel svet - Prenos podatkov zemljevida posameznih držav ali področij znotraj programa - Prekrivanje zemljevidov s podatkovnimi plastmi; na primer sledmi GPX, načrti poti, zanimive in priljubljene točke, izohipsami, postajališči javnega prometa, dodatni zemljevidi z nastavljivo prosojnostjo - Iskanje naslovov, krajev in zanimivih točk (POI) brez povezave - Vodenje poti v načinu brez povezave za srednje dolge poti - Način za avtomobiliste, kolesarje in pešce: - z nastavljivim samodejnim preklopom med dnevnim in nočnim prikazom - z nastavljivo povečavo zemljevida glede na hitrost gibanja - z nastavljivo usmerjenostjo zemljevida glede na kompas ali glede na smer gibanja - z nastavljivo vodenje po voznih pasovih, prikaz omejitev hitrosti, vodenje s posnetim ali sintetiziranim govorom (TTS)."</string>
-    <string name="error_occurred_loading_gpx">Prišlo je do napake med nalaganjem datoteke GPX</string>
+    <string name="osmand_long_description_1000_chars">OsmAnd (OSM Automated Navigation Directions)
+\n
+\nOsmAnd je odprtokodna programska oprema za navigacijo, ki za prikaz uporablja širok nabor zemljevidov OpenStreetMap (OSM). Vse podatke zemljevidov je mogoče shraniti v pomnilnik naprave (telefona ali tablice) za uporabo brez povezave. OsmAnd omogoča tudi izračun poti in glasovno vodenje od zavoja do zavoja.
+\n
+\nPomembnejše lastnosti:
+\n• popolnoma delujoč tudi brez povezave (shrani podatke vektorskih zemljevidov v mapo po izbiri)
+\n• na voljo so stisnjeni vektorski podatki zemljevida sveta
+\n• prenos podatkov zemljevida posameznih držav ali področij znotraj programa
+\n• prekrivanje zemljevidov s podatkovnimi sloji; na primer sledi GPX, načrti poti, zanimive in priljubljene točke, izohipsami, postajališča javnega prometa, dodatni zemljevidi z nastavljivo prosojnostjo
+\n• iskanje naslovov, krajev in zanimivih točk (POI) brez povezave
+\n• vodenje poti v načinu brez povezave za srednje dolge poti
+\n• način za avtomobiliste, kolesarje in pešce:
+\n- z nastavljivim samodejnim preklopom med dnevnim in nočnim prikazom
+\n- z nastavljivo povečavo zemljevida glede na hitrost gibanja
+\n- z nastavljivo usmerjenostjo zemljevida glede na kompas, ali glede na smer gibanja
+\n- z nastavljivo vodenje po voznih pasovih, prikaz omejitev hitrosti, vodenje s posnetim ali sintetiziranim govorom (TTS).
+\n
+\nBrezplačna različica programa OsmAnd ima naslednje omejitve: 
+\n• omejeno je število prenosov zemljevidov
+\n• brez povezave ni dostopa do vsebin z Wikipedije.
+\n
+\nOsmAnd je program v razvoju. Napredek projekta je odvisen od finančnih prispevkov, s katerimi se financira razvoj in testiranje novih funkcionalnosti. Razmislite o nakupu aplikacije OsmAnd+, ali financiranju posamezne funkcionalnosti oziroma nenamensko donacijo na spletni strani https://osmand.net.</string>
+    <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions)
+\n
+\nOsmAnd+ je odprtokodna programska oprema za navigacijo, ki za prikaz uporablja širok nabor zemljevidov OpenStreetMap (OSM). Vse podatke zemljevidov je mogoče shraniti v pomnilnik naprave (telefona ali tablice) za uporabo brez povezave. OsmAnd omogoča tudi izračun poti in glasovno vodenje od zavoja do zavoja.
+\n
+\nOsmAnd+ je plačljiva različica programa. Z nakupom podprete projekt, razvoj programske kode, nove zmožnosti programa in pridobite dostop do vseh najnovejših posodobitev.
+\n
+\nPomembnejše lastnosti:
+\n• Popolnoma delujoč tudi brez povezave (shrani podatke vektorskih zemljevidov v mapo po izbiri)
+\n• Na voljo so stisnjeni vektorski podatki zemljevida za cel svet
+\n• Prenos podatkov zemljevida posameznih držav ali področij znotraj programa
+\n• Prekrivanje zemljevidov s podatkovnimi plastmi; na primer sledmi GPX, načrti poti, zanimive in priljubljene točke, izohipsami, postajališči javnega prometa, dodatni zemljevidi z nastavljivo prosojnostjo
+\n• Iskanje naslovov, krajev in zanimivih točk (POI) brez povezave
+\n• Vodenje poti v načinu brez povezave za srednje dolge poti - 
+\n• Način za avtomobiliste, kolesarje in pešce:
+\n- z nastavljivim samodejnim preklopom med dnevnim in nočnim prikazom
+\n- z nastavljivo povečavo zemljevida glede na hitrost gibanja
+\n- z nastavljivo usmerjenostjo zemljevida glede na kompas ali glede na smer gibanja
+\n- z nastavljivo vodenje po voznih pasovih, prikaz omejitev hitrosti, vodenje s posnetim ali sintetiziranim govorom (TTS).</string>
+    <string name="error_occurred_loading_gpx">Ni mogoče naložiti datoteke GPX</string>
     <string name="send_report">Pošlji poročilo</string>
     <string name="none_region_found">Na kartici SD ni podatkov območij za uporabo brez povezave.</string>
     <string name="poi_namefinder_query_empty">Za iskanje točke POI je treba vpisati iskalni niz</string>
     <string name="any_poi">Katerokoli</string>
     
-    <string name="thanks_yandex_traffic">Za podatke o prometu gre zahvala spletišču Yandex.</string>
+    <string name="thanks_yandex_traffic">Za podatke o prometu gre zahvala storitvam Yandex.</string>
     <string name="layer_yandex_traffic">Promet Yandex</string>
     <string name="no_fav_to_save">Ni priljubljenih točk za shranjevanje</string>
     <string name="layer_route">Pot</string>
@@ -838,15 +879,17 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="network_provider">Omrežje</string>
     <string name="background_service_int_descr">Nastavitev intervala prebujanja v ozadju.</string>
     <string name="background_service_int">Interval prebujanja sprejemnika GPS</string>
-    <string name="background_service_provider_descr">Izberite ponudnika določevanja mesta med izvajanjem v ozadju.</string>
+    <string name="background_service_provider_descr">Izberite način določevanja mesta med izvajanjem v ozadju.</string>
     <string name="background_service_provider">Ponudnik mesta</string>
     <string name="background_router_service_descr">Izvaja OsmAnd v ozadju in omogoča spremljanje položaja, ko je zaslon izklopljen.</string>
     <string name="background_router_service">Zaženi OsmAnd v ozadju</string>
     <string name="off_router_service_no_gps_available">Storitev navigacije v ozadju zahteva, da je zagnan vsaj en program, ki zahteva te podatke.</string>
     <string name="search_poi_filter">Filter</string>
 
-    <string name="sd_unmounted">Kartica SD ni priklopljena.\nBrez podatkov ni mogoče uporabljati zemljevidov ali iskati mest.</string>
-    <string name="sd_mounted_ro">Kartica SD je nastavljena le za branje.\nNa voljo bodo le nameščeni zemljevidi. Novih ne bo mogoče prejeti.</string>
+    <string name="sd_unmounted">Pomnilniška kartica ni priklopljena.
+\nBrez podatkov ni mogoče uporabljati zemljevidov ali iskati mest.</string>
+    <string name="sd_mounted_ro">Pomnilniška kartica je nastavljena le za branje.
+\nNa voljo bodo le že nameščeni zemljevidi, novih in posodobitev ne bo mogoče prejeti.</string>
     <string name="unzipping_file">Poteka odpakiranje datoteke …</string>
     <string name="route_tr">Zavijte desno in pojdite</string>
     <string name="route_tshr">Zavijte ostro desno in pojdite</string>
@@ -858,11 +901,11 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="route_head">Začetek poti</string>
     <string name="first_time_continue">Kasneje</string>
     <string name="first_time_download">Prejem območij</string>
-    <string name="search_poi_location">Iskanje signala …</string>
+    <string name="search_poi_location">Poteka čakanje na signal …</string>
     <string name="search_near_map">Poišči v bližini trenutne sredine zemljevida</string>
 
-    <string name="fav_saved_sucessfully">Priljubljene točke uspešno shranjene v {0}</string>
-    <string name="opening_hours_not_supported">Oblike zapisa delovnega časa ni mogoče urejati</string>
+    <string name="fav_saved_sucessfully">Priljubljene točke so shranjene v {0}</string>
+    <string name="opening_hours_not_supported">Oblike zapisa delovnega časa ni mogoče spremeniti</string>
     <string name="add_new_rule">Dodajanje novega pravila</string>
     <string name="transport_Routes">Poti</string>
     <string name="transport_Stop">Postaja</string>
@@ -877,13 +920,13 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="shared_string_ok">V redu</string>
     <string name="show_transport_over_map_description">Pokaži postaje javnega prevoza na zemljevidu.</string>
     <string name="show_transport_over_map">Pokaži postaje prevoza</string>
-    <string name="update_poi_success">Podatki POI podatki so uspešno posodobljeni ({0} naloženih)</string>
-    <string name="update_poi_error_local">Napaka med posodabljanjem seznama POI</string>
-    <string name="update_poi_error_loading">Napaka med nalaganjem podatkov iz strežnika</string>
+    <string name="update_poi_success">Podatki POI podatki so posodobljeni (naloženo {0})</string>
+    <string name="update_poi_error_local">Seznama točk POI ni mogoče posodobiti</string>
+    <string name="update_poi_error_loading">S strežnika ni mogoče naložiti podatkov</string>
     <string name="update_poi_no_offline_poi_index">Ni krajevnih podatkov POI za to območje</string>
-    <string name="update_poi_is_not_available_for_zoom">Posodabljanje POI pri majhnih povečavah ni mogoče</string>
+    <string name="update_poi_is_not_available_for_zoom">Približanje pogleda omogoči posodabljanje točk POI</string>
     <string name="context_menu_item_update_poi">Posodobi točko POI</string>
-    <string name="context_menu_item_update_map_confirm">Ali naj se posodobijo krajevni podatki prek interneta?</string>
+    <string name="context_menu_item_update_map_confirm">Ali naj se krajevni podatki posodobijo\?</string>
     <string name="search_history_city">Mesto: {0}</string>
     <string name="search_history_street">Ulica: {0}, {1}</string>
     <string name="search_history_int_streets">Križišče: {0} z {1} v {2}</string>
@@ -903,37 +946,37 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="max_level_download_tile_descr">Izbor največje ravni približanja za prejem spletnih zemljevidov.</string>
     <string name="route_general_information">Skupna razdalja %1$s, čas potovanja %2$d h %3$d min.</string>
     <string name="router_service_descr">Izbor spletne ali krajevne navigacijske storitve.</string>
-    <string name="sd_dir_not_accessible">Shranjevalnega imenika na kartici SD ni na voljo!</string>
+    <string name="sd_dir_not_accessible">Mapa za podatkovno shrambo na pomnilniški kartici ni dostopna!</string>
     <string name="download_question">Prejmi {0} – {1}?</string>
     <string name="download_question_exist">Krajevni podatki za {0} že obstajajo ({1}). Ali jih želite posodobiti ({2})?</string>
     <string name="address">Naslov</string>
-    <string name="shared_string_download_successful">Prejem uspešno končan</string>
+    <string name="shared_string_download_successful">Prejem je uspešno končan</string>
 
     <string name="downloading_list_indexes">Prejemanje seznama območij zemljevida …</string>
-    <string name="list_index_files_was_not_loaded">Seznam območij ni bil pridobljen z osmand.net.</string>
+    <string name="list_index_files_was_not_loaded">Ni mogoče pridobiti seznama območij s spletišča https://osmand.net.</string>
     <string name="mark_final_location_first">Najprej je treba izbrati cilj</string>
     <string name="commiting_node">Posredovanje vozlišča …</string>
     <string name="loading_poi_obj">Nalaganje podatkov POI …</string>
     <string name="auth_failed">Pooblastitev je spodletela</string>
     <string name="failed_op">spodletelo</string>
-    <string name="converting_names">Pretvarjanje izvornih/angleških imen …</string>
+    <string name="converting_names">Pretvarjanje krajevnih/angleških imen …</string>
     <string name="loading_streets_buildings">Nalaganje ulic/zgradb …</string>
     <string name="loading_postcodes">Nalaganje poštnih številk …</string>
     <string name="loading_streets">Nalaganje ulic …</string>
     <string name="loading_cities">Nalaganje mest …</string>
 
     <string name="poi">Točke POI</string>
-    <string name="error_occurred_saving_gpx">Napaka med shranjevanjem sledi GPX</string>
-    <string name="error_calculating_route">Napaka izračunavanja poti</string>
-    <string name="error_calculating_route_occured">Prišlo je do napake med izračunavanjem poti</string>
-    <string name="empty_route_calculated">Napaka: izračunana pot je prazna</string>
+    <string name="error_occurred_saving_gpx">Datoteke GPX ni mogoče shraniti</string>
+    <string name="error_calculating_route">Poti ni mogoče določiti</string>
+    <string name="error_calculating_route_occured">Poti ni mogoče določiti</string>
+    <string name="empty_route_calculated">Določena pot je brez podatkov</string>
     <string name="new_route_calculated_dist">Izračunana nova pot, razdalja</string>
     <string name="arrived_at_destination">Prispeli ste na cilj</string>
     <string name="invalid_locations">Koordinate niso veljavne!</string>
     <string name="go_back_to_osmand">Pojdi nazaj na zemljevid OsmAnd</string>
     <string name="loading_data">Nalaganje podatkov …</string>
     <string name="reading_indexes">Nalaganje krajevnih podatkov …</string>
-    <string name="saving_gpx_tracks">Poteka shranjevanje sledi GPX na kartico SD …</string>
+    <string name="saving_gpx_tracks">Poteka shranjevanje datoteke GPX …</string>
     <string name="finished_task">Končano</string>
 
 
@@ -963,7 +1006,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="index_srtm_ele">Izris izohips</string>
     <string name="srtm_plugin_description">Vstavek omogoča prikaz izohips in senčenje hribovitih področij kot prekrivni zemljevid. Zmožnost je uporabna predvsem za pohodnike, športnike, raziskovalce in druge zanesenjake, ki si želijo, ali potrebujejo natančen prikaz na zemljevidu. 
 \n 
-\nSplošni podatki med 70 stopinjami severno in 70 južno so opredeljeni z meritvami SRTM (Shuttle Radar Topography Mission) in ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), napravo na satelitu Terra, ki je del NASINEGA sistema EOS (Earth Observing System). Satelit ASTER je razvit v sodelovanju med NASO, japonskim ministrstvom za ekonomijo, trgovino in industrijo (Trade and Industry – METI) in japonskim vesoljskimi sistemi (J-spacesystems).</string>
+\nGlobalni podatki (med 70° severno in 70° južno) temeljijo na meritvah SRTM (Shuttle Radar Topography Mission) in ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), instrumentu za slikanje na Terri, glavnem Nasinem opazovalnem satelitu. Naprava ASTER deluje s podporo ameriške agencije NASA, japonskega ministrstva za gospodarstvo, trgovino in industrijo (METI) in japonskega vesoljskega sistema (J-spacesystems).</string>
     <string name="srtm_plugin_name">Izohipse</string>
     <string name="download_select_map_types">Drugi zemljevidi</string>
     <string name="recording_context_menu_play">Predvajaj</string>
@@ -990,7 +1033,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="recording_context_menu_vrecord">Posnemi video zaznamek</string>
     <string name="recording_can_not_be_played">Posnetka ni mogoče predvajati</string>
     <string name="recording_context_menu_delete">Izbriši posnetek</string>
-    <string name="recording_is_recorded">Zvok oziroma video se snema. Za ustavitev pritisnite gumb ustavi na gradniku.</string>
+    <string name="recording_is_recorded">Zvok oziroma video se snema. Za ustavitev pritisnite gumb gradnika AV.</string>
     <string name="layer_recordings">Sloj posnetka</string>
     <string name="shared_string_control_start">Izmeri ↦</string>
 
@@ -1005,17 +1048,17 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="av_use_external_recorder">Uporabi zunanji snemalnik</string>
     <string name="av_settings_descr">Nastavi možnosti za zvok in video.</string>
     <string name="av_settings">Nastavitve za zvok in video</string>
-    <string name="recording_error">Med snemanjem je prišlo do napake </string>
+    <string name="recording_error">Snemanje je spodletelo</string>
     <string name="recording_camera_not_available">Kamera ni na voljo</string>
-    <string name="osmand_srtm_long_description_1000_chars">Ta vstavek omogoča prikaz izohips in reliefa pokrajine na shranjenih zemljevidih OsmAnd. Zmožnost je uporabna za športnike in pohodnike ter za vse, ki potrebujejo podatke o reliefu pokrajine.
+    <string name="osmand_srtm_long_description_1000_chars">Ta vstavek omogoča prikaz izohips in reliefa pokrajine na standardnih zemljevidih OsmAnd. Zmožnost je uporabna za športnike in pohodnike ter za vse, ki potrebujejo podatke o reliefu pokrajine. 
 \n 
-\nGlobalni podatki (med 70 stopinj severno in 70 stopinj južno) temeljijo na meritvah SRTM (Shuttle Radar Topography Mission) in ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), ki je instrument za slikanje na krovu Terre, vodilnega satelita Nasinega sistema za opazovanje. ASTER je prizadevanje za sodelovanje med ameriško NASO, japonskim ministrstvom za gospodarstvo, trgovino in industrijo (METI) in japonskim vesoljskim sistemom (J-spacesystems).</string>
+\nGlobalni podatki (med 70° severno in 70° južno) temeljijo na meritvah SRTM (Shuttle Radar Topography Mission) in ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), instrumentu za slikanje na Terri, glavnem Nasinem opazovalnem satelitu. Naprava ASTER deluje s podporo ameriške agencije NASA, japonskega ministrstva za gospodarstvo, trgovino in industrijo (METI) in japonskega vesoljskega sistema (J-spacesystems).</string>
     <string name="audionotes_location_not_defined">Mesto, ki naj bi ga povezali z zaznamkom, še ni določeno. Z možnostjo \"Uporabi mesto …\" je mogoče dodeliti zaznamek za določeno točko na zemljevidu.</string>
-    <string name="srtm_paid_version_msg">Razmislite o nakupu vstavka za prikaz izohips v trgovini Market in s tem podprite nadaljnji razvoj.</string>
+    <string name="srtm_paid_version_msg">Razmislite o nakupu vstavka za prikaz »Izohips« in s tem podprite nadaljnji razvoj.</string>
     <string name="srtm_paid_version_title">Vstavek Izohipse</string>
 
     <string name="intermediate_points_change_order">Spremeni vrstni red</string>
-    <string name="dropbox_plugin_description">Vstavek Dropbox omogoča usklajevanje datotek sledi in video/zvočnih zaznamkov z Dropboxovim uporabniškim računom.</string>
+    <string name="dropbox_plugin_description">Vstavek Dropbox omogoča usklajevanje datotek sledi in video/zvočnih zaznamkov z izbranim uporabniškim računom.</string>
     <string name="dropbox_plugin_name">Vstavek Dropbox</string>
     <string name="recording_context_menu_show">Pokaži</string>
     <string name="recording_photo_description">Fotografija %1$s %2$s</string>
@@ -1023,7 +1066,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="recording_context_menu_precord">Posnemi fotografijo</string>
     <string name="stop_routing_confirm">Ali ste prepričani, da želite prekiniti navigacijo?</string>
     <string name="clear_dest_confirm">Ali ste prepričani, da želite izbrisati celotno pot do cilja?</string>
-    <string name="precise_routing_mode_descr">Omogočite možnost za natančno izračunavanje poti. Možnost je še vedno omejena na točke, ki niso preveč oddaljene, storitev pa je tudi časovno zahtevnejša.</string>
+    <string name="precise_routing_mode_descr">Natančno izračunavanje poti še vedno omejujejo velike razdalje in čas.</string>
     <string name="precise_routing_mode">Natančno usmerjanje (preizkusno)</string>
     <string name="local_indexes_cat_av">Podatki zvoka/videa</string>
 
@@ -1066,7 +1109,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="install_paid">Polna različica</string>
     <string name="cancel_navigation">Prekini navigacijo</string>
     <string name="clear_destination">Izbriši cilj</string>
-    <string name="download_using_mobile_internet">Trenutno ni dejavne povezave WiFi. Ali želite nadaljevati prejem prek trenutno vzpostavljene povezave?</string>
+    <string name="download_using_mobile_internet">Trenutno ni dejavne povezave Wi-Fi. Ali želite nadaljevati prejem prek trenutno vzpostavljene povezave\?</string>
     <string name="delete_point">Izbriši točko</string>
     <string name="plugin_distance_point_time">čas</string>
     <string name="plugin_distance_point_hdop">natančnost</string>
@@ -1074,19 +1117,19 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="plugin_distance_point_ele">nadmorska višina</string>
     <string name="plugin_distance_point">Točka</string>
     <string name="gpx_file_name">Ime datoteke GPX</string>
-    <string name="gpx_saved_sucessfully">Datoteka GPX je uspešno shranjena v {0}</string>
+    <string name="gpx_saved_sucessfully">Datoteka GPX je shranjena v {0}</string>
     <string name="shared_string_do_not_show_again">Ne pokaži več</string>
     <string name="distance_measurement_start_editing">Začni z merjenjem razdalje</string>
     <string name="distance_measurement_finish_editing">Končaj določanje razdalje</string>
     <string name="distance_measurement_clear_route">Počisti vse točke določanja razdalj</string>
 
-    <string name="distance_measurement_load_gpx">Odpri obstoječo pot GPX</string>
+    <string name="distance_measurement_load_gpx">Odpri obstoječo datoteko GPX</string>
     <string name="context_menu_item_destination_point">Nastavi kot cilj</string>
     <string name="please_select_address">Najprej je treba izbrati kraj ali ulico</string>
-    <string name="search_street_in_neighborhood_cities">Iskanje ulice v sosednjih krajih</string>
+    <string name="search_street_in_neighborhood_cities">Iskanje ulice v sosednjih krajih ali mestih</string>
     <string name="intermediate_items_sort_return">Vmesni cilji so razvrščeni po vrsti na poti od trenutnega mesta do končnega cilja.</string>
-    <string name="local_osm_changes_backup_successful">Datoteka sprememb je uspešno ustvarjena %1$s</string>
-    <string name="local_osm_changes_backup_failed">Varnostna kopija sprememb za OSM je spodletela</string>
+    <string name="local_osm_changes_backup_successful">Datoteka sprememb je ustvarjena %1$s</string>
+    <string name="local_osm_changes_backup_failed">Ni mogoče ustvariti varnostne kopije sprememb za OSM</string>
     <string name="local_osm_changes_backup">Varnostna kopija sprememb za OSM</string>
     <string name="destination_point">Cilj %1$s</string>
 
@@ -1101,7 +1144,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="cancel_route">Opusti pot</string>
     <string name="monitoring_settings_descr">Nastavitve beleženja potovanj in poti.</string>
 
-    <string name="choose_osmand_theme_descr">Izbor teme programa.</string>
+    <string name="choose_osmand_theme_descr">Izbor videza programa.</string>
     <string name="choose_osmand_theme">Tema programa</string>
     <string name="accessibility_options">Možnosti dostopnosti</string>
     <string name="local_indexes_cat_srtm">Podatki izohips</string>
@@ -1130,7 +1173,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="speak_cameras">Hitrostne kamere</string>
     <string name="speak_traffic_warnings">Pometna opozorila</string>
 
-    <string name="osb_author_or_password_not_specified">V nastavitvah je treba določiti uporabniško ime in geslo za OSM</string>
+    <string name="osb_author_or_password_not_specified">V »Nastavitvah« je treba določiti uporabniško ime in geslo za OSM</string>
     <string name="clear_intermediate_points">Počisti vmesne cilje</string>
     <string name="keep_intermediate_points">Obdrži vmesne cilje</string>
     <string name="new_directions_point_dialog">Vmesni cilji so že nastavljeni.</string>
@@ -1167,7 +1210,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="local_index_tile_data_maxzoom">Največje približanje: %1$s</string>
     <string name="local_index_tile_data_minzoom">Najmanjše približanje: %1$s</string>
     <string name="local_index_tile_data_name">Podatki predmetov zemljevida: %1$s</string>
-    <string name="edit_tilesource_successfully">Vir predmetov zemljevida %1$s je uspešno shranjen.</string>
+    <string name="edit_tilesource_successfully">Vir predmetov zemljevida %1$s je shranjen.</string>
     <string name="edit_tilesource_elliptic_tile">Mercatorjeva projekcija</string>
     <string name="edit_tilesource_maxzoom">Največje približanje</string>
     <string name="edit_tilesource_expiration_time">Poteče (v minutah)</string>
@@ -1201,11 +1244,11 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="shared_string_delete_all">Izbriši vse</string>
     <string name="map_widget_map_rendering">Izrisovanje zemljevida</string>
     <string name="amenity_type_seamark">Pomorska oznaka</string>
-    <string name="app_modes_choose_descr">Izberite profile za uporabo, ki so vidni v programu.</string>
+    <string name="app_modes_choose_descr">Izbor profilov, prikazanih v programu.</string>
     <string name="app_modes_choose">Profili programa</string>
 
     <string name="guidance_preferences_descr">Nastavitve navigacije</string>
-    <string name="disable_complex_routing_descr">Onemogoči 2-fazno usmerjanje za avtomobilsko navigacijo.</string>
+    <string name="disable_complex_routing_descr">Onemogoči dvofazno usmerjanje za avtomobilsko navigacijo.</string>
     <string name="routing_preferences_descr">Nastavitve usmerjanja</string>
 
     <string name="speech_rate_descr">Določitev hitrosti govora za TTS.</string>
@@ -1240,7 +1283,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="lang_ko">Korejščina</string>
     <string name="lang_lv">Latvijščina</string>
     <string name="lang_lt">Litovščina</string>
-    <string name="lang_no">Norveščina</string>
+    <string name="lang_no">Norveški Bokmål</string>
     <string name="lang_pl">Poljščina</string>
     <string name="lang_pt">Portugalščina</string>
     <string name="lang_ro">Romunščina</string>
@@ -1295,7 +1338,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="always_center_position_on_map">Trenutno mesto naj bo vedno v središču</string>
     <string name="index_item_nation_addresses">Naslovi za celotno državo</string>
     <string name="lang_mr">Maratščina</string>
-    <string name="calculate_osmand_route_without_internet">Izračunanje odseka poti brez interneta</string>
+    <string name="calculate_osmand_route_without_internet">Izračunanje odseka poti brez povezave</string>
     <string name="gpx_option_calculate_first_last_segment">Izračunanje prvega in zadnjega odseka poti</string>
     <string name="use_displayed_track_for_navigation">Ali želite uporabiti prikazano sled za navigacijo?</string>
     <string name="route_preferences">Nastavitve poti</string>
@@ -1383,7 +1426,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="gpx_selection_point">Točka %1$s</string>
 
     <string name="gpx_selection_points">%1$s \nTočk</string>
-    <string name="gpx_file_is_empty">Sled GPX je brez podatkov</string>
+    <string name="gpx_file_is_empty">Datoteka GPX je brez podatkov</string>
 
     <string name="shared_string_tracks">Shranjene sledi</string>
     <string name="shared_string_my_places">Shranjene točke</string>
@@ -1422,7 +1465,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="shared_string_my_favorites">Shranjeni kraji</string>
     <string name="share_fav_subject">Priljubljene točke, ki so bile objavljene z OsmAnd</string>
     <string name="shared_string_share">Objavi</string>
-    <string name="import_file_favourites">Ali želite podatke shrani v datoteko GPX ali pa jih uvoziti kot vmesne točke med priljubljene?</string>
+    <string name="import_file_favourites">Ali želite podatke shrani v datoteko GPX ali uvoziti vmesne točke kot priljubljene\?</string>
 
     <string name="route_descr_destination">Cilj</string>
     
@@ -1432,7 +1475,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="minutes_ago">minut nazaj</string>
     <string name="hours_ago">ur nazaj</string>
     
-    <string name="none_selected_gpx">Ni izbranih datotek GPX. Datoteke je mogoče izbrati z zadržanim pritiskom na imenu želene sledi.</string>
+    <string name="none_selected_gpx">Ni izbranih datotek GPX. Datoteke je mogoče izbrati z zadržanim pritiskom na imenu sledi.</string>
     <string name="gpx_split_interval">Interval za razdelitev</string>
     
     
@@ -1451,8 +1494,8 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="enable_sleep_mode">Omogoči način delovanja GPS v ozadju</string>
     <string name="gps_wake_up_timer">Interval prebujanja GPS</string>
     <string name="sleep_mode_stop_dialog">Ali želite končati ozadnji način GPS?</string>
-    <string name="map_preferred_locale_descr">Prednostno uporabljeni jezik oznak na zemljevidu (če jezik ni na voljo, so uporabljene angleške ali krajevne oznake).</string>
-    <string name="map_preferred_locale">Jezik oznak na zemljevidu</string>
+    <string name="map_preferred_locale_descr">Prednostno uporabljeni jezik oznak na zemljevidu (če jezik ni na voljo, so uporabljene ali angleške ali krajevne oznake).</string>
+    <string name="map_preferred_locale">Prednostni jezik oznak na zemljevidu</string>
     <string name="local_map_names">Krajevna imena</string>
     <string name="lang_sw">Svahili</string>
     <string name="lang_he">Hebrejščina</string>
@@ -1574,14 +1617,14 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="map_widget_right">Desni pult</string>
     <string name="map_widget_left">Levi pult</string>
     <string name="shared_string_show">Pokaži</string>
-    <string name="configure_map">Nastavitve zemljevida</string>
+    <string name="configure_map">Možnosti zemljevida</string>
     <string name="search_radius_proximity">Znotraj</string>
     
     
-    <string name="anonymous_user_hint">Brezimni uporabnik ne more:
-- ustvariti skupin,
-- usklajevati skupin in naprav s strežnikom,
-- zasebno upravljati skupin in naprav prek spletnega vmesnika.</string>
+    <string name="anonymous_user_hint">Nevpisan uporabnik ne more:
+\n- ustvarjati skupin,
+\n- usklajevati skupin in naprav s strežnikom,
+\n- zasebno upravljati skupin in naprav prek spletnega vmesnika.</string>
     <string name="anonymous_user">Brezimni uporabnik</string>
     <string name="logged_as">Prijava kot %1$s</string>
     <string name="speed_limit_exceed">Upoštevanje omejitve hitrosti</string>
@@ -1625,7 +1668,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="coordinates">Koordinate</string>
     <string name="rendering_attr_transportStops_name">Postajališča javnega prevoza</string>
     <string name="use_opengl_render">Uporabi izrisovanje OpenGL</string>
-    <string name="use_opengl_render_descr">Uporabi strojno pospešeno izrisovanje OpenGL (na nekaterih napravah morda ne deluje).</string>
+    <string name="use_opengl_render_descr">Uporabi strojno pospešeno izrisovanje OpenGL (lahko vpliva porabo baterije, na nekaterih napravah morda tudi ne deluje).</string>
     <string name="home_button">Začetni zaslon</string>
     
     <string name="error_avoid_specific_road">Ni najdenih možnosti obvoza</string>
@@ -1637,7 +1680,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
 
 
     <string name="navigation_over_track">Ali želite začeti navigacijo po sledi?</string>
-    <string name="avoid_roads_msg">Izbor druge poti lahko določite tako, da izberete tiste poti, ki se jim želite izogniti.</string>
+    <string name="avoid_roads_msg">Izbor druge poti z izborom tistih, ki se jim želite izogniti</string>
     <string name="save_track_to_gpx_globally_headline">Shranjevanje sledi na zahtevo</string>
     <string name="parking_place">Parkirno mesto</string>
     <string name="remove_the_tag">ODSTRANI OZNAKO</string>
@@ -1646,7 +1689,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="version_settings">Nameščanje različic</string>
     <string name="rendering_attr_streetLighting_name">Pokaži ulično razsvetljavo</string>
     <string name="proxy_pref_title">Posredniški strežnik</string>
-    <string name="proxy_pref_descr">Nastavi posredniški strežnik.</string>
+    <string name="proxy_pref_descr">Nastavitev posredniškega strežnika.</string>
     <string name="settings_privacy">Zasebnost</string>
     <string name="shared_string_gpx_points">Točke</string>
 
@@ -1721,7 +1764,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="osmand_parking_overdue">prekoračen čas</string>
     <string name="shared_string_places">Kraji</string>
     <string name="watch">Poglej</string>
-    <string name="application_dir_change_warning3">Ali želite kopirati podatkovne datoteke tudi na novo ciljno mesto?</string>
+    <string name="application_dir_change_warning3">Ali želite kopirati podatkovne datoteke na novo ciljno mesto\?</string>
     <string name="specified_directiory_not_writeable">V navedeno mapo ni mogoče shraniti zemljevidov.</string>
     <string name="copying_osmand_file_failed">Kopiranje datotek je spodletelo.</string>
     <string name="storage_directory_external">Zunanje mesto za shranjevanje</string>
@@ -1741,9 +1784,9 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="shared_string_show_description">Pokaži opis.</string>
     <string name="agps_data_last_downloaded">Zadnja osvežitev podatkov A-GPS: %1$s</string>
     <string name="confirm_usage_speed_cameras">V mnogih državah (na primer v Nemčiji, Franciji, Italiji in drugih) je uporaba kamer za merjenje hitrosti prepovedana z zakonom. Razvijalci programa ne sprejemamo odgovornosti za tako rabo. Potrdite uporabo le, če ste res prepričani v svoje ravnanje.</string>
-    <string name="welmode_download_maps">Prejmi zemljevide</string>
+    <string name="welmode_download_maps">Posodobitve zemljevidov</string>
     <string name="welcome_select_region">Za pravilno prikazovanje prometnih določil mora biti izbran krajevni prometni režim. Trenutno dejaven je način:</string>
-    <string name="welcome_text">Program OsmAnd omogoča navigacijo s kakovostnimi brezplačnimi zemljevidi v načinu brez povezave.</string>
+    <string name="welcome_text">Program OsmAnd omogoča dostop do zemljevidov in navigacijo v načinu brez povezave.</string>
     <string name="current_route">Trenutna pot</string>
     <string name="osm_changes_added_to_local_edits">Spremembe nastavitev OSM so dodane med nastavitve.</string>
     <string name="mark_to_delete">Označi za brisanje</string>
@@ -1782,7 +1825,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
 \n
 \nVrnitev na običajni pogled je mogoče na dva načina. Ali odklopite prekrivni sloj ali pa spremenite slog zemljevida med »Nastavitvami zemljevida« v meniju."</string>
     
-    <string name="routing_attr_avoid_borders_description">Izogibanje prehodom meje z drugimi državami.</string>
+    <string name="routing_attr_avoid_borders_description">Izogni se mednarodnim mejnim prehodom</string>
     <string name="routing_attr_height_name">Omejitev višine</string>
     <string name="routing_attr_height_description">Določitev omejitve višine vozila za določeno pot.</string>
     <string name="use_fast_recalculation">Pametno preračunavanje poti</string>
@@ -1803,11 +1846,11 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="gps_network_not_enabled">Storitev določanja trenutnega mesta ni omogočena. Ali jo želite zagnati?</string>
     <string name="disable_recording_once_app_killed">Prepreči samostojno beleženje</string>
     <string name="disable_recording_once_app_killed_descrp">Možnost onemogoči beleženje GPX, ko program ni dejaven (preko nedavnih programov). To je možnost delovanja v ozadju, katere indikator se ne pojavi v obvestilni vrstici.</string>
-    <string name="download_wikipedia_files">Ali želite prejeti dodatne podatke iz Wikipedije (%1$s MB) ?</string>
+    <string name="download_wikipedia_files">Ali želite prejeti dodatne podatke iz Wikipedije (%1$s MB)\?</string>
     <string name="lang_vo">Volapik</string>
     <string name="lang_th">Tajščina</string>
     <string name="lang_te">Telugujščina</string>
-    <string name="lang_nn">Norveščina (Norsk)</string>
+    <string name="lang_nn">Norveški Norsk</string>
     <string name="lang_new">Nepalščina</string>
     <string name="lang_ms">Malajščina</string>
     <string name="lang_ht">Haitščina</string>
@@ -1816,7 +1859,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="lang_ceb">Cebuanščina</string>
     <string name="archive_wikipedia_data">Nameščeni so zastareli in nepodprti podatki iz Wikipedije. Ali jih želite arhivirati?</string>
     <string name="lang_es_ar">Španščina (argentinska)</string>
-    <string name="lang_nb">Norveščina (Bokmål)</string>
+    <string name="lang_nb">Norveški Bokmål</string>
     <string name="light_theme">Svetla</string>
     <string name="dark_theme">Temna</string>
     <string name="lang_pms">Pijemontščina</string>
@@ -1867,10 +1910,10 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="traffic_warning_hazard">Nevarnost</string>
     <string name="rendering_value_boldOutline_name">Poudarjen obris</string>
     <string name="no_updates_available">Ni posodobitev</string>
-    <string name="we_really_care_about_your_opinion">Vaš odziv je zelo pomemben, zato si želimo slišati vsa vaša mnenja in pripombe.</string>
+    <string name="we_really_care_about_your_opinion">Vaš odziv nam je zelo pomemben, zato si želimo slišati vaša mnenja in pripombe.</string>
     <string name="failed_to_upload">Pošiljanje je spodletelo</string>
     <string name="delete_change">Izbriši spremembe</string>
-    <string name="successfully_uploaded_pattern">Uspešno poslano {0}/{1}</string>
+    <string name="successfully_uploaded_pattern">Poslano {0}/{1}</string>
     <string name="try_again">Poskusi znova</string>
     <string name="error_message_pattern">Napaka: {0}</string>
     <string name="plugin_settings">Vstavki</string>
@@ -1905,9 +1948,9 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="please_specify_poi_type">Določiti je treba vrsto točke POI.</string>
     <string name="working_days">Delovni dnevi</string>
     <string name="recent_places">Nedavna mesta</string>
-    <string name="saved_at_time">Uspešno shranjeno ob: %1$s</string>
+    <string name="saved_at_time">Shranjeno ob: %1$s</string>
     <string name="poi_deleted_localy">Točka POI bo izbrisana po pošiljanju sprememb</string>
-    <string name="show_gpx">Pokaži GPX</string>
+    <string name="show_gpx">Pokaži podatke GPX</string>
     <string name="simulate_your_location_stop_descr">Zaustavi simuliranje položaja.</string>
     <string name="simulate_your_location_descr">Simuliraj trenutno točko z izračunano potjo oziroma s shranjeno potjo GPX.</string>
     <string name="show_on_start">Pokaži ob zagonu</string>
@@ -1918,22 +1961,22 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="roads">Poti</string>
     <string name="shared_string_trip_recording">Beleženje poti</string>
     <string name="shared_string_navigation">Navigacija</string>
-    <string name="osmand_running_in_background">Delovanje v ozadju</string>
+    <string name="osmand_running_in_background">Zaženi v ozadju</string>
     <string name="favourites_edit_dialog_title">Podrobnosti o točki</string>
-    <string name="favourites_context_menu_add">Dodaj priljubljeno</string>
+    <string name="favourites_context_menu_add">Dodaj med priljubljene</string>
     <string name="favorite_category_add_new">Dodaj novo</string>
     <string name="favorite_category_select">Izberi kategorijo</string>
     <string name="default_speed_system_descr">Določi enoto hitrosti.</string>
     <string name="default_speed_system">Enota hitrosti</string>
     <string name="nm">nmi</string>
-    <string name="si_nm">Morske milje</string>
+    <string name="si_nm">Navtične milje</string>
     <string name="si_kmh">Kilometri na uro</string>
     <string name="si_mph">Milje na uro</string>
     <string name="si_m_s">Metri na sekundo</string>
     <string name="si_min_km">Minute na kilometer</string>
     <string name="si_min_m">Minute na miljo</string>
     <string name="si_nm_h">Morske milje na uro (vozli)</string>
-    <string name="nm_h">nmi/h</string>
+    <string name="nm_h">voz</string>
     <string name="min_mile">min/m</string>
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>
@@ -1944,8 +1987,8 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="show_free_version_banner_description">Četudi imate plačljivo različico, še vedno lahko prikažete pasico brezplačne različice.</string>
     <string name="hillshade_layer_disabled">Senčenje terena je onemogočeno</string>
     <string name="buy">Nakup</string>
-    <string name="activate_seamarks_plugin">Omogočite vstavek pomorskih oznak</string>
-    <string name="activate_srtm_plugin">Omogočite vstavek SRTM</string>
+    <string name="activate_seamarks_plugin">Omogočite vstavek »Pomorske oznake«</string>
+    <string name="activate_srtm_plugin">Omogočite vstavek za prikaz reliefa »Izohipse«</string>
     <string name="later">Kasneje</string>
     <string name="get_full_version">Polna različica</string>
     <string name="regions">Območja</string>
@@ -1954,7 +1997,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="world_maps">Svetovni zemljevidi</string>
 
     <string name="downloads">Prejemi</string>
-    <string name="favorite_category_dublicate_message">Ime kategorije že obstaja. Izberite drugo ime.</string>
+    <string name="favorite_category_dublicate_message">Določiti je treba ime kategorije, ki še ne obstaja.</string>
     <string name="favorite_category_name">Ime kategorije</string>
     <string name="favorite_category_add_new_title">Dodaj kategorijo</string>
     <string name="confirm_download_roadmaps">Ali ste prepričani, da želite prejeti zemljevid le s podatki cest, čeprav je nameščen že polni zemljevid?</string>
@@ -1977,31 +2020,31 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="new_version">Nova različica</string>
     <string name="begin_with_osmand_menu_group">Prvi koraki z OsmAnd</string>
     <string name="features_menu_group">Zmožnosti</string>
-    <string name="help_us_to_improve_menu_group">Pomagajte nam izboljšati program</string>
+    <string name="help_us_to_improve_menu_group">Pomagajte izboljšati program OsmAnd</string>
     <string name="other_menu_group">Drugo</string>
     <string name="plugins_menu_group">Vstavki</string>
-    <string name="first_usage_item">Prva uporaba</string>
+    <string name="first_usage_item">Pred začetkom uporabe</string>
     <string name="first_usage_item_description">Kako prejeti zemljevide in prikrojiti osnovne nastavitve.</string>
-    <string name="navigation_item_description">Nastavitve navigacije</string>
+    <string name="navigation_item_description">Prilagajanje možnosti načrtovanja poti in navigacije.</string>
     <string name="faq_item">Pogosta vprašanja</string>
     <string name="faq_item_description">Pogosto zastavljena vprašanja</string>
     <string name="map_viewing_item">Pogled zemljevida</string>
     <string name="search_on_the_map_item">Iskanje po zemljevidu</string>
-    <string name="planning_trip_item">Planiranje potovanja</string>
+    <string name="planning_trip_item">Načrtovanje potovanj</string>
 
     
     <string name="instalation_troubleshooting_item">Namestitev in odpravljanje napak</string>
-    <string name="techical_articles_item">Tehnični članki</string>
+    <string name="techical_articles_item">Tehnični prispevki o možnostih programa</string>
     <string name="versions_item">Različice</string>
     <string name="feedback">Anketa</string>
-    <string name="contact_us">Stik z nami</string>
+    <string name="contact_us">Pišite nam</string>
     <string name="world_map_download_descr">Osnovni svetovni zemljevid (zemljevid sveta pri oddaljenem pogledu) je zastarel, ali pa ni nameščen. Brez tega zemljevida prikaz ni popoln.</string>
     <string name="simulate_initial_startup_descr">Nastavi zastavico, ki določa prvi zagon programa, ostale nastavitve pa ostanejo nespremenjene.</string>
     <string name="show_on_start_description">Onemogočena možnost zažene program v pogledu zemljevida.</string>
     <string name="enter_country_name">Vpis imena države</string>
 
 
-    <string name="map_legend">Legenda zemljevida</string>
+    <string name="map_legend">Legenda oznak na zemljevidu</string>
 <string name="shared_string_update">Posodobitev</string>
     
     
@@ -2036,9 +2079,9 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
 	<string name="osn_comment_dialog_title">Dodaj opombo</string>
 	<string name="osn_reopen_dialog_title">Ponovno odpri opombo</string>
 	<string name="osn_close_dialog_title">Zapri opombo</string>
-	<string name="osn_add_dialog_success">Opomba je uspešno ustvarjena</string>
+	<string name="osn_add_dialog_success">Opomba je ustvarjena</string>
 	<string name="osn_add_dialog_error">Opombe ni mogoče ustvariti</string>
-	<string name="osn_close_dialog_success">Opomba je uspešno zaprta</string>
+	<string name="osn_close_dialog_success">Opomba je zaprta</string>
 	<string name="osn_close_dialog_error">Opombe ni mogoče zapreti</string>
 	<string name="shared_string_commit">Uveljavi</string>
 	
@@ -2071,7 +2114,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="route_distance">Razdalja:</string>
     <string name="route_duration">Čas:</string>
     <string name="update">Posodobi vsakih</string>
-    <string name="only_download_over_wifi">Prejmi le preko WiFi</string>
+    <string name="only_download_over_wifi">Prejmi le prek WiFi</string>
     <string name="live_update">Posodobitev v živo</string>
     <string name="update_now">Posodobi takoj</string>
     <string name="missing_write_external_storage_permission">Dovoljenja onemogočajo programu uporabo kartice SD</string>
@@ -2115,7 +2158,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="number_of_edits">Število urejanj</string>
     <string name="reports_for">Poročilo za</string>
 <string name="shared_string_remove">Odstrani</string>
-    <string name="clear_updates_proposition_message">Posodobitve zemljevidov je mogoče izbrisati in povrniti stanje na izvorni zemljevid.</string>
+    <string name="clear_updates_proposition_message">Odstrani prejete posodobitve in povrniti stanje na izvorni zemljevid</string>
     <string name="add_time_span">Dodaj časovni razmik</string>
     <string name="road_blocked">Cesta je zaprta</string>
     <string name="rendering_attr_hideUnderground_name">Ne izriši podzemnih zgradb</string>
@@ -2141,17 +2184,15 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="map_marker_2nd">Druga označba na zemljevidu</string>
     <string name="shared_string_toolbar">Orodna vrstica</string>
     <string name="shared_string_widgets">Gradniki</string>
-    <string name="add_points_to_map_markers_q">Ali želite dodati vse točke k označbam zemljevida?</string>
+    <string name="add_points_to_map_markers_q">Ali želite dodati vse točke na zemljevid kot označbe\?</string>
     <string name="shared_string_add_to_map_markers">Dodaj med označbe zemljevida</string>
-    <string name="consider_turning_polygons_off">Priporočljivo je onemogočiti izrisovanje poligonov.</string>
+    <string name="consider_turning_polygons_off">Priporočljivo je onemogočiti izrisovanje večkotnikov.</string>
     <string name="select_map_marker">Izbor označbe na zemljevidu</string>
     <string name="map_markers_other">Druge označbe</string>
     <string name="download_files_error_not_enough_space">Ni dovolj prostora!
  Možnost zahteva {3} MB začasnega in {1} MB trajnega pomnilnika.
  Na voljo je le {2} MB prostora.</string>
-    <string name="download_files_question_space_with_temp">Ali res želite prejeti datoteke {0}?
- Prejem zahteva {3} MB začasnega in {1} MB trajnega pomnilnika.
- (Na voljo je le {2} MB.)</string>
+    <string name="download_files_question_space_with_temp">Ali res želite prejeti datoteke ({0})\? Prejem zahteva {3} MB začasnega in {1} MB stalnega prostora (na napravi je na voljo {2} MB).</string>
     <string name="upload_osm_note_description">Opombo OSM je mogoče poslati brezimno, ali pa prek profila OpenStreetMap.org.</string>
     <string name="upload_osm_note">Pošlji Opombo OSM</string>
     <string name="upload_anonymously">Pošlji anonimno</string>
@@ -2162,9 +2203,8 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="number_of_recipients">Število prejemnikov</string>
     <string name="osm_user_stat">Urejanj: %1$s, rang: %2$s, skupno urejanj: %3$s</string>
     <string name="osm_editors_ranking">Rangiranje urednikov OSM</string>
-    <string name="osm_live_subscription">Naročila OSM</string>
-    <string name="osm_live_email_desc">Podatke potrebujemo za posredovanje
-\npodrobnosti o potrjenih objavah.</string>
+    <string name="osm_live_subscription">Naročnina na storitev OsmAnd Live</string>
+    <string name="osm_live_email_desc">Uporabljeno za posredovanje podatkov o izvajalcih posodobitev.</string>
     <string name="osm_live_user_public_name">Javno ime</string>
     <string name="osm_live_hide_user_name">V poročilih ne pokaži mojega imena</string>
     <string name="osm_live_support_region">Podpora regiji</string>
@@ -2172,20 +2212,20 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="osm_live_month_cost_desc">Mesečno plačilo</string>
     <string name="osm_live_active">Dejaven</string>
     <string name="osm_live_not_active">Nedejaven</string>
-    <string name="osm_live_enter_email">Vpišite veljavni elektronski naslov</string>
+    <string name="osm_live_enter_email">Vpišite veljaven elektronski naslov</string>
     <string name="osm_live_enter_user_name">Vpišite naziv ali ime, ki bo prikazano javno</string>
-    <string name="osm_live_thanks">Zahvaljujemo se vam za naročilo\nna sprotne posodobitve!</string>
+    <string name="osm_live_thanks">Zahvaljujemo se vam za podporo storitev OsmAnd!
+\nZa dostop do vseh zmožnosti je treba program znova zagnati.</string>
     <string name="osm_live_region_desc">Del donacije bo posredovan uporabnikom OSM, ki objavljajo spremembe zemljevidov v vaši najpogosteje uporabljeni regiji.</string>
     <string name="osm_live_subscription_settings">Nastavitve naročil</string>
-    <string name="osm_live_ask_for_purchase">Najprej je treba kupiti
-\nnaročnino na OSM v živo.</string>
+    <string name="osm_live_ask_for_purchase">Najprej se je treba naročiti na storitve OsmAnd Live.</string>
 
     <string name="shared_string_topbar">Vrhnja vrstica</string>
     <string name="avoid_road">Izogni se cesti</string>
     <string name="shared_string_move_up">Premakni ↑</string>
     <string name="shared_string_move_down">Premakni ↓</string>
     <string name="finish_navigation">Končaj navigacijo</string>
-    <string name="storage_directory_readonly_desc">Trenutno do dovoljenja podatkovne mape le za branje, zato je začasno prestavljen na notranji pomnilnik. Izbrati je priporočljivo ustrezno in veljavno mapo za podatke.</string>
+    <string name="storage_directory_readonly_desc">Izbrana mapa za shranjevanje je označena le za branje, zato so datoteke prestavljene na notranji pomnilnik. Izbrati je treba stalno veljavno zapisljivo mapo za podatke.</string>
     <string name="storage_directory_shared">Pomnilnik v souporabi</string>
     <string name="report">Poročilo</string>
     <string name="storage_permission_restart_is_required">Sedaj je mogoče program uporabljati tako, da zapisuje podatke na zunanji nosilec. Poseg zahteva ponovni zagon programa.</string>
@@ -2195,18 +2235,17 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
 <string name="no_map_markers_found">Ni nobene določene označbe</string>
     <string name="no_waypoints_found">Ni vmesnih točk</string>
     
-    <string name="osm_live_header">Prijava omogoča dostop do urnih posodobitev vseh zemljevidov sveta.
-Del prihodka se vrne skupnosti OSM in se izplačuje za vsako opravljeno dejavnost. Če sta vam OsmAnd in OSM všeč, je to dober način za začetek sodelovanja.</string>
+    <string name="osm_live_header">Prijava omogoča dostop do urnih posodobitev vseh zemljevidov sveta. Del prihodka se vrne v skupnost OSM in se izplačuje za vsako opravljeno dejavnost oziroma podporo. Če sta vam OsmAnd in OSM všeč in bi želeli projekt podpreti, je to dober način za začetek sodelovanja.</string>
     
     <string name="rendering_value_thin_name">Tanko</string>
     <string name="rendering_value_medium_name">Srednje</string>
     <string name="rendering_value_bold_name">Krepko</string>
     <string name="access_disable_offroute_recalc">Ne preračunavaj poti, če navigacija skrene s poti</string>
-    <string name="access_disable_offroute_recalc_descr">Prepreči samodejno preračunavanje poti, ko je trenutna navigacija daleč od začrtane poti.</string>
+    <string name="access_disable_offroute_recalc_descr">Prepreči preračunavanje poti pri večjem odstopanju od začrtane poti.</string>
     <string name="access_disable_wrong_direction_recalc">Ne spreminjaj začrtane poti, če je trenutna smer v obratni smeri poti</string>
-    <string name="access_disable_wrong_direction_recalc_descr">Prepreči samodejno preračunavanje poti, ko je trenutno gibanje v nasprotni smeri.</string>
+    <string name="access_disable_wrong_direction_recalc_descr">Prepreči preračunavanje poti pri gibanju v nasprotni smeri vodenja.</string>
     <string name="access_smart_autoannounce">Pametno napovedovanje</string>
-    <string name="access_smart_autoannounce_descr">Napovej obvestilo le, če je spremenjena ciljna točka.</string>
+    <string name="access_smart_autoannounce_descr">Napovej obvestilo le, če se spremeni smer do ciljne točke.</string>
     <string name="access_autoannounce_period">Obdobje napovedovanja</string>
     <string name="access_autoannounce_period_descr">Najmanjši časovni razmik med najavami.</string>
     <string name="access_default_color">Privzeta barva</string>
@@ -2229,9 +2268,9 @@ Del prihodka se vrne skupnosti OSM in se izplačuje za vsako opravljeno dejavnos
     <string name="map_widget_bearing">Relativna smer</string>
     <string name="access_no_destination">Ciljno mesto še ni določeno</string>
     <string name="map_widget_magnetic_bearing">Smer po magnetnem polju</string>
-    <string name="use_osm_live_routing_description">Omogoči navigacijo za spremembe OSM v živo.</string>
-	<string name="use_osm_live_routing">Navigacija OSM v živo</string>
-    <string name="follow_us">Sledi nam</string>
+    <string name="use_osm_live_routing_description">Omogoči navigacijo z uporabo storitve OsmAnd Live.</string>
+	<string name="use_osm_live_routing">Navigacija s storitvijo OsmAnd Live</string>
+    <string name="follow_us">Sledite nam</string>
     <string name="access_direction_audio_feedback">Zvočno najavljanje smeri</string>
     <string name="access_direction_audio_feedback_descr">Določi smer ciljne točke z zvokom.</string>
     <string name="access_direction_haptic_feedback">Vibracijsko najavljanje smeri</string>
@@ -2285,22 +2324,22 @@ Del prihodka se vrne skupnosti OSM in se izplačuje za vsako opravljeno dejavnos
     <string name="no_inet_connection_desc_map">Zahtevano je prejemanje zemljevidov</string>
     <string name="search_location">Iskanje mesta …</string>
     <string name="storage_free_space">Razpoložljiv prostor</string>
-    <string name="storage_place_description">Shranjevanje podatkov OsmAnd (zemljevidi, sledi in drugo): %1$s.</string>
+    <string name="storage_place_description">Shranjevanje podatkov OsmAnd (zemljevidi, datoteke GPX in drugo): %1$s.</string>
     <string name="give_permission">Dodeli dovoljenje</string>
     <string name="allow_access_location">Dovoli dostop do mesta</string>
-    <string name="first_usage_greeting">Pridobi mesta in razišči nove kraje brez internetne povezave</string>
+    <string name="first_usage_greeting">Navigacija in spoznavanje novih krajev tudi brez internetne povezave</string>
     <string name="search_my_location">Najdi moje mesto</string>
     <string name="no_update_info">Ne pokaži posodobitev</string>
     <string name="update_all_maps_now">Ali želite posodobiti vse zemljevide?</string>
     <string name="clear_tile_data">Počisti vse sličice</string>
     <string name="skip_map_downloading_desc">Nameščenega ni nobenega zemljevida za delo brez povezave. Izbrati je mogoče zemljevid s seznama, ali pa ga prejeti preko menija »%1$s«.</string>
-    <string name="first_usage_wizard_desc">Naj program OsmAnd določi trenutno mesto in predlaga zemljevid za prejem.</string>
+    <string name="first_usage_wizard_desc">Zemljevidi za prejem so predlagani po podatkih trenutnega mesta.</string>
     <string name="no_update_info_desc">Ne preverjaj za posodobitve programa OsmAnd in drugih ugodnosti.</string>
     <string name="donation_to_osm">Doniraj skupinosti OpenStreetMap</string>
     <string name="get_it">Pridobi</string>
     <string name="get_for">Pridobi za %1$s</string>
     <string name="get_for_month">Pridobi za %1$s na mesec</string>
-    <string name="si_mi_meters">Milje / Metri</string>
+    <string name="si_mi_meters">Milje/Metri</string>
     <string name="lang_kab">Kabili</string>
     <string name="driving_region_australia">Avstralija</string>
     <string name="shared_string_filters">Filtri</string>
@@ -2311,8 +2350,8 @@ Del prihodka se vrne skupnosti OSM in se izplačuje za vsako opravljeno dejavnos
     <string name="new_filter_desc">Vpisati je treba ime novega filtra, ki se bo pojavilo na seznamu »kategorij«.</string>
     <string name="osm_live_payment_desc">Naročnina se obračuna mesečno. kadarkoli jo je mogoče preklicati prek Google Play.</string>
     <string name="donation_to_osm_desc">Del donacije se prenese uporabnikom OSM, ki so objavljali posodobitve na spletišču OpenStreetMap. Vsota naročnine ostaja nespremenjena.</string>
-    <string name="osm_live_subscription_desc">Naročnina omogoča urne, dnevne ali tedenske posodobitve in neomejene prejeme kateregakoli zemljevida.</string>
-    <string name="osm_live_banner_desc">Pridobite si neomejen dostop do zemljevidov in drugih posodobitev več kot le enkrat mesečno: tedensko, dnevno ali vsako uro.</string>
+    <string name="osm_live_subscription_desc">Naročnina omogoča urne, dnevne ali tedenske posodobitve in neomejene prejeme vseh zemljevidov.</string>
+    <string name="osm_live_banner_desc">Pridobite si neomejen dostop do zemljevidov in drugih posodobitev: ne le enkrat mesečno, ampak tedensko, dnevno ali kar vsako uro.</string>
     <string name="osmand_plus_banner_desc">Neomejene posodobitve zemljevidov, programske posodobitve in vstavek za Wikipedijo.</string>
     <string name="edit_filter">Uredi kategorije</string>
     <string name="subcategories">Podkategorije</string>
@@ -2351,9 +2390,9 @@ Del prihodka se vrne skupnosti OSM in se izplačuje za vsako opravljeno dejavnos
     <string name="rendering_attr_contourColorScheme_name">Barvna shema izohips</string>
     <string name="upload_poi">Pošlji točko POI</string>
     <string name="route_calculation">Izračunavanje poti</string>
-    <string name="gpx_no_tracks_title">Ni še shranjenih poti</string>
-    <string name="gpx_no_tracks_title_folder">Poti so shranjene v mapi</string>
-    <string name="gpx_add_track">Dodaj pot</string>
+    <string name="gpx_no_tracks_title">Ni še shranjenih datotek GPX</string>
+    <string name="gpx_no_tracks_title_folder">Datoteke GPX je mogoče dodati tudi v mapo</string>
+    <string name="gpx_add_track">Dodaj več …</string>
     <string name="gpx_appearance">Videz</string>
     <string name="rendering_value_fine_name">Drobno</string>
     <string name="route_roundabout_short">Pojdite na %1$d izhod in nadaljujte</string>
@@ -2383,9 +2422,9 @@ Del prihodka se vrne skupnosti OSM in se izplačuje za vsako opravljeno dejavnos
     <string name="quick_action_add_poi">Dodaj točko POI</string>
     <string name="quick_action_map_style">Spremeni slog zemljevida</string>
     <string name="quick_action_map_style_switch">Slog zemljevida je spremenjen na »%s«.</string>
-    <string name="quick_action_take_audio_note">Zabeleži zvočno sporočilo</string>
-    <string name="quick_action_take_video_note">Zabeleži video sporočilo</string>
-    <string name="quick_action_take_photo_note">Zabeleži slikovno sporočilo</string>
+    <string name="quick_action_take_audio_note">Novo zvočno sporočilo</string>
+    <string name="quick_action_take_video_note">Novo video sporočilo</string>
+    <string name="quick_action_take_photo_note">Novo slikovno sporočilo</string>
     <string name="quick_action_add_osm_bug">Vpiši opombo OSM</string>
     <string name="quick_action_add_gpx">Dodaj vmesno točko GPX</string>
     <string name="quick_action_add_parking">Dodaj parkirno mesto</string>
@@ -2474,7 +2513,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     
     
     <string name="routing_attr_height_obstacles_name">Uporabi podatke višine</string>
-    <string name="routing_attr_height_obstacles_description">Uporabi podatke višine terena po SRTM, ASTER in EU-DEM.</string>
+    <string name="routing_attr_height_obstacles_description">Faktor podatkov spreminjanja višine terena (po podatkih SRTM, ASTER in EU-DEM).</string>
 
     <string name="routing_attr_driving_style_name">Način vožnje</string>
     
@@ -2524,7 +2563,10 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="analyze_on_map">Preuči na zemljevidu</string>
     <string name="fonts_header">Pisave zemljevida</string>
     <string name="shared_string_paused">V premoru</string>
-    <string name="osmand_extended_description_part7">Sodelujte pri razvoju OSM • Pošiljajte poročila o hroščih • Objavljajte sledi GPX za OSM neposredno iz programa • Dodajajte točke POI in jih neposredno pošiljajte na strežnik OSM (z zamikom, če ni vzpostavljene povezave)</string>
+    <string name="osmand_extended_description_part7">Sodelujte pri razvoju OSM
+\n• Pošiljajte poročila o hroščih
+\n• Objavljajte sledi GPX za OSM neposredno iz programa
+\n• Dodajajte točke POI in jih neposredno pošiljajte na strežnik OSM (z zamikom, če ni vzpostavljene povezave)</string>
     <string name="shared_string_overview">Pregled</string>
     
     <string name="shared_string_in_name">v %1$s</string>
@@ -2541,8 +2583,22 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="change_color">Spremeni barvo</string>
     <string name="edit_name">Uredi ime</string>
     <string name="select_street">Izbor ulice</string>
-    <string name="osmand_extended_description_part4">Smučanje Smučarski zemljevidi OsmAnd omogočajo pregled prog in ocenjene ravni zahtevnosti, na voljo pa so tudi podatki o postavitvi žičnic in drugih pomembnih zgradbah.</string>
-    <string name="osmand_plus_extended_description_part8">"Približna pokritost zemljevidov in kakovost podatkov: • Zahodna Evropa: **** • Vzhodna Evropa: *** • Rusija: *** • Severna Amerika: *** • Južna Amerika: ** • Azija:  • Japonska &amp; Koreja: *** • Bližnji Vzhod: ** • Afrika: ** • Anketarica: * Zemljevidi večine držav so na voljo za prejem! Od Afganistana to Zimbabveja, od Avstralije do Združenih držav. Argentina, Brazilija, Kanada, Francija, Nemčija, Mehika, Združeno kraljestvo, Španija …"</string>
+    <string name="osmand_extended_description_part4">Smučanje
+\nSmučarski zemljevidi OsmAnd omogočajo pregled prog in ocenjene ravni zahtevnosti, na voljo pa so tudi podatki o postavitvi žičnic in drugih pomembnih zgradbah.</string>
+    <string name="osmand_plus_extended_description_part8">Približna pokritost zemljevidov in kakovost podatkov:
+\n• Zahodna Evropa: ****
+\n• Vzhodna Evropa: ***
+\n• Rusija: ***
+\n• Severna Amerika: ***
+\n• Južna Amerika: **
+\n• Azija: **
+\n• Japonska &amp; Koreja: ***
+\n• Bližnji Vzhod: **
+\n• Afrika: **
+\n• Antarktika: *
+\nZemljevidi večine držav so na voljo za prejem!
+\nOd Afganistana to Zimbabveja, od Avstralije do Združenih držav. Argentina, Brazilija, Kanada, Francija, Nemčija, Mehika, Združeno kraljestvo, Španija, Slovenija …
+\n</string>
     <string name="save_poi_too_many_uppercase">V imenu je preveč velikih črk. Ali želite vseeno nadaljevati?</string>
     <string name="restart_search">Ponovno začni iskanje</string>
     <string name="increase_search_radius">Povečaj območje iskanja</string>
@@ -2576,7 +2632,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="animate_my_location">Animiraj trenutno mesto</string>
     <string name="animate_my_location_desc">Omogoči animiranje trenutnega mesta med navigacijo.</string>
     <string name="quick_action_auto_zoom_desc">S pritiskom na gumb dejanj se preklopi prikaz samodejnega približevanja zemljevida glede na hitrost gibanja.</string>
-    <string name="quick_action_replace_destination_desc">S pritiskom na gumb dejanj se zamenja trenutno ciljno mesto z mestom na sredini zaslona.</string>
+    <string name="quick_action_replace_destination_desc">S pritiskom na gumb dejanj se zamenja trenutno ciljno mesto (če je to določeno) z mestom, ki je trenutno na sredini zaslona.</string>
     <string name="subscribe_email_desc">Naročite se na dopisni seznam o popustih programa in si pridobite tri dodatne prejeme zemljevidov!</string>
     <string name="depth_contour_descr">Izobate morske gladine in navtične točke.</string>
     <string name="sea_depth_thanks">Zahvaljujemo se vam za nakup »Navtičnega zemljevida« z reliefom morskega dna.</string>
@@ -2584,12 +2640,12 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="index_item_depth_points_southern_hemisphere">Navtične globinske točke južne poloble</string>
     <string name="index_item_depth_points_northern_hemisphere">Navtične globinske točke severne poloble</string>
     <string name="download_depth_countours">Navtični relief globine</string>
-    <string name="route_is_too_long_v2">Preračunavanje poti je lahko zelo dolgotrajno. V kolikor izračun ne bo končan v 10 minutah, vstavite nekaj vmesnih točk.</string>
+    <string name="route_is_too_long_v2">V kolikor pot pri daljših potovanjih ni ugotovljena v roku 10 minutah, vstavite nekaj vmesnih točk.</string>
     <string name="open_mapillary">Odpri Mapillary</string>
     <string name="hillshade_menu_download_descr">Za prikaz senčenja reliefa na zemljevidu je treba namestiti prekrivno plast senčenja za to območje.</string>
     <string name="hillshade_purchase_header">Za prikaz senčenja reliefa na zemljevidu, je treba kupiti in namestiti vstavek Izohipse.</string>
     <string name="hide_from_zoom_level">Skrij od ravni približanja</string>
-    <string name="srtm_menu_download_descr">Orejmi zemljevid reliefa za to območje.</string>
+    <string name="srtm_menu_download_descr">Prejmi zemljevid reliefa za to območje.</string>
     <string name="srtm_purchase_header">Za prikaz reliefa na zemljevidu, je treba kupiti in namestiti vstavek »Izohipse«.</string>
     <string name="show_from_zoom_level">Prikaži od ravni približanja</string>
     <string name="display_zoom_level">Raven približanja: %1$s</string>
@@ -2610,7 +2666,12 @@ Koda predstavlja območje: %1$s x %2$s</string>
 \n • Beležijo se podatki hitrosti in spremembe višine
 \n • Možnost shranjevanja poti GPX omogoča beleženje in izmenjavo poti
 \n • Prek dodatnih vstavkov je mogoče prikazati tudi izohipse terena in senčenje hribovitih predelov</string>
-    <string name="osmand_plus_extended_description_part5">Varnostne možnosti • Izbirno preklapljanje dnevno-nočnega pogleda • Nastavitev prikaza omejitev hitrosti z možnostjo opozoril v primeru prekoračitev • Prilagajanje približanja zemljevida glede na hitrost vožnje • Skupinsko objavljanje podatkov o trenutni točki za lažje iskanje med prijatelji</string>
+    <string name="osmand_plus_extended_description_part5">Varnostne možnosti
+\n• Izbirno preklapljanje dnevno-nočnega prikaza
+\n• Nastavitev prikaza omejitev hitrosti z možnostjo opozoril v primeru prekoračitev
+\n• Samodejno prilagajanje približanja zemljevida glede na hitrost vožnje
+\n• Skupinsko objavljanje podatkov o trenutni točki za lažje iskanje med prijatelji
+\n</string>
     <string name="shared_string_reset">Ponastavi</string>
     <string name="shared_string_reload">Ponovno naloži</string>
     <string name="mapillary_menu_descr_tile_cache">Ponovno posodobi sličice zemljevida.</string>
@@ -2618,12 +2679,12 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="wrong_user_name">Napačno uporabniško ime</string>
     <string name="shared_string_to">Za</string>
     <string name="mapillary_menu_date_from">Od</string>
-    <string name="mapillary_menu_descr_dates">Pogled le dodanih slik</string>
+    <string name="mapillary_menu_descr_dates">Pokaži le sličice navedenega uporabnika</string>
     <string name="mapillary_menu_title_dates">Datum</string>
     <string name="mapillary_menu_edit_text_hint">Uporabniško ime</string>
-    <string name="mapillary_menu_descr_username">Pogled le dodane s strani</string>
+    <string name="mapillary_menu_descr_username">Pokaži le sličice uporabnika</string>
     <string name="mapillary_menu_title_username">Uporabniško ime</string>
-    <string name="mapillary_menu_filter_description">Filtriranje slik po datumu in uporabniku. Filtri so dejavni le pri največji povečavi.</string>
+    <string name="mapillary_menu_filter_description">Sličice je mogoče filtrirati po datumu, vrsti in avtorju. Filtri so dejavni le pri največji povečavi.</string>
     <string name="store_tracks_in_monthly_directories">Shrani zabeležene sledi v mapah, razdeljenih po mesecih</string>
     <string name="store_tracks_in_monthly_directories_descrp">Sledi so shranjene v podmape, poimenovane po mesecu zapisa (npr. 2018-01).</string>
     <string name="average">Povprečje</string>
@@ -2643,14 +2704,28 @@ Koda predstavlja območje: %1$s x %2$s</string>
 \n • Ciljne točke je mogoče iskati po naslovu, po vrsti (na primer parkirišče, restavracija, hotel, bencinska črpalka, muzej ...) ali pa z vpisom koordinat
 \n • Podpira vpis vmesnih točk na poti
 \n • Omogočeno je beleženje sledi in shranjevanje v zapis GPX</string>
-    <string name="osmand_extended_description_part3">Zemljevid • Prikaz točk POI (point of interests) v bližini • Prilagajanje zemljevida smeri gibanja (ali kompasa) • Prikaz trenutne točke in smer gledanja • Objava trenutnega mesta, da vas prijatelji hitreje najdejo • Shranjevanje najpomembnejših mest med Priljubljenimi točkami • Omogoča izbiro prikaza imen krajev na zemljevidu: angleško, krajevno oziroma fonetično zapisano ime • Prikaz posebnih spletnih zemljevidov, kot so satelitski posnetki (Bing) in različnih prekrivnih plasti, kot so sledi GPX, izohipse in drugo</string>
+    <string name="osmand_extended_description_part3">Zemljevid
+\n• Prikaz točk POI (point of interests) v bližini
+\n• Prilagajanje zemljevida smeri gibanja (ali kompasa)
+\n• Prikaz trenutne točke in smeri gledanja
+\n• Objava trenutnega mesta, da vas prijatelji hitreje najdejo
+\n• Shranjevanje najpomembnejših mest med Priljubljenimi točkami
+\n• Omogoča izbiro prikaza imen krajev na zemljevidu: angleško, krajevno oziroma fonetično zapisano ime
+\n• Prikaz posebnih spletnih zemljevidov, kot so satelitski posnetki (Bing) in različnih prekrivnih plasti, kot so sledi GPX, izohipse in drugo</string>
     <string name="osmand_extended_description_part6">Pohodništvo, sprehodi in raziskovanje mest
 \n • Na zemljevidu so posebej poudarjene pešpoti
 \n • Povezave na spletne strani Wikipedije so odličen pripomoček za raziskovanje mesta
 \n • Postaje javnih prevozov (avtobus, tramvaj, vlak) in nazivi tras omogočajo hitro orientacijo v mestu
 \n • Navigacija GPS v načinu za pešce preračuna pot po pešpoteh
 \n • Sledi poti GPX je mogoče shraniti in prikazati za sledenje</string>
-    <string name="osmand_plus_extended_description_part4">Uporaba podatkov OSM in Wikipedije • Kakovostni podatki dveh najboljših sodelovalnih projektov na svetu • Podatki OSM so na voljo po državah ali regijah • Točke POI prek Wikipedije so odličen pripomoček za ogledovanje znamenitosti • Neomejeni prejemi posodobitev neposredno iz programa • Skrčeni vektorski zemljevidi za delo brez povezave se posodabljajo vsaj enkrat mesečno • Možnost izbire med popolnimi podatki območja ali pa zgolj cestnega omrežja (primer: zemljevid Japonske zasede 700 MB, japonsko cestno omrežje pa zgolj 200 MB)</string>
+    <string name="osmand_plus_extended_description_part4">Uporaba podatkov OSM in Wikipedije
+\n• Kakovostni podatki dveh najboljših sodelovalnih projektov na svetu
+\n• Podatki OSM so na voljo po državah ali regijah
+\n• Točke POI prek Wikipedije so odličen pripomoček za ogledovanje znamenitosti
+\n• Neomejeni prejemi posodobitev neposredno iz programa
+\n• Skrčeni vektorski zemljevidi za delo brez povezave se posodabljajo vsaj enkrat mesečno
+\n
+\n• Možnost izbire med popolnimi podatki območja ali pa zgolj cestnega omrežja (primer: zemljevid Japonske zasede 700 MB, japonsko cestno omrežje pa zgolj 200 MB)</string>
     <string name="min_max">Najmanj/Največ</string>
     <string name="osmand_extended_description_part8">OsmAnd je odprtokodni program, ki je v neprestanem razvoju. Vsakdo lahko sodeluje pri razvoju z objavljanjem hroščev, pregledom prevodov in razvojem programske opreme. Pri programu sodeluje živahna odprtokodna skupnost, ki jo sestavljajo posamezniki s celega sveta. Napredek razvoja je odvisen tudi od donacij za programiranje in preizkušanje programske opreme.
 \nOcena kakovosti in pokritosti zemljevidov:
@@ -2685,7 +2760,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     
     <string name="shared_string_options">Možnosti</string>
     <string name="empty_state_favourites">Dodaj priljubljene</string>
-    <string name="import_track">Uvozi sled</string>
+    <string name="import_track">Uvozi datoteko GPX</string>
     <string name="line">Črta</string>
     <string name="save_as_route_point">Shrani kot točke poti</string>
     <string name="save_as_line">Shrani kot črto</string>
@@ -2708,8 +2783,8 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="empty_state_my_tracks_desc">Beleženje in uvoz sledi za ogled</string>
     <string name="import_track_desc">Datoteka %1$s ne vključuje nobene vmesne točke. Ali želite pot uvoziti kot sled?</string>
     <string name="move_point">Premakni točko</string>
-    <string name="add_segment_to_the_track">Dodaj na sled GPX</string>
-<string name="empty_state_favourites_desc">Dodaj priljubljene na zemljevid, ali pa jih uvozi iz datoteke.</string>
+    <string name="add_segment_to_the_track">Dodaj v datoteko GPX</string>
+<string name="empty_state_favourites_desc">Uvoz priljubljenih točk oziroma dodajanje prek označb na zemljevid.</string>
     <string name="move_all_to_history">Premakni vse v zgodovino</string>
     
     <string name="show_direction">Kazalec smeri</string>
@@ -2732,9 +2807,29 @@ Koda predstavlja območje: %1$s x %2$s</string>
 \n• Podpora vmesnim točkam na poti
 \n• Samodejno preusmerjanje in preračunavanje poti ob nepričakovani spremembi poti
 \n• Iskanje mest po naslovu, po vrsti (na primer: restavracija, hotel, bencinska črpalka, muzej) ali po koordinatah</string>
-    <string name="osmand_plus_extended_description_part3">Pregledovanje zemljevida • Prikaz trenutnega mesta in usmerjenost • Izbirno prilagajanje po kompasu oziroma po smeri gibanja • Shranjevanje priljubljenih točk • Prikaz točk POI (točke zanimivosti) v bližini • Prikaz spletnih satelitskih sličic (Bing), različne prekrivne plasti kot so potovalne/navigacijske sledi GPX • Izbirno prikazovanje imen v krajevnem zapisu, angleško ali fonetično</string>
-    <string name="osmand_plus_extended_description_part6">Možnosti za pešce in kolesarje • Pregledovanje pešpoti, kolesarskih poti in označenih kolovozov • Poseben način prikazovanja z dodatnimi pogledi • Izbirni prikaz postajališč javnega prometa (avtobus, trolejbus, vlak), vključno z imeni prog • Možnost beleženja poti v krajevno datoteko GPX ali pošiljanje na spletno mesto • Prikaz hitrosti in nadmorske višine • Prikaz izohips in senčenja hribovitosti pokrajine (prek dodatnega vstavka)</string>
-    <string name="osmand_plus_extended_description_part7">Neposredno objavljanje na OSM • Objavljanje poročil o hroščih • Pošiljanje sledi GPX neposredno na OSM • Dodajanje točk POI • Izbirno beleženje tudi v stanju pripravljenosti naprave Program OsmAnd je odprtokoden, zato lahko vsak sodeluje pri razvoju. Zaželena je pomoč pri objavljanju hroščev, pregledovanje prevodov in pri razvoju novih možnosti programa. Trenutno je skupnost zelo živa. Napredovanje projekta se zanaša tudi na finančne donacije za nove zmožnosti in preizkušanje delovanja.</string>
+    <string name="osmand_plus_extended_description_part3">Pregledovanje zemljevida
+\n• Prikaz trenutnega mesta in usmerjenost
+\n• Izbirno prilagajanje po kompasu oziroma po smeri gibanja
+\n• Shranjevanje priljubljenih točk
+\n• Prikaz točk POI (točke zanimivosti) v bližini
+\n• Prikaz spletnih satelitskih sličic (Bing), različne prekrivne plasti kot so potovalne/navigacijske sledi GPX
+\n• Izbirno prikazovanje imen v krajevnem zapisu, angleško ali fonetično
+\n</string>
+    <string name="osmand_plus_extended_description_part6">Možnosti za pešce in kolesarje
+\n• Pregledovanje pešpoti, kolesarskih poti in označenih kolovozov
+\n• Poseben način prikazovanja z dodatnimi možnostmi prikaza
+\n• Izbirni prikaz postajališč javnega prometa (avtobus, trolejbus, vlak), vključno z imeni prog
+\n• Možnost beleženja poti v krajevno datoteko GPX ali pošiljanje na spletno mesto
+\n• Prikaz hitrosti in nadmorske višine trenutne točke
+\n• Prikaz izohips in senčenja hribovitosti pokrajine (prek dodatnega vstavka)
+\n</string>
+    <string name="osmand_plus_extended_description_part7">Neposredno objavljanje na OSM
+\n• Objavljanje poročil o hroščih
+\n• Pošiljanje sledi GPX neposredno na OSM
+\n• Dodajanje točk POI in neposredno pošiljanje podatkov na strežnik OSM (ob vzpostavitvi povezave)
+\n• Izbirno beleženje tudi v stanju pripravljenosti naprave
+\nOsmAnd je hitro razvijajoči se odprtokodni program. Vsak lahko sodeluje pri razvoju z objavljanjem hroščev, pregledovanjem jezikovnih prilagoditev in pri razvoju novih možnosti programa. Razvoj projekta temelji na donacijah za pripravo in pregled novih zmožnosti ter preizkušanja delovanja.
+\n</string>
     <string name="show_guide_line">Pokaži vodilne črte</string>
     <string name="show_arrows_on_the_map">Na zemljevidu pokaži puščice</string>
     <string name="show_passed">Pokaži dosežene</string>
@@ -2917,7 +3012,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="show_tunnels">Tuneli</string>
 <string name="shared_string_result">Rezultat</string>
     <string name="use_two_digits_longitude">Uporabi dvoštevilčno geografsko dolžino</string>
-    <string name="shared_string_travel_guides">Potovanje</string>
+    <string name="shared_string_travel_guides">Popotniški vodniki</string>
     <string name="waypoints_removed_from_map_markers">Vmesne točke so odstranjene iz označb zemljevida</string>
     <string name="nothing_found_in_radius">Ni zadetkov iskanja:</string>
     <string name="select_waypoints_category_description">Dodati je mogoče vse vmesne točke sledi, ali pa ločene kategorije.</string>
@@ -2970,16 +3065,15 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="show_full_description">Pokaži polni opis</string>
     <string name="quick_action_edit_actions">Uredi dejanja</string>
     <string name="purchase_dialog_title">Izbor načrta</string>
-    <string name="release_3_0">• Novo: podpora za popotniške vodnike. Mesta vodnikov so povezana z zemljevidom, začetni podatki pa s spletišča Wikivoyage.
-\n
-\n• Wikipedija: nov videz, dejavne povezave, podpora za prikaz slik
-\n
-\n• Vmesnik Open Track: podpora za skupine vmesnih točk
-\n
-\n• Označbe zemljevida: možnost uvoza izbranih skupin iz datotek GPX, vpis koordinat, spremenjen vmesnik
-\n
-\n• Naročnine na OsmAnd Live podpirajo vse možnosti programa OsmAnd
-\n
+    <string name="release_3_0">• Novo: podpora za popotniške vodnike – vodniki mest so povezani z zemljevidom, začetni podatki pa s spletiščem Wikivoyage. 
+\n 
+\n• Wikipedija: nov videz, dejavne povezave, podpora za prikaz slik 
+\n 
+\n• Vmesnik Open Track: podpora za skupine vmesnih točk 
+\n 
+\n• Označbe zemljevida: možnost uvoza izbranih skupin iz datotek GPX, vpis koordinat, spremenjen vmesnik 
+\n 
+\n• Naročnine na storitev OsmAnd Live podpirajo vse možnosti programa OsmAnd 
 \n</string>
     <string name="download_wikipedia_label">Prejmi podatke Wikipedije</string>
     <string name="open_in_browser_wiki">Odpri prispevek na spletni strani</string>
@@ -2992,8 +3086,140 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="edit_map_marker">Uredi označbo zemljevida</string>
     <string name="third_party_application">Programi tretjih oseb</string>
     <string name="search_street">Iskanje ulice</string>
-    <string name="start_search_from_city">Začni z iskanjem mesta</string>
+    <string name="start_search_from_city">Začeti je treba z izborom mesta</string>
     <string name="shared_string_restore">Obnovi</string>
     <string name="thank_you_for_feedback">Zahvaljujemo se vam za vaš odziv</string>
     <string name="shared_string_world">Svet</string>
-    </resources>
+    <string name="search_no_results_feedback">Na iskalni niz ni zadetkov iskanja\?
+\nPošljite nam odziv in podatke.</string>
+    <string name="send_search_query">Ali želite poslati iskalno poizvedbo\?</string>
+    <string name="point_deleted">Točka %1$s je izbrisana.</string>
+    <string name="coord_input_edit_point">Uredi točko</string>
+    <string name="coord_input_add_point">Dodaj točko</string>
+    <string name="coord_input_save_as_track">Shrani kot sled</string>
+    <string name="open_wikipedia_link_online">Odpri povezavo do spletišča Wikipedija</string>
+    <string name="open_wikipedia_link_online_description">Povezava bo odprta v spletnem brskalniku.</string>
+    <string name="download_all">Prejmi vse</string>
+    <string name="show_images">Pokaži slike</string>
+    <string name="osm_live_plan_pricing">Paket in cenik</string>
+    <string name="osm_live_payment_monthly_title">Mesečna plačila</string>
+    <string name="osm_live_payment_3_months_title">Plačilo na četrtletje</string>
+    <string name="osm_live_payment_annual_title">Letno plačilo</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / mesec</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mesec</string>
+    <string name="osm_live_payment_discount_descr">Prihranite %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Trenutno naročen paket</string>
+    <string name="osm_live_payment_renews_monthly">Mesečna obnovitev</string>
+    <string name="osm_live_payment_renews_quarterly">Četrtletna obnovitev</string>
+    <string name="osm_live_payment_renews_annually">Letna obnovitev</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Izberite obdobje plačila, ki vam najbolj ustreza:</string>
+    <string name="osm_live_payment_contribute_descr">Del prihodkov je namenjen sodelavcem OpenStreetMap.</string>
+    <string name="keep_passed_markers_descr">Označbe, dodane kot skupina priljubljenih točk oziroma točk GPX, ki so bile opredeljene kot prevožene, bodo ostale vidne na zemljevidu. Če skupina oziroma točke niso označene kot dejavne, bodo odstranjene.</string>
+    <string name="keep_passed_markers">Ohrani prevožene označbe na zemljevidu</string>
+    <string name="more_transport_on_stop_hint">Na tej postaji ustavlja več različnih prevozov.</string>
+    <string name="poi_cannot_be_found">Vozlišča ali poti ni mogoče najti.</string>
+    <string name="release_3_2_pre">• Odpravljena je napaka, ki je lahko povzročila sesutje programa
+\n
+\n• Nova zmožnost označb: prikaz že prepotovanih točk
+\n
+\n• Zgodovina iskanja po novem vključuje tudi že iskane kategorije
+\n
+\n• Odpravljena je napaka odpiranja zemljevidov z nelatinskimi črkami
+\n
+\n• Izboljšana hitrost izrisovanja na napravah s sistemom Android 8.0
+\n
+\n• Podpora za urejanje večkotnih predmetov (neoznačnih)
+\n
+\n• Merjenje razdalje: v meni dejanj je mogoče dodati gumb za merjenje
+\n</string>
+    <string name="release_3_1">• Navigacija: popravki vrstice napredovanja poti, možnost hitre menjave začetne in končne točke poti
+\n
+\n• Označbe na zemljevidih: skrivanje in prikaz skupin, možnost shrivanja označb
+\n
+\n• Urejanje OSM: možnost urejanja oznak za netočkovne predmete in poti, popravki opomb in varnostnih kopij urejanj
+\n
+\n• Izboljšano razčlenjevanje vsebin Wikipedije in Wikivoyage, posodobljene datoteke so že na voljo
+\n
+\n• Vsebinski meni: popravek prikaza oznak v nočnem načinu in popravki velikosti menijev
+\n
+\n• Navigacija za plovila: podpora za plovne poti v vodnem prometu
+\n
+\n• Številni drugi popravki hroščev
+\n</string>
+    <string name="commiting_way">Poteka objavljanje poti …</string>
+    <string name="increase_search_radius_to">Povečaj območje iskanja na %1$s</string>
+    <string name="coord_input_save_as_track_descr">Dodanih je %1$s točk. Vpisati je treba še ime datoteke in potrditi shranjevanje.</string>
+    <string name="error_notification_desc">Pošljite zaslonsko sliko obvestila na elektronski naslov support@osmand.net</string>
+    <string name="how_to_open_link">Kako odpreti povezavo\?</string>
+    <string name="read_wikipedia_offline">Pregled Wikipedije brez povezave</string>
+    <string name="shared_string_restart">Ponovni zagon programa</string>
+    <string name="purchase_cancelled_dialog_title">Naročnina na storitev OsmAnd Live je bila preklicana.</string>
+    <string name="start_editing_card_image_text">Brezplačen svetovni popotniški vodnik, ki ga lahko ureja vsak popotnik.</string>
+    <string name="purchase_dialog_subtitle">Izberite ustrezno možnost:</string>
+    <string name="online_webpage_warning">Stran je na voljo le na spletu. Ali jo želite odpreti v spletnem brskalniku\?</string>
+    <string name="wikivoyage_search_hint">Iskanje: država, mesto, okraj</string>
+    <string name="index_item_world_wikivoyage">Svetovni prispevki Wikivoyage</string>
+    <string name="rendering_value_black_name">Črna</string>
+    <string name="shared_string_gpx_files">Datoteke GPX</string>
+    <string name="access_intermediate_arrival_time">Vmesni čas prihoda</string>
+    <string name="map_widget_intermediate_time">Vmesni čas</string>
+    <string name="ask_for_location_permission">Program zahteva dostop do storitev geolociranja.</string>
+    <string name="send_search_query_description">Poslana bo iskalna poizvedba <b>»%1$s«</b> in podatek trenutnega mesta.<br/><br/> Osebnih podatkov program ne shranjuje, zbirajo se le iskalni nizi z namenom izboljševanja algoritma iskanja.<br/></string>
+    <string name="get_osmand_live">Naročite se na storitev OsmAnd Live za dostop do vseh zmožnosti: dnevnih posodobitev zemljevidov brez omejitev prejema, plačljive vstavke, povezave do vsebin Wikipedije in Wikivoyage in še mnogo več.</string>
+    <string name="unirs_render_descr">Prilagoditev privzetega sloga prikaza za povečanje kontrasta pešpoti in kolesarskih stez. Prilagojene so privzete barve sloga Mapnik.</string>
+    <string name="off_road_render_descr">Uporabno pri vožnji po neoznačenih poteh. Omogoča uporabo satelitskih posnetkov kot podlage zemljevidu. Debelina glavnih poti je zmanjšana, povečana pa je debelina pešpoti, kolesarskih prog, gozdnih gazi in drugih neopredeljivih povezav. Zasnova temelji na slogu »Topo«.</string>
+    <string name="nautical_render_descr">Navtični slog za navigacijo poudarja boje, svetilnike, rečne in morske poti, različne vodne označbe, pristanišča, priveze in izobate globine.</string>
+    <string name="ski_map_render_descr">Smučarski pogled izpostavlja smučišča, žičnice in gondole, različne oznake na terenu, varnostne oznake in zgradbe na smučišču. Drugi predmeti zemljevida so poenostavljeni.</string>
+    <string name="light_rs_render_descr">Preprost in kontrasten slog za avtomobilsko navigacijo, ki upošteva dnevno-nočne spremembe. Pogled poudarja topografske obrise okolja, kontrastno prikazuje cestišče in omogoča hiter pregled zanimivih točk v okolici trenutnega mesta.</string>
+    <string name="topo_render_descr">Enostaven slog, namenjen predvsem pohodništvu, trekingu in kolesarjenju po naravi. Omogoča dobro ločljivost kljub spreminjajoči se osvetljenosti v okolju. Slog poudarja različne vrste poti in značilnosti naravnega okolja, omogoča prilagajanje prikaza z naprednimi nastavitvami, prilagaja prikaz podrobnosti pri različnih ravneh približanja, možnost prikaza površinske celovitosti pa omogoča razlikovanje kakovosti površine cest. Ni možnosti nočnega načina prikaza.</string>
+    <string name="mapnik_render_descr">Privzet slog Mapnik, ki prevzema standardno barvno paleto.</string>
+    <string name="touring_view_render_descr">Podrobni slog za ogledovanje na popotovanjih. Prikaz vključuje vse možnosti privzetega sloga, hkrati pa so poudarjene vse podrobnosti, zlasti ceste, poti, postajališča in podobno. Jasno je nakazana razlika med različnimi vrstami cest, pogled pa spominja na standardne popotniške atlase. Uporabljena je visoko kontrastna barvna shema za zunanjo uporabo, podprta sta dnevni in nočni način prikaza.</string>
+    <string name="default_render_descr">Slog za splošno uporabo omogoča poenostavljen prikaz za uporabo v strnjenih naseljih. Med glavnimi značilnostmi so podrobno prikazane površine, oznake za omejitev dostopa, cestne ovire, označene skladno z lestvico SAC, športne površine in drugo.</string>
+    <string name="read_wikipedia_offline_description">Naročite se na storitev OsmAnd Live za dostop brez povezave do prispevkov na Wikipediji in Wikivoyage.</string>
+    <string name="purchase_cancelled_dialog_descr">Obnovite naročilo za uporabo vseh zmožnosti programa:</string>
+
+    <string name="maps_you_need_descr">Na osnovi shranjenih zaznamkov je priporočljivo prejeti zemljevide:</string>
+    <string name="travel_card_download_descr">Prejmite popotniške vodnike Wikivoyage za pregled prispevkov različnih svetovnih krajev brez povezave na internet.</string>
+	<string name="welcome_to_open_beta_description">Popotniški vodniki so zasnovani po vsebinah Wikivoyage. Storitev je na voljo brezplačno med preizkušanjem delovanja različice beta. Po tem obdobju bodo vodniki na voljo le uporabnikom paketov OsmAnd Neomejeno in OsmAnd+.</string>
+    <string name="start_editing_card_description">Vsakdo lahko (in tudi zaželeno je) ureja prispevke na WikiVoyage. Skupno znanje, izkušnje in mnenja povečajo kakovost vsebine.</string>
+    <string name="welcome_to_open_beta">Dobrodošli v različici Open beta</string>
+    <string name="wikivoyage_travel_guide_descr">Vodniki po najbolj zanimivih krajih sveta, prikazani znotraj OsmAnd, vendar brez potrebe po povezavi z internetom.</string>
+    <string name="contour_lines_hillshade_maps">Zemljevidi reliefa in senčenje površine</string>
+    <string name="unlock_all_features">Odkleni vse zmožnosti programa OsmAnd</string>
+    <string name="purchase_dialog_travel_description">Naročilo na katerokoli od navedenih možnosti omogoči dostop do popotniškega vodnika:</string>
+    <string name="shared_string_dont">Ne objavi</string>
+    <string name="shared_string_do">Objavi</string>
+    <string name="download_wikipedia_description">Prejmite prispevke z Wikipedija o %1$s za pregled brez povezave.</string>
+    <string name="test_voice_desrc">Pritisnite na gumb in poslušajte glasovni odziv za ugotavljanje manjkajočih oziroma napačnih navodil.</string>
+    <string name="osm_live_subscriptions">Naročnine</string>
+    <string name="swap_start_and_destination">Zamenjaj začetek in konec poti</string>
+    <string name="add_destination_point">Dodaj cilj</string>
+    <string name="add_intermediate_point">Dodaj vmesni cilj</string>
+    <string name="add_start_point">Dodaj začetno točko</string>
+    <string name="intermediate_waypoint">Vmesna točka: %1$s</string>
+    <string name="waypoints">Vmesne točke: %1$s</string>
+    <string name="transfers">prevozi: %1$s</string>
+    <string name="on_foot">hoja: %1$s</string>
+    <string name="route_way">Pot: %1$s</string>
+    <string name="points_of_interests">Točke zanimanja (POI)</string>
+    <string name="waiting_for_route_calculation">Poteka preračunavanje poti</string>
+    <string name="app_mode_public_transport">Javni prevozi</string>
+    <string name="avoid_roads_descr">Izberite cesto na zemljevidu oziroma iz spodnjega seznama, ki se jo želite izogniti:</string>
+    <string name="show_along_the_route">Pokaži vzdolž poti</string>
+    <string name="simulate_navigation">Izvedi navidezno navigacijo</string>
+    <string name="choose_track_file_to_follow">Izberite datoteko poti za sledenje</string>
+    <string name="voice_announcements">Glasovne najave</string>
+    <string name="intermediate_destinations">Vmesni cilji: %1$s</string>
+    <string name="arrive_at_time">Prihod ob %1$s</string>
+    <string name="powered_by_osmand">S podporo OsmAnd</string>
+    <string name="mapillary_menu_title_pano">Pokaži le 360° slike</string>
+    <string name="shared_string_launch">Zaženi</string>
+    <string name="lang_gn_py">Gvarani</string>
+    <string name="quick_action_switch_day_night_descr">S pritiskom na gumb dejanja se preklopi dnevno/nočni način programa.</string>
+    <string name="quick_action_switch_day_mode">Dnevni način</string>
+    <string name="quick_action_switch_night_mode">Nočni način</string>
+    <string name="quick_action_day_night_switch_mode">Preklopi Dnevni/Nočni način</string>
+    <string name="run_full_osmand_msg">Uporabljate zemljevid {0}, ki ga podpira OsmAnd. Ali želite zagnati polno različico programa\?</string>
+    <string name="run_full_osmand_header">Ali želite zagnati program OsmAnd\?</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sr/phrases.xml b/OsmAnd/res/values-sr/phrases.xml
index 1edef1fa23..898d898ef7 100644
--- a/OsmAnd/res/values-sr/phrases.xml
+++ b/OsmAnd/res/values-sr/phrases.xml
@@ -269,7 +269,7 @@
 	<string name="poi_bus_station">Аутобуска станица</string>
 	<string name="poi_railway_station">Железничка станица</string>
 	<string name="poi_subway_entrance">Улаз у подземну</string>
-	<string name="poi_subway_station">Подземна станица</string>
+	<string name="poi_subway_station">Да</string>
 	<string name="poi_taxi">Такси станица</string>
 
 	<string name="poi_aerodrome">Аеродром</string>
@@ -462,7 +462,7 @@
 	<string name="poi_customs">Царина</string>
 	<string name="poi_country">Држава</string>
 	<string name="poi_city">Град</string>
-	<string name="poi_capital">Престоница</string>
+	<string name="poi_capital">Да</string>
 	<string name="poi_town">Варошица</string>
 	<string name="poi_village">Село</string>
 	<string name="poi_hamlet">Засеок</string>
@@ -1921,7 +1921,7 @@
 	<string name="poi_drive_through_no">Пролазак кроз: не</string>
 
 	<string name="poi_brewery_additional">Име пиваре</string>
-	<string name="poi_microbrewery_yes">Микропивара</string>
+	<string name="poi_microbrewery_yes">Да</string>
 	<string name="poi_microbrewery_no">Не микропивара</string>
 
 	<string name="poi_takeaway_filter_yes">Да</string>
diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index 93182a3f12..ecbcacf394 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="about_version">Верзија:</string>
     <string name="shared_string_about">О програму</string>
@@ -1666,7 +1666,7 @@
     <string name="mapillary_menu_edit_text_hint">Унесите корисничко име</string>
     <string name="mapillary_menu_descr_username">Прегледај само слике које је додао</string>
     <string name="mapillary_menu_title_username">Корисничко име</string>
-    <string name="mapillary_menu_filter_description">Филтрирајте слике према отпремачу или према датуму. Филтрирање се примењује само при зумирању.</string>
+    <string name="mapillary_menu_filter_description">Филтрирајте слике према пошиљаоцу, према датуму или према типу. Филтрирање се примењује само при зумирању.</string>
     <string name="map_widget_ruler_control">Обим лењира</string>
     <string name="shared_string_permissions">Дозволе</string>
     <string name="import_gpx_failed_descr">OsmAnd не може да увезе фајл. Молим, проверите да ли OsmAnd има дозволе за читање фајла са ове локације.</string>
@@ -1733,8 +1733,8 @@
     <string name="first_intermediate_dest_description">Додаје прво стајање</string>
     <string name="switch_osm_notes_visibility_desc">Прикажи/Сакриј ОСМ белешке на карти.</string>
     <string name="shared_string_gpx_file">GPX фајл</string>
-    <string name="release_3_0">• Ново: Подршка за глобалне туристичке водиче без потребе за интернет конекцијом. Референтни положају су повезани на карти. Иницијални подаци са сајта Wikivoyage.
-\n
+    <string name="release_3_0">• Ново: Подршка за глобалне туристичке водиче без потребе за интернет конекцијом. Референтни положаји су повезани на карти. Иницијални подаци са сајта Wikivoyage. 
+\n 
 \n • Википедија: нови изглед, активне везе, слике 
 \n 
 \n • Open Track UI: приказ група пролазних тачака 
@@ -3012,11 +3012,36 @@
     <string name="rendering_value_black_name">Црна</string>
     <string name="more_transport_on_stop_hint">Постоје још превоза на овој станици.</string>
     <string name="search_street">Тражи улицу</string>
-    <string name="start_search_from_city">Тражи почевши од града</string>
+    <string name="start_search_from_city">Прво одаберите град</string>
     <string name="shared_string_restore">Поврати</string>
     <string name="keep_passed_markers_descr">Маркери додати као група Омиљених или ГПИкс пролазних тачака означени као Одобрени остаће на мапи. Ако група није активна, маркери ће се изгубиће са мапе.</string>
     <string name="keep_passed_markers">Задржи одобрене маркере на мапи</string>
     <string name="markers_remove_dialog_msg">Обриши ознаку „%s“ са карте\?</string>
     <string name="edit_map_marker">Измени ознаку карте</string>
     <string name="third_party_application">Апликација треће стране</string>
-    </resources>
+    <string name="powered_by_osmand">Омогућио OsmAnd</string>
+    <string name="osm_live_plan_pricing">Пакети &amp; ценовник</string>
+    <string name="osm_live_payment_monthly_title">Месечно плаћање</string>
+    <string name="osm_live_payment_3_months_title">Плаћање једном у 3 месеца</string>
+    <string name="osm_live_payment_annual_title">Плаћање једном годишње</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / месечно</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / месечно</string>
+    <string name="osm_live_payment_discount_descr">Уштедите %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Ваша тренутна претплата</string>
+    <string name="osm_live_payment_renews_monthly">Месечно обнављање</string>
+    <string name="osm_live_payment_renews_quarterly">Квартално обнављање</string>
+    <string name="osm_live_payment_renews_annually">Годишње обнављање</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Одаберите период плаћања који Вам највише одговара:</string>
+    <string name="osm_live_payment_contribute_descr">Део прихода иде уређивачима OpenStreetMap-а.</string>
+    <string name="osm_live_subscriptions">Претплате</string>
+    <string name="mapillary_menu_title_pano">Прикажи само слике од 360°</string>
+    <string name="shared_string_launch">Покрени</string>
+    <string name="lang_gn_py">Гварани</string>
+    <string name="quick_action_switch_day_night_descr">Кликтањем овог акционог дугмета се мења дневни и ноћни режим у OsmAnd-у</string>
+    <string name="quick_action_switch_day_mode">Дневни режим</string>
+    <string name="quick_action_switch_night_mode">Ноћни режим</string>
+    <string name="quick_action_day_night_switch_mode">Мењај дневни/ноћни режим</string>
+    <string name="run_full_osmand_msg">Користите карту {0} коју је омогућио OsmAnd. Да ли желите да покренете OsmAnd пуну верзију\?</string>
+    <string name="run_full_osmand_header">Покрени OsmAnd\?</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sv/phrases.xml b/OsmAnd/res/values-sv/phrases.xml
index 355c5b396a..088ff81033 100644
--- a/OsmAnd/res/values-sv/phrases.xml
+++ b/OsmAnd/res/values-sv/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_shoes">Skoaffär</string>
 	<string name="poi_computer">Datorbutik</string>
 	<string name="poi_shop">Butik</string>
@@ -742,7 +742,7 @@
 	<string name="poi_religion_spiritualist">Spiritualism</string>
 	<string name="poi_religion_bahai">Bahaism</string>
 	<string name="poi_religion_scientologist">Scientologi</string>
-	<string name="poi_religion_pagan">Hedendom</string>
+	<string name="poi_religion_pagan">Paganism</string>
 	<string name="poi_religion_tenrikyo">Tenrikyo</string>
 	<string name="poi_religion_zoroastrian">Zoroastrism</string>
 
@@ -3105,4 +3105,199 @@
 
 	<string name="poi_payment_troika_yes">Troika</string>
 	<string name="poi_support_ceiling">Stöd: tak</string>
-	</resources>
+    <string name="poi_bulk_purchase">Massköp</string>
+    <string name="poi_substation_type">Typ</string>
+    <string name="poi_books_type">Bok</string>
+    <string name="poi_car_pooling">Bilpoolplats</string>
+    <string name="poi_atm">Bankomat</string>
+    <string name="poi_pump_type_beam_pump">Pumptyp: domkraftspump</string>
+    <string name="poi_pump_type_india_mk_2_3">Pumptyp: India Mk II eller III&gt;</string>
+    <string name="poi_payment_troika_no">Troika-kort accepteras ej</string>
+    <string name="poi_support_billboard">Stöd: billboard</string>
+    <string name="poi_support_suspended">Stöd: upphängd</string>
+    <string name="poi_support_roof">Stöd: tak</string>
+    <string name="poi_support_tower">Stöd: torn</string>
+    <string name="poi_passenger_information_display_yes">Skärm för passagerarinformation: ja</string>
+    <string name="poi_passenger_information_display_no">Skärm för passagerarinformation: nej</string>
+    <string name="poi_aquaculture">Vattenbruk</string>
+    <string name="poi_aquaculture_shrimp">Vattenbruk: räkor</string>
+    <string name="poi_aquaculture_fish">Vattenbruk: fisk</string>
+    <string name="poi_aquaculture_mussels">Vattenbruk: musslor</string>
+    <string name="poi_min_age">Lägsta ålder</string>
+    <string name="poi_organic_yes">Ja</string>
+    <string name="poi_organic_no">Nej</string>
+    <string name="poi_organic_only">Endast</string>
+    <string name="poi_traffic_mirror">Trafikspegel</string>
+    <string name="poi_diplomatic_consulate">Konsulat</string>
+    <string name="poi_diplomatic_consulate_general">Generalkonsulat</string>
+    <string name="poi_diplomatic_honorary_consulate">Honorärkonsulat</string>
+    <string name="poi_diplomatic_delegation">Delegation</string>
+    <string name="poi_diplomatic_ambassadors_residence">Ambassadörsresidens</string>
+    <string name="poi_water_tank">Vattentank</string>
+    <string name="poi_length">Längd</string>
+    <string name="poi_wiki_link">Wikipedia</string>
+    <string name="poi_xmas">Jul</string>
+    <string name="poi_xmas_event">Julhändelse</string>
+    <string name="poi_xmas_market">Julmarknad</string>
+    <string name="poi_xmas_pyramid">Julpyramid</string>
+    <string name="poi_xmas_shop">Julbutik</string>
+    <string name="poi_xmas_shop_christmas_tree">Julgranshandel</string>
+    <string name="poi_xmas_tree">Julgran</string>
+    <string name="poi_cuisine">Kök</string>
+    <string name="poi_cuisine_pizza">Pizza</string>
+    <string name="poi_cuisine_burger">Hamburgare</string>
+    <string name="poi_cuisine_coffee">Kaffe</string>
+    <string name="poi_cuisine_sandwich">Smörgås</string>
+    <string name="poi_cuisine_kebab">Kebab</string>
+    <string name="poi_cuisine_doner">Dönerkebab (shawarma)</string>
+    <string name="poi_cuisine_chicken">Kyckling</string>
+    <string name="poi_cuisine_ice_cream">Glass</string>
+    <string name="poi_cuisine_sushi">Sushi</string>
+    <string name="poi_cuisine_snack">Mellanmål</string>
+    <string name="poi_cuisine_yogurt">Yoghurt</string>
+    <string name="poi_cuisine_gyros">Gyros</string>
+    <string name="poi_cuisine_empanada">Empanada</string>
+    <string name="poi_cuisine_crepes">Crêpes</string>
+    <string name="poi_cuisine_yakiniku">Yakiniku</string>
+    <string name="poi_cuisine_suki">Suki</string>
+    <string name="poi_cuisine_udon">Udon</string>
+    <string name="poi_cuisine_brasserie">Brasserie</string>
+    <string name="poi_cuisine_bubble_tea">Bubbelte</string>
+    <string name="poi_cuisine_yakitori">Yakitori</string>
+    <string name="poi_cuisine_sagardotegia">Sagardotegia</string>
+    <string name="poi_cuisine_meat">Kött</string>
+    <string name="poi_cuisine_wings">Vingar</string>
+    <string name="poi_cuisine_waffle">Våfflor</string>
+    <string name="poi_cuisine_chocolate">Choklad</string>
+    <string name="poi_cuisine_wine">Vin</string>
+    <string name="poi_cuisine_potato">Potatis</string>
+    <string name="poi_cuisine_brunch">Brunch</string>
+    <string name="poi_cuisine_sub">Sub</string>
+    <string name="poi_cuisine_pita">Pita</string>
+    <string name="poi_cuisine_fondue">Fondue</string>
+    <string name="poi_cuisine_baguette">Baguette</string>
+    <string name="poi_cuisine_pastel">Pastell</string>
+    <string name="poi_cuisine_burrito">Burrito</string>
+    <string name="poi_cuisine_teriyaki">Teriyaki</string>
+    <string name="poi_cuisine_shawarma">Shawarma</string>
+    <string name="poi_cuisine_regional">Regionalt</string>
+    <string name="poi_cuisine_italian">Italienskt</string>
+    <string name="poi_cuisine_chinese">Kinesiskt</string>
+    <string name="poi_cuisine_mexican">Mexikanskt</string>
+    <string name="poi_cuisine_japanese">Japanskt</string>
+    <string name="poi_cuisine_german">Tyskt</string>
+    <string name="poi_cuisine_indian">Indiskt</string>
+    <string name="poi_cuisine_american">Amerikanskt</string>
+    <string name="poi_cuisine_asian">Asiatiskt</string>
+    <string name="poi_cuisine_french">Franskt</string>
+    <string name="poi_cuisine_greek">Grekiskt</string>
+    <string name="poi_cuisine_thai">Thailändskt</string>
+    <string name="poi_cuisine_international">Internationellt</string>
+    <string name="poi_cuisine_turkish">Turkiskt</string>
+    <string name="poi_cuisine_spanish">Spanskt</string>
+    <string name="poi_cuisine_vietnamese">Vietnamesiskt</string>
+    <string name="poi_cuisine_korean">Koreanskt</string>
+    <string name="poi_cuisine_mediterranean">Medelhavs</string>
+    <string name="poi_cuisine_bavarian">Bayerskt</string>
+    <string name="poi_cuisine_lebanese">"Libanesiskt "</string>
+    <string name="poi_cuisine_russian">Ryskt</string>
+    <string name="poi_cuisine_filipino">Filippinskt</string>
+    <string name="poi_cuisine_portuguese">Portugisiskt</string>
+    <string name="poi_cuisine_georgian">Georgiskt</string>
+    <string name="poi_cuisine_polish">Polskt</string>
+    <string name="poi_cuisine_brazilian">Brasilianskt</string>
+    <string name="poi_cuisine_arab">Arabiskt</string>
+    <string name="poi_cuisine_danish">Danskt</string>
+    <string name="poi_cuisine_indonesian">Indonesiskt</string>
+    <string name="poi_cuisine_african">Afrikanskt</string>
+    <string name="poi_cuisine_caribbean">Karibiskt</string>
+    <string name="poi_cuisine_argentinian">Argentinskt</string>
+    <string name="poi_cuisine_balkan">Balkan</string>
+    <string name="poi_cuisine_peruvian">Peruanskt</string>
+    <string name="poi_cuisine_croatian">Kroatiskt</string>
+    <string name="poi_cuisine_bolivian">Bolivianskt</string>
+    <string name="poi_cuisine_malagasy">Malagassiskt</string>
+    <string name="poi_cuisine_persian">Persiskt</string>
+    <string name="poi_cuisine_moroccan">Marockanskt</string>
+    <string name="poi_cuisine_austrian">Österrikiskt</string>
+    <string name="poi_cuisine_malaysian">Malajiskt</string>
+    <string name="poi_cuisine_irish">Irländskt</string>
+    <string name="poi_cuisine_ethiopian">Etiopiskt</string>
+    <string name="poi_cuisine_hungarian">Ungerskt</string>
+    <string name="poi_cuisine_lao">Laotiskt</string>
+    <string name="poi_cuisine_european">Europeiskt</string>
+    <string name="poi_cuisine_uzbek">Uzbekiskt</string>
+    <string name="poi_cuisine_czech">Tjeckiskt</string>
+    <string name="poi_cuisine_cuban">Kubanskt</string>
+    <string name="poi_cuisine_british">Brittiskt</string>
+    <string name="poi_cuisine_latin_american">Latinamerikanskt</string>
+    <string name="poi_cuisine_nepalese">Nepalesiskt</string>
+    <string name="poi_cuisine_mongolian">Mongoliskt</string>
+    <string name="poi_cuisine_middle_eastern">Mellanöstern</string>
+    <string name="poi_cuisine_ukrainian">Ukrainskt</string>
+    <string name="poi_cuisine_afghan">Afghanskt</string>
+    <string name="poi_cuisine_belgian">Belgiskt</string>
+    <string name="poi_cuisine_basque">Baskiskt</string>
+    <string name="poi_cuisine_swiss">"Schweiziskt "</string>
+    <string name="poi_cuisine_cantonese">Kantonesiskt</string>
+    <string name="poi_cuisine_swedish">Svenskt</string>
+    <string name="poi_cuisine_jamaican">Jamaicanskt</string>
+    <string name="poi_cuisine_armenian">Armeniskt</string>
+    <string name="poi_cuisine_hawaiian">"Hawaiianskt "</string>
+    <string name="poi_cuisine_english">Engelskt</string>
+    <string name="poi_cuisine_pakistani">Pakistanskt</string>
+    <string name="poi_cuisine_taiwanese">Taiwanesiskt</string>
+    <string name="poi_cuisine_tex_mex">Tex-mex</string>
+    <string name="poi_cuisine_dutch">Holländskt</string>
+    <string name="poi_cuisine_syrian">Syrianskt</string>
+    <string name="poi_cuisine_australian">Australienskt</string>
+    <string name="poi_cuisine_cajun">Cajun</string>
+    <string name="poi_cuisine_egyptian">Egyptiskt</string>
+    <string name="poi_cuisine_senegalese">Senegalesiskt</string>
+    <string name="poi_cuisine_jewish">Judiskt</string>
+    <string name="poi_cuisine_bulgarian">Bulgariskt</string>
+    <string name="poi_cuisine_tibetan">Tibetanskt</string>
+    <string name="poi_feeding_place">Plats för utfodring av djur</string>
+    <string name="poi_party">Festutrustning</string>
+    <string name="poi_electrical">Elbutik</string>
+    <string name="poi_locksmith">Låssmed</string>
+    <string name="poi_lighting">Belysning</string>
+    <string name="poi_lottery">Lotterier</string>
+    <string name="poi_gambling_type">Typ</string>
+    <string name="poi_gambling_lottery">Lotteri</string>
+    <string name="poi_gambling_pachinko">Pachinko</string>
+    <string name="poi_gambling_slot_machines">Spelautomater</string>
+    <string name="poi_gambling_betting">Betting</string>
+    <string name="poi_gambling_bingo">Bingo</string>
+    <string name="poi_e_cigarette">E-cigarettbutik</string>
+    <string name="poi_locomotive">Lok</string>
+    <string name="poi_nutrition_supplements">Kosttillskott</string>
+    <string name="poi_photo_studio">Fotostudio</string>
+    <string name="poi_cliff">Klippa</string>
+    <string name="poi_animal_keeping">Djurhållning</string>
+    <string name="poi_animal_keeping_horse">Djurhållning: häst</string>
+    <string name="poi_animal_keeping_sheep">Djurhållning: får</string>
+    <string name="poi_animal_keeping_type_paddock">Typ: paddock</string>
+    <string name="poi_animal_keeping_type_open_stable">Typ: öppet stall</string>
+    <string name="poi_tower_construction_lattice">Konstruktion: fackverk</string>
+    <string name="poi_tower_construction_freestanding">Konstruktion: fristående</string>
+    <string name="poi_tower_construction_dish">Konstruktion: disk</string>
+    <string name="poi_tower_construction_dome">Konstruktion: dom</string>
+    <string name="poi_tower_construction_concealed">Konstruktion: dold</string>
+    <string name="poi_railway_yard">Fraktstation</string>
+    <string name="poi_fast_food_cafeteria">Ja</string>
+    <string name="poi_drink_wine_yes">Vin: ja</string>
+    <string name="poi_drink_wine_retail">Vin: detaljhandel</string>
+    <string name="poi_drink_wine_served">Vin: serveras</string>
+    <string name="poi_energy_supplier">Energileverantör</string>
+    <string name="poi_electronics_repair_computer">Reparation av elektronik: datorer</string>
+    <string name="poi_electronics_repair_appliance">Elektronik reparationer: apparater</string>
+    <string name="poi_electronics_repair_phone">Reparation av elektronik: telefon</string>
+    <string name="poi_electronics_repair_tv">Reparation av elektronik: tv</string>
+    <string name="poi_resort_kids_camp">Barnläger</string>
+    <string name="poi_music_school">Musikskola</string>
+    <string name="poi_language_school">Språkskola</string>
+    <string name="poi_life_ring">Livboj</string>
+    <string name="poi_zoo_safari_park">Safaripark</string>
+    <string name="poi_zoo_birds">Fåglar</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index e245a77059..442763eb4a 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
     <string name="ChooseCountry">Välj land</string>
@@ -137,7 +137,7 @@
     <string name="unknown_from_location">Startpunkten är ännu inte bestämd</string>
     <string name="unknown_location">Positionen är ännu inte känd</string>
     <string name="confirm_interrupt_download">Avbryt filhämtningen?</string>
-    <string name="local_indexes_cat_tile">Online-kartor och mellanlagrade kartbitar (tiles)</string>
+    <string name="local_indexes_cat_tile">Online-kartor och mellanlagrade kartrutor</string>
     <string name="local_indexes_cat_map">Standardkartor (vektor)</string>
 
     <string name="index_settings_descr">Hämta och hantera offline-kartor lagrade på din enhet.</string>
@@ -150,7 +150,7 @@
     <string name="gpx_visibility_txt">Synlighet</string>
     <string name="gpx_tags_txt">Taggar</string>
     <string name="gpx_description_txt">Beskrivning</string>
-    <string name="validate_gpx_upload_name_pwd">Vänligen ange OSM användarnamn och lösenord för att ladda upp GPX-filer.</string>
+    <string name="validate_gpx_upload_name_pwd">Vänligen ange ditt OSM-användarnamn och lösenord för att ladda upp GPX-filer.</string>
 
     <string name="accessibility_mode">Tillgänglighetsläge</string>
     <string name="accessibility_mode_descr">Sätter på tillgänglighetsfunktioner.</string>
@@ -214,11 +214,11 @@ Du hittar din parkeringsplats och -tid på instrumentbrädan och i widgeten på
     <string name="favourites_search_desc">Favoritsökning</string>
 
     <string name="modify_transparency">Ändra transparens (0 - transparent, 255 - ogenomskinlig)</string>
-    <string name="first_time_msg">Tack för att du använder OsmAnd. För många funktioner i programmet behöver du vissa regionala offline-data som du kan ladda ner via \'Inställningar\' -&gt; \'Hantera kartfiler\'. Därefter kommer du att kunna se kartor, hitta adresser, leta efter intressepunkter och hitta kollektivtrafik.</string>
+    <string name="first_time_msg">Tack för att du använder OsmAnd. Hämta regionala data för användning frånkopplad via \"Inställningar\"→\"Hantera kartfiler\" för att visa kartor, hitta adresser, leta upp POI:er, hitta kollektivtrafik och mer.</string>
     <string name="basemap_was_selected_to_download">Baskarta har valts för hämtning för att appen ska fungera.</string>
     <string name="select_index_file_to_download">Hittade ingenting. Om du inte kan hitta din region, kan du skapa den själv (se http://osmand.net).</string>
     <string name="map_online_plugin_is_not_installed">Aktivera modulen online-kartor för att välja olika kartkällor</string>
-    <string name="map_online_data">Online-kartor och kartbitar (tiles)</string>
+    <string name="map_online_data">Online-kartor och kartrutor</string>
     <string name="map_online_data_descr">Använd online-kartor (hämta och cacha kartbitar på SD-kortet).</string>
     <string name="online_map_settings_descr">Konfigurera online- eller cachade källor för kartbitar.</string>
 
@@ -476,7 +476,7 @@ Nyttjat utrymme är {1} MB.
     <string name="search_offline_geo_error">Det gick inte att tolka geo-uppsåt \'%s\'.</string>
     <string name="search_osm_offline">Sök adress med hjälp av offline-kartor</string>
     <string name="system_locale">System</string>
-    <string name="preferred_locale_descr">Välj visningsspråk (starta om OsmAnd efter språkbyte).</string>
+    <string name="preferred_locale_descr">Välj visningsspråk (träder i kraft när OsmAnd startas om).</string>
     <string name="preferred_locale">Visningsspråk</string>
 
 
@@ -643,7 +643,7 @@ Nyttjat utrymme är {1} MB.
     <string name="no_fav_to_save">Inga favoritpunkter att spara</string>
     <string name="error_occurred_loading_gpx">Kunde inte läsa in GPX</string>
     <string name="send_report">Skicka rapport</string>
-    <string name="none_region_found">Hittar inga offline-data för regioner på SD-kortet. Ladda ner regioner från Internet.</string>
+    <string name="none_region_found">Det gick inte att hitta några hämtade kartor på minneskortet.</string>
     <string name="poi_namefinder_query_empty">Ange sökfråga för att hitta POI</string>
     <string name="any_poi">Alla</string>
     
@@ -745,7 +745,7 @@ Nyttjat utrymme är {1} MB.
     <string name="searching_address">Söker adress …</string>
     <string name="hint_search_online">Online-sökning: Husnummer, gata, stad</string>
     <string name="search_offline_address">Offline</string>
-    <string name="max_level_download_tile_descr">Välj högsta zoomnivå att ladda ner för online-kartbitar.</string>
+    <string name="max_level_download_tile_descr">Bläddra inte i kartplattor på nätet för zoomnivåer bortom detta.</string>
     <string name="route_general_information">Total sträcka %1$s, restid %2$d h %3$d min.</string>
     <string name="router_service_descr">Välj en online- eller offline-navigeringstjänst.</string>
     <string name="router_service">Navigeringstjänst</string>
@@ -1398,7 +1398,7 @@ Nyttjat utrymme är {1} MB.
     <string name="none_selected_gpx">Inga GPX-filer markerade. För att markera tryck och håll ned ett tillgängligt spår.</string>
 
     <string name="local_index_select_gpx_file">Markera för att visa</string>
-    <string name="no_index_file_to_download">Hittar inget att ladda ner; kolla din Internetanslutning.</string>
+    <string name="no_index_file_to_download">Hämtningar hittades inte, kontrollera din anslutning till Internet.</string>
     
     
     
@@ -2164,9 +2164,9 @@ Tillgängligt utrymme är blott {2} MB.</string>
     
     <string name="map_widget_bearing">Relativ bäring</string>
     <string name="access_disable_offroute_recalc">Räkna inte om rutten när du lämnat den</string>
-    <string name="access_disable_offroute_recalc_descr">Förhindrar automatiskt omberäkning av rutten när du lämnat den.</string>
+    <string name="access_disable_offroute_recalc_descr">Ingen ruttomberäkning efter att ha lämnat rutten.</string>
     <string name="access_disable_wrong_direction_recalc">Ingen ny beräkning av rutten vid motsatt riktning</string>
-    <string name="access_disable_wrong_direction_recalc_descr">Förhindrar automatisk omberäkning av rutten när du rör dig i motsatt riktning.</string>
+    <string name="access_disable_wrong_direction_recalc_descr">Ingen ruttomberäkning när du rör dig i motsatt riktning.</string>
     <string name="access_smart_autoannounce">Smart auto-meddelande</string>
     <string name="access_smart_autoannounce_descr">Meddela endast när riktningen till målpunkten ändras.</string>
     <string name="access_autoannounce_period">Period för auto-meddelande</string>
@@ -2176,7 +2176,7 @@ Tillgängligt utrymme är blott {2} MB.</string>
     <string name="access_hint_enter_name">Skriv in namn</string>
     <string name="access_hint_enter_category">Skriv in kategori</string>
     <string name="access_hint_enter_description">Skriv in beskrivning.</string>
-    <string name="access_map_linked_to_location">Kartan är länkad till platsen</string>
+    <string name="access_map_linked_to_location">Kartan är kopplad till platsen</string>
     <string name="access_collapsed_list">Minimerad lista</string>
     <string name="access_expanded_list">Expanderad lista</string>
     <string name="access_empty_list">Tom lista</string>
@@ -2197,11 +2197,11 @@ Tillgängligt utrymme är blott {2} MB.</string>
 En del av inkomsterna går tillbaka till OSM-gemenskapen och betalas ut för varje OSM-bidrag.
 Om du tycker om OsmAnd och OSM och vill stödja dem så är detta ett utmärkt sätt att göra det på.</string>
     
-    <string name="access_no_destination">Ingen destination angiven</string>
+    <string name="access_no_destination">Destinationen är inte fastställd</string>
     <string name="map_widget_magnetic_bearing">Magnetisk bäring</string>
     <string name="rec_split_clip_length">Klipplängd</string>
     <string name="file_name_containes_illegal_char">Filnamnet innehåller ogiltiga tecken</string>
-<string name="move_marker_bottom_sheet_title">Flytta på kartan för att ändra markörens plats</string>
+<string name="move_marker_bottom_sheet_title">Flytta på kartan för att ändra markörens position</string>
     <!-- string name="lat_lon_pattern">Lat: %1$.5f Lon: %2$.5f</string -->
     <string name="follow_us">Följ oss</string>
     <string name="current_track">Nuvarande spår</string>
@@ -2219,8 +2219,8 @@ Om du tycker om OsmAnd och OSM och vill stödja dem så är detta ett utmärkt s
     <string name="lang_ast">Asturiska</string>
     <string name="access_direction_audio_feedback_descr">Ange riktningen till målet med ljud.</string>
     <string name="access_direction_haptic_feedback_descr">Ange riktningen till målet med vibration.</string>
-    <string name="access_direction_audio_feedback">Riktning (ljudåterkoppling)</string>
-    <string name="access_direction_haptic_feedback">Riktning (vibrationsåterkoppling)</string>
+    <string name="access_direction_audio_feedback">Ljuddirektiv</string>
+    <string name="access_direction_haptic_feedback">Vibrationsdirektiv</string>
     <string name="shared_string_from">från</string>
     <string name="city_type_district">Distrikt</string>
     <string name="city_type_neighbourhood">Grannskap</string>
@@ -2237,7 +2237,7 @@ Om du tycker om OsmAnd och OSM och vill stödja dem så är detta ett utmärkt s
     <string name="coords_search">Koordinatsökning</string>
     <string name="advanced_coords_search">Avancerad koordinatsökning</string>
     <string name="back_to_search">Tillbaka till Sök</string>
-    <string name="confirmation_to_delete_history_items">Vill du radera de markerade posterna från historiken?</string>
+    <string name="confirmation_to_delete_history_items">Vill du ta bort de valda posterna från \'Historik\'\?</string>
     <string name="show_something_on_map">Visa %1$s på kartan</string>
     <string name="dist_away_from_my_location">Sök %1$s bort</string>
     <string name="translit_names">Transkribera namn</string>
@@ -2261,19 +2261,19 @@ Om du tycker om OsmAnd och OSM och vill stödja dem så är detta ett utmärkt s
     <string name="location_not_found">Platsen hittades inte</string>
     <string name="no_inet_connection">Ingen Internetanslutning</string>
     <string name="no_inet_connection_desc_map">Krävs för att hämta kartor.</string>
-    <string name="search_location">Söker plats…</string>
+    <string name="search_location">Söker efter plats…</string>
     <string name="storage_free_space">Oanvänt utrymme</string>
     <string name="storage_place_description">OsmAnds lagringsplats för data (för kartor, GPX-filer med mera): %1$s.</string>
-    <string name="give_permission">Ge tillåtelse</string>
-    <string name="allow_access_location">Tillåt åtkomst till plats</string>
+    <string name="give_permission">Bevilja tillstånd</string>
+    <string name="allow_access_location">Tillåt platsåtkomst</string>
     <string name="no_update_info">Visa inte uppdateringar</string>
-    <string name="update_all_maps_now">Vill du uppdatera alla kartor nu?</string>
+    <string name="update_all_maps_now">Uppdatera alla kartor nu\?</string>
     <string name="routing_attr_short_way_name">Bränslesnål väg</string>
     <string name="routing_attr_short_way_description">Använd bränslesnål väg (oftast kortare).</string>
     <string name="shared_string_change">Ändra</string>
     <string name="get_started">Kom igång</string>
     <string name="replace_favorite_confirmation">Är du säker på att du vill ersätta favoriten %1$s?</string>
-    <string name="clear_tile_data">Rensa alla brickor</string>
+    <string name="clear_tile_data">Rensa alla rutor</string>
     <string name="search_hint">Ange stad, adress och POI-namn</string>
     <string name="donation_to_osm">Donation till OpenStreetMap-gemenskapen</string>
     <string name="get_it">Skaffa det</string>
@@ -2281,15 +2281,15 @@ Om du tycker om OsmAnd och OSM och vill stödja dem så är detta ett utmärkt s
     <string name="get_for_month">Skaffa för %1$s månad</string>
     <string name="skip_map_downloading_desc">"Du har inte några offline-kartor installerade. Du kan välja en karta från listan eller hämta kartor senare via \'Meny  - %1$s\'."</string>
     <string name="search_map">Söker efter kartor …</string>
-    <string name="first_usage_greeting">Få anvisningar och upptäck nya platser utan Internetuppkoppling</string>
+    <string name="first_usage_greeting">Erhåll vägbeskrivningar och upptäck nya platser utan Internetuppkoppling</string>
     <string name="search_my_location">Sök efter min plats</string>
     <string name="rendering_attr_contourColorScheme_description">Färgschema för konturer</string>
     <string name="save_track_min_speed">Minsta loggningshastighet</string>
-    <string name="save_track_min_speed_descr">Filter: Välj minsta hastighet som startar loggning av en punkt.</string>
+    <string name="save_track_min_speed_descr">Filter: ingen loggning av punkter under denna hastighet.</string>
     <string name="save_track_min_distance">Loggning av minimal rörelse</string>
-    <string name="save_track_min_distance_descr">Filter: Ange minsta avstånd från den senaste positionen för att en punkt ska loggas.</string>
+    <string name="save_track_min_distance_descr">Filter: Ställ in minsta avstånd från en punkt för att logga en ny.</string>
     <string name="save_track_precision">Minsta loggningsprecision</string>
-    <string name="save_track_precision_descr">Filter: Välj minsta precision som startar loggning av en punkt.</string>
+    <string name="save_track_precision_descr">Filter: Ingen loggning om inte denna noggrannhet uppnås.</string>
     <string name="christmas_poi">Jul-POI</string>
     <string name="christmas_desc_q">Visa Jul-POI?</string>
     <string name="rendering_value_light_brown_name">Ljusbrun</string>
@@ -2320,19 +2320,19 @@ Om du tycker om OsmAnd och OSM och vill stödja dem så är detta ett utmärkt s
     <string name="trip_rec_notification_settings">Aktivera snabbstart av inspelning</string>
     
     <string name="christmas_desc">Med tanke på den kommande julen och nyåret så kan du välja att visa POI som har med julen att göra: julgranar, julmarknader med mera.</string>
-    <string name="rendering_attr_contourWidth_name">Bredd på konturlinjer</string>
+    <string name="rendering_attr_contourWidth_name">Bredd på konturlinjen</string>
     <string name="rendering_attr_hideWaterPolygons_description">Vatten</string>
     <string name="osm_live_payment_desc">Prenumerationsavgiften faktureras varje månad. Avbryt den när som helst i Google Play.</string>
-    <string name="donation_to_osm_desc">En del av din donation kommer att skickas till OSM-användare som skickar in ändringar till OpenStreetMap. Prenumerationens kostnad fortsätter att vara densamma.</string>
+    <string name="donation_to_osm_desc">En del av din donation skickas till OSM-användare som skickar in ändringar till OpenStreetMap. Kostnaden för abonnemanget förblir densamma.</string>
     <string name="osm_live_subscription_desc">En prenumeration aktiverar uppdateringar varje timme, dag eller vecka och obegränsade nedladdningar av alla kartor globalt.</string>
-    <string name="osm_live_banner_desc">Erhåll obegränsade nedladdningar av kartor samt kartuppdateringar oftare än en gång i månaden: varje vecka, varje dag eller varje timme.</string>
+    <string name="osm_live_banner_desc">Erhåll obegränsade karthämtningar och kartuppdateringar oftare än en gång i månaden: varje vecka, dagligen eller varje timme.</string>
     
     <string name="rendering_value_low_name">Låg</string>
-    <string name="rendering_attr_contourWidth_description">Bredd på konturlinjer</string>
+    <string name="rendering_attr_contourWidth_description">Bredd på konturlinjen</string>
     <string name="rendering_value_high_name">Hög</string>
     <string name="rendering_value_medium_w_name">Mellan</string>
-    <string name="rendering_attr_contourDensity_description">Täthet på konturlinjer</string>
-    <string name="rendering_attr_contourDensity_name">Täthet på konturlinjer</string>
+    <string name="rendering_attr_contourDensity_description">Täthet på konturlinjen</string>
+    <string name="rendering_attr_contourDensity_name">Täthet på konturlinjen</string>
     <string name="lang_zh_hk">Kinesiska (Hong Kong)</string>
     <string name="driving_region_australia">Australien</string>
     <string name="rendering_attr_hideWaterPolygons_name">Dölj vatten</string>
@@ -2397,7 +2397,7 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="select_gpx_folder">Välj mapp för GPX-filer</string>
     <string name="average_speed">Medelhastighet</string>
     <string name="shared_string_time_moving">Tid i rörelse</string>
-    <string name="max_speed">Maxhastighet</string>
+    <string name="max_speed">Högsta hastighet</string>
     <string name="no_update_info_desc">Kontrollera inte efter uppdateringar om nya versioner eller rabatter relaterade till OsmAnd.</string>
     <string name="lang_sr_latn">Serbiska (latin)</string>
     <string name="configure_screen_quick_action">Snabbåtgärd</string>
@@ -2418,7 +2418,7 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="points_delete_multiple_succesful">Punkt(er) togs bort.</string>
     <string name="points_delete_multiple">Du håller på att ta bort %1$d punkt(er). Är du säker?</string>
     <string name="route_points_category_name">Kurvor att passera längs rutten</string>
-    <string name="track_points_category_name">Viktiga punkter längs denna rutt</string>
+    <string name="track_points_category_name">Vägpunkter, sevärdheter, namngivna funktioner</string>
     <string name="shared_string_gpx_track">Spår</string>
     <string name="shared_string_action_name">Åtgärdsnamn</string>
 <string name="quick_action_map_overlay_title">Kartöverlägg</string>
@@ -2531,7 +2531,7 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="quick_action_resume_pause_navigation">Pausa/Återuppta navigeringen</string>
     <string name="quick_action_start_stop_navigation">Starta/Stoppa navigeringen</string>
     <string name="shared_string_reset">Återställ</string>
-    <string name="shared_string_reload">Ladda om</string>
+    <string name="shared_string_reload">Uppdatera</string>
     <string name="wrong_user_name">Fel användarnamn</string>
     <string name="shared_string_to">Till</string>
     <string name="mapillary_menu_date_from">Från</string>
@@ -2706,7 +2706,7 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="map_orientation_change_in_accordance_with_speed_descr">Välj nedan vilken hastighet kartläget växlar från \"riktning\" till \"kompass\".</string>
     <string name="show_direction">Avståndsindikering</string>
     <string name="measurement_tool_snap_to_road_descr">Charlott ansluter punkter med vägar för den valda profilen.</string>
-    <string name="mapillary_menu_descr_tile_cache">Ladda tiles för att se aktuella data.</string>
+    <string name="mapillary_menu_descr_tile_cache">Uppdatera rutor för att se aktuell data.</string>
     <string name="mapillary_menu_title_tile_cache">Tile-cache</string>
     <string name="mapillary_menu_filter_description">Filtrera bilderna enligt inlämnare eller datum. Filter tillämpas endast för närbildszoom.</string>
     <string name="map_widget_ruler_control">Radielinjal</string>
@@ -2730,15 +2730,15 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="quick_action_auto_zoom_on">Aktivera autozoom karta</string>
     <string name="quick_action_auto_zoom_off">Inaktivera autozoom karta</string>
     <string name="quick_action_add_first_intermediate">Lägg till första mellanliggande</string>
-    <string name="quick_action_add_destination_desc">Knackning på åtgärdsknappen kommer att lägga till en destination från skärmens mitt. Tidigare inställda destinationen blir den sista mellanliggande destinationen.</string>
-    <string name="quick_action_replace_destination_desc">Knackning på åtgärdsknappen kommer att ersätta destinationen med skärmens mittläge.</string>
-    <string name="quick_action_add_first_intermediate_desc">Knackning på åtgärdsknappen kommer att lägga en första mellanliggande punkt från skärmens mittpunkt.</string>
+    <string name="quick_action_add_destination_desc">Genom att trycka på den här åtgärdsknappen blir skärmens mittpunkt resmålet, alla tidigare valda mål blir den senaste mellanliggande destinationen.</string>
+    <string name="quick_action_replace_destination_desc">Genom att trycka på den här åtgärdsknappen kan skärmen centrera den nya ruttdestinationen och ersätta den tidigare valda destinationen (om någon).</string>
+    <string name="quick_action_add_first_intermediate_desc">Genom att trycka på denna åtgärdsknapp kommer skärmens mittpunkt att bli den första mellanliggande destinationen.</string>
     <string name="subscribe_email_desc">Anmäl dig till vår e-postlista om apprabatter och få 3 extra kartnedladdningar!</string>
-    <string name="depth_contour_descr">Kartor som innehåller havsdjupskonturer och nautiska punkter.</string>
-    <string name="sea_depth_thanks">Tack för att du köpt nautiska djupkonturer!</string>
+    <string name="depth_contour_descr">Havsdjupskonturer och sjömärken.</string>
+    <string name="sea_depth_thanks">Tack för att du köpt \"Nautiska djupkonturer\"</string>
     <string name="index_item_depth_contours_osmand_ext">Nautiska djupkonturer</string>
-    <string name="index_item_depth_points_southern_hemisphere">Nautiska djuppunkter södra halvklotet</string>
-    <string name="index_item_depth_points_northern_hemisphere">Nautiska djuppoäng norra halvklotet</string>
+    <string name="index_item_depth_points_southern_hemisphere">Nautiska djuppunkter på södra halvklotet</string>
+    <string name="index_item_depth_points_northern_hemisphere">Nautiska djuppunkter på norra halvklotet</string>
     <string name="download_depth_countours">Nautiska djupkonturer</string>
     <string name="do_not_send_anonymous_app_usage_desc">OsmAnd samlar in information om vilka delar av appen du öppnar. Din plats skickas aldrig, inte heller någonting du anger i appen eller detaljer om områden du visar, söker eller hämtar.</string>
     <string name="routing_attr_relief_smoothness_factor_name">Välj höjdfluktuation</string>
@@ -2778,11 +2778,29 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="route_is_too_long_v2">Denna väg kan vara för lång tid att beräkna. Lägg till mellanliggande destinationer om inget resultat finns inom 10 minuter.</string>
     <string name="osmand_extended_description_part1">"OsmAnd (OSM Automated Navigation Directions) är en kartnavigationsapp med tillgång till gratis, världsomfattande OpenStreetMap (OSM)-data av hög kvalitet. Njut av röstnavigation eller visuell navigation, visning av POI (points of interest - nyttoplatser), att skapa och hantera GPX-spår, visa höjdkurvor  och höjdinfo (via plugin), val mellan bil-, cykel-, fotgängar-lägen, OSM-redigering och mycket mer."</string>
     <string name="osmand_extended_description_part2">GPS-navigering • Du kan välja mellan offline (inga roaming-avgifter när du är utomlands) eller på online(snabbare)-läge • Turn-by-Turn röstguidning leder dig längs vägen (inspelade och genererade röster) • Rutten uppdateras om du avviker från den. • Filval och beräknad ankomsttid hjälper dig längs vägen • För att göra din resa säkrare, dag/natt-läge växlar automatiskt • Du kan välja att visa hastighetsbegränsningar och få påminnelser om du överskrider den • Kartzoomen anpassar sig till din hastighet. • Du kan söka destinationer efter adress eller efter typ (t.ex.: parkering, restaurang, hotell, bensinstation, museum), eller av geografiska koordinater • Stödjer mellanliggande punkter på din rutt • Du kan spela in dina egna eller ladda upp en GPX-spår och följa dem</string>
-    <string name="osmand_extended_description_part3">Karta • Visar Poi (point of interests) runt omkring dig • Justera kartan baserat på riktning (eller kompass) • Visar var du är och vad du tittar på • Dela din plats så att dina vänner kan hitta dig • Sparar dina viktigaste platser i Favoriter • Låter dig välja hur du vill visa namn på kartan: på svenska, lokala, eller fonetisk stavning • Visar specialiserade online-tiles, satellitvy (Bing), olika överlägg som tour/navigering GPX-spår och ytterligare lager med anpassningsbar transparens</string>
+    <string name="osmand_extended_description_part3">Karta
+\n • Visar Poi (point of interests) runt omkring dig
+\n • Justera kartan baserat på riktning (eller kompass)
+\n • Visar var du är och vad du tittar på
+\n • Dela din plats så att dina vänner kan hitta dig
+\n • Sparar dina viktigaste platser i Favoriter
+\n • Låter dig välja hur du vill visa namn på kartan: på svenska, lokala, eller fonetisk stavning
+\n • Visar specialiserade online-rutor, satellitvy (från Bing), olika överlägg som tour/navigering GPX-spår och ytterligare lager med anpassningsbar transparens
+\n</string>
     <string name="osmand_extended_description_part4">Skidåkning OsmAnd skidkartor plugin gör att du kan se skidspår svårighetsgrad och en del kompletterande information, som plats för liftar och andra faciliteter.</string>
     <string name="osmand_extended_description_part5">Cykling • Du kan hitta cykelstigar på kartan • GPS-navigering i cykelläge skapar din rutt med hjälp av cykelvägar • Du kan se din hastighet och höjd • Med GPX-inspelningsalternativet kan du spela in din resa och dela den • Via ytterligare plugin kan du aktivera visning av höjdkurvor och höjdrelief</string>
-    <string name="osmand_extended_description_part6">Promenader, vandring, stadsrundtur • Kartan visar promenad-och vandringsleder • Wikipedia på ditt föredragna språk kan berätta en hel del under en stadsrundtur • Hållplatser för kollektivtrafiken (buss, spårvagn, tåg), inklusive linjenamn, hjälper till att navigera i en ny stad • GPS-navigation i fotgängarläge bygger din rutt med hjälp av gångvägar • Du kan ladda upp och följa en GPX-rutt eller spela in och dela dina egna</string>
-    <string name="osmand_extended_description_part7">Bidra till OSM • Rapportera databuggar • Ladda upp GPX-spår till OSM direkt från appen • Lägg till POI och ladda upp dem direkt till OSM (eller senare om offline)</string>
+    <string name="osmand_extended_description_part6">Promenader, vandring, stadsrundtur
+\n • Kartan visar promenad- och vandringsleder
+\n • Wikipedia på ditt föredragna språk kan berätta en hel del under en stadsrundtur
+\n • Hållplatser för kollektivtrafiken (buss, spårvagn, tåg), inklusive linjenamn, hjälper till att navigera i en ny stad
+\n • GPS-navigation i fotgängarläge bygger din rutt med hjälp av gångvägar
+\n • Du kan ladda upp och följa en GPX-rutt eller spela in och dela dina egna
+\n</string>
+    <string name="osmand_extended_description_part7">Bidra till OSM
+\n • Rapportera datafel
+\n • Ladda upp GPX-spår till OSM direkt från appen
+\n • Lägg till POI och ladda upp dem direkt till OSM (eller senare om du är frånkopplad)
+\n</string>
     <string name="clear_all_intermediates">Rensa alla mellanliggande punkter</string>
     <string name="rendering_attr_whiteWaterSports_name">Strömsporter</string>
     <string name="osmand_extended_description_part8">OsmAnd är open-source och är utvecklas aktivt. Alla kan bidra till appen genom att rapportera buggar, förbättra översättningar eller programmera nya funktioner. Projektet är i ett dynamiskt tillstånd av kontinuerlig förbättring av alla dessa former genom utvecklare och interaktion med användare. Projektet är också beroende av ekonomiska bidrag för att finansiera kodning och testning av nya funktioner. Ungefärlig karttäckning och kvalitet: • Västeuropa: **** • Östeuropa: *** • Ryssland: *** • Nordamerika: *** • Sydamerika: ** • Asien: ** • Japan &amp; Korea: *** • Mellanöstern: ** • Afrika: ** • Antarktis: * De flesta länder runt om i världen finns tillgängliga för hämtning! Få en tillförlitlig navigator i ditt land - det kan vara Tyskland, Frankrike, Mexiko, Storbritannien, Spanien, Nederländerna, USA, Ryssland, Brasilien eller något annat.</string>
@@ -2802,7 +2820,14 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="shared_string_total">Totalt</string>
     <string name="osmand_plus_extended_description_part1">OsmAnd+ (OSM Automated Navigation Directions) är en kartnavigationsapp med tillgång till gratis världsomfattande och högkvalitativa OpenStreetMap (OSM)-data. Njut av röst- och visuell navigation, visning av POI (points of interest - intressepunkter), att skapa och hantera GPX-spår, se höjdkurvor och höjdinfo, välja mellan bil-cykel- och fotgängarlägen, OSM-redigering och mycket mer. OsmAnd+ är en betalversion av appen. Genom att köpa den, stödjer du projektet, finansierar utveckling av nya funktioner, och får de senaste uppdateringarna. Några av de viktigaste funktionerna:</string>
     <string name="osmand_plus_extended_description_part2">Navigering • Fungerar på nätet (snabb) eller offline (inga roaming-avgifter när du är utomlands) • Sväng-för-sväng-röstguidning (inspelade och syntetiska röster) • Valfri körfältsguide, gatunamn visas, och beräknad ankomsttid • Stödjer mellanliggande punkter på din resplan • Automatisk omdirigering när du avviker från rutten • Sök platser efter adress eller typ (t ex: restaurang, hotell, bensinstation, museum), eller med geografiska koordinater</string>
-    <string name="osmand_plus_extended_description_part3">Kartvisning • Visa din position och orientering • Eventuellt justera bilden i förhållande till kompass eller din riktning • Spara dina mest viktiga platser som Favoriter • Visa POI(Points Of Interests - intressepunkter) runt omkring dig • Visa specialiserade onlineraster, satellitvisning (Bing), olika lager som turnering/navigering GPX-spår och ytterligare lager med anpassningsbar transparens • Alternativt visa namn på engelska, lokalt språk eller fonetisk stavning</string>
+    <string name="osmand_plus_extended_description_part3">Kartvisning
+\n • Visa din position och orientering
+\n • Eventuellt justera bilden i förhållande till kompass eller din riktning
+\n • Spara dina mest viktiga platser som Favoriter
+\n • Visa POI(Points Of Interests - intressepunkter) runt omkring dig
+\n • Visa specialiserade online-rutor, satellitvisning (från Bing), olika lager som turnering/navigering GPX-spår och ytterligare lager med anpassningsbar transparens
+\n • Alternativt visa namn på engelska, lokalt språk eller fonetisk stavning
+\n</string>
     <string name="live_monitoring_max_interval_to_send">Tidsbuffert för online-spårning</string>
     <string name="live_monitoring_max_interval_to_send_desrc">Ange en tidsbuffert för att behålla platser att skicka utan anslutning</string>
     <string name="show_free_version_banner">Visa gratisversion-banner</string>
@@ -2842,11 +2867,11 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="light_rs_render_descr">Enkel och kontrastrik stil för navigering med bil. Skonsam mot ögonen under natten. Viktiga funktioner: höjdkurvor, kontrastrik orange stil på vägar, mindre störande sekundära kartobjekt.</string>
     <string name="topo_render_descr">Kontraststil utformad främst för vandring, trekking och cykling i naturen. Bra läsbarhet vid komplex extern belysning. Viktiga funktioner: kontrastrika vägar och naturliga objekt, olika typer av rutter, höjdkurvor med avancerade inställningar för mer detaljer på motsvarande zoomnivåer än standard. Ytläge-alternativet kan skilja vägens ytkvalitet. Inget nattläge.</string>
     <string name="mapnik_render_descr">Gamla \"Mapnik\'-stil standardrendering. Viktiga funktioner: Färger som liknar \"Mapnik\" stil.</string>
-    <string name="touring_view_render_descr">Högsdetaljsstil för touringändamål. Innehåller alla inställningar av standardstilen, men även: Visar så mycket information som möjligt, i synnerhet alla vägar, stigar och andra sätt att resa. Tydliga visuella skillnader mellan olika vägtyper, påminnande av många atlaser. Högkontrastfärger för användning utomhus, dag- och nattläge.</string>
+    <string name="touring_view_render_descr">Högsdetaljsstil för turiständamål. Innehåller alla konfigurationsinställningar av standardstilen, dessutom: Visar så mycket detaljer som möjligt, i synnerhet alla vägar, stigar och andra sätt att resa. Tydliga visuella skillnader mellan olika vägtyper som påminner om många turistatlaser. Högkontrastfärger för utomhusbruk, dag- och nattläge.</string>
     <string name="default_render_descr">Stil för allmänna ändamål. Förenklad återgivning i tätbefolkade städer. Viktiga funktioner: höjdkurvor, rutter, ytkvalitet, tillträdeskontroll, farthinder, stigrendering enligt SAC-skala, vattensporter.</string>
     <string name="open_wikipedia_link_online">Öppna Wikipedia-länk på nätet</string>
     <string name="open_wikipedia_link_online_description">Länken kommer att öppnas i en webbläsare.</string>
-    <string name="read_wikipedia_offline_description">Skaffa OsmAnd Live-prenumeration för att läsa Wikipedia och Wikipedia-artiklar frånkopplad.</string>
+    <string name="read_wikipedia_offline_description">Skaffa OsmAnd Live-prenumeration för att läsa Wikipedia och Wikivoyage-artiklar frånkopplad.</string>
     <string name="how_to_open_link">Hur öppnar man länken?</string>
     <string name="read_wikipedia_offline">Läs Wikipedia frånkopplad</string>
     <string name="download_all">Hämta alla</string>
@@ -2990,20 +3015,20 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="coord_input_save_as_track_descr">Du lade till %1$s punkter. Skriv ett filnamn och tryck sedan på \"Spara\".</string>
     <string name="error_notification_desc">Skicka gärna en skärmdump av detta meddelande till support@osmand.net</string>
     <string name="quick_action_edit_actions">Redigera åtgärder</string>
-    <string name="get_osmand_live">Skaffa OsmAnd Live för att låsa upp alla features: Dagliga kartuppdateringar med obegränsat antal nedladdningar, alla betal-och gratistillägg, Wikipedia, Wikivoyage och mycket mer.</string>
+    <string name="get_osmand_live">Skaffa OsmAnd Live för att låsa upp alla funktioner: Dagliga kartuppdateringar med obegränsat antal hämtningar, alla betal-och gratistillägg, Wikipedia, Wikivoyage och mycket mer.</string>
     <string name="unirs_render_descr">Ändring av standardstilen för att öka kontrasten av gång och cykelvägar. Använder färger från tidigare versioner av Mapink.</string>
     <string name="shared_string_gpx_files">GPX-filer</string>
-    <string name="release_3_0">"• Nyhet: Stöd för globala frånkopplade  reseguider. Refererade platser är länkade till kartan. Datan kommer initialt från Wikivoyage. 
-\n 
-\n • Wikipedia: Nytt utseende, aktiva länkar, stöd för bilder 
-\n 
-\n • Open Track UI: Stöd för waypoint-grupper 
-\n 
+    <string name="release_3_0">• Nyhet: Stöd för globala frånkopplade reseguider. Refererade platser är länkade till kartan. Datan kommer initialt från Wikivoyage.
+\n
+\n • Wikipedia: Nytt utseende, aktiva länkar, stöd för bilder
+\n
+\n • Open Track UI: Stöd för waypoint-grupper
+\n
 \n • Kartmarkörer: Importering av valda grupper från GPX-filer, koordinatinmatning, nytt utseende 
-\n 
+\n
 \n • OsmAnd Live-prenumeration stödjer nu alla OsmAnd funktioner
-\n 
-\n"</string>
+\n
+\n</string>
     <string name="quick_action_page_list_descr">Att trycka på denna åtgärdsknapp bläddrar genom listan nedan.</string>
     <string name="poi_cannot_be_found">Nod eller väg kan inte hittas.</string>
     <string name="search_no_results_feedback">Inga sökresultat?
@@ -3016,7 +3041,26 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="send_search_query_description">Vi skickar din sökfråga: <b>\"%1$s\"</b>, såväl som din plats.<br/><br/> Vi samlar inte in personlig information, vi behöver bara sökdata för att förbättra sökalgoritmen.<br/></string>
     <string name="third_party_application">Tredjepartsprogram</string>
     <string name="search_street">Sök gata</string>
-    <string name="start_search_from_city">Börja sökning från stad</string>
+    <string name="start_search_from_city">Välj en stad först</string>
     <string name="shared_string_restore">Återställ</string>
     <string name="keep_passed_markers">Behåll passerade markörer på kartan</string>
-    </resources>
+    <string name="powered_by_osmand">Drivs av OsmAnd</string>
+    <string name="osm_live_plan_pricing">Abonnemang &amp; Priser</string>
+    <string name="osm_live_payment_monthly_title">Betala månadsvis</string>
+    <string name="osm_live_payment_3_months_title">Betala var 3:e månad</string>
+    <string name="osm_live_payment_annual_title">Betala en gång om året</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / månad</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / månad</string>
+    <string name="osm_live_payment_discount_descr">Spara %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Ditt nuvarande abonnemang</string>
+    <string name="osm_live_payment_renews_monthly">Förnyas varje månad</string>
+    <string name="osm_live_payment_renews_quarterly">Förnyas kvartalsvis</string>
+    <string name="osm_live_payment_renews_annually">Förnyas årligen</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Välj en passande betalningsperiod:</string>
+    <string name="osm_live_payment_contribute_descr">En del av intäkterna går till OpenStreetMap bidragsgivare.</string>
+    <string name="markers_remove_dialog_msg">Ta bort kartmarkör \'%s\'\?</string>
+    <string name="edit_map_marker">Redigera kartmarkör</string>
+    <string name="osm_live_subscriptions">Abonnemang</string>
+    <string name="keep_passed_markers_descr">Markörer tillagda som en grupp av favoriter eller GPX waypoints märkta som \'passerad\' kommer att finnas kvar på kartan. Om gruppen inte är aktiv, kommer markörerna att försvinna från kartan.</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ta/strings.xml b/OsmAnd/res/values-ta/strings.xml
index 14d4f1bddf..7da0ae0326 100644
--- a/OsmAnd/res/values-ta/strings.xml
+++ b/OsmAnd/res/values-ta/strings.xml
@@ -1 +1,1399 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources/>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<resources><string name="osm_live_subscriptions">சந்தாக்கள்
+\n</string>
+    <string name="powered_by_osmand">osm மூலம் இயக்கப்படுகிறது</string>
+    <string name="osm_live_plan_pricing">திட்டம் &amp; விலை</string>
+    <string name="osm_live_payment_monthly_title">"மாத தவணை "</string>
+    <string name="osm_live_payment_3_months_title">3 மாதங்களுக்கு ஒருமுறை செலுத்துங்கள்</string>
+    <string name="osm_live_payment_annual_title">ஒரு வருடத்திற்கு ஒரு முறை செலுத்துங்கள்</string>
+    <string name="osm_live_payment_current_subscription">உங்கள் தற்போதைய சந்தா</string>
+    <string name="osm_live_payment_renews_monthly">மாதாந்திர புதுப்பிப்பு</string>
+    <string name="osm_live_payment_renews_quarterly">காலாண்டு புதுப்பிப்பு</string>
+    <string name="osm_live_payment_renews_annually">வருடாந்திர புதுப்பிப்பு</string>
+    <string name="osm_live_payment_header">"உங்களுக்கு உரிய  கட்டண காலத்தை தேர்ந்தெடுக்கவும்:"</string>
+    <string name="osm_live_payment_contribute_descr">வருவாயின் ஒரு பகுதி OpenStreetMap பங்களிப்பாளர்களுக்கு செல்கிறது.</string>
+    <string name="edit_map_marker">வரைபட குறியீட்டை திருத்த</string>
+    <string name="third_party_application">மூன்றாம்-தரப்பு மென்பொருள்</string>
+    <string name="search_street">தெருவை தேட</string>
+    <string name="start_search_from_city">முதலில் நகரத்தை தேர்வு செய்</string>
+    <string name="shared_string_restore">மீட்டெடு</string>
+    <string name="keep_passed_markers_descr">பிடித்தவர்களின் குழுவாக அல்லது ஜி.பீ.எக்ஸ் வழிப்பாதைகளின் வரைபடத்தில் இருக்கும் கடவுச்சொல் என குறியிடப்படும் குறிப்பான்கள் சேர்க்கப்பட்டுள்ளன. குழு செயலில் இல்லை என்றால், குறிப்பான்கள் வரைபடத்தில் இருந்து மறைந்துவிடும்.</string>
+    <string name="keep_passed_markers">கடந்த அடையாளக்குறியை வரைபடத்தில் குறிக்கவும்</string>
+    <string name="more_transport_on_stop_hint">இந்த நிறுத்தத்தில் அதிக போக்குவரத்து உள்ளது.</string>
+    <string name="ask_for_location_permission">மேலும் தொடர இருப்பிடத்திற்கான Osm அனுமதியை கொடுக்கவும்.</string>
+    <string name="thank_you_for_feedback">கருத்துக்கு நன்றி</string>
+    <string name="send_search_query">தேடல் வினவலை அனுப்ப\?</string>
+    <string name="coord_input_edit_point">திருத்தும் நிலை</string>
+    <string name="quick_action_edit_actions">செயல்களை திருத்த</string>
+    <string name="poi_cannot_be_found">முனை அல்லது வழி கண்டுபிடிக்க முடியவில்லை.</string>
+    <string name="search_no_results_feedback">தேடல் முடிவு இல்லையா\?
+\nஎங்களுக்கு கருத்து தெரிவிக்கவும்
+\n</string>
+    <string name="commiting_way">உறுதி செய்வதற்கான வழி…</string>
+    <string name="increase_search_radius_to">தேடுதல் வட்டத்தை %1$s ஆக கூட்டவும்</string>
+    <string name="send_search_query_description">நாங்கள் உங்களின் தேடல்: <b>1\"%1$s\"</b>2, மற்றும் இருப்பிடத்தை அனுப்புவோம்.<br/>3<br/>"4 நாங்கள் உங்களது தனிப்பட்ட விவரத்தை  சேகரிக்க மாட்டோம், எங்களுடைய தேடுதல் 
+\n வழிமுறையை மேம்படுத்த உங்களின் தேடுதல் தகவல் தேவை படுகிறது ."<br/>5</string>
+    <string name="shared_string_world">உலகம்</string>
+
+    <string name="point_deleted">புள்ளி %1$s நீக்கப்பட்டது</string>
+    <string name="coord_input_add_point">புள்ளியே சேர்க்க</string>
+    <string name="coord_input_save_as_track">பாதை எனச் சேமி</string>
+    <string name="coord_input_save_as_track_descr">%1$s புள்ளிகளை நீங்கள் சேர்த்துள்ளீர்கள். ஒரு கோப்பு பெயரை தரவும் பின் \"சேமி\" என்பதை அழுத்தவும்.</string>
+    <string name="error_notification_desc">Support@osmand.net க்கு இந்த அறிவிப்பின் ஸ்கிரீன் ஷாட்டை அனுப்பவும்</string>
+    <string name="get_osmand_live">வரம்பற்ற பதிவிறக்கங்கள், அனைத்து பணம் மற்றும் இலவச கூடுதல், விக்கிபீடியா, விக்கிவோயேஜ், தினசரி வரைபடத்தை மேம்படுத்தல்கள் மற்றும் பல அம்சங்கள் திறக்க பெற OsmAndLive பெறவும்.</string>
+    <string name="update_is_available">மேம்படுத்தல் உள்ளது</string>
+    <string name="open_wikipedia_link_online">விக்கிபீடியா இணைப்பை ஆன்லைனில் திறக்கவும்</string>
+    <string name="open_wikipedia_link_online_description">இணைய உலாவியில் இணைப்பு திறக்கப்படும்.</string>
+    <string name="read_wikipedia_offline_description">விக்கிபீடியா மற்றும் விக்கிபீஜ் கட்டுரைகளை வாசிப்பதற்கு OsmAnd Live சந்தாவை பெறவும்.</string>
+    <string name="how_to_open_link">இணைப்பை எவ்வாறு திறக்க வேண்டும்\?</string>
+    <string name="read_wikipedia_offline">விக்கிபீடியா ஆஃப்லைன் வாசிக்கவும்</string>
+    <string name="download_all">அனைத்தையும் பதிவிறக்கு</string>
+    <string name="shared_string_restart">மென்பொருள் மறுதொடக்கம்</string>
+    <string name="show_images">படங்களை காட்டு</string>
+    <string name="purchase_cancelled_dialog_title">உங்கள் OsmAnd லைவ் சந்தாவை நீங்கள் ரத்து செய்துள்ளீர்கள்</string>
+    <string name="purchase_cancelled_dialog_descr">அனைத்து அம்சங்களையும் பயன்படுத்த மற்றும் தொடர சந்தாவை புதுப்பிக்கவும்:</string>
+    <string name="maps_you_need_descr">நீங்கள் புக்மார்க் செய்த தளங்களின் அடிப்படையில், கீழ்கண்ட வரைபடங்கள் பதிவிறக்கம் செய்ய பரிந்துரைக்கப்பட்டுள்ளன:</string>
+    <string name="maps_you_need">உங்களுக்கு தேவையான வரைபடங்கள்</string>
+    <string name="osmand_team">OsmAnd குழு</string>
+    <string name="popular_destinations">பிரபலமான இடங்களுக்கு</string>
+    <string name="paid_app">பணம் செளுதவெண்டிய செயலி</string>
+    <string name="paid_plugin">கட்டண சொருகி</string>
+    <string name="travel_card_update_descr">புதுப்பிப்பு செய்து, புதிய Wikivoyage தரவை அனுபவியுங்கள்.</string>
+    <string name="travel_card_download_descr">"இணையத்துடன் ஒரு இணைப்பு இல்லாமல் உலகெங்கிலும் உள்ள இடங்களைப் பற்றிய கட்டுரைகளைப் பார்வையிட   Wikivoyage  பயண வழிகாட்டிகளைப் பதிவிறக்கவும்."</string>
+    <string name="download_file">பதிவிறக்க கோப்பு</string>
+    <string name="start_editing_card_image_text">இலவச உலகளாவிய பயண வழிகாட்டி எவரும் திருத்த முடியும்.</string>
+    <string name="start_editing_card_description">உங்களால் எல்லா வகையான கட்டுரைகளை திருத்த முடியும்.
+\nஅறிவு, அனுபவம், திறமை மற்றும் உங்கள் கவனத்தை பகிர்ந்து கொள்ளுங்கள்</string>
+    <string name="start_editing">திருத்தம் செய்ய தொடங்கவும்</string>
+    <string name="get_unlimited_access">வரம்பற்ற அணுகலைப் பெறுக</string>
+    <string name="welcome_to_open_beta">திறந்த பீட்டாவை வரவேற்கிறோம்</string>
+    <string name="wikivoyage_travel_guide">பயண வழிகாட்டிகள்</string>
+    <string name="wikivoyage_travel_guide_descr">இணையத்தில் ஒரு இணைப்பு இல்லாமல், கிரகதில் உள்ள மிகவும் சுவாரஸ்யமான இடங்களுக்கு OsmAnd உள்ளே வழிகாட்டபட்டுளது.</string>
+    <string name="monthly_map_updates">வரைபட புதுப்பிப்புகள்: <b>1 எல்லா மாதமும்</b>2</string>
+    <string name="daily_map_updates">வரைபட புதுப்பிப்புகள்:<b>1 எல்லா
+\nமணிநேரமும் </b>2</string>
+    <string name="shared_string_result">முடிவு</string>
+    <string name="use_two_digits_longitude">இரட்டை இலக்கு தீர்க்கரேகையை பயன்படுத்துக</string>
+    <string name="shared_string_travel_guides">பயண வழிகாட்டிகள்</string>
+    <string name="waypoints_removed_from_map_markers">வரைபட குறியீட்டிலிருந்து நிறுத்தங்கள் அகற்றப்பட்டன</string>
+    <string name="nothing_found_in_radius">எதையும் கண்டுபிடிக்க முடியவில்லை:</string>
+    <string name="shared_string_total">மொத்தம்</string>
+    <string name="clear_all_intermediates">அனைத்து இடைநிலை புள்ளிகளையும் அழிக்கவும்</string>
+    <string name="group_deleted">குழு நீக்கப்பட்டது</string>
+    <string name="rendering_attr_whiteWaterSports_name">வெண்ணீர் விளையாட்டுகள்</string>
+    <string name="distance_farthest">"தொலைவு: முதலாவதாக வெகுதொலைவு "</string>
+    <string name="shared_string_markers">குறிப்பான்</string>
+    <string name="coordinates_format">ஒருங்கிணைப்பு வடிவம்</string>
+    <string name="use_system_keyboard">அமைப்பின் தட்டச்சை பயன்படுத்துக</string>
+    <string name="fast_coordinates_input_descr">ஒருங்கிணைப்பு உள்ளீடு வடிவத்தை தேர்வு செய்க. இதை எப்பொழுது வேண்டுமானாலும் \"ஆமைப்பில்\"சென்று மாற்றிகொள்ளலாம்.</string>
+    <string name="fast_coordinates_input">விரைவான ஒருங்கிணைப்பு உள்ளீடு</string>
+    <string name="use_location">நிலையை பயண்படுத்து</string>
+    <string name="add_location_as_first_point_descr">சரியான பயணபாதையை திட்டமிட உங்களின் நிலையை சேர்க்கவும்.</string>
+    <string name="my_location">என் நிலையம்</string>
+    <string name="shared_string_finish">முடி</string>
+    <string name="plan_route">பாதையை திட்டமிடு</string>
+    <string name="shared_string_sort">வகைபடுத்து.</string>
+    <string name="coordinate_input">ஒருங்கிணைப்பு உள்ளீடு</string>
+    <string name="is_saved">சேமிக்கபட்டது</string>
+    <string name="marker_save_as_track_descr">பின்வரும் ஜிபிஎக்ஸ் கோப்புக்கு குறிப்பாங்களை ஏற்றுமதி செய்:</string>
+    <string name="marker_save_as_track">ஜிபிஎக்ஸ் கோப்பாக சேமி</string>
+    <string name="move_to_history">வறலாற்றுக்கு நகர்த்து</string>
+    <string name="group_will_be_removed_after_restart">அடுத்த முறை இந்த செயலியை இயக்கும் பொழுது இந்த குழு அழிந்திருக்கும்.</string>
+    <string name="show_guide_line">வழிகாட்டி குறிப்புகளை காட்டு</string>
+    <string name="show_arrows_on_the_map">அம்புகுறியீடுகளை வரைபடத்தில் காட்டு</string>
+    <string name="show_passed">தேர்வாகியதை காட்டு</string>
+    <string name="hide_passed">தேர்வாகியதை மறை</string>
+    <string name="remove_from_map_markers">வரைபட குறியீடுகளில் இருந்து நீக்கு</string>
+    <string name="descendingly">தலைகீழாக</string>
+    <string name="ascendingly">ஏறுவரிசையில்</string>
+    <string name="date_added">நாள் சேர்க்கபட்டது</string>
+    <string name="distance_nearest">தொலைவு: அருகில் உள்ளவை</string>
+    <string name="enter_lon">தீர்க்கரேகை உள்ளிடவும்</string>
+    <string name="enter_lat">அட்சரேகை உள்ளிடுக</string>
+    <string name="enter_lat_and_lon">அட்சரேகை மற்றும் தீர்க்கரேகை உள்ளிடவும்</string>
+    <string name="east_abbreviation">கிழக்கு</string>
+    <string name="west_abbreviation">மேற்கு</string>
+    <string name="south_abbreviation">தெற்கு</string>
+    <string name="north_abbreviation">வடக்கு</string>
+    <string name="optional_point_name">விருப்ப புள்ளியின் பெயர்</string>
+    <string name="transport_nearby_routes_within">அருகிலுள்ள வழிகள்</string>
+    <string name="transport_nearby_routes">அதற்குள்</string>
+    <string name="enter_the_file_name">கோப்பு பெயரை உள்ளிடவும்.</string>
+    <string name="map_import_error">வரைபட இறக்குமதி பிழை</string>
+    <string name="map_imported_successfully">வரைபடம் இறக்குமதி செய்யப்பட்டது</string>
+    <string name="make_as_start_point">இதை தொடக்கமாக மாற்றுக</string>
+    <string name="shared_string_current">தற்போதைய</string>
+    <string name="last_intermediate_dest_description">இடைநிலை நிறுத்தத்தை சேர்க்கிறது
+\n</string>
+    <string name="first_intermediate_dest_description">ஆரம்ப நிறுத்தத்தை சேர்க்கிறது</string>
+    <string name="subsequent_dest_description">இலக்கை நகர்த்தி அதை உருவாக்கவும்</string>
+    <string name="show_closed_notes">மூடிய குறிப்புகளை காட்டவும்</string>
+    <string name="switch_osm_notes_visibility_desc">OSM வரைபடத்தில் குறிப்புகளை மறைக்கவும்/காண்பிக்கவும்.</string>
+    <string name="shared_string_gpx_file">GPX கோப்பு</string>
+    <string name="osc_file">OSC கோப்பு</string>
+    <string name="choose_file_type">கோப்பு வகையை தேர்வு செய்க</string>
+    <string name="osm_edits_export_desc">ஏற்றுமதி வகையை தேர்ந்தெடுக்கவும்: OSM குறிப்புகள், POI, அல்லது இரண்டும்.</string>
+    <string name="all_data">அனைத்து தகவல்கள்</string>
+    <string name="osm_notes">OSM குறிப்புகள்</string>
+    <string name="will_open_tomorrow_at">நாளை திறக்கிறது</string>
+    <string name="rendering_attr_hidePOILabels_name">POI முகப்புவரிச்சீட்டு</string>
+    <string name="shared_string_without_name">பெயர் இல்லாமல்</string>
+    <string name="what_is_here">இங்கே என்ன இருக்கிறது:</string>
+    <string name="parked_at">நிறுத்தப்பட்ட இடம்</string>
+    <string name="pick_up_till">வரை அழைத்து</string>
+    <string name="without_time_limit">காலக்கெடு இல்லாமல்</string>
+    <string name="context_menu_read_full_article">முழு கட்டுரை வாசிக்க</string>
+    <string name="context_menu_read_article">கட்டுரை வாசிக்க</string>
+    <string name="context_menu_points_of_group">குழுவின் அனைத்து புள்ளிகளும்</string>
+    <string name="additional_actions">கூடுதல் செயல்கள்</string>
+    <string name="modify_the_search_query">தேடல் வினவலை மாற்றுக.</string>
+    <string name="shared_string_actions">செயல்கள்</string>
+    <string name="marker_show_distance_descr">வரைபட திரையில் வரைபட குறீட்டில் காட்டும் இடத்திற்க்கு செல்லும் தூரம் மற்ற்ம் வழிதடத்தை சுட்டுவது எப்படி என்னும் அமைப்பை தேர்ந்தேடு:</string>
+    <string name="map_orientation_change_in_accordance_with_speed">நோக்குநிலையிலன் தொடக்கநிலையை வரைக</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">நோக்குநிலை மாற்றியின் வேகத்தை \"அசைவின் திசையில்\" இருந்து \"திசைகாட்டியின் திசைக்கு\" மாற்று.</string>
+    <string name="all_markers_moved_to_history">அத்தனை வரைபட குறியீடுகளும் வரலாற்றுக்கு நகர்த்தபட்டது</string>
+    <string name="marker_moved_to_history">வரைபட குறியீடுகளும் வரலாற்றுக்கு நகர்த்தபட்டது</string>
+    <string name="order_by">அடுக்குபதற்கான வழி:</string>
+    <string name="marker_moved_to_active">வரைபட குறீடு செயல்பாட்டில் உள்ளது</string>
+    <string name="shared_string_list">பட்டியல்</string>
+    <string name="shared_string_groups">குழுக்கள்</string>
+    <string name="passed">கடைசியாக உபயோகித்து: %1$s</string>
+    <string name="make_active">செயலில் மாற்ற</string>
+    <string name="today">இன்று</string>
+    <string name="yesterday">நேற்று</string>
+    <string name="last_seven_days">கடந்த 7 நாட்கள்</string>
+    <string name="this_year">இந்த வருடம்</string>
+    <string name="show_direction">"இடைத்தூரம்   அறிகுறி"</string>
+    <string name="sort_by">வரிசைப்படுத்து</string>
+    <string name="do_not_use_animations">உயிரூட்டுதல் இல்லை</string>
+    <string name="do_not_use_animations_descr">உயிரூடுதல் செய்யலியில் முடக்கப்பட்டுள்ளது.</string>
+    <string name="keep_showing_on_map">வரைபடத்தில் தொடர்ந்து காட்டவும்</string>
+    <string name="exit_without_saving">சேமிக்காமல் வெளியேறு\?</string>
+    <string name="line">கோடு</string>
+    <string name="save_as_route_point">பாதை புள்ளியாக சேமிக்கவும்</string>
+    <string name="save_as_line">கோடாக சேமி</string>
+    <string name="route_point">வழி புள்ளி</string>
+    <string name="edit_line">வரியைத் திருத்த</string>
+    <string name="add_point_before">முன் புள்ளி சேர்க்கவும்</string>
+    <string name="add_point_after">பிறகு புள்ளியைச் சேர்க்கவும்</string>
+    <string name="shared_string_options">விருப்பங்கள்</string>
+    <string name="measurement_tool_snap_to_road_descr">OsmAnd தேர்ந்தெடுக்கப்பட்ட சுயவிவரத்தை வைத்து பாதையை புள்ளிகள் மூலம் இணைக்கும்.</string>
+    <string name="measurement_tool_save_as_new_track_descr">புள்ளிகளை வழிபுள்ளியாக அல்லது கோடாக சேமி.
+\n</string>
+    <string name="choose_navigation_type">வழிசெலுத்தல் சுயவிவரத்தைத் தேர்ந்தெடுக்கவும்</string>
+    <string name="none_point_error">குறைந்தபட்சம் ஒரு புள்ளியைச் சேர்க்கவும்.</string>
+    <string name="enter_gpx_name">GPX கோப்பு பெயர்:</string>
+    <string name="show_on_map_after_saving">சேமித்த பிறகு வரைபடத்தில் காட்டு</string>
+    <string name="measurement_tool_action_bar">வரைபடத்தை உலாவவும் பின் புள்ளிகளைச் சேர்க்கவும்</string>
+    <string name="measurement_tool">தூரம் அளவிடவும்</string>
+    <string name="quick_action_resume_pause_navigation">இடைநிறுத்த / மீண்டும் வழிசெலுத்தல்</string>
+    <string name="quick_action_resume_pause_navigation_descr">"இந்த பொத்தானை இடைநிறுத்த அல்லது  வழியை தொடர தட்டவும்."</string>
+    <string name="quick_action_show_navigation_finish_dialog">\'வழிசெலுத்தல் முடிந்தது \' உரையாடலை காண்பிக்க</string>
+    <string name="quick_action_start_stop_navigation">வழிசெலுத்தல் தொடங்க/நிருந்த</string>
+    <string name="quick_action_start_stop_navigation_descr">வழிசெலுத்தல் தொடங்க அல்லது முடிக்க இந்த பொத்தானைத் தட்டவும்.</string>
+    <string name="store_tracks_in_monthly_directories">மாதாந்திர கோப்புறைகளில் சேமிக்கப்பட்ட தடங்கள் சேமிக்கப்படும்</string>
+    <string name="store_tracks_in_monthly_directories_descrp">ரெகார்டிங் மாதத்திற்கு (2018-01 போன்ற) துணை கோப்புறைகளில் சேமிக்கப்பட்ட தடங்கள் சேமிக்கப்படும்.</string>
+    <string name="shared_string_reset">மீட்டமைக்க</string>
+    <string name="local_indexes_cat_wiki">விக்கிபீடியா</string>
+    <string name="shared_string_show_details">விவரத்தை காட்டு</string>
+    <string name="osm_edit_context_menu_delete">ஓஎஸ்எம் தொகுப்பை நீக்கு</string>
+    <string name="rendering_value_disabled_name">முடக்கியது</string>
+    <string name="rendering_value_walkingRoutesScopeOSMC_name">வலைகட்டமைபின் இனைப்பின் படி வண்ணமிடு</string>
+    <string name="shared_string_logoff">வெளியேறு</string>
+    <string name="rendering_attr_hideHouseNumbers_name">வீட்டு எண்</string>
+    <string name="application_dir_change_warning3">ஒஎஸ்எம் தரவுகளை புது சேமிப்புதளத்திற்க்கு நகல் எடுக்கவா\?</string>
+    <string name="specified_directiory_not_writeable">வரைபட உருவாக்கம் குறிப்பிட்ட அடைவில்தான் நடக்கவேண்டும்</string>
+    <string name="copying_osmand_file_failed">நகல் எடுக்க முடியவில்லை</string>
+    <string name="storage_directory_external">வெளிப்புற சேமிப்பு</string>
+    <string name="storage_directory_multiuser">பலபயண்பாட்டாளர் சேமிப்பு</string>
+    <string name="storage_directory_internal_app">உள்புற செயலி சேமிப்பு</string>
+    <string name="storage_directory_manual">கைமுறையாக குறிப்பிட்டது</string>
+    <string name="storage_directory_default">உள்புற சேமிப்பு</string>
+    <string name="application_dir">தரவு சேமிப்பு கோப்புறை</string>
+    <string name="storage_directory">வரைபாட சேமிப்பு</string>
+    <string name="shared_string_copy">நகல்</string>
+    <string name="filter_poi_hint">பெயர் வைத்து வடிகட்டு</string>
+    <string name="search_poi_category_hint">அனைத்தையும் தேட இங்கு தட்டச்சு செய்</string>
+    <string name="shared_string_is_open">இப்பொழுதே திற</string>
+    <string name="agps_info">ஜிபிஎஸ் விவரம்</string>
+    <string name="shared_string_manage">கையாளு</string>
+    <string name="shared_string_edit">தொகுப்பு</string>
+    <string name="shared_string_places">இடங்கள்</string>
+    <string name="shared_string_search">தேடல்</string>
+    <string name="shared_string_show_description">விவரத்தை காட்டு</string>
+    <string name="shared_string_message">குறுஞ்செய்தி</string>
+    <string name="welmode_download_maps">வரைபடத்தை பதிவிறக்கு</string>
+    <string name="welcome_select_region">உங்களின் சாலை விளக்குகளின் சைகைகளையும் ,விதிமுறைகளையும் சரியாக அறிய உங்கள் பகுதியை குறிப்பிடவும்:</string>
+    <string name="shared_string_control_start">இயக்கு</string>
+    <string name="shared_string_control_stop">நிறுத்து</string>
+    <string name="shared_string_import">இறக்குமதி</string>
+    <string name="shared_string_export">இறக்குமதி</string>
+    <string name="shared_string_more">மேலும் பல…</string>
+    <string name="shared_string_more_actions">மேலும் பல செயல்பாடுகள்</string>
+    <string name="shared_string_do_not_show_again">மீண்டும் காட்ட வேண்டாம்</string>
+    <string name="shared_string_remember_my_choice">தேர்ந்தெடுத்ததை நினைவுகொள்</string>
+    <string name="shared_string_refresh">புதுப்பி</string>
+    <string name="shared_string_download">பதிவிறக்கு</string>
+    <string name="shared_string_downloading">பதிவிறக்கமாகிறது</string>
+    <string name="shared_string_download_successful">பதிவிறக்கமாகியது</string>
+    <string name="shared_string_io_error">உள்ளீடு/வெளியீடு பிழை</string>
+    <string name="shared_string_unexpected_error">எதிர்பாராத பிழை</string>
+    <string name="shared_string_action_template">நடவ்டிக்கை {0}</string>
+    <string name="shared_string_close">மூடு</string>
+    <string name="shared_string_exit">வெளியேற</string>
+    <string name="shared_string_show">காட்டு</string>
+    <string name="shared_string_show_all">அனைத்தையும் காட்டு</string>
+    <string name="shared_string_collapse">தகர்ந்து போ</string>
+    <string name="shared_string_show_on_map">வரைபடாத்தில் காட்டு</string>
+    <string name="shared_string_map">வரைபடம்</string>
+    <string name="shared_string_favorite">பிடித்தவை</string>
+    <string name="shared_string_favorites">பிடித்தவைகள்</string>
+    <string name="shared_string_address">முகவரி</string>
+    <string name="shared_string_add">சேரு</string>
+    <string name="shared_string_add_to_favorites">பிடித்தவைகளில் சேரு</string>
+    <string name="shared_string_my_location">என் நிலை</string>
+    <string name="shared_string_my_places">என் இடங்கள்</string>
+    <string name="shared_string_my_favorites">பிடித்தவைகள்</string>
+    <string name="shared_string_tracks">தடங்கள்</string>
+    <string name="shared_string_gpx_files">ஜிபிஎக்ஸ் கோப்புகள்</string>
+    <string name="shared_string_currently_recording_track">தற்பொழுது பதிவாகும் தடம்</string>
+    <string name="shared_string_audio">ஒழி</string>
+    <string name="shared_string_video">காணோளி</string>
+    <string name="shared_string_photo">புகைபடம்</string>
+    <string name="route_points">பாதை புள்ளிகள்</string>
+    <string name="track_segments">தடத்தின் பாகங்கள்</string>
+    <string name="track_points">தடத்தின் புள்ளிகள்</string>
+    <string name="shared_string_online_maps">நிகழ்நிலை வரைபடம்</string>
+    <string name="record_plugin_name">பயண பதிவுகள்</string>
+    <string name="srtm_paid_version_title">எல்லைகொடு வரிகளின் செருகி</string>
+    <string name="srtm_plugin_name">"எல்லைகோடு  "</string>
+    <string name="osm_live_payment_discount_descr">சேமிக்க %1$s!</string>
+    <string name="markers_remove_dialog_msg">\'%s\' வரைப்படப் புள்ளியை அழிக்க\?</string>
+    <string name="unirs_render_descr">பாதசாரி மற்றும் மிதிவண்டி சாலைகள் வேறுபடுவதை இயல்புநிலை பாணியின் மாற்றல். மரபுவழி Mapnik வண்ணங்களைப் பயன்படுத்துகிறது.</string>
+    <string name="shared_string_bookmark">அடையாளக்குறி</string>
+    <string name="hide_full_description">முழு விளக்கத்தையும் மறை</string>
+    <string name="show_full_description">முழு விளக்கத்தையும் காண்பி</string>
+    <string name="nautical_render_descr">கடல் வழிசெலுத்தல் பாணி. முக்கிய அம்சங்கள்: கலங்கள், கலங்கரை விளக்கங்கள், ஆறுகள், கடல் பாதைகள் மற்றும் குறிப்புகள், துறைமுகங்கள், கடற்கரை சேவைகள், ஆழம் வரையறைகளை.</string>
+    <string name="ski_map_render_descr">பனிச்சறுக்கு பாணி. முக்கிய அம்சங்கள்: ஒரு வசதியான முறையில் பிஸ்டெஸ், ஸ்கை-லிஃப்ட் மற்றும் இதர ஸ்கை அம்சங்களை வழங்குகிறது. குறைவான கவனத்தை திசைதிருப்பல்.</string>
+    <string name="mapnik_render_descr">பழைய \'Mapnik\' பாணி இயல்புநிலை ஒழுங்கமைவு பாணி. முக்கிய அம்சங்கள்: நிறங்கள் \'Mapnik\' பாணியைப் போலவே இருக்கின்றன.</string>
+    <string name="in_app_purchase">செயலியுள் வாங்குதல்</string>
+    <string name="in_app_purchase_desc">ஒரு முறை பணம் செலுத்துதல்</string>
+    <string name="in_app_purchase_desc_ex">ஒருமுறை வாங்கிய பிறகு, அது உங்களுக்கு நிரந்தரமாக கிடைக்கும்.</string>
+    <string name="purchase_unlim_title">வாங்க -%1$s</string>
+    <string name="purchase_subscription_title">சந்தாவிற்கு - %$s</string>
+    <string name="wikivoyage_offline">விக்கிவோயாஜ் இணையாநிலை</string>
+    <string name="unlimited_downloads">வரம்பற்ற பதிவிறக்கங்கள்</string>
+    <string name="wikipedia_offline">விக்கிப்பீடியா இணையாநிலை</string>
+    <string name="contour_lines_hillshade_maps">விளிம்பு கோடுகள் &amp; மலைநிழல் வரைபடங்கள்</string>
+    <string name="unlock_all_features">அனைத்து OsmAnd அம்சங்கள் திறக்க</string>
+    <string name="purchase_dialog_title">திட்டத்தைத் தேர்வுசெய்க</string>
+    <string name="purchase_dialog_travel_description">ஆஃப்லைன் பயண வழிகாட்டி செயல்பாடுகளைப் பெறுவதற்கு பின்வரும் ஒன்றை வாங்கவும்:</string>
+    <string name="purchase_dialog_subtitle">பொருத்தமான பொருளைத் தேர்வுசெய்க:</string>
+    <string name="shared_string_dont">செய்யாதே</string>
+    <string name="shared_string_do">செய்</string>
+    <string name="shared_string_only_with_wifi">Wi-Fi இல் மட்டும்</string>
+    <string name="wikivoyage_download_pics">படங்களைப் பதிவிறக்க</string>
+    <string name="wikivoyage_download_pics_descr">"கட்டுரையின் புகைப்படங்கள் இணையாநிலையில் பதிவிறக்கம் செய்ய.
+\nஎப்போதும் \'ஆராய்தல்\' → \'விருப்பங்கள்\'  உபயோகிக்கவும்."</string>
+    <string name="select_travel_book">பயண புத்தகத்தைத் தேர்ந்தெடுக்கவும்</string>
+    <string name="shared_string_travel_book">பயண நூல்</string>
+    <string name="online_webpage_warning">"பக்கம் நிகழ்நிலையில்  மட்டுமே கிடைக்கும். வலை உலாவியில் திறக்கவா\?"</string>
+    <string name="delete_search_history">தேடல் வரலாற்றை நீக்கு</string>
+    <string name="download_images">புகைப்படம் பதிவிறக்க</string>
+    <string name="download_maps_travel">பயண வழிகாட்டிகள்</string>
+    <string name="shared_string_wikivoyage">விக்கிவோயாஜ்</string>
+    <string name="article_removed">கட்டுரை அகற்றப்பட்டது</string>
+    <string name="wikivoyage_search_hint">தேடல்: நாடு, நகரம், மாகாணங்கள்</string>
+    <string name="shared_string_read">படிக்க</string>
+    <string name="saved_articles">புத்தகக்குறியிட்ட கட்டுரை</string>
+    <string name="shared_string_explore">ஆராய்தல்</string>
+    <string name="shared_string_contents">தகவல்கள்</string>
+    <string name="select_waypoints_category_description">அனைத்து பாதையின் பாதை புள்ளிகளையும் சேர்க்கவும் அல்லது தனி பிரிவுகள் தேர்ந்தெடுக்கவும்.</string>
+    <string name="open_from">இருந்து திறக்க</string>
+    <string name="open_till">வரை திறக்க</string>
+    <string name="will_close_at">மூடுகிறது</string>
+    <string name="will_open_at">திறக்கும்</string>
+    <string name="will_open_on">திறக்கும்</string>
+    <string name="av_locations_selected_desc">ஜி.பீ.எக்ஸ் கோப்பை தேர்ந்தெடுக்கப்பட்ட குறிப்புகள் மற்றும் தரவுகளுடன்.</string>
+    <string name="av_locations_all_desc">ஜி.பீ.எக்ஸ் கோப்பை தேர்ந்தெடுக்கப்பட்ட குறிப்புகள் மற்றும் தரவுகளுடன்.</string>
+    <string name="shared_string_marker">குறியீடு</string>
+    <string name="empty_state_osm_edits">OSM பொருள்களை உருவாக்கவும் அல்லது மாற்றவும்</string>
+    <string name="shared_string_deleted">அழிக்கப்பட்டது</string>
+    <string name="shared_string_edited">திருத்தப்பட்டது</string>
+    <string name="shared_string_added">சேர்க்கப்பட்டது</string>
+    <string name="marker_activated">"குறியீடு  %s செயல்படுத்தப்பட்டது."</string>
+    <string name="empty_state_av_notes">குறிப்பு எடு!</string>
+    <string name="empty_state_av_notes_desc">விட்ஜெட்டை அல்லது சூழல் மெனுவைப் பயன்படுத்தி, வரைபடத்தில் ஒவ்வொரு புள்ளியிலும் ஆடியோ, வீடியோ அல்லது புகைப்படம் குறிப்புகளைச் சேர்க்கவும்.</string>
+    <string name="notes_by_date">தேதி மூலம் குறிப்புகள்</string>
+    <string name="by_date">தேதியின் மூலம்</string>
+    <string name="by_type">வகையின் மூலம்</string>
+    <string name="looking_for_tracks_with_waypoints">வழிகாட்டுதல்களுடன் பாதைகளை தேடுகிறது</string>
+    <string name="shared_string_more_without_dots">மேலும்</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / மாதம்</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f%2$s / மாதம்</string>
+    <string name="default_price_currency_format">%1$.2f %2$s
+\n</string>
+    <string name="release_3_2_pre">சில சாதனங்களில் ஏற்பட்ட தொடக்கநிலையில் • நிலையான செயலிழப்பு
+\n
+\n • புதிய குறிப்பான்கள் இடம்பெறுகின்றன: ஏற்கனவே கடந்து வந்த குறிப்பான்களைக் காட்சிப்படுத்துகின்றன
+\n
+\n • தேடல் வரலாறு இப்போது நீங்கள் முன்பே தேடியுள்ள பிரிவுகள் காட்டுகிறது
+\n
+\n இலையுதிர் வரைபடங்களுடன் கூடிய தொடக்கநிலையில் நிலையான செயலிழப்பு
+\n
+\n • ஆண்ட்ராய்டு 8.0 சாதனங்களில் இடையீட்டு சிக்கல்களை மேம்படுத்துதல்
+\n
+\n • பலகோணத்திற்கான ஆதரவு (பொருத்தமற்ற) பொருள்கள் எடிட்டிங்
+\n
+\n • தூரத்தை அளவிடலாம்: சூழல் மெனுவில் நடவடிக்கைகளுக்கான மெஷர் பொத்தானைச் சேர்க்கவும்</string>
+    <string name="release_3_1">• வழிசெலுத்தல்: முன்னேற்றப் பட்டைச் சரிசெய்து, பாதையின் தொடக்கம் மற்றும் இறுதிப் புள்ளியை வேகமாக மாற்றுதல்
+\n
+\n • வரைபட குறிப்பான்கள்: வரைபடத்திலிருந்து குறிப்பான்களை மறைக்க திறன், குழுக்கள் மீது / அணைக்க
+\n
+\n • OSM திருத்து: புள்ளி அல்லாத பொருட்கள் மற்றும் வழிகளில் குறிச்சொற்களை திருத்தும் திறன், குறிப்புகளில் காணாமல் கருத்துரைகளை திருத்துதல், திருத்தங்களின் காப்பு
+\n
+\n • விக்கிபீடியா மற்றும் விக்கிபீடியா பாகுபடுத்தி மேம்படுத்த, மேம்படுத்தப்பட்ட கோப்புகள் ஏற்கனவே கிடைக்கின்றன
+\n
+\n • சூழல் மெனு: இரவு பயன் உள்ள போக்குவரத்து கவசங்கள் வண்ணத்தை சரிசெய்து, கூடுதல் மெனு அளவுகளை சரிசெய்யவும்
+\n
+\n • படகு வழிசெலுத்தல்: நீர்வழி நெடுஞ்சாலைக்கான ஆதரவு
+\n
+\n • பிற பிழை திருத்தங்கள்
+\n</string>
+    <string name="shared_string_recorded">பதிவு</string>
+    <string name="shared_string_record">பதிவு</string>
+    <string name="gpx_logging_no_data">தகவல் இல்லை</string>
+    <string name="save_track_min_speed">குறைந்தபட்ச வேகத்தை பதிவுசெய்கிறது</string>
+    <string name="save_track_min_speed_descr">வடிகட்டி: இந்த வேகத்திற்கு கீழே புள்ளிகள் பதிவு இல்லை.</string>
+    <string name="save_track_min_distance">குறைந்தபட்ச இடப்பெயர்ச்சி பதிவு செய்தல்</string>
+    <string name="save_track_min_distance_descr">வடிகட்டி: ஒரு புள்ளியில் இருந்து குறைந்தபட்ச தூரத்தை அமைக்கவும்.</string>
+    <string name="save_track_precision">குறைந்தபட்ச துல்லியம் பதிவு</string>
+    <string name="save_track_precision_descr">வடிகட்டி: இந்த துல்லியம் அடைந்தாலொழிய பதிவு இல்லை.</string>
+    <string name="christmas_poi">கிறிஸ்துமஸ் POI</string>
+    <string name="christmas_desc">கிறிஸ்மஸ் மற்றும் புத்தாண்டு விடுமுறைகளை எதிர்பார்த்து, நீங்கள் கிறிஸ்மஸ் தொடர்புடைய POI ஐ காட்ட தேர்வு செய்யலாம்: கிறிஸ்துமஸ் மரங்கள், சந்தைகள், முதலியன.</string>
+    <string name="christmas_desc_q">கிறிஸ்துமஸ் POI ஐ காட்டுகிறீர்களா\?</string>
+    <string name="rendering_value_light_brown_name">இளம் பழுப்பு நிறம்</string>
+    <string name="rendering_value_dark_brown_name">இருண்ட பழுப்பு</string>
+    <string name="rendering_attr_contourColorScheme_name">விளிம்பு கோடுகள் வண்ணங்கள்
+\n</string>
+    <string name="rendering_attr_surfaceIntegrity_name">சாலை மேற்பரப்பு ஒருமைப்பாடு</string>
+    <string name="search_hint">நகரம், முகவரி, POI பெயர்</string>
+    <string name="translit_name_if_miss">%1$s பெயர் காணவில்லை என்றால், குறிக்கவும்</string>
+    <string name="translit_names">பெயரிடும் பெயர்கள்</string>
+    <string name="edit_filter">திருத்து வகைகள்</string>
+    <string name="subcategories">துணை வகைகள்</string>
+    <string name="selected_categories">தேர்ந்தெடுக்கப்பட்ட பிரிவுகள்</string>
+    <string name="create_custom_poi">தனிப்பயன் வடிப்பான் உருவாக்கவும்</string>
+    <string name="custom_search">தனிப்பயன் தேடல்</string>
+    <string name="shared_string_filters">வடிகட்டிகள்</string>
+    <string name="apply_filters">வடிப்பான்களை விண்ணப்பிக்கவும்</string>
+    <string name="save_filter">வடிகட்டி சேமி</string>
+    <string name="delete_filter">வடிப்பான் நீக்கு</string>
+    <string name="new_filter">புதிய வடிப்பான்</string>
+    <string name="new_filter_desc">புதிய வடிப்பிற்கான பெயரை உள்ளிடவும், இது உங்கள் \'வகைகள்\' தாவலுக்குச் சேர்க்கப்படும்.</string>
+    <string name="osm_live_payment_desc">மாதத்திற்கு சந்தா கட்டணம் விதிக்கப்படுகிறது. எந்த நேரத்திலும் Google Play இல் ரத்துசெய்.</string>
+    <string name="donation_to_osm">OpenStreetMap சமூகத்திற்கு நன்கொடை</string>
+    <string name="donation_to_osm_desc">OpenStreetMap இல் மாற்றங்களைச் சமர்ப்பிக்கும் ஓஎஸ்எம் பயனர்களுக்கு உங்கள் நன்கொடைக்கான ஒரு பகுதி அனுப்பப்பட்டுள்ளது. சந்தாவின் செலவு அதேதான்.</string>
+    <string name="osm_live_subscription_desc">சந்தா உலகளாவிய அனைத்து வரைபடங்களுக்கான மணிநேர, தினசரி, வாராந்திர மேம்படுத்தல்கள் மற்றும் வரம்பற்ற பதிவிறக்கங்களை இயக்குகிறது.</string>
+    <string name="get_it">அதைப் பெறுங்கள்</string>
+    <string name="get_for">%1$s ஐப் பெறுக</string>
+    <string name="get_for_month">%1$s மாதத்திற்குப் பெறுக</string>
+    <string name="osm_live_banner_desc">வரம்பற்ற வரைபட பதிவிறக்கங்களைப் பெறுக, மேலும் ஒரு மாதத்திற்கு ஒருமுறை விட மேம்படுத்துங்கள்: வாராந்திர, தினசரி அல்லது மணிநேரம்.</string>
+    <string name="osmand_plus_banner_desc">வரம்பற்ற வரைபட பதிவிறக்கங்கள், புதுப்பிப்புகள் மற்றும் விக்கிபீடியா சொருகி.</string>
+    <string name="si_mi_meters">மைல்கள் / மீட்டர்</string>
+    <string name="skip_map_downloading">வரைபடங்களைப் பதிவிறக்குக</string>
+    <string name="skip_map_downloading_desc">உங்களிடம் ஆஃப்லைன் வரைபடம் நிறுவப்படவில்லை. பட்டியலில் இருந்து ஒரு வரைபடத்தை தேர்வு செய்யலாம் அல்லது \'மெனு -%1$s\' வழியாக பின்னர் வரைபடங்களைப் பதிவிறக்குங்கள்.
+\n</string>
+    <string name="search_another_country">மற்றொரு பகுதியைத் தேர்ந்தெடுக்கவும்</string>
+    <string name="search_map">வரைபடங்களை தேடுகிறது …</string>
+    <string name="first_usage_wizard_desc">OsmAnd உங்கள் இருப்பிடத்தை நிர்ணயித்து, அந்தப் பிராந்தியத்திற்கு ஏற்ற வரைபடங்களை பரிந்துரைக்கவும்.
+\n</string>
+    <string name="location_not_found">இடம் காணப்படவில்லை</string>
+    <string name="no_inet_connection">இணைய இணைப்பு இல்லை</string>
+    <string name="no_inet_connection_desc_map">வரைபடங்கள் பதிவிறக்க வேண்டும்.
+\n</string>
+    <string name="search_location">இடம் தேடுகிறது …</string>
+    <string name="storage_free_space">வெற்று இடம்</string>
+    <string name="storage_place_description">ஓஸ்மண்டின் தரவு சேமிப்பிடம் (வரைபடங்கள், ஜிபிஎக்ஸ் கோப்புகள், முதலியன):%1$s.</string>
+    <string name="give_permission">அனுமதி அனுமதிப்பத்திரம்</string>
+    <string name="allow_access_location">இருப்பிட அணுகலை அனுமதி</string>
+    <string name="first_usage_greeting">இணைய இணைப்பு இல்லாமல் திசைகளைப் பெறவும் புதிய இடங்களை கண்டறியவும்</string>
+    <string name="search_my_location">என் நிலையை கண்டுபிடி</string>
+    <string name="update_all_maps_now">இப்போது எல்லா வரைபடங்களையும் புதுப்பிக்குமா\?</string>
+    <string name="clear_tile_data">அனைத்து ஓலைகளையும் அழி</string>
+    <string name="routing_attr_short_way_name">எரிபொருள்-திறனுள்ள வழி</string>
+    <string name="routing_attr_short_way_description">எரிபொருள்-திறனுள்ள வழி (வழக்கமாக குறுகியது) பயன்படுத்தவும்.</string>
+    <string name="replace_favorite_confirmation">%1$s விருப்பத்தை நிச்சயமாக மாற்ற விரும்புகிறீர்களா \?
+\n</string>
+    <string name="rendering_attr_hideOverground_name">நிலப்பரப்பு பொருட்கள்</string>
+    <string name="shared_string_change">மாற்றம்</string>
+    <string name="get_started">தொடங்குக</string>
+    <string name="route_stops_before">%1$s முன்பு நிறுத்தப்படும்</string>
+    <string name="coords_search">ஒருங்கிணைப்பு தேடல்கள்</string>
+    <string name="advanced_coords_search">மேம்பட்ட ஒருங்கிணைப்பு தேடல்</string>
+    <string name="back_to_search">தேடுவதற்கு திரும்புக</string>
+    <string name="confirmation_to_delete_history_items">தேர்ந்தெடுத்த உருப்படிகளை \'வரலாறு\' இலிருந்து நீக்க வேண்டுமா\?</string>
+    <string name="show_something_on_map">வரைபடத்தில் %1$s ஐக் காட்டு</string>
+    <string name="share_history_subject">OsmAnd வழியாக பகிரப்பட்டது</string>
+    <string name="search_categories">வகைகள்</string>
+    <string name="postcode">அஞ்சல்</string>
+    <string name="shared_string_from">இருந்து</string>
+    <string name="city_type_district">மாவட்டம்</string>
+    <string name="city_type_neighbourhood">அக்கம்பக்கத்து</string>
+    <string name="map_widget_search">தேடல்</string>
+    <string name="shared_string_is_open_24_7">24/7 திறக்க</string>
+    <string name="storage_directory_card">மெமரி கார்டு</string>
+    <string name="coords_format">ஒருங்கிணைப்பு வடிவம்</string>
+    <string name="coords_format_descr">புவியியல் ஒருங்கிணைப்புகளுக்கான வடிவமைப்பு.</string>
+    <string name="app_mode_bus">பேருந்து</string>
+    <string name="app_mode_train">ரயில்</string>
+    <string name="current_track">தற்போதைய பாதையில்</string>
+    <string name="map_widget_battery">பேட்டரி நிலை</string>
+    <string name="change_markers_position">மார்க்கர் நிலையை மாற்றவும்</string>
+    <string name="move_marker_bottom_sheet_title">மார்க்கர் நிலையை மாற்ற வரைபடத்தை நகர்த்தவும்</string>
+    <string name="access_direction_audio_feedback">ஆடியோ திசைகளில்</string>
+    <string name="access_direction_audio_feedback_descr">ஒலி மூலம் இலக்கு புள்ளி திசையை குறிக்கவும்.</string>
+    <string name="access_direction_haptic_feedback">வெறுப்பு திசைகளில்</string>
+    <string name="access_direction_haptic_feedback_descr">அதிர்வு மூலம் இலக்கு புள்ளி திசை குறிக்க.</string>
+    <string name="use_osm_live_routing_description">OsmAnd லைவ் மாற்றங்களுக்கான வழிசெலுத்தலை இயக்கு.</string>
+    <string name="use_osm_live_routing">OsmAnd நேரடி வழிசெலுத்தல்</string>
+    <string name="access_no_destination">இலக்கு அமைக்கப்படவில்லை</string>
+    <string name="map_widget_magnetic_bearing">காந்த தாங்கி</string>
+    <string name="map_widget_bearing">உறவினர் தாங்கி</string>
+    <string name="access_disable_offroute_recalc">அதை விட்டுவிட்டுப் பிறகு எந்த வழிகாட்டுதலும் இல்லை</string>
+    <string name="access_disable_offroute_recalc_descr">அதை விட்டுவிட்டுப் பிறகு எந்த வழிகாட்டுதலும் இல்லை.</string>
+    <string name="access_disable_wrong_direction_recalc">எதிர் திசையில் பாதை வழிகாட்டி இல்லை</string>
+    <string name="access_disable_wrong_direction_recalc_descr">எதிர் திசையில் நகரும் போது எந்த வழிகாட்டுதலும் இல்லை.</string>
+    <string name="access_smart_autoannounce">ஸ்மார்ட் கார் அறிவிக்கிறது</string>
+    <string name="access_smart_autoannounce_descr">இலக்கு புள்ளி மாற்றங்களுக்கு திசையை மட்டும் அறிவிக்க வேண்டும்.
+\n</string>
+    <string name="access_autoannounce_period">ஆட்டோ அறிவிப்பு காலம்</string>
+    <string name="access_autoannounce_period_descr">அறிவிப்புகள் இடையே குறைந்த இடைவெளி.</string>
+    <string name="access_default_color">இயல்புநிலை நிறம்</string>
+    <string name="access_category_choice">வகை தேர்வு</string>
+    <string name="access_hint_enter_name">பெயரை உள்ளிடுக</string>
+    <string name="access_hint_enter_category">வகையை உள்ளிடுக</string>
+    <string name="access_hint_enter_description">விளக்கம் உள்ளிடவும்.</string>
+    <string name="access_map_linked_to_location">இடம் இணைக்கப்பட்ட வரைபடம்</string>
+    <string name="access_collapsed_list">சரிந்த பட்டியல்</string>
+    <string name="access_expanded_list">விரிவாக்கப்பட்ட பட்டியல்</string>
+    <string name="access_empty_list">வெற்று பட்டியல்</string>
+    <string name="access_tree_list">மரம் பட்டியல்</string>
+    <string name="access_shared_string_not_installed">நிறுவப்படாத</string>
+    <string name="access_widget_expand">விரி</string>
+    <string name="access_shared_string_navigate_up">மேலே செல்க</string>
+    <string name="access_sort">வரிசைப்படுத்த</string>
+    <string name="map_mode">வரைபட பயன்முறை</string>
+    <string name="number_of_gpx_files_selected_pattern">%s GPX கோப்புகள் தேர்ந்தெடுக்கப்பட்டன</string>
+    <string name="rendering_value_fine_name">சரி</string>
+    <string name="rendering_value_thin_name">மெல்லிய</string>
+    <string name="rendering_value_medium_name">நடுத்தர</string>
+    <string name="rendering_value_bold_name">போல்ட்</string>
+    <string name="no_map_markers_found">வரைபடத்தின் வழியாக வரைபட குறிப்பான்களைச் சேர்க்கவும்</string>
+    <string name="no_waypoints_found">எந்த வழியையும் காணவில்லை</string>
+    <string name="anonymous_user_hint">அநாமதேய பயனரால் முடியாது:
+\n- குழுக்களை உருவாக்கு;
+\n- சேவையகத்துடன் ஒத்திசை குழுக்கள் மற்றும் சாதனங்கள்;
+\n- வலைத்தளத்தில் தனிப்பட்ட டேஷ்போர்டில் குழுக்கள் மற்றும் சாதனங்களை நிர்வகிக்கவும்.</string>
+    <string name="report">அறிக்கை</string>
+    <string name="storage_permission_restart_is_required">பயன்பாட்டை இப்போது வெளிப்புற சேமிப்பகத்தில் எழுத அனுமதிக்கப்படுகிறது, ஆனால் அவ்வாறு செய்ய மீண்டும் தொடங்க வேண்டும்.</string>
+    <string name="shared_string_move_up">நகர்த்து</string>
+    <string name="shared_string_move_down">நகர்த்து</string>
+    <string name="finish_navigation">வழிநடத்துதலை முடிக்கவும்</string>
+    <string name="avoid_road">சாலை தவிர்க்கவும்</string>
+    <string name="storage_directory_readonly_desc">தேர்ந்தெடுக்கப்பட்ட தரவு சேமிப்பக அடைவு மட்டுமே படிக்கப்படும் முதல் உள் நினைவகத்திற்கு மாற்றப்பட்டது. எழுதக்கூடிய சேமிப்பக கோப்பகத்தைத் தேர்ந்தெடுக்கவும்.</string>
+    <string name="storage_directory_shared">பகிரப்பட்ட நினைவகம்</string>
+    <string name="shared_string_topbar">மேல் பட்டை</string>
+    <string name="full_report">முழு அறிக்கை</string>
+    <string name="recalculate_route">வழியை மீண்டும் கணக்கிடுங்கள்</string>
+    <string name="open_street_map_login_and_pass">OpenStreetMap பயனர் பெயர் மற்றும் கடவுச்சொல்</string>
+    <string name="donations">நன்கொடைகள்</string>
+    <string name="number_of_recipients">பெறுநர்களின் எண்ணிக்கை</string>
+    <string name="osm_user_stat">%1$s திருத்தங்கள், %2$s வரிசை, %3$s மொத்தத் திருத்தங்கள்</string>
+    <string name="osm_recipient_stat">%1$s திருத்தங்கள், மொத்தம் %2$s mBTC</string>
+    <string name="osm_editors_ranking">OSM தொகுப்பாளர்கள் தரவரிசை</string>
+    <string name="osm_live_subscription">OsmAnd நேரடி சந்தா</string>
+    <string name="osm_live_subscribe_btn">பதிவு</string>
+    <string name="osm_live_email_desc">நன்கொடைகள் பற்றிய தகவலை வழங்க வேண்டியது அவசியம்.</string>
+    <string name="osm_live_user_public_name">பொது பெயர்</string>
+    <string name="osm_live_hide_user_name">அறிக்கையில் என் பெயரை காட்டாதே</string>
+    <string name="osm_live_support_region">ஆதரவு மண்டலம்</string>
+    <string name="osm_live_month_cost">மாத செலவு</string>
+    <string name="osm_live_month_cost_desc">மாதாந்திர கட்டணம்</string>
+    <string name="osm_live_active">செயலில்</string>
+    <string name="osm_live_not_active">செயல்படா</string>
+    <string name="osm_live_enter_email">சரியான மின்னஞ்சல் முகவரியை உள்ளிடவும்</string>
+    <string name="osm_live_enter_user_name">பொது பெயர் உள்ளிடுக</string>
+    <string name="osm_live_thanks">OsmAnd ஐ ஆதரிப்பதற்கு நன்றி!
+\nஅனைத்து புதிய அம்சங்களையும் செயல்படுத்த நீங்கள் OsmAnd ஐ மீண்டும் தொடங்க வேண்டும்.</string>
+    <string name="osm_live_region_desc">அந்த பகுதியில் வரைபடத்தில் மாற்றங்களைச் சமர்ப்பிக்கும் ஓ.எஸ்.எம் பயனர்களுக்கு உங்கள் நன்கொடையின் ஒரு பகுதி அனுப்பப்படும்.</string>
+    <string name="osm_live_subscription_settings">சந்தா அமைப்புகள்</string>
+    <string name="osm_live_ask_for_purchase">முதலாவதாக OsmAnd இன் சந்தாவை வாங்கவும்</string>
+    <string name="osm_live_header">இந்த சந்தா உலகெங்கிலும் உள்ள அனைத்து வரைபடங்களுக்கான மணிநேர புதுப்பிப்புகளை இயக்குகிறது. வருமானத்தின் ஒரு பகுதி OSM சமுதாயத்திற்கு செல்கிறது மற்றும் ஒவ்வொரு OSM பங்கிற்கும் பணம் செலுத்துகிறது. நீங்கள் OsmAnd மற்றும் OSM ஆகியவற்றை நேசிக்கிறீர்கள் மற்றும் அவர்களுக்கு ஆதரவளித்து ஆதரவு அளித்தால், அதை செய்ய சரியான வழி இது.</string>
+    <string name="select_map_marker">வரைபட மார்க்கைத் தேர்ந்தெடுக்கவும்</string>
+    <string name="map_markers_other">மற்ற குறிப்பான்கள்</string>
+    <string name="upload_anonymously">அநாமதேயமாக பதிவேற்றவும்</string>
+    <string name="show_transparency_seekbar">வெளிப்படைத்தன்மை தேடுபவர் காட்டு</string>
+    <string name="download_files_error_not_enough_space">போதுமான இடவசதி இல்லை! சேமிப்பக இடைவெளி {3} MB தற்காலிகமாக, {1} MB நிரந்தரமாக உள்ளது. கிடைக்கக்கூடிய இடம் {2} MB மட்டுமே.</string>
+    <string name="download_files_question_space_with_temp">{0} கோப்பு (கள்) பதிவிறக்குமா\? பயன்படுத்தப்படும் சேமிப்பக இடைவெளி {3} MB தற்காலிகமாக, {1} MB நிரந்தரமாக உள்ளது. ({2} MB இடம் கிடைக்கும்.)</string>
+    <string name="download_files_question_space">{0} கோப்பு (கள்) பதிவிறக்குமா\? பயன்படுத்தப்படும் சேமிப்பக இடம் {1} MB. (கிடைக்கும் இடம் {2} மெ.பை.)</string>
+    <string name="upload_osm_note">OSM குறிப்பு பதிவேற்றவும்</string>
+    <string name="map_marker_1st">முதல் வரைபடம் மார்க்கர்</string>
+    <string name="map_marker_2nd">இரண்டாவது வரைபடம் மார்க்கர்</string>
+    <string name="shared_string_toolbar">கருவிப்பட்டை</string>
+    <string name="shared_string_widgets">சாளரம்</string>
+    <string name="add_points_to_map_markers_q">வரைபட குறிகளாக அனைத்து புள்ளிகளையும் சேர்க்கவா\?</string>
+    <string name="shared_string_add_to_map_markers">வரைபட குறிப்பான்களுக்குச் சேர்க்கவும்</string>
+    <string name="select_map_markers">வரைபட குறிப்பான்களைத் தேர்ந்தெடுக்கவும்</string>
+    <string name="shared_string_reverse_order">பின்னோக்கு வரிசை</string>
+    <string name="show_map_markers_description">வரைபட குறிப்பான்கள் அம்சத்தை இயக்கவும்.
+\n</string>
+    <string name="clear_active_markers_q">அனைத்து செயலில் உள்ள குறிப்பான்களை அகற்றவா\?</string>
+    <string name="clear_markers_history_q">வரைபட மார்க்கர் வரலாற்றை நீக்கவா\?</string>
+    <string name="active_markers">செயலில் உள்ள குறிப்பான்கள்</string>
+    <string name="map_markers">வரைபட குறிப்பான்கள்</string>
+    <string name="map_marker">வரைபட குறிப்பான்கள்</string>
+    <string name="consider_turning_polygons_off">பலகோன் ஒழுங்கமைப்பை முடக்க பரிந்துரைக்கப்படுகிறது.</string>
+    <string name="rendering_attr_showMtbRoutes_name">MTB பாதைகளைக் காண்பி</string>
+    <string name="show_polygons">பலகோணங்களைக் காண்பி</string>
+    <string name="find_parking">பார்க்கிங் கண்டுபிடிக்க</string>
+    <string name="shared_string_status">நிலைமை</string>
+    <string name="shared_string_save_changes">மாற்றங்களை சேமியுங்கள்</string>
+    <string name="shared_string_email_address">மின்னஞ்சல் முகவரி</string>
+    <string name="rendering_attr_hideUnderground_name">நிலத்தடி பொருட்கள்</string>
+    <string name="data_is_not_available">தரவு கிடைக்கவில்லை</string>
+    <string name="shared_string_remove">அகற்று</string>
+    <string name="shared_string_read_more">மேலும் வாசிக்க</string>
+    <string name="clear_updates_proposition_message">பதிவிறக்கம் புதுப்பிப்புகளை அகற்றி, அசல் வரைபட பதிப்பில் திரும்பவும்</string>
+    <string name="add_time_span">நேர இடைவெளியைச் சேர்க்கவும்</string>
+    <string name="road_blocked">சாலை தடுக்கப்பட்டது</string>
+    <string name="shared_string_select">தேர்வு</string>
+    <string name="switch_start_finish">தொடக்கம் மற்றும் இலக்கை மாற்றுக</string>
+    <string name="rendering_attr_hideIcons_name">POI சின்னங்கள்</string>
+    <string name="item_removed">உருப்படி அகற்றப்பட்டது</string>
+    <string name="n_items_removed">உருப்படி அகற்றப்பட்டது</string>
+    <string name="shared_string_undo_all">அனைத்தையும் செயல்தவிர்க்கவும்</string>
+    <string name="shared_string_type">வகை</string>
+    <string name="starting_point">தொடக்க புள்ளியாக</string>
+    <string name="shared_string_not_selected">தேர்ந்தெடுக்கப்படவில்லை</string>
+    <string name="rec_split">ரெக்கார்டர் ஸ்பிட்</string>
+    <string name="rec_split_title">ரெக்கார்டர் ஸ்பிட் ஐப் பயன்படுத்தவும்</string>
+    <string name="rec_split_desc">இடத்தை பயன்படுத்தும் போது சேமிப்பக அளவை மீறுகிறது.</string>
+    <string name="rec_split_clip_length">கிளிப் நீளம்</string>
+    <string name="rec_split_clip_length_desc">பதிவு செய்யப்பட்ட கிளிப்புகள் மேல் நேரம் வரம்பு.</string>
+    <string name="rec_split_storage_size">சேமிப்பு அளவு</string>
+    <string name="rec_split_storage_size_desc">பதிவுசெய்யப்பட்ட கிளிப்புகள் அனைத்தையும் ஆக்கிரமிக்கக்கூடிய இடத்தை அளவு.</string>
+    <string name="live_updates">நேரடி மேம்படுத்தல்கள்</string>
+    <string name="shared_string_deselect">தேர்வுநீக்கும்</string>
+    <string name="shared_string_deselect_all">அனைத்து தெரிவுகளையும் நிராகரி</string>
+    <string name="shared_string_clear">தெளிவான</string>
+    <string name="shared_string_clear_all">அனைத்தையும் அழி</string>
+    <string name="shared_string_save">சேமி</string>
+    <string name="shared_string_save_as_gpx">புதிய GPX கோப்பாக சேமிக்கவும்</string>
+    <string name="shared_string_rename">மறுபெயரிடு</string>
+    <string name="shared_string_delete">அழி</string>
+    <string name="shared_string_delete_all">அனைத்தையும் நீக்கு</string>
+    <string name="shared_string_share">பகிர்</string>
+    <string name="shared_string_apply">விண்ணப்பிக்கவும்</string>
+    <string name="rendering_attr_trolleybusRoutes_name">ட்ரோலிபஸ் பாதை</string>
+    <string name="rendering_attr_busRoutes_name">பேருந்து வழித்தடங்கள்</string>
+    <string name="rendering_category_hide">மறை</string>
+    <string name="rendering_category_routes">வழித்தடங்கள்</string>
+    <string name="rendering_category_details">விவரங்கள்</string>
+    <string name="rendering_category_transport">போக்குவரத்து</string>
+    <string name="rendering_category_others">மற்ற வரைபடம் பண்புக்கூறுகள்</string>
+    <string name="map_widget_appearance_rem">மீதமுள்ள கூறுகள்</string>
+    <string name="map_widget_vector_attributes">பண்புகளை வழங்குதல்</string>
+    <string name="map_widget_top">நிலைமை பட்டை</string>
+    <string name="map_widget_right">வலது குழு</string>
+    <string name="map_widget_left">இடது குழு</string>
+    <string name="configure_map">வரைபடத்தை உள்ளமைக்கவும்</string>
+    <string name="search_radius_proximity">நேரத்திற்குள்</string>
+    <string name="anonymous_user">அநாமதேய பயனர்</string>
+    <string name="logged_as">%1$s ஆக உள்நுழைந்துள்ளீர்கள்</string>
+    <string name="speed_limit_exceed">வேக வரம்பு சகிப்புத்தன்மை</string>
+    <string name="speed_limit_exceed_message">வேகம் வரம்பு சகிப்புத்தன்மை விளிம்புகளைத் தேர்ந்தெடுங்கள், மேலே நீங்கள் ஒரு குரல் எச்சரிக்கையைப் பெறுவீர்கள்.</string>
+    <string name="fav_point_emoticons_message">பிடித்த பெயரை ஒரு கோப்பில் எமோடிகானுடன் சரியாக சரம் சேமிப்பதில் விருப்பமான பெயர் %1$s க்கு மாற்றப்பட்டது.</string>
+    <string name="print_route">அச்சிடு வழி</string>
+    <string name="fav_point_dublicate">பிடித்த புள்ளி பெயர் நகல்</string>
+    <string name="fav_point_dublicate_message">குறிப்பிடப்பட்ட ஏற்கனவே பிடித்த பெயரில், பிரதி எடுக்காமல் %1$s க்கு மாற்றப்பட்டது.</string>
+    <string name="text_size_descr">வரைபடத்தில் உரை அளவு அமைக்கவும்.</string>
+    <string name="text_size">உரை அளவு</string>
+    <string name="traffic_warning_speed_limit">வேக வரம்பு</string>
+    <string name="traffic_warning_border_control">எல்லை கட்டுப்பாடு</string>
+    <string name="traffic_warning_payment">கட்டண சாவடி</string>
+    <string name="traffic_warning_stop">நிறுத்தல் குறி</string>
+    <string name="traffic_warning_calming">போக்குவரத்து அமைதி</string>
+    <string name="traffic_warning_speed_camera">வேக கேமரா</string>
+    <string name="traffic_warning">போக்குவரத்து எச்சரிக்கை</string>
+    <string name="speak_favorites">அருகிலுள்ள பிடித்தவை</string>
+    <string name="speak_poi">அருகிலுள்ள POI</string>
+    <string name="way_alarms">போக்குவரத்து எச்சரிக்கைகள்</string>
+    <string name="background_service_is_enabled_question">OsmAnd பின்னணி சேவை இன்னும் இயங்கும். அதை நிறுத்துங்கள், கூடவா\?</string>
+    <string name="sleep_mode_stop_dialog">GPS பின்னணி பயன்முறையை நிறுத்தவா\?</string>
+    <string name="stop_navigation_service">நிறுத்து</string>
+    <string name="confirm_every_run">எப்போதும் கேள்</string>
+    <string name="save_global_track_interval_descr">பொதுவான பாதையில் பதிவு செய்வதற்கான இடைவெளியைத் தேர்வுசெய்க (வரைபடத்தில் GPX உள்நுழைவு விட்ஜெட்டை வழியாக செயல்படுத்தப்படுகிறது).
+\n</string>
+    <string name="save_global_track_interval">பொது பதிவு இடைவெளி</string>
+    <string name="background_service_int">ஜிபிஎஸ் வேக் அப் இடைவேளை</string>
+    <string name="enable_sleep_mode">ஜி.பி.எஸ் பின்னணி பயன்முறையை இயக்கு</string>
+    <string name="save_track_to_gpx_globally_headline">தேவை டிராக் பதிவு</string>
+    <string name="save_track_to_gpx_globally_descr">ஜி.பி.எக்ஸ் கோப்பிற்கு பொதுவான நிலை பதிவு ஜி.பி.எக்ஸ் பதிவு விட்ஜெட்டை வரைபட திரையில் பயன்படுத்தி இயக்கலாம் அல்லது அணைக்கலாம்.</string>
+    <string name="save_current_track_descr">தற்போதைய பாதையை GPX கோப்பாக சேமி.</string>
+    <string name="save_current_track">தற்போதைய பாதையை சேமிக்கவும்</string>
+    <string name="save_track_to_gpx">வழிசெலுத்தலின் போது தானாக பதிவுசெய்த பாதையில்</string>
+    <string name="save_track_to_gpx_descrp">ஜி.பி.எக்ஸ் பாதையில் வழிசெலுத்தலின் போது தடங்கள் கோப்புறையில் தானாக சேமிக்கப்படும்.</string>
+    <string name="save_track_interval_globally">பதிவு இடைவெளி</string>
+    <string name="save_track_interval">வழிசெலுத்தலின் போது உள்நுழைவு இடைவெளி
+\n</string>
+    <string name="save_track_interval_descr">வழிசெலுத்தலின் போது பதிவு பதிவு இடைவெளியைத் தேர்வுசெய்க.</string>
+    <string name="voice_provider_descr">வழிசெலுத்தல் க்கான குரல் வழிகாட்டியைத் தேர்ந்தெடுக்கவும்.</string>
+    <string name="voice_provider">குரல் வழிகாட்டுதல்</string>
+    <string name="enable_proxy_title">HTTP ப்ராக்ஸியை இயக்கு</string>
+    <string name="enable_proxy_descr">அனைத்து நெட்வொர்க் கோரிக்கைகளுக்கும் HTTP பதிலாளை கட்டமைக்கவும்.</string>
+    <string name="proxy_host_title">ப்ராக்ஸி புரவலன்</string>
+    <string name="proxy_host_descr">உங்கள் பதிலாள் ஹோஸ்ட்பெயர் (எ.கா 127.0.0.1) கட்டமைக்கவும்.</string>
+    <string name="proxy_port_title">ப்ராக்ஸி போர்ட்</string>
+    <string name="proxy_port_descr">உங்கள் ப்ராக்ஸியின் போர்ட் எண் (எ.கா 8118) கட்டமைக்கவும்.</string>
+    <string name="monitoring_settings">பயணம் பதிவு</string>
+    <string name="monitoring_settings_descr">உங்கள் பயணங்கள் பதிவு செய்ய எப்படி கட்டமைக்க.</string>
+    <string name="int_hour">மணி</string>
+    <string name="duration">காலம்</string>
+    <string name="distance">தூரம்</string>
+    <string name="average">சராசரி</string>
+    <string name="of">%2$d இல் %1$d</string>
+    <string name="ascent_descent">ஏற்றம்/இறங்க</string>
+    <string name="moving_time">நகரும் நேரம்</string>
+    <string name="max_min">அதிகபட்ச/குறைந்தபட்ச</string>
+    <string name="min_max">"குறைந்தபட்ச/அதிகபட்ச "</string>
+    <string name="index_tours">சுற்றுப்பயணம்</string>
+    <string name="shared_string_all">அனைத்து</string>
+    <string name="shared_string_waypoints">பாதை புள்ளிகளின்</string>
+    <string name="download_additional_maps">காணாமல் போன வரைபடங்கள் %1$s (%2$d எம்பி) பதிவிறக்க வேண்டுமா\?
+\n</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="gps_network_not_enabled">இருப்பிடச் சேவை இயக்கப்பட்டது. அதை இயக்கவா\?</string>
+    <string name="disable_recording_once_app_killed">தனியான பதிவுகளை தடுக்கிறது</string>
+    <string name="disable_recording_once_app_killed_descrp">பயன்பாட்டைக் கொல்லும் போது (சமீபத்திய பயன்பாடுகளின் வழியாக) ஜி.பீ.எக்ஸ் லாக்கிங் இடைநிறுத்தப்படும். (ஆஸ்மண்ட் பின்னணி அறிகுறி Android அறிவிப்பு பட்டியில் இருந்து மறைந்துவிடும்.)</string>
+    <string name="shared_string_import2osmand">OsmAnd க்கு இறக்குமதி செய்</string>
+    <string name="read_full_article">முழு கட்டுரை (ஆன்லைன்) படிக்கவும்</string>
+    <string name="shared_string_wikipedia">விக்கிப்பீடியா</string>
+    <string name="shared_string_enable">இயக்கு</string>
+    <string name="shared_string_disable">முடக்கு</string>
+    <string name="shared_string_enabled">இயக்கப்பட்டது</string>
+    <string name="shared_string_disabled">முடக்கப்பட்டது</string>
+    <string name="shared_string_selected">தேர்ந்தெடுக்கப்பட்ட</string>
+    <string name="shared_string_selected_lowercase">தேர்ந்தெடுக்கப்பட்ட</string>
+    <string name="shared_string_never">ஒருபோதும்</string>
+    <string name="shared_string_none">யாரும்</string>
+    <string name="shared_string_and">மற்றும்</string>
+    <string name="shared_string_or">அல்லது</string>
+    <string name="shared_string_help">உதவி</string>
+    <string name="shared_string_settings">அமைப்புகள்</string>
+    <string name="shared_string_select_on_map">வரைபடத்தில் தேர்ந்தெடுக்கவும்</string>
+    <string name="shared_string_select_all">அனைத்தையும் தெரிவுசெய்</string>
+    <string name="wake_on_voice">திரையை இயக்கு</string>
+    <string name="wake_on_voice_descr">சாதனத்தை திரையில் (அனைத்து இருந்தால்) ஒரு திருப்பத்தை நெருங்கும் போது இயக்கவும்.</string>
+    <string name="impassable_road">சாலைகள் தவிர்க்கவும் …</string>
+    <string name="rendering_attr_trainLightrailRoutes_name">ரயில் பாதைகள்</string>
+    <string name="rendering_attr_tramRoutes_name">டிராம் வழித்தடங்கள்</string>
+    <string name="rendering_attr_shareTaxiRoutes_name">"டாக்ஸி பாதைகளில் பகிர் "</string>
+    <string name="rendering_value_pedestrian_name">பாதசாரிகள்</string>
+    <string name="rendering_attr_coloredBuildings_name">வண்ண வகை குறியீடு கட்டிடங்கள்</string>
+    <string name="continue_navigation">ஊடுருவல் தொடரவும்</string>
+    <string name="pause_navigation">ஊடுருவல் இடைநிறுத்தம்</string>
+    <string name="keep_navigation_service">வை</string>
+    <string name="map_preferred_locale_descr">வரைபடத்தில் லேபிள்களுக்கான விருப்பமான மொழி (கிடைக்கவில்லை என்றால், ஆங்கிலம் அல்லது உள்ளூர் பெயர்கள் பயன்படுத்தப்படும்).</string>
+    <string name="map_preferred_locale">விரும்பிய வரைபட மொழி</string>
+    <string name="local_map_names">உள்ளூர் பெயர்கள்</string>
+    <string name="lang_sw">சுவாஹிலி</string>
+    <string name="lang_he">ஹீப்ரு</string>
+    <string name="forward">முன்னோக்கி</string>
+    <string name="home">டாஷ்போர்டு</string>
+    <string name="live_monitoring_m_descr">GPX பதிவு இயக்கப்பட்டிருந்தால் குறிப்பிட்ட வலை சேவைக்கு கண்காணிப்பு தரவை அனுப்பவும்.</string>
+    <string name="live_monitoring_m">ஆன்லைன் கண்காணிப்பு (ஜிபிஎக்ஸ் தேவை)</string>
+    <string name="live_monitoring_start">ஆன்லைன் கண்காணிப்பதைத் தொடங்குங்கள்</string>
+    <string name="live_monitoring_stop">ஆன்லைன் கண்காணிப்பதை நிறுத்தவும்</string>
+    <string name="gpx_monitoring_start">ஜி.பி.எக்ஸ் பதிவுகளைத் தொடங்கவும்</string>
+    <string name="gpx_monitoring_stop">ஜி.பி.எக்ஸ் பதிவுகளை நிறுத்து</string>
+    <string name="gpx_start_new_segment">புதிய பிரிவைத் தொடங்குக</string>
+    <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_buildings15zoom_name">ஜூம் 15 இல் கட்டிடங்கள்</string>
+    <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_showSurfaceGrade_name">சாலை தரம் காட்டு</string>
+    <string name="rendering_attr_showSurfaces_name">சாலை மேற்பரப்பு காட்டு</string>
+    <string name="rendering_attr_showCycleRoutes_name">சுழற்சி வழிகளைக் காண்பி</string>
+    <string name="no_index_file_to_download">பதிவிறக்கங்கள் கிடைக்கவில்லை, இணையத்துடன் உங்கள் இணைப்பை சரிபார்க்கவும்.</string>
+    <string name="select_index_file_to_download">எதுவும் காணப்படவில்லை. உங்கள் பகுதியை நீங்கள் கண்டுபிடிக்க முடியவில்லை என்றால், அதை உங்களால் செய்ய முடியும் (https://osmand.net).</string>
+    <string name="none_selected_gpx">GPX கோப்புகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை. நீண்ட தட்டுவதன் மூலம் ஒன்றைத் தேர்ந்தெடுக்கவும்.</string>
+    <string name="local_index_select_gpx_file">காட்ட தேர்ந்தெடுக்கவும்</string>
+    <string name="gpx_split_interval">பிளவு இடைவெளி</string>
+    <string name="sort_by_distance">தூரம் மூலம் வரிசைப்படுத்த</string>
+    <string name="sort_by_name">பெயர் மூலம் வரிசைப்படுத்து</string>
+    <string name="show_zoom_buttons_navigation_descr">வழிசெலுத்தலின் போது ஜூம் பொத்தான்களைக் காட்டு.</string>
+    <string name="show_zoom_buttons_navigation">ஜூம் பொத்தான்களைக் காண்பி</string>
+    <string name="save_as_favorites_points">பிடித்தவர்களின் குழுவாக சேமிக்கவும்</string>
+    <string name="select_destination_and_intermediate_points">இடங்களை தேர்ந்தெடுங்கள்</string>
+    <string name="layer_amenity_label">POI ஓவர்லே லேபிள்கள்</string>
+    <string name="loading_smth">%1$s ஐ ஏற்றுகிறது …</string>
+    <string name="map_widget_plain_time">தற்போதைய நேரம்</string>
+    <string name="shared_string_waypoint">பாதைப்புள்ளி</string>
+    <string name="selected_gpx_info_show">"
+\n
+\nவரைபடத்தில் காண நீண்ட நேரம் தட்டவும்"</string>
+    <string name="delay_navigation_start">தானாகவே திரும்பத் திரும்ப வழிகாட்டலைத் தொடங்குங்கள்</string>
+    <string name="local_index_gpx_info_show">"
+\n
+\nவிருப்பங்களுக்கான நீண்ட தட்டு"</string>
+    <string name="gpx_info_subtracks">துணை தடங்கள்: %1$s</string>
+    <string name="gpx_info_waypoints">பாதை புள்ளிகள்: %1$s</string>
+    <string name="gpx_info_distance">தூரம்: %1$s (%2$s புள்ளிகள்)</string>
+    <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_avg_altitude">சராசரி உயரம்: %1$s</string>
+    <string name="gpx_info_diff_altitude">உயர அளவு: %1$s</string>
+    <string name="gpx_info_asc_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_number_of_points">%1$s புள்ளிகள்</string>
+    <string name="gpx_selection_point">"புள்ளிகள் %1$s "</string>
+    <string name="gpx_selection_route_points">%1$s.
+\nபாதை புள்ளிகள் %2$s</string>
+    <string name="gpx_selection_points">%1$s.
+\nபுள்ளிகள்</string>
+    <string name="gpx_selection_track">%1$s.
+\nட்ராக் %2$s</string>
+    <string name="gpx_file_is_empty">காலியான ஜிஎக்ஸ்எக்ஸ் கோப்பு</string>
+    <string name="osmo_edit_color">வண்ணம் காட்டவும்</string>
+    <string name="osmo_connect_menu">இணைக்கவும்</string>
+    <string name="osmo_group_description">விளக்கம்</string>
+    <string name="int_days">நாட்களில்</string>
+    <string name="hours_ago">மணி நேரத்திற்க்கு முன்பு</string>
+    <string name="minutes_ago">நிமிடம் முன்பு</string>
+    <string name="seconds_ago">விநாடிகள் முன்பு</string>
+    <string name="use_points_as_intermediates">புள்ளிகளுக்கு இடையில் வழியைக் கணக்கிடுங்கள்</string>
+    <string name="always_center_position_on_map">நிலையை எப்போதும் நடுவில் காண்பி</string>
+    <string name="voice_pref_title">குரல்</string>
+    <string name="misc_pref_title">மற்றவை</string>
+    <string name="localization_pref_title">மொழிப்பெயர்ப்பு</string>
+    <string name="index_item_nation_addresses">நாடு தழுவிய முகவரிகள்</string>
+    <string name="index_item_world_altitude_correction">உலக உயரடுக்கின் திருத்தம்</string>
+    <string name="index_item_world_seamarks">உலக கடல் குறிகள்</string>
+    <string name="index_item_world_bitcoin_payments">உலக பிட் நாணயம் கொடுப்பனவுகள்
+\n</string>
+    <string name="index_item_world_basemap">உலக கண்ணோட்ட வரைபடம்</string>
+    <string name="index_item_world_ski">உலக ஸ்கை வரைபடம்</string>
+    <string name="lang_zh">சீன</string>
+    <string name="lang_pt_br">போர்த்துகீசியம் (பிரேசில்)</string>
+    <string name="lang_en">ஆங்கிலம்</string>
+    <string name="lang_en_gb">ஆங்கிலம் (யுனைட்டட் கிங்டம்)</string>
+    <string name="lang_af">ஆஃப்ரிகான்ஸ்</string>
+    <string name="lang_al">அல்பேனிய</string>
+    <string name="lang_ar">அரபு</string>
+    <string name="lang_hy">ஆர்மேனியன்</string>
+    <string name="lang_eu">பஸ்க்</string>
+    <string name="lang_be">பைலோருஷ்ன்</string>
+    <string name="lang_be_by">பெலாரஷ்யன் (லத்தின்)</string>
+    <string name="lang_bs">போஸ்னியன்</string>
+    <string name="lang_bg">பல்கேரியன்</string>
+    <string name="lang_ca">காடலான்</string>
+    <string name="lang_hr">குரோஷியன்</string>
+    <string name="lang_cs">செக்</string>
+    <string name="lang_da">டேனிஷ்</string>
+    <string name="lang_nl">டச்சு</string>
+    <string name="lang_fi">பின்னிஷ்</string>
+    <string name="lang_fr">பிரஞ்சு</string>
+    <string name="lang_ka">ஜியோர்ஜியன்</string>
+    <string name="lang_de">ஜெர்மன்</string>
+    <string name="lang_el">கிரேக்கம்</string>
+    <string name="lang_iw">ஹீப்ரு</string>
+    <string name="lang_hi">இந்தி</string>
+    <string name="lang_hu">ஹங்கேரியன்</string>
+    <string name="lang_hu_formal">ஹங்கேரிய (முறையான)</string>
+    <string name="lang_id">இந்தோனேஷியன்</string>
+    <string name="lang_it">இத்தாலிய</string>
+    <string name="lang_ja">ஜப்பனீஸ்</string>
+    <string name="lang_kn">கன்னடம்</string>
+    <string name="lang_ko">கொரியன்</string>
+    <string name="lang_lv">லேட்வியன்</string>
+    <string name="lang_lt">லிதுவேனியன்</string>
+    <string name="lang_mr">மராத்தி</string>
+    <string name="lang_no">நார்வே பொக்மால்</string>
+    <string name="lang_fa">பாரசீக</string>
+    <string name="lang_pl">போலிஷ்</string>
+    <string name="lang_pt">போர்த்துகீசியம்</string>
+    <string name="lang_ro">ரோமேனியன்</string>
+    <string name="lang_ru">ரஷியன்</string>
+    <string name="lang_sc">சாடினியன்</string>
+    <string name="lang_sr">செர்பியன்</string>
+    <string name="lang_sr_latn">செர்பியன் (லத்தின்)</string>
+    <string name="lang_zh_cn">சீன (எளிமையாக்கப்பட்டது)</string>
+    <string name="lang_zh_hk">சீன (ஹாங்காங்)</string>
+    <string name="lang_sk">ஸ்லோவாக்</string>
+    <string name="lang_sl">ஸ்லோவேனியன்</string>
+    <string name="lang_es">ஸ்பானிஷ்</string>
+    <string name="lang_sv">ஸ்வீடிஷ்</string>
+    <string name="lang_zh_tw">சீன (பாரம்பரியம்)</string>
+    <string name="lang_tr">துருக்கிய</string>
+    <string name="lang_uk">உக்ரைனியன்</string>
+    <string name="lang_vi">வியட்நாமிஸ்</string>
+    <string name="lang_cy">வெல்ஷ்</string>
+    <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="gpx_option_calculate_first_last_segment">முதல் மற்றும் கடைசி பாதை பிரிவிற்கு OsmAnd வழியை கணக்கிடுங்கள்</string>
+    <string name="use_displayed_track_for_navigation">வழிசெலுத்தலுக்கான டிராக்கைப் பயன்படுத்தவும்\?</string>
+    <string name="keep_and_add_destination_point">அடுத்தடுத்த இலக்காக சேர்க்கவும்</string>
+    <string name="select_gpx">GPX ஐத் தேர்ந்தெடுக்கவும் …</string>
+    <string name="route_descr_select_destination">இலக்கு தேர்ந்தெடு</string>
+    <string name="route_preferences">வழி விருப்பத்தேர்வுகள்</string>
+    <string name="route_info">வழி தகவல்</string>
+    <string name="routing_attr_prefer_motorway_name">மோட்டார் வாகனங்களை விரும்புங்கள்</string>
+    <string name="routing_attr_prefer_motorway_description">மோட்டார் வாகனங்களை விரும்புங்கள்</string>
+    <string name="routing_attr_avoid_toll_name">கட்டண சாலைகள் தவிர்க்கவும்</string>
+    <string name="routing_attr_avoid_toll_description">கட்டண சாலைகள் தவிர்க்கவும்
+\n</string>
+    <string name="routing_attr_avoid_unpaved_name">நீக்கப்பட்ட சாலைகள் தவிர்க்கவும்</string>
+    <string name="routing_attr_avoid_unpaved_description">நீக்கப்பட்ட சாலைகள் தவிர்க்கவும்.</string>
+    <string name="routing_attr_avoid_ferries_name">படகுகள் தவிர்க்கவும்</string>
+    <string name="routing_attr_avoid_ferries_description">படகுகள் தவிர்க்கவும்</string>
+    <string name="routing_attr_avoid_motorway_name">மோட்டார் வாகனங்களைத் தவிர்க்கவும்</string>
+    <string name="routing_attr_avoid_motorway_description">மோட்டார் வாகனங்களைத் தவிர்க்கவும்</string>
+    <string name="routing_attr_avoid_stairs_name">மாடிப்படிகளைத் தவிர்க்கவும்</string>
+    <string name="routing_attr_avoid_stairs_description">மாடிப்படிகளைத் தவிர்க்கவும்</string>
+    <string name="routing_attr_avoid_borders_name">எல்லை கடத்தல் தவிர்க்கவும்</string>
+    <string name="routing_attr_avoid_borders_description">தேசிய எல்லைகளை கடக்க வேண்டாம்</string>
+    <string name="routing_attr_weight_name">எடை வரம்பு</string>
+    <string name="routing_attr_weight_description">அனுமதிக்கப்பட்ட வாகனம் எடை வரம்பை வழிகளில் குறிக்கவும்.</string>
+    <string name="routing_attr_height_name">உயரம் வரம்பு</string>
+    <string name="routing_attr_height_description">வாகன உயரத்தை பாதைகளில் அனுமதிக்கப்படுவதைக் குறிப்பிடவும்.</string>
+    <string name="android_19_location_disabled">ஆண்ட்ராய்டு பதிப்பு 4.4 (KitKat) என்பதால் பழைய சேமிப்பக கோப்புறையில் (%s) வரைபடங்களைப் பதிவிறக்க மற்றும் புதுப்பிக்க முடியாது. புதிய சேமிப்பக இருப்பிடத்திற்கு அனைத்து OsmAnd கோப்புகளை நகலெடுக்கவா\?
+\n குறிப்பு 1: உங்கள் பழைய கோப்புகள் தொடாமல் இருக்கும் (ஆனால் கைமுறையாக நீக்க முடியும்).
+\n குறிப்பு 2: புதிய சேமிப்பிட இருப்பிடத்தில், 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">ஆஃப்லைன் ஓஸ்மா வழி பாதை</string>
+    <string name="app_mode_truck">டிரக்</string>
+    <string name="guidance_preferences_descr">வழிசெலுத்தல் விருப்பத்தேர்வுகள்</string>
+    <string name="routing_preferences_descr">விருப்பத்தேர்வு விருப்பங்கள்</string>
+    <string name="speech_rate_descr">TTS க்கான பேச்சு விகிதத்தை குறிப்பிடவும்.</string>
+    <string name="speech_rate">பேச்சு விகிதம்</string>
+    <string name="complex_route_calculation_failed">ஃபாஸ்ட் ரேட் கணக்கீடு தோல்வியடைந்தது (%s), மெதுவாக கணக்கீடு செய்ய குறைவு.</string>
+    <string name="disable_complex_routing_descr">கார் வழிநடத்துதலுக்காக இரண்டு கட்ட பாதைகளை முடக்கவும்.</string>
+    <string name="disable_complex_routing">சிக்கலான ரூட்டிங் முடக்கவும்</string>
+    <string name="amenity_type_seamark">கடல் குறி</string>
+    <string name="app_modes_choose_descr">பயன்பாட்டில் காணக்கூடிய சுயவிவரங்களைத் தேர்ந்தெடுக்கவும்.</string>
+    <string name="app_modes_choose">பயன்பாட்டு விவரங்கள்</string>
+    <string name="map_widget_map_rendering">வரைபடம் ஒழுங்கமைத்தல்</string>
+    <string name="app_mode_hiking">நடைபயணம்</string>
+    <string name="app_mode_motorcycle">மோட்டார் சைக்கிள்</string>
+    <string name="app_mode_boat">படகு</string>
+    <string name="app_mode_aircraft">விமான</string>
+    <string name="local_osm_changes_delete_all_confirm">நீங்கள் %1$d OSM மாற்றங்களை நீக்கிவிடப் போகிறீர்கள். நீ சொல்வது உறுதியா\?</string>
+    <string name="animate_routing_route_not_calculated">முதலில் பாதை கணக்கிடவும்</string>
+    <string name="animate_routing_route">கணக்கிடப்பட்ட வழியைப் பயன்படுத்தி சிமுலேடு</string>
+    <string name="animate_routing_gpx">ஜி.பி.எக்ஸ் டிராக்கைப் பயன்படுத்தி சிமுலேட்</string>
+    <string name="route_is_too_long_v2">10 நிமிடங்களுக்குள் இந்த நீண்ட வழிக்கான பாதை கண்டுபிடிக்கப்படவில்லை எனில் இடைநிலை இடங்களைச் சேர்க்கவும்.</string>
+    <string name="auto_zoom_none">ஆட்டோ ஜூம் இல்லை</string>
+    <string name="auto_zoom_close">மூடுவதற்கு</string>
+    <string name="auto_zoom_far">நடுப்பகுதியில்</string>
+    <string name="auto_zoom_farthest">நீண்ட தூரத்திற்கு</string>
+    <string name="map_magnifier">வரைபடத்தின் உருப்பெருக்கம்</string>
+    <string name="base_world_map">உலக தளமே</string>
+    <string name="about_version">பதிப்பு:</string>
+    <string name="shared_string_about">பற்றி</string>
+    <string name="about_settings_descr">பதிப்புத் தகவல், உரிமங்கள், திட்ட உறுப்பினர்கள்</string>
+    <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_minzoom">குறைந்தபட்ச ஜூம்: %1$s</string>
+    <string name="local_index_tile_data_name">அடுக்கு தரவு: %1$s</string>
+    <string name="edit_tilesource_successfully">ஓடு மூல %1$s சேமிக்கப்பட்டது</string>
+    <string name="edit_tilesource_elliptic_tile">எலிபிக் மெர்கேட்டர்</string>
+    <string name="edit_tilesource_maxzoom">அதிகபட்ச ஜூம்</string>
+    <string name="edit_tilesource_expiration_time">காலாவதியாகும் (நிமிடங்கள்)</string>
+    <string name="edit_tilesource_minzoom">குறைந்தபட்ச ஜூம்</string>
+    <string name="edit_tilesource_url_to_load">URL ஐ</string>
+    <string name="edit_tilesource_choose_existing">ஏற்கனவே உள்ளதைத் தேர்வு செய்க …</string>
+    <string name="maps_define_edit">வரையறு/திருத்து…</string>
+    <string name="map_widget_fps_info">FPS பிழைத்திருத்த தகவல்</string>
+    <string name="driving_region_descr">உந்துதலையை தேர்ந்தெடுக்கவும்: அமெரிக்கா, ஐரோப்பா, இங்கிலாந்து, ஆசியா மற்றும் பலர்.</string>
+    <string name="driving_region">வாகனம் ஓட்டும் இடம்</string>
+    <string name="driving_region_japan">ஜப்பான்</string>
+    <string name="driving_region_us">ஐக்கிய மாநிலங்கள்</string>
+    <string name="driving_region_canada">கனடா</string>
+    <string name="driving_region_europe_asia">ஐரோப்பா, ஆசியா, இலத்தீன் அமெரிக்கா, மற்றும் ஒத்த</string>
+    <string name="driving_region_uk">இங்கிலாந்து, இந்தியா, மற்றும் ஒத்த</string>
+    <string name="driving_region_australia">ஆஸ்திரேலியா</string>
+    <string name="speak_title">அறிவிக்கவும் …</string>
+    <string name="speak_descr">தெரு பெயர்கள், போக்குவரத்து எச்சரிக்கைகள் (கட்டாயமாக நிறுத்தங்கள், வேகம் புடைப்புகள்), வேக கேமரா எச்சரிக்கை, வேக வரம்புகள் ஆகியவற்றை அறிவிக்க கட்டமைக்கவும்.</string>
+    <string name="speak_street_names">தெரு பெயர்கள் (TTS)</string>
+    <string name="speak_speed_limit">வேக வரம்பு</string>
+    <string name="speak_cameras">வேகம் கேமராக்கள்</string>
+    <string name="speak_traffic_warnings">போக்குவரத்து எச்சரிக்கைகள்</string>
+    <string name="osb_author_or_password_not_specified">தயவுசெய்து OSM பயனரையும் கடவுச்சொல்லையும் \'அமைப்புகள்\'</string>
+    <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="route_descr_map_location">வரைபடம்:</string>
+    <string name="route_descr_lat_lon">லாட் %1$.3f, லோன் %2$.3f</string>
+    <string name="route_descr_destination">இலக்கு</string>
+    <string name="route_to">பெறுநர்:</string>
+    <string name="route_via">வழியாக:</string>
+    <string name="route_from">இருந்து:</string>
+    <string name="app_mode_default">வரைபடத்தை உலாவுக</string>
+    <string name="destination_point">இலக்கு %1$s</string>
+    <string name="context_menu_item_destination_point">இலக்காக அமை</string>
+    <string name="please_select_address">முதலில் நகரம் அல்லது தெருவைத் தேர்ந்தெடுக்கவும்</string>
+    <string name="search_street_in_neighborhood_cities">அருகில் உள்ள நகரங்களில் தெருவுக்குத் தேடுங்கள்</string>
+    <string name="intermediate_items_sort_return">இலக்கை அடைவதற்கு இடைநிலை இடங்களுக்கு உகந்த வழிமுறை.
+\n</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="delete_point">புள்ளி நீக்கு</string>
+    <string name="plugin_distance_point_time">நேரம்</string>
+    <string name="plugin_distance_point_hdop">துல்லியம்</string>
+    <string name="plugin_distance_point_speed">வேகம்</string>
+    <string name="plugin_distance_point_ele">உயரத்தில்</string>
+    <string name="plugin_distance_point">புள்ளி</string>
+    <string name="gpx_file_name">GPX கோப்பு பெயர்</string>
+    <string name="gpx_saved_sucessfully">ஜி.பி.எக்ஸ் கோப்பு {0}</string>
+    <string name="distance_measurement_start_editing">எடிட்டிங் தொடங்கவும்</string>
+    <string name="distance_measurement_finish_editing">எடிட்டிங் முடிக்கவும்</string>
+    <string name="distance_measurement_finish_subtrack">ஒரு புதிய சுரங்கப் பாதையைத் தொடங்குங்கள்</string>
+    <string name="distance_measurement_clear_route">எல்லா புள்ளிகளையும் அழி</string>
+    <string name="distance_measurement_load_gpx">இருக்கும் ஜி.பீ.எக்ஸ் கோப்பை திற</string>
+    <string name="wait_current_task_finished">தற்போதைய பணி முடிவடையும் வரை காத்திருக்கவும்</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>
+    <string name="other_location">மற்ற</string>
+    <string name="files_limit">%1$d கோப்புகள் உள்ளன</string>
+    <string name="available_downloads_left">பதிவிறக்க %1$d கோப்புகள் உள்ளன</string>
+    <string name="install_paid">முழு பதிப்பு</string>
+    <string name="cancel_route">பாதை அகற்றவும்</string>
+    <string name="cancel_navigation">வழிநடத்துதலை நிறுத்தவும்</string>
+    <string name="clear_destination">இலக்கை அழிக்கவும்</string>
+    <string name="download_using_mobile_internet">Wi-Fi உடன் இணைக்கப்படவில்லை. பதிவிறக்கம் செய்ய இன்டர்நெட்டில் தற்போதைய இணைப்பைப் பயன்படுத்தவா\?</string>
+    <string name="street_name">தெருவின் பெயர்</string>
+    <string name="hno">வீட்டு எண்</string>
+    <string name="website">இணையதளம்</string>
+    <string name="phone">தொலைபேசி</string>
+    <string name="contribution_activity">பதிப்பு நிறுவவும்</string>
+    <string name="choose_osmand_theme_descr">பயன்பாட்டின் தோற்றத்தைத் தேர்வுசெய்யவும்.</string>
+    <string name="accessibility_options">அணுகல்தன்மை விருப்பங்கள்</string>
+    <string name="select_address_activity">முகவரியைத் தேர்ந்தெடுக்கவும்</string>
+    <string name="favourites_list_activity">பிடித்தவை தேர்ந்தெடுக்கவும்</string>
+    <string name="local_openstreetmap_act_title">OSM மாற்றங்கள்</string>
+    <string name="map_widget_gps_info">GPS தகவல்</string>
+    <string name="access_arrival_time">வருகை நேரம்</string>
+    <string name="access_intermediate_arrival_time">இடைநிலை வருகை நேரம்</string>
+    <string name="item_checked">சரிபார்க்கப்பட</string>
+    <string name="item_unchecked">தேர்ந்தெடுக்காத</string>
+    <string name="prefer_motorways">மோட்டார் வாகனங்களை விரும்புங்கள்</string>
+    <string name="prefer_in_routing_title">போக்குவரத்தை விரும்புகிறேன் …</string>
+    <string name="prefer_in_routing_descr">மோட்டார் வாகனங்களை விரும்புங்கள்.</string>
+    <string name="max_speed_none">யாரும்</string>
+    <string name="download_wikipedia_maps">விக்கிப்பீடியா</string>
+    <string name="local_indexes_cat_srtm">சமநிலைக்கோடுகள்</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="precise_routing_mode">துல்லியமான செல்வழி (ஆல்பா)</string>
+    <string name="recording_context_menu_show">காண்பி</string>
+    <string name="recording_photo_description">புகைப்படம் %1$s %2$s</string>
+    <string name="av_def_action_picture">ஒரு புகைப்படத்தை எடுக்கவும்</string>
+    <string name="recording_context_menu_precord">ஒரு புகைப்படத்தை எடுக்கவும்</string>
+    <string name="intermediate_points_change_order">வரிசையை மாற்று</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_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_use_external_recorder">கணினி ரெக்கார்டர் பயன்படுத்தவும்
+\n</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="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_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="layer_recordings">பதிவு அடுக்கு</string>
+    <string name="recording_can_not_be_played">பதிவு இயக்க முடியாது</string>
+    <string name="recording_context_menu_delete">பதிவுகளை நீக்கு</string>
+    <string name="recording_context_menu_play">இயக்க</string>
+    <string name="recording_description">%1$s %3$s %2$s பதிவுசெய்கிறது</string>
+    <string name="recording_default_name">பதிவு</string>
+    <string name="map_widget_av_notes">ஆடியோ / வீடியோ குறிப்புகள்</string>
+    <string name="map_widget_distancemeasurement">தொலைவு அளவீட்டு</string>
+    <string name="audionotes_location_not_defined">குறிப்புடன் இணைந்த இடம் இன்னும் வரையறுக்கப்படவில்லை. குறிப்பிட்டுள்ள இருப்பிடத்திற்கு ஒரு குறிப்பை ஒதுக்க \"இருப்பிடத்தைப் பயன்படுத்து ...\".</string>
+    <string name="map_widget_audionotes">ஆடியோ குறிப்புகள்</string>
+    <string name="index_srtm_parts">பாகங்கள்</string>
+    <string name="index_srtm_ele">சமநிலைக்கோடுகள்</string>
+    <string name="download_select_map_types">பிற வரைபடங்கள்</string>
+    <string name="download_roads_only_item">சாலைகள் மட்டுமே</string>
+    <string name="download_srtm_maps">சமநிலைக்கோடுகள்</string>
+    <string name="download_regular_maps">நிலையான வரைபடம்</string>
+    <string name="download_roads_only_maps">சாலைகள் மட்டுமே வரைபடம்</string>
+    <string name="rendering_attr_alpineHiking_description">SAC அளவின் படி பாதைகள் வழங்கவும்.</string>
+    <string name="rendering_attr_hikingRoutesOSMC_name">அதிகப்படியான குறியீட்டு மேலடுக்கு</string>
+    <string name="rendering_attr_hikingRoutesOSMC_description">OSMC தடங்களின் படி பாதைகளை வழங்கவும்.</string>
+    <string name="rendering_attr_noAdminboundaries_name">எல்லைகள்</string>
+    <string name="rendering_attr_noAdminboundaries_description">பிராந்திய எல்லைகளை காட்சிப்படுத்த (நிர்வாகம் அளவு 5-9).
+\n</string>
+    <string name="map_widget_max_speed">வேக வரம்பு</string>
+    <string name="monitoring_control_start">ஜிபிஎக்ஸ்</string>
+    <string name="no_buildings_found">கட்டிடங்கள் இல்லை.</string>
+    <string name="incremental_search_city">"நகரத்தை தேடுங்கள் படிப்படியாக "</string>
+    <string name="search_villages_and_postcodes">மேலும் கிராமங்கள் / அஞ்சல் குறியீட்டைத் தேடுக</string>
+    <string name="rendering_attr_showRoadMaps_description">சாலைகள் மட்டுமே வரைபடங்களைக் காண்பிக்கும் போது தேர்ந்தெடுங்கள்:</string>
+    <string name="rendering_attr_showRoadMaps_name">சாலைகள் மட்டுமே வரைபடங்கள்</string>
+    <string name="safe_mode_description">பாதுகாப்பான பயன்முறையில் பயன்பாட்டை இயக்கவும் (சொந்த குறியீட்டிற்கு பதிலாக மெதுவான Android ஐப் பயன்படுத்தி).</string>
+    <string name="safe_mode">பாதுகாப்பான முறையில்</string>
+    <string name="native_library_not_running">பயன்பாடு பாதுகாப்பான பயன்முறையில் இயங்குகிறது (\'அமைப்புகள்\' இல் முடக்கவும்).</string>
+    <string name="map_text_size_descr">வரைபடத்தில் பெயர்களுக்கு உரை அளவைத் தேர்ந்தெடுக்கவும்.</string>
+    <string name="map_text_size">வரைபட எழுத்துரு அளவு</string>
+    <string name="trace_rendering">பிழைத்திருத்த தகவல் ரெண்டரிங்</string>
+    <string name="trace_rendering_descr">ரெண்டரிங் செயல்திறனைக் காண்பி.</string>
+    <string name="installing_new_resources">புதிய தரவை நீக்குகிறது …</string>
+    <string name="internet_connection_required_for_online_route">ஆன்லைன் வழிசெலுத்தல் சேவையைத் தேர்ந்தெடுத்தது, ஆனால் நீங்கள் இணையத்துடன் இணைக்கப்படவில்லை.</string>
+    <string name="tts_language_not_supported_title">ஆதரிக்கப்படாத மொழி</string>
+    <string name="tts_language_not_supported">தேர்ந்தெடுக்கப்பட்ட மொழி நிறுவப்பட்ட Android TTS (உரை-க்கு-பேச்சு) இயந்திரத்தால் ஆதரிக்கப்படவில்லை. சந்தையில் மற்றொரு டி.டி.எஸ் இயந்திரத்தை பாருங்கள் இல்லையெனில் முன்னமைக்கப்பட்ட TTS மொழி பயன்படுத்தப்படும்.</string>
+    <string name="tts_missing_language_data_title">காணாமல் தரவு</string>
+    <string name="gpx_option_reverse_route">ஜிபிஎக்ஸ் திசையை பின்னோக்கு</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"</string>
+    <string name="choose_audio_stream">குரல் வழிநடத்துதல் வெளியீடு</string>
+    <string name="voice_stream_voice_call">தொலைபேசி அழைப்பு ஆடியோ (கார் BT ஸ்டீரியோவை குறுக்கிடவும்)</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="overlay_transparency_descr">மேலடுக்கு வெளிப்படைத்தன்மையை மாற்றவும்.</string>
+    <string name="overlay_transparency">மேலடுக்கு வெளிப்படைத்தன்மை</string>
+    <string name="map_transparency_descr">அடிப்படை வரைபட வெளிப்படைத்தன்மையை மாற்றுக.</string>
+    <string name="map_transparency">அடிப்படை வரைபடத்தின் வெளிப்படைத்தன்மை</string>
+    <string name="layer_underlay">வரைபடத்தின் கீழ் …</string>
+    <string name="map_underlay">வரைபடத்தின் கீழ்</string>
+    <string name="map_underlay_descr">கீழ்நிலை வரைபடத்தைத் தேர்வு செய்க.</string>
+    <string name="layer_overlay">மேலடுக்கு வரைபடம் …</string>
+    <string name="map_overlay">"மேலடுக்கு வரைபடம் "</string>
+    <string name="map_overlay_descr">மேலடுக்கில் வரைபடத்தைத் தேர்வுசெய்யவும்.</string>
+    <string name="tile_source_already_installed">வரைபடம் ஏற்கனவே நிறுவப்பட்டது, \'அமைப்புகள்\' புதுப்பிக்கப்படும்.</string>
+    <string name="select_tile_source_to_install">நிறுவவும் அல்லது மேம்படுத்தவும் (ஓடு) வரைபடங்கள் தேர்ந்தெடுக்கவும்.</string>
+    <string name="internet_not_available">இண்டர்நெட் இணைப்பு இல்லாததால் செயல்பட முடியவில்லை.</string>
+    <string name="install_more">மேலும் நிறுவவும் …</string>
+    <string name="level_to_switch_vector_raster_descr">இந்த நிலைக்கு அப்பால் எதற்கும் ராஸ்டர் வரைபடங்களைப் பயன்படுத்துங்கள்.</string>
+    <string name="level_to_switch_vector_raster">குறைந்தபட்ச வெக்டார் ஜூம் நிலை</string>
+    <string name="create_poi_link_to_osm_doc"><u>ஆன்லைன் OSM</u>படங்களுடன் வரைபட வகைப்பாடு.</string>
+    <string name="error_doing_search">ஆஃப்லைன் தேடலைச் செயல்படுத்த முடியவில்லை.</string>
+    <string name="search_offline_geo_error">புவி நோக்கத்தை \'%s\' ஐப் பாகுபடுத்த முடியவில்லை.</string>
+    <string name="search_osm_offline">புவி இருப்பிடத்தைத் தேடு</string>
+    <string name="system_locale">முறை</string>
+    <string name="preferred_locale_descr">காட்சி மொழியை தேர்ந்தெடு (OsmAnd மறுதொடக்கம் செய்யப்படும் போது நடைமுறைக்கு வரும்).
+\n</string>
+    <string name="preferred_locale">காட்சி மொழி</string>
+    <string name="incomplete_locale">முழுமையற்ற</string>
+    <string name="unit_of_length_descr">என்ன தூரம் அளவிடப்படுகிறது என்பதை மாற்றவும்.</string>
+    <string name="unit_of_length">நீளம் அலகுகள்</string>
+    <string name="si_mi_feet">மைல்கள் / அடி</string>
+    <string name="si_mi_yard">மைல்கள் / கெஜம்</string>
+    <string name="si_km_m">கிலோமீட்டர்கள் / மீட்டர்</string>
+    <string name="yard">யார்டு</string>
+    <string name="foot">அடி</string>
+    <string name="mile_per_hour">மைல்</string>
+    <string name="mile">மைல்</string>
+    <string name="send_location_way_choose_title">இடத்தைப் பயன்படுத்தி பகிர்</string>
+    <string name="send_location_sms_pattern">இருப்பிடம்: %1$s
+\n%2$s</string>
+    <string name="send_location_email_pattern">இருப்பிட இணைப்பு %1$s அல்லது Android உள்நோக்க இணைப்பு %2$s ஐப் பின்பற்றுவதைப் பார்க்க</string>
+    <string name="send_location">இடம் அனுப்பவும்</string>
+    <string name="context_menu_item_share_location">இருப்பிடத்தை பகிரவும்</string>
+    <string name="add_waypoint_dialog_added">ஜி.பி.எக்ஸ் வேப்பிங் \'\'{0}\'\' சேர்க்கப்பட்டது</string>
+    <string name="add_waypoint_dialog_title">பதிவுசெய்யப்பட்ட ஜி.பி.எக்ஸ் டிராக்கு வழிப்பாதையைச் சேர்க்கவும்</string>
+    <string name="context_menu_item_add_waypoint">GPX வழிப்பாதையைச் சேர்</string>
+    <string name="amenity_type_administrative">நிர்வாக</string>
+    <string name="amenity_type_barrier">தடை</string>
+    <string name="amenity_type_education">கல்வி</string>
+    <string name="amenity_type_emergency">அவசர</string>
+    <string name="amenity_type_entertainment">பொழுதுபோக்கு</string>
+    <string name="amenity_type_finance">நிதி</string>
+    <string name="amenity_type_healthcare">ஆரோக்கியம்</string>
+    <string name="amenity_type_historic">வரலாற்று</string>
+    <string name="amenity_type_landuse">நில பயன்பாடு</string>
+    <string name="amenity_type_leisure">ஓய்வு</string>
+    <string name="amenity_type_military">ராணுவம்</string>
+    <string name="amenity_type_natural">இயற்கை</string>
+    <string name="amenity_type_office">அலுவலகம்</string>
+    <string name="amenity_type_other">மற்ற</string>
+    <string name="amenity_type_shop">கடை</string>
+    <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="indexing_address">குறியீட்டு முகவரி …</string>
+    <string name="indexing_map">வரைபடத்தை குறியிடுகிறது …</string>
+    <string name="indexing_poi">POI ஐச் சுட்டிக்காட்டுகிறது …</string>
+    <string name="indexing_transport">குறியீட்டு போக்குவரத்து …</string>
+    <string name="km">கி.மீ.</string>
+    <string name="km_h">கிமீ / மணி</string>
+    <string name="m">மீ</string>
+    <string name="old_map_index_is_not_supported">நீக்கப்பட்ட வரைபட தரவு வடிவமைப்பு \'\' {0} \'\', ஆதரிக்கப்படவில்லை
+\n</string>
+    <string name="poi_filter_closest_poi">அருகில் உள்ள POI கள்</string>
+    <string name="poi_filter_custom_filter">விருப்ப வடிப்பான்</string>
+    <string name="poi_filter_namefinder">ஆன்லைன் பெயர் தேடுபவர்</string>
+    <string name="reading_cached_tiles">சேமித்த தரவு படித்தல்…</string>
+    <string name="version_index_is_big_for_memory">குறியீட்டு \'\' {0} \'\' நினைவகத்தில் பொருந்தவில்லை</string>
+    <string name="version_index_is_not_supported">குறியீட்டுப் பதிப்பு \'\' {0} \'\' ஆதரிக்கப்படவில்லை</string>
+    <string name="specified_dir_doesnt_exist">குறிப்பிட்ட கோப்புறையை கண்டுபிடிக்க முடியவில்லை.</string>
+    <string name="build_installed">கட்டடம் {0} நிறுவப்பட்டது ({1}).</string>
+    <string name="downloading_build">கட்டும் பதிவிறக்க …</string>
+    <string name="max_level_download_tile_descr">அதற்கு அப்பால் ஜூம் நிலைகளுக்கான ஆன்லைன் வரைபட டைல்களை உலவ வேண்டாம்.</string>
+    <string name="route_general_information">மொத்த தூரம் %1$s, பயண நேரம் %2$d h %3$d நிமிடம்.</string>
+    <string name="router_service_descr">ஆன்லைன் அல்லது ஆஃப்லைன் வழிசெலுத்தல் சேவையைத் தேர்ந்தெடுக்கவும்.</string>
+    <string name="router_service">ஊடுருவல் சேவை</string>
+    <string name="sd_dir_not_accessible">மெமரி கார்டில் உள்ள தரவு சேமிப்பக அடைவு அணுக முடியாது!</string>
+    <string name="download_question">பதிவிறக்கம் {0} - {1}\?</string>
+    <string name="download_question_exist">{0} க்கான ஆஃப்லைன் தரவு ஏற்கனவே உள்ளது ({1}). அதை புதுப்பிக்கவும் ({2})\?</string>
+    <string name="address">முகவரி</string>
+    <string name="downloading_list_indexes">கிடைக்கும் பகுதிகளின் பட்டியலைப் பதிவிறக்குகிறது…</string>
+    <string name="list_index_files_was_not_loaded">https://osmand.net இலிருந்து பிராந்தியங்களின் பட்டியலைப் பெற முடியவில்லை.</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="mark_final_location_first">முதலில் இலக்கைத் தேர்ந்தெடுக்கவும்</string>
+    <string name="get_directions">திசைகள்</string>
+    <string name="opening_hours">தொடக்க நேரம்</string>
+    <string name="opening_changeset">மாற்றங்களை திறக்கிறது…</string>
+    <string name="closing_changeset">மாற்றம் தொகுப்பை மூடுக…</string>
+    <string name="loading_poi_obj">POI ஐ ஏற்றுகிறது …</string>
+    <string name="auth_failed">அங்கீகாரம் தோல்வியடைந்தது</string>
+    <string name="failed_op">தோல்வி</string>
+    <string name="converting_names">உள்ளூர் / ஆங்கில பெயர்களை மாற்றுகிறது …</string>
+    <string name="loading_streets_buildings">தெருக்கள் / கட்டிடங்களை ஏற்றுகிறது …</string>
+    <string name="loading_postcodes">இடுகை குறியீடுகள் ஏற்றுகிறது …</string>
+    <string name="poi_dialog_other_tags_message">மற்ற குறிச்சொற்கள் பாதுகாக்கப்படுகின்றன</string>
+    <string name="default_buttons_commit">உறுதியளித்து</string>
+    <string name="filter_current_poiButton">வடிகட்டி</string>
+    <string name="edit_filter_save_as_menu_item">சேமி</string>
+    <string name="edit_filter_delete_dialog_title">தேர்ந்தெடுக்கப்பட்ட வடிப்பான் நீக்கவா\?</string>
+    <string name="edit_filter_delete_message">வடிகட்டி {0} நீக்கப்பட்டது</string>
+    <string name="edit_filter_create_message">வடிகட்டி {0} உருவாக்கப்பட்டது</string>
+    <string name="email">மின்னஞ்சல்</string>
+    <string name="av_camera_focus">கேமரா கவனம் வகை</string>
+    <string name="av_camera_focus_descr">உள் கேமரா மையப் பயன்முறையைத் தேர்ந்தெடுக்கவும்.</string>
+    <string name="av_camera_focus_auto">தானியங்கி கவனம்</string>
+    <string name="available_maps">உபயோகப்படுத்தக்கூடிய வரைபடங்கள்</string>
+    <string name="select_voice_provider">குரல் வழிகாட்டலைத் தேர்ந்தெடுக்கவும்</string>
+    <string name="select_voice_provider_descr">உங்கள் மொழிக்கான குரல் வழிகாட்டலைத் தேர்ந்தெடுக்கவும் அல்லது பதிவிறக்கவும்.</string>
+    <string name="impassable_road_desc">வழிசெலுத்தலின் போது தவிர்க்க விரும்பும் சாலைகளைத் தேர்ந்தெடுக்கவும்.</string>
+    <string name="shared_string_sound">ஒலி</string>
+    <string name="no_location_permission">இருப்பிடத் தகவல்களை அணுக, பயன்பாட்டிற்கு அனுமதி இல்லை.</string>
+    <string name="no_camera_permission">கேமராவை அணுகுமாறு அனுமதி இல்லை.</string>
+    <string name="no_microphone_permission">மைக்ரோஃபோனை அணுக அனுமதி இல்லை.</string>
+    <string name="route_distance">தூரம்:</string>
+    <string name="route_duration">நேரம்:</string>
+    <string name="rendering_attr_horseRoutes_name">குதிரை வழிகள்</string>
+    <string name="no_address_found">முகவரி இல்லை</string>
+    <string name="shared_string_near">அருகில்</string>
+    <string name="shared_string_hide">மறைக்க</string>
+    <string name="av_video_quality_low">குறைந்த தரம்</string>
+    <string name="av_video_quality_high">மிக உயர்ந்த தரம்</string>
+    <string name="av_video_quality">வீடியோ வெளியீடு தரம்</string>
+    <string name="av_video_quality_descr">வீடியோ தரத்தை தேர்ந்தெடுக்கவும்.</string>
+    <string name="av_audio_format">ஆடியோ வெளியீட்டு வடிவம்</string>
+    <string name="av_audio_format_descr">ஆடியோ வெளியீட்டு வடிவமைப்பைத் தேர்ந்தெடுக்கவும்.</string>
+    <string name="av_audio_bitrate">ஆடியோ பிட்ரேட்</string>
+    <string name="av_audio_bitrate_descr">ஆடியோ பிட்ரேட்டைத் தேர்ந்தெடுக்கவும்.</string>
+    <string name="please_specify_poi_type_only_from_list">தயவு செய்து சரியான POI வகையை குறிப்பிடவும் அல்லது அதை தவிர்க்கவும்.</string>
+    <string name="access_from_map">வரைபடத்திலிருந்து அணுகவும்</string>
+    <string name="show_on_start_description">\'ஆஃப்\' நேரடியாக வரைபட திரையைத் தொடங்குகிறது.</string>
+    <string name="show_on_start">தொடக்கத்தில் காட்டு</string>
+    <string name="copied_to_clipboard">கிளிப்போர்டுக்கு நகலெடுக்கப்பட்டது</string>
+    <string name="osm_save_offline">ஆஃப்லைனில் சேமிக்கவும்</string>
+    <string name="osm_edit_modified_poi">மாற்றப்பட்ட OSM POI</string>
+    <string name="osm_edit_deleted_poi">OSM POI ஐ நீக்கியது</string>
+    <string name="plugins_screen">கூடுதல்</string>
+    <string name="gpx_visibility_txt">தன்மை</string>
+    <string name="gpx_tags_txt">குறிச்சொற்கள்</string>
+    <string name="gpx_description_txt">விளக்கம்</string>
+    <string name="validate_gpx_upload_name_pwd">GPX கோப்புகளை பதிவேற்ற உங்கள் OSM பயனர் பெயர் மற்றும் கடவுச்சொல்லை குறிப்பிடவும்.</string>
+    <string name="default_buttons_support">ஆதரவு</string>
+    <string name="support_new_features">புதிய அம்சங்களை ஆதரிக்கவும்</string>
+    <string name="support_new_features_descr">பயன்பாட்டில் செயல்படுத்தப்பட்ட புதிய அம்சங்களைப் பார்க்க நன்கொடை அளிக்க.</string>
+    <string name="show_ruler_level">காட்சி வரைகோல்</string>
+    <string name="info_button">தகவல்</string>
+    <string name="back_to_location">நிலைக்குத் திரும்பு</string>
+    <string name="accessibility_mode">அணுகல் முறை</string>
+    <string name="accessibility_mode_descr">பலவீனமான பயனர்களுக்கான அம்சங்களை மாற்றியமைக்கிறது.</string>
+    <string name="accessibility_default">Android அமைப்பின் அமைப்பு படி</string>
+    <string name="backToMenu">மெனுவிற்குத் திரும்புக</string>
+    <string name="zoomOut"></string>
+    <string name="zoomIn">பெரிதாக்கு</string>
+    <string name="zoomIs">"பெரிதாக்கும் அளவு "</string>
+    <string name="north">வடக்கு</string>
+    <string name="north_north_east">வடக்கு-வடக்கு-கிழக்கு</string>
+    <string name="north_east">வடகிழக்கு</string>
+    <string name="east_north_east">கிழக்கு-வடகிழக்கு</string>
+    <string name="east">கிழக்கு</string>
+    <string name="east_south_east">கிழக்கு-தென்கிழக்கு</string>
+    <string name="south_east">தென்கிழக்கு</string>
+    <string name="south_south_east">தென்-தென்கிழக்கு</string>
+    <string name="south">தெற்கு</string>
+    <string name="south_west">தென் மேற்கு</string>
+    <string name="west_south_west">மேற்கு தென் மேற்கு</string>
+    <string name="west">மேற்கு</string>
+    <string name="front">முன்னோக்கி</string>
+    <string name="front_right">வலது முன்னோக்கி</string>
+    <string name="right">வலதுபுறமாக</string>
+    <string name="back_right">வலது பின்தங்கிய</string>
+    <string name="back">பின்தங்கிய</string>
+    <string name="back_left">இடது பின்தங்கிய</string>
+    <string name="left">இடது பக்கம்</string>
+    <string name="front_left">இடது முன்னோக்கி</string>
+    <string name="oclock">மணிக்கு</string>
+    <string name="towards">நோக்கி</string>
+    <string name="accuracy">துல்லியம்</string>
+    <string name="altitude">உயரம்</string>
+    <string name="no_info">தகவல் இல்லை</string>
+    <string name="direction_style_sidewise">பக்கவாட்டு (8 பிரிவுகளில்)</string>
+    <string name="direction_style_clockwise">கடிகார (12 பிரிவுகளில்)</string>
+    <string name="settings_direction_style">இயக்கம் பாணி</string>
+    <string name="i_am_here">நான் இங்கே இருக்கிறேன்</string>
+    <string name="arrival_distance_factor_early">ஆரம்ப</string>
+    <string name="arrival_distance_factor_normally">இயல்பான</string>
+    <string name="arrival_distance_factor_late">தாமதம்</string>
+    <string name="arrival_distance_factor_at_last">கடந்த மீட்டர்</string>
+    <string name="arrival_distance">வருகை அறிவிப்பு</string>
+    <string name="arrival_distance_descr">வருகையை அறிவிக்க எவ்வளவு விரைவில் விரும்புகிறீர்கள்\?</string>
+    <string name="rendering_out_of_memory">தேர்ந்தெடுக்கப்பட்ட பகுதியை காட்ட போதுமான செயல் நினைவகம் இல்லை</string>
+    <string name="use_fluorescent_overlays">ஃப்ளோரசன்ட் ஓவர்லேஸ்</string>
+    <string name="use_fluorescent_overlays_descr">தடங்கள் மற்றும் வழிகளைக் காண்பதற்கு ஒளிரும் வண்ணங்களைப் பயன்படுத்துக.</string>
+    <string name="offline_edition">ஆஃப்லைன் பதிப்பித்தல்</string>
+    <string name="offline_edition_descr">எப்போதும் ஆஃப்லைன் பதிப்பித்தலை பயன்படுத்தவும்.</string>
+    <string name="local_openstreetmap_uploading">பதிவேற்றப்படுகிறது…</string>
+    <string name="local_openstreetmap_were_uploaded">{0} POI / குறிப்புகள் பதிவேற்றப்பட்டன</string>
+    <string name="local_openstreetmap_uploadall">அனைத்தையும் பதிவேற்றவும்</string>
+    <string name="local_openstreetmap_upload">OSM க்கு மாற்றங்களைப் பதிவேற்றவும்</string>
+    <string name="local_openstreetmap_delete">மாற்றத்தை நீக்கு</string>
+    <string name="local_openstreetmap_descr_title">அசின்க்ரோனஸ் OSM பதிப்பித்தல்:</string>
+    <string name="shared_string_action_name">நடவடிக்கை பெயர்</string>
+    <string name="mappilary_no_internet_desc">வரைபடத்திலிருந்து படங்களைப் பார்வையிட இணையத்துடன் இணைக்கப்பட வேண்டும்.</string>
+    <string name="retry">மீண்டும் முயற்சிக்கவும்</string>
+    <string name="add_route_points">பாதை புள்ளிகளைச் சேர்க்கவும்</string>
+    <string name="add_waypoint">வழிப்பொருள் சேர்க்க</string>
+    <string name="add_line">வரி சேர்க்க</string>
+    <string name="empty_state_favourites">பிடித்தவை சேர்க்க</string>
+    <string name="move_point">நகரும் புள்ளி</string>
+    <string name="add_segment_to_the_track">GPX கோப்பில் சேர்க்கவும்</string>
+    <string name="osm_recipients_label">OSM பெறுபவர்கள்</string>
+    <string name="total_donations">மொத்த நன்கொடைகள்</string>
+    <string name="day_off_label">தொலைவில் உள்ள</string>
+    <string name="winter_and_ski_renderer">குளிர்காலம் மற்றும் பற்றுக் கரண்டி</string>
+    <string name="touring_view_renderer">சுற்றுப்பயண காட்சி</string>
+    <string name="nautical_renderer">கடலோடிகளுக்குரிய</string>
+    <string name="copy_location_name">நகல் புள்ளி/POI பெயர்</string>
+    <string name="toast_empty_name_error">பெயரிடப்படாத இடம்</string>
+    <string name="tunnel_warning">சுரங்கப்பாதை முன் நோக்கி உள்ளது</string>
+    <string name="show_tunnels">சுரங்கங்கள்</string>
+    <string name="download_wikipedia_label">விக்கிபீடியா கட்டுரையை பதிவிறக்கவும்</string>
+    <string name="download_wiki_region_placeholder">இந்த பகுதி</string>
+    <string name="wiki_article_search_text">குறிப்பிட்ட விக்கிபீடியா கட்டுரை தேடப்பட்டு வருகிறது</string>
+    <string name="wiki_article_not_found">கட்டுரை காணப்படவில்லை</string>
+    <string name="how_to_open_wiki_title">எப்படி விக்கிபீடியா கட்டுரைகளை திறக்க வேண்டும்\?</string>
+    <string name="welcome_text">ஒஎஸ்எம்அண்ட் உலக வரைபடத்தையும் ,பாதை வழிகளையும் இணையம் இல்லாமல் பயண்படுத்தும் வசதியை தருகிறது</string>
+    <string name="welcome_header">வருக</string>
+    <string name="current_route">தற்போதைய பாதை</string>
+    <string name="osm_changes_added_to_local_edits">ஓஎஸ்எம் மாற்றங்கள் உள்மாற்ற கூட்டமைப்பில் சேர்க்கபட்டது</string>
+    <string name="mark_to_delete">நீக்குவதற்க்கு குறிப்பிடவும்</string>
+    <string name="local_recordings_delete_all_confirm">நீங்கள் %1$d தரவுகளை நீக்க முற்படுகிறீர்கள் ,அழிக்கவா\?</string>
+    <string name="local_osm_changes_upload_all_confirm">%1$d மாற்றங்களை ஓஎஸ்எமிற்க்கு பதிவேற்ற முற்படுகிறது.பதிவேற்றவா\?</string>
+    <string name="confirmation_to_clear_history">வரலாறை அழிக்கவா\?</string>
+    <string name="delay_to_start_navigation_descr">பயண திட்ட திரை மாறும் நேரத்தை குறிப்பிடவும்.</string>
+    <string name="delay_to_start_navigation">மீண்டும் மீண்டும் வழிகாட்டும் முறையை இயக்கு…</string>
+    <string name="shared_string_go">செல்</string>
+    <string name="osmand_parking_overdue">தாமதம்</string>
+    <string name="action_create">செயலை உருவாக்கு</string>
+    <string name="action_modify">செயல் திருத்தம்</string>
+    <string name="action_delete">செயல் நீக்கம்</string>
+    <string name="osm_edits">ஓஎஸ்எம் தொகுப்பு</string>
+    <string name="osmand_parking_hour">மணிநேரம்</string>
+    <string name="osmand_parking_minute">மணிதுளி</string>
+    <string name="parking_place_limited">நிறுத்தி வைக்க வரையறுத்த நேரம்</string>
+    <string name="osmand_parking_time_left">இடது</string>
+    <string name="your_edits">உங்கள் தொகுப்பு</string>
+    <string name="waypoint_visit_after">பின்னே பார்</string>
+    <string name="waypoint_visit_before">முன்னேபார்</string>
+    <string name="simulate_your_location">உங்கள் நிலையை பிம்பபடுத்தவும்</string>
+    <string name="drawer">உள்தள பட்டியல்</string>
+    <string name="tips_and_tricks_descr">அதிகம் தொடுக்க பட்ட கேள்விகல்,அன்மையில் நடந்த மாற்றங்கள் ,மேலும் மற்றவை.</string>
+    <string name="routing_settings_2">வழிதட அமைப்புகள்</string>
+    <string name="general_settings_2">பொதுவான அமைப்புகள்</string>
+    <string name="shared_string_ellipsis">…</string>
+    <string name="shared_string_ok">எற்க்கிறேன்</string>
+    <string name="shared_string_cancel">மறுக்கிறேன்
+\n</string>
+    <string name="shared_string_dismiss">ரத்து செய்</string>
+    <string name="shared_string_yes">ஆம்</string>
+    <string name="shared_string_do_not_use">பயண்படுத்தாதே</string>
+    <string name="shared_string_no">இல்லை</string>
+    <string name="shared_string_on">இயக்கு</string>
+    <string name="shared_string_off">நிறுத்து</string>
+    <string name="shared_string_previous">முன்னே</string>
+    <string name="shared_string_next">அடுத்து</string>
+    <string name="images_cache">புகைப்படம் மறைவிடம்</string>
+    <string name="one_tap_active">\'ஒருத்ததொடு\' செயல்பாடு</string>
+    <string name="appearance_on_the_map">வரைபடத்தில் தோன்றுவது</string>
+    <string name="add_track_to_markers_descr">குறிப்பான்களுக்கு அதன் வழிகாட்டுதல்களை சேர்க்க ஒரு பாதையைத் தேர்ந்தெடுக்கவும்.</string>
+    <string name="add_favourites_group_to_markers_descr">குறிப்பான்களை சேர்க்க ஒரு பிடித்தவை வகையைத் தேர்ந்தெடுக்கவும்.</string>
+    <string name="shared_string_gpx_waypoints">வழிப்பாதைகளைக் கண்காணியுங்கள்</string>
+    <string name="favourites_group">பிடித்தவை வகை</string>
+    <string name="add_group">ஒரு குழுவைச் சேர்க்கவும்</string>
+    <string name="add_group_descr">பிடித்தவை அல்லது GPX வழிப்பாதைகளிலிருந்து குழுக்களை இறக்குமதி செய்.</string>
+    <string name="empty_state_markers_active">வரைபட குறியீடை உருவாக்க!</string>
+    <string name="empty_state_markers_active_desc">"நீண்ட அல்லது குறுகிய தட்டளுக்கு  \' இடங்கள்\' , பின்னர் குறியீடு கொடி பொத்தானை தட்டவும்."</string>
+    <string name="empty_state_markers_groups">குழுக்கள் இருக்குமதி செய்ய</string>
+    <string name="empty_state_markers_groups_desc">குறிக்கோளிகளாக பிடித்த குழுக்கள் அல்லது பாதை புள்ளிகளை இறக்குமதி செய்யுங்கள்.</string>
+    <string name="empty_state_markers_history_desc">இந்த திரையில் தோன்றியவாறு குறிக்கப்பட்ட குறிப்பான்கள் மாறும்.</string>
+    <string name="shared_string_two">இரண்டு</string>
+    <string name="shared_string_one">ஒன்று</string>
+    <string name="show_guide_line_descr">உங்கள் நிலைப்பாட்டிலிருந்து செய்யலில் உள்ள குறியீடுளுக்கு திசை வழியைக் காண்பி.</string>
+    <string name="show_arrows_descr">"செய்யளில் உள்ள அடையாளங்களுக்கான திசையை குறிக்கும்  ஒன்று அல்லது இரண்டு அம்புகளை காட்டு."</string>
+    <string name="distance_indication_descr">செய்யலிள் உள்ள குறியீடுகளை எவ்வாறு காட்ட வேண்டும் என்பதைத் தேர்வுசெய்யவும்.</string>
+    <string name="active_markers_descr">காண்பிப்பதற்காக எத்தனை திசையில் குறிகாட்டிகள் தேவை என்பதைத் தேர்ந்தெடுக்கவும்.</string>
+</resources>
diff --git a/OsmAnd/res/values-th/strings.xml b/OsmAnd/res/values-th/strings.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/OsmAnd/res/values-th/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index 35791e649e..3e6f23a00f 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="close_changeset">Değişiklik listesini kapat</string>
 	<string name="zxing_barcode_scanner_not_found">ZXing Barcode Scanner uygulaması kurulu değil. Uygulama marketinde aramak ister misiniz?</string>
 	<string name="rendering_attr_roadColors_description">Yol renk şemasını seç:</string>
@@ -95,7 +95,7 @@
     
 	<string name="local_indexes_cat_av">Ses/Video verisi</string>
     <string name="stop_routing_confirm">Navigasyonu durdurmak istediğinize emin misiniz?</string>
-    <string name="clear_dest_confirm">Varış noktasını silmek istediğinizden emin misiniz (ve ara hedefler)?</string>
+    <string name="clear_dest_confirm">Hedefi (ve ara hedefleri) temizlemek istediğinize emin misiniz\?</string>
     <string name="precise_routing_mode">Hassas yönlendirme (alfa)</string>
     <string name="recording_context_menu_show">Göster</string>
     <string name="recording_photo_description">%2$s fotoğrafın %1$s cisi</string>
@@ -123,7 +123,7 @@
     <string name="index_name_openmaps">AB Açık haritası</string>
     
     
-    <string name="precise_routing_mode_descr">Glitches olmadan kesin yolları hesaplamak için etkinleştirin. Yine uzaktan sınırlı ve yavaş.</string>
+    <string name="precise_routing_mode_descr">Kusursuz ve hassas rota hesapla. Henüz uzaklık kısıtlıdır ve yavaştır.</string>
     <string name="av_use_external_camera_descr">Fotoğraflar için sistem uygulamasını kullan.</string>
     <string name="av_use_external_camera">Kamera uygulamasını kullan</string>
     <string name="recording_is_recorded">Ses/Video kayıt ediliyor. Durdurmak için bu AV ikonuna basın.</string>
@@ -216,7 +216,7 @@
 	<string name="map_widget_next_turn_small">Sonraki dönüş (küçük)</string>
 	<string name="map_widget_next_next_turn">İkinci sonraki dönüş</string>
 	<string name="map_widget_mini_route">Mini rota haritası</string>
-	<string name="download_hillshade_maps">Tepe gölgelendirme tabakaları</string>
+	<string name="download_hillshade_maps">Tepe gölgeleri</string>
     <string name="email">e-posta</string>
 <string name="osmand_parking_position_description_add_time">Araba şu zamanda park edildi</string>
 	<string name="starting_point_too_far">Başlangıç noktası en yakın yoldan çok uzakta.</string>
@@ -374,7 +374,7 @@
 	<string name="search_online_address">İnternet</string>
 	<string name="router_service">Yolbul hizmeti</string>
 	<string name="address">Adres</string>
-	<string name="shared_string_download_successful">İndirme başarılı</string>
+	<string name="shared_string_download_successful">İndirildi</string>
 	
 	
 	
@@ -385,7 +385,7 @@
 	<string name="loading_cities">Şehirler yükleniyor…</string>
 	
 	<string name="arrived_at_destination">Varış noktasına ulaştınız</string>
-	<string name="invalid_locations">Koordinatlar geçersiz!</string>
+	<string name="invalid_locations">Geçersiz koordinatlar</string>
 	<string name="go_back_to_osmand">OsmAnd haritalara geri dön</string>
 	<string name="shared_string_close">Kapat</string>
 	<string name="loading_data">Veri yükleniyor…</string>
@@ -394,7 +394,7 @@
 	
 	
 	
-	<string name="use_online_routing_descr">Rotayı hesaplamak için interneti kullanın</string>
+	<string name="use_online_routing_descr">Rotayı hesaplamak için interneti kullanın.</string>
 	<string name="use_online_routing">Çevrim içi yolbulu kullan</string>
 	<string name="data_settings">Veriler</string>
 	<string name="additional_settings">İlave ayarlar</string>
@@ -667,7 +667,7 @@
     <string name="shared_string_map">Harita</string>
     <string name="prefer_motorways">Otoyol tercih et</string>
 	<string name="prefer_in_routing_title">Tercih et…</string>
-	<string name="prefer_in_routing_descr">Otoyolları tercih et</string>
+	<string name="prefer_in_routing_descr">Otoyolları yeğle.</string>
     <string name="max_speed_none">hiçbiri</string>
     <string name="av_def_action_choose">Talep üzerine seç</string>
     <string name="osmand_play_title_30_chars">OsmAnd Haritalar &amp; Yolbul</string>
@@ -686,7 +686,7 @@
 	<string name="search_position_map_view">Güncel harita merkezi</string>
 	<string name="select_search_position">Menşei:</string>
 	<string name="context_menu_item_search">Buraya yakın ara</string>
-	<string name="shared_string_save_as_gpx">Yeni GPX yol-izi olarak kaydet</string>
+	<string name="shared_string_save_as_gpx">Yeni GPX dosyası olarak kaydet</string>
 	<string name="route_successfully_saved_at">Rota \'%1$s\' olarak kaydedildi.</string>
 	<string name="filename_input">"Dosya adı: "</string>
 	
@@ -750,13 +750,13 @@
 	<string name="destination_point">Varış Noktası %1$s</string>
     <string name="context_menu_item_destination_point">Varış noktası olarak ayarla</string>
     <string name="please_select_address">Önce şehir ya da sokak seç</string>
-    <string name="search_street_in_neighborhood_cities">Yakın şehirlerde sokak ara</string>
+    <string name="search_street_in_neighborhood_cities">Komşu şehirlerdeki sokak için ara</string>
     <string name="intermediate_items_sort_by_distance">kapıdan kapıya sırala</string>
     <string name="local_osm_changes_backup_successful">OSM değişiklik dosyası başarıyla oluşturuldu</string>
-    <string name="local_osm_changes_backup_failed">OSM değişikliklerinin yedeklemesi başarısız</string>
+    <string name="local_osm_changes_backup_failed">OSM değişiklikleri yedeklenemedi</string>
     <string name="delete_point">Mevkiyi sil</string>
     <string name="plugin_distance_point_time">süre</string>
-    <string name="plugin_distance_point_hdop">hassaslık</string>
+    <string name="plugin_distance_point_hdop">doğruluk</string>
     <string name="plugin_distance_point_speed">hız</string>
     <string name="plugin_distance_point_ele">rakım</string>
     <string name="plugin_distance_point">Mevki</string>
@@ -768,26 +768,26 @@
     <string name="distance_measurement_finish_subtrack">Yeni bir alt yola başla</string>
     <string name="distance_measurement_clear_route">Tüm mevkileri temizle</string>
     
-    <string name="distance_measurement_load_gpx">Varolan GPX\'i aç</string>
+    <string name="distance_measurement_load_gpx">Var olan GPX dosyasını aç</string>
     <string name="wait_current_task_finished">Mevcut görev bitene kadar bekleyin lütfen</string>
-    <string name="use_kalman_filter_compass_descr">Pusuladaki gürültüyü azaltır ama durgunluk ekler</string>
+    <string name="use_kalman_filter_compass_descr">Pusula okumalarındaki gürültüyü azaltır ama durgunluk ekler.</string>
     <string name="use_kalman_filter_compass">Kalman süzgeci kullan</string>
-    <string name="use_magnetic_sensor_descr">pusula değerini belirlemek için yönlendirme sensörü yerine manyetik sensörü kullan</string>
+    <string name="use_magnetic_sensor_descr">Pusula okumaları için yönlendirme algılayıcısı yerine manyetik algılayıcıyı kullan.</string>
     <string name="use_magnetic_sensor">Manyetik sensörü kullan</string>
     <string name="other_location">Diğer</string>
     <string name="install_paid">Tam sürüm</string>
     <string name="cancel_route">Rotaya son ver</string>
     <string name="cancel_navigation">Navigasyonu durdur</string>
     <string name="clear_destination">Varış noktasını temizle</string>
-    <string name="download_using_mobile_internet">Şu anda Wifi ağına bağlı değil. Mevcut internet bağlantısı ile indirilsin mi?</string>
+    <string name="download_using_mobile_internet">Kablosuz ağa bağlı değil. İndirmek için şimdiki İnternet bağlantısı kullanılsın mı\?</string>
     <string name="street_name">Sokak Adı</string>
 	<string name="hno">Bina numarası</string>
-    <string name="website">İnternet sitesi</string>
+    <string name="website">Web sitesi</string>
 	<string name="monitoring_settings">Seyahat kaydetme</string>
     <string name="monitoring_settings_descr">Seyahatlerinizi nasıl kaydedeceğinizi ayarlayın.</string>
     
     <string name="contribution_activity">Yükleme versiyonu</string>
-    <string name="choose_osmand_theme_descr">Uygulama teması seç.</string>
+    <string name="choose_osmand_theme_descr">Uygulamanın nasıl görüneceğini seç.</string>
     <string name="choose_osmand_theme">Uygulama gövdesi</string>
     <string name="accessibility_options">Erişilebilirlik ayarları</string>
     <string name="select_address_activity">Adres seç</string>
@@ -811,15 +811,15 @@
     <string name="maps_define_edit">Tanımla/Düzenle…</string>
 	<string name="clear_intermediate_points"/>
     <string name="keep_intermediate_points">Ara hedefler tutun</string>
-    <string name="new_directions_point_dialog">Zaten ara noktaları belirlemişsiniz.</string>
+    <string name="new_directions_point_dialog">Zaten ara hedefleri belirlemişsiniz.</string>
     <string name="intermediate_items_sort_return">Ara hedefler sıralarına hedef geçerli konumdan giden yolda en iyi duruma getirmek için başvurdu.</string>
-    <string name="gpx_saved_sucessfully">GPX dosyası {0} yerine başarıyla kaydedildi</string>
+    <string name="gpx_saved_sucessfully">GPX dosyası {0} konumuna kaydedildi</string>
     <string name="use_distance_measurement_help">* Nokta belirlemek için basın.\n 
         * Önceki noktayı silmek için basılı tutun.\n
         * Noktayı görüntülemek ve açıklama eklemek için basılı tutun.\n
         * Daha fazla eylem için ölçüm aracına tıklayın.</string>
     <string name="files_limit">%1$d dosya kaldı</string>
-    <string name="available_downloads_left">%1$d dosya indirmek için uygun</string>
+    <string name="available_downloads_left">İndirilecek %1$d dosya kaldı</string>
     <string name="osmand_background_plugin_description">Periyodik GPS cihazı uyanma aracılığıyla arka planda izleme ve navigasyon (kapalı ekranı) modunu etkinleştirmek için ayarları gösterir.</string>
     <string name="get_directions">Yol tarifleri</string>
 	<string name="menu_layers">Harita katmanları</string>
@@ -867,7 +867,7 @@
 	<string name="context_menu_item_share_location">Konum paylaş</string>
 	<string name="amenity_type_landuse">Arazi</string>
 	<string name="amenity_type_transportation">Ulaşım</string>
-	<string name="shared_string_io_error">G/Ç hatası oluştu</string>
+	<string name="shared_string_io_error">G/Ç hatası</string>
 	<string name="km">km</string>
 	<string name="km_h">km/h</string>
 	<string name="m">m</string>
@@ -949,12 +949,12 @@
 	<string name="transport_finish_search">Aramayı bitir</string>
 	<string name="transport_route_distance">Güzergah mesafesi</string>
 	<string name="transport">Ulaşım</string>
-	<string name="show_transport_over_map_description">Halka açık ulaşım duraklarını haritada göster</string>
+	<string name="show_transport_over_map_description">Toplu taşıma duraklarını haritada göster.</string>
 	<string name="show_transport_over_map">Taşıma duraklarını göster</string>
-	<string name="hello">OsmAnd gezinti uygulaması</string>
-	<string name="update_poi_success">İÇN verisi başarıyla güncellendi ({0} yüklendi)</string>
-	<string name="update_poi_error_local">Yerel İÇN listesi güncelleme hatası</string>
-	<string name="update_poi_error_loading">Sunucudan veri yüklenirken hata</string>
+	<string name="hello">OsmAnd yolbul uygulaması</string>
+	<string name="update_poi_success">İÇN verisi güncellendi ({0} yüklendi)</string>
+	<string name="update_poi_error_local">Yerel İÇN listesi güncellenemedi</string>
+	<string name="update_poi_error_loading">Sunucudan veri yüklenemedi</string>
 	<string name="update_poi_no_offline_poi_index">Bu alan için çevrim dışı İÇN verisi mevcut değil</string>
 	<string name="search_history_city">Şehir: {0}</string>
 	<string name="search_history_street">Sokak: {0}, {1}</string>
@@ -965,14 +965,14 @@
 	<string name="search_nothing_found">Sonuç bulunamadı</string>
 	<string name="hint_search_online">Çevrimiçi arama: Ev numarası, sokak, şehir</string>
 	<string name="search_offline_address">Çevrim dışı arama</string>
-	<string name="route_general_information">Toplam mesafe %1$s, time %2$d h %3$d m seyahat.</string>
-	<string name="router_service_descr">Çevrim içi veya çevrim dışı yolbul hizmeti seçin</string>
-	<string name="sd_dir_not_accessible">SD kartta veri depolama klasörü erişilebilir değil!</string>
+	<string name="route_general_information">Toplam uzaklık %1$s, seyahat süresi %2$d s %3$d dak.</string>
+	<string name="router_service_descr">Çevrim içi veya çevrim dışı yolbul hizmeti seçin.</string>
+	<string name="sd_dir_not_accessible">Bellek kartında veri depolama klasörü erişilebilir değil!</string>
 	<string name="download_question">{0} - {1} indir ?</string>
-	<string name="download_question_exist">{0} için çevrim dışı veri zaten var ({1}). Güncellemek ister misiniz ({2}) ?</string>
+	<string name="download_question_exist">{0} için çevrim dışı veri zaten var ({1}). ({2}) güncellensin mi\?</string>
 	<string name="shared_string_downloading">İndiriliyor</string>
 	<string name="downloading_list_indexes">Mevcut bölgelerin listesi indiriliyor…</string>
-	<string name="list_index_files_was_not_loaded">osmand.net\'ten bölgelerin listesi alınamadı.</string>
+	<string name="list_index_files_was_not_loaded">https://osmand.net adresinden bölge listesi alınamadı.</string>
 	<string name="update_existing">Değiştir</string>
 	<string name="only_show">Güzergahı göster</string>
 	<string name="follow">Gezintiyi başlat</string>
@@ -982,13 +982,13 @@
 	<string name="loading_streets_buildings">Sokaklar/binalar yükleniyor…</string>
 	<string name="loading_streets">Sokaklar yükleniyor…</string>
 	<string name="poi">İÇN</string>
-	<string name="error_occurred_saving_gpx">GPX kaydedilirken hata</string>
-	<string name="error_calculating_route">Rota hesaplama hatası</string>
-	<string name="error_calculating_route_occured">Güzergah hesaplanırken hata oluştu</string>
-	<string name="empty_route_calculated">Hata: Hesaplanan rota boş</string>					
+	<string name="error_occurred_saving_gpx">GPX dosyası kaydedilemedi</string>
+	<string name="error_calculating_route">Rota hesaplanamadı</string>
+	<string name="error_calculating_route_occured">Rota hesaplanamadı</string>
+	<string name="empty_route_calculated">Hesaplanan rota boş</string>					
 	<string name="new_route_calculated_dist">Yeni güzergah hesaplandı, mesafe</string>
 	<string name="reading_indexes">Yerel veri okunuyor…</string>
-	<string name="saving_gpx_tracks">GPX takibi SD\'ye kaydediliyor…</string>
+	<string name="saving_gpx_tracks">GPX dosyası kaydediliyor…</string>
 	<string name="data_settings_descr">Dil belirleyin, veri indirin/tekrar yükleyin</string>
 	<string name="osm_settings">OSM düzenleme</string>
 	<string name="app_settings">Uygulama ayarları</string>
@@ -1081,7 +1081,7 @@
     <string name="animate_routing_route_not_calculated">Lütfen ilk olarak rotayı hesaplayın</string>
     <string name="animate_routing_route">Hesaplanan rotayı kullanarak simülasyon </string>
     <string name="animate_routing_gpx">GPX Rota kullanarak simülasyonlar</string>
-    <string name="shared_string_remember_my_choice">Seçimimi hatırla</string>
+    <string name="shared_string_remember_my_choice">Seçimi anımsa</string>
     
     <string name="shared_string_and">ve</string>
     <string name="shared_string_or">veya</string>
@@ -1189,7 +1189,7 @@
 	<string name="shared_string_share">Paylaş</string>
 	<string name="shared_string_export">Dışa aktar</string>
 	<string name="shared_string_more">Daha…</string>
-	<string name="shared_string_unexpected_error">Beklenmeyen hata oluştu</string>
+	<string name="shared_string_unexpected_error">Beklenmeyen hata</string>
 	<string name="shared_string_action_template">Eylem {0}</string>
 	<string name="shared_string_show">Göster</string>
 	<string name="shared_string_show_all">Tümünü göster</string>
@@ -1544,12 +1544,12 @@
 	<string name="poi_error_unexpected_template">Eylem {0} yaparken beklenmeyen bir hata oluştu.</string>
 	<string name="poi_error_io_error_template">I / O hatası eylemi yaparken oluştu {0}.</string>
 	<string name="poi_error_info_not_loaded">Düğüm hakkında bilgi yüklü değildi</string>
-	<string name="context_menu_item_update_map_confirm">İnternet üzerinden yerel bilgilerinizi güncelleyin?</string>
+	<string name="context_menu_item_update_map_confirm">İnternetten yerel bilgilerinizi güncelleyin\?</string>
 	<string name="search_history_int_streets">Kesişim: {0} x {1} {2} içinde</string>
 	<string name="favorite">Favori</string>
 	<string name="search_osm_nominatim">OSM Nominatim kullanarak çevrimiçi arama</string>
 	<string name="max_level_download_tile">Max. Online zoom</string>
-	<string name="max_level_download_tile_descr">Çevrimiçi harita fayans indirmek için maksimum yakınlaştırma düzeyini seçin</string>
+	<string name="max_level_download_tile_descr">Çevrim içi harita döşemelerinin bundan sonraki yakınlaştırma düzeylerine göz atmayın.</string>
 	<string name="fav_points_edited">En sevdiğim nokta düzenlendi</string>
 	<string name="fav_points_not_exist">Hiçbir favori noktalar var</string>
 	<string name="opening_changeset">Changeset Açılış …</string>
@@ -1564,7 +1564,7 @@
 	<string name="transport_to_go_after">Önceki mesafe</string>
 	<string name="transport_to_go_before">Sonraki mesafe</string>
 	<string name="transport_stops_to_pass">geçmek için durur</string>
-	<string name="update_poi_is_not_available_for_zoom">Güncelleniyor küçük yakınlaştırma düzeyleri için geçerli değildir</string>
+	<string name="update_poi_is_not_available_for_zoom">Yakınlaştırma, İÇN\'leri güncellemenizi sağlar</string>
 	<string name="context_menu_item_update_poi">Güncelleme POI</string>
 	<string name="fav_imported_sucessfully">Favoriler başarıyla içe aktarıldı</string>
 	<string name="import_file_favourites">Veri GPX dosyası olarak kaydetmek veya yol işaretleri için sık kullanılanları almak?</string>
@@ -1660,7 +1660,7 @@
     <string name="routing_attr_height_description">Güzergahlara uygun olmak için araç yüksekliğini belirt</string>
     <string name="edit_tilesource_minzoom">En az yakınlaştırma</string>
     <string name="route_descr_destination">Varış yeri</string>
-    <string name="local_osm_changes_backup">OSM değişiklik olarak yedekleme</string>
+    <string name="local_osm_changes_backup">OSM değişikliği olarak yedekle</string>
     <string name="lang_bg">Bulgaristan</string>
     <string name="lang_ca">Katalonya</string>
     <string name="lang_hr">Hırvatistan</string>
@@ -2359,9 +2359,9 @@
     <string name="all_markers_moved_to_history">Tüm harita işaretleyicileri Geçmiş\'e taşındı</string>
     <string name="marker_moved_to_history">Harita işaretleyici Geçmiş\'e taşındı</string>
     <string name="move_all_to_history">Tümünü Geçmiş\'e taşı</string>
-    <string name="quick_action_resume_pause_navigation">Navigasyonu devam ettir/duraklat</string>
+    <string name="quick_action_resume_pause_navigation">Navigasyonu duraklat/sürdür</string>
     <string name="quick_action_resume_pause_navigation_descr">Navigasyonu duraklatmak ya da devam ettirmek için bu düğmeye tıklayınız.</string>
-    <string name="quick_action_show_navigation_finish_dialog">Navigasyon tamamlandı iletisi göster</string>
+    <string name="quick_action_show_navigation_finish_dialog">\'Navigasyon tamamlandı\' iletisi göster</string>
     <string name="quick_action_start_stop_navigation">Navigasyonu başlat/durdur</string>
     <string name="quick_action_start_stop_navigation_descr">Navigasyonu başlatmak ya da sonlandırmak için bu düğmeye tıklayınız.</string>
     <string name="mapillary_menu_date_from">Buradan</string>
@@ -2561,4 +2561,17 @@
     <string name="distance_nearest">Uzaklık: En yakın önce</string>
     <string name="get_unlimited_access">Sınırsız erişim alın</string>
     <string name="dd_dddddd_format">DD,DDDDDD°</string>
-	</resources>
+    <string name="enter_lat_and_lon">Enlem ve boylam girin</string>
+    <string name="east_abbreviation">D</string>
+    <string name="west_abbreviation">B</string>
+    <string name="south_abbreviation">G</string>
+    <string name="north_abbreviation">K</string>
+    <string name="optional_point_name">İsteğe bağlı nokta adı</string>
+    <string name="enter_the_file_name">Dosya adını yazın.</string>
+    <string name="map_import_error">Harita içe aktarma hatası</string>
+    <string name="map_imported_successfully">Harita içe aktarıldı</string>
+    <string name="make_as_start_point">Bunu başlangıç noktası yap</string>
+    <string name="shared_string_current">Geçerli</string>
+    <string name="last_intermediate_dest_description">Ara durak ekler</string>
+    <string name="shared_string_gpx_files">GPX dosyaları</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
index 08620e31e8..4c673e3451 100644
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -239,7 +239,7 @@
 	<string name="poi_fuel_biogas">Біогаз</string>
 	<string name="poi_halt">Залізнична зупинка</string>
 	<string name="poi_subway_entrance">Вхід в метро</string>
-	<string name="poi_subway_station">Станція метро</string>
+	<string name="poi_subway_station">Так</string>
 	<string name="poi_taxi">Стоянка таксі</string>
 
 	<string name="poi_aerodrome">Аеропорт</string>
@@ -445,7 +445,7 @@
 	<string name="poi_prosecutor">Прокуратура</string>
 	<string name="poi_migration">Міграційна служба</string>
 	<string name="poi_tax_inspection">Налоговая інспекція</string>
-	<string name="poi_capital">Столиця</string>
+	<string name="poi_capital">Так</string>
 	<string name="poi_hamlet">Хутір</string>
 	<string name="poi_suburb">Район</string>
 	<string name="poi_neighbourhood">Мікрорайон</string>
@@ -1878,7 +1878,7 @@
 	<string name="poi_payment_uta_no">Картки UTA не приймаються</string>
 	<string name="poi_health_specialty_surgery_yes">Загальна хірургія</string>
 	<string name="poi_fire_hydrant_type_pond">Ставок</string>
-	<string name="poi_payment_efectivo_yes">Готівка</string>
+	<string name="poi_payment_efectivo_yes">Електронні гроші Efectivo</string>
 	<string name="poi_health_specialty_radiology_yes">Радіологія</string>
 	<string name="poi_fire_hydrant_type_wall">Пожежний кран</string>
 
@@ -2669,7 +2669,7 @@
 	<string name="poi_diet_vegetarian_only">Лише вегетаріанське харчування</string>
 	<string name="poi_memorial_column">Колона</string>
 	<string name="poi_service_bicycle_diy_yes">Інструменти для самостійного ремонту</string>
-	<string name="poi_scout_yes">так</string>
+	<string name="poi_scout_yes">Так</string>
 	<string name="poi_water_tap">Водопровідний кран</string>
 	<string name="poi_diplomatic_delegation">Делегація</string>
 	<string name="poi_cuisine_bavarian">Баварська</string>
@@ -2897,7 +2897,7 @@
 	<string name="poi_telescope_type_gamma">Гамма</string>
 	<string name="poi_cuisine_diner">Дайнер (американська дешева закусочна)</string>
 	<string name="poi_cuisine_cuban">Кубинська</string>
-	<string name="poi_microbrewery_yes">Власна пивоварня</string>
+	<string name="poi_microbrewery_yes">Так</string>
 	<string name="poi_vending_tickets">Квитки</string>
 	<string name="poi_bridge_movable_retractable">Тип розвідного моста: висувається</string>
 
@@ -3191,7 +3191,7 @@
 	<string name="poi_motorcycle_repair">Ремонт мотоциклів</string>
 	<string name="poi_resource_mercury">Ртуть</string>
 	<string name="poi_route_trolleybus_ref">Тролейбус</string>
-	<string name="poi_crop_poultry">Вирощується культура: свійська птиця</string>
+	<string name="poi_crop_poultry">Вирощується культура: корм для птиці</string>
 	<string name="poi_health_specialty_depth_psychology_yes">Глибинна психологія</string>
 	<string name="poi_nuclear_explosion_purpose_industrial_application_seismic_sounding">Мета вибуху: промислове застосування, сейсмічне зондування</string>
 	<string name="poi_treat_inpatient_no">Обслуговування в стаціонарі: ні</string>
@@ -3864,11 +3864,34 @@
 <string name="poi_car_pooling">Точка кар-шерінгу</string>
 	<string name="poi_ruins">Руїни</string>
 
-	<string name="poi_license_classes">Ліцензійні класи</string>
+	<string name="poi_license_classes">Види водійських прав</string>
 
 	<string name="poi_hill">Пагорб</string>
 
 <string name="poi_atm">Банкомат</string>
 	<string name="poi_shoe_repair">Ремонт взуття</string>
 
+<string name="poi_bulk_purchase">Масове придбання</string>
+	<string name="poi_substation_type">Тип</string>
+
+<string name="poi_bulk_purchase_yes">Так</string>
+	<string name="poi_bulk_purchase_only">Виключно</string>
+
+	<string name="poi_pipeline_substation">Трубопровідна підстанція</string>
+	<string name="poi_substation_transmission">Передавальна</string>
+	<string name="poi_substation_distribution">Розподільча</string>
+	<string name="poi_substation_minor_distribution">Локальна розподільча</string>
+	<string name="poi_substation_industrial">Промислова</string>
+	<string name="poi_substation_transition">Перехідна</string>
+	<string name="poi_substation_traction">Тягова</string>
+	<string name="poi_substation_converter">Перетворювальна</string>
+	<string name="poi_substation_compensation">Компенсаторна</string>
+
+	<string name="poi_substation_compression">Компресійна</string>
+	<string name="poi_substation_measurement">Вимірювальна</string>
+	<string name="poi_substation_valve">Вентиль</string>
+	<string name="poi_substation_valve_group">Група вентилів</string>
+	<string name="poi_substation_inspection_gauge">Контрольно-вимірювальна</string>
+	<string name="poi_substation_field_gathering">Збиральна</string>
+
 </resources>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 241e71c2e8..eb475023f0 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -84,7 +84,7 @@
   <string name="accessibility_mode">Режим допоміжних можливостей</string>
   <string name="accessibility_mode_descr">Вмикає функції для користувачів із вадами.</string>
   <string name="shared_string_on">Увімкнено</string>
-  <string name="shared_string_off">Вимкнено</string>
+  <string name="shared_string_off">Вимкнути</string>
   <string name="accessibility_default">Використовувати системні налаштування</string>
   <string name="backToMenu">Повернутися до меню</string>
   <string name="zoomOut">Зменшити</string>
@@ -268,7 +268,7 @@
   <string name="favorite_friends_category">Друзі</string>
   <string name="favorite_places_category">Місця</string>
   
-  <string name="shared_string_name">Назва</string>
+  <string name="shared_string_name">Імʼя</string>
   <string name="favourites_edit_dialog_category">Категорія</string>
   <string name="shared_string_no_thanks">Ні, дякую</string>
   <string name="basemap_missing">Завантажте базову мапу світу, щоб оглядати весь світ на малих рівнях масштабування.</string>
@@ -1577,7 +1577,7 @@
 	<string name="create_poi_link_to_osm_doc"><u>Онлайнова OSM</u> класифікація мапи із зображеннями.</string>
 	<string name="import_file_favourites">Зберегти дані як GPX-файл чи імпортувати маршрутні точки в \'Закладки\'?</string>
 	
-	<string name="shared_string_share">Поділитись</string>
+	<string name="shared_string_share">Поділитися</string>
 	<string name="share_fav_subject">Закладки, якими поділились через OsmAnd</string>
 	<string name="navigation_intent_invalid">Невірний формат: %s</string>
 <string name="rendering_attr_coloredBuildings_name">Кольорове маркування будівель за типом</string>
@@ -1618,7 +1618,7 @@
     <string name="duration">Тривалість</string>
     <string name="distance">Віддаль</string>
     <string name="index_tours">Подорожі</string>
-    <string name="shared_string_all">Усі</string>
+    <string name="shared_string_all">Всі</string>
     <string name="shared_string_waypoints">Шляхові точки</string>
     
     <string name="way_alarms">Перешкоди</string>
@@ -2595,7 +2595,7 @@
     <string name="show_from_zoom_level">Відображення від рівня масштабування</string>
     <string name="routing_attr_allow_private_name">Дозволити приватний доступ</string>
     <string name="routing_attr_allow_private_description">Дозволити доступ на приватну територію.</string>
-    <string name="display_zoom_level">Відображення рівня масштабування: %1$s</string>
+    <string name="display_zoom_level">Рівень масштабування: %1$s</string>
     <string name="favorite_group_name">Назва групи</string>
     <string name="change_color">Зміна кольору</string>
     <string name="edit_name">Редагувати ім\'я</string>
@@ -2885,7 +2885,7 @@
     <string name="my_location">Моє місцезнаходження</string>
     <string name="shared_string_finish">Фініш</string>
     <string name="plan_route">Планувати маршрут</string>
-    <string name="shared_string_sort">Сортувати</string>
+    <string name="shared_string_sort">Впорядкувати</string>
     <string name="coordinate_input">Введення координат</string>
     <string name="is_saved">збережено</string>
     <string name="marker_save_as_track_descr">Експортувати Ваші маркери у наступний GPX-файл:</string>
@@ -2939,7 +2939,7 @@
     <string name="rename_marker">Перейменувати маркер</string>
     <string name="appearance_on_the_map">Поява на мапі</string>
     <string name="add_track_to_markers_descr">Виберіть трек для додавання шляхових точок в маркери.</string>
-    <string name="add_favourites_group_to_markers_descr">Виберіть категорію закладок для додавання до маркерів.</string>
+    <string name="add_favourites_group_to_markers_descr">Виберіть категорію Закладок для додавання до позначок.</string>
     <string name="shared_string_gpx_waypoints">Шляхові точки треку</string>
     <string name="favourites_group">Категорія закладок</string>
     <string name="add_group">Додати групу</string>
@@ -3029,7 +3029,7 @@
     <string name="enter_lat">Введіть широту</string>
     <string name="enter_lat_and_lon">Введіть широту та довготу</string>
 	<string name="dd_mm_ss_format">DD°MM′SS″</string>
-	<string name="dd_dddddd_format">DD.DDDDDD°</string>
+	<string name="dd_dddddd_format">ГГ.ГГГГГГ°</string>
 	<string name="dd_ddddd_format">DD.DDDDD°</string>
 	<string name="dd_mm_mmmm_format">DD°MM.MMMM′</string>
 	<string name="dd_mm_mmm_format">DD°MM.MMM′</string>
@@ -3197,7 +3197,7 @@
     <string name="ask_for_location_permission">Будь ласка, надайте OsmAnd дозвіл визначати місцезнаходження для того, щоб продовжити.</string>
     <string name="rendering_value_black_name">Чорний</string>
     <string name="search_street">Пошук вулиці</string>
-    <string name="start_search_from_city">Почати пошук з міста</string>
+    <string name="start_search_from_city">Спочатку оберіть місто</string>
     <string name="shared_string_restore">Відновити</string>
     <string name="keep_passed_markers_descr">Позначки, додані як група Закладок або маршрутних точок GPX і позначені пройденими, залишаться на мапі. Якщо група неактивна, позначки зникнуть з мапи.</string>
     <string name="keep_passed_markers">Залишити пройдені позначки на мапі</string>
@@ -3205,4 +3205,19 @@
     <string name="markers_remove_dialog_msg">Видалити позначку мапи \'%s\'\?</string>
     <string name="edit_map_marker">Редагувати позначку мапи</string>
     <string name="third_party_application">Стороння програма</string>
+    <string name="osm_live_plan_pricing">План і ціни</string>
+    <string name="osm_live_payment_monthly_title">Платити щомісячно</string>
+    <string name="osm_live_payment_3_months_title">Платити раз на 3 місяці</string>
+    <string name="osm_live_payment_annual_title">Платити раз на рік</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / місяць</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / місяць</string>
+    <string name="osm_live_payment_discount_descr">Заощадьте %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Ваша поточна підписка</string>
+    <string name="osm_live_payment_renews_monthly">Оновлюється щомісяця</string>
+    <string name="osm_live_payment_renews_quarterly">Оновлюється щокварталу</string>
+    <string name="osm_live_payment_renews_annually">Оновлюється щороку</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Оберіть зручну для вас періодичність платежів:</string>
+    <string name="osm_live_payment_contribute_descr">Частина доходу йде до наповнювачів OpenStreetMap.</string>
+    <string name="powered_by_osmand">За підтримки OsmAnd</string>
     </resources>
diff --git a/OsmAnd/res/values-zh-rCN/phrases.xml b/OsmAnd/res/values-zh-rCN/phrases.xml
index 2208869faa..2f953eeaed 100644
--- a/OsmAnd/res/values-zh-rCN/phrases.xml
+++ b/OsmAnd/res/values-zh-rCN/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_fuel_avia_type"/>
 	<string name="poi_payment_type">支付类别</string>
 	<string name="poi_clothes_type">类型</string>
@@ -26,4 +26,29 @@
 	<string name="poi_user_defined_other">用户自定义</string>
 
 	<string name="poi_hazard_flood">洪水灾害</string>
-	</resources>
+    <string name="poi_cannabis">大麻商店</string>
+    <string name="poi_socket_cee_blue_output_low">低</string>
+    <string name="poi_socket_schuko_output_high">中</string>
+    <string name="poi_socket_schuko_output_medium">高</string>
+    <string name="poi_adult_gaming_centre">成人游戏中心</string>
+    <string name="poi_service_vehicle_air_conditioning_yes">空调</string>
+    <string name="poi_service_vehicle_insurance_yes">保险</string>
+    <string name="poi_glacier_type_remnant">遗迹</string>
+    <string name="poi_hazard_avalanche">雪崩灾害</string>
+    <string name="poi_hazard_slippery_road">湿滑道路</string>
+    <string name="poi_substation_industrial">工业</string>
+    <string name="poi_blood_donation">献血</string>
+    <string name="poi_denotation_landmark">地标</string>
+    <string name="poi_car_rental">车辆租赁</string>
+    <string name="poi_toilets">洗手间</string>
+    <string name="poi_shower">淋浴</string>
+    <string name="poi_smoking_area">吸烟区</string>
+    <string name="poi_internet_cafe">网咖</string>
+    <string name="poi_bank">银行</string>
+    <string name="poi_bitcoin_yes">比特币支付</string>
+    <string name="poi_volcano">火山</string>
+    <string name="poi_crater">火山口</string>
+    <string name="poi_glacier">冰山</string>
+    <string name="poi_waterfall">瀑布</string>
+    <string name="poi_river">河流</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index a499c5aa84..6610bc7c58 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="email">電子郵件</string>
 	<string name="poi_dialog_opening_hours">打開</string>
 	<string name="poi_dialog_comment">評論</string>
@@ -523,7 +523,7 @@
 	<string name="rendering_attr_showRoadMaps_description">选择何时显示仅包含道路的地图：</string>
 	<string name="rendering_attr_showRoadMaps_name">仅包含道路的地图</string>
     <string name="safe_mode_description">在安全模式运行应用（使用较慢的 Android 代码代替原生代码）。</string>
-    <string name="native_library_not_running">应用正运行在安全模式下（可在设置中关闭）。</string>
+    <string name="native_library_not_running">应用正运行在安全模式下（可在“设置”中关闭）。</string>
     <string name="background_service_is_enabled_question">OsmAnd 睡眠模式服务仍在运行。是否要关闭？</string>
     <string name="close_changeset">关闭修改集</string>
 	<string name="zxing_barcode_scanner_not_found">ZXing 条形码扫描应用未安装，是否转到应用市场中搜索？</string>
@@ -531,7 +531,7 @@
 	<string name="rendering_attr_roadColors_name">道路颜色主题</string>
     <string name="non_optimal_route_calculation">长距离时计算结果可能非最优</string>
 	<string name="map_widget_monitoring_services">日志服务</string>
-	<string name="replace_destination_point">替换终点</string>
+	<string name="replace_destination_point">替换目的地</string>
     <string name="new_destination_point_dialog">您已经设置了一个目的地：</string>
     <string name="ending_point_too_far">结束点与最近道路太远。</string>
     <string name="add_tag">添加标记</string>
@@ -680,13 +680,13 @@
 	<string name="local_indexes_cat_poi">兴趣点数据</string>
 	<string name="ttsvoice">TTS语音</string>
 	<string name="search_offline_clear_search">新搜索</string>
-	<string name="map_text_size_descr">选择地图上名称的字体大小</string>
+	<string name="map_text_size_descr">选择地图上名称的字体大小。</string>
 	<string name="map_text_size">地图字体大小</string>
-	<string name="trace_rendering_descr">显示渲染性能</string>
+	<string name="trace_rendering_descr">显示渲染性能。</string>
 	
 	<string name="installing_new_resources">解包新数据…</string>
 	<string name="internet_connection_required_for_online_route">已选择在线导航服务，但网络连接不可用。</string>
-	<string name="tts_language_not_supported_title">语言不支持</string>
+	<string name="tts_language_not_supported_title">不支持的语言</string>
 	<string name="tts_missing_language_data_title">数据丢失</string>
 	<string name="gpx_option_destination_point">使用当前终点</string>
 	<string name="voice_stream_notification">提醒语音音频</string>
@@ -1342,8 +1342,8 @@
     <string name="rendering_attr_showSurfaces_name">显示道路表面</string>
     
     
-    <string name="map_widget_left">左侧面板</string>
-    <string name="map_widget_right">右侧面板</string>
+    <string name="map_widget_left">左边栏</string>
+    <string name="map_widget_right">右边栏</string>
     <string name="rendering_attr_showCycleRoutes_name">显示自行车路线</string>
     <string name="rendering_attr_horseRoutes_name">马匹路线</string>
     <string name="download_wikipedia_maps">维基百科</string>
@@ -1424,7 +1424,7 @@
     <string name="dash_download_manage">管理</string>
     <string name="rendering_attr_trainLightrailRoutes_name">铁路线路</string>
     <string name="rendering_category_hide">隐藏</string>
-    <string name="traffic_warning_pedestrian">人行橫道</string>
+    <string name="traffic_warning_pedestrian">人行横道</string>
     <string name="rendering_category_routes">线路</string>
     <string name="show_railway_warnings">铁道交口</string>
     <string name="rendering_category_details">详细信息</string>
@@ -1680,7 +1680,7 @@
     <string name="upload_osm_note">上传 OSM 注释</string>
     <string name="consider_turning_polygons_off">建议关闭多边形渲染。</string>
     <string name="clear_updates_proposition_message">您可以删除已下载的更新和回到原始地图版本</string>
-    <string name="switch_start_finish">对调起始点和目的地</string>
+    <string name="switch_start_finish">交换起始点和目的地</string>
     <string name="rec_split">录制器拆分</string>
     <string name="rec_split_title">使用录制器拆分</string>
     <string name="rec_split_desc">重写剪辑时，使用的空间超过存储大小</string>
@@ -1844,7 +1844,7 @@
     <string name="traffic_warning_speed_limit">速度限制</string>
     <string name="traffic_warning_border_control">边境管制</string>
     <string name="traffic_warning_payment">收费站</string>
-    <string name="traffic_warning_stop">停车标志</string>
+    <string name="traffic_warning_stop">停止标志</string>
     <string name="traffic_warning_calming">交通稳静化</string>
     <string name="traffic_warning_speed_camera">测速摄像机</string>
     <string name="traffic_warning">交通警告</string>
@@ -2118,7 +2118,7 @@
     <string name="app_mode_boat">小船</string>
     <string name="app_mode_aircraft">航空器</string>
     <string name="local_osm_changes_delete_all_confirm">要删除 %1$d 个 OSM 更新。是否确定？</string>
-    <string name="animate_routing_route_not_calculated">请先计算路线</string>
+    <string name="animate_routing_route_not_calculated">请先计算路径</string>
     <string name="animate_routing_route">使用计算的路线进行模拟</string>
     <string name="animate_routing_gpx">模拟使用 GPX 轨迹</string>
     <string name="route_is_too_long_v2">这条路线可能太长，无法推算。如果在10分钟内没有结果，请添加中继节点。</string>
@@ -2718,4 +2718,44 @@
     <string name="increase_search_radius_to">增大搜索半径至 %1$s</string>
     <string name="send_search_query_description">我们将会发送您的搜索请求：<b>\"%1$s\"</b>，以及您的位置。<br/><br/>我们不会搜集您的个人信息，我们只需要搜索数据以改进搜索算法。<br/></string>
     <string name="send_search_query">发送搜索请求？</string>
-    </resources>
+    <string name="search_street">搜索街道</string>
+    <string name="start_search_from_city">从城市开始搜索</string>
+    <string name="thank_you_for_feedback">感谢您的反馈</string>
+    <string name="powered_by_osmand">由 OsmAnd 出品</string>
+    <string name="osm_live_plan_pricing">方案和价格</string>
+    <string name="osm_live_payment_monthly_title">每月付款</string>
+    <string name="osm_live_payment_3_months_title">每季度付款</string>
+    <string name="osm_live_payment_annual_title">每年付款</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / 月</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / 月</string>
+    <string name="osm_live_payment_discount_descr">节省 %1$s！</string>
+	<string name="osm_live_payment_current_subscription">您的当前订阅</string>
+    <string name="open_in_browser_wiki_description">在网页浏览器中查看文章。</string>
+    <string name="osm_live_subscriptions">订阅</string>
+    <string name="osm_live_payment_renews_monthly">每月续期</string>
+    <string name="osm_live_payment_renews_quarterly">每季度续期</string>
+    <string name="osm_live_payment_renews_annually">每年续期</string>
+    <string name="third_party_application">第三方应用程序</string>
+    <string name="osm_live_payment_header">选择对您方便的支付周期：</string>
+    <string name="osm_live_payment_contribute_descr">部分收入将由 OpenStreetMap 贡献者获得。</string>
+    <string name="shared_string_restore">恢复</string>
+    <string name="search_no_results_feedback">没有搜索结果？
+\n向我们提供反馈</string>
+    <string name="point_deleted">点 %1$s 已删除</string>
+    <string name="osn_modify_dialog_error">无法修改笔记</string>
+    <string name="fast_coordinates_input">快速坐标输入</string>
+    <string name="my_location">我的位置</string>
+    <string name="descendingly">降序</string>
+    <string name="ascendingly">升序</string>
+    <string name="order_by">排序方式：</string>
+    <string name="this_year">今年</string>
+    <string name="exit_without_saving">不保存退出？</string>
+    <string name="tunnel_warning">前方隧道</string>
+    <string name="show_tunnels">隧道</string>
+    <string name="download_wikipedia_description">下载 %1$s 的维基百科文章以离线阅读。</string>
+    <string name="swap_start_and_destination">交换出发地和目的地</string>
+    <string name="add_destination_point">添加目的地</string>
+    <string name="mapillary_menu_title_pano">仅显示 360° 图像</string>
+    <string name="wiki_article_search_text">搜索对应的维基文章</string>
+    <string name="run_full_osmand_header">启动 OsmAnd？</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index 2a053495e7..0e0af8d50a 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="poi_shop">商店</string>
 		<string name="poi_shop_food">食品商店</string>
 	<string name="poi_emergency">緊急救助</string>
@@ -52,7 +52,7 @@
 	<string name="poi_farm">農產品店</string>
 	<string name="poi_greengrocer">蔬果店</string>
 	<string name="poi_seafood">海産店</string>
-	<string name="poi_confectionery">糖果糕點店</string>
+	<string name="poi_confectionery">糖果店</string>
 	<string name="poi_ice_cream">冰淇淋店</string>
 	<string name="poi_supermarket">超市</string>
 	<string name="poi_tea">茶飲店</string>
@@ -163,7 +163,7 @@
 	<string name="poi_traffic_calming_cushion">緩衝墊</string>
 	<string name="poi_traffic_calming_chicane">減速彎道</string>
 	<string name="poi_traffic_calming_rumble_strip">車道屏</string>
-	<string name="poi_traffic_calming_table">路緣石</string>
+	<string name="poi_traffic_calming_table">減速平台</string>
 	<string name="poi_traffic_calming_choker">項鍊</string>
 	<string name="poi_traffic_signals">交通號誌</string>
 
@@ -216,7 +216,7 @@
 	<string name="poi_railway_platform">鐵路月台</string>
 	<string name="poi_halt">火車站</string>
 	<string name="poi_subway_entrance">捷運入口</string>
-	<string name="poi_subway_station">捷運車站</string>
+	<string name="poi_subway_station">是</string>
 	<string name="poi_railway_buffer_stop">鐵路止衝擋</string>
 	<string name="poi_taxi">計程車站</string>
 
@@ -943,7 +943,7 @@
 	<string name="poi_access_agricultural">農產通路</string>
 
 	<string name="poi_monitoring_station">監測站</string>
-	<string name="poi_capital">首都</string>
+	<string name="poi_capital">是</string>
 	<string name="poi_fee_no">不收費</string>
 
 	<string name="poi_email">電子郵件</string>
@@ -1607,7 +1607,7 @@
 	<string name="poi_drive_through_no">得來速：無</string>
 
 	<string name="poi_brewery_additional">啤酒廠名</string>
-	<string name="poi_microbrewery_yes">自釀酒廠</string>
+	<string name="poi_microbrewery_yes">是</string>
 	<string name="poi_microbrewery_no">無自釀酒廠</string>
 
 	<string name="poi_takeaway_yes">外帶</string>
@@ -2181,7 +2181,7 @@
 	<string name="poi_social_facility_for_drug_addicted">目標社群：吸毒成癮者</string>
 	<string name="poi_social_facility_for_unemployed">目標社群：失業者</string>
 	<string name="poi_social_facility_for_diseased">目標社群：病患者</string>
-	<string name="poi_social_facility_for_child_juvenile">目標社群：兒童；青少年</string>
+	<string name="poi_social_facility_for_child_juvenile">兒童、青少年</string>
 
 	<string name="poi_internet_access_type_yes">有網際網路存取</string>
 
@@ -3427,7 +3427,7 @@
 
 	<string name="poi_motorcycle_sales_yes">銷售</string>
 	<string name="poi_motorcycle_sales_no">銷售：無</string>
-	<string name="poi_motorcycle_sales_yes_used">銷售：有的;二手</string>
+	<string name="poi_motorcycle_sales_yes_used">銷售：有的，二手貨</string>
 	<string name="poi_motorcycle_sales_used">銷售：二手</string>
 	<string name="poi_lock_basin">塘形船閘</string>
 	<string name="poi_generator_output_electricity_no">輸出（電力）：無</string>
@@ -3881,4 +3881,57 @@
 	<string name="poi_checkpoint_type_code">程式碼</string>
 	<string name="poi_checkpoint_type_notebook">筆記電腦</string>
 	<string name="poi_checkpoint_type_electronic">電子</string>
-	</resources>
+    <string name="poi_bulk_purchase">批量購買</string>
+    <string name="poi_substation_type">類型</string>
+    <string name="poi_books_type">書</string>
+    <string name="poi_car_pooling">計程車招呼站</string>
+    <string name="poi_atm">ATM</string>
+    <string name="poi_checkpoint_type_stamp">標記點</string>
+    <string name="poi_checkpoint_type_needler">針刺者</string>
+    <string name="poi_course">路程</string>
+    <string name="poi_rock">岩石</string>
+    <string name="poi_end_date">結束日期</string>
+    <string name="poi_appliance">電器行</string>
+    <string name="poi_outcrop">礦脈</string>
+    <string name="poi_payment_contactless_yes">非接觸式</string>
+    <string name="poi_payment_contactless_no">不接受非接觸式</string>
+    <string name="poi_hazard_nuclear">核災危害</string>
+    <string name="poi_hazard_erosion">侵蝕危害</string>
+    <string name="poi_hazard_avalanche">雪崩危害</string>
+    <string name="poi_hazard_slippery_road">路滑</string>
+    <string name="poi_hazard_flood">洪水危害</string>
+    <string name="poi_hazard_minefield">雷區</string>
+    <string name="poi_ruins">廢墟</string>
+    <string name="poi_license_classes">許可等級</string>
+    <string name="poi_hill">爬坡道</string>
+    <string name="poi_shoe_repair">修鞋店</string>
+    <string name="poi_bulk_purchase_yes">是</string>
+    <string name="poi_bulk_purchase_only">只有</string>
+    <string name="poi_pipeline_substation">變電所</string>
+    <string name="poi_substation_transmission">傳輸</string>
+    <string name="poi_substation_distribution">分佈</string>
+    <string name="poi_substation_minor_distribution">次要分佈</string>
+    <string name="poi_substation_industrial">工業區</string>
+    <string name="poi_substation_transition">過渡</string>
+    <string name="poi_substation_traction">牽引</string>
+    <string name="poi_substation_converter">轉換器</string>
+    <string name="poi_substation_compensation">補償</string>
+    <string name="poi_substation_compression">壓縮</string>
+    <string name="poi_substation_measurement">測量</string>
+    <string name="poi_substation_valve">閥門</string>
+    <string name="poi_substation_valve_group">閥組</string>
+    <string name="poi_substation_inspection_gauge">檢具</string>
+    <string name="poi_substation_field_gathering">野外採集</string>
+    <string name="poi_craft_confectionery">糖果生產</string>
+    <string name="poi_shop_wholesale">批發商店</string>
+    <string name="poi_laboratory">醫學實驗室</string>
+    <string name="poi_blood_donation">捐血站</string>
+    <string name="poi_books_comic">漫畫</string>
+    <string name="poi_books_antiquarian">古物</string>
+    <string name="poi_books_religion">宗教</string>
+    <string name="poi_books_academic">學術</string>
+    <string name="poi_books_children">兒童</string>
+    <string name="poi_atoll">環礁</string>
+    <string name="poi_toll_gantry">收費站</string>
+    <string name="poi_childcare">托兒</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 5927fafd52..fd2668d9b0 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
     <string name="rendering_attr_roadColors_name">道路的色彩調配</string>
@@ -1511,7 +1511,7 @@
     <string name="way_alarms">交通狀況提醒</string>
     <string name="speak_favorites">附近我的收藏</string>
     <string name="speak_poi">附近的 POI</string>
-    <string name="shared_string_all">全部</string>
+    <string name="shared_string_all">所有</string>
     <string name="index_tours">旅遊</string>
     <string name="record_plugin_description">這個外掛元件在地圖螢幕上，以手動點觸 GPX 記錄小工具，以啟動去錄製和儲存您軌跡的功能，或是自動記錄您所有的導航路線到 GPX 檔案。 
 \n 
@@ -1945,7 +1945,7 @@
     <string name="osmand_running_in_background">在背景執行</string>
     <string name="default_speed_system_descr">定義速度單位。</string>
     <string name="default_speed_system">速度的單位</string>
-    <string name="si_nm">浬</string>
+    <string name="si_nm">海浬</string>
     <string name="nm">浬</string>
     <string name="si_kmh">公里每小時</string>
     <string name="si_mph">英里每小時</string>
@@ -2199,14 +2199,14 @@
     <string name="osm_live_not_active">失效的</string>
     <string name="osm_live_enter_email">請輸入有效的電子郵件地址</string>
     <string name="osm_live_enter_user_name">請輸入公開名稱</string>
-    <string name="osm_live_subscription_settings">認捐設定</string>
-    <string name="osm_live_subscription">OsmAnd Live 會費</string>
+    <string name="osm_live_subscription_settings">訂閱設定</string>
+    <string name="osm_live_subscription">Osmand Live 訂閱</string>
     <string name="osm_live_thanks">感謝您對 OsmAnd 的支持！
 \n要啟動所有新功能，您需要重開 OsmAnd。</string>
-    <string name="osm_live_region_desc">您捐助的一部分會發送到 OSM，使用者將送交更改到該地區的地圖。</string>
-    <string name="osm_live_ask_for_purchase">請先購買 OsmAnd Live 的訂閱</string>
+    <string name="osm_live_region_desc">您的部分捐款會發送給在該地區提交地圖更改的 OSM 使用者。</string>
+    <string name="osm_live_ask_for_purchase">請先購買 OsmAnd Live 訂閱</string>
 
-    <string name="osm_live_header">此捐助能夠為世界各地所有的地圖每小時更新一次。 部分收入又回到了 OSM 社群和支付每個 OSM 的貢獻。 假如您喜愛 OsmAnd 和 OSM 並且想要支持和得到他們的支持，這是個完美方式的作法。</string>
+    <string name="osm_live_header">此訂閱能夠為世界各地所有的地圖每小時更新一次。 部分收入又回到了 OSM 社群和支付每個 OSM 的貢獻。 假如您喜愛 OsmAnd 和 OSM 並且想要支持和得到他們的支持，這是個完美方式的作法。</string>
     
     <string name="recalculate_route">重新計算路線</string>
     <string name="shared_string_topbar">頂端列</string>
@@ -2321,7 +2321,7 @@
     <string name="no_update_info">不要顯示新版本</string>
     <string name="osm_live_banner_desc">獲得無限制的地圖下載和每個月超過一次以上的地圖更新︰每週、每天或每小時。</string>
     <string name="osmand_plus_banner_desc">沒有限制的地圖下載、更新和維基百科外掛元件。</string>
-    <string name="si_mi_meters">英哩/公尺</string>
+    <string name="si_mi_meters">英里/米</string>
     <string name="first_usage_wizard_desc">讓 OsmAnd 確定您所在的位置和建議下載該區域的地圖。</string>
     <string name="get_for">獲得 %1$s</string>
     <string name="get_for_month">每個月獲得 %1$s</string>
@@ -2366,7 +2366,7 @@
     <string name="shared_string_record">記錄</string>
     <string name="gpx_logging_no_data">沒有資料</string>
     <string name="christmas_desc">預知聖誕節和新年假期，您可以選擇顯示與聖誕節關聯的 POI：聖誕樹、市場等等。</string>
-    <string name="donation_to_osm_desc">您捐款的一部分會發送給向 OpenStreetMap 提交更改的 OSM 使用者。訂閱的成本保持不變。</string>
+    <string name="donation_to_osm_desc">您的部分捐款會發送給向 OpenStreetMap 提交更改的 OSM 使用者。訂閱的成本保持不變。</string>
     
     
     <string name="shared_string_notifications">通知</string>
@@ -2514,7 +2514,7 @@
     <string name="shared_string_end_time">結束時間</string>
     <string name="shared_string_color">顏色</string>
     <string name="max_speed">最高速度</string>
-    <string name="average_speed">平均速度</string>
+    <string name="average_speed">平均速率</string>
     <string name="shared_string_gpx_track">軌跡</string>
     <string name="points_delete_multiple_succesful">標點已刪除。</string>
     <string name="points_delete_multiple">您將要刪除 %1$d 個標點。您確定嗎？</string>
@@ -2748,7 +2748,7 @@
     <string name="mapillary_menu_edit_text_hint">輸入使用者名稱</string>
     <string name="mapillary_menu_descr_username">僅檢視增加的圖片由</string>
     <string name="mapillary_menu_title_username">使用者名稱</string>
-    <string name="mapillary_menu_filter_description">按照提供者或日期篩選圖片，僅動作於特寫的縮放才有效。</string>
+    <string name="mapillary_menu_filter_description">按照提供者、日期或類型篩選圖片。僅動作於特寫的縮放才有效。</string>
     <string name="shared_string_reload">重新載入</string>
     <string name="mapillary_menu_descr_tile_cache">請重新載入圖磚，以查看最新的資料。</string>
     <string name="mapillary_menu_title_tile_cache">圖磚快取</string>
@@ -3166,11 +3166,60 @@
     <string name="rendering_value_black_name">黑色</string>
     <string name="more_transport_on_stop_hint">在此停靠站有更多的交通工具。</string>
     <string name="search_street">搜尋街道</string>
-    <string name="start_search_from_city">從城市開始搜尋</string>
+    <string name="start_search_from_city">先選擇城市</string>
     <string name="shared_string_restore">還原</string>
     <string name="keep_passed_markers_descr">標記已加入群組作為我的收藏或 GPX 航點標記為已經過的將維持在地圖上。如果該群組未處於活動狀態，則標記將從地圖上消失。</string>
     <string name="keep_passed_markers">在地圖上保留已經過的標記</string>
     <string name="markers_remove_dialog_msg">刪除地圖標記「%s」？</string>
     <string name="edit_map_marker">編輯地圖標記</string>
     <string name="third_party_application">第三方應用程式</string>
-    </resources>
+    <string name="osm_live_plan_pricing">計畫與價格</string>
+    <string name="osm_live_payment_monthly_title">月付</string>
+    <string name="osm_live_payment_3_months_title">季付</string>
+    <string name="osm_live_payment_annual_title">年付</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / 月</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / 月</string>
+    <string name="osm_live_payment_discount_descr">節省 %1$s！</string>
+	<string name="osm_live_payment_current_subscription">您目前訂閱</string>
+    <string name="osm_live_payment_renews_monthly">每月續訂</string>
+    <string name="osm_live_payment_renews_quarterly">每季續訂</string>
+    <string name="osm_live_payment_renews_annually">每年續訂</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">選擇適合您的付款期：</string>
+    <string name="osm_live_payment_contribute_descr">部分收入歸 OpenStreetMap 的貢獻者所有。</string>
+    <string name="powered_by_osmand">Powered by OsmAnd</string>
+    <string name="osm_live_subscriptions">訂閱</string>
+    <string name="mapillary_menu_title_pano">只顯示 360° 圖片</string>
+    <string name="shared_string_launch">啟動</string>
+    <string name="run_full_osmand_msg">您正在使用裝有 OsmAnd 的 {0} 地圖。是否要啟動完整版本的 OsmAnd？</string>
+    <string name="run_full_osmand_header">啟動 OsmAnd？</string>
+    <string name="lang_gn_py">瓜拉尼語</string>
+    <string name="swap_start_and_destination">替換開始和目的地</string>
+    <string name="add_destination_point">增加目的地</string>
+    <string name="add_intermediate_point">增加中轉</string>
+    <string name="add_start_point">新增起始點</string>
+    <string name="intermediate_waypoint">中轉地點：%1$s</string>
+    <string name="waypoints">航點：%1$s</string>
+    <string name="transfers">移動：%1$s</string>
+    <string name="cubic_m">立方公尺</string>
+    <string name="metric_ton">公噸</string>
+    <string name="shared_string_capacity">容量</string>
+    <string name="shared_string_width">寬度</string>
+    <string name="shared_string_height">高度</string>
+    <string name="on_foot">步行：%1$s</string>
+    <string name="route_way">道路：%1$s</string>
+    <string name="points_of_interests">興趣點 (POI)</string>
+    <string name="waiting_for_route_calculation">等待計算路徑</string>
+    <string name="app_mode_public_transport">大眾運輸</string>
+    <string name="avoid_roads_descr">在導航時從地圖上的道路或下面的列表選擇您想要避免的地方：</string>
+    <string name="show_along_the_route">在路徑旁顯示</string>
+    <string name="simulate_navigation">模擬導航</string>
+    <string name="choose_track_file_to_follow">選擇要跟隨的軌跡檔案</string>
+    <string name="voice_announcements">語音通知</string>
+    <string name="intermediate_destinations">中轉地點：%1$s</string>
+    <string name="arrive_at_time">到達 %1$s</string>
+    <string name="quick_action_switch_day_night_descr">輕觸此動作按鈕以在 OsmAnd 的日間與夜間模式間切換</string>
+    <string name="quick_action_switch_day_mode">日間模式</string>
+    <string name="quick_action_switch_night_mode">夜間模式</string>
+    <string name="quick_action_day_night_switch_mode">切換日間／夜間模式</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index b84259168e..edf10aa98a 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -19,6 +19,7 @@
 		<attr name="expandable_list_background" format="color"/>
 		<attr name="bg_color" format="reference" />
         <attr name="btn_round_border" format="reference" />
+		<attr name="btn_round_border_2" format="reference" />
 		<attr name="bg_card" format="reference" />
         <attr name="context_menu_card" format="reference" />
         <attr name="ctx_menu_card_btn" format="reference" />
@@ -74,6 +75,9 @@
         <attr name="dialog_text_description_color" format="reference"/>
         <attr name="card_description_text_color" format="reference"/>
 
+		<attr name="subscription_active_bg_color" format="reference"/>
+		<attr name="subscription_active_div_color" format="reference"/>
+
 		<attr name="wikivoyage_bg_color" format="reference"/>
 		<attr name="wikivoyage_card_bg_color" format="reference"/>
 		<attr name="wikivoyage_card_divider_color" format="reference"/>
@@ -96,7 +100,10 @@
         <attr name="bottom_nav_shadow" format="reference"/>
 
         <attr name="purchase_dialog_active_card_bg" format="reference"/>
-    </declare-styleable>
+
+		<attr name="text_rounded_bg_regular" format="reference" />
+		<attr name="text_rounded_bg_active" format="reference" />
+	</declare-styleable>
 
     <declare-styleable name="PagerSlidingTabStrip">
         <attr name="pstsTextColor" format="color"/>
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 7f032c7dfa..c9c171378d 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<color name="subscription_active_bg_color_light">#fff9b2</color>
+	<color name="subscription_active_bg_color_dark">#43453b</color>
+	<color name="subscription_active_div_color_light">#f3edae</color>
+	<color name="subscription_active_div_color_dark">#32332c</color>
+
 	<color name="feature_purchased_bg">#78cc5c</color>
 
 	<color name="dialog_bg_color_light">#f0f0f0</color>
@@ -232,6 +237,8 @@
 	<color name="nav_track_fluorescent">#CC00ddff</color>
 	<color name="transport_route_line">#CC2f7af5</color>
 
+	<color name="nav_track_walk_fill">#ff407ef5</color>
+	<color name="nav_track_walk_stroke">#ff1f478c</color>
 
 	<color name="nav_arrow_distant">#C0C0C0</color>
 	<color name="nav_arrow">#FADE23</color>
@@ -392,8 +399,6 @@
 	<color name="route_info_bg_dark">#17191a</color>
 	<color name="route_info_bottom_view_bg_light">#f2f2f2</color>
 	<color name="route_info_bottom_view_bg_dark">#222526</color>
-	<color name="route_info_divider_light">#e6e6e6</color>
-	<color name="route_info_divider_dark">#2d3133</color>
 	<color name="route_info_control_icon_color_light">#505050</color>
 	<color name="route_info_control_icon_color_dark">#727272</color>
 	<color name="route_info_go_btn_inking_light">#4c63e6</color>
@@ -405,6 +410,8 @@
 	<color name="route_info_checked_mode_icon_color_light">#ff8800</color>
 	<color name="route_info_checked_mode_icon_color_dark">#d28521</color>
 	<color name="route_info_unchecked_mode_icon_color">#727272</color>
+	<color name="route_info_cancel_button_color_light">#5959ff</color>
+	<color name="route_info_cancel_button_color_dark">#17181a</color>
 
 	<color name="multi_selection_menu_divider_light">#f0f0f0</color>
 	<color name="multi_selection_menu_divider_dark">#222526</color>
@@ -448,4 +455,23 @@
 	<color name="wiki_webview_background_light">#ffffff</color>
 	<color name="wiki_webview_background_dark">#17191a</color>
 
+	<!-- Basic colors -->
+	<color name="app_bar_main_dark">#17191a</color>
+	<color name="app_bar_main_light">#ff8800</color>
+	<color name="activity_background_dark">#17191a</color>
+	<color name="activity_background_light">#f0f0f0</color>
+	<color name="card_and_list_background_dark">#222526</color>
+	<color name="card_and_list_background_light">#ffffff</color>
+	<color name="divider_dark">#1b1d1f</color>
+	<color name="divider_light">#f0f0f0</color>
+	<color name="main_font_dark">#cccccc</color>
+	<color name="main_font_light">#212121</color>
+	<color name="description_font_and_bottom_sheet_icons">#727272</color>
+	<color name="additional_description_dark">#4d4d4d</color>
+	<color name="additional_description_light">#b3b3b3</color>
+	<color name="active_buttons_and_links_light">#237bff</color>
+	<color name="active_buttons_and_links_dark">#d28521</color>
+	<color name="active_buttons_and_links_trans_light">#66237bff</color>
+	<color name="active_buttons_and_links_trans_dark">#66d28521</color>
+
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index cda44f01a8..534f4dbfac 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -107,6 +107,10 @@
 	<string name="poi_service_car">Car service</string>
 	<string name="poi_glacier_type">Glacier type</string>
 	<string name="poi_checkpoint_type">Checkpoint type</string>
+	<string name="poi_bulk_purchase">Bulk purchase</string>
+	<string name="poi_substation_type">Type</string>
+	<string name="poi_books_type">Books</string>
+	<string name="poi_denotation">Denotation</string>
 
 <!--  categories -->
 	<string name="poi_shop">Store</string>
@@ -169,7 +173,7 @@
 	<string name="poi_farm">Farm store</string>
 	<string name="poi_greengrocer">Greengrocery</string>
 	<string name="poi_seafood">Seafood store</string>
-	<string name="poi_confectionery">Confectionery</string>
+	<string name="poi_confectionery">Confectionery store</string>
 	<string name="poi_ice_cream">Ice cream parlor</string>
 	<string name="poi_supermarket">Supermarket</string>
 	<string name="poi_tea">Tea shop</string>
@@ -363,7 +367,7 @@
 	<string name="poi_railway_platform">Railroad platform</string>
 	<string name="poi_halt">Railroad stop</string>
 	<string name="poi_subway_entrance">Subway entrance</string>
-	<string name="poi_subway_station">Subway station</string>
+	<string name="poi_subway_station">Yes</string>
 	<string name="poi_railway_buffer_stop">Railroad buffer stop</string>
 	<string name="poi_taxi">Taxi stand</string>
 
@@ -574,7 +578,7 @@
 	<string name="poi_customs">Customs</string>
 	<string name="poi_country">Country</string>
 	<string name="poi_city">City</string>
-	<string name="poi_capital">Capital</string>
+	<string name="poi_capital">Yes</string>
 	<string name="poi_town">Town</string>
 	<string name="poi_village">Village</string>
 	<string name="poi_hamlet">Hamlet</string>
@@ -1775,7 +1779,7 @@
 	<string name="poi_drive_through_no">Drive-through: no</string>
 
 	<string name="poi_brewery_additional">Brewery name</string>
-	<string name="poi_microbrewery_yes">Microbrewery</string>
+	<string name="poi_microbrewery_yes">Yes</string>
 	<string name="poi_microbrewery_no">No microbrewery</string>
 
 	<string name="poi_takeaway_filter_yes">Yes</string>
@@ -3857,4 +3861,46 @@
 
 	<string name="poi_shoe_repair">Shoe repair</string>
 
+	<string name="poi_bulk_purchase_yes">Yes</string>
+	<string name="poi_bulk_purchase_only">Only</string>
+
+	<string name="poi_pipeline_substation">Pipeline substation</string>
+	<string name="poi_substation_transmission">Transmission</string>
+	<string name="poi_substation_distribution">Distribution</string>
+	<string name="poi_substation_minor_distribution">Minor distribution</string>
+	<string name="poi_substation_industrial">Industrial</string>
+	<string name="poi_substation_transition">Transition</string>
+	<string name="poi_substation_traction">Traction</string>
+	<string name="poi_substation_converter">Converter</string>
+	<string name="poi_substation_compensation">Compensation</string>
+
+	<string name="poi_substation_compression">Compression</string>
+	<string name="poi_substation_measurement">Measurement</string>
+	<string name="poi_substation_valve">Valve</string>
+	<string name="poi_substation_valve_group">Valve group</string>
+	<string name="poi_substation_inspection_gauge">Inspection gauge</string>
+	<string name="poi_substation_field_gathering">Field gathering</string>
+
+	<string name="poi_craft_confectionery">Confectionery production</string>
+
+	<string name="poi_shop_wholesale">Wholesale store</string>
+
+	<string name="poi_laboratory">Medical laboratory</string>
+
+	<string name="poi_blood_donation">Blood donation</string>
+	<string name="poi_books_comic">Comic</string>
+	<string name="poi_books_antiquarian">Antiquarian</string>
+	<string name="poi_books_religion">Religion</string>
+	<string name="poi_books_academic">Academic</string>
+	<string name="poi_books_children">Children</string>
+
+	<string name="poi_atoll">Atoll</string>
+
+	<string name="poi_toll_gantry">Toll gantry</string>
+
+	<string name="poi_childcare">Childcare</string>
+
+	<string name="poi_denotation_natural_monument">Natural monument</string>
+	<string name="poi_denotation_landmark">Landmark</string>
+
 </resources>
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 77b010042c..c9c95cf373 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<dimen name="dialog_button_ex_height">60dp</dimen>
+	<dimen name="dialog_button_ex_min_width">72dp</dimen>
+	<dimen name="dialog_button_ex_max_width">120dp</dimen>
 	<dimen name="wpt_list_category_height">60dp</dimen>
 	<dimen name="wpt_list_item_height">56dp</dimen>
 	<dimen name="list_item_button_padding">4dp</dimen>
@@ -12,6 +15,7 @@
     <dimen name="card_row_min_height">48dp</dimen>
 	<dimen name="card_button_min_size">58dp</dimen>
 	<dimen name="card_button_progress_size">32dp</dimen>
+	<dimen name="card_button_progress_size_small">24dp</dimen>
 	<dimen name="card_padding">12dp</dimen>
 
 	<dimen name="widget_turn_lane_size">36dp</dimen>
@@ -34,6 +38,7 @@
 
     <dimen name="subHeaderPadding">2dp</dimen>
     <dimen name="subHeaderMarginLeft">15dp</dimen>
+		<dimen name = "subHeaderMarginRight">15dp</dimen>
     <dimen name="showAllButtonMarginRight">14dp</dimen>
     <dimen name="showAllButtonHeight">36dp</dimen>
     <dimen name="dashFavIconSize">28dp</dimen>
@@ -263,8 +268,15 @@
 	<dimen name="route_info_directions_margin">56dp</dimen>
 	<dimen name="route_info_icon_padding_left">12dp</dimen>
 	<dimen name="route_info_icon_padding_right">16dp</dimen>
-	<dimen name="route_info_divider_margin">52dp</dimen>
 	<dimen name="route_info_modes_height">48dp</dimen>
+	<dimen name="route_info_details_padding">12dp</dimen>
+	<dimen name="route_info_icon_vertical_padding">6dp</dimen>
+	<dimen name="route_info_start_divider_margin">64dp</dimen>
+	<dimen name="route_info_end_divider_margin">56dp</dimen>
+	<dimen name="route_info_list_item_height">48dp</dimen>
+	<dimen name="route_info_buttons_height">36dp</dimen>
+	<dimen name="route_info_settings_buttons_height">32dp</dimen>
+	<dimen name="route_info_app_modes_padding">40dp</dimen>
 
 	<dimen name="multi_selection_header_height">52dp</dimen>
 
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 32da121fdd..4f9af32a24 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -10,11 +10,51 @@
 	- For wording and consistency, please note https://osmand.net/help-online?id=technical-articles#Creating_a_Consistent_User_Experience
 	Thx - Hardy
 -->
+    <string name="cubic_m">m³</string>
+    <string name="metric_ton">t</string>
+    <string name="shared_string_capacity">Сapacity</string>
+    <string name="shared_string_width">Width</string>
+    <string name="shared_string_height">Height</string>
+    <string name="swap_start_and_destination">Swap start and destination</string>
+    <string name="add_destination_point">Add destination</string>
+    <string name="add_intermediate_point">Add intermediate</string>
+    <string name="add_start_point">Add Start point</string>
+    <string name="intermediate_waypoint">Intermediate point: %1$s</string>
+    <string name="waypoints">Waypoints: %1$s</string>
+    <string name="transfers">transfers: %1$s</string>
+    <string name="on_foot">on foot: %1$s</string>
+    <string name="route_way">Way: %1$s</string>
+    <string name="points_of_interests">Points of interests(POI)</string>
+    <string name="waiting_for_route_calculation">Waiting for route calculation</string>
+    <string name="app_mode_public_transport">Public transport</string>
+    <string name="avoid_roads_descr">Select road on the map or from the list below that you want to avoid during navigation:</string>
+    <string name="show_along_the_route">Show along the route</string>
+    <string name="simulate_navigation">Simulate navigation</string>
+    <string name="choose_track_file_to_follow">Choose track file to follow</string>
+    <string name="voice_announcements">Voice announcements</string>
+    <string name="intermediate_destinations">Intermediate destinations: %1$s</string>
+    <string name="arrive_at_time">Arrive at %1$s</string>
+    <string name="osm_live_subscriptions">Subscriptions</string>
+    <string name="powered_by_osmand">Powered by OsmAnd</string>
+    <string name="osm_live_plan_pricing">Plan &amp; Pricing</string>
+    <string name="osm_live_payment_monthly_title">Pay monthly</string>
+    <string name="osm_live_payment_3_months_title">Pay once in 3 months</string>
+    <string name="osm_live_payment_annual_title">Pay once a year</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / month</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / month</string>
+    <string name="osm_live_payment_discount_descr">Save %1$s!</string>
+	<string name="osm_live_payment_current_subscription">Your current subscription</string>
+    <string name="osm_live_payment_renews_monthly">Renews monthly</string>
+    <string name="osm_live_payment_renews_quarterly">Renews quarterly</string>
+    <string name="osm_live_payment_renews_annually">Renews annually</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_header">Select the payment period convenient for you:</string>
+    <string name="osm_live_payment_contribute_descr">Part of income goes to OpenStreetMap contributors.</string>
     <string name="markers_remove_dialog_msg">Delete Map marker \'%s\'?</string>
     <string name="edit_map_marker">Edit map marker</string>
     <string name="third_party_application">Third-party application</string>
     <string name="search_street">Search street</string>
-    <string name="start_search_from_city">Start search from city</string>
+    <string name="start_search_from_city">Select the city first</string>
     <string name="shared_string_restore">Restore</string>
     <string name="keep_passed_markers_descr">Markers added as a group of Favorites or GPX waypoints marked "Passed" will remain on the map. If the group is not active, the markers will disappear from the map.</string>
     <string name="keep_passed_markers">Keep passed markers on the map</string>
@@ -357,7 +397,8 @@
     <string name="mapillary_menu_edit_text_hint">Type username</string>
     <string name="mapillary_menu_descr_username">View only images added by</string>
     <string name="mapillary_menu_title_username">Username</string>
-    <string name="mapillary_menu_filter_description">Filter images by submitter or by date. Only active in closeup zoom.</string>
+    <string name="mapillary_menu_filter_description">Filter images by submitter, by date or by type. Only active in closeup zoom.</string>
+    <string name="mapillary_menu_title_pano">Display only 360° images</string>
     <string name="map_widget_ruler_control">Radius ruler</string>
     <string name="shared_string_permissions">Permissions</string>
     <string name="import_gpx_failed_descr">OsmAnd cannot import the file. Please check if OsmAnd has permission to read file from its location.</string>
@@ -1145,6 +1186,7 @@
     <string name="shared_string_audio">Audio</string>
     <string name="shared_string_video">Video</string>
     <string name="shared_string_photo">Photo</string>
+    <string name="shared_string_launch">Launch</string>
     <string name="route_points">Route points</string>
     <string name="track_segments">Track segments</string>
     <string name="track_points">Track points</string>
@@ -1493,6 +1535,7 @@
     <string name="lang_uk">Ukrainian</string>
     <string name="lang_vi">Vietnamese</string>
     <string name="lang_cy">Welsh</string>
+    <string name="lang_gn_py">Guaraní</string>
     <string name="index_name_canada">North America - Canada</string>
     <string name="index_name_italy">Europe - Italy</string>
     <string name="index_name_gb">Europe - Great Britain</string>
@@ -2867,6 +2910,10 @@
     <string name="quick_action_add_poi_descr">Tapping this action button adds a POI in the middle of the screen.</string>
     <string name="quick_action_navigation_voice_descr">Tapping this action button disables or enables voice guidance during navigation.</string>
     <string name="quick_action_add_parking_descr">Tapping this action button adds a parking location in the middle of the screen.</string>
+    <string name="quick_action_switch_day_night_descr">Tapping this action button switch between Day and Night modes for OsmAnd</string>
+    <string name="quick_action_switch_day_mode">Day Mode</string>
+    <string name="quick_action_switch_night_mode">Night Mode</string>
+    <string name="quick_action_day_night_switch_mode">Switch Day/Night mode</string>
     <string name="quick_action_interim_dialog">Show an interim dialog</string>
     <string name="favorite_autofill_toast_text">" is saved to "</string>
     <string name="favorite_empty_place_name">Place</string>
@@ -2950,4 +2997,6 @@
     <string name="route_surface_stat_container">Surface</string>
     <string name="route_smoothness_stat_container">Smoothenss</string>
     <string name="route_steepness_stat_container">Steepness</string>
+    <string name="run_full_osmand_msg">You are using {0} Map which is powered by OsmAnd. Do you want to launch OsmAnd full version?</string>
+    <string name="run_full_osmand_header">Launch OsmAnd?</string>
 </resources>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 6f3d9dcd0d..55e6f343dd 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -130,6 +130,7 @@
         <item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
         <item name="bg_color">@color/bg_color_light</item>
         <item name="btn_round_border">@drawable/btn_round_border_light</item>
+        <item name="btn_round_border_2">@drawable/btn_round_border_light_2</item>
         <item name="bg_card">@drawable/bg_card_light</item>
         <item name="context_menu_card">@drawable/context_menu_card_light</item>
         <item name="bg_map_context_menu">@drawable/bg_map_context_menu_light</item>
@@ -199,6 +200,9 @@
 
         <item name="coordinate_input_edit_text_normal">@color/coordinate_input_edit_text_normal_light</item>
 
+        <item name="subscription_active_bg_color">@color/subscription_active_bg_color_light</item>
+        <item name="subscription_active_div_color">@color/subscription_active_div_color_light</item>
+
         <item name="dialog_bg_color">@color/dialog_bg_color_light</item>
         <item name="dialog_transparent_bg_color">@color/dialog_transparent_bg_color_light</item>
         <item name="dialog_title_color">@color/dialog_title_color_light</item>
@@ -228,6 +232,8 @@
 
         <item name="bottom_nav_shadow">@drawable/bg_bottom_bar_shadow_with_line_day</item>
 
+        <item name="text_rounded_bg_active">@drawable/text_rounded_bg_active_light</item>
+        <item name="text_rounded_bg_regular">@drawable/text_rounded_bg_regular_light</item>
     </style>
 
     <style name="OverflowMenuButton" parent="@style/Widget.AppCompat.ActionButton.Overflow">
@@ -358,6 +364,7 @@
         <item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
         <item name="bg_color">@color/bg_color_dark</item>
         <item name="btn_round_border">@drawable/btn_round_border_dark</item>
+        <item name="btn_round_border_2">@drawable/btn_round_border_dark_2</item>
         <item name="bg_card">@drawable/bg_card_dark</item>
         <item name="context_menu_card">@drawable/context_menu_card_dark</item>
         <item name="bg_map_context_menu">@drawable/bg_map_context_menu_dark</item>
@@ -375,8 +382,7 @@
         <item name="switch_ex_background">@drawable/switch_ex_background_dark</item>
         <item name="switch_ex_text_color">@color/switch_ex_button_text_dark</item>
         <item name="bg_plugin_logo_disabled">@drawable/bg_plugin_logo_disabled_dark</item>
-        <item name="plugin_details_install_header_bg">@color/plugin_details_install_header_bg_dark
-        </item>
+        <item name="plugin_details_install_header_bg">@color/plugin_details_install_header_bg_dark</item>
         <item name="expandable_list_item_background">
             @drawable/expandable_list_item_background_dark
         </item>
@@ -384,8 +390,7 @@
         <item name="size_progress_bar">@drawable/size_progressbar_dark</item>
         <item name="dash_parking_bg">@drawable/dash_parking_dark</item>
         <item name="dashboard_subheader_text_color">@color/dashboard_subheader_text_dark</item>
-        <item name="dashboard_general_button_text_color">@color/dashboard_general_button_text_dark
-        </item>
+        <item name="dashboard_general_button_text_color">@color/dashboard_general_button_text_dark</item>
         <item name="android:listChoiceIndicatorMultiple">@drawable/check_dark</item>
         <item name="android:textColorPrimary">@color/color_white</item>
         <item name="spinnerItemTextColor">@color/color_white</item>
@@ -414,6 +419,9 @@
 
         <item name="coordinate_input_edit_text_normal">@color/coordinate_input_edit_text_normal_dark</item>
 
+        <item name="subscription_active_bg_color">@color/subscription_active_bg_color_dark</item>
+        <item name="subscription_active_div_color">@color/subscription_active_div_color_dark</item>
+
         <item name="circle_dialog_bg">@drawable/circle_dialog_bg_night</item>
         <item name="dialog_bg_color">@color/dialog_bg_color_night</item>
         <item name="dialog_transparent_bg_color">@color/dialog_transparent_bg_color_night</item>
@@ -444,6 +452,8 @@
 
         <item name="bottom_nav_shadow">@drawable/bg_bottom_bar_shadow_with_line_night</item>
 
+        <item name="text_rounded_bg_active">@drawable/text_rounded_bg_active_dark</item>
+        <item name="text_rounded_bg_regular">@drawable/text_rounded_bg_regular_dark</item>
     </style>
 
     <style name="FreeVersionBanner" parent="OsmandDarkTheme">
diff --git a/OsmAnd/src/net/osmand/AndroidNetworkUtils.java b/OsmAnd/src/net/osmand/AndroidNetworkUtils.java
index 85feae4ca8..84131e9ffa 100644
--- a/OsmAnd/src/net/osmand/AndroidNetworkUtils.java
+++ b/OsmAnd/src/net/osmand/AndroidNetworkUtils.java
@@ -7,9 +7,7 @@ import android.os.AsyncTask;
 import net.osmand.osm.io.NetworkUtils;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
-import net.osmand.plus.SQLiteTileSource;
 import net.osmand.plus.Version;
-import net.osmand.plus.resources.ResourceManager;
 import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
@@ -17,8 +15,6 @@ import org.apache.commons.logging.Log;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -29,6 +25,7 @@ import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.net.UnknownHostException;
 import java.text.MessageFormat;
+import java.util.List;
 import java.util.Map;
 
 public class AndroidNetworkUtils {
@@ -40,6 +37,35 @@ public class AndroidNetworkUtils {
 		void onResult(String result);
 	}
 
+	public static void sendRequestsAsync(final OsmandApplication ctx,
+										final List<Request> requests,
+										final OnRequestResultListener listener) {
+
+		new AsyncTask<Void, Void, String>() {
+
+			@Override
+			protected String doInBackground(Void... params) {
+				for (Request request : requests) {
+					try {
+						return sendRequest(ctx, request.getUrl(), request.getParameters(),
+								request.getUserOperation(), request.isToastAllowed(), request.isPost());
+					} catch (Exception e) {
+						// ignore
+					}
+				}
+				return null;
+			}
+
+			@Override
+			protected void onPostExecute(String response) {
+				if (listener != null) {
+					listener.onResult(response);
+				}
+			}
+
+		}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
+	}
+
 	public static void sendRequestAsync(final OsmandApplication ctx,
 										final String url,
 										final Map<String, String> parameters,
@@ -193,4 +219,39 @@ public class AndroidNetworkUtils {
 		ctx.showToastMessage(message);
 	}
 
+	public static class Request {
+		private String url;
+		private Map<String, String> parameters;
+		private String userOperation;
+		private boolean toastAllowed;
+		private boolean post;
+
+		public Request(String url, Map<String, String> parameters, String userOperation, boolean toastAllowed, boolean post) {
+			this.url = url;
+			this.parameters = parameters;
+			this.userOperation = userOperation;
+			this.toastAllowed = toastAllowed;
+			this.post = post;
+		}
+
+		public String getUrl() {
+			return url;
+		}
+
+		public Map<String, String> getParameters() {
+			return parameters;
+		}
+
+		public String getUserOperation() {
+			return userOperation;
+		}
+
+		public boolean isToastAllowed() {
+			return toastAllowed;
+		}
+
+		public boolean isPost() {
+			return post;
+		}
+	}
 }
diff --git a/OsmAnd/src/net/osmand/AndroidUtils.java b/OsmAnd/src/net/osmand/AndroidUtils.java
index 092f87b225..9f6593f8d3 100644
--- a/OsmAnd/src/net/osmand/AndroidUtils.java
+++ b/OsmAnd/src/net/osmand/AndroidUtils.java
@@ -40,6 +40,7 @@ import android.view.Gravity;
 import android.view.View;
 import android.view.ViewParent;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import net.osmand.plus.R;
@@ -310,6 +311,15 @@ public class AndroidUtils {
 		}
 	}
 
+	public static void setForeground(Context ctx, View view, boolean night, int lightResId, int darkResId) {
+		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
+			view.setForeground(ctx.getResources().getDrawable(night ? darkResId : lightResId,
+					ctx.getTheme()));
+		} else if (view instanceof FrameLayout) {
+			((FrameLayout) view).setForeground(ctx.getResources().getDrawable(night ? darkResId : lightResId));
+		}
+	}
+
 	public static void setDashButtonBackground(Context ctx, View view, boolean night) {
 		setBackground(ctx, view, night, R.drawable.dashboard_button_light, R.drawable.dashboard_button_dark);
 	}
@@ -438,26 +448,6 @@ public class AndroidUtils {
 		return !TextUtils.isEmpty(target) && android.util.Patterns.EMAIL_ADDRESS.matcher(target).matches();
 	}
 
-	public static String getFileAsString(File file) {
-		try {
-			FileInputStream fin = new FileInputStream(file);
-			BufferedReader reader = new BufferedReader(new InputStreamReader(fin, "UTF-8"));
-			StringBuilder sb = new StringBuilder();
-			String line;
-			while ((line = reader.readLine()) != null) {
-				if (sb.length() > 0) {
-					sb.append("\n");
-				}
-				sb.append(line);
-			}
-			reader.close();
-			fin.close();
-			return sb.toString();
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
 	public static PointF centroidForPoly(PointF[] points) {
 		float centroidX = 0, centroidY = 0;
 
diff --git a/OsmAnd/src/net/osmand/aidl/IOsmAndAidlCallback.aidl b/OsmAnd/src/net/osmand/aidl/IOsmAndAidlCallback.aidl
index be010bb062..6f0cb8f65b 100644
--- a/OsmAnd/src/net/osmand/aidl/IOsmAndAidlCallback.aidl
+++ b/OsmAnd/src/net/osmand/aidl/IOsmAndAidlCallback.aidl
@@ -1,9 +1,14 @@
 package net.osmand.aidl;
 
 import net.osmand.aidl.search.SearchResult;
+import net.osmand.aidl.gpx.AGpxBitmap;
 
 interface IOsmAndAidlCallback {
     void onSearchComplete(in List<SearchResult> resultSet);
     
     void onUpdate();
+
+    void onAppInitialized();
+
+    void onGpxBitmapCreated(in AGpxBitmap bitmap);
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl b/OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl
index d7ebb4492d..af2423cd8b 100644
--- a/OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl
+++ b/OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl
@@ -54,6 +54,8 @@ import net.osmand.aidl.gpx.RemoveGpxParams;
 import net.osmand.aidl.maplayer.point.ShowMapPointParams;
 
 import net.osmand.aidl.navdrawer.SetNavDrawerItemsParams;
+import net.osmand.aidl.navdrawer.NavDrawerFooterParams;
+import net.osmand.aidl.navdrawer.NavDrawerHeaderParams;
 
 import net.osmand.aidl.navigation.PauseNavigationParams;
 import net.osmand.aidl.navigation.ResumeNavigationParams;
@@ -67,6 +69,20 @@ import net.osmand.aidl.search.SearchResult;
 import net.osmand.aidl.search.SearchParams;
 import net.osmand.aidl.navigation.NavigateSearchParams;
 
+import net.osmand.aidl.customization.SetWidgetsParams;
+import net.osmand.aidl.customization.OsmandSettingsParams;
+
+import net.osmand.aidl.gpx.AGpxFile;
+import net.osmand.aidl.gpx.AGpxFileDetails;
+import net.osmand.aidl.gpx.CreateGpxBitmapParams;
+
+import net.osmand.aidl.tiles.ASqliteDbFile;
+
+import net.osmand.aidl.plugins.PluginParams;
+
+
+
+
 // NOTE: Add new methods at the end of file!!!
 
 interface IOsmAndAidlInterface {
@@ -133,4 +149,34 @@ interface IOsmAndAidlInterface {
 
     long registerForUpdates(in long updateTimeMS, IOsmAndAidlCallback callback);
     boolean unregisterFromUpdates(in long callbackId);
+
+    boolean setNavDrawerLogo(in String imageUri);
+
+    boolean setEnabledIds(in List<String> ids);
+    boolean setDisabledIds(in List<String> ids);
+    boolean setEnabledPatterns(in List<String> patterns);
+    boolean setDisabledPatterns(in List<String> patterns);
+
+    boolean regWidgetVisibility(in SetWidgetsParams params);
+    boolean regWidgetAvailability(in SetWidgetsParams params);
+
+    boolean customizeOsmandSettings(in OsmandSettingsParams params);
+
+    boolean getImportedGpx(out List<AGpxFile> files);
+
+    boolean getSqliteDbFiles(out List<ASqliteDbFile> files);
+    boolean getActiveSqliteDbFiles(out List<ASqliteDbFile> files);
+    boolean showSqliteDbFile(String fileName);
+    boolean hideSqliteDbFile(String fileName);
+
+    boolean setNavDrawerLogoWithParams(in NavDrawerHeaderParams params);
+    boolean setNavDrawerFooterWithParams(in NavDrawerFooterParams params);
+
+    boolean restoreOsmand();
+
+    boolean changePluginState(in PluginParams params);
+
+    boolean registerForOsmandInitListener(in IOsmAndAidlCallback callback);
+
+    boolean getBitmapForGpx(in CreateGpxBitmapParams file, IOsmAndAidlCallback callback);
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
index bece844fcb..8ddddd5a51 100644
--- a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
+++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
@@ -10,11 +10,14 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
+import android.os.RemoteException;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
@@ -22,10 +25,14 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.ArrayAdapter;
 
+import net.osmand.CallbackWithObject;
 import net.osmand.IndexConstants;
 import net.osmand.PlatformUtil;
 import net.osmand.aidl.favorite.AFavorite;
 import net.osmand.aidl.favorite.group.AFavoriteGroup;
+import net.osmand.aidl.gpx.AGpxBitmap;
+import net.osmand.aidl.gpx.AGpxFile;
+import net.osmand.aidl.gpx.AGpxFileDetails;
 import net.osmand.aidl.gpx.ASelectedGpxFile;
 import net.osmand.aidl.gpx.StartGpxRecordingParams;
 import net.osmand.aidl.gpx.StopGpxRecordingParams;
@@ -33,11 +40,16 @@ import net.osmand.aidl.maplayer.AMapLayer;
 import net.osmand.aidl.maplayer.point.AMapPoint;
 import net.osmand.aidl.mapmarker.AMapMarker;
 import net.osmand.aidl.mapwidget.AMapWidget;
+import net.osmand.aidl.navdrawer.NavDrawerFooterParams;
+import net.osmand.aidl.plugins.PluginParams;
 import net.osmand.aidl.search.SearchResult;
+import net.osmand.aidl.tiles.ASqliteDbFile;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.AppInitializer;
+import net.osmand.plus.AppInitializer.AppInitializeListener;
+import net.osmand.plus.AppInitializer.InitEvents;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
@@ -45,18 +57,23 @@ import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
+import net.osmand.plus.GPXUtilities.GPXTrackAnalysis;
 import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.SQLiteTileSource;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
 import net.osmand.plus.dialogs.ConfigureMapMenu;
 import net.osmand.plus.helpers.ColorDialogs;
 import net.osmand.plus.helpers.ExternalApiHelper;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
+import net.osmand.plus.myplaces.TrackBitmapDrawer;
+import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.views.AidlMapLayer;
 import net.osmand.plus.views.MapInfoLayer;
@@ -82,6 +99,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -90,6 +108,8 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_ITEM_ID_SCHEME;
+
 
 public class OsmandAidlApi {
 	private static final Log LOG = PlatformUtil.getLog(OsmandAidlApi.class);
@@ -136,6 +156,11 @@ public class OsmandAidlApi {
 	private static final String AIDL_MUTE_NAVIGATION = "mute_navigation";
 	private static final String AIDL_UNMUTE_NAVIGATION = "unmute_navigation";
 
+	private static final String AIDL_SHOW_SQLITEDB_FILE = "aidl_show_sqlitedb_file";
+	private static final String AIDL_HIDE_SQLITEDB_FILE = "aidl_hide_sqlitedb_file";
+	private static final String AIDL_FILE_NAME = "aidl_file_name";
+
+
 	private static final ApplicationMode DEFAULT_PROFILE = ApplicationMode.CAR;
 
 	private static final ApplicationMode[] VALID_PROFILES = new ApplicationMode[]{
@@ -183,10 +208,14 @@ public class OsmandAidlApi {
 		registerStopNavigationReceiver(mapActivity);
 		registerMuteNavigationReceiver(mapActivity);
 		registerUnmuteNavigationReceiver(mapActivity);
+		registerShowSqliteDbFileReceiver(mapActivity);
+		registerHideSqliteDbFileReceiver(mapActivity);
 		initOsmandTelegram();
+		app.getAppCustomization().addListener(mapActivity);
 	}
 
 	public void onDestroyMapActivity(MapActivity mapActivity) {
+		app.getAppCustomization().removeListener(mapActivity);
 		mapActivityActive = false;
 		for (BroadcastReceiver b : receivers.values()) {
 			if(b == null) {
@@ -725,6 +754,52 @@ public class OsmandAidlApi {
 		registerReceiver(unmuteNavigationReceiver, mapActivity, AIDL_UNMUTE_NAVIGATION);
 	}
 
+	private void registerShowSqliteDbFileReceiver(MapActivity mapActivity) {
+		final WeakReference<MapActivity> mapActivityRef = new WeakReference<>(mapActivity);
+		BroadcastReceiver showSqliteDbFileReceiver = new BroadcastReceiver() {
+			@Override
+			public void onReceive(Context context, Intent intent) {
+				OsmandSettings settings = app.getSettings();
+				String fileName = intent.getStringExtra(AIDL_FILE_NAME);
+				if (!Algorithms.isEmpty(fileName)) {
+					settings.MAP_OVERLAY.set(fileName);
+					settings.MAP_OVERLAY_PREVIOUS.set(fileName);
+					MapActivity mapActivity = mapActivityRef.get();
+					if (mapActivity != null) {
+						OsmandRasterMapsPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class);
+						if (plugin != null) {
+							plugin.updateMapLayers(mapActivity.getMapView(), settings.MAP_OVERLAY, mapActivity.getMapLayers());
+						}
+					}
+				}
+			}
+		};
+		registerReceiver(showSqliteDbFileReceiver, mapActivity, AIDL_SHOW_SQLITEDB_FILE);
+	}
+
+	private void registerHideSqliteDbFileReceiver(MapActivity mapActivity) {
+		final WeakReference<MapActivity> mapActivityRef = new WeakReference<>(mapActivity);
+		BroadcastReceiver hideSqliteDbFileReceiver = new BroadcastReceiver() {
+			@Override
+			public void onReceive(Context context, Intent intent) {
+				OsmandSettings settings = app.getSettings();
+				String fileName = intent.getStringExtra(AIDL_FILE_NAME);
+				if (!Algorithms.isEmpty(fileName) && fileName.equals(settings.MAP_OVERLAY.get())) {
+					settings.MAP_OVERLAY.set(null);
+					settings.MAP_OVERLAY_PREVIOUS.set(null);
+					MapActivity mapActivity = mapActivityRef.get();
+					if (mapActivity != null) {
+						OsmandRasterMapsPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class);
+						if (plugin != null) {
+							plugin.updateMapLayers(mapActivity.getMapView(), settings.MAP_OVERLAY, mapActivity.getMapLayers());
+						}
+					}
+				}
+			}
+		};
+		registerReceiver(hideSqliteDbFileReceiver, mapActivity, AIDL_HIDE_SQLITEDB_FILE);
+	}
+
 	public void registerMapLayers(MapActivity mapActivity) {
 		for (AMapLayer layer : layers.values()) {
 			OsmandMapLayer mapLayer = mapLayers.get(layer.getId());
@@ -1240,24 +1315,28 @@ public class OsmandAidlApi {
 	boolean showGpx(String fileName) {
 		if (!Algorithms.isEmpty(fileName)) {
 			File f = app.getAppPath(IndexConstants.GPX_INDEX_DIR + fileName);
+			File fi = app.getAppPath(IndexConstants.GPX_IMPORT_DIR + fileName);
+			AsyncTask<File, Void, GPXFile> asyncTask = new AsyncTask<File, Void, GPXFile>() {
+
+				@Override
+				protected GPXFile doInBackground(File... files) {
+					return GPXUtilities.loadGPXFile(app, files[0]);
+				}
+
+				@Override
+				protected void onPostExecute(GPXFile gpx) {
+					if (gpx.warning == null) {
+						app.getSelectedGpxHelper().selectGpxFile(gpx, true, false);
+						refreshMap();
+					}
+				}
+			};
+
 			if (f.exists()) {
-				new AsyncTask<File, Void, GPXFile>() {
-
-					@Override
-					protected GPXFile doInBackground(File... files) {
-						return GPXUtilities.loadGPXFile(app, files[0]);
-					}
-
-					@Override
-					protected void onPostExecute(GPXFile gpx) {
-						if (gpx.warning == null) {
-							app.getSelectedGpxHelper().selectGpxFile(gpx, true, false);
-							refreshMap();
-						}
-					}
-
-				}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, f);
-
+				asyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, f);
+				return true;
+			} else if (fi.exists()) {
+				asyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, fi);
 				return true;
 			}
 		}
@@ -1281,12 +1360,15 @@ public class OsmandAidlApi {
 			List<SelectedGpxFile> selectedGpxFiles = app.getSelectedGpxHelper().getSelectedGPXFiles();
 			String gpxPath = app.getAppPath(IndexConstants.GPX_INDEX_DIR).getAbsolutePath();
 			for (SelectedGpxFile selectedGpxFile : selectedGpxFiles) {
-				String path = selectedGpxFile.getGpxFile().path;
+				GPXFile gpxFile = selectedGpxFile.getGpxFile();
+				String path = gpxFile.path;
 				if (!Algorithms.isEmpty(path)) {
 					if (path.startsWith(gpxPath)) {
 						path = path.substring(gpxPath.length() + 1);
 					}
-					files.add(new ASelectedGpxFile(path));
+					long modifiedTime = gpxFile.modifiedTime;
+					long fileSize = new File(gpxFile.path).length();
+					files.add(new ASelectedGpxFile(path, modifiedTime, fileSize, createGpxFileDetails(selectedGpxFile.getTrackAnalysis())));
 				}
 			}
 			return true;
@@ -1294,6 +1376,31 @@ public class OsmandAidlApi {
 		return false;
 	}
 
+	boolean getImportedGpx(List<AGpxFile> files) {
+		if (files != null) {
+			List<GpxDataItem> gpxDataItems = app.getGpxDatabase().getItems();
+			for (GpxDataItem dataItem : gpxDataItems) {
+				//if (dataItem.isApiImported()) {
+					File file = dataItem.getFile();
+					if (file.exists()) {
+						String fileName = file.getName();
+						boolean active = app.getSelectedGpxHelper().getSelectedFileByPath(file.getAbsolutePath()) != null;
+						long modifiedTime = dataItem.getFileLastModifiedTime();
+						long fileSize = file.length();
+						AGpxFileDetails details = null;
+						GPXTrackAnalysis analysis = dataItem.getAnalysis();
+						if (analysis != null) {
+							details = createGpxFileDetails(analysis);
+						}
+						files.add(new AGpxFile(fileName, modifiedTime, fileSize, active, details));
+					}
+				//}
+			}
+			return true;
+		}
+		return false;
+	}
+
 	boolean removeGpx(String fileName) {
 		if (!Algorithms.isEmpty(fileName)) {
 			final File f = app.getAppPath(IndexConstants.GPX_INDEX_DIR + fileName);
@@ -1309,6 +1416,74 @@ public class OsmandAidlApi {
 		return false;
 	}
 
+	private boolean getSqliteDbFiles(List<ASqliteDbFile> fileNames, boolean activeOnly) {
+		if (fileNames != null) {
+			File tilesPath = app.getAppPath(IndexConstants.TILES_INDEX_DIR);
+			if (tilesPath.canRead()) {
+				File[] files = tilesPath.listFiles();
+				if (files != null) {
+					String activeFile = app.getSettings().MAP_OVERLAY.get();
+					for (File tileFile : files) {
+						String fileName = tileFile.getName();
+						String fileNameLC = fileName.toLowerCase();
+						if (tileFile.isFile() && !fileNameLC.startsWith("hillshade") && fileNameLC.endsWith(SQLiteTileSource.EXT)) {
+							boolean active = fileName.equals(activeFile);
+							if (!activeOnly || active) {
+								fileNames.add(new ASqliteDbFile(fileName, tileFile.lastModified(), tileFile.length(), active));
+							}
+						}
+					}
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+
+	boolean getSqliteDbFiles(List<ASqliteDbFile> fileNames) {
+		return getSqliteDbFiles(fileNames, false);
+	}
+
+	boolean getActiveSqliteDbFiles(List<ASqliteDbFile> fileNames) {
+		return getSqliteDbFiles(fileNames, true);
+	}
+
+	boolean showSqliteDbFile(String fileName) {
+		if (!Algorithms.isEmpty(fileName)) {
+			File tileFile = new File(app.getAppPath(IndexConstants.TILES_INDEX_DIR), fileName);
+			String fileNameLC = fileName.toLowerCase();
+			if (tileFile.isFile() && !fileNameLC.startsWith("hillshade") && fileNameLC.endsWith(SQLiteTileSource.EXT)) {
+				OsmandSettings settings = app.getSettings();
+				settings.MAP_OVERLAY.set(fileName);
+				settings.MAP_OVERLAY_PREVIOUS.set(fileName);
+
+				Intent intent = new Intent();
+				intent.setAction(AIDL_SHOW_SQLITEDB_FILE);
+				intent.putExtra(AIDL_FILE_NAME, fileName);
+				app.sendBroadcast(intent);
+			}
+			return true;
+		}
+		return false;
+	}
+
+	boolean hideSqliteDbFile(String fileName) {
+		if (!Algorithms.isEmpty(fileName)) {
+			if (fileName.equals(app.getSettings().MAP_OVERLAY.get())) {
+				OsmandSettings settings = app.getSettings();
+				settings.MAP_OVERLAY.set(null);
+				settings.MAP_OVERLAY_PREVIOUS.set(null);
+
+				Intent intent = new Intent();
+				intent.setAction(AIDL_HIDE_SQLITEDB_FILE);
+				intent.putExtra(AIDL_FILE_NAME, fileName);
+				app.sendBroadcast(intent);
+				return true;
+			}
+		}
+		return false;
+	}
+
 	boolean setMapLocation(double latitude, double longitude, int zoom, boolean animated) {
 		Intent intent = new Intent();
 		intent.setAction(AIDL_SET_MAP_LOCATION);
@@ -1475,10 +1650,34 @@ public class OsmandAidlApi {
 		return true;
 	}
 
+	boolean registerForOsmandInitialization(final OsmandAppInitCallback callback)
+		throws RemoteException {
+		if (app.isApplicationInitializing()) {
+			app.getAppInitializer().addListener(new AppInitializeListener() {
+				@Override
+				public void onProgress(AppInitializer init, InitEvents event) {
+				}
+
+				@Override
+				public void onFinish(AppInitializer init) {
+					try {
+						LOG.debug("AIDL App registerForOsmandInitialization");
+						callback.onAppInitialized();
+					} catch (Exception e) {
+						e.printStackTrace();
+					}
+				}
+			});
+		} else {
+			callback.onAppInitialized();
+		}
+		return true;
+	}
+
 	boolean setNavDrawerItems(String appPackage, List<net.osmand.aidl.navdrawer.NavDrawerItem> items) {
 		if (!TextUtils.isEmpty(appPackage) && items != null) {
+			clearNavDrawerItems(appPackage);
 			if (items.isEmpty()) {
-				clearNavDrawerItems(appPackage);
 				return true;
 			}
 			List<NavDrawerItem> newItems = new ArrayList<>(MAX_NAV_DRAWER_ITEMS_PER_APP);
@@ -1517,6 +1716,7 @@ public class OsmandAidlApi {
 					}
 					final Intent finalIntent = intent;
 					adapter.addItem(new ContextMenuItem.ItemBuilder()
+							.setId(item.getId())
 							.setTitle(item.name)
 							.setIcon(getIconId(item.iconName))
 							.setListener(new ContextMenuAdapter.ItemClickListener() {
@@ -1655,6 +1855,160 @@ public class OsmandAidlApi {
 		}
 	}
 
+	boolean setNavDrawerLogo(@Nullable String uri) {
+		return app.getAppCustomization().setNavDrawerLogo(uri,null, null);
+	}
+
+	boolean setEnabledIds(Collection<String> ids) {
+		app.getAppCustomization().setFeaturesEnabledIds(ids);
+		return true;
+	}
+
+	boolean setDisabledIds(Collection<String> ids) {
+		app.getAppCustomization().setFeaturesDisabledIds(ids);
+		return true;
+	}
+
+	boolean setEnabledPatterns(Collection<String> patterns) {
+		app.getAppCustomization().setFeaturesEnabledPatterns(patterns);
+		return true;
+	}
+
+	boolean setDisabledPatterns(Collection<String> patterns) {
+		app.getAppCustomization().setFeaturesDisabledPatterns(patterns);
+		return true;
+	}
+
+	boolean regWidgetVisibility(@NonNull String widgetId, @Nullable List<String> appModeKeys) {
+		app.getAppCustomization().regWidgetVisibility(widgetId, appModeKeys);
+		return true;
+	}
+
+	boolean regWidgetAvailability(@NonNull String widgetId, @Nullable List<String> appModeKeys) {
+		app.getAppCustomization().regWidgetAvailability(widgetId, appModeKeys);
+		return true;
+	}
+
+	boolean customizeOsmandSettings(@NonNull String sharedPreferencesName, @Nullable Bundle bundle) {
+		app.getAppCustomization().customizeOsmandSettings(sharedPreferencesName, bundle);
+		return true;
+	}
+
+	boolean setNavDrawerLogoWithParams(
+			String uri, @Nullable String packageName, @Nullable String intent) {
+		return app.getAppCustomization().setNavDrawerLogoWithParams(uri, packageName, intent);
+	}
+
+	boolean setNavDrawerFooterWithParams(@NonNull NavDrawerFooterParams params) {
+		return app.getAppCustomization().setNavDrawerFooterParams(params);
+	}
+
+	boolean restoreOsmand() {
+		return app.getAppCustomization().restoreOsmand();
+	}
+
+	boolean changePluginState(PluginParams params) {
+		return app.getAppCustomization().changePluginStatus(params);
+	}
+
+	boolean getBitmapForGpx(final Uri gpxUri, final float density, final int widthPixels, final int heightPixels, final int color, final GpxBitmapCreatedCallback callback) {
+		if (gpxUri == null || callback == null) {
+			return false;
+		}
+		final TrackBitmapDrawer.TrackBitmapDrawerListener drawerListener = new TrackBitmapDrawer.TrackBitmapDrawerListener() {
+			@Override
+			public void onTrackBitmapDrawing() {
+			}
+
+			@Override
+			public void onTrackBitmapDrawn() {
+			}
+
+			@Override
+			public boolean isTrackBitmapSelectionSupported() {
+				return false;
+			}
+
+			@Override
+			public void drawTrackBitmap(Bitmap bitmap) {
+				callback.onGpxBitmapCreatedComplete(new AGpxBitmap(bitmap));
+			}
+		};
+
+		if (app.isApplicationInitializing()) {
+			app.getAppInitializer().addListener(new AppInitializer.AppInitializeListener() {
+				@Override
+				public void onProgress(AppInitializer init, AppInitializer.InitEvents event) {
+				}
+
+				@Override
+				public void onFinish(AppInitializer init) {
+					createGpxBitmapFromUri(gpxUri, density, widthPixels, heightPixels, color, drawerListener);
+				}
+			});
+		} else {
+			createGpxBitmapFromUri(gpxUri, density, widthPixels, heightPixels, color, drawerListener);
+		}
+		return true;
+	}
+
+	private void createGpxBitmapFromUri(final Uri gpxUri, final float density, final int widthPixels, final int heightPixels, final int color, final TrackBitmapDrawer.TrackBitmapDrawerListener drawerListener) {
+		GpxAsyncLoaderTask gpxAsyncLoaderTask = new GpxAsyncLoaderTask(app, gpxUri, new CallbackWithObject<GPXFile>() {
+			@Override
+			public boolean processResult(GPXFile result) {
+				TrackBitmapDrawer trackBitmapDrawer = new TrackBitmapDrawer(app, result, null, result.getRect(), density, widthPixels, heightPixels);
+				trackBitmapDrawer.addListener(drawerListener);
+				trackBitmapDrawer.setDrawEnabled(true);
+				trackBitmapDrawer.setTrackColor(color);
+				trackBitmapDrawer.initAndDraw();
+				return false;
+			}
+		});
+		gpxAsyncLoaderTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+	}
+
+	private static class GpxAsyncLoaderTask extends AsyncTask<Void, Void, GPXFile> {
+
+		private final OsmandApplication app;
+		private final CallbackWithObject<GPXFile> callback;
+		private final Uri gpxUri;
+
+		GpxAsyncLoaderTask(@NonNull OsmandApplication app, @NonNull Uri gpxUri, final CallbackWithObject<GPXFile> callback) {
+			this.app = app;
+			this.gpxUri = gpxUri;
+			this.callback = callback;
+		}
+
+		@Override
+		protected void onPostExecute(GPXFile gpxFile) {
+			if (gpxFile.warning == null && callback != null) {
+				callback.processResult(gpxFile);
+			}
+		}
+
+		@Override
+		protected GPXFile doInBackground(Void... voids) {
+			ParcelFileDescriptor gpxParcelDescriptor = null;
+			try {
+				gpxParcelDescriptor = app.getContentResolver().openFileDescriptor(gpxUri, "r");
+			} catch (FileNotFoundException e) {
+				e.printStackTrace();
+			}
+			if (gpxParcelDescriptor != null) {
+				final FileDescriptor fileDescriptor = gpxParcelDescriptor.getFileDescriptor();
+				return GPXUtilities.loadGPXFile(app, new FileInputStream(fileDescriptor));
+			}
+			return null;
+		}
+	}
+
+	private static AGpxFileDetails createGpxFileDetails(@NonNull GPXTrackAnalysis a) {
+		return new AGpxFileDetails(a.totalDistance, a.totalTracks, a.startTime, a.endTime,
+				a.timeSpan, a.timeMoving, a.totalDistanceMoving, a.diffElevationUp, a.diffElevationDown,
+				a.avgElevation, a.minElevation, a.maxElevation, a.minSpeed, a.maxSpeed, a.avgSpeed,
+				a.points, a.wptPoints, a.wptCategoryNames);
+	}
+
 	public static class ConnectedApp implements Comparable<ConnectedApp> {
 
 		static final String PACK_KEY = "pack";
@@ -1709,9 +2063,21 @@ public class OsmandAidlApi {
 			this.iconName = iconName;
 			this.flags = flags;
 		}
+
+		public String getId() {
+			return DRAWER_ITEM_ID_SCHEME + name;
+		}
 	}
 
 	public interface SearchCompleteCallback {
 		void onSearchComplete(List<SearchResult> resultSet);
 	}
+
+	public interface GpxBitmapCreatedCallback {
+		void onGpxBitmapCreatedComplete(AGpxBitmap aGpxBitmap);
+	}
+
+	public interface OsmandAppInitCallback {
+    void onAppInitialized();
+  }
 }
diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java
index ce61fe4386..d33222e9ab 100644
--- a/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java
+++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java
@@ -11,15 +11,22 @@ import android.os.RemoteException;
 import android.support.annotation.Nullable;
 
 import net.osmand.PlatformUtil;
+import net.osmand.aidl.OsmandAidlApi.GpxBitmapCreatedCallback;
+import net.osmand.aidl.OsmandAidlApi.OsmandAppInitCallback;
 import net.osmand.aidl.OsmandAidlApi.SearchCompleteCallback;
 import net.osmand.aidl.calculateroute.CalculateRouteParams;
+import net.osmand.aidl.customization.OsmandSettingsParams;
+import net.osmand.aidl.customization.SetWidgetsParams;
 import net.osmand.aidl.favorite.AddFavoriteParams;
 import net.osmand.aidl.favorite.RemoveFavoriteParams;
 import net.osmand.aidl.favorite.UpdateFavoriteParams;
 import net.osmand.aidl.favorite.group.AddFavoriteGroupParams;
 import net.osmand.aidl.favorite.group.RemoveFavoriteGroupParams;
 import net.osmand.aidl.favorite.group.UpdateFavoriteGroupParams;
+import net.osmand.aidl.gpx.AGpxBitmap;
+import net.osmand.aidl.gpx.AGpxFile;
 import net.osmand.aidl.gpx.ASelectedGpxFile;
+import net.osmand.aidl.gpx.CreateGpxBitmapParams;
 import net.osmand.aidl.gpx.HideGpxParams;
 import net.osmand.aidl.gpx.ImportGpxParams;
 import net.osmand.aidl.gpx.RemoveGpxParams;
@@ -40,6 +47,8 @@ import net.osmand.aidl.mapmarker.UpdateMapMarkerParams;
 import net.osmand.aidl.mapwidget.AddMapWidgetParams;
 import net.osmand.aidl.mapwidget.RemoveMapWidgetParams;
 import net.osmand.aidl.mapwidget.UpdateMapWidgetParams;
+import net.osmand.aidl.navdrawer.NavDrawerFooterParams;
+import net.osmand.aidl.navdrawer.NavDrawerHeaderParams;
 import net.osmand.aidl.navdrawer.SetNavDrawerItemsParams;
 import net.osmand.aidl.navigation.MuteNavigationParams;
 import net.osmand.aidl.navigation.NavigateGpxParams;
@@ -53,8 +62,10 @@ import net.osmand.aidl.note.StartAudioRecordingParams;
 import net.osmand.aidl.note.StartVideoRecordingParams;
 import net.osmand.aidl.note.StopRecordingParams;
 import net.osmand.aidl.note.TakePhotoNoteParams;
+import net.osmand.aidl.plugins.PluginParams;
 import net.osmand.aidl.search.SearchParams;
 import net.osmand.aidl.search.SearchResult;
+import net.osmand.aidl.tiles.ASqliteDbFile;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.util.Algorithms;
 
@@ -387,6 +398,12 @@ public class OsmandAidlService extends Service {
 			return api != null && api.getActiveGpx(files);
 		}
 
+		@Override
+		public boolean getImportedGpx(List<AGpxFile> files) throws RemoteException {
+			OsmandAidlApi api = getApi("getImportedGpx");
+			return api != null && api.getImportedGpx(files);
+		}
+
 		@Override
 		public boolean removeGpx(RemoveGpxParams params) throws RemoteException {
 			if (params != null && params.getFileName() != null) {
@@ -667,8 +684,37 @@ public class OsmandAidlService extends Service {
 
 		@Override
 		public boolean unregisterFromUpdates(long callbackId) throws RemoteException {
-			callbacks.remove(callbackId);
-			return true;
+			return callbacks.remove(callbackId) != null;
+		}
+
+		@Override
+		public boolean setNavDrawerLogo(String imageUri) throws RemoteException {
+			OsmandAidlApi api = getApi("setNavDrawerLogo");
+			return api != null && api.setNavDrawerLogo(imageUri);
+		}
+
+		@Override
+		public boolean setEnabledIds(List<String> ids) throws RemoteException {
+			OsmandAidlApi api = getApi("setFeaturesEnabledIds");
+			return api != null && api.setEnabledIds(ids);
+		}
+
+		@Override
+		public boolean setDisabledIds(List<String> ids) throws RemoteException {
+			OsmandAidlApi api = getApi("setFeaturesDisabledIds");
+			return api != null && api.setDisabledIds(ids);
+		}
+
+		@Override
+		public boolean setEnabledPatterns(List<String> patterns) throws RemoteException {
+			OsmandAidlApi api = getApi("setFeaturesEnabledPatterns");
+			return api != null && api.setEnabledPatterns(patterns);
+		}
+
+		@Override
+		public boolean setDisabledPatterns(List<String> patterns) throws RemoteException {
+			OsmandAidlApi api = getApi("setFeaturesDisabledPatterns");
+			return api != null && api.setDisabledPatterns(patterns);
 		}
 
 		void startRemoteUpdates(final long updateTimeMS, final long callbackId, final IOsmAndAidlCallback callback) {
@@ -689,5 +735,114 @@ public class OsmandAidlService extends Service {
 				}
 			}, updateTimeMS);
 		}
+
+		@Override
+		public boolean regWidgetVisibility(SetWidgetsParams params) throws RemoteException {
+			OsmandAidlApi api = getApi("regWidgetVisibility");
+			return api != null && api.regWidgetVisibility(params.getWidgetKey(), params.getAppModesKeys());
+		}
+
+		@Override
+		public boolean regWidgetAvailability(SetWidgetsParams params) throws RemoteException {
+			OsmandAidlApi api = getApi("regWidgetVisibility");
+			return api != null && api.regWidgetAvailability(params.getWidgetKey(), params.getAppModesKeys());
+		}
+
+		@Override
+		public boolean customizeOsmandSettings(OsmandSettingsParams params) throws RemoteException {
+			OsmandAidlApi api = getApi("customizeOsmandSettings");
+			return api != null && api.customizeOsmandSettings(params.getSharedPreferencesName(), params.getBundle());
+		}
+
+		@Override
+		public boolean getSqliteDbFiles(List<ASqliteDbFile> files) throws RemoteException {
+			OsmandAidlApi api = getApi("getSqliteDbFiles");
+			return api != null && api.getSqliteDbFiles(files);
+		}
+
+		@Override
+		public boolean getActiveSqliteDbFiles(List<ASqliteDbFile> files) throws RemoteException {
+			OsmandAidlApi api = getApi("getActiveSqliteDbFiles");
+			return api != null && api.getActiveSqliteDbFiles(files);
+		}
+
+		@Override
+		public boolean showSqliteDbFile(String fileName) throws RemoteException {
+			OsmandAidlApi api = getApi("showSqliteDbFile");
+			return api != null && api.showSqliteDbFile(fileName);
+		}
+
+		@Override
+		public boolean hideSqliteDbFile(String fileName) throws RemoteException {
+			OsmandAidlApi api = getApi("hideSqliteDbFile");
+			return api != null && api.hideSqliteDbFile(fileName);
+		}
+
+		@Override
+		public boolean setNavDrawerLogoWithParams(NavDrawerHeaderParams params) throws RemoteException {
+			OsmandAidlApi api = getApi("setNavDrawerLogoWithParams");
+			return api != null && api.setNavDrawerLogoWithParams(
+					params.getImageUri(), params.getPackageName(), params.getIntent());
+		}
+
+		@Override
+		public boolean setNavDrawerFooterWithParams(NavDrawerFooterParams params)
+				throws RemoteException {
+			OsmandAidlApi api = getApi("setNavDrawerFooterParams");
+			return api != null && api.setNavDrawerFooterWithParams(params);
+		}
+
+		@Override
+		public boolean restoreOsmand() {
+			OsmandAidlApi api = getApi("restoreOsmand");
+			return api != null && api.restoreOsmand();
+		}
+
+		@Override
+		public boolean changePluginState(PluginParams params) {
+			OsmandAidlApi api = getApi("changePluginState");
+			return api != null && api.changePluginState(params);
+		}
+
+		@Override
+		public boolean registerForOsmandInitListener(final IOsmAndAidlCallback callback)
+				throws RemoteException {
+			try {
+				OsmandAidlApi api = getApi("registerForOsmandInitListener");
+				return api != null && api.registerForOsmandInitialization(new OsmandAppInitCallback() {
+					@Override
+					public void onAppInitialized() {
+						try {
+							callback.onAppInitialized();
+						} catch (Exception e) {
+							handleException(e);
+						}
+					}
+				});
+			} catch (Exception e) {
+				handleException(e);
+				return false;
+			}
+		}
+
+		@Override
+		public boolean getBitmapForGpx(CreateGpxBitmapParams params, final IOsmAndAidlCallback callback) throws RemoteException {
+			try {
+				OsmandAidlApi api = getApi("getBitmapForGpx");
+				return params != null && api != null && api.getBitmapForGpx(params.getGpxUri(), params.getDensity(), params.getWidthPixels(), params.getHeightPixels(), params.getColor(), new GpxBitmapCreatedCallback() {
+					@Override
+					public void onGpxBitmapCreatedComplete(AGpxBitmap aGpxBitmap) {
+						try {
+							callback.onGpxBitmapCreated(aGpxBitmap);
+						} catch (RemoteException e) {
+							handleException(e);
+						}
+					}
+				});
+			} catch (Exception e) {
+				handleException(e);
+				return false;
+			}
+		}
 	};
 }
diff --git a/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl b/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl
new file mode 100644
index 0000000000..770070bb46
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.customization;
+
+parcelable OsmandSettingsParams;
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.java b/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.java
new file mode 100644
index 0000000000..bff8c68018
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.java
@@ -0,0 +1,60 @@
+package net.osmand.aidl.customization;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+public class OsmandSettingsParams implements Parcelable {
+
+	private String sharedPreferencesName;
+	private Bundle bundle;
+
+	public OsmandSettingsParams(@NonNull String sharedPreferencesName, @Nullable Bundle bundle) {
+		this.sharedPreferencesName = sharedPreferencesName;
+		this.bundle = bundle;
+	}
+
+	public OsmandSettingsParams(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<OsmandSettingsParams> CREATOR = new Creator<OsmandSettingsParams>() {
+		@Override
+		public OsmandSettingsParams createFromParcel(Parcel in) {
+			return new OsmandSettingsParams(in);
+		}
+
+		@Override
+		public OsmandSettingsParams[] newArray(int size) {
+			return new OsmandSettingsParams[size];
+		}
+	};
+
+	public String getSharedPreferencesName() {
+		return sharedPreferencesName;
+	}
+
+	public Bundle getBundle() {
+		return bundle;
+	}
+
+	@Override
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeString(sharedPreferencesName);
+		out.writeBundle(bundle);
+	}
+
+	@SuppressLint("ParcelClassLoader")
+	private void readFromParcel(Parcel in) {
+		sharedPreferencesName = in.readString();
+		bundle = in.readBundle();
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.aidl b/OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.aidl
new file mode 100644
index 0000000000..235a4abe51
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.customization;
+
+parcelable SetWidgetsParams;
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.java b/OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.java
new file mode 100644
index 0000000000..d9343b920e
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.java
@@ -0,0 +1,93 @@
+package net.osmand.aidl.customization;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SetWidgetsParams implements Parcelable {
+
+	private String widgetKey;
+	private List<String> appModesKeys;
+
+	public SetWidgetsParams(String widgetKey, @Nullable List<String> appModesKeys) {
+		this.widgetKey = widgetKey;
+		this.appModesKeys = appModesKeys;
+	}
+
+	public SetWidgetsParams(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<SetWidgetsParams> CREATOR = new Creator<SetWidgetsParams>() {
+		@Override
+		public SetWidgetsParams createFromParcel(Parcel in) {
+			return new SetWidgetsParams(in);
+		}
+
+		@Override
+		public SetWidgetsParams[] newArray(int size) {
+			return new SetWidgetsParams[size];
+		}
+	};
+
+	public String getWidgetKey() {
+		return widgetKey;
+	}
+
+	public List<String> getAppModesKeys() {
+		return appModesKeys;
+	}
+
+	@Override
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeString(widgetKey);
+		writeStringList(out, appModesKeys);
+	}
+
+	private void readFromParcel(Parcel in) {
+		widgetKey = in.readString();
+		appModesKeys = readStringList(in);
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+
+	private void writeStringList(Parcel out, List<String> val) {
+		if (val == null) {
+			out.writeInt(-1);
+			return;
+		}
+		int N = val.size();
+		int i = 0;
+		out.writeInt(N);
+		while (i < N) {
+			out.writeString(val.get(i));
+			i++;
+		}
+	}
+
+	private List<String> readStringList(Parcel in) {
+		List<String> list = new ArrayList<>();
+		int M = list.size();
+		int N = in.readInt();
+		if (N == -1) {
+			return null;
+		}
+		int i = 0;
+		for (; i < M && i < N; i++) {
+			list.set(i, in.readString());
+		}
+		for (; i < N; i++) {
+			list.add(in.readString());
+		}
+		for (; i < M; i++) {
+			list.remove(N);
+		}
+		return list;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.aidl b/OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.aidl
new file mode 100644
index 0000000000..ca9f623833
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.gpx;
+
+parcelable AGpxBitmap;
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.java b/OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.java
new file mode 100644
index 0000000000..f4bdef433d
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.java
@@ -0,0 +1,46 @@
+package net.osmand.aidl.gpx;
+
+import android.graphics.Bitmap;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+
+public class AGpxBitmap implements Parcelable {
+
+	private Bitmap bitmap;
+
+	public AGpxBitmap(@NonNull Bitmap bitmap) {
+		this.bitmap = bitmap;
+	}
+
+	public AGpxBitmap(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public Bitmap getBitmap() {
+		return bitmap;
+	}
+
+	public static final Creator<AGpxBitmap> CREATOR = new
+			Creator<AGpxBitmap>() {
+				public AGpxBitmap createFromParcel(Parcel in) {
+					return new AGpxBitmap(in);
+				}
+
+				public AGpxBitmap[] newArray(int size) {
+					return new AGpxBitmap[size];
+				}
+			};
+
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeParcelable(bitmap, flags);
+	}
+
+	private void readFromParcel(Parcel in) {
+		bitmap = in.readParcelable(Bitmap.class.getClassLoader());
+	}
+
+	public int describeContents() {
+		return 0;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.aidl b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.aidl
new file mode 100644
index 0000000000..413d34a571
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.gpx;
+
+parcelable AGpxFile;
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.java b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.java
new file mode 100644
index 0000000000..7183f3024c
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.java
@@ -0,0 +1,92 @@
+package net.osmand.aidl.gpx;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+
+import java.io.File;
+
+public class AGpxFile implements Parcelable {
+
+	private String fileName;
+	private long modifiedTime;
+	private long fileSize;
+	private boolean active;
+	private AGpxFileDetails details;
+
+	public AGpxFile(@NonNull String fileName, long modifiedTime, long fileSize, boolean active, @Nullable AGpxFileDetails details) {
+		this.fileName = fileName;
+		this.modifiedTime = modifiedTime;
+		this.fileSize = fileSize;
+		this.active = active;
+		this.details = details;
+	}
+
+	public AGpxFile(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<AGpxFile> CREATOR = new
+			Creator<AGpxFile>() {
+				public AGpxFile createFromParcel(Parcel in) {
+					return new AGpxFile(in);
+				}
+
+				public AGpxFile[] newArray(int size) {
+					return new AGpxFile[size];
+				}
+			};
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public long getModifiedTime() {
+		return modifiedTime;
+	}
+
+	public long getFileSize() {
+		return fileSize;
+	}
+
+	public boolean isActive() {
+		return active;
+	}
+
+	public AGpxFileDetails getDetails() {
+		return details;
+	}
+
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeString(fileName);
+		out.writeLong(modifiedTime);
+		out.writeLong(fileSize);
+		out.writeByte((byte) (active ? 1 : 0));
+
+		out.writeByte((byte) (details != null ? 1 : 0));
+		if (details != null) {
+			out.writeParcelable(details, flags);
+		}
+	}
+
+	private void readFromParcel(Parcel in) {
+		fileName = in.readString();
+		modifiedTime = in.readLong();
+		fileSize = in.readLong();
+		active = in.readByte() != 0;
+
+		boolean hasDetails= in.readByte() != 0;
+		if (hasDetails) {
+			details = in.readParcelable(AGpxFileDetails.class.getClassLoader());
+		} else {
+			details = null;
+		}
+	}
+
+	public int describeContents() {
+		return 0;
+	}
+}
+
diff --git a/OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl
new file mode 100644
index 0000000000..1e2cdec2b1
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.gpx;
+
+parcelable AGpxFileDetails;
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.java b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.java
new file mode 100644
index 0000000000..11d51e544b
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.java
@@ -0,0 +1,197 @@
+package net.osmand.aidl.gpx;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+public class AGpxFileDetails implements Parcelable {
+
+	private float totalDistance = 0;
+	private int totalTracks = 0;
+	private long startTime = Long.MAX_VALUE;
+	private long endTime = Long.MIN_VALUE;
+	private long timeSpan = 0;
+	private long timeMoving = 0;
+	private float totalDistanceMoving = 0;
+
+	private double diffElevationUp = 0;
+	private double diffElevationDown = 0;
+	private double avgElevation = 0;
+	private double minElevation = 99999;
+	private double maxElevation = -100;
+
+	private float minSpeed = Float.MAX_VALUE;
+	private float maxSpeed = 0;
+	private float avgSpeed;
+
+	private int points;
+	private int wptPoints = 0;
+
+	private List<String> wptCategoryNames = new ArrayList<>();
+
+	public AGpxFileDetails(float totalDistance, int totalTracks,
+						   long startTime, long endTime,
+						   long timeSpan, long timeMoving, float totalDistanceMoving,
+						   double diffElevationUp, double diffElevationDown,
+						   double avgElevation, double minElevation, double maxElevation,
+						   float minSpeed, float maxSpeed, float avgSpeed,
+						   int points, int wptPoints, Set<String> wptCategoryNames) {
+		this.totalDistance = totalDistance;
+		this.totalTracks = totalTracks;
+		this.startTime = startTime;
+		this.endTime = endTime;
+		this.timeSpan = timeSpan;
+		this.timeMoving = timeMoving;
+		this.totalDistanceMoving = totalDistanceMoving;
+		this.diffElevationUp = diffElevationUp;
+		this.diffElevationDown = diffElevationDown;
+		this.avgElevation = avgElevation;
+		this.minElevation = minElevation;
+		this.maxElevation = maxElevation;
+		this.minSpeed = minSpeed;
+		this.maxSpeed = maxSpeed;
+		this.avgSpeed = avgSpeed;
+		this.points = points;
+		this.wptPoints = wptPoints;
+		if (wptCategoryNames != null) {
+			this.wptCategoryNames = new ArrayList<>(wptCategoryNames);
+		}
+	}
+
+	public AGpxFileDetails(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<AGpxFileDetails> CREATOR = new
+			Creator<AGpxFileDetails>() {
+				public AGpxFileDetails createFromParcel(Parcel in) {
+					return new AGpxFileDetails(in);
+				}
+
+				public AGpxFileDetails[] newArray(int size) {
+					return new AGpxFileDetails[size];
+				}
+			};
+
+	public float getTotalDistance() {
+		return totalDistance;
+	}
+
+	public int getTotalTracks() {
+		return totalTracks;
+	}
+
+	public long getStartTime() {
+		return startTime;
+	}
+
+	public long getEndTime() {
+		return endTime;
+	}
+
+	public long getTimeSpan() {
+		return timeSpan;
+	}
+
+	public long getTimeMoving() {
+		return timeMoving;
+	}
+
+	public float getTotalDistanceMoving() {
+		return totalDistanceMoving;
+	}
+
+	public double getDiffElevationUp() {
+		return diffElevationUp;
+	}
+
+	public double getDiffElevationDown() {
+		return diffElevationDown;
+	}
+
+	public double getAvgElevation() {
+		return avgElevation;
+	}
+
+	public double getMinElevation() {
+		return minElevation;
+	}
+
+	public double getMaxElevation() {
+		return maxElevation;
+	}
+
+	public float getMinSpeed() {
+		return minSpeed;
+	}
+
+	public float getMaxSpeed() {
+		return maxSpeed;
+	}
+
+	public float getAvgSpeed() {
+		return avgSpeed;
+	}
+
+	public int getPoints() {
+		return points;
+	}
+
+	public int getWptPoints() {
+		return wptPoints;
+	}
+
+	public List<String> getWptCategoryNames() {
+		return wptCategoryNames;
+	}
+
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeFloat(totalDistance);
+		out.writeInt(totalTracks);
+		out.writeLong(startTime);
+		out.writeLong(endTime);
+		out.writeLong(timeSpan);
+		out.writeLong(timeMoving);
+		out.writeFloat(totalDistanceMoving);
+		out.writeDouble(diffElevationUp);
+		out.writeDouble(diffElevationDown);
+		out.writeDouble(avgElevation);
+		out.writeDouble(minElevation);
+		out.writeDouble(maxElevation);
+		out.writeFloat(minSpeed);
+		out.writeFloat(maxSpeed);
+		out.writeFloat(avgSpeed);
+		out.writeInt(points);
+		out.writeInt(wptPoints);
+		out.writeStringList(wptCategoryNames);
+	}
+
+	private void readFromParcel(Parcel in) {
+		totalDistance = in.readFloat();
+		totalTracks = in.readInt();
+		startTime = in.readLong();
+		endTime = in.readLong();
+		timeSpan = in.readLong();
+		timeMoving = in.readLong();
+		totalDistanceMoving = in.readFloat();
+		diffElevationUp = in.readDouble();
+		diffElevationDown = in.readDouble();
+		avgElevation = in.readDouble();
+		minElevation = in.readDouble();
+		maxElevation = in.readDouble();
+		minSpeed = in.readFloat();
+		maxSpeed = in.readFloat();
+		avgSpeed = in.readFloat();
+		points = in.readInt();
+		wptPoints = in.readInt();
+		in.readStringList(wptCategoryNames);
+	}
+
+	public int describeContents() {
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/aidl/gpx/ASelectedGpxFile.java b/OsmAnd/src/net/osmand/aidl/gpx/ASelectedGpxFile.java
index 54d51bf882..4a26cc5a5a 100644
--- a/OsmAnd/src/net/osmand/aidl/gpx/ASelectedGpxFile.java
+++ b/OsmAnd/src/net/osmand/aidl/gpx/ASelectedGpxFile.java
@@ -2,15 +2,30 @@ package net.osmand.aidl.gpx;
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+
+import java.io.File;
 
 public class ASelectedGpxFile implements Parcelable {
 
 	private String fileName;
+	private long modifiedTime;
+	private long fileSize;
+	private AGpxFileDetails details;
 
-	public ASelectedGpxFile(String fileName) {
+	public ASelectedGpxFile(@NonNull String fileName) {
 		this.fileName = fileName;
 	}
 
+	public ASelectedGpxFile(@NonNull String fileName, long modifiedTime, long fileSize, @Nullable AGpxFileDetails details) {
+		this.fileName = fileName;
+		this.modifiedTime = modifiedTime;
+		this.fileSize = fileSize;
+		this.details = details;
+	}
+
 	public ASelectedGpxFile(Parcel in) {
 		readFromParcel(in);
 	}
@@ -30,12 +45,40 @@ public class ASelectedGpxFile implements Parcelable {
 		return fileName;
 	}
 
+	public long getModifiedTime() {
+		return modifiedTime;
+	}
+
+	public long getFileSize() {
+		return fileSize;
+	}
+
+	public AGpxFileDetails getDetails() {
+		return details;
+	}
+
 	public void writeToParcel(Parcel out, int flags) {
 		out.writeString(fileName);
+		out.writeLong(modifiedTime);
+		out.writeLong(fileSize);
+
+		out.writeByte((byte) (details != null ? 1 : 0));
+		if (details != null) {
+			out.writeParcelable(details, flags);
+		}
 	}
 
 	private void readFromParcel(Parcel in) {
 		fileName = in.readString();
+		modifiedTime = in.readLong();
+		fileSize = in.readLong();
+
+		boolean hasDetails= in.readByte() != 0;
+		if (hasDetails) {
+			details = in.readParcelable(AGpxFileDetails.class.getClassLoader());
+		} else {
+			details = null;
+		}
 	}
 
 	public int describeContents() {
diff --git a/OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl
new file mode 100644
index 0000000000..b02d5c6e70
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.gpx;
+
+parcelable CreateGpxBitmapParams;
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java b/OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java
new file mode 100644
index 0000000000..b6af1d354c
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java
@@ -0,0 +1,101 @@
+package net.osmand.aidl.gpx;
+
+import android.net.Uri;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.io.File;
+
+public class CreateGpxBitmapParams implements Parcelable {
+
+	private File gpxFile;
+	private Uri gpxUri;
+	private float density;
+	private int widthPixels;
+	private int heightPixels;
+	private int color; //ARGB color int
+
+	public CreateGpxBitmapParams(File gpxFile, float density, int widthPixels, int heightPixels, int color) {
+		this.gpxFile = gpxFile;
+		this.density = density;
+		this.widthPixels = widthPixels;
+		this.heightPixels = heightPixels;
+		this.color = color;
+	}
+
+	public CreateGpxBitmapParams(Uri gpxUri, float density, int widthPixels, int heightPixels, int color) {
+		this.gpxUri = gpxUri;
+		this.density = density;
+		this.widthPixels = widthPixels;
+		this.heightPixels = heightPixels;
+		this.color = color;
+	}
+
+	public CreateGpxBitmapParams(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<CreateGpxBitmapParams> CREATOR = new
+			Creator<CreateGpxBitmapParams>() {
+				public CreateGpxBitmapParams createFromParcel(Parcel in) {
+					return new CreateGpxBitmapParams(in);
+				}
+
+				public CreateGpxBitmapParams[] newArray(int size) {
+					return new CreateGpxBitmapParams[size];
+				}
+			};
+
+	public File getGpxFile() {
+		return gpxFile;
+	}
+
+	public Uri getGpxUri() {
+		return gpxUri;
+	}
+
+	public int getWidthPixels() {
+		return widthPixels;
+	}
+
+	public int getHeightPixels() {
+		return heightPixels;
+	}
+
+	public float getDensity() {
+		return density;
+	}
+
+	public int getColor() {
+		return color;
+	}
+
+	public void writeToParcel(Parcel out, int flags) {
+		if (gpxFile != null) {
+			out.writeString(gpxFile.getAbsolutePath());
+		} else {
+			out.writeString(null);
+		}
+		out.writeParcelable(gpxUri, flags);
+		out.writeFloat(density);
+		out.writeInt(widthPixels);
+		out.writeInt(heightPixels);
+		out.writeInt(color);
+	}
+
+	private void readFromParcel(Parcel in) {
+		String gpxAbsolutePath = in.readString();
+		if (gpxAbsolutePath != null) {
+			gpxFile = new File(gpxAbsolutePath);
+		}
+		gpxUri = in.readParcelable(Uri.class.getClassLoader());
+		density = in.readFloat();
+		widthPixels = in.readInt();
+		heightPixels = in.readInt();
+		color = in.readInt();
+	}
+
+	public int describeContents() {
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl
new file mode 100644
index 0000000000..fc1271a8ca
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.navdrawer;
+
+parcelable NavDrawerFooterParams;
diff --git a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java
new file mode 100644
index 0000000000..9bfd70193f
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java
@@ -0,0 +1,68 @@
+package net.osmand.aidl.navdrawer;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+public class NavDrawerFooterParams implements Parcelable {
+
+	@NonNull
+	private String packageName;
+	@Nullable
+	private String intent;
+	@Nullable
+	private String appName;
+
+	@NonNull
+	public String getPackageName() {
+		return packageName;
+	}
+
+	@Nullable
+	public String getIntent() {
+		return intent;
+	}
+
+	@Nullable
+	public String getAppName() {
+		return appName;
+	}
+
+	public NavDrawerFooterParams(@NonNull String packageName, @Nullable String intent,
+			@Nullable String appName) {
+		this.packageName = packageName;
+		this.intent = intent;
+		this.appName = appName;
+	}
+
+	protected NavDrawerFooterParams(Parcel in) {
+		packageName = in.readString();
+		intent = in.readString();
+		appName = in.readString();
+	}
+
+	@Override
+	public void writeToParcel(Parcel dest, int flags) {
+		dest.writeString(packageName);
+		dest.writeString(intent);
+		dest.writeString(appName);
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+
+	public static final Creator<NavDrawerFooterParams> CREATOR = new Creator<NavDrawerFooterParams>() {
+		@Override
+		public NavDrawerFooterParams createFromParcel(Parcel in) {
+			return new NavDrawerFooterParams(in);
+		}
+
+		@Override
+		public NavDrawerFooterParams[] newArray(int size) {
+			return new NavDrawerFooterParams[size];
+		}
+	};
+}
diff --git a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl
new file mode 100644
index 0000000000..c230824841
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.navdrawer;
+
+parcelable NavDrawerHeaderParams;
diff --git a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java
new file mode 100644
index 0000000000..c88950fd10
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java
@@ -0,0 +1,68 @@
+package net.osmand.aidl.navdrawer;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+public class NavDrawerHeaderParams implements Parcelable {
+
+	@NonNull
+	private String imageUri;
+	@NonNull
+	private String packageName;
+	@Nullable
+	private String intent;
+
+	@NonNull
+	public String getImageUri() {
+		return imageUri;
+	}
+
+	@NonNull
+	public String getPackageName() {
+		return packageName;
+	}
+
+	@Nullable
+	public String getIntent() {
+		return intent;
+	}
+
+	public NavDrawerHeaderParams(@NonNull String imageUri, @NonNull String packageName,
+			@Nullable String intent) {
+		this.imageUri = imageUri;
+		this.packageName = packageName;
+		this.intent = intent;
+	}
+
+	public NavDrawerHeaderParams(Parcel in) {
+		imageUri = in.readString();
+		packageName = in.readString();
+		intent = in.readString();
+	}
+
+	@Override
+	public void writeToParcel(Parcel dest, int flags) {
+		dest.writeString(imageUri);
+		dest.writeString(packageName);
+		dest.writeString(intent);
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+
+	public static final Creator<NavDrawerHeaderParams> CREATOR = new Creator<NavDrawerHeaderParams>() {
+		@Override
+		public NavDrawerHeaderParams createFromParcel(Parcel in) {
+			return new NavDrawerHeaderParams(in);
+		}
+
+		@Override
+		public NavDrawerHeaderParams[] newArray(int size) {
+			return new NavDrawerHeaderParams[size];
+		}
+	};
+}
diff --git a/OsmAnd/src/net/osmand/aidl/plugins/PluginParams.aidl b/OsmAnd/src/net/osmand/aidl/plugins/PluginParams.aidl
new file mode 100644
index 0000000000..beff693f5a
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/plugins/PluginParams.aidl
@@ -0,0 +1,5 @@
+// PluginParams.aidl
+package net.osmand.aidl.plugins;
+
+parcelable PluginParams;
+
diff --git a/OsmAnd/src/net/osmand/aidl/plugins/PluginParams.java b/OsmAnd/src/net/osmand/aidl/plugins/PluginParams.java
new file mode 100644
index 0000000000..028bd8676a
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/plugins/PluginParams.java
@@ -0,0 +1,51 @@
+package net.osmand.aidl.plugins;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class PluginParams implements Parcelable {
+
+	private String pluginId;
+	private int newState; //0- off, 1 - on
+
+	public PluginParams(String pluginId, int newState) {
+		this.pluginId = pluginId;
+		this.newState = newState;
+	}
+
+	public String getPluginId() {
+		return pluginId;
+	}
+
+	public int getNewState() {
+		return newState;
+	}
+
+	protected PluginParams(Parcel in) {
+		pluginId = in.readString();
+		newState = in.readInt();
+	}
+
+	@Override
+	public void writeToParcel(Parcel dest, int flags) {
+		dest.writeString(pluginId);
+		dest.writeInt(newState);
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+
+	public static final Creator<PluginParams> CREATOR = new Creator<PluginParams>() {
+		@Override
+		public PluginParams createFromParcel(Parcel in) {
+			return new PluginParams(in);
+		}
+
+		@Override
+		public PluginParams[] newArray(int size) {
+			return new PluginParams[size];
+		}
+	};
+}
diff --git a/OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl b/OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl
new file mode 100644
index 0000000000..319cfd5035
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl
@@ -0,0 +1,3 @@
+package net.osmand.aidl.tiles;
+
+parcelable ASqliteDbFile;
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.java b/OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.java
new file mode 100644
index 0000000000..aaaf944ec9
--- /dev/null
+++ b/OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.java
@@ -0,0 +1,70 @@
+package net.osmand.aidl.tiles;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+public class ASqliteDbFile implements Parcelable {
+
+	private String fileName;
+	private long modifiedTime;
+	private long fileSize;
+	private boolean active;
+
+	public ASqliteDbFile(@NonNull String fileName, long modifiedTime, long fileSize, boolean active) {
+		this.fileName = fileName;
+		this.modifiedTime = modifiedTime;
+		this.fileSize = fileSize;
+		this.active = active;
+	}
+
+	public ASqliteDbFile(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<ASqliteDbFile> CREATOR = new
+			Creator<ASqliteDbFile>() {
+				public ASqliteDbFile createFromParcel(Parcel in) {
+					return new ASqliteDbFile(in);
+				}
+
+				public ASqliteDbFile[] newArray(int size) {
+					return new ASqliteDbFile[size];
+				}
+			};
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public long getModifiedTime() {
+		return modifiedTime;
+	}
+
+	public long getFileSize() {
+		return fileSize;
+	}
+
+	public boolean isActive() {
+		return active;
+	}
+
+	public void writeToParcel(Parcel out, int flags) {
+		out.writeString(fileName);
+		out.writeLong(modifiedTime);
+		out.writeLong(fileSize);
+		out.writeByte((byte) (active ? 1 : 0));
+	}
+
+	private void readFromParcel(Parcel in) {
+		fileName = in.readString();
+		modifiedTime = in.readLong();
+		fileSize = in.readLong();
+		active = in.readByte() != 0;
+	}
+
+	public int describeContents() {
+		return 0;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java
index b9aece2979..9360255676 100644
--- a/OsmAnd/src/net/osmand/plus/AppInitializer.java
+++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java
@@ -42,7 +42,9 @@ import net.osmand.plus.render.MapRenderRepositories;
 import net.osmand.plus.render.NativeOsmandLibrary;
 import net.osmand.plus.render.RendererRegistry;
 import net.osmand.plus.resources.ResourceManager;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper;
 import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.routing.TransportRoutingHelper;
 import net.osmand.plus.search.QuickSearchHelper;
 import net.osmand.plus.views.corenative.NativeCoreContext;
 import net.osmand.plus.voice.CommandPlayer;
@@ -180,7 +182,7 @@ public class AppInitializer implements IProgress {
 			if(prevAppVersion < VERSION_2_3) {
 				startPrefs.edit().putInt(VERSION_INSTALLED_NUMBER, VERSION_2_3).commit();
 			} else if (prevAppVersion < VERSION_3_2) {
-				app.getSettings().BILLING_PURCHASE_TOKEN_SENT.set(false);
+				app.getSettings().BILLING_PURCHASE_TOKENS_SENT.set("");
 				startPrefs.edit().putInt(VERSION_INSTALLED_NUMBER, VERSION_3_2).commit();
 			}
 			startPrefs.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
@@ -457,7 +459,9 @@ public class AppInitializer implements IProgress {
 		app.applyTheme(app);
 		app.inAppPurchaseHelper = startupInit(new InAppPurchaseHelper(app), InAppPurchaseHelper.class);
 		app.poiTypes = startupInit(MapPoiTypes.getDefaultNoInit(), MapPoiTypes.class);
+		app.transportRoutingHelper = startupInit(new TransportRoutingHelper(app), TransportRoutingHelper.class);
 		app.routingHelper = startupInit(new RoutingHelper(app), RoutingHelper.class);
+		app.routingOptionsHelper = startupInit(new RoutingOptionsHelper(app), RoutingOptionsHelper.class);
 		app.resourceManager = startupInit(new ResourceManager(app), ResourceManager.class);
 		app.daynightHelper = startupInit(new DayNightHelper(app), DayNightHelper.class);
 		app.locationProvider = startupInit(new OsmAndLocationProvider(app), OsmAndLocationProvider.class);
diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index fc608c9340..ebfe075f9a 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -19,7 +19,7 @@ public class ApplicationMode {
 	private static List<ApplicationMode> values = new ArrayList<>();
 	private static List<ApplicationMode> cachedFilteredValues = new ArrayList<>();
 	/*
-	 * DEFAULT("Browse map"), CAR("Car"), BICYCLE("Bicycle"), PEDESTRIAN("Pedestrian");
+	 * DEFAULT("Browse map"), CAR("Car"), BICYCLE("Bicycle"), PEDESTRIAN("Pedestrian"); NAUTICAL("boat")
 	 */
 	public static final ApplicationMode DEFAULT = create(R.string.app_mode_default, "default").speed(1.5f, 5).arrivalDistance(90).defLocation().
 			icon(R.drawable.map_world_globe_dark, R.drawable.ic_world_globe_dark).reg();
@@ -36,7 +36,7 @@ public class ApplicationMode {
 	public static final ApplicationMode AIRCRAFT = create(R.string.app_mode_aircraft, "aircraft").speed(40f, 100).carLocation().
 			icon(R.drawable.map_action_aircraft, R.drawable.ic_action_aircraft).reg();
 
-	public static final ApplicationMode BOAT = create(R.string.app_mode_boat, "boat").speed(5.5f, 20).carLocation().
+	public static final ApplicationMode BOAT = create(R.string.app_mode_boat, "boat").speed(5.5f, 20).carLocation().nauticalLocation().
 			icon(R.drawable.map_action_sail_boat_dark, R.drawable.ic_action_sail_boat_dark).reg();
 
 	public static final ApplicationMode HIKING = create(R.string.app_mode_hiking, "hiking").speed(1.5f, 5).parent(PEDESTRIAN).
@@ -57,6 +57,9 @@ public class ApplicationMode {
 	public static final ApplicationMode TRAIN = create(R.string.app_mode_train, "train").speed(25f, 40).
 			carLocation().icon(R.drawable.map_action_train, R.drawable.ic_action_train).reg();
 
+	public static final ApplicationMode PUBLIC_TRANSPORT = create(R.string.app_mode_public_transport, "public_transport").
+			icon(R.drawable.map_action_bus_dark, R.drawable.ic_action_bus_dark).reg();
+
 	static {
 		ApplicationMode[] exceptDefault = new ApplicationMode[]{CAR, PEDESTRIAN, BICYCLE, BOAT, AIRCRAFT, BUS, TRAIN};
 		ApplicationMode[] exceptPedestrianAndDefault = new ApplicationMode[]{CAR, BICYCLE, BOAT, AIRCRAFT, BUS, TRAIN};
@@ -159,6 +162,16 @@ public class ApplicationMode {
 			return this;
 		}
 
+		public ApplicationModeBuilder nauticalLocation() {
+			applicationMode.bearingIconDay = R.drawable.map_nautical_bearing;
+			applicationMode.bearingIconNight = R.drawable.map_nautical_bearing_night;
+			applicationMode.headingIconDay = R.drawable.map_nautical_location_view_angle;
+			applicationMode.headingIconNight = R.drawable.map_nautical_location_view_angle_night;
+			applicationMode.locationIconDay = R.drawable.map_nautical_location;
+			applicationMode.locationIconNight = R.drawable.map_nautical_location_night;
+			return this;
+		}
+
 		public ApplicationModeBuilder speed(float defSpeed, int distForTurn) {
 			applicationMode.defaultSpeed = defSpeed;
 			applicationMode.minDistanceForTurn = distForTurn;
@@ -187,19 +200,29 @@ public class ApplicationMode {
 		this.stringKey = stringKey;
 	}
 
-	public static List<ApplicationMode> values(OsmandSettings settings) {
+	public static List<ApplicationMode> values(OsmandApplication app) {
+		if (customizationListener == null) {
+			customizationListener = new OsmAndAppCustomization.OsmAndAppCustomizationListener() {
+				@Override
+				public void onOsmAndSettingsCustomized() {
+					cachedFilteredValues = new ArrayList<>();
+				}
+			};
+			app.getAppCustomization().addListener(customizationListener);
+		}
 		if (cachedFilteredValues.isEmpty()) {
+			OsmandSettings settings = app.getSettings();
 			if (listener == null) {
 				listener = new StateChangedListener<String>() {
 					@Override
 					public void stateChanged(String change) {
-						cachedFilteredValues = new ArrayList<ApplicationMode>();
+						cachedFilteredValues = new ArrayList<>();
 					}
 				};
 				settings.AVAILABLE_APP_MODES.addListener(listener);
 			}
 			String available = settings.AVAILABLE_APP_MODES.get();
-			cachedFilteredValues = new ArrayList<ApplicationMode>();
+			cachedFilteredValues = new ArrayList<>();
 			for (ApplicationMode v : values) {
 				if (available.indexOf(v.getStringKey() + ",") != -1 || v == DEFAULT) {
 					cachedFilteredValues.add(v);
@@ -236,7 +259,10 @@ public class ApplicationMode {
 		return false;
 	}
 
-	public boolean isWidgetVisible(String key) {
+	public boolean isWidgetVisible(OsmandApplication app, String key) {
+		if (app.getAppCustomization().areWidgetsCustomized()) {
+			return app.getAppCustomization().isWidgetVisible(key, this);
+		}
 		Set<ApplicationMode> set = widgetsVisibilityMap.get(key);
 		if (set == null) {
 			return false;
@@ -261,7 +287,10 @@ public class ApplicationMode {
 		return set;
 	}
 
-	public boolean isWidgetAvailable(String key) {
+	public boolean isWidgetAvailable(OsmandApplication app, String key) {
+		if (app.getAppCustomization().areWidgetsCustomized()) {
+			return app.getAppCustomization().isWidgetAvailable(key, this);
+		}
 		Set<ApplicationMode> set = widgetsAvailabilityMap.get(key);
 		if (set == null) {
 			return true;
@@ -393,4 +422,5 @@ public class ApplicationMode {
 	private int locationIconDayLost = R.drawable.map_pedestrian_location_lost;
 	private int locationIconNightLost = R.drawable.map_pedestrian_location_lost_night;
 	private static StateChangedListener<String> listener;
+	private static OsmAndAppCustomization.OsmAndAppCustomizationListener customizationListener;
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
index 7a37d2860b..26a36589a9 100644
--- a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
@@ -1,5 +1,6 @@
 package net.osmand.plus;
 
+import alice.tuprolog.Int;
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -10,6 +11,7 @@ import android.support.annotation.IdRes;
 import android.support.annotation.LayoutRes;
 import android.support.v4.app.FragmentActivity;
 import android.support.v7.widget.AppCompatImageView;
+import android.text.TextUtils;
 import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.view.ViewGroup;
@@ -32,6 +34,7 @@ import org.apache.commons.logging.Log;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -72,6 +75,8 @@ public class ContextMenuAdapter {
 		items.remove(position);
 	}
 
+	public void clearAdapter() { items.clear(); }
+
 	public void setDefaultLayoutId(int defaultLayoutId) {
 		this.DEFAULT_LAYOUT_ID = defaultLayoutId;
 	}
@@ -100,6 +105,13 @@ public class ContextMenuAdapter {
 	public ArrayAdapter<ContextMenuItem> createListAdapter(final Activity activity, final boolean lightTheme) {
 		final int layoutId = DEFAULT_LAYOUT_ID;
 		final OsmandApplication app = ((OsmandApplication) activity.getApplication());
+		final OsmAndAppCustomization customization = app.getAppCustomization();
+		for (Iterator<ContextMenuItem> iterator = items.iterator(); iterator.hasNext(); ) {
+			String id = iterator.next().getId();
+			if (!TextUtils.isEmpty(id) && !customization.isFeatureEnabled(id)) {
+				iterator.remove();
+			}
+		}
 		return new ContextMenuArrayAdapter(activity, layoutId, R.id.title,
 				items.toArray(new ContextMenuItem[items.size()]), app, lightTheme, changeAppModeListener);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/ContextMenuItem.java b/OsmAnd/src/net/osmand/plus/ContextMenuItem.java
index 3143a28f39..f29a5ee808 100644
--- a/OsmAnd/src/net/osmand/plus/ContextMenuItem.java
+++ b/OsmAnd/src/net/osmand/plus/ContextMenuItem.java
@@ -38,6 +38,7 @@ public class ContextMenuItem {
 	private final boolean hideDivider;
 	private final int minHeight;
 	private final int tag;
+	private final String id;
 
 	private ContextMenuItem(@StringRes int titleId,
 							String title,
@@ -59,7 +60,8 @@ public class ContextMenuItem {
 							ContextMenuAdapter.ProgressListener progressListener,
 							boolean hideDivider,
 							int minHeight,
-							int tag) {
+							int tag,
+							String id) {
 		this.titleId = titleId;
 		this.title = title;
 		this.mIcon = icon;
@@ -81,6 +83,7 @@ public class ContextMenuItem {
 		this.hideDivider = hideDivider;
 		this.minHeight = minHeight;
 		this.tag = tag;
+		this.id = id;
 	}
 
 	@StringRes
@@ -218,6 +221,10 @@ public class ContextMenuItem {
 		return tag;
 	}
 
+	public String getId() {
+		return id;
+	}
+
 	public static ItemBuilder createBuilder(String title) {
 		return new ItemBuilder().setTitle(title);
 	}
@@ -249,6 +256,7 @@ public class ContextMenuItem {
 		private boolean mHideDivider;
 		private int mMinHeight;
 		private int mTag;
+		private String mId;
 
 		public ItemBuilder setTitleId(@StringRes int titleId, @Nullable Context context) {
 			this.mTitleId = titleId;
@@ -363,11 +371,16 @@ public class ContextMenuItem {
 			return this;
 		}
 
+		public ItemBuilder setId(String id) {
+			this.mId = id;
+			return this;
+		}
+
 		public ContextMenuItem createItem() {
 			return new ContextMenuItem(mTitleId, mTitle, mIcon, mColorRes, mSecondaryIcon,
 					mSelected, mProgress, mLayout, mLoading, mIsCategory, mIsClickable, mSkipPaintingWithoutColor,
 					mPosition, mOrder, mDescription, mItemClickListener, mIntegerListener, mProgressListener,
-					mHideDivider, mMinHeight, mTag);
+					mHideDivider, mMinHeight, mTag, mId);
 		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
index 29977e007e..79b1733f0f 100644
--- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
+++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
@@ -46,7 +46,7 @@ public class FavouritesDbHelper {
 	private List<FavoriteGroup> favoriteGroups = new ArrayList<FavouritesDbHelper.FavoriteGroup>();
 	private Map<String, FavoriteGroup> flatGroups = new LinkedHashMap<String, FavouritesDbHelper.FavoriteGroup>();
 	private final OsmandApplication context;
-	protected static final String HIDDEN = "HIDDEN";
+	protected static final String HIDDEN = "hidden";
 	private static final String DELIMETER = "__";
 
 	private Set<FavoritesListener> listeners = new HashSet<>();
diff --git a/OsmAnd/src/net/osmand/plus/GPXDatabase.java b/OsmAnd/src/net/osmand/plus/GPXDatabase.java
index 75c1f70443..17ebca30bf 100644
--- a/OsmAnd/src/net/osmand/plus/GPXDatabase.java
+++ b/OsmAnd/src/net/osmand/plus/GPXDatabase.java
@@ -16,7 +16,7 @@ import java.util.List;
 public class GPXDatabase {
 
 	private static final String DB_NAME = "gpx_database";
-	private static final int DB_VERSION = 7;
+	private static final int DB_VERSION = 8;
 	private static final String GPX_TABLE_NAME = "gpxTable";
 	private static final String GPX_COL_NAME = "fileName";
 	private static final String GPX_COL_DIR = "fileDir";
@@ -50,6 +50,8 @@ public class GPXDatabase {
 
 	private static final String GPX_COL_WPT_CATEGORY_NAMES = "wptCategoryNames";
 
+	private static final String GPX_COL_SHOW_AS_MARKERS = "showAsMarkers";
+
 	public static final int GPX_SPLIT_TYPE_NO_SPLIT = -1;
 	public static final int GPX_SPLIT_TYPE_DISTANCE = 1;
 	public static final int GPX_SPLIT_TYPE_TIME = 2;
@@ -81,7 +83,8 @@ public class GPXDatabase {
 			GPX_COL_SPLIT_TYPE + " int, " +
 			GPX_COL_SPLIT_INTERVAL + " double, " +
 			GPX_COL_API_IMPORTED + " int, " + // 1 = true, 0 = false
-			GPX_COL_WPT_CATEGORY_NAMES + " TEXT);";
+			GPX_COL_WPT_CATEGORY_NAMES + " TEXT, " +
+			GPX_COL_SHOW_AS_MARKERS + " int);"; // 1 = true, 0 = false
 
 	private static final String GPX_TABLE_SELECT = "SELECT " +
 			GPX_COL_NAME + ", " +
@@ -107,7 +110,8 @@ public class GPXDatabase {
 			GPX_COL_SPLIT_TYPE + ", " +
 			GPX_COL_SPLIT_INTERVAL + ", " +
 			GPX_COL_API_IMPORTED + ", " +
-			GPX_COL_WPT_CATEGORY_NAMES +
+			GPX_COL_WPT_CATEGORY_NAMES + ", " +
+			GPX_COL_SHOW_AS_MARKERS +
 			" FROM " +	GPX_TABLE_NAME;
 
 	private OsmandApplication context;
@@ -120,6 +124,7 @@ public class GPXDatabase {
 		private int splitType;
 		private double splitInterval;
 		private boolean apiImported;
+		private boolean showAsMarkers;
 
 		public GpxDataItem(File file, GPXTrackAnalysis analysis) {
 			this.file = file;
@@ -162,6 +167,14 @@ public class GPXDatabase {
 		public void setApiImported(boolean apiImported) {
 			this.apiImported = apiImported;
 		}
+
+		public boolean isShowAsMarkers() {
+			return showAsMarkers;
+		}
+
+		public void setShowAsMarkers(boolean showAsMarkers) {
+			this.showAsMarkers = showAsMarkers;
+		}
 	}
 
 	public GPXDatabase(OsmandApplication app) {
@@ -252,6 +265,13 @@ public class GPXDatabase {
 		if (oldVersion < 7) {
 			db.execSQL("ALTER TABLE " + GPX_TABLE_NAME + " ADD " + GPX_COL_WPT_CATEGORY_NAMES + " TEXT");
 		}
+
+		if (oldVersion < 8) {
+			db.execSQL("ALTER TABLE " + GPX_TABLE_NAME + " ADD " + GPX_COL_SHOW_AS_MARKERS + " int");
+			db.execSQL("UPDATE " + GPX_TABLE_NAME +
+					" SET " + GPX_COL_SHOW_AS_MARKERS + " = ? " +
+					"WHERE " + GPX_COL_SHOW_AS_MARKERS + " IS NULL", new Object[]{0});
+		}
 	}
 
 	private boolean updateLastModifiedTime(GpxDataItem item) {
@@ -314,6 +334,25 @@ public class GPXDatabase {
 		return false;
 	}
 
+	public boolean updateShowAsMarkers(GpxDataItem item, boolean showAsMarkers) {
+		SQLiteConnection db = openConnection(false);
+		if (db != null) {
+			try {
+				String fileName = getFileName(item.file);
+				String fileDir = getFileDir(item.file);
+				db.execSQL("UPDATE " + GPX_TABLE_NAME + " SET " +
+								GPX_COL_SHOW_AS_MARKERS + " = ? " +
+								" WHERE " + GPX_COL_NAME + " = ? AND " + GPX_COL_DIR + " = ?",
+						new Object[]{showAsMarkers ? 1 : 0, fileName, fileDir});
+				item.setShowAsMarkers(showAsMarkers);
+			} finally {
+				db.close();
+			}
+			return true;
+		}
+		return false;
+	}
+
 	public boolean updateSplit(@NonNull GpxDataItem item, int splitType, double splitInterval) {
 		SQLiteConnection db = openConnection(false);
 		if (db != null){
@@ -390,11 +429,11 @@ public class GPXDatabase {
 		}
 		if (a != null) {
 			db.execSQL(
-					"INSERT INTO " + GPX_TABLE_NAME + " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+					"INSERT INTO " + GPX_TABLE_NAME + " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
 					new Object[]{ fileName, fileDir, a.totalDistance, a.totalTracks, a.startTime, a.endTime,
 							a.timeSpan, a.timeMoving, a.totalDistanceMoving, a.diffElevationUp, a.diffElevationDown,
 							a.avgElevation, a.minElevation, a.maxElevation, a.maxSpeed, a.avgSpeed, a.points, a.wptPoints,
-							color, item.file.lastModified(), item.splitType, item.splitInterval, item.apiImported ? 1 : 0,
+							color, item.file.lastModified(), item.splitType, item.splitInterval, item.apiImported ? 1 : 0, item.showAsMarkers ? 1 : 0,
 							Algorithms.encodeStringSet(item.analysis.wptCategoryNames)});
 		} else {
 			db.execSQL("INSERT INTO " + GPX_TABLE_NAME + "(" +
@@ -404,9 +443,10 @@ public class GPXDatabase {
 							GPX_COL_FILE_LAST_MODIFIED_TIME + ", " +
 							GPX_COL_SPLIT_TYPE + ", " +
 							GPX_COL_SPLIT_INTERVAL + ", " +
-							GPX_COL_API_IMPORTED +
-							") VALUES (?, ?, ?, ?, ?, ?, ?)",
-					new Object[]{fileName, fileDir, color, 0, item.splitType, item.splitInterval, item.apiImported ? 1 : 0});
+							GPX_COL_API_IMPORTED + ", " +
+							GPX_COL_SHOW_AS_MARKERS +
+							") VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
+					new Object[]{fileName, fileDir, color, 0, item.splitType, item.splitInterval, item.apiImported ? 1 : 0, item.showAsMarkers ? 1 : 0});
 		}
 	}
 
@@ -474,6 +514,7 @@ public class GPXDatabase {
 		double splitInterval = query.getDouble(21);
 		boolean apiImported = query.getInt(22) == 1;
 		String wptCategoryNames = query.getString(23);
+		boolean showAsMarkers = query.getInt(24) == 1;
 
 		GPXTrackAnalysis a = new GPXTrackAnalysis();
 		a.totalDistance = totalDistance;
@@ -513,6 +554,7 @@ public class GPXDatabase {
 		item.splitType = splitType;
 		item.splitInterval = splitInterval;
 		item.apiImported = apiImported;
+		item.showAsMarkers = showAsMarkers;
 		return item;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index f9b9414817..f9bfb2a73c 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -13,7 +13,9 @@ import net.osmand.Location;
 import net.osmand.PlatformUtil;
 import net.osmand.data.LocationPoint;
 import net.osmand.data.PointDescription;
+import net.osmand.data.QuadRect;
 import net.osmand.data.RotatedTileBox;
+import net.osmand.plus.routing.RouteCalculationResult;
 import net.osmand.plus.views.Renderable;
 import net.osmand.util.Algorithms;
 
@@ -52,6 +54,8 @@ import java.util.Set;
 import java.util.Stack;
 import java.util.TimeZone;
 
+import static net.osmand.binary.RouteDataObject.HEIGHT_UNDEFINED;
+
 public class GPXUtilities {
 	public final static Log log = PlatformUtil.getLog(GPXUtilities.class);
 
@@ -75,9 +79,19 @@ public class GPXUtilities {
 
 		@ColorInt
 		public int getColor(@ColorInt int defColor) {
-			if (extensions != null && extensions.containsKey("color")) {
+			String clrValue = null;
+			if (extensions != null) {
+				clrValue = extensions.get("color");
+				if (clrValue == null) {
+					clrValue = extensions.get("colour");
+				}
+				if (clrValue == null) {
+					clrValue = extensions.get("displaycolor");
+				}
+			}
+			if (clrValue != null && clrValue.length() > 0) {
 				try {
-					return Color.parseColor(extensions.get("color").toUpperCase());
+					return Color.parseColor(clrValue.toUpperCase());
 				} catch (IllegalArgumentException e) {
 					e.printStackTrace();
 				}
@@ -107,6 +121,7 @@ public class GPXUtilities {
 		public int time;
 		public float elevation;
 	}
+
 	public static class Speed {
 		public float distance;
 		public int time;
@@ -802,6 +817,7 @@ public class GPXUtilities {
 		public String warning = null;
 		public String path = "";
 		public boolean showCurrentTrack;
+		public boolean hasAltitude;
 		public long modifiedTime = 0;
 
 		private Track generalTrack;
@@ -1236,6 +1252,57 @@ public class GPXUtilities {
 			}
 			return categories;
 		}
+
+		public QuadRect getRect() {
+			double left = 0, right = 0;
+			double top = 0, bottom = 0;
+			for (Track track : tracks) {
+				for (TrkSegment segment : track.segments) {
+					for (WptPt p : segment.points) {
+						if (left == 0 && right == 0) {
+							left = p.getLongitude();
+							right = p.getLongitude();
+							top = p.getLatitude();
+							bottom = p.getLatitude();
+						} else {
+							left = Math.min(left, p.getLongitude());
+							right = Math.max(right, p.getLongitude());
+							top = Math.max(top, p.getLatitude());
+							bottom = Math.min(bottom, p.getLatitude());
+						}
+					}
+				}
+			}
+			for (WptPt p : points) {
+				if (left == 0 && right == 0) {
+					left = p.getLongitude();
+					right = p.getLongitude();
+					top = p.getLatitude();
+					bottom = p.getLatitude();
+				} else {
+					left = Math.min(left, p.getLongitude());
+					right = Math.max(right, p.getLongitude());
+					top = Math.max(top, p.getLatitude());
+					bottom = Math.min(bottom, p.getLatitude());
+				}
+			}
+			for (GPXUtilities.Route route : routes) {
+				for (WptPt p : route.points) {
+					if (left == 0 && right == 0) {
+						left = p.getLongitude();
+						right = p.getLongitude();
+						top = p.getLatitude();
+						bottom = p.getLatitude();
+					} else {
+						left = Math.min(left, p.getLongitude());
+						right = Math.max(right, p.getLongitude());
+						top = Math.max(top, p.getLatitude());
+						bottom = Math.min(bottom, p.getLatitude());
+					}
+				}
+			}
+			return new QuadRect(left, top, right, bottom);
+		}
 	}
 
     public static String asString(GPXFile file, OsmandApplication ctx) {
@@ -1499,18 +1566,16 @@ public class GPXUtilities {
 				if (tok == XmlPullParser.START_TAG) {
 					Object parse = parserState.peek();
 					String tag = parser.getName();
-					if (extensionReadMode && parse instanceof GPXExtensions) {
+					if (extensionReadMode && parse != null) {
 						String value = readText(parser, tag);
 						if (value != null) {
-							((GPXExtensions) parse).getExtensionsToWrite().put(tag, value);
+							((GPXExtensions) parse).getExtensionsToWrite().put(tag.toLowerCase(), value);
 							if (tag.equals("speed") && parse instanceof WptPt) {
 								try {
 									((WptPt) parse).speed = Float.parseFloat(value);
-								} catch (NumberFormatException e) {
-								}
+								} catch (NumberFormatException e) {}
 							}
 						}
-
 					} else if (parse instanceof GPXExtensions && tag.equals("extensions")) {
 						extensionReadMode = true;
 					} else {
@@ -1739,4 +1804,36 @@ public class GPXUtilities {
 			to.warning = from.warning;
 		}
 	}
+
+	public static GPXFile makeGpxFromRoute(RouteCalculationResult route) {
+		double lastHeight = HEIGHT_UNDEFINED;
+		GPXFile gpx = new GPXUtilities.GPXFile();
+		List<Location> locations = route.getRouteLocations();
+		if (locations != null) {
+			GPXUtilities.Track track = new GPXUtilities.Track();
+			GPXUtilities.TrkSegment seg = new GPXUtilities.TrkSegment();
+			for (Location l : locations) {
+				GPXUtilities.WptPt point = new GPXUtilities.WptPt();
+				point.lat = l.getLatitude();
+				point.lon = l.getLongitude();
+				if (l.hasAltitude()) {
+					gpx.hasAltitude = true;
+					float h = (float) l.getAltitude();
+					point.ele = h;
+					if (lastHeight == HEIGHT_UNDEFINED && seg.points.size() > 0) {
+						for (GPXUtilities.WptPt pt : seg.points) {
+							if (Double.isNaN(pt.ele)) {
+								pt.ele = h;
+							}
+						}
+					}
+					lastHeight = h;
+				}
+				seg.points.add(point);
+			}
+			track.segments.add(seg);
+			gpx.tracks.add(track);
+		}
+		return gpx;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
index 89660db9a4..f7c851abc0 100644
--- a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
+++ b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
@@ -5,6 +5,7 @@ import android.graphics.Matrix;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
+
 import net.osmand.IProgress;
 import net.osmand.data.LatLon;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
@@ -411,7 +412,7 @@ public class GpxSelectionHelper {
 	public void setGpxFileToDisplay(GPXFile... gpxs) {
 		// special case for gpx current route
 		for (GPXFile gpx : gpxs) {
-			selectGpxFileImpl(gpx, true, false, true, true);
+			selectGpxFile(gpx, true, false);
 		}
 		saveCurrentSelections();
 	}
@@ -438,7 +439,7 @@ public class GpxSelectionHelper {
 						if (gpx.warning != null) {
 							save = true;
 						} else {
-							selectGpxFile(gpx, true, false, true, selectedByUser);
+							selectGpxFile(gpx, true, false, true, selectedByUser, false);
 						}
 					} else if (obj.has(CURRENT_TRACK)) {
 						SelectedGpxFile file = savingTrackHelper.getCurrentTrack();
@@ -516,7 +517,7 @@ public class GpxSelectionHelper {
 	}
 
 	public SelectedGpxFile selectGpxFile(GPXFile gpx, boolean show, boolean notShowNavigationDialog) {
-		return selectGpxFile(gpx, show, notShowNavigationDialog, true, true);
+		return selectGpxFile(gpx, show, notShowNavigationDialog, true, true, true);
 	}
 
 	public SelectedGpxFile selectGpxFile(GPXFile gpx, boolean show, boolean notShowNavigationDialog, boolean syncGroup, boolean selectedByUser) {
@@ -525,6 +526,16 @@ public class GpxSelectionHelper {
 		return sf;
 	}
 
+	public SelectedGpxFile selectGpxFile(GPXFile gpx, boolean show, boolean notShowNavigationDialog, boolean syncGroup, boolean selectedByUser, boolean canAddToMarkers) {
+		if (canAddToMarkers && show) {
+			GPXDatabase.GpxDataItem dataItem = app.getGpxDatabase().getItem(new File(gpx.path));
+			if (dataItem != null && dataItem.isShowAsMarkers()) {
+				app.getMapMarkersHelper().addOrEnableGroup(gpx);
+			}
+		}
+		return selectGpxFile(gpx, show, notShowNavigationDialog, syncGroup, selectedByUser);
+	}
+
 	public void clearPoints(GPXFile gpxFile) {
 		gpxFile.clearPoints();
 		syncGpxWithMarkers(gpxFile);
diff --git a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
index f37ed94367..fdcb89bf4c 100644
--- a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
@@ -10,7 +10,6 @@ import android.support.v4.content.ContextCompat;
 import net.osmand.AndroidUtils;
 import net.osmand.IndexConstants;
 import net.osmand.PlatformUtil;
-import net.osmand.core.jni.MapMarker;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.LocationPoint;
@@ -320,6 +319,7 @@ public class MapMarkersHelper {
 
 	
 	public MapMarkersGroup addOrEnableGpxGroup(@NonNull File file) {
+		updateGpxShowAsMarkers(file);
 		MapMarkersGroup gr = getMapMarkerGroupById(getMarkerGroupId(file), MapMarkersGroup.GPX_TYPE);
 		if (gr == null) {
 			gr = createGPXMarkerGroup(file);
@@ -330,6 +330,7 @@ public class MapMarkersHelper {
 	}
 	
 	public MapMarkersGroup addOrEnableGroup(@NonNull GPXFile file) {
+		updateGpxShowAsMarkers(new File(file.path));
 		MapMarkersGroup gr = getMarkersGroup(file);
 		if (gr == null) {
 			gr = createGPXMarkerGroup(new File(file.path));
@@ -350,9 +351,6 @@ public class MapMarkersHelper {
 		return gr;
 	}
 	
-
-	
-	
 	public void enableGroup(@NonNull MapMarkersGroup gr) {
 		// check if group doesn't exist internally
 		if(!mapMarkersGroups.contains(gr)) {
@@ -363,13 +361,20 @@ public class MapMarkersHelper {
 		}
 		runSynchronization(gr);
 	}
-	
+
 	private void addGroupInternally(MapMarkersGroup gr) {
 		markersDbHelper.addGroup(gr);
 		addHistoryMarkersToGroup(gr);
 		addToGroupsList(gr);
 	}
-	
+
+	private void updateGpxShowAsMarkers(File file) {
+		GPXDatabase.GpxDataItem dataItem = ctx.getGpxDatabase().getItem(file);
+		if (dataItem != null) {
+			ctx.getGpxDatabase().updateShowAsMarkers(dataItem, true);
+			dataItem.setShowAsMarkers(true);
+		}
+	}
 
 	private void addHistoryMarkersToGroup(@NonNull MapMarkersGroup group) {
 		List<MapMarker> historyMarkers = new ArrayList<>(mapMarkersHistory);
@@ -640,7 +645,7 @@ public class MapMarkersHelper {
 		Iterator<MapMarker> iterator = groupMarkers.iterator();
 		while (iterator.hasNext()) {
 			MapMarker marker = iterator.next();
-			if (marker.id.equals(group.getId() + name)) {
+			if (marker.id.equals(group.getId() + name + MapUtils.createShortLinkString(latLon.getLatitude(), latLon.getLongitude(), 15))) {
 				exists = true;
 				marker.favouritePoint = favouritePoint;
 				marker.wptPt = wptPt;
@@ -907,7 +912,7 @@ public class MapMarkersHelper {
 
 				MapMarker marker = new MapMarker(point, pointDescription, colorIndex, false, 0);
 				if (group != null) {
-					marker.id = group.getId() + marker.getName(ctx);
+					marker.id = group.getId() + marker.getName(ctx) + MapUtils.createShortLinkString(marker.point.getLatitude(), marker.point.getLongitude(), 15);
 					// TODO ???????
 					if (markersDbHelper.getMarker(marker.id) != null) {
 						continue;
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
index 9fcf0777e9..37f903958a 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
@@ -1,144 +1,408 @@
 package net.osmand.plus;
 
+import static net.osmand.plus.osmedit.OpenstreetmapLocalUtil.LOG;
+
 import android.app.Activity;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
 
 import net.osmand.IProgress;
 import net.osmand.IndexConstants;
+import net.osmand.aidl.navdrawer.NavDrawerFooterParams;
+import net.osmand.aidl.navdrawer.NavDrawerHeaderParams;
+import net.osmand.aidl.plugins.PluginParams;
 import net.osmand.data.LocationPoint;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.PluginsActivity;
 import net.osmand.plus.activities.SettingsActivity;
 import net.osmand.plus.activities.TrackActivity;
-import net.osmand.plus.activities.search.SearchActivity;
 import net.osmand.plus.download.DownloadActivity;
-import net.osmand.plus.download.DownloadActivityType;
 import net.osmand.plus.helpers.WaypointHelper;
 import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.routing.RouteCalculationResult;
 import net.osmand.plus.views.OsmandMapTileView;
 
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class OsmAndAppCustomization {
-	
+
 	protected OsmandApplication app;
 	protected OsmandSettings osmandSettings;
 
+	private Bitmap navDrawerLogo;
+	private ArrayList<String> navDrawerParams;
+	private NavDrawerFooterParams navDrawerFooterParams;
+
+	private Set<String> featuresEnabledIds = new HashSet<>();
+	private Set<String> featuresDisabledIds = new HashSet<>();
+	private Set<String> featuresEnabledPatterns = new HashSet<>();
+	private Set<String> featuresDisabledPatterns = new HashSet<>();
+	private Map<String, Set<ApplicationMode>> widgetsVisibilityMap = new LinkedHashMap<>();
+	private Map<String, Set<ApplicationMode>> widgetsAvailabilityMap = new LinkedHashMap<>();
+	private CustomOsmandSettings customOsmandSettings;
+
+	private boolean featuresCustomized;
+	private boolean widgetsCustomized;
+
+	private List<OsmAndAppCustomizationListener> listeners = new ArrayList<>();
+
+	public interface OsmAndAppCustomizationListener {
+
+		void onOsmAndSettingsCustomized();
+	}
+
+	public static class CustomOsmandSettings {
+		private String sharedPreferencesName;
+		private OsmandSettings settings;
+
+		CustomOsmandSettings(OsmandApplication app, String sharedPreferencesName, Bundle bundle) {
+			this.sharedPreferencesName = sharedPreferencesName;
+			this.settings = new OsmandSettings(app, new net.osmand.plus.api.SettingsAPIImpl(app), sharedPreferencesName);
+			if (bundle != null) {
+				for (String key : bundle.keySet()) {
+					Object object = bundle.get(key);
+					this.settings.setPreference(key, object);
+				}
+			}
+		}
+
+		public OsmandSettings getSettings() {
+			return settings;
+		}
+	}
+
 	public void setup(OsmandApplication app) {
 		this.app = app;
 		this.osmandSettings = new OsmandSettings(app, new net.osmand.plus.api.SettingsAPIImpl(app));
 	}
 
-	public OsmandSettings getOsmandSettings(){ return osmandSettings;}
-	// Main menu
-	public boolean checkExceptionsOnStart() {
+	public OsmandSettings getOsmandSettings() {
+		return customOsmandSettings != null ? customOsmandSettings.getSettings() : osmandSettings;
+	}
+
+	public void customizeOsmandSettings(@NonNull String sharedPreferencesName, @Nullable Bundle bundle) {
+		customOsmandSettings = new CustomOsmandSettings(app, sharedPreferencesName, bundle);
+		OsmandSettings newSettings = customOsmandSettings.getSettings();
+		if (Build.VERSION.SDK_INT < 19) {
+			if (osmandSettings.isExternalStorageDirectorySpecifiedPre19()) {
+				File externalStorageDirectory = osmandSettings.getExternalStorageDirectoryPre19();
+				newSettings.setExternalStorageDirectoryPre19(externalStorageDirectory.getAbsolutePath());
+			}
+		} else if (osmandSettings.isExternalStorageDirectoryTypeSpecifiedV19()
+				&& osmandSettings.isExternalStorageDirectorySpecifiedV19()) {
+			int type = osmandSettings.getExternalStorageDirectoryTypeV19();
+			String directory = osmandSettings.getExternalStorageDirectoryV19();
+			newSettings.setExternalStorageDirectoryV19(type, directory);
+		}
+		app.setOsmandSettings(newSettings);
+		notifySettingsCustomized();
+	}
+
+	public void restoreOsmandSettings() {
+		app.setOsmandSettings(osmandSettings);
+		notifySettingsCustomized();
+	}
+
+	public boolean restoreOsmand() {
+		navDrawerLogo = null;
+		featuresCustomized = false;
+		widgetsCustomized = false;
+		customOsmandSettings = null;
+		restoreOsmandSettings();
+
+		featuresEnabledIds.clear();
+		featuresDisabledIds.clear();
+		featuresEnabledPatterns.clear();
+		featuresDisabledPatterns.clear();
+		widgetsVisibilityMap.clear();
+		widgetsAvailabilityMap.clear();
+
 		return true;
 	}
 
-	public boolean showFirstTimeRunAndTips(boolean firstTime, boolean appVersionChanged) {
-		return true;
-	}
-
-	public boolean checkBasemapDownloadedOnStart() {
-		return true;
-	}
-
-	
 	// Activities
-	public Class<? extends Activity> getSettingsActivity(){
+	public Class<? extends Activity> getSettingsActivity() {
 		return SettingsActivity.class;
 	}
-	
-	public Class<MapActivity> getMapActivity(){
+
+	public Class<MapActivity> getMapActivity() {
 		return MapActivity.class;
 	}
-	
-	public Class<TrackActivity> getTrackActivity(){
+
+	public Class<TrackActivity> getTrackActivity() {
 		return TrackActivity.class;
 	}
-	
-	public Class<FavoritesActivity> getFavoritesActivity(){
+
+	public Class<FavoritesActivity> getFavoritesActivity() {
 		return FavoritesActivity.class;
 	}
 
 	public Class<? extends Activity> getDownloadIndexActivity() {
 		return DownloadActivity.class;
 	}
-	
+
 	public Class<? extends Activity> getPluginsActivity() {
 		return PluginsActivity.class;
 	}
-	
+
 	public Class<? extends Activity> getDownloadActivity() {
 		return DownloadActivity.class;
 	}
 
-	// Download screen
-	public void getDownloadTypes(List<DownloadActivityType> items) {
-		
-	}
-
-
 	public List<String> onIndexingFiles(IProgress progress, Map<String, String> indexFileNames) {
 		return Collections.emptyList();
 	}
 
-	public void prepareLayerContextMenu(MapActivity activity, ContextMenuAdapter adapter) {
-	}
-
-	public void prepareOptionsMenu(MapActivity mapActivity, ContextMenuAdapter optionsMenuHelper) {
-	}
-
-
 	public String getIndexesUrl() {
-		return "http://"+IndexConstants.INDEX_DOWNLOAD_DOMAIN+"/get_indexes?gzip&" + Version.getVersionAsURLParam(app); //$NON-NLS-1$;
+		return "https://" + IndexConstants.INDEX_DOWNLOAD_DOMAIN + "/get_indexes?gzip&" + Version.getVersionAsURLParam(app);
 	}
 
 	public boolean showDownloadExtraActions() {
 		return true;
 	}
 
-
 	public File getTracksDir() {
 		return app.getAppPath(IndexConstants.GPX_RECORDED_INDEX_DIR);
 	}
 
 	public void createLayers(OsmandMapTileView mapView, MapActivity activity) {
-		
+
 	}
-	
+
 	public List<? extends LocationPoint> getWaypoints() {
 		return Collections.emptyList();
 	}
 
 	public boolean isWaypointGroupVisible(int waypointType, RouteCalculationResult route) {
-		if(waypointType == WaypointHelper.ALARMS) {
+		if (waypointType == WaypointHelper.ALARMS) {
 			return route != null && !route.getAlarmInfo().isEmpty();
-		} else if(waypointType == WaypointHelper.WAYPOINTS) {
+		} else if (waypointType == WaypointHelper.WAYPOINTS) {
 			return route != null && !route.getLocationPoints().isEmpty();
 		}
 		return true;
 	}
 
-	public void showLocationPoint(MapActivity ctx, LocationPoint locationPoint) {
-	}
-	
 	public boolean onDestinationReached() {
 		return true;
 	}
 
+	@Nullable
+	public Bitmap getNavDrawerLogo() {
+		return navDrawerLogo;
+	}
+
+	@Nullable
+	public ArrayList<String> getNavDrawerLogoParams() {return navDrawerParams; }
+
+	public boolean setNavDrawerLogo(String uri, @Nullable String packageName, @Nullable String intent) {
+		if (TextUtils.isEmpty(uri)) {
+			navDrawerLogo = null;
+		} else {
+			try {
+				InputStream is = app.getContentResolver().openInputStream(Uri.parse(uri));
+				if (is != null) {
+					navDrawerLogo = BitmapFactory.decodeStream(is);
+					is.close();
+
+				}
+			} catch (FileNotFoundException e) {
+				return false;
+			} catch (IOException e) {
+				// ignore
+			}
+			if (packageName != null && intent != null) {
+				navDrawerParams = new ArrayList<>();
+				navDrawerParams.add(packageName);
+				navDrawerParams.add(intent);
+			}
+		}
+		return true;
+	}
+
+	public boolean setNavDrawerFooterParams(NavDrawerFooterParams params) {
+		navDrawerFooterParams = params;
+		return true;
+	}
+
+	public NavDrawerFooterParams getNavFooterParams() {
+		return navDrawerFooterParams;
+	}
+
+	public void setFeaturesEnabledIds(@NonNull Collection<String> ids) {
+		featuresEnabledIds.clear();
+		featuresEnabledIds.addAll(ids);
+		setFeaturesCustomized();
+	}
+
+	public void setFeaturesDisabledIds(@NonNull Collection<String> ids) {
+		featuresDisabledIds.clear();
+		featuresDisabledIds.addAll(ids);
+		setFeaturesCustomized();
+	}
+
+	public void setFeaturesEnabledPatterns(@NonNull Collection<String> patterns) {
+		featuresEnabledPatterns.clear();
+		featuresEnabledPatterns.addAll(patterns);
+		setFeaturesCustomized();
+	}
+
+	public void setFeaturesDisabledPatterns(@NonNull Collection<String> patterns) {
+		featuresDisabledPatterns.clear();
+		featuresDisabledPatterns.addAll(patterns);
+		setFeaturesCustomized();
+	}
+
+	public Set<ApplicationMode> regWidgetVisibility(@NonNull String widgetId, @Nullable List<String> appModeKeys) {
+		HashSet<ApplicationMode> set = getAppModesSet(appModeKeys);
+		widgetsVisibilityMap.put(widgetId, set);
+		setWidgetsCustomized();
+		return set;
+	}
+
+	public Set<ApplicationMode> regWidgetAvailability(@NonNull String widgetId, @Nullable List<String> appModeKeys) {
+		HashSet<ApplicationMode> set = getAppModesSet(appModeKeys);
+		widgetsAvailabilityMap.put(widgetId, set);
+		setWidgetsCustomized();
+		return set;
+	}
+
+	public boolean isWidgetVisible(@NonNull String key, ApplicationMode appMode) {
+		Set<ApplicationMode> set = widgetsVisibilityMap.get(key);
+		if (set == null) {
+			return false;
+		}
+		return set.contains(appMode);
+	}
+
+	public boolean isWidgetAvailable(@NonNull String key, ApplicationMode appMode) {
+		Set<ApplicationMode> set = widgetsAvailabilityMap.get(key);
+		if (set == null) {
+			return true;
+		}
+		return set.contains(appMode);
+	}
+
+	public boolean setNavDrawerLogoWithParams(String imageUri, @Nullable String packageName,
+			@Nullable String intent) {
+		return setNavDrawerLogo(imageUri, packageName, intent);
+	}
+
+	public boolean changePluginStatus(PluginParams params) {
+		if (params.getNewState() == 0) {
+			for (OsmandPlugin plugin : OsmandPlugin.getEnabledPlugins()) {
+				if (plugin.getId().equals(params.getPluginId())) {
+					plugin.setActive(false);
+				}
+			}
+			return true;
+		}
+
+		if (params.getNewState() == 1) {
+			for (OsmandPlugin plugin : OsmandPlugin.getAvailablePlugins()) {
+				if (plugin.getId().equals(params.getPluginId())) {
+					plugin.setActive(true);
+				}
+			}
+			return true;
+		}
 
-	public boolean onlyTourDownload() {
 		return false;
 	}
 
-	public <T> void resumeActivity(Class<T> class1, T d) {
-	}
-	
-	public <T> void pauseActivity(Class<T> class1) {
+	@NonNull
+	private HashSet<ApplicationMode> getAppModesSet(@Nullable List<String> appModeKeys) {
+		HashSet<ApplicationMode> set = new HashSet<>();
+		List<ApplicationMode> values = ApplicationMode.allPossibleValues();
+		if (appModeKeys == null) {
+			set.addAll(values);
+		} else {
+			for (String key : appModeKeys) {
+				ApplicationMode am = ApplicationMode.valueOfStringKey(key, null);
+				if (am != null) {
+					set.add(am);
+				}
+			}
+		}
+		for (ApplicationMode m : values) {
+			// add derived modes
+			if (set.contains(m.getParent())) {
+				set.add(m);
+			}
+		}
+		return set;
 	}
 
+	public boolean isFeatureEnabled(@NonNull String id) {
+		if (!featuresCustomized) {
+			return true;
+		}
+		if (featuresEnabledIds.contains(id)) {
+			return true;
+		}
+		if (featuresDisabledIds.contains(id)) {
+			return false;
+		}
+		if (isMatchesPattern(id, featuresEnabledPatterns)) {
+			return true;
+		}
+		return !isMatchesPattern(id, featuresDisabledPatterns);
+	}
+
+	public boolean areWidgetsCustomized() {
+		return widgetsCustomized;
+	}
+
+	private void setFeaturesCustomized() {
+		featuresCustomized = true;
+	}
+
+	private void setWidgetsCustomized() {
+		widgetsCustomized = true;
+	}
+
+	private boolean isMatchesPattern(@NonNull String id, @NonNull Set<String> patterns) {
+		for (String pattern : patterns) {
+			if (id.startsWith(pattern)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private void notifySettingsCustomized() {
+		app.uiHandler.post(new Runnable() {
+
+			@Override
+			public void run() {
+				for (OsmAndAppCustomizationListener l : listeners) {
+					l.onOsmAndSettingsCustomized();
+				}
+			}
+		});
+	}
+
+	public void addListener(OsmAndAppCustomizationListener listener) {
+		this.listeners.add(listener);
+	}
+
+	public void removeListener(OsmAndAppCustomizationListener listener) {
+		this.listeners.remove(listener);
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndCustomizationConstants.java b/OsmAnd/src/net/osmand/plus/OsmAndCustomizationConstants.java
new file mode 100644
index 0000000000..27c78d026b
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/OsmAndCustomizationConstants.java
@@ -0,0 +1,103 @@
+package net.osmand.plus;
+
+public interface OsmAndCustomizationConstants {
+
+	// Navigation Drawer:
+
+	String DRAWER_ITEM_ID_SCHEME = "drawer.action.";
+	String DRAWER_DASHBOARD_ID = DRAWER_ITEM_ID_SCHEME + "dashboard";
+	String DRAWER_MAP_MARKERS_ID = DRAWER_ITEM_ID_SCHEME + "map_markers";
+	String DRAWER_MY_PLACES_ID = DRAWER_ITEM_ID_SCHEME + "my_places";
+	String DRAWER_SEARCH_ID = DRAWER_ITEM_ID_SCHEME + "search";
+	String DRAWER_DIRECTIONS_ID = DRAWER_ITEM_ID_SCHEME + "directions";
+	String DRAWER_CONFIGURE_MAP_ID = DRAWER_ITEM_ID_SCHEME + "configure_map";
+	String DRAWER_DOWNLOAD_MAPS_ID = DRAWER_ITEM_ID_SCHEME + "download_maps";
+	String DRAWER_OSMAND_LIVE_ID = DRAWER_ITEM_ID_SCHEME + "osmand_live";
+	String DRAWER_TRAVEL_GUIDES_ID = DRAWER_ITEM_ID_SCHEME + "travel_guides";
+	String DRAWER_MEASURE_DISTANCE_ID = DRAWER_ITEM_ID_SCHEME + "measure_distance";
+	String DRAWER_CONFIGURE_SCREEN_ID = DRAWER_ITEM_ID_SCHEME + "configure_screen";
+	String DRAWER_PLUGINS_ID = DRAWER_ITEM_ID_SCHEME + "plugins";
+	String DRAWER_SETTINGS_ID = DRAWER_ITEM_ID_SCHEME + "settings";
+	String DRAWER_HELP_ID = DRAWER_ITEM_ID_SCHEME + "help";
+	String DRAWER_BUILDS_ID = DRAWER_ITEM_ID_SCHEME + "builds";
+	String DRAWER_DIVIDER_ID = DRAWER_ITEM_ID_SCHEME + "divider";
+
+	// Configure Map:
+
+	String CONFIGURE_MAP_ITEM_ID_SCHEME = "map.configure.";
+	String SHOW_ITEMS_ID_SCHEME = CONFIGURE_MAP_ITEM_ID_SCHEME + "show.";
+	String RENDERING_ITEMS_ID_SCHEME = CONFIGURE_MAP_ITEM_ID_SCHEME + "rendering.";
+	String CUSTOM_RENDERING_ITEMS_ID_SCHEME = RENDERING_ITEMS_ID_SCHEME + "custom.";
+
+	String APP_PROFILES_ID = CONFIGURE_MAP_ITEM_ID_SCHEME + "app_profiles";
+
+	String SHOW_CATEGORY_ID = SHOW_ITEMS_ID_SCHEME + "category";
+	String FAVORITES_ID = SHOW_ITEMS_ID_SCHEME + "favorites";
+	String POI_OVERLAY_ID = SHOW_ITEMS_ID_SCHEME + "poi_overlay";
+	String POI_OVERLAY_LABELS_ID = SHOW_ITEMS_ID_SCHEME + "poi_overlay_labels";
+	String TRANSPORT_ID = SHOW_ITEMS_ID_SCHEME + "transport";
+	String GPX_FILES_ID = SHOW_ITEMS_ID_SCHEME + "gpx_files";
+	String MAP_MARKERS_ID = SHOW_ITEMS_ID_SCHEME + "map_markers";
+	String MAP_SOURCE_ID = SHOW_ITEMS_ID_SCHEME + "map_source";
+	String RECORDING_LAYER = SHOW_ITEMS_ID_SCHEME + "recording_layer";
+	String MAPILLARY = SHOW_ITEMS_ID_SCHEME + "mapillary";
+	String OSM_NOTES = SHOW_ITEMS_ID_SCHEME + "osm_notes";
+	String OVERLAY_MAP = SHOW_ITEMS_ID_SCHEME + "overlay_map";
+	String UNDERLAY_MAP = SHOW_ITEMS_ID_SCHEME + "underlay_map";
+	String CONTOUR_LINES = SHOW_ITEMS_ID_SCHEME + "contour_lines";
+	String HILLSHADE_LAYER = SHOW_ITEMS_ID_SCHEME + "hillshade_layer";
+
+	String MAP_RENDERING_CATEGORY_ID = RENDERING_ITEMS_ID_SCHEME + "category";
+	String MAP_STYLE_ID = RENDERING_ITEMS_ID_SCHEME + "map_style";
+	String MAP_MODE_ID = RENDERING_ITEMS_ID_SCHEME + "map_mode";
+	String MAP_MAGNIFIER_ID = RENDERING_ITEMS_ID_SCHEME + "map_marnifier";
+	String ROAD_STYLE_ID = RENDERING_ITEMS_ID_SCHEME + "road_style";
+	String TEXT_SIZE_ID = RENDERING_ITEMS_ID_SCHEME + "text_size";
+	String MAP_LANGUAGE_ID = RENDERING_ITEMS_ID_SCHEME + "map_language";
+	String TRANSPORT_RENDERING_ID = RENDERING_ITEMS_ID_SCHEME + "transport";
+	String DETAILS_ID = RENDERING_ITEMS_ID_SCHEME + "details";
+	String HIDE_ID = RENDERING_ITEMS_ID_SCHEME + "hide";
+	String ROUTES_ID = RENDERING_ITEMS_ID_SCHEME + "routes";
+
+	// Map Controls:
+
+	String HUD_BTN_ID_SCHEME = "map.view.";
+	String LAYERS_HUD_ID = HUD_BTN_ID_SCHEME + "layers";
+	String COMPASS_HUD_ID = HUD_BTN_ID_SCHEME + "compass";
+	String QUICK_SEARCH_HUD_ID = HUD_BTN_ID_SCHEME + "quick_search";
+	String BACK_TO_LOC_HUD_ID = HUD_BTN_ID_SCHEME + "back_to_loc";
+	String MENU_HUD_ID = HUD_BTN_ID_SCHEME + "menu";
+	String ROUTE_PLANNING_HUD_ID = HUD_BTN_ID_SCHEME + "route_planning";
+	String ZOOM_IN_HUD_ID = HUD_BTN_ID_SCHEME + "zoom_id";
+	String ZOOM_OUT_HUD_ID = HUD_BTN_ID_SCHEME + "zoom_out";
+
+	//Map Context Menu Actions:
+	String MAP_CONTEXT_MENU_ACTIONS = "point.actions.";
+	String MAP_CONTEXT_MENU_DIRECTIONS_FROM_ID = MAP_CONTEXT_MENU_ACTIONS + "directions_from";
+	String MAP_CONTEXT_MENU_SEARCH_NEARBY = MAP_CONTEXT_MENU_ACTIONS + "search_nearby";
+	String MAP_CONTEXT_MENU_CHANGE_MARKER_POSITION = MAP_CONTEXT_MENU_ACTIONS + "change_m_position";
+	String MAP_CONTEXT_MENU_MARK_AS_PARKING_LOC = MAP_CONTEXT_MENU_ACTIONS + "mark_as_parking";
+	String MAP_CONTEXT_MENU_MEASURE_DISTANCE = MAP_CONTEXT_MENU_ACTIONS + "measure_distance";
+	String MAP_CONTEXT_MENU_EDIT_GPX_WP = MAP_CONTEXT_MENU_ACTIONS + "edit_gpx_waypoint";
+	String MAP_CONTEXT_MENU_ADD_GPX_WAYPOINT = MAP_CONTEXT_MENU_ACTIONS + "add_gpx_waypoint";
+	String MAP_CONTEXT_MENU_UPDATE_MAP = MAP_CONTEXT_MENU_ACTIONS + "update_map";
+	String MAP_CONTEXT_MENU_DOWNLOAD_MAP = MAP_CONTEXT_MENU_ACTIONS + "download_map";
+	String MAP_CONTEXT_MENU_MODIFY_POI = MAP_CONTEXT_MENU_ACTIONS + "modify_poi";
+	String MAP_CONTEXT_MENU_MODIFY_OSM_CHANGE = MAP_CONTEXT_MENU_ACTIONS + "modify_osm_change";
+	String MAP_CONTEXT_MENU_CREATE_POI = MAP_CONTEXT_MENU_ACTIONS + "create_poi";
+	String MAP_CONTEXT_MENU_MODIFY_OSM_NOTE = MAP_CONTEXT_MENU_ACTIONS + "modify_osm_note";
+	String MAP_CONTEXT_MENU_OPEN_OSM_NOTE = MAP_CONTEXT_MENU_ACTIONS + "open_osm_note";
+
+	//Plug-in's IDs:
+	String PLUGIN_OSMAND_MONITOR = "osmand.monitoring";
+	String PLUGIN_MAPILLARY = "osmand.mapillary";
+	String PLUGIN_OSMAND_DEV = "osmand.development";
+	String PLUGIN_AUDIO_VIDEO_NOTES = "osmand.audionotes";
+	String PLUGIN_NAUTICAL = "nauticalPlugin.plugin";
+	String PLUGIN_OSMAND_EDITING = "osm.editing";
+	String PLUGIN_PARKING_POSITION = "osmand.parking.position";
+	String PLUGIN_RASTER_MAPS = "osmand.rastermaps";
+	String PLUGIN_SKI_MAPS = "skimaps.plugin";
+	String PLUGIN_SRTM = "osmand.srtm";
+
+}
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
index e7e5fdaeb4..6c9241b0b4 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
@@ -13,8 +13,12 @@ import net.osmand.plus.OsmandSettings.MetricsConstants;
 import net.osmand.plus.OsmandSettings.SpeedConstants;
 import net.osmand.util.Algorithms;
 
+import java.text.DateFormatSymbols;
 import java.text.DecimalFormat;
 import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Locale;
 import java.util.Map.Entry;
 
 public class OsmAndFormatter {
@@ -26,6 +30,9 @@ public class OsmAndFormatter {
 	public final static float FEET_IN_ONE_METER = YARDS_IN_ONE_METER * 3f;
 	private static final DecimalFormat fixed2 = new DecimalFormat("0.00");
 	private static final DecimalFormat fixed1 = new DecimalFormat("0.0");
+	private static final SimpleDateFormat SIMPLE_TIME_OF_DAY_FORMAT = new SimpleDateFormat("HH:mm", Locale.getDefault());
+	private static final String[] localDaysStr = getLettersStringArray(DateFormatSymbols.getInstance().getShortWeekdays(), 3);
+
 	{
 		fixed2.setMinimumFractionDigits(2);
 		fixed1.setMinimumFractionDigits(1);
@@ -53,6 +60,20 @@ public class OsmAndFormatter {
 		return hours + ":" + (minutes < 10 ? "0" + minutes : minutes) + ":" + (sec < 10 ? "0" + sec : sec);
 	}
 
+	public static String getFormattedTime(long seconds, boolean useCurrentTime) {
+		Calendar calendar = Calendar.getInstance();
+		if (useCurrentTime) {
+			calendar.setTimeInMillis(System.currentTimeMillis() + seconds * 1000);
+		} else {
+			calendar.setTimeInMillis(seconds * 1000);
+		}
+		if (isSameDay(calendar, Calendar.getInstance())) {
+			return SIMPLE_TIME_OF_DAY_FORMAT.format(calendar.getTime());
+		} else {
+			return SIMPLE_TIME_OF_DAY_FORMAT.format(calendar.getTime()) + " " + localDaysStr[calendar.get(Calendar.DAY_OF_WEEK)];
+		}
+	}
+
 	public static String getFormattedDate(Context context, long milliseconds) {
 		return DateUtils.formatDateTime(context, milliseconds, DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_ABBREV_ALL);
 	}
@@ -336,4 +357,24 @@ public class OsmAndFormatter {
 		}
 		return d.toString().trim();
 	}
-}
+
+	private static String[] getLettersStringArray(String[] strings, int letters) {
+		String[] newStrings = new String[strings.length];
+		for (int i = 0; i < strings.length; i++) {
+			if (strings[i] != null) {
+				if (strings[i].length() > letters) {
+					newStrings[i] = Algorithms.capitalizeFirstLetter(strings[i].substring(0, letters));
+				} else {
+					newStrings[i] = Algorithms.capitalizeFirstLetter(strings[i]);
+				}
+			}
+		}
+		return newStrings;
+	}
+
+	private static boolean isSameDay(Calendar cal1, Calendar cal2) {
+		return (cal1.get(Calendar.ERA) == cal2.get(Calendar.ERA) &&
+				cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
+				cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR));
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
index 1dcaca042b..4be50587b7 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
@@ -6,8 +6,8 @@ import android.app.Application;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
@@ -25,6 +25,7 @@ import android.view.accessibility.AccessibilityManager;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import net.osmand.CallbackWithObject;
 import net.osmand.PlatformUtil;
 import net.osmand.access.AccessibilityPlugin;
@@ -54,7 +55,9 @@ import net.osmand.plus.monitoring.LiveMonitoringHelper;
 import net.osmand.plus.poi.PoiFiltersHelper;
 import net.osmand.plus.render.RendererRegistry;
 import net.osmand.plus.resources.ResourceManager;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper;
 import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.routing.TransportRoutingHelper;
 import net.osmand.plus.search.QuickSearchHelper;
 import net.osmand.plus.voice.CommandPlayer;
 import net.osmand.plus.wikivoyage.data.TravelDbHelper;
@@ -104,6 +107,7 @@ public class OsmandApplication extends MultiDexApplication {
 	PoiFiltersHelper poiFilters;
 	MapPoiTypes poiTypes;
 	RoutingHelper routingHelper;
+	TransportRoutingHelper transportRoutingHelper;
 	FavouritesDbHelper favorites;
 	CommandPlayer player;
 	GpxSelectionHelper selectedGpxHelper;
@@ -115,6 +119,7 @@ public class OsmandApplication extends MultiDexApplication {
 	MapMarkersHelper mapMarkersHelper;
 	MapMarkersDbHelper mapMarkersDbHelper;
 	WaypointHelper waypointHelper;
+	RoutingOptionsHelper routingOptionsHelper;
 	DownloadIndexesThread downloadIndexesThread;
 	AvoidSpecificRoads avoidSpecificRoads;
 	BRouterServiceConnection bRouterServiceConnection;
@@ -271,6 +276,12 @@ public class OsmandApplication extends MultiDexApplication {
 		return osmandSettings;
 	}
 
+	public void setOsmandSettings(OsmandSettings osmandSettings) {
+		//android.os.Process.killProcess(android.os.Process.myPid());
+		this.osmandSettings = osmandSettings;
+		OsmandPlugin.initPlugins(this);
+	}
+
 	public SavingTrackHelper getSavingTrackHelper() {
 		return savingTrackHelper;
 	}
@@ -393,6 +404,14 @@ public class OsmandApplication extends MultiDexApplication {
 		return routingHelper;
 	}
 
+	public TransportRoutingHelper getTransportRoutingHelper() {
+		return transportRoutingHelper;
+	}
+
+	public RoutingOptionsHelper getRoutingOptionsHelper() {
+		return routingOptionsHelper;
+	}
+
 	public GeocodingLookupService getGeocodingLookupService() {
 		return geocodingLookupService;
 	}
@@ -428,13 +447,13 @@ public class OsmandApplication extends MultiDexApplication {
 				view.findViewById(R.id.spinner).setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(final View v) {
-						RoutePreferencesMenu.selectVoiceGuidance((MapActivity) uiContext, new CallbackWithObject<String>() {
+						routingOptionsHelper.selectVoiceGuidance((MapActivity) uiContext, new CallbackWithObject<String>() {
 							@Override
 							public boolean processResult(String result) {
 								boolean acceptableValue = !RoutePreferencesMenu.MORE_VALUE.equals(firstSelectedVoiceProvider);
 								if (acceptableValue) {
 									((TextView) v.findViewById(R.id.selectText))
-											.setText(RoutePreferencesMenu.getVoiceProviderName(uiContext, result));
+											.setText(routingOptionsHelper.getVoiceProviderName(uiContext, result));
 									firstSelectedVoiceProvider = result;
 								}
 								return acceptableValue;
@@ -452,7 +471,7 @@ public class OsmandApplication extends MultiDexApplication {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						if (!Algorithms.isEmpty(firstSelectedVoiceProvider)) {
-							RoutePreferencesMenu.applyVoiceProvider((MapActivity) uiContext, firstSelectedVoiceProvider);
+							routingOptionsHelper.applyVoiceProvider((MapActivity) uiContext, firstSelectedVoiceProvider);
 						}
 					}
 				});
diff --git a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
index 73ff6755fe..4bd1eaa35b 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
@@ -134,6 +134,7 @@ public abstract class OsmandPlugin {
 		OsmandSettings settings = app.getSettings();
 		Set<String> enabledPlugins = settings.getEnabledPlugins();
 
+		allPlugins.clear();
 		allPlugins.add(new MapillaryPlugin(app));
 		enabledPlugins.add(MapillaryPlugin.ID);
 
@@ -386,6 +387,15 @@ public abstract class OsmandPlugin {
 		return null;
 	}
 
+	public static OsmandPlugin getPlugin(String id) {
+		for (OsmandPlugin plugin : getAvailablePlugins()) {
+			if (plugin.getId().equals(id)) {
+				return plugin;
+			}
+		}
+		return null;
+	}
+
 	public static List<String> onIndexingFiles(IProgress progress) {
 		List<String> l = new ArrayList<String>();
 		for (OsmandPlugin plugin : getEnabledPlugins()) {
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 0fcba8c190..c63d2ca786 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -35,6 +35,8 @@ import net.osmand.plus.mapmarkers.CoordinateInputFormats.Format;
 import net.osmand.plus.render.RendererRegistry;
 import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.render.RenderingRulesStorage;
+import net.osmand.search.core.ObjectType;
+import net.osmand.util.Algorithms;
 
 import java.io.File;
 import java.io.IOException;
@@ -119,7 +121,8 @@ public class OsmandSettings {
 	}
 
 	// These settings are stored in SharedPreferences
-	private static final String SHARED_PREFERENCES_NAME = "net.osmand.settings"; //$NON-NLS-1$
+	private static final String SHARED_PREFERENCES_NAME = "net.osmand.settings";
+	private static String CUSTOM_SHARED_PREFERENCES_NAME;
 
 
 	/// Settings variables
@@ -143,11 +146,19 @@ public class OsmandSettings {
 		initPrefs();
 	}
 
+	protected OsmandSettings(OsmandApplication clientContext, SettingsAPI settinsAPI, String sharedPreferencesName) {
+		ctx = clientContext;
+		this.settingsAPI = settinsAPI;
+		CUSTOM_SHARED_PREFERENCES_NAME = "net.osmand.customsettings." + sharedPreferencesName;
+		initPrefs();
+	}
+
 	private void initPrefs() {
-		globalPreferences = settingsAPI.getPreferenceObject(SHARED_PREFERENCES_NAME);
+		globalPreferences = settingsAPI.getPreferenceObject(getSharedPreferencesName(null));
 		defaultProfilePreferences = getProfilePreferences(ApplicationMode.DEFAULT);
 		currentMode = readApplicationMode();
 		profilePreferences = getProfilePreferences(currentMode);
+		registeredPreferences.put(APPLICATION_MODE.getId(), APPLICATION_MODE);
 	}
 
 	public OsmandApplication getContext() {
@@ -164,10 +175,11 @@ public class OsmandSettings {
 	}
 
 	public static String getSharedPreferencesName(ApplicationMode mode) {
+		String sharedPreferencesName = !Algorithms.isEmpty(CUSTOM_SHARED_PREFERENCES_NAME) ? CUSTOM_SHARED_PREFERENCES_NAME : SHARED_PREFERENCES_NAME;
 		if (mode == null) {
-			return SHARED_PREFERENCES_NAME;
+			return sharedPreferencesName;
 		} else {
-			return SHARED_PREFERENCES_NAME + "." + mode.getStringKey().toLowerCase();
+			return sharedPreferencesName + "." + mode.getStringKey().toLowerCase();
 		}
 	}
 
@@ -175,6 +187,81 @@ public class OsmandSettings {
 		return settingsAPI.getPreferenceObject(getSharedPreferencesName(mode));
 	}
 
+	public boolean setPreference(String key, Object value) {
+		OsmandPreference<?> preference = registeredPreferences.get(key);
+		if (preference != null) {
+			if (preference == APPLICATION_MODE) {
+				if (value instanceof String) {
+					String appModeKey = (String) value;
+					ApplicationMode appMode = ApplicationMode.valueOfStringKey(appModeKey, null);
+					if (appMode != null) {
+						APPLICATION_MODE.set(appMode);
+						return true;
+					}
+				}
+			} else if (preference == DEFAULT_APPLICATION_MODE) {
+				if (value instanceof String) {
+					String appModeKey = (String) value;
+					ApplicationMode appMode = ApplicationMode.valueOfStringKey(appModeKey, null);
+					if (appMode != null) {
+						DEFAULT_APPLICATION_MODE.set(appMode);
+						return true;
+					}
+				}
+			} else if (preference == METRIC_SYSTEM) {
+				if (value instanceof String) {
+					String metricSystemName = (String) value;
+					MetricsConstants metricSystem;
+					try {
+						metricSystem = MetricsConstants.valueOf(metricSystemName);
+					} catch (IllegalArgumentException e) {
+						return false;
+					}
+					METRIC_SYSTEM.set(metricSystem);
+					return true;
+				}
+			} else if (preference == SPEED_SYSTEM) {
+				if (value instanceof String) {
+					String speedSystemName = (String) value;
+					SpeedConstants speedSystem;
+					try {
+						speedSystem = SpeedConstants.valueOf(speedSystemName);
+					} catch (IllegalArgumentException e) {
+						return false;
+					}
+					SPEED_SYSTEM.set(speedSystem);
+					return true;
+				}
+			} else if (preference instanceof BooleanPreference) {
+				if (value instanceof Boolean) {
+					((BooleanPreference) preference).set((Boolean) value);
+					return true;
+				}
+			} else if (preference instanceof StringPreference) {
+				if (value instanceof String) {
+					((StringPreference) preference).set((String) value);
+					return true;
+				}
+			} else if (preference instanceof FloatPreference) {
+				if (value instanceof Float) {
+					((FloatPreference) preference).set((Float) value);
+					return true;
+				}
+			} else if (preference instanceof IntPreference) {
+				if (value instanceof Integer) {
+					((IntPreference) preference).set((Integer) value);
+					return true;
+				}
+			} else if (preference instanceof LongPreference) {
+				if (value instanceof Long) {
+					((LongPreference) preference).set((Long) value);
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	public ApplicationMode LAST_ROUTING_APPLICATION_MODE = null;
 
 	// this value string is synchronized with settings_pref.xml preference name
@@ -297,6 +384,7 @@ public class OsmandSettings {
 		public CommonPreference(String id, T defaultValue) {
 			this.id = id;
 			this.defaultValue = defaultValue;
+			registeredPreferences.put(id, this);
 		}
 
 		public CommonPreference<T> makeGlobal() {
@@ -735,6 +823,7 @@ public class OsmandSettings {
 	public final CommonPreference<String> MAPILLARY_FILTER_USERNAME = new StringPreference("mapillary_filter_username", "").makeGlobal();
 	public final CommonPreference<Long> MAPILLARY_FILTER_FROM_DATE = new LongPreference("mapillary_filter_from_date", 0).makeGlobal();
 	public final CommonPreference<Long> MAPILLARY_FILTER_TO_DATE = new LongPreference("mapillary_filter_to_date", 0).makeGlobal();
+	public final CommonPreference<Boolean> MAPILLARY_FILTER_PANO = new BooleanPreference("mapillary_filter_pano", false).makeGlobal();
 
 	public final CommonPreference<Boolean> USE_FAST_RECALCULATION = new BooleanPreference("use_fast_recalculation", true).makeGlobal().cache();
 	public final CommonPreference<Boolean> FORCE_PRIVATE_ACCESS_ROUTING_ASKED = new BooleanPreference("force_private_access_routing", false).makeProfile().cache();
@@ -970,6 +1059,7 @@ public class OsmandSettings {
 	public final OsmandPreference<String> BILLING_USER_COUNTRY_DOWNLOAD_NAME = new StringPreference("billing_user_country_download_name", BILLING_USER_DONATION_NONE_PARAMETER).makeGlobal();
 	public final OsmandPreference<Boolean> BILLING_HIDE_USER_NAME = new BooleanPreference("billing_hide_user_name", false).makeGlobal();
 	public final OsmandPreference<Boolean> BILLING_PURCHASE_TOKEN_SENT = new BooleanPreference("billing_purchase_token_sent", false).makeGlobal();
+	public final OsmandPreference<String> BILLING_PURCHASE_TOKENS_SENT = new StringPreference("billing_purchase_tokens_sent", "").makeGlobal();
 	public final OsmandPreference<Boolean> LIVE_UPDATES_PURCHASED = new BooleanPreference("billing_live_updates_purchased", false).makeGlobal();
 	public final OsmandPreference<Long> LIVE_UPDATES_PURCHASE_CANCELLED_TIME = new LongPreference("live_updates_purchase_cancelled_time", 0).makeGlobal();
 	public final OsmandPreference<Boolean> LIVE_UPDATES_PURCHASE_CANCELLED_FIRST_DLG_SHOWN = new BooleanPreference("live_updates_purchase_cancelled_first_dlg_shown", false).makeGlobal();
@@ -1595,7 +1685,7 @@ public class OsmandSettings {
 		return isWriteable;
 	}
 
-	public boolean isExternalStorageDirectorySpecifiedV19() {
+	public boolean isExternalStorageDirectoryTypeSpecifiedV19() {
 		return settingsAPI.contains(globalPreferences, EXTERNAL_STORAGE_DIR_TYPE_V19);
 	}
 
@@ -1603,6 +1693,14 @@ public class OsmandSettings {
 		return settingsAPI.getInt(globalPreferences, EXTERNAL_STORAGE_DIR_TYPE_V19, -1);
 	}
 
+	public boolean isExternalStorageDirectorySpecifiedV19() {
+		return settingsAPI.contains(globalPreferences, EXTERNAL_STORAGE_DIR_V19);
+	}
+
+	public String getExternalStorageDirectoryV19() {
+		return settingsAPI.getString(globalPreferences, EXTERNAL_STORAGE_DIR_V19, null);
+	}
+
 	public File getExternalStorageDirectoryPre19() {
 		String defaultLocation = Environment.getExternalStorageDirectory().getAbsolutePath();
 		File rootFolder = new File(settingsAPI.getString(globalPreferences, EXTERNAL_STORAGE_DIR,
diff --git a/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java b/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
index bcaf767092..7b3b6e4e4e 100644
--- a/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
+++ b/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
@@ -422,7 +422,7 @@ public class SQLiteTileSource implements ITileSource {
 		if (db == null || db.isReadOnly() || onlyReadonlyAvailable) {
 			return;
 		}
-		db.execSQL("TRUNCATE TABLE tiles");
+		db.execSQL("DELETE FROM tiles");
 	}
 	
 	/**
diff --git a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
index 7106ad7454..1943d5cae9 100644
--- a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
+++ b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
@@ -379,8 +379,8 @@ public class TargetPointsHelper {
 	}
 
 	public void updateRouteAndRefresh(boolean updateRoute) {
-		if(updateRoute && ( routingHelper.isRouteBeingCalculated() || routingHelper.isRouteCalculated() ||
-				routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode())) {
+		if(updateRoute && (routingHelper.isPublicTransportMode() || routingHelper.isRouteBeingCalculated() ||
+				routingHelper.isRouteCalculated() || routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode())) {
 			updateRoutingHelper();
 		}
 		updateListeners();
@@ -388,15 +388,14 @@ public class TargetPointsHelper {
 
 	private void updateRoutingHelper() {
 		LatLon start = settings.getPointToStart();
-		Location lastKnownLocation = ctx.getLocationProvider().getLastKnownLocation();
+		LatLon finish = settings.getPointToNavigate();
 		List<LatLon> is = getIntermediatePointsLatLonNavigation();
+		Location lastKnownLocation = ctx.getLocationProvider().getLastKnownLocation();
 		if((routingHelper.isFollowingMode() && lastKnownLocation != null) || start == null) {
-			routingHelper.setFinalAndCurrentLocation(settings.getPointToNavigate(),
-					is, lastKnownLocation);
+			routingHelper.setFinalAndCurrentLocation(finish, is, lastKnownLocation);
 		} else {
 			Location loc = wrap(start);
-			routingHelper.setFinalAndCurrentLocation(settings.getPointToNavigate(),
-					is, loc);
+			routingHelper.setFinalAndCurrentLocation(finish, is, loc);
 		}
 	}
 
@@ -425,6 +424,9 @@ public class TargetPointsHelper {
 		listeners.add(l);
 	}
 
+	public void removeListener(StateChangedListener<Void> l) {
+		listeners.remove(l);
+	}
 
 	private void updateListeners() {
 		for(StateChangedListener<Void> l : listeners) {
@@ -457,6 +459,18 @@ public class TargetPointsHelper {
 		updateRouteAndRefresh(updateRoute);
 	}
 
+	public void clearAllPoints(boolean updateRoute) {
+		cancelStartPointAddressRequest();
+		cancelAllIntermediatePointsAddressRequests();
+		cancelTargetPointAddressRequest();
+		settings.clearPointToStart();
+		settings.clearIntermediatePoints();
+		settings.clearPointToNavigate();
+		intermediatePoints.clear();
+		readFromSettings();
+		updateRouteAndRefresh(updateRoute);
+	}
+
 	public void reorderAllTargetPoints(List<TargetPoint> point, boolean updateRoute) {
 		cancelTargetPointAddressRequest();
 		cancelAllIntermediatePointsAddressRequests();
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
index 27fc4c3907..c65e7296a5 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
@@ -270,15 +270,14 @@ public class FavoritesListFragment extends OsmAndListFragment implements SearchA
 						
 		}
 
-
-		public void sortByDefault() {
+		public void sortByDefault(boolean isSortedByDistance) {
 			Location loc = app.getLocationProvider().getLastStaleKnownLocation();
 			LatLon map = app.getMapViewTrackingUtilities().getMapLocation();
-			if (loc != null) {
+			if (loc != null && isSortedByDistance) {
 				sortByDistance(new LatLon(loc.getLatitude(), loc.getLongitude()));
-			} else if(map != null){
+			} else if (map != null && isSortedByDistance){
 				sortByDistance(map);
-			} else{
+			} else {
 				sortByName();
 			}			
 		}
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 276af19e10..163d7503d5 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -65,7 +65,6 @@ import java.util.Set;
 
 
 public class FavoritesTreeFragment extends OsmandExpandableListFragment {
-
 	public static final int SEARCH_ID = -1;
 	//	public static final int EXPORT_ID = 0;
 	// public static final int IMPORT_ID = 1;
@@ -948,7 +947,10 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 						} else {
 							Set<FavouritePoint> set = favoritesSelected.get(group.name);
 							if (set != null) {
+								groupsToDelete.remove(group);
+								getGroupPosition(group.name);
 								set.remove(model);
+								favouritesAdapter.notifyDataSetInvalidated();
 							}
 						}
 						updateSelectionMode(actionMode);
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 7f15f47692..c0b2545576 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -65,6 +65,7 @@ import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.MapMarkersHelper.MapMarkerChangedListener;
 import net.osmand.plus.OnDismissDialogFragmentListener;
+import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener;
 import net.osmand.plus.OsmAndConstants;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
@@ -90,7 +91,6 @@ import net.osmand.plus.firstusage.FirstUsageWelcomeFragment;
 import net.osmand.plus.firstusage.FirstUsageWizardFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.DiscountHelper;
-import net.osmand.plus.helpers.DiscountHelper.DiscountBarController;
 import net.osmand.plus.helpers.ExternalApiHelper;
 import net.osmand.plus.helpers.ImportHelper;
 import net.osmand.plus.helpers.ImportHelper.ImportGpxBottomSheetDialogFragment;
@@ -100,8 +100,8 @@ import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.mapcontextmenu.MenuController.MenuState;
 import net.osmand.plus.mapcontextmenu.builders.cards.dialogs.ContextMenuCardDialogFragment;
 import net.osmand.plus.mapcontextmenu.other.DestinationReachedMenu;
-import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
-import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenuFragment;
+import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
+import net.osmand.plus.routepreparationmenu.MapRouteInfoMenuFragment;
 import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu;
 import net.osmand.plus.mapmarkers.MapMarkersDialogFragment;
 import net.osmand.plus.mapmarkers.PlanRouteFragment;
@@ -110,9 +110,11 @@ import net.osmand.plus.measurementtool.MeasurementToolFragment;
 import net.osmand.plus.measurementtool.NewGpxData;
 import net.osmand.plus.render.RendererRegistry;
 import net.osmand.plus.resources.ResourceManager;
+import net.osmand.plus.routing.IRouteInformationListener;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.routing.RoutingHelper.IRouteInformationListener;
 import net.osmand.plus.routing.RoutingHelper.RouteCalculationProgressCallback;
+import net.osmand.plus.routing.TransportRoutingHelper;
+import net.osmand.plus.routing.TransportRoutingHelper.TransportRouteCalculationProgressCallback;
 import net.osmand.plus.search.QuickSearchDialogFragment;
 import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchTab;
 import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchType;
@@ -150,7 +152,7 @@ import java.util.regex.Pattern;
 
 public class MapActivity extends OsmandActionBarActivity implements DownloadEvents,
 		OnRequestPermissionsResultCallback, IRouteInformationListener,
-		MapMarkerChangedListener, OnDismissDialogFragmentListener, OnDrawMapListener {
+		MapMarkerChangedListener, OnDismissDialogFragmentListener, OnDrawMapListener, OsmAndAppCustomizationListener {
 	public static final String INTENT_KEY_PARENT_MAP_ACTIVITY = "intent_parent_map_activity_key";
 
 	private static final int SHOW_POSITION_MSG_ID = OsmAndConstants.UI_HANDLER_MAP_VIEW + 1;
@@ -208,6 +210,8 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 	private boolean mIsDestroyed = false;
 	private boolean pendingPause = false;
 	private Timer splashScreenTimer;
+	private boolean activityRestartNeeded = false;
+	private boolean stopped = true;
 
 	private ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
 
@@ -437,7 +441,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 	private void createProgressBarForRouting() {
 		final ProgressBar pb = (ProgressBar) findViewById(R.id.map_horizontal_progress);
 
-		app.getRoutingHelper().setProgressBar(new RouteCalculationProgressCallback() {
+		final RouteCalculationProgressCallback progressCallback = new RouteCalculationProgressCallback() {
 
 			@Override
 			public void start() {
@@ -467,7 +471,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 				if (!settings.FORCE_PRIVATE_ACCESS_ROUTING_ASKED.getModeValue(getRoutingHelper().getAppMode())) {
 					final OsmandSettings.CommonPreference<Boolean> allowPrivate
 							= settings.getCustomRoutingBooleanProperty(GeneralRouter.ALLOW_PRIVATE, false);
-					final List<ApplicationMode> modes = ApplicationMode.values(settings);
+					final List<ApplicationMode> modes = ApplicationMode.values(app);
 					for (ApplicationMode mode : modes) {
 						if (!allowPrivate.getModeValue(mode)) {
 							settings.FORCE_PRIVATE_ACCESS_ROUTING_ASKED.setModeValue(mode, true);
@@ -499,6 +503,25 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 				dashboardOnMap.routeCalculationFinished();
 				pb.setVisibility(View.GONE);
 			}
+		};
+
+		app.getRoutingHelper().setProgressBar(progressCallback);
+
+		app.getTransportRoutingHelper().setProgressBar(new TransportRouteCalculationProgressCallback() {
+			@Override
+			public void start() {
+				progressCallback.start();
+			}
+
+			@Override
+			public void updateProgress(int progress) {
+				progressCallback.updateProgress(progress);
+			}
+
+			@Override
+			public void finish() {
+				progressCallback.finish();
+			}
 		});
 	}
 
@@ -566,7 +589,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		if (dashboardOnMap.onBackPressed()) {
 			return;
 		}
-		if (drawerLayout.isDrawerOpen(Gravity.LEFT)) {
+		if (drawerLayout.isDrawerOpen(Gravity.START)) {
 			closeDrawer();
 			return;
 		}
@@ -634,6 +657,13 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 	@Override
 	protected void onResume() {
 		super.onResume();
+
+		if (activityRestartNeeded) {
+			activityRestartNeeded = false;
+			recreate();
+			return;
+		}
+
 		long tm = System.currentTimeMillis();
 
 		if (app.getMapMarkersHelper().getPlanRouteContext().isFragmentVisible()) {
@@ -760,8 +790,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		routingHelper.addListener(this);
 		app.getMapMarkersHelper().addListener(this);
 
-		DiscountHelper.checkAndDisplay(this);
-
 		QuickSearchDialogFragment searchDialogFragment = getQuickSearchDialogFragment();
 		if (searchDialogFragment != null) {
 			if (searchDialogFragment.isSearchHidden()) {
@@ -770,7 +798,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 			}
 		}
 
-		getMyApplication().getAppCustomization().resumeActivity(MapActivity.class, this);
 		if (System.currentTimeMillis() - tm > 50) {
 			System.err.println("OnCreate for MapActivity took " + (System.currentTimeMillis() - tm) + " ms");
 		}
@@ -1213,6 +1240,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 	@Override
 	protected void onStart() {
 		super.onStart();
+		stopped = false;
 		wakeLockHelper.onStart(this);
 		getMyApplication().getNotificationHelper().showNotifications();
 	}
@@ -1232,6 +1260,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		if(pendingPause) {
 			onPauseActivity();
 		}
+		stopped = true;
 		super.onStop();
 	}
 
@@ -1306,7 +1335,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 
 		settings.setLastKnownMapZoom(mapView.getZoom());
 		settings.MAP_ACTIVITY_ENABLED.set(false);
-		getMyApplication().getAppCustomization().pauseActivity(MapActivity.class);
 		app.getResourceManager().interruptRendering();
 		OsmandPlugin.onMapActivityPause(this);
 	}
@@ -1567,7 +1595,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 	public void openDrawer() {
 		mapActions.updateDrawerMenu();
 		boolean animate = !settings.DO_NOT_USE_ANIMATIONS.get();
-		drawerLayout.openDrawer(Gravity.LEFT, animate);
+		drawerLayout.openDrawer(Gravity.START, animate);
 	}
 
 	public void disableDrawer() {
@@ -1591,7 +1619,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 	public boolean dispatchTouchEvent(MotionEvent event) {
 		if (settings.DO_NOT_USE_ANIMATIONS.get()) {
 			if (event.getAction() == MotionEvent.ACTION_DOWN) {
-				if (drawerLayout.isDrawerOpen(Gravity.LEFT)) {
+				if (drawerLayout.isDrawerOpen(Gravity.START)) {
 					int width = AndroidUtils.dpToPx(this, 280);
 					if (event.getRawX() > width) {
 						closeDrawer();
@@ -1605,11 +1633,11 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 
 	public void closeDrawer() {
 		boolean animate = !settings.DO_NOT_USE_ANIMATIONS.get();
-		drawerLayout.closeDrawer(Gravity.LEFT, animate);
+		drawerLayout.closeDrawer(Gravity.START, animate);
 	}
 
 	public void toggleDrawer() {
-		if (drawerLayout.isDrawerOpen(Gravity.LEFT)) {
+		if (drawerLayout.isDrawerOpen(Gravity.START)) {
 			closeDrawer();
 		} else {
 			openDrawer();
@@ -1846,6 +1874,10 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		showQuickSearch(mode, showCategories, "", null);
 	}
 
+	public void showQuickSearch(ShowQuickSearchMode mode, QuickSearchTab showSearchTab) {
+		showQuickSearch(mode, showSearchTab, "", null);
+	}
+
 	public void showQuickSearch(@NonNull ShowQuickSearchMode mode, boolean showCategories,
 								@NonNull String searchQuery, @Nullable LatLon searchLocation) {
 		if (mode == ShowQuickSearchMode.CURRENT) {
@@ -1888,6 +1920,48 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		}
 	}
 
+	public void showQuickSearch(@NonNull ShowQuickSearchMode mode, QuickSearchTab showSearchTab,
+								@NonNull String searchQuery, @Nullable LatLon searchLocation) {
+		if (mode == ShowQuickSearchMode.CURRENT) {
+			mapContextMenu.close();
+		} else {
+			hideContextMenu();
+		}
+		QuickSearchDialogFragment fragment = getQuickSearchDialogFragment();
+		if (mode == ShowQuickSearchMode.START_POINT_SELECTION || mode == ShowQuickSearchMode.DESTINATION_SELECTION
+				|| mode == ShowQuickSearchMode.DESTINATION_SELECTION_AND_START || mode == ShowQuickSearchMode.INTERMEDIATE_SELECTION) {
+			if (fragment != null) {
+				fragment.dismiss();
+			}
+			if (mode == ShowQuickSearchMode.INTERMEDIATE_SELECTION) {
+				QuickSearchDialogFragment.showInstance(this, searchQuery, null,
+						QuickSearchType.INTERMEDIATE, showSearchTab, searchLocation);
+			} else if (mode == ShowQuickSearchMode.START_POINT_SELECTION) {
+				QuickSearchDialogFragment.showInstance(this, searchQuery, null,
+						QuickSearchType.START_POINT, showSearchTab, searchLocation);
+			} else if (mode == ShowQuickSearchMode.DESTINATION_SELECTION) {
+				QuickSearchDialogFragment.showInstance(this, searchQuery, null,
+						QuickSearchType.DESTINATION, showSearchTab, searchLocation);
+			} else {
+				QuickSearchDialogFragment.showInstance(this, searchQuery, null,
+						QuickSearchType.DESTINATION_AND_START, showSearchTab, searchLocation);
+			}
+		} else if (fragment != null) {
+			if (mode == ShowQuickSearchMode.NEW
+					|| (mode == ShowQuickSearchMode.NEW_IF_EXPIRED && fragment.isExpired())) {
+				fragment.dismiss();
+				QuickSearchDialogFragment.showInstance(this, searchQuery, null,
+						QuickSearchType.REGULAR, showSearchTab, searchLocation);
+			} else {
+				fragment.show();
+			}
+			refreshMap();
+		} else {
+			QuickSearchDialogFragment.showInstance(this, searchQuery, null,
+					QuickSearchType.REGULAR, showSearchTab, searchLocation);
+		}
+	}
+
 	private void hideContextMenu() {
 		if (mapContextMenu.isVisible()) {
 			mapContextMenu.hide();
@@ -1949,6 +2023,20 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		activityResultListeners.remove(listener);
 	}
 
+	@Override
+	public void onOsmAndSettingsCustomized() {
+		if (stopped) {
+			activityRestartNeeded = true;
+		} else {
+			recreate();
+		}
+	}
+
+	@Override
+	public void onInAppPurchaseGetItems() {
+		DiscountHelper.checkAndDisplay(this);
+	}
+
 	public enum ShowQuickSearchMode {
 		NEW,
 		NEW_IF_EXPIRED,
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 62d697f3b3..9945af0815 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -5,8 +5,10 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.Bitmap;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
@@ -17,9 +19,11 @@ import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import net.osmand.AndroidUtils;
 import net.osmand.IndexConstants;
 import net.osmand.Location;
@@ -47,7 +51,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.actions.OsmAndDialogs;
-import net.osmand.plus.activities.search.SearchActivity;
+import net.osmand.plus.activities.actions.OsmandRestoreOrExitDialog;
 import net.osmand.plus.dashboard.DashboardOnMap.DashboardType;
 import net.osmand.plus.dialogs.FavoriteDialogs;
 import net.osmand.plus.download.IndexItem;
@@ -76,8 +80,29 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_ADD_GPX_WAYPOINT;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_DIRECTIONS_FROM_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_CONFIGURE_MAP_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_CONFIGURE_SCREEN_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_DASHBOARD_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_DIRECTIONS_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_DIVIDER_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_DOWNLOAD_MAPS_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_HELP_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_MAP_MARKERS_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_MEASURE_DISTANCE_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_MY_PLACES_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_OSMAND_LIVE_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_PLUGINS_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_SEARCH_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_TRAVEL_GUIDES_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_EDIT_GPX_WP;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MEASURE_DISTANCE;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_SEARCH_NEARBY;
 import static net.osmand.plus.helpers.ImportHelper.GPX_SUFFIX;
 
+
 public class MapActivityActions implements DialogProvider {
 	private static final Log LOG = PlatformUtil.getLog(MapActivityActions.class);
 	public static final String KEY_LONGITUDE = "longitude";
@@ -102,6 +127,7 @@ public class MapActivityActions implements DialogProvider {
 	private static final int DIALOG_RELOAD_TITLE = 103;
 
 	private static final int DIALOG_SAVE_DIRECTIONS = 106;
+
 	// make static
 	private static Bundle dialogBundle = new Bundle();
 
@@ -109,10 +135,18 @@ public class MapActivityActions implements DialogProvider {
 	private OsmandSettings settings;
 	private RoutingHelper routingHelper;
 
+	@NonNull
+	private ImageView drawerLogoHeader;
+	private View drawerOsmAndFooter;
+
 	public MapActivityActions(MapActivity mapActivity) {
 		this.mapActivity = mapActivity;
 		settings = mapActivity.getMyApplication().getSettings();
 		routingHelper = mapActivity.getMyApplication().getRoutingHelper();
+		drawerLogoHeader = new ImageView(mapActivity);
+		drawerLogoHeader.setPadding(-AndroidUtils.dpToPx(mapActivity, 8f), AndroidUtils.dpToPx(mapActivity, 16f), 0,
+						0);
+		drawerOsmAndFooter = mapActivity.getLayoutInflater().inflate(R.layout.powered_by_osmand_item, null);
 	}
 
 	public void addAsTarget(double latitude, double longitude, PointDescription pd) {
@@ -293,18 +327,20 @@ public class MapActivityActions implements DialogProvider {
 
 		adapter.addItem(itemBuilder
 				.setTitleId(R.string.context_menu_item_directions_from, mapActivity)
+				.setId(MAP_CONTEXT_MENU_DIRECTIONS_FROM_ID)
 				.setIcon(R.drawable.ic_action_route_direction_from_here)
 				.setOrder(DIRECTIONS_FROM_ITEM_ORDER)
 				.createItem());
 		adapter.addItem(itemBuilder
 				.setTitleId(R.string.context_menu_item_search, mapActivity)
+				.setId(MAP_CONTEXT_MENU_SEARCH_NEARBY)
 				.setIcon(R.drawable.ic_action_search_dark)
 				.setOrder(SEARCH_NEAR_ITEM_ORDER)
 				.createItem());
 
 		OsmandPlugin.registerMapContextMenu(mapActivity, latitude, longitude, adapter, selectedObj);
 
-		ContextMenuAdapter.ItemClickListener listener = new ContextMenuAdapter.ItemClickListener() {
+		ItemClickListener listener = new ItemClickListener() {
 			@Override
 			public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int resId, int pos, boolean isChecked, int[] viewCoordinates) {
 				if (resId == R.string.context_menu_item_add_waypoint) {
@@ -318,15 +354,17 @@ public class MapActivityActions implements DialogProvider {
 
 		if (selectedObj instanceof WptPt
 				&& getMyApplication().getSelectedGpxHelper().getSelectedGPXFile((WptPt) selectedObj) != null) {
-			adapter.addItem(new ContextMenuItem.ItemBuilder()
+			adapter.addItem(new ItemBuilder()
 					.setTitleId(R.string.context_menu_item_edit_waypoint, mapActivity)
+					.setId(MAP_CONTEXT_MENU_EDIT_GPX_WP)
 					.setIcon(R.drawable.ic_action_edit_dark)
 					.setOrder(EDIT_GPX_WAYPOINT_ITEM_ORDER)
 					.setListener(listener).createItem());
 		} else if (!getMyApplication().getSelectedGpxHelper().getSelectedGPXFiles().isEmpty()
 				|| (OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) != null)) {
-			adapter.addItem(new ContextMenuItem.ItemBuilder()
+			adapter.addItem(new ItemBuilder()
 					.setTitleId(R.string.context_menu_item_add_waypoint, mapActivity)
+					.setId(MAP_CONTEXT_MENU_ADD_GPX_WAYPOINT)
 					.setIcon(R.drawable.ic_action_gnew_label_dark)
 					.setOrder(ADD_GPX_WAYPOINT_ITEM_ORDER)
 					.setListener(listener).createItem());
@@ -334,6 +372,7 @@ public class MapActivityActions implements DialogProvider {
 
 		adapter.addItem(itemBuilder
 				.setTitleId(R.string.measurement_tool, mapActivity)
+				.setId(MAP_CONTEXT_MENU_MEASURE_DISTANCE)
 				.setIcon(R.drawable.ic_action_ruler)
 				.setOrder(MEASURE_DISTANCE_ITEM_ORDER)
 				.createItem());
@@ -647,8 +686,9 @@ public class MapActivityActions implements DialogProvider {
 		ContextMenuAdapter optionsMenuHelper = new ContextMenuAdapter();
 
 		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.home, mapActivity)
+				.setId(DRAWER_DASHBOARD_ID)
 				.setIcon(R.drawable.map_dashboard)
-				.setListener(new ContextMenuAdapter.ItemClickListener() {
+				.setListener(new ItemClickListener() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 						app.logEvent(mapActivity, "drawer_dashboard_open");
@@ -660,8 +700,9 @@ public class MapActivityActions implements DialogProvider {
 				}).createItem());
 
 		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.map_markers, mapActivity)
+				.setId(DRAWER_MAP_MARKERS_ID)
 				.setIcon(R.drawable.ic_action_flag_dark)
-				.setListener(new ContextMenuAdapter.ItemClickListener() {
+				.setListener(new ItemClickListener() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 						app.logEvent(mapActivity, "drawer_markers_open");
@@ -672,8 +713,9 @@ public class MapActivityActions implements DialogProvider {
 				}).createItem());
 
 		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.shared_string_my_places, mapActivity)
+				.setId(DRAWER_MY_PLACES_ID)
 				.setIcon(R.drawable.ic_action_fav_dark)
-				.setListener(new ContextMenuAdapter.ItemClickListener() {
+				.setListener(new ItemClickListener() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 						app.logEvent(mapActivity, "drawer_myplaces_open");
@@ -686,8 +728,9 @@ public class MapActivityActions implements DialogProvider {
 				}).createItem());
 
 		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.search_button, mapActivity)
+				.setId(DRAWER_SEARCH_ID)
 				.setIcon(R.drawable.ic_action_search_dark)
-				.setListener(new ContextMenuAdapter.ItemClickListener() {
+				.setListener(new ItemClickListener() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 						app.logEvent(mapActivity, "drawer_search_open");
@@ -698,8 +741,9 @@ public class MapActivityActions implements DialogProvider {
 
 		
 		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.get_directions, mapActivity)
+				.setId(DRAWER_DIRECTIONS_ID)
 				.setIcon(R.drawable.ic_action_gdirections_dark)
-				.setListener(new ContextMenuAdapter.ItemClickListener() {
+				.setListener(new ItemClickListener() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 						app.logEvent(mapActivity, "drawer_directions_open");
@@ -724,9 +768,10 @@ public class MapActivityActions implements DialogProvider {
 				}).createItem());
 		*/
 
-		optionsMenuHelper.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.configure_map, mapActivity)
+		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.configure_map, mapActivity)
+				.setId(DRAWER_CONFIGURE_MAP_ID)
 				.setIcon(R.drawable.ic_action_layers_dark)
-				.setListener(new ContextMenuAdapter.ItemClickListener() {
+				.setListener(new ItemClickListener() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 						app.logEvent(mapActivity, "drawer_config_map_open");
@@ -744,8 +789,9 @@ public class MapActivityActions implements DialogProvider {
 			}
 		}
 		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.welmode_download_maps, null)
+				.setId(DRAWER_DOWNLOAD_MAPS_ID)
 				.setTitle(d).setIcon(R.drawable.ic_type_archive)
-				.setListener(new ContextMenuAdapter.ItemClickListener() {
+				.setListener(new ItemClickListener() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 						app.logEvent(mapActivity, "drawer_download_maps_open");
@@ -759,8 +805,9 @@ public class MapActivityActions implements DialogProvider {
 
 		if (Version.isGooglePlayEnabled(app) || Version.isDeveloperVersion(app)) {
 			optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.osm_live, mapActivity)
+					.setId(DRAWER_OSMAND_LIVE_ID)
 					.setIcon(R.drawable.ic_action_osm_live)
-					.setListener(new ContextMenuAdapter.ItemClickListener() {
+					.setListener(new ItemClickListener() {
 						@Override
 						public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 							app.logEvent(mapActivity, "drawer_osm_live_open");
@@ -773,6 +820,7 @@ public class MapActivityActions implements DialogProvider {
 		}
 
 		optionsMenuHelper.addItem(new ItemBuilder().setTitle(getString(R.string.shared_string_travel_guides) + " (Beta)")
+				.setId(DRAWER_TRAVEL_GUIDES_ID)
 				.setIcon(R.drawable.ic_action_travel)
 				.setListener(new ItemClickListener() {
 					@Override
@@ -791,9 +839,10 @@ public class MapActivityActions implements DialogProvider {
 					}
 				}).createItem());
 
-		optionsMenuHelper.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.measurement_tool, mapActivity)
+		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.measurement_tool, mapActivity)
+				.setId(DRAWER_MEASURE_DISTANCE_ID)
 				.setIcon(R.drawable.ic_action_ruler)
-				.setListener(new ContextMenuAdapter.ItemClickListener() {
+				.setListener(new ItemClickListener() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int position, boolean isChecked, int[] viewCoordinates) {
 						MeasurementToolFragment.showInstance(mapActivity.getSupportFragmentManager());
@@ -804,8 +853,9 @@ public class MapActivityActions implements DialogProvider {
 		app.getAidlApi().registerNavDrawerItems(mapActivity, optionsMenuHelper);
 
 		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.layer_map_appearance, mapActivity)
+				.setId(DRAWER_CONFIGURE_SCREEN_ID)
 				.setIcon(R.drawable.ic_configure_screen_dark)
-				.setListener(new ContextMenuAdapter.ItemClickListener() {
+				.setListener(new ItemClickListener() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 						app.logEvent(mapActivity, "drawer_config_screen_open");
@@ -816,6 +866,7 @@ public class MapActivityActions implements DialogProvider {
 				}).createItem());
 
 		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.prefs_plugins, mapActivity)
+				.setId(DRAWER_PLUGINS_ID)
 				.setIcon(R.drawable.ic_extension_dark)
 				.setListener(new ItemClickListener() {
 					@Override
@@ -830,8 +881,9 @@ public class MapActivityActions implements DialogProvider {
 				}).createItem());
 
 		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.shared_string_settings, mapActivity)
+				.setId(DRAWER_SETTINGS_ID)
 				.setIcon(R.drawable.ic_action_settings)
-				.setListener(new ContextMenuAdapter.ItemClickListener() {
+				.setListener(new ItemClickListener() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 						app.logEvent(mapActivity, "drawer_settings_open");
@@ -857,8 +909,9 @@ public class MapActivityActions implements DialogProvider {
 		*/
 
 		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.shared_string_help, mapActivity)
+				.setId(DRAWER_HELP_ID)
 				.setIcon(R.drawable.ic_action_help)
-				.setListener(new ContextMenuAdapter.ItemClickListener() {
+				.setListener(new ItemClickListener() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 						app.logEvent(mapActivity, "drawer_help_open");
@@ -882,10 +935,10 @@ public class MapActivityActions implements DialogProvider {
 		}
 
 		ItemBuilder divider = new ItemBuilder().setLayout(R.layout.drawer_divider);
+		divider.setId(DRAWER_DIVIDER_ID);
 		divider.setPosition(dividerItemIndex >= 0 ? dividerItemIndex : 8);
 		optionsMenuHelper.addItem(divider.createItem());
 
-		getMyApplication().getAppCustomization().prepareOptionsMenu(mapActivity, optionsMenuHelper);
 		return optionsMenuHelper;
 	}
 
@@ -901,7 +954,7 @@ public class MapActivityActions implements DialogProvider {
 		getMyApplication().stopNavigation();
 		mapActivity.updateApplicationModeSettings();
 		mapActivity.getDashboard().clearDeletedPoints();
-		List<ApplicationMode> modes = ApplicationMode.values(settings);
+		List<ApplicationMode> modes = ApplicationMode.values(getMyApplication());
 		for (ApplicationMode mode : modes) {
 			if (settings.FORCE_PRIVATE_ACCESS_ROUTING_ASKED.getModeValue(mode)) {
 				settings.FORCE_PRIVATE_ACCESS_ROUTING_ASKED.setModeValue(mode, false);
@@ -950,6 +1003,26 @@ public class MapActivityActions implements DialogProvider {
 		menu.show();
 	}
 
+	public void restoreOrReturnDialog(final String packageName) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
+        builder.setTitle("Restore OsmAnd");
+        builder.setMessage("Do you want to Restore OsmAnd or get back to the Client App?");
+        builder.setPositiveButton("Restore", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialogInterface, int i) {
+                restoreOsmand();
+            }
+        });
+        builder.setNeutralButton("Return", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialogInterface, int i) {
+                executeHeadersIntent(packageName);
+            }
+        });
+        builder.setNegativeButton("Cancel", null);
+        builder.show();
+    }
+
 	protected void updateDrawerMenu() {
 		boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		final ListView menuItemsListView = (ListView) mapActivity.findViewById(R.id.menuItems);
@@ -958,6 +1031,17 @@ public class MapActivityActions implements DialogProvider {
 		} else {
 			menuItemsListView.setBackgroundColor(ContextCompat.getColor(mapActivity, R.color.bg_color_light));
 		}
+		menuItemsListView.removeHeaderView(drawerLogoHeader);
+		menuItemsListView.removeFooterView(drawerOsmAndFooter);
+		Bitmap navDrawerLogo = getMyApplication().getAppCustomization().getNavDrawerLogo();
+		final ArrayList<String> navDrawerLogoParams = getMyApplication().getAppCustomization().getNavDrawerLogoParams();
+
+		boolean customHeader = false;
+		if (navDrawerLogo != null) {
+			customHeader = true;
+			drawerLogoHeader.setImageBitmap(navDrawerLogo);
+			menuItemsListView.addHeaderView(drawerLogoHeader);
+		}
 		menuItemsListView.setDivider(null);
 		final ContextMenuAdapter contextMenuAdapter = createMainOptionsMenu();
 		contextMenuAdapter.setDefaultLayoutId(R.layout.simple_list_menu_item);
@@ -968,16 +1052,80 @@ public class MapActivityActions implements DialogProvider {
 			@Override
 			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 				mapActivity.dismissCardDialog();
-				ContextMenuItem item = contextMenuAdapter.getItem(position);
-				ContextMenuAdapter.ItemClickListener click = item.getItemClickListener();
-				if (click != null && click.onContextMenuClick(simpleListAdapter, item.getTitleId(),
-						position, false, AndroidUtils.getCenterViewCoordinates(view))) {
-					mapActivity.closeDrawer();
-				}
+				boolean hasHeader = menuItemsListView.getHeaderViewsCount() > 0;
+				boolean hasFooter = menuItemsListView.getFooterViewsCount() > 0;
+				if (hasHeader && position ==0 || (hasFooter && position== menuItemsListView.getCount() - 1)) {
+						if(navDrawerLogoParams!=null) executeHeadersIntent(navDrawerLogoParams.get(0));
+						else restoreOsmand();
+					} else {
+						position -= menuItemsListView.getHeaderViewsCount();
+						ContextMenuItem item = contextMenuAdapter.getItem(position);
+						ItemClickListener click = item.getItemClickListener();
+						if (click != null && click.onContextMenuClick(simpleListAdapter, item.getTitleId(),
+								position, false, AndroidUtils.getCenterViewCoordinates(view))) {
+							mapActivity.closeDrawer();
+						}
+			        }
 			}
+
 		});
+		if (customHeader) {
+			menuItemsListView.post(new Runnable() {
+				public void run() {
+					View footerLayout = mapActivity.findViewById(R.id.drawer_footer_layout);
+					boolean showFooterLayout = false;
+					if (menuItemsListView.getChildCount() > 0) {
+						int numItemsVisible = menuItemsListView.getLastVisiblePosition() -
+								menuItemsListView.getFirstVisiblePosition();
+						View lastView = menuItemsListView.getChildAt(menuItemsListView.getLastVisiblePosition());
+						boolean overlapped = lastView != null && lastView.getY() + lastView.getHeight() * 2 > menuItemsListView.getHeight();
+						if (simpleListAdapter.getCount() - 1 > numItemsVisible || overlapped) {
+							menuItemsListView.addFooterView(drawerOsmAndFooter);
+						} else {
+							showFooterLayout = true;
+						}
+					} else {
+						showFooterLayout = true;
+					}
+					if (showFooterLayout) {
+						footerLayout.setVisibility(View.VISIBLE);
+						footerLayout.setOnClickListener(new View.OnClickListener() {
+							@Override
+							public void onClick(View v) {
+								if (navDrawerLogoParams != null) {
+									mapActivity.closeDrawer();
+								}
+								new OsmandRestoreOrExitDialog()
+										.show(mapActivity.getSupportFragmentManager(), "dialog");
+								//showReturnConfirmationDialog(navDrawerLogoParams.get(0));
+
+							}
+						});
+					} else {
+						footerLayout.setVisibility(View.GONE);
+					}
+				}
+			});
+		}
 	}
 
+	private void executeHeadersIntent(String packageName) {
+		Intent launchIntent = mapActivity.getPackageManager().getLaunchIntentForPackage(packageName);
+		if(launchIntent!=null) mapActivity.startActivity(launchIntent);
+		mapActivity.closeDrawer();
+	}
+
+	private void showReturnConfirmationDialog(String packageName) {
+		restoreOrReturnDialog(packageName);
+	    mapActivity.closeDrawer();
+	}
+
+	private void restoreOsmand(){
+		getMyApplication().getAppCustomization().restoreOsmand();
+		mapActivity.closeDrawer();
+	}
+
+
 	public void setFirstMapMarkerAsTarget() {
 		if (getMyApplication().getMapMarkersHelper().getMapMarkers().size() > 0) {
 			MapMarkersHelper.MapMarker marker = getMyApplication().getMapMarkersHelper().getMapMarkers().get(0);
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
index 9ddf7b33aa..fd90b34279 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
@@ -96,7 +96,7 @@ public class MapActivityLayers {
 
 	public MapActivityLayers(MapActivity activity) {
 		this.activity = activity;
-		this.mapWidgetRegistry = new MapWidgetRegistry(activity.getMyApplication().getSettings());
+		this.mapWidgetRegistry = new MapWidgetRegistry(activity.getMyApplication());
 		this.quickActionRegistry = new QuickActionRegistry(activity.getMyApplication().getSettings());
 	}
 
@@ -307,6 +307,9 @@ public class MapActivityLayers {
 							ContextMenuItem item = listAdapter.getItem(i);
 								PoiUIFilter filter = list.get(i);
 							if (item.getSelected()) {
+								if (filter.isStandardFilter()) {
+									filter.setFilterByName(null);
+								}
 								getApplication().getPoiFilters().addSelectedPoiFilter(filter);
 							} else {
 								getApplication().getPoiFilters().removeSelectedPoiFilter(filter);
@@ -372,6 +375,9 @@ public class MapActivityLayers {
 					}
 					activity.showQuickSearch(ShowQuickSearchMode.NEW, true);
 				} else {
+					if (pf.isStandardFilter()) {
+						pf.setFilterByName(null);
+					}
 					getApplication().getPoiFilters().clearSelectedPoiFilters();
 					getApplication().getPoiFilters().addSelectedPoiFilter(pf);
 					mapView.refreshMap();
diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandInAppPurchaseActivity.java b/OsmAnd/src/net/osmand/plus/activities/OsmandInAppPurchaseActivity.java
index 3ba69e5c6e..ef8a7826f5 100644
--- a/OsmAnd/src/net/osmand/plus/activities/OsmandInAppPurchaseActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/OsmandInAppPurchaseActivity.java
@@ -176,7 +176,7 @@ public class OsmandInAppPurchaseActivity extends AppCompatActivity implements In
 
 	@Override
 	public void onItemPurchased(String sku, boolean active) {
-		if (purchaseHelper != null && purchaseHelper.getSkuLiveUpdates().equals(sku)) {
+		if (purchaseHelper != null && purchaseHelper.getLiveUpdates().containsSku(sku)) {
 			getMyApplication().logEvent(this, "live_osm_subscription_purchased");
 
 			if (!active) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
index 19150482af..d1f251407f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
@@ -324,20 +324,21 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
 	@Override
     public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		settings = getMyApplication().getSettings();
+		OsmandApplication app = getMyApplication();
+		settings = app.getSettings();
 		getToolbar().setTitle(R.string.shared_string_settings);
 
 		
 		if (profileSettings) {
 			modes.clear();
-			for (ApplicationMode a : ApplicationMode.values(settings)) {
+			for (ApplicationMode a : ApplicationMode.values(app)) {
 				if (a != ApplicationMode.DEFAULT) {
 					modes.add(a);
 				}
 			}
 			List<String> s = new ArrayList<String>();
 			for (ApplicationMode a : modes) {
-				s.add(a.toHumanString(getMyApplication()));
+				s.add(a.toHumanString(app));
 			}
 			SpinnerAdapter spinnerAdapter = new SpinnerAdapter(this,
 					R.layout.spinner_item, s);
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index 2b45f1141c..8070c39317 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -1,30 +1,6 @@
 package net.osmand.plus.activities;
 
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import net.osmand.IProgress;
-import net.osmand.IndexConstants;
-import net.osmand.data.PointDescription;
-import net.osmand.osm.io.NetworkUtils;
-import net.osmand.plus.ApplicationMode;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.OsmandSettings.DrivingRegion;
-import net.osmand.plus.OsmandSettings.MetricsConstants;
-import net.osmand.plus.R;
-import net.osmand.plus.Version;
-import net.osmand.plus.base.MapViewTrackingUtilities;
-import net.osmand.plus.dashboard.DashChooseAppDirFragment;
-import net.osmand.plus.dashboard.DashChooseAppDirFragment.ChooseAppDirFragment;
-import net.osmand.plus.dashboard.DashChooseAppDirFragment.MoveFilesToDifferentDirectory;
-import net.osmand.plus.dialogs.ConfigureMapMenu;
-import net.osmand.plus.download.DownloadActivity;
-import net.osmand.plus.render.NativeOsmandLibrary;
-import net.osmand.render.RenderingRulesStorage;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
@@ -55,6 +31,31 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import net.osmand.IProgress;
+import net.osmand.IndexConstants;
+import net.osmand.data.PointDescription;
+import net.osmand.osm.io.NetworkUtils;
+import net.osmand.plus.ApplicationMode;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.OsmandSettings.DrivingRegion;
+import net.osmand.plus.OsmandSettings.MetricsConstants;
+import net.osmand.plus.R;
+import net.osmand.plus.Version;
+import net.osmand.plus.base.MapViewTrackingUtilities;
+import net.osmand.plus.dashboard.DashChooseAppDirFragment;
+import net.osmand.plus.dashboard.DashChooseAppDirFragment.ChooseAppDirFragment;
+import net.osmand.plus.dashboard.DashChooseAppDirFragment.MoveFilesToDifferentDirectory;
+import net.osmand.plus.dialogs.ConfigureMapMenu;
+import net.osmand.plus.download.DownloadActivity;
+import net.osmand.plus.render.NativeOsmandLibrary;
+import net.osmand.render.RenderingRulesStorage;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 
 public class SettingsGeneralActivity extends SettingsBaseActivity implements OnRequestPermissionsResultCallback {
 
@@ -80,13 +81,13 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
 		String[] entries;
 		String[] entrieValues;
 		PreferenceScreen screen = getPreferenceScreen();
-		settings = getMyApplication().getSettings();
+		OsmandApplication app = getMyApplication();
+		settings = app.getSettings();
 
-
-		ApplicationMode[] appModes = ApplicationMode.values(settings).toArray(new ApplicationMode[0]);
+		ApplicationMode[] appModes = ApplicationMode.values(app).toArray(new ApplicationMode[0]);
 		entries = new String[appModes.length];
 		for (int i = 0; i < entries.length; i++) {
-			entries[i] = appModes[i].toHumanString(getMyApplication());
+			entries[i] = appModes[i].toHumanString(app);
 		}
 		registerListPreference(settings.DEFAULT_APPLICATION_MODE, screen, entries, appModes);
 
@@ -298,17 +299,17 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
 				getString(R.string.lang_es),
 				getString(R.string.lang_es_ar),
 				getString(R.string.lang_es_us),
-				getString(R.string.lang_eu) + incompleteSuffix,
+				getString(R.string.lang_eu),
 				getString(R.string.lang_fa),
 				getString(R.string.lang_fi) + incompleteSuffix,
 				getString(R.string.lang_fr),
-				getString(R.string.lang_gl) + incompleteSuffix,
+				getString(R.string.lang_gl),
 				getString(R.string.lang_he) + incompleteSuffix,
 				getString(R.string.lang_hr) + incompleteSuffix,
 				getString(R.string.lang_hsb) + incompleteSuffix,
 				getString(R.string.lang_hu),
 				getString(R.string.lang_hy),
-				getString(R.string.lang_is) + incompleteSuffix,
+				getString(R.string.lang_is),
 				getString(R.string.lang_it),
 				getString(R.string.lang_ja),
 				getString(R.string.lang_ka) + incompleteSuffix,
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
index 79c75a4456..0acac76133 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
@@ -23,7 +23,6 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import net.osmand.IndexConstants;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
@@ -38,6 +37,7 @@ import net.osmand.plus.Version;
 import net.osmand.plus.download.DownloadActivity;
 import net.osmand.plus.download.DownloadActivityType;
 import net.osmand.plus.helpers.FileNameTranslationHelper;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper;
 import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.plus.voice.CommandPlayer;
 import net.osmand.router.GeneralRouter;
@@ -45,14 +45,11 @@ import net.osmand.router.GeneralRouter.RoutingParameter;
 import net.osmand.router.GeneralRouter.RoutingParameterType;
 import net.osmand.util.Algorithms;
 
-import java.io.File;
 import java.util.ArrayList;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static net.osmand.plus.mapcontextmenu.other.RoutePreferencesMenu.getVoiceFiles;
 
 public class SettingsNavigationActivity extends SettingsBaseActivity {
 
@@ -246,7 +243,7 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 	private void reloadVoiceListPreference(PreferenceScreen screen) {
 		String[] entries;
 		String[] entrieValues;
-		Set<String> voiceFiles = getVoiceFiles(this);
+		Set<String> voiceFiles = getMyApplication().getRoutingOptionsHelper().getVoiceFiles(this);
 		entries = new String[voiceFiles.size() + 2];
 		entrieValues = new String[voiceFiles.size() + 2];
 		int k = 0;
@@ -306,7 +303,7 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 			clearParameters();
 			if (router != null) {
 				Map<String, RoutingParameter> parameters = router.getParameters();
-				if(parameters.containsKey("short_way")) {
+				if(parameters.containsKey(GeneralRouter.USE_SHORTEST_WAY)) {
 					cat.addPreference(fastRoute);
 				}
 				List<RoutingParameter> others = new ArrayList<GeneralRouter.RoutingParameter>();
@@ -319,7 +316,7 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 						preferParameters.add(routingParameter);
 					} else if ("relief_smoothness_factor".equals(routingParameter.getGroup())) {
 						reliefFactorParameters.add(routingParameter);
-					} else if (!param.equals("short_way") && !"driving_style".equals(routingParameter.getGroup())) {
+					} else if (!param.equals(GeneralRouter.USE_SHORTEST_WAY) && !RoutingOptionsHelper.DRIVING_STYLE.equals(routingParameter.getGroup())) {
 						others.add(routingParameter);
 					}
 				}
diff --git a/OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoDialogFragment.java b/OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoDialogFragment.java
index 4d8b0bf59b..f504dba879 100644
--- a/OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoDialogFragment.java
@@ -53,21 +53,20 @@ import net.osmand.data.PointDescription;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GPXUtilities.GPXTrackAnalysis;
-import net.osmand.plus.GPXUtilities.Track;
 import net.osmand.plus.GPXUtilities.TrkSegment;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
-import net.osmand.plus.UiUtilities;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetAxisType;
 import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetType;
 import net.osmand.plus.helpers.GpxUiHelper.OrderedLineDataSet;
-import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
+import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
 import net.osmand.plus.routing.RouteDirectionInfo;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.views.TurnPathHelper;
@@ -90,7 +89,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import static net.osmand.binary.RouteDataObject.HEIGHT_UNDEFINED;
 
 public class ShowRouteInfoDialogFragment extends DialogFragment {
 
@@ -102,9 +100,7 @@ public class ShowRouteInfoDialogFragment extends DialogFragment {
 	private RouteInfoAdapter adapter;
 	private GPXFile gpx;
 	private OrderedLineDataSet elevationDataSet;
-	private OrderedLineDataSet slopeDataSet;
 	private GpxDisplayItem gpxItem;
-	private boolean hasHeights;
 
 	public ShowRouteInfoDialogFragment() {
 	}
@@ -205,7 +201,7 @@ public class ShowRouteInfoDialogFragment extends DialogFragment {
 		});
 
 		makeGpx();
-		if (hasHeights) {
+		if (gpx.hasAltitude) {
 			View headerView = inflater.inflate(R.layout.route_info_header, null);
 			buildHeader(headerView);
 			listView.addHeaderView(headerView);
@@ -321,43 +317,13 @@ public class ShowRouteInfoDialogFragment extends DialogFragment {
 	}
 
 	private void makeGpx() {
-		double lastHeight = HEIGHT_UNDEFINED;
-		gpx = new GPXFile();
-		List<Location> locations = helper.getRoute().getRouteLocations();
-		if (locations != null) {
-			Track track = new Track();
-			TrkSegment seg = new TrkSegment();
-			for (Location l : locations) {
-				WptPt point = new WptPt();
-				point.lat = l.getLatitude();
-				point.lon = l.getLongitude();
-				if (l.hasAltitude()) {
-					if (!hasHeights) {
-						hasHeights = true;
-					}
-					float h = (float) l.getAltitude();
-					point.ele = h;
-					if (lastHeight == HEIGHT_UNDEFINED && seg.points.size() > 0) {
-						for (WptPt pt : seg.points) {
-							if (Double.isNaN(pt.ele)) {
-								pt.ele = h;
-							}
-						}
-					}
-					lastHeight = h;
-				}
-				seg.points.add(point);
-			}
-			track.segments.add(seg);
-			gpx.tracks.add(track);
-
-			String groupName = getMyApplication().getString(R.string.current_route);
-			GpxDisplayGroup group = getMyApplication().getSelectedGpxHelper().buildGpxDisplayGroup(gpx, 0, groupName);
-			if (group != null && group.getModifiableList().size() > 0) {
-				gpxItem = group.getModifiableList().get(0);
-				if (gpxItem != null) {
-					gpxItem.route = true;
-				}
+		gpx = GPXUtilities.makeGpxFromRoute(helper.getRoute());
+		String groupName = getMyApplication().getString(R.string.current_route);
+		GpxDisplayGroup group = getMyApplication().getSelectedGpxHelper().buildGpxDisplayGroup(gpx, 0, groupName);
+		if (group != null && group.getModifiableList().size() > 0) {
+			gpxItem = group.getModifiableList().get(0);
+			if (gpxItem != null) {
+				gpxItem.route = true;
 			}
 		}
 	}
@@ -375,6 +341,7 @@ public class ShowRouteInfoDialogFragment extends DialogFragment {
 		});
 
 		GPXTrackAnalysis analysis = gpx.getAnalysis(0);
+		OrderedLineDataSet slopeDataSet;
 		if (analysis.hasElevationData) {
 			List<ILineDataSet> dataSets = new ArrayList<>();
 			elevationDataSet = GpxUiHelper.createGPXElevationDataSet(app, mChart, analysis,
diff --git a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
index 564fc109ba..3b01d00303 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
@@ -1,5 +1,6 @@
 package net.osmand.plus.activities;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.os.AsyncTask;
@@ -9,9 +10,11 @@ import android.support.annotation.Nullable;
 import android.support.design.widget.BottomNavigationView;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBar;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 
 import net.osmand.AndroidUtils;
 import net.osmand.data.LatLon;
@@ -20,7 +23,6 @@ import net.osmand.data.QuadRect;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
-import net.osmand.plus.GPXUtilities.Track;
 import net.osmand.plus.GPXUtilities.TrkSegment;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper;
@@ -35,7 +37,6 @@ import net.osmand.plus.mapmarkers.CoordinateInputDialogFragment;
 import net.osmand.plus.measurementtool.NewGpxData;
 import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.myplaces.SplitSegmentDialogFragment;
-import net.osmand.plus.myplaces.TrackActivityFragmentAdapter;
 import net.osmand.plus.myplaces.TrackBitmapDrawer;
 import net.osmand.plus.myplaces.TrackBitmapDrawer.TrackBitmapDrawerListener;
 import net.osmand.plus.myplaces.TrackPointFragment;
@@ -156,56 +157,11 @@ public class TrackActivity extends TabActivity {
 	}
 
 	public QuadRect getRect() {
-		double left = 0, right = 0;
-		double top = 0, bottom = 0;
 		if (getGpx() != null) {
-			for (Track track : getGpx().tracks) {
-				for (TrkSegment segment : track.segments) {
-					for (WptPt p : segment.points) {
-						if (left == 0 && right == 0) {
-							left = p.getLongitude();
-							right = p.getLongitude();
-							top = p.getLatitude();
-							bottom = p.getLatitude();
-						} else {
-							left = Math.min(left, p.getLongitude());
-							right = Math.max(right, p.getLongitude());
-							top = Math.max(top, p.getLatitude());
-							bottom = Math.min(bottom, p.getLatitude());
-						}
-					}
-				}
-			}
-			for (WptPt p : getGpx().getPoints()) {
-				if (left == 0 && right == 0) {
-					left = p.getLongitude();
-					right = p.getLongitude();
-					top = p.getLatitude();
-					bottom = p.getLatitude();
-				} else {
-					left = Math.min(left, p.getLongitude());
-					right = Math.max(right, p.getLongitude());
-					top = Math.max(top, p.getLatitude());
-					bottom = Math.min(bottom, p.getLatitude());
-				}
-			}
-			for (GPXUtilities.Route route : getGpx().routes) {
-				for (WptPt p : route.points) {
-					if (left == 0 && right == 0) {
-						left = p.getLongitude();
-						right = p.getLongitude();
-						top = p.getLatitude();
-						bottom = p.getLatitude();
-					} else {
-						left = Math.min(left, p.getLongitude());
-						right = Math.max(right, p.getLongitude());
-						top = Math.max(top, p.getLatitude());
-						bottom = Math.min(bottom, p.getLatitude());
-					}
-				}
-			}
+			return getGpx().getRect();
+		} else {
+			return new QuadRect(0, 0, 0, 0);
 		}
-		return new QuadRect(left, top, right, bottom);
 	}
 
 	protected void setGpxDataItem(GpxDataItem gpxDataItem) {
@@ -383,8 +339,11 @@ public class TrackActivity extends TabActivity {
 		setGpx(gpxFile);
 		setGpxDataItem(file != null ? app.getGpxDatabase().getItem(file) : null);
 
-		if (gpxFile != null) {
-			trackBitmapDrawer = new TrackBitmapDrawer(this, gpxFile, getGpxDataItem(), getRect());
+		WindowManager mgr = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+		if (gpxFile != null && mgr != null) {
+			DisplayMetrics dm = new DisplayMetrics();
+			mgr.getDefaultDisplay().getMetrics(dm);
+			trackBitmapDrawer = new TrackBitmapDrawer(app, gpxFile, getGpxDataItem(), getRect(), dm.density, dm.widthPixels, AndroidUtils.dpToPx(app, 152f));
 		}
 
 		for (WeakReference<Fragment> f : fragList) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java b/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
index dbc59ddadb..2bfe724593 100644
--- a/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
+++ b/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
@@ -1,6 +1,9 @@
 package net.osmand.plus.activities.actions;
 
 import android.app.Activity;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.support.annotation.LayoutRes;
 import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -22,10 +25,11 @@ import java.util.Set;
 public class AppModeDialog {
 
 	public static View prepareAppModeView(Activity a, final Set<ApplicationMode> selected, boolean showDefault,
-			ViewGroup parent, final boolean singleSelection, boolean useListBg, boolean useMapTheme, final View.OnClickListener onClickListener) {
-		OsmandSettings settings = ((OsmandApplication) a.getApplication()).getSettings();
-		final List<ApplicationMode> values = new ArrayList<ApplicationMode>(ApplicationMode.values(settings));
-		if(!showDefault) {
+	                                      ViewGroup parent, final boolean singleSelection, boolean useListBg, boolean useMapTheme, final View.OnClickListener onClickListener) {
+		OsmandApplication app = (OsmandApplication) a.getApplication();
+		OsmandSettings settings = app.getSettings();
+		final List<ApplicationMode> values = new ArrayList<>(ApplicationMode.values(app));
+		if (!showDefault) {
 			values.remove(ApplicationMode.DEFAULT);
 		}
 		if (showDefault || (settings.getApplicationMode() != ApplicationMode.DEFAULT && !singleSelection)) {
@@ -37,17 +41,24 @@ public class AppModeDialog {
 	//special method for drawer menu
 	//needed because if there's more than 4 items  - the don't fit in drawer
 	public static View prepareAppModeDrawerView(Activity a, final Set<ApplicationMode> selected,
-												boolean useMapTheme, final View.OnClickListener onClickListener) {
-		OsmandSettings settings = ((OsmandApplication) a.getApplication()).getSettings();
-		final List<ApplicationMode> values = new ArrayList<ApplicationMode>(ApplicationMode.values(settings));
+	                                            boolean useMapTheme, final View.OnClickListener onClickListener) {
+		OsmandApplication app = (OsmandApplication) a.getApplication();
+		OsmandSettings settings = app.getSettings();
+		final List<ApplicationMode> values = new ArrayList<>(ApplicationMode.values(app));
 		selected.add(settings.getApplicationMode());
 		return prepareAppModeView(a, values, selected, null, true, true, useMapTheme, onClickListener);
 	}
-	
-	public static View prepareAppModeView(Activity a, final List<ApplicationMode> values , final Set<ApplicationMode> selected, 
-				ViewGroup parent, final boolean singleSelection, boolean useListBg, boolean useMapTheme, final View.OnClickListener onClickListener) {
-		View ll = a.getLayoutInflater().inflate(R.layout.mode_toggles, parent);
+
+	public static View prepareAppModeView(Activity a, final List<ApplicationMode> values, final Set<ApplicationMode> selected,
+	                                      ViewGroup parent, final boolean singleSelection, boolean useListBg, boolean useMapTheme, final View.OnClickListener onClickListener) {
 		boolean nightMode = isNightMode(((OsmandApplication) a.getApplication()), useMapTheme);
+
+		return prepareAppModeView(a, values, selected, parent, singleSelection, useListBg, useMapTheme, onClickListener, nightMode);
+	}
+
+	public static View prepareAppModeView(Activity a, final List<ApplicationMode> values, final Set<ApplicationMode> selected,
+	                                      ViewGroup parent, final boolean singleSelection, boolean useListBg, boolean useMapTheme, final View.OnClickListener onClickListener, boolean nightMode) {
+		View ll = a.getLayoutInflater().inflate(R.layout.mode_toggles, parent);
 		if (useListBg) {
 			AndroidUtils.setListItemBackground(a, ll, nightMode);
 		} else {
@@ -55,26 +66,25 @@ public class AppModeDialog {
 		}
 		final View[] buttons = new View[values.size()];
 		int k = 0;
-		for(ApplicationMode ma : values) {
-			buttons[k++] = createToggle(a.getLayoutInflater(), (OsmandApplication) a.getApplication(), (LinearLayout) ll.findViewById(R.id.app_modes_content), ma, useMapTheme);
+		for (ApplicationMode ma : values) {
+			buttons[k++] = createToggle(a.getLayoutInflater(), (OsmandApplication) a.getApplication(), R.layout.mode_view, (LinearLayout) ll.findViewById(R.id.app_modes_content), ma, useMapTheme);
 		}
 		for (int i = 0; i < buttons.length; i++) {
 			updateButtonState((OsmandApplication) a.getApplication(), values, selected, onClickListener, buttons, i,
-					singleSelection, useMapTheme);
+					singleSelection, useMapTheme, nightMode);
 		}
 		return ll;
 	}
 
 
-	private static void updateButtonState(final OsmandApplication ctx, final List<ApplicationMode> visible,
-			final Set<ApplicationMode> selected, final View.OnClickListener onClickListener, final View[] buttons,
-			int i, final boolean singleChoice, final boolean useMapTheme) {
+	public static void updateButtonState(final OsmandApplication ctx, final List<ApplicationMode> visible,
+	                                     final Set<ApplicationMode> selected, final View.OnClickListener onClickListener, final View[] buttons,
+	                                     int i, final boolean singleChoice, final boolean useMapTheme, final boolean nightMode) {
 		if (buttons[i] != null) {
 			View tb = buttons[i];
 			final ApplicationMode mode = visible.get(i);
 			final boolean checked = selected.contains(mode);
 			ImageView iv = (ImageView) tb.findViewById(R.id.app_mode_icon);
-			boolean nightMode = isNightMode(ctx, useMapTheme);
 			if (checked) {
 				iv.setImageDrawable(ctx.getUIUtilities().getIcon(mode.getSmallIconDark(), nightMode ? R.color.route_info_checked_mode_icon_color_dark : R.color.route_info_checked_mode_icon_color_light));
 				iv.setContentDescription(String.format("%s %s", mode.toHumanString(ctx), ctx.getString(R.string.item_checked)));
@@ -109,19 +119,86 @@ public class AppModeDialog {
 					if (onClickListener != null) {
 						onClickListener.onClick(null);
 					}
-					for(int i = 0; i < visible.size(); i++) {
-						updateButtonState(ctx, visible, selected, onClickListener, buttons, i, singleChoice, useMapTheme);
+					for (int i = 0; i < visible.size(); i++) {
+						updateButtonState(ctx, visible, selected, onClickListener, buttons, i, singleChoice, useMapTheme, nightMode);
 					}
 				}
 			});
 		}
 	}
 
+	public static void updateButtonState2(final OsmandApplication ctx, final List<ApplicationMode> visible,
+	                                      final Set<ApplicationMode> selected, final View.OnClickListener onClickListener, final View[] buttons,
+	                                      int i, final boolean singleChoice, final boolean useMapTheme, final boolean nightMode) {
+		if (buttons[i] != null) {
+			View tb = buttons[i];
+			final ApplicationMode mode = visible.get(i);
+			final boolean checked = selected.contains(mode);
+			ImageView iv = (ImageView) tb.findViewById(R.id.app_mode_icon);
+			View selection = tb.findViewById(R.id.selection);
 
-	static private View createToggle(LayoutInflater layoutInflater, OsmandApplication ctx, LinearLayout layout, ApplicationMode mode, boolean useMapTheme){
+			if (checked) {
+				Drawable drawable = ctx.getUIUtilities().getIcon(mode.getSmallIconDark(), nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+				iv.setImageDrawable(drawable);
+				iv.setContentDescription(String.format("%s %s", mode.toHumanString(ctx), ctx.getString(R.string.item_checked)));
+
+				if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+					AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+				} else {
+					AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.btn_border_trans_light, R.drawable.btn_border_trans_dark);
+				}
+				AndroidUtils.setBackground(ctx, iv, nightMode, R.drawable.btn_border_trans_light, R.drawable.ripple_dark);
+			} else {
+				if (useMapTheme) {
+					Drawable drawable = ctx.getUIUtilities().getIcon(mode.getSmallIconDark(), nightMode ? R.color.route_info_control_icon_color_dark : R.color.route_info_control_icon_color_light);
+					if (Build.VERSION.SDK_INT >= 21) {
+						Drawable active = ctx.getUIUtilities().getIcon(mode.getSmallIconDark(), nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+						drawable = AndroidUtils.createPressedStateListDrawable(drawable, active);
+					}
+					iv.setImageDrawable(drawable);
+					if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+						AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+					} else {
+						AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.btn_border_pressed_light, R.drawable.btn_border_pressed_dark);
+					}
+				} else {
+					iv.setImageDrawable(ctx.getUIUtilities().getThemedIcon(mode.getSmallIconDark()));
+				}
+				AndroidUtils.setBackground(ctx, iv, nightMode, R.drawable.btn_border_pressed_light, R.drawable.btn_border_pressed_dark);
+				iv.setContentDescription(String.format("%s %s", mode.toHumanString(ctx), ctx.getString(R.string.item_unchecked)));
+			}
+			tb.setOnClickListener(new View.OnClickListener() {
+
+				@Override
+				public void onClick(View v) {
+					boolean isChecked = !checked;
+					if (singleChoice) {
+						if (isChecked) {
+							selected.clear();
+							selected.add(mode);
+						}
+					} else {
+						if (isChecked) {
+							selected.add(mode);
+						} else {
+							selected.remove(mode);
+						}
+					}
+					if (onClickListener != null) {
+						onClickListener.onClick(null);
+					}
+					for (int i = 0; i < visible.size(); i++) {
+						updateButtonState2(ctx, visible, selected, onClickListener, buttons, i, singleChoice, useMapTheme, nightMode);
+					}
+				}
+			});
+		}
+	}
+
+	static public View createToggle(LayoutInflater layoutInflater, OsmandApplication ctx, @LayoutRes int layoutId, LinearLayout layout, ApplicationMode mode, boolean useMapTheme) {
 		int metricsX = (int) ctx.getResources().getDimension(R.dimen.route_info_modes_height);
 		int metricsY = (int) ctx.getResources().getDimension(R.dimen.route_info_modes_height);
-		View tb = layoutInflater.inflate(R.layout.mode_view, null);
+		View tb = layoutInflater.inflate(layoutId, null);
 		ImageView iv = (ImageView) tb.findViewById(R.id.app_mode_icon);
 		iv.setImageDrawable(ctx.getUIUtilities().getIcon(mode.getSmallIconDark(), isNightMode(ctx, useMapTheme) ? R.color.route_info_checked_mode_icon_color_dark : R.color.route_info_checked_mode_icon_color_light));
 		iv.setContentDescription(mode.toHumanString(ctx));
diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/OsmandRestoreOrExitDialog.java b/OsmAnd/src/net/osmand/plus/activities/actions/OsmandRestoreOrExitDialog.java
new file mode 100644
index 0000000000..ee3e27ba43
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/activities/actions/OsmandRestoreOrExitDialog.java
@@ -0,0 +1,64 @@
+package net.osmand.plus.activities.actions;
+
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+import java.text.MessageFormat;
+import net.osmand.plus.R;
+import net.osmand.plus.base.BottomSheetDialogFragment;
+import net.osmand.plus.helpers.FontCache;
+
+public class OsmandRestoreOrExitDialog extends BottomSheetDialogFragment {
+
+	private String clientAppTitle = "";
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
+		View view = getActivity().getLayoutInflater()
+				.inflate(R.layout.dash_restore_osmand_fragment, container, false);
+		try {
+			clientAppTitle = getMyApplication().getAppCustomization().getNavFooterParams().getAppName();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		String msg = MessageFormat.format(getString(R.string.run_full_osmand_msg), clientAppTitle);
+		Typeface typeface = FontCache.getRobotoMedium(getActivity());
+		Typeface typefaceReg = FontCache.getRobotoRegular(getActivity());
+		TextView header = view.findViewById(R.id.run_full_osmand_header);
+		header.setTypeface(typeface);
+
+		TextView message = view.findViewById(R.id.run_full_osmand_message);
+		message.setTypeface(typefaceReg);
+		message.setText(msg);
+
+		Button cancelBtn = view.findViewById(R.id.cancel_full_osmand_btn);
+		cancelBtn.setTypeface(typeface);
+		cancelBtn.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				dismiss();
+			}
+		});
+
+		Button launchBtn = view.findViewById(R.id.launch_full_osmand_btn);
+		launchBtn.setTypeface(typeface);
+		launchBtn.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				getMyApplication().getAppCustomization().restoreOsmand();
+				dismiss();
+			}
+		});
+
+		return view;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java b/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
index d49079edd0..900cb464da 100644
--- a/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
+++ b/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
@@ -35,7 +35,9 @@ public class StartGPSStatus extends OsmAndAction {
 		GPS_TEST("GPS Test", "com.chartcross.gpstest", "com.chartcross.gpstestplus", ""),
 		INVIU_GPS("inViu GPS-details ", "de.enaikoon.android.inviu.gpsdetails", "", ""),
 		ANDROI_TS_GPS_TEST("AndroiTS GPS Test", "com.androits.gps.test.free", "com.androits.gps.test.pro", ""),
-		SAT_STAT("SatStat (F-droid)", "com.vonglasow.michael.satstat", "", "");
+		SAT_STAT("SatStat (F-droid)", "com.vonglasow.michael.satstat", "", ""),
+		GPSTESTSS("GPSTest (F-droid)", "com.android.gpstest", "", "");
+
 		
 		public final String stringRes;
 		public final String appName;
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index 8f3208daa7..bb0777836e 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -91,6 +91,8 @@ import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import static net.osmand.plus.OsmAndCustomizationConstants.RECORDING_LAYER;
+
 
 public class AudioVideoNotesPlugin extends OsmandPlugin {
 
@@ -640,6 +642,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			}
 		};
 		adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.layer_recordings, app)
+				.setId(RECORDING_LAYER)
 				.setSelected(SHOW_RECORDINGS.get())
 				.setIcon(R.drawable.ic_action_micro_dark)
 				.setColor(SHOW_RECORDINGS.get() ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
index e655960eea..d6e20a7d3e 100644
--- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
@@ -25,7 +25,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.dashboard.DashboardOnMap;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.routing.RoutingHelper.IRouteInformationListener;
+import net.osmand.plus.routing.IRouteInformationListener;
 import net.osmand.plus.views.AnimateDraggingMapThread;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.util.MapUtils;
@@ -127,7 +127,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 			headingChanged = Math.abs(MapUtils.degreesDiff(prevHeading, heading)) > 1.0;
 		}
 		if (mapView != null) {
-			float speedForDirectionOfMovement = settings.SWITCH_MAP_DIRECTION_TO_COMPASS.get();
+			float speedForDirectionOfMovement = settings.SWITCH_MAP_DIRECTION_TO_COMPASS.get()/3.6f;
 			boolean smallSpeedForDirectionOfMovement = speedForDirectionOfMovement != 0 && 
 					myLocation != null && isSmallSpeedForDirectionOfMovement(myLocation, speedForDirectionOfMovement);
 			if ((settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_COMPASS || (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING && smallSpeedForDirectionOfMovement)) && !routePlanningMode) {
@@ -182,7 +182,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 					zoom = autozoom(tb, location);
 				}
 				int currentMapRotation = settings.ROTATE_MAP.get();
-				float speedForDirectionOfMovement = settings.SWITCH_MAP_DIRECTION_TO_COMPASS.get();
+				float speedForDirectionOfMovement = settings.SWITCH_MAP_DIRECTION_TO_COMPASS.get()/3.6f;
 				boolean smallSpeedForDirectionOfMovement = speedForDirectionOfMovement != 0
 						&& isSmallSpeedForDirectionOfMovement(location, speedForDirectionOfMovement);
 				boolean smallSpeedForCompass = isSmallSpeedForCompass(location);
diff --git a/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java
index 97284d81db..590c383ea2 100644
--- a/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java
@@ -74,9 +74,7 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
 			itemsContainer.setVisibility(View.VISIBLE);
 		}
 
-		for (BaseBottomSheetItem item : items) {
-			item.inflate(app, itemsContainer, nightMode);
-		}
+		inflateMenuItems();
 
 		int bottomDividerColorId = getBottomDividerColorId();
 		if (bottomDividerColorId != DEFAULT_VALUE) {
@@ -90,24 +88,29 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
 				dismiss();
 			}
 		});
-		((TextView) mainView.findViewById(R.id.dismiss_button_text)).setText(getDismissButtonTextId());
+		if (hideButtonsContainer()) {
+			mainView.findViewById(R.id.bottom_row_divider).setVisibility(View.GONE);
+			mainView.findViewById(R.id.buttons_container).setVisibility(View.GONE);
+		} else {
+			((TextView) mainView.findViewById(R.id.dismiss_button_text)).setText(getDismissButtonTextId());
 
-		int rightBottomButtonTextId = getRightBottomButtonTextId();
-		if (rightBottomButtonTextId != DEFAULT_VALUE) {
-			View buttonsDivider = mainView.findViewById(R.id.bottom_buttons_divider);
-			buttonsDivider.setVisibility(View.VISIBLE);
-			if (bottomDividerColorId != DEFAULT_VALUE) {
-				buttonsDivider.setBackgroundColor(getResolvedColor(bottomDividerColorId));
-			}
-			View rightButton = mainView.findViewById(R.id.right_bottom_button);
-			rightButton.setVisibility(View.VISIBLE);
-			rightButton.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					onRightBottomButtonClick();
+			int rightBottomButtonTextId = getRightBottomButtonTextId();
+			if (rightBottomButtonTextId != DEFAULT_VALUE) {
+				View buttonsDivider = mainView.findViewById(R.id.bottom_buttons_divider);
+				buttonsDivider.setVisibility(View.VISIBLE);
+				if (bottomDividerColorId != DEFAULT_VALUE) {
+					buttonsDivider.setBackgroundColor(getResolvedColor(bottomDividerColorId));
 				}
-			});
-			((TextView) rightButton.findViewById(R.id.right_bottom_button_text)).setText(rightBottomButtonTextId);
+				View rightButton = mainView.findViewById(R.id.right_bottom_button);
+				rightButton.setVisibility(View.VISIBLE);
+				rightButton.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						onRightBottomButtonClick();
+					}
+				});
+				((TextView) rightButton.findViewById(R.id.right_bottom_button_text)).setText(rightBottomButtonTextId);
+			}
 		}
 
 		setupHeightAndBackground(mainView);
@@ -143,6 +146,13 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
 
 	public abstract void createMenuItems(Bundle savedInstanceState);
 
+	protected void inflateMenuItems(){
+		OsmandApplication app = getMyApplication();
+		for (BaseBottomSheetItem item : items) {
+			item.inflate(app, itemsContainer, nightMode);
+		}
+	}
+
 	@Override
 	protected Drawable getContentIcon(@DrawableRes int id) {
 		return getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.on_map_icon_color);
@@ -174,7 +184,11 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
 			public void onGlobalLayout() {
 				final View contentView = useScrollableItemsContainer() ? mainView.findViewById(R.id.scroll_view) : itemsContainer;
 				if (contentView.getHeight() > contentHeight) {
-					contentView.getLayoutParams().height = contentHeight;
+					if (useScrollableItemsContainer()) {
+						contentView.getLayoutParams().height = contentHeight;
+					} else {
+						contentView.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
+					}
 					contentView.requestLayout();
 				}
 
@@ -182,6 +196,9 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
 				boolean showTopShadow = screenHeight - statusBarHeight - mainView.getHeight() >= AndroidUtils.dpToPx(activity, 8);
 				if (AndroidUiHelper.isOrientationPortrait(activity)) {
 					mainView.setBackgroundResource(showTopShadow ? getPortraitBgResId() : getBgColorId());
+					if (!showTopShadow) {
+						mainView.setPadding(0, 0, 0, 0);
+					}
 				} else {
 					mainView.setBackgroundResource(showTopShadow ? getLandscapeTopsidesBgResId() : getLandscapeSidesBgResId());
 				}
@@ -215,6 +232,10 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
 		return true;
 	}
 
+	protected boolean hideButtonsContainer() {
+		return false;
+	}
+
 	@ColorRes
 	protected int getBottomDividerColorId() {
 		return DEFAULT_VALUE;
diff --git a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithCompoundButton.java b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithCompoundButton.java
index a0b1d87107..7722438cdb 100644
--- a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithCompoundButton.java
+++ b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithCompoundButton.java
@@ -59,16 +59,20 @@ public class BottomSheetItemWithCompoundButton extends BottomSheetItemWithDescri
 
 	public void setChecked(boolean checked) {
 		this.checked = checked;
-		compoundButton.setChecked(checked);
+		if (compoundButton != null) {
+			compoundButton.setChecked(checked);
+		}
 	}
 
 	@Override
 	public void inflate(OsmandApplication app, ViewGroup container, boolean nightMode) {
 		super.inflate(app, container, nightMode);
 		compoundButton = (CompoundButton) view.findViewById(R.id.compound_button);
-		compoundButton.setChecked(checked);
-		CompoundButtonCompat.setButtonTintList(compoundButton, buttonTintList);
-		compoundButton.setOnCheckedChangeListener(onCheckedChangeListener);
+		if (compoundButton != null) {
+			compoundButton.setChecked(checked);
+			CompoundButtonCompat.setButtonTintList(compoundButton, buttonTintList);
+			compoundButton.setOnCheckedChangeListener(onCheckedChangeListener);
+		}
 	}
 
 	public static class Builder extends BottomSheetItemWithDescription.Builder {
diff --git a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/SimpleBottomSheetItem.java b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/SimpleBottomSheetItem.java
index 53b861fea6..cff7feb2e3 100644
--- a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/SimpleBottomSheetItem.java
+++ b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/SimpleBottomSheetItem.java
@@ -19,6 +19,9 @@ public class SimpleBottomSheetItem extends BaseBottomSheetItem {
 	@ColorRes
 	protected int titleColorId = INVALID_ID;
 
+	private TextView titleTv;
+	private ImageView iconView;
+
 	public SimpleBottomSheetItem(View customView,
 								 @LayoutRes int layoutId,
 								 Object tag,
@@ -38,14 +41,25 @@ public class SimpleBottomSheetItem extends BaseBottomSheetItem {
 
 	}
 
+	public void setTitle(String title) {
+		this.title = title;
+		titleTv.setText(title);
+	}
+
+	public void setIcon(Drawable icon) {
+		this.icon = icon;
+		iconView.setImageDrawable(icon);
+	}
+
 	@Override
 	public void inflate(OsmandApplication app, ViewGroup container, boolean nightMode) {
 		super.inflate(app, container, nightMode);
-		if (icon != null) {
-			((ImageView) view.findViewById(R.id.icon)).setImageDrawable(icon);
+		iconView = ((ImageView) view.findViewById(R.id.icon));
+		if (iconView != null) {
+			iconView.setImageDrawable(icon);
 		}
-		if (title != null) {
-			TextView titleTv = (TextView) view.findViewById(R.id.title);
+		titleTv = (TextView) view.findViewById(R.id.title);
+		if (title != null && titleTv != null) {
 			titleTv.setText(title);
 			if (titleColorId != INVALID_ID) {
 				titleTv.setTextColor(ContextCompat.getColor(app, titleColorId));
diff --git a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/simpleitems/DividerStartItem.java b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/simpleitems/DividerStartItem.java
new file mode 100644
index 0000000000..b429bf1db5
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/simpleitems/DividerStartItem.java
@@ -0,0 +1,31 @@
+package net.osmand.plus.base.bottomsheetmenu.simpleitems;
+
+import android.content.Context;
+import android.support.annotation.ColorRes;
+
+import net.osmand.plus.R;
+
+public class DividerStartItem extends DividerItem {
+
+	public DividerStartItem(Context context) {
+		super(context);
+	}
+
+	public DividerStartItem(Context context, @ColorRes int colorId) {
+		super(context, colorId);
+	}
+
+	public DividerStartItem(Context context, @ColorRes int colorId, int position) {
+		super(context, colorId, position);
+	}
+
+	@Override
+	protected int getBottomMargin(Context context) {
+		return context.getResources().getDimensionPixelSize(R.dimen.bottom_sheet_divider_margin_top);
+	}
+
+	@Override
+	protected int getLeftMargin(Context context) {
+		return context.getResources().getDimensionPixelSize(R.dimen.bottom_sheet_divider_margin_start);
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/simpleitems/SimpleDividerItem.java b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/simpleitems/SimpleDividerItem.java
new file mode 100644
index 0000000000..8a34b7784d
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/simpleitems/SimpleDividerItem.java
@@ -0,0 +1,29 @@
+package net.osmand.plus.base.bottomsheetmenu.simpleitems;
+
+import android.content.Context;
+import android.support.annotation.ColorRes;
+
+public class SimpleDividerItem extends DividerItem {
+
+	public SimpleDividerItem(Context context) {
+		super(context);
+	}
+
+	public SimpleDividerItem(Context context, @ColorRes int colorId) {
+		super(context, colorId);
+	}
+
+	public SimpleDividerItem(Context context, @ColorRes int colorId, int position) {
+		super(context, colorId, position);
+	}
+
+	@Override
+	protected int getTopMargin(Context context) {
+		return 0;
+	}
+
+	@Override
+	protected int getBottomMargin(Context context) {
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/simpleitems/TitleItem.java b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/simpleitems/TitleItem.java
index 18a25d73b3..737585275f 100644
--- a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/simpleitems/TitleItem.java
+++ b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/simpleitems/TitleItem.java
@@ -1,5 +1,6 @@
 package net.osmand.plus.base.bottomsheetmenu.simpleitems;
 
+import android.support.annotation.ColorRes;
 import android.view.ViewGroup;
 
 import net.osmand.plus.OsmandApplication;
@@ -13,9 +14,17 @@ public class TitleItem extends SimpleBottomSheetItem {
 		this.layoutId = R.layout.bottom_sheet_item_title;
 	}
 
+	public TitleItem(String title, @ColorRes int titleColorId) {
+		this.title = title;
+		this.layoutId = R.layout.bottom_sheet_item_title;
+		this.titleColorId = titleColorId;
+	}
+
 	@Override
 	public void inflate(OsmandApplication app, ViewGroup container, boolean nightMode) {
-		titleColorId = nightMode ? R.color.ctx_menu_info_text_dark : INVALID_ID;
+		if (titleColorId == INVALID_ID) {
+			titleColorId = nightMode ? R.color.ctx_menu_info_text_dark : INVALID_ID;
+		}
 		super.inflate(app, container, nightMode);
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java
index e17b432e9a..4b8ca2cb07 100644
--- a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java
@@ -1,9 +1,12 @@
 package net.osmand.plus.chooseplan;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.ColorRes;
@@ -25,6 +28,7 @@ import android.view.Window;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import net.osmand.AndroidUtils;
 import net.osmand.PlatformUtil;
@@ -39,11 +43,17 @@ import net.osmand.plus.download.DownloadValidationManager;
 import net.osmand.plus.inapp.InAppPurchaseHelper;
 import net.osmand.plus.inapp.InAppPurchaseHelper.InAppPurchaseListener;
 import net.osmand.plus.inapp.InAppPurchaseHelper.InAppPurchaseTaskType;
+import net.osmand.plus.inapp.InAppPurchases.InAppPurchase;
+import net.osmand.plus.inapp.InAppPurchases.InAppSubscription;
+import net.osmand.plus.liveupdates.SubscriptionFragment;
 import net.osmand.plus.srtmplugin.SRTMPlugin;
 import net.osmand.plus.widgets.TextViewEx;
+import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
 
+import java.util.List;
+
 public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment implements InAppPurchaseListener {
 	public static final String TAG = ChoosePlanDialogFragment.class.getSimpleName();
 	private static final Log LOG = PlatformUtil.getLog(ChoosePlanDialogFragment.class);
@@ -53,34 +63,42 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
 
 	private boolean nightMode;
 
-	private View osmLiveCardButton;
+	private ViewGroup osmLiveCardButtonsContainer;
+	private ProgressBar osmLiveCardProgress;
 	private View planTypeCardButton;
+	private View planTypeCardButtonDisabled;
 
 	public interface ChoosePlanDialogListener {
 		void onChoosePlanDialogDismiss();
 	}
 
 	public enum OsmAndFeature {
-		WIKIVOYAGE_OFFLINE(R.string.wikivoyage_offline),
-		DAILY_MAP_UPDATES(R.string.daily_map_updates),
-		MONTHLY_MAP_UPDATES(R.string.monthly_map_updates),
-		UNLIMITED_DOWNLOADS(R.string.unlimited_downloads),
-		WIKIPEDIA_OFFLINE(R.string.wikipedia_offline),
-		CONTOUR_LINES_HILLSHADE_MAPS(R.string.contour_lines_hillshade_maps),
-		SEA_DEPTH_MAPS(R.string.index_item_depth_contours_osmand_ext),
-		UNLOCK_ALL_FEATURES(R.string.unlock_all_features),
-		DONATION_TO_OSM(R.string.donation_to_osm);
+		WIKIVOYAGE_OFFLINE(R.string.wikivoyage_offline, R.drawable.ic_action_explore),
+		DAILY_MAP_UPDATES(R.string.daily_map_updates, R.drawable.ic_action_time_span),
+		MONTHLY_MAP_UPDATES(R.string.monthly_map_updates, R.drawable.ic_action_sand_clock),
+		UNLIMITED_DOWNLOADS(R.string.unlimited_downloads, R.drawable.ic_action_unlimited_download),
+		WIKIPEDIA_OFFLINE(R.string.wikipedia_offline, R.drawable.ic_plugin_wikipedia),
+		CONTOUR_LINES_HILLSHADE_MAPS(R.string.contour_lines_hillshade_maps, R.drawable.ic_plugin_srtm),
+		SEA_DEPTH_MAPS(R.string.index_item_depth_contours_osmand_ext, R.drawable.ic_action_nautical_depth),
+		UNLOCK_ALL_FEATURES(R.string.unlock_all_features, R.drawable.ic_action_osmand_logo),
+		DONATION_TO_OSM(R.string.donation_to_osm, 0);
 
 		private final int key;
+		private final int iconId;
 
-		OsmAndFeature(int key) {
+		OsmAndFeature(int key, int iconId) {
 			this.key = key;
+			this.iconId = iconId;
 		}
 
 		public String toHumanString(Context ctx) {
 			return ctx.getString(key);
 		}
 
+		public int getIconId() {
+			return iconId;
+		}
+
 		public boolean isFeaturePurchased(OsmandApplication ctx) {
 			if (InAppPurchaseHelper.isSubscribedToLiveUpdates(ctx)) {
 				return true;
@@ -205,7 +223,7 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
 	public void onDismiss(DialogInterface dialog) {
 		super.onDismiss(dialog);
 		Activity activity = getActivity();
-		if (activity != null && activity instanceof ChoosePlanDialogListener) {
+		if (activity instanceof ChoosePlanDialogListener) {
 			((ChoosePlanDialogListener) activity).onChoosePlanDialogDismiss();
 		}
 	}
@@ -239,12 +257,25 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
 
 	public abstract String getPlanTypeHeaderDescription();
 
-	public abstract String getPlanTypeButtonTitle();
+	public String getPlanTypeButtonTitle() {
+		InAppPurchase purchase = getPlanTypePurchase();
+		if (purchase != null) {
+			if (purchase.isPurchased()) {
+				return purchase.getPrice(getContext());
+			} else {
+				return getString(R.string.purchase_unlim_title, purchase.getPrice(getContext()));
+			}
+		}
+		return "";
+	}
 
 	public abstract String getPlanTypeButtonDescription();
 
 	public abstract void setPlanTypeButtonClickListener(View button);
 
+	@Nullable
+	public abstract InAppPurchase getPlanTypePurchase();
+
 	private View inflate(@LayoutRes int layoutId, @Nullable ViewGroup container) {
 		int themeRes = nightMode ? R.style.OsmandDarkTheme_DarkActionbar : R.style.OsmandLightTheme_DarkActionbar_LightStatusBar;
 		return LayoutInflater.from(new ContextThemeWrapper(getContext(), themeRes))
@@ -252,7 +283,7 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
 	}
 
 	private ViewGroup buildOsmLiveCard(@NonNull Context ctx, ViewGroup container) {
-		ViewGroup cardView = (ViewGroup) inflate(R.layout.purchase_dialog_active_card, container);
+		ViewGroup cardView = (ViewGroup) inflate(R.layout.purchase_dialog_osm_live_card, container);
 		TextView headerTitle = (TextView) cardView.findViewById(R.id.header_title);
 		TextView headerDescr = (TextView) cardView.findViewById(R.id.header_descr);
 		headerTitle.setText(R.string.osm_live);
@@ -269,6 +300,7 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
 				imgView.setVisibility(View.GONE);
 				imgPurchasedView.setVisibility(View.VISIBLE);
 			} else {
+				imgView.setImageResource(feature.getIconId());
 				imgView.setVisibility(View.VISIBLE);
 				imgPurchasedView.setVisibility(View.GONE);
 			}
@@ -283,54 +315,228 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
 		if (featureRowDiv != null) {
 			featureRowDiv.setVisibility(View.GONE);
 		}
-		TextViewEx cardDescription = (TextViewEx) cardView.findViewById(R.id.card_descr);
-		cardDescription.setText(R.string.osm_live_payment_desc);
-
-		osmLiveCardButton = cardView.findViewById(R.id.card_button);
 
+		osmLiveCardButtonsContainer = (ViewGroup) cardView.findViewById(R.id.card_buttons_container);
+		osmLiveCardProgress = (ProgressBar) cardView.findViewById(R.id.card_progress);
+		if (osmLiveCardProgress != null) {
+			int color =  ContextCompat.getColor(ctx, nightMode ? R.color.wikivoyage_active_dark : R.color.wikivoyage_active_light);
+			osmLiveCardProgress.getIndeterminateDrawable().setColorFilter(color, android.graphics.PorterDuff.Mode.MULTIPLY);
+		}
 		return cardView;
 	}
 
-	private void setupOsmLiveCardButton(boolean progress) {
-		if (osmLiveCardButton != null) {
-			ProgressBar progressBar = (ProgressBar) osmLiveCardButton.findViewById(R.id.card_button_progress);
-			TextViewEx buttonTitle = (TextViewEx) osmLiveCardButton.findViewById(R.id.card_button_title);
-			TextViewEx buttonSubtitle = (TextViewEx) osmLiveCardButton.findViewById(R.id.card_button_subtitle);
-			if (purchaseHelper == null || !purchaseHelper.hasPrices()) {
-				buttonTitle.setText(getString(R.string.purchase_subscription_title, getString(R.string.osm_live_default_price)));
-			} else {
-				buttonTitle.setText(getString(R.string.purchase_subscription_title, purchaseHelper.getLiveUpdatesPrice()));
+	@SuppressLint("CutPasteId")
+	private void setupOsmLiveCardButtons(boolean progress) {
+		final Context ctx = getContext();
+		if (ctx == null) {
+			return;
+		}
+		if (progress) {
+			if (osmLiveCardButtonsContainer != null) {
+				osmLiveCardButtonsContainer.setVisibility(View.GONE);
 			}
-			buttonSubtitle.setText(R.string.osm_live_month_cost_desc);
-			if (progress) {
-				buttonTitle.setVisibility(View.GONE);
-				buttonSubtitle.setVisibility(View.GONE);
-				progressBar.setVisibility(View.VISIBLE);
-				osmLiveCardButton.setOnClickListener(null);
-			} else {
-				buttonTitle.setVisibility(View.VISIBLE);
-				buttonSubtitle.setVisibility(View.VISIBLE);
-				progressBar.setVisibility(View.GONE);
-				osmLiveCardButton.setOnClickListener(new OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						subscript();
+			if (osmLiveCardProgress != null) {
+				osmLiveCardProgress.setVisibility(View.VISIBLE);
+			}
+		} else if (osmLiveCardButtonsContainer != null) {
+			osmLiveCardButtonsContainer.removeAllViews();
+			View lastBtn = null;
+			InAppSubscription monthlyLiveUpdates = purchaseHelper.getMonthlyLiveUpdates();
+			double regularMonthlyPrice = monthlyLiveUpdates.getPriceValue();
+			List<InAppSubscription> visibleSubscriptions = purchaseHelper.getLiveUpdates().getVisibleSubscriptions();
+			boolean anyPurchased = false;
+			for (final InAppSubscription s : visibleSubscriptions) {
+				if (s.isPurchased()) {
+					anyPurchased = true;
+					break;
+				}
+			}
+			for (final InAppSubscription s : visibleSubscriptions) {
+				if (s.isPurchased()) {
+					View buttonPurchased = inflate(R.layout.purchase_dialog_card_button_active_ex, osmLiveCardButtonsContainer);
+					View buttonContainer = buttonPurchased.findViewById(R.id.button_container);
+					TextViewEx title = (TextViewEx) buttonPurchased.findViewById(R.id.title);
+					TextViewEx description = (TextViewEx) buttonPurchased.findViewById(R.id.description);
+					TextViewEx buttonTitle = (TextViewEx) buttonPurchased.findViewById(R.id.button_title);
+					View buttonView = buttonPurchased.findViewById(R.id.button_view);
+					View buttonCancelView = buttonPurchased.findViewById(R.id.button_cancel_view);
+					View divTop = buttonPurchased.findViewById(R.id.div_top);
+					View divBottom = buttonPurchased.findViewById(R.id.div_bottom);
+					View div = buttonPurchased.findViewById(R.id.div);
+
+					title.setText(s.getTitle(ctx));
+					description.setText(s.getDescription(ctx));
+					buttonTitle.setText(s.getPrice(ctx));
+					buttonView.setVisibility(View.VISIBLE);
+					buttonCancelView.setVisibility(View.GONE);
+					buttonPurchased.setOnClickListener(null);
+					divTop.setVisibility(View.VISIBLE);
+					div.setVisibility(View.VISIBLE);
+					divBottom.setVisibility(View.GONE);
+					if (s.isDonationSupported()) {
+						buttonPurchased.setOnClickListener(new OnClickListener() {
+							@Override
+							public void onClick(View v) {
+								showDonationSettings();
+								dismiss();
+							}
+						});
+					} else {
+						buttonPurchased.setOnClickListener(null);
 					}
-				});
+					osmLiveCardButtonsContainer.addView(buttonPurchased);
+
+					View buttonCancel = inflate(R.layout.purchase_dialog_card_button_active_ex, osmLiveCardButtonsContainer);
+					buttonContainer = buttonCancel.findViewById(R.id.button_container);
+					title = (TextViewEx) buttonCancel.findViewById(R.id.title);
+					description = (TextViewEx) buttonCancel.findViewById(R.id.description);
+					buttonView = buttonCancel.findViewById(R.id.button_view);
+					buttonCancelView = buttonCancel.findViewById(R.id.button_cancel_view);
+					divTop = buttonCancel.findViewById(R.id.div_top);
+					divBottom = buttonCancel.findViewById(R.id.div_bottom);
+					div = buttonCancel.findViewById(R.id.div);
+
+					title.setText(getString(R.string.osm_live_payment_current_subscription));
+					description.setText(s.getRenewDescription(ctx));
+					buttonView.setVisibility(View.GONE);
+					buttonCancelView.setVisibility(View.VISIBLE);
+					buttonCancel.setOnClickListener(new OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							manageSubscription(ctx, s.getSku());
+						}
+					});
+					divTop.setVisibility(View.GONE);
+					div.setVisibility(View.GONE);
+					divBottom.setVisibility(View.VISIBLE);
+					osmLiveCardButtonsContainer.addView(buttonCancel);
+
+					if (lastBtn != null) {
+						View lastBtnDiv = lastBtn.findViewById(R.id.div);
+						if (lastBtnDiv != null) {
+							lastBtnDiv.setVisibility(View.GONE);
+						}
+						View lastBtnDivBottom = lastBtn.findViewById(R.id.div_bottom);
+						if (lastBtnDivBottom != null) {
+							lastBtnDivBottom.setVisibility(View.GONE);
+						}
+					}
+					lastBtn = buttonCancel;
+
+				} else {
+					View button = inflate(R.layout.purchase_dialog_card_button_ex, osmLiveCardButtonsContainer);
+					TextViewEx title = (TextViewEx) button.findViewById(R.id.title);
+					TextViewEx description = (TextViewEx) button.findViewById(R.id.description);
+
+					View buttonView = button.findViewById(R.id.button_view);
+					View buttonExView = button.findViewById(R.id.button_ex_view);
+					TextViewEx buttonTitle = (TextViewEx) button.findViewById(R.id.button_title);
+					TextViewEx buttonExTitle = (TextViewEx) button.findViewById(R.id.button_ex_title);
+					buttonView.setVisibility(anyPurchased ? View.VISIBLE : View.GONE);
+					buttonExView.setVisibility(!anyPurchased ? View.VISIBLE : View.GONE);
+
+					TextViewEx discountRegular = (TextViewEx) button.findViewById(R.id.discount_banner_regular);
+					TextViewEx discountActive = (TextViewEx) button.findViewById(R.id.discount_banner_active);
+					View div = button.findViewById(R.id.div);
+
+					title.setText(s.getTitle(ctx));
+					description.setText(s.getDescription(ctx));
+					buttonTitle.setText(s.getPrice(ctx));
+					buttonExTitle.setText(s.getPrice(ctx));
+
+					if (regularMonthlyPrice > 0 && s.getMonthlyPriceValue() > 0 && s.getMonthlyPriceValue() < regularMonthlyPrice) {
+						int discount = (int) ((1 - s.getMonthlyPriceValue() / regularMonthlyPrice) * 100d);
+						String discountStr = discount + "%";
+						if (discount > 50) {
+							discountActive.setText(String.format(" %s ", getString(R.string.osm_live_payment_discount_descr, discountStr)));
+							discountActive.setVisibility(View.VISIBLE);
+							discountRegular.setVisibility(View.GONE);
+						} else if (discount > 0) {
+							discountActive.setVisibility(View.GONE);
+							discountRegular.setText(String.format(" %s ", getString(R.string.osm_live_payment_discount_descr, discountStr)));
+							discountRegular.setVisibility(View.VISIBLE);
+						} else {
+							discountActive.setVisibility(View.GONE);
+							discountRegular.setVisibility(View.GONE);
+						}
+					} else {
+						discountActive.setVisibility(View.GONE);
+						discountRegular.setVisibility(View.GONE);
+					}
+					button.setOnClickListener(new OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							subscribe(s.getSku());
+						}
+					});
+					if (anyPurchased) {
+						buttonView.setOnClickListener(new OnClickListener() {
+							@Override
+							public void onClick(View v) {
+								subscribe(s.getSku());
+							}
+						});
+					} else {
+						buttonExView.setOnClickListener(new OnClickListener() {
+							@Override
+							public void onClick(View v) {
+								subscribe(s.getSku());
+							}
+						});
+					}
+					div.setVisibility(View.VISIBLE);
+					osmLiveCardButtonsContainer.addView(button);
+					lastBtn = button;
+				}
+			}
+			if (lastBtn != null) {
+				View div = lastBtn.findViewById(R.id.div);
+				if (div != null) {
+					div.setVisibility(View.GONE);
+				}
+				View divBottom = lastBtn.findViewById(R.id.div_bottom);
+				if (divBottom != null) {
+					divBottom.setVisibility(View.GONE);
+				}
+			}
+			if (osmLiveCardProgress != null) {
+				osmLiveCardProgress.setVisibility(View.GONE);
+			}
+			osmLiveCardButtonsContainer.setVisibility(View.VISIBLE);
+		}
+	}
+
+	private void showDonationSettings() {
+		FragmentActivity activity = getActivity();
+		if (activity != null) {
+			SubscriptionFragment subscriptionFragment = new SubscriptionFragment();
+			subscriptionFragment.show(activity.getSupportFragmentManager(), SubscriptionFragment.TAG);
+		}
+	}
+
+	private void subscribe(String sku) {
+		if (!app.getSettings().isInternetConnectionAvailable(true)) {
+			Toast.makeText(app, R.string.internet_not_available, Toast.LENGTH_LONG).show();
+		} else {
+			FragmentActivity ctx = getActivity();
+			if (ctx != null && purchaseHelper != null) {
+				OsmandSettings settings = app.getSettings();
+				purchaseHelper.purchaseLiveUpdates(ctx, sku,
+						settings.BILLING_USER_EMAIL.get(),
+						settings.BILLING_USER_NAME.get(),
+						settings.BILLING_USER_COUNTRY_DOWNLOAD_NAME.get(),
+						settings.BILLING_HIDE_USER_NAME.get());
 			}
 		}
 	}
 
-	private void subscript() {
-		FragmentActivity ctx = getActivity();
-		if (ctx != null && purchaseHelper != null) {
-			OsmandSettings settings = app.getSettings();
-			purchaseHelper.purchaseLiveUpdates(ctx,
-					settings.BILLING_USER_EMAIL.get(),
-					settings.BILLING_USER_NAME.get(),
-					settings.BILLING_USER_COUNTRY_DOWNLOAD_NAME.get(),
-					settings.BILLING_HIDE_USER_NAME.get());
+	private void manageSubscription(@NonNull Context ctx, @Nullable String sku) {
+		String url = "https://play.google.com/store/account/subscriptions?package=" + ctx.getPackageName();
+		if (!Algorithms.isEmpty(sku)) {
+			url += "&sku=" + sku;
 		}
+		Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+		startActivity(intent);
 	}
 
 	private ViewGroup buildPlanTypeCard(@NonNull Context ctx, ViewGroup container) {
@@ -366,6 +572,7 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
 				imgView.setVisibility(View.GONE);
 				imgPurchasedView.setVisibility(View.VISIBLE);
 			} else {
+				imgView.setImageResource(feature.getIconId());
 				imgView.setVisibility(View.VISIBLE);
 				imgPurchasedView.setVisibility(View.GONE);
 			}
@@ -380,27 +587,44 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
 		cardDescription.setText(R.string.in_app_purchase_desc_ex);
 
 		planTypeCardButton = cardView.findViewById(R.id.card_button);
+		planTypeCardButtonDisabled = cardView.findViewById(R.id.card_button_disabled);
 
 		return cardView;
 	}
 
-	private void setupPlanTypeCardButton(boolean progress) {
-		if (planTypeCardButton != null) {
+	private void setupPlanTypeCardButtons(boolean progress) {
+		if (planTypeCardButton != null && planTypeCardButtonDisabled != null) {
+			InAppPurchase purchase = getPlanTypePurchase();
+			boolean purchased = purchase != null && purchase.isPurchased();
+
 			ProgressBar progressBar = (ProgressBar) planTypeCardButton.findViewById(R.id.card_button_progress);
 			TextViewEx buttonTitle = (TextViewEx) planTypeCardButton.findViewById(R.id.card_button_title);
 			TextViewEx buttonSubtitle = (TextViewEx) planTypeCardButton.findViewById(R.id.card_button_subtitle);
 			buttonTitle.setText(getPlanTypeButtonTitle());
 			buttonSubtitle.setText(getPlanTypeButtonDescription());
 			if (progress) {
+				planTypeCardButton.setVisibility(View.VISIBLE);
+				planTypeCardButtonDisabled.setVisibility(View.GONE);
 				buttonTitle.setVisibility(View.GONE);
 				buttonSubtitle.setVisibility(View.GONE);
 				progressBar.setVisibility(View.VISIBLE);
 				planTypeCardButton.setOnClickListener(null);
 			} else {
-				buttonTitle.setVisibility(View.VISIBLE);
-				buttonSubtitle.setVisibility(View.VISIBLE);
-				progressBar.setVisibility(View.GONE);
-				setPlanTypeButtonClickListener(planTypeCardButton);
+				if (!purchased) {
+					planTypeCardButton.setVisibility(View.VISIBLE);
+					planTypeCardButtonDisabled.setVisibility(View.GONE);
+					buttonTitle.setVisibility(View.VISIBLE);
+					buttonSubtitle.setVisibility(View.VISIBLE);
+					progressBar.setVisibility(View.GONE);
+					setPlanTypeButtonClickListener(planTypeCardButton);
+				} else {
+					planTypeCardButton.setVisibility(View.GONE);
+					planTypeCardButtonDisabled.setVisibility(View.VISIBLE);
+					buttonTitle = (TextViewEx) planTypeCardButtonDisabled.findViewById(R.id.card_button_title);
+					buttonSubtitle = (TextViewEx) planTypeCardButtonDisabled.findViewById(R.id.card_button_subtitle);
+					buttonTitle.setText(getPlanTypeButtonTitle());
+					buttonSubtitle.setText(getPlanTypeButtonDescription());
+				}
 			}
 		}
 	}
@@ -408,7 +632,7 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
 	@Nullable
 	public MapActivity getMapActivity() {
 		Activity activity = getActivity();
-		if (activity != null && activity instanceof MapActivity) {
+		if (activity instanceof MapActivity) {
 			return (MapActivity) activity;
 		}
 		return null;
@@ -424,11 +648,11 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
 		}
 
 		boolean requestingInventory = purchaseHelper != null && purchaseHelper.getActiveTask() == InAppPurchaseTaskType.REQUEST_INVENTORY;
-		if (osmLiveCardButton != null) {
-			setupOsmLiveCardButton(requestingInventory);
+		if (osmLiveCardButtonsContainer != null) {
+			setupOsmLiveCardButtons(requestingInventory);
 		}
 		if (planTypeCardButton != null) {
-			setupPlanTypeCardButton(requestingInventory);
+			setupPlanTypeCardButtons(requestingInventory);
 		}
 	}
 
@@ -445,8 +669,8 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
 	@Override
 	public void onError(InAppPurchaseTaskType taskType, String error) {
 		if (taskType == InAppPurchaseTaskType.REQUEST_INVENTORY) {
-			setupOsmLiveCardButton(false);
-			setupPlanTypeCardButton(false);
+			setupOsmLiveCardButtons(false);
+			setupPlanTypeCardButtons(false);
 		}
 	}
 
@@ -456,22 +680,28 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
 
 	@Override
 	public void onItemPurchased(String sku, boolean active) {
+		if (purchaseHelper != null) {
+			InAppSubscription s = purchaseHelper.getLiveUpdates().getSubscriptionBySku(sku);
+			if (s != null && s.isDonationSupported()) {
+				showDonationSettings();
+			}
+		}
 		dismiss();
 	}
 
 	@Override
 	public void showProgress(InAppPurchaseTaskType taskType) {
 		if (taskType == InAppPurchaseTaskType.REQUEST_INVENTORY) {
-			setupOsmLiveCardButton(true);
-			setupPlanTypeCardButton(true);
+			setupOsmLiveCardButtons(true);
+			setupPlanTypeCardButtons(true);
 		}
 	}
 
 	@Override
 	public void dismissProgress(InAppPurchaseTaskType taskType) {
 		if (taskType == InAppPurchaseTaskType.REQUEST_INVENTORY) {
-			setupOsmLiveCardButton(false);
-			setupPlanTypeCardButton(false);
+			setupOsmLiveCardButtons(false);
+			setupPlanTypeCardButtons(false);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanFreeBannerDialogFragment.java b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanFreeBannerDialogFragment.java
index 3a680a09f5..2544c037bb 100644
--- a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanFreeBannerDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanFreeBannerDialogFragment.java
@@ -1,12 +1,14 @@
 package net.osmand.plus.chooseplan;
 
 import android.app.Activity;
+import android.support.annotation.Nullable;
 import android.view.View;
 
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.OsmandInAppPurchaseActivity;
 import net.osmand.plus.inapp.InAppPurchaseHelper;
+import net.osmand.plus.inapp.InAppPurchases.InAppPurchase;
 
 public class ChoosePlanFreeBannerDialogFragment extends ChoosePlanDialogFragment {
 	public static final String TAG = ChoosePlanFreeBannerDialogFragment.class.getSimpleName();
@@ -19,7 +21,6 @@ public class ChoosePlanFreeBannerDialogFragment extends ChoosePlanDialogFragment
 			OsmAndFeature.CONTOUR_LINES_HILLSHADE_MAPS,
 			OsmAndFeature.SEA_DEPTH_MAPS,
 			OsmAndFeature.UNLOCK_ALL_FEATURES,
-			OsmAndFeature.DONATION_TO_OSM,
 	};
 	private final OsmAndFeature[] selectedOsmLiveFeatures = {
 			OsmAndFeature.DAILY_MAP_UPDATES,
@@ -73,16 +74,6 @@ public class ChoosePlanFreeBannerDialogFragment extends ChoosePlanDialogFragment
 		}
 	}
 
-	@Override
-	public String getPlanTypeButtonTitle() {
-		InAppPurchaseHelper purchaseHelper = getOsmandApplication().getInAppPurchaseHelper();
-		if (purchaseHelper == null || !purchaseHelper.hasPrices()) {
-			return getString(R.string.purchase_unlim_title, getString(R.string.full_version_price));
-		} else {
-			return getString(R.string.purchase_unlim_title, purchaseHelper.getFullVersionPrice());
-		}
-	}
-
 	@Override
 	public String getPlanTypeButtonDescription() {
 		return getString(R.string.in_app_purchase_desc);
@@ -107,4 +98,14 @@ public class ChoosePlanFreeBannerDialogFragment extends ChoosePlanDialogFragment
 			}
 		});
 	}
+
+	@Nullable
+	@Override
+	public InAppPurchase getPlanTypePurchase() {
+		InAppPurchaseHelper purchaseHelper = getOsmandApplication().getInAppPurchaseHelper();
+		if (purchaseHelper != null) {
+			return purchaseHelper.getFullVersion();
+		}
+		return null;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanHillshadeSrtmDialogFragment.java b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanHillshadeSrtmDialogFragment.java
index e81ff851eb..4580830191 100644
--- a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanHillshadeSrtmDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanHillshadeSrtmDialogFragment.java
@@ -1,11 +1,13 @@
 package net.osmand.plus.chooseplan;
 
 import android.app.Activity;
+import android.support.annotation.Nullable;
 import android.view.View;
 
 import net.osmand.plus.R;
 import net.osmand.plus.activities.OsmandInAppPurchaseActivity;
 import net.osmand.plus.inapp.InAppPurchaseHelper;
+import net.osmand.plus.inapp.InAppPurchases.InAppPurchase;
 
 public class ChoosePlanHillshadeSrtmDialogFragment extends ChoosePlanDialogFragment {
 	public static final String TAG = ChoosePlanHillshadeSrtmDialogFragment.class.getSimpleName();
@@ -18,7 +20,6 @@ public class ChoosePlanHillshadeSrtmDialogFragment extends ChoosePlanDialogFragm
 			OsmAndFeature.WIKIPEDIA_OFFLINE,
 			OsmAndFeature.WIKIVOYAGE_OFFLINE,
 			OsmAndFeature.UNLOCK_ALL_FEATURES,
-			OsmAndFeature.DONATION_TO_OSM,
 	};
 	private final OsmAndFeature[] selectedOsmLiveFeatures = {
 			OsmAndFeature.CONTOUR_LINES_HILLSHADE_MAPS,
@@ -65,16 +66,6 @@ public class ChoosePlanHillshadeSrtmDialogFragment extends ChoosePlanDialogFragm
 		return getString(R.string.paid_plugin);
 	}
 
-	@Override
-	public String getPlanTypeButtonTitle() {
-		InAppPurchaseHelper purchaseHelper = getOsmandApplication().getInAppPurchaseHelper();
-		if (purchaseHelper == null || !purchaseHelper.hasPrices()) {
-			return getString(R.string.purchase_unlim_title, getString(R.string.srtm_plugin_price));
-		} else {
-			return getString(R.string.purchase_unlim_title, purchaseHelper.getContourLinesPrice());
-		}
-	}
-
 	@Override
 	public String getPlanTypeButtonDescription() {
 		return getString(R.string.in_app_purchase_desc);
@@ -93,4 +84,14 @@ public class ChoosePlanHillshadeSrtmDialogFragment extends ChoosePlanDialogFragm
 			}
 		});
 	}
+
+	@Nullable
+	@Override
+	public InAppPurchase getPlanTypePurchase() {
+		InAppPurchaseHelper purchaseHelper = getOsmandApplication().getInAppPurchaseHelper();
+		if (purchaseHelper != null) {
+			return purchaseHelper.getContourLines();
+		}
+		return null;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanSeaDepthMapsDialogFragment.java b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanSeaDepthMapsDialogFragment.java
index 2d789707d0..f80cbc8e05 100644
--- a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanSeaDepthMapsDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanSeaDepthMapsDialogFragment.java
@@ -1,11 +1,13 @@
 package net.osmand.plus.chooseplan;
 
 import android.app.Activity;
+import android.support.annotation.Nullable;
 import android.view.View;
 
 import net.osmand.plus.R;
 import net.osmand.plus.activities.OsmandInAppPurchaseActivity;
 import net.osmand.plus.inapp.InAppPurchaseHelper;
+import net.osmand.plus.inapp.InAppPurchases.InAppPurchase;
 
 public class ChoosePlanSeaDepthMapsDialogFragment extends ChoosePlanDialogFragment {
 	public static final String TAG = ChoosePlanSeaDepthMapsDialogFragment.class.getSimpleName();
@@ -18,7 +20,6 @@ public class ChoosePlanSeaDepthMapsDialogFragment extends ChoosePlanDialogFragme
 			OsmAndFeature.DAILY_MAP_UPDATES,
 			OsmAndFeature.UNLIMITED_DOWNLOADS,
 			OsmAndFeature.UNLOCK_ALL_FEATURES,
-			OsmAndFeature.DONATION_TO_OSM,
 	};
 	private final OsmAndFeature[] selectedOsmLiveFeatures = {
 			OsmAndFeature.CONTOUR_LINES_HILLSHADE_MAPS,
@@ -65,16 +66,6 @@ public class ChoosePlanSeaDepthMapsDialogFragment extends ChoosePlanDialogFragme
 		return getString(R.string.in_app_purchase);
 	}
 
-	@Override
-	public String getPlanTypeButtonTitle() {
-		InAppPurchaseHelper purchaseHelper = getOsmandApplication().getInAppPurchaseHelper();
-		if (purchaseHelper == null || !purchaseHelper.hasPrices()) {
-			return getString(R.string.purchase_unlim_title, getString(R.string.sea_depth_maps_price));
-		} else {
-			return getString(R.string.purchase_unlim_title, purchaseHelper.getDepthContoursPrice());
-		}
-	}
-
 	@Override
 	public String getPlanTypeButtonDescription() {
 		return getString(R.string.in_app_purchase_desc);
@@ -92,4 +83,14 @@ public class ChoosePlanSeaDepthMapsDialogFragment extends ChoosePlanDialogFragme
 			}
 		});
 	}
+
+	@Nullable
+	@Override
+	public InAppPurchase getPlanTypePurchase() {
+		InAppPurchaseHelper purchaseHelper = getOsmandApplication().getInAppPurchaseHelper();
+		if (purchaseHelper != null) {
+			return purchaseHelper.getDepthContours();
+		}
+		return null;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanWikipediaDialogFragment.java b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanWikipediaDialogFragment.java
index 2ffeba3489..8729bdbbeb 100644
--- a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanWikipediaDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanWikipediaDialogFragment.java
@@ -11,7 +11,6 @@ public class ChoosePlanWikipediaDialogFragment extends ChoosePlanFreeBannerDialo
 			OsmAndFeature.CONTOUR_LINES_HILLSHADE_MAPS,
 			OsmAndFeature.SEA_DEPTH_MAPS,
 			OsmAndFeature.UNLOCK_ALL_FEATURES,
-			OsmAndFeature.DONATION_TO_OSM,
 	};
 	private final OsmAndFeature[] selectedOsmLiveFeatures = {
 			OsmAndFeature.WIKIPEDIA_OFFLINE,
diff --git a/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java b/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java
index e56332b2cc..9dac53298c 100644
--- a/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java
+++ b/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java
@@ -8,7 +8,6 @@ import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.ColorRes;
-import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentActivity;
@@ -56,7 +55,6 @@ public class OsmLiveCancelledDialog extends BaseOsmAndDialogFragment implements
 			OsmAndFeature.CONTOUR_LINES_HILLSHADE_MAPS,
 			OsmAndFeature.SEA_DEPTH_MAPS,
 			OsmAndFeature.UNLOCK_ALL_FEATURES,
-			OsmAndFeature.DONATION_TO_OSM,
 	};
 
 	@Override
@@ -93,7 +91,9 @@ public class OsmLiveCancelledDialog extends BaseOsmAndDialogFragment implements
 		if (ctx == null) {
 			return null;
 		}
-		View view = inflate(R.layout.osmlive_cancelled_dialog_fragment, container);
+		int themeRes = nightMode ? R.style.OsmandDarkTheme_DarkActionbar : R.style.OsmandLightTheme_DarkActionbar_LightStatusBar;
+		View view = LayoutInflater.from(new ContextThemeWrapper(getContext(), themeRes))
+				.inflate(R.layout.osmlive_cancelled_dialog_fragment, container, false);
 
 		view.findViewById(R.id.button_close).setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -118,7 +118,7 @@ public class OsmLiveCancelledDialog extends BaseOsmAndDialogFragment implements
 	@Nullable
 	public MapActivity getMapActivity() {
 		Activity activity = getActivity();
-		if (activity != null && activity instanceof MapActivity) {
+		if (activity instanceof MapActivity) {
 			return (MapActivity) activity;
 		}
 		return null;
@@ -194,50 +194,29 @@ public class OsmLiveCancelledDialog extends BaseOsmAndDialogFragment implements
 			ProgressBar progressBar = (ProgressBar) osmLiveButton.findViewById(R.id.card_button_progress);
 			TextViewEx buttonTitle = (TextViewEx) osmLiveButton.findViewById(R.id.card_button_title);
 			TextViewEx buttonSubtitle = (TextViewEx) osmLiveButton.findViewById(R.id.card_button_subtitle);
-			if (!purchaseHelper.hasPrices()) {
-				buttonTitle.setText(getString(R.string.purchase_subscription_title, getString(R.string.osm_live_default_price)));
-			} else {
-				buttonTitle.setText(getString(R.string.purchase_subscription_title, purchaseHelper.getLiveUpdatesPrice()));
-			}
-			buttonSubtitle.setText(R.string.osm_live_month_cost_desc);
+			buttonTitle.setText(getString(R.string.osm_live_plan_pricing));
+			buttonSubtitle.setVisibility(View.GONE);
 			if (progress) {
 				buttonTitle.setVisibility(View.GONE);
-				buttonSubtitle.setVisibility(View.GONE);
 				progressBar.setVisibility(View.VISIBLE);
 				osmLiveButton.setOnClickListener(null);
 			} else {
 				buttonTitle.setVisibility(View.VISIBLE);
-				buttonSubtitle.setVisibility(View.VISIBLE);
 				progressBar.setVisibility(View.GONE);
 				osmLiveButton.setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View v) {
-						subscript();
 						dismiss();
+						FragmentActivity activity = getActivity();
+						if (activity != null) {
+							ChoosePlanDialogFragment.showOsmLiveInstance(activity.getSupportFragmentManager());
+						}
 					}
 				});
 			}
 		}
 	}
 
-	private void subscript() {
-		FragmentActivity ctx = getActivity();
-		if (ctx != null && purchaseHelper != null) {
-			OsmandSettings settings = app.getSettings();
-			purchaseHelper.purchaseLiveUpdates(ctx,
-					settings.BILLING_USER_EMAIL.get(),
-					settings.BILLING_USER_NAME.get(),
-					settings.BILLING_USER_COUNTRY_DOWNLOAD_NAME.get(),
-					settings.BILLING_HIDE_USER_NAME.get());
-		}
-	}
-
-	private View inflate(@LayoutRes int layoutId, @Nullable ViewGroup container) {
-		int themeRes = nightMode ? R.style.OsmandDarkTheme_DarkActionbar : R.style.OsmandLightTheme_DarkActionbar_LightStatusBar;
-		return LayoutInflater.from(new ContextThemeWrapper(getContext(), themeRes))
-				.inflate(layoutId, container, false);
-	}
-
 	public static boolean shouldShowDialog(OsmandApplication app) {
 		OsmandSettings settings = app.getSettings();
 		long cancelledTime = settings.LIVE_UPDATES_PURCHASE_CANCELLED_TIME.get();
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index 2a80a140a7..47431645a9 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -73,15 +73,14 @@ import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.WaypointDialogHelper;
 import net.osmand.plus.helpers.WaypointDialogHelper.WaypointDialogHelperCallbacks;
 import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
-import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
 import net.osmand.plus.mapcontextmenu.other.RoutePreferencesMenu;
-import net.osmand.plus.mapcontextmenu.other.RoutePreferencesMenu.LocalRoutingParameter;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.LocalRoutingParameter;
 import net.osmand.plus.mapillary.MapillaryFiltersFragment;
 import net.osmand.plus.mapillary.MapillaryPlugin.MapillaryFirstDialogFragment;
 import net.osmand.plus.osmedit.OsmNotesMenu;
 import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.routing.RoutingHelper.IRouteInformationListener;
+import net.osmand.plus.routing.IRouteInformationListener;
 import net.osmand.plus.srtmplugin.ContourLinesMenu;
 import net.osmand.plus.srtmplugin.HillshadeMenu;
 import net.osmand.plus.srtmplugin.SRTMPlugin;
@@ -236,7 +235,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 	public void createDashboardView() {
 		baseColor = ContextCompat.getColor(mapActivity, R.color.osmand_orange) & 0x00ffffff;
 		waypointDialogHelper = new WaypointDialogHelper(mapActivity);
-		waypointDialogHelper.setHelperCallbacks(this);
+		waypointDialogHelper.addHelperCallbacks(this);
 		landscape = !AndroidUiHelper.isOrientationPortrait(mapActivity);
 		dashboardView = (FrameLayout) mapActivity.findViewById(R.id.dashboard);
 		AndroidUtils.addStatusBarPadding21v(mapActivity, dashboardView);
diff --git a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
index 3113e2cf09..aaf2ed7ff6 100644
--- a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
@@ -18,6 +18,8 @@ import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.TextInfoWidget;
 
+import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_BUILDS_ID;
+
 public class OsmandDevelopmentPlugin extends OsmandPlugin {
 	private static final String ID = "osmand.development";
 	private OsmandApplication app;
@@ -57,6 +59,7 @@ public class OsmandDevelopmentPlugin extends OsmandPlugin {
 	public void registerOptionsMenuItems(final MapActivity mapActivity, ContextMenuAdapter helper) {
 		if (Version.isDeveloperVersion(mapActivity.getMyApplication())) {
 			helper.addItem(new ContextMenuItem.ItemBuilder()
+					.setId(DRAWER_BUILDS_ID)
 					.setTitleId(R.string.version_settings, mapActivity)
 					.setIcon(R.drawable.ic_action_gabout_dark)
 					.setListener(new ContextMenuAdapter.ItemClickListener() {
diff --git a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
index 1727b171d6..045834f51f 100644
--- a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
+++ b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
@@ -226,7 +226,7 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
 		AlertDialog.Builder b = new AlertDialog.Builder(this);
 		final List<ApplicationMode> modes = ApplicationMode.allPossibleValues();
 		modes.remove(ApplicationMode.DEFAULT);
-		final Set<ApplicationMode> selected = new LinkedHashSet<ApplicationMode>(ApplicationMode.values(settings));
+		final Set<ApplicationMode> selected = new LinkedHashSet<ApplicationMode>(ApplicationMode.values(getMyApplication()));
 		selected.remove(ApplicationMode.DEFAULT);
 		View v = AppModeDialog.prepareAppModeView(this, modes, selected, null, false, true, false,
 				new View.OnClickListener() {
diff --git a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java
index 279290fd58..78e8450474 100644
--- a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java
+++ b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java
@@ -17,32 +17,19 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import net.osmand.IndexConstants;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.OsmandActionBarActivity;
 import net.osmand.plus.routing.data.StreetName;
 import net.osmand.plus.voice.AbstractPrologCommandPlayer;
-import net.osmand.plus.voice.JSCommandBuilder;
-import net.osmand.plus.voice.JSMediaCommandPlayerImpl;
-import net.osmand.plus.voice.JSTTSCommandPlayerImpl;
 import net.osmand.plus.voice.TTSCommandPlayerImpl;
 import net.osmand.plus.voice.CommandBuilder;
 import net.osmand.plus.voice.CommandPlayer;
-import net.osmand.plus.routing.VoiceRouter;
-import net.osmand.util.Algorithms;
 
-import java.io.File;
 import java.util.HashMap;
-import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
-import alice.tuprolog.Struct;
-import alice.tuprolog.Term;
-
-import static net.osmand.plus.mapcontextmenu.other.RoutePreferencesMenu.getVoiceFiles;
-
 
 /**
  * Test Voice activity
@@ -91,7 +78,7 @@ public class TestVoiceActivity extends OsmandActionBarActivity {
 	private void selectVoice(final LinearLayout ll) {
 		String[] entries;
 		final String[] entrieValues;
-		Set<String> voiceFiles = getVoiceFiles(this);
+		Set<String> voiceFiles = getMyApplication().getRoutingOptionsHelper().getVoiceFiles(this);
 		entries = new String[voiceFiles.size() ];
 		entrieValues = new String[voiceFiles.size() ];
 		int k = 0;
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
index 19a42bfd83..9aacc10a4a 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@@ -68,6 +68,27 @@ import java.util.Map;
 
 import gnu.trove.list.array.TIntArrayList;
 
+import static net.osmand.plus.OsmAndCustomizationConstants.APP_PROFILES_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.CUSTOM_RENDERING_ITEMS_ID_SCHEME;
+import static net.osmand.plus.OsmAndCustomizationConstants.DETAILS_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.FAVORITES_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.GPX_FILES_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.HIDE_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_LANGUAGE_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_MAGNIFIER_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_MARKERS_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_MODE_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_RENDERING_CATEGORY_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_SOURCE_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_STYLE_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.POI_OVERLAY_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.POI_OVERLAY_LABELS_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.ROAD_STYLE_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.ROUTES_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.SHOW_CATEGORY_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.TEXT_SIZE_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.TRANSPORT_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.TRANSPORT_RENDERING_ID;
 import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_DENSITY_ATTR;
 import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_LINES_ATTR;
 import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_LINES_SCHEME_ATTR;
@@ -80,6 +101,7 @@ public class ConfigureMapMenu {
 	public static final String CURRENT_TRACK_WIDTH_ATTR = "currentTrackWidth";
 	public static final String COLOR_ATTR = "color";
 	public static final String ROAD_STYLE_ATTR = "roadStyle";
+
 	private int hikingRouteOSMCValue;
 	private int selectedLanguageIndex;
 	private boolean transliterateNames;
@@ -93,6 +115,7 @@ public class ConfigureMapMenu {
 		ContextMenuAdapter adapter = new ContextMenuAdapter();
 		adapter.setDefaultLayoutId(R.layout.list_item_icon_and_menu);
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setId(APP_PROFILES_ID)
 				.setTitleId(R.string.app_modes_choose, ma)
 				.setLayout(R.layout.mode_toggles).createItem());
 		adapter.setChangeAppModeListener(new OnClickListener() {
@@ -251,11 +274,13 @@ public class ConfigureMapMenu {
 		final OsmandSettings settings = app.getSettings();
 		LayerMenuListener l = new LayerMenuListener(activity, adapter);
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setId(SHOW_CATEGORY_ID)
 				.setTitleId(R.string.shared_string_show, activity)
 				.setCategory(true).setLayout(R.layout.list_group_title_with_switch).createItem());
 		// String appMode = " [" + settings.getApplicationMode().toHumanString(view.getApplication()) +"] ";
 		boolean selected = settings.SHOW_FAVORITES.get();
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setId(FAVORITES_ID)
 				.setTitleId(R.string.shared_string_favorites, activity)
 				.setSelected(settings.SHOW_FAVORITES.get())
 				.setColor(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
@@ -263,6 +288,7 @@ public class ConfigureMapMenu {
 				.setListener(l).createItem());
 		selected = app.getPoiFilters().isShowingAnyPoi();
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setId(POI_OVERLAY_ID)
 				.setTitleId(R.string.layer_poi, activity)
 				.setSelected(selected)
 				.setDescription(app.getPoiFilters().getSelectedPoiFiltersName())
@@ -272,6 +298,7 @@ public class ConfigureMapMenu {
 				.setListener(l).createItem());
 		selected = settings.SHOW_POI_LABEL.get();
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setId(POI_OVERLAY_LABELS_ID)
 				.setTitleId(R.string.layer_amenity_label, activity)
 				.setSelected(settings.SHOW_POI_LABEL.get())
 				.setColor(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
@@ -308,6 +335,7 @@ public class ConfigureMapMenu {
 		}
 		final boolean transportSelected = selected;
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setId(TRANSPORT_ID)
 				.setTitleId(R.string.rendering_category_transport, activity)
 				.setIcon(R.drawable.ic_action_bus_dark)
 				.setSecondaryIcon(R.drawable.ic_action_additional_option)
@@ -459,6 +487,7 @@ public class ConfigureMapMenu {
 				}).createItem());
 		selected = app.getSelectedGpxHelper().isShowingAnyGpxFiles();
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setId(GPX_FILES_ID)
 				.setTitleId(R.string.layer_gpx_layer, activity)
 				.setSelected(app.getSelectedGpxHelper().isShowingAnyGpxFiles())
 				.setDescription(app.getSelectedGpxHelper().getGpxDescription())
@@ -469,6 +498,7 @@ public class ConfigureMapMenu {
 
 		selected = settings.SHOW_MAP_MARKERS.get();
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setId(MAP_MARKERS_ID)
 				.setTitleId(R.string.map_markers, activity)
 				.setSelected(selected)
 				.setColor(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
@@ -476,13 +506,13 @@ public class ConfigureMapMenu {
 				.setListener(l).createItem());
 
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setId(MAP_SOURCE_ID)
 				.setTitleId(R.string.layer_map, activity)
 				.setIcon(R.drawable.ic_world_globe_dark)
 				.setDescription(settings.MAP_ONLINE_DATA.get() ? settings.MAP_TILE_SOURCES.get() : null)
 				.setListener(l).createItem());
 
 		OsmandPlugin.registerLayerContextMenu(activity.getMapView(), adapter, activity);
-		app.getAppCustomization().prepareLayerContextMenu(activity, adapter);
 		boolean srtmDisabled = OsmandPlugin.getEnabledPlugin(SRTMPlugin.class) == null
 				&& !InAppPurchaseHelper.isSubscribedToLiveUpdates(app);
 		if (srtmDisabled) {
@@ -502,8 +532,10 @@ public class ConfigureMapMenu {
 	private void createRenderingAttributeItems(List<RenderingRuleProperty> customRules,
 											   final ContextMenuAdapter adapter, final MapActivity activity) {
 		adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.map_widget_map_rendering, activity)
+				.setId(MAP_RENDERING_CATEGORY_ID)
 				.setCategory(true).setLayout(R.layout.list_group_title_with_switch).createItem());
 		adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.map_widget_renderer, activity)
+				.setId(MAP_STYLE_ID)
 				.setDescription(getRenderDescr(activity)).setLayout(R.layout.list_item_single_line_descrition_narrow)
 				.setIcon(R.drawable.ic_map).setListener(new ContextMenuAdapter.ItemClickListener() {
 					@Override
@@ -516,6 +548,7 @@ public class ConfigureMapMenu {
 				}).createItem());
 
 		adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.map_mode, activity)
+				.setId(MAP_MODE_ID)
 				.setDescription(getDayNightDescr(activity)).setLayout(R.layout.list_item_single_line_descrition_narrow)
 				.setIcon(getDayNightIcon(activity)).setListener(new ItemClickListener() {
 					@Override
@@ -548,6 +581,7 @@ public class ConfigureMapMenu {
 				}).createItem());
 
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setId(MAP_MAGNIFIER_ID)
 				.setTitleId(R.string.map_magnifier, activity)
 				.setDescription(
 						String.format(Locale.UK, "%.0f",
@@ -609,12 +643,13 @@ public class ConfigureMapMenu {
 				}).createItem());
 
 		ContextMenuItem props;
-		props = createRenderingProperty(customRules, adapter, activity, R.drawable.ic_action_intersection, ROAD_STYLE_ATTR);
+		props = createRenderingProperty(customRules, adapter, activity, R.drawable.ic_action_intersection, ROAD_STYLE_ATTR, ROAD_STYLE_ID);
 		if (props != null) {
 			adapter.addItem(props);
 		}
 
 		adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.text_size, activity)
+				.setId(TEXT_SIZE_ID)
 				.setDescription(getScale(activity)).setLayout(R.layout.list_item_single_line_descrition_narrow)
 				.setIcon(R.drawable.ic_action_map_text_size).setListener(new ContextMenuAdapter.ItemClickListener() {
 					@Override
@@ -653,6 +688,7 @@ public class ConfigureMapMenu {
 		localeDescr = localeDescr == null || localeDescr.equals("") ? activity.getString(R.string.local_map_names)
 				: localeDescr;
 		adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.map_locale, activity)
+				.setId(MAP_LANGUAGE_ID)
 				.setDescription(localeDescr).setLayout(R.layout.list_item_single_line_descrition_narrow)
 				.setIcon(R.drawable.ic_action_map_language)
 				.setListener(new ContextMenuAdapter.ItemClickListener() {
@@ -743,17 +779,17 @@ public class ConfigureMapMenu {
 				}).createItem());
 
 		props = createProperties(customRules, null, R.string.rendering_category_transport, R.drawable.ic_action_bus_dark,
-				"transport", null, adapter, activity, true);
+				"transport", null, adapter, activity, true, TRANSPORT_RENDERING_ID);
 		if (props != null) {
 			adapter.addItem(props);
 		}
 		props = createProperties(customRules, null, R.string.rendering_category_details, R.drawable.ic_action_layers_dark,
-				"details", null, adapter, activity, true);
+				"details", null, adapter, activity, true, DETAILS_ID);
 		if (props != null) {
 			adapter.addItem(props);
 		}
 		props = createProperties(customRules, null, R.string.rendering_category_hide, R.drawable.ic_action_hide,
-				"hide", null, adapter, activity, true);
+				"hide", null, adapter, activity, true, HIDE_ID);
 		if (props != null) {
 			adapter.addItem(props);
 		}
@@ -765,7 +801,7 @@ public class ConfigureMapMenu {
 			}
 		}
 		props = createProperties(customRules, customRulesIncluded, R.string.rendering_category_routes, R.drawable.ic_action_map_routes,
-				"routes", null, adapter, activity, true);
+				"routes", null, adapter, activity, true, ROUTES_ID);
 		if (props != null) {
 			adapter.addItem(props);
 		}
@@ -827,7 +863,8 @@ public class ConfigureMapMenu {
 											 final ListStringPreference defaultSettings,
 											 final ContextMenuAdapter adapter,
 											 final MapActivity activity,
-											 final boolean useDescription) {
+											 final boolean useDescription,
+											 final String id) {
 
 		final List<RenderingRuleProperty> ps = new ArrayList<>();
 		final List<OsmandSettings.CommonPreference<Boolean>> prefs = new ArrayList<>();
@@ -883,6 +920,7 @@ public class ConfigureMapMenu {
 
 			};
 			ContextMenuItem.ItemBuilder builder = new ContextMenuItem.ItemBuilder().setTitleId(strId, activity)
+					.setId(id)
 					.setIcon(icon).setListener(clickListener);
 			boolean selected = false;
 			for (OsmandSettings.CommonPreference<Boolean> p : prefs) {
@@ -1138,7 +1176,7 @@ public class ConfigureMapMenu {
 												 List<RenderingRuleProperty> customRules) {
 		for (final RenderingRuleProperty p : customRules) {
 			if (isPropertyAccepted(p)) {
-				adapter.addItem(createRenderingProperty(adapter, activity, 0, p));
+				adapter.addItem(createRenderingProperty(adapter, activity, 0, p, CUSTOM_RENDERING_ITEMS_ID_SCHEME + p.getName()));
 			}
 		}
 	}
@@ -1155,17 +1193,17 @@ public class ConfigureMapMenu {
 
 	private ContextMenuItem createRenderingProperty(final List<RenderingRuleProperty> customRules,
 													final ContextMenuAdapter adapter, final MapActivity activity,
-													@DrawableRes final int icon, final String attrName) {
+													@DrawableRes final int icon, final String attrName, String id) {
 		for (final RenderingRuleProperty p : customRules) {
 			if (p.getAttrName().equals(attrName)) {
-				return createRenderingProperty(adapter, activity, icon, p);
+				return createRenderingProperty(adapter, activity, icon, p, id);
 			}
 		}
 		return null;
 	}
 
 	private ContextMenuItem createRenderingProperty(final ContextMenuAdapter adapter, final MapActivity activity,
-										 @DrawableRes final int icon, final RenderingRuleProperty p) {
+										 @DrawableRes final int icon, final RenderingRuleProperty p, final String id) {
 		final OsmandMapTileView view = activity.getMapView();
 		String propertyName = SettingsActivity.getStringPropertyName(view.getContext(), p.getAttrName(),
 				p.getName());
@@ -1176,6 +1214,7 @@ public class ConfigureMapMenu {
 			final OsmandSettings.CommonPreference<Boolean> pref = view.getApplication().getSettings()
 					.getCustomRenderBooleanProperty(p.getAttrName());
 			return ContextMenuItem.createBuilder(propertyName)
+					.setId(id)
 					.setListener(new ContextMenuAdapter.ItemClickListener() {
 
 						@Override
@@ -1198,6 +1237,7 @@ public class ConfigureMapMenu {
 						p.getDefaultValueDescription());
 			}
 			ContextMenuItem.ItemBuilder builder = ContextMenuItem.createBuilder(propertyName)
+					.setId(id)
 					.setListener(new ContextMenuAdapter.ItemClickListener() {
 
 						@Override
@@ -1359,7 +1399,10 @@ public class ConfigureMapMenu {
 
 		public static int parseTrackColor(RenderingRulesStorage renderer, String colorName) {
 			int defaultColor = -1;
-			RenderingRule gpxRule = renderer.getRenderingAttributeRule("gpx");
+			RenderingRule gpxRule = null;
+			if(renderer!=null) {
+				gpxRule = renderer.getRenderingAttributeRule("gpx");
+			}
 			if (gpxRule != null && gpxRule.getIfElseChildren().size() > 0) {
 				List<RenderingRule> rules = renderer.getRenderingAttributeRule("gpx").getIfElseChildren().get(0).getIfElseChildren();
 				for (RenderingRule r : rules) {
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
index df55ef2332..0f783844ac 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
@@ -55,7 +55,7 @@ public class FavoriteDialogs {
 			}
 			
 		};
-		favouritesAdapter.sortByDefault();
+		favouritesAdapter.sortByDefault(true);
 		
 		if(points.size() == 0){
 			Toast.makeText(activity, activity.getString(R.string.fav_points_not_exist), Toast.LENGTH_SHORT).show();
@@ -208,7 +208,7 @@ public class FavoriteDialogs {
 			final OnDismissListener dismissListener, final Dialog[] dialogHolder, final boolean sortByDist) {
 		ListView listView = new ListView(uiContext);
 		AlertDialog.Builder bld = new AlertDialog.Builder(uiContext);
-		favouritesAdapter.sortByDefault();
+		favouritesAdapter.sortByDefault(sortByDist);
 		listView.setAdapter(favouritesAdapter);
 		listView.setOnItemClickListener(click);
 		bld.setPositiveButton(sortByDist ? R.string.sort_by_name :
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java
index 92e154210c..49f4e6ebc1 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java
@@ -2,6 +2,7 @@ package net.osmand.plus.dialogs;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
+import android.util.Log;
 import android.view.View;
 import android.widget.ArrayAdapter;
 
@@ -60,10 +61,15 @@ public class RasterMapMenu {
 		} else {
 			throw new RuntimeException("Unexpected raster map type");
 		}
+
 		final OsmandSettings.CommonPreference<Boolean> hidePolygonsPref =
 				mapActivity.getMyApplication().getSettings().getCustomRenderBooleanProperty("noPolygons");
 
 		String mapTypeDescr = mapTypePreference.get();
+		if (mapTypeDescr!=null && mapTypeDescr.contains(".sqlitedb")) {
+			mapTypeDescr = mapTypeDescr.replaceFirst(".sqlitedb", "");
+		}
+
 		final boolean selected = mapTypeDescr != null;
 		final int toggleActionStringId = selected ? R.string.shared_string_enabled
 				: R.string.shared_string_disabled;
@@ -124,6 +130,7 @@ public class RasterMapMenu {
 				return false;
 			}
 		};
+
 		mapTypeDescr = selected ? mapTypeDescr : mapActivity.getString(R.string.shared_string_none);
 		contextMenuAdapter.addItem(new ContextMenuItem.ItemBuilder()
 				.setTitleId(toggleActionStringId, mapActivity)
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 0ebb98195c..1c0dc9d4f8 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -254,7 +254,6 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
 	protected void onResume() {
 		super.onResume();
 		initAppStatusVariables();
-		getMyApplication().getAppCustomization().resumeActivity(DownloadActivity.class, this);
 		downloadThread.setUiActivity(this);
 		downloadInProgress();
 	}
@@ -283,7 +282,6 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
 	@Override
 	public void onPause() {
 		super.onPause();
-		getMyApplication().getAppCustomization().pauseActivity(DownloadActivity.class);
 		downloadThread.resetUiActivity(this);
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
index 88f3431eb3..e8fbe08c66 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
@@ -233,7 +233,7 @@ public class DownloadActivityType {
 	}
 
 	public String getBaseUrl(OsmandApplication ctx, String fileName) {
-		String url = "http://" + IndexConstants.INDEX_DOWNLOAD_DOMAIN + "/download?event=2&"
+		String url = "https://" + IndexConstants.INDEX_DOWNLOAD_DOMAIN + "/download?event=2&"
 				+ Version.getVersionAsURLParam(ctx) + "&file=" + encode(fileName);
 		if(this == LIVE_UPDATES_FILE && fileName.length() > 16) {
 			// DATE_AND_EXT_STR_LEN = "_18_06_02.obf.gz".length()
diff --git a/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java b/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java
index e352bb0fed..cda046f910 100644
--- a/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java
+++ b/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java
@@ -57,7 +57,6 @@ import org.json.JSONObject;
 import java.io.File;
 import java.io.IOException;
 import java.text.MessageFormat;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -86,14 +85,11 @@ public class FirstUsageWizardFragment extends BaseOsmAndFragment implements OsmA
 
 	private Timer locationSearchTimer;
 	private boolean waitForIndexes;
-	List<IndexItem> indexItems = new ArrayList<>();
 
 	private static Location location;
-	private static WorldRegion localDownloadRegion;
-	private static IndexItem localMapIndexItem;
-	private static IndexItem baseMapIndexItem;
-	private static boolean firstMapDownloadCancelled;
-	private static boolean secondMapDownloadCancelled;
+	private static WorldRegion mapDownloadRegion;
+	private static IndexItem mapIndexItem;
+	private static boolean mapDownloadCancelled;
 	private static boolean wizardClosed;
 
 	enum WizardType {
@@ -197,19 +193,14 @@ public class FirstUsageWizardFragment extends BaseOsmAndFragment implements OsmA
 			case MAP_FOUND:
 				TextView mapTitle = (TextView) view.findViewById(R.id.map_download_title);
 				TextView mapDescription = (TextView) view.findViewById(R.id.map_download_desc);
-				final IndexItem indexItem = localMapIndexItem != null ? localMapIndexItem : baseMapIndexItem;
-				if (indexItem != null) {
-					mapTitle.setText(indexItem.getVisibleName(getContext(), getMyApplication().getRegions(), false));
-					mapDescription.setText(indexItem.getSizeDescription(getContext()));
+				if (mapIndexItem != null) {
+					mapTitle.setText(mapIndexItem.getVisibleName(getContext(), getMyApplication().getRegions(), false));
+					mapDescription.setText(mapIndexItem.getSizeDescription(getContext()));
 				}
 				view.findViewById(R.id.map_download_action_button).setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View v) {
-						boolean spaceEnoughForBoth = validationManager.isSpaceEnoughForDownload(getActivity(), false, localMapIndexItem, baseMapIndexItem);
-						boolean spaceEnoughForLocal = validationManager.isSpaceEnoughForDownload(getActivity(), true, localMapIndexItem);
-						if (!spaceEnoughForBoth) {
-							baseMapIndexItem = null;
-						}
+						boolean spaceEnoughForLocal = validationManager.isSpaceEnoughForDownload(getActivity(), true, mapIndexItem);
 						if (spaceEnoughForLocal) {
 							showMapDownloadFragment(getActivity());
 						}
@@ -226,38 +217,30 @@ public class FirstUsageWizardFragment extends BaseOsmAndFragment implements OsmA
 				});
 				break;
 			case MAP_DOWNLOAD:
-				if (localMapIndexItem != null) {
-					indexItems.add(localMapIndexItem);
-				}
-				if (baseMapIndexItem != null) {
-					indexItems.add(baseMapIndexItem);
-				}
-
-				if (indexItems.size() > 0) {
-					final IndexItem item = indexItems.get(0);
-					String mapName = item.getVisibleName(getContext(), getMyApplication().getRegions(), false);
+				if (mapIndexItem != null) {
+					String mapName = mapIndexItem.getVisibleName(getContext(), getMyApplication().getRegions(), false);
 					TextView mapNameTextView = (TextView) view.findViewById(R.id.map_downloading_title);
 					mapNameTextView.setText(mapName);
 					final TextView mapDescriptionTextView = (TextView) view.findViewById(R.id.map_downloading_desc);
 					final View progressPadding = view.findViewById(R.id.map_download_padding);
 					final View progressLayout = view.findViewById(R.id.map_download_progress_layout);
-					mapDescriptionTextView.setText(item.getSizeDescription(getContext()));
+					mapDescriptionTextView.setText(mapIndexItem.getSizeDescription(getContext()));
 					final ImageButton redownloadButton = (ImageButton) view.findViewById(R.id.map_redownload_button);
 					redownloadButton.setOnClickListener(new View.OnClickListener() {
 						@Override
 						public void onClick(View v) {
-							if (!downloadThread.isDownloading(item) && !item.isDownloaded()) {
-								validationManager.startDownload(getActivity(), item);
-								firstMapDownloadCancelled = false;
+							if (!downloadThread.isDownloading(mapIndexItem) && !mapIndexItem.isDownloaded()) {
+								validationManager.startDownload(getActivity(), mapIndexItem);
+								mapDownloadCancelled = false;
 							}
 						}
 					});
 					view.findViewById(R.id.map_download_progress_button).setOnClickListener(new View.OnClickListener() {
 						@Override
 						public void onClick(View v) {
-							firstMapDownloadCancelled = true;
-							downloadThread.cancelDownload(item);
-							mapDescriptionTextView.setText(item.getSizeDescription(getContext()));
+							mapDownloadCancelled = true;
+							downloadThread.cancelDownload(mapIndexItem);
+							mapDescriptionTextView.setText(mapIndexItem.getSizeDescription(getContext()));
 							progressPadding.setVisibility(View.VISIBLE);
 							progressLayout.setVisibility(View.GONE);
 							redownloadButton.setVisibility(View.VISIBLE);
@@ -269,45 +252,6 @@ public class FirstUsageWizardFragment extends BaseOsmAndFragment implements OsmA
 					view.findViewById(R.id.map_downloading_layout).setVisibility(View.VISIBLE);
 				} else {
 					view.findViewById(R.id.map_downloading_layout).setVisibility(View.GONE);
-					view.findViewById(R.id.map_downloading_divider).setVisibility(View.GONE);
-				}
-				if (indexItems.size() > 1) {
-					final IndexItem item = indexItems.get(1);
-					String mapName = item.getVisibleName(getContext(), getMyApplication().getRegions(), false);
-					TextView mapNameTextView = (TextView) view.findViewById(R.id.map2_downloading_title);
-					mapNameTextView.setText(mapName);
-					final TextView mapDescriptionTextView = (TextView) view.findViewById(R.id.map2_downloading_desc);
-					final View progressPadding = view.findViewById(R.id.map2_download_padding);
-					final View progressLayout = view.findViewById(R.id.map2_download_progress_layout);
-					mapDescriptionTextView.setText(item.getSizeDescription(getContext()));
-					final ImageButton redownloadButton = (ImageButton) view.findViewById(R.id.map2_redownload_button);
-					redownloadButton.setOnClickListener(new View.OnClickListener() {
-						@Override
-						public void onClick(View v) {
-							if (!downloadThread.isDownloading(item) && !item.isDownloaded()) {
-								validationManager.startDownload(getActivity(), item);
-								secondMapDownloadCancelled = false;
-							}
-						}
-					});
-					view.findViewById(R.id.map2_download_progress_button).setOnClickListener(new View.OnClickListener() {
-						@Override
-						public void onClick(View v) {
-							secondMapDownloadCancelled = true;
-							downloadThread.cancelDownload(item);
-							mapDescriptionTextView.setText(item.getSizeDescription(getContext()));
-							progressPadding.setVisibility(View.VISIBLE);
-							progressLayout.setVisibility(View.GONE);
-							redownloadButton.setVisibility(View.VISIBLE);
-						}
-					});
-					progressPadding.setVisibility(View.VISIBLE);
-					progressLayout.setVisibility(View.GONE);
-					redownloadButton.setVisibility(View.VISIBLE);
-					view.findViewById(R.id.map2_downloading_layout).setVisibility(View.VISIBLE);
-				} else {
-					view.findViewById(R.id.map_downloading_divider).setVisibility(View.GONE);
-					view.findViewById(R.id.map2_downloading_layout).setVisibility(View.GONE);
 				}
 
 				view.findViewById(R.id.map_downloading_action_button).setOnClickListener(new View.OnClickListener() {
@@ -422,11 +366,9 @@ public class FirstUsageWizardFragment extends BaseOsmAndFragment implements OsmA
 			case MAP_FOUND:
 				break;
 			case MAP_DOWNLOAD:
-				if (!startDownload(0)) {
-					startDownload(1);
-				}
-				if (localDownloadRegion != null) {
-					downloadThread.initSettingsFirstMap(localDownloadRegion);
+				startDownload();
+				if (mapDownloadRegion != null) {
+					downloadThread.initSettingsFirstMap(mapDownloadRegion);
 				}
 				break;
 		}
@@ -505,131 +447,79 @@ public class FirstUsageWizardFragment extends BaseOsmAndFragment implements OsmA
 			} else {
 				v = getString(R.string.file_size_in_mb, mb);
 			}
-
-			int index = indexItems.indexOf(indexItem);
-			if (index == 0) {
-				if (!firstMapDownloadCancelled) {
-					final TextView mapDescriptionTextView = (TextView) view.findViewById(R.id.map_downloading_desc);
-					ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.map_download_progress_bar);
-					mapDescriptionTextView.setText(v);
-					progressBar.setProgress(progress < 0 ? 0 : progress);
-				}
-			} else if (index == 1) {
-				if (!secondMapDownloadCancelled) {
-					final TextView mapDescriptionTextView = (TextView) view.findViewById(R.id.map2_downloading_desc);
-					ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.map2_download_progress_bar);
-					mapDescriptionTextView.setText(v);
-					progressBar.setProgress(progress < 0 ? 0 : progress);
-				}
+			if (!mapDownloadCancelled) {
+				final TextView mapDescriptionTextView = (TextView) view.findViewById(R.id.map_downloading_desc);
+				ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.map_download_progress_bar);
+				mapDescriptionTextView.setText(v);
+				progressBar.setProgress(progress < 0 ? 0 : progress);
 			}
 		}
-		updateDownloadedItems();
+		updateDownloadedItem();
 	}
 
 	@Override
 	public void downloadHasFinished() {
-		updateDownloadedItems();
-		startDownload(1);
+		updateDownloadedItem();
 	}
 
-	private boolean startDownload(int itemIndex) {
+	private boolean startDownload() {
 		boolean downloadStarted = false;
-		if (itemIndex == 0 && indexItems.size() > 0) {
-			IndexItem indexItem = indexItems.get(0);
-			if (!downloadThread.isDownloading(indexItem)
-					&& !indexItem.isDownloaded()
-					&& !firstMapDownloadCancelled) {
-				validationManager.startDownload(getActivity(), indexItem);
-				downloadStarted = true;
-			}
-		} else if (itemIndex == 1 && indexItems.size() > 1) {
-			IndexItem indexItem = indexItems.get(1);
-			if (!downloadThread.isDownloading(indexItem)
-					&& !indexItem.isDownloaded()
-					&& !secondMapDownloadCancelled) {
-				validationManager.startDownload(getActivity(), indexItem);
-				downloadStarted = true;
-			}
+		if (!downloadThread.isDownloading(mapIndexItem)
+				&& !mapIndexItem.isDownloaded()
+				&& !mapDownloadCancelled) {
+			validationManager.startDownload(getActivity(), mapIndexItem);
+			downloadStarted = true;
 		}
 		return downloadStarted;
 	}
 
-	private void updateDownloadedItems() {
-		int i = 0;
+	private void updateDownloadedItem() {
 		final View firstRowLayout = view.findViewById(R.id.map_downloading_layout);
-		final View secondRowLayout = view.findViewById(R.id.map2_downloading_layout);
 		final View progressLayout = view.findViewById(R.id.map_download_progress_layout);
-		final View progressLayout2 = view.findViewById(R.id.map2_download_progress_layout);
 		final ImageButton redownloadButton = (ImageButton) view.findViewById(R.id.map_redownload_button);
-		final ImageButton redownloadButton2 = (ImageButton) view.findViewById(R.id.map2_redownload_button);
-		for (IndexItem indexItem : indexItems) {
-			if (indexItem.isDownloaded()) {
-				if (i == 0 && progressLayout.getVisibility() == View.VISIBLE) {
-					final TextView mapDescriptionTextView = (TextView) view.findViewById(R.id.map_downloading_desc);
-					mapDescriptionTextView.setText(indexItem.getSizeDescription(getContext()));
-					view.findViewById(R.id.map_download_padding).setVisibility(View.VISIBLE);
-					progressLayout.setVisibility(View.GONE);
-					firstRowLayout.setClickable(true);
-					final LatLon mapCenter = getMapCenter(indexItem);
-					final int mapZoom = getMapZoom(indexItem);
-					firstRowLayout.setOnClickListener(new View.OnClickListener() {
-						@Override
-						public void onClick(View v) {
-							showOnMap(mapCenter, mapZoom);
-						}
-					});
-				} else if (i == 1 && progressLayout2.getVisibility() == View.VISIBLE) {
-					final TextView mapDescriptionTextView = (TextView) view.findViewById(R.id.map2_downloading_desc);
-					mapDescriptionTextView.setText(indexItem.getSizeDescription(getContext()));
-					view.findViewById(R.id.map2_download_padding).setVisibility(View.VISIBLE);
-					progressLayout2.setVisibility(View.GONE);
-					secondRowLayout.setClickable(true);
-					final LatLon mapCenter = getMapCenter(indexItem);
-					final int mapZoom = getMapZoom(indexItem);
-					secondRowLayout.setOnClickListener(new View.OnClickListener() {
-						@Override
-						public void onClick(View v) {
-							showOnMap(mapCenter, mapZoom);
-						}
-					});
-				}
-			} else {
-				if (downloadThread.isDownloading(indexItem)) {
-					if (i == 0 && !firstMapDownloadCancelled) {
-						if (progressLayout.getVisibility() == View.GONE) {
-							progressLayout.setVisibility(View.VISIBLE);
-						}
-						if (redownloadButton.getVisibility() == View.VISIBLE) {
-							redownloadButton.setVisibility(View.GONE);
-						}
+		if (mapIndexItem.isDownloaded()) {
+			if (progressLayout.getVisibility() == View.VISIBLE) {
+				final TextView mapDescriptionTextView = (TextView) view.findViewById(R.id.map_downloading_desc);
+				mapDescriptionTextView.setText(mapIndexItem.getSizeDescription(getContext()));
+				view.findViewById(R.id.map_download_padding).setVisibility(View.VISIBLE);
+				progressLayout.setVisibility(View.GONE);
+				firstRowLayout.setClickable(true);
+				final LatLon mapCenter = getMapCenter();
+				final int mapZoom = getMapZoom();
+				firstRowLayout.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						showOnMap(mapCenter, mapZoom);
 					}
-					if (i == 1 && !secondMapDownloadCancelled) {
-						if (progressLayout2.getVisibility() == View.GONE) {
-							progressLayout2.setVisibility(View.VISIBLE);
-						}
-						if (redownloadButton2.getVisibility() == View.VISIBLE) {
-							redownloadButton2.setVisibility(View.GONE);
-						}
+				});
+			}
+		} else {
+			if (downloadThread.isDownloading(mapIndexItem)) {
+				if (!mapDownloadCancelled) {
+					if (progressLayout.getVisibility() == View.GONE) {
+						progressLayout.setVisibility(View.VISIBLE);
+					}
+					if (redownloadButton.getVisibility() == View.VISIBLE) {
+						redownloadButton.setVisibility(View.GONE);
 					}
 				}
 			}
-			i++;
 		}
 	}
 
-	private LatLon getMapCenter(IndexItem indexItem) {
+	private LatLon getMapCenter() {
 		final LatLon mapCenter;
-		if (indexItem == localMapIndexItem && localDownloadRegion != null) {
-			mapCenter = localDownloadRegion.getRegionCenter();
+		if (mapDownloadRegion != null) {
+			mapCenter = mapDownloadRegion.getRegionCenter();
 		} else {
 			mapCenter = new LatLon(48, 17);
 		}
 		return mapCenter;
 	}
 
-	private int getMapZoom(IndexItem indexItem) {
+	private int getMapZoom() {
 		final int mapZoom;
-		if (indexItem == localMapIndexItem && localDownloadRegion != null) {
+		if (mapDownloadRegion != null) {
 			mapZoom = 13;
 		} else {
 			mapZoom = 3;
@@ -691,19 +581,17 @@ public class FirstUsageWizardFragment extends BaseOsmAndFragment implements OsmA
 			if (!Algorithms.isEmpty(selectedFullName)) {
 				WorldRegion downloadRegion = osmandRegions.getRegionData(selectedFullName);
 				if (downloadRegion != null && downloadRegion.isRegionMapDownload()) {
-					localDownloadRegion = downloadRegion;
+					FirstUsageWizardFragment.mapDownloadRegion = downloadRegion;
 					List<IndexItem> indexItems = new LinkedList<>(downloadThread.getIndexes().getIndexItems(downloadRegion));
 					for (IndexItem item : indexItems) {
 						if (item.getType() == DownloadActivityType.NORMAL_FILE) {
-							localMapIndexItem = item;
+							mapIndexItem = item;
 							break;
 						}
 					}
 				}
 			}
-			baseMapIndexItem = downloadThread.getIndexes().getWorldBaseMapItem();
-
-			if (localMapIndexItem != null || baseMapIndexItem != null) {
+			if (mapIndexItem != null) {
 				showMapFoundFragment(getActivity());
 			} else {
 				closeWizard();
@@ -740,9 +628,8 @@ public class FirstUsageWizardFragment extends BaseOsmAndFragment implements OsmA
 			activity.getSupportFragmentManager().beginTransaction()
 					.remove(FirstUsageWizardFragment.this).commit();
 			location = null;
-			localDownloadRegion = null;
-			localMapIndexItem = null;
-			baseMapIndexItem = null;
+			mapDownloadRegion = null;
+			mapIndexItem = null;
 			wizardClosed = true;
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
index ce439474e8..c50f85f873 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
@@ -101,7 +101,7 @@ public class AvoidSpecificRoads {
 		return OsmAndFormatter.getFormattedDistance((float) dist, app);
 	}
 
-	private String getText(@Nullable LatLon point) {
+	public String getText(@Nullable LatLon point) {
 		if (point != null) {
 			RouteDataObject obj = impassableRoads.get(point);
 			if (obj != null) {
@@ -121,6 +121,23 @@ public class AvoidSpecificRoads {
 		return app.getString(R.string.shared_string_road);
 	}
 
+	public String getText(@Nullable RouteDataObject obj) {
+		if (obj != null) {
+			String locale = app.getSettings().MAP_PREFERRED_LOCALE.get();
+			boolean transliterate = app.getSettings().MAP_TRANSLITERATE_NAMES.get();
+			String name = RoutingHelper.formatStreetName(
+					obj.getName(locale, transliterate),
+					obj.getRef(locale, transliterate, true),
+					obj.getDestinationName(locale, transliterate, true),
+					app.getString(R.string.towards)
+			);
+			if (!TextUtils.isEmpty(name)) {
+				return name;
+			}
+		}
+		return app.getString(R.string.shared_string_road);
+	}
+
 	private void recalculateRoute() {
 		RoutingHelper rh = app.getRoutingHelper();
 		if (rh.isRouteCalculated() || rh.isRouteBeingCalculated()) {
@@ -128,7 +145,7 @@ public class AvoidSpecificRoads {
 		}
 	}
 
-	private void removeImpassableRoad(LatLon latLon) {
+	public void removeImpassableRoad(LatLon latLon) {
 		app.getSettings().removeImpassableRoad(latLon);
 		RouteDataObject obj = impassableRoads.remove(latLon);
 		if (obj != null) {
@@ -169,7 +186,7 @@ public class AvoidSpecificRoads {
 		bld.show();
 	}
 
-	private void selectFromMap(final MapActivity mapActivity) {
+	public void selectFromMap(final MapActivity mapActivity) {
 		ContextMenuLayer cm = mapActivity.getMapLayers().getContextMenuLayer();
 		cm.setSelectOnMap(new CallbackWithObject<LatLon>() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java b/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java
index 0585ff1b45..843d93e661 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java
@@ -1,6 +1,7 @@
 package net.osmand.plus.helpers;
 
 import android.annotation.SuppressLint;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
@@ -11,7 +12,9 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.provider.Settings.Secure;
 import android.support.annotation.ColorInt;
+import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 
@@ -21,23 +24,30 @@ import net.osmand.osm.MapPoiTypes;
 import net.osmand.osm.PoiCategory;
 import net.osmand.osm.PoiType;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.chooseplan.ChoosePlanDialogFragment;
 import net.osmand.plus.inapp.InAppPurchaseHelper;
+import net.osmand.plus.inapp.InAppPurchases;
+import net.osmand.plus.inapp.InAppPurchases.InAppPurchase;
+import net.osmand.plus.inapp.InAppPurchases.InAppSubscription;
+import net.osmand.plus.inapp.InAppPurchases.InAppSubscriptionList;
 import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.search.QuickSearchHelper;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarControllerType;
 import net.osmand.util.Algorithms;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
@@ -56,7 +66,17 @@ public class DiscountHelper {
 	private static final String INAPP_PREFIX = "osmand-in-app:";
 	private static final String SEARCH_QUERY_PREFIX = "osmand-search-query:";
 	private static final String SHOW_POI_PREFIX = "osmand-show-poi:";
+	private static final String OPEN_ACTIVITY = "open_activity";
 
+	private static final String SHOW_CHOOSE_PLAN_PREFIX = "show-choose-plan:";
+	private static final String CHOOSE_PLAN_TYPE_FREE = "free-version";
+	private static final String CHOOSE_PLAN_TYPE_LIVE = "osmand-live";
+	private static final String CHOOSE_PLAN_TYPE_SEA_DEPTH = "sea-depth";
+	private static final String CHOOSE_PLAN_TYPE_HILLSHADE = "hillshade";
+	private static final String CHOOSE_PLAN_TYPE_WIKIPEDIA = "wikipedia";
+	private static final String CHOOSE_PLAN_TYPE_WIKIVOYAGE= "wikivoyage";
+
+	@SuppressLint("HardwareIds")
 	public static void checkAndDisplay(final MapActivity mapActivity) {
 		OsmandApplication app = mapActivity.getMyApplication();
 		OsmandSettings settings = app.getSettings();
@@ -125,7 +145,35 @@ public class DiscountHelper {
 				String inAppSku = data.url.substring(INAPP_PREFIX.length());
 				InAppPurchaseHelper purchaseHelper = app.getInAppPurchaseHelper();
 				if (purchaseHelper != null
-						&& (purchaseHelper.isPurchased(inAppSku) || InAppPurchaseHelper.isSubscribedToLiveUpdates(app))) {
+						&& purchaseHelper.isPurchased(inAppSku) || InAppPurchaseHelper.isSubscribedToLiveUpdates(app)) {
+					return;
+				}
+			}
+
+			if (data.oneOfConditions != null) {
+				boolean oneOfConditionsMatch = false;
+				try {
+					Conditions conditions = new Conditions(app);
+					JSONArray conditionsArr = data.oneOfConditions;
+					for (int i = 0; i < conditionsArr.length(); i++) {
+						JSONObject conditionObj = conditionsArr.getJSONObject(i);
+						JSONArray conditionArr = conditionObj.getJSONArray("condition");
+						if (conditionArr.length() > 0) {
+							boolean conditionMatch = true;
+							for (int k = 0; k < conditionArr.length(); k++) {
+								JSONObject o = conditionArr.getJSONObject(k);
+								conditionMatch = conditions.matchesCondition(o);
+								if (!conditionMatch) {
+									break;
+								}
+							}
+							oneOfConditionsMatch |= conditionMatch;
+						}
+					}
+				} catch (JSONException e) {
+					// ignore
+				}
+				if (!oneOfConditionsMatch) {
 					return;
 				}
 			}
@@ -153,6 +201,10 @@ public class DiscountHelper {
 						if (showChristmasDialog) {
 							mapActivity.showXMasDialog();
 						} else {
+							InAppPurchaseHelper purchaseHelper = mapActivity.getPurchaseHelper();
+							if (purchaseHelper != null) {
+								purchaseHelper.requestInventory();
+							}
 							showDiscountBanner(mapActivity, data);
 						}
 					}
@@ -200,6 +252,11 @@ public class DiscountHelper {
 		toolbarController.setBackBtnIconIds(iconId, iconId);
 		toolbarController.setBackBtnIconClrs(data.iconColor, data.iconColor);
 		toolbarController.setStatusBarColor(data.statusBarColor);
+		if (!TextUtils.isEmpty(data.textBtnTitle)) {
+			toolbarController.setTextBtnVisible(true);
+			toolbarController.setTextBtnTitle(data.textBtnTitle);
+			toolbarController.setTextBtnTitleClrs(data.textBtnTitleColor, data.textBtnTitleColor);
+		}
 		if (!Algorithms.isEmpty(data.url)) {
 			View.OnClickListener clickListener = new View.OnClickListener() {
 				@Override
@@ -212,6 +269,7 @@ public class DiscountHelper {
 			};
 			toolbarController.setOnBackButtonClickListener(clickListener);
 			toolbarController.setOnTitleClickListener(clickListener);
+			toolbarController.setOnTextBtnClickListener(clickListener);
 		}
 		toolbarController.setOnCloseButtonClickListener(new View.OnClickListener() {
 			@Override
@@ -241,15 +299,20 @@ public class DiscountHelper {
 
 	private static void openUrl(final MapActivity mapActivity, String url) {
 		if (url.startsWith(INAPP_PREFIX)) {
-			if (url.contains(InAppPurchaseHelper.SKU_FULL_VERSION_PRICE)) {
-				OsmandApplication app = mapActivity.getMyApplication();
-				app.logEvent(mapActivity, "in_app_purchase_redirect");
-				InAppPurchaseHelper purchaseHelper = app.getInAppPurchaseHelper();
-				if (purchaseHelper != null) {
+			OsmandApplication app = mapActivity.getMyApplication();
+			InAppPurchaseHelper purchaseHelper = app.getInAppPurchaseHelper();
+			if (purchaseHelper != null) {
+				if (url.contains(purchaseHelper.getFullVersion().getSku())) {
+					app.logEvent(mapActivity, "in_app_purchase_redirect");
 					purchaseHelper.purchaseFullVersion(mapActivity);
+				} else {
+					for (InAppPurchase p : purchaseHelper.getLiveUpdates().getAllSubscriptions()) {
+						if (url.contains(p.getSku())) {
+							ChoosePlanDialogFragment.showOsmLiveInstance(mapActivity.getSupportFragmentManager());
+							break;
+						}
+					}
 				}
-			} else if (url.contains(InAppPurchaseHelper.SKU_LIVE_UPDATES)) {
-				ChoosePlanDialogFragment.showOsmLiveInstance(mapActivity.getSupportFragmentManager());
 			}
 		} else if (url.startsWith(SEARCH_QUERY_PREFIX)) {
 			String query = url.substring(SEARCH_QUERY_PREFIX.length());
@@ -283,6 +346,25 @@ public class DiscountHelper {
 					showPoiFilter(mapActivity, filter);
 				}
 			}
+		} else if (url.equals(OPEN_ACTIVITY)) {
+			if (mData.activityJson != null) {
+				openActivity(mapActivity, mData.activityJson);
+			}
+		} else if (url.startsWith(SHOW_CHOOSE_PLAN_PREFIX)) {
+			String planType = url.substring(SHOW_CHOOSE_PLAN_PREFIX.length()).trim();
+			if (CHOOSE_PLAN_TYPE_FREE.equals(planType)) {
+				ChoosePlanDialogFragment.showFreeVersionInstance(mapActivity.getSupportFragmentManager());
+			} else if (CHOOSE_PLAN_TYPE_LIVE.equals(planType)) {
+				ChoosePlanDialogFragment.showOsmLiveInstance(mapActivity.getSupportFragmentManager());
+			} else if (CHOOSE_PLAN_TYPE_SEA_DEPTH.equals(planType)) {
+				ChoosePlanDialogFragment.showSeaDepthMapsInstance(mapActivity.getSupportFragmentManager());
+			} else if (CHOOSE_PLAN_TYPE_HILLSHADE.equals(planType)) {
+				ChoosePlanDialogFragment.showHillshadeSrtmPluginInstance(mapActivity.getSupportFragmentManager());
+			} else if (CHOOSE_PLAN_TYPE_WIKIPEDIA.equals(planType)) {
+				ChoosePlanDialogFragment.showWikipediaInstance(mapActivity.getSupportFragmentManager());
+			} else if (CHOOSE_PLAN_TYPE_WIKIVOYAGE.equals(planType)) {
+				ChoosePlanDialogFragment.showWikivoyageInstance(mapActivity.getSupportFragmentManager());
+			}
 		} else {
 			Intent intent = new Intent(Intent.ACTION_VIEW);
 			intent.setData(Uri.parse(url));
@@ -290,12 +372,51 @@ public class DiscountHelper {
 		}
 	}
 
+	private static void openActivity(Context context, JSONObject activityObject) {
+		boolean successful = false;
+		Intent intent = new Intent(Intent.ACTION_VIEW);
+		try {
+			for (Iterator<String> it = activityObject.keys(); it.hasNext(); ) {
+				String key = it.next();
+				if (key.equals("activity_name")) {
+					intent.setClassName(context, activityObject.getString(key));
+					successful = true;
+					continue;
+				}
+				Object obj = activityObject.get(key);
+				if (obj instanceof Integer) {
+					intent.putExtra(key, (Integer) obj);
+				} else if (obj instanceof Long) {
+					intent.putExtra(key, (Long) obj);
+				} else if (obj instanceof Boolean) {
+					intent.putExtra(key, (Boolean) obj);
+				} else if (obj instanceof Float) {
+					intent.putExtra(key, (Float) obj);
+				} else if (obj instanceof Double) {
+					intent.putExtra(key, (Double) obj);
+				} else if (obj instanceof String) {
+					intent.putExtra(key, (String) obj);
+				}
+			}
+		} catch (JSONException e) {
+			successful = false;
+		}
+		if (successful) {
+			try {
+				context.startActivity(intent);
+			} catch (ActivityNotFoundException e) {
+				// ignore
+			}
+		}
+	}
+
 	private static class ControllerData {
 
 		String message;
 		String description;
 		String iconId;
 		String url;
+		String textBtnTitle;
 
 		@ColorInt
 		int iconColor = -1;
@@ -307,6 +428,11 @@ public class DiscountHelper {
 		int descrColor = -1;
 		@ColorInt
 		int statusBarColor = -1;
+		@ColorInt
+		int textBtnTitleColor = -1;
+
+		JSONObject activityJson;
+		JSONArray oneOfConditions;
 
 		static ControllerData parse(OsmandApplication app, JSONObject obj) throws JSONException {
 			ControllerData res = new ControllerData();
@@ -314,11 +440,15 @@ public class DiscountHelper {
 			res.description = obj.getString("description");
 			res.iconId = obj.getString("icon");
 			res.url = parseUrl(app, obj.getString("url"));
+			res.textBtnTitle = obj.optString("button_title");
 			res.iconColor = parseColor("icon_color", obj);
 			res.bgColor = parseColor("bg_color", obj);
 			res.titleColor = parseColor("title_color", obj);
 			res.descrColor = parseColor("description_color", obj);
 			res.statusBarColor = parseColor("status_bar_color", obj);
+			res.textBtnTitleColor = parseColor("button_title_color", obj);
+			res.activityJson = obj.optJSONObject("activity");
+			res.oneOfConditions = obj.optJSONArray("oneOfConditions");
 			return res;
 		}
 
@@ -359,4 +489,173 @@ public class DiscountHelper {
 	private static void logError(String msg, Throwable e) {
 		Log.e(TAG, "Error: " + msg, e);
 	}
+
+	private static abstract class Condition {
+
+		protected OsmandApplication app;
+
+		Condition(OsmandApplication app) {
+			this.app = app;
+		}
+
+		abstract String getId();
+
+		abstract boolean matches(String value);
+
+	}
+
+	private static abstract class InAppPurchaseCondition extends Condition {
+
+		InAppPurchases inAppPurchases;
+
+		InAppPurchaseCondition(OsmandApplication app) {
+			super(app);
+			inAppPurchases = app.getInAppPurchaseHelper().getInAppPurchases();
+		}
+	}
+
+	private static abstract class SubscriptionCondition extends Condition {
+
+		InAppSubscriptionList liveUpdates;
+
+		SubscriptionCondition(OsmandApplication app) {
+			super(app);
+			liveUpdates = app.getInAppPurchaseHelper().getLiveUpdates();
+		}
+	}
+
+	private static class NotPurchasedSubscriptionCondition extends SubscriptionCondition {
+
+		NotPurchasedSubscriptionCondition(OsmandApplication app) {
+			super(app);
+		}
+
+		@Override
+		String getId() {
+			return "not_purchased_subscription";
+		}
+
+		@Override
+		boolean matches(@NonNull String value) {
+			InAppSubscription subscription = liveUpdates.getSubscriptionBySku(value);
+			return subscription == null || !subscription.isPurchased();
+		}
+	}
+
+	private static class PurchasedSubscriptionCondition extends SubscriptionCondition {
+
+		PurchasedSubscriptionCondition(OsmandApplication app) {
+			super(app);
+		}
+
+		@Override
+		String getId() {
+			return "purchased_subscription";
+		}
+
+		@Override
+		boolean matches(@NonNull String value) {
+			InAppSubscription subscription = liveUpdates.getSubscriptionBySku(value);
+			return subscription != null && subscription.isPurchased();
+		}
+	}
+
+	private static class NotPurchasedInAppPurchaseCondition extends InAppPurchaseCondition {
+
+		NotPurchasedInAppPurchaseCondition(OsmandApplication app) {
+			super(app);
+		}
+
+		@Override
+		String getId() {
+			return "not_purchased_inapp";
+		}
+
+		@Override
+		boolean matches(@NonNull String value) {
+			InAppPurchase purchase = inAppPurchases.getInAppPurchaseBySku(value);
+			return purchase == null || !purchase.isPurchased();
+		}
+	}
+
+	private static class PurchasedInAppPurchaseCondition extends InAppPurchaseCondition {
+
+		PurchasedInAppPurchaseCondition(OsmandApplication app) {
+			super(app);
+		}
+
+		@Override
+		String getId() {
+			return "purchased_inapp";
+		}
+
+		@Override
+		boolean matches(@NonNull String value) {
+			InAppPurchase purchase = inAppPurchases.getInAppPurchaseBySku(value);
+			return purchase != null && purchase.isPurchased();
+		}
+	}
+
+	private static class NotPurchasedPluginCondition extends Condition {
+
+		NotPurchasedPluginCondition(OsmandApplication app) {
+			super(app);
+		}
+
+		@Override
+		String getId() {
+			return "not_purchased_plugin";
+		}
+
+		@Override
+		boolean matches(@NonNull String value) {
+			OsmandPlugin plugin = OsmandPlugin.getPlugin(value);
+			return plugin == null || plugin.needsInstallation();
+		}
+	}
+
+	private static class PurchasedPluginCondition extends Condition {
+
+		PurchasedPluginCondition(OsmandApplication app) {
+			super(app);
+		}
+
+		@Override
+		String getId() {
+			return "purchased_plugin";
+		}
+
+		@Override
+		boolean matches(@NonNull String value) {
+			OsmandPlugin plugin = OsmandPlugin.getPlugin(value);
+			return plugin != null && !plugin.needsInstallation();
+		}
+	}
+
+	private static class Conditions {
+
+		protected OsmandApplication app;
+		private Condition[] conditions;
+
+		Conditions(OsmandApplication app) {
+			this.app = app;
+			conditions = new Condition[] {
+					new NotPurchasedSubscriptionCondition(app),
+					new PurchasedSubscriptionCondition(app),
+					new NotPurchasedInAppPurchaseCondition(app),
+					new PurchasedInAppPurchaseCondition(app),
+					new NotPurchasedPluginCondition(app),
+					new PurchasedPluginCondition(app) };
+		}
+
+		boolean matchesCondition(JSONObject o) {
+			for (Condition condition : conditions) {
+				String value = o.optString(condition.getId());
+				if (!TextUtils.isEmpty(value)) {
+					return condition.matches(value);
+				}
+			}
+			return false;
+		}
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java
index 8065d38bf6..51ac6b50a2 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java
@@ -11,7 +11,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 
-import net.osmand.AndroidUtils;
 import net.osmand.IndexConstants;
 import net.osmand.Location;
 import net.osmand.PlatformUtil;
@@ -824,7 +823,7 @@ public class ExternalApiHelper {
 				// test show gpx (data)
 				uri = Uri.parse("osmand.api://show_gpx");
 				intent = new Intent(Intent.ACTION_VIEW, uri);
-				intent.putExtra("data", AndroidUtils.getFileAsString(
+				intent.putExtra("data", Algorithms.getFileAsString(
 						new File(app.getAppPath(IndexConstants.GPX_INDEX_DIR), gpxName)));
 			}
 
@@ -836,7 +835,7 @@ public class ExternalApiHelper {
 				// test navigate gpx (data)
 				uri = Uri.parse("osmand.api://navigate_gpx?force=true");
 				intent = new Intent(Intent.ACTION_VIEW, uri);
-				intent.putExtra("data", AndroidUtils.getFileAsString(
+				intent.putExtra("data", Algorithms.getFileAsString(
 						new File(app.getAppPath(IndexConstants.GPX_INDEX_DIR), gpxName)));
 			}
 
diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
index f1bf559838..1dd59d3e17 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
@@ -67,12 +67,12 @@ import net.osmand.plus.GPXUtilities.GPXTrackAnalysis;
 import net.osmand.plus.GPXUtilities.Speed;
 import net.osmand.plus.GPXUtilities.TrkSegment;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
-import net.osmand.plus.UiUtilities;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.ActivityResultListener;
 import net.osmand.plus.activities.ActivityResultListener.OnActivityResultListener;
 import net.osmand.plus.activities.MapActivity;
@@ -966,17 +966,19 @@ public class GpxUiHelper {
 
 	public static void setupGPXChart(OsmandApplication ctx, LineChart mChart, int yLabelsCount) {
 		OsmandSettings settings = ctx.getSettings();
-		boolean light = settings.isLightContent();
+		setupGPXChart(mChart, yLabelsCount, 24f, 16f, settings.isLightContent(), true);
+	}
 
+	public static void setupGPXChart(LineChart mChart, int yLabelsCount, float topOffset, float bottomOffset, boolean light, boolean useGesturesAndScale) {
 		if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
 			mChart.setHardwareAccelerationEnabled(false);
 		} else {
 			mChart.setHardwareAccelerationEnabled(true);
 		}
-		mChart.setTouchEnabled(true);
-		mChart.setDragEnabled(true);
-		mChart.setScaleEnabled(true);
-		mChart.setPinchZoom(true);
+		mChart.setTouchEnabled(useGesturesAndScale);
+		mChart.setDragEnabled(useGesturesAndScale);
+		mChart.setScaleEnabled(useGesturesAndScale);
+		mChart.setPinchZoom(useGesturesAndScale);
 		mChart.setScaleYEnabled(false);
 		mChart.setAutoScaleMinMaxEnabled(true);
 		mChart.setDrawBorders(false);
@@ -985,8 +987,8 @@ public class GpxUiHelper {
 		mChart.setMinOffset(0f);
 		mChart.setDragDecelerationEnabled(false);
 
-		mChart.setExtraTopOffset(24f);
-		mChart.setExtraBottomOffset(16f);
+		mChart.setExtraTopOffset(topOffset);
+		mChart.setExtraBottomOffset(bottomOffset);
 
 		// create a custom MarkerView (extend MarkerView) and specify the layout
 		// to use for it
diff --git a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
index 0b76162d07..2ea8ce927e 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
@@ -25,7 +25,11 @@ import android.widget.Toast;
 
 import net.osmand.IProgress;
 import net.osmand.IndexConstants;
+import net.osmand.PlatformUtil;
 import net.osmand.data.FavouritePoint;
+import net.osmand.plus.AppInitializer;
+import net.osmand.plus.AppInitializer.AppInitializeListener;
+import net.osmand.plus.AppInitializer.InitEvents;
 import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
@@ -60,12 +64,13 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.zip.ZipInputStream;
+import org.apache.commons.logging.Log;
 
 /**
  * @author Koen Rabaey
  */
 public class ImportHelper {
-
+	public final static Log log = PlatformUtil.getLog(ImportHelper.class);
 	public static final String KML_SUFFIX = ".kml";
 	public static final String KMZ_SUFFIX = ".kmz";
 	public static final String GPX_SUFFIX = ".gpx";
@@ -248,39 +253,57 @@ public class ImportHelper {
 
 	@SuppressLint("StaticFieldLeak")
 	private void importFavoritesImpl(final GPXFile gpxFile, final String fileName, final boolean forceImportFavourites) {
-		new AsyncTask<Void, Void, GPXFile>() {
-			ProgressDialog progress = null;
+		if(!app.isApplicationInitializing()) {
+			new AsyncTask<Void, Void, GPXFile>() {
+				ProgressDialog progress = null;
 
-			@Override
-			protected void onPreExecute() {
-				progress = ProgressDialog.show(activity, app.getString(R.string.loading_smth, ""), app.getString(R.string.loading_data));
-			}
-
-			@Override
-			protected GPXFile doInBackground(Void... nothing) {
-				final List<FavouritePoint> favourites = asFavourites(gpxFile.getPoints(), fileName, forceImportFavourites);
-				final FavouritesDbHelper favoritesHelper = app.getFavorites();
-				for (final FavouritePoint favourite : favourites) {
-					favoritesHelper.deleteFavourite(favourite, false);
-					favoritesHelper.addFavourite(favourite, false);
+				@Override
+				protected void onPreExecute() {
+					progress = ProgressDialog
+						.show(activity, app.getString(R.string.loading_smth, ""),
+							app.getString(R.string.loading_data));
 				}
-				favoritesHelper.sortAll();
-				favoritesHelper.saveCurrentPointsIntoFile();
-				return null;
-			}
 
-			@Override
-			protected void onPostExecute(GPXFile result) {
-				if (isActivityNotDestroyed(activity)) {
-					progress.dismiss();
+				@Override
+				protected GPXFile doInBackground(Void... nothing) {
+					final List<FavouritePoint> favourites = asFavourites(gpxFile.getPoints(),
+						fileName, forceImportFavourites);
+					final FavouritesDbHelper favoritesHelper = app.getFavorites();
+					for (final FavouritePoint favourite : favourites) {
+						favoritesHelper.deleteFavourite(favourite, false);
+						favoritesHelper.addFavourite(favourite, false);
+					}
+					favoritesHelper.sortAll();
+					favoritesHelper.saveCurrentPointsIntoFile();
+					return null;
 				}
-				Toast.makeText(activity, R.string.fav_imported_sucessfully, Toast.LENGTH_LONG).show();
-				final Intent newIntent = new Intent(activity, app.getAppCustomization().getFavoritesActivity());
-				newIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-				newIntent.putExtra(FavoritesActivity.OPEN_FAVOURITES_TAB, true);
-				activity.startActivity(newIntent);
-			}
-		}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+
+				@Override
+				protected void onPostExecute(GPXFile result) {
+					if (isActivityNotDestroyed(activity)) {
+						progress.dismiss();
+					}
+					Toast.makeText(activity, R.string.fav_imported_sucessfully, Toast.LENGTH_LONG)
+						.show();
+					final Intent newIntent = new Intent(activity,
+						app.getAppCustomization().getFavoritesActivity());
+					newIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+					newIntent.putExtra(FavoritesActivity.OPEN_FAVOURITES_TAB, true);
+					activity.startActivity(newIntent);
+				}
+			}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+		} else {
+			app.getAppInitializer().addListener(new AppInitializeListener() {
+
+				@Override
+				public void onProgress(AppInitializer init, InitEvents event) {}
+
+				@Override
+				public void onFinish(AppInitializer init) {
+					importFavoritesImpl(gpxFile, fileName, forceImportFavourites);
+				}
+			});
+		}
 	}
 
 	@SuppressLint("StaticFieldLeak")
diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
index 0699b83425..4127b85184 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
@@ -47,7 +47,7 @@ import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerHalfItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
 import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
-import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
+import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
 import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.views.controls.DynamicListView.DragIcon;
 import net.osmand.plus.views.controls.ListDividerShape;
@@ -65,7 +65,7 @@ public class WaypointDialogHelper {
 	private MapActivity mapActivity;
 	private OsmandApplication app;
 	private WaypointHelper waypointHelper;
-	private WaypointDialogHelperCallbacks helperCallbacks;
+	private List<WaypointDialogHelperCallbacks> helperCallbacks= new ArrayList<>();
 
 	private boolean flat;
 	private List<LocationPointWrapper> deletedPoints;
@@ -86,15 +86,18 @@ public class WaypointDialogHelper {
 		}
 	}
 
-	public void setHelperCallbacks(WaypointDialogHelperCallbacks callbacks) {
-		this.helperCallbacks = callbacks;
+	public void addHelperCallbacks(WaypointDialogHelperCallbacks callbacks) {
+		helperCallbacks.add(callbacks);
+	}
+
+	public void removeHelperCallbacks(WaypointDialogHelperCallbacks callbacks) {
+		helperCallbacks.add(callbacks);
 	}
 
 	public WaypointDialogHelper(MapActivity mapActivity) {
 		this.app = mapActivity.getMyApplication();
 		waypointHelper = this.app.getWaypointHelper();
 		this.mapActivity = mapActivity;
-
 	}
 
 	public static void updatePointInfoView(final OsmandApplication app, final Activity activity,
@@ -217,7 +220,46 @@ public class WaypointDialogHelper {
 		return points;
 	}
 
-	private List<Object> getActivePoints(List<Object> points) {
+	public List<Object> getTargetPoints() {
+		final List<Object> points = new ArrayList<>();
+		for (int i = 0; i < WaypointHelper.MAX; i++) {
+			List<LocationPointWrapper> tp = waypointHelper.getWaypoints(i);
+			if ((i == WaypointHelper.WAYPOINTS || i == WaypointHelper.TARGETS) && waypointHelper.isTypeVisible(i)) {
+				if (i == WaypointHelper.TARGETS) {
+					TargetPoint start = app.getTargetPointsHelper().getPointToStart();
+					if (start == null) {
+						LatLon latLon;
+						Location loc = app.getLocationProvider().getLastKnownLocation();
+						if (loc != null) {
+							latLon = new LatLon(loc.getLatitude(), loc.getLongitude());
+						} else {
+							latLon = new LatLon(mapActivity.getMapView().getLatitude(),
+									mapActivity.getMapView().getLongitude());
+						}
+						start = TargetPoint.createStartPoint(latLon,
+								new PointDescription(PointDescription.POINT_TYPE_MY_LOCATION,
+										mapActivity.getString(R.string.shared_string_my_location)));
+					} else {
+						String oname = start.getOnlyName().length() > 0 ? start.getOnlyName()
+								: (mapActivity.getString(R.string.route_descr_map_location)
+								+ " " + mapActivity.getString(R.string.route_descr_lat_lon, start.getLatitude(), start.getLongitude()));
+
+						start = TargetPoint.createStartPoint(new LatLon(start.getLatitude(), start.getLongitude()),
+								new PointDescription(PointDescription.POINT_TYPE_LOCATION,
+										oname));
+					}
+					points.add(new LocationPointWrapper(null, WaypointHelper.TARGETS, start, 0f, 0));
+
+				}
+				if (tp != null && tp.size() > 0) {
+					points.addAll(tp);
+				}
+			}
+		}
+		return points;
+	}
+
+	public List<Object> getActivePoints(List<Object> points) {
 		List<Object> activePoints = new ArrayList<>();
 		for (Object p : points) {
 			if (p instanceof LocationPointWrapper) {
@@ -358,8 +400,10 @@ public class WaypointDialogHelper {
 								= new GeocodingLookupService.AddressLookupRequest(t.point, new GeocodingLookupService.OnAddressLookupResult() {
 							@Override
 							public void geocodingDone(String address) {
-								if (helperCallbacks != null) {
-									helperCallbacks.reloadAdapter();
+								if (!helperCallbacks.isEmpty()) {
+									for (WaypointDialogHelperCallbacks callback : helperCallbacks) {
+										callback.reloadAdapter();
+									}
 								} else {
 									reloadListAdapter(listAdapter);
 								}
@@ -454,7 +498,7 @@ public class WaypointDialogHelper {
 	}
 
 	// switch start & finish
-	private static void switchStartAndFinish(TargetPointsHelper targetPointsHelper, TargetPoint finish,
+	public static void switchStartAndFinish(TargetPointsHelper targetPointsHelper, TargetPoint finish,
 											 Activity ctx, TargetPoint start, OsmandApplication app,
 											 WaypointDialogHelper helper) {
 		targetPointsHelper.setStartPoint(new LatLon(finish.getLatitude(),
@@ -472,9 +516,11 @@ public class WaypointDialogHelper {
 		updateControls(ctx, helper);
 	}
 
-	private static void updateControls(Activity ctx, WaypointDialogHelper helper) {
+	public static void updateControls(Activity ctx, WaypointDialogHelper helper) {
 		if (helper != null && helper.helperCallbacks != null) {
-			helper.helperCallbacks.reloadAdapter();
+			for (WaypointDialogHelperCallbacks callback : helper.helperCallbacks) {
+				callback.reloadAdapter();
+			}
 		}
 		updateRouteInfoMenu(ctx);
 	}
@@ -484,7 +530,7 @@ public class WaypointDialogHelper {
 		updateControls(ctx, helper);
 	}
 
-	private static void replaceStartWithFirstIntermediate(TargetPointsHelper targetPointsHelper, Activity ctx,
+	public static void replaceStartWithFirstIntermediate(TargetPointsHelper targetPointsHelper, Activity ctx,
 														  WaypointDialogHelper helper) {
 		List<TargetPoint> intermediatePoints = targetPointsHelper.getIntermediatePointsWithTarget();
 		TargetPoint firstIntermediate = intermediatePoints.remove(0);
@@ -521,8 +567,10 @@ public class WaypointDialogHelper {
 			LocationPointWrapper point = (LocationPointWrapper) item;
 			if (point.type == WaypointHelper.TARGETS && adapter instanceof StableArrayAdapter) {
 				StableArrayAdapter stableAdapter = (StableArrayAdapter) adapter;
-				if (helper != null && helper.helperCallbacks != null && needCallback) {
-					helper.helperCallbacks.deleteWaypoint(stableAdapter.getPosition(item));
+				if (helper != null && !helper.helperCallbacks.isEmpty() && needCallback) {
+					for (WaypointDialogHelperCallbacks callback : helper.helperCallbacks) {
+						callback.deleteWaypoint(stableAdapter.getPosition(item));
+					}
 				}
 				updateRouteInfoMenu(ctx);
 			} else {
@@ -684,8 +732,10 @@ public class WaypointDialogHelper {
 								enableType(running, listAdapter, type, enable);
 							} else {
 								running[0] = -1;
-								if (helperCallbacks != null) {
-									helperCallbacks.reloadAdapter();
+								if (!helperCallbacks.isEmpty()) {
+									for (WaypointDialogHelperCallbacks callback : helperCallbacks) {
+										callback.reloadAdapter();
+									}
 								} else {
 									reloadListAdapter(listAdapter);
 								}
@@ -709,8 +759,10 @@ public class WaypointDialogHelper {
 
 			protected void onPostExecute(Void result) {
 				running[0] = -1;
-				if (helperCallbacks != null) {
-					helperCallbacks.reloadAdapter();
+				if (!helperCallbacks.isEmpty()) {
+					for (WaypointDialogHelperCallbacks callback : helperCallbacks) {
+						callback.reloadAdapter();
+					}
 				} else {
 					reloadListAdapter(listAdapter);
 				}
@@ -776,8 +828,10 @@ public class WaypointDialogHelper {
 
 			protected void onPostExecute(Void result) {
 				running[0] = -1;
-				if (helperCallbacks != null) {
-					helperCallbacks.reloadAdapter();
+				if (!helperCallbacks.isEmpty()) {
+					for (WaypointDialogHelperCallbacks callback : helperCallbacks) {
+						callback.reloadAdapter();
+					}
 				} else {
 					reloadListAdapter(listAdapter);
 				}
@@ -800,7 +854,7 @@ public class WaypointDialogHelper {
 		listAdapter.notifyDataSetChanged();
 	}
 
-	protected String getHeader(int type, boolean checked, Activity ctx) {
+	public String getHeader(int type, boolean checked, Activity ctx) {
 		String str = ctx.getString(R.string.shared_string_waypoints);
 		switch (type) {
 			case WaypointHelper.TARGETS:
@@ -965,8 +1019,10 @@ public class WaypointDialogHelper {
 				if (!eq) {
 					targets.reorderAllTargetPoints(intermediates, true);
 				}
-				if (helper.helperCallbacks != null) {
-					helper.helperCallbacks.reloadAdapter();
+				if (!helper.helperCallbacks.isEmpty()) {
+					for (WaypointDialogHelperCallbacks callback : helper.helperCallbacks) {
+						callback.reloadAdapter();
+					}
 				}
 				updateRouteInfoMenu(activity);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
index ba28c82585..c7552f9228 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
@@ -680,13 +680,15 @@ public class WaypointHelper {
 	}
 
 	public static class LocationPointWrapper {
-		LocationPoint point;
-		float deviationDistance;
-		boolean deviationDirectionRight;
+
+		public LocationPoint point;
+		public float deviationDistance;
+		public boolean deviationDirectionRight;
+		public int type;
+
 		int routeIndex;
 		boolean announce = true;
 		RouteCalculationResult route;
-		int type;
 
 		public LocationPointWrapper() {
 		}
diff --git a/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt b/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt
index 2d5b32048a..9380d6918f 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt
+++ b/OsmAnd/src/net/osmand/plus/helpers/kml2gpx.xslt
@@ -66,6 +66,44 @@
 					</wpt>
 				</xsl:if>
 			</xsl:for-each>
+
+			<xsl:for-each select="//ge:Placemark">
+				<xsl:variable name="lonlat" select="ge:Point/ge:coordinates"/>
+				<xsl:variable name="lon" select="substring-before($lonlat,',')"/>
+				<xsl:variable name="latele" select="substring-after($lonlat,',')"/>
+				<xsl:variable name="lat">
+					<xsl:choose>
+						<xsl:when test="contains($latele,' ')">
+							<xsl:value-of select="substring-before($latele,',')"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="$latele"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:variable name="foldername" select="../ge:name"/>
+
+				<xsl:if test="$lon">
+					<wpt lon="{$lon}" lat="{$lat}">
+						<xsl:choose>
+							<xsl:when test="contains($latele,',')">
+								<ele><xsl:value-of select="substring-after($latele,',')"/></ele>
+							</xsl:when>
+						</xsl:choose>
+						<type>
+							<xsl:value-of select="$foldername"/>
+						</type>
+						<name>
+							<xsl:value-of select="ge:name"/>
+						</name>
+						<xsl:if test="ge:description">
+							<desc>
+								<xsl:value-of select="ge:description"/>
+							</desc>
+						</xsl:if>
+					</wpt>
+				</xsl:if>
+			</xsl:for-each>
 			<xsl:for-each select="//kml:Placemark">
 				<xsl:if test="kml:Point">
 					<xsl:variable name="lonlat" select="kml:Point/kml:coordinates"/>
diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java b/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java
index 6268f00262..ff3bc30cca 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java
@@ -5,6 +5,8 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import android.util.Log;
 
 import net.osmand.AndroidNetworkUtils;
@@ -14,6 +16,11 @@ import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
+import net.osmand.plus.inapp.InAppPurchases.InAppPurchase;
+import net.osmand.plus.inapp.InAppPurchases.InAppPurchase.PurchaseState;
+import net.osmand.plus.inapp.InAppPurchases.InAppPurchaseLiveUpdatesOldSubscription;
+import net.osmand.plus.inapp.InAppPurchases.InAppSubscription;
+import net.osmand.plus.inapp.InAppPurchases.InAppSubscriptionList;
 import net.osmand.plus.inapp.util.IabHelper;
 import net.osmand.plus.inapp.util.IabHelper.OnIabPurchaseFinishedListener;
 import net.osmand.plus.inapp.util.IabHelper.QueryInventoryFinishedListener;
@@ -25,42 +32,32 @@ import net.osmand.plus.liveupdates.CountrySelectionFragment;
 import net.osmand.plus.liveupdates.CountrySelectionFragment.CountryItem;
 import net.osmand.util.Algorithms;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import static net.osmand.plus.inapp.util.IabHelper.IABHELPER_USER_CANCELLED;
+import static net.osmand.plus.inapp.util.IabHelper.ITEM_TYPE_SUBS;
 
 public class InAppPurchaseHelper {
 	// Debug tag, for logging
 	private static final String TAG = InAppPurchaseHelper.class.getSimpleName();
-	boolean mDebugLog = true;
+	private boolean mDebugLog = true;
 
 	public static final long SUBSCRIPTION_HOLDING_TIME_MSEC = 1000 * 60 * 60 * 24 * 3; // 3 days
 
+	private InAppPurchases purchases;
 	private long lastValidationCheckTime;
-	private String liveUpdatesPrice;
-	private String fullVersionPrice;
-	private String depthContoursPrice;
-	private String contourLinesPrice;
-
-	public static final String SKU_FULL_VERSION_PRICE = "osmand_full_version_price";
-
-	private static final String SKU_LIVE_UPDATES_FULL = "osm_live_subscription_2";
-	private static final String SKU_LIVE_UPDATES_FREE = "osm_free_live_subscription_2";
-	private static final String SKU_DEPTH_CONTOURS_FULL = "net.osmand.seadepth_plus";
-	private static final String SKU_DEPTH_CONTOURS_FREE = "net.osmand.seadepth";
-	private static final String SKU_CONTOUR_LINES_FULL = "net.osmand.contourlines_plus";
-	private static final String SKU_CONTOUR_LINES_FREE = "net.osmand.contourlines";
-
-	public static String SKU_LIVE_UPDATES;
-	public static String SKU_DEPTH_CONTOURS;
-	public static String SKU_CONTOUR_LINES;
 
 	private static final long PURCHASE_VALIDATION_PERIOD_MSEC = 1000 * 60 * 60 * 24; // daily
 	// (arbitrary) request code for the purchase flow
@@ -72,6 +69,7 @@ public class InAppPurchaseHelper {
 	private String token = "";
 	private InAppPurchaseTaskType activeTask;
 	private boolean processingTask = false;
+	private boolean inventoryRequestPending = false;
 
 	private OsmandApplication ctx;
 	private InAppPurchaseListener uiActivity = null;
@@ -138,59 +136,39 @@ public class InAppPurchaseHelper {
 		return Version.isDeveloperBuild(ctx) || ctx.getSettings().DEPTH_CONTOURS_PURCHASED.get();
 	}
 
-	public String getLiveUpdatesPrice() {
-		return liveUpdatesPrice;
+	public InAppPurchases getInAppPurchases() {
+		return purchases;
 	}
 
-	public String getFullVersionPrice() {
-		return fullVersionPrice;
+	public InAppSubscriptionList getLiveUpdates() {
+		return purchases.getLiveUpdates();
 	}
 
-	public String getDepthContoursPrice() {
-		return depthContoursPrice;
+	public InAppPurchase getFullVersion() {
+		return purchases.getFullVersion();
 	}
 
-	public String getContourLinesPrice() {
-		return contourLinesPrice;
+	public InAppPurchase getDepthContours() {
+		return purchases.getDepthContours();
 	}
 
-	public String getSkuLiveUpdates() {
-		return SKU_LIVE_UPDATES;
+	public InAppPurchase getContourLines() {
+		return purchases.getContourLines();
 	}
 
-	public boolean hasPrices() {
-		return !Algorithms.isEmpty(liveUpdatesPrice)
-				&& (!Version.isFreeVersion(ctx) || !Algorithms.isEmpty(fullVersionPrice));
+	public InAppSubscription getMonthlyLiveUpdates() {
+		return purchases.getMonthlyLiveUpdates();
 	}
 
-	private void initialize() {
-		if (SKU_LIVE_UPDATES == null) {
-			if (Version.isFreeVersion(ctx)) {
-				SKU_LIVE_UPDATES = SKU_LIVE_UPDATES_FREE;
-			} else {
-				SKU_LIVE_UPDATES = SKU_LIVE_UPDATES_FULL;
-			}
-		}
-		if (SKU_DEPTH_CONTOURS == null) {
-			if (Version.isFreeVersion(ctx)) {
-				SKU_DEPTH_CONTOURS = SKU_DEPTH_CONTOURS_FREE;
-			} else {
-				SKU_DEPTH_CONTOURS = SKU_DEPTH_CONTOURS_FULL;
-			}
-		}
-		if (SKU_CONTOUR_LINES == null) {
-			if (Version.isFreeVersion(ctx)) {
-				SKU_CONTOUR_LINES = SKU_CONTOUR_LINES_FREE;
-			} else {
-				SKU_CONTOUR_LINES = SKU_CONTOUR_LINES_FULL;
-			}
-		}
+	@Nullable
+	public InAppSubscription getPurchasedMonthlyLiveUpdates() {
+		return purchases.getPurchasedMonthlyLiveUpdates();
 	}
 
 	public InAppPurchaseHelper(OsmandApplication ctx) {
 		this.ctx = ctx;
 		isDeveloperVersion = Version.isDeveloperVersion(ctx);
-		initialize();
+		purchases = new InAppPurchases(ctx);
 	}
 
 	public boolean hasInventory() {
@@ -198,11 +176,11 @@ public class InAppPurchaseHelper {
 	}
 
 	public boolean isPurchased(String inAppSku) {
-		if (inAppSku.equals(SKU_FULL_VERSION_PRICE)) {
+		if (purchases.isFullVersion(inAppSku)) {
 			return isFullVersionPurchased(ctx);
-		} else if (inAppSku.equals(SKU_LIVE_UPDATES_FULL) || inAppSku.equals(SKU_LIVE_UPDATES_FREE)) {
+		} else if (purchases.isLiveUpdates(inAppSku)) {
 			return isSubscribedToLiveUpdates(ctx);
-		} else if (inAppSku.equals(SKU_DEPTH_CONTOURS_FULL) || inAppSku.equals(SKU_DEPTH_CONTOURS_FREE)) {
+		} else if (purchases.isDepthContours(inAppSku)) {
 			return isDepthContoursPurchased(ctx);
 		}
 		return false;
@@ -214,7 +192,10 @@ public class InAppPurchaseHelper {
 		}
 
 		if (processingTask) {
-			logError("Already processing task: " + taskType + ". Exit.");
+			if (taskType == InAppPurchaseTaskType.REQUEST_INVENTORY) {
+				inventoryRequestPending = true;
+			}
+			logError("Already processing task: " + activeTask + ". Exit.");
 			return;
 		}
 
@@ -259,32 +240,13 @@ public class InAppPurchaseHelper {
 	}
 
 	public boolean needRequestInventory() {
-		return (isSubscribedToLiveUpdates(ctx) && !ctx.getSettings().BILLING_PURCHASE_TOKEN_SENT.get())
+		return (isSubscribedToLiveUpdates(ctx) && Algorithms.isEmpty(ctx.getSettings().BILLING_PURCHASE_TOKENS_SENT.get()))
 				|| System.currentTimeMillis() - lastValidationCheckTime > PURCHASE_VALIDATION_PERIOD_MSEC;
 	}
 
 	public void requestInventory() {
 		notifyShowProgress(InAppPurchaseTaskType.REQUEST_INVENTORY);
-		exec(InAppPurchaseTaskType.REQUEST_INVENTORY, new InAppRunnable() {
-			@Override
-			public boolean run(InAppPurchaseHelper helper) {
-				logDebug("Setup successful. Querying inventory.");
-				List<String> skus = new ArrayList<>();
-				skus.add(SKU_LIVE_UPDATES);
-				skus.add(SKU_DEPTH_CONTOURS);
-				skus.add(SKU_CONTOUR_LINES);
-				skus.add(SKU_FULL_VERSION_PRICE);
-				try {
-					mHelper.queryInventoryAsync(true, skus, mGotInventoryListener);
-					return false;
-				} catch (Exception e) {
-					logError("queryInventoryAsync Error", e);
-					notifyDismissProgress(InAppPurchaseTaskType.REQUEST_INVENTORY);
-					stop(true);
-				}
-				return true;
-			}
-		});
+		new RequestInventoryTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
 	}
 
 	public void purchaseFullVersion(final Activity activity) {
@@ -294,7 +256,7 @@ public class InAppPurchaseHelper {
 			public boolean run(InAppPurchaseHelper helper) {
 				try {
 					mHelper.launchPurchaseFlow(activity,
-							SKU_FULL_VERSION_PRICE, RC_REQUEST, mPurchaseFinishedListener);
+							getFullVersion().getSku(), RC_REQUEST, mPurchaseFinishedListener);
 					return false;
 				} catch (Exception e) {
 					complain("Cannot launch full version purchase!");
@@ -306,10 +268,10 @@ public class InAppPurchaseHelper {
 		});
 	}
 
-	public void purchaseLiveUpdates(Activity activity, String email, String userName,
+	public void purchaseLiveUpdates(Activity activity, String sku, String email, String userName,
 									String countryDownloadName, boolean hideUserName) {
 		notifyShowProgress(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES);
-		new LiveUpdatesPurchaseTask(activity, email, userName, countryDownloadName, hideUserName)
+		new LiveUpdatesPurchaseTask(activity, sku, email, userName, countryDownloadName, hideUserName)
 				.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
 	}
 
@@ -320,7 +282,7 @@ public class InAppPurchaseHelper {
 			public boolean run(InAppPurchaseHelper helper) {
 				try {
 					mHelper.launchPurchaseFlow(activity,
-							SKU_DEPTH_CONTOURS, RC_REQUEST, mPurchaseFinishedListener);
+							getDepthContours().getSku(), RC_REQUEST, mPurchaseFinishedListener);
 					return false;
 				} catch (Exception e) {
 					complain("Cannot launch depth contours purchase!");
@@ -359,9 +321,70 @@ public class InAppPurchaseHelper {
 			 * verifyDeveloperPayload().
 			 */
 
+			List<String> allOwnedSubscriptionSkus = inventory.getAllOwnedSkus(ITEM_TYPE_SUBS);
+			for (InAppPurchase p : getLiveUpdates().getAllSubscriptions()) {
+				if (inventory.hasDetails(p.getSku())) {
+					Purchase purchase = inventory.getPurchase(p.getSku());
+					SkuDetails liveUpdatesDetails = inventory.getSkuDetails(p.getSku());
+					fetchInAppPurchase(p, liveUpdatesDetails, purchase);
+					allOwnedSubscriptionSkus.remove(p.getSku());
+				}
+			}
+			for (String sku : allOwnedSubscriptionSkus) {
+				Purchase purchase = inventory.getPurchase(sku);
+				SkuDetails liveUpdatesDetails = inventory.getSkuDetails(sku);
+				InAppSubscription s = getLiveUpdates().upgradeSubscription(sku);
+				if (s == null) {
+					s = new InAppPurchaseLiveUpdatesOldSubscription(liveUpdatesDetails);
+				}
+				fetchInAppPurchase(s, liveUpdatesDetails, purchase);
+			}
+
+			InAppPurchase fullVersion = getFullVersion();
+			if (inventory.hasDetails(fullVersion.getSku())) {
+				Purchase purchase = inventory.getPurchase(fullVersion.getSku());
+				SkuDetails fullPriceDetails = inventory.getSkuDetails(fullVersion.getSku());
+				fetchInAppPurchase(fullVersion, fullPriceDetails, purchase);
+			}
+
+			InAppPurchase depthContours = getDepthContours();
+			if (inventory.hasDetails(depthContours.getSku())) {
+				Purchase purchase = inventory.getPurchase(depthContours.getSku());
+				SkuDetails depthContoursDetails = inventory.getSkuDetails(depthContours.getSku());
+				fetchInAppPurchase(depthContours, depthContoursDetails, purchase);
+			}
+
+			InAppPurchase contourLines = getContourLines();
+			if (inventory.hasDetails(contourLines.getSku())) {
+				Purchase purchase = inventory.getPurchase(contourLines.getSku());
+				SkuDetails contourLinesDetails = inventory.getSkuDetails(contourLines.getSku());
+				fetchInAppPurchase(contourLines, contourLinesDetails, purchase);
+			}
+
+			Purchase fullVersionPurchase = inventory.getPurchase(fullVersion.getSku());
+			boolean fullVersionPurchased = (fullVersionPurchase != null && fullVersionPurchase.getPurchaseState() == 0);
+			if (fullVersionPurchased) {
+				ctx.getSettings().FULL_VERSION_PURCHASED.set(true);
+			}
+
+			Purchase depthContoursPurchase = inventory.getPurchase(depthContours.getSku());
+			boolean depthContoursPurchased = (depthContoursPurchase != null && depthContoursPurchase.getPurchaseState() == 0);
+			if (depthContoursPurchased) {
+				ctx.getSettings().DEPTH_CONTOURS_PURCHASED.set(true);
+			}
+
 			// Do we have the live updates?
-			Purchase liveUpdatesPurchase = inventory.getPurchase(SKU_LIVE_UPDATES);
-			boolean subscribedToLiveUpdates = (liveUpdatesPurchase != null && liveUpdatesPurchase.getPurchaseState() == 0);
+			boolean subscribedToLiveUpdates = false;
+			List<Purchase> liveUpdatesPurchases = new ArrayList<>();
+			for (InAppPurchase p : getLiveUpdates().getAllSubscriptions()) {
+				Purchase purchase = inventory.getPurchase(p.getSku());
+				if (purchase != null) {
+					liveUpdatesPurchases.add(purchase);
+					if (!subscribedToLiveUpdates && purchase.getPurchaseState() == 0) {
+						subscribedToLiveUpdates = true;
+					}
+				}
+			}
 			OsmandPreference<Long> subscriptionCancelledTime = ctx.getSettings().LIVE_UPDATES_PURCHASE_CANCELLED_TIME;
 			if (!subscribedToLiveUpdates && ctx.getSettings().LIVE_UPDATES_PURCHASED.get()) {
 				if (subscriptionCancelledTime.get() == 0) {
@@ -379,59 +402,34 @@ public class InAppPurchaseHelper {
 				ctx.getSettings().LIVE_UPDATES_PURCHASED.set(true);
 			}
 
-			Purchase fullVersionPurchase = inventory.getPurchase(SKU_FULL_VERSION_PRICE);
-			boolean fullVersionPurchased = (fullVersionPurchase != null && fullVersionPurchase.getPurchaseState() == 0);
-			if (fullVersionPurchased) {
-				ctx.getSettings().FULL_VERSION_PURCHASED.set(true);
-			}
-
-			Purchase depthContoursPurchase = inventory.getPurchase(SKU_DEPTH_CONTOURS);
-			boolean depthContoursPurchased = (depthContoursPurchase != null && depthContoursPurchase.getPurchaseState() == 0);
-			if (depthContoursPurchased) {
-				ctx.getSettings().DEPTH_CONTOURS_PURCHASED.set(true);
-			}
-
 			lastValidationCheckTime = System.currentTimeMillis();
 			logDebug("User " + (subscribedToLiveUpdates ? "HAS" : "DOES NOT HAVE")
 					+ " live updates purchased.");
 
-			if (inventory.hasDetails(SKU_LIVE_UPDATES)) {
-				SkuDetails liveUpdatesDetails = inventory.getSkuDetails(SKU_LIVE_UPDATES);
-				liveUpdatesPrice = liveUpdatesDetails.getPrice();
-			}
-			if (inventory.hasDetails(SKU_FULL_VERSION_PRICE)) {
-				SkuDetails fullPriceDetails = inventory.getSkuDetails(SKU_FULL_VERSION_PRICE);
-				fullVersionPrice = fullPriceDetails.getPrice();
-			}
-			if (inventory.hasDetails(SKU_DEPTH_CONTOURS)) {
-				SkuDetails depthContoursDetails = inventory.getSkuDetails(SKU_DEPTH_CONTOURS);
-				depthContoursPrice = depthContoursDetails.getPrice();
-			}
-			if (inventory.hasDetails(SKU_CONTOUR_LINES)) {
-				SkuDetails contourLinesDetails = inventory.getSkuDetails(SKU_CONTOUR_LINES);
-				contourLinesPrice = contourLinesDetails.getPrice();
-			}
 			OsmandSettings settings = ctx.getSettings();
 			settings.INAPPS_READ.set(true);
 
-			boolean needSendToken = false;
-			if (liveUpdatesPurchase != null) {
-				if ((Algorithms.isEmpty(settings.BILLING_USER_ID.get()) || Algorithms.isEmpty(settings.BILLING_USER_TOKEN.get()))
-						&& !Algorithms.isEmpty(liveUpdatesPurchase.getDeveloperPayload())) {
-					String payload = liveUpdatesPurchase.getDeveloperPayload();
-					if (!Algorithms.isEmpty(payload)) {
-						String[] arr = payload.split(" ");
-						if (arr.length > 0) {
-							settings.BILLING_USER_ID.set(arr[0]);
-						}
-						if (arr.length > 1) {
-							token = arr[1];
-							settings.BILLING_USER_TOKEN.set(token);
+			List<Purchase> tokensToSend = new ArrayList<>();
+			if (liveUpdatesPurchases.size() > 0) {
+				List<String> tokensSent = Arrays.asList(settings.BILLING_PURCHASE_TOKENS_SENT.get().split(";"));
+				for (Purchase purchase : liveUpdatesPurchases) {
+					if ((Algorithms.isEmpty(settings.BILLING_USER_ID.get()) || Algorithms.isEmpty(settings.BILLING_USER_TOKEN.get()))
+							&& !Algorithms.isEmpty(purchase.getDeveloperPayload())) {
+						String payload = purchase.getDeveloperPayload();
+						if (!Algorithms.isEmpty(payload)) {
+							String[] arr = payload.split(" ");
+							if (arr.length > 0) {
+								settings.BILLING_USER_ID.set(arr[0]);
+							}
+							if (arr.length > 1) {
+								token = arr[1];
+								settings.BILLING_USER_TOKEN.set(token);
+							}
 						}
 					}
-				}
-				if (!settings.BILLING_PURCHASE_TOKEN_SENT.get()) {
-					needSendToken = true;
+					if (!tokensSent.contains(purchase.getSku())) {
+						tokensToSend.add(purchase);
+					}
 				}
 			}
 
@@ -445,19 +443,41 @@ public class InAppPurchaseHelper {
 				}
 			};
 
-			if (needSendToken) {
-				sendToken(liveUpdatesPurchase.getToken(), listener);
+			if (tokensToSend.size() > 0) {
+				sendTokens(tokensToSend, listener);
 			} else {
 				listener.onResult("OK");
 			}
 		}
 	};
 
+	private void fetchInAppPurchase(@NonNull InAppPurchase inAppPurchase, @NonNull SkuDetails skuDetails, @Nullable Purchase purchase) {
+		if (purchase != null) {
+			inAppPurchase.setPurchaseState(purchase.getPurchaseState() == 0
+					? PurchaseState.PURCHASED : PurchaseState.NOT_PURCHASED);
+			inAppPurchase.setPurchaseTime(purchase.getPurchaseTime());
+		} else {
+			inAppPurchase.setPurchaseState(PurchaseState.NOT_PURCHASED);
+		}
+		inAppPurchase.setPrice(skuDetails.getPrice());
+		inAppPurchase.setPriceCurrencyCode(skuDetails.getPriceCurrencyCode());
+		if (skuDetails.getPriceAmountMicros() > 0) {
+			inAppPurchase.setPriceValue(skuDetails.getPriceAmountMicros() / 1000000d);
+		}
+		String subscriptionPeriod = skuDetails.getSubscriptionPeriod();
+		if (!Algorithms.isEmpty(subscriptionPeriod)) {
+			if (inAppPurchase instanceof InAppSubscription) {
+				((InAppSubscription) inAppPurchase).setSubscriptionPeriod(subscriptionPeriod);
+			}
+		}
+	}
+
 	@SuppressLint("StaticFieldLeak")
 	private class LiveUpdatesPurchaseTask extends AsyncTask<Void, Void, String> {
 
 		private WeakReference<Activity> activity;
 
+		private String sku;
 		private String email;
 		private String userName;
 		private String countryDownloadName;
@@ -465,10 +485,11 @@ public class InAppPurchaseHelper {
 
 		private String userId;
 
-		LiveUpdatesPurchaseTask(Activity activity, String email, String userName,
+		LiveUpdatesPurchaseTask(Activity activity, String sku, String email, String userName,
 								String countryDownloadName, boolean hideUserName) {
 			this.activity = new WeakReference<>(activity);
 
+			this.sku = sku;
 			this.email = email;
 			this.userName = userName;
 			this.countryDownloadName = countryDownloadName;
@@ -478,35 +499,43 @@ public class InAppPurchaseHelper {
 		@Override
 		protected String doInBackground(Void... params) {
 			userId = ctx.getSettings().BILLING_USER_ID.get();
-			try {
-				Map<String, String> parameters = new HashMap<>();
-				parameters.put("visibleName", hideUserName ? "" : userName);
-				parameters.put("preferredCountry", countryDownloadName);
-				parameters.put("email", email);
-				if (Algorithms.isEmpty(userId)) {
-					parameters.put("status", "new");
+			if (Algorithms.isEmpty(userId) || Algorithms.isEmpty(token)) {
+				try {
+					Map<String, String> parameters = new HashMap<>();
+					parameters.put("visibleName", hideUserName ? "" : userName);
+					parameters.put("preferredCountry", countryDownloadName);
+					parameters.put("email", email);
+
+					return AndroidNetworkUtils.sendRequest(ctx,
+							"https://osmand.net/subscription/register",
+							parameters, "Requesting userId...", true, true);
+
+				} catch (Exception e) {
+					logError("sendRequest Error", e);
 				}
-
-				return AndroidNetworkUtils.sendRequest(ctx,
-						"https://osmand.net/subscription/register",
-						parameters, "Requesting userId...", true, true);
-
-			} catch (Exception e) {
-				logError("sendRequest Error", e);
-				return null;
 			}
+			return null;
 		}
 
 		@Override
 		protected void onPostExecute(String response) {
 			logDebug("Response=" + response);
 			if (response == null) {
-				complain("Cannot retrieve userId from server.");
-				notifyDismissProgress(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES);
-				notifyError(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES, "Cannot retrieve userId from server.");
-				stop(true);
-				return;
-
+				if (!Algorithms.isEmpty(userId)) {
+					if (Algorithms.isEmpty(token)) {
+						complain("User token is empty.");
+						notifyDismissProgress(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES);
+						notifyError(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES, "User token is empty.");
+						stop(true);
+						return;
+					}
+				} else {
+					complain("Cannot retrieve userId from server.");
+					notifyDismissProgress(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES);
+					notifyError(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES, "Cannot retrieve userId from server.");
+					stop(true);
+					return;
+				}
 			} else {
 				try {
 					JSONObject obj = new JSONObject(response);
@@ -526,7 +555,7 @@ public class InAppPurchaseHelper {
 			}
 
 			notifyDismissProgress(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES);
-			if (!Algorithms.isEmpty(userId)) {
+			if (!Algorithms.isEmpty(userId) && !Algorithms.isEmpty(token)) {
 				logDebug("Launching purchase flow for live updates subscription for userId=" + userId);
 				final String payload = userId + " " + token;
 				exec(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES, new InAppRunnable() {
@@ -536,7 +565,7 @@ public class InAppPurchaseHelper {
 							Activity a = activity.get();
 							if (a != null) {
 								mHelper.launchPurchaseFlow(a,
-										SKU_LIVE_UPDATES, IabHelper.ITEM_TYPE_SUBS,
+										sku, ITEM_TYPE_SUBS,
 										RC_REQUEST, mPurchaseFinishedListener, payload);
 								return false;
 							} else {
@@ -550,7 +579,7 @@ public class InAppPurchaseHelper {
 					}
 				});
 			} else {
-				notifyError(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES,"Empty userId");
+				notifyError(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES, "Empty userId");
 				stop(true);
 			}
 		}
@@ -578,6 +607,71 @@ public class InAppPurchaseHelper {
 		}
 	}
 
+	@SuppressLint("StaticFieldLeak")
+	private class RequestInventoryTask extends AsyncTask<Void, Void, String> {
+
+		RequestInventoryTask() {
+		}
+
+		@Override
+		protected String doInBackground(Void... params) {
+			try {
+				Map<String, String> parameters = new HashMap<>();
+				parameters.put("androidPackage", ctx.getPackageName());
+				parameters.put("version", Version.getFullVersion(ctx));
+				parameters.put("lang", ctx.getLanguage() + "");
+
+				return AndroidNetworkUtils.sendRequest(ctx,
+						"https://osmand.net/api/subscriptions/active",
+						parameters, "Requesting active subscriptions...", false, false);
+
+			} catch (Exception e) {
+				logError("sendRequest Error", e);
+			}
+			return null;
+		}
+
+		@Override
+		protected void onPostExecute(String response) {
+			logDebug("Response=" + response);
+			if (response != null) {
+				try {
+					JSONObject obj = new JSONObject(response);
+					JSONArray names = obj.names();
+					for (int i = 0; i < names.length(); i++) {
+						String skuType = names.getString(i);
+						JSONObject subObj = obj.getJSONObject(skuType);
+						String sku = subObj.getString("sku");
+						if (!Algorithms.isEmpty(sku)) {
+							getLiveUpdates().upgradeSubscription(sku);
+						}
+					}
+				} catch (JSONException e) {
+					logError("Json parsing error", e);
+				}
+			}
+			exec(InAppPurchaseTaskType.REQUEST_INVENTORY, new InAppRunnable() {
+				@Override
+				public boolean run(InAppPurchaseHelper helper) {
+					logDebug("Setup successful. Querying inventory.");
+					Set<String> skus = new HashSet<>();
+					for (InAppPurchase purchase : purchases.getAllInAppPurchases()) {
+						skus.add(purchase.getSku());
+					}
+					try {
+						mHelper.queryInventoryAsync(true, new ArrayList<>(skus), mGotInventoryListener);
+						return false;
+					} catch (Exception e) {
+						logError("queryInventoryAsync Error", e);
+						notifyDismissProgress(InAppPurchaseTaskType.REQUEST_INVENTORY);
+						stop(true);
+					}
+					return true;
+				}
+			});
+		}
+	}
+
 	// Callback for when a purchase is finished
 	private OnIabPurchaseFinishedListener mPurchaseFinishedListener = new OnIabPurchaseFinishedListener() {
 		public void onIabPurchaseFinished(IabResult result, Purchase purchase) {
@@ -601,10 +695,13 @@ public class InAppPurchaseHelper {
 
 			logDebug("Purchase successful.");
 
-			if (purchase.getSku().equals(SKU_LIVE_UPDATES)) {
+			InAppPurchase liveUpdatesPurchase = getLiveUpdates().getSubscriptionBySku(purchase.getSku());
+			if (liveUpdatesPurchase != null) {
 				// bought live updates
 				logDebug("Live updates subscription purchased.");
-				sendToken(purchase.getToken(), new OnRequestResultListener() {
+				final String sku = liveUpdatesPurchase.getSku();
+				liveUpdatesPurchase.setPurchaseState(purchase.getPurchaseState() == 0 ? PurchaseState.PURCHASED : PurchaseState.NOT_PURCHASED);
+				sendTokens(Collections.singletonList(purchase), new OnRequestResultListener() {
 					@Override
 					public void onResult(String result) {
 						boolean active = ctx.getSettings().LIVE_UPDATES_PURCHASED.get();
@@ -616,30 +713,32 @@ public class InAppPurchaseHelper {
 						ctx.getSettings().LIVE_UPDATES_PURCHASE_CANCELLED_SECOND_DLG_SHOWN.set(false);
 
 						notifyDismissProgress(InAppPurchaseTaskType.PURCHASE_LIVE_UPDATES);
-						notifyItemPurchased(SKU_LIVE_UPDATES, active);
+						notifyItemPurchased(sku, active);
 						stop(true);
 					}
 				});
 
-			} else if (purchase.getSku().equals(SKU_FULL_VERSION_PRICE)) {
+			} else if (purchase.getSku().equals(getFullVersion().getSku())) {
 				// bought full version
+				getFullVersion().setPurchaseState(purchase.getPurchaseState() == 0 ? PurchaseState.PURCHASED : PurchaseState.NOT_PURCHASED);
 				logDebug("Full version purchased.");
 				showToast(ctx.getString(R.string.full_version_thanks));
 				ctx.getSettings().FULL_VERSION_PURCHASED.set(true);
 
 				notifyDismissProgress(InAppPurchaseTaskType.PURCHASE_FULL_VERSION);
-				notifyItemPurchased(SKU_FULL_VERSION_PRICE, false);
+				notifyItemPurchased(getFullVersion().getSku(), false);
 				stop(true);
 
-			} else if (purchase.getSku().equals(SKU_DEPTH_CONTOURS)) {
+			} else if (purchase.getSku().equals(getDepthContours().getSku())) {
 				// bought sea depth contours
+				getDepthContours().setPurchaseState(purchase.getPurchaseState() == 0 ? PurchaseState.PURCHASED : PurchaseState.NOT_PURCHASED);
 				logDebug("Sea depth contours purchased.");
 				showToast(ctx.getString(R.string.sea_depth_thanks));
 				ctx.getSettings().DEPTH_CONTOURS_PURCHASED.set(true);
 				ctx.getSettings().getCustomRenderBooleanProperty("depthContours").set(true);
 
 				notifyDismissProgress(InAppPurchaseTaskType.PURCHASE_DEPTH_CONTOURS);
-				notifyItemPurchased(SKU_DEPTH_CONTOURS, false);
+				notifyItemPurchased(getDepthContours().getSku(), false);
 				stop(true);
 
 			} else {
@@ -669,73 +768,86 @@ public class InAppPurchaseHelper {
 			processingTask = false;
 			activeTask = null;
 		}
+		if (inventoryRequestPending) {
+			inventoryRequestPending = false;
+			requestInventory();
+		}
 	}
 
-	private void sendToken(String purchaseToken, final OnRequestResultListener listener) {
+	private void sendTokens(@NonNull final List<Purchase> purchases, final OnRequestResultListener listener) {
 		final String userId = ctx.getSettings().BILLING_USER_ID.get();
 		final String token = ctx.getSettings().BILLING_USER_TOKEN.get();
 		final String email = ctx.getSettings().BILLING_USER_EMAIL.get();
 		try {
-			Map<String, String> parameters = new HashMap<>();
-			parameters.put("userid", userId);
-			parameters.put("sku", SKU_LIVE_UPDATES);
-			parameters.put("purchaseToken", purchaseToken);
-			parameters.put("email", email);
-			parameters.put("token", token);
-
-			AndroidNetworkUtils.sendRequestAsync(ctx,
-					"https://osmand.net/subscription/purchased",
-					parameters, "Sending purchase info...", true, true, new OnRequestResultListener() {
-						@Override
-						public void onResult(String result) {
-							if (result != null) {
-								try {
-									JSONObject obj = new JSONObject(result);
-									if (!obj.has("error")) {
-										ctx.getSettings().BILLING_PURCHASE_TOKEN_SENT.set(true);
-										if (obj.has("visibleName") && !Algorithms.isEmpty(obj.getString("visibleName"))) {
-											ctx.getSettings().BILLING_USER_NAME.set(obj.getString("visibleName"));
-											ctx.getSettings().BILLING_HIDE_USER_NAME.set(false);
-										} else {
-											ctx.getSettings().BILLING_HIDE_USER_NAME.set(true);
-										}
-										if (obj.has("preferredCountry")) {
-											String prefferedCountry = obj.getString("preferredCountry");
-											if (!ctx.getSettings().BILLING_USER_COUNTRY_DOWNLOAD_NAME.get().equals(prefferedCountry)) {
-												ctx.getSettings().BILLING_USER_COUNTRY_DOWNLOAD_NAME.set(prefferedCountry);
-												CountrySelectionFragment countrySelectionFragment = new CountrySelectionFragment();
-												countrySelectionFragment.initCountries(ctx);
-												CountryItem countryItem = null;
-												if (Algorithms.isEmpty(prefferedCountry)) {
-													countryItem = countrySelectionFragment.getCountryItems().get(0);
-												} else if (!prefferedCountry.equals(OsmandSettings.BILLING_USER_DONATION_NONE_PARAMETER)) {
-													countryItem = countrySelectionFragment.getCountryItem(prefferedCountry);
-												}
-												if (countryItem != null) {
-													ctx.getSettings().BILLING_USER_COUNTRY.set(countryItem.getLocalName());
-												}
-											}
-										}
-										if (obj.has("email")) {
-											ctx.getSettings().BILLING_USER_EMAIL.set(obj.getString("email"));
-										}
-									} else {
-										complain("SendToken Error: "
-												+ obj.getString("error")
-												+ " (userId=" + userId + " token=" + token + " response=" + result + ")");
-									}
-								} catch (JSONException e) {
-									logError("SendToken", e);
-									complain("SendToken Error: "
-											+ (e.getMessage() != null ? e.getMessage() : "JSONException")
-											+ " (userId=" + userId + " token=" + token + " response=" + result + ")");
+			String url = "https://osmand.net/subscription/purchased";
+			String userOperation = "Sending purchase info...";
+			final List<AndroidNetworkUtils.Request> requests = new ArrayList<>();
+			for (Purchase purchase : purchases) {
+				Map<String, String> parameters = new HashMap<>();
+				parameters.put("userid", userId);
+				parameters.put("sku", purchase.getSku());
+				parameters.put("purchaseToken", purchase.getToken());
+				parameters.put("email", email);
+				parameters.put("token", token);
+				requests.add(new AndroidNetworkUtils.Request(url, parameters, userOperation, true, true));
+			}
+			AndroidNetworkUtils.sendRequestsAsync(ctx, requests, new OnRequestResultListener() {
+				@Override
+				public void onResult(String result) {
+					if (result != null) {
+						try {
+							JSONObject obj = new JSONObject(result);
+							if (!obj.has("error")) {
+								String tokensSentStr = ctx.getSettings().BILLING_PURCHASE_TOKENS_SENT.get();
+								Set<String> tokensSent = new HashSet<>(Arrays.asList(tokensSentStr.split(";")));
+								for (Purchase purchase : purchases) {
+									tokensSent.add(purchase.getSku());
 								}
+								ctx.getSettings().BILLING_PURCHASE_TOKENS_SENT.set(TextUtils.join(";", tokensSent));
+
+								if (obj.has("visibleName") && !Algorithms.isEmpty(obj.getString("visibleName"))) {
+									ctx.getSettings().BILLING_USER_NAME.set(obj.getString("visibleName"));
+									ctx.getSettings().BILLING_HIDE_USER_NAME.set(false);
+								} else {
+									ctx.getSettings().BILLING_HIDE_USER_NAME.set(true);
+								}
+								if (obj.has("preferredCountry")) {
+									String prefferedCountry = obj.getString("preferredCountry");
+									if (!ctx.getSettings().BILLING_USER_COUNTRY_DOWNLOAD_NAME.get().equals(prefferedCountry)) {
+										ctx.getSettings().BILLING_USER_COUNTRY_DOWNLOAD_NAME.set(prefferedCountry);
+										CountrySelectionFragment countrySelectionFragment = new CountrySelectionFragment();
+										countrySelectionFragment.initCountries(ctx);
+										CountryItem countryItem = null;
+										if (Algorithms.isEmpty(prefferedCountry)) {
+											countryItem = countrySelectionFragment.getCountryItems().get(0);
+										} else if (!prefferedCountry.equals(OsmandSettings.BILLING_USER_DONATION_NONE_PARAMETER)) {
+											countryItem = countrySelectionFragment.getCountryItem(prefferedCountry);
+										}
+										if (countryItem != null) {
+											ctx.getSettings().BILLING_USER_COUNTRY.set(countryItem.getLocalName());
+										}
+									}
+								}
+								if (obj.has("email")) {
+									ctx.getSettings().BILLING_USER_EMAIL.set(obj.getString("email"));
+								}
+							} else {
+								complain("SendToken Error: "
+										+ obj.getString("error")
+										+ " (userId=" + userId + " token=" + token + " response=" + result + ")");
 							}
-							if (listener != null) {
-								listener.onResult("OK");
-							}
+						} catch (JSONException e) {
+							logError("SendToken", e);
+							complain("SendToken Error: "
+									+ (e.getMessage() != null ? e.getMessage() : "JSONException")
+									+ " (userId=" + userId + " token=" + token + " response=" + result + ")");
 						}
-					});
+					}
+					if (listener != null) {
+						listener.onResult("OK");
+					}
+				}
+			});
 		} catch (Exception e) {
 			logError("SendToken Error", e);
 			if (listener != null) {
diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppPurchases.java b/OsmAnd/src/net/osmand/plus/inapp/InAppPurchases.java
new file mode 100644
index 0000000000..24c25edfa1
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/inapp/InAppPurchases.java
@@ -0,0 +1,893 @@
+package net.osmand.plus.inapp;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.style.StyleSpan;
+
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.Version;
+import net.osmand.plus.inapp.util.SkuDetails;
+import net.osmand.util.Algorithms;
+
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Currency;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class InAppPurchases {
+
+	private static final InAppPurchase FULL_VERSION = new InAppPurchaseFullVersion();
+	private static final InAppPurchaseDepthContoursFull DEPTH_CONTOURS_FULL = new InAppPurchaseDepthContoursFull();
+	private static final InAppPurchaseDepthContoursFree DEPTH_CONTOURS_FREE = new InAppPurchaseDepthContoursFree();
+	private static final InAppPurchaseContourLinesFull CONTOUR_LINES_FULL = new InAppPurchaseContourLinesFull();
+	private static final InAppPurchaseContourLinesFree CONTOUR_LINES_FREE = new InAppPurchaseContourLinesFree();
+
+	private static final InAppSubscription[] LIVE_UPDATES_FULL = new InAppSubscription[]{
+			new InAppPurchaseLiveUpdatesOldMonthlyFull(),
+			new InAppPurchaseLiveUpdatesMonthlyFull(),
+			new InAppPurchaseLiveUpdates3MonthsFull(),
+			new InAppPurchaseLiveUpdatesAnnualFull()
+	};
+
+	private static final InAppSubscription[] LIVE_UPDATES_FREE = new InAppSubscription[]{
+			new InAppPurchaseLiveUpdatesOldMonthlyFree(),
+			new InAppPurchaseLiveUpdatesMonthlyFree(),
+			new InAppPurchaseLiveUpdates3MonthsFree(),
+			new InAppPurchaseLiveUpdatesAnnualFree()
+	};
+
+	private InAppPurchase fullVersion;
+	private InAppPurchase depthContours;
+	private InAppPurchase contourLines;
+	private InAppSubscription monthlyLiveUpdates;
+	private InAppSubscription discountedMonthlyLiveUpdates;
+	private InAppSubscriptionList liveUpdates;
+	private InAppPurchase[] inAppPurchases;
+
+	InAppPurchases(OsmandApplication ctx) {
+		fullVersion = FULL_VERSION;
+		if (Version.isFreeVersion(ctx)) {
+			liveUpdates = new LiveUpdatesInAppPurchasesFree();
+		} else {
+			liveUpdates = new LiveUpdatesInAppPurchasesFull();
+		}
+		for (InAppSubscription s : liveUpdates.getAllSubscriptions()) {
+			if (s instanceof InAppPurchaseLiveUpdatesMonthly) {
+				if (s.isDiscounted()) {
+					discountedMonthlyLiveUpdates = s;
+				} else {
+					monthlyLiveUpdates = s;
+				}
+			}
+		}
+		if (Version.isFreeVersion(ctx)) {
+			depthContours = DEPTH_CONTOURS_FREE;
+		} else {
+			depthContours = DEPTH_CONTOURS_FULL;
+		}
+		if (Version.isFreeVersion(ctx)) {
+			contourLines = CONTOUR_LINES_FREE;
+		} else {
+			contourLines = CONTOUR_LINES_FULL;
+		}
+
+		inAppPurchases = new InAppPurchase[] { fullVersion, depthContours, contourLines };
+	}
+
+	public InAppPurchase getFullVersion() {
+		return fullVersion;
+	}
+
+	public InAppPurchase getDepthContours() {
+		return depthContours;
+	}
+
+	public InAppPurchase getContourLines() {
+		return contourLines;
+	}
+
+	@Nullable
+	public InAppPurchase getInAppPurchaseBySku(@NonNull String sku) {
+		for (InAppPurchase p : inAppPurchases) {
+			if (p.getSku().equals(sku)) {
+				return p;
+			}
+		}
+		return null;
+	}
+
+	public InAppSubscription getMonthlyLiveUpdates() {
+		return monthlyLiveUpdates;
+	}
+
+	@Nullable
+	public InAppSubscription getPurchasedMonthlyLiveUpdates() {
+		if (monthlyLiveUpdates.isAnyPurchased()) {
+			return monthlyLiveUpdates;
+		} else if (discountedMonthlyLiveUpdates.isAnyPurchased()) {
+			return discountedMonthlyLiveUpdates;
+		}
+		return null;
+	}
+
+	public InAppSubscriptionList getLiveUpdates() {
+		return liveUpdates;
+	}
+
+	public List<InAppPurchase> getAllInAppPurchases() {
+		List<InAppPurchase> purchases = new ArrayList<>();
+		purchases.add(fullVersion);
+		purchases.add(depthContours);
+		purchases.add(contourLines);
+		purchases.addAll(liveUpdates.getAllSubscriptions());
+		return purchases;
+	}
+
+	public boolean isFullVersion(String sku) {
+		return FULL_VERSION.getSku().equals(sku);
+	}
+
+	public boolean isDepthContours(String sku) {
+		return DEPTH_CONTOURS_FULL.getSku().equals(sku) || DEPTH_CONTOURS_FREE.getSku().equals(sku);
+	}
+
+	public boolean isContourLines(String sku) {
+		return CONTOUR_LINES_FULL.getSku().equals(sku) || CONTOUR_LINES_FREE.getSku().equals(sku);
+	}
+
+	public boolean isLiveUpdates(String sku) {
+		for (InAppPurchase p : LIVE_UPDATES_FULL) {
+			if (p.getSku().equals(sku)) {
+				return true;
+			}
+		}
+		for (InAppPurchase p : LIVE_UPDATES_FREE) {
+			if (p.getSku().equals(sku)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public abstract static class InAppSubscriptionList {
+
+		private List<InAppSubscription> subscriptions;
+
+		InAppSubscriptionList(@NonNull InAppSubscription[] subscriptionsArray) {
+			this.subscriptions = Arrays.asList(subscriptionsArray);;
+		}
+
+		private List<InAppSubscription> getSubscriptions() {
+			return new ArrayList<>(subscriptions);
+		}
+
+		public List<InAppSubscription> getAllSubscriptions() {
+			List<InAppSubscription> res = new ArrayList<>();
+			for (InAppSubscription s : getSubscriptions()) {
+				res.add(s);
+				res.addAll(s.getUpgrades());
+			}
+			return res;
+		}
+
+		public List<InAppSubscription> getVisibleSubscriptions() {
+			List<InAppSubscription> res = new ArrayList<>();
+			for (InAppSubscription s : getSubscriptions()) {
+				boolean added = false;
+				if (s.isPurchased()) {
+					res.add(s);
+					added = true;
+				} else {
+					for (InAppSubscription upgrade : s.getUpgrades()) {
+						if (upgrade.isPurchased()) {
+							res.add(upgrade);
+							added = true;
+						}
+					}
+				}
+				if (!added) {
+					for (InAppSubscription upgrade : s.getUpgrades()) {
+						res.add(upgrade);
+						added = true;
+					}
+				}
+				if (!added && !s.isDiscounted()) {
+					res.add(s);
+				}
+			}
+			return res;
+		}
+
+		@Nullable
+		public InAppSubscription getSubscriptionBySku(@NonNull String sku) {
+			for (InAppSubscription s : getAllSubscriptions()) {
+				if (s.getSku().equals(sku)) {
+					return s;
+				}
+			}
+			return null;
+		}
+
+		public boolean containsSku(@NonNull String sku) {
+			return getSubscriptionBySku(sku) != null;
+		}
+
+		@Nullable
+		public InAppSubscription upgradeSubscription(String sku) {
+			List<InAppSubscription> subscriptions = getAllSubscriptions();
+			for (InAppSubscription s : subscriptions) {
+				InAppSubscription upgrade = s.upgradeSubscription(sku);
+				if (upgrade != null) {
+					return upgrade;
+				}
+			}
+			return null;
+		}
+	}
+
+	public static class LiveUpdatesInAppPurchasesFree extends InAppSubscriptionList {
+
+		public LiveUpdatesInAppPurchasesFree() {
+			super(LIVE_UPDATES_FREE);
+		}
+	}
+
+	public static class LiveUpdatesInAppPurchasesFull extends InAppSubscriptionList {
+
+		public LiveUpdatesInAppPurchasesFull() {
+			super(LIVE_UPDATES_FULL);
+		}
+	}
+
+	public abstract static class InAppPurchase {
+
+		public enum PurchaseState {
+			UNKNOWN,
+			PURCHASED,
+			NOT_PURCHASED
+		}
+
+		private String sku;
+		private String price;
+		private double priceValue;
+		private String priceCurrencyCode;
+		private PurchaseState purchaseState = PurchaseState.UNKNOWN;
+		private long purchaseTime;
+
+		double monthlyPriceValue;
+		boolean donationSupported = false;
+		boolean discounted = false;
+
+		private NumberFormat currencyFormatter;
+
+		private InAppPurchase(@NonNull String sku) {
+			this.sku = sku;
+		}
+
+		private InAppPurchase(@NonNull String sku, boolean discounted) {
+			this(sku);
+			this.discounted = discounted;
+		}
+
+		@NonNull
+		public String getSku() {
+			return sku;
+		}
+
+		public String getPrice(Context ctx) {
+			if (!Algorithms.isEmpty(price)) {
+				return price;
+			} else {
+				return getDefaultPrice(ctx);
+			}
+		}
+
+		public void setPrice(String price) {
+			this.price = price;
+		}
+
+		public long getPurchaseTime() {
+			return purchaseTime;
+		}
+
+		public void setPurchaseTime(long purchaseTime) {
+			this.purchaseTime = purchaseTime;
+		}
+
+		public String getDefaultPrice(Context ctx) {
+			return "";
+		}
+
+		public String getDefaultMonthlyPrice(Context ctx) {
+			return "";
+		}
+
+		public PurchaseState getPurchaseState() {
+			return purchaseState;
+		}
+
+		public void setPurchaseState(PurchaseState purchaseState) {
+			this.purchaseState = purchaseState;
+		}
+
+		public boolean isPurchased() {
+			return purchaseState == PurchaseState.PURCHASED;
+		}
+
+		public boolean fetchRequired() {
+			return purchaseState == PurchaseState.UNKNOWN;
+		}
+
+		public boolean isDiscounted() {
+			return discounted;
+		}
+
+		public CharSequence getTitle(Context ctx) {
+			return "";
+		}
+
+		public CharSequence getDescription(@NonNull Context ctx) {
+			NumberFormat currencyFormatter = getCurrencyFormatter();
+			if (currencyFormatter != null) {
+				return currencyFormatter.format(getPriceValue());
+			} else {
+				return ctx.getString(R.string.default_price_currency_format, getPriceValue(), getPriceCurrencyCode());
+			}
+		}
+
+		public double getPriceValue() {
+			return priceValue;
+		}
+
+		public void setPriceValue(double priceValue) {
+			this.priceValue = priceValue;
+		}
+
+		public double getMonthlyPriceValue() {
+			return monthlyPriceValue;
+		}
+
+		public boolean isDonationSupported() {
+			return donationSupported;
+		}
+
+		public String getPriceCurrencyCode() {
+			return priceCurrencyCode;
+		}
+
+		public void setPriceCurrencyCode(String priceCurrencyCode) {
+			this.priceCurrencyCode = priceCurrencyCode;
+
+			Locale currencyLocale = null;
+			Locale defaultLocale = Locale.getDefault();
+			try {
+				Currency defaultCurrency = Currency.getInstance(defaultLocale);
+				if (defaultCurrency != null && defaultCurrency.getCurrencyCode().equals(priceCurrencyCode)) {
+					currencyLocale = defaultLocale;
+				}
+			} catch (Exception e) {
+				// ignore
+			}
+			if (currencyLocale == null) {
+				if ("USD".equals(priceCurrencyCode)) {
+					currencyLocale = Locale.US;
+				} else if ("EUR".equals(priceCurrencyCode)) {
+					currencyLocale = Locale.GERMANY;
+				} else if ("GBP".equals(priceCurrencyCode)) {
+					currencyLocale = Locale.UK;
+				} else if ("JPY".equals(priceCurrencyCode)) {
+					currencyLocale = Locale.JAPAN;
+				} else if ("CNY".equals(priceCurrencyCode)) {
+					currencyLocale = Locale.CHINA;
+				} else if ("UAH".equals(priceCurrencyCode)) {
+					currencyLocale = new Locale("ukr", "UA");
+				} else if ("RUB".equals(priceCurrencyCode)) {
+					currencyLocale = new Locale("rus", "RU");
+				}
+			}
+			if (currencyLocale != null) {
+				currencyFormatter = NumberFormat.getCurrencyInstance(currencyLocale);
+			}
+		}
+
+		NumberFormat getCurrencyFormatter() {
+			return currencyFormatter;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj) return true;
+			if (obj == null) return false;
+			if (obj instanceof InAppPurchase) {
+				InAppPurchase purchase = (InAppPurchase) obj;
+				return sku.equals(purchase.sku);
+			} else {
+				return false;
+			}
+		}
+
+		@Override
+		public int hashCode() {
+			return sku.hashCode();
+		}
+	}
+
+	public static abstract class InAppSubscription extends InAppPurchase {
+
+		private Map<String, InAppSubscription> upgrades = new ConcurrentHashMap<>();
+		private String skuNoVersion;
+		private String subscriptionPeriod;
+		private boolean upgrade = false;
+
+		InAppSubscription(@NonNull String skuNoVersion, int version) {
+			super(skuNoVersion + "_v" + version);
+			this.skuNoVersion = skuNoVersion;
+		}
+
+		InAppSubscription(@NonNull String sku, boolean discounted) {
+			super(sku, discounted);
+			this.skuNoVersion = sku;
+		}
+
+		@NonNull
+		private List<InAppSubscription> getUpgrades() {
+			return new ArrayList<>(upgrades.values());
+		}
+
+		@Nullable
+		InAppSubscription upgradeSubscription(@NonNull String sku) {
+			InAppSubscription s = null;
+			if (!upgrade) {
+				s = getSku().equals(sku) ? this : upgrades.get(sku);
+				if (s == null) {
+					s = newInstance(sku);
+					if (s != null) {
+						s.upgrade = true;
+						upgrades.put(sku, s);
+					}
+				}
+			}
+			return s;
+		}
+
+		public boolean isAnyPurchased() {
+			if (isPurchased()) {
+				return true;
+			} else {
+				for (InAppSubscription s : getUpgrades()) {
+					if (s.isPurchased()) {
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
+		public String getSkuNoVersion() {
+			return skuNoVersion;
+		}
+
+		public String getSubscriptionPeriod() {
+			return subscriptionPeriod;
+		}
+
+		public void setSubscriptionPeriod(String subscriptionPeriod) {
+			this.subscriptionPeriod = subscriptionPeriod;
+		}
+
+		@Override
+		public CharSequence getDescription(@NonNull Context ctx) {
+			if (getMonthlyPriceValue() == 0) {
+				return ctx.getString(R.string.osm_live_payment_month_cost_descr, getDefaultMonthlyPrice(ctx));
+			} else {
+				NumberFormat currencyFormatter = getCurrencyFormatter();
+				if (currencyFormatter != null) {
+					return ctx.getString(R.string.osm_live_payment_month_cost_descr, currencyFormatter.format(getMonthlyPriceValue()));
+				} else {
+					return ctx.getString(R.string.osm_live_payment_month_cost_descr_ex, getMonthlyPriceValue(), getPriceCurrencyCode());
+				}
+			}
+		}
+
+		public CharSequence getRenewDescription(@NonNull Context ctx) {
+			return "";
+		}
+
+		@Nullable
+		protected abstract InAppSubscription newInstance(@NonNull String sku);
+	}
+
+	public static class InAppPurchaseFullVersion extends InAppPurchase {
+
+		private static final String SKU_FULL_VERSION_PRICE = "osmand_full_version_price";
+
+		InAppPurchaseFullVersion() {
+			super(SKU_FULL_VERSION_PRICE);
+		}
+
+		@Override
+		public String getDefaultPrice(Context ctx) {
+			return ctx.getString(R.string.full_version_price);
+		}
+	}
+
+	public static class InAppPurchaseDepthContours extends InAppPurchase {
+
+		private InAppPurchaseDepthContours(String sku) {
+			super(sku);
+		}
+
+		@Override
+		public String getDefaultPrice(Context ctx) {
+			return ctx.getString(R.string.sea_depth_maps_price);
+		}
+	}
+
+	public static class InAppPurchaseDepthContoursFull extends InAppPurchaseDepthContours {
+
+		private static final String SKU_DEPTH_CONTOURS_FULL = "net.osmand.seadepth_plus";
+
+		InAppPurchaseDepthContoursFull() {
+			super(SKU_DEPTH_CONTOURS_FULL);
+		}
+	}
+
+	public static class InAppPurchaseDepthContoursFree extends InAppPurchaseDepthContours {
+
+		private static final String SKU_DEPTH_CONTOURS_FREE = "net.osmand.seadepth";
+
+		InAppPurchaseDepthContoursFree() {
+			super(SKU_DEPTH_CONTOURS_FREE);
+		}
+	}
+
+	public static class InAppPurchaseContourLines extends InAppPurchase {
+
+		private InAppPurchaseContourLines(String sku) {
+			super(sku);
+		}
+
+		@Override
+		public String getDefaultPrice(Context ctx) {
+			return ctx.getString(R.string.srtm_plugin_price);
+		}
+	}
+
+	public static class InAppPurchaseContourLinesFull extends InAppPurchaseContourLines {
+
+		private static final String SKU_CONTOUR_LINES_FULL = "net.osmand.contourlines_plus";
+
+		InAppPurchaseContourLinesFull() {
+			super(SKU_CONTOUR_LINES_FULL);
+		}
+	}
+
+	public static class InAppPurchaseContourLinesFree extends InAppPurchaseContourLines {
+
+		private static final String SKU_CONTOUR_LINES_FREE = "net.osmand.contourlines";
+
+		InAppPurchaseContourLinesFree() {
+			super(SKU_CONTOUR_LINES_FREE);
+		}
+	}
+
+	public static abstract class InAppPurchaseLiveUpdatesMonthly extends InAppSubscription {
+
+		InAppPurchaseLiveUpdatesMonthly(String skuNoVersion, int version) {
+			super(skuNoVersion, version);
+			donationSupported = true;
+		}
+
+		InAppPurchaseLiveUpdatesMonthly(@NonNull String sku, boolean discounted) {
+			super(sku, discounted);
+			donationSupported = true;
+		}
+
+		InAppPurchaseLiveUpdatesMonthly(@NonNull String sku) {
+			this(sku, false);
+		}
+
+		@Override
+		public void setPriceValue(double priceValue) {
+			super.setPriceValue(priceValue);
+			monthlyPriceValue = priceValue;
+		}
+
+		@Override
+		public String getDefaultPrice(Context ctx) {
+			return ctx.getString(R.string.osm_live_monthly_price);
+		}
+
+		@Override
+		public String getDefaultMonthlyPrice(Context ctx) {
+			return ctx.getString(R.string.osm_live_monthly_price);
+		}
+
+		@Override
+		public CharSequence getTitle(Context ctx) {
+			return ctx.getString(R.string.osm_live_payment_monthly_title);
+		}
+
+		@Override
+		public CharSequence getDescription(@NonNull Context ctx) {
+			CharSequence descr = super.getDescription(ctx);
+			SpannableStringBuilder text = new SpannableStringBuilder(descr).append(". ").append(ctx.getString(R.string.osm_live_payment_contribute_descr));
+			text.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), descr.length() + 1, text.length() - 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+			return text;
+		}
+
+		@Override
+		public CharSequence getRenewDescription(@NonNull Context ctx) {
+			return ctx.getString(R.string.osm_live_payment_renews_monthly);
+		}
+	}
+
+	public static class InAppPurchaseLiveUpdatesMonthlyFull extends InAppPurchaseLiveUpdatesMonthly {
+
+		private static final String SKU_LIVE_UPDATES_MONTHLY_FULL = "osm_live_subscription_monthly_full";
+
+		InAppPurchaseLiveUpdatesMonthlyFull() {
+			super(SKU_LIVE_UPDATES_MONTHLY_FULL, 1);
+		}
+
+		private InAppPurchaseLiveUpdatesMonthlyFull(@NonNull String sku) {
+			super(sku);
+		}
+
+		@Nullable
+		@Override
+		protected InAppSubscription newInstance(@NonNull String sku) {
+			return sku.startsWith(getSkuNoVersion()) ? new InAppPurchaseLiveUpdatesMonthlyFull(sku) : null;
+		}
+	}
+
+	public static class InAppPurchaseLiveUpdatesMonthlyFree extends InAppPurchaseLiveUpdatesMonthly {
+
+		private static final String SKU_LIVE_UPDATES_MONTHLY_FREE = "osm_live_subscription_monthly_free";
+
+		InAppPurchaseLiveUpdatesMonthlyFree() {
+			super(SKU_LIVE_UPDATES_MONTHLY_FREE, 1);
+		}
+
+		private InAppPurchaseLiveUpdatesMonthlyFree(@NonNull String sku) {
+			super(sku);
+		}
+
+		@Nullable
+		@Override
+		protected InAppSubscription newInstance(@NonNull String sku) {
+			return sku.startsWith(getSkuNoVersion()) ? new InAppPurchaseLiveUpdatesMonthlyFree(sku) : null;
+		}
+	}
+
+	public static abstract class InAppPurchaseLiveUpdates3Months extends InAppSubscription {
+
+		InAppPurchaseLiveUpdates3Months(String skuNoVersion, int version) {
+			super(skuNoVersion, version);
+		}
+
+		InAppPurchaseLiveUpdates3Months(@NonNull String sku) {
+			super(sku, false);
+		}
+
+		@Override
+		public void setPriceValue(double priceValue) {
+			super.setPriceValue(priceValue);
+			monthlyPriceValue = priceValue / 3d;
+		}
+
+		@Override
+		public String getDefaultPrice(Context ctx) {
+			return ctx.getString(R.string.osm_live_3_months_price);
+		}
+
+		@Override
+		public String getDefaultMonthlyPrice(Context ctx) {
+			return ctx.getString(R.string.osm_live_3_months_monthly_price);
+		}
+
+		@Override
+		public CharSequence getTitle(Context ctx) {
+			return ctx.getString(R.string.osm_live_payment_3_months_title);
+		}
+
+		@Override
+		public CharSequence getRenewDescription(@NonNull Context ctx) {
+			return ctx.getString(R.string.osm_live_payment_renews_quarterly);
+		}
+	}
+
+	public static class InAppPurchaseLiveUpdates3MonthsFull extends InAppPurchaseLiveUpdates3Months {
+
+		private static final String SKU_LIVE_UPDATES_3_MONTHS_FULL = "osm_live_subscription_3_months_full";
+
+		InAppPurchaseLiveUpdates3MonthsFull() {
+			super(SKU_LIVE_UPDATES_3_MONTHS_FULL, 1);
+		}
+
+		private InAppPurchaseLiveUpdates3MonthsFull(@NonNull String sku) {
+			super(sku);
+		}
+
+		@Nullable
+		@Override
+		protected InAppSubscription newInstance(@NonNull String sku) {
+			return sku.startsWith(getSkuNoVersion()) ? new InAppPurchaseLiveUpdates3MonthsFull(sku) : null;
+		}
+	}
+
+	public static class InAppPurchaseLiveUpdates3MonthsFree extends InAppPurchaseLiveUpdates3Months {
+
+		private static final String SKU_LIVE_UPDATES_3_MONTHS_FREE = "osm_live_subscription_3_months_free";
+
+		InAppPurchaseLiveUpdates3MonthsFree() {
+			super(SKU_LIVE_UPDATES_3_MONTHS_FREE, 1);
+		}
+
+		private InAppPurchaseLiveUpdates3MonthsFree(@NonNull String sku) {
+			super(sku);
+		}
+
+		@Nullable
+		@Override
+		protected InAppSubscription newInstance(@NonNull String sku) {
+			return sku.startsWith(getSkuNoVersion()) ? new InAppPurchaseLiveUpdates3MonthsFree(sku) : null;
+		}
+	}
+
+	public static abstract class InAppPurchaseLiveUpdatesAnnual extends InAppSubscription {
+
+		InAppPurchaseLiveUpdatesAnnual(String skuNoVersion, int version) {
+			super(skuNoVersion, version);
+		}
+
+		InAppPurchaseLiveUpdatesAnnual(@NonNull String sku) {
+			super(sku, false);
+		}
+
+		@Override
+		public void setPriceValue(double priceValue) {
+			super.setPriceValue(priceValue);
+			monthlyPriceValue = priceValue / 12d;
+		}
+
+		@Override
+		public String getDefaultPrice(Context ctx) {
+			return ctx.getString(R.string.osm_live_annual_price);
+		}
+
+		@Override
+		public String getDefaultMonthlyPrice(Context ctx) {
+			return ctx.getString(R.string.osm_live_annual_monthly_price);
+		}
+
+		@Override
+		public CharSequence getTitle(Context ctx) {
+			return ctx.getString(R.string.osm_live_payment_annual_title);
+		}
+
+		@Override
+		public CharSequence getRenewDescription(@NonNull Context ctx) {
+			return ctx.getString(R.string.osm_live_payment_renews_annually);
+		}
+	}
+
+	public static class InAppPurchaseLiveUpdatesAnnualFull extends InAppPurchaseLiveUpdatesAnnual {
+
+		private static final String SKU_LIVE_UPDATES_ANNUAL_FULL = "osm_live_subscription_annual_full";
+
+		InAppPurchaseLiveUpdatesAnnualFull() {
+			super(SKU_LIVE_UPDATES_ANNUAL_FULL, 1);
+		}
+
+		private InAppPurchaseLiveUpdatesAnnualFull(@NonNull String sku) {
+			super(sku);
+		}
+
+		@Nullable
+		@Override
+		protected InAppSubscription newInstance(@NonNull String sku) {
+			return sku.startsWith(getSkuNoVersion()) ? new InAppPurchaseLiveUpdatesAnnualFull(sku) : null;
+		}
+	}
+
+	public static class InAppPurchaseLiveUpdatesAnnualFree extends InAppPurchaseLiveUpdatesAnnual {
+
+		private static final String SKU_LIVE_UPDATES_ANNUAL_FREE = "osm_live_subscription_annual_free";
+
+		InAppPurchaseLiveUpdatesAnnualFree() {
+			super(SKU_LIVE_UPDATES_ANNUAL_FREE, 1);
+		}
+
+		private InAppPurchaseLiveUpdatesAnnualFree(@NonNull String sku) {
+			super(sku);
+		}
+
+		@Nullable
+		@Override
+		protected InAppSubscription newInstance(@NonNull String sku) {
+			return sku.startsWith(getSkuNoVersion()) ? new InAppPurchaseLiveUpdatesAnnualFree(sku) : null;
+		}
+	}
+
+	public static class InAppPurchaseLiveUpdatesOldMonthly extends InAppPurchaseLiveUpdatesMonthly {
+
+		InAppPurchaseLiveUpdatesOldMonthly(String sku) {
+			super(sku, true);
+		}
+
+		@Override
+		public String getDefaultPrice(Context ctx) {
+			return ctx.getString(R.string.osm_live_default_price);
+		}
+
+		@Override
+		public String getDefaultMonthlyPrice(Context ctx) {
+			return ctx.getString(R.string.osm_live_default_price);
+		}
+
+		@Nullable
+		@Override
+		protected InAppSubscription newInstance(@NonNull String sku) {
+			return null;
+		}
+	}
+
+	public static class InAppPurchaseLiveUpdatesOldMonthlyFull extends InAppPurchaseLiveUpdatesOldMonthly {
+
+		private static final String SKU_LIVE_UPDATES_OLD_MONTHLY_FULL = "osm_live_subscription_2";
+
+		InAppPurchaseLiveUpdatesOldMonthlyFull() {
+			super(SKU_LIVE_UPDATES_OLD_MONTHLY_FULL);
+		}
+	}
+
+	public static class InAppPurchaseLiveUpdatesOldMonthlyFree extends InAppPurchaseLiveUpdatesOldMonthly {
+
+		private static final String SKU_LIVE_UPDATES_OLD_MONTHLY_FREE = "osm_free_live_subscription_2";
+
+		InAppPurchaseLiveUpdatesOldMonthlyFree() {
+			super(SKU_LIVE_UPDATES_OLD_MONTHLY_FREE);
+		}
+	}
+
+	public static class InAppPurchaseLiveUpdatesOldSubscription extends InAppSubscription {
+
+		private SkuDetails details;
+
+		InAppPurchaseLiveUpdatesOldSubscription(@NonNull SkuDetails details) {
+			super(details.getSku(), true);
+			this.details = details;
+		}
+
+		@Override
+		public String getDefaultPrice(Context ctx) {
+			return "";
+		}
+
+		@Override
+		public CharSequence getTitle(Context ctx) {
+			return details.getTitle();
+		}
+
+		@Override
+		public CharSequence getDescription(@NonNull Context ctx) {
+			return details.getDescription();
+		}
+
+		@Nullable
+		@Override
+		protected InAppSubscription newInstance(@NonNull String sku) {
+			return null;
+		}
+	}
+}
+
diff --git a/OsmAnd/src/net/osmand/plus/inapp/util/Inventory.java b/OsmAnd/src/net/osmand/plus/inapp/util/Inventory.java
index b41c8a6312..2f9d1eb05a 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/util/Inventory.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/util/Inventory.java
@@ -63,12 +63,12 @@ public class Inventory {
     }
 
     /** Returns a list of all owned product IDs. */
-    List<String> getAllOwnedSkus() {
+    public List<String> getAllOwnedSkus() {
         return new ArrayList<String>(mPurchaseMap.keySet());
     }
 
     /** Returns a list of all owned product IDs of a given type */
-    List<String> getAllOwnedSkus(String itemType) {
+    public List<String> getAllOwnedSkus(String itemType) {
         List<String> result = new ArrayList<String>();
         for (Purchase p : mPurchaseMap.values()) {
             if (p.getItemType().equals(itemType)) result.add(p.getSku());
diff --git a/OsmAnd/src/net/osmand/plus/inapp/util/SkuDetails.java b/OsmAnd/src/net/osmand/plus/inapp/util/SkuDetails.java
index 7f7ee18406..5b77a01564 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/util/SkuDetails.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/util/SkuDetails.java
@@ -26,6 +26,9 @@ public class SkuDetails {
     String mSku;
     String mType;
     String mPrice;
+    long mPriceAmountMicros;
+    String mPriceCurrencyCode;
+    String mSubscriptionPeriod;
     String mTitle;
     String mDescription;
     String mJson;
@@ -41,6 +44,9 @@ public class SkuDetails {
         mSku = o.optString("productId");
         mType = o.optString("type");
         mPrice = o.optString("price");
+        mPriceAmountMicros = o.optLong("price_amount_micros");
+        mPriceCurrencyCode = o.optString("price_currency_code");
+        mSubscriptionPeriod = o.optString("subscriptionPeriod");
         mTitle = o.optString("title");
         mDescription = o.optString("description");
     }
@@ -48,6 +54,15 @@ public class SkuDetails {
     public String getSku() { return mSku; }
     public String getType() { return mType; }
     public String getPrice() { return mPrice; }
+    public long getPriceAmountMicros() {
+        return mPriceAmountMicros;
+    }
+    public String getPriceCurrencyCode() {
+        return mPriceCurrencyCode;
+    }
+    public String getSubscriptionPeriod() {
+        return mSubscriptionPeriod;
+    }
     public String getTitle() { return mTitle; }
     public String getDescription() { return mDescription; }
 
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
index f01dd20cb1..7986a4523d 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
@@ -14,22 +14,16 @@ import android.os.Bundle;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AlertDialog.Builder;
 import android.support.v7.widget.SwitchCompat;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AbsListView;
-import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.ExpandableListView;
@@ -47,10 +41,12 @@ import net.osmand.plus.activities.LocalIndexInfo;
 import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
 import net.osmand.plus.activities.OsmandInAppPurchaseActivity;
 import net.osmand.plus.base.BaseOsmAndFragment;
+import net.osmand.plus.chooseplan.ChoosePlanDialogFragment;
 import net.osmand.plus.download.ui.AbstractLoadLocalIndexTask;
 import net.osmand.plus.inapp.InAppPurchaseHelper;
 import net.osmand.plus.inapp.InAppPurchaseHelper.InAppPurchaseListener;
 import net.osmand.plus.inapp.InAppPurchaseHelper.InAppPurchaseTaskType;
+import net.osmand.plus.inapp.InAppPurchases.InAppSubscription;
 import net.osmand.plus.resources.IncrementalChangesManager;
 import net.osmand.util.Algorithms;
 
@@ -147,18 +143,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
 		if (!Version.isDeveloperVersion(getMyApplication())) {
 			subscriptionHeader = inflater.inflate(R.layout.live_updates_header, listView, false);
 			updateSubscriptionHeader();
-
-			listView.addHeaderView(subscriptionHeader);
-			listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-				@Override
-				public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-					if (position == 0 && !processing && InAppPurchaseHelper.isSubscribedToLiveUpdates(getMyApplication())) {
-						SubscriptionFragment subscriptionFragment = new SubscriptionFragment();
-						subscriptionFragment.setEditMode(true);
-						subscriptionFragment.show(getChildFragmentManager(), SubscriptionFragment.TAG);
-					}
-				}
-			});
+			listView.addHeaderView(subscriptionHeader, "subscriptionHeader", false);
 		}
 		listView.setAdapter(adapter);
 
@@ -179,18 +164,53 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
 				TextView regionNameTextView = (TextView) subscriptionHeader.findViewById(R.id.regionTextView);
 				statusTextView.setText(getString(R.string.osm_live_active));
 				statusIcon.setImageDrawable(getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_done));
+
 				regionNameHeaderTextView.setText(R.string.osm_live_support_region);
 				String countryName = getSettings().BILLING_USER_COUNTRY.get();
-				if (Algorithms.isEmpty(countryName)) {
-					if (getSettings().BILLING_USER_COUNTRY_DOWNLOAD_NAME.get().equals(OsmandSettings.BILLING_USER_DONATION_NONE_PARAMETER)) {
+				InAppPurchaseHelper purchaseHelper = getInAppPurchaseHelper();
+				if (purchaseHelper != null) {
+					InAppSubscription monthlyPurchased = purchaseHelper.getPurchasedMonthlyLiveUpdates();
+					if (monthlyPurchased != null && monthlyPurchased.isDonationSupported()) {
+						if (Algorithms.isEmpty(countryName)) {
+							if (getSettings().BILLING_USER_COUNTRY_DOWNLOAD_NAME.get().equals(OsmandSettings.BILLING_USER_DONATION_NONE_PARAMETER)) {
+								regionNameHeaderTextView.setText(R.string.default_buttons_support);
+								countryName = getString(R.string.osmand_team);
+							} else {
+								countryName = getString(R.string.shared_string_world);
+							}
+						}
+					} else {
 						regionNameHeaderTextView.setText(R.string.default_buttons_support);
 						countryName = getString(R.string.osmand_team);
-					} else {
-						countryName = getString(R.string.shared_string_world);
 					}
+				} else {
+					regionNameHeaderTextView.setText(R.string.default_buttons_support);
+					countryName = getString(R.string.osmand_team);
 				}
 				regionNameTextView.setText(countryName);
 
+				View subscriptionsButton = subscriptionHeader.findViewById(R.id.button_subscriptions);
+				View settingsButtonContainer = subscriptionHeader.findViewById(R.id.button_settings_container);
+				View settingsButton = subscriptionHeader.findViewById(R.id.button_settings);
+				subscriptionsButton.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						ChoosePlanDialogFragment.showOsmLiveInstance(getActivity().getSupportFragmentManager());
+					}
+				});
+				if (isDonationSupported()) {
+					settingsButton.setOnClickListener(new View.OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							showDonationSettings();
+						}
+					});
+					settingsButtonContainer.setVisibility(View.VISIBLE);
+				} else {
+					settingsButton.setOnClickListener(null);
+					settingsButtonContainer.setVisibility(View.GONE);
+				}
+
 				subscriptionBanner.setVisibility(View.GONE);
 				subscriptionInfo.setVisibility(View.VISIBLE);
 			} else {
@@ -209,8 +229,10 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
 				subscriptionButton.setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View v) {
-						SubscriptionFragment subscriptionFragment = new SubscriptionFragment();
-						subscriptionFragment.show(getChildFragmentManager(), SubscriptionFragment.TAG);
+						FragmentActivity activity = getActivity();
+						if (activity != null) {
+							ChoosePlanDialogFragment.showOsmLiveInstance(activity.getSupportFragmentManager());
+						}
 					}
 				});
 
@@ -229,10 +251,6 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
 				enableProgress();
 			}
 		}
-		if (((OsmLiveActivity) getActivity()).shouldOpenSubscription()) {
-			SubscriptionFragment subscriptionFragment = new SubscriptionFragment();
-			subscriptionFragment.show(getChildFragmentManager(), SubscriptionFragment.TAG);
-		}
 	}
 
 	@Override
@@ -251,34 +269,18 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
 		}
 	}
 
-	@SuppressWarnings("deprecation")
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		if (InAppPurchaseHelper.isSubscribedToLiveUpdates(getMyApplication())
-				&& !Version.isDeveloperVersion(getMyApplication())) {
-
-			ActionBar actionBar = getMyActivity().getSupportActionBar();
-			if (actionBar != null) {
-				actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
-			}
-
-			SubMenu split = menu.addSubMenu(R.string.shared_string_more_actions);
-			split.setIcon(R.drawable.ic_overflow_menu_white);
-			MenuItemCompat.setShowAsAction(split.getItem(), MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-			MenuItem item = split.add(0, SUBSCRIPTION_SETTINGS, 0, R.string.osm_live_subscription_settings);
-			MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+	private boolean isDonationSupported() {
+		InAppPurchaseHelper purchaseHelper = getInAppPurchaseHelper();
+		if (purchaseHelper != null) {
+			InAppSubscription monthlyPurchased = purchaseHelper.getPurchasedMonthlyLiveUpdates();
+			return monthlyPurchased != null && monthlyPurchased.isDonationSupported();
 		}
+		return false;
 	}
 
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if (item.getItemId() == SUBSCRIPTION_SETTINGS && !processing) {
-			SubscriptionFragment subscriptionFragment = new SubscriptionFragment();
-			subscriptionFragment.setEditMode(true);
-			subscriptionFragment.show(getChildFragmentManager(), SubscriptionFragment.TAG);
-			return true;
-		}
-		return super.onOptionsItemSelected(item);
+	private void showDonationSettings() {
+		SubscriptionFragment subscriptionFragment = new SubscriptionFragment();
+		subscriptionFragment.show(getChildFragmentManager(), SubscriptionFragment.TAG);
 	}
 
 	protected class LocalIndexesAdapter extends OsmandBaseExpandableListAdapter {
@@ -715,7 +717,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
 	@Override
 	public void onItemPurchased(String sku, boolean active) {
 		InAppPurchaseHelper purchaseHelper = getInAppPurchaseHelper();
-		if (purchaseHelper != null && purchaseHelper.getSkuLiveUpdates().equals(sku)) {
+		if (purchaseHelper != null && purchaseHelper.getLiveUpdates().containsSku(sku)) {
 			updateSubscriptionHeader();
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java b/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
index 210af91384..c7505715a9 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
@@ -34,11 +34,9 @@ import java.util.TimeZone;
 
 public class OsmLiveActivity extends AbstractDownloadActivity implements DownloadEvents, ChoosePlanDialogListener {
 	private final static Log LOG = PlatformUtil.getLog(OsmLiveActivity.class);
-	public final static String OPEN_SUBSCRIPTION_INTENT_PARAM = "open_subscription_intent_param";
 	public final static String SHOW_SETTINGS_ONLY_INTENT_PARAM = "show_settings_only_intent_param";
 
 	private LiveUpdatesFragmentPagerAdapter pagerAdapter;
-	private boolean openSubscription;
 	private boolean showSettingOnly;
 	private GetLastUpdateDateTask getLastUpdateDateTask;
 	private static final String URL = "https://osmand.net/api/osmlive_status";
@@ -51,10 +49,8 @@ public class OsmLiveActivity extends AbstractDownloadActivity implements Downloa
 
 		Intent intent = getIntent();
 		if (intent != null && intent.getExtras() != null) {
-			openSubscription = intent.getExtras().getBoolean(OPEN_SUBSCRIPTION_INTENT_PARAM, false);
 			showSettingOnly = intent.getExtras().getBoolean(SHOW_SETTINGS_ONLY_INTENT_PARAM, false);
 		} else if (savedInstanceState != null) {
-			openSubscription = savedInstanceState.getBoolean(OPEN_SUBSCRIPTION_INTENT_PARAM, false);
 			showSettingOnly = savedInstanceState.getBoolean(SHOW_SETTINGS_ONLY_INTENT_PARAM, false);
 		}
 
@@ -109,13 +105,12 @@ public class OsmLiveActivity extends AbstractDownloadActivity implements Downloa
 	@Override
 	protected void onSaveInstanceState(Bundle outState) {
 		super.onSaveInstanceState(outState);
-		outState.putBoolean(OPEN_SUBSCRIPTION_INTENT_PARAM, openSubscription);
 		outState.putBoolean(SHOW_SETTINGS_ONLY_INTENT_PARAM, showSettingOnly);
 	}
 
 	@Override
 	public void onChoosePlanDialogDismiss() {
-		finish();
+		//finish();
 	}
 
 	public boolean isShowSettingOnly() {
@@ -140,10 +135,6 @@ public class OsmLiveActivity extends AbstractDownloadActivity implements Downloa
 		((LiveUpdatesFragment) pagerAdapter.fragments[0]).notifyLiveUpdatesChanged();
 	}
 
-	public boolean shouldOpenSubscription() {
-		return openSubscription;
-	}
-
 	private static class GetLastUpdateDateTask extends AsyncTask<Void, Void, String> {
 
 		private OsmandApplication app;
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
index 38dfe231e7..3a5d8a8635 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
@@ -42,7 +42,6 @@ import java.util.Map;
 public class SubscriptionFragment extends BaseOsmAndDialogFragment implements InAppPurchaseListener, OnFragmentInteractionListener {
 
 	public static final String TAG = "SubscriptionFragment";
-	private static final String EDIT_MODE_ID = "edit_mode_id";
 	private static final String USER_NAME_ID = "user_name_id";
 	private static final String EMAIL_ID = "email_id";
 	private static final String COUNTRY_ITEM_ID = "country_id";
@@ -51,7 +50,6 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 
 	private OsmandSettings settings;
 	private ProgressDialog dlg;
-	private boolean editMode;
 	private boolean donation;
 
 	private String prevEmail;
@@ -59,10 +57,6 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 
 	private CountrySelectionFragment countrySelectionFragment = new CountrySelectionFragment();
 
-	public void setEditMode(boolean editMode) {
-		this.editMode = editMode;
-	}
-
 	@Nullable
 	public InAppPurchaseHelper getInAppPurchaseHelper() {
 		Activity activity = getActivity();
@@ -75,8 +69,6 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 
 	@Override
 	public void onSaveInstanceState(Bundle outState) {
-		outState.putBoolean(EDIT_MODE_ID, editMode);
-
 		View view = getView();
 		if (view != null) {
 			EditText userNameEdit = (EditText) view.findViewById(R.id.userNameEdit);
@@ -91,7 +83,6 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 				outState.putSerializable(COUNTRY_ITEM_ID, selectedCountryItem);
 			}
 		}
-
 		super.onSaveInstanceState(outState);
 	}
 
@@ -99,10 +90,6 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-		if (savedInstanceState != null) {
-			editMode = savedInstanceState.getBoolean(EDIT_MODE_ID);
-		}
-
 		settings = getMyApplication().getSettings();
 		prevEmail = settings.BILLING_USER_EMAIL.get();
 	}
@@ -134,11 +121,7 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 
 		View view = inflater.inflate(R.layout.subscription_fragment, container, false);
 		ImageButton closeButton = (ImageButton) view.findViewById(R.id.closeButton);
-		if (editMode) {
-			closeButton.setImageDrawable(getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_mode_back));
-		} else {
-			closeButton.setImageDrawable(getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_remove_dark));
-		}
+		closeButton.setImageDrawable(getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_mode_back));
 		closeButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -147,11 +130,7 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 		});
 
 		TextView title = (TextView) view.findViewById(R.id.titleTextView);
-		if (editMode) {
-			title.setText(getString(R.string.osm_live_subscription_settings));
-		} else {
-			title.setText(getString(R.string.osm_live_subscription));
-		}
+		title.setText(getString(R.string.osm_live_subscription_settings));
 
 		final View headerLayout = view.findViewById(R.id.headerLayout);
 		final View paramsLayout = view.findViewById(R.id.paramsLayout);
@@ -204,100 +183,69 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 		final CheckBox hideUserNameCheckbox = (CheckBox) view.findViewById(R.id.hideUserNameCheckbox);
 		hideUserNameCheckbox.setChecked(hideUserName);
 
-		View editModeBottomView = view.findViewById(R.id.editModeBottomView);
-		View purchaseCard = view.findViewById(R.id.purchaseCard);
-		if (editMode) {
-			editModeBottomView.setVisibility(View.VISIBLE);
-			purchaseCard.setVisibility(View.GONE);
+		Button saveChangesButton = (Button) view.findViewById(R.id.saveChangesButton);
+		saveChangesButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				InAppPurchaseHelper purchaseHelper = getInAppPurchaseHelper();
+				if (purchaseHelper != null && applySettings(userNameEdit.getText().toString().trim(),
+						emailEdit.getText().toString().trim(), hideUserNameCheckbox.isChecked())) {
 
-			Button saveChangesButton = (Button) view.findViewById(R.id.saveChangesButton);
-			saveChangesButton.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					InAppPurchaseHelper purchaseHelper = getInAppPurchaseHelper();
-					if (purchaseHelper != null && applySettings(userNameEdit.getText().toString().trim(),
-							emailEdit.getText().toString().trim(), hideUserNameCheckbox.isChecked())) {
+					final Map<String, String> parameters = new HashMap<>();
+					parameters.put("visibleName", settings.BILLING_HIDE_USER_NAME.get() ? "" : settings.BILLING_USER_NAME.get());
+					parameters.put("preferredCountry", settings.BILLING_USER_COUNTRY_DOWNLOAD_NAME.get());
+					parameters.put("email", settings.BILLING_USER_EMAIL.get());
+					parameters.put("cemail", prevEmail);
+					parameters.put("userid", settings.BILLING_USER_ID.get());
+					parameters.put("token", settings.BILLING_USER_TOKEN.get());
 
-						final Map<String, String> parameters = new HashMap<>();
-						parameters.put("visibleName", settings.BILLING_HIDE_USER_NAME.get() ? "" : settings.BILLING_USER_NAME.get());
-						parameters.put("preferredCountry", settings.BILLING_USER_COUNTRY_DOWNLOAD_NAME.get());
-						parameters.put("email", settings.BILLING_USER_EMAIL.get());
-						parameters.put("cemail", prevEmail);
-						parameters.put("userid", settings.BILLING_USER_ID.get());
-						parameters.put("token", settings.BILLING_USER_TOKEN.get());
+					showProgress(null);
 
-						showProgress(null);
-
-						AndroidNetworkUtils.sendRequestAsync(getMyApplication(),
-								"https://osmand.net/subscription/update",
-								parameters, "Sending data...", true, true, new AndroidNetworkUtils.OnRequestResultListener() {
-									@Override
-									public void onResult(String result) {
-										dismissProgress(null);
-										OsmandApplication app = getMyApplication();
-										if (result != null) {
-											try {
-												JSONObject obj = new JSONObject(result);
-												if (!obj.has("error")) {
-													String userId = obj.getString("userid");
-													app.getSettings().BILLING_USER_ID.set(userId);
-													String email = obj.getString("email");
-													app.getSettings().BILLING_USER_EMAIL.set(email);
-													String visibleName = obj.getString("visibleName");
-													if (!Algorithms.isEmpty(visibleName)) {
-														app.getSettings().BILLING_USER_NAME.set(visibleName);
-														app.getSettings().BILLING_HIDE_USER_NAME.set(false);
-													} else {
-														app.getSettings().BILLING_HIDE_USER_NAME.set(true);
-													}
-													String preferredCountry = obj.getString("preferredCountry");
-													app.getSettings().BILLING_USER_COUNTRY_DOWNLOAD_NAME.set(preferredCountry);
-
-													Fragment parent = getParentFragment();
-													if (parent != null && parent instanceof LiveUpdatesFragment) {
-														((LiveUpdatesFragment) parent).updateSubscriptionHeader();
-													}
-
-													dismiss();
+					AndroidNetworkUtils.sendRequestAsync(getMyApplication(),
+							"https://osmand.net/subscription/update",
+							parameters, "Sending data...", true, true, new AndroidNetworkUtils.OnRequestResultListener() {
+								@Override
+								public void onResult(String result) {
+									dismissProgress(null);
+									OsmandApplication app = getMyApplication();
+									if (result != null) {
+										try {
+											JSONObject obj = new JSONObject(result);
+											if (!obj.has("error")) {
+												String userId = obj.getString("userid");
+												app.getSettings().BILLING_USER_ID.set(userId);
+												String email = obj.getString("email");
+												app.getSettings().BILLING_USER_EMAIL.set(email);
+												String visibleName = obj.getString("visibleName");
+												if (!Algorithms.isEmpty(visibleName)) {
+													app.getSettings().BILLING_USER_NAME.set(visibleName);
+													app.getSettings().BILLING_HIDE_USER_NAME.set(false);
 												} else {
-													app.showToastMessage("Error: " + obj.getString("error"));
+													app.getSettings().BILLING_HIDE_USER_NAME.set(true);
 												}
-											} catch (JSONException e) {
-												app.showToastMessage(getString(R.string.shared_string_io_error));
+												String preferredCountry = obj.getString("preferredCountry");
+												app.getSettings().BILLING_USER_COUNTRY_DOWNLOAD_NAME.set(preferredCountry);
+
+												Fragment parent = getParentFragment();
+												if (parent instanceof LiveUpdatesFragment) {
+													((LiveUpdatesFragment) parent).updateSubscriptionHeader();
+												}
+
+												dismiss();
+											} else {
+												app.showToastMessage("Error: " + obj.getString("error"));
 											}
-										} else {
+										} catch (JSONException e) {
 											app.showToastMessage(getString(R.string.shared_string_io_error));
 										}
+									} else {
+										app.showToastMessage(getString(R.string.shared_string_io_error));
 									}
-								});
-					}
+								}
+							});
 				}
-			});
-
-		} else {
-			editModeBottomView.setVisibility(View.GONE);
-			purchaseCard.setVisibility(View.VISIBLE);
-
-			updatePrice(view);
-			final Button subscribeButton = (Button) view.findViewById(R.id.subscribeButton);
-			subscribeButton.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					InAppPurchaseHelper purchaseHelper = getInAppPurchaseHelper();
-					if (purchaseHelper != null) {
-						if (applySettings(userNameEdit.getText().toString().trim(),
-								emailEdit.getText().toString().trim(), hideUserNameCheckbox.isChecked())) {
-
-							purchaseHelper.purchaseLiveUpdates(getActivity(),
-									settings.BILLING_USER_EMAIL.get(),
-									settings.BILLING_USER_NAME.get(),
-									settings.BILLING_USER_COUNTRY_DOWNLOAD_NAME.get(),
-									settings.BILLING_HIDE_USER_NAME.get());
-						}
-					}
-				}
-			});
-		}
+			}
+		});
 
 		setThemedDrawable((ImageView) view.findViewById(R.id.userNameIcon), R.drawable.ic_person);
 		setThemedDrawable((ImageView) view.findViewById(R.id.emailIcon), R.drawable.ic_action_message);
@@ -351,7 +299,6 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 
 	@Override
 	public void onGetItems() {
-		updatePrice(getView());
 	}
 
 	@Override
@@ -390,17 +337,4 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 			}
 		}
 	}
-
-	private void updatePrice(View view) {
-		if (view == null) {
-			view = getView();
-		}
-		if (view != null) {
-			TextView priceTextView = (TextView) view.findViewById(R.id.priceTextView);
-			InAppPurchaseHelper purchaseHelper = getInAppPurchaseHelper();
-			if (purchaseHelper.getLiveUpdatesPrice() != null) {
-				priceTextView.setText(purchaseHelper.getLiveUpdatesPrice());
-			}
-		}
-	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/AdditionalActionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/AdditionalActionsBottomSheetDialogFragment.java
index 1aae887bc7..84f76c4970 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/AdditionalActionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/AdditionalActionsBottomSheetDialogFragment.java
@@ -64,7 +64,7 @@ public class AdditionalActionsBottomSheetDialogFragment extends net.osmand.plus.
 		updateBackground(false);
 		cancelRowBgView.setBackgroundResource(getCancelRowBgResId());
 		mainView.findViewById(R.id.divider).setBackgroundResource(nightMode
-				? R.color.route_info_bottom_view_bg_dark : R.color.route_info_divider_light);
+				? R.color.route_info_bottom_view_bg_dark : R.color.ctx_menu_buttons_divider_light);
 
 		View.OnClickListener dismissOnClickListener = new View.OnClickListener() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index 27ed59879e..9b1ae5e72f 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -55,7 +55,7 @@ import net.osmand.plus.mapcontextmenu.MenuController.MenuState;
 import net.osmand.plus.mapcontextmenu.MenuController.TitleButtonController;
 import net.osmand.plus.mapcontextmenu.MenuController.TitleProgressController;
 import net.osmand.plus.mapcontextmenu.controllers.TransportStopController;
-import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
+import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
 import net.osmand.plus.transport.TransportStopRoute;
 import net.osmand.plus.views.AnimateDraggingMapThread;
 import net.osmand.plus.views.OsmandMapTileView;
@@ -369,7 +369,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 							if (menu.isLandscapeLayout() && newY > topScreenPosY) {
 								newY = topScreenPosY;
 							}
-							setViewY((int) newY, false, false);
+							setViewY((int) newY, false, false, 0);
 
 							menuFullHeight = view.getHeight() - (int) newY + 10;
 							ViewGroup.LayoutParams lp = mainView.getLayoutParams();
@@ -886,10 +886,9 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 			}
 		}
 		int newMenuState = menu.getCurrentMenuState();
-		boolean needMapAdjust = currentMenuState != newMenuState && newMenuState != MenuState.FULL_SCREEN;
+		boolean needMapAdjust = currentMenuState != newMenuState && (currentMenuState == MenuState.HEADER_ONLY || newMenuState == MenuState.HEADER_ONLY);
 
 		if (newMenuState != currentMenuState) {
-			restoreCustomMapRatio();
 			menu.updateControlsVisibility(true);
 			doBeforeMenuStateChange(currentMenuState, newMenuState);
 			toggleDetailsHideButton();
@@ -919,17 +918,13 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 		if (map.isZooming() && map.hasCustomMapRatio()) {
 			getMapActivity().changeZoom(2, System.currentTimeMillis());
 		} else {
-			if (!map.hasCustomMapRatio()) {
-				//setCustomMapRatio();
-			}
+			setCustomMapRatio();
 			getMapActivity().changeZoom(1, System.currentTimeMillis());
 		}
 	}
 
 	public void doZoomOut() {
-		if (!map.hasCustomMapRatio()) {
-			//setCustomMapRatio();
-		}
+		setCustomMapRatio();
 		getMapActivity().changeZoom(-1, System.currentTimeMillis());
 	}
 
@@ -1005,7 +1000,11 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 					.start();
 
 			if (needMapAdjust) {
-				adjustMapPosition(posY, true, centered, dZoom);
+				int mapPosY = posY;
+				if (newMenuState == MenuState.FULL_SCREEN) {
+					mapPosY = getMenuStatePosY(MenuState.HALF_SCREEN);
+				}
+				adjustMapPosition(mapPosY, true, centered, dZoom);
 			}
 		}
 	}
@@ -1245,9 +1244,9 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 
 	@Override
 	public void onPause() {
-		restoreCustomMapRatio();
 
 		if (view != null) {
+			restoreCustomMapRatio();
 			ViewParent parent = view.getParent();
 			if (parent != null && containerLayoutListener != null) {
 				((View) parent).removeOnLayoutChangeListener(containerLayoutListener);
@@ -1789,12 +1788,12 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 		return (int) mainView.getY();
 	}
 
-	private void setViewY(int y, boolean animated, boolean adjustMapPos) {
+	private void setViewY(int y, boolean animated, boolean adjustMapPos, int mapY) {
 		mainView.setY(y);
 		zoomButtonsView.setY(getZoomButtonsY(y));
 		if (!customMapCenter) {
 			if (adjustMapPos) {
-				adjustMapPosition(y, animated, centered, 0);
+				adjustMapPosition(mapY, animated, centered, 0);
 			}
 		} else {
 			customMapCenter = false;
@@ -1889,8 +1888,10 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 	}
 
 	private void doLayoutMenu() {
-		final int posY = getPosY(getViewY(), false, menu.getCurrentMenuState());
-		setViewY(posY, true, !initLayout || !centered);
+		int state = menu.getCurrentMenuState();
+		int posY = getPosY(getViewY(), false, state);
+		int mapPosY = state == MenuState.FULL_SCREEN ? getMenuStatePosY(MenuState.HALF_SCREEN) : posY;
+		setViewY(posY, true, !initLayout || !centered, mapPosY);
 		updateMainViewLayout(posY);
 	}
 
@@ -1921,7 +1922,9 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 				if (mapCenter != null) {
 					map.setLatLon(mapCenter.getLatitude(), mapCenter.getLongitude());
 				}
-				adjustMapPosition(getPosY(), true, false, 0);
+				int posY = getPosY();
+				int mapPosY = menu.getCurrentMenuState() == MenuState.FULL_SCREEN ? getMenuStatePosY(MenuState.HALF_SCREEN) : posY;
+				adjustMapPosition(mapPosY, true, false, 0);
 			} else {
 				view.setVisibility(View.GONE);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/TransportStopRouteAdapter.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/TransportStopRouteAdapter.java
index 727d741234..d640dda9e5 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/TransportStopRouteAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/TransportStopRouteAdapter.java
@@ -45,7 +45,7 @@ public class TransportStopRouteAdapter extends ArrayAdapter<Object> {
 			int bgColor = 0;
 			if (object instanceof TransportStopRoute) {
 				TransportStopRoute transportStopRoute = (TransportStopRoute) object;
-				routeRef = getAdjustedRouteRef(transportStopRoute.route.getRef());
+				routeRef = transportStopRoute.route.getAdjustedRouteRef();
 				bgColor = transportStopRoute.getColor(app, nightMode);
 			} else if (object instanceof String) {
 				routeRef = (String) object;
@@ -70,19 +70,6 @@ public class TransportStopRouteAdapter extends ArrayAdapter<Object> {
 		return convertView;
 	}
 
-	private String getAdjustedRouteRef(String ref) {
-		if (ref != null) {
-			int charPos = ref.lastIndexOf(':');
-			if (charPos != -1) {
-				ref = ref.substring(0, charPos);
-			}
-			if (ref.length() > 4) {
-				ref = ref.substring(0, 4);
-			}
-		}
-		return ref;
-	}
-
 	public interface OnClickListener {
 		void onClick(int position);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
index 21764c439b..9f58608f4b 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
@@ -21,15 +21,15 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import net.osmand.AndroidUtils;
+import net.osmand.PlatformUtil;
 import net.osmand.data.Amenity;
 import net.osmand.data.PointDescription;
 import net.osmand.osm.AbstractPoiType;
 import net.osmand.osm.MapPoiTypes;
 import net.osmand.osm.PoiCategory;
 import net.osmand.osm.PoiType;
-import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.R;
-import net.osmand.plus.Version;
+import net.osmand.plus.*;
+import net.osmand.plus.OsmandSettings.MetricsConstants;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.FontCache;
 import net.osmand.plus.mapcontextmenu.MenuBuilder;
@@ -42,7 +42,9 @@ import net.osmand.plus.wikipedia.WikipediaArticleWikiLinkFragment;
 import net.osmand.plus.wikipedia.WikipediaDialogFragment;
 import net.osmand.util.Algorithms;
 import net.osmand.util.OpeningHoursParser;
+import org.apache.commons.logging.Log;
 
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
@@ -59,13 +61,17 @@ import java.util.Map;
 public class AmenityMenuBuilder extends MenuBuilder {
 
 	private static final String WIKI_LINK = ".wikipedia.org/w";
-
+	public final static Log LOG = PlatformUtil.getLog(AmenityMenuBuilder.class);
+	private final static DecimalFormat DF = new DecimalFormat("#.##");
+	private OsmandSettings.MetricsConstants metricSystem;
 	private final Amenity amenity;
 
+
 	public AmenityMenuBuilder(@NonNull MapActivity mapActivity, final @NonNull Amenity amenity) {
 		super(mapActivity);
 		this.amenity = amenity;
 		setShowNearestWiki(true, amenity.getId());
+		metricSystem = mapActivity.getMyApplication().getSettings().METRIC_SYSTEM.get();
 	}
 
 	@Override
@@ -521,6 +527,10 @@ public class AmenityMenuBuilder extends MenuBuilder {
 				}
 			}
 
+			String[] formattedPrefixAndText = getFormattedPrefixAndText(key, textPrefix, vl);
+			textPrefix = formattedPrefixAndText[0];
+			vl = formattedPrefixAndText[1];
+
 			boolean matchWidthDivider = !isDescription && isWiki;
 			AmenityInfoRow row;
 			if (isDescription) {
@@ -674,6 +684,62 @@ public class AmenityMenuBuilder extends MenuBuilder {
 		}
 	}
 
+	private String[] getFormattedPrefixAndText(String key, String prefix, String value) {
+		DF.setRoundingMode(RoundingMode.CEILING);
+		String formattedValue = "";
+		String formattedPrefix = "";
+		switch (key) {
+			case "width":
+			case "height":
+				if (key.equals("width")) {
+					formattedPrefix = mapActivity.getResources().getString(R.string.shared_string_width);
+				} else {
+					formattedPrefix = mapActivity.getResources().getString(R.string.shared_string_height);
+				}
+			case "depth":
+			case "seamark_height":
+				double valueAsDouble = Double.valueOf(value);
+				if (metricSystem == OsmandSettings.MetricsConstants.MILES_AND_FEET) {
+					formattedValue = String.valueOf(DF.format(valueAsDouble * OsmAndFormatter.FEET_IN_ONE_METER))
+							+ " " + mapActivity.getResources().getString(R.string.foot);
+				} else if (metricSystem == OsmandSettings.MetricsConstants.MILES_AND_YARDS) {
+					formattedValue = String.valueOf(DF.format(valueAsDouble * OsmAndFormatter.YARDS_IN_ONE_METER))
+							+ " " + mapActivity.getResources().getString(R.string.yard);
+				} else {
+					formattedValue = value + " " + mapActivity.getResources().getString(R.string.m);
+				}
+				break;
+			case "distance":
+				float valueAsFloatInMeters = Float.parseFloat(value) * 1000;
+				if (metricSystem == MetricsConstants.KILOMETERS_AND_METERS) {
+					formattedValue = value + " " + mapActivity.getResources().getString(R.string.km);
+				} else {
+					formattedValue = OsmAndFormatter.getFormattedDistance(valueAsFloatInMeters, mapActivity.getMyApplication());
+				}
+				formattedPrefix =  formatPrefix(prefix, mapActivity.getResources().getString(R.string.distance));
+				break;
+			case "capacity":
+				formattedValue = value + " " + mapActivity.getResources().getString(R.string.cubic_m);
+				break;
+			case "maxweight":
+				formattedValue = value + " " + mapActivity.getResources().getString(R.string.metric_ton);
+				break;
+			case "students":
+			case "spots":
+			case "seats":
+				formattedPrefix = formatPrefix(prefix, mapActivity.getResources().getString(R.string.shared_string_capacity));
+				break;
+			default:
+				formattedValue = value;
+				formattedPrefix = prefix;
+		}
+		return new String[]{formattedPrefix, formattedValue};
+	}
+
+	private String formatPrefix(String prefix, String units) {
+		return (!prefix.isEmpty()) ? (prefix + ", " + units): units;
+	}
+
 	public void buildAmenityRow(View view, AmenityInfoRow info) {
 		if (info.icon != null) {
 			buildRow(view, info.icon, info.text, info.textPrefix, info.collapsable, info.collapsableView,
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/FavouritesBottomSheetMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/FavouritesBottomSheetMenuFragment.java
index f6a9023cd6..ba0058df81 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/FavouritesBottomSheetMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/FavouritesBottomSheetMenuFragment.java
@@ -3,6 +3,7 @@ package net.osmand.plus.mapcontextmenu.other;
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.ContextThemeWrapper;
@@ -22,6 +23,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemTitleWithDescrAndButton;
+import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
 import net.osmand.util.MapUtils;
 
 import java.text.Collator;
@@ -155,6 +157,10 @@ public class FavouritesBottomSheetMenuFragment extends MenuBottomSheetDialogFrag
 			setupMapRouteInfoMenuSpinners(routeMenu);
 			updateMapRouteInfoMenuFromIcon(routeMenu);
 		}
+		Fragment fragment = getTargetFragment();
+		if (fragment != null) {
+			fragment.onActivityResult(getTargetRequestCode(), 0, null);
+		}
 		dismiss();
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapMultiSelectionMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapMultiSelectionMenuFragment.java
index 49b471064f..417a37ef79 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapMultiSelectionMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapMultiSelectionMenuFragment.java
@@ -26,6 +26,7 @@ import net.osmand.AndroidUtils;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.mapcontextmenu.other.MapMultiSelectionMenu.MenuObject;
+import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
deleted file mode 100644
index 0cf760e648..0000000000
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
+++ /dev/null
@@ -1,1070 +0,0 @@
-package net.osmand.plus.mapcontextmenu.other;
-
-import android.content.Context;
-import android.content.DialogInterface.OnDismissListener;
-import android.graphics.PointF;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.ContextCompat;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import net.osmand.AndroidUtils;
-import net.osmand.Location;
-import net.osmand.ValueHolder;
-import net.osmand.data.LatLon;
-import net.osmand.data.PointDescription;
-import net.osmand.data.RotatedTileBox;
-import net.osmand.plus.ApplicationMode;
-import net.osmand.plus.GeocodingLookupService;
-import net.osmand.plus.GeocodingLookupService.AddressLookupRequest;
-import net.osmand.plus.UiUtilities;
-import net.osmand.plus.MapMarkersHelper;
-import net.osmand.plus.MapMarkersHelper.MapMarker;
-import net.osmand.plus.OsmAndFormatter;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandSettings.OsmandPreference;
-import net.osmand.plus.R;
-import net.osmand.plus.TargetPointsHelper;
-import net.osmand.plus.TargetPointsHelper.TargetPoint;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.activities.ShowRouteInfoDialogFragment;
-import net.osmand.plus.activities.actions.AppModeDialog;
-import net.osmand.plus.helpers.AndroidUiHelper;
-import net.osmand.plus.helpers.MapMarkerDialogHelper;
-import net.osmand.plus.mapcontextmenu.MapContextMenu;
-import net.osmand.plus.mapmarkers.MapMarkerSelectionFragment;
-import net.osmand.plus.routing.RouteDirectionInfo;
-import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.routing.RoutingHelper.IRouteInformationListener;
-import net.osmand.plus.views.MapControlsLayer;
-import net.osmand.plus.views.OsmandMapTileView;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class MapRouteInfoMenu implements IRouteInformationListener {
-	public static int directionInfo = -1;
-	public static boolean controlVisible = false;
-	private final MapContextMenu contextMenu;
-	private final RoutingHelper routingHelper;
-	private OsmandMapTileView mapView;
-	private GeocodingLookupService geocodingLookupService;
-	private boolean selectFromMapTouch;
-	private boolean selectFromMapForTarget;
-	private boolean selectFromMapForIntermediate;
-
-	private boolean showMenu = false;
-	private static boolean visible;
-	private MapActivity mapActivity;
-	private MapControlsLayer mapControlsLayer;
-	public static final String TARGET_SELECT = "TARGET_SELECT";
-	private boolean nightMode;
-	private boolean switched;
-
-	private AddressLookupRequest startPointRequest;
-	private AddressLookupRequest targetPointRequest;
-	private List<LatLon> intermediateRequestsLatLon = new ArrayList<>();
-	private OnDismissListener onDismissListener;
-
-	private OnMarkerSelectListener onMarkerSelectListener;
-	private View mainView;
-
-	private static final long SPINNER_MY_LOCATION_ID = 1;
-	public static final long SPINNER_FAV_ID = 2;
-	public static final long SPINNER_MAP_ID = 3;
-	public static final long SPINNER_ADDRESS_ID = 4;
-	private static final long SPINNER_START_ID = 5;
-	private static final long SPINNER_FINISH_ID = 6;
-	private static final long SPINNER_HINT_ID = 100;
-	public static final long SPINNER_MAP_MARKER_1_ID = 301;
-	public static final long SPINNER_MAP_MARKER_2_ID = 302;
-	private static final long SPINNER_MAP_MARKER_3_ID = 303;
-	public static final long SPINNER_MAP_MARKER_MORE_ID = 350;
-
-	public interface OnMarkerSelectListener {
-		void onSelect(int index, boolean target, boolean intermediate);
-	}
-
-	public MapRouteInfoMenu(MapActivity mapActivity, MapControlsLayer mapControlsLayer) {
-		this.mapActivity = mapActivity;
-		this.mapControlsLayer = mapControlsLayer;
-		contextMenu = mapActivity.getContextMenu();
-		routingHelper = mapActivity.getRoutingHelper();
-		mapView = mapActivity.getMapView();
-		routingHelper.addListener(this);
-		geocodingLookupService = mapActivity.getMyApplication().getGeocodingLookupService();
-		onMarkerSelectListener = new OnMarkerSelectListener() {
-			@Override
-			public void onSelect(int index, boolean target, boolean intermediate) {
-				selectMapMarker(index, target, intermediate);
-			}
-		};
-	}
-
-	public OnDismissListener getOnDismissListener() {
-		return onDismissListener;
-	}
-
-	public void setOnDismissListener(OnDismissListener onDismissListener) {
-		this.onDismissListener = onDismissListener;
-	}
-
-	public boolean isSelectFromMapTouch() {
-		return selectFromMapTouch;
-	}
-
-	public void cancelSelectionFromMap() {
-		selectFromMapTouch = false;
-	}
-
-	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
-		if (selectFromMapTouch) {
-			LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y);
-			selectFromMapTouch = false;
-			if (selectFromMapForIntermediate) {
-				getTargets().navigateToPoint(latlon, true, getTargets().getIntermediatePoints().size());
-			} else if (selectFromMapForTarget) {
-				getTargets().navigateToPoint(latlon, true, -1);
-			} else {
-				getTargets().setStartPoint(latlon, true, null);
-			}
-			show();
-			if (selectFromMapForIntermediate && getTargets().checkPointToNavigateShort()) {
-				mapActivity.getMapActions().openIntermediatePointsDialog();
-			}
-			return true;
-		}
-		return false;
-	}
-
-	public OnMarkerSelectListener getOnMarkerSelectListener() {
-		return onMarkerSelectListener;
-	}
-
-	private void cancelStartPointAddressRequest() {
-		if (startPointRequest != null) {
-			geocodingLookupService.cancel(startPointRequest);
-			startPointRequest = null;
-		}
-	}
-
-	private void cancelTargetPointAddressRequest() {
-		if (targetPointRequest != null) {
-			geocodingLookupService.cancel(targetPointRequest);
-			targetPointRequest = null;
-		}
-	}
-
-	public void setVisible(boolean visible) {
-		if (visible) {
-			if (showMenu) {
-				show();
-				showMenu = false;
-			}
-			controlVisible = true;
-		} else {
-			hide();
-			controlVisible = false;
-		}
-	}
-
-
-	public void showHideMenu() {
-		intermediateRequestsLatLon.clear();
-		if (isVisible()) {
-			hide();
-		} else {
-			show();
-		}
-	}
-
-	public void updateRouteCalculationProgress(int progress) {
-		WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
-		if (fragmentRef != null) {
-			fragmentRef.get().updateRouteCalculationProgress(progress);
-		}
-	}
-
-	public void routeCalculationFinished() {
-		WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
-		if (fragmentRef != null) {
-			fragmentRef.get().hideRouteCalculationProgressBar();
-		}
-	}
-
-	public void updateMenu() {
-		WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
-		if (fragmentRef != null)
-			fragmentRef.get().updateInfo();
-	}
-
-	public void updateFromIcon() {
-		WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
-		if (fragmentRef != null)
-			fragmentRef.get().updateFromIcon();
-	}
-
-	public void updateInfo(final View main) {
-		mainView = main;
-		nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
-		updateViaView(main);
-		updateFromSpinner(main);
-		updateToSpinner(main);
-		updateApplicationModes(main);
-		mapControlsLayer.updateRouteButtons(main, true);
-		boolean addButtons = routingHelper.isRouteCalculated();
-		if (addButtons) {
-			updateRouteButtons(main);
-		} else {
-			updateRouteCalcProgress(main);
-		}
-	}
-
-	private void updateRouteCalcProgress(final View main) {
-		TargetPointsHelper targets = getTargets();
-		if (targets.hasTooLongDistanceToNavigate()) {
-			main.findViewById(R.id.dividerToDropDown).setVisibility(View.VISIBLE);
-			main.findViewById(R.id.RouteInfoControls).setVisibility(View.VISIBLE);
-			TextView textView = (TextView) main.findViewById(R.id.InfoTextView);
-			ImageView iconView = (ImageView) main.findViewById(R.id.InfoIcon);
-			main.findViewById(R.id.Prev).setVisibility(View.GONE);
-			main.findViewById(R.id.Next).setVisibility(View.GONE);
-			main.findViewById(R.id.InfoIcon).setVisibility(View.GONE);
-			main.findViewById(R.id.DurationIcon).setVisibility(View.GONE);
-			main.findViewById(R.id.InfoDistance).setVisibility(View.GONE);
-			main.findViewById(R.id.InfoDuration).setVisibility(View.GONE);
-			textView.setText(R.string.route_is_too_long_v2);
-			textView.setVisibility(View.VISIBLE);
-			iconView.setImageDrawable(mapActivity.getMyApplication().getUIUtilities().getIcon(R.drawable.ic_warning, isLight()));
-		} else {
-			main.findViewById(R.id.dividerToDropDown).setVisibility(View.GONE);
-			main.findViewById(R.id.RouteInfoControls).setVisibility(View.GONE);
-		}
-	}
-
-	private void updateApplicationModes(final View parentView) {
-		//final OsmandSettings settings = mapActivity.getMyApplication().getSettings();
-		//ApplicationMode am = settings.APPLICATION_MODE.get();
-		final ApplicationMode am = routingHelper.getAppMode();
-		final Set<ApplicationMode> selected = new HashSet<>();
-		selected.add(am);
-		ViewGroup vg = (ViewGroup) parentView.findViewById(R.id.app_modes);
-		vg.removeAllViews();
-		AppModeDialog.prepareAppModeView(mapActivity, selected, false,
-				vg, true,false,true, new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						if (selected.size() > 0) {
-							ApplicationMode next = selected.iterator().next();
-							OsmandPreference<ApplicationMode> appMode
-									= mapActivity.getMyApplication().getSettings().APPLICATION_MODE;
-							if (routingHelper.isFollowingMode() && appMode.get() == am) {
-								appMode.set(next);
-								//updateMenu();
-							}
-							routingHelper.setAppMode(next);
-							mapActivity.getMyApplication().initVoiceCommandPlayer(mapActivity, next, true, null, false, false);
-							routingHelper.recalculateRouteDueToSettingsChange();
-						}
-					}
-				});
-	}
-
-	private void updateViaView(final View parentView) {
-		String via = generateViaDescription();
-		View viaLayout = parentView.findViewById(R.id.ViaLayout);
-		View viaLayoutDivider = parentView.findViewById(R.id.viaLayoutDivider);
-		ImageView swapDirectionView = (ImageView) parentView.findViewById(R.id.swap_direction_image_view);
-		if (via.length() == 0) {
-			viaLayout.setVisibility(View.GONE);
-			viaLayoutDivider.setVisibility(View.GONE);
-			swapDirectionView.setVisibility(View.VISIBLE);
-		} else {
-			swapDirectionView.setVisibility(View.GONE);
-			viaLayout.setVisibility(View.VISIBLE);
-			viaLayoutDivider.setVisibility(View.VISIBLE);
-			((TextView) parentView.findViewById(R.id.ViaView)).setText(via);
-		}
-
-		viaLayout.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (getTargets().checkPointToNavigateShort()) {
-					mapActivity.getMapActions().openIntermediatePointsDialog();
-				}
-			}
-		});
-
-		ImageView viaIcon = (ImageView) parentView.findViewById(R.id.viaIcon);
-		viaIcon.setImageDrawable(getIconOrig(R.drawable.list_intermediate));
-
-		swapDirectionView.setImageDrawable(mapActivity.getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_change_navigation_points,
-				isLight() ? R.color.route_info_control_icon_color_light : R.color.route_info_control_icon_color_dark));
-		swapDirectionView.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				TargetPointsHelper targetPointsHelper = getTargets();
-				TargetPoint startPoint = targetPointsHelper.getPointToStart();
-				TargetPoint endPoint = targetPointsHelper.getPointToNavigate();
-
-				if (startPoint == null) {
-					Location loc = mapActivity.getMyApplication().getLocationProvider().getLastKnownLocation();
-					if (loc != null) {
-						startPoint = TargetPoint.createStartPoint(new LatLon(loc.getLatitude(), loc.getLongitude()),
-								new PointDescription(PointDescription.POINT_TYPE_MY_LOCATION,
-										mapActivity.getString(R.string.shared_string_my_location)));
-					}
-				}
-
-				if (startPoint != null && endPoint != null) {
-					targetPointsHelper.navigateToPoint(startPoint.point, false, -1, startPoint.getPointDescription(mapActivity));
-					targetPointsHelper.setStartPoint(endPoint.point, false, endPoint.getPointDescription(mapActivity));
-					targetPointsHelper.updateRouteAndRefresh(true);
-
-					updateInfo(parentView);
-				}
-			}
-		});
-	}
-
-	private void updateToSpinner(final View parentView) {
-		final Spinner toSpinner = setupToSpinner(parentView);
-		toSpinner.setClickable(false);
-		final View toLayout = parentView.findViewById(R.id.ToLayout);
-		toSpinner.setOnTouchListener(new View.OnTouchListener() {
-			@Override
-			public boolean onTouch(View v, MotionEvent event) {
-				event.offsetLocation(AndroidUtils.dpToPx(mapActivity, 48f), 0);
-				toLayout.onTouchEvent(event);
-				return true;
-			}
-		});
-		toSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-			@Override
-			public void onItemSelected(AdapterView<?> parent, View view, int position, final long id) {
-				parentView.post(new Runnable() {
-					@Override
-					public void run() {
-						if (id == SPINNER_FAV_ID) {
-							selectFavorite(parentView, true, false);
-						} else if (id == SPINNER_MAP_ID) {
-							selectOnScreen(true, false);
-						} else if (id == SPINNER_ADDRESS_ID) {
-							mapActivity.showQuickSearch(MapActivity.ShowQuickSearchMode.DESTINATION_SELECTION, false);
-							setupToSpinner(parentView);
-						} else if (id == SPINNER_MAP_MARKER_MORE_ID) {
-							selectMapMarker(-1, true, false);
-							setupToSpinner(parentView);
-						} else if (id == SPINNER_MAP_MARKER_1_ID) {
-							selectMapMarker(0, true, false);
-						} else if (id == SPINNER_MAP_MARKER_2_ID) {
-							selectMapMarker(1, true, false);
-						} else if (id == SPINNER_MAP_MARKER_3_ID) {
-							selectMapMarker(2, true, false);
-						}
-					}
-				});
-			}
-
-			@Override
-			public void onNothingSelected(AdapterView<?> parent) {
-			}
-		});
-
-		toLayout.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				toSpinner.performClick();
-			}
-		});
-
-		updateToIcon(parentView);
-
-		ImageView toDropDownIcon = (ImageView) parentView.findViewById(R.id.toDropDownIcon);
-		toDropDownIcon.setImageDrawable(mapActivity.getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_arrow_drop_down, isLight()));
-	}
-
-	private void updateToIcon(View parentView) {
-		ImageView toIcon = (ImageView) parentView.findViewById(R.id.toIcon);
-		toIcon.setImageDrawable(getIconOrig(R.drawable.list_destination));
-	}
-
-	private void updateFromSpinner(final View parentView) {
-		final TargetPointsHelper targets = getTargets();
-		final Spinner fromSpinner = setupFromSpinner(parentView);
-		fromSpinner.setClickable(false);
-		final View fromLayout = parentView.findViewById(R.id.FromLayout);
-		fromSpinner.setOnTouchListener(new View.OnTouchListener() {
-			@Override
-			public boolean onTouch(View v, MotionEvent event) {
-				event.offsetLocation(AndroidUtils.dpToPx(mapActivity, 48f), 0);
-				fromLayout.onTouchEvent(event);
-				return true;
-			}
-		});
-		fromSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-
-			@Override
-			public void onItemSelected(AdapterView<?> parent, View view, int position, final long id) {
-				parentView.post(new Runnable() {
-					@Override
-					public void run() {
-						if (id == SPINNER_MY_LOCATION_ID) {
-							if (targets.getPointToStart() != null) {
-								targets.clearStartPoint(true);
-								mapActivity.getMyApplication().getSettings().backupPointToStart();
-							}
-							updateFromIcon(parentView);
-						} else if (id == SPINNER_FAV_ID) {
-							selectFavorite(parentView, false, false);
-						} else if (id == SPINNER_MAP_ID) {
-							selectOnScreen(false, false);
-						} else if (id == SPINNER_ADDRESS_ID) {
-							mapActivity.showQuickSearch(MapActivity.ShowQuickSearchMode.START_POINT_SELECTION, false);
-							setupFromSpinner(parentView);
-						} else if (id == SPINNER_MAP_MARKER_MORE_ID) {
-							selectMapMarker(-1, false, false);
-							setupFromSpinner(parentView);
-						} else if (id == SPINNER_MAP_MARKER_1_ID) {
-							selectMapMarker(0, false, false);
-						} else if (id == SPINNER_MAP_MARKER_2_ID) {
-							selectMapMarker(1, false, false);
-						} else if (id == SPINNER_MAP_MARKER_3_ID) {
-							selectMapMarker(2, false, false);
-						}
-					}
-				});
-			}
-
-			@Override
-			public void onNothingSelected(AdapterView<?> parent) {
-			}
-		});
-
-		fromLayout.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				fromSpinner.performClick();
-			}
-		});
-
-		updateFromIcon(parentView);
-
-		ImageView fromDropDownIcon = (ImageView) parentView.findViewById(R.id.fromDropDownIcon);
-		fromDropDownIcon.setImageDrawable(mapActivity.getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_arrow_drop_down, isLight()));
-	}
-
-	public void updateFromIcon(View parentView) {
-		((ImageView) parentView.findViewById(R.id.fromIcon)).setImageDrawable(ContextCompat.getDrawable(mapActivity,
-				getTargets().getPointToStart() == null ? R.drawable.ic_action_location_color : R.drawable.list_startpoint));
-	}
-
-	public void selectOnScreen(boolean target, boolean intermediate) {
-		selectFromMapTouch = true;
-		selectFromMapForTarget = target;
-		selectFromMapForIntermediate = intermediate;
-		hide();
-	}
-
-	public void selectAddress(String name, LatLon l, final boolean target, final boolean intermediate) {
-		PointDescription pd = new PointDescription(PointDescription.POINT_TYPE_ADDRESS, name);
-		if (intermediate) {
-			getTargets().navigateToPoint(l, true, getTargets().getIntermediatePoints().size(), pd);
-		} else if (target) {
-			getTargets().navigateToPoint(l, true, -1, pd);
-		} else {
-			getTargets().setStartPoint(l, true, pd);
-		}
-		updateMenu();
-	}
-
-	public void selectFavorite(@Nullable final View parentView, final boolean target, final boolean intermediate) {
-		FragmentManager fragmentManager = mapActivity.getSupportFragmentManager();
-		FavouritesBottomSheetMenuFragment fragment = new FavouritesBottomSheetMenuFragment();
-		Bundle args = new Bundle();
-		args.putBoolean(FavouritesBottomSheetMenuFragment.TARGET, target);
-		args.putBoolean(FavouritesBottomSheetMenuFragment.INTERMEDIATE, intermediate);
-		fragment.setArguments(args);
-		fragment.show(fragmentManager, FavouritesBottomSheetMenuFragment.TAG);
-	}
-
-	public void setupSpinners(final boolean target, final boolean intermediate) {
-		if (!intermediate && mainView != null) {
-			if (target) {
-				setupToSpinner(mainView);
-			} else {
-				setupFromSpinner(mainView);
-			}
-		}
-	}
-
-	public void selectMapMarker(final int index, final boolean target, final boolean intermediate) {
-		if (index != -1) {
-			MapMarker m = mapActivity.getMyApplication().getMapMarkersHelper().getMapMarkers().get(index);
-			LatLon point = new LatLon(m.getLatitude(), m.getLongitude());
-			if (intermediate) {
-				getTargets().navigateToPoint(point, true, getTargets().getIntermediatePoints().size(), m.getPointDescription(mapActivity));
-			} else if (target) {
-				getTargets().navigateToPoint(point, true, -1, m.getPointDescription(mapActivity));
-			} else {
-				getTargets().setStartPoint(point, true, m.getPointDescription(mapActivity));
-			}
-			updateFromIcon();
-
-		} else {
-
-			MapMarkerSelectionFragment selectionFragment = MapMarkerSelectionFragment.newInstance(target, intermediate);
-			selectionFragment.show(mapActivity.getSupportFragmentManager(), MapMarkerSelectionFragment.TAG);
-		}
-	}
-
-	private boolean isLight() {
-		return !nightMode;
-	}
-
-	private Drawable getIconOrig(int iconId) {
-		UiUtilities iconsCache = mapActivity.getMyApplication().getUIUtilities();
-		return iconsCache.getIcon(iconId, 0);
-	}
-
-	public static int getDirectionInfo() {
-		return directionInfo;
-	}
-
-	public static boolean isVisible() {
-		return visible;
-	}
-
-	public WeakReference<MapRouteInfoMenuFragment> findMenuFragment() {
-		Fragment fragment = mapActivity.getSupportFragmentManager().findFragmentByTag(MapRouteInfoMenuFragment.TAG);
-		if (fragment != null && !fragment.isDetached()) {
-			return new WeakReference<>((MapRouteInfoMenuFragment) fragment);
-		} else {
-			return null;
-		}
-	}
-
-	public static boolean isControlVisible() {
-		return controlVisible;
-	}
-
-	private void updateRouteButtons(final View mainView) {
-		mainView.findViewById(R.id.dividerToDropDown).setVisibility(View.VISIBLE);
-		mainView.findViewById(R.id.RouteInfoControls).setVisibility(View.VISIBLE);
-		final OsmandApplication ctx = mapActivity.getMyApplication();
-		ImageView prev = (ImageView) mainView.findViewById(R.id.Prev);
-		prev.setImageDrawable(ctx.getUIUtilities().getIcon(R.drawable.ic_prev, isLight()));
-		if (directionInfo >= 0) {
-			prev.setVisibility(View.VISIBLE);
-			prev.setOnClickListener(new View.OnClickListener() {
-
-				@Override
-				public void onClick(View v) {
-					if (directionInfo >= 0) {
-						directionInfo--;
-					}
-					if (routingHelper.getRouteDirections() != null && directionInfo >= 0) {
-						if (routingHelper.getRouteDirections().size() > directionInfo) {
-							RouteDirectionInfo info = routingHelper.getRouteDirections().get(directionInfo);
-							net.osmand.Location l = routingHelper.getLocationFromRouteDirection(info);
-							contextMenu.showMinimized(new LatLon(l.getLatitude(), l.getLongitude()), null, info);
-							showLocationOnMap(mapActivity, l.getLatitude(), l.getLongitude());
-						}
-					}
-					mapView.refreshMap();
-					updateInfo(mainView);
-				}
-
-			});
-		} else {
-			prev.setVisibility(View.GONE);
-		}
-		ImageView next = (ImageView) mainView.findViewById(R.id.Next);
-		next.setVisibility(View.VISIBLE);
-		next.setImageDrawable(ctx.getUIUtilities().getIcon(R.drawable.ic_next, isLight()));
-		next.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (routingHelper.getRouteDirections() != null && directionInfo < routingHelper.getRouteDirections().size() - 1) {
-					directionInfo++;
-					RouteDirectionInfo info = routingHelper.getRouteDirections().get(directionInfo);
-					net.osmand.Location l = routingHelper.getLocationFromRouteDirection(info);
-					contextMenu.showMinimized(new LatLon(l.getLatitude(), l.getLongitude()), null, info);
-					showLocationOnMap(mapActivity, l.getLatitude(), l.getLongitude());
-				}
-				mapView.refreshMap();
-				updateInfo(mainView);
-			}
-
-		});
-		View info = mainView.findViewById(R.id.Info);
-		info.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				ShowRouteInfoDialogFragment.showDialog(mapActivity.getSupportFragmentManager());
-			}
-		});
-
-		TextView textView = (TextView) mainView.findViewById(R.id.InfoTextView);
-		ImageView infoIcon = (ImageView) mainView.findViewById(R.id.InfoIcon);
-		ImageView durationIcon = (ImageView) mainView.findViewById(R.id.DurationIcon);
-		View infoDistanceView = mainView.findViewById(R.id.InfoDistance);
-		View infoDurationView = mainView.findViewById(R.id.InfoDuration);
-		if (directionInfo >= 0) {
-			infoIcon.setVisibility(View.GONE);
-			durationIcon.setVisibility(View.GONE);
-			infoDistanceView.setVisibility(View.GONE);
-			infoDurationView.setVisibility(View.GONE);
-			textView.setVisibility(View.VISIBLE);
-		} else {
-			infoIcon.setImageDrawable(ctx.getUIUtilities().getIcon(R.drawable.ic_action_route_distance, R.color.route_info_unchecked_mode_icon_color));
-			infoIcon.setVisibility(View.VISIBLE);
-			durationIcon.setImageDrawable(ctx.getUIUtilities().getIcon(R.drawable.ic_action_time_span, R.color.route_info_unchecked_mode_icon_color));
-			durationIcon.setVisibility(View.VISIBLE);
-			infoDistanceView.setVisibility(View.VISIBLE);
-			infoDurationView.setVisibility(View.VISIBLE);
-			textView.setVisibility(View.GONE);
-		}
-		if (directionInfo >= 0 && routingHelper.getRouteDirections() != null
-				&& directionInfo < routingHelper.getRouteDirections().size()) {
-			RouteDirectionInfo ri = routingHelper.getRouteDirections().get(directionInfo);
-			if (!ri.getDescriptionRoutePart().endsWith(OsmAndFormatter.getFormattedDistance(ri.distance, ctx))) {
-				textView.setText((directionInfo + 1) + ". " + ri.getDescriptionRoutePart() + " " + OsmAndFormatter.getFormattedDistance(ri.distance, ctx));
-			} else {
-				textView.setText((directionInfo + 1) + ". " + ri.getDescriptionRoutePart());
-			}
-		} else {
-			TextView distanceText = (TextView) mainView.findViewById(R.id.DistanceText);
-			TextView durationText = (TextView) mainView.findViewById(R.id.DurationText);
-			distanceText.setText(OsmAndFormatter.getFormattedDistance(ctx.getRoutingHelper().getLeftDistance(), ctx));
-			durationText.setText(OsmAndFormatter.getFormattedDuration(ctx.getRoutingHelper().getLeftTime(), ctx));
-		}
-	}
-
-	public static void showLocationOnMap(MapActivity mapActivity, double latitude, double longitude) {
-		RotatedTileBox tb = mapActivity.getMapView().getCurrentRotatedTileBox().copy();
-		int tileBoxWidthPx = 0;
-		int tileBoxHeightPx = 0;
-
-		MapRouteInfoMenu routeInfoMenu = mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu();
-		WeakReference<MapRouteInfoMenuFragment> fragmentRef = routeInfoMenu.findMenuFragment();
-		if (fragmentRef != null) {
-			MapRouteInfoMenuFragment f = fragmentRef.get();
-			if (mapActivity.isLandscapeLayout()) {
-				tileBoxWidthPx = tb.getPixWidth() - f.getWidth();
-			} else {
-				tileBoxHeightPx = tb.getPixHeight() - f.getHeight();
-			}
-		}
-		mapActivity.getMapView().fitLocationToMap(latitude, longitude, mapActivity.getMapView().getZoom(),
-				tileBoxWidthPx, tileBoxHeightPx, AndroidUtils.dpToPx(mapActivity, 40f), true);
-	}
-
-	@Override
-	public void newRouteIsCalculated(boolean newRoute, ValueHolder<Boolean> showToast) {
-		directionInfo = -1;
-		updateMenu();
-		if (isVisible()) {
-			showToast.value = false;
-		}
-	}
-
-	public String generateViaDescription() {
-		TargetPointsHelper targets = getTargets();
-		List<TargetPoint> points = targets.getIntermediatePointsNavigation();
-		if (points.size() == 0) {
-			return "";
-		}
-		StringBuilder via = new StringBuilder();
-		for (int i = 0; i < points.size(); i++) {
-			if (i > 0) {
-				via.append(" ");
-			}
-			TargetPoint p = points.get(i);
-			String description = p.getOnlyName();
-			via.append(getRoutePointDescription(p.point, description));
-			boolean needAddress = new PointDescription(PointDescription.POINT_TYPE_LOCATION, description).isSearchingAddress(mapActivity)
-					&& !intermediateRequestsLatLon.contains(p.point);
-			if (needAddress) {
-				AddressLookupRequest lookupRequest = new AddressLookupRequest(p.point, new GeocodingLookupService.OnAddressLookupResult() {
-					@Override
-					public void geocodingDone(String address) {
-						updateMenu();
-					}
-				}, null);
-				intermediateRequestsLatLon.add(p.point);
-				geocodingLookupService.lookupAddress(lookupRequest);
-			}
-		}
-		return via.toString();
-	}
-
-	public String getRoutePointDescription(double lat, double 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 "";
-	}
-
-	private Spinner setupFromSpinner(View view) {
-		List<RouteSpinnerRow> fromActions = new ArrayList<>();
-		fromActions.add(new RouteSpinnerRow(SPINNER_MY_LOCATION_ID, R.drawable.ic_action_get_my_location,
-				mapActivity.getString(R.string.shared_string_my_location)));
-		fromActions.add(new RouteSpinnerRow(SPINNER_FAV_ID, R.drawable.ic_action_fav_dark,
-				mapActivity.getString(R.string.shared_string_favorite) + mapActivity.getString(R.string.shared_string_ellipsis)));
-		fromActions.add(new RouteSpinnerRow(SPINNER_MAP_ID, R.drawable.ic_action_marker_dark,
-				mapActivity.getString(R.string.shared_string_select_on_map)));
-		fromActions.add(new RouteSpinnerRow(SPINNER_ADDRESS_ID, R.drawable.ic_action_home_dark,
-				mapActivity.getString(R.string.shared_string_address) + mapActivity.getString(R.string.shared_string_ellipsis)));
-
-		TargetPoint start = getTargets().getPointToStart();
-		int startPos = -1;
-		if (start != null) {
-			String oname = start.getOnlyName().length() > 0 ? start.getOnlyName()
-					: (mapActivity.getString(R.string.route_descr_map_location) + " " + getRoutePointDescription(start.getLatitude(), start.getLongitude()));
-			startPos = fromActions.size();
-			fromActions.add(new RouteSpinnerRow(SPINNER_START_ID, R.drawable.ic_action_get_my_location, oname));
-
-			final LatLon latLon = start.point;
-			final PointDescription pointDescription = start.getOriginalPointDescription();
-			boolean needAddress = pointDescription != null && pointDescription.isSearchingAddress(mapActivity);
-			cancelStartPointAddressRequest();
-			if (needAddress) {
-				startPointRequest = new AddressLookupRequest(latLon, new GeocodingLookupService.OnAddressLookupResult() {
-					@Override
-					public void geocodingDone(String address) {
-						startPointRequest = null;
-						updateMenu();
-					}
-				}, null);
-				geocodingLookupService.lookupAddress(startPointRequest);
-			}
-		}
-
-		addMarkersToSpinner(fromActions);
-
-		final Spinner fromSpinner = ((Spinner) view.findViewById(R.id.FromSpinner));
-		RouteSpinnerArrayAdapter fromAdapter = new RouteSpinnerArrayAdapter(view.getContext());
-		for (RouteSpinnerRow row : fromActions) {
-			fromAdapter.add(row);
-		}
-		fromSpinner.setAdapter(fromAdapter);
-		if (start != null) {
-			fromSpinner.setSelection(startPos);
-		} else {
-			if (mapActivity.getMyApplication().getLocationProvider().getLastKnownLocation() == null) {
-				fromSpinner.setPromptId(R.string.search_poi_location);
-			}
-			//fromSpinner.setSelection(0);
-		}
-		return fromSpinner;
-	}
-
-	private Spinner setupToSpinner(View view) {
-		final Spinner toSpinner = ((Spinner) view.findViewById(R.id.ToSpinner));
-		final TargetPointsHelper targets = getTargets();
-		List<RouteSpinnerRow> toActions = new ArrayList<>();
-
-		TargetPoint finish = getTargets().getPointToNavigate();
-		if (finish != null) {
-			toActions.add(new RouteSpinnerRow(SPINNER_FINISH_ID, R.drawable.ic_action_get_my_location,
-					getRoutePointDescription(targets.getPointToNavigate().point,
-							targets.getPointToNavigate().getOnlyName())));
-
-			final LatLon latLon = finish.point;
-			final PointDescription pointDescription = finish.getOriginalPointDescription();
-			boolean needAddress = pointDescription != null && pointDescription.isSearchingAddress(mapActivity);
-			cancelTargetPointAddressRequest();
-			if (needAddress) {
-				targetPointRequest = new AddressLookupRequest(latLon, new GeocodingLookupService.OnAddressLookupResult() {
-					@Override
-					public void geocodingDone(String address) {
-						targetPointRequest = null;
-						updateMenu();
-					}
-				}, null);
-				geocodingLookupService.lookupAddress(targetPointRequest);
-			}
-
-		} else {
-			toSpinner.setPromptId(R.string.route_descr_select_destination);
-			toActions.add(new RouteSpinnerRow(SPINNER_HINT_ID, R.drawable.ic_action_get_my_location,
-					mapActivity.getString(R.string.route_descr_select_destination)));
-		}
-		toActions.add(new RouteSpinnerRow(SPINNER_FAV_ID, R.drawable.ic_action_fav_dark,
-				mapActivity.getString(R.string.shared_string_favorite) + mapActivity.getString(R.string.shared_string_ellipsis)));
-		toActions.add(new RouteSpinnerRow(SPINNER_MAP_ID, R.drawable.ic_action_marker_dark,
-				mapActivity.getString(R.string.shared_string_select_on_map)));
-		toActions.add(new RouteSpinnerRow(SPINNER_ADDRESS_ID, R.drawable.ic_action_home_dark,
-				mapActivity.getString(R.string.shared_string_address) + mapActivity.getString(R.string.shared_string_ellipsis)));
-
-		addMarkersToSpinner(toActions);
-
-		RouteSpinnerArrayAdapter toAdapter = new RouteSpinnerArrayAdapter(view.getContext());
-		for (RouteSpinnerRow row : toActions) {
-			toAdapter.add(row);
-		}
-		toSpinner.setAdapter(toAdapter);
-		return toSpinner;
-	}
-
-	public RoutePopupListArrayAdapter getIntermediatesPopupAdapter(Context ctx) {
-		List<RouteSpinnerRow> viaActions = new ArrayList<>();
-
-		viaActions.add(new RouteSpinnerRow(SPINNER_FAV_ID, R.drawable.ic_action_fav_dark,
-				mapActivity.getString(R.string.shared_string_favorite) + mapActivity.getString(R.string.shared_string_ellipsis)));
-		viaActions.add(new RouteSpinnerRow(SPINNER_MAP_ID, R.drawable.ic_action_marker_dark,
-				mapActivity.getString(R.string.shared_string_select_on_map)));
-		viaActions.add(new RouteSpinnerRow(SPINNER_ADDRESS_ID, R.drawable.ic_action_home_dark,
-				mapActivity.getString(R.string.shared_string_address) + mapActivity.getString(R.string.shared_string_ellipsis)));
-
-		addMarkersToSpinner(viaActions);
-
-		RoutePopupListArrayAdapter viaAdapter = new RoutePopupListArrayAdapter(ctx);
-		for (RouteSpinnerRow row : viaActions) {
-			viaAdapter.add(row);
-		}
-
-		return viaAdapter;
-	}
-
-	private void addMarkersToSpinner(List<RouteSpinnerRow> actions) {
-		MapMarkersHelper markersHelper = mapActivity.getMyApplication().getMapMarkersHelper();
-		List<MapMarker> markers = markersHelper.getMapMarkers();
-		if (markers.size() > 0) {
-			MapMarker m = markers.get(0);
-			actions.add(new RouteSpinnerRow(SPINNER_MAP_MARKER_1_ID,
-					MapMarkerDialogHelper.getMapMarkerIcon(mapActivity.getMyApplication(), m.colorIndex),
-					m.getName(mapActivity)));
-		}
-		if (markers.size() > 1) {
-			MapMarker m = markers.get(1);
-			actions.add(new RouteSpinnerRow(SPINNER_MAP_MARKER_2_ID,
-					MapMarkerDialogHelper.getMapMarkerIcon(mapActivity.getMyApplication(), m.colorIndex),
-					m.getName(mapActivity)));
-		}
-		/*
-		if (markers.size() > 2) {
-			MapMarker m = markers.get(2);
-			actions.add(new RouteSpinnerRow(SPINNER_MAP_MARKER_3_ID,
-					MapMarkerDialogHelper.getMapMarkerIcon(mapActivity.getMyApplication(), m.colorIndex),
-					m.getOnlyName()));
-		}
-		*/
-		if (markers.size() > 2) {
-			actions.add(new RouteSpinnerRow(SPINNER_MAP_MARKER_MORE_ID, 0,
-					mapActivity.getString(R.string.map_markers_other)));
-		}
-	}
-
-	private TargetPointsHelper getTargets() {
-		return mapActivity.getMyApplication().getTargetPointsHelper();
-	}
-
-	@Override
-	public void routeWasCancelled() {
-		directionInfo = -1;
-		// do not hide fragment (needed for use case entering Planning mode without destination)
-	}
-
-	@Override
-	public void routeWasFinished() {
-	}
-
-	public void onDismiss() {
-		visible = false;
-		mapActivity.getMapView().setMapPositionX(0);
-		mapActivity.getMapView().refreshMap();
-		AndroidUiHelper.updateVisibility(mapActivity.findViewById(R.id.map_route_land_left_margin), false);
-		AndroidUiHelper.updateVisibility(mapActivity.findViewById(R.id.map_right_widgets_panel), true);
-		if (switched) {
-			mapControlsLayer.switchToRouteFollowingLayout();
-		}
-		if (getTargets().getPointToNavigate() == null && !selectFromMapTouch) {
-			mapActivity.getMapActions().stopNavigationWithoutConfirm();
-		}
-		if (onDismissListener != null) {
-			onDismissListener.onDismiss(null);
-		}
-	}
-
-	public void show() {
-		if (!visible) {
-			visible = true;
-			switched = mapControlsLayer.switchToRoutePlanningLayout();
-			boolean refreshMap = !switched;
-			boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
-			if (!portrait) {
-				mapActivity.getMapView().setMapPositionX(1);
-				refreshMap = true;
-			}
-
-			if (refreshMap) {
-				mapActivity.refreshMap();
-			}
-
-			MapRouteInfoMenuFragment.showInstance(mapActivity);
-
-			if (!AndroidUiHelper.isXLargeDevice(mapActivity)) {
-				AndroidUiHelper.updateVisibility(mapActivity.findViewById(R.id.map_right_widgets_panel), false);
-			}
-			if (!portrait) {
-				AndroidUiHelper.updateVisibility(mapActivity.findViewById(R.id.map_route_land_left_margin), true);
-			}
-		}
-	}
-
-	public void hide() {
-		WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
-		if (fragmentRef != null) {
-			fragmentRef.get().dismiss();
-		} else {
-			visible = false;
-		}
-	}
-
-	public void setShowMenu() {
-		showMenu = true;
-	}
-
-	private class RouteSpinnerRow {
-		long id;
-		int iconId;
-		Drawable icon;
-		String text;
-
-		public RouteSpinnerRow(long id) {
-			this.id = id;
-		}
-
-		public RouteSpinnerRow(long id, int iconId, String text) {
-			this.id = id;
-			this.iconId = iconId;
-			this.text = text;
-		}
-
-		public RouteSpinnerRow(long id, Drawable icon, String text) {
-			this.id = id;
-			this.icon = icon;
-			this.text = text;
-		}
-	}
-
-	private class RouteBaseArrayAdapter extends ArrayAdapter<RouteSpinnerRow> {
-
-		RouteBaseArrayAdapter(@NonNull Context context, int resource) {
-			super(context, resource);
-		}
-
-		@Override
-		public boolean hasStableIds() {
-			return true;
-		}
-
-		@Override
-		public long getItemId(int position) {
-			RouteSpinnerRow row = getItem(position);
-			return row.id;
-		}
-
-		@Override
-		public boolean isEnabled(int position) {
-			long id = getItemId(position);
-			return id != SPINNER_HINT_ID;
-		}
-
-		View getRowItemView(int position, View convertView, ViewGroup parent) {
-			TextView label = (TextView) super.getView(position, convertView, parent);
-			RouteSpinnerRow row = getItem(position);
-			label.setText(row.text);
-			label.setTextColor(!isLight() ?
-					ContextCompat.getColorStateList(mapActivity, android.R.color.primary_text_dark) : ContextCompat.getColorStateList(mapActivity, android.R.color.primary_text_light));
-			return label;
-		}
-
-		View getListItemView(int position, View convertView, ViewGroup parent) {
-			long id = getItemId(position);
-			TextView label = (TextView) super.getDropDownView(position, convertView, parent);
-
-			RouteSpinnerRow row = getItem(position);
-			label.setText(row.text);
-			if (id != SPINNER_HINT_ID) {
-				Drawable icon = null;
-				if (row.icon != null) {
-					icon = row.icon;
-				} else if (row.iconId > 0) {
-					icon = mapActivity.getMyApplication().getUIUtilities().getThemedIcon(row.iconId);
-				}
-				label.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
-				label.setCompoundDrawablePadding(AndroidUtils.dpToPx(mapActivity, 16f));
-			} else {
-				label.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
-				label.setCompoundDrawablePadding(0);
-			}
-
-			if (id == SPINNER_MAP_MARKER_MORE_ID) {
-				label.setTextColor(!mapActivity.getMyApplication().getSettings().isLightContent() ?
-						mapActivity.getResources().getColor(R.color.color_dialog_buttons_dark) : mapActivity.getResources().getColor(R.color.color_dialog_buttons_light));
-			} else {
-				label.setTextColor(!mapActivity.getMyApplication().getSettings().isLightContent() ?
-						ContextCompat.getColorStateList(mapActivity, android.R.color.primary_text_dark) : ContextCompat.getColorStateList(mapActivity, android.R.color.primary_text_light));
-			}
-			label.setPadding(AndroidUtils.dpToPx(mapActivity, 16f), 0, 0, 0);
-
-			return label;
-		}
-	}
-
-	private class RouteSpinnerArrayAdapter extends RouteBaseArrayAdapter {
-
-		RouteSpinnerArrayAdapter(Context context) {
-			super(context, android.R.layout.simple_spinner_item);
-			setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-		}
-
-		@NonNull
-		@Override
-		public View getView(int position, View convertView, @NonNull ViewGroup parent) {
-			return getRowItemView(position, convertView, parent);
-		}
-
-		@Override
-		public View getDropDownView(int position, View convertView, @NonNull ViewGroup parent) {
-			return getListItemView(position, convertView, parent);
-		}
-	}
-
-	private class RoutePopupListArrayAdapter extends RouteBaseArrayAdapter {
-
-		RoutePopupListArrayAdapter(Context context) {
-			super(context, android.R.layout.simple_spinner_dropdown_item);
-		}
-
-		@NonNull
-		@Override
-		public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
-			return getListItemView(position, convertView, parent);
-		}
-	}
-}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java
deleted file mode 100644
index d6c61be203..0000000000
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package net.osmand.plus.mapcontextmenu.other;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import net.osmand.AndroidUtils;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.base.BaseOsmAndFragment;
-import net.osmand.plus.helpers.AndroidUiHelper;
-
-public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
-	public static final String TAG = "MapRouteInfoMenuFragment";
-
-	private MapRouteInfoMenu menu;
-	private View mainView;
-
-	private boolean portrait;
-
-	private MapActivity getMapActivity() {
-		return (MapActivity) getActivity();
-	}
-
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
-							 Bundle savedInstanceState) {
-		MapActivity mapActivity = getMapActivity();
-
-		menu = mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu();
-		View view = inflater.inflate(R.layout.plan_route_info, container, false);
-		portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
-		if (!portrait) {
-			AndroidUtils.addStatusBarPadding21v(getActivity(), view);
-		}
-		if (menu == null) {
-			return view;
-		}
-
-		view.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				dismiss();
-			}
-		});
-
-		mainView = view.findViewById(R.id.main_view);
-		updateInfo();
-
-		return view;
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-		if (menu == null) {
-			dismiss();
-		}
-		getMapActivity().getMapLayers().getMapControlsLayer().showMapControlsIfHidden();
-	}
-
-	@Override
-	public void onDestroyView() {
-		super.onDestroyView();
-		if (menu != null) {
-			menu.onDismiss();
-		}
-	}
-
-	@Override
-	public int getStatusBarColorId() {
-		return portrait ? -1 : R.color.status_bar_transparent_gradient;
-	}
-
-	public int getHeight() {
-		if (mainView != null) {
-			return mainView.getHeight();
-		} else {
-			return 0;
-		}
-	}
-
-	public int getWidth() {
-		if (mainView != null) {
-			return mainView.getWidth();
-		} else {
-			return 0;
-		}
-	}
-
-	public void updateInfo() {
-		if (menu != null) {
-			menu.updateInfo(mainView);
-			applyDayNightMode();
-		}
-	}
-
-	public void updateFromIcon() {
-		if (menu != null) {
-			menu.updateFromIcon(mainView);
-		}
-	}
-
-	public void updateRouteCalculationProgress(int progress) {
-		ProgressBar progressBar = (ProgressBar) mainView.findViewById(R.id.progress_bar);
-		if (progressBar != null) {
-			if (progressBar.getVisibility() != View.VISIBLE) {
-				progressBar.setVisibility(View.VISIBLE);
-			}
-			progressBar.setProgress(progress);
-		}
-	}
-
-	public void hideRouteCalculationProgressBar() {
-		View progressBar = mainView.findViewById(R.id.progress_bar);
-		if (progressBar != null) {
-			progressBar.setVisibility(View.GONE);
-		}
-	}
-
-	public void show(MapActivity mapActivity) {
-		int slideInAnim = 0;
-		int slideOutAnim = 0;
-		if (!mapActivity.getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get()) {
-			slideInAnim = R.anim.slide_in_bottom;
-			slideOutAnim = R.anim.slide_out_bottom;
-		}
-
-		mapActivity.getSupportFragmentManager()
-				.beginTransaction()
-				.setCustomAnimations(slideInAnim, slideOutAnim, slideInAnim, slideOutAnim)
-				.add(R.id.routeMenuContainer, this, TAG)
-				.addToBackStack(TAG)
-				.commitAllowingStateLoss();
-	}
-
-	public void dismiss() {
-		FragmentActivity activity = getActivity();
-		if (activity != null) {
-			try {
-				activity.getSupportFragmentManager().popBackStack(TAG,
-						FragmentManager.POP_BACK_STACK_INCLUSIVE);
-			} catch (Exception e) {
-				//
-			}
-		}
-	}
-
-	public void applyDayNightMode() {
-		MapActivity ctx = getMapActivity();
-		boolean portraitMode = AndroidUiHelper.isOrientationPortrait(ctx);
-		boolean landscapeLayout = !portraitMode;
-		boolean nightMode = ctx.getMyApplication().getDaynightHelper().isNightModeForMapControls();
-		if (!landscapeLayout) {
-			AndroidUtils.setBackground(ctx, mainView, nightMode, R.drawable.route_info_menu_bg_light, R.drawable.route_info_menu_bg_dark);
-		} else {
-			AndroidUtils.setBackground(ctx, mainView, nightMode, R.drawable.route_info_menu_bg_left_light, R.drawable.route_info_menu_bg_left_dark);
-		}
-		AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.map_route_prepare_bottom_view), nightMode,
-				R.color.route_info_bottom_view_bg_light, R.color.route_info_bottom_view_bg_dark);
-
-		AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.dividerModesLayout), nightMode,
-				R.color.route_info_divider_light, R.color.route_info_divider_dark);
-		AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.dividerFromDropDown), nightMode,
-				R.color.route_info_divider_light, R.color.route_info_divider_dark);
-		AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.viaLayoutDivider), nightMode,
-				R.color.route_info_divider_light, R.color.route_info_divider_dark);
-		AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.dividerToDropDown), nightMode,
-				R.color.route_info_divider_light, R.color.route_info_divider_dark);
-		AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.dividerButtons), nightMode,
-				R.color.route_info_divider_light, R.color.route_info_divider_dark);
-
-		AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.dividerBtn1), nightMode,
-				R.color.route_info_divider_light, R.color.route_info_divider_dark);
-		AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.dividerBtn2), nightMode,
-				R.color.route_info_divider_light, R.color.route_info_divider_dark);
-
-		AndroidUtils.setTextPrimaryColor(ctx, (TextView) mainView.findViewById(R.id.ViaView), nightMode);
-		AndroidUtils.setTextSecondaryColor(ctx, (TextView) mainView.findViewById(R.id.ViaSubView), nightMode);
-		AndroidUtils.setTextSecondaryColor(ctx, (TextView) mainView.findViewById(R.id.toTitle), nightMode);
-		AndroidUtils.setTextSecondaryColor(ctx, (TextView) mainView.findViewById(R.id.fromTitle), nightMode);
-		AndroidUtils.setTextPrimaryColor(ctx, (TextView) mainView.findViewById(R.id.InfoTextView), nightMode);
-
-		AndroidUtils.setTextPrimaryColor(ctx, (TextView) mainView.findViewById(R.id.DistanceText), nightMode);
-		AndroidUtils.setTextSecondaryColor(ctx, (TextView) mainView.findViewById(R.id.DistanceTitle), nightMode);
-		AndroidUtils.setTextPrimaryColor(ctx, (TextView) mainView.findViewById(R.id.DurationText), nightMode);
-		AndroidUtils.setTextSecondaryColor(ctx, (TextView) mainView.findViewById(R.id.DurationTitle), nightMode);
-
-		ctx.setupRouteCalculationProgressBar((ProgressBar) mainView.findViewById(R.id.progress_bar));
-	}
-
-	public static boolean showInstance(final MapActivity mapActivity) {
-		boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
-		int slideInAnim = 0;
-		int slideOutAnim = 0;
-		if (!mapActivity.getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get()) {
-			if (portrait) {
-				slideInAnim = R.anim.slide_in_bottom;
-				slideOutAnim = R.anim.slide_out_bottom;
-			} else {
-				slideInAnim = R.anim.slide_in_left;
-				slideOutAnim = R.anim.slide_out_left;
-			}
-		}
-
-		try {
-			mapActivity.getContextMenu().hideMenues();
-
-			MapRouteInfoMenuFragment fragment = new MapRouteInfoMenuFragment();
-			mapActivity.getSupportFragmentManager()
-					.beginTransaction()
-					.setCustomAnimations(slideInAnim, slideOutAnim, slideInAnim, slideOutAnim)
-					.add(R.id.routeMenuContainer, fragment, TAG)
-					.addToBackStack(TAG)
-					.commitAllowingStateLoss();
-
-			return true;
-
-		} catch (RuntimeException e) {
-			return false;
-		}
-	}
-}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java
index d1140ff106..b161066f1a 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java
@@ -1,7 +1,5 @@
 package net.osmand.plus.mapcontextmenu.other;
 
-import android.app.Activity;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.support.annotation.NonNull;
@@ -21,9 +19,6 @@ import android.widget.TextView;
 
 import net.osmand.AndroidUtils;
 import net.osmand.CallbackWithObject;
-import net.osmand.IndexConstants;
-import net.osmand.Location;
-import net.osmand.data.LatLon;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
@@ -31,40 +26,33 @@ import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
-import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.SettingsBaseActivity;
 import net.osmand.plus.activities.SettingsNavigationActivity;
-import net.osmand.plus.dashboard.DashboardOnMap;
-import net.osmand.plus.download.DownloadActivity;
-import net.osmand.plus.download.DownloadActivityType;
 import net.osmand.plus.helpers.FileNameTranslationHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.AvoidRoadsRoutingParameter;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.GpxLocalRoutingParameter;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.InterruptMusicRoutingParameter;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.LocalRoutingParameter;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.LocalRoutingParameterGroup;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.MuteSoundRoutingParameter;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.OtherSettingsRoutingParameter;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.VoiceGuidanceRoutingParameter;
 import net.osmand.plus.routing.RouteProvider;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.views.MapControlsLayer;
-import net.osmand.plus.voice.JSMediaCommandPlayerImpl;
-import net.osmand.plus.voice.JSTTSCommandPlayerImpl;
-import net.osmand.plus.voice.MediaCommandPlayerImpl;
-import net.osmand.plus.voice.TTSCommandPlayerImpl;
 import net.osmand.router.GeneralRouter;
-import net.osmand.router.GeneralRouter.RoutingParameter;
-import net.osmand.util.Algorithms;
-import net.osmand.util.MapUtils;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
 
 public class RoutePreferencesMenu {
 
 	private OsmandSettings settings;
 	private OsmandApplication app;
 	private MapActivity mapActivity;
-	private MapControlsLayer controlsLayer;
 	private RoutingHelper routingHelper;
+	private RoutingOptionsHelper routingOptionsHelper;
 	private ArrayAdapter<LocalRoutingParameter> listAdapter;
 
 	public static final String MORE_VALUE = "MORE_VALUE";
@@ -72,286 +60,22 @@ public class RoutePreferencesMenu {
 	public RoutePreferencesMenu(MapActivity mapActivity) {
 		this.mapActivity = mapActivity;
 		app = mapActivity.getMyApplication();
-		this.controlsLayer = mapActivity.getMapLayers().getMapControlsLayer();
 		routingHelper = mapActivity.getRoutingHelper();
+		routingOptionsHelper = app.getRoutingOptionsHelper();
 		settings = app.getSettings();
 	}
 
-	public static class LocalRoutingParameter {
-
-		public RoutingParameter routingParameter;
-		private ApplicationMode am;
-		
-		public LocalRoutingParameter(ApplicationMode am) {
-			this.am = am;
-		}
-
-		public String getText(MapActivity mapActivity) {
-			return SettingsBaseActivity.getRoutingStringPropertyName(mapActivity, routingParameter.getId(),
-					routingParameter.getName());
-		}
-
-		public boolean isSelected(OsmandSettings settings) {
-			final OsmandSettings.CommonPreference<Boolean> property =
-					settings.getCustomRoutingBooleanProperty(routingParameter.getId(), routingParameter.getDefaultBoolean());
-			if(am != null) {
-				return property.getModeValue(am);
-			} else {
-				return property.get();
-			}
-		}
-
-		public void setSelected(OsmandSettings settings, boolean isChecked) {
-			final OsmandSettings.CommonPreference<Boolean> property =
-					settings.getCustomRoutingBooleanProperty(routingParameter.getId(), routingParameter.getDefaultBoolean());
-			if(am != null) {
-				property.setModeValue(am, isChecked);
-			} else {
-				property.set(isChecked);
-			}
-		}
-
-		public ApplicationMode getApplicationMode() {
-			return am;
-		}
-	}
-
-	private static class LocalRoutingParameterGroup extends LocalRoutingParameter {
-
-		private String groupName;
-		private List<LocalRoutingParameter> routingParameters = new ArrayList<>();
-
-		public LocalRoutingParameterGroup(ApplicationMode am, String groupName) {
-			super(am);
-			this.groupName = groupName;
-		}
-
-		public void addRoutingParameter(RoutingParameter routingParameter) {
-			LocalRoutingParameter p = new LocalRoutingParameter(getApplicationMode());
-			p.routingParameter = routingParameter;
-			routingParameters.add(p);
-		}
-
-		public String getGroupName() {
-			return groupName;
-		}
-
-		public List<LocalRoutingParameter> getRoutingParameters() {
-			return routingParameters;
-		}
-
-		@Override
-		public String getText(MapActivity mapActivity) {
-			return SettingsBaseActivity.getRoutingStringPropertyName(mapActivity, groupName,
-					Algorithms.capitalizeFirstLetterAndLowercase(groupName.replace('_', ' ')));
-		}
-
-		@Override
-		public boolean isSelected(OsmandSettings settings) {
-			return false;
-		}
-
-		@Override
-		public void setSelected(OsmandSettings settings, boolean isChecked) {
-		}
-
-		public LocalRoutingParameter getSelected(OsmandSettings settings) {
-			for (LocalRoutingParameter p : routingParameters) {
-				if (p.isSelected(settings)) {
-					return p;
-				}
-			}
-			return null;
-		}
-	}
-
-	private static class MuteSoundRoutingParameter extends LocalRoutingParameter {
-
-		public MuteSoundRoutingParameter() {
-			super(null);
-		}
-	}
-
-	private static class InterruptMusicRoutingParameter extends LocalRoutingParameter {
-
-		public InterruptMusicRoutingParameter() {
-			super(null);
-		}
-	}
-
-	private static class VoiceGuidanceRoutingParameter extends LocalRoutingParameter {
-
-		public VoiceGuidanceRoutingParameter() {
-			super(null);
-		}
-	}
-
-	private static class AvoidRoadsRoutingParameter extends LocalRoutingParameter {
-
-		public AvoidRoadsRoutingParameter() {
-			super(null);
-		}
-		
-	}
-
-	private static class GpxLocalRoutingParameter extends LocalRoutingParameter {
-
-		public GpxLocalRoutingParameter() {
-			super(null);
-		}
-	}
-
-	private static class OtherSettingsRoutingParameter extends LocalRoutingParameter {
-
-		public OtherSettingsRoutingParameter() {
-			super(null);
-		}
-	}
-
-	private static class OtherLocalRoutingParameter extends LocalRoutingParameter {
-		public String text;
-		public boolean selected;
-		public int id;
-
-		public OtherLocalRoutingParameter(int id, String text, boolean selected) {
-			super(null);
-			this.text = text;
-			this.selected = selected;
-			this.id = id;
-		}
-
-		@Override
-		public String getText(MapActivity mapActivity) {
-			return text;
-		}
-
-		@Override
-		public boolean isSelected(OsmandSettings settings) {
-			return selected;
-		}
-
-		@Override
-		public void setSelected(OsmandSettings settings, boolean isChecked) {
-			selected = isChecked;
-		}
-	}
-
-	private void switchSound() {
-		boolean mt = !routingHelper.getVoiceRouter().isMute();
-		settings.VOICE_MUTE.set(mt);
-		routingHelper.getVoiceRouter().setMute(mt);
-	}
-
-	private void switchMusic() {
-		boolean mt = !settings.INTERRUPT_MUSIC.get();
-		settings.INTERRUPT_MUSIC.set(mt);
-	}
-
 	private void doSelectVoiceGuidance() {
-		selectVoiceGuidance(mapActivity, new CallbackWithObject<String>() {
+		routingOptionsHelper.selectVoiceGuidance(mapActivity, new CallbackWithObject<String>() {
 			@Override
 			public boolean processResult(String result) {
-				applyVoiceProvider(mapActivity, result);
+				routingOptionsHelper.applyVoiceProvider(mapActivity, result);
 				updateParameters();
 				return true;
 			}
 		});
 	}
 
-	private void selectRestrictedRoads() {
-		mapActivity.getDashboard().setDashboardVisibility(false, DashboardOnMap.DashboardType.ROUTE_PREFERENCES);
-		controlsLayer.getMapRouteInfoMenu().hide();
-		app.getAvoidSpecificRoads().showDialog(mapActivity);
-	}
-
-	public static void selectVoiceGuidance(final MapActivity mapActivity, final CallbackWithObject<String> callback) {
-		final ContextMenuAdapter adapter = new ContextMenuAdapter();
-
-		String[] entries;
-		final String[] entrieValues;
-		Set<String> voiceFiles = getVoiceFiles(mapActivity);
-		entries = new String[voiceFiles.size() + 2];
-		entrieValues = new String[voiceFiles.size() + 2];
-		int k = 0;
-		int selected = -1;
-		String selectedValue = mapActivity.getMyApplication().getSettings().VOICE_PROVIDER.get();
-		entrieValues[k] = OsmandSettings.VOICE_PROVIDER_NOT_USE;
-		entries[k] = mapActivity.getResources().getString(R.string.shared_string_do_not_use);
-		ContextMenuItem.ItemBuilder itemBuilder = new ContextMenuItem.ItemBuilder();
-		adapter.addItem(itemBuilder.setTitle(entries[k]).createItem());
-		if (OsmandSettings.VOICE_PROVIDER_NOT_USE.equals(selectedValue)) {
-			selected = k;
-		}
-		k++;
-		for (String s : voiceFiles) {
-			entries[k] = (s.contains("tts") ?  mapActivity.getResources().getString(R.string.ttsvoice) + " " : "") +
-					FileNameTranslationHelper.getVoiceName(mapActivity, s);
-			entrieValues[k] = s;
-			adapter.addItem(itemBuilder.setTitle(entries[k]).createItem());
-			if (s.equals(selectedValue)) {
-				selected = k;
-			}
-			k++;
-		}
-		entrieValues[k] = MORE_VALUE;
-		entries[k] =  mapActivity.getResources().getString(R.string.install_more);
-		adapter.addItem(itemBuilder.setTitle(entries[k]).createItem());
-
-		AlertDialog.Builder bld = new AlertDialog.Builder(mapActivity);
-		bld.setSingleChoiceItems(entries, selected, new DialogInterface.OnClickListener() {
-
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				String value = entrieValues[which];
-				if (MORE_VALUE.equals(value)) {
-					final Intent intent = new Intent(mapActivity, DownloadActivity.class);
-					intent.putExtra(DownloadActivity.TAB_TO_OPEN, DownloadActivity.DOWNLOAD_TAB);
-					intent.putExtra(DownloadActivity.FILTER_CAT, DownloadActivityType.VOICE_FILE.getTag());
-					mapActivity.startActivity(intent);
-				} else {
-					if (callback != null) {
-						callback.processResult(value);
-					}
-				}
-				dialog.dismiss();
-			}
-		});
-		bld.show();
-	}
-
-	public static String getVoiceProviderName(Context ctx, String value) {
-		if (OsmandSettings.VOICE_PROVIDER_NOT_USE.equals(value)) {
-			return ctx.getResources().getString(R.string.shared_string_do_not_use);
-		} else {
-			return (value.contains("tts") ? ctx.getResources().getString(R.string.ttsvoice) + " " : "") +
-					FileNameTranslationHelper.getVoiceName(ctx, value);
-		}
-	}
-
-	public static void applyVoiceProvider(MapActivity mapActivity, String provider) {
-		OsmandApplication app = mapActivity.getMyApplication();
-		app.getSettings().VOICE_PROVIDER.set(provider);
-		app.initVoiceCommandPlayer(mapActivity, app.getRoutingHelper().getAppMode(), false, null, true, false);
-	}
-
-	public static Set<String> getVoiceFiles(Activity activity) {
-		// read available voice data
-		OsmandApplication app = ((OsmandApplication) activity.getApplication());
-		File extStorage = app.getAppPath(IndexConstants.VOICE_INDEX_DIR);
-		Set<String> setFiles = new LinkedHashSet<String>();
-		if (extStorage.exists()) {
-			for (File f : extStorage.listFiles()) {
-				if (f.isDirectory()) {
-					if (JSMediaCommandPlayerImpl.isMyData(f) || JSTTSCommandPlayerImpl.isMyData(f)
-							|| MediaCommandPlayerImpl.isMyData(f) || TTSCommandPlayerImpl.isMyData(f)) {
-						setFiles.add(f.getName());
-					}
-				}
-			}
-		}
-		return setFiles;
-	}
-
 	public OnItemClickListener getItemClickListener(final ArrayAdapter<?> listAdapter) {
 		return new OnItemClickListener() {
 			@Override
@@ -437,9 +161,9 @@ public class RoutePreferencesMenu {
 					final CompoundButton btn = (CompoundButton) view.findViewById(R.id.toggle_item);
 					btn.performClick();
 				} else if (obj instanceof AvoidRoadsRoutingParameter) {
-					selectRestrictedRoads();
-				} else if (view.findViewById(R.id.GPXRouteSpinner) != null) {
-					showOptionsMenu((TextView) view.findViewById(R.id.GPXRouteSpinner));
+					routingOptionsHelper.selectRestrictedRoads(mapActivity);
+				} else if (obj instanceof GpxLocalRoutingParameter) {
+					showOptionsMenu((TextView) view.findViewById(R.id.description));
 				} else {
 					CheckBox ch = (CheckBox) view.findViewById(R.id.toggle_item);
 					if (ch != null) {
@@ -453,7 +177,7 @@ public class RoutePreferencesMenu {
 	public ArrayAdapter<LocalRoutingParameter> getRoutePreferencesDrawerAdapter(final boolean nightMode) {
 
 		listAdapter = new ArrayAdapter<LocalRoutingParameter>(mapActivity, R.layout.layers_list_activity_item, R.id.title,
-				getRoutingParameters(routingHelper.getAppMode()/*settings.APPLICATION_MODE.get()*/)) {
+				routingOptionsHelper.getAllRoutingParameters(routingHelper.getAppMode()/*settings.APPLICATION_MODE.get()*/)) {
 			@Override
 			public View getView(final int position, View convertView, ViewGroup parent) {
 				LocalRoutingParameter parameter = getItem(position);
@@ -470,7 +194,7 @@ public class RoutePreferencesMenu {
 					btn.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
 						@Override
 						public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-							switchSound();
+							routingOptionsHelper.switchSound();
 						}
 					});
 
@@ -483,14 +207,14 @@ public class RoutePreferencesMenu {
 					View v = mapActivity.getLayoutInflater().inflate(R.layout.switch_select_list_item, null);
 					AndroidUtils.setListItemBackground(mapActivity, v, nightMode);
 					((ImageView) v.findViewById(R.id.icon))
-							.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_road_works_dark, !nightMode));
+							.setImageDrawable(app.getUIUtilities().getIcon(parameter.getActiveIconId(), !nightMode));
 					v.findViewById(R.id.toggle_item).setVisibility(View.GONE);
 					final TextView btn = (TextView) v.findViewById(R.id.select_button);
 					btn.setTextColor(btn.getLinkTextColors());
 					btn.setOnClickListener(new View.OnClickListener() {
 						@Override
 						public void onClick(View v) {
-							selectRestrictedRoads();
+							routingOptionsHelper.selectRestrictedRoads(mapActivity);
 						}
 					});
 
@@ -549,7 +273,7 @@ public class RoutePreferencesMenu {
 					btn.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
 						@Override
 						public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-							switchMusic();
+							routingOptionsHelper.switchMusic();
 						}
 					});
 
@@ -565,8 +289,8 @@ public class RoutePreferencesMenu {
 				if (parameter instanceof GpxLocalRoutingParameter) {
 					View v = mapActivity.getLayoutInflater().inflate(R.layout.plan_route_gpx, null);
 					AndroidUtils.setListItemBackground(mapActivity, v, nightMode);
-					AndroidUtils.setTextPrimaryColor(mapActivity, (TextView) v.findViewById(R.id.GPXRouteTitle), nightMode);
-					final TextView gpxSpinner = (TextView) v.findViewById(R.id.GPXRouteSpinner);
+					AndroidUtils.setTextPrimaryColor(mapActivity, (TextView) v.findViewById(R.id.title), nightMode);
+					final TextView gpxSpinner = (TextView) v.findViewById(R.id.description);
 					AndroidUtils.setTextPrimaryColor(mapActivity, gpxSpinner, nightMode);
 					((ImageView) v.findViewById(R.id.dropDownIcon))
 							.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_arrow_drop_down, !nightMode));
@@ -577,7 +301,7 @@ public class RoutePreferencesMenu {
 					View v = mapActivity.getLayoutInflater().inflate(R.layout.layers_list_activity_item, null);
 					AndroidUtils.setListItemBackground(mapActivity, v, nightMode);
 					final ImageView icon = (ImageView) v.findViewById(R.id.icon);
-					icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.map_action_settings, !nightMode));
+					icon.setImageDrawable(app.getUIUtilities().getIcon(parameter.getActiveIconId(), !nightMode));
 					icon.setVisibility(View.VISIBLE);
 					TextView titleView = (TextView) v.findViewById(R.id.title);
 					titleView.setText(R.string.routing_settings_2);
@@ -608,7 +332,7 @@ public class RoutePreferencesMenu {
 					}
 					ch.setVisibility(View.GONE);
 				} else {
-					if (rp.routingParameter != null && rp.routingParameter.getId().equals("short_way")) {
+					if (rp.routingParameter != null && rp.routingParameter.getId().equals(GeneralRouter.USE_SHORTEST_WAY)) {
 						// if short route settings - it should be inverse of fast_route_mode
 						ch.setChecked(!settings.FAST_ROUTE_MODE.getModeValue(routingHelper.getAppMode()));
 					} else {
@@ -618,7 +342,7 @@ public class RoutePreferencesMenu {
 					ch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
 						@Override
 						public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-							applyRoutingParameter(rp, isChecked);
+							routingOptionsHelper.applyRoutingParameter(rp, isChecked);
 						}
 					});
 				}
@@ -629,153 +353,12 @@ public class RoutePreferencesMenu {
 		return listAdapter;
 	}
 
-	private void applyRoutingParameter(LocalRoutingParameter rp, boolean isChecked) {
-		// if short way that it should set valut to fast mode opposite of current
-		if (rp.routingParameter != null && rp.routingParameter.getId().equals("short_way")) {
-			settings.FAST_ROUTE_MODE.setModeValue(routingHelper.getAppMode(), !isChecked);
-		}
-		rp.setSelected(settings, isChecked);
-
-		if (rp instanceof OtherLocalRoutingParameter) {
-			updateGpxRoutingParameter((OtherLocalRoutingParameter) rp);
-		}
-		mapActivity.getRoutingHelper().recalculateRouteDueToSettingsChange();
-	}
-
-	private void updateGpxRoutingParameter(OtherLocalRoutingParameter gpxParam) {
-		RouteProvider.GPXRouteParamsBuilder rp = mapActivity.getRoutingHelper().getCurrentGPXRoute();
-		boolean selected = gpxParam.isSelected(settings);
-		if (rp != null) {
-			if (gpxParam.id == R.string.gpx_option_reverse_route) {
-				rp.setReverse(selected);
-				TargetPointsHelper tg = app.getTargetPointsHelper();
-				List<Location> ps = rp.getPoints();
-				if (ps.size() > 0) {
-					Location first = ps.get(0);
-					Location end = ps.get(ps.size() - 1);
-					TargetPointsHelper.TargetPoint pn = tg.getPointToNavigate();
-					boolean update = false;
-					if (pn == null
-							|| MapUtils.getDistance(pn.point, new LatLon(first.getLatitude(), first.getLongitude())) < 10) {
-						tg.navigateToPoint(new LatLon(end.getLatitude(), end.getLongitude()), false, -1);
-						update = true;
-					}
-					if (tg.getPointToStart() == null
-							|| MapUtils.getDistance(tg.getPointToStart().point,
-							new LatLon(end.getLatitude(), end.getLongitude())) < 10) {
-						tg.setStartPoint(new LatLon(first.getLatitude(), first.getLongitude()), false, null);
-						update = true;
-					}
-					if (update) {
-						tg.updateRouteAndRefresh(true);
-					}
-				}
-			} else if (gpxParam.id == R.string.gpx_option_calculate_first_last_segment) {
-				rp.setCalculateOsmAndRouteParts(selected);
-				settings.GPX_ROUTE_CALC_OSMAND_PARTS.set(selected);
-			} else if (gpxParam.id == R.string.gpx_option_from_start_point) {
-				rp.setPassWholeRoute(selected);
-			} else if (gpxParam.id == R.string.use_points_as_intermediates) {
-				settings.GPX_CALCULATE_RTEPT.set(selected);
-				rp.setUseIntermediatePointsRTE(selected);
-			} else if (gpxParam.id == R.string.calculate_osmand_route_gpx) {
-				settings.GPX_ROUTE_CALC.set(selected);
-				rp.setCalculateOsmAndRoute(selected);
-				updateParameters();
-			}
-		}
-		if (gpxParam.id == R.string.calculate_osmand_route_without_internet) {
-			settings.GPX_ROUTE_CALC_OSMAND_PARTS.set(selected);
-		}
-		if (gpxParam.id == R.string.fast_route_mode) {
-			settings.FAST_ROUTE_MODE.set(selected);
-		}
-		if (gpxParam.id == R.string.speak_favorites) {
-			settings.ANNOUNCE_NEARBY_FAVORITES.set(selected);
-		}
-	}
-
-	private List<LocalRoutingParameter> getRoutingParameters(ApplicationMode am) {
-		List<LocalRoutingParameter> list = getRoutingParametersInner(am);
-		list.add(0, new MuteSoundRoutingParameter());
-		list.add(1, new VoiceGuidanceRoutingParameter());
-		list.add(2, new InterruptMusicRoutingParameter());
-		list.add(3, new AvoidRoadsRoutingParameter());
-		list.add(new GpxLocalRoutingParameter());
-		list.add(new OtherSettingsRoutingParameter());
-		return list;
-	}
-
-	private List<LocalRoutingParameter> getRoutingParametersInner(ApplicationMode am) {
-		List<LocalRoutingParameter> list = new ArrayList<LocalRoutingParameter>();
-		RouteProvider.GPXRouteParamsBuilder rparams = mapActivity.getRoutingHelper().getCurrentGPXRoute();
-		boolean osmandRouter = settings.ROUTER_SERVICE.getModeValue(am) == RouteProvider.RouteService.OSMAND;
-		if (!osmandRouter) {
-			list.add(new OtherLocalRoutingParameter(R.string.calculate_osmand_route_without_internet,
-					getString(R.string.calculate_osmand_route_without_internet), settings.GPX_ROUTE_CALC_OSMAND_PARTS
-					.get()));
-			list.add(new OtherLocalRoutingParameter(R.string.fast_route_mode, getString(R.string.fast_route_mode),
-					settings.FAST_ROUTE_MODE.get()));
-			return list;
-		}
-		if (rparams != null) {
-			GPXUtilities.GPXFile fl = rparams.getFile();
-			if (fl.hasRtePt()) {
-				list.add(new OtherLocalRoutingParameter(R.string.use_points_as_intermediates,
-						getString(R.string.use_points_as_intermediates), rparams.isUseIntermediatePointsRTE()));
-			}
-			list.add(new OtherLocalRoutingParameter(R.string.gpx_option_reverse_route,
-					getString(R.string.gpx_option_reverse_route), rparams.isReverse()));
-			if (!rparams.isUseIntermediatePointsRTE()) {
-				list.add(new OtherLocalRoutingParameter(R.string.gpx_option_from_start_point,
-						getString(R.string.gpx_option_from_start_point), rparams.isPassWholeRoute()));
-				list.add(new OtherLocalRoutingParameter(R.string.gpx_option_calculate_first_last_segment,
-						getString(R.string.gpx_option_calculate_first_last_segment), rparams
-						.isCalculateOsmAndRouteParts()));
-			}
-		}
-		GeneralRouter rm = SettingsNavigationActivity.getRouter(app.getDefaultRoutingConfig(), am);
-		if (rm == null || (rparams != null && !rparams.isCalculateOsmAndRoute()) && !rparams.getFile().hasRtePt()) {
-			return list;
-		}
-		for (RoutingParameter r : rm.getParameters().values()) {
-			if (r.getType() == GeneralRouter.RoutingParameterType.BOOLEAN) {
-				if ("relief_smoothness_factor".equals(r.getGroup())) {
-					continue;
-				}
-				if (!Algorithms.isEmpty(r.getGroup())) {
-					LocalRoutingParameterGroup rpg = getLocalRoutingParameterGroup(list, r.getGroup());
-					if (rpg == null) {
-						rpg = new LocalRoutingParameterGroup(am, r.getGroup());
-						list.add(rpg);
-					}
-					rpg.addRoutingParameter(r);
-				} else {
-					LocalRoutingParameter rp = new LocalRoutingParameter(am);
-					rp.routingParameter = r;
-					list.add(rp);
-				}
-			}
-		}
-
-		return list;
-	}
-
-	private LocalRoutingParameterGroup getLocalRoutingParameterGroup(List<LocalRoutingParameter> list, String groupName) {
-		for (LocalRoutingParameter p : list) {
-			if (p instanceof LocalRoutingParameterGroup && groupName.equals(((LocalRoutingParameterGroup) p).getGroupName())) {
-				return (LocalRoutingParameterGroup) p;
-			}
-		}
-		return null;
-	}
-
 	private void updateParameters() {
 		//ApplicationMode am = settings.APPLICATION_MODE.get();
 		ApplicationMode am = routingHelper.getAppMode();
 		listAdapter.setNotifyOnChange(false);
 		listAdapter.clear();
-		for (LocalRoutingParameter r : getRoutingParameters(am)) {
+		for (LocalRoutingParameter r : routingOptionsHelper.getAllRoutingParameters(am)) {
 			listAdapter.add(r);
 		}
 		listAdapter.notifyDataSetChanged();
diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java
index 2066537a31..c38ee0b279 100644
--- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java
@@ -115,7 +115,6 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
         ((AppCompatImageView) view.findViewById(R.id.mapillary_filters_date_icon)).setImageDrawable(getIcon(R.drawable.ic_action_data, colorRes));
         ((AppCompatImageView) view.findViewById(R.id.mapillary_filters_tile_cache_icon)).setImageDrawable(getIcon(R.drawable.ic_layer_top_dark, colorRes));
 
-
         final DelayAutoCompleteTextView textView = (DelayAutoCompleteTextView) view.findViewById(R.id.auto_complete_text_view);
         textView.setAdapter(new MapillaryAutoCompleteAdapter(getContext(), R.layout.auto_complete_suggestion, getMyApplication()));
         String selectedUsername = settings.MAPILLARY_FILTER_USERNAME.get();
@@ -150,13 +149,7 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
             @Override
             public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
                 view.findViewById(R.id.warning_linear_layout).setVisibility(View.GONE);
-                if (!settings.MAPILLARY_FILTER_USERNAME.get().equals("") ||
-                        settings.MAPILLARY_FILTER_TO_DATE.get() != 0 ||
-                        settings.MAPILLARY_FILTER_FROM_DATE.get() != 0) {
-                    changeButtonState((Button) view.findViewById(R.id.button_apply), 1, true);
-                } else {
-                    changeButtonState((Button) view.findViewById(R.id.button_apply), .5f, false);
-                }
+                enableButtonApply(view);
             }
 
             @Override
@@ -179,7 +172,7 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
                 from.set(Calendar.DAY_OF_MONTH, dayOfMonth);
                 dateFromEt.setText(dateFormat.format(from.getTime()));
                 settings.MAPILLARY_FILTER_FROM_DATE.set(from.getTimeInMillis());
-                changeButtonState((Button) view.findViewById(R.id.button_apply), 1, true);
+                enableButtonApply(view);
                 mapActivity.getDashboard().refreshContent(true);
             }
         };
@@ -206,7 +199,7 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
                 to.set(Calendar.DAY_OF_MONTH, dayOfMonth);
                 dateToEt.setText(dateFormat.format(to.getTime()));
                 settings.MAPILLARY_FILTER_TO_DATE.set(to.getTimeInMillis());
-                changeButtonState((Button) view.findViewById(R.id.button_apply), 1, true);
+                enableButtonApply(view);
                 mapActivity.getDashboard().refreshContent(true);
             }
         };
@@ -233,9 +226,28 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
             }
         }
 
+        final View rowPano = view.findViewById(R.id.pano_row);
+        final CompoundButton pano = (CompoundButton) rowPano.findViewById(R.id.pano_row_toggle);
+        pano.setOnCheckedChangeListener(null);
+        pano.setChecked(settings.MAPILLARY_FILTER_PANO.get());
+        pano.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                settings.MAPILLARY_FILTER_PANO.set(!settings.MAPILLARY_FILTER_PANO.get());
+                enableButtonApply(view);
+                mapActivity.getDashboard().refreshContent(true);
+            }
+        });
+        rowPano.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                pano.setChecked(!pano.isChecked());
+            }
+        });
+
 
         final Button apply = (Button) view.findViewById(R.id.button_apply);
-        changeButtonState(apply, .5f, false);
+        disableButtonApply(view);
         apply.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -243,7 +255,7 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
                 String dateFrom = dateFromEt.getText().toString();
                 String dateTo = dateToEt.getText().toString();
 
-                if (!settings.MAPILLARY_FILTER_USERNAME.get().equals("") || !dateFrom.equals("") || !dateTo.equals("")) {
+                if (!settings.MAPILLARY_FILTER_USERNAME.get().equals("") || !dateFrom.equals("") || !dateTo.equals("") || settings.MAPILLARY_FILTER_PANO.get()) {
                     settings.USE_MAPILLARY_FILTER.set(true);
                 }
                 if (dateFrom.equals("")) {
@@ -272,12 +284,14 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
                 textView.setText("");
                 dateFromEt.setText("");
                 dateToEt.setText("");
+                pano.setChecked(false);
 
                 settings.USE_MAPILLARY_FILTER.set(false);
                 settings.MAPILLARY_FILTER_USER_KEY.set("");
                 settings.MAPILLARY_FILTER_USERNAME.set("");
                 settings.MAPILLARY_FILTER_FROM_DATE.set(0L);
                 settings.MAPILLARY_FILTER_TO_DATE.set(0L);
+                settings.MAPILLARY_FILTER_PANO.set(false);
 
                 plugin.updateLayers(mapActivity.getMapView(), mapActivity);
                 hideKeyboard();
@@ -295,6 +309,14 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
         }
     }
 
+    private void enableButtonApply(View view) {
+        changeButtonState((Button) view.findViewById(R.id.button_apply), 1, true);
+    }
+
+    private void disableButtonApply(View view) {
+        changeButtonState((Button) view.findViewById(R.id.button_apply), .5f, false);
+    }
+
     private void changeButtonState(Button button, float alpha, boolean enabled) {
         button.setAlpha(alpha);
         button.setEnabled(enabled);
diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
index c1547333b2..ddc87dd1d0 100644
--- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
@@ -39,6 +39,7 @@ import java.text.MessageFormat;
 import java.util.List;
 
 import static android.content.Intent.ACTION_VIEW;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAPILLARY;
 
 public class MapillaryPlugin extends OsmandPlugin {
 	public static final String ID = "osmand.mapillary";
@@ -179,6 +180,7 @@ public class MapillaryPlugin extends OsmandPlugin {
 			settings.SHOW_MAPILLARY.set(false);
 		}
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setId(MAPILLARY)
 				.setTitleId(R.string.mapillary, mapActivity)
 				.setSelected(settings.SHOW_MAPILLARY.get())
 				.setColor(settings.SHOW_MAPILLARY.get() ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryVectorLayer.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryVectorLayer.java
index abc928ba8b..5d90bbbf2c 100644
--- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryVectorLayer.java
+++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryVectorLayer.java
@@ -202,6 +202,7 @@ class MapillaryVectorLayer extends MapTileLayer implements MapillaryLayer, ICont
 		long capturedAt = ((Number) userData.get("captured_at")).longValue();
 		long from = settings.MAPILLARY_FILTER_FROM_DATE.get();
 		long to = settings.MAPILLARY_FILTER_TO_DATE.get();
+		boolean pano = settings.MAPILLARY_FILTER_PANO.get();
 
 		if (!userKey.equals("")) {
 			String key = (String) userData.get("userkey");
@@ -216,6 +217,10 @@ class MapillaryVectorLayer extends MapTileLayer implements MapillaryLayer, ICont
 		} else if ((from != 0 && capturedAt < from) || (to != 0 && capturedAt > to)) {
 			return true;
 		}
+
+		if (pano) {
+			return (long) userData.get("pano") == 0;
+		}
 		return false;
 	}
 
@@ -386,4 +391,4 @@ class MapillaryVectorLayer extends MapTileLayer implements MapillaryLayer, ICont
 		}
 		return (int) (r * view.getScaleCoefficient());
 	}
-}
\ No newline at end of file
+}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/AddTracksGroupBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/AddTracksGroupBottomSheetDialogFragment.java
index 106db868e6..232ac2c1b3 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/AddTracksGroupBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/AddTracksGroupBottomSheetDialogFragment.java
@@ -73,7 +73,7 @@ public class AddTracksGroupBottomSheetDialogFragment extends AddGroupBottomSheet
 				File gpx = dataItem.getFile();
 				if (selectionHelper.getSelectedFileByPath(gpx.getAbsolutePath()) == null) {
 					GPXFile res = GPXUtilities.loadGPXFile(app, gpx);
-					selectionHelper.selectGpxFile(res, true, false, false, false);
+					selectionHelper.selectGpxFile(res, true, false, false, false, false);
 				}
 				app.getMapMarkersHelper().addOrEnableGpxGroup(gpx);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
index d0b348fb0d..29e3c37f81 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
@@ -357,7 +357,7 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 
 		setupSideOfTheWorldBtns(R.id.lat_side_of_the_world_btn, R.id.lon_side_of_the_world_btn);
 
-		setBackgroundColor(R.id.point_name_divider, lightTheme ? R.color.route_info_divider_light : R.color.route_info_divider_dark);
+		setBackgroundColor(R.id.point_name_divider, lightTheme ? R.color.ctx_menu_buttons_divider_light : R.color.ctx_menu_buttons_divider_dark);
 		setBackgroundColor(R.id.point_name_et_container, lightTheme ? R.color.keyboard_item_control_light_bg : R.color.route_info_bottom_view_bg_dark);
 
 		ImageView pointNameKeyboardBtn = (ImageView) mainView.findViewById(R.id.point_name_keyboard_btn);
@@ -1510,7 +1510,7 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 		@Override
 		protected void onPostExecute(Void aVoid) {
 			if (!gpxSelected) {
-				app.getSelectedGpxHelper().selectGpxFile(gpx, true, false);
+				app.getSelectedGpxHelper().selectGpxFile(gpx, true, false, true, true, false);
 			}
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkerSelectionFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkerSelectionFragment.java
index 20d127a2ca..d87d4040c2 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkerSelectionFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkerSelectionFragment.java
@@ -12,7 +12,6 @@ import android.widget.ImageButton;
 import android.widget.ListView;
 
 import net.osmand.AndroidUtils;
-import net.osmand.Location;
 import net.osmand.data.LatLon;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.OsmandApplication;
@@ -20,10 +19,9 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.BaseOsmAndDialogFragment;
 import net.osmand.plus.base.MapViewTrackingUtilities;
-import net.osmand.plus.dashboard.DashLocationFragment;
 import net.osmand.plus.helpers.MapMarkerDialogHelper;
-import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
-import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu.OnMarkerSelectListener;
+import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
+import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu.OnMarkerSelectListener;
 
 import java.util.List;
 
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MarkersPlanRouteContext.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MarkersPlanRouteContext.java
index 361586f311..1f920db387 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MarkersPlanRouteContext.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MarkersPlanRouteContext.java
@@ -10,6 +10,7 @@ import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.routing.RouteCalculationParams;
+import net.osmand.plus.routing.RouteCalculationResult;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.router.RouteCalculationProgress;
 import net.osmand.util.MapUtils;
@@ -246,7 +247,8 @@ public class MarkersPlanRouteContext {
 		};
 		params.resultListener = new RouteCalculationParams.RouteCalculationResultListener() {
 			@Override
-			public void onRouteCalculated(List<Location> locations) {
+			public void onRouteCalculated(RouteCalculationResult route) {
+				List<Location> locations = route.getRouteLocations();
 				ArrayList<WptPt> pts = new ArrayList<>(locations.size());
 				for (Location loc : locations) {
 					WptPt pt = new WptPt();
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java
index 5b23af3470..578439d126 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java
@@ -17,8 +17,8 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
-import net.osmand.plus.base.bottomsheetmenu.simpleitems.ShortDescriptionItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerItem;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.ShortDescriptionItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
 
 import java.io.File;
@@ -136,7 +136,7 @@ public class SelectWptCategoriesBottomSheetDialogFragment extends MenuBottomShee
 
 		SelectedGpxFile selectedGpxFile = gpxSelectionHelper.getSelectedFileByPath(gpxFile.path);
 		if (selectedGpxFile == null) {
-			gpxSelectionHelper.selectGpxFile(gpxFile, true, false, false, false);
+			gpxSelectionHelper.selectGpxFile(gpxFile, true, false, false, false, false);
 		}
 		MapMarkersGroup group = mapMarkersHelper.getMarkersGroup(gpxFile);
 		if (group == null) {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/CoordinateInputAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/CoordinateInputAdapter.java
index 8ebb3505c2..6817a8bb90 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/CoordinateInputAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/CoordinateInputAdapter.java
@@ -69,7 +69,7 @@ public class CoordinateInputAdapter extends RecyclerView.Adapter<MapMarkerItemVi
 		holder.icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(app, wpt.getColor(), false));
 		holder.mainLayout.setBackgroundColor(getResolvedColor(nightTheme ? R.color.ctx_menu_bg_dark : R.color.bg_color_light));
 		holder.title.setTextColor(getResolvedColor(nightTheme ? R.color.ctx_menu_title_color_dark : R.color.color_black));
-		holder.divider.setBackgroundColor(getResolvedColor(nightTheme ? R.color.route_info_divider_dark : R.color.dashboard_divider_light));
+		holder.divider.setBackgroundColor(getResolvedColor(nightTheme ? R.color.coordinate_input_edit_text_normal_dark : R.color.dashboard_divider_light));
 		holder.iconReorder.setVisibility(View.GONE);
 		holder.numberText.setVisibility(View.VISIBLE);
 		holder.numberText.setText(String.valueOf(position + 1));
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
index b5a707d9f3..d20d95785e 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
@@ -11,22 +11,23 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
+
 import net.osmand.AndroidUtils;
 import net.osmand.IndexConstants;
 import net.osmand.data.LatLon;
+import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
-import net.osmand.plus.GPXUtilities;
-import net.osmand.plus.OsmAndFormatter;
-import net.osmand.plus.UiUtilities;
 import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.MapMarkersHelper.GroupHeader;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.MapMarkersHelper.MapMarkersGroup;
 import net.osmand.plus.MapMarkersHelper.ShowHideHistoryButton;
+import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
 import net.osmand.plus.UiUtilities.UpdateLocationViewCache;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.mapmarkers.SelectWptCategoriesBottomSheetDialogFragment;
@@ -445,7 +446,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 						final GPXFile[] gpxFile = new GPXFile[1];
 						boolean disabled = !enabled;
 
-						if (groupIsDisabled && !group.wasShown() && !group.getWptCategories().isEmpty()) {
+						if (groupIsDisabled && !group.wasShown() && group.getWptCategories().size() > 1) {
 							group.setWasShown(true);
 							Bundle args = new Bundle();
 							args.putString(SelectWptCategoriesBottomSheetDialogFragment.GPX_FILE_PATH_KEY, group.getGpxPath());
@@ -462,18 +463,13 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 							group.setVisibleUntilRestart(disabled);
 							String gpxPath = group.getGpxPath();
 							SelectedGpxFile selectedGpxFile = app.getSelectedGpxHelper().getSelectedFileByPath(gpxPath);
-							if (disabled) {
-								if (selectedGpxFile != null) {
-									gpxFile[0] = selectedGpxFile.getGpxFile();
-									switchGpxVisibility(gpxFile[0], selectedGpxFile, false);
-								}	
+							if (selectedGpxFile != null) {
+								gpxFile[0] = selectedGpxFile.getGpxFile();
 							} else {
-								if (selectedGpxFile == null) {
-									// TODO IO load in another thread ?
-									gpxFile[0] = GPXUtilities.loadGPXFile(app, new File(gpxPath));
-									switchGpxVisibility(gpxFile[0], null, true);
-								}
+								// TODO IO load in another thread ?
+								gpxFile[0] = GPXUtilities.loadGPXFile(app, new File(gpxPath));
 							}
+							switchGpxVisibility(gpxFile[0], selectedGpxFile, !disabled);
 						}
 						if(!disabled) {
 							mapMarkersHelper.enableGroup(group);
@@ -481,7 +477,6 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 							mapMarkersHelper.runSynchronization(group);
 						}
 
-
 						if (disabled) {
 							snackbar = Snackbar.make(holder.itemView, app.getString(R.string.group_will_be_removed_after_restart), Snackbar.LENGTH_LONG)
 									.setAction(R.string.shared_string_undo, new View.OnClickListener() {
@@ -563,7 +558,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 		if (!visible && selectedGpxFile != null && selectedGpxFile.selectedByUser) {
 			return;
 		}
-		gpxHelper.selectGpxFile(gpxFile, visible, false, false, false);
+		gpxHelper.selectGpxFile(gpxFile, visible, false, false, false, false);
 	}
 
 	public void hideSnackbar() {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
index fb61e0c3e2..2544c34a2d 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
@@ -10,6 +10,7 @@ import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.measurementtool.command.MeasurementCommandManager;
 import net.osmand.plus.routing.RouteCalculationParams;
+import net.osmand.plus.routing.RouteCalculationResult;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.router.RouteCalculationProgress;
 
@@ -312,7 +313,8 @@ public class MeasurementEditingContext {
 		};
 		params.resultListener = new RouteCalculationParams.RouteCalculationResultListener() {
 			@Override
-			public void onRouteCalculated(List<Location> locations) {
+			public void onRouteCalculated(RouteCalculationResult route) {
+				List<Location> locations = route.getRouteLocations();
 				ArrayList<WptPt> pts = new ArrayList<>(locations.size());
 				for (Location loc : locations) {
 					if(!loc.hasAltitude()){
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index aec0e21e12..36e6c23d5f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -24,8 +24,6 @@ import net.osmand.util.MapUtils;
 import java.util.ArrayList;
 import java.util.List;
 
-import gnu.trove.list.array.TIntArrayList;
-
 public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuLayer.IContextMenuProvider {
 	private static final int POINTS_TO_DRAW = 50;
 
@@ -42,8 +40,8 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	private int marginApplyingPointIconX;
 	private int marginApplyingPointIconY;
 	private final Path path = new Path();
-	private final TIntArrayList tx = new TIntArrayList();
-	private final TIntArrayList ty = new TIntArrayList();
+	private final List<Float> tx = new ArrayList<>();
+	private final List<Float> ty = new ArrayList<>();
 	private OnMeasureDistanceToCenter measureDistanceToCenterListener;
 	private OnSingleTapListener singleTapListener;
 	private OnEnterMovePointModeListener enterMovePointModeListener;
@@ -181,7 +179,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	@Override
 	public void onPrepareBufferImage(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
 		if (inMeasurementMode) {
-			lineAttrs.updatePaints(view, settings, tb);
+			lineAttrs.updatePaints(view.getApplication(), settings, tb);
 
 			TrkSegment before = editingCtx.getBeforeTrkSegmentLine();
 			before.renders.clear();
@@ -198,7 +196,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
 		if (inMeasurementMode) {
-			lineAttrs.updatePaints(view, settings, tb);
+			lineAttrs.updatePaints(view.getApplication(), settings, tb);
 
 			if (editingCtx.getSelectedPointPosition() == -1) {
 				drawCenterIcon(canvas, tb, tb.getCenterPixelPoint(), settings.isNightMode());
@@ -218,26 +216,26 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 
 			if (before.points.size() > 0 || after.points.size() > 0) {
 				path.reset();
-				tx.reset();
-				ty.reset();
+				tx.clear();
+				ty.clear();
 
 				if (before.points.size() > 0) {
 					WptPt pt = before.points.get(before.points.size() - 1);
-					int locX = tb.getPixXFromLonNoRot(pt.lon);
-					int locY = tb.getPixYFromLatNoRot(pt.lat);
+					float locX = tb.getPixXFromLonNoRot(pt.lon);
+					float locY = tb.getPixYFromLatNoRot(pt.lat);
 					tx.add(locX);
 					ty.add(locY);
-					tx.add(tb.getCenterPixelX());
-					ty.add(tb.getCenterPixelY());
+					tx.add((float)tb.getCenterPixelX());
+					ty.add((float)tb.getCenterPixelY());
 				}
 				if (after.points.size() > 0) {
 					if (before.points.size() == 0) {
-						tx.add(tb.getCenterPixelX());
-						ty.add(tb.getCenterPixelY());
+						tx.add((float)tb.getCenterPixelX());
+						ty.add((float)tb.getCenterPixelY());
 					}
 					WptPt pt = after.points.get(0);
-					int locX = tb.getPixXFromLonNoRot(pt.lon);
-					int locY = tb.getPixYFromLatNoRot(pt.lat);
+					float locX = tb.getPixXFromLonNoRot(pt.lon);
+					float locY = tb.getPixYFromLatNoRot(pt.lat);
 					tx.add(locX);
 					ty.add(locY);
 				}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
index d1fb314f35..5cf36fe094 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapToRoadBottomSheetDialogFragment.java
@@ -48,13 +48,13 @@ public class SnapToRoadBottomSheetDialogFragment extends android.support.design.
 	@Override
 	public void setupDialog(Dialog dialog, int style) {
 		super.setupDialog(dialog, style);
-		if (getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get()) {
+		OsmandApplication app = getMyApplication();
+		if (app.getSettings().DO_NOT_USE_ANIMATIONS.get()) {
 			dialog.getWindow().setWindowAnimations(R.style.Animations_NoAnimation);
 		}
 
-		nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		nightMode = app.getDaynightHelper().isNightModeForMapControls();
 		portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
-		final OsmandSettings settings = getMyApplication().getSettings();
 		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 
 		final View mainView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.fragment_snap_to_road_bottom_sheet_dialog, null);
@@ -76,7 +76,7 @@ public class SnapToRoadBottomSheetDialogFragment extends android.support.design.
 		}
 
 		LinearLayout container = (LinearLayout) mainView.findViewById(R.id.navigation_types_container);
-		final List<ApplicationMode> modes = new ArrayList<>(ApplicationMode.values(settings));
+		final List<ApplicationMode> modes = new ArrayList<>(ApplicationMode.values(app));
 		if (removeDefaultMode) {
 			modes.remove(ApplicationMode.DEFAULT);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java
index 04b3aa1217..232b7d32fb 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java
@@ -22,7 +22,6 @@ import android.view.View;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.ProgressBar;
@@ -321,10 +320,10 @@ public class TrackActivityFragmentAdapter implements TrackBitmapDrawerListener {
 		}
 
 		vis.setChecked(gpxFileSelected);
-		vis.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+		vis.setOnClickListener(new View.OnClickListener() {
 			@Override
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-				if (!isChecked) {
+			public void onClick(View v) {
+				if (!vis.isChecked()) {
 					selectedSplitInterval = 0;
 				}
 				setTrackVisibilityOnMap(vis.isChecked());
@@ -335,6 +334,7 @@ public class TrackActivityFragmentAdapter implements TrackBitmapDrawerListener {
 				TrackActivity trackActivity = getTrackActivity();
 				if (trackActivity != null) {
 					trackActivity.updateHeader(fragment);
+					trackActivity.invalidateOptionsMenu();
 				}
 			}
 		});
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackBitmapDrawer.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackBitmapDrawer.java
index de4df5d6b3..df3a5fa23e 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackBitmapDrawer.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackBitmapDrawer.java
@@ -1,7 +1,5 @@
 package net.osmand.plus.myplaces;
 
-import android.app.Activity;
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
@@ -12,8 +10,6 @@ import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
-import android.util.DisplayMetrics;
-import android.view.WindowManager;
 
 import net.osmand.AndroidUtils;
 import net.osmand.data.LatLon;
@@ -32,15 +28,16 @@ import net.osmand.plus.resources.ResourceManager;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.Renderable;
 
-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
 public class TrackBitmapDrawer {
 
 	private OsmandApplication app;
-	private WeakReference<Activity> activityRef;
 	private QuadRect rect;
+	private float density;
+	private int widthPixels;
+	private int heightPixels;
 
 	private boolean drawEnabled;
 	private RotatedTileBox rotatedTileBox;
@@ -69,11 +66,13 @@ public class TrackBitmapDrawer {
 		void drawTrackBitmap(Bitmap bitmap);
 	}
 
-	public TrackBitmapDrawer(@NonNull Activity activity, @NonNull GPXFile gpxFile,
-							 @Nullable GpxDataItem gpxDataItem, @NonNull QuadRect rect) {
-		this.activityRef = new WeakReference<>(activity);
+	public TrackBitmapDrawer(@NonNull OsmandApplication app, @NonNull GPXFile gpxFile,
+	                         @Nullable GpxDataItem gpxDataItem, @NonNull QuadRect rect, float density, int widthPixels, int heightPixels) {
+		this.density = density;
+		this.widthPixels = widthPixels;
+		this.heightPixels = heightPixels;
 		this.rect = rect;
-		this.app = (OsmandApplication) activity.getApplication();
+		this.app = app;
 		this.gpxFile = gpxFile;
 		this.gpxDataItem = gpxDataItem;
 
@@ -83,8 +82,8 @@ public class TrackBitmapDrawer {
 		paint.setStrokeWidth(AndroidUtils.dpToPx(app, 4f));
 		defPointColor = ContextCompat.getColor(app, R.color.gpx_color_point);
 		paintIcon = new Paint();
-		pointSmall = BitmapFactory.decodeResource(activity.getResources(), R.drawable.map_white_shield_small);
-		selectedPoint = BitmapFactory.decodeResource(activity.getResources(), R.drawable.map_default_location);
+		pointSmall = BitmapFactory.decodeResource(app.getResources(), R.drawable.map_white_shield_small);
+		selectedPoint = BitmapFactory.decodeResource(app.getResources(), R.drawable.map_default_location);
 	}
 
 	public void addListener(TrackBitmapDrawerListener l) {
@@ -150,54 +149,48 @@ public class TrackBitmapDrawer {
 	}
 
 	public boolean initAndDraw() {
-		Activity activity = activityRef.get();
-		if (activity != null) {
-			WindowManager mgr = (WindowManager) activity.getSystemService(Context.WINDOW_SERVICE);
-			if (mgr != null && rect != null && rect.left != 0 && rect.top != 0) {
-				notifyDrawing();
+		if (rect != null && rect.left != 0 && rect.top != 0) {
+			notifyDrawing();
 
-				double clat = rect.bottom / 2 + rect.top / 2;
-				double clon = rect.left / 2 + rect.right / 2;
-				DisplayMetrics dm = new DisplayMetrics();
-				mgr.getDefaultDisplay().getMetrics(dm);
-				RotatedTileBox.RotatedTileBoxBuilder boxBuilder = new RotatedTileBox.RotatedTileBoxBuilder()
-						.setLocation(clat, clon)
-						.setZoom(15)
-						.density(dm.density)
-						.setPixelDimensions(dm.widthPixels, AndroidUtils.dpToPx(app, 152f), 0.5f, 0.5f);
+			double clat = rect.bottom / 2 + rect.top / 2;
+			double clon = rect.left / 2 + rect.right / 2;
+			RotatedTileBox.RotatedTileBoxBuilder boxBuilder = new RotatedTileBox.RotatedTileBoxBuilder()
+					.setLocation(clat, clon)
+					.setZoom(15)
+					.density(density)
+					.setPixelDimensions(widthPixels, heightPixels, 0.5f, 0.5f);
 
-				rotatedTileBox = boxBuilder.build();
-				while (rotatedTileBox.getZoom() < 17 && rotatedTileBox.containsLatLon(rect.top, rect.left) && rotatedTileBox.containsLatLon(rect.bottom, rect.right)) {
-					rotatedTileBox.setZoom(rotatedTileBox.getZoom() + 1);
-				}
-				while (rotatedTileBox.getZoom() >= 7 && (!rotatedTileBox.containsLatLon(rect.top, rect.left) || !rotatedTileBox.containsLatLon(rect.bottom, rect.right))) {
-					rotatedTileBox.setZoom(rotatedTileBox.getZoom() - 1);
-				}
+			rotatedTileBox = boxBuilder.build();
+			while (rotatedTileBox.getZoom() < 17 && rotatedTileBox.containsLatLon(rect.top, rect.left) && rotatedTileBox.containsLatLon(rect.bottom, rect.right)) {
+				rotatedTileBox.setZoom(rotatedTileBox.getZoom() + 1);
+			}
+			while (rotatedTileBox.getZoom() >= 7 && (!rotatedTileBox.containsLatLon(rect.top, rect.left) || !rotatedTileBox.containsLatLon(rect.bottom, rect.right))) {
+				rotatedTileBox.setZoom(rotatedTileBox.getZoom() - 1);
+			}
 
-				final DrawSettings drawSettings = new DrawSettings(!app.getSettings().isLightContent(), true);
-				final ResourceManager resourceManager = app.getResourceManager();
-				final MapRenderRepositories renderer = resourceManager.getRenderer();
-				if (resourceManager.updateRenderedMapNeeded(rotatedTileBox, drawSettings)) {
-					resourceManager.updateRendererMap(rotatedTileBox, new OnMapLoadedListener() {
-						@Override
-						public void onMapLoaded(boolean interrupted) {
-							app.runInUIThread(new Runnable() {
-								@Override
-								public void run() {
-									if (isDrawEnabled()) {
-										mapBitmap = renderer.getBitmap();
-										if (mapBitmap != null) {
-											notifyDrawn();
-											refreshTrackBitmap();
-										}
+			final DrawSettings drawSettings = new DrawSettings(!app.getSettings().isLightContent(), true);
+			final ResourceManager resourceManager = app.getResourceManager();
+			final MapRenderRepositories renderer = resourceManager.getRenderer();
+			if (resourceManager.updateRenderedMapNeeded(rotatedTileBox, drawSettings)) {
+				resourceManager.updateRendererMap(rotatedTileBox, new OnMapLoadedListener() {
+					@Override
+					public void onMapLoaded(boolean interrupted) {
+						app.runInUIThread(new Runnable() {
+							@Override
+							public void run() {
+								if (isDrawEnabled()) {
+									mapBitmap = renderer.getBitmap();
+									if (mapBitmap != null) {
+										notifyDrawn();
+										refreshTrackBitmap();
 									}
 								}
-							});
-						}
-					});
-				}
-				return true;
+							}
+						});
+					}
+				});
 			}
+			return true;
 		}
 		return false;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index f6bc70cb31..b0669f8ed6 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -53,12 +53,12 @@ import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType;
-import net.osmand.plus.UiUtilities;
 import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.MapMarkersHelper.MapMarkersGroup;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.OsmandActionBarActivity;
 import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
@@ -514,7 +514,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment implements
 		if (markersGr != null) {
 			activity.invalidateOptionsMenu();
 			if (gpxFile != null) {
-				app.getSelectedGpxHelper().selectGpxFile(gpxFile, true, false);
+				app.getSelectedGpxHelper().selectGpxFile(gpxFile, true, false, true, true, false);
 			}
 			if (fragmentAdapter != null) {
 				fragmentAdapter.hideTransparentOverlay();
diff --git a/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java b/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java
index 0a74048946..86994d9ebd 100644
--- a/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java
@@ -90,7 +90,7 @@ public class NauticalMapsPlugin extends OsmandPlugin {
 	}
 
 	public void addBoatProfile(boolean flag) {
-		Set<ApplicationMode> selectedProfiles = new LinkedHashSet<>(ApplicationMode.values(app.getSettings()));
+		Set<ApplicationMode> selectedProfiles = new LinkedHashSet<>(ApplicationMode.values(app));
 		boolean isBoatEnabled = selectedProfiles.contains(ApplicationMode.BOAT);
 		if((!isBoatEnabled && flag) || (isBoatEnabled && !flag)) {
 			String s = app.getSettings().AVAILABLE_APP_MODES.get();
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
index cfc08ab1be..8a39857514 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
@@ -47,6 +47,13 @@ import org.apache.commons.logging.Log;
 
 import java.util.List;
 
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_CREATE_POI;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MODIFY_OSM_CHANGE;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MODIFY_OSM_NOTE;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MODIFY_POI;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_OPEN_OSM_NOTE;
+import static net.osmand.plus.OsmAndCustomizationConstants.OSM_NOTES;
+
 
 public class OsmEditingPlugin extends OsmandPlugin {
 	private static final Log LOG = PlatformUtil.getLog(OsmEditingPlugin.class);
@@ -228,18 +235,21 @@ public class OsmEditingPlugin extends OsmandPlugin {
 		}
 		if (isEditable) {
 			adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.poi_context_menu_modify, mapActivity)
+					.setId(MAP_CONTEXT_MENU_MODIFY_POI)
 					.setIcon(R.drawable.ic_action_edit_dark)
 					.setOrder(MODIFY_POI_ITEM_ORDER)
 					.setListener(listener)
 					.createItem());
 		} else if (selectedObj instanceof OpenstreetmapPoint && ((OpenstreetmapPoint) selectedObj).getAction() != Action.DELETE) {
 			adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.poi_context_menu_modify_osm_change, mapActivity)
+					.setId(MAP_CONTEXT_MENU_MODIFY_OSM_CHANGE)
 					.setIcon(R.drawable.ic_action_edit_dark)
 					.setOrder(MODIFY_OSM_CHANGE_ITEM_ORDER)
 					.setListener(listener)
 					.createItem());
 		} else {
 			adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.context_menu_item_create_poi, mapActivity)
+					.setId(MAP_CONTEXT_MENU_CREATE_POI)
 					.setIcon(R.drawable.ic_action_plus_dark)
 					.setOrder(CREATE_POI_ITEM_ORDER)
 					.setListener(listener)
@@ -247,12 +257,14 @@ public class OsmEditingPlugin extends OsmandPlugin {
 		}
 		if (selectedObj instanceof OsmNotesPoint) {
 			adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.context_menu_item_modify_note, mapActivity)
+					.setId(MAP_CONTEXT_MENU_MODIFY_OSM_NOTE)
 					.setIcon(R.drawable.ic_action_edit_dark)
 					.setOrder(MODIFY_OSM_NOTE_ITEM_ORDER)
 					.setListener(listener)
 					.createItem());
 		} else {
 			adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.context_menu_item_open_note, mapActivity)
+					.setId(MAP_CONTEXT_MENU_OPEN_OSM_NOTE)
 					.setIcon(R.drawable.ic_action_bug_dark)
 					.setOrder(OPEN_OSM_NOTE_ITEM_ORDER)
 					.setListener(listener)
@@ -292,6 +304,7 @@ public class OsmEditingPlugin extends OsmandPlugin {
 	@Override
 	public void registerLayerContextMenuActions(OsmandMapTileView mapView, ContextMenuAdapter adapter, final MapActivity mapActivity) {
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setId(OSM_NOTES)
 				.setTitleId(R.string.layer_osm_bugs, mapActivity)
 				.setSelected(settings.SHOW_OSM_BUGS.get())
 				.setIcon(R.drawable.ic_action_bug_dark)
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
index 7cc68c2652..a76fadd526 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
@@ -1,6 +1,8 @@
 package net.osmand.plus.parkingpoint;
 
 
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MARK_AS_PARKING_LOC;
+
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -233,10 +235,12 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 		};
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
 				.setTitleId(R.string.context_menu_item_add_parking_point, mapActivity)
+				.setId(MAP_CONTEXT_MENU_MARK_AS_PARKING_LOC)
 				.setIcon(R.drawable.ic_action_parking_dark)
 				.setOrder(MARK_AS_PARKING_POS_ITEM_ORDER)
 				.setListener(addListener)
 				.createItem());
+
 	}
 
 	/**
@@ -420,10 +424,6 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 		}
 		clearParkingPosition();
 	}
-
-	@Override
-	public void registerOptionsMenuItems(final MapActivity mapActivity, ContextMenuAdapter helper) {
-    }
 	
 	/**
 	 * @return the control to be added on a MapInfoLayer 
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionFactory.java b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionFactory.java
index dfcf8551c0..8620092f04 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionFactory.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionFactory.java
@@ -35,6 +35,7 @@ import net.osmand.plus.quickaction.actions.NewAction;
 import net.osmand.plus.quickaction.actions.ShowHideFavoritesAction;
 import net.osmand.plus.quickaction.actions.ShowHideOSMBugAction;
 import net.osmand.plus.quickaction.actions.ShowHidePoiAction;
+import net.osmand.plus.quickaction.actions.DayNightModeAction;
 import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
 
 import java.lang.reflect.Type;
@@ -116,6 +117,9 @@ public class QuickActionFactory {
 			quickActions.add(new MapUnderlayAction());
 		}
 
+		quickActions.add(new DayNightModeAction());
+
+
 		QuickAction voice = new NavVoiceAction();
 		QuickAction addDestination = new NavAddDestinationAction();
 		QuickAction addFirstIntermediate = new NavAddFirstIntermediateAction();
@@ -232,6 +236,9 @@ public class QuickActionFactory {
 			case NavResumePauseAction.TYPE:
 				return new NavResumePauseAction();
 
+			case DayNightModeAction.TYPE:
+				return new DayNightModeAction();
+
 			default:
 				return new QuickAction();
 		}
@@ -313,6 +320,9 @@ public class QuickActionFactory {
 			case NavResumePauseAction.TYPE:
 				return new NavResumePauseAction(quickAction);
 
+			case DayNightModeAction.TYPE:
+				return new DayNightModeAction(quickAction);
+
 			default:
 				return quickAction;
 		}
@@ -394,6 +404,9 @@ public class QuickActionFactory {
 			case NavResumePauseAction.TYPE:
 				return R.drawable.ic_play_dark;
 
+			case DayNightModeAction.TYPE:
+				return R.drawable.ic_action_map_day;
+
 			default:
 				return R.drawable.ic_action_plus;
 		}
@@ -457,6 +470,9 @@ public class QuickActionFactory {
 			case MapUnderlayAction.TYPE:
 				return R.string.quick_action_map_underlay;
 
+			case DayNightModeAction.TYPE:
+				return R.string.quick_action_day_night_switch_mode;
+
 			case NavAddDestinationAction.TYPE:
 				return R.string.quick_action_add_destination;
 
@@ -500,6 +516,7 @@ public class QuickActionFactory {
 			case ShowHideOSMBugAction.TYPE:
 			case NavStartStopAction.TYPE:
 			case NavResumePauseAction.TYPE:
+			case DayNightModeAction.TYPE:
 				return false;
 
 			default:
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/DayNightModeAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/DayNightModeAction.java
new file mode 100644
index 0000000000..4441573263
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/DayNightModeAction.java
@@ -0,0 +1,76 @@
+package net.osmand.plus.quickaction.actions;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.quickaction.QuickAction;
+
+public class DayNightModeAction extends QuickAction {
+	public static final int TYPE = 27;
+
+	public DayNightModeAction() {super(TYPE);}
+
+	public DayNightModeAction(QuickAction quickAction) {super(quickAction);}
+
+	@Override
+	public void execute(MapActivity activity) {
+		switch (activity.getMyApplication().getSettings().DAYNIGHT_MODE.get()){
+			case DAY: {
+				activity.getMyApplication().getSettings().DAYNIGHT_MODE.set(OsmandSettings.DayNightMode.NIGHT);
+				break;
+			}
+			case NIGHT: {
+				activity.getMyApplication().getSettings().DAYNIGHT_MODE.set(OsmandSettings.DayNightMode.DAY);
+				break;
+			}
+			case AUTO: {
+				activity.getMyApplication().getSettings().DAYNIGHT_MODE.set(OsmandSettings.DayNightMode.DAY);
+				break;
+			}
+			case SENSOR: {
+				activity.getMyApplication().getSettings().DAYNIGHT_MODE.set(OsmandSettings.DayNightMode.DAY);
+				break;
+			}
+		}
+	}
+
+	@Override
+	public void drawUI(ViewGroup parent, MapActivity activity) {
+		View view = LayoutInflater.from(parent.getContext())
+				.inflate(R.layout.quick_action_with_text, parent, false);
+
+		((TextView) view.findViewById(R.id.text))
+				.setText(R.string.quick_action_switch_day_night_descr);
+
+		parent.addView(view);
+	}
+
+	@Override
+	public int getIconRes(Context context) {
+		if(context instanceof MapActivity) {
+			switch (((MapActivity) context).getMyApplication().getSettings().DAYNIGHT_MODE.get()) {
+				case NIGHT: {
+					return R.drawable.ic_action_map_night;
+				}
+				case AUTO: {
+					return R.drawable.ic_action_map_sunst;
+				}
+				case SENSOR: {
+					return R.drawable.ic_action_map_light_sensor;
+				}
+			}
+		}
+		return R.drawable.ic_action_map_day;
+	}
+
+	@Override
+	public String getActionText(OsmandApplication application) {
+		return application.getSettings().DAYNIGHT_MODE.get().toHumanString(application) + " Mode";
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHidePoiAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHidePoiAction.java
index 6a389f5c22..07bb0c732e 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHidePoiAction.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHidePoiAction.java
@@ -23,7 +23,6 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.poi.PoiFiltersHelper;
 import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.quickaction.QuickAction;
-import net.osmand.plus.quickaction.QuickActionFactory;
 import net.osmand.plus.render.RenderingIcons;
 
 import java.util.ArrayList;
@@ -108,6 +107,9 @@ public class ShowHidePoiAction extends QuickAction {
 			pf.clearSelectedPoiFilters();
 
 			for (PoiUIFilter filter : poiFilters) {
+				if (filter.isStandardFilter()) {
+					filter.setFilterByName(null);
+				}
 				pf.addSelectedPoiFilter(filter);
 			}
 
diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
index 53d04cef51..8d0a5025a1 100644
--- a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
@@ -46,6 +46,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_DOWNLOAD_MAP;
+import static net.osmand.plus.OsmAndCustomizationConstants.OVERLAY_MAP;
+import static net.osmand.plus.OsmAndCustomizationConstants.UNDERLAY_MAP;
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_UPDATE_MAP;
+
 public class OsmandRasterMapsPlugin extends OsmandPlugin {
 	public static final String ID = "osmand.rastermaps";
 
@@ -270,6 +275,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 										ContextMenuItem item = adapter.getItem(pos);
 
 										String overlayMapDescr = settings.MAP_OVERLAY.get();
+
 										boolean hasOverlayDescription = overlayMapDescr != null;
 										overlayMapDescr = hasOverlayDescription ? overlayMapDescr
 												: mapActivity.getString(R.string.shared_string_none);
@@ -289,6 +295,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 										ContextMenuItem item = adapter.getItem(pos);
 
 										String underlayMapDescr = settings.MAP_UNDERLAY.get();
+
 										boolean hasUnderlayDescription = underlayMapDescr != null;
 										underlayMapDescr = hasUnderlayDescription ? underlayMapDescr
 												: mapActivity.getString(R.string.shared_string_none);
@@ -320,9 +327,13 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 			settings.MAP_UNDERLAY_PREVIOUS.set(null);
 		}
 		String overlayMapDescr = settings.MAP_OVERLAY.get();
+		if (overlayMapDescr!=null && overlayMapDescr.contains(".sqlitedb")) {
+			overlayMapDescr = overlayMapDescr.replaceFirst(".sqlitedb", "");
+		}
 		boolean hasOverlayDescription = overlayMapDescr != null;
 		overlayMapDescr = hasOverlayDescription ? overlayMapDescr : mapActivity.getString(R.string.shared_string_none);
 		adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.layer_overlay, mapActivity)
+				.setId(OVERLAY_MAP)
 				.setDescription(overlayMapDescr)
 				.setSelected(hasOverlayDescription)
 				.setColor(hasOverlayDescription ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
@@ -332,9 +343,13 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 				.setPosition(14)
 				.createItem());
 		String underlayMapDescr = settings.MAP_UNDERLAY.get();
+		if (underlayMapDescr!=null && underlayMapDescr.contains(".sqlitedb")) {
+			underlayMapDescr = underlayMapDescr.replaceFirst(".sqlitedb", "");
+		}
 		boolean hasUnderlayDescription = underlayMapDescr != null;
 		underlayMapDescr = hasUnderlayDescription ? underlayMapDescr : mapActivity.getString(R.string.shared_string_none);
 		adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.layer_underlay, mapActivity)
+				.setId(UNDERLAY_MAP)
 				.setDescription(underlayMapDescr)
 				.setSelected(hasUnderlayDescription)
 				.setColor(hasUnderlayDescription ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
@@ -365,11 +380,13 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 			};
 			adapter.addItem(new ContextMenuItem.ItemBuilder()
 					.setTitleId(R.string.context_menu_item_update_map, mapActivity)
+					.setId(MAP_CONTEXT_MENU_UPDATE_MAP)
 					.setIcon(R.drawable.ic_action_refresh_dark)
 					.setOrder(UPDATE_MAP_ITEM_ORDER)
 					.setListener(listener).createItem());
 			adapter.addItem(new ContextMenuItem.ItemBuilder()
 					.setTitleId(R.string.shared_string_download_map, mapActivity)
+					.setId(MAP_CONTEXT_MENU_DOWNLOAD_MAP)
 					.setIcon(R.drawable.ic_action_import)
 					.setOrder(DOWNLOAD_MAP_ITEM_ORDER)
 					.setListener(listener).createItem());
diff --git a/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java b/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java
index 880526d709..85ee219a99 100644
--- a/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java
+++ b/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java
@@ -299,6 +299,7 @@ public class IncrementalChangesManager {
 			XmlPullParserException {
 		String url = URL + "?aosmc=true&timestamp=" + timestamp + "&file=" + URLEncoder.encode(file);
 		HttpURLConnection conn = NetworkUtils.getHttpURLConnection(url);
+		conn.setUseCaches(false);
 		XmlPullParser parser = PlatformUtil.newXMLPullParser();
 		parser.setInput(conn.getInputStream(), "UTF-8");
 		List<IncrementalUpdate> lst = new ArrayList<IncrementalUpdate>();
diff --git a/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java b/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
index 8e3e85ae94..6e10c2df97 100644
--- a/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
+++ b/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
@@ -108,7 +108,8 @@ public class ResourceManager {
 		TRANSPORT,
 		ADDRESS,
 		QUICK_SEARCH, 
-		ROUTING
+		ROUTING,
+		TRANSPORT_ROUTING
 	}
 	
 	public static class BinaryMapReaderResource {
@@ -638,6 +639,19 @@ public class ResourceManager {
 		}
 		File liveDir = context.getAppPath(IndexConstants.LIVE_INDEX_DIR);
 		depthContours = false;
+		boolean hasWorldBasemap = false;
+		File worldBasemapMini = null;
+		for (File f : files) {
+			if (f.getName().equals("World_basemap.obf")) {
+				hasWorldBasemap = true;
+			}
+			if (f.getName().startsWith("World_basemap_mini")) {
+				worldBasemapMini = f;
+			}
+		}
+		if (hasWorldBasemap && worldBasemapMini != null) {
+			files.remove(worldBasemapMini);
+		}
 		for (File f : files) {
 			progress.startTask(context.getString(R.string.indexing_map) + " " + f.getName(), -1); //$NON-NLS-1$
 			try {
@@ -998,7 +1012,20 @@ public class ResourceManager {
 		}
 		return readers.toArray(new BinaryMapIndexReader[readers.size()]);
 	}
-	
+
+	public BinaryMapIndexReader[] getTransportRoutingMapFiles() {
+		List<BinaryMapIndexReader> readers = new ArrayList<>(fileReaders.size());
+		for(BinaryMapReaderResource r : fileReaders.values()) {
+			if(r.isUseForRouting()) {
+				BinaryMapIndexReader reader = r.getReader(BinaryMapReaderResourceType.TRANSPORT_ROUTING);
+				if (reader != null) {
+					readers.add(reader);
+				}
+			}
+		}
+		return readers.toArray(new BinaryMapIndexReader[readers.size()]);
+	}
+
 	public BinaryMapIndexReader[] getQuickSearchFiles() {
 		List<BinaryMapIndexReader> readers = new ArrayList<>(fileReaders.size());
 		for(BinaryMapReaderResource r : fileReaders.values()) {
@@ -1029,7 +1056,8 @@ public class ResourceManager {
 		File[] maps = dir.listFiles(new FileFilter() {
 			@Override
 			public boolean accept(File pathname) {
-				return pathname.getName().endsWith(IndexConstants.BINARY_MAP_INDEX_EXT);
+				return pathname.getName().endsWith(IndexConstants.BINARY_MAP_INDEX_EXT) &&
+						!pathname.getName().endsWith("World_basemap_mini.obf");
 			}
 		});
 		return maps != null && maps.length > 0;
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/AddPointBottomSheetDialog.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/AddPointBottomSheetDialog.java
new file mode 100644
index 0000000000..8c37413dd3
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/AddPointBottomSheetDialog.java
@@ -0,0 +1,310 @@
+package net.osmand.plus.routepreparationmenu;
+
+import android.content.Intent;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.text.SpannableString;
+import android.view.ContextThemeWrapper;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import net.osmand.AndroidUtils;
+import net.osmand.Location;
+import net.osmand.data.LatLon;
+import net.osmand.plus.MapMarkersHelper;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.TargetPointsHelper;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.base.MenuBottomSheetDialogFragment;
+import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerHalfItem;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
+import net.osmand.plus.helpers.FontCache;
+import net.osmand.plus.helpers.MapMarkerDialogHelper;
+import net.osmand.plus.helpers.WaypointDialogHelper;
+import net.osmand.plus.mapcontextmenu.other.FavouritesBottomSheetMenuFragment;
+import net.osmand.plus.search.QuickSearchDialogFragment;
+import net.osmand.plus.widgets.style.CustomTypefaceSpan;
+
+import java.util.List;
+
+public class AddPointBottomSheetDialog extends MenuBottomSheetDialogFragment {
+
+	public static final String TAG = "AddPointBottomSheetDialog";
+	public static final String TARGET_KEY = "target";
+	public static final String INTERMEDIATE_KEY = "intermediate";
+
+	public static final int ADD_FAVOURITE_TO_ROUTE_REQUEST_CODE = 1;
+
+	private boolean target;
+	private boolean intermediate;
+
+	@Override
+	public void createMenuItems(Bundle savedInstanceState) {
+		Bundle args = getArguments();
+		if (args != null && args.containsKey(TARGET_KEY) && args.containsKey(INTERMEDIATE_KEY)) {
+			target = args.getBoolean(TARGET_KEY);
+			intermediate = args.getBoolean(INTERMEDIATE_KEY);
+		}
+		String title;
+		if (intermediate) {
+			title = getString(R.string.add_intermediate_point);
+		} else if (target) {
+			title = getString(R.string.add_destination_point);
+		} else {
+			title = getString(R.string.add_start_point);
+		}
+		items.add(new TitleItem(title));
+
+		createSearchItem();
+		if (intermediate) {
+			createSelectOnTheMapItem();
+			createFavouritesItem();
+			createMarkersItem();
+		} else if (target) {
+			createMyLocItem();
+			createSelectOnTheMapItem();
+			createFavouritesItem();
+			createMarkersItem();
+			items.add(new DividerHalfItem(getContext()));
+			createSwitchStartAndEndItem();
+		} else {
+			createMyLocItem();
+			createSelectOnTheMapItem();
+			createFavouritesItem();
+			createMarkersItem();
+			items.add(new DividerHalfItem(getContext()));
+			createSwitchStartAndEndItem();
+		}
+	}
+
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		if (requestCode == ADD_FAVOURITE_TO_ROUTE_REQUEST_CODE) {
+			dismiss();
+		}
+	}
+
+	@Override
+	protected int getDismissButtonTextId() {
+		return R.string.shared_string_close;
+	}
+
+	private void createSearchItem() {
+		View searchView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.bottom_sheet_double_item, null);
+		TextView firstTitle = (TextView) searchView.findViewById(R.id.first_title);
+		TextView secondTitle = (TextView) searchView.findViewById(R.id.second_title);
+		ImageView firstIcon = (ImageView) searchView.findViewById(R.id.first_icon);
+		ImageView secondIcon = (ImageView) searchView.findViewById(R.id.second_icon);
+
+		firstTitle.setText(R.string.shared_string_search);
+		secondTitle.setText(R.string.shared_string_address);
+		firstIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_search_dark));
+		secondIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_street_name));
+
+		AndroidUtils.setBackground(getContext(), searchView.findViewById(R.id.first_divider),
+				nightMode, R.color.dashboard_divider_light, R.color.dashboard_divider_dark);
+		AndroidUtils.setBackground(getContext(), searchView.findViewById(R.id.second_divider),
+				nightMode, R.color.dashboard_divider_light, R.color.dashboard_divider_dark);
+
+		searchView.findViewById(R.id.first_item).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				MapActivity mapActivity = (MapActivity) getActivity();
+				if (mapActivity != null) {
+					mapActivity.showQuickSearch(getSearchMode(), QuickSearchDialogFragment.QuickSearchTab.HISTORY);
+				}
+				dismiss();
+			}
+		});
+		searchView.findViewById(R.id.second_item).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				MapActivity mapActivity = (MapActivity) getActivity();
+				if (mapActivity != null) {
+					mapActivity.showQuickSearch(getSearchMode(), false);
+				}
+				dismiss();
+			}
+		});
+		items.add(new BaseBottomSheetItem.Builder().setCustomView(searchView).create());
+	}
+
+	private MapActivity.ShowQuickSearchMode getSearchMode() {
+		if (intermediate) {
+			return MapActivity.ShowQuickSearchMode.INTERMEDIATE_SELECTION;
+		} else if (target) {
+			return MapActivity.ShowQuickSearchMode.DESTINATION_SELECTION;
+		} else {
+			return MapActivity.ShowQuickSearchMode.START_POINT_SELECTION;
+		}
+	}
+
+	private void createMyLocItem() {
+		BaseBottomSheetItem myLocationItem = new SimpleBottomSheetItem.Builder()
+				.setIcon(getIcon(R.drawable.ic_action_location_color, 0))
+				.setTitle(getString(R.string.shared_string_my_location))
+				.setLayoutId(R.layout.bottom_sheet_item_simple_56dp)
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						OsmandApplication app = getMyApplication();
+						if (app != null) {
+							TargetPointsHelper targetPointsHelper = app.getTargetPointsHelper();
+							Location myLocation = app.getLocationProvider().getLastKnownLocation();
+							if (myLocation != null) {
+								LatLon ll = new LatLon(myLocation.getLatitude(), myLocation.getLongitude());
+								if (intermediate) {
+									app.showShortToastMessage(R.string.add_intermediate_point);
+									targetPointsHelper.navigateToPoint(ll, true, targetPointsHelper.getIntermediatePoints().size());
+								} else if (target) {
+									app.showShortToastMessage(R.string.add_destination_point);
+									targetPointsHelper.navigateToPoint(ll, true, -1);
+								} else {
+									if (targetPointsHelper.getPointToStart() != null) {
+										targetPointsHelper.clearStartPoint(true);
+										app.getSettings().backupPointToStart();
+									}
+								}
+							}
+						}
+						dismiss();
+					}
+				}).create();
+		items.add(myLocationItem);
+	}
+
+	private void createSelectOnTheMapItem() {
+		BaseBottomSheetItem selectOnTheMapItem = new SimpleBottomSheetItem.Builder()
+				.setIcon(getContentIcon(R.drawable.ic_show_on_map))
+				.setTitle(getString(R.string.shared_string_select_on_map))
+				.setLayoutId(R.layout.bottom_sheet_item_simple_56dp)
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						MapActivity mapActivity = (MapActivity) getActivity();
+						if (mapActivity != null) {
+							MapRouteInfoMenu menu = mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu();
+							menu.selectOnScreen(target, intermediate);
+						}
+						dismiss();
+					}
+				})
+				.create();
+		items.add(selectOnTheMapItem);
+	}
+
+	private void createFavouritesItem() {
+		BaseBottomSheetItem favouritesItem = new SimpleBottomSheetItem.Builder()
+				.setIcon(getContentIcon(R.drawable.ic_action_fav_dark))
+				.setTitle(getString(R.string.shared_string_favorites))
+				.setLayoutId(R.layout.bottom_sheet_item_simple_56dp)
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						MapActivity mapActivity = (MapActivity) getActivity();
+						if (mapActivity != null) {
+							FragmentManager fragmentManager = mapActivity.getSupportFragmentManager();
+							FavouritesBottomSheetMenuFragment fragment = new FavouritesBottomSheetMenuFragment();
+							Bundle args = new Bundle();
+							args.putBoolean(FavouritesBottomSheetMenuFragment.TARGET, target);
+							args.putBoolean(FavouritesBottomSheetMenuFragment.INTERMEDIATE, intermediate);
+							fragment.setTargetFragment(AddPointBottomSheetDialog.this, ADD_FAVOURITE_TO_ROUTE_REQUEST_CODE);
+							fragment.setArguments(args);
+							fragment.show(fragmentManager, FavouritesBottomSheetMenuFragment.TAG);
+						}
+					}
+				})
+				.create();
+		items.add(favouritesItem);
+	}
+
+	private void createMarkersItem() {
+		final OsmandApplication app = getMyApplication();
+		if (app == null) {
+			return;
+		}
+		final View markersView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.bottom_sheet_double_item, null);
+
+		MapMarkersHelper markersHelper = app.getMapMarkersHelper();
+		List<MapMarkersHelper.MapMarker> markers = markersHelper.getMapMarkers();
+		MapMarkersHelper.MapMarker marker = null;
+		if (markers.size() > 0) {
+			marker = markers.get(0);
+		}
+		TextView firstTitle = (TextView) markersView.findViewById(R.id.first_title);
+		TextView secondTitle = (TextView) markersView.findViewById(R.id.second_title);
+		ImageView firstIcon = (ImageView) markersView.findViewById(R.id.first_icon);
+		ImageView secondIcon = (ImageView) markersView.findViewById(R.id.second_icon);
+
+		firstTitle.setText(R.string.shared_string_markers);
+		firstIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_flag_dark));
+
+		if (marker != null) {
+			secondTitle.setText(marker.getName(getContext()));
+			secondIcon.setImageDrawable(MapMarkerDialogHelper.getMapMarkerIcon(app, marker.colorIndex));
+
+		}
+		markersView.findViewById(R.id.first_item).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				MapActivity mapActivity = (MapActivity) getActivity();
+				if (mapActivity != null) {
+					MapRouteInfoMenu menu = mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu();
+					menu.selectMapMarker(-1, target, intermediate);
+					dismiss();
+				}
+			}
+		});
+		markersView.findViewById(R.id.second_item).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				MapActivity mapActivity = (MapActivity) getActivity();
+				if (mapActivity != null) {
+					MapRouteInfoMenu menu = mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu();
+					menu.selectMapMarker(0, target, intermediate);
+					dismiss();
+				}
+			}
+		});
+		items.add(new BaseBottomSheetItem.Builder().setCustomView(markersView).create());
+	}
+
+	private void createSwitchStartAndEndItem() {
+		final View switchStartAndEndView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.bottom_sheet_item_simple_56dp, null);
+		TextView title = (TextView) switchStartAndEndView.findViewById(R.id.title);
+
+		String titleS = getString(R.string.swap_start_and_destination);
+		SpannableString titleSpan = new SpannableString(titleS);
+		int firstIndex = titleS.indexOf(" ");
+		if (firstIndex != -1) {
+			Typeface typeface = FontCache.getRobotoMedium(getContext());
+			titleSpan.setSpan(new CustomTypefaceSpan(typeface), firstIndex, titleS.indexOf(" ", firstIndex + 1), 0);
+			titleSpan.setSpan(new CustomTypefaceSpan(typeface), titleS.lastIndexOf(" "), titleS.length(), 0);
+		}
+		title.setText(titleSpan);
+
+		BaseBottomSheetItem switchStartAndEndItem = new SimpleBottomSheetItem.Builder()
+				.setIcon(getContentIcon(R.drawable.ic_action_change_navigation_points))
+				.setCustomView(switchStartAndEndView)
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						MapActivity mapActivity = (MapActivity) getActivity();
+						if (mapActivity != null) {
+							TargetPointsHelper targetsHelper = mapActivity.getMyApplication().getTargetPointsHelper();
+							WaypointDialogHelper.switchStartAndFinish(targetsHelper, targetsHelper.getPointToNavigate(),
+									mapActivity, targetsHelper.getPointToStart(), mapActivity.getMyApplication(),
+									mapActivity.getDashboard().getWaypointDialogHelper());
+						}
+						dismiss();
+					}
+				}).create();
+		items.add(switchStartAndEndItem);
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/AvoidRoadsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/AvoidRoadsBottomSheetDialogFragment.java
new file mode 100644
index 0000000000..0638172652
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/AvoidRoadsBottomSheetDialogFragment.java
@@ -0,0 +1,303 @@
+package net.osmand.plus.routepreparationmenu;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.Toolbar;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import net.osmand.AndroidUtils;
+import net.osmand.data.LatLon;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.SettingsBaseActivity;
+import net.osmand.plus.base.MenuBottomSheetDialogFragment;
+import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
+import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.SubtitleDividerItem;
+import net.osmand.plus.dashboard.DashboardOnMap;
+import net.osmand.plus.helpers.AvoidSpecificRoads;
+import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.router.GeneralRouter;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class AvoidRoadsBottomSheetDialogFragment extends MenuBottomSheetDialogFragment {
+
+	public static final String TAG = AvoidRoadsBottomSheetDialogFragment.class.getSimpleName();
+
+	public static final int REQUEST_CODE = 0;
+	public static final int OPEN_AVOID_ROADS_DIALOG_REQUEST_CODE = 1;
+
+	private static final String AVOID_ROADS_TYPES_KEY = "avoid_roads_types";
+	private static final String AVOID_ROADS_OBJECTS_KEY = "avoid_roads_objects";
+
+	private HashMap<String, Boolean> routingParametersMap;
+	private List<LatLon> removedImpassableRoads;
+	private LinearLayout stylesContainer;
+
+	List<BottomSheetItemWithCompoundButton> compoundButtons = new ArrayList<>();
+
+	@Override
+	public void createMenuItems(Bundle savedInstanceState) {
+		final OsmandApplication app = getMyApplication();
+		if (app == null) {
+			return;
+		}
+		if (savedInstanceState != null) {
+			if (savedInstanceState.containsKey(AVOID_ROADS_TYPES_KEY)) {
+				routingParametersMap = (HashMap<String, Boolean>) savedInstanceState.getSerializable(AVOID_ROADS_TYPES_KEY);
+			}
+			if (savedInstanceState.containsKey(AVOID_ROADS_OBJECTS_KEY)) {
+				removedImpassableRoads = (List<LatLon>) savedInstanceState.getSerializable(AVOID_ROADS_OBJECTS_KEY);
+			}
+		}
+		if (routingParametersMap == null) {
+			routingParametersMap = generateStylesMap(app);
+		}
+		if (removedImpassableRoads == null) {
+			removedImpassableRoads = new ArrayList<LatLon>();
+		}
+
+		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
+		final View titleView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.bottom_sheet_item_toolbar_title, null);
+		TextView textView = (TextView) titleView.findViewById(R.id.title);
+		textView.setText(R.string.impassable_road);
+
+		Toolbar toolbar = (Toolbar) titleView.findViewById(R.id.toolbar);
+		toolbar.setNavigationIcon(getContentIcon(R.drawable.ic_arrow_back));
+		toolbar.setNavigationContentDescription(R.string.access_shared_string_navigate_up);
+		toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				dismiss();
+			}
+		});
+
+		final SimpleBottomSheetItem titleItem = (SimpleBottomSheetItem) new SimpleBottomSheetItem.Builder()
+				.setCustomView(titleView)
+				.create();
+		items.add(titleItem);
+
+		final SimpleBottomSheetItem descriptionItem = (SimpleBottomSheetItem) new SimpleBottomSheetItem.Builder()
+				.setTitle(getString(R.string.avoid_roads_descr))
+				.setLayoutId(R.layout.bottom_sheet_item_title_long)
+				.create();
+		items.add(descriptionItem);
+
+		stylesContainer = new LinearLayout(app);
+		stylesContainer.setLayoutParams((new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)));
+		stylesContainer.setOrientation(LinearLayout.VERTICAL);
+		stylesContainer.setPadding(0, getResources().getDimensionPixelSize(R.dimen.bottom_sheet_content_padding_small), 0, 0);
+
+		for (final LatLon routeDataObject : app.getAvoidSpecificRoads().getImpassableRoads().keySet()) {
+			if (removedImpassableRoads.contains(routeDataObject)) {
+				continue;
+			}
+			LayoutInflater.from(new ContextThemeWrapper(app, themeRes)).inflate(R.layout.bottom_sheet_item_simple_right_icon, stylesContainer, true);
+		}
+		items.add(new BaseBottomSheetItem.Builder().setCustomView(stylesContainer).create());
+
+		populateImpassableRoadsObjects();
+
+		final View buttonView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.bottom_sheet_item_btn, null);
+		TextView buttonDescription = (TextView) buttonView.findViewById(R.id.button_descr);
+		buttonDescription.setText(R.string.shared_string_select_on_map);
+		buttonDescription.setTextColor(getResolvedColor(nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light));
+
+		FrameLayout buttonContainer = buttonView.findViewById(R.id.button_container);
+		AndroidUtils.setBackground(app, buttonContainer, nightMode, R.drawable.btn_border_trans_light, R.drawable.btn_border_trans_dark);
+		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+			AndroidUtils.setBackground(app, buttonDescription, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+		}
+
+		buttonContainer.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				MapActivity mapActivity = getMapActivity();
+				if (mapActivity != null) {
+					mapActivity.getDashboard().setDashboardVisibility(false, DashboardOnMap.DashboardType.ROUTE_PREFERENCES);
+					mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu().hide();
+					app.getAvoidSpecificRoads().selectFromMap(mapActivity);
+					Fragment fragment = getTargetFragment();
+					if (fragment != null) {
+						fragment.onActivityResult(getTargetRequestCode(), OPEN_AVOID_ROADS_DIALOG_REQUEST_CODE, null);
+					}
+				}
+				dismiss();
+			}
+		});
+
+		final SimpleBottomSheetItem buttonItem = (SimpleBottomSheetItem) new SimpleBottomSheetItem.Builder()
+				.setCustomView(buttonView)
+				.create();
+		items.add(buttonItem);
+
+		items.add(new SubtitleDividerItem(app));
+
+		populateImpassableRoadsTypes();
+	}
+
+	private void populateImpassableRoadsObjects() {
+		Context context = getContext();
+		if (context == null) {
+			return;
+		}
+		AvoidSpecificRoads avoidSpecificRoads = getMyApplication().getAvoidSpecificRoads();
+
+		int counter = 0;
+		for (final LatLon routeDataObject : avoidSpecificRoads.getImpassableRoads().keySet()) {
+			if (removedImpassableRoads.contains(routeDataObject)) {
+				continue;
+			}
+			String name = avoidSpecificRoads.getText(routeDataObject);
+
+			View view = stylesContainer.getChildAt(counter);
+			view.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					removedImpassableRoads.add(routeDataObject);
+					stylesContainer.removeView(v);
+				}
+			});
+
+			TextView titleTv = (TextView) view.findViewById(R.id.title);
+			titleTv.setText(name);
+			titleTv.setTextColor(getResolvedColor(nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light));
+
+			ImageView icon = (ImageView) view.findViewById(R.id.icon);
+			icon.setImageDrawable(getContentIcon(R.drawable.ic_action_remove_dark));
+
+			counter++;
+		}
+	}
+
+	private void populateImpassableRoadsTypes() {
+		Context context = getContext();
+		if (context == null) {
+			return;
+		}
+		for (Map.Entry<String, Boolean> entry : routingParametersMap.entrySet()) {
+			final String parameterId = entry.getKey();
+			boolean selected = entry.getValue();
+			String parameterName = SettingsBaseActivity.getRoutingStringPropertyName(context, parameterId, "");
+
+			final BottomSheetItemWithCompoundButton[] item = new BottomSheetItemWithCompoundButton[1];
+			item[0] = (BottomSheetItemWithCompoundButton) new BottomSheetItemWithCompoundButton.Builder()
+					.setChecked(selected)
+					.setTitle(parameterName)
+					.setLayoutId(R.layout.bottom_sheet_item_with_switch_no_icon)
+					.setOnClickListener(new View.OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							item[0].setChecked(!item[0].isChecked());
+							routingParametersMap.put(parameterId, item[0].isChecked());
+						}
+					})
+					.setTag(parameterId)
+					.create();
+			items.add(item[0]);
+			compoundButtons.add(item[0]);
+		}
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		for (BottomSheetItemWithCompoundButton item : compoundButtons) {
+			final String routingParameterId = (String) item.getTag();
+			item.setChecked(routingParametersMap.get(routingParameterId));
+		}
+	}
+
+	@Override
+	public void onSaveInstanceState(Bundle outState) {
+		super.onSaveInstanceState(outState);
+		outState.putSerializable(AVOID_ROADS_TYPES_KEY, routingParametersMap);
+		outState.putSerializable(AVOID_ROADS_OBJECTS_KEY, (Serializable) removedImpassableRoads);
+	}
+
+	@Override
+	protected int getRightBottomButtonTextId() {
+		return R.string.shared_string_apply;
+	}
+
+
+	@Nullable
+	private MapActivity getMapActivity() {
+		Activity activity = getActivity();
+		if (activity != null && activity instanceof MapActivity) {
+			return (MapActivity) activity;
+		}
+		return null;
+	}
+
+	@Override
+	protected void onRightBottomButtonClick() {
+		final OsmandApplication app = getMyApplication();
+		if (app == null) {
+			return;
+		}
+
+		for (Map.Entry<String, Boolean> entry : routingParametersMap.entrySet()) {
+			String parameterId = entry.getKey();
+			GeneralRouter.RoutingParameter parameter = app.getRoutingOptionsHelper().getRoutingPrefsForAppModeById(app.getRoutingHelper().getAppMode(), parameterId);
+			if (parameter != null) {
+				boolean checked = entry.getValue();
+				OsmandSettings.CommonPreference<Boolean> preference = app.getSettings().getCustomRoutingBooleanProperty(parameter.getId(), parameter.getDefaultBoolean());
+				preference.set(checked);
+			}
+		}
+
+		AvoidSpecificRoads avoidSpecificRoads = app.getAvoidSpecificRoads();
+		for (LatLon routeLocation : removedImpassableRoads) {
+			avoidSpecificRoads.removeImpassableRoad(routeLocation);
+		}
+
+		RoutingHelper routingHelper = app.getRoutingHelper();
+		if (routingHelper.isRouteCalculated() || routingHelper.isRouteBeingCalculated()) {
+			routingHelper.recalculateRouteDueToSettingsChange();
+		}
+
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			final MapRouteInfoMenu mapRouteInfoMenu = mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu();
+			if (mapRouteInfoMenu != null) {
+				mapRouteInfoMenu.updateMenu();
+			}
+		}
+
+		dismiss();
+	}
+
+	@NonNull
+	private HashMap<String, Boolean> generateStylesMap(OsmandApplication app) {
+		HashMap<String, Boolean> res = new HashMap<>();
+		List<GeneralRouter.RoutingParameter> avoidParameters = app.getRoutingOptionsHelper().getAvoidRoutingPrefsForAppMode(app.getRoutingHelper().getAppMode());
+
+		for (GeneralRouter.RoutingParameter parameter : avoidParameters) {
+			OsmandSettings.CommonPreference<Boolean> preference = app.getSettings().getCustomRoutingBooleanProperty(parameter.getId(), parameter.getDefaultBoolean());
+			res.put(parameter.getId(), preference.get());
+		}
+
+		return res;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java
new file mode 100644
index 0000000000..0e9ffcc890
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java
@@ -0,0 +1,383 @@
+package net.osmand.plus.routepreparationmenu;
+
+import android.Manifest;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+
+import net.osmand.AndroidUtils;
+import net.osmand.Location;
+import net.osmand.data.RotatedTileBox;
+import net.osmand.osm.edit.Node;
+import net.osmand.plus.LockableViewPager;
+import net.osmand.plus.OsmAndLocationProvider;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.TargetPointsHelper;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.base.BaseOsmAndFragment;
+import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.routepreparationmenu.routeCards.PublicTransportCard;
+import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.routing.TransportRoutingHelper;
+import net.osmand.plus.views.OsmandMapTileView;
+import net.osmand.router.TransportRoutePlanner.TransportRouteResult;
+import net.osmand.router.TransportRoutePlanner.TransportRouteResultSegment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChooseRouteFragment extends BaseOsmAndFragment {
+
+	public static final String TAG = "ChooseRouteFragment";
+
+	private OsmandMapTileView map;
+	private MapActivity mapActivity;
+
+	private View view;
+	private LockableViewPager viewPager;
+	private ImageButton myLocButtonView;
+
+	private boolean portrait;
+	private boolean nightMode;
+	private boolean wasDrawerDisabled;
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+		mapActivity = (MapActivity) getActivity();
+		nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
+		map = getMapActivity().getMapView();
+		List<TransportRouteResult> routes = getMyApplication().getTransportRoutingHelper().getRoutes();
+		if (routes != null && !routes.isEmpty()) {
+			view = inflater.inflate(R.layout.fragment_show_all_routes, null);
+			viewPager = view.findViewById(R.id.pager);
+
+			AndroidUtils.addStatusBarPadding21v(mapActivity, view);
+
+			final List<PublicTransportCard> routeCards = new ArrayList<>();
+			for (int i = 0; i < routes.size(); i++) {
+				PublicTransportCard card = new PublicTransportCard(mapActivity, routes.get(i), i);
+				card.setSecondButtonVisible(true);
+				card.setShowTopShadow(false);
+				card.setShowBottomShadow(false);
+				routeCards.add(card);
+			}
+			viewPager.setClipToPadding(false);
+			final ViewsPagerAdapter pagerAdapter = new ViewsPagerAdapter(mapActivity, routeCards);
+			viewPager.setAdapter(pagerAdapter);
+			viewPager.setSwipeLocked(routeCards.size() < 2);
+			viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+				public void onPageScrollStateChanged(int state) {
+				}
+
+				public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+				}
+
+				public void onPageSelected(int position) {
+					mapActivity.getMyApplication().getTransportRoutingHelper().setCurrentRoute(routeCards.get(position).getRouteId());
+					mapActivity.refreshMap();
+				}
+			});
+
+			if (!portrait) {
+				LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, AndroidUtils.dpToPx(getMyApplication(), 200f));
+				params.gravity = Gravity.BOTTOM;
+				viewPager.setLayoutParams(params);
+			}
+
+			ImageButton backButtonView = (ImageButton) view.findViewById(R.id.back_button);
+			backButtonView.setImageDrawable(getIcon(R.drawable.ic_arrow_back, R.color.icon_color));
+			AndroidUtils.setBackground(mapActivity, backButtonView, nightMode, R.drawable.btn_circle, R.drawable.btn_circle_night);
+			backButtonView.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					dismiss(mapActivity);
+				}
+			});
+
+			View fabButtonsView = view.findViewById(R.id.fab_container);
+			ImageButton zoomInButtonView = (ImageButton) view.findViewById(R.id.map_zoom_in_button);
+			ImageButton zoomOutButtonView = (ImageButton) view.findViewById(R.id.map_zoom_out_button);
+			myLocButtonView = (ImageButton) view.findViewById(R.id.map_my_location_button);
+			if (portrait) {
+				updateImageButton(zoomInButtonView, R.drawable.map_zoom_in, R.drawable.map_zoom_in_night,
+						R.drawable.btn_circle_trans, R.drawable.btn_circle_night, nightMode);
+				updateImageButton(zoomOutButtonView, R.drawable.map_zoom_out, R.drawable.map_zoom_out_night,
+						R.drawable.btn_circle_trans, R.drawable.btn_circle_night, nightMode);
+				zoomInButtonView.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						doZoomIn();
+					}
+				});
+				zoomOutButtonView.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						doZoomOut();
+					}
+				});
+				myLocButtonView.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						if (OsmAndLocationProvider.isLocationPermissionAvailable(mapActivity)) {
+							mapActivity.getMapViewTrackingUtilities().backToLocationImpl();
+						} else {
+							ActivityCompat.requestPermissions(mapActivity,
+									new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
+									OsmAndLocationProvider.REQUEST_LOCATION_PERMISSION);
+						}
+					}
+				});
+				fabButtonsView.setVisibility(View.VISIBLE);
+			} else {
+				fabButtonsView.setVisibility(View.GONE);
+			}
+			updateMyLocation(mapActivity.getRoutingHelper());
+		}
+
+		return view;
+	}
+
+	private void adjustMapPosition() {
+		RoutingHelper rh = mapActivity.getRoutingHelper();
+		OsmandApplication app = mapActivity.getMyApplication();
+		TransportRoutingHelper transportRoutingHelper = rh.getTransportRoutingHelper();
+		if (getMapActivity().getMapView() != null) {
+			Location lt = rh.getLastProjection();
+			if (lt == null) {
+				lt = app.getTargetPointsHelper().getPointToStartLocation();
+			}
+			if (lt != null) {
+				double left = lt.getLongitude(), right = lt.getLongitude();
+				double top = lt.getLatitude(), bottom = lt.getLatitude();
+				List<Location> list = rh.getCurrentCalculatedRoute();
+				for (Location l : list) {
+					left = Math.min(left, l.getLongitude());
+					right = Math.max(right, l.getLongitude());
+					top = Math.max(top, l.getLatitude());
+					bottom = Math.min(bottom, l.getLatitude());
+				}
+				TransportRouteResult result = transportRoutingHelper.getCurrentRouteResult();
+				if (result != null) {
+					for (TransportRouteResultSegment segment : result.getSegments()) {
+						for (Node n : segment.getNodes()) {
+							left = Math.min(left, n.getLongitude());
+							right = Math.max(right, n.getLongitude());
+							top = Math.max(top, n.getLatitude());
+							bottom = Math.min(bottom, n.getLatitude());
+						}
+					}
+				}
+				List<TargetPointsHelper.TargetPoint> targetPoints = app.getTargetPointsHelper().getIntermediatePointsWithTarget();
+				for (TargetPointsHelper.TargetPoint l : targetPoints) {
+					left = Math.min(left, l.getLongitude());
+					right = Math.max(right, l.getLongitude());
+					top = Math.max(top, l.getLatitude());
+					bottom = Math.min(bottom, l.getLatitude());
+				}
+				RotatedTileBox tb = getMapActivity().getMapView().getCurrentRotatedTileBox().copy();
+				int tileBoxWidthPx = 0;
+				int tileBoxHeightPx = 0;
+
+				if (!portrait) {
+					tileBoxWidthPx = tb.getPixWidth() - view.getWidth();
+				} else {
+					int fHeight = viewPager.getHeight() + AndroidUtils.getStatusBarHeight(app);
+					tileBoxHeightPx = tb.getPixHeight() - fHeight;
+				}
+				getMapActivity().getMapView().fitRectToMap(left, right, top, bottom, tileBoxWidthPx, tileBoxHeightPx, 0);
+			}
+		}
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		getMapActivity().getMapLayers().getMapControlsLayer().showMapControlsIfHidden();
+		MapRouteInfoMenu.chooseRoutesVisible = true;
+		wasDrawerDisabled = getMapActivity().isDrawerDisabled();
+		if (!wasDrawerDisabled) {
+			getMapActivity().disableDrawer();
+		}
+	}
+
+	public void onPause() {
+		super.onPause();
+		MapRouteInfoMenu.chooseRoutesVisible = false;
+		if (!wasDrawerDisabled) {
+			getMapActivity().enableDrawer();
+		}
+	}
+
+	@Override
+	public int getStatusBarColorId() {
+		return R.color.status_bar_transparent_gradient;
+	}
+
+	private void updateMyLocation(RoutingHelper rh) {
+		Location lastKnownLocation = mapActivity.getMyApplication().getLocationProvider().getLastKnownLocation();
+		boolean enabled = lastKnownLocation != null;
+		boolean tracked = mapActivity.getMapViewTrackingUtilities().isMapLinkedToLocation();
+
+		if (!enabled) {
+			myLocButtonView.setImageDrawable(getIcon(R.drawable.map_my_location, R.color.icon_color));
+			AndroidUtils.setBackground(mapActivity, myLocButtonView, nightMode, R.drawable.btn_circle, R.drawable.btn_circle_night);
+			myLocButtonView.setContentDescription(mapActivity.getString(R.string.unknown_location));
+		} else if (tracked) {
+			myLocButtonView.setImageDrawable(getIcon(R.drawable.map_my_location, R.color.color_myloc_distance));
+			AndroidUtils.setBackground(mapActivity, myLocButtonView, nightMode, R.drawable.btn_circle, R.drawable.btn_circle_night);
+		} else {
+			myLocButtonView.setImageResource(R.drawable.map_my_location);
+			AndroidUtils.setBackground(mapActivity, myLocButtonView, nightMode, R.drawable.btn_circle_blue, R.drawable.btn_circle_blue);
+			myLocButtonView.setContentDescription(mapActivity.getString(R.string.map_widget_back_to_loc));
+		}
+		if (mapActivity.getMyApplication().accessibilityEnabled()) {
+			myLocButtonView.setClickable(enabled && !tracked && rh.isFollowingMode());
+		}
+	}
+
+	private MapActivity getMapActivity() {
+		return (MapActivity) getActivity();
+	}
+
+	public void doZoomIn() {
+		if (map.isZooming() && map.hasCustomMapRatio()) {
+			getMapActivity().changeZoom(2, System.currentTimeMillis());
+		} else {
+			if (!map.hasCustomMapRatio()) {
+				//setCustomMapRatio();
+			}
+			getMapActivity().changeZoom(1, System.currentTimeMillis());
+		}
+	}
+
+	public void doZoomOut() {
+		if (!map.hasCustomMapRatio()) {
+			//setCustomMapRatio();
+		}
+		getMapActivity().changeZoom(-1, System.currentTimeMillis());
+	}
+
+	private void updateImageButton(ImageButton button, int iconLightId, int iconDarkId, int bgLightId, int bgDarkId, boolean night) {
+		button.setImageDrawable(getMapActivity().getMyApplication().getUIUtilities().getIcon(night ? iconDarkId : iconLightId));
+		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+			button.setBackground(getMapActivity().getResources().getDrawable(night ? bgDarkId : bgLightId,
+					getMapActivity().getTheme()));
+		} else {
+			button.setBackgroundDrawable(getMapActivity().getResources().getDrawable(night ? bgDarkId : bgLightId));
+		}
+	}
+
+	@Override
+	protected Drawable getContentIcon(@DrawableRes int id) {
+		return getIcon(id, nightMode ? R.color.ctx_menu_info_text_dark : R.color.icon_color);
+	}
+
+	private void dismiss(MapActivity mapActivity) {
+		try {
+			mapActivity.getSupportFragmentManager().beginTransaction().remove(this).commitAllowingStateLoss();
+		} catch (Exception e) {
+			// ignore
+		}
+	}
+
+	public static boolean showInstance(FragmentManager fragmentManager) {
+		return showFragment(new ChooseRouteFragment(), fragmentManager);
+	}
+
+	private static boolean showFragment(ChooseRouteFragment fragment, FragmentManager fragmentManager) {
+		try {
+			fragment.setRetainInstance(true);
+			fragmentManager.beginTransaction()
+					.add(R.id.fragmentContainer, fragment, ChooseRouteFragment.TAG)
+					.commitAllowingStateLoss();
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
+
+	private class ViewsPagerAdapter extends PagerAdapter {
+
+		private List<PublicTransportCard> cards;
+		private MapActivity mapActivity;
+
+		ViewsPagerAdapter(MapActivity mapActivity, List<PublicTransportCard> cards) {
+			this.mapActivity = mapActivity;
+			this.cards = cards;
+		}
+
+		@Override
+		public float getPageWidth(int position) {
+			return portrait ? super.getPageWidth(position) : 0.7f;
+		}
+
+		public void setCards(List<PublicTransportCard> cards) {
+			this.cards = cards;
+			notifyDataSetChanged();
+		}
+
+		@Override
+		public int getCount() {
+			return itemsCount();
+		}
+
+		private int itemsCount() {
+			return cards.size();
+		}
+
+		private View createPageView(int position) {
+			return cards.get(position).build(mapActivity);
+		}
+
+		@NonNull
+		@Override
+		public Object instantiateItem(@NonNull ViewGroup container, final int position) {
+
+			View view = createPageView(position);
+			view.setBackgroundDrawable(null);
+			view.setBackgroundResource(R.drawable.route_cards_topsides_light);
+			view.findViewById(R.id.details_button).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					mapActivity.getMyApplication().getTransportRoutingHelper().setCurrentRoute(cards.get(position).getRouteId());
+					mapActivity.getMapView().refreshMap(true);
+				}
+			});
+			view.findViewById(R.id.show_button).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					adjustMapPosition();
+				}
+			});
+			container.addView(view, 0);
+
+			return view;
+		}
+
+		@Override
+		public void destroyItem(@NonNull ViewGroup collection, int position, @NonNull Object view) {
+			collection.removeView((View) view);
+		}
+
+		@Override
+		public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
+			return view == object;
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
new file mode 100644
index 0000000000..eeef67c876
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
@@ -0,0 +1,1651 @@
+package net.osmand.plus.routepreparationmenu;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
+import android.graphics.PointF;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.FrameLayout;
+import android.widget.HorizontalScrollView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import net.osmand.AndroidUtils;
+import net.osmand.Location;
+import net.osmand.StateChangedListener;
+import net.osmand.ValueHolder;
+import net.osmand.binary.RouteDataObject;
+import net.osmand.data.LatLon;
+import net.osmand.data.PointDescription;
+import net.osmand.data.RotatedTileBox;
+import net.osmand.plus.ApplicationMode;
+import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.GeocodingLookupService;
+import net.osmand.plus.GeocodingLookupService.AddressLookupRequest;
+import net.osmand.plus.MapMarkersHelper;
+import net.osmand.plus.MapMarkersHelper.MapMarker;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.OsmandSettings.OsmandPreference;
+import net.osmand.plus.R;
+import net.osmand.plus.TargetPointsHelper;
+import net.osmand.plus.TargetPointsHelper.TargetPoint;
+import net.osmand.plus.UiUtilities;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.SettingsBaseActivity;
+import net.osmand.plus.activities.actions.AppModeDialog;
+import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.helpers.AvoidSpecificRoads;
+import net.osmand.plus.helpers.MapMarkerDialogHelper;
+import net.osmand.plus.helpers.WaypointHelper;
+import net.osmand.plus.mapcontextmenu.other.FavouritesBottomSheetMenuFragment;
+import net.osmand.plus.mapmarkers.MapMarkerSelectionFragment;
+import net.osmand.plus.poi.PoiUIFilter;
+import net.osmand.plus.routepreparationmenu.routeCards.BaseRouteCard;
+import net.osmand.plus.routepreparationmenu.routeCards.PublicTransportCard;
+import net.osmand.plus.routepreparationmenu.routeCards.SimpleRouteCard;
+import net.osmand.plus.routing.IRouteInformationListener;
+import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.routing.TransportRoutingHelper;
+import net.osmand.plus.views.MapControlsLayer;
+import net.osmand.router.GeneralRouter;
+import net.osmand.router.TransportRoutePlanner;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.DRIVING_STYLE;
+
+public class MapRouteInfoMenu implements IRouteInformationListener {
+
+	public static class MenuState {
+		public static final int HEADER_ONLY = 1;
+		public static final int HALF_SCREEN = 2;
+		public static final int FULL_SCREEN = 4;
+	}
+
+	public static int directionInfo = -1;
+	private static boolean visible;
+	public static boolean controlVisible = false;
+	public static boolean chooseRoutesVisible = false;
+	public static final String TARGET_SELECT = "TARGET_SELECT";
+
+	private final RoutingHelper routingHelper;
+	private final TransportRoutingHelper transportHelper;
+	private final RoutingOptionsHelper routingOptionsHelper;
+	private GeocodingLookupService geocodingLookupService;
+
+	private boolean selectFromMapTouch;
+	private boolean selectFromMapForTarget;
+	private boolean selectFromMapForIntermediate;
+
+	private boolean showMenu = false;
+	private MapActivity mapActivity;
+	private OsmandApplication app;
+	private MapControlsLayer mapControlsLayer;
+	private boolean nightMode;
+	private boolean switched;
+
+	private AddressLookupRequest startPointRequest;
+	private AddressLookupRequest targetPointRequest;
+	private List<LatLon> intermediateRequestsLatLon = new ArrayList<>();
+	private OnDismissListener onDismissListener;
+	private List<BaseRouteCard> routeCards = new ArrayList<BaseRouteCard>();
+
+	private OnMarkerSelectListener onMarkerSelectListener;
+	private StateChangedListener<Void> onStateChangedListener;
+	private View mainView;
+
+	private int currentMenuState;
+	private boolean portraitMode;
+
+	private static final long SPINNER_MY_LOCATION_ID = 1;
+	public static final long SPINNER_FAV_ID = 2;
+	public static final long SPINNER_MAP_ID = 3;
+	public static final long SPINNER_ADDRESS_ID = 4;
+	private static final long SPINNER_START_ID = 5;
+	private static final long SPINNER_FINISH_ID = 6;
+	private static final long SPINNER_HINT_ID = 100;
+	public static final long SPINNER_MAP_MARKER_1_ID = 301;
+	public static final long SPINNER_MAP_MARKER_2_ID = 302;
+	private static final long SPINNER_MAP_MARKER_3_ID = 303;
+	public static final long SPINNER_MAP_MARKER_MORE_ID = 350;
+
+	public interface OnMarkerSelectListener {
+		void onSelect(int index, boolean target, boolean intermediate);
+	}
+
+	public MapRouteInfoMenu(MapActivity mapActivity, MapControlsLayer mapControlsLayer) {
+		this.mapActivity = mapActivity;
+		this.app = mapActivity.getMyApplication();
+		this.mapControlsLayer = mapControlsLayer;
+		this.routingHelper = mapActivity.getRoutingHelper();
+		this.transportHelper = routingHelper.getTransportRoutingHelper();
+		this.routingOptionsHelper = app.getRoutingOptionsHelper();
+
+		routingHelper.addListener(this);
+		portraitMode = AndroidUiHelper.isOrientationPortrait(mapActivity);
+		currentMenuState = getInitialMenuState();
+
+		geocodingLookupService = mapActivity.getMyApplication().getGeocodingLookupService();
+		onMarkerSelectListener = new OnMarkerSelectListener() {
+			@Override
+			public void onSelect(int index, boolean target, boolean intermediate) {
+				selectMapMarker(index, target, intermediate);
+			}
+		};
+		onStateChangedListener = new StateChangedListener<Void>() {
+			@Override
+			public void stateChanged(Void change) {
+				updateMenu();
+			}
+		};
+	}
+
+	private int getInitialMenuState() {
+		if (!portraitMode) {
+			return MenuState.FULL_SCREEN;
+		} else {
+			return getInitialMenuStatePortrait();
+		}
+	}
+
+	public OnDismissListener getOnDismissListener() {
+		return onDismissListener;
+	}
+
+	public void setOnDismissListener(OnDismissListener onDismissListener) {
+		this.onDismissListener = onDismissListener;
+	}
+
+	public boolean isSelectFromMapTouch() {
+		return selectFromMapTouch;
+	}
+
+	public void cancelSelectionFromMap() {
+		selectFromMapTouch = false;
+	}
+
+	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
+		if (selectFromMapTouch) {
+			LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y);
+			selectFromMapTouch = false;
+			if (selectFromMapForIntermediate) {
+				getTargets().navigateToPoint(latlon, true, getTargets().getIntermediatePoints().size());
+			} else if (selectFromMapForTarget) {
+				getTargets().navigateToPoint(latlon, true, -1);
+			} else {
+				getTargets().setStartPoint(latlon, true, null);
+			}
+			show();
+			if (selectFromMapForIntermediate && getTargets().checkPointToNavigateShort()) {
+				WaypointsFragment.showInstance(mapActivity);
+			}
+			return true;
+		}
+		return false;
+	}
+
+	public OnMarkerSelectListener getOnMarkerSelectListener() {
+		return onMarkerSelectListener;
+	}
+
+	public void addTargetPointListener() {
+		app.getTargetPointsHelper().addListener(onStateChangedListener);
+	}
+
+	private void removeTargetPointListener() {
+		app.getTargetPointsHelper().removeListener(onStateChangedListener);
+	}
+
+	private void cancelStartPointAddressRequest() {
+		if (startPointRequest != null) {
+			geocodingLookupService.cancel(startPointRequest);
+			startPointRequest = null;
+		}
+	}
+
+	private void cancelTargetPointAddressRequest() {
+		if (targetPointRequest != null) {
+			geocodingLookupService.cancel(targetPointRequest);
+			targetPointRequest = null;
+		}
+	}
+
+	public void setVisible(boolean visible) {
+		if (visible) {
+			if (showMenu) {
+				show();
+				showMenu = false;
+			}
+			controlVisible = true;
+		} else {
+			hide();
+			controlVisible = false;
+		}
+	}
+
+	public int getCurrentMenuState() {
+		return currentMenuState;
+	}
+
+	public int getSupportedMenuStates() {
+		if (!portraitMode) {
+			return MenuState.FULL_SCREEN;
+		} else {
+			return getSupportedMenuStatesPortrait();
+		}
+	}
+
+	protected int getInitialMenuStatePortrait() {
+		return MenuState.HEADER_ONLY;
+	}
+
+	protected int getSupportedMenuStatesPortrait() {
+		return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN | MenuState.FULL_SCREEN;
+	}
+
+	public boolean slideUp() {
+		int v = currentMenuState;
+		for (int i = 0; i < 2; i++) {
+			v = v << 1;
+			if ((v & getSupportedMenuStates()) != 0) {
+				currentMenuState = v;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public boolean slideDown() {
+		int v = currentMenuState;
+		for (int i = 0; i < 2; i++) {
+			v = v >> 1;
+			if ((v & getSupportedMenuStates()) != 0) {
+				currentMenuState = v;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public void showHideMenu() {
+		intermediateRequestsLatLon.clear();
+		if (isVisible()) {
+			hide();
+		} else {
+			show();
+		}
+	}
+
+	public void updateRouteCalculationProgress(int progress) {
+		WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
+		if (fragmentRef != null && fragmentRef.get().isVisible()) {
+			fragmentRef.get().updateRouteCalculationProgress(progress);
+			fragmentRef.get().updateControlButtons();
+		}
+	}
+
+	public void routeCalculationFinished() {
+		WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
+		if (fragmentRef != null && fragmentRef.get().isVisible()) {
+			fragmentRef.get().hideRouteCalculationProgressBar();
+			fragmentRef.get().updateControlButtons();
+			fragmentRef.get().updateInfo();
+			if (currentMenuState == MenuState.HEADER_ONLY) {
+				fragmentRef.get().openMenuHalfScreen();
+			}
+		}
+	}
+
+	public void updateMenu() {
+		WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
+		if (fragmentRef != null)
+			fragmentRef.get().updateInfo();
+	}
+
+	public void updateFromIcon() {
+		WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
+		if (fragmentRef != null)
+			fragmentRef.get().updateFromIcon();
+	}
+
+	public void build(LinearLayout rootView) {
+		rootView.removeAllViews();
+		for (BaseRouteCard card : routeCards) {
+			rootView.addView(card.build(mapActivity));
+		}
+	}
+
+	public void updateInfo(final View main) {
+		mainView = main;
+		nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		updateViaView(main);
+		updateFromSpinner(main);
+		updateToSpinner(main);
+		updateApplicationModes(main);
+		updateApplicationModesOptions(main);
+		updateOptionsButtons(main);
+
+		routeCards.clear();
+		if (isBasicRouteCalculated()) {
+			GPXUtilities.GPXFile gpx = GPXUtilities.makeGpxFromRoute(routingHelper.getRoute());
+			if (gpx != null) {
+				routeCards.add(new SimpleRouteCard(mapActivity, gpx));
+				LinearLayout cardsContainer = (LinearLayout) mainView.findViewById(R.id.route_menu_cards_container);
+				build(cardsContainer);
+			}
+		} else if (isTransportRouteCalculated()) {
+			List<TransportRoutePlanner.TransportRouteResult> routes = transportHelper.getRoutes();
+			for (int i = 0; i < routes.size(); i++) {
+				PublicTransportCard card = new PublicTransportCard(mapActivity, routes.get(i), i);
+				card.setShowBottomShadow(i == routes.size() - 1);
+				card.setShowTopShadow(i != 0);
+				routeCards.add(card);
+			}
+			LinearLayout cardsContainer = (LinearLayout) mainView.findViewById(R.id.route_menu_cards_container);
+			build(cardsContainer);
+		} else {
+			updateRouteCalcProgress(main);
+		}
+	}
+
+	public boolean isRouteCalculated() {
+		return isBasicRouteCalculated() || isTransportRouteCalculated();
+	}
+
+	public boolean isTransportRouteCalculated() {
+		return routingHelper.isPublicTransportMode() && transportHelper.getRoutes() != null;
+	}
+
+	public boolean isBasicRouteCalculated() {
+		return routingHelper.getFinalLocation() != null && routingHelper.isRouteCalculated();
+	}
+
+	private void updateApplicationModesOptions(final View parentView) {
+		parentView.findViewById(R.id.app_modes_options).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				availableProfileDialog();
+			}
+		});
+	}
+
+	private void availableProfileDialog() {
+		AlertDialog.Builder b = new AlertDialog.Builder(mapActivity);
+		final OsmandSettings settings = mapActivity.getMyApplication().getSettings();
+		final List<ApplicationMode> modes = ApplicationMode.allPossibleValues();
+		modes.remove(ApplicationMode.DEFAULT);
+		final Set<ApplicationMode> selected = new LinkedHashSet<ApplicationMode>(ApplicationMode.values(mapActivity.getMyApplication()));
+		selected.remove(ApplicationMode.DEFAULT);
+		View v = AppModeDialog.prepareAppModeView(mapActivity, modes, selected, null, false, true, false,
+				new View.OnClickListener() {
+
+					@Override
+					public void onClick(View v) {
+						StringBuilder vls = new StringBuilder(ApplicationMode.DEFAULT.getStringKey() + ",");
+						for (ApplicationMode mode : modes) {
+							if (selected.contains(mode)) {
+								vls.append(mode.getStringKey()).append(",");
+							}
+						}
+						settings.AVAILABLE_APP_MODES.set(vls.toString());
+					}
+				});
+		b.setTitle(R.string.profile_settings);
+		b.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				updateApplicationModes(mainView);
+			}
+		});
+		b.setView(v);
+		b.show();
+	}
+
+	private void updateApplicationMode(ApplicationMode mode, ApplicationMode next) {
+		OsmandPreference<ApplicationMode> appMode
+				= mapActivity.getMyApplication().getSettings().APPLICATION_MODE;
+		if (routingHelper.isFollowingMode() && appMode.get() == mode) {
+			appMode.set(next);
+		}
+		routingHelper.setAppMode(next);
+		mapActivity.getMyApplication().initVoiceCommandPlayer(mapActivity, next, true, null, false, false);
+		routingHelper.recalculateRouteDueToSettingsChange();
+	}
+
+	private void updateRouteCalcProgress(final View main) {
+		LinearLayout cardsContainer = (LinearLayout) main.findViewById(R.id.route_menu_cards_container);
+		if (cardsContainer != null) {
+			cardsContainer.removeAllViews();
+		}
+	}
+
+	private void updateApplicationModes(final View parentView) {
+		final ApplicationMode am = routingHelper.getAppMode();
+		final Set<ApplicationMode> selected = new HashSet<>();
+		selected.add(am);
+		ViewGroup vg = (ViewGroup) parentView.findViewById(R.id.app_modes);
+		vg.removeAllViews();
+		View.OnClickListener listener = new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				if (selected.size() > 0) {
+					ApplicationMode next = selected.iterator().next();
+					updateApplicationMode(am, next);
+				}
+				updateOptionsButtons(mainView);
+			}
+		};
+		final List<ApplicationMode> values = new ArrayList<ApplicationMode>(ApplicationMode.values(mapActivity.getMyApplication()));
+		values.remove(ApplicationMode.DEFAULT);
+
+		if (values.size() > 0 && !values.contains(am)) {
+			ApplicationMode next = values.iterator().next();
+			updateApplicationMode(am, next);
+		}
+
+		View ll = mapActivity.getLayoutInflater().inflate(R.layout.mode_toggles, vg);
+		ll.setBackgroundColor(ContextCompat.getColor(mapActivity, nightMode ? R.color.route_info_bg_dark : R.color.route_info_bg_light));
+
+		HorizontalScrollView scrollView = ll.findViewById(R.id.app_modes_scroll_container);
+		scrollView.setVerticalScrollBarEnabled(false);
+		scrollView.setHorizontalScrollBarEnabled(false);
+
+		final View[] buttons = new View[values.size()];
+		int k = 0;
+		Iterator<ApplicationMode> iterator = values.iterator();
+		while (iterator.hasNext()) {
+			ApplicationMode mode = iterator.next();
+			View toggle = AppModeDialog.createToggle(mapActivity.getLayoutInflater(), (OsmandApplication) mapActivity.getApplication(), R.layout.mode_view_route_preparation, (LinearLayout) ll.findViewById(R.id.app_modes_content), mode, true);
+
+			if (!iterator.hasNext() && toggle.getLayoutParams() instanceof ViewGroup.MarginLayoutParams) {
+				ViewGroup.MarginLayoutParams p = (ViewGroup.MarginLayoutParams) toggle.getLayoutParams();
+				p.setMargins(p.leftMargin, p.topMargin, p.rightMargin + mapActivity.getResources().getDimensionPixelSize(R.dimen.content_padding), p.bottomMargin);
+			}
+
+			buttons[k++] = toggle;
+		}
+		for (int i = 0; i < buttons.length; i++) {
+			AppModeDialog.updateButtonState2((OsmandApplication) mapActivity.getApplication(), values, selected, listener, buttons, i, true, true, nightMode);
+		}
+	}
+
+	private void updateOptionsButtons(final View main) {
+		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		final OsmandSettings settings = app.getSettings();
+		final int colorActive = ContextCompat.getColor(app, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+		final int colorDisabled = ContextCompat.getColor(app, R.color.description_font_and_bottom_sheet_icons);
+		final ApplicationMode applicationMode = routingHelper.getAppMode();
+		final RoutingOptionsHelper.RouteMenuAppModes mode = routingOptionsHelper.modes.get(applicationMode);
+		int margin = AndroidUtils.dpToPx(app, 3);
+
+		View startButton = main.findViewById(R.id.start_button);
+		if (isRouteCalculated()) {
+			AndroidUtils.setBackground(app, startButton, nightMode, R.color.active_buttons_and_links_light, R.color.active_buttons_and_links_dark);
+			int color = nightMode ? R.color.main_font_dark : R.color.card_and_list_background_light;
+			((TextView) main.findViewById(R.id.start_button_descr)).setTextColor(ContextCompat.getColor(app, color));
+			((ImageView) main.findViewById(R.id.start_icon)).setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_start_navigation, color));
+		} else {
+			AndroidUtils.setBackground(app, startButton, nightMode, R.color.activity_background_light, R.color.route_info_cancel_button_color_dark);
+			int color = R.color.description_font_and_bottom_sheet_icons;
+			((TextView) main.findViewById(R.id.start_button_descr)).setTextColor(ContextCompat.getColor(app, color));
+			((ImageView) main.findViewById(R.id.start_icon)).setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_start_navigation, color));
+		}
+		startButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				clickRouteGo();
+			}
+		});
+
+		View cancelButton = main.findViewById(R.id.cancel_button);
+		AndroidUtils.setBackground(app, cancelButton, nightMode, R.color.card_and_list_background_light, R.color.card_and_list_background_dark);
+		cancelButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				clickRouteCancel();
+			}
+		});
+
+		LinearLayout optionsButton = (LinearLayout) main.findViewById(R.id.map_options_route_button);
+		TextView optionsTitle = (TextView) main.findViewById(R.id.map_options_route_button_title);
+		ImageView optionsIcon = (ImageView) main.findViewById(R.id.map_options_route_button_icon);
+		Drawable drawable = app.getUIUtilities().getIcon(R.drawable.map_action_settings, nightMode ? R.color.route_info_control_icon_color_dark : R.color.route_info_control_icon_color_light);
+		if (Build.VERSION.SDK_INT >= 21) {
+			Drawable active = app.getUIUtilities().getIcon(R.drawable.map_action_settings, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+			drawable = AndroidUtils.createPressedStateListDrawable(drawable, active);
+		}
+		optionsIcon.setImageDrawable(drawable);
+		optionsButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				clickRouteParams();
+			}
+		});
+		AndroidUtils.setBackground(app, optionsButton, nightMode, R.drawable.route_info_trans_gradient_light, R.drawable.route_info_trans_gradient_dark);
+
+		HorizontalScrollView scrollView = mainView.findViewById(R.id.route_options_scroll_container);
+		scrollView.setVerticalScrollBarEnabled(false);
+		scrollView.setHorizontalScrollBarEnabled(false);
+
+		LinearLayout optionsContainer = (LinearLayout) main.findViewById(R.id.route_options_container);
+		optionsContainer.removeAllViews();
+		if (mode == null) {
+			return;
+		}
+
+		LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT);
+		LinearLayout.LayoutParams newLp = new LinearLayout.LayoutParams(AndroidUtils.dpToPx(app, 100), ViewGroup.LayoutParams.MATCH_PARENT);
+
+		lp.setMargins(margin, 0, margin, 0);
+
+		if (mode.parameters.size() > 2) {
+			optionsTitle.setVisibility(View.GONE);
+		} else {
+			optionsTitle.setVisibility(View.VISIBLE);
+		}
+
+		for (final RoutingOptionsHelper.LocalRoutingParameter parameter : mode.parameters) {
+			if (parameter instanceof RoutingOptionsHelper.MuteSoundRoutingParameter) {
+				String text = null;
+				boolean active = !app.getRoutingHelper().getVoiceRouter().isMute();
+				if (mode.parameters.size() <= 2) {
+					text = app.getString(active ? R.string.shared_string_on : R.string.shared_string_off);
+				}
+				View item = createToolbarOptionView(active, text, parameter.getActiveIconId(), parameter.getDisabledIconId(), new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						routingOptionsHelper.switchSound();
+						boolean active = !app.getRoutingHelper().getVoiceRouter().isMute();
+						String text = app.getString(active ? R.string.shared_string_on : R.string.shared_string_off);
+
+						Drawable itemDrawable = app.getUIUtilities().getIcon(active ? parameter.getActiveIconId() : parameter.getDisabledIconId(), nightMode ? R.color.route_info_control_icon_color_dark : R.color.route_info_control_icon_color_light);
+						Drawable activeItemDrawable = app.getUIUtilities().getIcon(active ? parameter.getActiveIconId() : parameter.getDisabledIconId(), nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+
+						if (Build.VERSION.SDK_INT >= 21) {
+							itemDrawable = AndroidUtils.createPressedStateListDrawable(itemDrawable, activeItemDrawable);
+						}
+
+						((ImageView) v.findViewById(R.id.route_option_image_view)).setImageDrawable(active ? activeItemDrawable : itemDrawable);
+						((TextView) v.findViewById(R.id.route_option_title)).setText(text);
+						((TextView) v.findViewById(R.id.route_option_title)).setTextColor(active ? colorActive : colorDisabled);
+					}
+				});
+				optionsContainer.addView(item, lp);
+			} else if (parameter instanceof RoutingOptionsHelper.ShowAlongTheRouteItem) {
+				final Set<PoiUIFilter> poiFilters = app.getPoiFilters().getSelectedPoiFilters();
+				final boolean traffic = app.getSettings().SHOW_TRAFFIC_WARNINGS.getModeValue(applicationMode);
+				final boolean fav = app.getSettings().SHOW_NEARBY_FAVORITES.getModeValue(applicationMode);
+				if (!poiFilters.isEmpty()) {
+					final LinearLayout item = createToolbarOptionView(false, null, -1, -1, null);
+					item.findViewById(R.id.route_option_container).setVisibility(View.GONE);
+					Iterator<PoiUIFilter> it = poiFilters.iterator();
+					while (it.hasNext()) {
+						final PoiUIFilter poiUIFilter = it.next();
+						final LinearLayout container = createToolbarSubOptionView(true, poiUIFilter.getName(), R.drawable.ic_action_remove_dark, !it.hasNext(), new View.OnClickListener() {
+							@Override
+							public void onClick(View v) {
+								app.getPoiFilters().removeSelectedPoiFilter(poiUIFilter);
+								mapActivity.getMapView().refreshMap();
+								updateOptionsButtons(mainView);
+							}
+						});
+						item.addView(container, newLp);
+					}
+					optionsContainer.addView(item, lp);
+				}
+				if (traffic) {
+					final LinearLayout item = createToolbarOptionView(false, null, -1, -1, null);
+					item.findViewById(R.id.route_option_container).setVisibility(View.GONE);
+					final LinearLayout container = createToolbarSubOptionView(true, app.getString(R.string.way_alarms), R.drawable.ic_action_remove_dark, true, new View.OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							app.getWaypointHelper().enableWaypointType(WaypointHelper.ALARMS, false);
+							updateOptionsButtons(mainView);
+						}
+					});
+					AndroidUtils.setBackground(app, container, nightMode, R.drawable.btn_border_trans_light, R.drawable.btn_border_trans_dark);
+					item.addView(container, newLp);
+					optionsContainer.addView(item, lp);
+				}
+				if (fav) {
+					final LinearLayout item = createToolbarOptionView(false, null, -1, -1, null);
+					item.findViewById(R.id.route_option_container).setVisibility(View.GONE);
+					final LinearLayout container = createToolbarSubOptionView(true, app.getString(R.string.favourites), R.drawable.ic_action_remove_dark, true, new View.OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							app.getWaypointHelper().enableWaypointType(WaypointHelper.FAVORITES, false);
+							updateOptionsButtons(mainView);
+						}
+					});
+					AndroidUtils.setBackground(app, container, nightMode, R.drawable.btn_border_trans_light, R.drawable.btn_border_trans_dark);
+					item.addView(container, newLp);
+					optionsContainer.addView(item, lp);
+				}
+			} else if (parameter instanceof RoutingOptionsHelper.AvoidRoadsTypesRoutingParameter) {
+				final LinearLayout item = createToolbarOptionView(false, null, -1, -1, null);
+				item.findViewById(R.id.route_option_container).setVisibility(View.GONE);
+
+				List<GeneralRouter.RoutingParameter> avoidParameters = routingOptionsHelper.getAvoidRoutingPrefsForAppMode(applicationMode);
+				final List<GeneralRouter.RoutingParameter> avoidedParameters = new ArrayList<GeneralRouter.RoutingParameter>();
+				for (int i = 0; i < avoidParameters.size(); i++) {
+					GeneralRouter.RoutingParameter p = avoidParameters.get(i);
+					OsmandSettings.CommonPreference<Boolean> preference = settings.getCustomRoutingBooleanProperty(p.getId(), p.getDefaultBoolean());
+					if (preference != null && preference.get()) {
+						avoidedParameters.add(p);
+					}
+				}
+				if (avoidedParameters.isEmpty()) {
+					continue;
+				}
+				for (int i = 0; i < avoidedParameters.size(); i++) {
+					final GeneralRouter.RoutingParameter routingParameter = avoidedParameters.get(i);
+					final LinearLayout container = createToolbarSubOptionView(false, SettingsBaseActivity.getRoutingStringPropertyName(app, routingParameter.getId(), routingParameter.getName()), R.drawable.ic_action_remove_dark, i == avoidedParameters.size() - 1, new View.OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							OsmandSettings.CommonPreference<Boolean> preference = settings.getCustomRoutingBooleanProperty(routingParameter.getId(), routingParameter.getDefaultBoolean());
+							preference.set(false);
+							avoidedParameters.remove(routingParameter);
+							if (avoidedParameters.isEmpty()) {
+								mode.parameters.remove(parameter);
+							}
+							if (mode.parameters.size() > 2) {
+								item.removeView(v);
+							} else {
+								updateOptionsButtons(mainView);
+							}
+						}
+					});
+					item.addView(container, newLp);
+				}
+				optionsContainer.addView(item, lp);
+			} else if (parameter instanceof RoutingOptionsHelper.AvoidRoadsRoutingParameter) {
+				final LinearLayout item = createToolbarOptionView(false, null, -1, -1, null);
+				item.findViewById(R.id.route_option_container).setVisibility(View.GONE);
+				AvoidSpecificRoads avoidSpecificRoads = app.getAvoidSpecificRoads();
+				Map<LatLon, RouteDataObject> impassableRoads = avoidSpecificRoads.getImpassableRoads();
+				if (impassableRoads.isEmpty()) {
+					continue;
+				}
+				Iterator<RouteDataObject> it = impassableRoads.values().iterator();
+				while (it.hasNext()) {
+					final RouteDataObject routeDataObject = it.next();
+					final LinearLayout container = createToolbarSubOptionView(false, avoidSpecificRoads.getText(routeDataObject), R.drawable.ic_action_remove_dark, !it.hasNext(), new View.OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							if (routeDataObject != null) {
+								app.getAvoidSpecificRoads().removeImpassableRoad(routeDataObject);
+							}
+							if (routingHelper.isRouteCalculated() || routingHelper.isRouteBeingCalculated()) {
+								routingHelper.recalculateRouteDueToSettingsChange();
+							}
+							if (app.getAvoidSpecificRoads().getImpassableRoads().isEmpty()) {
+								mode.parameters.remove(parameter);
+							}
+							mapActivity.getMapView().refreshMap();
+							if (mode.parameters.size() > 2) {
+								item.removeView(v);
+							} else {
+								updateOptionsButtons(mainView);
+							}
+						}
+					});
+					item.addView(container, newLp);
+				}
+				optionsContainer.addView(item, lp);
+			} else if (parameter instanceof RoutingOptionsHelper.LocalRoutingParameterGroup) {
+				final RoutingOptionsHelper.LocalRoutingParameterGroup group = (RoutingOptionsHelper.LocalRoutingParameterGroup) parameter;
+				String text = null;
+				RoutingOptionsHelper.LocalRoutingParameter selected = group.getSelected(settings);
+				if (selected != null) {
+					text = group.getText(mapActivity);
+				}
+				View item = createToolbarOptionView(false, text, parameter.getActiveIconId(), parameter.getDisabledIconId(), new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						routingOptionsHelper.showLocalRoutingParameterGroupDialog(group, mapActivity, new RoutingOptionsHelper.OnClickListener() {
+							@Override
+							public void onClick() {
+								updateOptionsButtons(mainView);
+							}
+						});
+					}
+				});
+				optionsContainer.addView(item, lp);
+			} else {
+				String text;
+				boolean active;
+				if (parameter.routingParameter != null) {
+					if (parameter.routingParameter.getId().equals(GeneralRouter.USE_SHORTEST_WAY)) {
+						// if short route settings - it should be inverse of fast_route_mode
+						active = !settings.FAST_ROUTE_MODE.getModeValue(routingHelper.getAppMode());
+					} else {
+						active = parameter.isSelected(settings);
+					}
+					text = parameter.getText(mapActivity);
+					View item = createToolbarOptionView(active, text, parameter.getActiveIconId(), parameter.getDisabledIconId(), new View.OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							if (parameter.routingParameter != null) {
+								boolean selected = !parameter.isSelected(settings);
+								routingOptionsHelper.applyRoutingParameter(parameter, selected);
+
+								Drawable itemDrawable = app.getUIUtilities().getIcon(selected ? parameter.getActiveIconId() : parameter.getDisabledIconId(), nightMode ? R.color.route_info_control_icon_color_dark : R.color.route_info_control_icon_color_light);
+								Drawable activeItemDrawable = app.getUIUtilities().getIcon(selected ? parameter.getActiveIconId() : parameter.getDisabledIconId(), nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+
+								if (Build.VERSION.SDK_INT >= 21) {
+									itemDrawable = AndroidUtils.createPressedStateListDrawable(itemDrawable, activeItemDrawable);
+								}
+								((ImageView) v.findViewById(R.id.route_option_image_view)).setImageDrawable(selected ? activeItemDrawable : itemDrawable);
+								((TextView) v.findViewById(R.id.route_option_title)).setTextColor(selected ? colorActive : colorDisabled);
+							}
+						}
+					});
+					LinearLayout.LayoutParams newLp2 = new LinearLayout.LayoutParams(AndroidUtils.dpToPx(app, 100), ViewGroup.LayoutParams.MATCH_PARENT);
+					newLp2.setMargins(margin, 0, margin, 0);
+					optionsContainer.addView(item, newLp2);
+				}
+			}
+		}
+		int rightPadding = AndroidUtils.dpToPx(app, 70);
+		if (optionsTitle.getVisibility() == View.VISIBLE) {
+			rightPadding += AndroidUtils.getTextWidth(app.getResources().getDimensionPixelSize(R.dimen.text_button_text_size), app.getString(R.string.shared_string_options));
+		}
+		optionsContainer.setPadding(optionsContainer.getPaddingLeft(), optionsContainer.getPaddingTop(), rightPadding, optionsContainer.getPaddingBottom());
+	}
+
+	private LinearLayout createToolbarOptionView(boolean active, String title, @DrawableRes int activeIconId, @DrawableRes int disabledIconId, View.OnClickListener listener) {
+		final LinearLayout item = (LinearLayout) mapActivity.getLayoutInflater().inflate(R.layout.route_option_btn, null);
+		final TextView textView = (TextView) item.findViewById(R.id.route_option_title);
+		final ImageView imageView = (ImageView) item.findViewById(R.id.route_option_image_view);
+		final int colorActive = ContextCompat.getColor(app, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+		final int colorDisabled = ContextCompat.getColor(app, R.color.description_font_and_bottom_sheet_icons);
+
+		AndroidUtils.setBackground(app, item, nightMode, R.drawable.btn_border_trans_light, R.drawable.btn_border_trans_dark);
+		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+			AndroidUtils.setBackground(app, item.findViewById(R.id.route_option_container), nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+		}
+
+		Drawable itemDrawable = null;
+		Drawable activeItemDrawable = null;
+		if (activeIconId != -1 && disabledIconId != -1) {
+			itemDrawable = app.getUIUtilities().getIcon(active ? activeIconId : disabledIconId, nightMode ? R.color.route_info_control_icon_color_dark : R.color.route_info_control_icon_color_light);
+			activeItemDrawable = app.getUIUtilities().getIcon(active ? activeIconId : disabledIconId, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+			if (Build.VERSION.SDK_INT >= 21) {
+				itemDrawable = AndroidUtils.createPressedStateListDrawable(itemDrawable, activeItemDrawable);
+			}
+		}
+		if (title == null) {
+			textView.setVisibility(View.GONE);
+			if (activeItemDrawable != null && itemDrawable != null) {
+				imageView.setImageDrawable(active ? activeItemDrawable : itemDrawable);
+			} else {
+				imageView.setVisibility(View.GONE);
+			}
+		} else {
+			textView.setVisibility(View.VISIBLE);
+			textView.setTextColor(active ? colorActive : colorDisabled);
+			textView.setText(title);
+			if (activeItemDrawable != null && itemDrawable != null) {
+				imageView.setImageDrawable(active ? activeItemDrawable : itemDrawable);
+			} else {
+				imageView.setVisibility(View.GONE);
+			}
+		}
+		item.setOnClickListener(listener);
+
+		return item;
+	}
+
+	private LinearLayout createToolbarSubOptionView(boolean hideTextLine, String title, @DrawableRes int iconId, boolean lastItem, View.OnClickListener listener) {
+		final LinearLayout container = (LinearLayout) mapActivity.getLayoutInflater().inflate(R.layout.route_options_container, null);
+		final TextView routeOptionTV = (TextView) container.findViewById(R.id.route_removable_option_title);
+		final ImageView routeOptionImageView = (ImageView) container.findViewById(R.id.removable_option_icon);
+
+		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+			AndroidUtils.setForeground(app, container, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+		} else {
+			AndroidUtils.setForeground(app, container, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+		}
+		AndroidUtils.setBackground(app, container.findViewById(R.id.options_divider_end), nightMode, R.color.divider_light, R.color.divider_dark);
+		AndroidUtils.setBackground(app, routeOptionImageView, nightMode, R.drawable.route_info_trans_gradient_light, R.drawable.route_info_trans_gradient_dark);
+
+		if (lastItem) {
+			container.findViewById(R.id.options_divider_end).setVisibility(View.GONE);
+		} else {
+			container.findViewById(R.id.options_divider_end).setVisibility(View.VISIBLE);
+		}
+		if (hideTextLine) {
+			container.findViewById(R.id.title_divider).setVisibility(View.GONE);
+		}
+		routeOptionTV.setText(title);
+		routeOptionImageView.setImageDrawable(app.getUIUtilities().getIcon(iconId, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light));
+		container.setOnClickListener(listener);
+
+		return container;
+	}
+
+	private void clickRouteGo() {
+		if (getTargets().getPointToNavigate() != null) {
+			hide();
+		}
+		if (isTransportRouteCalculated()) {
+			ChooseRouteFragment.showInstance(mapActivity.getSupportFragmentManager());
+		} else {
+			mapControlsLayer.startNavigation();
+		}
+	}
+
+	private void clickRouteCancel() {
+		mapControlsLayer.stopNavigation();
+	}
+
+	private void clickRouteParams() {
+		RouteOptionsBottomSheet.showInstance(mapActivity.getSupportFragmentManager());
+	}
+
+	private void clickRouteWaypoints() {
+		if (getTargets().checkPointToNavigateShort()) {
+			mapActivity.getMapActions().openIntermediatePointsDialog();
+		}
+	}
+
+	private void updateViaView(final View parentView) {
+		String via = generateViaDescription();
+		View viaLayout = parentView.findViewById(R.id.ViaLayout);
+		View viaLayoutDivider = parentView.findViewById(R.id.viaLayoutDivider);
+		if (via.length() == 0) {
+			viaLayout.setVisibility(View.GONE);
+			viaLayoutDivider.setVisibility(View.GONE);
+		} else {
+			viaLayout.setVisibility(View.VISIBLE);
+			viaLayoutDivider.setVisibility(View.VISIBLE);
+			((TextView) parentView.findViewById(R.id.ViaView)).setText(via);
+			((TextView) parentView.findViewById(R.id.ViaSubView)).setText(app.getString(R.string.intermediate_destinations, getTargets().getIntermediatePoints().size()));
+		}
+		FrameLayout viaButton = (FrameLayout) parentView.findViewById(R.id.via_button);
+
+		viaButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+//				clickRouteWaypoints();
+				if (getTargets().checkPointToNavigateShort()) {
+					WaypointsFragment.showInstance(mapActivity);
+				}
+			}
+		});
+
+		ImageView viaIcon = (ImageView) parentView.findViewById(R.id.viaIcon);
+		viaIcon.setImageDrawable(getIconOrig(R.drawable.list_intermediate));
+		viaIcon.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				clickRouteWaypoints();
+			}
+		});
+		LinearLayout viaButtonContainer = (LinearLayout) parentView.findViewById(R.id.via_button_container);
+
+		AndroidUtils.setBackground(app, viaButton, nightMode, R.drawable.btn_border_trans_rounded_light, R.drawable.btn_border_trans_rounded_dark);
+		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+			AndroidUtils.setBackground(app, viaButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark);
+		} else {
+			AndroidUtils.setBackground(app, viaButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark);
+		}
+		ImageView viaButtonImageView = (ImageView) parentView.findViewById(R.id.via_button_image_view);
+
+		Drawable normal = mapActivity.getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_edit_dark, nightMode ? R.color.route_info_control_icon_color_dark : R.color.route_info_control_icon_color_light);
+		if (Build.VERSION.SDK_INT >= 21) {
+			Drawable active = mapActivity.getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_edit_dark, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+
+			normal = AndroidUtils.createPressedStateListDrawable(normal, active);
+		}
+		viaButtonImageView.setImageDrawable(normal);
+	}
+
+	private void updateToSpinner(final View parentView) {
+		final Spinner toSpinner = setupToSpinner(parentView);
+		toSpinner.setClickable(false);
+		final View toLayout = parentView.findViewById(R.id.ToLayout);
+		toSpinner.setOnTouchListener(new View.OnTouchListener() {
+			@Override
+			public boolean onTouch(View v, MotionEvent event) {
+				event.offsetLocation(AndroidUtils.dpToPx(mapActivity, 48f), 0);
+				toLayout.onTouchEvent(event);
+				return true;
+			}
+		});
+		toSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+			@Override
+			public void onItemSelected(AdapterView<?> parent, View view, int position, final long id) {
+				parentView.post(new Runnable() {
+					@Override
+					public void run() {
+						if (id == SPINNER_FAV_ID) {
+							selectFavorite(parentView, true, false);
+						} else if (id == SPINNER_MAP_ID) {
+							selectOnScreen(true, false);
+						} else if (id == SPINNER_ADDRESS_ID) {
+							mapActivity.showQuickSearch(MapActivity.ShowQuickSearchMode.DESTINATION_SELECTION, false);
+							setupToSpinner(parentView);
+						} else if (id == SPINNER_MAP_MARKER_MORE_ID) {
+							selectMapMarker(-1, true, false);
+							setupToSpinner(parentView);
+						} else if (id == SPINNER_MAP_MARKER_1_ID) {
+							selectMapMarker(0, true, false);
+						} else if (id == SPINNER_MAP_MARKER_2_ID) {
+							selectMapMarker(1, true, false);
+						} else if (id == SPINNER_MAP_MARKER_3_ID) {
+							selectMapMarker(2, true, false);
+						}
+					}
+				});
+			}
+
+			@Override
+			public void onNothingSelected(AdapterView<?> parent) {
+			}
+		});
+
+		toLayout.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				openAddPointDialog(true, false);
+			}
+		});
+
+		final FrameLayout toButton = (FrameLayout) parentView.findViewById(R.id.to_button);
+		final LinearLayout toButtonContainer = (LinearLayout) parentView.findViewById(R.id.to_button_container);
+
+		AndroidUtils.setBackground(app, toButton, nightMode, R.drawable.btn_border_trans_rounded_light, R.drawable.btn_border_trans_rounded_dark);
+		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+			AndroidUtils.setBackground(app, toButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark);
+		} else {
+			AndroidUtils.setBackground(app, toButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark);
+		}
+		ImageView toButtonImageView = (ImageView) parentView.findViewById(R.id.to_button_image_view);
+
+		Drawable normal = mapActivity.getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_plus, nightMode ? R.color.route_info_control_icon_color_dark : R.color.route_info_control_icon_color_light);
+		if (Build.VERSION.SDK_INT >= 21) {
+			Drawable active = mapActivity.getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_plus, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+
+			normal = AndroidUtils.createPressedStateListDrawable(normal, active);
+		}
+
+		toButtonImageView.setImageDrawable(normal);
+		toButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				openAddPointDialog(false, true);
+			}
+		});
+
+		updateToIcon(parentView);
+	}
+
+	private void updateToIcon(View parentView) {
+		ImageView toIcon = (ImageView) parentView.findViewById(R.id.toIcon);
+		toIcon.setImageDrawable(getIconOrig(R.drawable.list_destination));
+	}
+
+	private void updateFromSpinner(final View parentView) {
+		final TargetPointsHelper targets = getTargets();
+		final Spinner fromSpinner = setupFromSpinner(parentView);
+		fromSpinner.setClickable(false);
+		final View fromLayout = parentView.findViewById(R.id.FromLayout);
+		fromSpinner.setOnTouchListener(new View.OnTouchListener() {
+			@Override
+			public boolean onTouch(View v, MotionEvent event) {
+				event.offsetLocation(AndroidUtils.dpToPx(mapActivity, 48f), 0);
+				fromLayout.onTouchEvent(event);
+				return true;
+			}
+		});
+		fromSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+
+			@Override
+			public void onItemSelected(AdapterView<?> parent, View view, int position, final long id) {
+				parentView.post(new Runnable() {
+					@Override
+					public void run() {
+						if (id == SPINNER_MY_LOCATION_ID) {
+							if (targets.getPointToStart() != null) {
+								targets.clearStartPoint(true);
+								mapActivity.getMyApplication().getSettings().backupPointToStart();
+							}
+							updateFromIcon(parentView);
+						} else if (id == SPINNER_FAV_ID) {
+							selectFavorite(parentView, false, false);
+						} else if (id == SPINNER_MAP_ID) {
+							selectOnScreen(false, false);
+						} else if (id == SPINNER_ADDRESS_ID) {
+							mapActivity.showQuickSearch(MapActivity.ShowQuickSearchMode.START_POINT_SELECTION, false);
+							setupFromSpinner(parentView);
+						} else if (id == SPINNER_MAP_MARKER_MORE_ID) {
+							selectMapMarker(-1, false, false);
+							setupFromSpinner(parentView);
+						} else if (id == SPINNER_MAP_MARKER_1_ID) {
+							selectMapMarker(0, false, false);
+						} else if (id == SPINNER_MAP_MARKER_2_ID) {
+							selectMapMarker(1, false, false);
+						} else if (id == SPINNER_MAP_MARKER_3_ID) {
+							selectMapMarker(2, false, false);
+						}
+					}
+				});
+			}
+
+			@Override
+			public void onNothingSelected(AdapterView<?> parent) {
+			}
+		});
+
+		fromLayout.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				openAddPointDialog(false, false);
+			}
+		});
+
+		FrameLayout fromButton = (FrameLayout) parentView.findViewById(R.id.from_button);
+		final LinearLayout fromButtonContainer = (LinearLayout) parentView.findViewById(R.id.from_button_container);
+
+		AndroidUtils.setBackground(app, fromButton, nightMode, R.drawable.btn_border_trans_rounded_light, R.drawable.btn_border_trans_rounded_dark);
+		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+			AndroidUtils.setBackground(app, fromButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark);
+		} else {
+			AndroidUtils.setBackground(app, fromButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark);
+		}
+
+		ImageView swapDirectionView = (ImageView) parentView.findViewById(R.id.from_button_image_view);
+
+		Drawable normal = mapActivity.getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_change_navigation_points, nightMode ? R.color.route_info_control_icon_color_dark : R.color.route_info_control_icon_color_light);
+		if (Build.VERSION.SDK_INT >= 21) {
+			Drawable active = mapActivity.getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_change_navigation_points, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+			normal = AndroidUtils.createPressedStateListDrawable(normal, active);
+		}
+
+		swapDirectionView.setImageDrawable(normal);
+		fromButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				TargetPointsHelper targetPointsHelper = getTargets();
+				TargetPoint startPoint = targetPointsHelper.getPointToStart();
+				TargetPoint endPoint = targetPointsHelper.getPointToNavigate();
+
+				if (startPoint == null) {
+					Location loc = mapActivity.getMyApplication().getLocationProvider().getLastKnownLocation();
+					if (loc != null) {
+						startPoint = TargetPoint.createStartPoint(new LatLon(loc.getLatitude(), loc.getLongitude()),
+								new PointDescription(PointDescription.POINT_TYPE_MY_LOCATION,
+										mapActivity.getString(R.string.shared_string_my_location)));
+					}
+				}
+
+				if (startPoint != null && endPoint != null) {
+					targetPointsHelper.navigateToPoint(startPoint.point, false, -1, startPoint.getPointDescription(mapActivity));
+					targetPointsHelper.setStartPoint(endPoint.point, false, endPoint.getPointDescription(mapActivity));
+					targetPointsHelper.updateRouteAndRefresh(true);
+				}
+			}
+		});
+
+		updateFromIcon(parentView);
+	}
+
+	public void updateFromIcon(View parentView) {
+		((ImageView) parentView.findViewById(R.id.fromIcon)).setImageDrawable(ContextCompat.getDrawable(mapActivity,
+				getTargets().getPointToStart() == null ? R.drawable.ic_action_location_color : R.drawable.list_startpoint));
+	}
+
+	public void selectOnScreen(boolean target, boolean intermediate) {
+		selectFromMapTouch = true;
+		selectFromMapForTarget = target;
+		selectFromMapForIntermediate = intermediate;
+		hide();
+	}
+
+	public void selectAddress(String name, LatLon l, final boolean target, final boolean intermediate) {
+		PointDescription pd = new PointDescription(PointDescription.POINT_TYPE_ADDRESS, name);
+		if (intermediate) {
+			getTargets().navigateToPoint(l, true, getTargets().getIntermediatePoints().size(), pd);
+		} else if (target) {
+			getTargets().navigateToPoint(l, true, -1, pd);
+		} else {
+			getTargets().setStartPoint(l, true, pd);
+		}
+		updateMenu();
+	}
+
+	public void selectFavorite(@Nullable final View parentView, final boolean target, final boolean intermediate) {
+		FragmentManager fragmentManager = mapActivity.getSupportFragmentManager();
+		FavouritesBottomSheetMenuFragment fragment = new FavouritesBottomSheetMenuFragment();
+		Bundle args = new Bundle();
+		args.putBoolean(FavouritesBottomSheetMenuFragment.TARGET, target);
+		args.putBoolean(FavouritesBottomSheetMenuFragment.INTERMEDIATE, intermediate);
+		fragment.setArguments(args);
+		fragment.show(fragmentManager, FavouritesBottomSheetMenuFragment.TAG);
+	}
+
+	public void setupSpinners(final boolean target, final boolean intermediate) {
+		if (!intermediate && mainView != null) {
+			if (target) {
+				setupToSpinner(mainView);
+			} else {
+				setupFromSpinner(mainView);
+			}
+		}
+	}
+
+	public void selectMapMarker(final int index, final boolean target, final boolean intermediate) {
+		if (index != -1) {
+			MapMarker m = mapActivity.getMyApplication().getMapMarkersHelper().getMapMarkers().get(index);
+			LatLon point = new LatLon(m.getLatitude(), m.getLongitude());
+			if (intermediate) {
+				getTargets().navigateToPoint(point, true, getTargets().getIntermediatePoints().size(), m.getPointDescription(mapActivity));
+			} else if (target) {
+				getTargets().navigateToPoint(point, true, -1, m.getPointDescription(mapActivity));
+			} else {
+				getTargets().setStartPoint(point, true, m.getPointDescription(mapActivity));
+			}
+			updateFromIcon();
+		} else {
+			MapMarkerSelectionFragment selectionFragment = MapMarkerSelectionFragment.newInstance(target, intermediate);
+			selectionFragment.show(mapActivity.getSupportFragmentManager(), MapMarkerSelectionFragment.TAG);
+		}
+	}
+
+	private void openAddPointDialog(final boolean target, final boolean intermediate) {
+		Bundle args = new Bundle();
+		args.putBoolean(AddPointBottomSheetDialog.TARGET_KEY, target);
+		args.putBoolean(AddPointBottomSheetDialog.INTERMEDIATE_KEY, intermediate);
+		AddPointBottomSheetDialog fragment = new AddPointBottomSheetDialog();
+		fragment.setArguments(args);
+		fragment.setUsedOnMap(false);
+		fragment.show(mapActivity.getSupportFragmentManager(), AddPointBottomSheetDialog.TAG);
+	}
+
+	private boolean isLight() {
+		return !nightMode;
+	}
+
+	private Drawable getIconOrig(int iconId) {
+		UiUtilities iconsCache = mapActivity.getMyApplication().getUIUtilities();
+		return iconsCache.getIcon(iconId, 0);
+	}
+
+	public static int getDirectionInfo() {
+		return directionInfo;
+	}
+
+	public static boolean isVisible() {
+		return visible;
+	}
+
+	public WeakReference<MapRouteInfoMenuFragment> findMenuFragment() {
+		Fragment fragment = mapActivity.getSupportFragmentManager().findFragmentByTag(MapRouteInfoMenuFragment.TAG);
+		if (fragment != null && !fragment.isDetached()) {
+			return new WeakReference<>((MapRouteInfoMenuFragment) fragment);
+		} else {
+			return null;
+		}
+	}
+
+	public static boolean isControlVisible() {
+		return controlVisible;
+	}
+
+	public static void showLocationOnMap(MapActivity mapActivity, double latitude, double longitude) {
+		RotatedTileBox tb = mapActivity.getMapView().getCurrentRotatedTileBox().copy();
+		int tileBoxWidthPx = 0;
+		int tileBoxHeightPx = 0;
+
+		MapRouteInfoMenu routeInfoMenu = mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu();
+		WeakReference<MapRouteInfoMenuFragment> fragmentRef = routeInfoMenu.findMenuFragment();
+		if (fragmentRef != null) {
+			MapRouteInfoMenuFragment f = fragmentRef.get();
+			if (mapActivity.isLandscapeLayout()) {
+				tileBoxWidthPx = tb.getPixWidth() - f.getWidth();
+			} else {
+				tileBoxHeightPx = tb.getPixHeight() - f.getHeight();
+			}
+		}
+		mapActivity.getMapView().fitLocationToMap(latitude, longitude, mapActivity.getMapView().getZoom(),
+				tileBoxWidthPx, tileBoxHeightPx, AndroidUtils.dpToPx(mapActivity, 40f), true);
+	}
+
+	@Override
+	public void newRouteIsCalculated(boolean newRoute, ValueHolder<Boolean> showToast) {
+		directionInfo = -1;
+		updateMenu();
+		if (isVisible()) {
+			showToast.value = false;
+		}
+	}
+
+	public String generateViaDescription() {
+		TargetPointsHelper targets = getTargets();
+		List<TargetPoint> points = targets.getIntermediatePointsNavigation();
+		if (points.size() == 0) {
+			return "";
+		}
+		StringBuilder via = new StringBuilder();
+		for (int i = 0; i < points.size(); i++) {
+			if (i > 0) {
+				via.append(" ");
+			}
+			TargetPoint p = points.get(i);
+			String description = p.getOnlyName();
+			via.append(getRoutePointDescription(p.point, description));
+			boolean needAddress = new PointDescription(PointDescription.POINT_TYPE_LOCATION, description).isSearchingAddress(mapActivity)
+					&& !intermediateRequestsLatLon.contains(p.point);
+			if (needAddress) {
+				AddressLookupRequest lookupRequest = new AddressLookupRequest(p.point, new GeocodingLookupService.OnAddressLookupResult() {
+					@Override
+					public void geocodingDone(String address) {
+						updateMenu();
+					}
+				}, null);
+				intermediateRequestsLatLon.add(p.point);
+				geocodingLookupService.lookupAddress(lookupRequest);
+			}
+		}
+		return via.toString();
+	}
+
+	public String getRoutePointDescription(double lat, double 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 "";
+	}
+
+	private Spinner setupFromSpinner(View view) {
+		List<RouteSpinnerRow> fromActions = new ArrayList<>();
+		fromActions.add(new RouteSpinnerRow(SPINNER_MY_LOCATION_ID, R.drawable.ic_action_get_my_location,
+				mapActivity.getString(R.string.shared_string_my_location)));
+		fromActions.add(new RouteSpinnerRow(SPINNER_FAV_ID, R.drawable.ic_action_fav_dark,
+				mapActivity.getString(R.string.shared_string_favorite) + mapActivity.getString(R.string.shared_string_ellipsis)));
+		fromActions.add(new RouteSpinnerRow(SPINNER_MAP_ID, R.drawable.ic_action_marker_dark,
+				mapActivity.getString(R.string.shared_string_select_on_map)));
+		fromActions.add(new RouteSpinnerRow(SPINNER_ADDRESS_ID, R.drawable.ic_action_home_dark,
+				mapActivity.getString(R.string.shared_string_address) + mapActivity.getString(R.string.shared_string_ellipsis)));
+
+		TargetPoint start = getTargets().getPointToStart();
+		int startPos = -1;
+		if (start != null) {
+			String oname = start.getOnlyName().length() > 0 ? start.getOnlyName()
+					: (mapActivity.getString(R.string.route_descr_map_location) + " " + getRoutePointDescription(start.getLatitude(), start.getLongitude()));
+			startPos = fromActions.size();
+			fromActions.add(new RouteSpinnerRow(SPINNER_START_ID, R.drawable.ic_action_get_my_location, oname));
+
+			final LatLon latLon = start.point;
+			final PointDescription pointDescription = start.getOriginalPointDescription();
+			boolean needAddress = pointDescription != null && pointDescription.isSearchingAddress(mapActivity);
+			cancelStartPointAddressRequest();
+			if (needAddress) {
+				startPointRequest = new AddressLookupRequest(latLon, new GeocodingLookupService.OnAddressLookupResult() {
+					@Override
+					public void geocodingDone(String address) {
+						startPointRequest = null;
+						updateMenu();
+					}
+				}, null);
+				geocodingLookupService.lookupAddress(startPointRequest);
+			}
+		}
+
+		addMarkersToSpinner(fromActions);
+
+		final Spinner fromSpinner = ((Spinner) view.findViewById(R.id.FromSpinner));
+		RouteSpinnerArrayAdapter fromAdapter = new RouteSpinnerArrayAdapter(view.getContext());
+		for (RouteSpinnerRow row : fromActions) {
+			fromAdapter.add(row);
+		}
+		fromSpinner.setAdapter(fromAdapter);
+		if (start != null) {
+			fromSpinner.setSelection(startPos);
+		} else {
+			if (mapActivity.getMyApplication().getLocationProvider().getLastKnownLocation() == null) {
+				fromSpinner.setPromptId(R.string.search_poi_location);
+			}
+			//fromSpinner.setSelection(0);
+		}
+		return fromSpinner;
+	}
+
+	private Spinner setupToSpinner(View view) {
+		final Spinner toSpinner = ((Spinner) view.findViewById(R.id.ToSpinner));
+		final TargetPointsHelper targets = getTargets();
+		List<RouteSpinnerRow> toActions = new ArrayList<>();
+
+		TargetPoint finish = getTargets().getPointToNavigate();
+		if (finish != null) {
+			toActions.add(new RouteSpinnerRow(SPINNER_FINISH_ID, R.drawable.ic_action_get_my_location,
+					getRoutePointDescription(targets.getPointToNavigate().point,
+							targets.getPointToNavigate().getOnlyName())));
+
+			final LatLon latLon = finish.point;
+			final PointDescription pointDescription = finish.getOriginalPointDescription();
+			boolean needAddress = pointDescription != null && pointDescription.isSearchingAddress(mapActivity);
+			cancelTargetPointAddressRequest();
+			if (needAddress) {
+				targetPointRequest = new AddressLookupRequest(latLon, new GeocodingLookupService.OnAddressLookupResult() {
+					@Override
+					public void geocodingDone(String address) {
+						targetPointRequest = null;
+						updateMenu();
+					}
+				}, null);
+				geocodingLookupService.lookupAddress(targetPointRequest);
+			}
+
+		} else {
+			toSpinner.setPromptId(R.string.route_descr_select_destination);
+			toActions.add(new RouteSpinnerRow(SPINNER_HINT_ID, R.drawable.ic_action_get_my_location,
+					mapActivity.getString(R.string.route_descr_select_destination)));
+		}
+		toActions.add(new RouteSpinnerRow(SPINNER_FAV_ID, R.drawable.ic_action_fav_dark,
+				mapActivity.getString(R.string.shared_string_favorite) + mapActivity.getString(R.string.shared_string_ellipsis)));
+		toActions.add(new RouteSpinnerRow(SPINNER_MAP_ID, R.drawable.ic_action_marker_dark,
+				mapActivity.getString(R.string.shared_string_select_on_map)));
+		toActions.add(new RouteSpinnerRow(SPINNER_ADDRESS_ID, R.drawable.ic_action_home_dark,
+				mapActivity.getString(R.string.shared_string_address) + mapActivity.getString(R.string.shared_string_ellipsis)));
+
+		addMarkersToSpinner(toActions);
+
+		RouteSpinnerArrayAdapter toAdapter = new RouteSpinnerArrayAdapter(view.getContext());
+		for (RouteSpinnerRow row : toActions) {
+			toAdapter.add(row);
+		}
+		toSpinner.setAdapter(toAdapter);
+		return toSpinner;
+	}
+
+	public RoutePopupListArrayAdapter getIntermediatesPopupAdapter(Context ctx) {
+		List<RouteSpinnerRow> viaActions = new ArrayList<>();
+
+		viaActions.add(new RouteSpinnerRow(SPINNER_FAV_ID, R.drawable.ic_action_fav_dark,
+				mapActivity.getString(R.string.shared_string_favorite) + mapActivity.getString(R.string.shared_string_ellipsis)));
+		viaActions.add(new RouteSpinnerRow(SPINNER_MAP_ID, R.drawable.ic_action_marker_dark,
+				mapActivity.getString(R.string.shared_string_select_on_map)));
+		viaActions.add(new RouteSpinnerRow(SPINNER_ADDRESS_ID, R.drawable.ic_action_home_dark,
+				mapActivity.getString(R.string.shared_string_address) + mapActivity.getString(R.string.shared_string_ellipsis)));
+
+		addMarkersToSpinner(viaActions);
+
+		RoutePopupListArrayAdapter viaAdapter = new RoutePopupListArrayAdapter(ctx);
+		for (RouteSpinnerRow row : viaActions) {
+			viaAdapter.add(row);
+		}
+
+		return viaAdapter;
+	}
+
+	private void addMarkersToSpinner(List<RouteSpinnerRow> actions) {
+		MapMarkersHelper markersHelper = mapActivity.getMyApplication().getMapMarkersHelper();
+		List<MapMarker> markers = markersHelper.getMapMarkers();
+		if (markers.size() > 0) {
+			MapMarker m = markers.get(0);
+			actions.add(new RouteSpinnerRow(SPINNER_MAP_MARKER_1_ID,
+					MapMarkerDialogHelper.getMapMarkerIcon(mapActivity.getMyApplication(), m.colorIndex),
+					m.getName(mapActivity)));
+		}
+		if (markers.size() > 1) {
+			MapMarker m = markers.get(1);
+			actions.add(new RouteSpinnerRow(SPINNER_MAP_MARKER_2_ID,
+					MapMarkerDialogHelper.getMapMarkerIcon(mapActivity.getMyApplication(), m.colorIndex),
+					m.getName(mapActivity)));
+		}
+		/*
+		if (markers.size() > 2) {
+			MapMarker m = markers.get(2);
+			actions.add(new RouteSpinnerRow(SPINNER_MAP_MARKER_3_ID,
+					MapMarkerDialogHelper.getMapMarkerIcon(mapActivity.getMyApplication(), m.colorIndex),
+					m.getOnlyName()));
+		}
+		*/
+		if (markers.size() > 2) {
+			actions.add(new RouteSpinnerRow(SPINNER_MAP_MARKER_MORE_ID, 0,
+					mapActivity.getString(R.string.map_markers_other)));
+		}
+	}
+
+	private TargetPointsHelper getTargets() {
+		return app.getTargetPointsHelper();
+	}
+
+	@Override
+	public void routeWasCancelled() {
+		directionInfo = -1;
+		// do not hide fragment (needed for use case entering Planning mode without destination)
+	}
+
+	@Override
+	public void routeWasFinished() {
+	}
+
+	public void onDismiss() {
+		visible = false;
+		mapActivity.getMapView().setMapPositionX(0);
+		mapActivity.getMapView().refreshMap();
+		AndroidUiHelper.updateVisibility(mapActivity.findViewById(R.id.map_route_land_left_margin), false);
+		AndroidUiHelper.updateVisibility(mapActivity.findViewById(R.id.map_right_widgets_panel), true);
+		if (switched) {
+			mapControlsLayer.switchToRouteFollowingLayout();
+		}
+		if (getTargets().getPointToNavigate() == null && !selectFromMapTouch) {
+			mapActivity.getMapActions().stopNavigationWithoutConfirm();
+		}
+		if (onDismissListener != null) {
+			onDismissListener.onDismiss(null);
+		}
+		removeTargetPointListener();
+	}
+
+	public void show() {
+		if (!visible) {
+			currentMenuState = getInitialMenuState();
+			visible = true;
+			switched = mapControlsLayer.switchToRoutePlanningLayout();
+			boolean refreshMap = !switched;
+			boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
+			if (!portrait) {
+				mapActivity.getMapView().setMapPositionX(1);
+				refreshMap = true;
+			}
+
+			if (refreshMap) {
+				mapActivity.refreshMap();
+			}
+
+			MapRouteInfoMenuFragment.showInstance(mapActivity);
+
+			if (!AndroidUiHelper.isXLargeDevice(mapActivity)) {
+				AndroidUiHelper.updateVisibility(mapActivity.findViewById(R.id.map_right_widgets_panel), false);
+			}
+			if (!portrait) {
+				AndroidUiHelper.updateVisibility(mapActivity.findViewById(R.id.map_route_land_left_margin), true);
+			}
+		}
+	}
+
+	public void hide() {
+		WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
+		if (fragmentRef != null) {
+			fragmentRef.get().dismiss();
+		} else {
+			visible = false;
+		}
+		routingHelper.removeListener(this);
+	}
+
+	public void setShowMenu() {
+		showMenu = true;
+	}
+
+	private class RouteSpinnerRow {
+		long id;
+		int iconId;
+		Drawable icon;
+		String text;
+
+		public RouteSpinnerRow(long id) {
+			this.id = id;
+		}
+
+		public RouteSpinnerRow(long id, int iconId, String text) {
+			this.id = id;
+			this.iconId = iconId;
+			this.text = text;
+		}
+
+		public RouteSpinnerRow(long id, Drawable icon, String text) {
+			this.id = id;
+			this.icon = icon;
+			this.text = text;
+		}
+	}
+
+	private class RouteBaseArrayAdapter extends ArrayAdapter<RouteSpinnerRow> {
+
+		RouteBaseArrayAdapter(@NonNull Context context, int resource) {
+			super(context, resource);
+		}
+
+		@Override
+		public boolean hasStableIds() {
+			return true;
+		}
+
+		@Override
+		public long getItemId(int position) {
+			RouteSpinnerRow row = getItem(position);
+			return row.id;
+		}
+
+		@Override
+		public boolean isEnabled(int position) {
+			long id = getItemId(position);
+			return id != SPINNER_HINT_ID;
+		}
+
+		View getRowItemView(int position, View convertView, ViewGroup parent) {
+			TextView label = (TextView) super.getView(position, convertView, parent);
+			RouteSpinnerRow row = getItem(position);
+			label.setText(row.text);
+			label.setTextColor(!isLight() ?
+					ContextCompat.getColorStateList(mapActivity, android.R.color.primary_text_dark) : ContextCompat.getColorStateList(mapActivity, android.R.color.primary_text_light));
+			return label;
+		}
+
+		View getListItemView(int position, View convertView, ViewGroup parent) {
+			long id = getItemId(position);
+			TextView label = (TextView) super.getDropDownView(position, convertView, parent);
+
+			RouteSpinnerRow row = getItem(position);
+			label.setText(row.text);
+			if (id != SPINNER_HINT_ID) {
+				Drawable icon = null;
+				if (row.icon != null) {
+					icon = row.icon;
+				} else if (row.iconId > 0) {
+					icon = mapActivity.getMyApplication().getUIUtilities().getThemedIcon(row.iconId);
+				}
+				label.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
+				label.setCompoundDrawablePadding(AndroidUtils.dpToPx(mapActivity, 16f));
+			} else {
+				label.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
+				label.setCompoundDrawablePadding(0);
+			}
+
+			if (id == SPINNER_MAP_MARKER_MORE_ID) {
+				label.setTextColor(!mapActivity.getMyApplication().getSettings().isLightContent() ?
+						mapActivity.getResources().getColor(R.color.color_dialog_buttons_dark) : mapActivity.getResources().getColor(R.color.color_dialog_buttons_light));
+			} else {
+				label.setTextColor(!mapActivity.getMyApplication().getSettings().isLightContent() ?
+						ContextCompat.getColorStateList(mapActivity, android.R.color.primary_text_dark) : ContextCompat.getColorStateList(mapActivity, android.R.color.primary_text_light));
+			}
+			label.setPadding(AndroidUtils.dpToPx(mapActivity, 16f), 0, 0, 0);
+
+			return label;
+		}
+	}
+
+	private class RouteSpinnerArrayAdapter extends RouteBaseArrayAdapter {
+
+		RouteSpinnerArrayAdapter(Context context) {
+			super(context, android.R.layout.simple_spinner_item);
+			setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+		}
+
+		@NonNull
+		@Override
+		public View getView(int position, View convertView, @NonNull ViewGroup parent) {
+			return getRowItemView(position, convertView, parent);
+		}
+
+		@Override
+		public View getDropDownView(int position, View convertView, @NonNull ViewGroup parent) {
+			return getListItemView(position, convertView, parent);
+		}
+	}
+
+	private class RoutePopupListArrayAdapter extends RouteBaseArrayAdapter {
+
+		RoutePopupListArrayAdapter(Context context) {
+			super(context, android.R.layout.simple_spinner_dropdown_item);
+		}
+
+		@NonNull
+		@Override
+		public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+			return getListItemView(position, convertView, parent);
+		}
+	}
+
+	public enum PermanentAppModeOptions {
+
+		CAR(RoutingOptionsHelper.MuteSoundRoutingParameter.KEY, RoutingOptionsHelper.AvoidRoadsRoutingParameter.KEY),
+
+		BICYCLE(RoutingOptionsHelper.MuteSoundRoutingParameter.KEY, DRIVING_STYLE, GeneralRouter.USE_HEIGHT_OBSTACLES),
+
+		PEDESTRIAN(RoutingOptionsHelper.MuteSoundRoutingParameter.KEY, GeneralRouter.USE_HEIGHT_OBSTACLES);
+
+		List<String> routingParameters;
+
+		PermanentAppModeOptions(String... routingParameters) {
+			this.routingParameters = Arrays.asList(routingParameters);
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java
new file mode 100644
index 0000000000..14d9548864
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java
@@ -0,0 +1,893 @@
+package net.osmand.plus.routepreparationmenu;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.annotation.TargetApi;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.content.ContextCompat;
+import android.util.TypedValue;
+import android.view.GestureDetector;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.view.ViewTreeObserver;
+import android.view.animation.DecelerateInterpolator;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.OverScroller;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import net.osmand.AndroidUtils;
+import net.osmand.Location;
+import net.osmand.data.RotatedTileBox;
+import net.osmand.osm.edit.Node;
+import net.osmand.plus.LockableScrollView;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.TargetPointsHelper;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.base.BaseOsmAndFragment;
+import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.mapcontextmenu.InterceptorLinearLayout;
+import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.views.controls.HorizontalSwipeConfirm;
+import net.osmand.plus.widgets.ImageViewExProgress;
+import net.osmand.plus.widgets.TextViewExProgress;
+import net.osmand.router.TransportRoutePlanner;
+import net.osmand.router.TransportRoutePlanner.TransportRouteResult;
+import net.osmand.router.TransportRoutePlanner.TransportRouteResultSegment;
+
+import java.util.List;
+
+import static net.osmand.plus.mapcontextmenu.MapContextMenuFragment.CURRENT_Y_UNDEFINED;
+import static net.osmand.plus.mapcontextmenu.MenuBuilder.SHADOW_HEIGHT_TOP_DP;
+
+public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
+	public static final String TAG = "MapRouteInfoMenuFragment";
+
+	private MapRouteInfoMenu menu;
+	private InterceptorLinearLayout mainView;
+	private View view;
+	private LinearLayout cardsContainer;
+	private View.OnLayoutChangeListener containerLayoutListener;
+
+	private boolean portrait;
+	private boolean nightMode;
+	private boolean moving;
+	private boolean forceUpdateLayout;
+	private boolean initLayout = true;
+	private boolean wasDrawerDisabled;
+
+	private int menuFullHeight;
+	private int minHalfY;
+	private int menuTopShadowAllHeight;
+	private int topScreenPosY;
+	private int menuBottomViewHeight;
+	private int menuFullHeightMax;
+	private int menuTitleHeight;
+	private int shadowHeight;
+	private int screenHeight;
+	private int viewHeight;
+
+	private MapActivity getMapActivity() {
+		return (MapActivity) getActivity();
+	}
+
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+	                         Bundle savedInstanceState) {
+		MapActivity mapActivity = getMapActivity();
+		processScreenHeight(container);
+
+		portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
+
+		menu = mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu();
+		shadowHeight = AndroidUtils.dpToPx(mapActivity, SHADOW_HEIGHT_TOP_DP);
+		topScreenPosY = addStatusBarHeightIfNeeded(0);
+		minHalfY = viewHeight - (int) (viewHeight * .75f);
+
+		view = inflater.inflate(R.layout.plan_route_info, container, false);
+		if (menu == null) {
+			return view;
+		}
+		AndroidUtils.addStatusBarPadding21v(getActivity(), view);
+
+		mainView = view.findViewById(R.id.main_view);
+		nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+
+		view.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				dismiss();
+			}
+		});
+
+		LockableScrollView bottomScrollView = (LockableScrollView) view.findViewById(R.id.route_menu_bottom_scroll);
+		bottomScrollView.setScrollingEnabled(false);
+		bottomScrollView.setBackgroundColor(getResources().getColor(nightMode ? R.color.activity_background_dark : R.color.activity_background_light));
+
+		FrameLayout bottomContainer = (FrameLayout) view.findViewById(R.id.bottom_container);
+		if (!menu.isRouteCalculated()) {
+			bottomContainer.setForeground(getContentIcon(R.drawable.bg_contextmenu_shadow));
+		} else {
+			bottomContainer.setForeground(null);
+		}
+
+		cardsContainer = (LinearLayout) view.findViewById(R.id.route_menu_cards_container);
+
+		buildBottomView();
+
+		if (!portrait) {
+			final TypedValue typedValueAttr = new TypedValue();
+			getMapActivity().getTheme().resolveAttribute(R.attr.left_menu_view_bg, typedValueAttr, true);
+			mainView.setBackgroundResource(typedValueAttr.resourceId);
+			mainView.setLayoutParams(new FrameLayout.LayoutParams(getResources().getDimensionPixelSize(R.dimen.dashboard_land_width), ViewGroup.LayoutParams.MATCH_PARENT));
+
+			FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(AndroidUtils.dpToPx(getMyApplication(), 345f), ViewGroup.LayoutParams.WRAP_CONTENT);
+
+			params.gravity = Gravity.BOTTOM;
+			view.findViewById(R.id.control_buttons).setLayoutParams(params);
+		}
+
+		runLayoutListener();
+
+		final GestureDetector swipeDetector = new GestureDetector(getMapActivity(), new HorizontalSwipeConfirm(true));
+
+		final View.OnTouchListener slideTouchListener = new View.OnTouchListener() {
+			private float dy;
+			private float dyMain;
+			private float mDownY;
+
+			private int minimumVelocity;
+			private int maximumVelocity;
+			private VelocityTracker velocityTracker;
+			private OverScroller scroller;
+
+			private boolean slidingUp;
+			private boolean slidingDown;
+
+			private boolean hasMoved;
+
+			{
+				scroller = new OverScroller(getMapActivity());
+				final ViewConfiguration configuration = ViewConfiguration.get(getMapActivity());
+				minimumVelocity = configuration.getScaledMinimumFlingVelocity();
+				maximumVelocity = configuration.getScaledMaximumFlingVelocity();
+			}
+
+			@Override
+			public boolean onTouch(View v, MotionEvent event) {
+
+				if (!portrait) {
+					if (swipeDetector.onTouchEvent(event)) {
+						menu.hide();
+
+						recycleVelocityTracker();
+						return true;
+					}
+				}
+
+				switch (event.getAction()) {
+					case MotionEvent.ACTION_DOWN:
+						hasMoved = false;
+						mDownY = event.getRawY();
+						dy = event.getY();
+						dyMain = getViewY();
+
+						initOrResetVelocityTracker();
+						velocityTracker.addMovement(event);
+						break;
+
+					case MotionEvent.ACTION_MOVE:
+						if (Math.abs(event.getRawY() - mDownY) > mainView.getTouchSlop()) {
+							moving = true;
+						}
+						if (moving) {
+							hasMoved = true;
+							float y = event.getY();
+							float newY = getViewY() + (y - dy);
+							if (!portrait && newY > topScreenPosY) {
+								newY = topScreenPosY;
+							}
+							setViewY((int) newY, false, false);
+
+							menuFullHeight = view.getHeight() - (int) newY + 10;
+							ViewGroup.LayoutParams lp = mainView.getLayoutParams();
+							lp.height = Math.max(menuFullHeight, menuTitleHeight);
+							mainView.setLayoutParams(lp);
+							mainView.requestLayout();
+
+							float newEventY = newY - (dyMain - dy);
+							MotionEvent ev = MotionEvent.obtain(event.getDownTime(), event.getEventTime(), event.getAction(),
+									event.getX(), newEventY, event.getMetaState());
+
+							initVelocityTrackerIfNotExists();
+							velocityTracker.addMovement(ev);
+						}
+
+						break;
+
+					case MotionEvent.ACTION_UP:
+						if (moving) {
+							moving = false;
+							hasMoved = false;
+							int currentY = getViewY();
+
+							final VelocityTracker velocityTracker = this.velocityTracker;
+							velocityTracker.computeCurrentVelocity(1000, maximumVelocity);
+							int initialVelocity = (int) velocityTracker.getYVelocity();
+
+							if ((Math.abs(initialVelocity) > minimumVelocity)) {
+
+								scroller.abortAnimation();
+								scroller.fling(0, currentY, 0, initialVelocity, 0, 0,
+										Math.min(viewHeight - menuFullHeightMax, getFullScreenTopPosY()),
+										screenHeight,
+										0, 0);
+								currentY = scroller.getFinalY();
+								scroller.abortAnimation();
+
+								slidingUp = initialVelocity < -2000;
+								slidingDown = initialVelocity > 2000;
+							} else {
+								slidingUp = false;
+								slidingDown = false;
+							}
+
+							changeMenuState(currentY, slidingUp, slidingDown);
+						}
+						recycleVelocityTracker();
+						break;
+					case MotionEvent.ACTION_CANCEL:
+						moving = false;
+						hasMoved = false;
+						recycleVelocityTracker();
+						break;
+
+				}
+				return true;
+			}
+
+			private void initOrResetVelocityTracker() {
+				if (velocityTracker == null) {
+					velocityTracker = VelocityTracker.obtain();
+				} else {
+					velocityTracker.clear();
+				}
+			}
+
+			private void initVelocityTrackerIfNotExists() {
+				if (velocityTracker == null) {
+					velocityTracker = VelocityTracker.obtain();
+					velocityTracker.clear();
+				}
+			}
+
+			private void recycleVelocityTracker() {
+				if (velocityTracker != null) {
+					velocityTracker.recycle();
+					velocityTracker = null;
+				}
+			}
+		};
+
+		((InterceptorLinearLayout) mainView).setListener(slideTouchListener);
+		mainView.setOnTouchListener(slideTouchListener);
+
+		containerLayoutListener = new View.OnLayoutChangeListener() {
+			@Override
+			public void onLayoutChange(View view, int left, int top, int right, int bottom,
+			                           int oldLeft, int oldTop, int oldRight, int oldBottom) {
+				if (forceUpdateLayout || bottom != oldBottom) {
+					forceUpdateLayout = false;
+					processScreenHeight(view.getParent());
+					runLayoutListener();
+				}
+			}
+		};
+
+		updateInfo();
+
+		return view;
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		if (menu == null) {
+			dismiss();
+		}
+		menu.addTargetPointListener();
+		ViewParent parent = view.getParent();
+		if (parent != null && containerLayoutListener != null) {
+			((View) parent).addOnLayoutChangeListener(containerLayoutListener);
+		}
+		getMapActivity().getMapLayers().getMapControlsLayer().showMapControlsIfHidden();
+		wasDrawerDisabled = getMapActivity().isDrawerDisabled();
+		if (!wasDrawerDisabled) {
+			getMapActivity().disableDrawer();
+		}
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		if (view != null) {
+			ViewParent parent = view.getParent();
+			if (parent != null && containerLayoutListener != null) {
+				((View) parent).removeOnLayoutChangeListener(containerLayoutListener);
+			}
+		}
+		if (!wasDrawerDisabled) {
+			getMapActivity().enableDrawer();
+		}
+	}
+
+	@Override
+	public void onDestroyView() {
+		super.onDestroyView();
+		if (menu != null) {
+			menu.onDismiss();
+		}
+	}
+
+	@Override
+	public int getStatusBarColorId() {
+		if (menu != null && (menu.getCurrentMenuState() == MapRouteInfoMenu.MenuState.FULL_SCREEN || !portrait)) {
+			return nightMode ? R.color.status_bar_dark : R.color.status_bar_route_light;
+		}
+		return -1;
+	}
+
+	private void buildBottomView() {
+		if (cardsContainer != null) {
+			menu.build(cardsContainer);
+		}
+	}
+
+	private int getViewY() {
+		return (int) mainView.getY();
+	}
+
+	private void setViewY(int y, boolean animated, boolean adjustMapPos) {
+		mainView.setY(y);
+	}
+
+	private void processScreenHeight(ViewParent parent) {
+		View container = (View) parent;
+		screenHeight = container.getHeight() + AndroidUtils.getStatusBarHeight(getMapActivity());
+		viewHeight = screenHeight - AndroidUtils.getStatusBarHeight(getMapActivity());
+	}
+
+	private int getFullScreenTopPosY() {
+		return -menuTitleHeight + AndroidUtils.getStatusBarHeight(getMyApplication());
+	}
+
+	private int addStatusBarHeightIfNeeded(int res) {
+		if (Build.VERSION.SDK_INT >= 21) {
+			return res + AndroidUtils.getStatusBarHeight(getMyApplication());
+		}
+		return res;
+	}
+
+	private int getHeaderOnlyTopY() {
+		return viewHeight - menuTitleHeight - AndroidUtils.dpToPx(getMyApplication(), 48f);
+	}
+
+	public void openMenuFullScreen() {
+		changeMenuState(getMenuStatePosY(MapRouteInfoMenu.MenuState.FULL_SCREEN), false, false);
+	}
+
+	public void openMenuHeaderOnly() {
+		if (portrait) {
+			changeMenuState(getMenuStatePosY(MapRouteInfoMenu.MenuState.HEADER_ONLY), false, false);
+		}
+	}
+
+	public void openMenuHalfScreen() {
+		if (portrait) {
+			changeMenuState(getMenuStatePosY(MapRouteInfoMenu.MenuState.HALF_SCREEN), false, false);
+		}
+	}
+
+	private int getMenuStatePosY(int menuState) {
+		if (!portrait) {
+			return topScreenPosY;
+		}
+		switch (menuState) {
+			case MapRouteInfoMenu.MenuState.HEADER_ONLY:
+				return getHeaderOnlyTopY();
+			case MapRouteInfoMenu.MenuState.HALF_SCREEN:
+				return minHalfY;
+			case MapRouteInfoMenu.MenuState.FULL_SCREEN:
+				return getFullScreenTopPosY();
+			default:
+				return 0;
+		}
+	}
+
+	private void changeMenuState(int currentY, boolean slidingUp, boolean slidingDown) {
+		boolean needCloseMenu = false;
+
+		int currentMenuState = menu.getCurrentMenuState();
+		if (portrait) {
+			int headerDist = Math.abs(currentY - getMenuStatePosY(MapRouteInfoMenu.MenuState.HEADER_ONLY));
+			int halfDist = Math.abs(currentY - getMenuStatePosY(MapRouteInfoMenu.MenuState.HALF_SCREEN));
+			int fullDist = Math.abs(currentY - getMenuStatePosY(MapRouteInfoMenu.MenuState.FULL_SCREEN));
+			int newState;
+			if (headerDist < halfDist && headerDist < fullDist) {
+				newState = MapRouteInfoMenu.MenuState.HEADER_ONLY;
+			} else if (halfDist < headerDist && halfDist < fullDist) {
+				newState = MapRouteInfoMenu.MenuState.HALF_SCREEN;
+			} else {
+				newState = MapRouteInfoMenu.MenuState.FULL_SCREEN;
+			}
+
+			if (slidingDown && currentMenuState == MapRouteInfoMenu.MenuState.FULL_SCREEN && getViewY() < getFullScreenTopPosY()) {
+				slidingDown = false;
+				newState = MapRouteInfoMenu.MenuState.FULL_SCREEN;
+			}
+			if (menuBottomViewHeight > 0 && slidingUp) {
+				while (menu.getCurrentMenuState() != newState) {
+					if (!menu.slideUp()) {
+						break;
+					}
+				}
+			} else if (slidingDown) {
+				if (currentMenuState == MapRouteInfoMenu.MenuState.HEADER_ONLY) {
+					needCloseMenu = true;
+				} else {
+					while (menu.getCurrentMenuState() != newState) {
+						if (!menu.slideDown()) {
+							needCloseMenu = true;
+							break;
+						}
+					}
+				}
+			} else {
+				if (currentMenuState < newState) {
+					while (menu.getCurrentMenuState() != newState) {
+						if (!menu.slideUp()) {
+							break;
+						}
+					}
+				} else {
+					while (menu.getCurrentMenuState() != newState) {
+						if (!menu.slideDown()) {
+							break;
+						}
+					}
+				}
+			}
+		}
+		int newMenuState = menu.getCurrentMenuState();
+		boolean needMapAdjust = currentMenuState != newMenuState && newMenuState != MapRouteInfoMenu.MenuState.FULL_SCREEN;
+
+		applyPosY(currentY, needCloseMenu, needMapAdjust, currentMenuState, newMenuState, 0);
+	}
+
+
+	private int getPosY(final int currentY, boolean needCloseMenu, int previousState) {
+		if (needCloseMenu) {
+			return screenHeight;
+		}
+
+		int destinationState;
+		destinationState = menu.getCurrentMenuState();
+
+		int posY = 0;
+		switch (destinationState) {
+			case MapRouteInfoMenu.MenuState.HEADER_ONLY:
+				posY = getMenuStatePosY(MapRouteInfoMenu.MenuState.HEADER_ONLY);
+				break;
+			case MapRouteInfoMenu.MenuState.HALF_SCREEN:
+				posY = getMenuStatePosY(MapRouteInfoMenu.MenuState.HALF_SCREEN);
+				break;
+			case MapRouteInfoMenu.MenuState.FULL_SCREEN:
+				if (currentY != CURRENT_Y_UNDEFINED) {
+					int maxPosY = viewHeight - menuFullHeightMax;
+					int minPosY = getMenuStatePosY(MapRouteInfoMenu.MenuState.FULL_SCREEN);
+					if (maxPosY > minPosY) {
+						maxPosY = minPosY;
+					}
+					if (currentY > minPosY || previousState != MapRouteInfoMenu.MenuState.FULL_SCREEN) {
+						posY = minPosY;
+					} else if (currentY < maxPosY) {
+						posY = maxPosY;
+					} else {
+						posY = currentY;
+					}
+				} else {
+					posY = getMenuStatePosY(MapRouteInfoMenu.MenuState.FULL_SCREEN);
+				}
+				break;
+			default:
+				break;
+		}
+		if (portrait) {
+			getMapActivity().updateStatusBarColor();
+		}
+		return posY;
+	}
+
+	private void updateMainViewLayout(int posY) {
+		if (view != null) {
+			menuFullHeight = view.getHeight() - posY;
+			menuTopShadowAllHeight = menuTitleHeight;
+			ViewGroup.LayoutParams lp = mainView.getLayoutParams();
+			lp.height = Math.max(menuFullHeight, menuTitleHeight);
+			mainView.setLayoutParams(lp);
+			mainView.requestLayout();
+		}
+	}
+
+	private void applyPosY(final int currentY, final boolean needCloseMenu, boolean needMapAdjust,
+	                       final int previousMenuState, final int newMenuState, int dZoom) {
+		final int posY = getPosY(currentY, needCloseMenu, previousMenuState);
+		if (getViewY() != posY || dZoom != 0) {
+			if (posY < getViewY()) {
+				updateMainViewLayout(posY);
+			}
+
+			mainView.animate().y(posY)
+					.setDuration(200)
+					.setInterpolator(new DecelerateInterpolator())
+					.setListener(new AnimatorListenerAdapter() {
+
+						boolean canceled = false;
+
+						@Override
+						public void onAnimationCancel(Animator animation) {
+							canceled = true;
+						}
+
+						@Override
+						public void onAnimationEnd(Animator animation) {
+							if (!canceled) {
+								if (needCloseMenu) {
+									menu.hide();
+								} else {
+									updateMainViewLayout(posY);
+									if (previousMenuState != 0 && newMenuState != 0 && previousMenuState != newMenuState) {
+										doAfterMenuStateChange(previousMenuState, newMenuState);
+									}
+								}
+							}
+						}
+					})
+					.start();
+
+			if (needMapAdjust) {
+				adjustMapPosition(posY);
+			}
+		}
+	}
+
+	private void doAfterMenuStateChange(int previousState, int newState) {
+		runLayoutListener();
+	}
+
+	@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+	private void runLayoutListener() {
+		if (view != null) {
+			ViewTreeObserver vto = view.getViewTreeObserver();
+			vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+
+				@Override
+				public void onGlobalLayout() {
+
+					if (view != null) {
+						ViewTreeObserver obs = view.getViewTreeObserver();
+						if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+							obs.removeOnGlobalLayoutListener(this);
+						} else {
+							obs.removeGlobalOnLayoutListener(this);
+						}
+
+						if (getActivity() == null) {
+							return;
+						}
+
+						menuFullHeight = view.findViewById(R.id.main_view).getHeight();
+						int newMenuTopShadowAllHeight = view.findViewById(R.id.route_menu_top_shadow_all).getHeight();
+
+						int dy = shadowHeight;
+
+						menuTopShadowAllHeight = newMenuTopShadowAllHeight;
+						menuTitleHeight = menuTopShadowAllHeight + dy;
+						menuBottomViewHeight = view.findViewById(R.id.route_menu_cards_container).getHeight();
+
+						menuFullHeightMax = menuTitleHeight + menuBottomViewHeight;
+
+						if (!moving) {
+							doLayoutMenu();
+						}
+						initLayout = false;
+					}
+				}
+
+			});
+		}
+	}
+
+	private void doLayoutMenu() {
+		final int posY = getPosY(getViewY(), false, menu.getCurrentMenuState());
+		setViewY(posY, true, !initLayout);
+		updateMainViewLayout(posY);
+	}
+
+	public int getHeight() {
+		if (menu != null) {
+			int height = getMenuStatePosY(menu.getCurrentMenuState());
+			return viewHeight - height - AndroidUtils.getStatusBarHeight(getMyApplication());
+		} else {
+			return 0;
+		}
+	}
+
+	private void adjustMapPosition(int y) {
+		OsmandApplication app = getMyApplication();
+		if (menu.isSelectFromMapTouch() || app == null) {
+			return;
+		}
+
+		RoutingHelper rh = app.getRoutingHelper();
+		if (rh.isRoutePlanningMode() && getMapActivity().getMapView() != null) {
+			Location lt = rh.getLastProjection();
+			if (lt == null) {
+				lt = app.getTargetPointsHelper().getPointToStartLocation();
+			}
+			if (lt != null) {
+				double left = lt.getLongitude(), right = lt.getLongitude();
+				double top = lt.getLatitude(), bottom = lt.getLatitude();
+				List<Location> list = rh.getCurrentCalculatedRoute();
+				for (Location l : list) {
+					left = Math.min(left, l.getLongitude());
+					right = Math.max(right, l.getLongitude());
+					top = Math.max(top, l.getLatitude());
+					bottom = Math.min(bottom, l.getLatitude());
+				}
+				if (menu.isTransportRouteCalculated()) {
+					TransportRouteResult result = app.getTransportRoutingHelper().getCurrentRouteResult();
+					if (result != null) {
+						for (TransportRouteResultSegment segment : result.getSegments()) {
+							for (Node n : segment.getNodes()) {
+								left = Math.min(left, n.getLongitude());
+								right = Math.max(right, n.getLongitude());
+								top = Math.max(top, n.getLatitude());
+								bottom = Math.min(bottom, n.getLatitude());
+							}
+						}
+					}
+				}
+				List<TargetPointsHelper.TargetPoint> targetPoints = app.getTargetPointsHelper().getIntermediatePointsWithTarget();
+				for (TargetPointsHelper.TargetPoint l : targetPoints) {
+					left = Math.min(left, l.getLongitude());
+					right = Math.max(right, l.getLongitude());
+					top = Math.max(top, l.getLatitude());
+					bottom = Math.min(bottom, l.getLatitude());
+				}
+
+				RotatedTileBox tb = getMapActivity().getMapView().getCurrentRotatedTileBox().copy();
+				int tileBoxWidthPx = 0;
+				int tileBoxHeightPx = 0;
+
+				if (!portrait) {
+					tileBoxWidthPx = tb.getPixWidth() - getWidth();
+				} else {
+					int fHeight = viewHeight - y - AndroidUtils.getStatusBarHeight(app);
+					tileBoxHeightPx = tb.getPixHeight() - fHeight;
+				}
+				getMapActivity().getMapView().fitRectToMap(left, right, top, bottom, tileBoxWidthPx, tileBoxHeightPx, 0);
+			}
+		}
+	}
+
+	public int getWidth() {
+		if (mainView != null) {
+			return mainView.getWidth();
+		} else {
+			return 0;
+		}
+	}
+
+	public void updateInfo() {
+		if (menu != null) {
+			menu.updateInfo(view);
+			applyDayNightMode();
+			runLayoutListener();
+		}
+	}
+
+	public void updateFromIcon() {
+		if (menu != null) {
+			menu.updateFromIcon(mainView);
+		}
+	}
+
+	public void updateRouteCalculationProgress(int progress) {
+		ProgressBar progressBar = (ProgressBar) mainView.findViewById(R.id.progress_bar);
+		if (progressBar != null) {
+			if (progressBar.getVisibility() != View.VISIBLE) {
+				progressBar.setVisibility(View.VISIBLE);
+			}
+			progressBar.setProgress(progress);
+		}
+		ProgressBar progressBarButton = (ProgressBar) view.findViewById(R.id.progress_bar_button);
+		if (progressBarButton != null) {
+			if (progressBarButton.getVisibility() != View.VISIBLE) {
+				progressBarButton.setVisibility(View.VISIBLE);
+			}
+			progressBarButton.setProgress(progress);
+		}
+		TextViewExProgress textViewExProgress = (TextViewExProgress) view.findViewById(R.id.start_button_descr);
+		textViewExProgress.percent = progress / 100f;
+		int color = nightMode ? R.color.main_font_dark : R.color.card_and_list_background_light;
+		textViewExProgress.color1 = ContextCompat.getColor(getMapActivity(), color);
+		textViewExProgress.color2 = ContextCompat.getColor(getMapActivity(), R.color.description_font_and_bottom_sheet_icons);
+		textViewExProgress.invalidate();
+		ImageViewExProgress imageViewExProgress = (ImageViewExProgress) view.findViewById(R.id.start_icon);
+		imageViewExProgress.percent = progress / 100f;
+		imageViewExProgress.color1 = ContextCompat.getColor(getMapActivity(), color);
+		imageViewExProgress.color2 = ContextCompat.getColor(getMapActivity(), R.color.description_font_and_bottom_sheet_icons);
+		imageViewExProgress.invalidate();
+	}
+
+	public void hideRouteCalculationProgressBar() {
+		View progressBar = mainView.findViewById(R.id.progress_bar);
+		if (progressBar != null) {
+			progressBar.setVisibility(View.GONE);
+		}
+		View progressBarButton = view.findViewById(R.id.progress_bar_button);
+		if (progressBarButton != null) {
+			progressBarButton.setVisibility(View.GONE);
+		}
+		int color = nightMode ? R.color.main_font_dark : R.color.card_and_list_background_light;
+		((TextView) view.findViewById(R.id.start_button_descr)).setTextColor(ContextCompat.getColor(getMapActivity(), color));
+	}
+
+	public void updateControlButtons() {
+		OsmandApplication app = getMyApplication();
+		if (app != null) {
+			TextViewExProgress textViewExProgress = (TextViewExProgress) view.findViewById(R.id.start_button_descr);
+			textViewExProgress.color1 = ContextCompat.getColor(getMapActivity(), nightMode ? R.color.main_font_dark : R.color.card_and_list_background_light);
+			textViewExProgress.color2 = ContextCompat.getColor(getMapActivity(), R.color.description_font_and_bottom_sheet_icons);
+
+			ImageViewExProgress imageViewExProgress = (ImageViewExProgress) view.findViewById(R.id.start_icon);
+			imageViewExProgress.color1 = ContextCompat.getColor(getMapActivity(), nightMode ? R.color.main_font_dark : R.color.card_and_list_background_light);
+			imageViewExProgress.color2 = ContextCompat.getColor(getMapActivity(), R.color.description_font_and_bottom_sheet_icons);
+			((ImageView) view.findViewById(R.id.start_icon)).setImageResource(R.drawable.ic_action_start_navigation);
+			if (menu.isRouteCalculated()) {
+				AndroidUtils.setBackground(app, view.findViewById(R.id.start_button), nightMode, R.color.active_buttons_and_links_light, R.color.active_buttons_and_links_dark);
+				textViewExProgress.percent = 1;
+				imageViewExProgress.percent = 1;
+			}
+		}
+	}
+
+	public void show(MapActivity mapActivity) {
+		int slideInAnim = 0;
+		int slideOutAnim = 0;
+		if (!mapActivity.getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get()) {
+			slideInAnim = R.anim.slide_in_bottom;
+			slideOutAnim = R.anim.slide_out_bottom;
+		}
+		mapActivity.getSupportFragmentManager()
+				.beginTransaction()
+				.setCustomAnimations(slideInAnim, slideOutAnim, slideInAnim, slideOutAnim)
+				.add(R.id.routeMenuContainer, this, TAG)
+				.addToBackStack(TAG)
+				.commitAllowingStateLoss();
+	}
+
+	public void dismiss() {
+		FragmentActivity activity = getActivity();
+		if (activity != null) {
+			try {
+				activity.getSupportFragmentManager().popBackStack(TAG,
+						FragmentManager.POP_BACK_STACK_INCLUSIVE);
+			} catch (Exception e) {
+				//
+			}
+		}
+	}
+
+	public void applyDayNightMode() {
+		MapActivity ctx = getMapActivity();
+		boolean portraitMode = AndroidUiHelper.isOrientationPortrait(ctx);
+		boolean landscapeLayout = !portraitMode;
+		boolean nightMode = ctx.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		if (!landscapeLayout) {
+			AndroidUtils.setBackground(ctx, mainView, nightMode, R.drawable.route_info_menu_bg_light, R.drawable.route_info_menu_bg_dark);
+		} else {
+			AndroidUtils.setBackground(ctx, mainView, nightMode, R.drawable.route_info_menu_bg_left_light, R.drawable.route_info_menu_bg_left_dark);
+		}
+		AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.dividerFromDropDown), nightMode,
+				R.color.divider_light, R.color.divider_dark);
+		AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.viaLayoutDivider), nightMode,
+				R.color.divider_light, R.color.divider_dark);
+		AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.dividerButtons), nightMode,
+				R.color.divider_light, R.color.divider_dark);
+		AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.app_modes_options_container), nightMode,
+				R.drawable.route_info_trans_gradient_light, R.drawable.route_info_trans_gradient_dark);
+		AndroidUtils.setBackground(ctx, view.findViewById(R.id.dividerControlButtons), nightMode,
+				R.color.divider_light, R.color.divider_dark);
+
+		int color = ContextCompat.getColor(getMapActivity(), nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+
+		((TextView) mainView.findViewById(R.id.from_button_description)).setTextColor(color);
+		((TextView) mainView.findViewById(R.id.via_button_description)).setTextColor(color);
+		((TextView) mainView.findViewById(R.id.to_button_description)).setTextColor(color);
+		((TextView) mainView.findViewById(R.id.map_options_route_button_title)).setTextColor(color);
+
+		((TextView) view.findViewById(R.id.cancel_button_descr)).setTextColor(
+				ContextCompat.getColor(getMapActivity(), nightMode ? R.color.active_buttons_and_links_dark : R.color.route_info_cancel_button_color_light));
+
+		AndroidUtils.setTextPrimaryColor(ctx, (TextView) mainView.findViewById(R.id.ViaView), nightMode);
+		AndroidUtils.setTextSecondaryColor(ctx, (TextView) mainView.findViewById(R.id.ViaSubView), nightMode);
+		AndroidUtils.setTextSecondaryColor(ctx, (TextView) mainView.findViewById(R.id.toTitle), nightMode);
+		AndroidUtils.setTextSecondaryColor(ctx, (TextView) mainView.findViewById(R.id.fromTitle), nightMode);
+
+		ctx.setupRouteCalculationProgressBar((ProgressBar) mainView.findViewById(R.id.progress_bar));
+		setupRouteCalculationButtonProgressBar((ProgressBar) view.findViewById(R.id.progress_bar_button));
+
+		FrameLayout bottomContainer = (FrameLayout) view.findViewById(R.id.bottom_container);
+		if (!menu.isRouteCalculated()) {
+			bottomContainer.setForeground(getContentIcon(R.drawable.bg_contextmenu_shadow));
+		} else {
+			bottomContainer.setForeground(null);
+		}
+
+		updateControlButtons();
+	}
+
+	public static boolean showInstance(final MapActivity mapActivity) {
+		boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
+		int slideInAnim = 0;
+		int slideOutAnim = 0;
+		if (!mapActivity.getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get()) {
+			if (portrait) {
+				slideInAnim = R.anim.slide_in_bottom;
+				slideOutAnim = R.anim.slide_out_bottom;
+			} else {
+				slideInAnim = R.anim.slide_in_left;
+				slideOutAnim = R.anim.slide_out_left;
+			}
+		}
+
+		try {
+			mapActivity.getContextMenu().hideMenues();
+
+			MapRouteInfoMenuFragment fragment = new MapRouteInfoMenuFragment();
+			mapActivity.getSupportFragmentManager()
+					.beginTransaction()
+					.setCustomAnimations(slideInAnim, slideOutAnim, slideInAnim, slideOutAnim)
+					.add(R.id.routeMenuContainer, fragment, TAG)
+					.addToBackStack(TAG)
+					.commitAllowingStateLoss();
+
+			return true;
+
+		} catch (RuntimeException e) {
+			return false;
+		}
+	}
+
+	public void setupRouteCalculationButtonProgressBar(@NonNull ProgressBar pb) {
+		int bgColor = ContextCompat.getColor(getMyApplication(), nightMode ? R.color.route_info_cancel_button_color_dark : R.color.activity_background_light);
+		int progressColor = ContextCompat.getColor(getMyApplication(), nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+
+		pb.setProgressDrawable(AndroidUtils.createProgressDrawable(bgColor, progressColor));
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java
new file mode 100644
index 0000000000..bdf98a3197
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java
@@ -0,0 +1,484 @@
+package net.osmand.plus.routepreparationmenu;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.PopupMenu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import net.osmand.AndroidUtils;
+import net.osmand.CallbackWithObject;
+import net.osmand.plus.ApplicationMode;
+import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.OsmAndLocationProvider;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.SettingsBaseActivity;
+import net.osmand.plus.activities.SettingsNavigationActivity;
+import net.osmand.plus.base.MenuBottomSheetDialogFragment;
+import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
+import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerStartItem;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
+import net.osmand.plus.development.OsmandDevelopmentPlugin;
+import net.osmand.plus.helpers.GpxUiHelper;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.AvoidRoadsRoutingParameter;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.AvoidRoadsTypesRoutingParameter;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.DividerItem;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.GpxLocalRoutingParameter;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.LocalRoutingParameter;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.LocalRoutingParameterGroup;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.MuteSoundRoutingParameter;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.OtherSettingsRoutingParameter;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.RouteSimulationItem;
+import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.ShowAlongTheRouteItem;
+import net.osmand.plus.routing.RouteProvider;
+import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.router.GeneralRouter;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.DRIVING_STYLE;
+
+public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
+
+	public static final String TAG = "RouteOptionsBottomSheet";
+
+	private OsmandApplication app;
+	private OsmandSettings settings;
+	private RoutingHelper routingHelper;
+	private RoutingOptionsHelper routingOptionsHelper;
+	private ApplicationMode applicationMode;
+	private MapActivity mapActivity;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		app = getMyApplication();
+		settings = app.getSettings();
+		routingHelper = app.getRoutingHelper();
+		routingOptionsHelper = app.getRoutingOptionsHelper();
+		mapActivity = getMapActivity();
+		applicationMode = routingHelper.getAppMode();
+	}
+
+	@Override
+	public void createMenuItems(Bundle savedInstanceState) {
+		items.add(new TitleItem(app.getString(R.string.shared_string_settings), nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light));
+
+		List<LocalRoutingParameter> list = getRoutingParameters(applicationMode);
+
+		for (final LocalRoutingParameter optionsItem : list) {
+			if (optionsItem instanceof DividerItem) {
+				items.add(new DividerStartItem(app));
+			} else if (optionsItem instanceof MuteSoundRoutingParameter) {
+				items.add(createMuteSoundItem(optionsItem));
+			} else if (optionsItem instanceof ShowAlongTheRouteItem) {
+				items.add(createShowAlongTheRouteItem(optionsItem));
+			} else if (optionsItem instanceof RouteSimulationItem) {
+				if (OsmandPlugin.getEnabledPlugin(OsmandDevelopmentPlugin.class) != null) {
+					items.add(createRouteSimulationItem(optionsItem));
+				}
+			} else if (optionsItem instanceof AvoidRoadsTypesRoutingParameter) {
+				items.add(createAvoidRoadsTypesItem(optionsItem));
+			} else if (optionsItem instanceof AvoidRoadsRoutingParameter) {
+				items.add(createAvoidRoadsItem(optionsItem));
+			} else if (optionsItem instanceof GpxLocalRoutingParameter) {
+				items.add(createGpxRoutingItem(optionsItem));
+			} else if (optionsItem instanceof OtherSettingsRoutingParameter) {
+				items.add(createOtherSettingsRoutingItem(optionsItem));
+			} else {
+				inflateRoutingParameter(optionsItem);
+			}
+		}
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		for (BaseBottomSheetItem item : items) {
+			if (item instanceof BottomSheetItemWithCompoundButton) {
+				BottomSheetItemWithCompoundButton itemWithCompoundButton = (BottomSheetItemWithCompoundButton) item;
+				itemWithCompoundButton.setChecked(itemWithCompoundButton.isChecked());
+			}
+		}
+	}
+
+	@Override
+	protected int getDismissButtonTextId() {
+		return R.string.shared_string_close;
+	}
+
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		if (requestCode == AvoidRoadsBottomSheetDialogFragment.REQUEST_CODE
+				&& resultCode == AvoidRoadsBottomSheetDialogFragment.OPEN_AVOID_ROADS_DIALOG_REQUEST_CODE) {
+			dismiss();
+		}
+		if (requestCode == ShowAlongTheRouteBottomSheet.REQUEST_CODE
+				&& resultCode == ShowAlongTheRouteBottomSheet.SHOW_CONTENT_ITEM_REQUEST_CODE) {
+			dismiss();
+		}
+	}
+
+	private BaseBottomSheetItem createMuteSoundItem(final LocalRoutingParameter optionsItem) {
+		final BottomSheetItemWithCompoundButton[] muteSoundItem = new BottomSheetItemWithCompoundButton[1];
+		muteSoundItem[0] = (BottomSheetItemWithCompoundButton) new BottomSheetItemWithCompoundButton.Builder()
+				.setChecked(!routingHelper.getVoiceRouter().isMute())
+				.setDescription(getString(R.string.voice_announcements))
+				.setIcon(getContentIcon((routingHelper.getVoiceRouter().isMute() ? optionsItem.getDisabledIconId() : optionsItem.getActiveIconId())))
+				.setTitle(getString(R.string.shared_string_sound))
+				.setLayoutId(R.layout.bottom_sheet_item_with_descr_and_switch_56dp)
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						routingOptionsHelper.addNewRouteMenuParameter(applicationMode, optionsItem);
+						boolean mt = !routingHelper.getVoiceRouter().isMute();
+						settings.VOICE_MUTE.set(mt);
+						routingHelper.getVoiceRouter().setMute(mt);
+						muteSoundItem[0].setChecked(!routingHelper.getVoiceRouter().isMute());
+						muteSoundItem[0].setIcon(getContentIcon((routingHelper.getVoiceRouter().isMute() ? optionsItem.getDisabledIconId() : optionsItem.getActiveIconId())));
+						updateMenu();
+					}
+				})
+				.create();
+		return muteSoundItem[0];
+	}
+
+	private BaseBottomSheetItem createShowAlongTheRouteItem(final LocalRoutingParameter optionsItem) {
+		return new SimpleBottomSheetItem.Builder()
+				.setIcon(getContentIcon((optionsItem.getActiveIconId())))
+				.setTitle(getString(R.string.show_along_the_route))
+				.setLayoutId(R.layout.bottom_sheet_item_simple_56dp)
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						routingOptionsHelper.addNewRouteMenuParameter(applicationMode, optionsItem);
+						FragmentManager fm = getFragmentManager();
+						if (fm == null) {
+							return;
+						}
+						Bundle args = new Bundle();
+						ShowAlongTheRouteBottomSheet fragment = new ShowAlongTheRouteBottomSheet();
+						fragment.setUsedOnMap(false);
+						fragment.setArguments(args);
+						fragment.setTargetFragment(RouteOptionsBottomSheet.this, ShowAlongTheRouteBottomSheet.REQUEST_CODE);
+						fragment.show(fm, ShowAlongTheRouteBottomSheet.TAG);
+						updateMenu();
+					}
+				}).create();
+	}
+
+	private BaseBottomSheetItem createRouteSimulationItem(final LocalRoutingParameter optionsItem) {
+		return new SimpleBottomSheetItem.Builder()
+				.setIcon(getContentIcon(R.drawable.ic_action_start_navigation))
+				.setTitle(getString(R.string.simulate_navigation))
+				.setLayoutId(R.layout.bottom_sheet_item_simple_56dp)
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						final OsmAndLocationProvider loc = app.getLocationProvider();
+						loc.getLocationSimulation().startStopRouteAnimation(getActivity());
+						dismiss();
+					}
+				})
+				.create();
+	}
+
+	private BaseBottomSheetItem createAvoidRoadsTypesItem(final LocalRoutingParameter optionsItem) {
+		return new SimpleBottomSheetItem.Builder()
+				.setIcon(getContentIcon((optionsItem.getActiveIconId())))
+				.setTitle(getString(R.string.impassable_road))
+				.setLayoutId(R.layout.bottom_sheet_item_simple_56dp)
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						routingOptionsHelper.addNewRouteMenuParameter(applicationMode, optionsItem);
+						AvoidRoadsBottomSheetDialogFragment avoidRoadsFragment = new AvoidRoadsBottomSheetDialogFragment();
+						avoidRoadsFragment.setTargetFragment(RouteOptionsBottomSheet.this, AvoidRoadsBottomSheetDialogFragment.REQUEST_CODE);
+						avoidRoadsFragment.show(mapActivity.getSupportFragmentManager(), AvoidRoadsBottomSheetDialogFragment.TAG);
+						updateMenu();
+					}
+				})
+				.create();
+	}
+
+	private BaseBottomSheetItem createAvoidRoadsItem(final LocalRoutingParameter optionsItem) {
+		return new SimpleBottomSheetItem.Builder()
+				.setIcon(getContentIcon((optionsItem.getActiveIconId())))
+				.setTitle(getString(R.string.impassable_road))
+				.setLayoutId(R.layout.bottom_sheet_item_simple_56dp)
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						routingOptionsHelper.addNewRouteMenuParameter(applicationMode, optionsItem);
+						AvoidRoadsBottomSheetDialogFragment avoidRoadsFragment = new AvoidRoadsBottomSheetDialogFragment();
+						avoidRoadsFragment.setTargetFragment(RouteOptionsBottomSheet.this, AvoidRoadsBottomSheetDialogFragment.REQUEST_CODE);
+						avoidRoadsFragment.show(mapActivity.getSupportFragmentManager(), AvoidRoadsBottomSheetDialogFragment.TAG);
+						updateMenu();
+					}
+				})
+				.create();
+	}
+
+	private BaseBottomSheetItem createGpxRoutingItem(final LocalRoutingParameter optionsItem) {
+		View view = mapActivity.getLayoutInflater().inflate(R.layout.plan_route_gpx, null);
+		AndroidUtils.setTextPrimaryColor(mapActivity, (TextView) view.findViewById(R.id.title), nightMode);
+		final TextView gpxDescription = (TextView) view.findViewById(R.id.description);
+
+		((ImageView) view.findViewById(R.id.icon)).setImageDrawable(getContentIcon(optionsItem.getActiveIconId()));
+		((ImageView) view.findViewById(R.id.dropDownIcon)).setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_drop_down));
+
+		RouteProvider.GPXRouteParamsBuilder rp = mapActivity.getRoutingHelper().getCurrentGPXRoute();
+		String gpxName;
+		if (rp == null) {
+			AndroidUtils.setTextSecondaryColor(mapActivity, gpxDescription, nightMode);
+			gpxName = mapActivity.getString(R.string.choose_track_file_to_follow);
+		} else {
+			gpxDescription.setTextColor(ContextCompat.getColor(mapActivity, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light));
+			gpxName = new File(rp.getFile().path).getName();
+		}
+		gpxDescription.setText(gpxName);
+
+		return new BaseBottomSheetItem.Builder().setCustomView(view).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				showOptionsMenu(gpxDescription);
+			}
+		}).create();
+	}
+
+	private BaseBottomSheetItem createOtherSettingsRoutingItem(final LocalRoutingParameter optionsItem) {
+		return new SimpleBottomSheetItem.Builder()
+				.setIcon(getContentIcon(optionsItem.getActiveIconId()))
+				.setTitle(getString(R.string.routing_settings_2))
+				.setLayoutId(R.layout.bottom_sheet_item_simple_56dp)
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						final Intent settings = new Intent(mapActivity, SettingsNavigationActivity.class);
+						settings.putExtra(SettingsNavigationActivity.INTENT_SKIP_DIALOG, true);
+						settings.putExtra(SettingsBaseActivity.INTENT_APP_MODE, routingHelper.getAppMode().getStringKey());
+						mapActivity.startActivity(settings);
+					}
+				})
+				.create();
+	}
+
+	private void inflateRoutingParameter(final LocalRoutingParameter parameter) {
+		if (parameter != null) {
+			final BottomSheetItemWithCompoundButton[] item = new BottomSheetItemWithCompoundButton[1];
+			BottomSheetItemWithCompoundButton.Builder builder = new BottomSheetItemWithCompoundButton.Builder();
+			if (parameter.routingParameter != null || parameter instanceof RoutingOptionsHelper.OtherLocalRoutingParameter) {
+				builder.setTitle(parameter.getText(mapActivity));
+				int iconId = parameter.isSelected(settings) ? parameter.getActiveIconId() : parameter.getDisabledIconId();
+				if (iconId != -1) {
+					builder.setIcon(getContentIcon(iconId));
+				}
+			}
+			if (parameter instanceof LocalRoutingParameterGroup) {
+				final LocalRoutingParameterGroup group = (LocalRoutingParameterGroup) parameter;
+				LocalRoutingParameter selected = group.getSelected(settings);
+				if (selected != null) {
+					builder.setTitle(group.getText(mapActivity));
+					builder.setDescription(selected.getText(mapActivity));
+				}
+				builder.setLayoutId(R.layout.bottom_sheet_item_with_descr_56dp);
+				builder.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						routingOptionsHelper.addNewRouteMenuParameter(applicationMode, parameter);
+						routingOptionsHelper.showLocalRoutingParameterGroupDialog(group, mapActivity, new RoutingOptionsHelper.OnClickListener() {
+							@Override
+							public void onClick() {
+								LocalRoutingParameter selected = group.getSelected(settings);
+								if (selected != null) {
+									item[0].setDescription(selected.getText(mapActivity));
+								}
+								updateMenu();
+							}
+						});
+					}
+				});
+			} else {
+				builder.setLayoutId(R.layout.bottom_sheet_item_with_switch_56dp);
+				if (parameter.routingParameter != null && parameter.routingParameter.getId().equals(GeneralRouter.USE_SHORTEST_WAY)) {
+					// if short route settings - it should be inverse of fast_route_mode
+					builder.setChecked(!settings.FAST_ROUTE_MODE.getModeValue(routingHelper.getAppMode()));
+				} else {
+					builder.setChecked(parameter.isSelected(settings));
+				}
+				builder.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						routingOptionsHelper.addNewRouteMenuParameter(applicationMode, parameter);
+						boolean selected = !parameter.isSelected(settings);
+						routingOptionsHelper.applyRoutingParameter(parameter, selected);
+						item[0].setChecked(selected);
+						int iconId = selected ? parameter.getActiveIconId() : parameter.getDisabledIconId();
+						if (iconId != -1) {
+							item[0].setIcon(getContentIcon(iconId));
+						}
+						updateMenu();
+					}
+				});
+			}
+			item[0] = builder.create();
+			items.add(item[0]);
+		}
+	}
+
+	private void updateMenu() {
+		final MapRouteInfoMenu mapRouteInfoMenu = getMapActivity().getMapLayers().getMapControlsLayer().getMapRouteInfoMenu();
+		if (mapRouteInfoMenu != null) {
+			mapRouteInfoMenu.updateMenu();
+		}
+	}
+
+	private List<LocalRoutingParameter> getRoutingParameters(ApplicationMode applicationMode) {
+		List<String> routingParameters = new ArrayList<>();
+		if (applicationMode.equals(ApplicationMode.CAR)) {
+			routingParameters = AppModeOptions.CAR.routingParameters;
+		} else if (applicationMode.equals(ApplicationMode.BICYCLE)) {
+			routingParameters = AppModeOptions.BICYCLE.routingParameters;
+		} else if (applicationMode.equals(ApplicationMode.PEDESTRIAN)) {
+			routingParameters = AppModeOptions.PEDESTRIAN.routingParameters;
+		}
+
+		return routingOptionsHelper.getRoutingParameters(applicationMode, routingParameters);
+	}
+
+	private MapActivity getMapActivity() {
+		return (MapActivity) getActivity();
+	}
+
+	public static void showInstance(FragmentManager fragmentManager) {
+		RouteOptionsBottomSheet f = new RouteOptionsBottomSheet();
+		f.show(fragmentManager, RouteOptionsBottomSheet.TAG);
+	}
+
+	protected void openGPXFileSelection() {
+		GpxUiHelper.selectGPXFile(mapActivity, false, false, new CallbackWithObject<GPXUtilities.GPXFile[]>() {
+
+			@Override
+			public boolean processResult(GPXUtilities.GPXFile[] result) {
+				mapActivity.getMapActions().setGPXRouteParams(result[0]);
+				app.getTargetPointsHelper().updateRouteAndRefresh(true);
+				updateParameters();
+				routingHelper.recalculateRouteDueToSettingsChange();
+				return true;
+			}
+		});
+	}
+
+	private void showOptionsMenu(final TextView gpxSpinner) {
+		RouteProvider.GPXRouteParamsBuilder rp = mapActivity.getRoutingHelper().getCurrentGPXRoute();
+		final PopupMenu optionsMenu = new PopupMenu(gpxSpinner.getContext(), gpxSpinner);
+		MenuItem item = optionsMenu.getMenu().add(
+				mapActivity.getString(R.string.shared_string_none));
+		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+			@Override
+			public boolean onMenuItemClick(MenuItem item) {
+				if (mapActivity.getRoutingHelper().getCurrentGPXRoute() != null) {
+					mapActivity.getRoutingHelper().setGpxParams(null);
+					settings.FOLLOW_THE_GPX_ROUTE.set(null);
+					mapActivity.getRoutingHelper().recalculateRouteDueToSettingsChange();
+				}
+				updateParameters();
+				return true;
+			}
+		});
+		item = optionsMenu.getMenu().add(mapActivity.getString(R.string.select_gpx));
+		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+			@Override
+			public boolean onMenuItemClick(MenuItem item) {
+				openGPXFileSelection();
+				return true;
+			}
+		});
+		if (rp != null) {
+			item = optionsMenu.getMenu().add(new File(rp.getFile().path).getName());
+			item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+				@Override
+				public boolean onMenuItemClick(MenuItem item) {
+					// nothing to change
+					return true;
+				}
+			});
+		}
+		optionsMenu.show();
+	}
+
+	private void updateParameters() {
+		View mainView = getView();
+		if (mainView != null) {
+			LinearLayout itemsContainer = (LinearLayout) mainView.findViewById(useScrollableItemsContainer()
+					? R.id.scrollable_items_container : R.id.non_scrollable_items_container);
+			if (itemsContainer != null) {
+				itemsContainer.removeAllViews();
+			}
+			items.clear();
+			createMenuItems(null);
+			for (BaseBottomSheetItem item : items) {
+				item.inflate(app, itemsContainer, nightMode);
+			}
+			setupHeightAndBackground(mainView);
+		}
+	}
+
+	public enum AppModeOptions {
+
+		CAR(MuteSoundRoutingParameter.KEY,
+				DividerItem.KEY,
+				AvoidRoadsRoutingParameter.KEY,
+				ShowAlongTheRouteItem.KEY,
+				GeneralRouter.ALLOW_PRIVATE,
+				GeneralRouter.USE_SHORTEST_WAY,
+				DividerItem.KEY,
+				GpxLocalRoutingParameter.KEY,
+				OtherSettingsRoutingParameter.KEY,
+				RouteSimulationItem.KEY),
+
+		BICYCLE(MuteSoundRoutingParameter.KEY,
+				DRIVING_STYLE,
+				GeneralRouter.USE_HEIGHT_OBSTACLES,
+				DividerItem.KEY,
+				GeneralRouter.ALLOW_MOTORWAYS,
+				AvoidRoadsTypesRoutingParameter.KEY,
+				ShowAlongTheRouteItem.KEY,
+				DividerItem.KEY,
+				GpxLocalRoutingParameter.KEY,
+				OtherSettingsRoutingParameter.KEY,
+				RouteSimulationItem.KEY),
+
+		PEDESTRIAN(MuteSoundRoutingParameter.KEY,
+				GeneralRouter.USE_HEIGHT_OBSTACLES,
+				DividerItem.KEY,
+				AvoidRoadsTypesRoutingParameter.KEY,
+				ShowAlongTheRouteItem.KEY,
+				DividerItem.KEY,
+				GpxLocalRoutingParameter.KEY,
+				OtherSettingsRoutingParameter.KEY,
+				RouteSimulationItem.KEY);
+
+
+		List<String> routingParameters;
+
+		AppModeOptions(String... routingParameters) {
+			this.routingParameters = Arrays.asList(routingParameters);
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java
new file mode 100644
index 0000000000..ce85a602c6
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java
@@ -0,0 +1,946 @@
+package net.osmand.plus.routepreparationmenu;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
+import android.support.v7.app.AlertDialog;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import net.osmand.CallbackWithObject;
+import net.osmand.IndexConstants;
+import net.osmand.Location;
+import net.osmand.data.LatLon;
+import net.osmand.plus.ApplicationMode;
+import net.osmand.plus.ContextMenuAdapter;
+import net.osmand.plus.ContextMenuItem;
+import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.TargetPointsHelper;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.SettingsBaseActivity;
+import net.osmand.plus.activities.SettingsNavigationActivity;
+import net.osmand.plus.dashboard.DashboardOnMap;
+import net.osmand.plus.download.DownloadActivity;
+import net.osmand.plus.download.DownloadActivityType;
+import net.osmand.plus.helpers.FileNameTranslationHelper;
+import net.osmand.plus.routing.RouteProvider;
+import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.voice.JSMediaCommandPlayerImpl;
+import net.osmand.plus.voice.JSTTSCommandPlayerImpl;
+import net.osmand.plus.voice.MediaCommandPlayerImpl;
+import net.osmand.plus.voice.TTSCommandPlayerImpl;
+import net.osmand.router.GeneralRouter;
+import net.osmand.util.Algorithms;
+import net.osmand.util.MapUtils;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static net.osmand.plus.activities.SettingsNavigationActivity.getRouter;
+
+public class RoutingOptionsHelper {
+
+	public static final String MORE_VALUE = "MORE_VALUE";
+	public static final String DRIVING_STYLE = "driving_style";
+
+	private OsmandApplication app;
+	private OsmandSettings settings;
+
+	Map<ApplicationMode, RouteMenuAppModes> modes = new HashMap<>();
+
+	public RoutingOptionsHelper(OsmandApplication application) {
+		app = application;
+		settings = app.getSettings();
+
+		modes.put(ApplicationMode.CAR, new RouteMenuAppModes(ApplicationMode.CAR, getRoutingParameters(ApplicationMode.CAR, MapRouteInfoMenu.PermanentAppModeOptions.CAR.routingParameters)));
+		modes.put(ApplicationMode.BICYCLE, new RouteMenuAppModes(ApplicationMode.BICYCLE, getRoutingParameters(ApplicationMode.BICYCLE, MapRouteInfoMenu.PermanentAppModeOptions.BICYCLE.routingParameters)));
+		modes.put(ApplicationMode.PEDESTRIAN, new RouteMenuAppModes(ApplicationMode.PEDESTRIAN, getRoutingParameters(ApplicationMode.PEDESTRIAN, MapRouteInfoMenu.PermanentAppModeOptions.PEDESTRIAN.routingParameters)));
+	}
+
+	public void addNewRouteMenuParameter(ApplicationMode applicationMode, LocalRoutingParameter parameter) {
+		RouteMenuAppModes mode = modes.get(applicationMode);
+		if (mode != null) {
+			if (parameter.canAddToRouteMenu() && mode.am.equals(applicationMode) && !mode.containsParameter(parameter)) {
+				mode.parameters.add(parameter);
+			}
+		} else if (parameter.canAddToRouteMenu()) {
+			List<LocalRoutingParameter> list = new ArrayList<>();
+			list.add(parameter);
+			modes.put(applicationMode, new RouteMenuAppModes(applicationMode, list));
+		}
+	}
+
+	public void switchSound() {
+		RoutingHelper routingHelper = app.getRoutingHelper();
+		boolean mt = !routingHelper.getVoiceRouter().isMute();
+		settings.VOICE_MUTE.set(mt);
+		routingHelper.getVoiceRouter().setMute(mt);
+	}
+
+	public void switchMusic() {
+		boolean mt = !settings.INTERRUPT_MUSIC.get();
+		settings.INTERRUPT_MUSIC.set(mt);
+	}
+
+	public void selectRestrictedRoads(final MapActivity mapActivity) {
+		mapActivity.getDashboard().setDashboardVisibility(false, DashboardOnMap.DashboardType.ROUTE_PREFERENCES);
+		mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu().hide();
+		mapActivity.getMyApplication().getAvoidSpecificRoads().showDialog(mapActivity);
+	}
+
+	public void selectVoiceGuidance(final MapActivity mapActivity, final CallbackWithObject<String> callback) {
+		final ContextMenuAdapter adapter = new ContextMenuAdapter();
+
+		String[] entries;
+		final String[] entrieValues;
+		Set<String> voiceFiles = getVoiceFiles(mapActivity);
+		entries = new String[voiceFiles.size() + 2];
+		entrieValues = new String[voiceFiles.size() + 2];
+		int k = 0;
+		int selected = -1;
+		String selectedValue = mapActivity.getMyApplication().getSettings().VOICE_PROVIDER.get();
+		entrieValues[k] = OsmandSettings.VOICE_PROVIDER_NOT_USE;
+		entries[k] = mapActivity.getResources().getString(R.string.shared_string_do_not_use);
+		ContextMenuItem.ItemBuilder itemBuilder = new ContextMenuItem.ItemBuilder();
+		adapter.addItem(itemBuilder.setTitle(entries[k]).createItem());
+		if (OsmandSettings.VOICE_PROVIDER_NOT_USE.equals(selectedValue)) {
+			selected = k;
+		}
+		k++;
+		for (String s : voiceFiles) {
+			entries[k] = (s.contains("tts") ? mapActivity.getResources().getString(R.string.ttsvoice) + " " : "") +
+					FileNameTranslationHelper.getVoiceName(mapActivity, s);
+			entrieValues[k] = s;
+			adapter.addItem(itemBuilder.setTitle(entries[k]).createItem());
+			if (s.equals(selectedValue)) {
+				selected = k;
+			}
+			k++;
+		}
+		entrieValues[k] = MORE_VALUE;
+		entries[k] = mapActivity.getResources().getString(R.string.install_more);
+		adapter.addItem(itemBuilder.setTitle(entries[k]).createItem());
+
+		AlertDialog.Builder bld = new AlertDialog.Builder(mapActivity);
+		bld.setSingleChoiceItems(entries, selected, new DialogInterface.OnClickListener() {
+
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				String value = entrieValues[which];
+				if (MORE_VALUE.equals(value)) {
+					final Intent intent = new Intent(mapActivity, DownloadActivity.class);
+					intent.putExtra(DownloadActivity.TAB_TO_OPEN, DownloadActivity.DOWNLOAD_TAB);
+					intent.putExtra(DownloadActivity.FILTER_CAT, DownloadActivityType.VOICE_FILE.getTag());
+					mapActivity.startActivity(intent);
+				} else {
+					if (callback != null) {
+						callback.processResult(value);
+					}
+				}
+				dialog.dismiss();
+			}
+		});
+		bld.show();
+	}
+
+	public String getVoiceProviderName(Context ctx, String value) {
+		if (OsmandSettings.VOICE_PROVIDER_NOT_USE.equals(value)) {
+			return ctx.getResources().getString(R.string.shared_string_do_not_use);
+		} else {
+			return (value.contains("tts") ? ctx.getResources().getString(R.string.ttsvoice) + " " : "") +
+					FileNameTranslationHelper.getVoiceName(ctx, value);
+		}
+	}
+
+	public void applyVoiceProvider(MapActivity mapActivity, String provider) {
+		OsmandApplication app = mapActivity.getMyApplication();
+		app.getSettings().VOICE_PROVIDER.set(provider);
+		app.initVoiceCommandPlayer(mapActivity, app.getRoutingHelper().getAppMode(), false, null, true, false);
+	}
+
+	public Set<String> getVoiceFiles(Activity activity) {
+		// read available voice data
+		OsmandApplication app = ((OsmandApplication) activity.getApplication());
+		File extStorage = app.getAppPath(IndexConstants.VOICE_INDEX_DIR);
+		Set<String> setFiles = new LinkedHashSet<String>();
+		if (extStorage.exists()) {
+			for (File f : extStorage.listFiles()) {
+				if (f.isDirectory()) {
+					if (JSMediaCommandPlayerImpl.isMyData(f) || JSTTSCommandPlayerImpl.isMyData(f)
+							|| MediaCommandPlayerImpl.isMyData(f) || TTSCommandPlayerImpl.isMyData(f)) {
+						setFiles.add(f.getName());
+					}
+				}
+			}
+		}
+		return setFiles;
+	}
+
+	public void applyRoutingParameter(LocalRoutingParameter rp, boolean isChecked) {
+		final OsmandSettings settings = app.getSettings();
+		RoutingHelper routingHelper = app.getRoutingHelper();
+		// if short way that it should set valut to fast mode opposite of current
+		if (rp.routingParameter != null && rp.routingParameter.getId().equals(GeneralRouter.USE_SHORTEST_WAY)) {
+			settings.FAST_ROUTE_MODE.setModeValue(routingHelper.getAppMode(), !isChecked);
+		}
+		rp.setSelected(settings, isChecked);
+
+		if (rp instanceof OtherLocalRoutingParameter) {
+			updateGpxRoutingParameter((OtherLocalRoutingParameter) rp);
+		}
+		routingHelper.recalculateRouteDueToSettingsChange();
+	}
+
+	public void updateGpxRoutingParameter(OtherLocalRoutingParameter gpxParam) {
+		RouteProvider.GPXRouteParamsBuilder rp = app.getRoutingHelper().getCurrentGPXRoute();
+		final OsmandSettings settings = app.getSettings();
+		boolean selected = gpxParam.isSelected(settings);
+		if (rp != null) {
+			if (gpxParam.id == R.string.gpx_option_reverse_route) {
+				rp.setReverse(selected);
+				TargetPointsHelper tg = app.getTargetPointsHelper();
+				List<Location> ps = rp.getPoints();
+				if (ps.size() > 0) {
+					Location first = ps.get(0);
+					Location end = ps.get(ps.size() - 1);
+					TargetPointsHelper.TargetPoint pn = tg.getPointToNavigate();
+					boolean update = false;
+					if (pn == null
+							|| MapUtils.getDistance(pn.point, new LatLon(first.getLatitude(), first.getLongitude())) < 10) {
+						tg.navigateToPoint(new LatLon(end.getLatitude(), end.getLongitude()), false, -1);
+						update = true;
+					}
+					if (tg.getPointToStart() == null
+							|| MapUtils.getDistance(tg.getPointToStart().point,
+							new LatLon(end.getLatitude(), end.getLongitude())) < 10) {
+						tg.setStartPoint(new LatLon(first.getLatitude(), first.getLongitude()), false, null);
+						update = true;
+					}
+					if (update) {
+						tg.updateRouteAndRefresh(true);
+					}
+				}
+			} else if (gpxParam.id == R.string.gpx_option_calculate_first_last_segment) {
+				rp.setCalculateOsmAndRouteParts(selected);
+				settings.GPX_ROUTE_CALC_OSMAND_PARTS.set(selected);
+			} else if (gpxParam.id == R.string.gpx_option_from_start_point) {
+				rp.setPassWholeRoute(selected);
+			} else if (gpxParam.id == R.string.use_points_as_intermediates) {
+				settings.GPX_CALCULATE_RTEPT.set(selected);
+				rp.setUseIntermediatePointsRTE(selected);
+			} else if (gpxParam.id == R.string.calculate_osmand_route_gpx) {
+				settings.GPX_ROUTE_CALC.set(selected);
+				rp.setCalculateOsmAndRoute(selected);
+			}
+		}
+		if (gpxParam.id == R.string.calculate_osmand_route_without_internet) {
+			settings.GPX_ROUTE_CALC_OSMAND_PARTS.set(selected);
+		}
+		if (gpxParam.id == R.string.fast_route_mode) {
+			settings.FAST_ROUTE_MODE.set(selected);
+		}
+		if (gpxParam.id == R.string.speak_favorites) {
+			settings.ANNOUNCE_NEARBY_FAVORITES.set(selected);
+		}
+	}
+
+	public List<LocalRoutingParameter> getRoutingParameters(ApplicationMode am, List<String> routingParameters) {
+		List<LocalRoutingParameter> list = new ArrayList<>();
+		getAppModeItems(am, list, routingParameters);
+		return list;
+	}
+
+	public List<LocalRoutingParameter> getAppModeItems(ApplicationMode am, List<LocalRoutingParameter> list, List<String> routingParameters) {
+		for (String itemId : routingParameters) {
+			LocalRoutingParameter item = getItem(am, itemId);
+			if (item != null) {
+				updateRoutingParameterIcons(item);
+				list.add(item);
+				if (item instanceof GpxLocalRoutingParameter) {
+					list.addAll(getGpxAndOsmandRouterParameters(am));
+				}
+			}
+		}
+		return list;
+	}
+
+	public interface OnClickListener {
+		void onClick();
+	}
+
+	public void showLocalRoutingParameterGroupDialog(final LocalRoutingParameterGroup group, final MapActivity mapActivity, final OnClickListener listener) {
+		final ContextMenuAdapter adapter = new ContextMenuAdapter();
+		int i = 0;
+		int selectedIndex = -1;
+		for (LocalRoutingParameter p : group.getRoutingParameters()) {
+			adapter.addItem(ContextMenuItem.createBuilder(p.getText(mapActivity)).setSelected(false).createItem());
+			if (p.isSelected(settings)) {
+				selectedIndex = i;
+			}
+			i++;
+		}
+		if (selectedIndex == -1) {
+			selectedIndex = 0;
+		}
+		AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
+		final int layout = R.layout.list_menu_item_native_singlechoice;
+
+		final ArrayAdapter<String> listAdapter = new ArrayAdapter<String>(mapActivity, layout, R.id.text1, adapter.getItemNames()) {
+			@NonNull
+			@Override
+			public View getView(final int position, View convertView, ViewGroup parent) {
+				// User super class to create the View
+				View v = convertView;
+				if (v == null) {
+					v = mapActivity.getLayoutInflater().inflate(layout, null);
+				}
+				final ContextMenuItem item = adapter.getItem(position);
+				TextView tv = (TextView) v.findViewById(R.id.text1);
+				tv.setText(item.getTitle());
+				tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f);
+
+				return v;
+			}
+		};
+
+		final int[] selectedPosition = {selectedIndex};
+		builder.setSingleChoiceItems(listAdapter, selectedIndex, new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int position) {
+				selectedPosition[0] = position;
+			}
+		});
+		builder.setTitle(group.getText(mapActivity))
+				.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						int position = selectedPosition[0];
+						if (position >= 0 && position < group.getRoutingParameters().size()) {
+							for (int i = 0; i < group.getRoutingParameters().size(); i++) {
+								LocalRoutingParameter rp = group.getRoutingParameters().get(i);
+								rp.setSelected(settings, i == position);
+							}
+							mapActivity.getRoutingHelper().recalculateRouteDueToSettingsChange();
+							if (listener != null) {
+								listener.onClick();
+							}
+						}
+					}
+				})
+				.setNegativeButton(R.string.shared_string_cancel, null);
+		builder.create().show();
+	}
+
+	public LocalRoutingParameter getItem(ApplicationMode am, String parameter) {
+		switch (parameter) {
+			case MuteSoundRoutingParameter.KEY:
+				return new MuteSoundRoutingParameter();
+			case DividerItem.KEY:
+				return new DividerItem();
+			case RouteSimulationItem.KEY:
+				return new RouteSimulationItem();
+			case ShowAlongTheRouteItem.KEY:
+				return new ShowAlongTheRouteItem();
+			case AvoidRoadsTypesRoutingParameter.KEY:
+				return new AvoidRoadsTypesRoutingParameter();
+			case AvoidRoadsRoutingParameter.KEY:
+				return new AvoidRoadsRoutingParameter();
+			case GpxLocalRoutingParameter.KEY:
+				return new GpxLocalRoutingParameter();
+			case OtherSettingsRoutingParameter.KEY:
+				return new OtherSettingsRoutingParameter();
+			default:
+				return getRoutingParameterInnerById(am, parameter);
+		}
+	}
+
+	public LocalRoutingParameter getRoutingParameterInnerById(ApplicationMode am, String parameterId) {
+		RouteProvider.GPXRouteParamsBuilder rparams = app.getRoutingHelper().getCurrentGPXRoute();
+		GeneralRouter rm = getRouter(app.getDefaultRoutingConfig(), am);
+		if (rm == null || (rparams != null && !rparams.isCalculateOsmAndRoute()) && !rparams.getFile().hasRtePt()) {
+			return null;
+		}
+
+		LocalRoutingParameter rp;
+		Map<String, GeneralRouter.RoutingParameter> parameters = rm.getParameters();
+		GeneralRouter.RoutingParameter routingParameter = parameters.get(parameterId);
+
+		if (routingParameter != null) {
+			rp = new LocalRoutingParameter(am);
+			rp.routingParameter = routingParameter;
+		} else {
+			LocalRoutingParameterGroup rpg = null;
+			for (GeneralRouter.RoutingParameter r : rm.getParameters().values()) {
+				if (r.getType() == GeneralRouter.RoutingParameterType.BOOLEAN
+						&& !Algorithms.isEmpty(r.getGroup()) && r.getGroup().equals(parameterId)) {
+					if (rpg == null) {
+						rpg = new LocalRoutingParameterGroup(am, r.getGroup());
+					}
+					rpg.addRoutingParameter(r);
+				}
+			}
+			return rpg;
+		}
+
+		return rp;
+	}
+
+	public List<LocalRoutingParameter> getAllRoutingParameters(ApplicationMode am) {
+		List<LocalRoutingParameter> list = getRoutingParametersInner(am);
+		list.add(0, new MuteSoundRoutingParameter());
+		list.add(1, new VoiceGuidanceRoutingParameter());
+		list.add(2, new InterruptMusicRoutingParameter());
+		list.add(3, new AvoidRoadsRoutingParameter());
+		list.add(new GpxLocalRoutingParameter());
+		list.add(new OtherSettingsRoutingParameter());
+		return list;
+	}
+
+	public List<LocalRoutingParameter> getGpxAndOsmandRouterParameters(ApplicationMode am) {
+		final OsmandSettings settings = app.getSettings();
+		List<LocalRoutingParameter> list = new ArrayList<LocalRoutingParameter>();
+		RouteProvider.GPXRouteParamsBuilder rparams = app.getRoutingHelper().getCurrentGPXRoute();
+		boolean osmandRouter = settings.ROUTER_SERVICE.getModeValue(am) == RouteProvider.RouteService.OSMAND;
+		if (!osmandRouter) {
+			list.add(new OtherLocalRoutingParameter(R.string.calculate_osmand_route_without_internet,
+					app.getString(R.string.calculate_osmand_route_without_internet), settings.GPX_ROUTE_CALC_OSMAND_PARTS
+					.get()));
+			list.add(new OtherLocalRoutingParameter(R.string.fast_route_mode, app.getString(R.string.fast_route_mode),
+					settings.FAST_ROUTE_MODE.get()));
+			return list;
+		}
+		if (rparams != null) {
+			GPXUtilities.GPXFile fl = rparams.getFile();
+			if (fl.hasRtePt()) {
+				list.add(new OtherLocalRoutingParameter(R.string.use_points_as_intermediates,
+						app.getString(R.string.use_points_as_intermediates), rparams.isUseIntermediatePointsRTE()));
+			}
+			list.add(new OtherLocalRoutingParameter(R.string.gpx_option_reverse_route,
+					app.getString(R.string.gpx_option_reverse_route), rparams.isReverse()));
+			if (!rparams.isUseIntermediatePointsRTE()) {
+				list.add(new OtherLocalRoutingParameter(R.string.gpx_option_from_start_point,
+						app.getString(R.string.gpx_option_from_start_point), rparams.isPassWholeRoute()));
+				list.add(new OtherLocalRoutingParameter(R.string.gpx_option_calculate_first_last_segment,
+						app.getString(R.string.gpx_option_calculate_first_last_segment), rparams
+						.isCalculateOsmAndRouteParts()));
+			}
+		}
+		return list;
+	}
+
+	public List<LocalRoutingParameter> getRoutingParametersInner(ApplicationMode am) {
+		RouteProvider.GPXRouteParamsBuilder rparams = app.getRoutingHelper().getCurrentGPXRoute();
+		List<LocalRoutingParameter> list = new ArrayList<LocalRoutingParameter>(getGpxAndOsmandRouterParameters(am));
+		GeneralRouter rm = SettingsNavigationActivity.getRouter(app.getDefaultRoutingConfig(), am);
+		if (rm == null || (rparams != null && !rparams.isCalculateOsmAndRoute()) && !rparams.getFile().hasRtePt()) {
+			return list;
+		}
+		for (GeneralRouter.RoutingParameter r : rm.getParameters().values()) {
+			if (r.getType() == GeneralRouter.RoutingParameterType.BOOLEAN) {
+				if ("relief_smoothness_factor".equals(r.getGroup())) {
+					continue;
+				}
+				if (!Algorithms.isEmpty(r.getGroup())) {
+					LocalRoutingParameterGroup rpg = getLocalRoutingParameterGroup(list, r.getGroup());
+					if (rpg == null) {
+						rpg = new LocalRoutingParameterGroup(am, r.getGroup());
+						list.add(rpg);
+					}
+					rpg.addRoutingParameter(r);
+				} else {
+					LocalRoutingParameter rp = new LocalRoutingParameter(am);
+					rp.routingParameter = r;
+					updateRoutingParameterIcons(rp);
+					list.add(rp);
+				}
+			}
+		}
+
+		return list;
+	}
+
+	private static void updateRoutingParameterIcons(LocalRoutingParameter rp) {
+		if (rp.routingParameter == null) {
+			return;
+		}
+		switch (rp.routingParameter.getId()) {
+			case GeneralRouter.USE_SHORTEST_WAY:
+				rp.activeIconId = R.drawable.ic_action_fuel;
+				rp.disabledIconId = R.drawable.ic_action_fuel;
+				break;
+			case GeneralRouter.USE_HEIGHT_OBSTACLES:
+				rp.activeIconId = R.drawable.ic_action_elevation;
+				rp.disabledIconId = R.drawable.ic_action_elevation;
+				break;
+			case GeneralRouter.AVOID_FERRIES:
+				rp.activeIconId = R.drawable.ic_action_fuel;
+				rp.disabledIconId = R.drawable.ic_action_fuel;
+				break;
+			case GeneralRouter.AVOID_TOLL:
+				rp.activeIconId = R.drawable.ic_action_fuel;
+				rp.disabledIconId = R.drawable.ic_action_fuel;
+				break;
+			case GeneralRouter.AVOID_MOTORWAY:
+				rp.activeIconId = R.drawable.ic_action_motorways;
+				rp.disabledIconId = R.drawable.ic_action_avoid_motorways;
+				break;
+			case GeneralRouter.AVOID_UNPAVED:
+				rp.activeIconId = R.drawable.ic_action_fuel;
+				rp.disabledIconId = R.drawable.ic_action_fuel;
+				break;
+			case GeneralRouter.PREFER_MOTORWAYS:
+				rp.activeIconId = R.drawable.ic_action_motorways;
+				rp.activeIconId = R.drawable.ic_action_avoid_motorways;
+				break;
+			case GeneralRouter.ALLOW_PRIVATE:
+				rp.activeIconId = R.drawable.ic_action_allow_private_access;
+				rp.disabledIconId = R.drawable.ic_action_forbid_private_access;
+				break;
+			case GeneralRouter.ALLOW_MOTORWAYS:
+				rp.activeIconId = R.drawable.ic_action_motorways;
+				rp.disabledIconId = R.drawable.ic_action_avoid_motorways;
+				break;
+		}
+	}
+
+	public static LocalRoutingParameterGroup getLocalRoutingParameterGroup(List<LocalRoutingParameter> list, String groupName) {
+		for (LocalRoutingParameter p : list) {
+			if (p instanceof LocalRoutingParameterGroup && groupName.equals(((LocalRoutingParameterGroup) p).getGroupName())) {
+				return (LocalRoutingParameterGroup) p;
+			}
+		}
+		return null;
+	}
+
+	public List<GeneralRouter.RoutingParameter> getAvoidRoutingPrefsForAppMode(ApplicationMode applicationMode) {
+		List<GeneralRouter.RoutingParameter> avoidParameters = new ArrayList<GeneralRouter.RoutingParameter>();
+		GeneralRouter router = getRouter(app.getDefaultRoutingConfig(), applicationMode);
+		if (router != null) {
+			for (Map.Entry<String, GeneralRouter.RoutingParameter> e : router.getParameters().entrySet()) {
+				String param = e.getKey();
+				GeneralRouter.RoutingParameter routingParameter = e.getValue();
+				if (param.startsWith("avoid_")) {
+					avoidParameters.add(routingParameter);
+				}
+			}
+		}
+		return avoidParameters;
+	}
+
+	public GeneralRouter.RoutingParameter getRoutingPrefsForAppModeById(ApplicationMode applicationMode, String parameterId) {
+		GeneralRouter router = getRouter(app.getDefaultRoutingConfig(), applicationMode);
+		GeneralRouter.RoutingParameter parameter = null;
+
+		if (router != null) {
+			parameter = router.getParameters().get(parameterId);
+		}
+
+		return parameter;
+	}
+
+	public static class LocalRoutingParameter {
+
+		public static final String KEY = "LocalRoutingParameter";
+
+		public GeneralRouter.RoutingParameter routingParameter;
+
+		private ApplicationMode am;
+
+		@DrawableRes
+		public
+		int activeIconId = -1;
+
+		@DrawableRes
+		int disabledIconId = -1;
+
+		public boolean canAddToRouteMenu() {
+			return true;
+		}
+
+		public String getKey() {
+			if (routingParameter != null) {
+				return routingParameter.getId();
+			}
+			return KEY;
+		}
+
+		public int getActiveIconId() {
+			return activeIconId;
+		}
+
+		public int getDisabledIconId() {
+			return disabledIconId;
+		}
+
+		public LocalRoutingParameter(ApplicationMode am) {
+			this.am = am;
+		}
+
+		public String getText(MapActivity mapActivity) {
+			return SettingsBaseActivity.getRoutingStringPropertyName(mapActivity, routingParameter.getId(),
+					routingParameter.getName());
+		}
+
+		public boolean isSelected(OsmandSettings settings) {
+			final OsmandSettings.CommonPreference<Boolean> property =
+					settings.getCustomRoutingBooleanProperty(routingParameter.getId(), routingParameter.getDefaultBoolean());
+			if (am != null) {
+				return property.getModeValue(am);
+			} else {
+				return property.get();
+			}
+		}
+
+		public void setSelected(OsmandSettings settings, boolean isChecked) {
+			final OsmandSettings.CommonPreference<Boolean> property =
+					settings.getCustomRoutingBooleanProperty(routingParameter.getId(), routingParameter.getDefaultBoolean());
+			if (am != null) {
+				property.setModeValue(am, isChecked);
+			} else {
+				property.set(isChecked);
+			}
+		}
+
+		public ApplicationMode getApplicationMode() {
+			return am;
+		}
+	}
+
+	public static class LocalRoutingParameterGroup extends LocalRoutingParameter {
+
+		public static final String KEY = "LocalRoutingParameterGroup";
+
+		private String groupName;
+		private List<LocalRoutingParameter> routingParameters = new ArrayList<>();
+
+		public String getKey() {
+			if (groupName != null) {
+				return groupName;
+			}
+			return KEY;
+		}
+
+		public LocalRoutingParameterGroup(ApplicationMode am, String groupName) {
+			super(am);
+			this.groupName = groupName;
+		}
+
+		public void addRoutingParameter(GeneralRouter.RoutingParameter routingParameter) {
+			LocalRoutingParameter p = new LocalRoutingParameter(getApplicationMode());
+			p.routingParameter = routingParameter;
+			routingParameters.add(p);
+		}
+
+		public String getGroupName() {
+			return groupName;
+		}
+
+		public List<LocalRoutingParameter> getRoutingParameters() {
+			return routingParameters;
+		}
+
+		@Override
+		public String getText(MapActivity mapActivity) {
+			return SettingsBaseActivity.getRoutingStringPropertyName(mapActivity, groupName,
+					Algorithms.capitalizeFirstLetterAndLowercase(groupName.replace('_', ' ')));
+		}
+
+		@Override
+		public boolean isSelected(OsmandSettings settings) {
+			return false;
+		}
+
+		@Override
+		public void setSelected(OsmandSettings settings, boolean isChecked) {
+		}
+
+		public LocalRoutingParameter getSelected(OsmandSettings settings) {
+			for (LocalRoutingParameter p : routingParameters) {
+				if (p.isSelected(settings)) {
+					return p;
+				}
+			}
+			return null;
+		}
+	}
+
+	public static class MuteSoundRoutingParameter extends LocalRoutingParameter {
+
+		public static final String KEY = "MuteSoundRoutingParameter";
+
+		public MuteSoundRoutingParameter() {
+			super(null);
+		}
+
+		public String getKey() {
+			return KEY;
+		}
+
+		@Override
+		public int getActiveIconId() {
+			return R.drawable.ic_action_volume_up;
+		}
+
+		@Override
+		public int getDisabledIconId() {
+			return R.drawable.ic_action_volume_mute;
+		}
+	}
+
+	public static class DividerItem extends LocalRoutingParameter {
+
+		public static final String KEY = "DividerItem";
+
+		public String getKey() {
+			return KEY;
+		}
+
+		public boolean canAddToRouteMenu() {
+			return false;
+		}
+
+		public DividerItem() {
+			super(null);
+		}
+	}
+
+	public static class RouteSimulationItem extends LocalRoutingParameter {
+
+		public static final String KEY = "RouteSimulationItem";
+
+		public String getKey() {
+			return KEY;
+		}
+
+		public boolean canAddToRouteMenu() {
+			return false;
+		}
+
+		public RouteSimulationItem() {
+			super(null);
+		}
+	}
+
+	public static class ShowAlongTheRouteItem extends LocalRoutingParameter {
+
+		public static final String KEY = "ShowAlongTheRouteItem";
+
+		public ShowAlongTheRouteItem() {
+			super(null);
+		}
+
+		public String getKey() {
+			return KEY;
+		}
+
+		@Override
+		public int getActiveIconId() {
+			return R.drawable.ic_action_show_along_route;
+		}
+
+		@Override
+		public int getDisabledIconId() {
+			return R.drawable.ic_action_show_along_route;
+		}
+	}
+
+	public static class AvoidRoadsRoutingParameter extends LocalRoutingParameter {
+
+		public static final String KEY = "AvoidRoadsRoutingParameter";
+
+		public AvoidRoadsRoutingParameter() {
+			super(null);
+		}
+
+		public String getKey() {
+			return KEY;
+		}
+
+		@Override
+		public int getActiveIconId() {
+			return R.drawable.ic_action_road_works_dark;
+		}
+
+		@Override
+		public int getDisabledIconId() {
+			return R.drawable.ic_action_road_works_dark;
+		}
+	}
+
+	public static class AvoidRoadsTypesRoutingParameter extends LocalRoutingParameter {
+
+		public static final String KEY = "AvoidRoadsTypesRoutingParameter";
+
+		public AvoidRoadsTypesRoutingParameter() {
+			super(null);
+		}
+
+		public String getKey() {
+			return KEY;
+		}
+
+		@Override
+		public int getActiveIconId() {
+			return R.drawable.ic_action_road_works_dark;
+		}
+
+		@Override
+		public int getDisabledIconId() {
+			return R.drawable.ic_action_road_works_dark;
+		}
+	}
+
+	public static class GpxLocalRoutingParameter extends LocalRoutingParameter {
+
+		public static final String KEY = "GpxLocalRoutingParameter";
+
+		public String getKey() {
+			return KEY;
+		}
+
+		public boolean canAddToRouteMenu() {
+			return false;
+		}
+
+		public GpxLocalRoutingParameter() {
+			super(null);
+		}
+
+		@Override
+		public int getActiveIconId() {
+			return R.drawable.ic_action_polygom_dark;
+		}
+
+		@Override
+		public int getDisabledIconId() {
+			return R.drawable.ic_action_polygom_dark;
+		}
+	}
+
+	public static class OtherSettingsRoutingParameter extends LocalRoutingParameter {
+
+		public static final String KEY = "OtherSettingsRoutingParameter";
+
+		public OtherSettingsRoutingParameter() {
+			super(null);
+		}
+
+		public String getKey() {
+			return KEY;
+		}
+
+		public boolean canAddToRouteMenu() {
+			return false;
+		}
+
+		@Override
+		public int getActiveIconId() {
+			return R.drawable.map_action_settings;
+		}
+
+		@Override
+		public int getDisabledIconId() {
+			return R.drawable.map_action_settings;
+		}
+	}
+
+	public static class OtherLocalRoutingParameter extends LocalRoutingParameter {
+
+		public static final String KEY = "OtherLocalRoutingParameter";
+
+		public String getKey() {
+			return KEY;
+		}
+
+		public boolean canAddToRouteMenu() {
+			return false;
+		}
+
+		public String text;
+		public boolean selected;
+		public int id;
+
+		public OtherLocalRoutingParameter(int id, String text, boolean selected) {
+			super(null);
+			this.text = text;
+			this.selected = selected;
+			this.id = id;
+		}
+
+		@Override
+		public String getText(MapActivity mapActivity) {
+			return text;
+		}
+
+		@Override
+		public boolean isSelected(OsmandSettings settings) {
+			return selected;
+		}
+
+		@Override
+		public void setSelected(OsmandSettings settings, boolean isChecked) {
+			selected = isChecked;
+		}
+	}
+
+	public static class InterruptMusicRoutingParameter extends LocalRoutingParameter {
+
+		public static final String KEY = "InterruptMusicRoutingParameter";
+
+		public String getKey() {
+			return KEY;
+		}
+
+		public InterruptMusicRoutingParameter() {
+			super(null);
+		}
+	}
+
+	public static class VoiceGuidanceRoutingParameter extends LocalRoutingParameter {
+
+		public static final String KEY = "VoiceGuidanceRoutingParameter";
+
+		public String getKey() {
+			return KEY;
+		}
+
+		public VoiceGuidanceRoutingParameter() {
+			super(null);
+		}
+	}
+
+	public static class RouteMenuAppModes {
+
+		public ApplicationMode am;
+
+		public List<LocalRoutingParameter> parameters;
+
+		public RouteMenuAppModes(ApplicationMode am, List<LocalRoutingParameter> parameters) {
+			this.am = am;
+			this.parameters = parameters;
+		}
+
+		public boolean containsParameter(LocalRoutingParameter parameter) {
+			for (LocalRoutingParameter p : parameters) {
+				if (p.getKey().equals(parameter.getKey())) {
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/ShowAlongTheRouteBottomSheet.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ShowAlongTheRouteBottomSheet.java
new file mode 100644
index 0000000000..c7d1a597cb
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ShowAlongTheRouteBottomSheet.java
@@ -0,0 +1,594 @@
+package net.osmand.plus.routepreparationmenu;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.Toolbar;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.ExpandableListView;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import net.osmand.AndroidUtils;
+import net.osmand.ValueHolder;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.MapActivityLayers;
+import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
+import net.osmand.plus.base.MenuBottomSheetDialogFragment;
+import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.SimpleDividerItem;
+import net.osmand.plus.helpers.WaypointDialogHelper;
+import net.osmand.plus.helpers.WaypointHelper;
+import net.osmand.plus.poi.PoiUIFilter;
+import net.osmand.plus.routing.IRouteInformationListener;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ShowAlongTheRouteBottomSheet extends MenuBottomSheetDialogFragment implements IRouteInformationListener {
+
+	public static final String TAG = "ShowAlongTheRouteBottomSheet";
+
+
+	public static final int REQUEST_CODE = 2;
+	public static final int SHOW_CONTENT_ITEM_REQUEST_CODE = 3;
+
+	private OsmandApplication app;
+
+	private MapActivity mapActivity;
+	private WaypointHelper waypointHelper;
+
+	private ExpandableListView expListView;
+	private ExpandableListAdapter adapter;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		app = getMyApplication();
+		mapActivity = (MapActivity) getActivity();
+		waypointHelper = app.getWaypointHelper();
+	}
+
+	@Override
+	public void createMenuItems(Bundle savedInstanceState) {
+		Context ctx = getContext();
+		Bundle args = getArguments();
+		if (ctx == null || args == null) {
+			return;
+		}
+
+		final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
+		final View titleView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.bottom_sheet_item_toolbar_title, null);
+		TextView textView = (TextView) titleView.findViewById(R.id.title);
+		textView.setText(R.string.show_along_the_route);
+
+		Toolbar toolbar = (Toolbar) titleView.findViewById(R.id.toolbar);
+		toolbar.setNavigationIcon(getContentIcon(R.drawable.ic_arrow_back));
+		toolbar.setNavigationContentDescription(R.string.access_shared_string_navigate_up);
+		toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				dismiss();
+			}
+		});
+
+		final SimpleBottomSheetItem titleItem = (SimpleBottomSheetItem) new SimpleBottomSheetItem.Builder()
+				.setCustomView(titleView)
+				.create();
+		items.add(titleItem);
+
+		final ContentItem contentItem = getAdapterContentItems();
+
+		items.add(new SimpleDividerItem(app));
+
+		Drawable transparent = ContextCompat.getDrawable(ctx, R.color.color_transparent);
+		adapter = new ExpandableListAdapter(ctx, contentItem);
+		expListView = new ExpandableListView(ctx);
+		expListView.setAdapter(adapter);
+		expListView.setDivider(transparent);
+		expListView.setGroupIndicator(transparent);
+		expListView.setSelector(transparent);
+		expListView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
+		LinearLayout container = new LinearLayout(ctx);
+		container.addView(expListView);
+
+		items.add(new SimpleBottomSheetItem.Builder().setCustomView(container).create());
+	}
+
+	@Override
+	protected boolean useScrollableItemsContainer() {
+		return false;
+	}
+
+	@Override
+	protected boolean hideButtonsContainer() {
+		return true;
+	}
+
+	private ContentItem getAdapterContentItems() {
+		final ContentItem contentItem = new ContentItem();
+		for (int i = 2; i < WaypointHelper.MAX; i++) {
+			List<WaypointHelper.LocationPointWrapper> tp = waypointHelper.getWaypoints(i);
+			ContentItem headerItem = new PointItem(i);
+			contentItem.subItems.add(headerItem);
+			headerItem.type = i;
+
+			if (waypointHelper.isRouteCalculated()) {
+				if ((i == WaypointHelper.POI || i == WaypointHelper.FAVORITES) && waypointHelper.isTypeEnabled(i)) {
+					ContentItem radiusItem = new RadiusItem(i);
+					headerItem.subItems.add(radiusItem);
+				}
+				if (tp != null && tp.size() > 0) {
+					for (int j = 0; j < tp.size(); j++) {
+						WaypointHelper.LocationPointWrapper pointWrapper = tp.get(j);
+						PointItem subheaderItem = new PointItem(pointWrapper.type);
+
+						headerItem.subItems.add(subheaderItem);
+						subheaderItem.point = pointWrapper;
+					}
+				}
+			} else {
+				ContentItem infoItem = new InfoItem(i);
+				headerItem.subItems.add(infoItem);
+			}
+		}
+		return contentItem;
+	}
+
+	@Override
+	public void newRouteIsCalculated(boolean newRoute, ValueHolder<Boolean> showToast) {
+		updateAdapter();
+	}
+
+	@Override
+	public void routeWasCancelled() {
+
+	}
+
+	@Override
+	public void routeWasFinished() {
+
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		app.getRoutingHelper().removeListener(this);
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		app.getRoutingHelper().addListener(this);
+	}
+
+
+	private void updateAdapter() {
+		if (adapter != null) {
+			adapter.contentItem = getAdapterContentItems();
+			adapter.notifyDataSetChanged();
+			setupHeightAndBackground(getView());
+		}
+	}
+
+	class ExpandableListAdapter extends OsmandBaseExpandableListAdapter {
+
+		private Context context;
+
+		private ContentItem contentItem;
+
+		ExpandableListAdapter(Context context, ContentItem contentItem) {
+			this.context = context;
+			this.contentItem = contentItem;
+		}
+
+		@Override
+		public Object getChild(int groupPosition, int childPosititon) {
+			return contentItem.getSubItems().get(groupPosition).getSubItems().get(childPosititon);
+		}
+
+		@Override
+		public long getChildId(int groupPosition, int childPosition) {
+			return childPosition;
+		}
+
+		@Override
+		public View getChildView(int groupPosition, final int childPosition,
+		                         boolean isLastChild, View convertView, ViewGroup parent) {
+			final ContentItem group = contentItem.getSubItems().get(groupPosition);
+			final ContentItem child = group.getSubItems().get(childPosition);
+
+			if (child instanceof RadiusItem) {
+				convertView = createItemForRadiusProximity(group.type, nightMode);
+			} else if (child instanceof InfoItem) {
+				convertView = createInfoItem();
+			} else if (child instanceof PointItem) {
+				final PointItem item = (PointItem) child;
+				convertView = LayoutInflater.from(context).inflate(R.layout.along_the_route_point_item, parent, false);
+				WaypointDialogHelper.updatePointInfoView(app, mapActivity, convertView, item.point, true, nightMode, true, false);
+
+				convertView.findViewById(R.id.waypoint_container).setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						WaypointDialogHelper.showOnMap(app, mapActivity, item.point.getPoint(), false);
+						Fragment fragment = getTargetFragment();
+						if (fragment != null) {
+							fragment.onActivityResult(getTargetRequestCode(), SHOW_CONTENT_ITEM_REQUEST_CODE, null);
+						}
+						dismiss();
+					}
+				});
+
+				final ImageButton remove = (ImageButton) convertView.findViewById(R.id.info_close);
+				remove.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_remove_dark));
+				remove.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						app.getWaypointHelper().removeVisibleLocationPoint(item.point);
+						group.subItems.remove(item);
+						adapter.notifyDataSetChanged();
+					}
+				});
+			}
+
+			View bottomDivider = convertView.findViewById(R.id.bottom_divider);
+			if (bottomDivider != null) {
+				bottomDivider.setVisibility(isLastChild ? View.VISIBLE : View.GONE);
+				AndroidUtils.setBackground(app, bottomDivider, nightMode, R.color.dashboard_divider_light, R.color.dashboard_divider_dark);
+			}
+
+			if (child instanceof RadiusItem && group.type == WaypointHelper.POI) {
+				convertView.findViewById(R.id.divider).setVisibility(isLastChild ? View.GONE : View.VISIBLE);
+			}
+
+			return convertView;
+		}
+
+		@Override
+		public int getChildrenCount(int groupPosition) {
+			return contentItem.getSubItems().get(groupPosition).getSubItems().size();
+		}
+
+		@Override
+		public Object getGroup(int groupPosition) {
+			return contentItem.getSubItems().get(groupPosition);
+		}
+
+		@Override
+		public int getGroupCount() {
+			return contentItem.getSubItems().size();
+		}
+
+		@Override
+		public long getGroupId(int groupPosition) {
+			return groupPosition;
+		}
+
+		@Override
+		public View getGroupView(final int groupPosition, final boolean isExpanded,
+		                         View convertView, ViewGroup parent) {
+			final ContentItem group = contentItem.getSubItems().get(groupPosition);
+			final int type = group.type;
+			final boolean enabled = waypointHelper.isTypeEnabled(type);
+
+			if (convertView == null) {
+				convertView = LayoutInflater.from(context)
+						.inflate(R.layout.along_the_route_category_item, parent, false);
+			}
+			TextView lblListHeader = (TextView) convertView.findViewById(R.id.title);
+			lblListHeader.setText(getHeader(group.type, mapActivity));
+			lblListHeader.setTextColor(ContextCompat.getColor(context, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light));
+
+			adjustIndicator(app, groupPosition, isExpanded, convertView, !nightMode);
+
+			final CompoundButton compoundButton = (CompoundButton) convertView.findViewById(R.id.compound_button);
+			compoundButton.setChecked(enabled);
+			compoundButton.setEnabled(true);
+			compoundButton.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					boolean isChecked = compoundButton.isChecked();
+					if (type == WaypointHelper.POI && isChecked) {
+						selectPoi(type, isChecked);
+					} else {
+						enableType(type, isChecked);
+					}
+					if (isChecked) {
+						expListView.expandGroup(groupPosition);
+						setupHeightAndBackground(getView());
+					}
+				}
+			});
+
+			convertView.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					if (enabled) {
+						if (isExpanded) {
+							expListView.collapseGroup(groupPosition);
+						} else {
+							expListView.expandGroup(groupPosition);
+						}
+						setupHeightAndBackground(getView());
+					}
+				}
+			});
+
+			View bottomDivider = convertView.findViewById(R.id.bottom_divider);
+
+			bottomDivider.setVisibility(isExpanded ? View.GONE : View.VISIBLE);
+			AndroidUtils.setBackground(app, bottomDivider, nightMode, R.color.dashboard_divider_light, R.color.dashboard_divider_dark);
+
+			return convertView;
+		}
+
+		@Override
+		public boolean hasStableIds() {
+			return false;
+		}
+
+		@Override
+		public boolean isChildSelectable(int groupPosition, int childPosition) {
+			return true;
+		}
+
+		@Override
+		protected void adjustIndicator(OsmandApplication app, int groupPosition, boolean isExpanded, View row, boolean light) {
+			ImageView indicator = (ImageView) row.findViewById(R.id.icon);
+			if (!isExpanded) {
+				indicator.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_arrow_down, light));
+				indicator.setContentDescription(row.getContext().getString(R.string.access_collapsed_list));
+			} else {
+				indicator.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_arrow_up, light));
+				indicator.setContentDescription(row.getContext().getString(R.string.access_expanded_list));
+			}
+		}
+
+		private String getHeader(int type, Context ctx) {
+			String str = ctx.getString(R.string.shared_string_waypoints);
+			switch (type) {
+				case WaypointHelper.TARGETS:
+					str = ctx.getString(R.string.shared_string_target_points);
+					break;
+				case WaypointHelper.ALARMS:
+					str = ctx.getString(R.string.way_alarms);
+					break;
+				case WaypointHelper.FAVORITES:
+					str = ctx.getString(R.string.shared_string_my_favorites);
+					break;
+				case WaypointHelper.WAYPOINTS:
+					str = ctx.getString(R.string.shared_string_waypoints);
+					break;
+				case WaypointHelper.POI:
+					str = ctx.getString(R.string.points_of_interests);
+					break;
+			}
+			return str;
+		}
+
+		private View createInfoItem() {
+			View view = mapActivity.getLayoutInflater().inflate(R.layout.show_along_the_route_info_item, null);
+			TextView titleTv = (TextView) view.findViewById(R.id.title);
+			titleTv.setText(getText(R.string.waiting_for_route_calculation));
+
+			return view;
+		}
+
+		private View createItemForRadiusProximity(final int type, boolean nightMode) {
+			View v;
+			if (type == WaypointHelper.POI) {
+				v = mapActivity.getLayoutInflater().inflate(R.layout.along_the_route_radius_poi, null);
+				AndroidUtils.setTextSecondaryColor(mapActivity, (TextView) v.findViewById(R.id.titleEx), nightMode);
+				String descEx = !app.getPoiFilters().isShowingAnyPoi() ? getString(R.string.poi) : app.getPoiFilters().getSelectedPoiFiltersName();
+				((TextView) v.findViewById(R.id.title)).setText(getString(R.string.search_radius_proximity) + ":");
+				((TextView) v.findViewById(R.id.titleEx)).setText(getString(R.string.shared_string_type) + ":");
+				final TextView radiusEx = (TextView) v.findViewById(R.id.descriptionEx);
+				radiusEx.setText(descEx);
+				v.findViewById(R.id.secondCellContainer).setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						mapActivity.getMapLayers().showSingleChoicePoiFilterDialog(mapActivity.getMapView(), new MapActivityLayers.DismissListener() {
+
+							@Override
+							public void dismiss() {
+								enableType(type, true);
+							}
+						});
+					}
+				});
+				AndroidUtils.setTextSecondaryColor(mapActivity, (TextView) v.findViewById(R.id.title), nightMode);
+				final TextView radius = (TextView) v.findViewById(R.id.description);
+				radius.setText(OsmAndFormatter.getFormattedDistance(waypointHelper.getSearchDeviationRadius(type), app));
+				v.findViewById(R.id.firstCellContainer).setOnClickListener(new View.OnClickListener() {
+
+					@Override
+					public void onClick(View view) {
+						selectDifferentRadius(type);
+					}
+				});
+				AndroidUtils.setBackground(app, v.findViewById(R.id.top_divider), nightMode,
+						R.color.dashboard_divider_light, R.color.dashboard_divider_dark);
+				AndroidUtils.setBackground(app, v.findViewById(R.id.divider), nightMode,
+						R.color.dashboard_divider_light, R.color.dashboard_divider_dark);
+			} else {
+				v = mapActivity.getLayoutInflater().inflate(R.layout.along_the_route_radius_simple, null);
+				((TextView) v.findViewById(R.id.title)).setText(getString(R.string.search_radius_proximity));
+				AndroidUtils.setTextPrimaryColor(mapActivity, (TextView) v.findViewById(R.id.title), nightMode);
+				final TextView radius = (TextView) v.findViewById(R.id.description);
+				radius.setText(OsmAndFormatter.getFormattedDistance(waypointHelper.getSearchDeviationRadius(type), app));
+				v.setOnClickListener(new View.OnClickListener() {
+
+					@Override
+					public void onClick(View view) {
+						selectDifferentRadius(type);
+					}
+
+				});
+			}
+			return v;
+		}
+	}
+
+	private void selectPoi(final int type, final boolean enable) {
+		if (!app.getPoiFilters().isPoiFilterSelected(PoiUIFilter.CUSTOM_FILTER_ID)) {
+			mapActivity.getMapLayers().showSingleChoicePoiFilterDialog(mapActivity.getMapView(),
+					new MapActivityLayers.DismissListener() {
+						@Override
+						public void dismiss() {
+							if (app.getPoiFilters().isShowingAnyPoi()) {
+								enableType(type, enable);
+							}
+						}
+					});
+		} else {
+			enableType(type, enable);
+		}
+	}
+
+	protected void selectDifferentRadius(final int type) {
+		int length = WaypointHelper.SEARCH_RADIUS_VALUES.length;
+		String[] names = new String[length];
+		int selected = 0;
+		for (int i = 0; i < length; i++) {
+			names[i] = OsmAndFormatter.getFormattedDistance(WaypointHelper.SEARCH_RADIUS_VALUES[i], app);
+			if (WaypointHelper.SEARCH_RADIUS_VALUES[i] == waypointHelper.getSearchDeviationRadius(type)) {
+				selected = i;
+			}
+		}
+		new AlertDialog.Builder(mapActivity)
+				.setSingleChoiceItems(names, selected, new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialogInterface, int i) {
+						int value = WaypointHelper.SEARCH_RADIUS_VALUES[i];
+						if (waypointHelper.getSearchDeviationRadius(type) != value) {
+							waypointHelper.setSearchDeviationRadius(type, value);
+							recalculatePoints(type);
+							dialogInterface.dismiss();
+							updateAdapter();
+						}
+					}
+				}).setTitle(app.getString(R.string.search_radius_proximity))
+				.setNegativeButton(R.string.shared_string_cancel, null)
+				.show();
+	}
+
+	private void enableType(final int type,
+	                        final boolean enable) {
+		new EnableWaypointsTypeTask(this, type, enable).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+	}
+
+	private void recalculatePoints(final int type) {
+		new RecalculatePointsTask(this, type).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+	}
+
+	private static class RecalculatePointsTask extends AsyncTask<Void, Void, Void> {
+
+		private OsmandApplication app;
+		private WeakReference<ShowAlongTheRouteBottomSheet> fragmentRef;
+		private int type;
+
+		RecalculatePointsTask(ShowAlongTheRouteBottomSheet fragment, int type) {
+			this.app = fragment.getMyApplication();
+			this.fragmentRef = new WeakReference<>(fragment);
+			this.type = type;
+		}
+
+		@Override
+		protected Void doInBackground(Void... params) {
+			app.getWaypointHelper().recalculatePoints(type);
+			return null;
+		}
+
+		@Override
+		protected void onPostExecute(Void aVoid) {
+			ShowAlongTheRouteBottomSheet fragment = fragmentRef.get();
+			if (fragment != null) {
+				fragment.updateAdapter();
+			}
+		}
+	}
+
+	private static class EnableWaypointsTypeTask extends AsyncTask<Void, Void, Void> {
+
+		private OsmandApplication app;
+		private WeakReference<ShowAlongTheRouteBottomSheet> fragmentRef;
+		private int type;
+		private boolean enable;
+
+		EnableWaypointsTypeTask(ShowAlongTheRouteBottomSheet fragment, int type, boolean enable) {
+			this.app = fragment.getMyApplication();
+			this.fragmentRef = new WeakReference<>(fragment);
+			this.type = type;
+			this.enable = enable;
+		}
+
+		@Override
+		protected Void doInBackground(Void... params) {
+			app.getWaypointHelper().enableWaypointType(type, enable);
+			return null;
+		}
+
+		@Override
+		protected void onPostExecute(Void aVoid) {
+			ShowAlongTheRouteBottomSheet fragment = fragmentRef.get();
+			if (fragment != null) {
+				fragment.updateAdapter();
+			}
+		}
+	}
+
+	private static class ContentItem {
+
+		private int type;
+		private ArrayList<ContentItem> subItems = new ArrayList<>();
+
+		private ContentItem(int type) {
+			this.type = type;
+		}
+
+		private ContentItem() {
+		}
+
+		private ArrayList<ContentItem> getSubItems() {
+			return subItems;
+		}
+	}
+
+	private static class RadiusItem extends ContentItem {
+
+		private RadiusItem(int type) {
+			super(type);
+		}
+	}
+
+	private static class InfoItem extends ContentItem {
+
+		private InfoItem(int type) {
+			super(type);
+		}
+	}
+
+	private static class PointItem extends ContentItem {
+
+		private WaypointHelper.LocationPointWrapper point;
+
+		private PointItem(int type) {
+			super(type);
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/WaypointsFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/WaypointsFragment.java
new file mode 100644
index 0000000000..4e653bf9b8
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/WaypointsFragment.java
@@ -0,0 +1,902 @@
+package net.osmand.plus.routepreparationmenu;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.CountDownTimer;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.content.ContextCompat;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks;
+import com.github.ksoichiro.android.observablescrollview.ScrollState;
+
+import net.osmand.AndroidUtils;
+import net.osmand.StateChangedListener;
+import net.osmand.ValueHolder;
+import net.osmand.data.FavouritePoint;
+import net.osmand.data.LatLon;
+import net.osmand.data.LocationPoint;
+import net.osmand.data.PointDescription;
+import net.osmand.plus.GeocodingLookupService;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.TargetPointsHelper;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.base.BaseOsmAndFragment;
+import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.helpers.WaypointDialogHelper;
+import net.osmand.plus.helpers.WaypointHelper;
+import net.osmand.plus.views.controls.DynamicListView;
+import net.osmand.plus.views.controls.DynamicListViewCallbacks;
+import net.osmand.plus.views.controls.StableArrayAdapter;
+import net.osmand.plus.views.controls.SwipeDismissListViewTouchListener;
+import net.osmand.plus.widgets.ImageViewExProgress;
+import net.osmand.plus.widgets.TextViewEx;
+import net.osmand.plus.widgets.TextViewExProgress;
+import net.osmand.util.Algorithms;
+import net.osmand.util.MapUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static net.osmand.plus.helpers.WaypointDialogHelper.showOnMap;
+
+public class WaypointsFragment extends BaseOsmAndFragment implements ObservableScrollViewCallbacks,
+		DynamicListViewCallbacks, WaypointDialogHelper.WaypointDialogHelperCallbacks {
+
+	public static final String TAG = "WaypointsFragment";
+
+	private OsmandApplication app;
+
+	private MapActivity mapActivity;
+	private WaypointDialogHelper waypointDialogHelper;
+
+	private View view;
+	private View mainView;
+	private DynamicListView listView;
+
+	private StableArrayAdapter listAdapter;
+	private AdapterView.OnItemClickListener listAdapterOnClickListener;
+	private SwipeDismissListViewTouchListener swipeDismissListener;
+
+	private StateChangedListener<Void> onStateChangedListener;
+
+	private CountDownTimer cTimer = null;
+
+	private final int[] running = new int[]{-1};
+
+	private boolean portrait;
+	private boolean nightMode;
+	private boolean wasDrawerDisabled;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		app = getMyApplication();
+		mapActivity = (MapActivity) getActivity();
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
+		portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
+		nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		waypointDialogHelper = mapActivity.getDashboard().getWaypointDialogHelper();
+
+		view = inflater.inflate(R.layout.route_waypoints_fragment, parent, false);
+		if (view == null) {
+			return view;
+		}
+		AndroidUtils.addStatusBarPadding21v(app, view);
+
+		mainView = view.findViewById(R.id.main_view);
+
+		listView = (DynamicListView) view.findViewById(R.id.dash_list_view);
+		listView.setDrawSelectorOnTop(true);
+		listView.setDynamicListViewCallbacks(this);
+
+		final ImageView backButton = (ImageView) view.findViewById(R.id.back_button);
+		backButton.setImageDrawable(getContentIcon(R.drawable.ic_arrow_back));
+		backButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				dismiss();
+			}
+		});
+
+		updateTitle();
+
+		final TextViewEx sortButton = (TextViewEx) view.findViewById(R.id.text_button);
+		sortButton.setVisibility(View.VISIBLE);
+		sortButton.setTextColor(ContextCompat.getColor(app, nightMode ? R.color.color_dialog_buttons_dark : R.color.color_dialog_buttons_light));
+		sortButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				boolean hasActivePoints = false;
+				List<Object> items = listAdapter.getActiveObjects();
+				if (items.size() > 0) {
+					if (items.size() > 1) {
+						hasActivePoints = true;
+					} else {
+						Object item = items.get(0);
+						if (item instanceof WaypointHelper.LocationPointWrapper) {
+							WaypointHelper.LocationPointWrapper w = (WaypointHelper.LocationPointWrapper) item;
+							if (w.getPoint() instanceof TargetPointsHelper.TargetPoint) {
+								hasActivePoints = !((TargetPointsHelper.TargetPoint) w.point).start;
+							}
+						} else {
+							hasActivePoints = true;
+						}
+					}
+				}
+
+				if (hasActivePoints) {
+					WaypointDialogHelper.TargetOptionsBottomSheetDialogFragment fragment = new WaypointDialogHelper.TargetOptionsBottomSheetDialogFragment();
+					fragment.setUsedOnMap(true);
+					fragment.show(mapActivity.getSupportFragmentManager(), WaypointDialogHelper.TargetOptionsBottomSheetDialogFragment.TAG);
+				}
+			}
+		});
+
+		if (!portrait) {
+			final TypedValue typedValueAttr = new TypedValue();
+			mapActivity.getTheme().resolveAttribute(R.attr.left_menu_view_bg, typedValueAttr, true);
+			mainView.setBackgroundResource(typedValueAttr.resourceId);
+			mainView.setLayoutParams(new FrameLayout.LayoutParams(getResources().getDimensionPixelSize(R.dimen.dashboard_land_width), ViewGroup.LayoutParams.MATCH_PARENT));
+
+			FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(AndroidUtils.dpToPx(app, 345f), ViewGroup.LayoutParams.WRAP_CONTENT);
+
+			params.gravity = Gravity.BOTTOM;
+			view.findViewById(R.id.control_buttons).setLayoutParams(params);
+		}
+
+		view.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				dismiss();
+			}
+		});
+
+		mainView.setOnClickListener(null);
+
+		swipeDismissListener = new SwipeDismissListViewTouchListener(
+				mapActivity,
+				listView,
+				new SwipeDismissListViewTouchListener.DismissCallbacks() {
+
+					@Override
+					public boolean canDismiss(int position) {
+						List<Object> activeObjects = ((StableArrayAdapter) listAdapter).getActiveObjects();
+						Object obj = listAdapter.getItem(position);
+						if (obj instanceof WaypointHelper.LocationPointWrapper) {
+							WaypointHelper.LocationPointWrapper w = (WaypointHelper.LocationPointWrapper) obj;
+							if (w.getPoint() instanceof TargetPointsHelper.TargetPoint) {
+								return !((TargetPointsHelper.TargetPoint) w.getPoint()).start;
+							}
+						}
+						return activeObjects.contains(obj);
+					}
+
+					@Override
+					public SwipeDismissListViewTouchListener.Undoable onDismiss(final int position) {
+						final Object item;
+						final StableArrayAdapter stableAdapter;
+						final int activeObjPos;
+						stableAdapter = (StableArrayAdapter) listAdapter;
+						item = stableAdapter.getItem(position);
+
+						stableAdapter.setNotifyOnChange(false);
+						stableAdapter.remove(item);
+						stableAdapter.getObjects().remove(item);
+						activeObjPos = stableAdapter.getActiveObjects().indexOf(item);
+						stableAdapter.getActiveObjects().remove(item);
+						stableAdapter.refreshData();
+						stableAdapter.notifyDataSetChanged();
+
+						return new SwipeDismissListViewTouchListener.Undoable() {
+							@Override
+							public void undo() {
+								if (item != null) {
+									stableAdapter.setNotifyOnChange(false);
+									stableAdapter.insert(item, position);
+									stableAdapter.getObjects().add(position, item);
+									stableAdapter.getActiveObjects().add(activeObjPos, item);
+									stableAdapter.refreshData();
+									applyPointsChanges();
+									updateTitle();
+								}
+							}
+
+							@Override
+							public String getTitle() {
+								List<Object> activeObjects;
+								if ((getMyApplication().getRoutingHelper().isRoutePlanningMode() || getMyApplication().getRoutingHelper().isFollowingMode())
+										&& item != null
+										&& ((activeObjects = stableAdapter.getActiveObjects()).isEmpty() || isContainsOnlyStart(activeObjects))) {
+									return mapActivity.getResources().getString(R.string.cancel_navigation);
+								} else {
+									return null;
+								}
+							}
+						};
+					}
+
+					@Override
+					public void onHidePopup() {
+						StableArrayAdapter stableAdapter = (StableArrayAdapter) listAdapter;
+						stableAdapter.refreshData();
+						applyPointsChanges();
+						updateTitle();
+						List<Object> activeObjects = stableAdapter.getActiveObjects();
+						if (activeObjects.isEmpty() || isContainsOnlyStart(activeObjects)) {
+							mapActivity.getMapActions().stopNavigationWithoutConfirm();
+							getMyApplication().getTargetPointsHelper().removeAllWayPoints(false, true);
+							mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu().hide();
+						}
+					}
+
+					private boolean isContainsOnlyStart(List<Object> items) {
+						if (items.size() == 1) {
+							Object item = items.get(0);
+							if (item instanceof WaypointHelper.LocationPointWrapper) {
+								WaypointHelper.LocationPointWrapper w = (WaypointHelper.LocationPointWrapper) item;
+								if (w.getPoint() instanceof TargetPointsHelper.TargetPoint) {
+									return ((TargetPointsHelper.TargetPoint) w.getPoint()).start;
+								}
+							}
+						}
+						return false;
+					}
+				});
+
+		final FrameLayout addButton = view.findViewById(R.id.add_button);
+		addButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Bundle args = new Bundle();
+				args.putBoolean(AddPointBottomSheetDialog.TARGET_KEY, false);
+				args.putBoolean(AddPointBottomSheetDialog.INTERMEDIATE_KEY, true);
+				AddPointBottomSheetDialog fragment = new AddPointBottomSheetDialog();
+				fragment.setArguments(args);
+				fragment.setUsedOnMap(false);
+				fragment.show(mapActivity.getSupportFragmentManager(), AddPointBottomSheetDialog.TAG);
+			}
+		});
+
+		FrameLayout clearButton = view.findViewById(R.id.clear_all_button);
+		TextView clearButtonDescr = (TextView) view.findViewById(R.id.clear_all_button_descr);
+		clearButtonDescr.setText(R.string.shared_string_clear_all);
+		clearButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				app.getTargetPointsHelper().clearAllPoints(true);
+				updateTitle();
+				reloadAdapter();
+			}
+		});
+
+		View applyButton = view.findViewById(R.id.start_button);
+		applyButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				cancelTimer();
+				updateRouteCalculationProgress(0);
+				applyPointsChanges();
+				updateTitle();
+			}
+		});
+
+		View cancelButton = view.findViewById(R.id.cancel_button);
+		cancelButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				dismiss();
+			}
+		});
+
+		onStateChangedListener = new StateChangedListener<Void>() {
+			@Override
+			public void stateChanged(Void change) {
+				reloadAdapter();
+				updateTitle();
+			}
+		};
+
+		updateListAdapter();
+		applyDayNightMode();
+
+		return view;
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		wasDrawerDisabled = mapActivity.isDrawerDisabled();
+		waypointDialogHelper.addHelperCallbacks(this);
+		app.getTargetPointsHelper().addListener(onStateChangedListener);
+		if (!wasDrawerDisabled) {
+			mapActivity.disableDrawer();
+		}
+		updateRouteCalculationProgress(0);
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		cancelTimer();
+		waypointDialogHelper.removeHelperCallbacks(this);
+		app.getTargetPointsHelper().removeListener(onStateChangedListener);
+		if (!wasDrawerDisabled) {
+			mapActivity.enableDrawer();
+		}
+	}
+
+	@Override
+	public void onScrollChanged(int scrollY, boolean firstScroll, boolean dragging) {
+
+	}
+
+	@Override
+	public void onDownMotionEvent() {
+
+	}
+
+	@Override
+	public void onUpOrCancelMotionEvent(ScrollState scrollState) {
+
+	}
+
+	@Override
+	public void reloadAdapter() {
+		if (listAdapter != null) {
+			StableArrayAdapter stableAdapter = (StableArrayAdapter) listAdapter;
+			reloadListAdapter(stableAdapter);
+			setDynamicListItems(listView, stableAdapter);
+		}
+	}
+
+	@Override
+	public void onItemSwapping(int position) {
+	}
+
+	@Override
+	public void onWindowVisibilityChanged(int visibility) {
+
+	}
+
+	@Override
+	public void deleteWaypoint(int position) {
+		deleteSwipeItem(position);
+	}
+
+	@Override
+	public void exchangeWaypoints(int pos1, int pos2) {
+
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void onItemsSwapped(final List<Object> items) {
+		cancelTimer();
+		startTimer();
+	}
+
+	public void applyDayNightMode() {
+		final FrameLayout addButton = view.findViewById(R.id.add_button);
+		final TextView addButtonDescr = (TextView) view.findViewById(R.id.add_button_descr);
+		boolean landscapeLayout = !portrait;
+		boolean nightMode = app.getDaynightHelper().isNightModeForMapControls();
+		if (!landscapeLayout) {
+			AndroidUtils.setBackground(app, mainView, nightMode, R.drawable.route_info_menu_bg_light, R.drawable.route_info_menu_bg_dark);
+		} else {
+			AndroidUtils.setBackground(app, mainView, nightMode, R.drawable.route_info_menu_bg_left_light, R.drawable.route_info_menu_bg_left_dark);
+		}
+
+		addButtonDescr.setText(R.string.shared_string_add);
+		addButtonDescr.setCompoundDrawablesWithIntrinsicBounds(getIcon(R.drawable.ic_action_plus, R.color.active_buttons_and_links_light), null, null, null);
+		AndroidUtils.setBackground(app, addButton, nightMode, R.drawable.btn_border_trans_light, R.drawable.btn_border_trans_dark);
+		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+			AndroidUtils.setBackground(app, addButtonDescr, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+		} else {
+			AndroidUtils.setBackground(app, addButtonDescr, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+		}
+
+		int colorActive = ContextCompat.getColor(mapActivity, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+		((TextView) view.findViewById(R.id.add_button_descr)).setTextColor(colorActive);
+		((TextView) view.findViewById(R.id.clear_all_button_descr)).setTextColor(colorActive);
+
+		FrameLayout clearButton = view.findViewById(R.id.clear_all_button);
+		TextView clearButtonDescr = (TextView) view.findViewById(R.id.clear_all_button_descr);
+		clearButtonDescr.setText(R.string.shared_string_clear_all);
+		clearButtonDescr.setCompoundDrawablesWithIntrinsicBounds(getIcon(R.drawable.ic_action_clear_all, R.color.active_buttons_and_links_light), null, null, null);
+		AndroidUtils.setBackground(app, clearButton, nightMode, R.drawable.btn_border_trans_light, R.drawable.btn_border_trans_dark);
+
+		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+			AndroidUtils.setBackground(app, clearButtonDescr, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+		} else {
+			AndroidUtils.setBackground(app, clearButtonDescr, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+		}
+
+		AndroidUtils.setBackground(app, view.findViewById(R.id.dividerControlButtons), nightMode,
+				R.color.divider_light, R.color.divider_dark);
+
+		((TextView) view.findViewById(R.id.cancel_button_descr)).setTextColor(
+				ContextCompat.getColor(mapActivity, nightMode ? R.color.active_buttons_and_links_dark : R.color.route_info_cancel_button_color_light));
+
+		AndroidUtils.setBackground(app, view.findViewById(R.id.cancel_button), nightMode, R.color.card_and_list_background_light, R.color.card_and_list_background_dark);
+		((TextView) view.findViewById(R.id.start_button_descr)).setText(getText(R.string.shared_string_apply));
+
+		setupRouteCalculationButtonProgressBar((ProgressBar) view.findViewById(R.id.progress_bar_button));
+	}
+
+	public void reloadListAdapter(ArrayAdapter<Object> listAdapter) {
+		mapActivity.getMyApplication().getWaypointHelper().removeVisibleLocationPoint(new ArrayList<WaypointHelper.LocationPointWrapper>());
+
+		listAdapter.setNotifyOnChange(false);
+		listAdapter.clear();
+		List<Object> points = waypointDialogHelper.getTargetPoints();
+		for (Object point : points) {
+			listAdapter.add(point);
+		}
+		if (listAdapter instanceof StableArrayAdapter) {
+			((StableArrayAdapter) listAdapter).updateObjects(points, waypointDialogHelper.getActivePoints(points));
+		}
+		listAdapter.notifyDataSetChanged();
+	}
+
+	public AdapterView.OnItemClickListener getDrawerItemClickListener(final FragmentActivity ctx, final int[] running,
+	                                                                  final ArrayAdapter<Object> listAdapter) {
+		return new AdapterView.OnItemClickListener() {
+			@Override
+			public void onItemClick(AdapterView<?> adapterView, View view, int item, long l) {
+				if (listAdapter.getItem(item) instanceof WaypointHelper.LocationPointWrapper) {
+					WaypointHelper.LocationPointWrapper ps = (WaypointHelper.LocationPointWrapper) listAdapter.getItem(item);
+					showOnMap(app, ctx, ps.getPoint(), false);
+					dismiss();
+				}
+			}
+		};
+	}
+
+	public StableArrayAdapter getWaypointsDrawerAdapter(
+			final boolean edit, final List<WaypointHelper.LocationPointWrapper> deletedPoints,
+			final MapActivity ctx, final int[] running, final boolean flat, final boolean nightMode) {
+
+		List<Object> points = waypointDialogHelper.getTargetPoints();
+		List<Object> activePoints = waypointDialogHelper.getActivePoints(points);
+
+		final StableArrayAdapter listAdapter = new StableArrayAdapter(ctx,
+				R.layout.route_waypoint_item, R.id.waypoint_text, points, activePoints) {
+
+			@NonNull
+			@Override
+			public View getView(final int position, View convertView, @NonNull ViewGroup parent) {
+				View v = convertView;
+				Object obj = getItem(position);
+				if (obj instanceof WaypointHelper.LocationPointWrapper) {
+					WaypointHelper.LocationPointWrapper point = (WaypointHelper.LocationPointWrapper) obj;
+					v = updateWaypointItemView(edit, deletedPoints, app, ctx, waypointDialogHelper, v, point, this, nightMode, flat, position);
+					AndroidUtils.setListItemBackground(mapActivity, v, nightMode);
+				}
+				return v;
+			}
+		};
+
+		for (Object p : points) {
+			if (p instanceof WaypointHelper.LocationPointWrapper) {
+				WaypointHelper.LocationPointWrapper w = (WaypointHelper.LocationPointWrapper) p;
+				if (w.type == WaypointHelper.TARGETS) {
+					final TargetPointsHelper.TargetPoint t = (TargetPointsHelper.TargetPoint) w.point;
+					if (t.getOriginalPointDescription() != null
+							&& t.getOriginalPointDescription().isSearchingAddress(mapActivity)) {
+						GeocodingLookupService.AddressLookupRequest lookupRequest
+								= new GeocodingLookupService.AddressLookupRequest(t.point, new GeocodingLookupService.OnAddressLookupResult() {
+							@Override
+							public void geocodingDone(String address) {
+								reloadListAdapter(listAdapter);
+								//updateRouteInfoMenu(ctx);
+							}
+						}, null);
+						app.getGeocodingLookupService().lookupAddress(lookupRequest);
+					}
+
+				}
+			}
+		}
+
+		return listAdapter;
+	}
+
+	public void newRouteIsCalculated(boolean newRoute, ValueHolder<Boolean> showToast) {
+		reloadAdapter();
+		showToast.value = false;
+	}
+
+	public void updateRouteCalculationProgress(int progress) {
+		ProgressBar progressBarButton = (ProgressBar) view.findViewById(R.id.progress_bar_button);
+		if (progressBarButton != null) {
+			if (progressBarButton.getVisibility() != View.VISIBLE) {
+				progressBarButton.setVisibility(View.VISIBLE);
+			}
+			progressBarButton.setProgress(progress);
+		}
+		TextViewExProgress textViewExProgress = (TextViewExProgress) view.findViewById(R.id.start_button_descr);
+		textViewExProgress.percent = progress / 100f;
+		int color = nightMode ? R.color.main_font_dark : R.color.card_and_list_background_light;
+		textViewExProgress.color1 = ContextCompat.getColor(mapActivity, color);
+		textViewExProgress.color2 = ContextCompat.getColor(mapActivity, R.color.description_font_and_bottom_sheet_icons);
+		textViewExProgress.invalidate();
+		ImageViewExProgress imageViewExProgress = (ImageViewExProgress) view.findViewById(R.id.start_icon);
+		imageViewExProgress.percent = progress / 100f;
+		imageViewExProgress.color1 = ContextCompat.getColor(mapActivity, color);
+		imageViewExProgress.color2 = ContextCompat.getColor(mapActivity, R.color.description_font_and_bottom_sheet_icons);
+		imageViewExProgress.invalidate();
+	}
+
+	public void setupRouteCalculationButtonProgressBar(@NonNull ProgressBar pb) {
+		int bgColor = ContextCompat.getColor(app, nightMode ? R.color.route_info_cancel_button_color_dark : R.color.activity_background_light);
+		int progressColor = ContextCompat.getColor(getMyApplication(), nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+
+		pb.setProgressDrawable(AndroidUtils.createProgressDrawable(bgColor, progressColor));
+	}
+
+	private void setDynamicListItems(DynamicListView listView, StableArrayAdapter listAdapter) {
+		listView.setItemsList(listAdapter.getObjects());
+		listView.setActiveItemsList(listAdapter.getActiveObjects());
+	}
+
+	private void updateListAdapter() {
+		List<WaypointHelper.LocationPointWrapper> deletedPoints = new ArrayList<>();
+		listView.setEmptyView(null);
+		StableArrayAdapter listAdapter = getWaypointsDrawerAdapter(true, deletedPoints, mapActivity, running, false, false);
+		AdapterView.OnItemClickListener listener = getDrawerItemClickListener(mapActivity, running, listAdapter);
+		setDynamicListItems(listView, listAdapter);
+		updateListAdapter(listAdapter, listener);
+
+	}
+
+	private void updateListAdapter(StableArrayAdapter listAdapter, AdapterView.OnItemClickListener listener) {
+		this.listAdapter = listAdapter;
+		listAdapterOnClickListener = listener;
+		if (listView != null) {
+			listView.setAdapter(listAdapter);
+			if (listAdapterOnClickListener != null) {
+				listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+					@Override
+					public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+						listAdapterOnClickListener.onItemClick(parent, view, position - listView.getHeaderViewsCount(), id);
+					}
+				});
+			} else {
+				listView.setOnItemClickListener(null);
+			}
+		}
+	}
+
+	private void deleteSwipeItem(int position) {
+		if (swipeDismissListener != null) {
+			swipeDismissListener.delete(position);
+		}
+	}
+
+	private void updateTitle() {
+		final TextViewEx title = (TextViewEx) view.findViewById(R.id.title);
+		int pointsSize = app.getTargetPointsHelper().getAllPoints().size();
+		title.setText(app.getString(R.string.waypoints, (pointsSize != 0 ? pointsSize : 1)));
+	}
+
+	private void applyPointsChanges() {
+		app.runInUIThread(new Runnable() {
+			@Override
+			public void run() {
+				OsmandApplication app = getMyApplication();
+				if (app == null || !isVisible()) {
+					return;
+				}
+				List<TargetPointsHelper.TargetPoint> allTargets = new ArrayList<>();
+				TargetPointsHelper.TargetPoint start = null;
+				List<Object> items = listAdapter.getActiveObjects();
+				if (items != null) {
+					for (Object obj : items) {
+						if (obj instanceof WaypointHelper.LocationPointWrapper) {
+							WaypointHelper.LocationPointWrapper p = (WaypointHelper.LocationPointWrapper) obj;
+							if (p.getPoint() instanceof TargetPointsHelper.TargetPoint) {
+								TargetPointsHelper.TargetPoint t = (TargetPointsHelper.TargetPoint) p.getPoint();
+								if (t.start) {
+									start = t;
+								} else {
+									t.intermediate = true;
+								}
+								allTargets.add(t);
+							}
+						}
+					}
+					if (allTargets.size() > 0) {
+						allTargets.get(allTargets.size() - 1).intermediate = false;
+					}
+				}
+				TargetPointsHelper targetPointsHelper = getMyApplication().getTargetPointsHelper();
+				if (start != null) {
+					int startInd = allTargets.indexOf(start);
+					TargetPointsHelper.TargetPoint first = allTargets.remove(0);
+					if (startInd != 0) {
+						start.start = false;
+						start.intermediate = startInd != allTargets.size() - 1;
+						if (targetPointsHelper.getPointToStart() == null) {
+							start.getOriginalPointDescription().setName(PointDescription
+									.getLocationNamePlain(getMyApplication(), start.getLatitude(), start.getLongitude()));
+						}
+						first.start = true;
+						first.intermediate = false;
+						targetPointsHelper.setStartPoint(new LatLon(first.getLatitude(), first.getLongitude()),
+								false, first.getPointDescription(getMyApplication()));
+					}
+				}
+				targetPointsHelper.reorderAllTargetPoints(allTargets, false);
+				newRouteIsCalculated(false, new ValueHolder<Boolean>());
+				targetPointsHelper.updateRouteAndRefresh(true);
+			}
+		}, 50);
+	}
+
+	private void startTimer() {
+		cTimer = new CountDownTimer(10000, 200) {
+
+			public void onTick(long millisUntilFinished) {
+				updateRouteCalculationProgress((int) ((((10000 - millisUntilFinished) / 10000f)) * 100));
+			}
+
+			public void onFinish() {
+				updateRouteCalculationProgress(100);
+				applyPointsChanges();
+				updateTitle();
+			}
+		};
+		cTimer.start();
+	}
+
+	private void cancelTimer() {
+		if (cTimer != null)
+			cTimer.cancel();
+	}
+
+	private static View updateWaypointItemView(final boolean edit, final List<WaypointHelper.LocationPointWrapper> deletedPoints,
+	                                           final OsmandApplication app, final Activity ctx,
+	                                           final WaypointDialogHelper helper, View v,
+	                                           final WaypointHelper.LocationPointWrapper point,
+	                                           final ArrayAdapter adapter, final boolean nightMode,
+	                                           final boolean flat, final int position) {
+		if (v == null || v.findViewById(R.id.info_close) == null) {
+			v = ctx.getLayoutInflater().inflate(R.layout.route_waypoint_item, null);
+		}
+		updatePointInfoView(app, ctx, v, point, true, nightMode, edit, false);
+
+		final ImageView move = (ImageView) v.findViewById(R.id.info_move);
+		final ImageButton remove = (ImageButton) v.findViewById(R.id.info_close);
+		final View topDivider = (View) v.findViewById(R.id.top_divider);
+
+		if (!edit) {
+			remove.setVisibility(View.GONE);
+			move.setVisibility(View.GONE);
+		} else {
+			boolean targets = point.type == WaypointHelper.TARGETS;
+			boolean notFlatTargets = targets && !flat;
+			boolean startPoint = notFlatTargets && ((TargetPointsHelper.TargetPoint) point.point).start;
+			final TargetPointsHelper targetPointsHelper = app.getTargetPointsHelper();
+			boolean canRemove = !targets || !targetPointsHelper.getIntermediatePoints().isEmpty();
+			int iconResId = nightMode ? R.color.marker_circle_button_color_dark : R.color.ctx_menu_title_color_dark;
+
+			remove.setVisibility(View.VISIBLE);
+			remove.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_remove_dark));
+			remove.setEnabled(canRemove);
+			remove.setAlpha(canRemove ? 1 : .5f);
+			if (canRemove) {
+				if (notFlatTargets && startPoint) {
+					remove.setOnClickListener(new View.OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							if (targetPointsHelper.getPointToStart() == null) {
+								if (!targetPointsHelper.getIntermediatePoints().isEmpty()) {
+									WaypointDialogHelper.replaceStartWithFirstIntermediate(targetPointsHelper, ctx, helper);
+								}
+							} else {
+								targetPointsHelper.setStartPoint(null, true, null);
+								WaypointDialogHelper.updateControls(ctx, helper);
+							}
+						}
+					});
+				} else {
+					remove.setOnClickListener(new View.OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							WaypointDialogHelper.deletePoint(app, ctx, adapter, helper, point, deletedPoints, true);
+						}
+					});
+				}
+			}
+
+			AndroidUtils.setBackground(ctx, topDivider, nightMode, R.color.divider_light, R.color.divider_dark);
+			topDivider.setVisibility(position != 0 ? View.VISIBLE : View.GONE);
+
+			move.setVisibility(notFlatTargets ? View.VISIBLE : View.GONE);
+			if (notFlatTargets) {
+				move.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_item_move, iconResId));
+				move.setTag(new DynamicListView.DragIcon() {
+					@Override
+					public void onClick() {
+						// do nothing
+					}
+				});
+			}
+		}
+
+		return v;
+	}
+
+	private static void updatePointInfoView(final OsmandApplication app, final Activity activity,
+	                                        View localView, final WaypointHelper.LocationPointWrapper ps,
+	                                        final boolean mapCenter, final boolean nightMode,
+	                                        final boolean edit, final boolean topBar) {
+		WaypointHelper wh = app.getWaypointHelper();
+		final LocationPoint point = ps.getPoint();
+		TextView text = (TextView) localView.findViewById(R.id.waypoint_text);
+		if (!topBar) {
+			AndroidUtils.setTextPrimaryColor(activity, text, nightMode);
+		}
+		TextView textShadow = (TextView) localView.findViewById(R.id.waypoint_text_shadow);
+		if (!edit) {
+			localView.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					showOnMap(app, activity, point, mapCenter);
+				}
+			});
+		}
+		TextView textDist = (TextView) localView.findViewById(R.id.waypoint_dist);
+		((ImageView) localView.findViewById(R.id.waypoint_icon)).setImageDrawable(ps.getDrawable(activity, app, nightMode));
+		int dist = -1;
+		boolean startPoint = ps.type == WaypointHelper.TARGETS && ((TargetPointsHelper.TargetPoint) ps.point).start;
+		if (!startPoint) {
+			if (!wh.isRouteCalculated()) {
+				if (activity instanceof MapActivity) {
+					dist = (int) MapUtils.getDistance(((MapActivity) activity).getMapView().getLatitude(), ((MapActivity) activity)
+							.getMapView().getLongitude(), point.getLatitude(), point.getLongitude());
+				}
+			} else {
+				dist = wh.getRouteDistance(ps);
+			}
+		}
+
+		if (dist > 0) {
+			textDist.setText(OsmAndFormatter.getFormattedDistance(dist, app));
+		} else {
+			textDist.setText("");
+		}
+
+		TextView textDeviation = (TextView) localView.findViewById(R.id.waypoint_deviation);
+		if (textDeviation != null) {
+			if (dist > 0 && ps.deviationDistance > 0) {
+				String devStr = "+" + OsmAndFormatter.getFormattedDistance(ps.deviationDistance, app);
+				textDeviation.setText(devStr);
+				if (!topBar) {
+					int colorId = nightMode ? R.color.secondary_text_dark : R.color.secondary_text_light;
+					AndroidUtils.setTextSecondaryColor(activity, textDeviation, nightMode);
+					if (ps.deviationDirectionRight) {
+						textDeviation.setCompoundDrawablesWithIntrinsicBounds(
+								app.getUIUtilities().getIcon(R.drawable.ic_small_turn_right, colorId),
+								null, null, null);
+					} else {
+						textDeviation.setCompoundDrawablesWithIntrinsicBounds(
+								app.getUIUtilities().getIcon(R.drawable.ic_small_turn_left, colorId),
+								null, null, null);
+					}
+				}
+				textDeviation.setVisibility(View.VISIBLE);
+			} else {
+				textDeviation.setText("");
+				textDeviation.setVisibility(View.GONE);
+			}
+		}
+
+		String descr;
+		PointDescription pd = point.getPointDescription(app);
+		if (Algorithms.isEmpty(pd.getName())) {
+			descr = pd.getTypeName();
+		} else {
+			descr = pd.getName();
+		}
+
+		if (textShadow != null) {
+			textShadow.setText(descr);
+		}
+		text.setText(descr);
+
+		String pointDescription = "";
+		TextView descText = (TextView) localView.findViewById(R.id.waypoint_desc_text);
+		if (descText != null) {
+			AndroidUtils.setTextSecondaryColor(activity, descText, nightMode);
+			switch (ps.type) {
+				case WaypointHelper.TARGETS:
+					TargetPointsHelper.TargetPoint targetPoint = (TargetPointsHelper.TargetPoint) ps.point;
+					if (targetPoint.start) {
+						pointDescription = activity.getResources().getString(R.string.starting_point);
+					} else {
+						pointDescription = getPointDescription(activity, targetPoint).getTypeName();
+					}
+					break;
+
+				case WaypointHelper.FAVORITES:
+					FavouritePoint favPoint = (FavouritePoint) ps.point;
+					pointDescription = Algorithms.isEmpty(favPoint.getCategory()) ? activity.getResources().getString(R.string.shared_string_favorites) : favPoint.getCategory();
+					break;
+			}
+		}
+
+		if (Algorithms.objectEquals(descr, pointDescription)) {
+			pointDescription = "";
+		}
+		if (dist > 0 && !Algorithms.isEmpty(pointDescription)) {
+			pointDescription = "  •  " + pointDescription;
+		}
+		if (descText != null) {
+			descText.setText(pointDescription);
+		}
+	}
+
+	private static PointDescription getPointDescription(Context ctx, TargetPointsHelper.TargetPoint point) {
+		if (!point.intermediate) {
+			return new PointDescription(PointDescription.POINT_TYPE_TARGET, ctx.getString(R.string.route_descr_destination) + ":",
+					point.getOnlyName());
+		} else {
+			return new PointDescription(PointDescription.POINT_TYPE_TARGET, ctx.getString(R.string.intermediate_waypoint, "" + (point.index + 1)),
+					point.getOnlyName());
+		}
+	}
+
+	public static boolean showInstance(final MapActivity mapActivity) {
+		try {
+			mapActivity.getContextMenu().hideMenues();
+
+			WaypointsFragment fragment = new WaypointsFragment();
+			mapActivity.getSupportFragmentManager()
+					.beginTransaction()
+					.add(R.id.routeMenuContainer, fragment, TAG)
+					.addToBackStack(TAG)
+					.commitAllowingStateLoss();
+
+			return true;
+
+		} catch (RuntimeException e) {
+			return false;
+		}
+	}
+
+	private void dismiss() {
+		FragmentActivity activity = getActivity();
+		if (activity != null) {
+			try {
+				activity.getSupportFragmentManager().popBackStack(TAG,
+						FragmentManager.POP_BACK_STACK_INCLUSIVE);
+			} catch (Exception e) {
+				//
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/routeCards/BaseRouteCard.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/routeCards/BaseRouteCard.java
new file mode 100644
index 0000000000..1805771421
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/routeCards/BaseRouteCard.java
@@ -0,0 +1,80 @@
+package net.osmand.plus.routepreparationmenu.routeCards;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.ColorInt;
+import android.support.annotation.ColorRes;
+import android.support.annotation.DrawableRes;
+import android.support.v4.content.ContextCompat;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+
+public abstract class BaseRouteCard {
+
+	protected OsmandApplication app;
+	protected MapActivity mapActivity;
+
+	protected View view;
+
+	boolean showTopShadow;
+	boolean showBottomShadow;
+	protected boolean nightMode;
+
+	public BaseRouteCard(MapActivity mapActivity) {
+		this.mapActivity = mapActivity;
+		this.app = mapActivity.getMyApplication();
+	}
+
+	public abstract int getCardLayoutId();
+
+	public abstract void update();
+
+	public View build(Context ctx) {
+		view = LayoutInflater.from(ctx).inflate(getCardLayoutId(), null);
+		update();
+		return view;
+	}
+
+	public MapActivity getMapActivity() {
+		return mapActivity;
+	}
+
+	public OsmandApplication getMyApplication() {
+		return app;
+	}
+
+	protected abstract void applyDayNightMode();
+
+	@ColorInt
+	protected int getResolvedColor(@ColorRes int colorId) {
+		return ContextCompat.getColor(app, colorId);
+	}
+
+	protected Drawable getContentIcon(@DrawableRes int icon) {
+		return getColoredIcon(icon, R.color.icon_color);
+	}
+
+	protected Drawable getActiveIcon(@DrawableRes int icon) {
+		return getColoredIcon(icon, R.color.active_buttons_and_links_light, R.color.active_buttons_and_links_dark);
+	}
+
+	protected Drawable getColoredIcon(@DrawableRes int icon, @ColorRes int colorLight, @ColorRes int colorDark) {
+		return getColoredIcon(icon, nightMode ? colorDark : colorLight);
+	}
+
+	protected Drawable getColoredIcon(@DrawableRes int icon, @ColorRes int color) {
+		return app.getUIUtilities().getIcon(icon, color);
+	}
+
+	public void setShowTopShadow(boolean showTopShadow) {
+		this.showTopShadow = showTopShadow;
+	}
+
+	public void setShowBottomShadow(boolean showBottomShadow) {
+		this.showBottomShadow = showBottomShadow;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/routeCards/PublicTransportCard.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/routeCards/PublicTransportCard.java
new file mode 100644
index 0000000000..8b97ea22f0
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/routeCards/PublicTransportCard.java
@@ -0,0 +1,266 @@
+package net.osmand.plus.routepreparationmenu.routeCards;
+
+import android.graphics.Typeface;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Build;
+import android.support.v4.content.ContextCompat;
+import android.text.SpannableString;
+import android.text.style.ForegroundColorSpan;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import net.osmand.AndroidUtils;
+import net.osmand.data.TransportRoute;
+import net.osmand.data.TransportStop;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.helpers.FontCache;
+import net.osmand.plus.widgets.FlowLayout;
+import net.osmand.plus.transport.TransportStopRoute;
+import net.osmand.plus.transport.TransportStopType;
+import net.osmand.plus.widgets.style.CustomTypefaceSpan;
+import net.osmand.router.TransportRoutePlanner.TransportRouteResult;
+import net.osmand.router.TransportRoutePlanner.TransportRouteResultSegment;
+
+import java.util.Iterator;
+import java.util.List;
+
+public class PublicTransportCard extends BaseRouteCard {
+
+	private static final int MIN_WALK_TIME = 120;
+
+	private TransportRouteResult routeResult;
+
+	private int routeId;
+	private boolean secondButtonVisible;
+
+	public PublicTransportCard(MapActivity mapActivity, TransportRouteResult routeResult, int routeId) {
+		super(mapActivity);
+		this.routeResult = routeResult;
+		this.routeId = routeId;
+	}
+
+	@Override
+	public int getCardLayoutId() {
+		return R.layout.transport_route_card;
+	}
+
+	@Override
+	public void update() {
+		if (view != null) {
+			view.setBackgroundColor(ContextCompat.getColor(app, nightMode ? R.color.route_info_bg_dark : R.color.route_info_bg_light));
+
+			List<TransportRouteResultSegment> segments = routeResult.getSegments();
+			createRouteBadges(segments);
+
+			TextView fromLine = (TextView) view.findViewById(R.id.from_line);
+			TextView wayLine = (TextView) view.findViewById(R.id.way_line);
+
+			fromLine.setText(getFirstLineDescrSpan());
+			wayLine.setText(getSecondLineDescrSpan());
+
+			view.findViewById(R.id.details_button).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					app.getTransportRoutingHelper().setCurrentRoute(routeId);
+					getMapActivity().refreshMap();
+				}
+			});
+			view.findViewById(R.id.bottom_shadow).setVisibility(showBottomShadow ? View.VISIBLE : View.GONE);
+			view.findViewById(R.id.card_divider).setVisibility(showTopShadow ? View.VISIBLE : View.GONE);
+
+			applyDayNightMode();
+		}
+	}
+
+	public int getRouteId() {
+		return routeId;
+	}
+
+	public void setSecondButtonVisible(boolean secondButtonVisible) {
+		this.secondButtonVisible = secondButtonVisible;
+	}
+
+	protected void applyDayNightMode() {
+		TextView fromLine = (TextView) view.findViewById(R.id.from_line);
+		TextView wayLine = (TextView) view.findViewById(R.id.way_line);
+		AndroidUtils.setTextSecondaryColor(app, fromLine, nightMode);
+		AndroidUtils.setTextSecondaryColor(app, wayLine, nightMode);
+
+		FrameLayout detailsButton = (FrameLayout) view.findViewById(R.id.details_button);
+		TextView detailsButtonDescr = (TextView) view.findViewById(R.id.details_button_descr);
+
+		AndroidUtils.setBackground(app, detailsButton, nightMode, R.drawable.btn_border_trans_light, R.drawable.btn_border_trans_dark);
+		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+			AndroidUtils.setBackground(app, detailsButtonDescr, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+		} else {
+			AndroidUtils.setBackground(app, detailsButtonDescr, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+		}
+		int color = ContextCompat.getColor(app, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+		detailsButtonDescr.setTextColor(color);
+
+		FrameLayout showButton = (FrameLayout) view.findViewById(R.id.show_button);
+		if (secondButtonVisible) {
+			TextView showButtonDescr = (TextView) view.findViewById(R.id.show_button_descr);
+			AndroidUtils.setBackground(app, showButton, nightMode, R.drawable.btn_border_trans_light, R.drawable.btn_border_trans_dark);
+			if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+				AndroidUtils.setBackground(app, showButtonDescr, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+			} else {
+				AndroidUtils.setBackground(app, showButtonDescr, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+			}
+			showButtonDescr.setTextColor(color);
+			showButton.setVisibility(View.VISIBLE);
+		} else {
+			showButton.setVisibility(View.GONE);
+		}
+
+		AndroidUtils.setBackground(app, view, nightMode, R.color.activity_background_light, R.color.activity_background_dark);
+		AndroidUtils.setBackground(app, view.findViewById(R.id.top_divider), nightMode, R.color.divider_light, R.color.divider_dark);
+		AndroidUtils.setBackground(app, view.findViewById(R.id.routes_info_container), nightMode, R.color.route_info_bg_light, R.color.route_info_bg_dark);
+	}
+
+	private SpannableString getFirstLineDescrSpan() {
+		List<TransportRouteResultSegment> segments = routeResult.getSegments();
+		String name = segments.get(0).getStart().getName();
+		String firstLine = app.getString(R.string.route_from) + " " + name;
+
+		if (segments.size() > 1) {
+			firstLine += ", " + app.getString(R.string.transfers, (segments.size() - 1));
+		}
+
+		SpannableString firstLineDesc = new SpannableString(firstLine);
+		Typeface typeface = FontCache.getRobotoMedium(app);
+		firstLineDesc.setSpan(new CustomTypefaceSpan(typeface),
+				firstLine.indexOf(name), firstLine.indexOf(name) + name.length(), 0);
+		firstLineDesc.setSpan(new ForegroundColorSpan(ContextCompat.getColor(app, nightMode ? R.color.primary_text_dark : R.color.primary_text_light)),
+				firstLine.indexOf(name), firstLine.indexOf(name) + name.length(), 0);
+
+		return firstLineDesc;
+	}
+
+	private SpannableString getSecondLineDescrSpan() {
+		Typeface typeface = FontCache.getRobotoMedium(app);
+		String travelTime = OsmAndFormatter.getFormattedDuration((int) routeResult.getTravelTime(), app);
+		String walkTime = OsmAndFormatter.getFormattedDuration((int) routeResult.getWalkTime(), app);
+		String walkDistance = OsmAndFormatter.getFormattedDistance((int) routeResult.getTravelDist(), app);
+
+		String secondLine = app.getString(R.string.route_way, travelTime) + "  •  " + app.getString(R.string.on_foot, walkTime) + "  •  " + walkDistance;
+
+		SpannableString secondLineDesc = new SpannableString(secondLine);
+
+		secondLineDesc.setSpan(new ForegroundColorSpan(ContextCompat.getColor(app, nightMode ? R.color.primary_text_dark : R.color.primary_text_light)),
+				secondLine.indexOf(travelTime), secondLine.indexOf(travelTime) + travelTime.length(), 0);
+		secondLineDesc.setSpan(new CustomTypefaceSpan(typeface),
+				secondLine.indexOf(travelTime), secondLine.indexOf(travelTime) + travelTime.length(), 0);
+
+		secondLineDesc.setSpan(new ForegroundColorSpan(ContextCompat.getColor(app, nightMode ? R.color.primary_text_dark : R.color.primary_text_light)),
+				secondLine.indexOf(walkTime), secondLine.indexOf(walkTime) + walkTime.length(), 0);
+		secondLineDesc.setSpan(new CustomTypefaceSpan(typeface),
+				secondLine.indexOf(walkTime), secondLine.indexOf(walkTime) + walkTime.length(), 0);
+
+		return secondLineDesc;
+	}
+
+	private void createRouteBadges(List<TransportRouteResultSegment> segments) {
+		int itemsSpacing = AndroidUtils.dpToPx(app, 6);
+		FlowLayout routesBadges = (FlowLayout) view.findViewById(R.id.routes_badges);
+
+		Iterator<TransportRouteResultSegment> iterator = segments.iterator();
+		while (iterator.hasNext()) {
+			TransportRouteResultSegment s = iterator.next();
+			if (s.walkDist != 0) {
+				double walkTime = getWalkTime(s.walkDist, routeResult.getWalkSpeed());
+				if (walkTime > MIN_WALK_TIME) {
+					String walkTimeS = OsmAndFormatter.getFormattedDuration((int) walkTime, app);
+					routesBadges.addView(createWalkRouteBadge(walkTimeS), new FlowLayout.LayoutParams(itemsSpacing, itemsSpacing));
+					routesBadges.addView(createArrow(), new FlowLayout.LayoutParams(itemsSpacing, itemsSpacing));
+				}
+			}
+			routesBadges.addView(createRouteBadge(s), new FlowLayout.LayoutParams(itemsSpacing, itemsSpacing));
+			if (iterator.hasNext()) {
+				routesBadges.addView(createArrow(), new FlowLayout.LayoutParams(itemsSpacing, itemsSpacing));
+			} else {
+				double finishWalkDist = routeResult.getFinishWalkDist();
+				if (finishWalkDist > 0) {
+					double walkTime2 = getWalkTime(finishWalkDist, routeResult.getWalkSpeed());
+					if (walkTime2 > MIN_WALK_TIME) {
+						String walkTimeS = OsmAndFormatter.getFormattedDuration((int) walkTime2, app);
+						routesBadges.addView(createArrow(), new FlowLayout.LayoutParams(itemsSpacing, itemsSpacing));
+						routesBadges.addView(createWalkRouteBadge(walkTimeS));
+					}
+				}
+			}
+		}
+	}
+
+	private View createRouteBadge(TransportRouteResultSegment segment) {
+		LinearLayout convertView = (LinearLayout) getMapActivity().getLayoutInflater().inflate(R.layout.transport_stop_route_item_with_icon, null, false);
+		if (segment != null) {
+			TransportRoute transportRoute = segment.route;
+			TransportStopRoute transportStopRoute = getTransportStopRoute(transportRoute, segment.getStart());
+
+			String routeRef = segment.route.getAdjustedRouteRef();
+			int bgColor = transportStopRoute.getColor(app, nightMode);
+
+			TextView transportStopRouteTextView = (TextView) convertView.findViewById(R.id.transport_stop_route_text);
+			ImageView transportStopRouteImageView = (ImageView) convertView.findViewById(R.id.transport_stop_route_icon);
+
+			transportStopRouteImageView.setImageDrawable(app.getUIUtilities().getPaintedIcon(R.drawable.ic_action_bus_dark, UiUtilities.getContrastColor(app, bgColor, true)));
+			transportStopRouteTextView.setText(routeRef);
+			GradientDrawable gradientDrawableBg = (GradientDrawable) convertView.getBackground();
+			gradientDrawableBg.setColor(bgColor);
+			transportStopRouteTextView.setTextColor(UiUtilities.getContrastColor(app, bgColor, true));
+		}
+
+		return convertView;
+	}
+
+	private View createWalkRouteBadge(String walkTime) {
+		LinearLayout convertView = (LinearLayout) getMapActivity().getLayoutInflater().inflate(R.layout.transport_stop_route_item_with_icon, null, false);
+		if (walkTime != null) {
+			int bgColor = ContextCompat.getColor(app, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+
+			TextView transportStopRouteTextView = (TextView) convertView.findViewById(R.id.transport_stop_route_text);
+			ImageView transportStopRouteImageView = (ImageView) convertView.findViewById(R.id.transport_stop_route_icon);
+
+			transportStopRouteImageView.setImageDrawable(getActiveIcon(R.drawable.ic_action_pedestrian_dark));
+			transportStopRouteTextView.setText(walkTime);
+			GradientDrawable gradientDrawableBg = (GradientDrawable) convertView.getBackground();
+			gradientDrawableBg.setColor(bgColor);
+			transportStopRouteTextView.setTextColor(bgColor);
+
+			AndroidUtils.setBackground(app, convertView, nightMode, R.drawable.btn_border_active_light, R.drawable.btn_border_active_dark);
+		}
+
+		return convertView;
+	}
+
+	private View createArrow() {
+		LinearLayout container = new LinearLayout(app);
+		ImageView arrow = new ImageView(app);
+		arrow.setImageDrawable(getContentIcon(R.drawable.ic_arrow_forward));
+		container.addView(arrow, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, AndroidUtils.dpToPx(app, 28)));
+		return container;
+	}
+
+	private TransportStopRoute getTransportStopRoute(TransportRoute rs, TransportStop s) {
+		TransportStopType type = TransportStopType.findType(rs.getType());
+		TransportStopRoute r = new TransportStopRoute();
+		r.type = type;
+		r.desc = rs.getName();
+		r.route = rs;
+		r.stop = s;
+		r.refStop = s;
+		return r;
+	}
+
+	private double getWalkTime(double walkDist, double walkSpeed) {
+		return walkDist / walkSpeed;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/routeCards/SimpleRouteCard.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/routeCards/SimpleRouteCard.java
new file mode 100644
index 0000000000..b4b0d81825
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/routeCards/SimpleRouteCard.java
@@ -0,0 +1,153 @@
+package net.osmand.plus.routepreparationmenu.routeCards;
+
+import android.os.Build;
+import android.support.v4.content.ContextCompat;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.github.mikephil.charting.charts.LineChart;
+import com.github.mikephil.charting.data.LineData;
+import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
+
+import net.osmand.AndroidUtils;
+import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.ShowRouteInfoDialogFragment;
+import net.osmand.plus.helpers.GpxUiHelper;
+import net.osmand.plus.routing.RouteDirectionInfo;
+import net.osmand.plus.routing.RoutingHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static net.osmand.plus.routepreparationmenu.MapRouteInfoMenu.directionInfo;
+
+public class SimpleRouteCard extends BaseRouteCard {
+
+	private MapActivity mapActivity;
+	private GPXUtilities.GPXFile gpx;
+
+	public SimpleRouteCard(MapActivity mapActivity, GPXUtilities.GPXFile gpx) {
+		super(mapActivity);
+		this.mapActivity = mapActivity;
+		this.gpx = gpx;
+	}
+
+	@Override
+	public int getCardLayoutId() {
+		return R.layout.route_info_statistic;
+	}
+
+	@Override
+	public void update() {
+		if (view != null) {
+			RoutingHelper routingHelper = mapActivity.getRoutingHelper();
+
+			view.setBackgroundColor(ContextCompat.getColor(mapActivity, nightMode ? R.color.route_info_bg_dark : R.color.route_info_bg_light));
+
+			view.findViewById(R.id.dividerToDropDown).setVisibility(View.VISIBLE);
+			view.findViewById(R.id.route_info_details_card).setVisibility(View.VISIBLE);
+
+			View info = view.findViewById(R.id.info_container);
+			info.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					ShowRouteInfoDialogFragment.showDialog(mapActivity.getSupportFragmentManager());
+				}
+			});
+
+			ImageView infoIcon = (ImageView) view.findViewById(R.id.InfoIcon);
+			ImageView durationIcon = (ImageView) view.findViewById(R.id.DurationIcon);
+			View infoDistanceView = view.findViewById(R.id.InfoDistance);
+			View infoDurationView = view.findViewById(R.id.InfoDuration);
+			if (directionInfo >= 0) {
+				infoIcon.setVisibility(View.GONE);
+				durationIcon.setVisibility(View.GONE);
+				infoDistanceView.setVisibility(View.GONE);
+				infoDurationView.setVisibility(View.GONE);
+			} else {
+				infoIcon.setImageDrawable(getColoredIcon(R.drawable.ic_action_route_distance, R.color.route_info_unchecked_mode_icon_color));
+				infoIcon.setVisibility(View.VISIBLE);
+				durationIcon.setImageDrawable(getColoredIcon(R.drawable.ic_action_time_span, R.color.route_info_unchecked_mode_icon_color));
+				durationIcon.setVisibility(View.VISIBLE);
+				infoDistanceView.setVisibility(View.VISIBLE);
+				infoDurationView.setVisibility(View.VISIBLE);
+			}
+			if (directionInfo >= 0 && routingHelper.getRouteDirections() != null
+					&& directionInfo < routingHelper.getRouteDirections().size()) {
+				RouteDirectionInfo ri = routingHelper.getRouteDirections().get(directionInfo);
+			} else {
+				TextView distanceText = (TextView) view.findViewById(R.id.DistanceText);
+				TextView distanceTitle = (TextView) view.findViewById(R.id.DistanceTitle);
+				TextView durationText = (TextView) view.findViewById(R.id.DurationText);
+				TextView durationTitle = (TextView) view.findViewById(R.id.DurationTitle);
+
+				distanceText.setText(OsmAndFormatter.getFormattedDistance(app.getRoutingHelper().getLeftDistance(), app));
+
+				durationText.setText(OsmAndFormatter.getFormattedDuration(app.getRoutingHelper().getLeftTime(), app));
+				durationTitle.setText(app.getString(R.string.arrive_at_time, OsmAndFormatter.getFormattedTime(app.getRoutingHelper().getLeftTime(), true)));
+
+				AndroidUtils.setTextPrimaryColor(app, distanceText, nightMode);
+				AndroidUtils.setTextSecondaryColor(app, distanceTitle, nightMode);
+				AndroidUtils.setTextPrimaryColor(app, durationText, nightMode);
+				AndroidUtils.setTextSecondaryColor(app, durationTitle, nightMode);
+			}
+			view.findViewById(R.id.details_button).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					ShowRouteInfoDialogFragment.showDialog(mapActivity.getSupportFragmentManager());
+				}
+			});
+
+			buildHeader(view);
+			applyDayNightMode();
+		}
+	}
+
+	protected void applyDayNightMode() {
+		FrameLayout detailsButton = view.findViewById(R.id.details_button);
+		AndroidUtils.setBackground(app, detailsButton, nightMode, R.drawable.btn_border_trans_light, R.drawable.btn_border_trans_dark);
+		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+			AndroidUtils.setBackground(app, view.findViewById(R.id.details_button_descr), nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+		} else {
+			AndroidUtils.setBackground(app, view.findViewById(R.id.details_button_descr), nightMode, R.drawable.ripple_light, R.drawable.ripple_dark);
+		}
+		int color = ContextCompat.getColor(mapActivity, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
+		AndroidUtils.setBackground(app, view.findViewById(R.id.dividerToDropDown), nightMode, R.color.divider_light, R.color.divider_dark);
+		AndroidUtils.setBackground(app, view.findViewById(R.id.info_divider), nightMode, R.color.activity_background_light, R.color.route_info_cancel_button_color_dark);
+		AndroidUtils.setBackground(app, view.findViewById(R.id.route_info_details_card), nightMode, R.color.activity_background_light, R.color.route_info_cancel_button_color_dark);
+		AndroidUtils.setBackground(app, view.findViewById(R.id.RouteInfoControls), nightMode, R.color.route_info_bg_light, R.color.route_info_bg_dark);
+
+		((TextView) view.findViewById(R.id.details_button_descr)).setTextColor(color);
+	}
+
+	private void buildHeader(View headerView) {
+		final LineChart mChart = (LineChart) headerView.findViewById(R.id.chart);
+		final GPXUtilities.GPXTrackAnalysis analysis = gpx.getAnalysis(0);
+
+		GpxUiHelper.setupGPXChart(mChart, 4, 4f, 4f, !nightMode, false);
+		GpxUiHelper.OrderedLineDataSet elevationDataSet;
+		GpxUiHelper.OrderedLineDataSet slopeDataSet;
+		if (analysis.hasElevationData) {
+			List<ILineDataSet> dataSets = new ArrayList<>();
+			elevationDataSet = GpxUiHelper.createGPXElevationDataSet(app, mChart, analysis,
+					GpxUiHelper.GPXDataSetAxisType.DISTANCE, false, true);
+			if (elevationDataSet != null) {
+				dataSets.add(elevationDataSet);
+			}
+			slopeDataSet = GpxUiHelper.createGPXSlopeDataSet(app, mChart, analysis,
+					GpxUiHelper.GPXDataSetAxisType.DISTANCE, elevationDataSet.getValues(), true, true);
+			if (slopeDataSet != null) {
+				dataSets.add(slopeDataSet);
+			}
+			mChart.setData(new LineData(dataSets));
+			mChart.setVisibility(View.VISIBLE);
+		} else {
+			mChart.setVisibility(View.GONE);
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/routing/IRouteInformationListener.java b/OsmAnd/src/net/osmand/plus/routing/IRouteInformationListener.java
new file mode 100644
index 0000000000..917e2081c5
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routing/IRouteInformationListener.java
@@ -0,0 +1,12 @@
+package net.osmand.plus.routing;
+
+import net.osmand.ValueHolder;
+
+public interface IRouteInformationListener {
+
+	void newRouteIsCalculated(boolean newRoute, ValueHolder<Boolean> showToast);
+
+	void routeWasCancelled();
+
+	void routeWasFinished();
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationParams.java b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationParams.java
index b535d0fcfb..9f40b6dab8 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationParams.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationParams.java
@@ -29,11 +29,14 @@ public class RouteCalculationParams {
 	public boolean fast;
 	public boolean leftSide;
 	public boolean inSnapToRoadMode;
+	public boolean inPublicTransportMode;
+	public boolean startTransportStop;
+	public boolean targetTransportStop;
 	public RouteCalculationProgress calculationProgress;
 	public RouteCalculationProgressCallback calculationProgressCallback;
 	public RouteCalculationResultListener resultListener;
 
 	public interface RouteCalculationResultListener {
-		void onRouteCalculated(List<Location> locations);
+		void onRouteCalculated(RouteCalculationResult route);
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
index 519caa12c9..b5bc13b9bf 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
@@ -648,6 +648,9 @@ public class RouteProvider {
 				&& precalculated == null;
 		ctx.leftSideNavigation = params.leftSide;
 		ctx.calculationProgress = params.calculationProgress;
+		ctx.publicTransport = params.inPublicTransportMode;
+		ctx.startTransportStop = params.startTransportStop;
+		ctx.targetTransportStop = params.targetTransportStop;
 		if(params.previousToRecalculate != null && params.onlyStartPointChanged) {
 			int currentRoute = params.previousToRecalculate.getCurrentRoute();
 			List<RouteSegmentResult> originalRoute = params.previousToRecalculate.getOriginalRoute();
diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
index df11e56b6e..6736e5cee8 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
@@ -36,21 +36,12 @@ public class RoutingHelper {
 
 	private static final org.apache.commons.logging.Log log = PlatformUtil.getLog(RoutingHelper.class);
 
-	public interface IRouteInformationListener {
-
-		void newRouteIsCalculated(boolean newRoute, ValueHolder<Boolean> showToast);
-
-		void routeWasCancelled();
-
-		void routeWasFinished();
-	}
-
 	private static final float POSITION_TOLERANCE = 60;
 
-
-	private List<WeakReference<IRouteInformationListener>> listeners = new LinkedList<WeakReference<IRouteInformationListener>>();
+	private List<WeakReference<IRouteInformationListener>> listeners = new LinkedList<>();
 
 	private OsmandApplication app;
+	private TransportRoutingHelper transportRoutingHelper;
 
 	private boolean isFollowingMode = false;
 	private boolean isRoutePlanningMode = false;
@@ -99,9 +90,14 @@ public class RoutingHelper {
 		settings = context.getSettings();
 		voiceRouter = new VoiceRouter(this, settings);
 		provider = new RouteProvider();
+		transportRoutingHelper = context.getTransportRoutingHelper();
+		transportRoutingHelper.setRoutingHelper(this);
 		setAppMode(settings.APPLICATION_MODE.get());
 	}
 
+	public TransportRoutingHelper getTransportRoutingHelper() {
+		return transportRoutingHelper;
+	}
 
 	public boolean isFollowingMode() {
 		return isFollowingMode;
@@ -160,8 +156,6 @@ public class RoutingHelper {
 		this.isRoutePlanningMode = isRoutePlanningMode;
 	}
 
-
-
 	public synchronized void setFinalAndCurrentLocation(LatLon finalLocation, List<LatLon> intermediatePoints, Location currentLocation){
 		RouteCalculationResult previousRoute = route;
 		clearCurrentRoute(finalLocation, intermediatePoints);
@@ -201,6 +195,7 @@ public class RoutingHelper {
 			this.lastProjection = null;
 			setFollowingMode(false);
 		}
+		transportRoutingHelper.clearCurrentRoute(newFinalLocation);
 	}
 
 	private synchronized void finishCurrentRoute() {
@@ -265,7 +260,8 @@ public class RoutingHelper {
 	}
 
 	public void addListener(IRouteInformationListener l){
-		listeners.add(new WeakReference<RoutingHelper.IRouteInformationListener>(l));
+		listeners.add(new WeakReference<>(l));
+		transportRoutingHelper.addListener(l);
 	}
 
 	public boolean removeListener(IRouteInformationListener lt){
@@ -278,6 +274,7 @@ public class RoutingHelper {
 				return true;
 			}
 		}
+		transportRoutingHelper.removeListener(lt);
 		return false;
 	}
 
@@ -305,7 +302,12 @@ public class RoutingHelper {
 	private Location setCurrentLocation(Location currentLocation, boolean returnUpdatedLocation,
 			RouteCalculationResult previousRoute, boolean targetPointsChanged) {
 		Location locationProjection = currentLocation;
-		if (finalLocation == null || currentLocation == null) {
+		if (isPublicTransportMode() && currentLocation != null && finalLocation != null &&
+				(targetPointsChanged || transportRoutingHelper.getStartLocation() == null)) {
+			transportRoutingHelper.setFinalAndCurrentLocation(finalLocation,
+					new LatLon(currentLocation.getLatitude(), currentLocation.getLongitude()));
+		}
+		if (finalLocation == null || currentLocation == null || isPublicTransportMode()) {
 			isDeviatedFromRoute = false;
 			return locationProjection;
 		}
@@ -567,7 +569,7 @@ public class RoutingHelper {
 
 
 	private boolean identifyUTurnIsNeeded(Location currentLocation, float posTolerance) {
-		if (finalLocation == null || currentLocation == null || !route.isCalculated()) {
+		if (finalLocation == null || currentLocation == null || !route.isCalculated() || isPublicTransportMode()) {
 			return false;
 		}
 		boolean isOffRoute = false;
@@ -664,7 +666,7 @@ public class RoutingHelper {
 		app.runInUIThread(new Runnable() {
 			@Override
 			public void run() {
-				ValueHolder<Boolean> showToast = new ValueHolder<Boolean>();
+				ValueHolder<Boolean> showToast = new ValueHolder<>();
 				showToast.value = true;
 				Iterator<WeakReference<IRouteInformationListener>> it = listeners.iterator();
 				while (it.hasNext()) {
@@ -894,11 +896,11 @@ public class RoutingHelper {
 			RouteCalculationResult prev = route;
 			synchronized (RoutingHelper.this) {
 				if (res.isCalculated()) {
-					if (!params.inSnapToRoadMode) {
+					if (!params.inSnapToRoadMode && !params.inPublicTransportMode) {
 						route = res;
 					}
 					if (params.resultListener != null) {
-						params.resultListener.onRouteCalculated(res.getRouteLocations());
+						params.resultListener.onRouteCalculated(res);
 					}
 				} else {
 					evalWaitInterval = Math.max(3000, evalWaitInterval * 3 / 2); // for Issue #3899
@@ -907,7 +909,7 @@ public class RoutingHelper {
 				currentRunningJob = null;
 			}
 			if(res.isCalculated()){
-				if (!params.inSnapToRoadMode) {
+				if (!params.inSnapToRoadMode && !params.inPublicTransportMode) {
 					setNewRoute(prev, res, params.start);
 				}
 			} else if (onlineSourceWithoutInternet) {
@@ -937,7 +939,18 @@ public class RoutingHelper {
 
 	public void recalculateRouteDueToSettingsChange() {
 		clearCurrentRoute(finalLocation, intermediatePoints);
-		recalculateRouteInBackground(lastFixedLocation, finalLocation, intermediatePoints, currentGPXRoute, route, true, false);
+		if (isPublicTransportMode()) {
+			Location start = lastFixedLocation;
+			LatLon finish = finalLocation;
+			if (start != null && finish != null) {
+				transportRoutingHelper.setFinalAndCurrentLocation(finish,
+						new LatLon(start.getLatitude(), start.getLongitude()));
+			} else {
+				transportRoutingHelper.recalculateRouteDueToSettingsChange();
+			}
+		} else {
+			recalculateRouteInBackground(lastFixedLocation, finalLocation, intermediatePoints, currentGPXRoute, route, true, false);
+		}
 	}
 
 	private void recalculateRouteInBackground(final Location start, final LatLon end, final List<LatLon> intermediates,
@@ -1060,6 +1073,9 @@ public class RoutingHelper {
 		void finish();
 	}
 
+	public boolean isPublicTransportMode() {
+		return mode == ApplicationMode.PUBLIC_TRANSPORT;
+	}
 
 	public boolean isRouteBeingCalculated(){
 		return currentRunningJob instanceof RouteRecalculationThread;
diff --git a/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java
new file mode 100644
index 0000000000..79618ec374
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java
@@ -0,0 +1,551 @@
+package net.osmand.plus.routing;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.Pair;
+
+import net.osmand.Location;
+import net.osmand.PlatformUtil;
+import net.osmand.ValueHolder;
+import net.osmand.binary.BinaryMapIndexReader;
+import net.osmand.data.LatLon;
+import net.osmand.plus.ApplicationMode;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.R;
+import net.osmand.plus.routing.RouteCalculationParams.RouteCalculationResultListener;
+import net.osmand.plus.routing.RouteProvider.RouteService;
+import net.osmand.plus.routing.RoutingHelper.RouteCalculationProgressCallback;
+import net.osmand.router.RouteCalculationProgress;
+import net.osmand.router.RoutingConfiguration;
+import net.osmand.router.TransportRoutePlanner;
+import net.osmand.router.TransportRoutePlanner.TransportRouteResult;
+import net.osmand.router.TransportRoutePlanner.TransportRouteResultSegment;
+import net.osmand.router.TransportRoutePlanner.TransportRoutingContext;
+import net.osmand.router.TransportRoutingConfiguration;
+import net.osmand.util.MapUtils;
+
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import static net.osmand.plus.notifications.OsmandNotification.NotificationType.NAVIGATION;
+
+public class TransportRoutingHelper {
+
+	private static final org.apache.commons.logging.Log log = PlatformUtil.getLog(TransportRoutingHelper.class);
+
+	private List<WeakReference<IRouteInformationListener>> listeners = new LinkedList<>();
+
+	private OsmandApplication app;
+	private RoutingHelper routingHelper;
+
+	private List<TransportRouteResult> routes;
+	private Map<Pair<TransportRouteResultSegment, TransportRouteResultSegment>, RouteCalculationResult> walkingRouteSegments;
+	private int currentRoute;
+
+	private LatLon startLocation;
+	private LatLon endLocation;
+	private boolean useSchedule;
+
+	private Thread currentRunningJob;
+	private String lastRouteCalcError;
+	private String lastRouteCalcErrorShort;
+	private long lastTimeEvaluatedRoute = 0;
+
+	private TransportRouteCalculationProgressCallback progressRoute;
+
+	public TransportRoutingHelper(@NonNull OsmandApplication app) {
+		this.app = app;
+	}
+
+	public void setRoutingHelper(RoutingHelper routingHelper) {
+		this.routingHelper = routingHelper;
+	}
+
+	public LatLon getStartLocation() {
+		return startLocation;
+	}
+
+	public LatLon getEndLocation() {
+		return endLocation;
+	}
+
+	public boolean isUseSchedule() {
+		return useSchedule;
+	}
+
+	public void setUseSchedule(boolean useSchedule) {
+		this.useSchedule = useSchedule;
+	}
+
+	public int getCurrentRoute() {
+		return currentRoute;
+	}
+
+	@Nullable
+	public TransportRouteResult getCurrentRouteResult() {
+		if (routes != null && currentRoute < routes.size()) {
+			return routes.get(currentRoute);
+		}
+		return null;
+	}
+
+	public List<TransportRouteResult> getRoutes() {
+		return routes;
+	}
+
+	@Nullable
+	public RouteCalculationResult getWalkingRouteSegment(TransportRouteResultSegment s1, TransportRouteResultSegment s2) {
+		return walkingRouteSegments.get(new Pair<>(s1, s2));
+	}
+
+	public void setCurrentRoute(int currentRoute) {
+		this.currentRoute = currentRoute;
+	}
+
+	public void addListener(IRouteInformationListener l){
+		listeners.add(new WeakReference<>(l));
+	}
+
+	public boolean removeListener(IRouteInformationListener lt){
+		Iterator<WeakReference<IRouteInformationListener>> it = listeners.iterator();
+		while(it.hasNext()) {
+			WeakReference<IRouteInformationListener> ref = it.next();
+			IRouteInformationListener l = ref.get();
+			if(l == null || lt == l) {
+				it.remove();
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public void recalculateRouteDueToSettingsChange() {
+		clearCurrentRoute(endLocation);
+		recalculateRouteInBackground(startLocation, endLocation);
+	}
+
+	private void recalculateRouteInBackground(LatLon start, LatLon end) {
+		if (start == null || end == null) {
+			return;
+		}
+		TransportRouteCalculationParams params = new TransportRouteCalculationParams();
+		params.start = start;
+		params.end = end;
+		params.useSchedule = useSchedule;
+		params.type = RouteService.OSMAND;
+		params.ctx = app;
+		params.calculationProgress = new RouteCalculationProgress();
+
+		float rd = (float) MapUtils.getDistance(start, end);
+		params.calculationProgress.totalEstimatedDistance = rd * 1.5f;
+
+		startRouteCalculationThread(params);
+	}
+
+	private void startRouteCalculationThread(TransportRouteCalculationParams params) {
+		synchronized (this) {
+			final Thread prevRunningJob = currentRunningJob;
+			RouteRecalculationThread newThread =
+					new RouteRecalculationThread("Calculating public transport route", params);
+			currentRunningJob = newThread;
+			startProgress(params);
+			updateProgress(params);
+			if (prevRunningJob != null) {
+				newThread.setWaitPrevJob(prevRunningJob);
+			}
+			currentRunningJob.start();
+		}
+	}
+
+	public void setProgressBar(TransportRouteCalculationProgressCallback progressRoute) {
+		this.progressRoute = progressRoute;
+	}
+
+	private void startProgress(final TransportRouteCalculationParams params) {
+		final TransportRouteCalculationProgressCallback progressRoute = this.progressRoute;
+		if (progressRoute != null) {
+			progressRoute.start();
+		}
+	}
+
+	private void updateProgress(final TransportRouteCalculationParams params) {
+		final TransportRouteCalculationProgressCallback progressRoute = this.progressRoute;
+		if (progressRoute != null) {
+			app.runInUIThread(new Runnable() {
+
+				@Override
+				public void run() {
+					RouteCalculationProgress calculationProgress = params.calculationProgress;
+					if (isRouteBeingCalculated()) {
+						float pr = calculationProgress.getLinearProgress();
+						progressRoute.updateProgress((int) pr);
+						Thread t = currentRunningJob;
+						if (t instanceof RouteRecalculationThread && ((RouteRecalculationThread) t).params != params) {
+							// different calculation started
+						} else {
+							updateProgress(params);
+						}
+					} else {
+						progressRoute.finish();
+					}
+				}
+			}, 300);
+		}
+	}
+
+	public boolean isRouteBeingCalculated() {
+		return currentRunningJob instanceof RouteRecalculationThread;
+	}
+
+	private void setNewRoute(final List<TransportRouteResult> res) {
+		app.runInUIThread(new Runnable() {
+			@Override
+			public void run() {
+				ValueHolder<Boolean> showToast = new ValueHolder<>();
+				showToast.value = true;
+				Iterator<WeakReference<IRouteInformationListener>> it = listeners.iterator();
+				while (it.hasNext()) {
+					WeakReference<IRouteInformationListener> ref = it.next();
+					IRouteInformationListener l = ref.get();
+					if (l == null) {
+						it.remove();
+					} else {
+						l.newRouteIsCalculated(true, showToast);
+					}
+				}
+				if (showToast.value && OsmandPlugin.isDevelopment()) {
+					String msg = "Public transport routes calculated: " + res.size();
+					app.showToastMessage(msg);
+				}
+			}
+		});
+	}
+
+	public synchronized void setFinalAndCurrentLocation(LatLon finalLocation, LatLon currentLocation) {
+		clearCurrentRoute(finalLocation);
+		// to update route
+		setCurrentLocation(currentLocation);
+	}
+
+	public synchronized void clearCurrentRoute(LatLon newFinalLocation) {
+		routes = null;
+		walkingRouteSegments = null;
+		app.getWaypointHelper().setNewRoute(new RouteCalculationResult(""));
+		app.runInUIThread(new Runnable() {
+			@Override
+			public void run() {
+				Iterator<WeakReference<IRouteInformationListener>> it = listeners.iterator();
+				while (it.hasNext()) {
+					WeakReference<IRouteInformationListener> ref = it.next();
+					IRouteInformationListener l = ref.get();
+					if (l == null) {
+						it.remove();
+					} else {
+						l.routeWasCancelled();
+					}
+				}
+			}
+		});
+		this.endLocation = newFinalLocation;
+		if (currentRunningJob instanceof RouteRecalculationThread) {
+			((RouteRecalculationThread) currentRunningJob).stopCalculation();
+		}
+	}
+
+	private void setCurrentLocation(LatLon currentLocation) {
+		if (endLocation == null || currentLocation == null) {
+			return;
+		}
+		startLocation = currentLocation;
+		recalculateRouteInBackground(currentLocation, endLocation);
+	}
+
+	private void showMessage(final String msg) {
+		app.runInUIThread(new Runnable() {
+			@Override
+			public void run() {
+				app.showToastMessage(msg);
+			}
+		});
+	}
+
+	public interface TransportRouteCalculationProgressCallback {
+
+		void start();
+
+		void updateProgress(int progress);
+
+		void finish();
+	}
+
+	public static class TransportRouteCalculationParams {
+
+		public LatLon start;
+		public LatLon end;
+
+		public OsmandApplication ctx;
+		public RouteService type;
+		public boolean useSchedule;
+		public RouteCalculationProgress calculationProgress;
+		public TransportRouteCalculationResultListener resultListener;
+
+		public interface TransportRouteCalculationResultListener {
+			void onRouteCalculated(List<TransportRouteResult> route);
+		}
+	}
+
+	private class WalkingRouteSegment {
+		TransportRouteResultSegment s1;
+		TransportRouteResultSegment s2;
+		LatLon start;
+		boolean startTransportStop;
+		LatLon end;
+		boolean endTransportStop;
+
+		WalkingRouteSegment(TransportRouteResultSegment s1, TransportRouteResultSegment s2) {
+			this.s1 = s1;
+			this.s2 = s2;
+
+			start = s1.getEnd().getLocation();
+			end = s2.getStart().getLocation();
+			startTransportStop = true;
+			endTransportStop = true;
+		}
+
+		WalkingRouteSegment(LatLon start, TransportRouteResultSegment s) {
+			this.start = start;
+			this.s2 = s;
+			end = s2.getStart().getLocation();
+			endTransportStop = true;
+		}
+
+		WalkingRouteSegment(TransportRouteResultSegment s, LatLon end) {
+			this.s1 = s;
+			this.end = end;
+			start = s1.getEnd().getLocation();
+			startTransportStop = true;
+		}
+	}
+
+	private class RouteRecalculationThread extends Thread {
+
+		private final TransportRouteCalculationParams params;
+		private Thread prevRunningJob;
+
+		private final Queue<WalkingRouteSegment> walkingSegmentsToCalculate = new ConcurrentLinkedQueue<>();
+		private Map<Pair<TransportRouteResultSegment, TransportRouteResultSegment>, RouteCalculationResult> walkingRouteSegments = new HashMap<>();
+		private boolean walkingSegmentsCalculated;
+
+		public RouteRecalculationThread(String name, TransportRouteCalculationParams params) {
+			super(name);
+			this.params = params;
+			if (params.calculationProgress == null) {
+				params.calculationProgress = new RouteCalculationProgress();
+			}
+		}
+
+		public void stopCalculation() {
+			params.calculationProgress.isCancelled = true;
+		}
+
+		private List<TransportRouteResult> calculateRouteImpl(TransportRouteCalculationParams params) throws IOException, InterruptedException {
+			RoutingConfiguration.Builder config = params.ctx.getDefaultRoutingConfig();
+			BinaryMapIndexReader[] files = params.ctx.getResourceManager().getTransportRoutingMapFiles();
+
+			TransportRoutingConfiguration cfg = new TransportRoutingConfiguration(config);
+			cfg.useSchedule = params.useSchedule;
+			TransportRoutePlanner planner = new TransportRoutePlanner();
+			TransportRoutingContext ctx = new TransportRoutingContext(cfg, files);
+			ctx.calculationProgress =  params.calculationProgress;
+			return planner.buildRoute(ctx, params.start, params.end);
+		}
+
+		@Nullable
+		private RouteCalculationParams getWalkingRouteParams() {
+
+			ApplicationMode walkingMode = ApplicationMode.PEDESTRIAN;
+
+			final WalkingRouteSegment walkingRouteSegment = walkingSegmentsToCalculate.poll();
+			if (walkingRouteSegment == null) {
+				return null;
+			}
+
+			Location start = new Location("");
+			start.setLatitude(walkingRouteSegment.start.getLatitude());
+			start.setLongitude(walkingRouteSegment.start.getLongitude());
+			LatLon end = new LatLon(walkingRouteSegment.end.getLatitude(), walkingRouteSegment.end.getLongitude());
+
+			final float currentDistanceFromBegin =
+					RouteRecalculationThread.this.params.calculationProgress.distanceFromBegin +
+							(walkingRouteSegment.s1 != null ? (float) walkingRouteSegment.s1.getTravelDist() : 0);
+
+			final RouteCalculationParams params = new RouteCalculationParams();
+			params.inPublicTransportMode = true;
+			params.start = start;
+			params.end = end;
+			params.startTransportStop = walkingRouteSegment.startTransportStop;
+			params.targetTransportStop = walkingRouteSegment.endTransportStop;
+			RoutingHelper.applyApplicationSettings(params, app.getSettings(), walkingMode);
+			params.mode = walkingMode;
+			params.ctx = app;
+			params.calculationProgress = new RouteCalculationProgress();
+			params.calculationProgressCallback = new RouteCalculationProgressCallback() {
+
+				@Override
+				public void start() {
+
+				}
+
+				@Override
+				public void updateProgress(int progress) {
+					float p = Math.max(params.calculationProgress.distanceFromBegin,
+							params.calculationProgress.distanceFromEnd);
+
+					RouteRecalculationThread.this.params.calculationProgress.distanceFromBegin =
+							Math.max(RouteRecalculationThread.this.params.calculationProgress.distanceFromBegin, currentDistanceFromBegin + p);
+				}
+
+				@Override
+				public void requestPrivateAccessRouting() {
+
+				}
+
+				@Override
+				public void finish() {
+					if (walkingSegmentsToCalculate.isEmpty()) {
+						walkingSegmentsCalculated = true;
+					} else {
+						updateProgress(0);
+					}
+				}
+			};
+			params.resultListener = new RouteCalculationResultListener() {
+				@Override
+				public void onRouteCalculated(RouteCalculationResult route) {
+					RouteRecalculationThread.this.walkingRouteSegments.put(new Pair<>(walkingRouteSegment.s1, walkingRouteSegment.s2), route);
+					if (!walkingSegmentsToCalculate.isEmpty()) {
+						RouteCalculationParams walkingRouteParams = getWalkingRouteParams();
+						if (walkingRouteParams != null) {
+							routingHelper.startRouteCalculationThread(walkingRouteParams, true, true);
+						}
+					}
+				}
+			};
+
+			return params;
+		}
+
+		private void calculateWalkingRoutes(List<TransportRouteResult> routes) {
+			walkingSegmentsCalculated = false;
+			walkingSegmentsToCalculate.clear();
+			walkingRouteSegments.clear();
+			if (routes != null && routes.size() > 0) {
+				for (TransportRouteResult r : routes) {
+					TransportRouteResultSegment prev = null;
+					for (TransportRouteResultSegment s : r.getSegments()) {
+						LatLon start = prev != null ? prev.getEnd().getLocation() : params.start;
+						LatLon end = s.getStart().getLocation();
+						if (start != null && end != null) {
+							if (prev == null || MapUtils.getDistance(start, end) > 50) {
+								walkingSegmentsToCalculate.add(prev == null ?
+										new WalkingRouteSegment(start, s) : new WalkingRouteSegment(prev, s));
+							}
+						}
+						prev = s;
+					}
+					if (prev != null) {
+						walkingSegmentsToCalculate.add(new WalkingRouteSegment(prev, params.end));
+					}
+				}
+				RouteCalculationParams walkingRouteParams = getWalkingRouteParams();
+				if (walkingRouteParams != null) {
+					routingHelper.startRouteCalculationThread(walkingRouteParams, true, true);
+					// wait until all segments calculated
+					while (!walkingSegmentsCalculated) {
+						try {
+							Thread.sleep(50);
+						} catch (InterruptedException e) {
+							// ignore
+						}
+						if (params.calculationProgress.isCancelled) {
+							walkingSegmentsToCalculate.clear();
+							walkingSegmentsCalculated = true;
+						}
+					}
+				}
+			}
+		}
+
+		@Override
+		public void run() {
+			synchronized (TransportRoutingHelper.this) {
+				currentRunningJob = this;
+			}
+			if (prevRunningJob != null) {
+				while (prevRunningJob.isAlive()) {
+					try {
+						Thread.sleep(50);
+					} catch (InterruptedException e) {
+						// ignore
+					}
+				}
+				synchronized (TransportRoutingHelper.this) {
+					currentRunningJob = this;
+				}
+			}
+
+			List<TransportRouteResult> res = null;
+			String error = null;
+			try {
+				res = calculateRouteImpl(params);
+				if (res != null && !params.calculationProgress.isCancelled) {
+					calculateWalkingRoutes(res);
+				}
+			} catch (Exception e) {
+				error = e.getMessage();
+				log.error(e);
+			}
+			if (params.calculationProgress.isCancelled) {
+				synchronized (TransportRoutingHelper.this) {
+					currentRunningJob = null;
+				}
+				return;
+			}
+			synchronized (TransportRoutingHelper.this) {
+				routes = res;
+				TransportRoutingHelper.this.walkingRouteSegments = walkingRouteSegments;
+				if (res != null) {
+					if (params.resultListener != null) {
+						params.resultListener.onRouteCalculated(res);
+					}
+				}
+				currentRunningJob = null;
+			}
+			if (res != null) {
+				setNewRoute(res);
+			} else if (error != null) {
+				lastRouteCalcError = app.getString(R.string.error_calculating_route) + ":\n" + error;
+				lastRouteCalcErrorShort = app.getString(R.string.error_calculating_route);
+				showMessage(lastRouteCalcError);
+			} else {
+				lastRouteCalcError = app.getString(R.string.empty_route_calculated);
+				lastRouteCalcErrorShort = app.getString(R.string.empty_route_calculated);
+				showMessage(lastRouteCalcError);
+			}
+			app.getNotificationHelper().refreshNotification(NAVIGATION);
+			lastTimeEvaluatedRoute = System.currentTimeMillis();
+		}
+
+		public void setWaitPrevJob(Thread prevRunningJob) {
+			this.prevRunningJob = prevRunningJob;
+		}
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java
index 49b7fc8d40..cfbe49d0fd 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java
@@ -21,6 +21,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import java.util.concurrent.ExecutionException;
 import net.osmand.osm.PoiCategory;
 import net.osmand.osm.PoiType;
 import net.osmand.plus.UiUtilities;
@@ -68,14 +69,15 @@ public class QuickSearchCustomPoiFragment extends DialogFragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		boolean isLightTheme = getMyApplication().getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME;
+		boolean isLightTheme =
+				getMyApplication().getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME;
 		int themeId = isLightTheme ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme;
 		setStyle(STYLE_NO_FRAME, themeId);
 	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-							 Bundle savedInstanceState) {
+			Bundle savedInstanceState) {
 		final OsmandApplication app = getMyApplication();
 		helper = app.getPoiFilters();
 		if (getArguments() != null) {
@@ -136,9 +138,17 @@ public class QuickSearchCustomPoiFragment extends DialogFragment {
 			@Override
 			public void onClick(View v) {
 				dismiss();
-				QuickSearchDialogFragment quickSearchDialogFragment = getQuickSearchDialogFragment();
-				if (quickSearchDialogFragment != null) {
-					quickSearchDialogFragment.showFilter(filterId);
+				if (!editMode) {
+					dismiss();
+					QuickSearchDialogFragment quickSearchDialogFragment = getQuickSearchDialogFragment();
+					if (quickSearchDialogFragment != null) {
+						quickSearchDialogFragment.showFilter(filterId);
+					}
+				} else {
+					QuickSearchPoiFilterFragment quickSearchPoiFilterFragment = getQuickSearchPoiFilterFragment();
+					if(quickSearchPoiFilterFragment!= null) {
+						quickSearchPoiFilterFragment.refreshList();
+					}
 				}
 			}
 		});
@@ -177,6 +187,15 @@ public class QuickSearchCustomPoiFragment extends DialogFragment {
 		}
 	}
 
+	private QuickSearchPoiFilterFragment getQuickSearchPoiFilterFragment() {
+		Fragment parent = getParentFragment();
+		if (parent instanceof QuickSearchPoiFilterFragment) {
+			return (QuickSearchPoiFilterFragment) parent;
+		} else {
+			return null;
+		}
+	}
+
 	private int getIconId(PoiCategory category) {
 		OsmandApplication app = getMyApplication();
 		String id = null;
@@ -203,6 +222,7 @@ public class QuickSearchCustomPoiFragment extends DialogFragment {
 	}
 
 	private class CategoryListAdapter extends ArrayAdapter<PoiCategory> {
+
 		private OsmandApplication app;
 
 		CategoryListAdapter(OsmandApplication app, List<PoiCategory> items) {
@@ -213,7 +233,8 @@ public class QuickSearchCustomPoiFragment extends DialogFragment {
 		@NonNull
 		@Override
 		public View getView(int position, View convertView, ViewGroup parent) {
-			LayoutInflater inflater = (LayoutInflater) app.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+			LayoutInflater inflater = (LayoutInflater) app
+					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 			View row = convertView;
 			if (row == null) {
 				row = inflater.inflate(R.layout.list_item_icon24_and_menu, parent, false);
@@ -221,7 +242,8 @@ public class QuickSearchCustomPoiFragment extends DialogFragment {
 			PoiCategory category = getItem(position);
 			if (category != null) {
 				AppCompatImageView iconView = (AppCompatImageView) row.findViewById(R.id.icon);
-				AppCompatImageView secondaryIconView = (AppCompatImageView) row.findViewById(R.id.secondary_icon);
+				AppCompatImageView secondaryIconView = (AppCompatImageView) row
+						.findViewById(R.id.secondary_icon);
 				AppCompatTextView titleView = (AppCompatTextView) row.findViewById(R.id.title);
 				AppCompatTextView descView = (AppCompatTextView) row.findViewById(R.id.description);
 				SwitchCompat check = (SwitchCompat) row.findViewById(R.id.toggle_item);
@@ -239,7 +261,8 @@ public class QuickSearchCustomPoiFragment extends DialogFragment {
 					iconView.setImageDrawable(null);
 				}
 				secondaryIconView.setImageDrawable(
-						ic.getIcon(R.drawable.ic_action_additional_option, app.getSettings().isLightContent() ? R.color.icon_color_light : 0));
+						ic.getIcon(R.drawable.ic_action_additional_option,
+								app.getSettings().isLightContent() ? R.color.icon_color_light : 0));
 				check.setOnCheckedChangeListener(null);
 				check.setChecked(filter.isTypeAccepted(category));
 				String textString = category.getTranslation();
@@ -262,7 +285,8 @@ public class QuickSearchCustomPoiFragment extends DialogFragment {
 				} else {
 					descView.setVisibility(View.GONE);
 				}
-				row.findViewById(R.id.divider).setVisibility(position == getCount() - 1 ? View.GONE : View.VISIBLE);
+				row.findViewById(R.id.divider)
+						.setVisibility(position == getCount() - 1 ? View.GONE : View.VISIBLE);
 				addRowListener(category, check);
 			}
 			return (row);
@@ -291,7 +315,18 @@ public class QuickSearchCustomPoiFragment extends DialogFragment {
 				bottomBarShadow.setVisibility(View.GONE);
 				bottomBar.setVisibility(View.GONE);
 			} else {
-				barTitle.setText(getContext().getString(R.string.selected_categories) + ": " + filter.getAcceptedTypesCount());
+				barTitle.setText(getContext().getString(R.string.selected_categories) + ": " + filter
+						.getAcceptedTypesCount());
+				bottomBarShadow.setVisibility(View.VISIBLE);
+				bottomBar.setVisibility(View.VISIBLE);
+			}
+		} else {
+			if (filter.isEmpty()) {
+				bottomBarShadow.setVisibility(View.GONE);
+				bottomBar.setVisibility(View.GONE);
+			} else {
+				barTitle.setText(getContext().getString(R.string.selected_categories) + ": " + filter
+						.getAcceptedTypesCount());
 				bottomBarShadow.setVisibility(View.VISIBLE);
 				bottomBar.setVisibility(View.VISIBLE);
 			}
@@ -306,11 +341,11 @@ public class QuickSearchCustomPoiFragment extends DialogFragment {
 		final LinkedHashMap<String, String> subCategories = new LinkedHashMap<String, String>();
 		Set<String> acceptedCategories = filter.getAcceptedSubtypes(poiCategory);
 		if (acceptedCategories != null) {
-			for(String s : acceptedCategories) {
+			for (String s : acceptedCategories) {
 				subCategories.put(s, Algorithms.capitalizeFirstLetterAndLowercase(s));
 			}
 		}
-		for(PoiType pt :  poiCategory.getPoiTypes()) {
+		for (PoiType pt : poiCategory.getPoiTypes()) {
 			subCategories.put(pt.getKeyName(), pt.getTranslation());
 		}
 
@@ -351,43 +386,46 @@ public class QuickSearchCustomPoiFragment extends DialogFragment {
 		builder.setCustomTitle(titleView);
 
 		builder.setCancelable(true);
-		builder.setNegativeButton(getContext().getText(R.string.shared_string_cancel), new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				dialog.dismiss();
-				listAdapter.notifyDataSetChanged();
-			}
-		});
-		builder.setPositiveButton(getContext().getText(R.string.shared_string_apply), new DialogInterface.OnClickListener() {
-
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				LinkedHashSet<String> accepted = new LinkedHashSet<String>();
-				for (int i = 0; i < selected.length; i++) {
-					if(selected[i]){
-						accepted.add(array[i]);
+		builder.setNegativeButton(getContext().getText(R.string.shared_string_cancel),
+				new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						dialog.dismiss();
+						listAdapter.notifyDataSetChanged();
 					}
-				}
-				if (subCategories.size() == accepted.size()) {
-					filter.selectSubTypesToAccept(poiCategory, null);
-				} else if(accepted.size() == 0){
-					filter.setTypeToAccept(poiCategory, false);
-				} else {
-					filter.selectSubTypesToAccept(poiCategory, accepted);
-				}
-				saveFilter();
-				listAdapter.notifyDataSetChanged();
-				listView.setSelectionFromTop(index, top);
-			}
-		});
+				});
+		builder.setPositiveButton(getContext().getText(R.string.shared_string_apply),
+				new DialogInterface.OnClickListener() {
 
-		builder.setMultiChoiceItems(visibleNames, selected, new DialogInterface.OnMultiChoiceClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						LinkedHashSet<String> accepted = new LinkedHashSet<String>();
+						for (int i = 0; i < selected.length; i++) {
+							if (selected[i]) {
+								accepted.add(array[i]);
+							}
+						}
+						if (subCategories.size() == accepted.size()) {
+							filter.selectSubTypesToAccept(poiCategory, null);
+						} else if (accepted.size() == 0) {
+							filter.setTypeToAccept(poiCategory, false);
+						} else {
+							filter.selectSubTypesToAccept(poiCategory, accepted);
+						}
+						saveFilter();
+						listAdapter.notifyDataSetChanged();
+						listView.setSelectionFromTop(index, top);
+					}
+				});
 
-			@Override
-			public void onClick(DialogInterface dialog, int item, boolean isChecked) {
-				selected[item] = isChecked;
-			}
-		});
+		builder.setMultiChoiceItems(visibleNames, selected,
+				new DialogInterface.OnMultiChoiceClickListener() {
+
+					@Override
+					public void onClick(DialogInterface dialog, int item, boolean isChecked) {
+						selected[item] = isChecked;
+					}
+				});
 		final AlertDialog dialog = builder.show();
 		check.setOnCheckedChangeListener(new OnCheckedChangeListener() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
index 563e7c8538..4864ec98b5 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
@@ -22,6 +22,7 @@ import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.Spannable;
 import android.text.SpannableString;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.style.ForegroundColorSpan;
 import android.view.KeyEvent;
@@ -178,6 +179,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 
 	private boolean newSearch;
 	private boolean interruptedSearch;
+	private boolean pausedSearch;
 	private long hideTimeMs;
 	private boolean expired;
 	private boolean poiFilterApplied;
@@ -985,12 +987,17 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 		}
 		expired = false;
 		paused = false;
+		if (pausedSearch && !TextUtils.isEmpty(searchQuery)) {
+			runSearch();
+		}
+		pausedSearch = false;
 	}
 
 	@Override
 	public void onPause() {
 		super.onPause();
 		paused = true;
+		pausedSearch = searching;
 		hideTimeMs = System.currentTimeMillis();
 		stopLocationUpdate();
 		hideProgressBar();
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java
index bd64b7871a..d5b80bc07b 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java
@@ -215,8 +215,14 @@ public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
 			SearchUICore searchUICore = app.getSearchUICore().getCore();
 			SearchPhrase searchPhrase = searchUICore.getPhrase();
 
-			String textTitle = app.getString(R.string.nothing_found_in_radius) + " "
-					+ OsmAndFormatter.getFormattedDistance(searchUICore.getMinimalSearchRadius(searchPhrase), app);
+			String textTitle;
+			int minimalSearchRadius = searchUICore.getMinimalSearchRadius(searchPhrase);
+			if (searchUICore.isSearchMoreAvailable(searchPhrase) && minimalSearchRadius != Integer.MAX_VALUE) {
+				textTitle = app.getString(R.string.nothing_found_in_radius) + " "
+						+ OsmAndFormatter.getFormattedDistance(minimalSearchRadius, app);
+			} else {
+				textTitle = app.getString(R.string.search_nothing_found);
+			}
 			((TextView) view.findViewById(R.id.empty_search_title)).setText(textTitle);
 			View increaseRadiusRow = view.findViewById(R.id.increase_radius_row);
 
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchPoiFilterFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchPoiFilterFragment.java
index 72d61dc878..4fdafdf11c 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchPoiFilterFragment.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchPoiFilterFragment.java
@@ -12,6 +12,7 @@ import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -405,6 +406,11 @@ public class QuickSearchPoiFilterFragment extends DialogFragment {
 		}
 	}
 
+	public void refreshList() {
+		initListItems();
+		updateListView();
+	}
+
 	private void updateListView() {
 		adapter.setListItems(getListItems());
 	}
diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
index 66ee81ffcd..4e23944e16 100644
--- a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
@@ -29,6 +29,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import static net.osmand.plus.OsmAndCustomizationConstants.CONTOUR_LINES;
+import static net.osmand.plus.OsmAndCustomizationConstants.HILLSHADE_LAYER;
+
 public class SRTMPlugin extends OsmandPlugin {
 
 	public static final String ID = "osmand.srtm";
@@ -217,6 +220,7 @@ public class SRTMPlugin extends OsmandPlugin {
 			}
 			String descr = getPrefDescription(app, contourLinesProp, pref);
 			adapter.addItem(new ContextMenuItem.ItemBuilder()
+					.setId(CONTOUR_LINES)
 					.setTitleId(R.string.srtm_plugin_name, mapActivity)
 					.setSelected(contourLinesSelected)
 					.setIcon(R.drawable.ic_plugin_srtm)
@@ -227,6 +231,7 @@ public class SRTMPlugin extends OsmandPlugin {
 					.setListener(listener).createItem());
 		}
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
+				.setId(HILLSHADE_LAYER)
 				.setTitleId(R.string.layer_hillshade, mapActivity)
 				.setSelected(HILLSHADE.get())
 				.setColor(HILLSHADE.get() ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
diff --git a/OsmAnd/src/net/osmand/plus/transport/TransportStopRoute.java b/OsmAnd/src/net/osmand/plus/transport/TransportStopRoute.java
index a5186705aa..75ab3d98fb 100644
--- a/OsmAnd/src/net/osmand/plus/transport/TransportStopRoute.java
+++ b/OsmAnd/src/net/osmand/plus/transport/TransportStopRoute.java
@@ -1,5 +1,7 @@
 package net.osmand.plus.transport;
 
+import android.util.Pair;
+
 import net.osmand.data.RotatedTileBox;
 import net.osmand.data.TransportRoute;
 import net.osmand.data.TransportStop;
@@ -9,7 +11,9 @@ import net.osmand.plus.R;
 import net.osmand.render.RenderingRuleSearchRequest;
 import net.osmand.render.RenderingRulesStorage;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class TransportStopRoute {
 	public TransportStop refStop;
@@ -21,6 +25,7 @@ public class TransportStopRoute {
 	public boolean showWholeRoute;
 	private int cachedColor;
 	private boolean cachedNight;
+	private Map<Pair<String, Boolean>, Integer> cachedRouteColors = new HashMap<>();
 
 	public String getDescription(OsmandApplication ctx, boolean useDistance) {
 		if (useDistance && distance > 0) {
@@ -66,7 +71,29 @@ public class TransportStopRoute {
 				}
 			}
 		}
+		return cachedColor;
+	}
 
+	public int getRouteColor(OsmandApplication ctx, boolean nightMode) {
+		Integer cachedColor = null;
+		if (route != null) {
+			Pair<String, Boolean> key = new Pair<>(route.getType(), nightMode);
+			cachedColor = cachedRouteColors.get(key);
+			if (cachedColor == null) {
+				RenderingRulesStorage rrs = ctx.getRendererRegistry().getCurrentSelectedRenderer();
+				RenderingRuleSearchRequest req = new RenderingRuleSearchRequest(rrs);
+				req.setBooleanFilter(rrs.PROPS.R_NIGHT_MODE, nightMode);
+				req.setStringFilter(rrs.PROPS.R_TAG, "pt_line");
+				req.setStringFilter(rrs.PROPS.R_VALUE, route.getType());
+				if (req.searchRenderingAttribute("publicTransportLine")) {
+					cachedColor = req.getIntPropertyValue(rrs.PROPS.R_COLOR);
+				}
+				cachedRouteColors.put(key, cachedColor);
+			}
+		}
+		if (cachedColor == null || cachedColor == 0) {
+			cachedColor = getColor(ctx, nightMode);
+		}
 		return cachedColor;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index 6991be28fc..169e8bd4ea 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -55,8 +55,6 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.MapActivityActions;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
-import net.osmand.plus.mapcontextmenu.MenuController;
-import net.osmand.plus.mapcontextmenu.MenuController.MenuState;
 import net.osmand.plus.mapcontextmenu.other.MapMultiSelectionMenu;
 import net.osmand.plus.render.MapRenderRepositories;
 import net.osmand.plus.render.NativeOsmandLibrary;
@@ -77,6 +75,7 @@ import java.util.Set;
 
 import gnu.trove.list.array.TIntArrayList;
 
+import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_CHANGE_MARKER_POSITION;
 import static net.osmand.plus.mapcontextmenu.controllers.TransportStopController.SHOW_STOPS_RADIUS_METERS;
 
 public class ContextMenuLayer extends OsmandMapLayer {
@@ -281,6 +280,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		};
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
 				.setTitleId(R.string.change_markers_position, activity)
+				.setId(MAP_CONTEXT_MENU_CHANGE_MARKER_POSITION)
 				.setIcon(R.drawable.ic_show_on_map)
 				.setOrder(MapActivityActions.CHANGE_POSITION_ITEM_ORDER)
 				.setClickable(isObjectMoveable(o))
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 167ab41942..372b104acb 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -16,7 +16,6 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewCompat;
 import android.support.v4.view.ViewPropertyAnimatorCompat;
 import android.support.v4.view.ViewPropertyAnimatorListener;
@@ -30,12 +29,14 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
+
 import net.osmand.AndroidUtils;
 import net.osmand.Location;
 import net.osmand.core.android.MapRendererContext;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.data.RotatedTileBox;
+import net.osmand.plus.OsmAndAppCustomization;
 import net.osmand.plus.OsmAndLocationProvider;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
@@ -50,9 +51,9 @@ import net.osmand.plus.activities.MapActivity.ShowQuickSearchMode;
 import net.osmand.plus.dashboard.DashboardOnMap.DashboardType;
 import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
-import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
 import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu;
 import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
+import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.views.corenative.NativeCoreContext;
 
@@ -61,6 +62,15 @@ import java.util.List;
 
 import gnu.trove.list.array.TIntArrayList;
 
+import static net.osmand.plus.OsmAndCustomizationConstants.BACK_TO_LOC_HUD_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.COMPASS_HUD_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.LAYERS_HUD_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.MENU_HUD_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.QUICK_SEARCH_HUD_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.ROUTE_PLANNING_HUD_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.ZOOM_IN_HUD_ID;
+import static net.osmand.plus.OsmAndCustomizationConstants.ZOOM_OUT_HUD_ID;
+
 public class MapControlsLayer extends OsmandMapLayer {
 
 	private static final int TIMEOUT_TO_SHOW_BUTTONS = 7000;
@@ -68,10 +78,11 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private static final int REQUEST_LOCATION_FOR_NAVIGATION_FAB_PERMISSION = 201;
 	private static final int REQUEST_LOCATION_FOR_ADD_DESTINATION_PERMISSION = 202;
 
-	public MapHudButton createHudButton(View iv, int resId) {
+	public MapHudButton createHudButton(View iv, int resId, String id) {
 		MapHudButton mc = new MapHudButton();
 		mc.iv = iv;
 		mc.resId = resId;
+		mc.id = id;
 		return mc;
 	}
 
@@ -97,6 +108,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private TextView zoomText;
 	private OsmandMapTileView mapView;
 	private OsmandApplication app;
+	private OsmAndAppCustomization appCustomization;
 	private MapHudButton routePlanningBtn;
 	private long touchEvent;
 	private MapHudButton mapZoomOut;
@@ -112,6 +124,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 	public MapControlsLayer(MapActivity activity) {
 		this.mapActivity = activity;
 		app = activity.getMyApplication();
+		appCustomization = app.getAppCustomization();
 		settings = activity.getMyApplication().getSettings();
 		mapView = mapActivity.getMapView();
 		contextMenuLayer = mapActivity.getMapLayers().getContextMenuLayer();
@@ -246,7 +259,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	private void initTopControls() {
 		View configureMap = mapActivity.findViewById(R.id.map_layers_button);
-		layersHud = createHudButton(configureMap, R.drawable.map_world_globe_dark)
+		layersHud = createHudButton(configureMap, R.drawable.map_world_globe_dark, LAYERS_HUD_ID)
 				.setIconColorId(R.color.on_map_icon_color, 0)
 				.setBg(R.drawable.btn_inset_circle_trans, R.drawable.btn_inset_circle_night);
 		controls.add(layersHud);
@@ -259,7 +272,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		});
 
 		View compass = mapActivity.findViewById(R.id.map_compass_button);
-		compassHud = createHudButton(compass, R.drawable.map_compass).setIconColorId(0).
+		compassHud = createHudButton(compass, R.drawable.map_compass, COMPASS_HUD_ID).setIconColorId(0).
 				setBg(R.drawable.btn_inset_circle_trans, R.drawable.btn_inset_circle_night);
 		compassHud.compass = true;
 		controls.add(compassHud);
@@ -271,7 +284,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		});
 
 		View search = mapActivity.findViewById(R.id.map_search_button);
-		quickSearchHud = createHudButton(search, R.drawable.map_search_dark)
+		quickSearchHud = createHudButton(search, R.drawable.map_search_dark, QUICK_SEARCH_HUD_ID)
 				.setIconsId(R.drawable.map_search_dark, R.drawable.map_search_night)
 				.setIconColorId(0)
 				.setBg(R.drawable.btn_inset_circle_trans, R.drawable.btn_inset_circle_night);
@@ -291,49 +304,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 		trackDetailsMenu = new TrackDetailsMenu(mapActivity);
 	}
 
-	public void updateRouteButtons(View main, boolean routeInfo) {
-		boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
-		ImageView cancelRouteButton = (ImageView) main.findViewById(R.id.map_cancel_route_button);
-		cancelRouteButton.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.map_action_cancel, nightMode ? R.color.route_info_control_icon_color_dark : R.color.route_info_control_icon_color_light));
-		cancelRouteButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				clickRouteCancel();
-			}
-		});
-
-		ImageView waypointsButton = (ImageView) main.findViewById(R.id.map_waypoints_route_button);
-		waypointsButton.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_intermediate_destination, nightMode ? R.color.route_info_control_icon_color_dark : R.color.route_info_control_icon_color_light));
-		waypointsButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				clickRouteWaypoints();
-			}
-		});
-
-		ImageView options = (ImageView) main.findViewById(R.id.map_options_route_button);
-		options.setImageDrawable(!routeInfo ? app.getUIUtilities().getIcon(R.drawable.map_action_settings,
-				R.color.osmand_orange) : app.getUIUtilities().getIcon(R.drawable.map_action_settings, nightMode ? R.color.route_info_control_icon_color_dark : R.color.route_info_control_icon_color_light));
-		options.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				clickRouteParams();
-			}
-		});
-
-		TextView routeGoButton = (TextView) main.findViewById(R.id.map_go_route_button);
-		routeGoButton.setCompoundDrawablesWithIntrinsicBounds(app.getUIUtilities().getIcon(R.drawable.map_start_navigation, R.color.color_white), null, null, null);
-		routeGoButton.setText(mapActivity.getString(R.string.shared_string_go));
-		routeGoButton.setTextColor(ContextCompat.getColor(mapActivity, R.color.color_white));
-		AndroidUtils.setBackground(mapActivity, routeGoButton, nightMode, R.drawable.route_info_go_btn_bg_light, R.drawable.route_info_go_btn_bg_dark);
-		routeGoButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				clickRouteGo();
-			}
-		});
-	}
-
 	public void setControlsClickable(boolean clickable) {
 		for (MapHudButton mb : controls) {
 			mb.iv.setClickable(clickable);
@@ -344,16 +314,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 		return mapActivity.getMyApplication().getTargetPointsHelper();
 	}
 
-	protected void clickRouteParams() {
-		mapActivity.getMapActions().openRoutePreferencesDialog();
-	}
-
-	protected void clickRouteWaypoints() {
-		if (getTargets().checkPointToNavigateShort()) {
-			mapActivity.getMapActions().openIntermediatePointsDialog();
-		}
-	}
-
 	public void stopNavigation() {
 		mapRouteInfoMenu.hide();
 		if (mapActivity.getRoutingHelper().isFollowingMode()) {
@@ -368,17 +328,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 		mapActivity.getMapActions().stopNavigationWithoutConfirm();
 	}
 
-	protected void clickRouteCancel() {
-		stopNavigation();
-	}
-
-	protected void clickRouteGo() {
-		if (app.getTargetPointsHelper().getPointToNavigate() != null) {
-			mapRouteInfoMenu.hide();
-		}
-		startNavigation();
-	}
-
 	public void showRouteInfoControlDialog() {
 		mapRouteInfoMenu.showHideMenu();
 	}
@@ -389,7 +338,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	private void initControls() {
 		View backToLocation = mapActivity.findViewById(R.id.map_my_location_button);
-		backToLocationControl = createHudButton(backToLocation, R.drawable.map_my_location)
+		backToLocationControl = createHudButton(backToLocation, R.drawable.map_my_location, BACK_TO_LOC_HUD_ID)
 				.setBg(R.drawable.btn_circle_blue);
 		controls.add(backToLocationControl);
 
@@ -409,7 +358,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 		final boolean dash = settings.SHOW_DASHBOARD_ON_MAP_SCREEN.get();
 		menuControl = createHudButton(backToMenuButton,
-				!dash ? R.drawable.map_drawer : R.drawable.map_dashboard).setBg(
+				!dash ? R.drawable.map_drawer : R.drawable.map_dashboard, MENU_HUD_ID).setBg(
 				R.drawable.btn_round, R.drawable.btn_round_night);
 		controls.add(menuControl);
 		backToMenuButton.setOnClickListener(new View.OnClickListener() {
@@ -426,7 +375,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		zoomText = (TextView) mapActivity.findViewById(R.id.map_app_mode_text);
 
 		View routePlanButton = mapActivity.findViewById(R.id.map_route_info_button);
-		routePlanningBtn = createHudButton(routePlanButton, R.drawable.map_directions).setBg(
+		routePlanningBtn = createHudButton(routePlanButton, R.drawable.map_directions, ROUTE_PLANNING_HUD_ID).setBg(
 				R.drawable.btn_round, R.drawable.btn_round_night);
 		controls.add(routePlanningBtn);
 		routePlanButton.setOnClickListener(new View.OnClickListener() {
@@ -634,7 +583,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private void initZooms() {
 		final OsmandMapTileView view = mapActivity.getMapView();
 		View zoomInButton = mapActivity.findViewById(R.id.map_zoom_in_button);
-		mapZoomIn = createHudButton(zoomInButton, R.drawable.map_zoom_in).
+		mapZoomIn = createHudButton(zoomInButton, R.drawable.map_zoom_in, ZOOM_IN_HUD_ID).
 				setIconsId(R.drawable.map_zoom_in, R.drawable.map_zoom_in_night).setRoundTransparent();
 		controls.add(mapZoomIn);
 		zoomInButton.setOnClickListener(new View.OnClickListener() {
@@ -653,7 +602,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		final View.OnLongClickListener listener = MapControlsLayer.getOnClickMagnifierListener(view);
 		zoomInButton.setOnLongClickListener(listener);
 		View zoomOutButton = mapActivity.findViewById(R.id.map_zoom_out_button);
-		mapZoomOut = createHudButton(zoomOutButton, R.drawable.map_zoom_out).
+		mapZoomOut = createHudButton(zoomOutButton, R.drawable.map_zoom_out, ZOOM_OUT_HUD_ID).
 				setIconsId(R.drawable.map_zoom_out, R.drawable.map_zoom_out_night).setRoundTransparent();
 		controls.add(mapZoomOut);
 		zoomOutButton.setOnClickListener(new View.OnClickListener() {
@@ -818,7 +767,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 				((app.accessibilityEnabled() || (System.currentTimeMillis() - touchEvent < TIMEOUT_TO_SHOW_BUTTONS)) && routeFollowingMode);
 		updateMyLocation(rh, routeDialogOpened || trackDialogOpened || contextMenuOpened);
 		boolean showButtons = (showRouteCalculationControls || !routeFollowingMode)
-				&& !isInMovingMarkerMode() && !isInGpxDetailsMode() && !isInMeasurementToolMode() && !isInPlanRouteMode() && !contextMenuOpened;
+				&& !isInMovingMarkerMode() && !isInGpxDetailsMode() && !isInMeasurementToolMode() && !isInPlanRouteMode() && !contextMenuOpened && !isInChoosingRoutesMode();
 		//routePlanningBtn.setIconResId(routeFollowingMode ? R.drawable.ic_action_gabout_dark : R.drawable.map_directions);
 		if (rh.isFollowingMode()) {
 			routePlanningBtn.setIconResId(R.drawable.map_start_navigation);
@@ -833,10 +782,10 @@ public class MapControlsLayer extends OsmandMapLayer {
 		routePlanningBtn.updateVisibility(showButtons);
 		menuControl.updateVisibility(showButtons);
 
-		mapZoomIn.updateVisibility(!routeDialogOpened && !contextMenuOpened);
-		mapZoomOut.updateVisibility(!routeDialogOpened && !contextMenuOpened);
+		mapZoomIn.updateVisibility(!routeDialogOpened && !contextMenuOpened && !isInChoosingRoutesMode());
+		mapZoomOut.updateVisibility(!routeDialogOpened && !contextMenuOpened && !isInChoosingRoutesMode());
 		boolean forceHideCompass = routeDialogOpened || trackDialogOpened
-				||  isInMeasurementToolMode() || isInPlanRouteMode() || contextMenuOpened;
+				|| isInMeasurementToolMode() || isInPlanRouteMode() || contextMenuOpened || isInChoosingRoutesMode();
 		compassHud.forceHideCompass = forceHideCompass;
 		compassHud.updateVisibility(!forceHideCompass && shouldShowCompass());
 
@@ -844,9 +793,9 @@ public class MapControlsLayer extends OsmandMapLayer {
 			layersHud.update(app, isNight);
 		}
 		layersHud.updateVisibility(!routeDialogOpened && !trackDialogOpened && !isInMeasurementToolMode() && !isInPlanRouteMode()
-				&& !contextMenuOpened);
+				&& !contextMenuOpened && !isInChoosingRoutesMode());
 		quickSearchHud.updateVisibility(!routeDialogOpened && !trackDialogOpened && !isInMeasurementToolMode() && !isInPlanRouteMode()
-				&& !contextMenuOpened);
+				&& !contextMenuOpened && !isInChoosingRoutesMode());
 
 		if (!routePlanningMode && !routeFollowingMode) {
 			if (mapView.isZooming()) {
@@ -926,7 +875,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 			backToLocationControl.iv.setContentDescription(mapActivity.getString(R.string.map_widget_back_to_loc));
 		}
 		boolean visible = !(tracked && rh.isFollowingMode());
-		backToLocationControl.updateVisibility(visible && !dialogOpened && !isInPlanRouteMode());
+		backToLocationControl.updateVisibility(visible && !dialogOpened && !isInPlanRouteMode() && !isInChoosingRoutesMode());
 		if (app.accessibilityEnabled()) {
 			backToLocationControl.iv.setClickable(enabled && visible);
 		}
@@ -976,15 +925,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 				}
 			}
 		});
-		ImageButton imageButton = (ImageButton) mapActivity.findViewById(R.id.map_transparency_hide);
-		imageButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				transparencyBarLayout.setVisibility(View.GONE);
-				settings.LAYER_TRANSPARENCY_SEEKBAR_MODE.set(LayerTransparencySeekbarMode.OFF);
-				hideTransparencyBar(transparencySetting);
-			}
-		});
 
 		LayerTransparencySeekbarMode seekbarMode = settings.LAYER_TRANSPARENCY_SEEKBAR_MODE.get();
 		if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) != null) {
@@ -1035,6 +975,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		int resDarkId;
 		int resClrLight = R.color.icon_color;
 		int resClrDark = 0;
+		String id;
 
 		boolean nightMode = false;
 		boolean f = true;
@@ -1094,6 +1035,9 @@ public class MapControlsLayer extends OsmandMapLayer {
 		}
 
 		public boolean updateVisibility(boolean visible) {
+			if (visible) {
+				visible = appCustomization.isFeatureEnabled(id);
+			}
 			if (!compassOutside && visible != (iv.getVisibility() == View.VISIBLE)) {
 				if (visible) {
 					if (hideAnimator != null) {
@@ -1252,6 +1196,11 @@ public class MapControlsLayer extends OsmandMapLayer {
 		return mapActivity.getMapLayers().getMapMarkersLayer().isInPlanRouteMode();
 	}
 
+	private boolean isInChoosingRoutesMode() {
+		RoutingHelper rh = mapActivity.getRoutingHelper();
+		return rh.isPublicTransportMode() && rh.getTransportRoutingHelper().getRoutes() != null && MapRouteInfoMenu.chooseRoutesVisible;
+	}
+
 	public static View.OnLongClickListener getOnClickMagnifierListener(final OsmandMapTileView view) {
 		return new View.OnLongClickListener() {
 
diff --git a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
index bf6e2d2574..bb8fec7ad8 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
@@ -49,8 +49,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import gnu.trove.list.array.TIntArrayList;
-
 public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvider,
 		IContextMenuProviderSelection, ContextMenuLayer.IMoveObjectProvider {
 
@@ -93,8 +91,8 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
 	private float textSize;
 	private int verticalOffset;
 
-	private TIntArrayList tx = new TIntArrayList();
-	private TIntArrayList ty = new TIntArrayList();
+	private List<Float> tx = new ArrayList<>();
+	private List<Float> ty = new ArrayList<>();
 	private Path linePath = new Path();
 
 	private LatLon fingerLocation;
@@ -233,7 +231,8 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
 
 	@Override
 	public void onPrepareBufferImage(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
-		OsmandSettings settings = map.getMyApplication().getSettings();
+		OsmandApplication app = map.getMyApplication();
+		OsmandSettings settings = app.getSettings();
 		if (!settings.SHOW_MAP_MARKERS.get()) {
 			return;
 		}
@@ -244,14 +243,14 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
 			myLoc.setLatitude(fingerLocation.getLatitude());
 			myLoc.setLongitude(fingerLocation.getLongitude());
 		} else {
-			myLoc = map.getMyApplication().getLocationProvider().getLastStaleKnownLocation();
+			myLoc = app.getLocationProvider().getLastStaleKnownLocation();
 		}
-		MapMarkersHelper markersHelper = map.getMyApplication().getMapMarkersHelper();
+		MapMarkersHelper markersHelper = app.getMapMarkersHelper();
 		List<MapMarker> activeMapMarkers = markersHelper.getMapMarkers();
 		int displayedWidgets = settings.DISPLAYED_MARKERS_WIDGETS_COUNT.get();
 
 		if (route != null && route.points.size() > 0) {
-			planRouteAttrs.updatePaints(view, nightMode, tileBox);
+			planRouteAttrs.updatePaints(app, nightMode, tileBox);
 			route.renders.clear();
 			route.renders.add(new Renderable.StandardTrack(new ArrayList<>(route.points), 17.2));
 			route.drawRenderers(view.getZoom(), defaultAppMode ? planRouteAttrs.paint : planRouteAttrs.paint2, canvas, tileBox);
@@ -261,30 +260,30 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
 			textAttrs.paint.setTextSize(textSize);
 			textAttrs.paint2.setTextSize(textSize);
 
-			lineAttrs.updatePaints(view, nightMode, tileBox);
-			textAttrs.updatePaints(view, nightMode, tileBox);
+			lineAttrs.updatePaints(app, nightMode, tileBox);
+			textAttrs.updatePaints(app, nightMode, tileBox);
 			textAttrs.paint.setStyle(Paint.Style.FILL);
 
 			textPaint.set(textAttrs.paint);
 
 			boolean drawMarkerName = settings.DISPLAYED_MARKERS_WIDGETS_COUNT.get() == 1;
 
-			int locX;
-			int locY;
+			float locX;
+			float locY;
 			if (map.getMapViewTrackingUtilities().isMapLinkedToLocation()
 					&& !MapViewTrackingUtilities.isSmallSpeedForAnimation(myLoc)
 					&& !map.getMapViewTrackingUtilities().isMovingToMyLocation()) {
-				locX = (int) tileBox.getPixXFromLatLon(tileBox.getLatitude(), tileBox.getLongitude());
-				locY = (int) tileBox.getPixYFromLatLon(tileBox.getLatitude(), tileBox.getLongitude());
+				locX = tileBox.getPixXFromLatLon(tileBox.getLatitude(), tileBox.getLongitude());
+				locY = tileBox.getPixYFromLatLon(tileBox.getLatitude(), tileBox.getLongitude());
 			} else {
-				locX = (int) tileBox.getPixXFromLatLon(myLoc.getLatitude(), myLoc.getLongitude());
-				locY = (int) tileBox.getPixYFromLatLon(myLoc.getLatitude(), myLoc.getLongitude());
+				locX = tileBox.getPixXFromLatLon(myLoc.getLatitude(), myLoc.getLongitude());
+				locY = tileBox.getPixYFromLatLon(myLoc.getLatitude(), myLoc.getLongitude());
 			}
 			int[] colors = MapMarker.getColors(map);
 			for (int i = 0; i < activeMapMarkers.size() && i < displayedWidgets; i++) {
 				MapMarker marker = activeMapMarkers.get(i);
-				int markerX = (int) tileBox.getPixXFromLatLon(marker.getLatitude(), marker.getLongitude());
-				int markerY = (int) tileBox.getPixYFromLatLon(marker.getLatitude(), marker.getLongitude());
+				float markerX = tileBox.getPixXFromLatLon(marker.getLatitude(), marker.getLongitude());
+				float markerY = tileBox.getPixYFromLatLon(marker.getLatitude(), marker.getLongitude());
 
 				linePath.reset();
 				tx.clear();
diff --git a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
index 69a64a7687..521a72a120 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
@@ -420,8 +420,8 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
 
     @Override
     public void onActionSelected(QuickAction action) {
-        QuickActionFactory.produceAction(action).execute(mapActivity);
         setLayerState(false);
+        QuickActionFactory.produceAction(action).execute(mapActivity);
     }
 
     public PointF getMovableCenterPoint(RotatedTileBox tb) {
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapLayer.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapLayer.java
index 767e0cd10e..b84e4c277b 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapLayer.java
@@ -1,5 +1,8 @@
 package net.osmand.plus.views;
 
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorFilter;
@@ -11,8 +14,12 @@ import android.graphics.Path;
 import android.graphics.PointF;
 import android.graphics.PorterDuff.Mode;
 import android.graphics.PorterDuffColorFilter;
+import android.graphics.Rect;
+import android.graphics.RectF;
 import android.os.AsyncTask;
 import android.support.annotation.NonNull;
+import android.support.v4.graphics.ColorUtils;
+import android.util.Pair;
 import android.view.MotionEvent;
 
 import net.osmand.binary.BinaryMapIndexReader;
@@ -24,6 +31,8 @@ import net.osmand.data.RotatedTileBox;
 import net.osmand.osm.PoiCategory;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.render.OsmandRenderer;
 import net.osmand.plus.render.OsmandRenderer.RenderingContext;
@@ -34,11 +43,10 @@ import net.osmand.util.MapUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import gnu.trove.list.array.TIntArrayList;
-
 public abstract class OsmandMapLayer {
 
 	protected List<LatLon> fullObjectsLatLon;
@@ -132,29 +140,353 @@ public abstract class OsmandMapLayer {
 		}
 	}
 
-
-	protected boolean isIn(int x, int y, int lx, int ty, int rx, int by) {
+	protected boolean isIn(float x, float y, int lx, int ty, int rx, int by) {
 		return x >= lx && x <= rx && y >= ty && y <= by;
 	}
 
+	public int calculatePath(RotatedTileBox tb, List<Float> xs, List<Float> ys, Path path) {
+		List<Pair<Path, GeometryWayStyle>> paths = new ArrayList<>();
+		int res = calculatePath(tb, xs, ys, null, paths);
+		if (paths.size() > 0) {
+			path.addPath(paths.get(0).first);
+		}
+		return res;
+	}
 
-	public int calculatePath(RotatedTileBox tb, TIntArrayList xs, TIntArrayList ys, Path path) {
+	public static class GeometryWayContext {
+
+		private Context ctx;
+		private float density;
+		private boolean nightMode;
+
+		private Paint paintIcon;
+		private Paint paintIconCustom;
+
+		private RenderingLineAttributes attrs;
+		private RenderingLineAttributes attrsPT;
+		private RenderingLineAttributes attrsW;
+
+		private Bitmap arrowBitmap;
+		private Bitmap walkArrowBitmap;
+		private Bitmap anchorBitmap;
+		private Map<Pair<Integer, Bitmap>, Bitmap> stopBitmapsCache = new HashMap<>();
+		private Map<Integer, Bitmap> stopSmallBitmapsCache = new HashMap<>();
+
+		public GeometryWayContext(Context ctx, float density) {
+			this.ctx = ctx;
+			this.density = density;
+
+			paintIcon = new Paint();
+			paintIcon.setFilterBitmap(true);
+			paintIcon.setAntiAlias(true);
+			paintIcon.setColor(Color.BLACK);
+			paintIcon.setStrokeWidth(1f * density);
+
+			paintIconCustom = new Paint();
+			paintIconCustom.setFilterBitmap(true);
+			paintIconCustom.setAntiAlias(true);
+			paintIconCustom.setColor(Color.BLACK);
+			paintIconCustom.setStrokeWidth(1f * density);
+
+			attrsW = new RenderingLineAttributes("walkingRouteLine");
+			attrsW.defaultWidth = (int) (12 * density);
+			attrsW.defaultWidth3 = (int) (7 * density);
+			attrsW.defaultColor = ctx.getResources().getColor(R.color.nav_track_walk_fill);
+			attrsW.paint3.setStrokeCap(Cap.BUTT);
+			attrsW.paint3.setColor(Color.WHITE);
+			attrsW.paint2.setStrokeCap(Cap.BUTT);
+			attrsW.paint2.setColor(Color.BLACK);
+
+			arrowBitmap = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.map_route_direction_arrow, null);
+		}
+
+		public OsmandApplication getApp() {
+			return (OsmandApplication) ctx.getApplicationContext();
+		}
+
+		public float getDensity() {
+			return density;
+		}
+
+		public boolean isNightMode() {
+			return nightMode;
+		}
+
+		private int calculateHash(Object... o) {
+			return Arrays.hashCode(o);
+		}
+
+		public void updatePaints(boolean nightMode,
+									@NonNull RenderingLineAttributes attrs,
+									@NonNull RenderingLineAttributes attrsPT,
+									@NonNull RenderingLineAttributes attrsW) {
+			this.attrs = attrs;
+			this.attrsPT = attrsPT;
+			this.attrsW = attrsW;
+			paintIcon.setColorFilter(new PorterDuffColorFilter(attrs.paint2.getColor(), Mode.MULTIPLY));
+
+			this.nightMode = nightMode;
+			recreateBitmaps();
+		}
+
+		private boolean hasAttrs() {
+			return attrs != null && attrsPT != null && attrsW != null;
+		}
+
+		public int getStrokeColor(int sourceColor) {
+			return ColorUtils.blendARGB(sourceColor, Color.BLACK, 0.6f);
+		}
+
+		private void recreateBitmaps() {
+			if (hasAttrs()) {
+				float walkCircleH = attrsW.paint.getStrokeWidth() * 1.33f;
+				float walkCircleW = attrsW.paint.getStrokeWidth();
+				float walkCircleRadius = attrsW.paint.getStrokeWidth() / 2f;
+				float routeShieldRadius = attrsPT.paint3.getStrokeWidth() / 2f;
+
+				// create anchor bitmap
+				float margin = 2f * density;
+				float width = routeShieldRadius * 2 + margin * 2;
+				float height = routeShieldRadius * 2 + margin * 2;
+				Bitmap bitmap = Bitmap.createBitmap((int)width, (int)height, Bitmap.Config.ARGB_8888);
+
+				Canvas canvas = new Canvas(bitmap);
+				Paint paint = new Paint();
+				paint.setAntiAlias(true);
+				paint.setStrokeWidth(1f * density);
+
+				float x = width / 2;
+				float y = height / 2;
+				paint.setColor(Color.WHITE);
+				paint.setStyle(Paint.Style.FILL);
+				canvas.drawCircle(x, y, routeShieldRadius, paint);
+				paint.setColor(Color.BLACK);
+				paint.setStyle(Paint.Style.STROKE);
+				canvas.drawCircle(x, y, routeShieldRadius, paint);
+
+				anchorBitmap = bitmap;
+
+				// create walk arrow bitmap
+				width = walkCircleW + margin * 2;
+				height = walkCircleH + margin * 2;
+				bitmap = Bitmap.createBitmap((int)width, (int)height, Bitmap.Config.ARGB_8888);
+
+				canvas = new Canvas(bitmap);
+				paint = new Paint();
+				paint.setAntiAlias(true);
+				paint.setStrokeWidth(1f * density);
+
+				RectF rect = new RectF(margin, margin, width - margin, height - margin);
+				paint.setColor(attrsW.paint.getColor());
+				paint.setStyle(Paint.Style.FILL);
+				canvas.drawRoundRect(rect, walkCircleRadius, walkCircleRadius, paint);
+				paint.setColor(getStrokeColor(paint.getColor()));
+				paint.setStyle(Paint.Style.STROKE);
+				canvas.drawRoundRect(rect, walkCircleRadius, walkCircleRadius, paint);
+
+				paint = new Paint();
+				paint.setAntiAlias(true);
+				paint.setColor(Color.WHITE);
+				paint.setStrokeWidth(1f * density);
+				paint.setAlpha(200);
+				canvas.drawBitmap(arrowBitmap, width / 2 - arrowBitmap.getWidth() / 2f, height / 2 - arrowBitmap.getHeight() / 2f, paint);
+
+				walkArrowBitmap = bitmap;
+				stopBitmapsCache = new HashMap<>();
+			}
+		}
+
+		public Paint getPaintIcon() {
+			return paintIcon;
+		}
+
+		public Paint getPaintIconCustom() {
+			return paintIconCustom;
+		}
+
+		public Bitmap getArrowBitmap() {
+			return arrowBitmap;
+		}
+
+		public Bitmap getWalkArrowBitmap() {
+			return walkArrowBitmap;
+		}
+
+		public Bitmap getAnchorBitmap() {
+			return anchorBitmap;
+		}
+
+		public Bitmap getStopShieldBitmap(int color, Bitmap stopBitmap) {
+			Bitmap bmp = stopBitmapsCache.get(new Pair<>(color, stopBitmap));
+			if (bmp == null) {
+				int fillColor = UiUtilities.getContrastColor(getApp(), color, true);
+				int strokeColor = getStrokeColor(color);
+
+				float routeShieldRadius = attrsPT.paint3.getStrokeWidth() / 2;
+				float routeShieldCornerRadius = 3 * density;
+
+				float margin = 2f * density;
+				float width = routeShieldRadius * 2 + margin * 2;
+				float height = routeShieldRadius * 2 + margin * 2;
+				bmp = Bitmap.createBitmap((int) width, (int) height, Bitmap.Config.ARGB_8888);
+
+				Canvas canvas = new Canvas(bmp);
+				Paint paint = new Paint();
+				paint.setAntiAlias(true);
+				paint.setStrokeWidth(1f * density);
+
+				RectF rect = new RectF(margin, margin, width - margin, height - margin);
+				paint.setColor(fillColor);
+				paint.setStyle(Paint.Style.FILL);
+				canvas.drawRoundRect(rect, routeShieldCornerRadius, routeShieldCornerRadius, paint);
+				paint.setColor(strokeColor);
+				paint.setStyle(Paint.Style.STROKE);
+				canvas.drawRoundRect(rect, routeShieldCornerRadius, routeShieldCornerRadius, paint);
+
+				if (stopBitmap != null) {
+					paint.setFilterBitmap(true);
+					paint.setColorFilter(new PorterDuffColorFilter(strokeColor, Mode.SRC_IN));
+					Rect src = new Rect(0, 0, stopBitmap.getWidth(), stopBitmap.getHeight());
+					float marginBitmap = 1f * density;
+					rect.inset(marginBitmap, marginBitmap);
+					canvas.drawBitmap(stopBitmap, src, rect, paint);
+				}
+				stopBitmapsCache.put(new Pair<>(color, stopBitmap), bmp);
+			}
+			return bmp;
+		}
+
+		public Bitmap getStopSmallShieldBitmap(int color) {
+			Bitmap bmp = stopSmallBitmapsCache.get(color);
+			if (bmp == null) {
+				int fillColor = UiUtilities.getContrastColor(getApp(), color, true);
+				int strokeColor = getStrokeColor(color);
+
+				float routeShieldRadius = attrsPT.paint3.getStrokeWidth() / 4;
+
+				float margin = 3f * density;
+				float width = routeShieldRadius * 2 + margin * 2;
+				float height = routeShieldRadius * 2 + margin * 2;
+				bmp = Bitmap.createBitmap((int) width, (int) height, Bitmap.Config.ARGB_8888);
+
+				Canvas canvas = new Canvas(bmp);
+				Paint paint = new Paint();
+				paint.setAntiAlias(true);
+				paint.setStrokeWidth(1f * density);
+				paint.setColor(fillColor);
+				paint.setStyle(Paint.Style.FILL);
+				canvas.drawCircle(width / 2, height / 2, routeShieldRadius, paint);
+				paint.setColor(strokeColor);
+				paint.setStyle(Paint.Style.STROKE);
+				canvas.drawCircle(width / 2, height / 2, routeShieldRadius, paint);
+
+				stopSmallBitmapsCache.put(color, bmp);
+			}
+			return bmp;
+		}
+	}
+
+	public abstract static class GeometryWayStyle {
+
+		private GeometryWayContext context;
+		protected Integer color;
+
+		public GeometryWayStyle(GeometryWayContext context) {
+			this.context = context;
+		}
+
+		public GeometryWayStyle(GeometryWayContext context, Integer color) {
+			this.context = context;
+			this.color = color;
+		}
+
+		public GeometryWayContext getContext() {
+			return context;
+		}
+
+		public Context getCtx() {
+			return context.ctx;
+		}
+
+		public Integer getColor() {
+			return color;
+		}
+
+		public Integer getStrokeColor() {
+			return context.getStrokeColor(color);
+		}
+
+		public Integer getPointColor() {
+			return null;
+		}
+
+		public boolean isNightMode() {
+			return context.nightMode;
+		}
+
+		public boolean hasAnchors() {
+			return false;
+		}
+
+		public boolean hasPathLine() {
+			return true;
+		}
+
+		public boolean isTransportLine() {
+			return false;
+		}
+
+		public boolean isWalkLine() {
+			return false;
+		}
+
+		public abstract Bitmap getPointBitmap();
+
+		public boolean hasPaintedPointBitmap() {
+			return false;
+		}
+
+		@Override
+		public int hashCode() {
+			return (color != null ? color.hashCode() : 0) + (context.nightMode ? 1231 : 1237) + (hasAnchors() ? 12310 : 12370);
+		}
+
+		@Override
+		public boolean equals(Object other) {
+			if (this == other) {
+				return true;
+			}
+			if (!(other instanceof GeometryWayStyle)) {
+				return false;
+			}
+			GeometryWayStyle o = (GeometryWayStyle) other;
+			if (color != null && o.color != null) {
+				return color.equals(o.color);
+			}
+			return color == null && o.color == null;
+		}
+	}
+
+	public int calculatePath(RotatedTileBox tb, List<Float> xs, List<Float> ys, List<GeometryWayStyle> styles, List<Pair<Path, GeometryWayStyle>> paths) {
 		boolean segmentStarted = false;
-		int prevX = xs.get(0);
-		int prevY = ys.get(0);
+		float prevX = xs.get(0);
+		float prevY = ys.get(0);
 		int height = tb.getPixHeight();
 		int width = tb.getPixWidth();
 		int cnt = 0;
+		boolean hasStyles = styles != null && styles.size() == xs.size();
+		GeometryWayStyle style = hasStyles ? styles.get(0) : null;
+		Path path = new Path();
 		boolean prevIn = isIn(prevX, prevY, 0, 0, width, height);
 		for (int i = 1; i < xs.size(); i++) {
-			int currX = xs.get(i);
-			int currY = ys.get(i);
+			float currX = xs.get(i);
+			float currY = ys.get(i);
 			boolean currIn = isIn(currX, currY, 0, 0, width, height);
 			boolean draw = false;
 			if (prevIn && currIn) {
 				draw = true;
 			} else {
-				long intersection = MapAlgorithms.calculateIntersection(currX, currY, prevX, prevY, 0, width, height, 0);
+				long intersection = MapAlgorithms.calculateIntersection((int)currX, (int)currY, (int)prevX, (int)prevY, 0, width, height, 0);
 				if (intersection != -1) {
 					if (prevIn && (i == 1)) {
 						cnt++;
@@ -166,7 +498,7 @@ public abstract class OsmandMapLayer {
 					draw = true;
 				}
 				if (i == xs.size() - 1 && !currIn) {
-					long inter = MapAlgorithms.calculateIntersection(prevX, prevY, currX, currY, 0, width, height, 0);
+					long inter = MapAlgorithms.calculateIntersection((int)prevX, (int)prevY, (int)currX, (int)currY, 0, width, height, 0);
 					if (inter != -1) {
 						currX = (int) (inter >> 32);
 						currY = (int) (inter & 0xffffffff);
@@ -186,6 +518,21 @@ public abstract class OsmandMapLayer {
 			prevIn = currIn;
 			prevX = currX;
 			prevY = currY;
+
+			if (hasStyles) {
+				GeometryWayStyle newStyle = styles.get(i);
+				if (!style.equals(newStyle)) {
+					paths.add(new Pair<>(path, style));
+					path = new Path();
+					if (segmentStarted) {
+						path.moveTo(currX, currY);
+					}
+					style = newStyle;
+				}
+			}
+		}
+		if (!path.isEmpty()) {
+			paths.add(new Pair<>(path, style));
 		}
 		return cnt;
 	}
@@ -383,6 +730,8 @@ public abstract class OsmandMapLayer {
 	protected static class RenderingLineAttributes {
 		protected int cachedHash;
 		public Paint paint;
+		public Paint customColorPaint;
+		public int customColor = 0;
 		public int defaultWidth = 0;
 		public int defaultColor = 0;
 		public boolean isPaint2;
@@ -402,6 +751,7 @@ public abstract class OsmandMapLayer {
 		public RenderingLineAttributes(String renderingAttribute) {
 			this.renderingAttribute = renderingAttribute;
 			paint = initPaint();
+			customColorPaint = new Paint(paint);
 			paint2 = initPaint();
 			paint3 = initPaint();
 			paint_1 = initPaint();
@@ -419,8 +769,7 @@ public abstract class OsmandMapLayer {
 		}
 
 
-		public boolean updatePaints(OsmandMapTileView view, DrawSettings settings, RotatedTileBox tileBox) {
-			OsmandApplication app = view.getApplication();
+		public boolean updatePaints(OsmandApplication app, DrawSettings settings, RotatedTileBox tileBox) {
 			OsmandRenderer renderer = app.getResourceManager().getRenderer().getRenderer();
 			RenderingRulesStorage rrs = app.getRendererRegistry().getCurrentSelectedRenderer();
 			final boolean isNight = settings != null && settings.isNightMode();
@@ -462,6 +811,7 @@ public abstract class OsmandMapLayer {
 					if (paint.getStrokeWidth() == 0 && defaultWidth != 0) {
 						paint.setStrokeWidth(defaultWidth);
 					}
+					customColorPaint = new Paint(paint);
 				}
 				return true;
 			}
@@ -486,7 +836,12 @@ public abstract class OsmandMapLayer {
 			if (isShadowPaint) {
 				canvas.drawPath(path, shadowPaint);
 			}
-			canvas.drawPath(path, paint);
+			if (customColor != 0) {
+				customColorPaint.setColor(customColor);
+				canvas.drawPath(path, customColorPaint);
+			} else {
+				canvas.drawPath(path, paint);
+			}
 			if (isPaint2) {
 				canvas.drawPath(path, paint2);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index bf08946e5f..8dda1d73b3 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -511,7 +511,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 			ry -= 0.35;
 		}
 		box.setCenterLocation(rx, ry);
-		LatLon screenCenter = box.getLatLonFromPixel(box.getPixWidth() / 2, box.getPixHeight() / 2);
+		LatLon screenCenter = box.getLatLonFromPixel(box.getPixWidth() / 2f, box.getPixHeight() / 2f);
 		mapRatioX = 0;
 		mapRatioY = 0;
 		setLatLon(screenCenter.getLatitude(), screenCenter.getLongitude());
@@ -711,6 +711,10 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		return additional.fps;
 	}
 
+	public boolean isAnimatingZoom() {
+		return animatedDraggingThread.isAnimatingZoom();
+	}
+
 	@SuppressLint("WrongCall")
 	public void drawOverMap(Canvas canvas, RotatedTileBox tileBox, DrawSettings drawSettings) {
 		if (mapRenderer == null) {
diff --git a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
index f03da3dac1..f475fedef8 100644
--- a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
@@ -39,7 +39,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.render.RenderingIcons;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.routing.RoutingHelper.IRouteInformationListener;
+import net.osmand.plus.routing.IRouteInformationListener;
 import net.osmand.plus.views.MapTextLayer.MapTextProvider;
 import net.osmand.util.Algorithms;
 
diff --git a/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java b/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
index 5cd5562533..01f73e39a3 100644
--- a/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
@@ -123,7 +123,8 @@ public class PointLocationLayer extends OsmandMapLayer implements ContextMenuLay
 				canvas.restore();
 
 			}
-			boolean isBearing = lastKnownLocation.hasBearing();
+			// Issue 5538: Some devices return positives for hasBearing() at rest, hence add 0.0 check:
+			boolean isBearing = lastKnownLocation.hasBearing() && (lastKnownLocation.getBearing() != 0.0);
 			if (!locationOutdated && isBearing) {
 				float bearing = lastKnownLocation.getBearing();
 				canvas.rotate(bearing - 90, locationX, locationY);
diff --git a/OsmAnd/src/net/osmand/plus/views/RouteLayer.java b/OsmAnd/src/net/osmand/plus/views/RouteLayer.java
index dd7349b754..a17ff85a9d 100644
--- a/OsmAnd/src/net/osmand/plus/views/RouteLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/RouteLayer.java
@@ -12,46 +12,64 @@ import android.graphics.PointF;
 import android.graphics.PorterDuff.Mode;
 import android.graphics.PorterDuffColorFilter;
 import android.support.annotation.ColorInt;
+import android.support.annotation.Nullable;
+import android.util.Pair;
 
 import net.osmand.Location;
 import net.osmand.data.LatLon;
+import net.osmand.data.PointDescription;
 import net.osmand.data.QuadRect;
+import net.osmand.data.QuadTree;
 import net.osmand.data.RotatedTileBox;
+import net.osmand.data.TransportRoute;
+import net.osmand.data.TransportStop;
+import net.osmand.osm.edit.Node;
+import net.osmand.osm.edit.OSMSettings;
+import net.osmand.osm.edit.Way;
 import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
 import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu;
 import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu.TrackChartPoints;
+import net.osmand.plus.render.RenderingIcons;
 import net.osmand.plus.routing.RouteCalculationResult;
 import net.osmand.plus.routing.RouteDirectionInfo;
 import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.routing.TransportRoutingHelper;
+import net.osmand.plus.transport.TransportStopRoute;
+import net.osmand.plus.transport.TransportStopType;
+import net.osmand.router.TransportRoutePlanner.TransportRouteResult;
+import net.osmand.router.TransportRoutePlanner.TransportRouteResultSegment;
 import net.osmand.util.MapUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 
 import gnu.trove.list.array.TByteArrayList;
-import gnu.trove.list.array.TIntArrayList;
 
-public class RouteLayer extends OsmandMapLayer {
+public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.IContextMenuProvider {
 	
 	private static final float EPSILON_IN_DPI = 2;
 
 	private OsmandMapTileView view;
 	
 	private final RoutingHelper helper;
+	private final TransportRoutingHelper transportHelper;
 	// keep array lists created
 	private List<Location> actionPoints = new ArrayList<Location>();
-	
-	private Path path;
+	private List<TransportStop> routeTransportStops = new ArrayList<>();
 
 	// cache
-	private Bitmap coloredArrowUp;
 	private Bitmap actionArrow;
 
-	private Paint paintIcon;
 	private Paint paintIconAction;
 	private Paint paintGridOuterCircle;
 	private Paint paintGridCircle;
@@ -61,10 +79,15 @@ public class RouteLayer extends OsmandMapLayer {
 	private TrackChartPoints trackChartPoints;
 
 	private RenderingLineAttributes attrs;
+	private RenderingLineAttributes attrsPT;
+	private RenderingLineAttributes attrsW;
+	private boolean nightMode;
 
+	private GeometryWayContext wayContext;
 
-	public RouteLayer(RoutingHelper helper){
+	public RouteLayer(RoutingHelper helper) {
 		this.helper = helper;
+		this.transportHelper = helper.getTransportRoutingHelper();
 	}
 
 	public void setTrackChartPoints(TrackDetailsMenu.TrackChartPoints trackChartPoints) {
@@ -72,29 +95,43 @@ public class RouteLayer extends OsmandMapLayer {
 	}
 
 	private void initUI() {
+		float density = view.getDensity();
+
 		actionArrow = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_action_arrow, null);
-		path = new Path();
-		
-		paintIcon = new Paint();
-		paintIcon.setFilterBitmap(true);
-		paintIcon.setAntiAlias(true);
-		paintIcon.setColor(Color.BLACK);
-		paintIcon.setStrokeWidth(3);
 
 		paintIconAction = new Paint();
 		paintIconAction.setFilterBitmap(true);
 		paintIconAction.setAntiAlias(true);
 
 		attrs = new RenderingLineAttributes("route");
-		attrs.defaultWidth = (int) (12 * view.getDensity());
-		attrs.defaultWidth3 = (int) (7 * view.getDensity());
+		attrs.defaultWidth = (int) (12 * density);
+		attrs.defaultWidth3 = (int) (7 * density);
 		attrs.defaultColor = view.getResources().getColor(R.color.nav_track);
 		attrs.paint3.setStrokeCap(Cap.BUTT);
 		attrs.paint3.setColor(Color.WHITE);
-		
 		attrs.paint2.setStrokeCap(Cap.BUTT);
 		attrs.paint2.setColor(Color.BLACK);
 
+		attrsPT = new RenderingLineAttributes("publicTransportLine");
+		attrsPT.defaultWidth = (int) (12 * density);
+		attrsPT.defaultWidth3 = (int) (7 * density);
+		attrsPT.defaultColor = view.getResources().getColor(R.color.nav_track);
+		attrsPT.paint3.setStrokeCap(Cap.BUTT);
+		attrsPT.paint3.setColor(Color.WHITE);
+		attrsPT.paint2.setStrokeCap(Cap.BUTT);
+		attrsPT.paint2.setColor(Color.BLACK);
+
+		attrsW = new RenderingLineAttributes("walkingRouteLine");
+		attrsW.defaultWidth = (int) (12 * density);
+		attrsW.defaultWidth3 = (int) (7 * density);
+		attrsW.defaultColor = view.getResources().getColor(R.color.nav_track_walk_fill);
+		attrsW.paint3.setStrokeCap(Cap.BUTT);
+		attrsW.paint3.setColor(Color.WHITE);
+		attrsW.paint2.setStrokeCap(Cap.BUTT);
+		attrsW.paint2.setColor(Color.BLACK);
+
+		wayContext = new GeometryWayContext(view.getContext(), density);
+
 		paintIconSelected = new Paint();
 		selectedPoint = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_default_location);
 
@@ -109,25 +146,20 @@ public class RouteLayer extends OsmandMapLayer {
 		paintGridOuterCircle.setColor(Color.WHITE);
 		paintGridOuterCircle.setAlpha(204);
 	}
-	
+
 	@Override
 	public void initLayer(OsmandMapTileView view) {
 		this.view = view;
 		initUI();
 	}
 
-	
 	@Override
 	public void onPrepareBufferImage(Canvas canvas, RotatedTileBox tileBox, DrawSettings settings) {
-		if (helper.getFinalLocation() != null && helper.getRoute().isCalculated()) {
+		if ((helper.isPublicTransportMode() && transportHelper.getRoutes() != null) ||
+				(helper.getFinalLocation() != null && helper.getRoute().isCalculated())) {
+
 			updateAttrs(settings, tileBox);
 			
-			if(coloredArrowUp == null) {
-				Bitmap originalArrowUp = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_route_direction_arrow, null);
-				coloredArrowUp = originalArrowUp;
-//				coloredArrowUp = Bitmap.createScaledBitmap(originalArrowUp, originalArrowUp.getWidth() * 3 / 4,	
-//						originalArrowUp.getHeight() * 3 / 4, true);
-			}
 			int w = tileBox.getPixWidth();
 			int h = tileBox.getPixHeight();
 			Location lastProjection = helper.getLastProjection();
@@ -163,7 +195,7 @@ public class RouteLayer extends OsmandMapLayer {
 						&& highlightedPoint.getLongitude() <= latlonRect.right) {
 					float x = tileBox.getPixXFromLatLon(highlightedPoint.getLatitude(), highlightedPoint.getLongitude());
 					float y = tileBox.getPixYFromLatLon(highlightedPoint.getLatitude(), highlightedPoint.getLongitude());
-					canvas.drawBitmap(selectedPoint, x - selectedPoint.getWidth() / 2, y - selectedPoint.getHeight() / 2, paintIconSelected);
+					canvas.drawBitmap(selectedPoint, x - selectedPoint.getWidth() / 2f, y - selectedPoint.getHeight() / 2f, paintIconSelected);
 				}
 			}
 		}
@@ -171,12 +203,21 @@ public class RouteLayer extends OsmandMapLayer {
 	}
 
 	private void updateAttrs(DrawSettings settings, RotatedTileBox tileBox) {
-		boolean updatePaints = attrs.updatePaints(view, settings, tileBox);
+		boolean updatePaints = attrs.updatePaints(view.getApplication(), settings, tileBox);
 		attrs.isPaint3 = false;
 		attrs.isPaint2 = false;
-		if(updatePaints) {
+		attrsPT.updatePaints(view.getApplication(), settings, tileBox);
+		attrsPT.isPaint3 = false;
+		attrsPT.isPaint2 = false;
+		attrsW.updatePaints(view.getApplication(), settings, tileBox);
+		attrsPT.isPaint3 = false;
+		attrsPT.isPaint2 = false;
+
+		nightMode = settings != null && settings.isNightMode();
+
+		if (updatePaints) {
 			paintIconAction.setColorFilter(new PorterDuffColorFilter(attrs.paint3.getColor(), Mode.MULTIPLY));
-			paintIcon.setColorFilter(new PorterDuffColorFilter(attrs.paint2.getColor(), Mode.MULTIPLY));
+			wayContext.updatePaints(nightMode, attrs, attrsPT, attrsW);
 		}
 	}
 
@@ -224,9 +265,9 @@ public class RouteLayer extends OsmandMapLayer {
 						float pdx = x - px;
 						float pdy = y - py;
 						matrix.reset();
-						matrix.postTranslate(0, -actionArrow.getHeight() / 2);
-						matrix.postRotate((float) angle, actionArrow.getWidth() / 2, 0);
-						matrix.postTranslate(px + pdx - actionArrow.getWidth() / 2, py + pdy);
+						matrix.postTranslate(0, -actionArrow.getHeight() / 2f);
+						matrix.postRotate((float) angle, actionArrow.getWidth() / 2f, 0);
+						matrix.postTranslate(px + pdx - actionArrow.getWidth() / 2f, py + pdy);
 						canvas.drawBitmap(actionArrow, matrix, paintIconAction);
 					} else {
 						px = x;
@@ -278,58 +319,399 @@ public class RouteLayer extends OsmandMapLayer {
             survivor.set(end, (byte) 1);
         }
     }
-	
 
-	private void drawArrowsOverPath(Canvas canvas, RotatedTileBox tb, TIntArrayList tx, TIntArrayList ty,
-			List<Double> angles, List<Double> distances, Bitmap arrow, double distPixToFinish) {
+    private static class PathPoint {
+		float x;
+		float y;
+		double angle;
+		GeometryWayStyle style;
+
+		private Matrix matrix = new Matrix();
+
+		PathPoint(float x, float y, double angle, GeometryWayStyle style) {
+			this.x = x;
+			this.y = y;
+			this.angle = angle;
+			this.style = style;
+		}
+
+		protected Matrix getMatrix() {
+			return matrix;
+		}
+
+		void draw(Canvas canvas, GeometryWayContext context) {
+			if (style != null && style.getPointBitmap() != null) {
+				Bitmap bitmap = style.getPointBitmap();
+				Integer pointColor = style.getPointColor();
+				float paintH2 = bitmap.getHeight() / 2f;
+				float paintW2 = bitmap.getWidth() / 2f;
+
+				matrix.reset();
+				matrix.postRotate((float) angle, paintW2, paintH2);
+				matrix.postTranslate(x - paintW2, y - paintH2);
+				if (pointColor != null) {
+					Paint paint = context.getPaintIconCustom();
+					paint.setColorFilter(new PorterDuffColorFilter(pointColor, Mode.SRC_IN));
+					canvas.drawBitmap(bitmap, matrix, paint);
+				} else {
+					if (style.hasPaintedPointBitmap()) {
+						Paint paint = context.getPaintIconCustom();
+						paint.setColorFilter(null);
+						canvas.drawBitmap(bitmap, matrix, paint);
+					} else {
+						canvas.drawBitmap(bitmap, matrix, context.getPaintIcon());
+					}
+				}
+			}
+		}
+	}
+
+	private static class PathAnchor extends PathPoint {
+		PathAnchor(float x, float y, GeometryAnchorWayStyle style) {
+			super(x, y, 0, style);
+		}
+	}
+
+	private static class PathTransportStop extends PathPoint {
+
+		private boolean smallPoint;
+
+		public boolean isSmallPoint() {
+			return smallPoint;
+		}
+
+		public void setSmallPoint(boolean smallPoint) {
+			this.smallPoint = smallPoint;
+		}
+
+		PathTransportStop(float x, float y, GeometryTransportWayStyle style) {
+			super(x, y, 0, style);
+		}
+
+		GeometryTransportWayStyle getTransportWayStyle() {
+			return (GeometryTransportWayStyle) style;
+		}
+
+
+		@Override
+		void draw(Canvas canvas, GeometryWayContext context) {
+			Bitmap stopBitmap = smallPoint ?
+					getTransportWayStyle().getStopSmallBitmap() : getTransportWayStyle().getStopBitmap();
+			float paintH2 = stopBitmap.getHeight() / 2f;
+			float paintW2 = stopBitmap.getWidth() / 2f;
+
+			Matrix matrix = getMatrix();
+			matrix.reset();
+			matrix.postRotate(0f, paintW2, paintH2);
+			matrix.postTranslate(x - paintW2, y - paintH2);
+			Paint paint = context.getPaintIconCustom();
+			paint.setColorFilter(null);
+			canvas.drawBitmap(stopBitmap, matrix, paint);
+		}
+	}
+
+	private static class GeometryWalkWayStyle extends GeometryWayStyle {
+
+		public GeometryWalkWayStyle(GeometryWayContext context) {
+			super(context);
+		}
+
+		@Override
+		public boolean hasPathLine() {
+			return false;
+		}
+
+		@Override
+		public boolean equals(Object other) {
+			if (this == other) {
+				return true;
+			}
+			if (!super.equals(other)) {
+				return false;
+			}
+			return other instanceof GeometryWalkWayStyle;
+		}
+
+		public Bitmap getPointBitmap() {
+			return getContext().getWalkArrowBitmap();
+		}
+
+		@Override
+		public boolean isWalkLine() {
+			return true;
+		}
+
+		@Override
+		public boolean hasPaintedPointBitmap() {
+			return true;
+		}
+	}
+
+	private static class GeometryAnchorWayStyle extends GeometryWayStyle {
+
+		public GeometryAnchorWayStyle(GeometryWayContext context) {
+			super(context);
+		}
+
+		@Override
+		public boolean hasPathLine() {
+			return false;
+		}
+
+		@Override
+		public boolean equals(Object other) {
+			if (this == other) {
+				return true;
+			}
+			if (!super.equals(other)) {
+				return false;
+			}
+			return other instanceof GeometryAnchorWayStyle;
+		}
+
+		public Bitmap getPointBitmap() {
+			return getContext().getAnchorBitmap();
+		}
+
+		@Override
+		public boolean hasPaintedPointBitmap() {
+			return true;
+		}
+	}
+
+	private static class GeometrySolidWayStyle extends GeometryWayStyle {
+
+		public GeometrySolidWayStyle(GeometryWayContext context, Integer color) {
+			super(context, color);
+		}
+
+		@Override
+		public Bitmap getPointBitmap() {
+			return getContext().getArrowBitmap();
+		}
+
+		@Override
+		public boolean equals(Object other) {
+			if (this == other) {
+				return true;
+			}
+			if (!super.equals(other)) {
+				return false;
+			}
+			return other instanceof GeometrySolidWayStyle;
+		}
+	}
+
+	private static class GeometryTransportWayStyle extends GeometryWayStyle {
+
+		private TransportRouteResultSegment segment;
+		private Bitmap stopBitmap;
+		private Integer pointColor;
+
+		public GeometryTransportWayStyle(GeometryWayContext context, TransportRouteResultSegment segment) {
+			super(context);
+			this.segment = segment;
+
+			TransportStopRoute r = new TransportStopRoute();
+			TransportRoute route = segment.route;
+			r.type = TransportStopType.findType(route.getType());
+			r.route = route;
+			OsmandApplication app = (OsmandApplication) getCtx().getApplicationContext();
+			this.color = r.getRouteColor(app, isNightMode());
+			this.pointColor = UiUtilities.getContrastColor(app, color, true);
+
+			TransportStopType type = TransportStopType.findType(route.getType());
+			if (type == null) {
+				type = TransportStopType.findType("bus");
+			}
+			if (type != null) {
+				stopBitmap = RenderingIcons.getIcon(getCtx(), type.getResName(), false);
+			}
+		}
+
+		public TransportRouteResultSegment getSegment() {
+			return segment;
+		}
+
+		public TransportRoute getRoute() {
+			return segment.route;
+		}
+
+		@Override
+		public boolean hasAnchors() {
+			return true;
+		}
+
+		@Override
+		public Bitmap getPointBitmap() {
+			return getContext().getArrowBitmap();
+		}
+
+		@Override
+		public Integer getPointColor() {
+			return pointColor;
+		}
+
+		public Bitmap getStopBitmap() {
+			return getContext().getStopShieldBitmap(color, stopBitmap);
+		}
+
+		public Bitmap getStopSmallBitmap() {
+			return getContext().getStopSmallShieldBitmap(color);
+		}
+
+		@Override
+		public boolean isTransportLine() {
+			return true;
+		}
+
+		@Override
+		public boolean equals(Object other) {
+			if (this == other) {
+				return true;
+			}
+			if (!super.equals(other)) {
+				return false;
+			}
+			if (!(other instanceof GeometryTransportWayStyle)) {
+				return false;
+			}
+			return getRoute() == ((GeometryTransportWayStyle) other).getRoute();
+		}
+	}
+
+	private void drawArrowsOverPath(Canvas canvas, RotatedTileBox tb, List<Float> tx, List<Float> ty,
+			List<Double> angles, List<Double> distances, double distPixToFinish, List<GeometryWayStyle> styles) {
 		int h = tb.getPixHeight();
 		int w = tb.getPixWidth();
 		int left =  -w / 4;
 		int right = w + w / 4;
 		int top = - h/4;
 		int bottom = h + h/4;
-		
-		double pxStep = arrow.getHeight() * 4f;
-		Matrix matrix = new Matrix();
+
+		boolean hasStyles = styles != null && styles.size() == tx.size();
+		double zoomCoef = tb.getZoomAnimation() > 0 ? (Math.pow(2, tb.getZoomAnimation() + tb.getZoomFloatPart())) : 1f;
+
+		Bitmap arrow = wayContext.getArrowBitmap();
+		int arrowHeight = arrow.getHeight();
+		double pxStep = arrowHeight * 4f * zoomCoef;
 		double dist = 0;
-		if(distPixToFinish != 0) {
+		if (distPixToFinish != 0) {
 			dist = distPixToFinish - pxStep * ((int) (distPixToFinish / pxStep)); // dist < 1
 		}
-		
+
+		List<PathPoint> arrows = new ArrayList<>();
+		List<PathAnchor> anchors = new ArrayList<>();
+		List<PathTransportStop> stops = new ArrayList<>();
+		Set<GeometryTransportWayStyle> transportWaysStyles = new HashSet<>();
+
+		GeometryAnchorWayStyle anchorWayStyle = new GeometryAnchorWayStyle(wayContext);
+
+		GeometryWalkWayStyle walkWayStyle = new GeometryWalkWayStyle(wayContext);
+		Bitmap walkArrow = walkWayStyle.getPointBitmap();
+		int walkArrowHeight = walkArrow.getHeight();
+		double pxStepWalk = walkArrowHeight * 1.2f * zoomCoef;
+		double pxStepRegular = arrowHeight * 4f * zoomCoef;
+
+		GeometryWayStyle prevStyle = null;
 		for (int i = tx.size() - 2; i >= 0; i --) {
-			int px = tx.get(i);
-			int py = ty.get(i);
-			int x = tx.get(i + 1);
-			int y = ty.get(i + 1);
+			GeometryWayStyle style = hasStyles ? styles.get(i) : null;
+			float px = tx.get(i);
+			float py = ty.get(i);
+			float x = tx.get(i + 1);
+			float y = ty.get(i + 1);
 			double distSegment = distances.get(i + 1);
 			double angle = angles.get(i + 1);
-//			double angleRad = Math.atan2(y - py, x - px);
-//			angle = (angleRad * 180 / Math.PI) + 90f;
-//			distSegment = Math.sqrt((y - py) * (y - py) + (x - px) * (x - px));
-			if(distSegment == 0) {
+			if (distSegment == 0) {
 				continue;
 			}
-			if(dist >= pxStep) {
-				dist = 0; // unnecessary but double check to avoid errors
+			if (style != null && style.isWalkLine()) {
+				pxStep = pxStepWalk;
+			} else {
+				pxStep = pxStepRegular;
+			}
+			if (style != null && !style.equals(prevStyle) && (prevStyle != null || style.hasAnchors())) {
+				prevStyle = style;
+				anchors.add(new PathAnchor(x, y, anchorWayStyle));
+				dist = 0;
+			}
+			if (style != null && style.isTransportLine()) {
+				transportWaysStyles.add((GeometryTransportWayStyle) style);
+			}
+			if (dist >= pxStep) {
+				dist = 0;
 			}
 			double percent = 1 - (pxStep - dist) / distSegment;
 			dist += distSegment;
-			while(dist >= pxStep) {
+			while (dist >= pxStep) {
 				double pdx = (x - px) * percent;
 				double pdy = (y - py) * percent;
-				if (isIn((int)(px + pdx), (int) (py + pdy), left, top, right, bottom)) {
-					float icony = (float) (py + pdy);
-					float iconx = (float) (px + pdx - arrow.getWidth() / 2);
-					matrix.reset();
-					matrix.postTranslate(0, -arrow.getHeight() / 2);
-					matrix.postRotate((float) angle, arrow.getWidth() / 2, 0);
-					matrix.postTranslate(iconx, icony);
-					canvas.drawBitmap(arrow, matrix, paintIcon);
+				float iconx = (float) (px + pdx);
+				float icony = (float) (py + pdy);
+				if (isIn(iconx, icony, left, top, right, bottom)) {
+					arrows.add(new PathPoint(iconx, icony, angle, style));
 				}
 				dist -= pxStep;
 				percent -= pxStep / distSegment;
 			}
 		}
+		List<TransportStop> routeTransportStops = new ArrayList<>();
+		for (GeometryTransportWayStyle style : transportWaysStyles) {
+			List<TransportStop> transportStops = style.getRoute().getForwardStops();
+			TransportRouteResultSegment segment = style.getSegment();
+			int start = segment.start;
+			int end = segment.end;
+			for (int i = start; i <= end; i++) {
+				TransportStop stop = transportStops.get(i);
+				double lat = stop.getLocation().getLatitude();
+				double lon = stop.getLocation().getLongitude();
+				float x = tb.getPixXFromLatLon(lat, lon);
+				float y = tb.getPixYFromLatLon(lat, lon);
+				if (isIn(x, y, left, top, right, bottom)) {
+					if (i != start && i != end) {
+						stops.add(new PathTransportStop(x, y, style));
+					}
+					routeTransportStops.add(transportStops.get(i));
+				}
+			}
+		}
+		this.routeTransportStops = routeTransportStops;
+
+		for (int i = arrows.size() - 1; i >= 0; i--) {
+			PathPoint a = arrows.get(i);
+			if (!tb.isZoomAnimated() || a.style.isWalkLine()) {
+				a.draw(canvas, wayContext);
+			}
+		}
+		for (int i = anchors.size() - 1; i >= 0; i--) {
+			PathAnchor anchor = anchors.get(i);
+			anchor.draw(canvas, wayContext);
+		}
+		if (stops.size() > 0) {
+			QuadTree<QuadRect> boundIntersections = initBoundIntersections(tb);
+			List<PathTransportStop> fullObjects = new ArrayList<>();
+			Bitmap stopBitmap = null;
+			float iconSize = 1f;
+			for (int i = stops.size() - 1; i >= 0; i--) {
+				PathTransportStop stop = stops.get(i);
+				if (stopBitmap == null) {
+					stopBitmap = stop.getTransportWayStyle().getStopBitmap();
+					iconSize = stopBitmap.getWidth() * 3 / 2.5f;
+				}
+				float x = stop.x;
+				float y = stop.y;
+				if (intersects(boundIntersections, x, y, iconSize, iconSize)) {
+					stop.setSmallPoint(true);
+					stop.draw(canvas, wayContext);
+				} else {
+					stop.setSmallPoint(false);
+					fullObjects.add(stop);
+				}
+			}
+			for (PathTransportStop stop : fullObjects) {
+				stop.draw(canvas, wayContext);
+			}
+		}
 	}
 	
 	private static class RouteGeometryZoom {
@@ -342,8 +724,8 @@ public class RouteLayer extends OsmandMapLayer {
 			tb = new RotatedTileBox(tb);
 			tb.setZoomAndAnimation(tb.getZoom(), 0, tb.getZoomFloatPart());
 			simplifyPoints = new TByteArrayList(locations.size());
-			distances = new ArrayList<Double>(locations.size());
-			angles = new ArrayList<Double>(locations.size());
+			distances = new ArrayList<>(locations.size());
+			angles = new ArrayList<>(locations.size());
 			simplifyPoints.fill(0, locations.size(), (byte)0);
 			if(locations.size() > 0) {
 				simplifyPoints.set(0, (byte) 1);
@@ -413,24 +795,79 @@ public class RouteLayer extends OsmandMapLayer {
 	
 	private class RouteSimplificationGeometry {
 		RouteCalculationResult route;
+		TransportRouteResult transportRoute;
 		double mapDensity;
 		TreeMap<Integer, RouteGeometryZoom> zooms = new TreeMap<>();
-		List<Location> locations = Collections.emptyList(); 
-		
+		List<Location> locations = Collections.emptyList();
+		Map<Integer, GeometryWayStyle> styleMap = Collections.emptyMap();
+
 		// cache arrays
-		TIntArrayList tx = new TIntArrayList();
-		TIntArrayList ty = new TIntArrayList();
+		List<Float> tx = new ArrayList<>();
+		List<Float> ty = new ArrayList<>();
 		List<Double> angles = new ArrayList<>();
 		List<Double> distances = new ArrayList<>();
-		
+		List<GeometryWayStyle> styles = new ArrayList<>();
+
+		private GeometryWayStyle getStyle(int index, GeometryWayStyle defaultWayStyle) {
+			List<Integer> list = new ArrayList<>(styleMap.keySet());
+			for (int i = list.size() - 1; i >= 0; i--) {
+				int c = list.get(i);
+				if (c <= index) {
+					return styleMap.get(c);
+				}
+			}
+			return defaultWayStyle;
+		}
+
+		private boolean isTransportRoute() {
+			return transportRoute != null;
+		}
+
 		public void updateRoute(RotatedTileBox tb, RouteCalculationResult route) {
 			if(tb.getMapDensity() != mapDensity || this.route != route) {
 				this.route = route;
-				if(route == null) {
+				if (route == null) {
 					locations = Collections.emptyList();
 				} else {
 					locations = route.getImmutableAllLocations();
 				}
+				styleMap = Collections.emptyMap();
+				this.mapDensity = tb.getMapDensity();
+				zooms.clear();
+			}
+		}
+
+		public void updateTransportRoute(RotatedTileBox tb, TransportRouteResult route) {
+			if (tb.getMapDensity() != mapDensity || this.transportRoute != route) {
+				this.transportRoute = route;
+				if (route == null) {
+					locations = Collections.emptyList();
+					styleMap = Collections.emptyMap();
+				} else {
+					LatLon start = transportHelper.getStartLocation();
+					LatLon end = transportHelper.getEndLocation();
+					List<Way> list = new ArrayList<>();
+					List<GeometryWayStyle> styles = new ArrayList<>();
+					calculateTransportResult(start, end, route, list, styles);
+					List<Location> locs = new ArrayList<>();
+					Map<Integer, GeometryWayStyle> stlMap = new TreeMap<>();
+					int i = 0;
+					int k = 0;
+					if (list.size() > 0) {
+						for (Way w : list) {
+							stlMap.put(k, styles.get(i++));
+							for (Node n : w.getNodes()) {
+								Location ln = new Location("");
+								ln.setLatitude(n.getLatitude());
+								ln.setLongitude(n.getLongitude());
+								locs.add(ln);
+								k++;
+							}
+						}
+					}
+					locations = locs;
+					styleMap = stlMap;
+				}
 				this.mapDensity = tb.getMapDensity();
 				zooms.clear();
 			}
@@ -452,14 +889,16 @@ public class RouteLayer extends OsmandMapLayer {
 			TByteArrayList simplification = geometryZoom.getSimplifyPoints();
 			List<Double> odistances = geometryZoom.getDistances();
 			
-
-			
 			clearArrays();
+			GeometryWayStyle defaultWayStyle = isTransportRoute() ?
+					new GeometryWalkWayStyle(wayContext) :
+					new GeometrySolidWayStyle(wayContext, attrs.paint.getColor());
+			GeometryWayStyle style = defaultWayStyle;
 			boolean previousVisible = false;
 			if (lastProjection != null) {
 				if (leftLongitude <= lastProjection.getLongitude() && lastProjection.getLongitude() <= rightLongitude
 						&& bottomLatitude <= lastProjection.getLatitude() && lastProjection.getLatitude() <= topLatitude) {
-					addLocation(tb, lastProjection, tx, ty, angles, distances, 0);
+					addLocation(tb, lastProjection, style, tx, ty, angles, distances, 0, styles);
 					previousVisible = true;
 				}
 			}
@@ -467,7 +906,8 @@ public class RouteLayer extends OsmandMapLayer {
 			int previous = -1;
 			for (int i = currentRoute; i < routeNodes.size(); i++) {
 				Location ls = routeNodes.get(i);
-				if(simplification.getQuick(i) == 0) {
+				style = getStyle(i, defaultWayStyle);
+				if (simplification.getQuick(i) == 0 && !styleMap.containsKey(i)) {
 					continue;
 				}
 				if (leftLongitude <= ls.getLongitude() && ls.getLongitude() <= rightLongitude && bottomLatitude <= ls.getLatitude()
@@ -481,23 +921,23 @@ public class RouteLayer extends OsmandMapLayer {
 						} else if (lastProjection != null) {
 							lt = lastProjection;
 						}
-						addLocation(tb, lt, tx, ty, angles, distances, 0); // first point
+						addLocation(tb, lt, style, tx, ty, angles, distances, 0, styles); // first point
 					}
-					addLocation(tb, ls, tx, ty, angles, distances, dist);
+					addLocation(tb, ls, style, tx, ty, angles, distances, dist, styles);
 					previousVisible = true;
 				} else if (previousVisible) {
-					addLocation(tb, ls, tx, ty, angles, distances, previous == -1 ? 0 : odistances.get(i));
+					addLocation(tb, ls, style, tx, ty, angles, distances, previous == -1 ? 0 : odistances.get(i), styles);
 					double distToFinish = 0;
 					for(int ki = i + 1; ki < odistances.size(); ki++) {
 						distToFinish += odistances.get(ki);
 					}
-					drawRouteSegment(tb, canvas, tx, ty, angles, distances, distToFinish);
+					drawRouteSegment(tb, canvas, tx, ty, angles, distances, distToFinish, styles);
 					previousVisible = false;
 					clearArrays();
 				}
 				previous = i;
 			}
-			drawRouteSegment(tb, canvas, tx, ty, angles, distances, 0);
+			drawRouteSegment(tb, canvas, tx, ty, angles, distances, 0, styles);
 		}
 
 		private void clearArrays() {
@@ -505,10 +945,11 @@ public class RouteLayer extends OsmandMapLayer {
 			ty.clear();
 			distances.clear();
 			angles.clear();
+			styles.clear();
 		}
 
-		private void addLocation(RotatedTileBox tb, Location ls, TIntArrayList tx, TIntArrayList ty, 
-				List<Double> angles, List<Double> distances, double dist) {
+		private void addLocation(RotatedTileBox tb, Location ls, GeometryWayStyle style, List<Float> tx, List<Float> ty,
+				List<Double> angles, List<Double> distances, double dist, List<GeometryWayStyle> styles) {
 			float x = tb.getPixXFromLatLon(ls.getLatitude(), ls.getLongitude());
 			float y = tb.getPixYFromLatLon(ls.getLatitude(), ls.getLongitude());
 			float px = x;
@@ -527,27 +968,45 @@ public class RouteLayer extends OsmandMapLayer {
 			if(dist != 0) {
 				distSegment = dist;
 			}
-			tx.add((int) x);
-			ty.add((int) y);
+			tx.add(x);
+			ty.add(y);
 			angles.add(angle);
 			distances.add(distSegment);
+			styles.add(style);
 		}
 	}
 	
-	RouteSimplificationGeometry routeGeometry  = new RouteSimplificationGeometry();
+	private RouteSimplificationGeometry routeGeometry  = new RouteSimplificationGeometry();
 	
-	private void drawRouteSegment(RotatedTileBox tb, Canvas canvas, TIntArrayList tx, TIntArrayList ty,
-			List<Double> angles, List<Double> distances, double distToFinish) {
-		if(tx.size() < 2) {
+	private void drawRouteSegment(RotatedTileBox tb, Canvas canvas, List<Float> tx, List<Float> ty,
+			List<Double> angles, List<Double> distances, double distToFinish, List<GeometryWayStyle> styles) {
+		if (tx.size() < 2) {
 			return;
 		}
 		try {
-			path.reset();
+			List<Pair<Path, GeometryWayStyle>> paths = new ArrayList<>();
 			canvas.rotate(-tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY());
-			calculatePath(tb, tx, ty, path);
-			attrs.drawPath(canvas, path);
-			if (tb.getZoomAnimation() == 0) {
-				drawArrowsOverPath(canvas, tb, tx, ty, angles, distances, coloredArrowUp, distToFinish);
+			calculatePath(tb, tx, ty, styles, paths);
+			for (Pair<Path, GeometryWayStyle> pc : paths) {
+				GeometryWayStyle style = pc.second;
+				if (style.hasPathLine()) {
+					if (style.isTransportLine()) {
+						attrsPT.customColor = style.getStrokeColor();
+						attrsPT.customColorPaint.setStrokeWidth(attrsPT.paint2.getStrokeWidth());
+						attrsPT.drawPath(canvas, pc.first);
+						attrsPT.customColorPaint.setStrokeWidth(attrsPT.paint.getStrokeWidth());
+						attrsPT.customColor = style.getColor();
+						attrsPT.drawPath(canvas, pc.first);
+					} else {
+						attrs.customColor = style.getColor();
+						attrs.drawPath(canvas, pc.first);
+					}
+				}
+			}
+			attrs.customColor = 0;
+			attrsPT.customColor = 0;
+			if (!view.isAnimatingZoom()) {
+				drawArrowsOverPath(canvas, tb, tx, ty, angles, distances, distToFinish, styles);
 			}
 		} finally {
 			canvas.rotate(tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY());
@@ -555,16 +1014,32 @@ public class RouteLayer extends OsmandMapLayer {
 	}
 	
 	public void drawLocations(RotatedTileBox tb, Canvas canvas, double topLatitude, double leftLongitude, double bottomLatitude, double rightLongitude) {
-		RouteCalculationResult route = helper.getRoute();
-		routeGeometry.updateRoute(tb, route);
-		routeGeometry.drawSegments(tb, canvas, topLatitude, leftLongitude, bottomLatitude, rightLongitude, 
-				helper.getLastProjection(), route == null ? 0 : route.getCurrentRoute());
-		List<RouteDirectionInfo> rd = helper.getRouteDirections();
-		Iterator<RouteDirectionInfo> it = rd.iterator();
-		if (tb.getZoom() >= 14) {
-			List<Location> actionPoints = calculateActionPoints(topLatitude, leftLongitude, bottomLatitude, rightLongitude, helper.getLastProjection(),
-					helper.getRoute().getRouteLocations(), helper.getRoute().getCurrentRoute(), it, tb.getZoom());
-			drawAction(tb, canvas, actionPoints);
+		if (helper.isPublicTransportMode()) {
+			int currentRoute = transportHelper.getCurrentRoute();
+			List<TransportRouteResult> routes = transportHelper.getRoutes();
+			TransportRouteResult route = routes != null && routes.size() > currentRoute ? routes.get(currentRoute) : null;
+			routeGeometry.updateRoute(tb, null);
+			routeGeometry.updateTransportRoute(tb, route);
+			if (route != null) {
+				LatLon start = transportHelper.getStartLocation();
+				Location startLocation = new Location("transport");
+				startLocation.setLatitude(start.getLatitude());
+				startLocation.setLongitude(start.getLongitude());
+				routeGeometry.drawSegments(tb, canvas, topLatitude, leftLongitude, bottomLatitude, rightLongitude, startLocation, 0);
+			}
+		} else {
+			RouteCalculationResult route = helper.getRoute();
+			routeGeometry.updateTransportRoute(tb, null);
+			routeGeometry.updateRoute(tb, route);
+			routeGeometry.drawSegments(tb, canvas, topLatitude, leftLongitude, bottomLatitude, rightLongitude,
+					helper.getLastProjection(), route == null ? 0 : route.getCurrentRoute());
+			List<RouteDirectionInfo> rd = helper.getRouteDirections();
+			Iterator<RouteDirectionInfo> it = rd.iterator();
+			if (tb.getZoom() >= 14) {
+				List<Location> actionPoints = calculateActionPoints(topLatitude, leftLongitude, bottomLatitude, rightLongitude, helper.getLastProjection(),
+						helper.getRoute().getRouteLocations(), helper.getRoute().getCurrentRoute(), it, tb.getZoom());
+				drawAction(tb, canvas, actionPoints);
+			}
 		}
 	}
 	
@@ -710,7 +1185,137 @@ public class RouteLayer extends OsmandMapLayer {
 		return false;
 	}
 
+	private void calculateTransportResult(LatLon start, LatLon end, TransportRouteResult r, List<Way> res, List<GeometryWayStyle> styles) {
+		if (r != null) {
+			LatLon p = start;
+			TransportRouteResultSegment prev = null;
+			for (TransportRouteResultSegment s : r.getSegments()) {
+				LatLon floc = s.getStart().getLocation();
+				addRouteWalk(prev, s, p, floc, res, styles);
+				List<Way> geometry = s.getGeometry();
+				res.addAll(geometry);
+				addStyle(s, geometry.size(), styles);
+				p = s.getEnd().getLocation();
+				prev = s;
+			}
+			addRouteWalk(prev, null, p, end, res, styles);
+		}
+	}
 
-	
+	private void addRouteWalk(TransportRouteResultSegment s1, TransportRouteResultSegment s2,
+							  LatLon start, LatLon end, List<Way> res, List<GeometryWayStyle> styles) {
+		final RouteCalculationResult walkingRouteSegment = transportHelper.getWalkingRouteSegment(s1, s2);
+		if (walkingRouteSegment != null && walkingRouteSegment.getRouteLocations().size() > 0) {
+			final List<Location> routeLocations = walkingRouteSegment.getRouteLocations();
+			Way way = new Way(-1);
+			way.putTag(OSMSettings.OSMTagKey.NAME.getValue(), String.format(Locale.US, "Walk %d m", walkingRouteSegment.getWholeDistance()));
+			for (Location l : routeLocations) {
+				way.addNode(new Node(l.getLatitude(), l.getLongitude(), -1));
+			}
+			res.add(way);
+			addStyle(null, 1, styles);
+		} else {
+			double dist = MapUtils.getDistance(start, end);
+			Way way = new Way(-1);
+			way.putTag(OSMSettings.OSMTagKey.NAME.getValue(), String.format(Locale.US, "Walk %.1f m", dist));
+			way.addNode(new Node(start.getLatitude(), start.getLongitude(), -1));
+			way.addNode(new Node(end.getLatitude(), end.getLongitude(), -1));
+			res.add(way);
+			addStyle(null, 1, styles);
+		}
+	}
 
+	private void addStyle(TransportRouteResultSegment segment, int count, List<GeometryWayStyle> styles) {
+		GeometryWayStyle style;
+		if (segment == null || segment.route == null) {
+			style = new GeometryWalkWayStyle(wayContext);
+		} else {
+			style = new GeometryTransportWayStyle(wayContext, segment);
+		}
+		for (int i = 0; i < count; i++) {
+			styles.add(style);
+		}
+	}
+
+	private int getRadiusPoi(RotatedTileBox tb){
+		final double zoom = tb.getZoom();
+		int r;
+		if(zoom <= 15) {
+			r = 8;
+		} else if(zoom <= 16) {
+			r = 10;
+		} else if(zoom <= 17) {
+			r = 14;
+		} else {
+			r = 18;
+		}
+		return (int) (r * tb.getDensity());
+	}
+
+	private void getFromPoint(RotatedTileBox tb, PointF point, List<? super TransportStop> res) {
+		int ex = (int) point.x;
+		int ey = (int) point.y;
+		final int rp = getRadiusPoi(tb);
+		int radius = rp * 3 / 2;
+		try {
+			for (int i = 0; i < routeTransportStops.size(); i++) {
+				TransportStop n = routeTransportStops.get(i);
+				if (n.getLocation() == null) {
+					continue;
+				}
+				int x = (int) tb.getPixXFromLatLon(n.getLocation().getLatitude(), n.getLocation().getLongitude());
+				int y = (int) tb.getPixYFromLatLon(n.getLocation().getLatitude(), n.getLocation().getLongitude());
+				if (Math.abs(x - ex) <= radius && Math.abs(y - ey) <= radius) {
+					radius = rp;
+					res.add(n);
+				}
+			}
+		} catch (IndexOutOfBoundsException e) {
+			// ignore
+		}
+	}
+
+	@Override
+	public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> res, boolean unknownLocation) {
+		if (routeTransportStops.size() > 0) {
+			getFromPoint(tileBox, point, res);
+		}
+	}
+
+	@Override
+	public LatLon getObjectLocation(Object o) {
+		if (o instanceof TransportStop){
+			return ((TransportStop)o).getLocation();
+		}
+		return null;
+	}
+
+	@Override
+	public PointDescription getObjectName(Object o) {
+		if (o instanceof TransportStop){
+			return new PointDescription(PointDescription.POINT_TYPE_TRANSPORT_STOP, view.getContext().getString(R.string.transport_Stop),
+					((TransportStop)o).getName());
+		}
+		return null;
+	}
+
+	@Override
+	public boolean disableSingleTap() {
+		return false;
+	}
+
+	@Override
+	public boolean disableLongPressOnMap() {
+		return false;
+	}
+
+	@Override
+	public boolean isObjectClickable(Object o) {
+		return false;
+	}
+
+	@Override
+	public boolean runExclusiveAction(@Nullable Object o, boolean unknownLocation) {
+		return false;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/RulerControlLayer.java b/OsmAnd/src/net/osmand/plus/views/RulerControlLayer.java
index 7a7af6063e..b1b232618e 100644
--- a/OsmAnd/src/net/osmand/plus/views/RulerControlLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/RulerControlLayer.java
@@ -27,8 +27,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.util.MapUtils;
 
 import java.util.ArrayList;
-
-import gnu.trove.list.array.TIntArrayList;
+import java.util.List;
 
 public class RulerControlLayer extends OsmandMapLayer {
 
@@ -68,8 +67,8 @@ public class RulerControlLayer extends OsmandMapLayer {
 	private boolean touched;
 	private boolean wasZoom;
 
-	private TIntArrayList tx = new TIntArrayList();
-	private TIntArrayList ty = new TIntArrayList();
+	private List<Float> tx = new ArrayList<>();
+	private List<Float> ty = new ArrayList<>();
 	private Path linePath = new Path();
 
 	private Bitmap centerIconDay;
@@ -181,12 +180,13 @@ public class RulerControlLayer extends OsmandMapLayer {
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
 		if (rulerModeOn()) {
-			lineAttrs.updatePaints(view, settings, tb);
-			lineFontAttrs.updatePaints(view, settings, tb);
+			OsmandApplication app = view.getApplication();
+			lineAttrs.updatePaints(app, settings, tb);
+			lineFontAttrs.updatePaints(app, settings, tb);
 			lineFontAttrs.paint.setStyle(Style.FILL);
-			circleAttrs.updatePaints(view, settings, tb);
+			circleAttrs.updatePaints(app, settings, tb);
 			circleAttrs.paint2.setStyle(Style.FILL);
-			circleAttrsAlt.updatePaints(view, settings, tb);
+			circleAttrsAlt.updatePaints(app, settings, tb);
 			circleAttrsAlt.paint2.setStyle(Style.FILL);
 			final QuadPoint center = tb.getCenterPixelPoint();
 			final RulerMode mode = app.getSettings().RULER_MODE.get();
@@ -308,15 +308,15 @@ public class RulerControlLayer extends OsmandMapLayer {
 	private void drawDistBetweenFingerAndLocation(Canvas canvas, RotatedTileBox tb, Location currLoc, boolean night) {
 		float x = tb.getPixXFromLatLon(touchPointLatLon.getLatitude(), touchPointLatLon.getLongitude());
 		float y = tb.getPixYFromLatLon(touchPointLatLon.getLatitude(), touchPointLatLon.getLongitude());
-		int currX = (int) tb.getPixXFromLatLon(currLoc.getLatitude(), currLoc.getLongitude());
-		int currY = (int) tb.getPixYFromLatLon(currLoc.getLatitude(), currLoc.getLongitude());
+		float currX = tb.getPixXFromLatLon(currLoc.getLatitude(), currLoc.getLongitude());
+		float currY = tb.getPixYFromLatLon(currLoc.getLatitude(), currLoc.getLongitude());
 
 		linePath.reset();
-		tx.reset();
-		ty.reset();
+		tx.clear();
+		ty.clear();
 
-		tx.add((int) x);
-		ty.add((int) y);
+		tx.add(x);
+		ty.add(y);
 		tx.add(currX);
 		ty.add(currY);
 
diff --git a/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java b/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java
index 831df51025..2da704414b 100644
--- a/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java
@@ -23,9 +23,9 @@ import net.osmand.data.TransportStop;
 import net.osmand.osm.edit.Node;
 import net.osmand.osm.edit.Way;
 import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.render.RenderingIcons;
 import net.osmand.plus.transport.TransportStopRoute;
-import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.transport.TransportStopType;
 
 import java.util.ArrayList;
@@ -34,8 +34,6 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.TreeSet;
 
-import gnu.trove.list.array.TIntArrayList;
-
 public class TransportStopsLayer extends OsmandMapLayer implements ContextMenuLayer.IContextMenuProvider {
 	private static final int startZoom = 12;
 	private static final int startZoomRoute = 10;
@@ -196,18 +194,18 @@ public class TransportStopsLayer extends OsmandMapLayer implements ContextMenuLa
 				objects = stopRoute.route.getForwardStops();
 				int color = stopRoute.getColor(mapActivity.getMyApplication(), settings.isNightMode());
 				attrs.paint.setColor(color);
-				attrs.updatePaints(view, settings, tb);
+				attrs.updatePaints(view.getApplication(), settings, tb);
 				try {
 					path.reset();
 					List<Way> ws = stopRoute.route.getForwardWays();
 					if (ws != null) {
 						for (Way w : ws) {
-							TIntArrayList tx = new TIntArrayList();
-							TIntArrayList ty = new TIntArrayList();
+							List<Float> tx = new ArrayList<>();
+							List<Float> ty = new ArrayList<>();
 							for (int i = 0; i < w.getNodes().size(); i++) {
 								Node o = w.getNodes().get(i);
-								int x = (int) tb.getPixXFromLatLon(o.getLatitude(), o.getLongitude());
-								int y = (int) tb.getPixYFromLatLon(o.getLatitude(), o.getLongitude());
+								float x = tb.getPixXFromLatLon(o.getLatitude(), o.getLongitude());
+								float y = tb.getPixYFromLatLon(o.getLatitude(), o.getLongitude());
 								tx.add(x);
 								ty.add(y);
 							}
diff --git a/OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java b/OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java
index b9df08a3ba..0ab039449f 100644
--- a/OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java
+++ b/OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java
@@ -591,9 +591,17 @@ public class TurnPathHelper {
 			}
 		} else if (turnIndex == SECOND_TURN) {
 			if (TurnType.isLeftTurn(firstTurnType) && TurnType.isLeftTurn(secondTurnType)) {
-				turnResource = null;
+				if (TurnType.isSlightTurn(firstTurnType)) {
+					turnResource = new TurnResource(secondTurnType, true, false, leftSide);
+				} else {
+					turnResource = null;
+				}
 			} else if (TurnType.isRightTurn(firstTurnType) && TurnType.isRightTurn(secondTurnType)) {
-				turnResource = null;
+				if (TurnType.isSlightTurn(firstTurnType)) {
+					turnResource = new TurnResource(secondTurnType, true, false, leftSide);
+				} else {
+					turnResource = null;
+				}
 			} else if (firstTurnType == TurnType.C || thirdTurnType == TurnType.C) {
 				// get the small one
 				turnResource = new TurnResource(secondTurnType, true, false, leftSide);
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index a5376dd5eb..0db11e6b87 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -36,7 +36,7 @@ import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.WaypointDialogHelper;
 import net.osmand.plus.helpers.WaypointHelper;
 import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
-import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
+import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
 import net.osmand.plus.routing.RouteDirectionInfo;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
@@ -274,6 +274,7 @@ public class MapInfoWidgetsFactory {
 
 		boolean refreshBtnVisible = false;
 		boolean saveViewVisible = false;
+		boolean textBtnVisible = false;
 		protected boolean topBarSwitchVisible = false;
 		protected boolean topBarSwitchChecked = false;
 
@@ -293,6 +294,10 @@ public class MapInfoWidgetsFactory {
 		int descrTextClrLight = -1;
 		@ColorInt
 		int descrTextClrDark = -1;
+		@ColorInt
+		int textBtnTitleClrLight = -1;
+		@ColorInt
+		int textBtnTitleClrDark = -1;
 
 		boolean singleLineTitle = true;
 
@@ -300,6 +305,7 @@ public class MapInfoWidgetsFactory {
 
 		String title = "";
 		String description = null;
+		String textBtnTitle = null;
 
 		int saveViewTextId = -1;
 
@@ -308,6 +314,7 @@ public class MapInfoWidgetsFactory {
 		OnClickListener onCloseButtonClickListener;
 		OnClickListener onRefreshButtonClickListener;
 		OnClickListener onSaveViewClickListener;
+		OnClickListener onTextBtnClickListener;
 		OnCheckedChangeListener onSwitchCheckedChangeListener;
 
 		Runnable onCloseToolbarListener;
@@ -412,6 +419,14 @@ public class MapInfoWidgetsFactory {
 			this.saveViewTextId = id;
 		}
 
+		public void setTextBtnVisible(boolean visible) {
+			this.textBtnVisible = visible;
+		}
+
+		public void setTextBtnTitle(String title) {
+			this.textBtnTitle = title;
+		}
+
 		public void setTopBarSwitchVisible(boolean visible) {
 			this.topBarSwitchVisible = visible;
 		}
@@ -440,6 +455,11 @@ public class MapInfoWidgetsFactory {
 			this.descrTextClrDark = descrTextClrDark;
 		}
 
+		public void setTextBtnTitleClrs(int textBtnTitleClrLight, int textBtnTitleClrDark) {
+			this.textBtnTitleClrLight = textBtnTitleClrLight;
+			this.textBtnTitleClrDark = textBtnTitleClrDark;
+		}
+
 		public void setOnBackButtonClickListener(OnClickListener onBackButtonClickListener) {
 			this.onBackButtonClickListener = onBackButtonClickListener;
 		}
@@ -456,6 +476,10 @@ public class MapInfoWidgetsFactory {
 			this.onSaveViewClickListener = onSaveViewClickListener;
 		}
 
+		public void setOnTextBtnClickListener(OnClickListener onTextBtnClickListener) {
+			this.onTextBtnClickListener = onTextBtnClickListener;
+		}
+
 		public void setOnSwitchCheckedChangeListener(OnCheckedChangeListener onSwitchCheckedChangeListener) {
 			this.onSwitchCheckedChangeListener = onSwitchCheckedChangeListener;
 		}
@@ -519,6 +543,7 @@ public class MapInfoWidgetsFactory {
 		private ImageButton refreshButton;
 		private ImageButton closeButton;
 		private TextView saveView;
+		private TextView textBtn;
 		private SwitchCompat topBarSwitch;
 		private View shadowView;
 		private boolean nightMode;
@@ -535,6 +560,7 @@ public class MapInfoWidgetsFactory {
 			closeButton = (ImageButton) map.findViewById(R.id.widget_top_bar_close_button);
 			titleView = (TextView) map.findViewById(R.id.widget_top_bar_title);
 			saveView = (TextView) map.findViewById(R.id.widget_top_bar_save);
+			textBtn = (TextView) map.findViewById(R.id.widget_top_bar_text_btn);
 			descrView = (TextView) map.findViewById(R.id.widget_top_bar_description);
 			topBarSwitch = (SwitchCompat) map.findViewById(R.id.widget_top_bar_switch);
 			shadowView = map.findViewById(R.id.widget_top_bar_shadow);
@@ -653,6 +679,7 @@ public class MapInfoWidgetsFactory {
 			closeButton.setOnClickListener(controller.onCloseButtonClickListener);
 			refreshButton.setOnClickListener(controller.onRefreshButtonClickListener);
 			saveView.setOnClickListener(controller.onSaveViewClickListener);
+			textBtn.setOnClickListener(controller.onTextBtnClickListener);
 			topBarSwitch.setOnCheckedChangeListener(controller.onSwitchCheckedChangeListener);
 		}
 
@@ -690,6 +717,7 @@ public class MapInfoWidgetsFactory {
 			int titleTextClrId = nightMode ? controller.titleTextClrDarkId : controller.titleTextClrLightId;
 			int descrTextClr = nightMode ? controller.descrTextClrDark : controller.descrTextClrLight;
 			int descrTextClrId = nightMode ? controller.descrTextClrDarkId : controller.descrTextClrLightId;
+			int textBtnTitleClr = nightMode ? controller.textBtnTitleClrDark : controller.textBtnTitleClrLight;
 
 			if (bg != null) {
 				topBarLayout.setBackgroundDrawable(bg);
@@ -720,6 +748,9 @@ public class MapInfoWidgetsFactory {
 			titleView.setTextColor(titleColor);
 			descrView.setTextColor(descrColor);
 			saveView.setTextColor(titleColor);
+			if (textBtnTitleClr != -1) {
+				textBtn.setTextColor(textBtnTitleClr);
+			}
 
 			titleView.setSingleLine(controller.singleLineTitle);
 
@@ -748,6 +779,15 @@ public class MapInfoWidgetsFactory {
 			} else if (saveView.getVisibility() == View.VISIBLE) {
 				saveView.setVisibility(View.GONE);
 			}
+			if (controller.textBtnVisible) {
+				textBtn.setText(controller.textBtnTitle);
+				textBtn.setContentDescription(controller.textBtnTitle);
+				if (textBtn.getVisibility() == View.GONE) {
+					textBtn.setVisibility(View.VISIBLE);
+				}
+			} else if (textBtn.getVisibility() == View.VISIBLE) {
+				textBtn.setVisibility(View.GONE);
+			}
 		}
 
 		public void updateColors() {
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidgetsFactory.java
index d09e8e0b97..bed59baf1f 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidgetsFactory.java
@@ -14,9 +14,8 @@ import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.dashboard.DashLocationFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
-import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
+import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
 import net.osmand.plus.mapmarkers.MapMarkersDialogFragment;
 import net.osmand.plus.views.AnimateDraggingMapThread;
 import net.osmand.plus.views.DirectionDrawable;
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index 7d4e43b4a0..fa5676abf6 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -45,13 +45,14 @@ public class MapWidgetRegistry {
 	private Set<MapWidgetRegInfo> leftWidgetSet = new TreeSet<>();
 	private Set<MapWidgetRegInfo> rightWidgetSet = new TreeSet<>();
 	private Map<ApplicationMode, Set<String>> visibleElementsFromSettings = new LinkedHashMap<>();
+	private final OsmandApplication app;
 	private final OsmandSettings settings;
 
+	public MapWidgetRegistry(OsmandApplication app) {
+		this.app = app;
+		this.settings = app.getSettings();
 
-	public MapWidgetRegistry(OsmandSettings settings) {
-		this.settings = settings;
-
-		for (ApplicationMode ms : ApplicationMode.values(settings)) {
+		for (ApplicationMode ms : ApplicationMode.values(app)) {
 			String mpf = settings.MAP_INFO_CONTROLS.getModeValue(ms);
 			if (mpf.equals(SHOW_PREFIX)) {
 				visibleElementsFromSettings.put(ms, null);
@@ -193,9 +194,9 @@ public class MapWidgetRegistry {
 	}
 
 	private void processVisibleModes(String key, MapWidgetRegInfo ii) {
-		for (ApplicationMode ms : ApplicationMode.values(settings)) {
+		for (ApplicationMode ms : ApplicationMode.values(app)) {
 			boolean collapse = ms.isWidgetCollapsible(key);
-			boolean def = ms.isWidgetVisible(key);
+			boolean def = ms.isWidgetVisible(app, key);
 			Set<String> set = visibleElementsFromSettings.get(ms);
 			if (set != null) {
 				if (set.contains(key)) {
@@ -288,7 +289,7 @@ public class MapWidgetRegistry {
 		for (MapWidgetRegInfo ri : set) {
 			ri.visibleCollapsible.remove(mode);
 			ri.visibleModes.remove(mode);
-			if (mode.isWidgetVisible(ri.key)) {
+			if (mode.isWidgetVisible(app, ri.key)) {
 				if (mode.isWidgetCollapsible(ri.key)) {
 					ri.visibleCollapsible.add(mode);
 				} else {
@@ -457,7 +458,7 @@ public class MapWidgetRegistry {
 	private void addControls(final MapActivity mapActivity, final ContextMenuAdapter contextMenuAdapter,
 							 Set<MapWidgetRegInfo> groupTitle, final ApplicationMode mode) {
 		for (final MapWidgetRegInfo r : groupTitle) {
-			if (!mode.isWidgetAvailable(r.key)) {
+			if (!mode.isWidgetAvailable(app, r.key)) {
 				continue;
 			}
 
@@ -484,7 +485,7 @@ public class MapWidgetRegistry {
 							MenuInflater inflater = popup.getMenuInflater();
 							final Menu menu = popup.getMenu();
 							inflater.inflate(R.menu.widget_visibility_menu, menu);
-							UiUtilities ic = mapActivity.getMyApplication().getUIUtilities();
+							UiUtilities ic = app.getUIUtilities();
 							menu.findItem(R.id.action_show).setIcon(ic.getThemedIcon(R.drawable.ic_action_view));
 							menu.findItem(R.id.action_hide).setIcon(ic.getThemedIcon(R.drawable.ic_action_hide));
 							menu.findItem(R.id.action_collapse).setIcon(ic.getThemedIcon(R.drawable.ic_action_widget_collapse));
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
index 0edd5072d6..d82fc5ded4 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
@@ -41,7 +41,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.MapViewTrackingUtilities;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.WaypointHelper;
-import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
+import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
 import net.osmand.plus.routing.AlarmInfo;
 import net.osmand.plus.routing.AlarmInfo.AlarmInfoType;
 import net.osmand.plus.routing.RouteCalculationResult.NextDirectionInfo;
@@ -1180,8 +1180,6 @@ public class RouteInfoWidgetsFactory {
 			// update cache
 			if (view.isZooming()) {
 				visible = false;
-			} else if (!orientationPortrait && ma.getRoutingHelper().isRoutePlanningMode()) {
-				visible = false;
 			} else if (!tb.isZoomAnimated() && (tb.getZoom() != cacheRulerZoom || Math.abs(tb.getCenterTileX() - cacheRulerTileX) > 1 || Math
 					.abs(tb.getCenterTileY() - cacheRulerTileY) > 1 || mapDensity.get() != cacheMapDensity) &&
 					tb.getPixWidth() > 0 && maxWidth > 0) {
diff --git a/OsmAnd/src/net/osmand/plus/widgets/FlowLayout.java b/OsmAnd/src/net/osmand/plus/widgets/FlowLayout.java
new file mode 100644
index 0000000000..2c19103613
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/widgets/FlowLayout.java
@@ -0,0 +1,118 @@
+package net.osmand.plus.widgets;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+
+public class FlowLayout extends ViewGroup {
+
+	private int line_height;
+
+	public static class LayoutParams extends ViewGroup.LayoutParams {
+
+		public final int horizontal_spacing;
+		public final int vertical_spacing;
+
+		/**
+		 * @param horizontal_spacing Pixels between items, horizontally
+		 * @param vertical_spacing   Pixels between items, vertically
+		 */
+		public LayoutParams(int horizontal_spacing, int vertical_spacing) {
+			super(0, 0);
+			this.horizontal_spacing = horizontal_spacing;
+			this.vertical_spacing = vertical_spacing;
+		}
+	}
+
+	public FlowLayout(Context context) {
+		super(context);
+	}
+
+	public FlowLayout(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+		assert (MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.UNSPECIFIED);
+
+		final int width = MeasureSpec.getSize(widthMeasureSpec) - getPaddingLeft() - getPaddingRight();
+		int height = MeasureSpec.getSize(heightMeasureSpec) - getPaddingTop() - getPaddingBottom();
+		final int count = getChildCount();
+		int line_height = 0;
+
+		int xpos = getPaddingLeft();
+		int ypos = getPaddingTop();
+
+		int childHeightMeasureSpec;
+		if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.AT_MOST) {
+			childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST);
+		} else {
+			childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
+		}
+
+
+		for (int i = 0; i < count; i++) {
+			final View child = getChildAt(i);
+			if (child.getVisibility() != GONE) {
+				final LayoutParams lp = (LayoutParams) child.getLayoutParams();
+				child.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST), childHeightMeasureSpec);
+				final int childw = child.getMeasuredWidth();
+				line_height = Math.max(line_height, child.getMeasuredHeight() + lp.vertical_spacing);
+
+				if (xpos + childw > width) {
+					xpos = getPaddingLeft();
+					ypos += line_height;
+				}
+
+				xpos += childw + lp.horizontal_spacing;
+			}
+		}
+		this.line_height = line_height;
+
+		if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.UNSPECIFIED) {
+			height = ypos + line_height;
+
+		} else if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.AT_MOST) {
+			if (ypos + line_height < height) {
+				height = ypos + line_height;
+			}
+		}
+		setMeasuredDimension(width, height);
+	}
+
+	@Override
+	protected ViewGroup.LayoutParams generateDefaultLayoutParams() {
+		return new LayoutParams(1, 1); // default of 1px spacing
+	}
+
+	@Override
+	protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
+		return p instanceof LayoutParams;
+	}
+
+	@Override
+	protected void onLayout(boolean changed, int l, int t, int r, int b) {
+		final int count = getChildCount();
+		final int width = r - l;
+		int xpos = getPaddingLeft();
+		int ypos = getPaddingTop();
+
+		for (int i = 0; i < count; i++) {
+			final View child = getChildAt(i);
+			if (child.getVisibility() != GONE) {
+				final int childw = child.getMeasuredWidth();
+				final int childh = child.getMeasuredHeight();
+				final LayoutParams lp = (LayoutParams) child.getLayoutParams();
+				if (xpos + childw > width) {
+					xpos = getPaddingLeft();
+					ypos += line_height;
+				}
+				child.layout(xpos, ypos, xpos + childw, ypos + childh);
+				xpos += childw + lp.horizontal_spacing;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/widgets/ImageViewExProgress.java b/OsmAnd/src/net/osmand/plus/widgets/ImageViewExProgress.java
new file mode 100644
index 0000000000..43c7d66575
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/widgets/ImageViewExProgress.java
@@ -0,0 +1,55 @@
+package net.osmand.plus.widgets;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+
+public class ImageViewExProgress extends ImageView {
+
+	public float percent;
+	public int color1;
+	public int color2;
+
+	public ImageViewExProgress(Context context) {
+		super(context);
+	}
+
+	public ImageViewExProgress(Context context, @Nullable AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public ImageViewExProgress(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+	}
+
+	@TargetApi(21)
+	public ImageViewExProgress(Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+		super(context, attrs, defStyleAttr, defStyleRes);
+	}
+
+
+	@Override
+	public void draw(Canvas canvas) {
+		canvas.save();
+		setColorFilter(color1);
+		int width = getWidth();
+		int widthP = (int) (width * percent);
+		int height = getHeight();
+		canvas.clipRect(new Rect(0, 0, widthP, height));
+		super.draw(canvas);
+		canvas.restore();
+
+		canvas.save();
+		setColorFilter(color2);
+		int width2 = getWidth();
+		int widthP2 = (int) (width2 * percent);
+		int height2 = getHeight();
+		canvas.clipRect(new Rect(widthP2, 0, width2, height2));
+		super.draw(canvas);
+		canvas.restore();
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/widgets/TextViewExProgress.java b/OsmAnd/src/net/osmand/plus/widgets/TextViewExProgress.java
new file mode 100644
index 0000000000..46ea3511fe
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/widgets/TextViewExProgress.java
@@ -0,0 +1,49 @@
+package net.osmand.plus.widgets;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+
+public class TextViewExProgress extends TextViewEx {
+	public float percent;
+	public int color1;
+	public int color2;
+
+	public TextViewExProgress(Context context) {
+		super(context);
+	}
+
+	public TextViewExProgress(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public TextViewExProgress(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+	}
+
+	public TextViewExProgress(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+		super(context, attrs, defStyleAttr, defStyleRes);
+	}
+
+	@Override
+	public void draw(Canvas canvas) {
+		canvas.save();
+		setTextColor(color1);
+		int width = getWidth();
+		int widthP = (int) (width * percent);
+		int height = getHeight();
+		canvas.clipRect(new Rect(0, 0, widthP, height));
+		super.draw(canvas);
+		canvas.restore();
+
+		canvas.save();
+		setTextColor(color2);
+		int width2 = getWidth();
+		int widthP2 = (int) (width2 * percent);
+		int height2 = getHeight();
+		canvas.clipRect(new Rect(widthP2, 0, width2, height2));
+		super.draw(canvas);
+		canvas.restore();
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/widgets/style/CustomTypefaceSpan.java b/OsmAnd/src/net/osmand/plus/widgets/style/CustomTypefaceSpan.java
new file mode 100644
index 0000000000..b679a320eb
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/widgets/style/CustomTypefaceSpan.java
@@ -0,0 +1,31 @@
+package net.osmand.plus.widgets.style;
+
+import android.graphics.Typeface;
+import android.text.TextPaint;
+import android.text.style.MetricAffectingSpan;
+
+public class CustomTypefaceSpan extends MetricAffectingSpan {
+
+	private Typeface typeface;
+
+	public CustomTypefaceSpan(Typeface typeface) {
+		this.typeface = typeface;
+	}
+
+	@Override
+	public void updateMeasureState(TextPaint p) {
+		update(p);
+	}
+
+	@Override
+	public void updateDrawState(TextPaint tp) {
+		update(tp);
+	}
+
+	private void update(TextPaint tp) {
+		Typeface old = tp.getTypeface();
+		int oldStyle = old.getStyle();
+		Typeface font = Typeface.create(typeface, oldStyle);
+		tp.setTypeface(font);
+	}
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 563ba46351..76cd4dc0e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.2.50'
+    ext.kotlin_version = '1.3.11'
     repositories {
         google()
         mavenCentral()
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         //classpath 'com.android.tools.build:gradle:2.+'
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.google.gms:google-services:3.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
diff --git a/gradle.properties b/gradle.properties
index 1a75c657f4..3bb8ab935d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,4 @@
 # for enableD8=true min sdk must be > 22
 # UPDATE: temporairly commented since gradle plugin updated to 3.1.3 and claims INSTALL_FAILED_DEXOPT is fixed
 # UPDATE 2: D8 causes problems on arm64 devices with Android 6.0 (API 23)
- android.enableD8=false
+android.enableD8=false
diff --git a/plugins/Osmand-Nautical/AndroidManifest.xml b/plugins/Osmand-Nautical/AndroidManifest.xml
index 48ce8473ba..3bd78bb43a 100644
--- a/plugins/Osmand-Nautical/AndroidManifest.xml
+++ b/plugins/Osmand-Nautical/AndroidManifest.xml
@@ -5,7 +5,7 @@
     android:versionCode="9"
     android:versionName="1.0" >
 
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="16" />
+    <uses-sdk android:targetSdkVersion="16" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
 	<supports-screens  android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" 
 	    android:xlargeScreens="true" android:anyDensity="true" />
diff --git a/plugins/Osmand-ParkingPlugin/AndroidManifest.xml b/plugins/Osmand-ParkingPlugin/AndroidManifest.xml
index 2361592b76..ad6666073e 100644
--- a/plugins/Osmand-ParkingPlugin/AndroidManifest.xml
+++ b/plugins/Osmand-ParkingPlugin/AndroidManifest.xml
@@ -4,7 +4,7 @@
     android:versionCode="9"
     android:versionName="1.0" >
 
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16" />
+    <uses-sdk android:targetSdkVersion="16" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
 	<supports-screens  android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" 
 	    android:xlargeScreens="true" android:anyDensity="true" />
diff --git a/plugins/Osmand-SRTMPlugin/AndroidManifest.xml b/plugins/Osmand-SRTMPlugin/AndroidManifest.xml
index 3b4b598a11..bcc116619c 100644
--- a/plugins/Osmand-SRTMPlugin/AndroidManifest.xml
+++ b/plugins/Osmand-SRTMPlugin/AndroidManifest.xml
@@ -4,7 +4,7 @@
     android:versionCode="9"
     android:versionName="1.0" >
 
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16" />
+    <uses-sdk android:targetSdkVersion="16" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/> 
 	<supports-screens  android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" 
 	    android:xlargeScreens="true" android:anyDensity="true" />
diff --git a/plugins/Osmand-Skimaps/AndroidManifest.xml b/plugins/Osmand-Skimaps/AndroidManifest.xml
index 569666c600..6aefafebcb 100644
--- a/plugins/Osmand-Skimaps/AndroidManifest.xml
+++ b/plugins/Osmand-Skimaps/AndroidManifest.xml
@@ -4,7 +4,7 @@
     android:versionCode="9"
     android:versionName="1.0" >
 
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="16" />
+    <uses-sdk android:targetSdkVersion="16" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
 	<supports-screens  android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" 
 	    android:xlargeScreens="true" android:anyDensity="true" />