Merge branch 'master' into jpn_translit

OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java

@@ -1,26 +1,5 @@
 
-package net.osmand.plus;
-
-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.LocationPoint;
-import net.osmand.data.PointDescription;
-import net.osmand.data.RotatedTileBox;
-import net.osmand.plus.views.Renderable;
-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;
+package net.osmand;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -48,10 +27,19 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Stack;
 import java.util.TimeZone;
 
+import net.osmand.data.QuadRect;
+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;
+
 public class GPXUtilities {
 	public final static Log log = PlatformUtil.getLog(GPXUtilities.class);
 
@@ -63,6 +51,47 @@ public class GPXUtilities {
 	private final static NumberFormat decimalFormat = new DecimalFormat("#.###", new DecimalFormatSymbols(
 			new Locale("EN", "US")));
 
+	public enum GPXColor {
+		BLACK(0xFF000000),
+		DARKGRAY(0xFF444444),
+		GRAY(0xFF888888),
+		LIGHTGRAY(0xFFCCCCCC),
+		WHITE(0xFFFFFFFF),
+		RED(0xFFFF0000),
+		GREEN(0xFF00FF00),
+		BLUE(0xFF0000FF),
+		YELLOW(0xFFFFFF00),
+		CYAN(0xFF00FFFF),
+		MAGENTA(0xFFFF00FF),
+		AQUA(0xFF00FFFF),
+		FUCHSIA(0xFFFF00FF),
+		DARKGREY(0xFF444444),
+		GREY(0xFF888888),
+		LIGHTGREY(0xFFCCCCCC),
+		LIME(0xFF00FF00),
+		MAROON(0xFF800000),
+		NAVY(0xFF000080),
+		OLIVE(0xFF808000),
+		PURPLE(0xFF800080),
+		SILVER(0xFFC0C0C0),
+		TEAL(0xFF008080);
+
+		int color;
+
+		GPXColor(int color) {
+			this.color = color;
+		}
+
+		public static GPXColor getColorFromName(String s) {
+			for (GPXColor c : values()) {
+				if (c.name().equalsIgnoreCase(s)) {
+					return c;
+				}
+			}
+			return null;
+		}
+	}
+
 	public static class GPXExtensions {
 		Map<String, String> extensions = null;
 
@@ -73,8 +102,7 @@ public class GPXUtilities {
 			return extensions;
 		}
 
-		@ColorInt
-		public int getColor(@ColorInt int defColor) {
+		public int getColor(int defColor) {
 			String clrValue = null;
 			if (extensions != null) {
 				clrValue = extensions.get("color");
@@ -84,15 +112,11 @@ public class GPXUtilities {
 				if (clrValue == null) {
 					clrValue = extensions.get("displaycolor");
 				}
-			}
-			if (clrValue != null && clrValue.length() > 0) {
-				try {
-					return Color.parseColor(clrValue.toUpperCase());
-				} catch (IllegalArgumentException e) {
-					e.printStackTrace();
+				if (clrValue == null) {
+					clrValue = extensions.get("displaycolour");
 				}
 			}
-			return defColor;
+			return parseColor(clrValue, defColor);
 		}
 
 		public void setColor(int color) {
@@ -110,6 +134,25 @@ public class GPXUtilities {
 			return extensions;
 		}
 
+		private int parseColor(String colorString, int defColor) {
+			if (!Algorithms.isEmpty(colorString)) {
+				if (colorString.charAt(0) == '#') {
+					long color = Long.parseLong(colorString.substring(1), 16);
+					if (colorString.length() == 7) {
+						color |= 0x00000000ff000000;
+					} else if (colorString.length() != 9) {
+						return defColor;
+					}
+					return (int) color;
+				} else {
+					GPXColor c = GPXColor.getColorFromName(colorString);
+					if (c != null) {
+						return c.color;
+					}
+				}
+			}
+			return defColor;
+		}
 	}
 
 	public static class Elevation {
@@ -124,7 +167,7 @@ public class GPXUtilities {
 		public float speed;
 	}
 
-	public static class WptPt extends GPXExtensions implements LocationPoint {
+	public static class WptPt extends GPXExtensions {
 		public boolean firstPoint = false;
 		public boolean lastPoint = false;
 		public double lat;
@@ -174,27 +217,19 @@ public class GPXUtilities {
 			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;
@@ -204,7 +239,6 @@ public class GPXUtilities {
 			this.hdop = hdop;
 		}
 
-		@Override
 		public boolean isVisible() {
 			return true;
 		}
@@ -235,6 +269,10 @@ public class GPXUtilities {
 					&& Algorithms.objectEquals(other.lon, lon)
 					&& Algorithms.objectEquals(other.desc, desc);
 		}
+
+		public boolean hasLocation() {
+			return (lat != 0 && lon != 0);
+		}
 	}
 
 	public static class TrkSegment extends GPXExtensions {
@@ -242,7 +280,8 @@ public class GPXUtilities {
 
 		public List<WptPt> points = new ArrayList<>();
 
-		public List<Renderable.RenderableSegment> renders = new ArrayList<>();
+		public Object renderer;
+
 
 		public List<GPXTrackAnalysis> splitByDistance(double meters) {
 			return split(getDistanceMetric(), getTimeSplit(), meters);
@@ -258,11 +297,6 @@ public class GPXUtilities {
 			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 {
@@ -283,12 +317,10 @@ public class GPXUtilities {
 	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");
 		}
@@ -300,9 +332,9 @@ public class GPXUtilities {
 		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;
+		//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;
 
@@ -756,8 +788,8 @@ public class GPXUtilities {
 	}
 
 	private static void splitSegment(SplitMetric metric, SplitMetric secondaryMetric,
-			double metricLimit, List<SplitSegment> splitSegments,
-			TrkSegment segment) {
+									 double metricLimit, List<SplitSegment> splitSegments,
+									 TrkSegment segment) {
 		double currentMetricEnd = metricLimit;
 		double secondaryMetricEnd = 0;
 		SplitSegment sp = new SplitSegment(segment, 0, 0);
@@ -810,14 +842,32 @@ public class GPXUtilities {
 		private List<WptPt> points = new ArrayList<>();
 		public List<Route> routes = new ArrayList<>();
 
-		public String warning = null;
+		public Exception error = null;
 		public String path = "";
 		public boolean showCurrentTrack;
+		public boolean hasAltitude;
 		public long modifiedTime = 0;
 
 		private Track generalTrack;
 		private TrkSegment generalSegment;
 
+		public GPXFile(String author) {
+			this.author = author;
+		}
+
+		public GPXFile(String title, String lang, String description) {
+			this.metadata = new Metadata();
+			if(description != null) {
+				metadata.extensions.put("desc", description);
+			}
+			if(lang != null) {
+				metadata.extensions.put("article_lang", lang);
+			}
+			if(title != null) {
+				metadata.extensions.put("article_title", title);
+			}
+		}
+
 		public List<WptPt> getPoints() {
 			return Collections.unmodifiableList(points);
 		}
@@ -846,11 +896,11 @@ public class GPXUtilities {
 			return points.size();
 		}
 
-		boolean containsPoint(WptPt point) {
+		public boolean containsPoint(WptPt point) {
 			return points.contains(point);
 		}
 
-		void clearPoints() {
+		public void clearPoints() {
 			points.clear();
 			modifiedTime = System.currentTimeMillis();
 		}
@@ -864,8 +914,8 @@ public class GPXUtilities {
 			points.add(position, point);
 			modifiedTime = System.currentTimeMillis();
 		}
-		
-		void addPoints(Collection<? extends WptPt> collection) {
+
+		public void addPoints(Collection<? extends WptPt> collection) {
 			points.addAll(collection);
 			modifiedTime = System.currentTimeMillis();
 		}
@@ -1223,7 +1273,7 @@ public class GPXUtilities {
 			Set<String> categories = new HashSet<>();
 			for (WptPt pt : points) {
 				String category = pt.category == null ? "" : pt.category;
-				if (withDefaultCategory || !TextUtils.isEmpty(category)) {
+				if (withDefaultCategory || !Algorithms.isEmpty(category)) {
 					categories.add(category);
 				}
 			}
@@ -1235,7 +1285,7 @@ public class GPXUtilities {
 			for (WptPt pt : points) {
 				String category = pt.category == null ? "" : pt.category;
 				int color = pt.category == null ? 0 : pt.getColor();
-				boolean emptyCategory = TextUtils.isEmpty(category);
+				boolean emptyCategory = Algorithms.isEmpty(category);
 				if (!emptyCategory) {
 					Integer existingColor = categories.get(category);
 					if (existingColor == null || (existingColor == 0 && color != 0)) {
@@ -1247,29 +1297,79 @@ 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) {
+	public static String asString(GPXFile file) {
 		final Writer writer = new StringWriter();
-		GPXUtilities.writeGpx(writer, file, ctx);
+		GPXUtilities.writeGpx(writer, file);
 		return writer.toString();
 	}
 
-	public static String writeGpxFile(File fout, GPXFile file, OsmandApplication ctx) {
+	public static Exception writeGpxFile(File fout, GPXFile file) {
 		Writer output = null;
 		try {
-			if(fout.getParentFile() != null) {
+			if (fout.getParentFile() != null) {
 				fout.getParentFile().mkdirs();
 			}
 			output = new OutputStreamWriter(new FileOutputStream(fout), "UTF-8"); //$NON-NLS-1$
-			if(Algorithms.isEmpty(file.path)) {
+			if (Algorithms.isEmpty(file.path)) {
 				file.path = fout.getAbsolutePath();
 			}
-			String msg = writeGpx(output, file, ctx);
-			return msg;
-		} catch (IOException e) {
+			return writeGpx(output, file);
+		} catch (Exception e) {
 			log.error("Error saving gpx", e); //$NON-NLS-1$
-			return ctx.getString(R.string.error_occurred_saving_gpx);
+			return e;
 		} finally {
 			if (output != null) {
 				try {
@@ -1281,7 +1381,7 @@ public class GPXUtilities {
 		}
 	}
 
-	public static String writeGpx(Writer output, GPXFile file, OsmandApplication ctx) {
+	public static Exception writeGpx(Writer output, GPXFile file) {
 		try {
 			SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT, Locale.US);
 			format.setTimeZone(TimeZone.getTimeZone("UTC"));
@@ -1291,9 +1391,7 @@ public class GPXUtilities {
 			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", Version.getAppName(ctx)); //$NON-NLS-1$
-			} else {
+			if (file.author != null) {
 				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$
@@ -1353,29 +1451,24 @@ public class GPXUtilities {
 			serializer.endTag(null, "gpx"); //$NON-NLS-1$
 			serializer.endDocument();
 			serializer.flush();
-			
-			
-		} catch (RuntimeException e) {
+		} catch (Exception e) {
 			log.error("Error saving gpx", e); //$NON-NLS-1$
-			return ctx.getString(R.string.error_occurred_saving_gpx);
-		} catch (IOException e) {
-			log.error("Error saving gpx", e); //$NON-NLS-1$
-			return ctx.getString(R.string.error_occurred_saving_gpx);
+			return e;
 		}
 		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);
-            }
-        }
+			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;
 	}
 
@@ -1390,7 +1483,7 @@ public class GPXUtilities {
 	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()) {
+			for (Entry<String, String> s : p.getExtensionsToRead().entrySet()) {
 				writeNotNullText(serializer, s.getKey(), s.getValue());
 			}
 			serializer.endTag(null, "extensions");
@@ -1450,27 +1543,54 @@ public class GPXUtilities {
 
 	private static String readText(XmlPullParser parser, String key) throws XmlPullParserException, IOException {
 		int tok;
-		String text = null;
+		StringBuilder 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();
+					text = new StringBuilder(parser.getText());
 				} else {
-					text += parser.getText();
+					text.append(parser.getText());
 				}
 			}
-
 		}
-		return text;
+		return text == null ? null : text.toString();
 	}
 
-	public static GPXFile loadGPXFile(Context ctx, File f) {
+	private static Map<String, String> readTextMap(XmlPullParser parser, String key)
+			throws XmlPullParserException, IOException {
+		int tok;
+		StringBuilder text = null;
+		Map<String, String> result = new HashMap<>();
+		while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
+			if (tok == XmlPullParser.END_TAG) {
+				String tag = parser.getName();
+				if (text != null && !Algorithms.isEmpty(text.toString().trim())) {
+					result.put(tag, text.toString());
+				}
+				if (tag.equals(key)) {
+					break;
+				}
+				text = null;
+			} else if (tok == XmlPullParser.START_TAG) {
+				text = null;
+			} else if (tok == XmlPullParser.TEXT) {
+				if (text == null) {
+					text = new StringBuilder(parser.getText());
+				} else {
+					text.append(parser.getText());
+				}
+			}
+		}
+		return result;
+	}
+
+	public static GPXFile loadGPXFile(File f) {
 		FileInputStream fis = null;
 		try {
 			fis = new FileInputStream(f);
-			GPXFile file = loadGPXFile(ctx, fis);
+			GPXFile file = loadGPXFile(fis);
 			file.path = f.getAbsolutePath();
 			try {
 				fis.close();
@@ -1478,10 +1598,10 @@ public class GPXUtilities {
 			}
 			return file;
 		} catch (IOException e) {
-			GPXFile res = new GPXFile();
+			GPXFile res = new GPXFile(null);
 			res.path = f.getAbsolutePath();
 			log.error("Error reading gpx " + res.path, e); //$NON-NLS-1$
-			res.warning = ctx.getString(R.string.error_reading_gpx);
+			res.error = e;
 			return res;
 		} finally {
 			try {
@@ -1493,8 +1613,8 @@ public class GPXUtilities {
 		}
 	}
 
-	public static GPXFile loadGPXFile(Context ctx, InputStream f) {
-		GPXFile res = new GPXFile();
+	public static GPXFile loadGPXFile(InputStream f) {
+		GPXFile res = new GPXFile(null);
 		SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT, Locale.US);
 		format.setTimeZone(TimeZone.getTimeZone("UTC"));
 		SimpleDateFormat formatMillis = new SimpleDateFormat(GPX_TIME_FORMAT_MILLIS, Locale.US);
@@ -1504,23 +1624,47 @@ public class GPXUtilities {
 			parser.setInput(getUTF8Reader(f));
 			Stack<GPXExtensions> parserState = new Stack<>();
 			boolean extensionReadMode = false;
+			boolean parseExtension = false;
+			boolean endOfTrkSegment = false;
 			parserState.push(res);
 			int tok;
 			while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
 				if (tok == XmlPullParser.START_TAG) {
-					Object parse = parserState.peek();
+					GPXExtensions parse = parserState.peek();
 					String tag = parser.getName();
-					if (extensionReadMode && parse != null) {
-						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) {}
-							}
+					if (extensionReadMode && parse != null && !parseExtension) {
+						switch (tag.toLowerCase()) {
+							case "routepointextension":
+								parseExtension = true;
+								Track track = new Track();
+								res.tracks.add(track);
+								GPXExtensions parent = parserState.size() > 1 ? parserState.get(parserState.size() - 2) : null;
+								if (parse instanceof WptPt && parent instanceof Route) {
+									track.getExtensionsToWrite().putAll(parent.getExtensionsToRead());
+									track.getExtensionsToWrite().putAll(parse.getExtensionsToRead());
+								}
+								parserState.push(track);
+								break;
+
+							default:
+								Map<String, String> values = readTextMap(parser, tag);
+								if (values.size() > 0) {
+									for (Entry<String, String> entry : values.entrySet()) {
+										String t = entry.getKey().toLowerCase();
+										String value = entry.getValue();
+										parse.getExtensionsToWrite().put(t, value);
+										if (tag.equals("speed") && parse instanceof WptPt) {
+											try {
+												((WptPt) parse).speed = Float.parseFloat(value);
+											} catch (NumberFormatException e) {
+												log.debug(e.getMessage(), e);
+											}
+										}
+									}
+								}
+								break;
 						}
-					} else if (parse instanceof GPXExtensions && tag.equals("extensions")) {
+					} else if (parse != null && tag.equals("extensions")) {
 						extensionReadMode = true;
 					} else {
 						if (parse instanceof GPXFile) {
@@ -1575,8 +1719,18 @@ public class GPXUtilities {
 								((Track) parse).segments.add(trkSeg);
 								parserState.push(trkSeg);
 							}
+							if (tag.equals("rpt")) {
+								endOfTrkSegment = false;
+								TrkSegment trkSeg = new TrkSegment();
+								((Track) parse).segments.add(trkSeg);
+								parserState.push(trkSeg);
+								WptPt wptPt = parseWptAttributes(parser);
+								parse = parserState.peek();
+								((TrkSegment) parse).points.add(wptPt);
+								parserState.push(wptPt);
+							}
 						} else if (parse instanceof TrkSegment) {
-							if (tag.equals("trkpt")) {
+							if (tag.equals("trkpt") || tag.equals("rpt")) {
 								WptPt wptPt = parseWptAttributes(parser);
 								((TrkSegment) parse).points.add(wptPt);
 								parserState.push(wptPt);
@@ -1613,7 +1767,7 @@ public class GPXUtilities {
 								try {
 									String value = readText(parser, "speed");
 									((WptPt) parse).speed = Float.parseFloat(value);
-									((WptPt) parse).getExtensionsToWrite().put("speed", value);
+									parse.getExtensionsToWrite().put("speed", value);
 								} catch (NumberFormatException e) {
 								}
 							} else if (tag.equals("link")) {
@@ -1653,6 +1807,8 @@ public class GPXUtilities {
 										}
 									}
 								}
+							} else if (tag.toLowerCase().equals("subclass")) {
+								endOfTrkSegment = true;
 							}
 						}
 					}
@@ -1660,7 +1816,13 @@ public class GPXUtilities {
 				} else if (tok == XmlPullParser.END_TAG) {
 					Object parse = parserState.peek();
 					String tag = parser.getName();
-					if (parse instanceof GPXExtensions && tag.equals("extensions")) {
+
+					if (tag.toLowerCase().equals("routepointextension")) {
+						parseExtension = false;
+						Object pop = parserState.pop();
+						assert pop instanceof Track;
+					}
+					if (parse != null && tag.equals("extensions")) {
 						extensionReadMode = false;
 					}
 
@@ -1685,18 +1847,26 @@ public class GPXUtilities {
 					} else if (tag.equals("trkseg")) {
 						Object pop = parserState.pop();
 						assert pop instanceof TrkSegment;
+					} else if (tag.equals("rpt")) {
+						Object pop = parserState.pop();
+						assert pop instanceof WptPt;
+						if (endOfTrkSegment) {
+							Object popSegment = parserState.pop();
+							if (popSegment instanceof TrkSegment) {
+								List<TrkSegment> segments = res.tracks.get(res.tracks.size() - 1).segments;
+								int last = segments.size() - 1;
+								if (!Algorithms.isEmpty(segments) && segments.get(last).points.size() < 2) {
+									segments.remove(last);
+								}
+							}
+							endOfTrkSegment = false;
+						}
 					}
 				}
 			}
-		} catch (RuntimeException e) {
+		} catch (Exception e) {
+			res.error = e;
 			log.error("Error reading gpx", e); //$NON-NLS-1$
-			res.warning = ctx.getString(R.string.error_reading_gpx) + " " + e.getMessage();
-		} catch (XmlPullParserException e) {
-			log.error("Error reading gpx", e); //$NON-NLS-1$
-			res.warning = ctx.getString(R.string.error_reading_gpx) + " " + e.getMessage();
-		} catch (IOException e) {
-			log.error("Error reading gpx", e); //$NON-NLS-1$
-			res.warning = ctx.getString(R.string.error_reading_gpx) + " " + e.getMessage();
 		}
 
 		return res;
@@ -1744,8 +1914,8 @@ public class GPXUtilities {
 		if (from.routes != null) {
 			to.routes.addAll(from.routes);
 		}
-		if (from.warning != null) {
-			to.warning = from.warning;
+		if (from.error != null) {
+			to.error = from.error;
 		}
 	}
-}
+}

OsmAnd-java/src/main/java/net/osmand/IndexConstants.java

@@ -68,4 +68,5 @@ public class IndexConstants {
 	public static final String RENDERERS_DIR = "rendering/"; //$NON-NLS-1$
 	public static final String ROUTING_XML_FILE= "routing.xml";
 	public static final String SETTINGS_DIR = "settings/"; //$NON-NLS-1$
+	public static final String TEMP_DIR = "temp/";
 }

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);
 

OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java

@@ -2078,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) {
@@ -2094,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");
 
@@ -2284,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(" ");
 				}

OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapTransportReaderAdapter.java

@@ -472,7 +472,7 @@ public class BinaryMapTransportReaderAdapter {
 		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)));
+			s.setName(stringTable.get(e.getKey().charAt(0)), stringTable.get(e.getValue().charAt(0)));
 		}
 	}
 

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++) {

OsmAnd-java/src/main/java/net/osmand/data/Amenity.java

@@ -274,6 +274,7 @@ public class Amenity extends MapObject {
 				Algorithms.objectEquals(getLocation(), thatObj.getLocation()) &&
 				Algorithms.objectEquals(this.subType, thatObj.subType) &&
 				Algorithms.objectEquals(this.additionalInfo, thatObj.additionalInfo) &&
+				Algorithms.objectEquals(this.getName(), thatObj.getName()) &&
 				Algorithms.objectEquals(this.getNamesMap(true), thatObj.getNamesMap(true))) {
 			return true;
 		}

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;
+	}
 }

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;

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;

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) {

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);
@@ -1718,4 +1718,6 @@ public class RouteResultPreparation {
 		return MapUtils.getDistance(MapUtils.get31LatitudeY(y1), MapUtils.get31LongitudeX(x1), 
 				MapUtils.get31LatitudeY(y2), MapUtils.get31LongitudeX(x2));
 	}
+
+
 }

OsmAnd-java/src/main/java/net/osmand/router/RouteSegmentResult.java

@@ -2,6 +2,7 @@ package net.osmand.router;
 
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -43,19 +44,28 @@ public class RouteSegmentResult {
 		int st = Math.min(startPointIndex, endPointIndex);
 		int end = Math.max(startPointIndex, endPointIndex);
 		float[] res = new float[(end - st + 1) * 2];
-		for (int k = 0; k < res.length / 2; k++) {
-			int ind = reverse ? (2 * (end - k)) : (2 * (k + st));
-			if (k == 0) {
-				res[2 * k] = 0;
-			} else {
-				if(ind < pf.length) {
-					res[2 * k] = pf[k];
+		if (reverse) {
+			for (int k = 1; k <= res.length / 2; k++) {
+				int ind = (2 * (end--));
+				if (ind < pf.length && k < res.length / 2) {
+					res[2 * k] = pf[ind];
+				}
+				if (ind < pf.length) {
+					res[2 * (k - 1) + 1] = pf[ind + 1];
 				}
 			}
-			if(ind < pf.length) {
-				res[2 * k + 1] = pf[ind + 1];
+		} else {
+			for (int k = 0; k < res.length / 2; k++) {
+				int ind = (2 * (st + k));
+				if (k > 0 && ind < pf.length) {
+					res[2 * k] = pf[ind];
+				}
+				if (ind < pf.length) {
+					res[2 * k + 1] = pf[ind + 1];
+				}
 			}
 		}
+
 		return res;
 	}
 	
@@ -217,5 +227,16 @@ public class RouteSegmentResult {
 	public String toString() {
 		return object.toString() + ": " + startPointIndex + "-" + endPointIndex;
 	}
-	
+
+	public String getSurface() {
+		return object.getValue("surface");
+	}
+
+	public String getSmoothness() {
+		return object.getValue("smoothness");
+	}
+
+	public String getHighway() {
+		return object.getHighway();
+	}
 }

OsmAnd-java/src/main/java/net/osmand/router/RouteStatistics.java

@@ -0,0 +1,530 @@
+package net.osmand.router;
+
+import java.util.*;
+
+public class RouteStatistics {
+
+    private final List<RouteSegmentResult> route;
+
+    private RouteStatistics(List<RouteSegmentResult> route) {
+        this.route = route;
+    }
+
+    public static RouteStatistics newRouteStatistic(List<RouteSegmentResult> route) {
+        return new RouteStatistics(route);
+    }
+
+    public Statistics getRouteSurfaceStatistic() {
+        RouteStatisticComputer statisticComputer = new RouteSurfaceStatisticComputer(route);
+        return statisticComputer.computeStatistic();
+    }
+
+    public Statistics getRouteSmoothnessStatistic() {
+        RouteStatisticComputer statisticComputer = new RouteSmoothnessStatisticComputer(route);
+        return statisticComputer.computeStatistic();
+    }
+
+    public Statistics getRouteClassStatistic() {
+        RouteStatisticComputer statisticComputer = new RouteClassStatisticComputer(route);
+        return statisticComputer.computeStatistic();
+    }
+
+    public Statistics getRouteSteepnessStatistic(List<Incline> inclines) {
+        RouteStatisticComputer statisticComputer = new RouteSteepnessStatisticComputer(inclines);
+        return statisticComputer.computeStatistic();
+    }
+
+
+    private abstract static class RouteStatisticComputer<E extends Comparable<E>> {
+
+        private final List<RouteSegmentResult> route;
+
+        public RouteStatisticComputer(List<RouteSegmentResult> route) {
+            this.route = route;
+        }
+
+        protected Map<E, RouteSegmentAttribute<E>> makePartition(List<RouteSegmentAttribute<E>> routeAttributes) {
+            Map<E, RouteSegmentAttribute<E>> partition = new TreeMap<>();
+            for (RouteSegmentAttribute<E> attribute : routeAttributes) {
+                E key = attribute.getAttribute();
+                RouteSegmentAttribute<E> pattr = partition.get(key);
+                if (pattr == null) {
+                    pattr = new RouteSegmentAttribute<>(attribute.getIndex(), attribute.getAttribute(), attribute.getColorAttrName());
+                    partition.put(key, pattr);
+                }
+                pattr.incrementDistanceBy(attribute.getDistance());
+            }
+            return partition;
+        }
+
+        private float computeTotalDistance(List<RouteSegmentAttribute<E>> attributes) {
+            float distance = 0f;
+            for (RouteSegmentAttribute attribute : attributes) {
+                distance += attribute.getDistance();
+            }
+            return distance;
+        }
+
+        protected List<RouteSegmentResult> getRoute() {
+            return route;
+        }
+
+        protected List<RouteSegmentAttribute<E>> processRoute() {
+            int index = 0;
+            List<RouteSegmentAttribute<E>> routes = new ArrayList<>();
+            E prev = null;
+            for (RouteSegmentResult segment : getRoute()) {
+                E current = getAttribute(segment);
+                if (prev != null && !prev.equals(current)) {
+                    index++;
+                }
+                if (index >= routes.size()) {
+                    String colorAttrName = determineColor(current);
+                    routes.add(new RouteSegmentAttribute<>(index, current, colorAttrName));
+                }
+                RouteSegmentAttribute surface = routes.get(index);
+                surface.incrementDistanceBy(segment.getDistance());
+                prev = current;
+            }
+            return routes;
+        }
+
+        public Statistics<E> computeStatistic() {
+            List<RouteSegmentAttribute<E>> routeAttributes = processRoute();
+            Map<E, RouteSegmentAttribute<E>> partition = makePartition(routeAttributes);
+            float totalDistance = computeTotalDistance(routeAttributes);
+            return new Statistics<>(routeAttributes, partition, totalDistance);
+        }
+
+        public abstract E getAttribute(RouteSegmentResult segment);
+
+        public abstract String determineColor(E attribute);
+
+    }
+
+    private static class RouteSurfaceStatisticComputer extends RouteStatisticComputer<String> {
+
+        public RouteSurfaceStatisticComputer(List<RouteSegmentResult> route) {
+            super(route);
+        }
+
+        @Override
+        public String getAttribute(RouteSegmentResult segment) {
+            String segmentSurface = segment.getSurface();
+            if (segmentSurface == null) {
+                return RoadSurface.UNDEFINED.name().toLowerCase();
+            }
+            for (RoadSurface roadSurface : RoadSurface.values()) {
+                if (roadSurface.contains(segmentSurface)) {
+                    return roadSurface.name().toLowerCase();
+                }
+            }
+            return RoadSurface.UNDEFINED.name().toLowerCase();
+        }
+
+        @Override
+        public String determineColor(String attribute) {
+            RoadSurface roadSurface = RoadSurface.valueOf(attribute.toUpperCase());
+            return roadSurface.getColorAttrName();
+        }
+    }
+
+    private static class RouteSmoothnessStatisticComputer extends RouteStatisticComputer<String> {
+
+        public RouteSmoothnessStatisticComputer(List<RouteSegmentResult> route) {
+            super(route);
+        }
+
+        @Override
+        public String getAttribute(RouteSegmentResult segment) {
+            String segmentSmoothness = segment.getSurface();
+            if (segmentSmoothness == null) {
+                return RoadSmoothness.UNDEFINED.name().toLowerCase();
+            }
+            for (RoadSmoothness roadSmoothness : RoadSmoothness.values()) {
+                if (roadSmoothness.contains(segmentSmoothness)) {
+                    return roadSmoothness.name().toLowerCase();
+                }
+            }
+            return RoadSmoothness.UNDEFINED.name().toLowerCase();
+        }
+
+        @Override
+        public String determineColor(String attribute) {
+            RoadSmoothness roadSmoothness = RoadSmoothness.valueOf(attribute.toUpperCase());
+            return roadSmoothness.getColorAttrName();
+        }
+    }
+
+
+    private static class RouteClassStatisticComputer extends RouteStatisticComputer<String> {
+
+        public RouteClassStatisticComputer(List<RouteSegmentResult> route) {
+            super(route);
+        }
+
+        @Override
+        public String getAttribute(RouteSegmentResult segment) {
+            String segmentClass = segment.getHighway();
+            if (segmentClass == null) {
+                return RoadClass.UNDEFINED.name().toLowerCase();
+            }
+            for (RoadClass roadClass : RoadClass.values()) {
+                if (roadClass.contains(segmentClass)) {
+                    return roadClass.name().toLowerCase();
+                }
+            }
+            return RoadClass.UNDEFINED.name().toLowerCase();
+        }
+
+        @Override
+        public String determineColor(String attribute) {
+            RoadClass roadClass = RoadClass.valueOf(attribute.toUpperCase());
+            return roadClass.getColorAttrName();
+        }
+    }
+
+
+    private static class RouteSteepnessStatisticComputer extends RouteStatisticComputer<Boundaries> {
+
+        private static final String POSITIVE_INCLINE_COLOR_ATTR_NAME = "greenColor";
+        private static final String NEGATIVE_INCLINE_COLOR_ATTR_NAME = "redColor";
+
+        private final List<Incline> inclines;
+
+        public RouteSteepnessStatisticComputer(List<Incline> inclines) {
+            super(null);
+            this.inclines = inclines;
+        }
+
+        @Override
+        public List<RouteSegmentAttribute<Boundaries>> processRoute() {
+            List<RouteSegmentAttribute<Boundaries>> routeInclines = new ArrayList<>();
+            int index = 0;
+            Boundaries prev = null;
+            Incline prevIncline = null;
+            for (Incline incline : inclines) {
+                Boundaries current = incline.getBoundaries();
+                if (prev != null && !prev.equals(current)) {
+                    index++;
+                }
+                if (index >= routeInclines.size()) {
+                    String colorAttrName = determineColor(current);
+                    RouteSegmentAttribute<Boundaries> attribute = new RouteSegmentAttribute<>(index, current, colorAttrName);
+                    if (prevIncline != null) {
+                        attribute.setInitDistance(prevIncline.getDistance());
+                    }
+                    routeInclines.add(attribute);
+                }
+                RouteSegmentAttribute routeIncline = routeInclines.get(index);
+                routeIncline.relativeSum(incline.getDistance());
+                prev = current;
+                prevIncline = incline;
+            }
+            return routeInclines;
+        }
+
+        @Override
+        public Boundaries getAttribute(RouteSegmentResult segment) {
+            /*
+                no-op
+             */
+            return null;
+        }
+
+        @Override
+        public String determineColor(Boundaries attribute) {
+            return attribute.getLowerBoundary() >= 0 ? POSITIVE_INCLINE_COLOR_ATTR_NAME : NEGATIVE_INCLINE_COLOR_ATTR_NAME;
+        }
+    }
+
+
+    public static class RouteSegmentAttribute<E> {
+
+        private final int index;
+        private final E attribute;
+        private final String colorAttrName;
+
+        private float distance;
+        private float initDistance;
+
+        public RouteSegmentAttribute(int index, E attribute, String colorAttrName) {
+            this.index = index;
+            this.attribute = attribute;
+            this.colorAttrName = colorAttrName;
+        }
+
+        public int getIndex() {
+            return index;
+        }
+
+        public E getAttribute() {
+            return attribute;
+        }
+
+        public float getDistance() {
+            return distance;
+        }
+
+        public void setInitDistance(float initDistance) {
+            this.initDistance = initDistance;
+        }
+
+        public void incrementDistanceBy(float distance) {
+            this.distance += distance;
+        }
+
+        public void relativeSum(float distance) {
+            this.distance = this.distance + ((distance - this.initDistance) - this.distance);
+        }
+
+        public String getColorAttrName() {
+            return colorAttrName;
+        }
+
+        @Override
+        public String toString() {
+            return "RouteSegmentAttribute{" +
+                    "index=" + index +
+                    ", attribute='" + attribute + '\'' +
+                    ", colorAttrName='" + colorAttrName + '\'' +
+                    ", distance=" + distance +
+                    '}';
+        }
+    }
+
+    public static class Incline {
+
+        private float inclineValue;
+        private final float distance;
+        private final Boundaries boundaries;
+
+        public Incline(float inclineValue, float distance) {
+            this.inclineValue = inclineValue;
+            this.distance = distance;
+            this.boundaries = Boundaries.newBoundariesFor(inclineValue);
+        }
+
+        public float getValue() {
+            return inclineValue;
+        }
+
+        public float getDistance() {
+            return distance;
+        }
+
+        public Boundaries getBoundaries() {
+            return this.boundaries;
+        }
+
+        @Override
+        public String toString() {
+            return "Incline{" +
+                    ", incline=" + inclineValue +
+                    ", distance=" + distance +
+                    '}';
+        }
+    }
+
+    public static class Boundaries implements Comparable<Boundaries> {
+
+        private static final int MIN_INCLINE = -100;
+        private static final int MAX_INCLINE = 100;
+        private static final int STEP = 4;
+        private static final int NUM;
+        private static final int[] BOUNDARIES_ARRAY;
+
+        static {
+            NUM = ((MAX_INCLINE - MIN_INCLINE) / STEP + 1);
+            BOUNDARIES_ARRAY = new int[NUM];
+            for (int i = 0; i < NUM; i++) {
+                BOUNDARIES_ARRAY[i] = MIN_INCLINE + i * STEP;
+            }
+        }
+
+        private final float upperBoundary;
+        private final float lowerBoundary;
+
+        private Boundaries(float upperBoundary, float lowerBoundary) {
+            this.upperBoundary = upperBoundary;
+            this.lowerBoundary = lowerBoundary;
+        }
+
+        public static Boundaries newBoundariesFor(float incline) {
+            if (incline > MAX_INCLINE) {
+                return new Boundaries(MAX_INCLINE, MAX_INCLINE - STEP);
+            }
+            if (incline < MIN_INCLINE) {
+                return new Boundaries(MIN_INCLINE + STEP, MIN_INCLINE);
+            }
+            for (int i = 1; i < NUM; i++) {
+                if (incline >= BOUNDARIES_ARRAY[i - 1] && incline < BOUNDARIES_ARRAY[i]) {
+                    return new Boundaries(BOUNDARIES_ARRAY[i], BOUNDARIES_ARRAY[i - 1]);
+                }
+            }
+            return null;
+        }
+
+        public float getUpperBoundary() {
+            return upperBoundary;
+        }
+
+        public float getLowerBoundary() {
+            return lowerBoundary;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+
+            Boundaries that = (Boundaries) o;
+
+            if (Float.compare(that.upperBoundary, upperBoundary) != 0) return false;
+            return Float.compare(that.lowerBoundary, lowerBoundary) == 0;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = (upperBoundary != +0.0f ? Float.floatToIntBits(upperBoundary) : 0);
+            result = 31 * result + (lowerBoundary != +0.0f ? Float.floatToIntBits(lowerBoundary) : 0);
+            return result;
+        }
+
+        @Override
+        public int compareTo(Boundaries boundaries) {
+            return  (int) (getLowerBoundary() - boundaries.getLowerBoundary());
+        }
+
+        @Override
+        public String toString() {
+            return String.format("%d-%d", Math.round(getLowerBoundary()), Math.round(getUpperBoundary()));
+        }
+    }
+
+    public static class Statistics<E>  {
+
+        private final List<RouteSegmentAttribute<E>> elements;
+        private final Map<E, RouteSegmentAttribute<E>> partition;
+        private final float totalDistance;
+
+        private Statistics(List<RouteSegmentAttribute<E>> elements,
+                          Map<E, RouteSegmentAttribute<E>> partition,
+                          float totalDistance) {
+            this.elements = elements;
+            this.partition = partition;
+            this.totalDistance = totalDistance;
+        }
+
+        public float getTotalDistance() {
+            return totalDistance;
+        }
+
+        public List<RouteSegmentAttribute<E>> getElements() {
+            return elements;
+        }
+
+        public Map<E, RouteSegmentAttribute<E>> getPartition() {
+            return partition;
+        }
+    }
+
+    public enum RoadClass {
+        UNDEFINED("whitewaterSectionGrade0Color", "undefined"),
+        MOTORWAY("motorwayRoadColor", "motorway", "motorway_link"),
+        STATE_ROAD("trunkRoadColor" , "trunk", "trunk_link", "primary", "primary_link"),
+        ROAD("secondaryRoadColor", "secondary", "secondary_link", "tertiary", "tertiary_link", "unclassified"),
+        STREET("residentialRoadColor" ,"residential", "living_street"),
+        SERVICE("serviceRoadColor", "service"),
+        TRACK("trackColor", "track", "road"),
+        FOOTWAY("footwayColor", "footway"),
+        PATH("pathColor", "path"),
+        CYCLE_WAY("cyclewayColor", "cycleway");
+
+        final Set<String> roadClasses = new TreeSet<>();
+        final String colorAttrName;
+
+        RoadClass(String colorAttrName, String... classes) {
+           roadClasses.addAll(Arrays.asList(classes));
+           this.colorAttrName =  colorAttrName;
+        }
+
+        boolean contains(String roadClass) {
+            return roadClasses.contains(roadClass);
+        }
+
+        String getColorAttrName() {
+            return colorAttrName;
+        }
+    }
+
+    public enum RoadSurface {
+        UNDEFINED("whitewaterSectionGrade0Color", "undefined"),
+        PAVED("motorwayRoadColor", "paved"),
+        UNPAVED("motorwayRoadShadowColor", "unpaved"),
+        ASPHALT("trunkRoadColor", "asphalt"),
+        CONCRETE("primaryRoadColor", "concrete"),
+        COMPACTED("secondaryRoadColor", "compacted"),
+        GRAVEL("tertiaryRoadColor", "gravel"),
+        FINE_GRAVEL("residentialRoadColor", "fine_gravel"),
+        PAVING_STONES("serviceRoadColor", "paving_stones"),
+        SETT("roadRoadColor", "sett"),
+        COBBLESTONE("pedestrianRoadColor", "cobblestone"),
+        PEBBLESTONE("racewayColor", "pebblestone"),
+        STONE("trackColor", "stone"),
+        METAL("footwayColor", "metal"),
+        GROUND("pathColor", "ground", "mud"),
+        WOOD("cycleRouteColor", "wood"),
+        GRASS_PAVER("osmcBlackColor", "grass_paver"),
+        GRASS("osmcBlueColor", "grass"),
+        SAND("osmcGreenColor", "sand"),
+        SALT("osmcRedColor", "salt"),
+        SNOW("osmcYellowColor", "snow"),
+        ICE("osmcOrangeColor", "ice"),
+        CLAY("osmcBrownColor", "clay");
+
+        final Set<String> surfaces = new TreeSet<>();
+        final String colorAttrName;
+
+        RoadSurface(String colorAttrName, String... surfaces) {
+            this.surfaces.addAll(Arrays.asList(surfaces));
+            this.colorAttrName = colorAttrName;
+        }
+
+        boolean contains(String surface) {
+            return surfaces.contains(surface);
+        }
+
+        public String getColorAttrName() {
+            return this.colorAttrName;
+        }
+    }
+
+    public enum RoadSmoothness {
+        UNDEFINED("redColor", "undefined"),
+        EXCELLENT("orangeColor", "excellent"),
+        GOOD("brownColor", "good"),
+        INTERMEDIATE("darkyellowColor", "intermediate"),
+        BAD("yellowColor", "bad"),
+        VERY_BAD("lightgreenColor", "very_bad"),
+        HORRIBLE("greenColor", "horrible"),
+        VERY_HORRIBLE("lightblueColor", "very_horrible"),
+        IMPASSABLE("blueColor", "impassable");
+
+        final Set<String> surfaces = new TreeSet<>();
+        final String colorAttrName;
+
+        RoadSmoothness(String colorAttrName, String... surfaces) {
+            this.surfaces.addAll(Arrays.asList(surfaces));
+            this.colorAttrName = colorAttrName;
+        }
+
+        boolean contains(String surface) {
+            return surfaces.contains(surface);
+        }
+
+        public String getColorAttrName() {
+            return this.colorAttrName;
+        }
+    }
+}

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;

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,6 +10,20 @@ 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 {
 	
 
@@ -37,7 +37,7 @@ public class TransportRoutePlanner {
 		for(TransportRouteSegment s : endStops) {
 			endSegments.put(s.getId(), s);
 		}
-		PriorityQueue<TransportRouteSegment> queue = new PriorityQueue<TransportRouteSegment>(new SegmentsComparator(ctx));
+		PriorityQueue<TransportRouteSegment> queue = new PriorityQueue<TransportRouteSegment>(startStops.size(), new SegmentsComparator(ctx));
 		for(TransportRouteSegment r : startStops){
 			r.walkDist = (float) MapUtils.getDistance(r.getLocation(), start);
 			r.distFromStart = r.walkDist / ctx.cfg.walkSpeed;
@@ -47,6 +47,9 @@ public class TransportRoutePlanner {
 		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) {
@@ -71,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
@@ -87,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;
 					}
@@ -174,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, 
@@ -190,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;
@@ -280,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();
@@ -352,7 +379,7 @@ public class TransportRoutePlanner {
 		public List<TransportRouteResultSegment> getSegments() {
 			return segments;
 		}
-		
+
 		public double getWalkDist() {
 			double d = finishWalkDist;
 			for (TransportRouteResultSegment s : segments) {
@@ -360,7 +387,15 @@ public class TransportRoutePlanner {
 			}
 			return d;
 		}
-		
+
+		public double getFinishWalkDist() {
+			return finishWalkDist;
+		}
+
+		public double getWalkSpeed() {
+			return  cfg.walkSpeed;
+		}
+
 		public double getRouteTime() {
 			return routeTime;
 		}

OsmAnd-java/src/test/java/net/osmand/search/SearchCoreUITest.java

@@ -222,7 +222,7 @@ public class SearchCoreUITest {
 		});
 		if (files != null) {
 			for (File f : files) {
-				testSearchImpl(f);
+				//testSearchImpl(f);
 			}
 		}
 	}

OsmAnd-java/src/test/java/net/osmand/util/GeoPointParserUtilTest.java

@@ -11,7 +11,7 @@ import org.junit.Test;
 import net.osmand.util.GeoPointParserUtil.GeoParsedPoint;
 
 public class GeoPointParserUtilTest {
-	
+
 	@Test
 	public void testGeoPointUrlDecode() {
 		// bug in get scheme getSchemeSpecificPart()
@@ -19,14 +19,14 @@ 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);
@@ -97,8 +97,8 @@ public class GeoPointParserUtilTest {
 			System.out.println(" Passed!");
 		}
 
-		
-		
+
+
 		// geo:34,-106
 		url = "geo:" + ilat + "," + ilon;
 		System.out.println("url: " + url);
@@ -111,7 +111,7 @@ public class GeoPointParserUtilTest {
 		System.out.println("url: " + url);
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon));
-		
+
 		// geo:34.99393,-106.61568
 		url = "geo:" + dlat + "," + dlon;
 		System.out.println("url: " + url);
@@ -271,12 +271,12 @@ public class GeoPointParserUtilTest {
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint(dlat, -Math.abs(dlon)));
 
-		url = "http://maps.google.com/maps?f=d&saddr=" + dlat +"," +dlon +"&daddr=" +dlat +"," +dlon+"&hl=en"; 
+		url = "http://maps.google.com/maps?f=d&saddr=" + dlat +"," +dlon +"&daddr=" +dlat +"," +dlon+"&hl=en";
 		System.out.println("url: " + url);
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon));
-		
-		url = "http://maps.google.com/maps?f=d&saddr=My+Location&daddr=" +dlat +"," +dlon+"&hl=en"; 
+
+		url = "http://maps.google.com/maps?f=d&saddr=My+Location&daddr=" +dlat +"," +dlon+"&hl=en";
 		System.out.println("url: " + url);
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon));
@@ -407,7 +407,7 @@ public class GeoPointParserUtilTest {
 		System.out.println("url: " + url);
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
-		
+
 		// https://maps.google.com/maps?q=loc:-21.8835112,-47.7838932 (Name)
 		url = "https://maps.google.com/maps?q=loc:" + dlat + "," + dlon + " (Name)" ;
 		System.out.println("url: " + url);
@@ -843,7 +843,7 @@ public class GeoPointParserUtilTest {
 	}
 
 
-	
 
-	
+
+
 }

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,6 +148,5 @@ dependencies {
 	implementation("com.github.HITGIF:TextFieldBoxes:1.4.4") {
 		exclude group: 'com.android.support'
 	}
-
-	implementation 'net.sf.kxml:kxml2:2.1.8'
+	implementation 'org.jetbrains:annotations-java5:15.0'
 }

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>

OsmAnd-telegram/res/layout/activity_main.xml

@@ -8,8 +8,9 @@
 	android:orientation="vertical"
 	tools:context=".ui.MainActivity">
 
-	<FrameLayout
+	<android.support.design.widget.CoordinatorLayout
 		android:layout_width="match_parent"
+		android:id="@+id/coordinator"
 		android:layout_height="0dp"
 		android:layout_weight="1">
 
@@ -25,7 +26,7 @@
 			android:scaleType="fitXY"
 			android:src="?attr/bottom_nav_shadow"/>
 
-	</FrameLayout>
+	</android.support.design.widget.CoordinatorLayout>
 
 	<LinearLayout
 		android:id="@+id/buttons_bar"

OsmAnd-telegram/res/layout/fragement_settings_dialog.xml

@@ -74,6 +74,35 @@
 
 			<include layout="@layout/list_item_divider"/>
 
+			<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="@dimen/list_header_height"
+					android:ellipsize="end"
+					android:gravity="center_vertical"
+					android:maxLines="1"
+					android:paddingLeft="@dimen/content_padding_standard"
+					android:paddingRight="@dimen/content_padding_standard"
+					android:text="@string/shared_string_appearance"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="@dimen/list_item_title_text_size"
+					app:typeface="@string/font_roboto_medium"/>
+
+				<LinearLayout
+					android:id="@+id/gps_points_container"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:orientation="vertical"/>
+
+			</LinearLayout>
+
+			<include layout="@layout/list_item_divider"/>
+
 			<LinearLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
@@ -91,7 +120,7 @@
 					android:text="@string/share_location_as"
 					android:textColor="?android:textColorPrimary"
 					android:textSize="@dimen/list_item_title_text_size"
-					app:firstBaselineToTopHeight="25sp"
+					app:firstBaselineToTopHeight="28sp"
 					app:typeface="@string/font_roboto_medium" />
 
 				<net.osmand.telegram.ui.views.TextViewEx
@@ -175,7 +204,7 @@
 					android:text="@string/osmand_connect"
 					android:textColor="?android:textColorPrimary"
 					android:textSize="@dimen/list_item_title_text_size"
-					app:firstBaselineToTopHeight="25sp"
+					app:firstBaselineToTopHeight="28sp"
 					app:typeface="@string/font_roboto_medium"/>
 
 				<net.osmand.telegram.ui.views.TextViewEx

OsmAnd-telegram/res/layout/fragment_live_now_tab.xml

@@ -129,13 +129,20 @@
 			android:visibility="gone"
 			app:typeface="@string/font_roboto_regular" />
 
-		<android.support.v7.widget.RecyclerView
-			android:id="@+id/recycler_view"
+		<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_item_content_margin"
-			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"

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>

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>

OsmAnd-telegram/res/layout/item_with_desc_and_right_value.xml

@@ -44,7 +44,7 @@
 			android:layout_height="wrap_content"
 			android:textColor="?android:attr/textColorSecondary"
 			android:textSize="@dimen/list_item_description_text_size"
-			app:firstBaselineToTopHeight="20sp"
+			app:firstBaselineToTopHeight="14sp"
 			app:lastBaselineToBottomHeight="16sp"
 			app:typeface="@string/font_roboto_regular"
 			tools:text="Some long description"/>

OsmAnd-telegram/res/layout/item_with_descr_and_right_switch.xml

@@ -0,0 +1,62 @@
+<?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:background="?attr/selectableItemBackground"
+	android:paddingLeft="@dimen/content_padding_standard"
+	android:paddingRight="@dimen/content_padding_standard"
+	tools:background="@color/card_bg_light">
+
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/image_button_padding"
+		android:layout_marginEnd="@dimen/content_padding_big"
+		android:layout_marginRight="@dimen/content_padding_big"
+		tools:src="@drawable/ic_action_live_now"
+		tools:tint="@color/icon_light" />
+
+	<LinearLayout
+		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:orientation="vertical">
+
+		<net.osmand.telegram.ui.views.TextViewEx
+			android:id="@+id/title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/list_item_title_text_size"
+			app:firstBaselineToTopHeight="25sp"
+			app:typeface="@string/font_roboto_regular"
+			tools:text="Some title" />
+
+		<net.osmand.telegram.ui.views.TextViewEx
+			android:id="@+id/description"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textColor="?android:attr/textColorSecondary"
+			android:textSize="@dimen/list_item_description_text_size"
+			app:firstBaselineToTopHeight="14sp"
+			app:lastBaselineToBottomHeight="16sp"
+			app:typeface="@string/font_roboto_regular"
+			tools:text="Some long description" />
+
+	</LinearLayout>
+
+	<Switch
+		android:id="@+id/switcher"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:background="@null"
+		android:clickable="false"
+		android:focusable="false" />
+
+</LinearLayout>

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,79 @@
 					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:paddingBottom="2dp"
+					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_icon_margin_right"
+							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_icon_margin_right"
+							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"
@@ -114,7 +154,7 @@
 							android:layout_height="wrap_content"
 							android:maxLines="1"
 							android:textSize="@dimen/list_item_description_text_size"
-							app:firstBaselineToTopHeight="@dimen/list_item_baseline_to_top_height_small"
+							app:firstBaselineToTopHeight="18dp"
 							app:typeface="@string/font_roboto_medium"
 							tools:text="213 m"
 							tools:textColor="@color/ctrl_active_light"/>
@@ -128,7 +168,7 @@
 							android:textColor="?attr/android:textColorSecondary"
 							android:textSize="@dimen/list_item_description_text_size"
 							android:visibility="visible"
-							app:firstBaselineToTopHeight="@dimen/list_item_icon_margin_right" />
+							app:firstBaselineToTopHeight="18dp" />
 
 					</LinearLayout>
 
@@ -141,12 +181,34 @@
 						android:maxLines="1"
 						android:textColor="?attr/android:textColorSecondary"
 						android:textSize="@dimen/list_item_description_text_size"
-						app:firstBaselineToTopHeight="@dimen/list_item_icon_margin_right"
+						app:firstBaselineToTopHeight="18dp"
 						app:typeface="@string/font_roboto_regular"
 						tools:text="Live: 1 • All: 36"/>
 
 				</LinearLayout>
 
+				<LinearLayout
+					android:id="@+id/received_gps_points_container"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="gone"
+					tools:visibility="visible">
+
+					<net.osmand.telegram.ui.views.TextViewEx
+						android:id="@+id/received_gps_points_description"
+						android:layout_width="0dp"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:ellipsize="end"
+						android:maxLines="1"
+						android:textColor="?attr/android:textColorSecondary"
+						android:textSize="@dimen/list_item_description_text_size"
+						app:firstBaselineToTopHeight="@dimen/list_item_icon_margin_right"
+						app:typeface="@string/font_roboto_regular"
+						tools:text="@string/received_gps_points" />
+
+				</LinearLayout>
+
 			</LinearLayout>
 
 			<ImageView

OsmAnd-telegram/res/layout/login_dialog.xml

@@ -125,6 +125,7 @@
 			android:background="@android:color/transparent">
 
 			<ScrollView
+				android:id="@+id/scroll_view"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
 				android:fillViewport="true">
@@ -352,6 +353,125 @@
 
 						</LinearLayout>
 
+						<LinearLayout
+							android:id="@+id/privacy_policy_layout"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:orientation="vertical"
+							android:paddingBottom="@dimen/content_padding_standard"
+							android:visibility="gone"
+							tools:visibility="gone">
+
+							<TextView
+								android:id="@+id/privacy_policy_telegram_descr"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginLeft="@dimen/content_padding_standard"
+								android:layout_marginTop="@dimen/dialog_description_margin"
+								android:layout_marginRight="@dimen/content_padding_standard"
+								android:layout_marginBottom="@dimen/content_padding_standard"
+								android:letterSpacing="@dimen/text_description_letter_spacing"
+								android:lineSpacingMultiplier="@dimen/text_description_line_spacing_multiplier"
+								android:text="@string/privacy_policy_telegram_client"
+								android:textColor="@color/app_bar_title_light"
+								android:textSize="@dimen/descr_text_size" />
+
+							<TextView
+								android:id="@+id/privacy_policy_agree"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginLeft="@dimen/content_padding_standard"
+								android:layout_marginTop="@dimen/dialog_description_margin"
+								android:layout_marginRight="@dimen/content_padding_standard"
+								android:layout_marginBottom="@dimen/content_padding_standard"
+								android:letterSpacing="@dimen/text_description_letter_spacing"
+								android:lineSpacingMultiplier="@dimen/text_description_line_spacing_multiplier"
+								android:text="@string/privacy_policy_agree"
+								android:textColor="@color/app_bar_title_light"
+								android:textSize="@dimen/descr_text_size"
+								android:textStyle="bold" />
+
+							<LinearLayout
+								android:id="@+id/telegram_privacy_policy_btn"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="@dimen/content_padding_half"
+								android:background="@drawable/btn_border_bg"
+								android:gravity="center_vertical"
+								android:visibility="visible">
+
+								<net.osmand.telegram.ui.views.TextViewEx
+									android:id="@+id/telegram_privacy_policy_title"
+									android:layout_width="0dp"
+									android:layout_height="wrap_content"
+									android:layout_marginLeft="@dimen/content_padding_standard"
+									android:layout_marginTop="10dp"
+									android:layout_marginRight="@dimen/content_padding_standard"
+									android:layout_marginBottom="10dp"
+									android:layout_weight="1"
+									android:ellipsize="end"
+									android:gravity="center_vertical"
+									android:letterSpacing="@dimen/text_description_letter_spacing"
+									android:text="@string/do_not_have_telegram"
+									android:textColor="@color/text_bold_highlight"
+									android:textSize="@dimen/hint_text_size"
+									android:textStyle="bold" />
+
+
+								<ImageView
+									android:id="@+id/telegram_privacy_policy_icon"
+									android:layout_width="wrap_content"
+									android:layout_height="wrap_content"
+									android:layout_marginEnd="@dimen/content_padding_standard"
+									android:layout_marginRight="@dimen/content_padding_standard"
+									android:contentDescription="@string/do_not_have_telegram"
+									android:scaleType="centerInside"
+									tools:src="@drawable/ic_arrow_forward"
+									tools:tint="@color/text_bold_highlight" />
+
+							</LinearLayout>
+
+							<LinearLayout
+								android:id="@+id/osmand_privacy_policy_btn"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="@dimen/content_padding_half"
+								android:background="@drawable/btn_border_bg"
+								android:gravity="center_vertical"
+								android:visibility="visible">
+
+								<net.osmand.telegram.ui.views.TextViewEx
+									android:id="@+id/osmand_privacy_policy_title"
+									android:layout_width="0dp"
+									android:layout_height="wrap_content"
+									android:layout_marginLeft="@dimen/content_padding_standard"
+									android:layout_marginTop="10dp"
+									android:layout_marginRight="@dimen/content_padding_standard"
+									android:layout_marginBottom="10dp"
+									android:layout_weight="1"
+									android:ellipsize="end"
+									android:gravity="center_vertical"
+									android:letterSpacing="@dimen/text_description_letter_spacing"
+									android:text="@string/do_not_have_telegram"
+									android:textColor="@color/text_bold_highlight"
+									android:textSize="@dimen/hint_text_size"
+									android:textStyle="bold" />
+
+								<ImageView
+									android:id="@+id/osmand_privacy_policy_icon"
+									android:layout_width="wrap_content"
+									android:layout_height="wrap_content"
+									android:layout_marginEnd="@dimen/content_padding_standard"
+									android:layout_marginRight="@dimen/content_padding_standard"
+									android:contentDescription="@string/do_not_have_telegram"
+									android:scaleType="centerInside"
+									tools:src="@drawable/ic_arrow_forward"
+									tools:tint="@color/text_bold_highlight"  />
+
+							</LinearLayout>
+
+						</LinearLayout>
+
 						<LinearLayout
 							android:id="@+id/progress_layout"
 							android:layout_width="match_parent"

OsmAnd-telegram/res/layout/my_location_sharing_chat.xml

@@ -107,7 +107,8 @@
 		<LinearLayout
 			android:id="@+id/show_on_map_row"
 			android:layout_width="match_parent"
-			android:layout_height="@dimen/list_item_height_big"
+			android:layout_height="wrap_content"
+			android:minHeight="60dp"
 			android:gravity="center_vertical"
 			android:orientation="horizontal"
 			android:paddingLeft="@dimen/content_padding_standard"
@@ -116,7 +117,7 @@
 			<LinearLayout
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
-				android:layout_gravity="center_vertical"
+				android:layout_gravity="top"
 				android:layout_marginEnd="@dimen/content_padding_standard"
 				android:layout_marginRight="@dimen/content_padding_standard"
 				android:layout_weight="1"
@@ -127,49 +128,33 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_gravity="center_vertical"
-					android:layout_marginEnd="@dimen/content_padding_standard"
-					android:layout_marginRight="@dimen/content_padding_standard"
 					android:text="@string/turn_off_location_sharing"
 					android:textColor="?attr/ctrl_active_color"
 					android:textSize="@dimen/hint_text_size"
+					app:firstBaselineToTopHeight="24sp"
 					app:typeface="@string/font_roboto_medium" />
 
-				<LinearLayout
-					android:layout_width="match_parent"
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:id="@+id/expires_line"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:orientation="horizontal">
+					android:layout_gravity="center_vertical"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/hint_text_size"
+					app:typeface="@string/font_roboto_regular"
+					app:lastBaselineToBottomHeight="10sp"
+					tools:text="@string/expire_at" />
 
-					<net.osmand.telegram.ui.views.TextViewEx
-						android:id="@+id/stop_in"
-						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"
-						tools:text="@string/expire_at" />
-
-					<net.osmand.telegram.ui.views.TextViewEx
-						android:id="@+id/ending_in_first_part"
-						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:id="@+id/ending_in_second_part"
-						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" />
-
-				</LinearLayout>
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:id="@+id/gps_points_line"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:text="@string/gps_points"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/hint_text_size"
+					app:lastBaselineToBottomHeight="16sp"
+					app:typeface="@string/font_roboto_regular" />
 
 			</LinearLayout>
 

OsmAnd-telegram/res/layout/user_list_item.xml

@@ -15,7 +15,8 @@
 		<LinearLayout
 			android:id="@+id/main_view"
 			android:layout_width="match_parent"
-			android:layout_height="@dimen/list_item_height"
+			android:layout_height="wrap_content"
+			android:minHeight="@dimen/list_item_height"
 			android:layout_marginBottom="@dimen/list_item_bottom_margin"
 			android:background="?attr/selectableItemBackground"
 			android:gravity="center_vertical">
@@ -46,6 +47,7 @@
 					android:maxLines="1"
 					android:textColor="?android:textColorPrimary"
 					android:textSize="@dimen/list_item_title_text_size"
+					android:paddingTop="@dimen/content_padding_half"
 					app:typeface="@string/font_roboto_regular"
 					tools:text="Share location"/>
 
@@ -106,6 +108,29 @@
 
 				</LinearLayout>
 
+				<LinearLayout
+					android:id="@+id/received_gps_points_container"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="gone"
+					android:paddingBottom="@dimen/content_padding_half"
+					tools:visibility="visible">
+
+					<net.osmand.telegram.ui.views.TextViewEx
+						android:id="@+id/received_gps_points_description"
+						android:layout_width="0dp"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:ellipsize="end"
+						android:maxLines="1"
+						android:textColor="?attr/android:textColorSecondary"
+						android:textSize="@dimen/list_item_description_text_size"
+						app:firstBaselineToTopHeight="@dimen/list_item_icon_margin_right"
+						app:typeface="@string/font_roboto_regular"
+						tools:text="@string/received_gps_points" />
+
+				</LinearLayout>
+
 			</LinearLayout>
 
 			<CheckBox

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>

OsmAnd-telegram/res/values-ast/strings.xml

@@ -0,0 +1,152 @@
+<?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="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 Tracker 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 Tracker\?</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 Tracker.</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 Tracker 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 Online GPS Tracker</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 Tracker 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 Tracker</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>

OsmAnd-telegram/res/values-be/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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>
@@ -10,7 +10,7 @@
 	<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="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>
@@ -21,7 +21,7 @@
 	<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="battery_optimization_description">Выключыць аптымізацыю батарэі для OsmAnd Tracker, каб прадухіліць нечаканае выключэнне фонавага рэжыму.</string>
 	<string name="sharing_in_background">Абмен у фонавым рэжыме</string>
 	<string name="go_to_settings">Перайсці ў налады</string>
 	<string name="shared_string_later">Пазней</string>
@@ -39,8 +39,8 @@
 	<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="logout_from_osmand_telegram_descr">Вы не зможаце падзяліцца сваім месцазнаходжаннем і ўбачыць месцазнаходжанне іншых. Сапраўды выйсці з OsmAnd Tracker\?</string>
+	<string name="logout_from_osmand_telegram">Выйсці з OsmAnd Tracker\?</string>
 	<string name="shared_string_name">Імя</string>
 	<string name="by_distance">Па адлегласці</string>
 	<string name="by_name">Па імёнах</string>
@@ -58,13 +58,13 @@
 	<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_desc">Для таго, каб скасаваць абмен месцазнаходжаннем, адкрыйце Тэлеграм, перайдзіце ў Налады → Прыватнасць і бяспека → Сеансы і спыніце сеанс OsmAnd Tracker.</string>
 	<string name="disconnect_from_telegram">Як выключыць абмен месцазнаходжаннем у OsmAnd праз Тэлеграм</string>
 	<string name="logout_help_desc">Як выключыць абмен месцазнаходжаннем у OsmAnd праз Тэлеграм</string>
-	<string name="connected_account">Падлучаны рахунак</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_desc">Абраць версію OsmAnd, якую OsmAnd Tracker будзе выкарыстоўваць для адлюстравання пазіцыі.</string>
 	<string name="osmand_connect">Злучэнне з OsmAnd</string>
 	<string name="location_history_desc">Схаваць кантакты, якія не перамяшчаліся пэўны час.</string>
 	<string name="location_history">Гісторыя месцазнаходжанняў</string>
@@ -81,13 +81,13 @@
 	<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_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="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>
@@ -104,13 +104,13 @@
 	<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="app_name">OsmAnd Online GPS Tracker</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="authentication_code_descr">Тэлеграм адправіў вам код для OsmAnd для ўваходу ў акаўнт.</string>
 	<string name="enter_password">Увядзіце пароль</string>
 	<string name="password_descr">Пароль Тэлеграм</string>
 	<string name="shared_string_login">Увайсці</string>
@@ -127,11 +127,11 @@
 	<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="osmand_service_descr">OsmAnd Tracker працуе ў фонавым рэжыме з выключаным экранам.</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="process_service">Сэрвіс OsmAnd Tracker</string>
 	<string name="osmand_logo">Лагатып OsmAnd</string>
 	<string name="install_osmand_dialog_message">Спачатку вам неабходна ўсталяваць бясплатную ці платную версію OsmAnd</string>
 	<string name="install_osmand">Усталяваць OsmAnd</string>
@@ -167,7 +167,7 @@
 	<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="welcome_descr"><b>Абмен месцазнаходжаннем OsmAnd</b> Дае магчымасць дзяліцца сваім месцазнаходжаннем і бачыць месцазнаходжанне іншых у OsmAnd.<br/><br/> Дадатак выкарыстоўвае Telegram API, таму вам неабходны акаўнт Тэлеграм.</string>
 	<string name="my_location">Маё месцазнаходжанне</string>
 	<string name="live_now">Зараз дзейнічае</string>
 
@@ -177,4 +177,21 @@
 	<string name="shared_string_map">Мапа</string>
 	<string name="shared_string_text">Тэкст</string>
 	<string name="map_and_text">Мапа і тэкст</string>
-	</resources>
+    <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">Храналогія</string>
+    <string name="please_update_osmand">Калі ласка, абнавіце OsmAnd каб паглядзець даныя на мапе</string>
+    <string name="shared_string_update">Абнавіць</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>
+</resources>

OsmAnd-telegram/res/values-da/strings.xml

@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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 pludseligt bliver slukket, når det er i baggrunden.</string>
+	<string name="battery_optimization_description">Sluk for batterioptimering af OsmAnd Tracker, 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>
@@ -18,8 +18,8 @@
 	<string name="add_device">Tilføj enhed</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>
-	<string name="logout_from_osmand_telegram">Log ud af OsmAnd Telegram\?</string>
+	<string name="logout_from_osmand_telegram_descr">Er du sikker på at du vil logge ud af OsmAnd Tracker, så du ikke kan dele din placering eller se placeringen af andre\?</string>
+	<string name="logout_from_osmand_telegram">Log ud af OsmAnd Tracker\?</string>
 	<string name="shared_string_name">Navn</string>
 	<string name="by_distance">Efter afstand</string>
 	<string name="by_name">Efter navn</string>
@@ -37,13 +37,13 @@
 	<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="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_desc">"Sådan tilbagekaldes adgang til placeringsdeling. Åbn Telegram, gå til Settings - Privacy and Security - Sessions og afslut OsmAnd Tracker session. "</string>
 	<string name="disconnect_from_telegram">Hvordan afbrydes OsmAnd placeringsdeling fra Telegram</string>
 	<string name="logout_help_desc">Hvordan afbrydes OsmAnd placeringsdeling fra Telegram</string>
 	<string name="connected_account">Tilsluttet konto</string>
 	<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_desc">Vælg den OsmAnd version, som OsmAnd Tracker bruger til vise placeringer på kortet.</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>
@@ -82,7 +82,7 @@
 	<string name="my_location_search_hint">Søg: gruppe eller kontakt</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="app_name">OsmAnd Online GPS Tracker</string>
 	<string name="phone_number_title">Telefonnummer</string>
 	<string name="phone_number_descr">Telefonnummer i internationalt format</string>
 	<string name="shared_string_password">Adgangskode</string>
@@ -101,11 +101,11 @@
 	<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="osmand_service_descr">OsmAnd Tracker 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="process_service">OsmAnd Telegram tjeneste</string>
+	<string name="process_service">OsmAnd Tracker 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>
 	<string name="install_osmand">Installer OsmAnd</string>
@@ -179,4 +179,21 @@
 	<string name="shared_string_map">Kort</string>
 	<string name="shared_string_text">Tekst</string>
 	<string name="map_and_text">Kort og tekst</string>
-	</resources>
+    <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>
+    <string name="please_update_osmand">Opdater OsmAnd for at se data på kortet</string>
+    <string name="shared_string_update">Opdater</string>
+    <string name="gps_points_in_buffer">sendt (%1$d i buffer)</string>
+    <string name="points_size">%1$s punkter</string>
+    <string name="shared_string_date">Dato</string>
+    <string name="shared_string_collected">Indsamlet</string>
+    <string name="gps_points">GPS punkter</string>
+    <string name="shared_string_sent">Sendt</string>
+    <string name="monitoring_is_enabled">Overvågning er aktiveret</string>
+    <string name="monitoring_is_disabled">Overvågning er deaktiveret</string>
+    <string name="time_on_the_move">tid i bevægelse</string>
+</resources>

OsmAnd-telegram/res/values-de/strings.xml

@@ -1,182 +1,199 @@
 <?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="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="no_internet_connection">Keine Internetverbindung</string>
-	<string name="shared_string_disable">Deaktivieren</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>
-	<string name="share_location_as">Standort teilen als</string>
-	<string name="live_now_description">Kontakte und Gruppen, die ihren Standort mit Ihnen teilen.</string>
-	<string name="logout_from_osmand_telegram">Aus OsmAnd Telegram abmelden\?</string>
-	<string name="shared_string_name">"Name "</string>
-	<string name="by_distance">Nach Entfernung</string>
-	<string name="by_name">Nach Namen</string>
-	<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 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>
-	<string name="time_ago">vor</string>
-	<string name="last_response">Letzte Antwort</string>
-	<string name="shared_string_group">Gruppe</string>
-	<string name="logout_no_internet_msg">Verbinden Sie sich mit dem Internet, um sich ordnungsgemäß von Telegram abzumelden.</string>
-	<string name="shared_string_close">Schließen</string>
-	<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 anzuzeigen.</string>
-	<string name="osmand_connect">OsmAnd verbinden</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 sich ein Kontakt bewegt hat.</string>
-	<string name="send_my_location">Meinen Standort senden</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 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>
-	<string name="do_not_have_telegram">Ich habe kein Telegram-Konto</string>
-	<string name="enter_phone_number">Telefonnummer eingeben</string>
-	<string name="enter_authentication_code">Authentifizierungscode eingeben</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">Installieren</string>
-	<string name="shared_string_share">Teilen</string>
-	<string name="shared_string_back">Zurück</string>
-	<string name="visible_time_for_all">Für alle sichtbare Zeit</string>
-	<string name="set_time">Zeit einstellen</string>
-	<string name="my_location_search_hint">Suche: Gruppe oder Kontakt</string>
-	<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 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">Abmelden</string>
-	<string name="not_logged_in">Sie sind nicht angemeldet</string>
-	<string name="shared_string_continue">Fortfahren</string>
-	<string name="shared_string_cancel">Abbrechen</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 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="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>
-	<string name="install_osmand">OsmAnd installieren</string>
-	<string name="show_users_on_map">Benutzer auf der Karte anzeigen</string>
-	<string name="active_chats">Aktive Chats</string>
-	<string name="shared_string_authorization">Autorisation</string>
-	<string name="shared_string_authorization_descr">Bitte geben Sie Ihre Telegram-Telefonnummer im internationalen Format ein</string>
-	<string name="shared_string_welcome">Willkommen</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="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">Kilometer pro Stunde</string>
-	<string name="si_mph">Meilen pro Stunde</string>
-	<string name="si_m_s">Meter pro Sekunde</string>
-	<string name="si_min_km">Minuten pro Kilometer</string>
-	<string name="si_min_m">Minuten pro Meile</string>
-	<string name="si_nm_h">Seemeilen pro Stunde (Knoten)</string>
-	<string name="si_mi_feet">Meilen/Fuß</string>
-	<string name="si_mi_yard">Meilen/Yards</string>
-	<string name="si_km_m">Kilometer/Meter</string>
-	<string name="si_nm">Seemeilen</string>
-	<string name="si_mi_meters">Meilen/Meter</string>
-	<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="my_location">Mein Standort</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">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, 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="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">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">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</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, 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>
-	<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>
+<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="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="no_internet_connection">Keine Internetverbindung</string>
+    <string name="shared_string_disable">Deaktivieren</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>
+    <string name="share_location_as">Standort teilen als</string>
+    <string name="live_now_description">Kontakte und Gruppen, die ihren Standort mit Ihnen teilen.</string>
+    <string name="logout_from_osmand_telegram">Aus OsmAnd Telegram abmelden\?</string>
+    <string name="shared_string_name">"Name "</string>
+    <string name="by_distance">Nach Entfernung</string>
+    <string name="by_name">Nach Namen</string>
+    <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 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>
+    <string name="time_ago">vor</string>
+    <string name="last_response">Letzte Antwort</string>
+    <string name="shared_string_group">Gruppe</string>
+    <string name="logout_no_internet_msg">Verbinden Sie sich mit dem Internet, um sich ordnungsgemäß von Telegram abzumelden.</string>
+    <string name="shared_string_close">Schließen</string>
+    <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 anzuzeigen.</string>
+    <string name="osmand_connect">OsmAnd verbinden</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 sich ein Kontakt bewegt hat.</string>
+    <string name="send_my_location">Meinen Standort senden</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 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>
+    <string name="do_not_have_telegram">Ich habe kein Telegram-Konto</string>
+    <string name="enter_phone_number">Telefonnummer eingeben</string>
+    <string name="enter_authentication_code">Authentifizierungscode eingeben</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">Installieren</string>
+    <string name="shared_string_share">Teilen</string>
+    <string name="shared_string_back">Zurück</string>
+    <string name="visible_time_for_all">Für alle sichtbare Zeit</string>
+    <string name="set_time">Zeit einstellen</string>
+    <string name="my_location_search_hint">Suche: Gruppe oder Kontakt</string>
+    <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 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">Abmelden</string>
+    <string name="not_logged_in">Sie sind nicht angemeldet</string>
+    <string name="shared_string_continue">Fortfahren</string>
+    <string name="shared_string_cancel">Abbrechen</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 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="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>
+    <string name="install_osmand">OsmAnd installieren</string>
+    <string name="show_users_on_map">Benutzer auf der Karte anzeigen</string>
+    <string name="active_chats">Aktive Chats</string>
+    <string name="shared_string_authorization">Autorisation</string>
+    <string name="shared_string_authorization_descr">Bitte geben Sie Ihre Telegram-Telefonnummer im internationalen Format ein</string>
+    <string name="shared_string_welcome">Willkommen</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="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">Kilometer pro Stunde</string>
+    <string name="si_mph">Meilen pro Stunde</string>
+    <string name="si_m_s">Meter pro Sekunde</string>
+    <string name="si_min_km">Minuten pro Kilometer</string>
+    <string name="si_min_m">Minuten pro Meile</string>
+    <string name="si_nm_h">Seemeilen pro Stunde (Knoten)</string>
+    <string name="si_mi_feet">Meilen/Fuß</string>
+    <string name="si_mi_yard">Meilen/Yards</string>
+    <string name="si_km_m">Kilometer/Meter</string>
+    <string name="si_nm">Seemeilen</string>
+    <string name="si_mi_meters">Meilen/Meter</string>
+    <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="my_location">Mein Standort</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">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, 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="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">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">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</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, 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>
+    <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">Zeitachse</string>
+    <string name="please_update_osmand">Bitte aktualisieren Sie OsmAnd, um die Daten auf der Karte zu sehen</string>
+    <string name="shared_string_update">Aktualisieren</string>
+    <string name="gps_points_in_buffer">gesendet (%1$d im Puffer)</string>
+    <string name="points_size">%1$d Punkte</string>
+    <string name="shared_string_date">Datum</string>
+    <string name="shared_string_collected">Gesammelt</string>
+    <string name="gps_points">GPS-Punkte</string>
+    <string name="shared_string_sent">Gesendet</string>
+    <string name="shared_string_telegram">Telegram</string>
+    <string name="privacy_policy_use_telegram">Telegram (die Messaging-App) wird verwendet, um sich mit Menschen zu verbinden und mit ihnen zu kommunizieren.</string>
 </resources>

OsmAnd-telegram/res/values-es-rUS/strings.xml

@@ -1,180 +1,208 @@
 <?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">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_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="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">Añadir dispositivo</string>
-	<string name="share_location_as">Compartir ubicación como</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>
-	<string name="by_group">Por grupo</string>
-	<string name="shared_string_sort">Ordenar</string>
-	<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">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">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 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 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 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 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">Ubicación</string>
-	<string name="sharing_time">Tiempo compartido</string>
-	<string name="expire_at">Expira en</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 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 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>
-	<string name="set_visible_time_for_all">Ajustar la hora visible 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">Compartir</string>
-	<string name="shared_string_back">Atrás</string>
-	<string name="visible_time_for_all">Tiempo visible para todos</string>
-	<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">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>
-	<string name="phone_number_descr">Número de teléfono en formato internacional</string>
-	<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">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">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="shared_string_continue">Continuar</string>
-	<string name="shared_string_cancel">Cancelar</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 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="process_service">Servicio de OsmAnd Telegram</string>
-	<string name="osmand_logo">Logotipo 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">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>
-	<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">Kiló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 kilómetro</string>
-	<string name="si_min_m">Minutos por milla</string>
-	<string name="si_nm_h">Millas náuticas por hora (nudos)</string>
-	<string name="si_mi_feet">Millas/pies</string>
-	<string name="si_mi_yard">Millas/yardas</string>
-	<string name="si_km_m">Kilómetros/metros</string>
-	<string name="si_nm">Millas náuticas</string>
-	<string name="si_mi_meters">Millas/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">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>
-
-
-<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>
+<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">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_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="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">Añadir dispositivo</string>
+    <string name="share_location_as">Compartir ubicación como</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>
+    <string name="by_group">Por grupo</string>
+    <string name="shared_string_sort">Ordenar</string>
+    <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">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">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 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 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 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 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">Ubicación</string>
+    <string name="sharing_time">Tiempo compartido</string>
+    <string name="expire_at">Expira en</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 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 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>
+    <string name="set_visible_time_for_all">Ajustar la hora visible 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">Compartir</string>
+    <string name="shared_string_back">Atrás</string>
+    <string name="visible_time_for_all">Tiempo visible para todos</string>
+    <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">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>
+    <string name="phone_number_descr">Número de teléfono en formato internacional</string>
+    <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">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">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="shared_string_continue">Continuar</string>
+    <string name="shared_string_cancel">Cancelar</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 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="process_service">Servicio de OsmAnd Telegram</string>
+    <string name="osmand_logo">Logotipo 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">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>
+    <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">Kiló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 kilómetro</string>
+    <string name="si_min_m">Minutos por milla</string>
+    <string name="si_nm_h">Millas náuticas por hora (nudos)</string>
+    <string name="si_mi_feet">Millas/pies</string>
+    <string name="si_mi_yard">Millas/yardas</string>
+    <string name="si_km_m">Kilómetros/metros</string>
+    <string name="si_nm">Millas náuticas</string>
+    <string name="si_mi_meters">Millas/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">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>
+    <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">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 GPS</string>
+    <string name="shared_string_sent">Enviado</string>
+    <string name="please_update_osmand">Actualiza OsmAnd para ver datos en el mapa</string>
+    <string name="shared_string_update">Actualizar</string>
+    <string name="shared_string_telegram">Telegram</string>
+    <string name="privacy_policy_use_telegram">Telegram (la aplicación de mensajería) se utiliza para conectarse y comunicarse con las personas.</string>
+    <string name="privacy_policy_telegram_client">La plataforma abierta de Telegram y «OsmAnd Tracker» es uno de los clientes. Los contactos pueden utilizar cualquier otro cliente de Telegram.</string>
+    <string name="privacy_policy_agree">Al pulsar en continuar, acepta la Políticas de Privacidad de Telegram y de OsmAnd.</string>
+    <string name="shared_string_accept">Aceptar</string>
+    <string name="telegram_privacy_policy">Política de privacidad de Telegram</string>
+    <string name="osmand_privacy_policy">Política de privacidad de OsmAnd</string>
+    <string name="how_it_works">Cómo funciona</string>
+    <string name="received_gps_points">Puntos GPX recibidos: %1$s</string>
+    <string name="shared_string_appearance">Aspecto</string>
+    <string name="show_gps_points">Mostrar puntos GPS</string>
+    <string name="show_gps_points_descr">Muestra la cantidad de puntos GPS recibidos y enviados.</string>
 </resources>

OsmAnd-telegram/res/values-es/strings.xml

@@ -1,7 +1,7 @@
 <?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">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="battery_optimization_description">Desactivar la optimización de la batería para OsmAnd Tracker 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>
@@ -18,8 +18,8 @@
 	<string name="add_device">Añadir dispositivo</string>
 	<string name="share_location_as">Compartir ubicación como</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="logout_from_osmand_telegram_descr">¿Cerrar sesión en OsmAnd Tracker\? 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 Tracker\?</string>
 	<string name="shared_string_name">Nombre</string>
 	<string name="by_distance">Por distancia</string>
 	<string name="by_name">Por nombre</string>
@@ -43,7 +43,7 @@
 	<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 el cual «OsmAnd Telegram» utilizará para mostrar las ubicaciones.</string>
+	<string name="osmand_connect_desc">Elija la versión de OsmAnd el cual «OsmAnd Tracker» utilizará para mostrar las ubicaciones.</string>
 	<string name="osmand_connect">Conectar OsmAnd</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>
@@ -82,7 +82,7 @@
 	<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="app_name">OsmAnd Online GPS Tracker</string>
 	<string name="phone_number_title">Número de teléfono</string>
 	<string name="phone_number_descr">Número de teléfono en formato internacional</string>
 	<string name="shared_string_password">Contraseña</string>
@@ -101,11 +101,11 @@
 	<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="osmand_service_descr">OsmAnd Tracker 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="process_service">Servicio de OsmAnd Telegram</string>
+	<string name="process_service">Servicio de OsmAnd Tracker</string>
 	<string name="osmand_logo">Logotipo 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>
@@ -177,4 +177,21 @@
     <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">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>
+    <string name="please_update_osmand">Actualice OsmAnd para ver datos en el mapa</string>
+    <string name="shared_string_update">Actualizar</string>
 </resources>

OsmAnd-telegram/res/values-fa/strings.xml

@@ -11,7 +11,7 @@
 	<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="battery_optimization_description">بهینه‌سازی باتری را برای OsmAnd Tracker غیرفعال کنید تا هنگامی که در پس‌زمینه کار می‌کند ناگهان بسته نشود.</string>
 	<string name="go_to_settings">برو به تنظیمات</string>
 	<string name="shared_string_later">بعداً</string>
 	<string name="not_sent_yet">هنوز ارسال نشده</string>

OsmAnd-telegram/res/values-gl/strings.xml

@@ -18,8 +18,8 @@
 	<string name="add_device">Engadir dispositivo</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="logout_from_osmand_telegram_descr">Está na certeza de que desexa desconectarse do Tracker 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 Tracker OsmAnd\?</string>
 	<string name="shared_string_name">Nome</string>
 	<string name="by_distance">Pola distancia</string>
 	<string name="by_name">Polo nome</string>
@@ -88,12 +88,12 @@
 	<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="battery_optimization_description">Desactiva-la optimización da batería para o OsmAnd Tracker 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_desc">Escolla a versión do OsmAnd na cal o «OsmAnd Tracker» 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>
@@ -116,7 +116,7 @@
 	<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="app_name">OsmAnd Online GPS Tracker</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>
@@ -138,11 +138,11 @@
 	<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="osmand_service_descr">O OsmAnd Tracker 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="process_service">Servizo do OsmAnd Tracker</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>
@@ -177,4 +177,13 @@
 	<string name="shared_string_map">Mapa</string>
 	<string name="shared_string_text">Texto</string>
 	<string name="map_and_text">Mapa e texto</string>
-	</resources>
+    <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">Liña do tempo</string>
+</resources>

OsmAnd-telegram/res/values-he/strings.xml

@@ -1,48 +1,49 @@
 <?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>
+<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>
@@ -63,4 +64,145 @@
     <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="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 Online GPS Tracker</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>
+    <string name="please_update_osmand">נא לעדכן את OsmAnd כדי לצפות בנתונים במפה</string>
+    <string name="shared_string_update">עדכון</string>
+    <string name="shared_string_telegram">טלגרם</string>
+    <string name="privacy_policy_use_telegram">אנו משתמשים בטלגרם (יישומון התכתבות) כדי להתחבר לאנשים ולהקל עליך לתקשר אתם.</string>
+    <string name="privacy_policy_telegram_client">הפלטפורמה הפתוחה של טלגרם והעוקב של OsmAnd נמנים מבין לקוחותינו. אנשי הקשר שלך יכולים להשתמש בכל לקוח טלגרם שיבחרו.</string>
+    <string name="privacy_policy_agree">לחיצה על המשך מהווה את הסכמתך למדיניות הפרטיות של טלגרם ולמדיניות הפרטיות של OsmAnd.</string>
+    <string name="shared_string_accept">קבלה</string>
+    <string name="telegram_privacy_policy">מדיניות הפרטיות של טלגרם</string>
+    <string name="osmand_privacy_policy">מדיניות הפרטיות של OsmAnd</string>
+    <string name="how_it_works">כיצד זה עובד</string>
+    <string name="received_gps_points">"התקבלו נקודות GPX:‏ %1$s "</string>
+    <string name="shared_string_appearance">מראה</string>
+    <string name="show_gps_points">הצגת נקודות GPS</string>
+    <string name="show_gps_points_descr">הצגת כמות נקודות ה־GPS שנאספו ונשלחו.</string>
 </resources>

OsmAnd-telegram/res/values-hu/strings.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="shared_string_telegram">Telegram</string>
+    <string name="privacy_policy_use_telegram">A Telegram (üzenetküldő alkalmazás) a másokkal való összekapcsolódásra és kommunikációra használható.</string>
+    <string name="privacy_policy_telegram_client">A Telegram egy nyílt platform, amelynek egyik ügyfele az OsmAnd Tracker. Partnerei bármelyik másik Telegram kliensprogramot is használhatják.</string>
+    <string name="privacy_policy_agree">A továbbra kattintva elfogadja a Telegram és az OsmAnd adatvédelmi irányelveit.</string>
+    <string name="shared_string_accept">Elfogadás</string>
+    <string name="telegram_privacy_policy">Telegram adatvédelmi irányelvei</string>
+    <string name="osmand_privacy_policy">OsmAnd adatvédelmi irányelvei</string>
+    <string name="how_it_works">Hogyan működik\?</string>
+    <string name="received_gps_points">Kapott GPX-pontok: %1$s</string>
+    <string name="shared_string_appearance">Megjelenés</string>
+    <string name="show_gps_points">GPS-pontok megjelenítése</string>
+    <string name="show_gps_points_descr">Gyűjtött és küldött GPS-pontok mennyiségének megjelenítése.</string>
+    <string name="please_update_osmand">Az adatok térképen való megtekintéséhez kérjük, frissítse az OsmAndot.</string>
+    <string name="shared_string_update">Frissítés</string>
+    <string name="gps_points_in_buffer">elküldve (%1$d a pufferben)</string>
+    <string name="points_size">%1$d pont</string>
+    <string name="shared_string_date">Dátum</string>
+    <string name="shared_string_collected">Gyűjtve</string>
+    <string name="gps_points">GPS-pont</string>
+    <string name="shared_string_sent">Elküldve</string>
+    <string name="monitoring_is_enabled">Figyelemmel kísérés engedélyezve</string>
+    <string name="monitoring_is_disabled">Figyelemmel kísérés letiltva</string>
+    <string name="time_on_the_move">Mozgással töltött idő</string>
+    <string name="average_altitude">Átlagos magasság</string>
+    <string name="average_speed">Átlagsebesség</string>
+    <string name="open_in_osmand">Megnyitás az OsmAndban</string>
+    <string name="end_date">Záró dátum</string>
+    <string name="start_date">Kezdő dátum</string>
+    <string name="send_location_as">Helyzet elküldése mint</string>
+    <string name="send_location_as_descr">Válassza ki, hogyan nézzenek ki a helyzetét tartalmazó üzenetek.</string>
+    <string name="shared_string_map">Térkép</string>
+    <string name="shared_string_text">Szöveg</string>
+    <string name="map_and_text">Térkép és szöveg</string>
+    <string name="last_update_from_telegram">Utolsó frissítés a Telegramból</string>
+    <string name="enter_another_device_name">Válasszon egy olyan nevet, amelyet még nem használt</string>
+    <string name="device_added_successfully">%1$s hozzáadva.</string>
+    <string name="shared_string_add">Hozzáadás</string>
+    <string name="error_adding_new_device">Új eszköz hozzáadása sikertelen</string>
+    <string name="enter_device_name_description">Az új eszköz neve legfeljebb 200 karakter hosszú lehet.</string>
+    <string name="device_name_is_too_long">Túl hosszú az eszköz neve</string>
+    <string name="device_name_cannot_be_empty">Az eszköz nevének helye nem lehet üres</string>
+    <string name="device_name">Eszköz neve</string>
+    <string name="shared_string_hide">Elrejtés</string>
+    <string name="share_location_as_description_second_line">Az eszköz azonosítóját létrehozhatja és megtekintheti telegram ügyfélszoftverrel a(z) %1$s chatbotot használva. %2$s</string>
+</resources>

OsmAnd-telegram/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="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>
@@ -21,7 +21,7 @@
 	<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="battery_optimization_description">Disattiva l\'ottimizzazione della batteria per OsmAnd Tracker 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>
@@ -39,7 +39,7 @@
 	<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="logout_from_osmand_telegram">Disconnettersi da OsmAnd Tracker\?</string>
 	<string name="shared_string_name">Nome</string>
 	<string name="by_distance">Per distanza</string>
 	<string name="by_name">Per nome</string>
@@ -63,7 +63,7 @@
 	<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="osmand_connect_desc">Scegli la versione di OsmAnd che OsmAnd Tracker 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>
@@ -100,7 +100,7 @@
 	<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="app_name">OsmAnd Online GPS Tracker</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>
@@ -123,11 +123,11 @@
 	<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="osmand_service_descr">OsmAnd Tracker 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="process_service">Servizio di OsmAnd Tracker</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>
@@ -163,8 +163,8 @@
 	<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">OsmAnd connect</string>
+<string name="logout_from_osmand_telegram_descr">Sei sicuro di volerti disconnettere da OsmAnd Tracker, 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>
@@ -172,4 +172,18 @@
 	<string name="m_s">m/s</string>
 	<string name="km_h">km/h</string>
 	<string name="mile_per_hour">mi/h</string>
-	</resources>
+    <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="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>

OsmAnd-telegram/res/values-nb/strings.xml

@@ -1,182 +1,206 @@
-<?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">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 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="no_internet_connection">Ingen internettilknytning</string>
-	<string name="shared_string_disable">Skru av</string>
-	<string name="add_device">Legg til enhet</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>
-	<string name="by_name">Etter navn</string>
-	<string name="by_group">Etter gruppe</string>
-	<string name="shared_string_sort">Sorter</string>
-	<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 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">Koble til Internett for å logge ut av Telegram ordentlig.</string>
-	<string name="shared_string_close">Lukk</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 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">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 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="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 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>
-	<string name="shared_string_off">Av</string>
-	<string name="already_registered_in_telegram">Du trenger registrert konto og telefonnummer i Telegram</string>
-	<string name="do_not_have_telegram">Jeg har ikke en Telegram-konto</string>
-	<string name="enter_phone_number">Skriv inn telefonnummer</string>
-	<string name="enter_authentication_code">Skriv inn identitetsbekreftelseskode</string>
-	<string name="set_visible_time_for_all">Sett synlig tid for alle</string>
-	<string name="hours_and_minutes_format">%1$d t %2$d m</string>
-	<string name="minutes_format">%1$d m</string>
-	<string name="hours_format">%1$d t</string>
-	<string name="shared_string_install">Installer</string>
-	<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 posisjon i sanntid.</string>
-	<string name="set_time">Sett tid</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">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>
-	<string name="phone_number_descr">Telefonnummer i internasjonalt format</string>
-	<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">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</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="shared_string_continue">Fortsett</string>
-	<string name="shared_string_cancel">Avbryt</string>
-	<string name="shared_string_settings">Innstillinger</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 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>
-	<string name="install_osmand">Installer OsmAnd</string>
-	<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 ditt Telegram-telefonnummer i internasjonalt format</string>
-	<string name="shared_string_welcome">Velkommen</string>
-
-	<string name="km">km</string>
-	<string name="m">m</string>
-	<string name="si_kmh">Kilometer i timen</string>
-	<string name="si_m_s">Meter i sekunder</string>
-	<string name="si_min_km">Minutter per kilometer</string>
-	<string name="si_nm_h">Nautiske mil per time (knop)</string>
-	<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="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 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 posisjon</string>
-	<string name="initializing">Starter</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>
-	<string name="mile">mil</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/t</string>
-	<string name="m_s">m/s</string>
-	<string name="km_h">km/t</string>
-	<string name="mile_per_hour">mph</string>
-	<string name="si_mph">Engelske mil i timen</string>
-	<string name="si_min_m">Minutter per engelske mil</string>
-	<string name="si_mi_feet">Engelske mil/fot</string>
-	<string name="si_mi_yard">Engelske mil/yard</string>
-	<string name="si_km_m">Kilometer/meter</string>
-	<string name="si_nm">Nautiske mil</string>
-	<string name="si_mi_meters">Engelske mil/meter</string>
-	<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>
-	</resources>
+<?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">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 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="no_internet_connection">Ingen internettilknytning</string>
+    <string name="shared_string_disable">Skru av</string>
+    <string name="add_device">Legg til enhet</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>
+    <string name="by_name">Etter navn</string>
+    <string name="by_group">Etter gruppe</string>
+    <string name="shared_string_sort">Sorter</string>
+    <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 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">Koble til Internett for å logge ut av Telegram ordentlig.</string>
+    <string name="shared_string_close">Lukk</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 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">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 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="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 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>
+    <string name="shared_string_off">Av</string>
+    <string name="already_registered_in_telegram">Du trenger registrert konto og telefonnummer i Telegram</string>
+    <string name="do_not_have_telegram">Jeg har ikke en Telegram-konto</string>
+    <string name="enter_phone_number">Skriv inn telefonnummer</string>
+    <string name="enter_authentication_code">Skriv inn identitetsbekreftelseskode</string>
+    <string name="set_visible_time_for_all">Sett synlig tid for alle</string>
+    <string name="hours_and_minutes_format">%1$d t %2$d m</string>
+    <string name="minutes_format">%1$d m</string>
+    <string name="hours_format">%1$d t</string>
+    <string name="shared_string_install">Installer</string>
+    <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 posisjon i sanntid.</string>
+    <string name="set_time">Sett tid</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">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>
+    <string name="phone_number_descr">Telefonnummer i internasjonalt format</string>
+    <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">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</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="shared_string_continue">Fortsett</string>
+    <string name="shared_string_cancel">Avbryt</string>
+    <string name="shared_string_settings">Innstillinger</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 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>
+    <string name="install_osmand">Installer OsmAnd</string>
+    <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 ditt Telegram-telefonnummer i internasjonalt format</string>
+    <string name="shared_string_welcome">Velkommen</string>
+    <string name="km">km</string>
+    <string name="m">m</string>
+    <string name="si_kmh">Kilometer i timen</string>
+    <string name="si_m_s">Meter i sekunder</string>
+    <string name="si_min_km">Minutter per kilometer</string>
+    <string name="si_nm_h">Nautiske mil per time (knop)</string>
+    <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="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 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 posisjon</string>
+    <string name="initializing">Starter</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>
+    <string name="mile">mil</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/t</string>
+    <string name="m_s">m/s</string>
+    <string name="km_h">km/t</string>
+    <string name="mile_per_hour">mph</string>
+    <string name="si_mph">Engelske mil i timen</string>
+    <string name="si_min_m">Minutter per engelske mil</string>
+    <string name="si_mi_feet">Engelske mil/fot</string>
+    <string name="si_mi_yard">Engelske mil/yard</string>
+    <string name="si_km_m">Kilometer/meter</string>
+    <string name="si_nm">Nautiske mil</string>
+    <string name="si_mi_meters">Engelske mil/meter</string>
+    <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">Tidslinje</string>
+    <string name="shared_string_telegram">Telegram</string>
+    <string name="privacy_policy_telegram_client">Telegram åpen plattform, og OsmAnd-sporeren er én av kundene. Dine kontakter kan bruke enhver annen Telegram-klient.</string>
+    <string name="privacy_policy_agree">Ved å klikke \"Fortsett\" samtykker du til Telegram-personvernspraksisen, og OsmAnd-personvernspraksisen.</string>
+    <string name="shared_string_accept">Godta</string>
+    <string name="telegram_privacy_policy">Telegram-personvernspraksis</string>
+    <string name="how_it_works">Hvordan det virker</string>
+    <string name="received_gps_points">Mottatte GPX-punkter: %1$s</string>
+    <string name="shared_string_appearance">Utseende</string>
+    <string name="show_gps_points">Vis GPS-punkter</string>
+    <string name="show_gps_points_descr">Vis mengden innsamlede og sendte GPS-punkter.</string>
+    <string name="shared_string_update">Oppdater</string>
+    <string name="gps_points_in_buffer">sendt (%1$d i hurtiglager)</string>
+    <string name="points_size">%1$d punkter</string>
+    <string name="shared_string_date">Dato</string>
+    <string name="shared_string_collected">Innsamlet</string>
+    <string name="gps_points">GPS-punkter</string>
+    <string name="shared_string_sent">Sendt</string>
+</resources>

OsmAnd-telegram/res/values-pl/strings.xml

@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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.
+	<string name="battery_optimization_description">Aby stabilnie udostępniać swoją pozycję w tle, zaleca się wyłączenie optymalizacji baterii dla Tracker OsmAnd.
 \n
 \nJeśli włączona jest optymalizacja, system może automatycznie wyłączyć aplikację działającą w tle (gdy ekran jest zablokowany i/lub aplikacja jest zminimalizowana). Dzieje się tak bez powiadomienia i powoduje zatrzymanie położenia geograficznego.</string>
 	<string name="sharing_in_background">Udostępnianie w tle</string>
@@ -21,8 +21,8 @@
 	<string name="add_device">Dodaj urządzenie</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, 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="logout_from_osmand_telegram_descr">Czy na pewno chcesz się wylogować z OsmAnd Tracker, aby nie udostępniać lokalizacji ani nie widzieć lokalizacji innych\?</string>
+	<string name="logout_from_osmand_telegram">Wylogować się z OsmAnd Tracker\?</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>
@@ -45,7 +45,7 @@
 	<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, którą Telegram OsmAnd będzie używał do wyświetlaniu pozycji.</string>
+	<string name="osmand_connect_desc">Wybierz wersję OsmAnd, którą Tracker 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 zostały przeniesione w określonym czasie.</string>
 	<string name="location_history">Historia lokalizacji</string>
@@ -83,7 +83,7 @@
 	<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="app_name">OsmAnd Online GPS Tracker</string>
 	<string name="phone_number_title">Numer telefonu</string>
 	<string name="phone_number_descr">Numer telefonu w formacie międzynarodowym</string>
 	<string name="shared_string_password">Hasło</string>
@@ -103,11 +103,11 @@
 	<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="osmand_service_descr">Tracker 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="process_service">Usługa Telegramu OsmAnd</string>
+	<string name="process_service">Usługa Tracker 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>
 	<string name="install_osmand">Zainstaluj OsmAnd</string>
@@ -179,4 +179,20 @@
 	<string name="shared_string_map">Mapa</string>
 	<string name="shared_string_text">Tekst</string>
 	<string name="map_and_text">Mapa i tekst</string>
-	</resources>
+    <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">Linia czasu</string>
+    <string name="please_update_osmand">Proszę zaktualizować OsmAnd, by zobaczyć dane na mapie</string>
+    <string name="shared_string_update">Aktualizuj</string>
+    <string name="points_size">%1$d punktów</string>
+    <string name="shared_string_date">Data</string>
+    <string name="shared_string_collected">Zgromadzone</string>
+    <string name="gps_points">Punkty GPS</string>
+    <string name="shared_string_sent">Wyślij</string>
+</resources>

OsmAnd-telegram/res/values-pt-rBR/strings.xml

@@ -0,0 +1,209 @@
+<?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 Tracker 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 Tracker 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 Tracker\?</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 Tracker usa para exibir posições.</string>
+    <string name="osmand_connect">"Conectar 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 Online GPS Tracker</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 Tracker é 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 Tracker</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">"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>
+    <string name="please_update_osmand">Por favor, atualize o OsmAnd para ver os dados no mapa</string>
+    <string name="shared_string_update">"Atualizar "</string>
+    <string name="shared_string_telegram">Telegram</string>
+    <string name="privacy_policy_use_telegram">Telegrama (o aplicativo de mensagens) é usado para se conectar e se comunicar com as pessoas.</string>
+    <string name="privacy_policy_telegram_client">Telegram é uma plataforma aberta e OsmAnd Tracker é um dos clientes. Seus contatos podem usar qualquer outro cliente Telegram.</string>
+    <string name="privacy_policy_agree">Ao clicar em continuar, você concorda com a Política de Privacidade da Telegram e a Política de Privacidade da OsmAnd.</string>
+    <string name="shared_string_accept">Aceitar</string>
+    <string name="telegram_privacy_policy">Política de privacidade do Telegram</string>
+    <string name="osmand_privacy_policy">"Política de privacidade do OsmAnd "</string>
+    <string name="how_it_works">Como funciona</string>
+    <string name="received_gps_points">Pontos GPX recebidos: %1$s</string>
+    <string name="shared_string_appearance">Aparência</string>
+    <string name="show_gps_points">Mostrar pontos de GPS</string>
+    <string name="show_gps_points_descr">Mostrar quantidade de pontos de GPS coletados e enviados.</string>
+</resources>

OsmAnd-telegram/res/values-ru/strings.xml

@@ -1,5 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+	<string name="timeline_available_for_free_now">"Попробуйте функцию Хронология бесплатно.</string>
+	<string name="location_recording_enabled">Запись местоположений включена</string>
+	<string name="privacy_policy_use_telegram">Мы используем Telegram (messaging app), чтобы соединять людей и чтобы вам было проще общаться с ними.</string>
+	<string name="privacy_policy_telegram_client">Telegram открытая платформа и OsmAnd Tracker является одним из клиентов. Ваши контакты могут использовать любой другой Telegram client.</string>
+	<string name="privacy_policy_agree">Нажимая продолжить, вы соглашаетесь с Telegram Privacy Policy и OsmAnd Privacy Policy.</string>
+	<string name="timeline_description">Включите мониторинг, чтобы сохранять все местоположения в истории.</string>
 	<string name="last_update_from_telegram">Последнее обновление в Telegram</string>
 	<string name="device_name">Имя устройства</string>
 	<string name="shared_string_hide">Спрятать</string>
@@ -20,9 +26,9 @@
 	<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="battery_optimization_description">Отключите оптимизацию батареи для OsmAnd Tracker, чтобы оно не было внезапно отключено в фоновом режиме.</string>
 	<string name="osmand_service">Фоновый режим</string>
-	<string name="osmand_service_descr">OsmAnd Telegram работает в фоновом режиме с выключенным экраном.</string>
+	<string name="osmand_service_descr">OsmAnd Tracker работает в фоновом режиме с выключенным экраном.</string>
 	<string name="choose_osmand_desc">Выберите версию OsmAnd, в которой контакты будут отображаться на карте.</string>
 	<string name="choose_osmand">Выберите версию OsmAnd для использования</string>
 	<string name="disable_all_sharing_desc">Остановить трансляцию своей позиции всем ранее выбранным чатам (%1$d).</string>
@@ -113,7 +119,7 @@
 	<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_desc">Выберите версию OsmAnd которую OsmAnd Tracker использует для отображения позиций на карте.</string>
 	<string name="osmand_connect">OsmAnd подключение</string>
 	<string name="connected_account">Связанная учетная запись</string>
 	<string name="shared_string_account">Учетная запись</string>
@@ -121,11 +127,11 @@
 	<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="disconnect_from_telegram_desc">Отмена доступа к отправке локаций. Откройте Telegram, перейдите в Настройки - Конфиденциальность и безопасность - Сессии и завершите сеанс OsmAnd Tracker.</string>
+	<string name="logout_from_osmand_telegram">Выйти из OsmAnd Tracker?</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="logout_from_osmand_telegram_descr">Вы уверены, что хотите выйти из OsmAnd Tracker, так вы не сможете делиться местоположением или не видеть местоположения других?</string>
 
 	<string name="not_found_yet">Не найдено</string>
 	<string name="re_send_location">Отправить местоположение</string>

OsmAnd-telegram/res/values-sc/strings.xml

@@ -0,0 +1,208 @@
+<?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 Tracker 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="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 Tracker 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 Tracker pro non cumpartzire sa positzione tua o bìdere sa de àtere\?</string>
+    <string name="logout_from_osmand_telegram">Serrare sa sessione de OsmAnd Tracker\?</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 Tracker 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 Online GPS Tracker</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 Tracker</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>
+    <string name="please_update_osmand">Pro praghere agiorna OsmAnd pro bìdere sos datos in sa mapa</string>
+    <string name="shared_string_update">Agiorna</string>
+    <string name="shared_string_telegram">Telegram</string>
+    <string name="privacy_policy_use_telegram">Impreamus Telegram (s\'aplicatzione pro sos messàgios) pro cunnètere sa gente e fàghere in modu chi comunicare cun issos ti siat prus fàtzile.</string>
+    <string name="privacy_policy_telegram_client">Telegram est una prataforma aberta e OsmAnd Tracker est unu de sos comporadores. Sos cuntatos tuos podent impreare cale si siat aplicatzione cliente Telegram.</string>
+    <string name="privacy_policy_agree">Incarchende \"sighi\" atzetas sa Polìtica de Riservadesa de Telegram e cussa de OsmAnd.</string>
+    <string name="shared_string_accept">Atzeta</string>
+    <string name="telegram_privacy_policy">Polìtica de riservadesa de Telegram</string>
+    <string name="osmand_privacy_policy">Polìtica de riservadesa de OsmAnd</string>
+    <string name="how_it_works">Comente funtzionat</string>
+    <string name="received_gps_points">Puntos GPX retzidos: %1$s</string>
+    <string name="shared_string_appearance">Aparèntzia</string>
+    <string name="show_gps_points">Ammustra sos puntos GPS</string>
+    <string name="show_gps_points_descr">Ammustra sa cantidade de puntos GPS collidos e imbiados.</string>
+</resources>

OsmAnd-telegram/res/values-sl/strings.xml

@@ -32,7 +32,7 @@
 	<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="logout_from_osmand_telegram">Ali se želite odjaviti iz storitve OsmAnd Tracker\?</string>
 	<string name="shared_string_name">Ime</string>
 	<string name="by_distance">Po razdalji</string>
 	<string name="by_name">Po imenu</string>
@@ -51,7 +51,7 @@
 	<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="app_name">OsmAnd Online GPS Tracker</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>

OsmAnd-telegram/res/values-uk/strings.xml

@@ -20,7 +20,7 @@
 	<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="battery_optimization_description">Вимкніть оптимізацію батареї для OsmAnd Tracker, аби додаток не вимикався у фоновому режимі.</string>
 	<string name="sharing_in_background">Трансляція у фоновому режимі</string>
 	<string name="go_to_settings">Перейти до налаштувань</string>
 	<string name="shared_string_later">Пізніше</string>
@@ -38,8 +38,8 @@
 	<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="logout_from_osmand_telegram_descr">Ви впевнені, що бажаєте вийти з OsmAnd Tracker\? Оскільки не зможете транслювати свою позицію чи бачити позицію інших.</string>
+	<string name="logout_from_osmand_telegram">Вийти з OsmAnd Tracker\?</string>
 	<string name="shared_string_name">Імʼя</string>
 	<string name="by_distance">За відстанню</string>
 	<string name="by_name">За імʼям</string>
@@ -63,7 +63,7 @@
 	<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_desc">Оберіть версію OsmAnd, яку OsmAnd Tracker буде використовувати для показу позицій на карті.</string>
 	<string name="osmand_connect">Підключення OsmAnd</string>
 	<string name="location_history_desc">Приховайте контакти, які не рухалися на протязі визначеного проміжку часу.</string>
 	<string name="location_history">Історія позицій</string>
@@ -95,7 +95,7 @@
 	<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="app_name">OsmAnd Online GPS Tracker</string>
 	<string name="phone_number_title">Номер телефону</string>
 	<string name="phone_number_descr">Номер телефону у міжнародному форматі</string>
 	<string name="shared_string_password">Пароль</string>
@@ -117,7 +117,7 @@
 	<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="osmand_service_descr">OsmAnd Tracker працює у фоновому режимі з вимкненим екраном.</string>
 	<string name="shared_string_distance">Відстань</string>
 	<string name="share_location">Поділитися позицією</string>
 	<string name="sharing_location">Трансляція позиції</string>

OsmAnd-telegram/res/values-zh-rTW/strings.xml

@@ -1,2 +1,210 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<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 Tracker 的電池最佳化，這樣在後臺時就不會突然關閉。</string>
+    <string name="live_now_description">連絡人和群組共用位置給您。</string>
+    <string name="logout_from_osmand_telegram_descr">你確定要登出 OsmAnd Tracker，這樣你就不能共用位置或看到其他人的位置嗎？</string>
+    <string name="logout_from_osmand_telegram">要登出 OsmAnd Tracker 嗎\?</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 Tracker 會話。</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 Tracker 用於顯示位置。</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 Online GPS Tracker</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 Tracker 伺服器</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">時間軸</string>
+    <string name="shared_string_telegram">Telegram</string>
+    <string name="privacy_policy_use_telegram">Telegram（即時通訊應用程式）是用於與人們連線與溝通。</string>
+    <string name="privacy_policy_telegram_client">Telegram 開放平臺，而 OsmAnd 是其中一個客戶。您的聯絡人可以使用其他任何 Telegram 客戶端。</string>
+    <string name="privacy_policy_agree">點選繼續就代表您同意 Telegram 隱私權政策與 OsmAnd 隱私權政策。</string>
+    <string name="shared_string_accept">接受</string>
+    <string name="telegram_privacy_policy">Telegram 隱私權政策</string>
+    <string name="osmand_privacy_policy">OsmAnd 隱私權政策</string>
+    <string name="how_it_works">如何運作</string>
+    <string name="received_gps_points">"已收到 GPX 點：%1$s "</string>
+    <string name="shared_string_appearance">外觀</string>
+    <string name="show_gps_points">顯示 GPS 點</string>
+    <string name="show_gps_points_descr">顯示蒐集到與發送的 GPS 點數量。</string>
+    <string name="please_update_osmand">請更新 OsmAnd 以在地圖上檢視資料</string>
+    <string name="shared_string_update">更新</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>
+</resources>

OsmAnd-telegram/res/values/colors.xml

@@ -41,4 +41,6 @@
 	<color name="sharing_status_icon_error">#ee5622</color>
 	<color name="sharing_status_icon_success">#78cc5c</color>
 
+	<color name="text_bold_highlight">#5959FF</color>
+
 </resources>

OsmAnd-telegram/res/values/dimens.xml

@@ -24,6 +24,7 @@
 	<dimen name="dialog_welcome_title_top_margin">89dp</dimen>
 
 	<dimen name="list_header_height">48dp</dimen>
+	<dimen name="list_header_with_descr_height">42dp</dimen>
 
 	<dimen name="list_item_height">56dp</dimen>
 	<dimen name="list_item_height_min">48dp</dimen>
@@ -52,6 +53,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>
 
@@ -79,7 +83,7 @@
 	<dimen name="hint_text_size">14sp</dimen>
 
 	<dimen name="list_item_title_text_size">16sp</dimen>
-	<dimen name="list_item_description_text_size">12sp</dimen>
+	<dimen name="list_item_description_text_size">13sp</dimen>
 
 	<dimen name="text_button_text_size">15sp</dimen>
 

OsmAnd-telegram/res/values/strings.xml

@@ -1,181 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<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</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>
-	<string name="go_to_settings">Go to settings</string>
-	<string name="shared_string_later">Later</string>
-	<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_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="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">Add device</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>
-	<string name="logout_from_osmand_telegram">Log out of OsmAnd Telegram?</string>
-	<string name="shared_string_name">Name</string>
-	<string name="by_distance">By distance</string>
-	<string name="by_name">By name</string>
-	<string name="by_group">By group</string>
-	<string name="shared_string_sort">Sort</string>
-	<string name="shared_string_sort_by">Sort by</string>
-	<string name="choose_osmand_desc">Select OsmAnd version where contacts will be displayed on the map.</string>
-	<string name="choose_osmand">Select OsmAnd version to use</string>
-	<string name="disable_all_sharing_desc">Turns off location sharing to all selected chats (%1$d).</string>
-	<string name="disable_all_sharing">Disable all sharing</string>
-	<string name="turn_off_all">Turn off all</string>
-	<string name="shared_string_exit">Exit</string>
-	<string name="time_ago">ago</string>
-	<string name="last_response">Last response</string>
-	<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">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.</string>
-	<string name="osmand_connect">OsmAnd connect</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 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">Position</string>
-	<string name="sharing_time">Sharing time</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 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>
-	<string name="do_not_have_telegram">I don\'t have Telegram account</string>
-	<string name="enter_phone_number">Enter phone number</string>
-	<string name="enter_authentication_code">Enter authentication code</string>
-	<string name="set_visible_time_for_all">Set visible time for all</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">Install</string>
-	<string name="shared_string_share">Share</string>
-	<string name="shared_string_back">Back</string>
-	<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 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 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">Telegram password</string>
-	<string name="shared_string_login">Log in</string>
-	<string name="shared_string_logout">Log out</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="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 \"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="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>
-	<string name="install_osmand">Install OsmAnd</string>
-	<string name="show_users_on_map">Show users on the map</string>
-	<string name="active_chats">Active chats</string>
-	<string name="shared_string_authorization">Authorization</string>
-	<string name="shared_string_authorization_descr">Please enter your Telegram phone number in international format</string>
-	<string name="shared_string_welcome">Welcome</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">Kilometers per hour</string>
-	<string name="si_mph">Miles per hour</string>
-	<string name="si_m_s">Meters per second</string>
-	<string name="si_min_km">Minutes per kilometer</string>
-	<string name="si_min_m">Minutes per mile</string>
-	<string name="si_nm_h">Nautical miles per hour (knot)</string>
-	<string name="si_mi_feet">Miles/feet</string>
-	<string name="si_mi_yard">Miles/yards</string>
-	<string name="si_km_m">Kilometers/meters</string>
-	<string name="si_nm">Nautical miles</string>
-	<string name="si_mi_meters">Miles/meters</string>
-	<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="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">Live now</string>
-
-
-</resources>
+    <string name="shared_string_ok">OK</string>
+    <string name="timeline_available_for_free_now">Timeline is a feature available now for free.</string>
+    <string name="disable_monitoring">Disable monitoring</string>
+    <string name="location_recording_enabled">Location recording enabled</string>
+    <string name="timeline_description">Enable monitoring to save all locations in history.</string>
+    <string name="app_name_short_online">Online Tracker</string>
+    <string name="app_name_short">OsmAnd Tracker</string>
+    <string name="shared_string_telegram">Telegram</string>
+    <string name="privacy_policy_use_telegram">Telegram (the messaging app) is used to to connect to and communicate with people.</string>
+    <string name="privacy_policy_telegram_client">Telegram open platform and OsmAnd Tracker is one of the customers. Your contacts can use any other Telegram client.</string>
+    <string name="privacy_policy_agree">By clicking continue you agree to the Telegram Privacy Policy and the OsmAnd Privacy Policy.</string>
+    <string name="shared_string_accept">Accept</string>
+    <string name="telegram_privacy_policy">Telegram Privacy Policy</string>
+    <string name="osmand_privacy_policy">OsmAnd Privacy Policy</string>
+    <string name="how_it_works">How it works</string>
+    <string name="received_gps_points">Received GPX points: %1$s</string>
+    <string name="shared_string_appearance">Appearance</string>
+    <string name="show_gps_points">Show GPS points</string>
+    <string name="show_gps_points_descr">Show quantity of collected and sent GPS points.</string>
+    <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="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</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>
+    <string name="go_to_settings">Go to settings</string>
+    <string name="shared_string_later">Later</string>
+    <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_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="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">Add device</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>
+    <string name="logout_from_osmand_telegram">Log out of OsmAnd Telegram?</string>
+    <string name="shared_string_name">Name</string>
+    <string name="by_distance">By distance</string>
+    <string name="by_name">By name</string>
+    <string name="by_group">By group</string>
+    <string name="shared_string_sort">Sort</string>
+    <string name="shared_string_sort_by">Sort by</string>
+    <string name="choose_osmand_desc">Select OsmAnd version where contacts will be displayed on the map.</string>
+    <string name="choose_osmand">Select OsmAnd version to use</string>
+    <string name="disable_all_sharing_desc">Turns off location sharing to all selected chats (%1$d).</string>
+    <string name="disable_all_sharing">Disable all sharing</string>
+    <string name="turn_off_all">Turn off all</string>
+    <string name="shared_string_exit">Exit</string>
+    <string name="time_ago">ago</string>
+    <string name="last_response">Last response</string>
+    <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">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.</string>
+    <string name="osmand_connect">OsmAnd connect</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 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">Position</string>
+    <string name="sharing_time">Sharing time</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 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>
+    <string name="do_not_have_telegram">I don\'t have Telegram account</string>
+    <string name="enter_phone_number">Enter phone number</string>
+    <string name="enter_authentication_code">Enter authentication code</string>
+    <string name="set_visible_time_for_all">Set visible time for all</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">Install</string>
+    <string name="shared_string_share">Share</string>
+    <string name="shared_string_back">Back</string>
+    <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 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 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">Telegram password</string>
+    <string name="shared_string_login">Log in</string>
+    <string name="shared_string_logout">Log out</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="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 \"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="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>
+    <string name="install_osmand">Install OsmAnd</string>
+    <string name="show_users_on_map">Show users on the map</string>
+    <string name="active_chats">Active chats</string>
+    <string name="shared_string_authorization">Authorization</string>
+    <string name="shared_string_authorization_descr">Please enter your Telegram phone number in international format</string>
+    <string name="shared_string_welcome">Welcome</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">Kilometers per hour</string>
+    <string name="si_mph">Miles per hour</string>
+    <string name="si_m_s">Meters per second</string>
+    <string name="si_min_km">Minutes per kilometer</string>
+    <string name="si_min_m">Minutes per mile</string>
+    <string name="si_nm_h">Nautical miles per hour (knot)</string>
+    <string name="si_mi_feet">Miles/feet</string>
+    <string name="si_mi_yard">Miles/yards</string>
+    <string name="si_km_m">Kilometers/meters</string>
+    <string name="si_nm">Nautical miles</string>
+    <string name="si_mi_meters">Miles/meters</string>
+    <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="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">Live now</string>
+    <string name="timeline">Timeline</string>
+</resources>

OsmAnd-telegram/src/net/osmand/PlatformUtil.java

@@ -1,5 +1,7 @@
 package net.osmand;
 
+import android.util.Xml;
+
 import org.apache.commons.logging.Log;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -147,10 +149,10 @@ public class PlatformUtil {
 	}
 
 	public static XmlPullParser newXMLPullParser() throws XmlPullParserException {
-		return new org.kxml2.io.KXmlParser();
+		return Xml.newPullParser();
 	}
 
 	public static XmlSerializer newSerializer() {
-		return new org.kxml2.io.KXmlSerializer();
+		return Xml.newSerializer();
 	}
 }

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);
 }