Merge branch 'master' into Android10DarkTheme

# Conflicts: # OsmAnd/res/values/strings.xml
2020-08-25 14:42:13 +03:00 · 2020-08-25 14:42:13 +03:00 · ab9e621c33
commit ab9e621c33
parent 62a15f2759 00bfa6e098
142 changed files with 36078 additions and 790 deletions
--- a/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java
+++ b/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java
@ -129,6 +129,13 @@ public class GPXUtilities {
 			return extensions;
 		}

+		public void copyExtensions(GPXExtensions e) {
+			Map<String, String> extensionsToRead = e.getExtensionsToRead();
+			if (!extensionsToRead.isEmpty()) {
+				getExtensionsToWrite().putAll(extensionsToRead);
+			}
+		}
+
 		public GPXExtensionsWriter getExtensionsWriter() {
 			return extensionsWriter;
 		}
@ -454,7 +461,21 @@ public class GPXUtilities {
 		public String pointTypes;
 		public String names;

-		public StringBundle getStringBundle() {
+		public static RouteSegment fromStringBundle(StringBundle bundle) {
+			RouteSegment s = new RouteSegment();
+			s.id = bundle.getString("id", null);
+			s.length = bundle.getString("length", null);
+			s.segmentTime = bundle.getString("segmentTime", null);
+			s.speed = bundle.getString("speed", null);
+			s.turnType = bundle.getString("turnType", null);
+			s.turnAngle = bundle.getString("turnAngle", null);
+			s.types = bundle.getString("types", null);
+			s.pointTypes = bundle.getString("pointTypes", null);
+			s.names = bundle.getString("names", null);
+			return s;
+		}
+
+		public StringBundle toStringBundle() {
 			StringBundle bundle = new StringBundle();
 			bundle.putString("id", id);
 			bundle.putString("length", length);
@ -473,7 +494,14 @@ public class GPXUtilities {
 		public String tag;
 		public String value;

-		public StringBundle getStringBundle() {
+		public static RouteType fromStringBundle(StringBundle bundle) {
+			RouteType t = new RouteType();
+			t.tag = bundle.getString("t", null);
+			t.value = bundle.getString("v", null);
+			return t;
+		}
+
+		public StringBundle toStringBundle() {
 			StringBundle bundle = new StringBundle();
 			bundle.putString("t", tag);
 			bundle.putString("v", value);
@ -1827,12 +1855,12 @@ public class GPXUtilities {
 					StringBundle bundle = new StringBundle();
 					List<StringBundle> segmentsBundle = new ArrayList<>();
 					for (RouteSegment segment : gpxFile.routeSegments) {
-						segmentsBundle.add(segment.getStringBundle());
+						segmentsBundle.add(segment.toStringBundle());
 					}
 					bundle.putBundleList("route", "segment", segmentsBundle);
 					List<StringBundle> typesBundle = new ArrayList<>();
 					for (RouteType routeType : gpxFile.routeTypes) {
-						typesBundle.add(routeType.getStringBundle());
+						typesBundle.add(routeType.toStringBundle());
 					}
 					bundle.putBundleList("types", "type", typesBundle);
 					StringBundleWriter bundleWriter = new StringBundleXmlWriter(bundle, serializer);
--- a/OsmAnd-java/src/main/java/net/osmand/router/RouteExporter.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/RouteExporter.java
@ -1,7 +1,10 @@
 package net.osmand.router;

+import net.osmand.GPXUtilities;
 import net.osmand.GPXUtilities.GPXExtensionsWriter;
 import net.osmand.GPXUtilities.GPXFile;
+import net.osmand.GPXUtilities.RouteSegment;
+import net.osmand.GPXUtilities.RouteType;
 import net.osmand.GPXUtilities.Track;
 import net.osmand.GPXUtilities.TrkSegment;
 import net.osmand.GPXUtilities.WptPt;
@ -37,8 +40,7 @@ public class RouteExporter {

 	public GPXFile exportRoute() {
 		RouteDataResources resources = new RouteDataResources(locations);
-		final RouteDataBundle bundle = new RouteDataBundle(resources);
-
+		List<StringBundle> routeItems = new ArrayList<>();
 		if (!Algorithms.isEmpty(route)) {
 			for (RouteSegmentResult sr : route) {
 				sr.collectTypes(resources);
@ -47,15 +49,12 @@ public class RouteExporter {
 				sr.collectNames(resources);
 			}

-			List<StringBundle> routeItems = new ArrayList<>();
 			for (RouteSegmentResult sr : route) {
 				RouteDataBundle itemBundle = new RouteDataBundle(resources);
 				sr.writeToBundle(itemBundle);
 				routeItems.add(itemBundle);
 			}
-			bundle.putBundleList("route", "segment", routeItems);
 		}
-
 		List<StringBundle> typeList = new ArrayList<>();
 		Map<RouteTypeRule, Integer> rules = resources.getRules();
 		for (RouteTypeRule rule : rules.keySet()) {
@ -63,7 +62,6 @@ public class RouteExporter {
 			rule.writeToBundle(typeBundle);
 			typeList.add(typeBundle);
 		}
-		bundle.putBundleList("types", "type", typeList);

 		GPXFile gpx = new GPXFile(OSMAND_ROUTER_V2);
 		Track track = new Track();
@ -75,7 +73,6 @@ public class RouteExporter {
 		if (locations == null || locations.isEmpty()) {
 			return gpx;
 		}
-
 		for (int i = 0; i < locations.size(); i++) {
 			Location loc = locations.get(i);
 			WptPt pt = new WptPt();
@ -92,21 +89,22 @@ public class RouteExporter {
 			}
 			trkSegment.points.add(pt);
 		}
-
 		if (points != null) {
 			for (WptPt pt : points) {
 				gpx.addPoint(pt);
 			}
 		}

-		GPXExtensionsWriter extensionsWriter = new GPXExtensionsWriter() {
-			@Override
-			public void writeExtensions(XmlSerializer serializer) {
-				StringBundleWriter bundleWriter = new StringBundleXmlWriter(bundle, serializer);
-				bundleWriter.writeBundle();
+		List<RouteSegment> routeSegments = new ArrayList<>();
+		for (StringBundle item : routeItems) {
+			routeSegments.add(RouteSegment.fromStringBundle(item));
 		}
-		};
-		gpx.setExtensionsWriter(extensionsWriter);
+		gpx.routeSegments = routeSegments;
+		List<RouteType> routeTypes = new ArrayList<>();
+		for (StringBundle item : typeList) {
+			routeTypes.add(RouteType.fromStringBundle(item));
+		}
+		gpx.routeTypes = routeTypes;

 		return gpx;
 	}
--- a/OsmAnd-java/src/main/java/net/osmand/router/RouteImporter.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/RouteImporter.java
@ -98,7 +98,7 @@ public class RouteImporter {
 		for (RouteSegment segment : gpxFile.routeSegments) {
 			RouteDataObject object = new RouteDataObject(region);
 			RouteSegmentResult segmentResult = new RouteSegmentResult(object);
-			segmentResult.readFromBundle(new RouteDataBundle(resources, segment.getStringBundle()));
+			segmentResult.readFromBundle(new RouteDataBundle(resources, segment.toStringBundle()));
 			route.add(segmentResult);
 		}
 	}
@ -106,7 +106,7 @@ public class RouteImporter {
 	private void collectTypes() {
 		int i = 0;
 		for (RouteType routeType : gpxFile.routeTypes) {
-			StringBundle bundle = routeType.getStringBundle();
+			StringBundle bundle = routeType.toStringBundle();
 			String t = bundle.getString("t", null);
 			String v = bundle.getString("v", null);
 			region.initRouteEncodingRule(i++, t, v);
--- a/OsmAnd-java/src/main/java/net/osmand/router/RouteSegmentResult.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/RouteSegmentResult.java
@ -327,6 +327,9 @@ public class RouteSegmentResult implements StringExternalizable<RouteDataBundle>
 		Location prevLocation = null;
 		for (int i = 0; i < length; i++) {
 			Location location = resources.getLocation(index);
+			if (location == null) {
+				break;
+			}
 			double dist = 0;
 			if (prevLocation != null) {
 				dist = MapUtils.getDistance(prevLocation.getLatitude(), prevLocation.getLongitude(), location.getLatitude(), location.getLongitude());
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@ -408,6 +408,7 @@
 			</intent-filter>
 		</receiver>

+		<activity android:name=".activities.ServerActivity" android:label="@string/shared_string_settings" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name="net.osmand.plus.activities.SettingsActivity" android:label="@string/shared_string_settings" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name="net.osmand.plus.activities.SettingsGeneralActivity" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name="net.osmand.plus.activities.SettingsNavigationActivity" android:configChanges="keyboardHidden|orientation" />
--- a/OsmAnd/assets/server/css/admin.css
+++ b/OsmAnd/assets/server/css/admin.css
@ -0,0 +1,110 @@
+body {
+  margin:0;
+  padding:20px;
+  max-width: 1250px;
+}
+
+table {
+  border-collapse: collapse;
+}
+
+.send-private-giveaway, .register-giveaway, .access-server-logs, .update-btc-report {
+	margin: 20px 0px;
+	border: 1px solid #e6e6e6;
+	width: 50%;
+
+}
+.wrapper {
+   list-style-type: none;
+   padding: 0;
+   border-radius: 3px;
+   
+}
+.form-row {
+  display: flex;
+  justify-content: flex-start;
+  align-items: flex-start;
+  padding: 5px;
+  text-align: left;
+}
+
+.form-row > label {
+  flex: 1;
+}
+.form-row > input {
+   flex: 1;
+   width: auto;
+}
+.form-row > button {
+   flex: 1;
+}
+
+th, td {
+  text-align: left;
+  padding: 8px;
+}
+
+tr:nth-child(even){background-color: #f2f2f2}
+tr:hover {background-color: #d5d5d5;}
+
+th {
+  background-color: #4CAF50;
+  color: white;
+}
+.loader,
+.loader:before,
+.loader:after {
+  border-radius: 50%;
+  width: 2.5em;
+  height: 2.5em;
+  -webkit-animation-fill-mode: both;
+  animation-fill-mode: both;
+  -webkit-animation: load7 1.8s infinite ease-in-out;
+  animation: load7 1.8s infinite ease-in-out;
+}
+.loader {
+  color: #00ffff;
+  font-size: 10px;
+  margin: 25px auto;
+  position: relative;
+  text-indent: -9999em;
+  -webkit-transform: translateZ(0);
+  -ms-transform: translateZ(0);
+  transform: translateZ(0);
+  -webkit-animation-delay: -0.16s;
+  animation-delay: -0.16s;
+}
+.loader:before,
+.loader:after {
+  content: '';
+  position: absolute;
+  top: 0;
+}
+.loader:before {
+  left: -3.5em;
+  -webkit-animation-delay: -0.32s;
+  animation-delay: -0.32s;
+}
+.loader:after {
+  left: 3.5em;
+}
+@-webkit-keyframes load7 {
+  0%,
+  80%,
+  100% {
+    box-shadow: 0 2.5em 0 -1.3em;
+  }
+  40% {
+    box-shadow: 0 2.5em 0 0;
+  }
+}
+@keyframes load7 {
+  0%,
+  80%,
+  100% {
+    box-shadow: 0 2.5em 0 -1.3em;
+  }
+  40% {
+    box-shadow: 0 2.5em 0 0;
+  }
+}
--- a/OsmAnd/assets/server/css/report.css
+++ b/OsmAnd/assets/server/css/report.css
@ -0,0 +1,606 @@
+::-webkit-input-placeholder {color:#000;}
+::-moz-placeholder          {color:#000;}
+:-moz-placeholder           {color:#000;}
+:-ms-input-placeholder      {color:#000;}
+h2, h3 {
+  font-size: 20px;
+}
+.nav-holder {
+  padding: 0 20px;
+  background: #ff8e01;
+}
+.navigation {
+  max-width: 1100px;
+  margin: 0 auto;
+}
+.navigation li {
+  margin-right: 30px;
+}
+.navigation a {
+  display: block;
+  padding: 30px 0;
+  color: rgba(255, 255, 255, 0.5);
+  font-size: 15px;
+  font-weight: bold;
+  text-decoration: none;
+  text-transform: uppercase;
+  border-bottom: 4px solid #ff8e01;
+  outline: none;
+}
+.navigation a:hover {
+  color: #fff;
+}
+.navigation li {
+  display: inline-block;
+  vertical-align: middle;
+}
+.navigation li.active a, 
+.navigation li.active a:focus, 
+.navigation li.active a:hover {
+  color: #fff;
+  border-bottom: 4px solid #4464ad;
+}
+#month-selection {
+  margin-bottom: 10px;
+}
+#region-selection {
+  margin-bottom: 10px;
+}
+.infobox {
+  font-size: 16px;
+  line-height: 150%;
+}
+.infobox h2 {
+  font-size: 33px;
+}
+.infobox h3 {
+  margin-top: 35px;
+  font-weight: bold;
+}
+.infobox ul {
+  list-style-type: disc;
+  list-style-position: inside;
+}
+.report-period-group {
+  padding: 20px;
+  background: #f2f2f2;
+}
+.report-period-group.supporters {
+  float: left;
+  width: 30%;
+  height: 120px;
+}
+.supporters-total {
+  float: right;
+  width: 70%;
+  height: 120px;
+  border: 1px solid #ddd;
+  border-left: 0 none;
+}
+.supporters-total-holder:after {
+  content: '';
+  display: table;
+  clear: both;
+  float: none;
+}
+.report-group {
+  display: inline-block;
+  vertical-align: top;
+}
+.report-group.period {
+  width: 100%;
+  max-width: 250px;
+  margin-right: 40px;
+}
+.supporters .report-group.period {
+  margin-right: 0;
+}
+.report-group.region {
+  width: 100%;
+  max-width: 420px;
+}
+.styled-select {
+  position: relative;
+  width: 100%;
+  height: 42px;
+  overflow: hidden;
+  background: #fff;
+  border: 1px solid #ccc;
+  border-radius: 2px;
+}
+.styled-select:before {
+  z-index: 0;
+  content: '';
+  position: absolute;
+  top: 10px;
+  left: 10px;
+  width: 20px;
+  height: 20px;
+  background: url('../images/main-sprite.png') no-repeat;
+}
+.styled-select:after {
+  z-index: 0;
+  content: '';
+  position: absolute;
+  top: 12px;
+  right: 10px;
+  width: 20px;
+  height: 20px;
+  background: url('../images/main-sprite.png') no-repeat -200px -80px;
+}
+.report-group.period .styled-select:before {
+  background-position: -251px -110px;
+}
+.report-group.region .styled-select:before {
+  background-position: -290px -110px;
+}
+.report-group.round .styled-select:before {
+  background-position: -290px -110px;
+}
+
+.styled-select select {
+  position: relative;
+  z-index: 1;
+  display: block;
+  width: 110%;
+  height: 42px;
+  padding: 10px 45px 10px 35px;
+  border: 0 none;
+  border-radius: 0;
+  background: transparent;
+  text-overflow: ellipsis;
+}
+select {
+  -webkit-appearance: none;
+     -moz-appearance: none;
+          appearance: none;
+}
+select:-moz-focusring {
+  color: transparent;
+  text-shadow: 0 0 0 #000;
+}
+.report-total-div {
+  border: 1px solid #e6e6e6;
+  border-top: 0 none;
+}
+.overview-body {
+  padding: 15px 15px 0;
+}
+.overview-hint {
+  font-weight: bold;
+  margin: 5px 0 20px;
+}
+.overview-hint span {
+  color: #484dde;
+}
+.overview {
+  position: relative;
+  display: inline-block;
+  vertical-align: top;
+  padding-left: 50px;
+  margin-right: 80px;
+  margin-bottom: 20px;
+  text-align: left;
+}
+.overview:last-child {
+  margin-right: 0;
+}
+.overview:before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 40px;
+  height: 40px;
+  background: url('../images/main-sprite.png') no-repeat;
+}
+.overview-changes:before {
+  background-position: -0px -280px;
+}
+.overview-users:before {
+  background-position: -40px -280px;
+}
+.overview-region:before {
+  background-position: -80px -280px;
+}
+.overview-active_supporters:before {
+  background-position: -40px -280px;
+}
+.overview-register_supporters:before {
+  background-position: -120px -280px;
+}
+.overview-btc:before {
+  background-position: -160px -280px;
+}
+.overview-total_weight:before {
+  background-position: -200px -280px;
+}
+.overview p {
+  margin: 0;
+  margin-bottom: -10px;
+  font-size: 30px;
+  font-weight: bold;
+  line-height: 1.2;
+}
+.overview span {
+  color: #999;
+  font-size: 11px;
+  text-transform: uppercase;
+  letter-spacing: 2px;
+}
+#report-ranking,
+#users-ranking,
+#support-country-table-header,
+#support-table-header,
+#recipients-table-header {
+  margin-top: 50px;
+  font-size: 20px;
+}
+#report-ranking span {
+  display: block;
+  font-size: 13px;
+  font-weight: normal;
+  color: #999;
+  text-transform: uppercase;
+}
+.table {
+  font-size: 14px;
+}
+.table thead span {
+  display: block;
+  color: #999;
+  font-size: 11px;
+  text-transform: uppercase;
+}
+.table tbody tr td {
+  padding: 12px;
+  font-weight: bold;
+}
+.table-bordered > thead > tr > td, 
+.table-bordered > thead > tr > th {
+  vertical-align: middle;
+  border-bottom-color: #ff8f00;
+  font-weight: normal;
+}
+.table-controls.hidden {
+  display: none;
+}
+.table-controls {
+  position: relative;
+  padding-right: 185px;
+}
+.tc.search {
+  position: relative;
+}
+.tc.search:before {
+  content: '';
+  position: absolute;
+  top: 10px;
+  left: 12px;
+  width: 20px;
+  height: 20px;
+  background: url('../images/main-sprite.png') no-repeat -300px -80px;
+}
+.tc.search input {
+  max-width: 350px;
+  height: 42px;
+  padding-left: 40px;
+  border-radius: 2px;
+}
+.tc.entries {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 100%;
+  max-width: 180px;
+  font-size: 14px;
+}
+.tc.entries .styled-select {
+  display: inline-block;
+  vertical-align: middle;
+  width: 80px;
+}
+.tc.entries .styled-select:before {
+  content: none;
+}
+.tc.entries label {
+  display: block;
+  text-align: right;
+}
+.tc.entries select {
+  display: inline-block;
+  vertical-align: middle;
+  width: 125%;
+  padding: 10px 0 10px 10px;
+}
+.sorting_desc,
+.sorting_asc,
+.sorting {
+  position: relative;
+}
+.sorting_desc:after,
+.sorting_asc:after {
+  content: '' !important;
+  position: absolute;
+  top: 50%;
+  right: 0;
+  width: 20px;
+  height: 20px;
+  background: url('../images/main-sprite.png') no-repeat;
+  transform: translate(0, -50%);
+}
+.sorting_asc:after {
+  background-position: -160px -140px;
+}
+.sorting_desc:after {
+  background-position: -200px -140px;
+}
+.sorting:after {
+  content: '' !important;
+  position: absolute;
+  top: 50%;
+  right: 0;
+  width: 20px;
+  height: 20px;
+  background: url('../images/main-sprite.png') no-repeat -180px -140px;
+  transform: translate(0, -50%);
+}
+.pagination > .active > a,
+.pagination > .active > a:focus,
+.pagination > .active > a:hover,
+.pagination > .active > span,
+.pagination > .active > span:focus,
+.pagination > .active > span:hover {
+  background-color: #ff8f00;
+  border-color: #ff8f00;
+}
+.pagination > li > a,
+.pagination > li > span {
+  color: #000;
+}
+.pagination > li > a:hover,
+.pagination > li > span:hover {
+  background-color: rgba(255, 143, 0, 0.5);
+  border-color: #ff8f00;
+  color: #fff;
+}
+.registration {
+  display: inline-block;
+  vertical-align: top;
+  width: 49%;
+  min-height: 420px;
+  padding: 20px;
+  margin-top: 20px;
+  margin-right: 1%;
+  background: #f2f2f2;
+}
+.registration.contributor-registration {
+  margin-right: 0;
+}
+.registration h4 {
+  margin-top: 0;
+  font-size: 20px;
+}
+.recipient-registration label {
+  margin-top: 10px;
+  font-size: 14px;
+  font-weight: normal;
+}
+.recipient-registration .form-control {
+  margin: 0;
+  border-radius: 2px;
+  height: 42px;
+  padding-left: 40px;
+}
+.recipient-registration .input-holder {
+  position: relative;
+}
+
+#agree_osm_live {
+  margin-left: 5px;
+  margin-top: 3px;
+}
+.agree_osm_live_label {
+  position: relative;
+  cursor: pointer;
+  font-size: 14px;
+  margin-left: 7px;
+  margin-bottom: 15px;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+}
+
+.recipient-registration .input-holder:before {
+  content: '';
+  position: absolute;
+  top: 10px;
+  left: 12px;
+  width: 20px;
+  height: 20px;
+  background: url('../images/main-sprite.png') no-repeat;
+}
+.recipient-registration .input-holder.input-user:before {
+  background-position: -180px -80px;
+}
+.recipient-registration .input-holder.input-pass:before {
+  height: 21px;
+  background-position: -172px -109px;
+}
+.recipient-registration .input-holder.input-bitcoin:before {
+  background-position: -210px -110px;
+}
+.recipient-registration .input-hint {
+  color: #999;
+  line-height: 1.4;
+}
+.recipient-registration .btn,
+.recipient-registration .btn:active {
+  background: #575bde;
+  border: 1px solid #3d42bf;
+  color: #fff;
+  font-weight: bold;
+}
+.registration-badges img {
+  border: none;
+  height: 45px;
+  margin-bottom: 20px;
+}
+.contributor-registration p {
+  font-size: 14px;
+  line-height: 1.4;
+}
+.contributor-registration .btc-address {
+  padding: 15px 10px;
+  margin-bottom: 10px;
+  background: #ff8f00;
+  border-radius: 2px;
+  color: #fff;
+  font-size: 14px;
+  font-weight: bold;
+}
+#recipients-info-div {
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+.maincontainer {
+  background-color: white;
+}
+.full-width-banner {
+  width: 100%;
+  margin: 20px auto;
+}
+.full-width-banner img {
+  display: block;
+  max-width: 100%;
+}
+
+.vlabel {
+  font-size: 16px;
+  font-weight: bold;
+}
+.form-control {
+  margin-bottom: 10px;
+}
+.tab-content {
+  margin-top: 25px;
+}
+.container {
+  max-width: 1135px;
+  margin: 10px auto 50px;
+}
+#recipients-table td:nth-child(7) {
+  word-break: break-all;
+  padding: 8px 5px !important;
+}
+@media screen and (max-width: 1200px) {
+  .nav-holder .navigation{
+    max-width: 940px;
+  }
+}
+@media screen and (max-width: 991px) {
+  .nav-holder .navigation{
+    max-width: 720px;
+  }
+  .report-group.period {
+    max-width: 420px;
+    margin-right: 0;
+  }
+  .supporters-total .overview {
+    margin-right: 20px;
+  }
+}
+@media screen and (max-width: 770px) {
+  .report-period-group.supporters {
+    float: none;
+    width: 100%;
+    height: 120px;
+  }
+  .supporters-total {
+    float: none;
+    width: 100%;
+    height: auto;
+    border: 1px solid #ddd;
+    border-top: 0 none;
+  }
+  .supporters-total:after {
+    content: '';
+    display: table;
+    clear: both;
+    float: none;
+  }
+  .registration {
+    width: 100%;
+    min-height: auto;
+    margin-right: 0;
+    margin-bottom: 20px;
+  }
+}
+@media screen and (max-width: 650px) {
+  #recipients-table th:nth-child(4),
+  #recipients-table td:nth-child(4),
+  #recipients-table th:nth-child(3),
+  #recipients-table td:nth-child(3) {
+    display: none;
+  }
+  .navigation li a,
+  .navigation li.active a,
+  .navigation li.active a:focus,
+  .navigation li.active a:hover {
+    border-bottom: 0 none;
+    padding: 15px 0;
+  }
+}
+@media screen and (max-width: 550px) {
+  .table {
+    font-size: 13px;
+  }
+  .table thead {
+    font-size: 11px;
+  }
+  .table thead span {
+    text-transform: lowercase;
+  }
+  .table th, 
+  .table td {
+    padding: 8px 2px !important;
+    vertical-align: middle !important;
+    font-weight: normal !important;
+    text-align: center;
+
+  }
+  .table th.sorting_asc:before,
+  .table th.sorting_desc:before {
+    content: '';
+    position: absolute;
+    left: 50%;
+    margin-left: -2px;
+    border: 4px solid transparent;
+  }
+  .table th.sorting_asc:before {
+    bottom: 1px;
+    border-top-color: #ff8f00;
+  }
+  .table th.sorting_desc:before {
+    top: 1px;
+    border-bottom-color: #ff8f00;
+  }
+  .table th:after {
+    content: none !important;
+  }
+  .table-controls {
+    padding-right: 145px;
+  }
+  .tc.entries {
+    font-size: 12px;
+  }
+  .tc.entries span {
+    display: inline-block;
+    vertical-align: middle;
+    width: 30%;
+    text-align: center;
+  }
+  .contributor-registration .btc-address {
+    word-break: break-all;
+  }
+}
--- a/OsmAnd/assets/server/css/site.css
+++ b/OsmAnd/assets/server/css/site.css
--- a/OsmAnd/assets/server/css/slick.css
+++ b/OsmAnd/assets/server/css/slick.css
@ -0,0 +1,117 @@
+/* Slider */
+.slick-slider
+{
+    position: relative;
+
+    display: block;
+    box-sizing: border-box;
+
+    -webkit-user-select: none;
+       -moz-user-select: none;
+        -ms-user-select: none;
+            user-select: none;
+
+    -webkit-touch-callout: none;
+    -khtml-user-select: none;
+    -ms-touch-action: pan-y;
+        touch-action: pan-y;
+    -webkit-tap-highlight-color: transparent;
+}
+
+.slick-list
+{
+    position: relative;
+
+    display: block;
+    overflow: hidden;
+
+    margin: 0;
+    padding: 0;
+}
+.slick-list:focus
+{
+    outline: none;
+}
+.slick-list.dragging
+{
+    cursor: pointer;
+    cursor: hand;
+}
+
+.slick-slider .slick-track,
+.slick-slider .slick-list
+{
+    -webkit-transform: translate3d(0, 0, 0);
+       -moz-transform: translate3d(0, 0, 0);
+        -ms-transform: translate3d(0, 0, 0);
+         -o-transform: translate3d(0, 0, 0);
+            transform: translate3d(0, 0, 0);
+}
+
+.slick-track
+{
+    position: relative;
+    top: 0;
+    left: 0;
+
+    display: block;
+}
+.slick-track:before,
+.slick-track:after
+{
+    display: table;
+
+    content: '';
+}
+.slick-track:after
+{
+    clear: both;
+}
+.slick-loading .slick-track
+{
+    visibility: hidden;
+}
+
+.slick-slide
+{
+    display: none;
+    float: left;
+
+    height: 100%;
+    min-height: 1px;
+}
+[dir='rtl'] .slick-slide
+{
+    float: right;
+}
+.slick-slide img
+{
+    display: block;
+}
+.slick-slide.slick-loading img
+{
+    display: none;
+}
+.slick-slide.dragging img
+{
+    pointer-events: none;
+}
+.slick-initialized .slick-slide
+{
+    display: block;
+}
+.slick-loading .slick-slide
+{
+    visibility: hidden;
+}
+.slick-vertical .slick-slide
+{
+    display: block;
+
+    height: auto;
+
+    border: 1px solid transparent;
+}
+.slick-arrow.slick-hidden {
+    display: none;
+}
--- a/OsmAnd/assets/server/css/src/slick.less
+++ b/OsmAnd/assets/server/css/src/slick.less
@ -0,0 +1,98 @@
+/* Slider */
+
+.slick-slider {
+    position: relative;
+    display: block;
+    box-sizing: border-box;
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    -ms-touch-action: pan-y;
+    touch-action: pan-y;
+    -webkit-tap-highlight-color: transparent;
+}
+.slick-list {
+    position: relative;
+    overflow: hidden;
+    display: block;
+    margin: 0;
+    padding: 0;
+
+    &:focus {
+        outline: none;
+    }
+
+    &.dragging {
+        cursor: pointer;
+        cursor: hand;
+    }
+}
+.slick-slider .slick-track,
+.slick-slider .slick-list {
+    -webkit-transform: translate3d(0, 0, 0);
+    -moz-transform: translate3d(0, 0, 0);
+    -ms-transform: translate3d(0, 0, 0);
+    -o-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+}
+
+.slick-track {
+    position: relative;
+    left: 0;
+    top: 0;
+    display: block;
+
+    &:before,
+    &:after {
+        content: "";
+        display: table;
+    }
+
+    &:after {
+        clear: both;
+    }
+
+    .slick-loading & {
+        visibility: hidden;
+    }
+}
+.slick-slide {
+    float: left;
+    height: 100%;
+    min-height: 1px;
+    [dir="rtl"] & {
+        float: right;
+    }
+    img {
+        display: block;
+    }
+    &.slick-loading img {
+        display: none;
+    }
+
+    display: none;
+
+    &.dragging img {
+        pointer-events: none;
+    }
+
+    .slick-initialized & {
+        display: block;
+    }
+
+    .slick-loading & {
+        visibility: hidden;
+    }
+
+    .slick-vertical & {
+        display: block;
+        height: auto;
+        border: 1px solid transparent;
+    }
+}
+.slick-arrow.slick-hidden {
+    display: none;
+}
--- a/OsmAnd/assets/server/css/src/source_site.css
+++ b/OsmAnd/assets/server/css/src/source_site.css
--- a/OsmAnd/assets/server/css/src/style.less
+++ b/OsmAnd/assets/server/css/src/style.less
--- a/OsmAnd/assets/server/css/src/vars.less
+++ b/OsmAnd/assets/server/css/src/vars.less
@ -0,0 +1,43 @@
+@font-family: 'Roboto Regular';
+@text-color: #000;
+@oposite-text-color: #fff;
+@header-color: #536dfe;
+@read-more-color: #adadad;
+@brand-orange: #ff8f00;
+@opacity-orange-overlay: 0.9;
+@separator-bg: #ffbb00;
+
+@badge-free: #f3f3f3;
+@badge-free-text: #737373;
+@badge-paid: #62c452;
+@badge-paid-text: #fff;
+
+@footer-bg: #292f33;
+@footer-text-color: #fff;
+@footer-header-color: #698d8f;
+@footer-header-underline-color: #2f4445;
+@footer-copyright-color: #525e66;
+@footer-font-family: Arial;
+@footer-contact-btn-border: #394247;
+
+@index-app-features-header: #ffa516;
+@index-app-features-subheader: #c1c1c1;
+@index-banner-btn-bg: #ffa516;
+@index-header-color: #000;
+@index-subheader-color: #737373;
+@index-slider-btn-active: #ffa516;
+@index-slider-btn-passive: #d4d4d4;
+@index-recomendations-username: #212121;
+@index-recomendations-service: #9e9e9e;
+@index-news-link-color: #266ce0;
+@index-news-read-more-link: #adadad;
+@index-news-timestamp: #adadad;
+@index-poll-btn-bg: #ff8f00;
+@index-poll-result-btn-bg: #ff6c00;
+@index-poll-radio-btn-active: #ff8f00;
+@index-poll-radio-btn-border: #bbb;
+
+@blog-article-header: #536dfe;
+
+@help-question-link: #454ade;
+@help-question-border: #e6e7ec;
--- a/OsmAnd/assets/server/css/style.css
+++ b/OsmAnd/assets/server/css/style.css
@ -0,0 +1,2 @@
+/***********************EMPTY USED BY HELP inlining but already defined in site.css
+	*********************************************/
--- a/OsmAnd/assets/server/fonts/Roboto-Bold-webfont.eot
+++ b/OsmAnd/assets/server/fonts/Roboto-Bold-webfont.eot
--- a/OsmAnd/assets/server/fonts/Roboto-Bold-webfont.svg
+++ b/OsmAnd/assets/server/fonts/Roboto-Bold-webfont.svg
--- a/OsmAnd/assets/server/fonts/Roboto-Bold-webfont.ttf
+++ b/OsmAnd/assets/server/fonts/Roboto-Bold-webfont.ttf
--- a/OsmAnd/assets/server/fonts/Roboto-Bold-webfont.woff
+++ b/OsmAnd/assets/server/fonts/Roboto-Bold-webfont.woff
--- a/OsmAnd/assets/server/fonts/Roboto-Regular-webfont.eot
+++ b/OsmAnd/assets/server/fonts/Roboto-Regular-webfont.eot
--- a/OsmAnd/assets/server/fonts/Roboto-Regular-webfont.svg
+++ b/OsmAnd/assets/server/fonts/Roboto-Regular-webfont.svg
--- a/OsmAnd/assets/server/fonts/Roboto-Regular-webfont.ttf
+++ b/OsmAnd/assets/server/fonts/Roboto-Regular-webfont.ttf
--- a/OsmAnd/assets/server/fonts/Roboto-Regular-webfont.woff
+++ b/OsmAnd/assets/server/fonts/Roboto-Regular-webfont.woff
--- a/OsmAnd/assets/server/go.html
+++ b/OsmAnd/assets/server/go.html
@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="cache-control" content="max-age=0"/>
+    <meta http-equiv="cache-control" content="no-cache"/>
+    <meta http-equiv="expires" content="0"/>
+    <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT"/>
+    <meta http-equiv="pragma" content="no-cache"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>OsmAnd - Offline Mobile Maps and Navigation</title>
+    <link rel="stylesheet" type="text/css" href="/css/site.css?v=4"/>
+    <!--  <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" /> -->
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.1.0/dist/leaflet.css"/>
+    <script src="https://unpkg.com/leaflet@1.1.0/dist/leaflet.js"></script>
+    <script type="text/javascript" src="/scripts/jquery-3.1.0.min.js"></script>
+    <!--
+      <script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
+    -->
+
+    <script type="text/javascript" src="/scripts/js.cookie.js"></script>
+    <script type="text/javascript" src="/scripts/go.js?v=5"></script>
+
+    <script>
+        function getMarkerContent(feature) {
+		var p = feature.properties;
+		var popupContent = p.title;
+		if(p.opr_id) {
+			popupContent += " (" + p.opr_id+") ";
+		}
+		if(p.tags) {
+			for (var t in p.tags) {
+				popupContent += "<br>" + t + " " + p.tags[t];
+			}
+		}
+		if(p.opr_id) {
+			popupContent += "<br><a href=\'/api/admin?view=objects&browse=type&type=opr.place&subtype=id&key=" +
+				p.opr_id + "\'>OpenPlaceReviews</a>";
+		}
+		if(p.osm_id) {
+			popupContent += "<br><a href=\'https://www.openstreetmap.org/" +
+				p.osm_type + "/" + p.osm_id + "\'>OpenStreetMap</a>";
+		}
+		return popupContent;
+	    }
+
+	    function markerClick(e){
+
+	    }
+
+        function setupMarkers(){
+            $.ajax({
+                type: 'GET',
+                url: "/favorites",
+                async: false,
+                contentType: "application/json",
+                dataType: 'json',
+            complete: function(r) {
+                var points = JSON.parse(r.responseText);
+                points.forEach(e => {
+		    	    window.goMap.map.addPopupMarker(e,markerClick);
+                });
+            },
+            error: function(e) {
+                alert("Error happened while getting favourite points "+e.message);
+            }
+            });
+        }
+
+        $( document ).ready(function() {
+            setupMarkers();
+        });
+
+    </script>
+</head>
+<body>
+<div class="gocontainer" id="gocontainer">
+    <div class="goheader">
+        <a href="/"><img src="/images/logo-grey.png" class="logo"/></a>
+        <div class="coordinatescontainer">
+            <div><span class="title">LAT</span><span class="coordinate latitude"></span></div>
+            <div><span class="title">LON</span><span class="coordinate longitude"></span></div>
+        </div>
+        <div class="clear:both;"></div>
+    </div>
+    <div id="map"></div>
+    <div class="overlay" style="display:none;"></div>
+    <div class="popup" style="display:none;">
+        <div class="logo"></div>
+        <h1>Did you know</h1>
+        <p>OsmAnd has an iOS application</p>
+        <a class="button yes" href="javascript:void(0);">Yep, I've already got it</a>
+        <a class="button no" href="javascript::void(0);">Nope, but I'd love to try it</a>
+        <a class="button cancel" href="javascript:void(0);">Leave me alone</a>
+    </div>
+</div>
+</body>
+</html>
--- a/OsmAnd/assets/server/images/amazon-apps-store.png
+++ b/OsmAnd/assets/server/images/amazon-apps-store.png
--- a/OsmAnd/assets/server/images/app-store-badge.png
+++ b/OsmAnd/assets/server/images/app-store-badge.png
--- a/OsmAnd/assets/server/images/logo-grey.png
+++ b/OsmAnd/assets/server/images/logo-grey.png
--- a/OsmAnd/assets/server/scripts/blog.js
+++ b/OsmAnd/assets/server/scripts/blog.js
@ -0,0 +1,86 @@
+var blogArticles = [
+    {title:'OsmAnd for iPhone is released', url:'blog.html?id=osmand-ios', id:'osmand-ios', gatag:'osmand_ios'},	
+    {title:'Nautical charts', url:'blog.html?id=nautical-charts', id:'nautical-charts', gatag:'nautical_charts'},
+	{title:'OsmAnd DVR goes live', url:'blog.html?id=osmand-dvr-goes-live', id:'osmand-dvr-goes-live', gatag:'osmand_dvr_goes_live'},	
+	{title:'OsmAnd 1.9', url:'blog.html?id=osmand-1-9-released', id:'osmand-1-9-released', gatag:'osmand_1_9'},
+	{title:'OsmAnd 1.8', url:'blog.html?id=osmand-1-8-released', id:'osmand-1-8-released', gatag:'osmand_1_8'},
+	{title:'OsmAnd 1.7', url:'blog.html?id=osmand-1-7-released', id:'osmand-1-7-released', gatag:'osmand_1_7'},	
+	{title:'OsmAnd 1.6 Released', url:'blog.html?id=osmand-1-6-released', id:'osmand-1-6-released', gatag:'osmand_1_6'},
+	{title:'OsmAnd 1.5 Released', url:'blog.html?id=osmand-1-5-released', id:'osmand-1-5-released', gatag:'osmand_1_5'}
+];
+
+var webSiteUrl = "http://osmand.net";
+
+$.urlParam = function(url, name){
+    var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(url);
+    if (results==null){
+       return null;
+    }
+    else{
+       return results[1] || 0;
+    }
+}
+
+function blog(container){
+
+var getFullArticleUrl = function(articleObj){
+	return webSiteUrl + "/" + articleObj.url;
+}
+
+var fixTwitter =function (){ 
+	$('#___plusone_0 iframe').css('height', '21px');
+}
+
+var updateMetaTags = function(articleObj){
+	if (articleObj && articleObj != null){
+		var articleFullUrl = getFullArticleUrl(articleObj);
+		$('meta[property="og:title"]').attr('content', articleObj.title);
+		$('meta[property="og:url"]').attr('content', articleFullUrl);
+		$('meta[property="og:description"]').attr('content', articleObj.title);
+		
+		$('link[rel="canonical"]').attr('href', articleFullUrl);
+		
+		$('div.fb-like').attr('data-href', articleFullUrl);
+		$('.twitter-share-button').attr('data-url', articleFullUrl);
+	}
+}
+
+var getArticleById = function(articleid){
+	for(var i=0; i < blogArticles.length;++i){
+		if (blogArticles[i].id === articleid){
+			return blogArticles[i];
+		}
+	}
+	return null;
+}
+
+var init = function(){
+	container.empty();
+	
+	for(var i=0; i < blogArticles.length; ++i){
+		var link = blogArticles[i];	
+		container.append('<li><a data-gatag="' +link.gatag+ '" data-index="' + link.index+ '" href="' + link.url + '">' + link.title + '</a></li>');
+	}
+	
+	var articleid = $.urlParam(window.location.href, 'id');
+	if (!articleid || articleid == null){
+		articleid = blogArticles[0].id;
+	}
+	//hide share buttons
+	$('.share_buttons').css('display', 'none');
+	updateMetaTags(getArticleById(articleid));
+	var url = 'blog_articles' + '/' + articleid + ".html";
+	$( ".article" ).load(url, function( response, status, xhr) {
+		if ( status != "error" ) {
+			
+			$('.share_buttons').css('display', 'block');			
+			setTimeout(fixTwitter, 5000);
+		}
+	});
+	
+}
+
+init();
+
+
+}
--- a/OsmAnd/assets/server/scripts/go.js
+++ b/OsmAnd/assets/server/scripts/go.js
@ -0,0 +1,268 @@
+var requestUtils={
+	'getParamValue':function(paramName){		
+			let value= (location.search.split(paramName + '=')[1]||'').split('&')[0];
+			if (value && value.length > 0){
+				return value;
+			}
+			return null;
+		},
+	'isIOS':function(){
+		return /(iPad|iPhone|iPod)/g.test( navigator.userAgent );
+	},
+	'redirect':function(newUrl){
+		document.location = newUrl;
+	}
+};
+
+var goMap = {
+	'config':{
+		'containerid': 'gocontainer',		
+		'defaults':{
+			'lat':50.27,
+			'lon':30.30,
+			'zoom':13
+			}
+	},
+	'utils':{
+		'getPointFromUrl':function(){
+			let point = {};
+			point.lat = requestUtils.getParamValue('lat');
+			point.lon = requestUtils.getParamValue('lon');
+			point.zoom = requestUtils.getParamValue('z');
+			return point;
+		},
+		'isPointComplete':function(point){		
+			if (!point.lat || !point.lon){
+				return false;
+			}
+			return true;
+		},
+		'extendPoint':function(initialPoint, newPoint){
+			let point={};
+			point.lat=newPoint.lat;
+			if (!point.lat || point.lat == null){
+				point.lat = initialPoint.lat;
+			}
+			point.lon=newPoint.lon;
+			if (!point.lon || point.lon == null){
+				point.lon = initialPoint.lon;
+			}
+			point.zoom=newPoint.zoom;
+			if (!point.zoom || point.zoom == null){
+				point.zoom = initialPoint.zoom;
+			}
+			return point;
+		}
+	},
+	'init': function(config){
+		if (config && typeof (config) == 'object') {
+            $.extend(goMap.config, config);
+        }
+		goMap.$container = $('#' + goMap.config.containerid);
+		goMap.$footer = goMap.$container.find('.gofooter');
+		goMap.$latitude = goMap.$container.find('.latitude');
+		goMap.$longitude = goMap.$container.find('.longitude');
+		
+		let inputPoint = goMap.utils.getPointFromUrl();					
+		goMap.point = goMap.utils.extendPoint(goMap.config.defaults, inputPoint);
+		goMap.refreshCoordinates();
+		
+		goMap.map =$.mapwidget();		
+		goMap.map.showPoint(goMap.point);
+		
+		let inputComplete = goMap.utils.isPointComplete(inputPoint);
+		if (inputComplete){
+			goMap.map.addMarker(goMap.point);
+		}
+		goMap.point = goMap.utils.getPointFromUrl();	
+	},	
+	'refreshCoordinates':function(){
+		goMap.$latitude.text(goMap.point.lat);
+		goMap.$longitude.text(goMap.point.lon);
+	}
+};
+
+function toColor(num) {
+            num >>>= 0;
+            var b = num & 0xFF,
+                g = (num & 0xFF00) >>> 8,
+                r = (num & 0xFF0000) >>> 16,
+                a = ( (num & 0xFF000000) >>> 24 ) / 255 ;
+            return "rgba(" + [r, g, b, a].join(",") + ")";
+         }
+
+(function($) {
+	$.mapwidget = function(config) {
+		var loc = goMap.point.lat + '/' + goMap.point.lon;
+		var lparams = '?mlat='+goMap.point.lat + '&mlon=' + goMap.point.lon;
+		var mapobj={
+			config: $.extend({
+				'mapid':'map',
+                'maxzoom':20,
+				'maxnativezoom':19,
+				'sourceurl':'https://tile.osmand.net/hd/{z}/{x}/{y}.png',
+				'attribution':'&copy; <a href="https://www.openstreetmap.org/'+lparams+'#map=15/'+loc+'">OpenStreetMap</a> contributors'
+            }, config),
+			init:function(){
+				mapobj.map = L.map(mapobj.config.mapid);
+				L.tileLayer(mapobj.config.sourceurl, {
+					attribution: mapobj.config.attribution,
+					maxZoom: mapobj.config.maxzoom,
+					maxNativeZoom: mapobj.config.maxnativezoom
+				}).addTo(mapobj.map);				
+			},
+			showPoint:function(point){
+				mapobj.map.setView([point.lat, point.lon], point.zoom);				
+			},
+			addMarker:function(point){
+				L.marker([point.lat, point.lon]).addTo(mapobj.map);
+			},
+			addPopupMarker:function(favorite,onClickEvent){
+			    window.point = favorite;
+                var point = {};
+		    	    point.lat = favorite.latitude;
+		    	    point.lon = favorite.longitude;
+			    var popup = L.popup().setContent(
+			                "name: <b>" + favorite.name + "</b><br/>" +
+			                "address: <i>" + favorite.address + "</i><br/>"
+			                 + "category: " + favorite.category);
+			    L.marker([point.lat, point.lon])
+			        .bindPopup(popup)
+			        .addTo(mapobj.map)
+			        .on('click', function(e) {
+                        onClickEvent(e);
+                    });
+			}
+		};
+		mapobj.init();
+		return {            
+            showPoint: mapobj.showPoint,
+            addMarker: mapobj.addMarker,
+            addPopupMarker: mapobj.addPopupMarker
+        };
+	};
+})(jQuery);
+
+(function($) {
+	$.timer=function(config){
+		var timerobj={
+			config: $.extend({
+				'timeoutInMs':300,
+                'maxActionDelayInMs':2000,
+				'action':function(){},
+				'actionparams':null
+            }, config),
+			init:function(){
+				timerobj.timer = null;
+				timerobj.startDate = null;
+			},
+			start:function(){
+				timerobj.cancel();
+				timerobj.startDate = new Date();
+				timerobj.timer=setTimeout(timerobj.onTimer, timerobj.config.timeoutInMs);
+			},
+			cancel:function(){
+				if (timerobj.timer != null){
+					clearTimeout(timerobj.timer);
+					timerobj.timer = null;
+					timerobj.startDate = null;
+				}
+			},
+			onTimer:function(){
+				timerobj.timer= null;
+				let now = new Date();
+				if(now - timerobj.startDate < timerobj.config.maxActionDelayInMs){
+					timerobj.config.action(timerobj.config.actionparams);
+				}				
+			}
+		};
+		timerobj.init();
+		return {
+			start:timerobj.start,
+			cancel:timerobj.cancel
+		};
+	};
+})(jQuery);
+
+var iosAppRedirect = {
+	config:{
+		appPrefix:'osmandmaps://',
+		containerid:'gocontainer',
+		cookieName:'OsmAndInstalled',
+		cookieNoExpirationTimeoutInDays:30
+	},
+	init:function(config){
+		if (config && typeof (config) == 'object') {
+            $.extend(iosAppRedirect.config, config);
+        }
+		
+		if (!requestUtils.isIOS()){	
+			return;
+		}
+		iosAppRedirect.$container = $('#' + iosAppRedirect.config.containerid);
+		iosAppRedirect.$overlay = iosAppRedirect.$container.find('.overlay');
+		iosAppRedirect.$popup = iosAppRedirect.$container.find('.popup');
+		iosAppRedirect.$yesBtn =  iosAppRedirect.$container.find('.yes');
+		iosAppRedirect.$noBtn =  iosAppRedirect.$container.find('.no');
+		iosAppRedirect.$cancelBtn =  iosAppRedirect.$container.find('.cancel');
+		iosAppRedirect.applestorelink = iosAppRedirect.$container.find('.gobadges .apple a').attr('href');	
+		iosAppRedirect.applink = iosAppRedirect.config.appPrefix + document.location.search;	
+		
+				
+		if (iosAppRedirect.isAppInstalled() === "yes"){			
+			iosAppRedirect.redirectToApp();			
+			return;
+		}
+		if (iosAppRedirect.isAppInstalled() === "no"){
+			return;
+		}
+		
+		iosAppRedirect.$yesBtn.on('click', function(){		    
+			iosAppRedirect.redirectToApp();
+			iosAppRedirect.closePopup();
+		});
+		
+		iosAppRedirect.$noBtn.on('click', function(){
+			iosAppRedirect.setCookie(true);
+			iosAppRedirect.closePopup();
+			window.open(iosAppRedirect.applestorelink , '_blank');
+		});
+		
+		iosAppRedirect.$cancelBtn.on('click', function(){
+			iosAppRedirect.setCookie(false);
+			iosAppRedirect.closePopup();			
+		});
+		iosAppRedirect.openPopup();
+	},
+	isAppInstalled:function(){
+		return Cookies.get('OsmAndInstalled');		
+	},
+	redirectToApp:function(){
+		iosAppRedirect.timer = $.timer({action:iosAppRedirect.clearCookie});
+		iosAppRedirect.timer.start();
+		requestUtils.redirect(iosAppRedirect.applink);
+	},
+	setCookie:function(appInstalled){
+		if (appInstalled === true){
+			Cookies.set(iosAppRedirect.config.cookieName, "yes");
+		}else{
+			Cookies.set(iosAppRedirect.config.cookieName, "no", { expires: iosAppRedirect.config.cookieNoExpirationTimeoutInDays });
+		}
+	},	
+	clearCookie:function(){
+		Cookies.remove('OsmAndInstalled'); 
+	},
+	openPopup:function(){
+		iosAppRedirect.$overlay.show();
+		iosAppRedirect.$popup.show();
+	},
+	closePopup:function(){
+		iosAppRedirect.$overlay.hide();
+		iosAppRedirect.$popup.hide();
+	}
+};
+
+ $( document ).ready(function() {
+    goMap.init();
+	iosAppRedirect.init();
+  });
--- a/OsmAnd/assets/server/scripts/jquery-1.11.1.min.js
+++ b/OsmAnd/assets/server/scripts/jquery-1.11.1.min.js
--- a/OsmAnd/assets/server/scripts/jquery-1.11.2.js
+++ b/OsmAnd/assets/server/scripts/jquery-1.11.2.js
--- a/OsmAnd/assets/server/scripts/jquery-3.1.0.min.js
+++ b/OsmAnd/assets/server/scripts/jquery-3.1.0.min.js
--- a/OsmAnd/assets/server/scripts/jquery.ellipsis.js
+++ b/OsmAnd/assets/server/scripts/jquery.ellipsis.js
@ -0,0 +1,38 @@
+(function($) {
+	$.fn.ellipsis = function()
+	{
+		return this.each(function()
+		{
+			var el = $(this);
+
+			if(el.css("overflow") == "hidden")
+			{
+				var text = el.html();
+				var multiline = el.hasClass('multiline');
+				var t = $(this.cloneNode(true))
+					.hide()
+					.css('position', 'absolute')
+					.css('overflow', 'visible')
+					.width(multiline ? el.width() : 'auto')
+					.height(multiline ? 'auto' : el.height())
+					;
+
+				el.after(t);
+
+				function height() { return t.height() > el.height(); };
+				function width() { return t.width() > el.width(); };
+
+				var func = multiline ? height : width;
+
+				while (text.length > 0 && func())
+				{
+					text = text.substr(0, text.length - 1);
+					t.html(text + "...");
+				}
+
+				el.html(t.html());
+				t.remove();
+			}
+		});
+	};
+})(jQuery);
--- a/OsmAnd/assets/server/scripts/js.cookie.js
+++ b/OsmAnd/assets/server/scripts/js.cookie.js
@ -0,0 +1,165 @@
+/*!
+ * JavaScript Cookie v2.1.4
+ * https://github.com/js-cookie/js-cookie
+ *
+ * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
+ * Released under the MIT license
+ */
+;(function (factory) {
+	var registeredInModuleLoader = false;
+	if (typeof define === 'function' && define.amd) {
+		define(factory);
+		registeredInModuleLoader = true;
+	}
+	if (typeof exports === 'object') {
+		module.exports = factory();
+		registeredInModuleLoader = true;
+	}
+	if (!registeredInModuleLoader) {
+		var OldCookies = window.Cookies;
+		var api = window.Cookies = factory();
+		api.noConflict = function () {
+			window.Cookies = OldCookies;
+			return api;
+		};
+	}
+}(function () {
+	function extend () {
+		var i = 0;
+		var result = {};
+		for (; i < arguments.length; i++) {
+			var attributes = arguments[ i ];
+			for (var key in attributes) {
+				result[key] = attributes[key];
+			}
+		}
+		return result;
+	}
+
+	function init (converter) {
+		function api (key, value, attributes) {
+			var result;
+			if (typeof document === 'undefined') {
+				return;
+			}
+
+			// Write
+
+			if (arguments.length > 1) {
+				attributes = extend({
+					path: '/'
+				}, api.defaults, attributes);
+
+				if (typeof attributes.expires === 'number') {
+					var expires = new Date();
+					expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5);
+					attributes.expires = expires;
+				}
+
+				// We're using "expires" because "max-age" is not supported by IE
+				attributes.expires = attributes.expires ? attributes.expires.toUTCString() : '';
+
+				try {
+					result = JSON.stringify(value);
+					if (/^[\{\[]/.test(result)) {
+						value = result;
+					}
+				} catch (e) {}
+
+				if (!converter.write) {
+					value = encodeURIComponent(String(value))
+						.replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
+				} else {
+					value = converter.write(value, key);
+				}
+
+				key = encodeURIComponent(String(key));
+				key = key.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent);
+				key = key.replace(/[\(\)]/g, escape);
+
+				var stringifiedAttributes = '';
+
+				for (var attributeName in attributes) {
+					if (!attributes[attributeName]) {
+						continue;
+					}
+					stringifiedAttributes += '; ' + attributeName;
+					if (attributes[attributeName] === true) {
+						continue;
+					}
+					stringifiedAttributes += '=' + attributes[attributeName];
+				}
+				return (document.cookie = key + '=' + value + stringifiedAttributes);
+			}
+
+			// Read
+
+			if (!key) {
+				result = {};
+			}
+
+			// To prevent the for loop in the first place assign an empty array
+			// in case there are no cookies at all. Also prevents odd result when
+			// calling "get()"
+			var cookies = document.cookie ? document.cookie.split('; ') : [];
+			var rdecode = /(%[0-9A-Z]{2})+/g;
+			var i = 0;
+
+			for (; i < cookies.length; i++) {
+				var parts = cookies[i].split('=');
+				var cookie = parts.slice(1).join('=');
+
+				if (cookie.charAt(0) === '"') {
+					cookie = cookie.slice(1, -1);
+				}
+
+				try {
+					var name = parts[0].replace(rdecode, decodeURIComponent);
+					cookie = converter.read ?
+						converter.read(cookie, name) : converter(cookie, name) ||
+						cookie.replace(rdecode, decodeURIComponent);
+
+					if (this.json) {
+						try {
+							cookie = JSON.parse(cookie);
+						} catch (e) {}
+					}
+
+					if (key === name) {
+						result = cookie;
+						break;
+					}
+
+					if (!key) {
+						result[name] = cookie;
+					}
+				} catch (e) {}
+			}
+
+			return result;
+		}
+
+		api.set = api;
+		api.get = function (key) {
+			return api.call(api, key);
+		};
+		api.getJSON = function () {
+			return api.apply({
+				json: true
+			}, [].slice.call(arguments));
+		};
+		api.defaults = {};
+
+		api.remove = function (key, attributes) {
+			api(key, '', extend(attributes, {
+				expires: -1
+			}));
+		};
+
+		api.withConverter = init;
+
+		return api;
+	}
+
+	return init(function () {});
+}));
--- a/OsmAnd/assets/server/scripts/mapselector.js
+++ b/OsmAnd/assets/server/scripts/mapselector.js
@ -0,0 +1,29 @@
+
+
+function mapselector(container){
+var $cnt = $(container);
+var $selectbox = $cnt.find(".selectbox");
+
+$cnt.find("label").on('click', function(){
+		refreshMap();
+	});
+
+	var refreshMap = function(){
+	var selectedStyle = getSelectedStyle().val();
+		var selectedMap = getSelectedMap().val();
+		if (selectedStyle && selectedMap){
+			var imageName = selectedMap + "-" +  selectedStyle + ".png";
+			$cnt.css('background-image', "url('/images/" + imageName + "')");
+		}
+	}
+
+var getSelectedStyle = function(){
+	return $selectbox.find("input[name='style']:checked");
+}
+var getSelectedMap = function(){
+	return $selectbox.find("input[name='show']:checked");
+}
+refreshMap();
+
+
+}
--- a/OsmAnd/assets/server/scripts/poll.js
+++ b/OsmAnd/assets/server/scripts/poll.js
@ -0,0 +1,35 @@
+function applyPolStyles(){
+
+ if ($('.pds-box').length > 0){
+	$('.pds-box').css('border', 'none');
+	$('.pds-vote-button').css('float', 'left');
+	$('.pds-vote-button').css('background', 'none');
+	$('.pds-vote-button').css('background-color', '#FF8F00');
+	$('.pds-vote-button').css('color', '#fff');
+	$('.pds-vote-button').css('border', 'none');
+	$('.pds-vote-button').css('border-radius', '5px');
+	$('.pds-box-outer').css('padding', '0');
+	$('.pds-view-results').on('click', function(){
+		subscribeToReturnToPoll();		
+	});
+	}else{
+	   setTimeout(applyPolStyles, timeout);
+	}
+ }
+ 
+ function subscribeToReturnToPoll(){
+ if ($('.pds-return-poll').length > 0){
+	$('.pds-return-poll').on('click', function(){applyStyleOnBackToPoll();});
+	applyPolStyles();
+ }else{
+	setTimeout(subscribeToReturnToPoll, timeout);
+ }
+ }
+ 
+ function applyStyleOnBackToPoll(){
+  if ($('.pds-view-results').length >0){	
+	applyPolStyles();
+ }else{
+	setTimeout(applyStyleOnBackToPoll, timeout);
+ }
+ }
--- a/OsmAnd/assets/server/scripts/slick.min.js
+++ b/OsmAnd/assets/server/scripts/slick.min.js
--- a/OsmAnd/assets/server/scripts/slider.js
+++ b/OsmAnd/assets/server/scripts/slider.js
@ -0,0 +1,129 @@
+var images_android=[
+"promo-1s.png",
+"promo-2s.png",
+"promo-3s.png",
+"promo-4s.png",
+"promo-5s.png",
+"promo-6s.png",
+"promo-7s.png",
+"promo-8s.png",
+"promo-9s.png",
+"promo-10s.png",
+"promo-11s.png",
+"promo-12s.png"
+];
+
+var images_ios=[
+"ios-1s.png",
+"ios-2s.png",
+"ios-3s.png",
+"ios-4s.png",
+"ios-5s.png"
+];
+
+function slider(container){
+var $cnt = $(container);
+var $img1 = $cnt.find("#screenshot1");
+var $img2 =$cnt.find("#screenshot2");
+var $img3 = $cnt.find("#screenshot3");
+var $img4 = $cnt.find("#screenshot4");
+var $leftarrow =  $cnt.find(".arrow.left");
+var $rightarrow =  $cnt.find(".arrow.right");
+var $btnleft = $cnt.find(".button.left");
+var $btnright = $cnt.find(".button.right");
+var currentPosition =0;
+var count =4;
+
+var images = images_android;
+
+var init = function(){
+	updatePictures();
+	updateArrows();	
+	$leftarrow.on('click', function(){
+		if (currentPosition > 0){
+			currentPosition-=count;
+			updatePictures();
+			updateArrows();	
+		}
+	});
+	$rightarrow.on('click', function(){
+		if (currentPosition + count < images.length){
+			currentPosition+=count;
+			updatePictures();
+			updateArrows();	
+		}
+	});
+	$btnleft.on('click', function(){
+		if (!$btnleft.hasClass("active")){
+			$btnleft.addClass("active");
+			$btnright.removeClass("active");
+			$btnright.addClass
+			images = images_android;
+			currentPosition = 0;
+			updatePictures();
+			updateArrows();
+		}
+		
+		
+	});
+	$btnright.on('click', function(){
+		if (!$btnright.hasClass("active")){
+			$btnright.addClass("active");
+			$btnleft.removeClass("active");
+			images = images_ios;
+			currentPosition = 0;
+			updatePictures();
+			updateArrows();
+		}
+		
+	});
+}
+
+var changePicture = function(img, index){
+	if (index < images.length){
+		img.attr("src", "images/" + images[index]);
+	}else{
+		img.attr("src", "images/empty.png");
+	}
+}
+var updatePictures = function(){
+	changePicture( $img1, currentPosition);
+	changePicture( $img2, currentPosition+1);
+	changePicture( $img3, currentPosition+2);
+	changePicture( $img4, currentPosition+3);
+}
+var updateArrows = function(){
+	if (currentPosition + count < images.length){
+		enableRightArrow();	
+	}else{
+		disableRightArrow();
+	}
+	if (currentPosition== 0 ){
+		disableLeftArrow();	
+	}else{
+		enableLeftArrow();
+	}
+}
+var enableLeftArrow = function(){
+	$leftarrow.attr("src", "images/left_arrow_orange.png");
+	while ($leftarrow.hasClass("disabled")){	
+		$leftarrow.removeClass("disabled");
+	}
+}
+var disableLeftArrow = function(){
+	$leftarrow.attr("src", "images/left_arrow_grey.png");
+	$leftarrow.addClass("disabled");
+}
+var enableRightArrow = function(){
+	$rightarrow.attr("src", "images/right_arrow_orange.png");
+	while ($rightarrow.hasClass("disabled")){	
+		$rightarrow.removeClass("disabled");
+	}
+}
+var disableRightArrow = function(){
+	$rightarrow.attr("src", "images/right_arrow_grey.png");
+	$rightarrow.addClass("disabled");
+}
+init();
+
+}
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@ -542,6 +542,7 @@ dependencies {
 	//implementation 'com.atilika.kuromoji:kuromoji-ipadic:0.9.0'
 	implementation 'com.squareup.picasso:picasso:2.71828'
 	implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
+	implementation 'org.nanohttpd:nanohttpd:2.2.0'
 	// JS core
 	implementation group: 'org.mozilla', name: 'rhino', version: '1.7.9'
 // size restrictions
--- a/OsmAnd/res/layout/bottom_sheet_item_edit_with_recyclerview.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_edit_with_recyclerview.xml
@ -104,6 +104,7 @@
 			android:paddingRight="@dimen/content_padding_small"
 			android:paddingEnd="@dimen/content_padding_small"
 			android:paddingLeft="@dimen/content_padding_small"
+			android:textColor="?android:textColorSecondary"
 			android:text="@string/shared_string_meters" />
 	</FrameLayout>

--- a/OsmAnd/res/layout/bottom_sheet_item_with_descr_56dp.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_descr_56dp.xml
@ -33,8 +33,8 @@
 			android:layout_height="wrap_content"
 			android:ellipsize="end"
 			android:maxLines="1"
-			android:textAppearance="@style/TextAppearance.ListItemTitle"
-			tools:text="Some title"/>
+			style="@style/TextAppearance.ListItemTitle"
+			tools:text="Some title" />

 		<TextView
 			android:id="@+id/description"
@ -42,8 +42,9 @@
 			android:layout_height="wrap_content"
 			android:ellipsize="end"
 			android:maxLines="2"
-			android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
-			tools:text="Some description"/>
+			style="@style/TextAppearance.ContextMenuSubtitle"
+			android:textColor="@null"
+			tools:text="Some description" />
 	</LinearLayout>

 </LinearLayout>
--- a/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_checkbox_56dp.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_checkbox_56dp.xml
@ -44,6 +44,7 @@
 			android:ellipsize="end"
 			android:maxLines="2"
 			android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+			android:textColor="@null"
 			tools:text="Some description"/>
 	</LinearLayout>

--- a/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_switch_56dp.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_switch_56dp.xml
@ -44,6 +44,7 @@
            android:ellipsize="end"
            android:maxLines="2"
            android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+            android:textColor="@null"
            tools:text="Some description"/>
    </LinearLayout>

--- a/OsmAnd/res/layout/bottom_sheet_item_with_descr_pad_32dp.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_descr_pad_32dp.xml
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:minHeight="@dimen/measurement_tool_up_down_row_height"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding"
+	android:paddingEnd="@dimen/content_padding"
+	android:paddingStart="@dimen/content_padding">
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/icon"
+		android:layout_width="@dimen/standard_icon_size"
+		android:layout_height="@dimen/standard_icon_size"
+		android:layout_gravity="center_vertical"
+		android:layout_marginEnd="@dimen/bottom_sheet_icon_margin_large"
+		android:layout_marginRight="@dimen/bottom_sheet_icon_margin_large"
+		tools:src="@drawable/list_destination" />
+
+	<LinearLayout
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_weight="1"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:maxLines="1"
+			style="@style/TextAppearance.ListItemTitle"
+			tools:text="Some title" />
+
+		<TextView
+			android:id="@+id/description"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:maxLines="2"
+			style="@style/TextAppearance.ContextMenuSubtitle"
+			tools:text="Some description" />
+	</LinearLayout>
+
+</LinearLayout>
--- a/OsmAnd/res/layout/bottom_sheet_item_with_descr_switch_and_additional_button_56dp.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_descr_switch_and_additional_button_56dp.xml
@ -49,6 +49,7 @@
                android:layout_height="wrap_content"
                android:ellipsize="end"
                android:maxLines="2"
+                android:textColor="@null"
                android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
                tools:text="Some description" />
        </LinearLayout>
--- a/OsmAnd/res/layout/bottom_sheet_menu_base.xml
+++ b/OsmAnd/res/layout/bottom_sheet_menu_base.xml
@ -6,6 +6,10 @@
 	android:orientation="vertical"
 	tools:background="?attr/bg_color">

+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
 		<ScrollView
 			android:id="@+id/scroll_view"
 			android:layout_width="match_parent"
@ -26,6 +30,15 @@
 			android:orientation="vertical"
 			android:visibility="gone" />

+		<androidx.appcompat.widget.AppCompatImageView
+			android:id="@+id/buttons_shadow"
+			android:layout_width="match_parent"
+			android:layout_height="10dp"
+			android:layout_gravity="bottom"
+			android:visibility="gone"
+			android:background="@drawable/bg_contextmenu_shadow_top_light" />
+	</FrameLayout>
+
 	<include layout="@layout/bottom_buttons" />

 </LinearLayout>
--- a/OsmAnd/res/layout/fragment_edit_poi.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi.xml
@ -43,26 +43,32 @@
                android:layout_height="wrap_content"
                app:layout_scrollFlags="scroll">

-                <com.google.android.material.textfield.TextInputLayout
+                <net.osmand.plus.widgets.OsmandTextFieldBoxes
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:hint="@string/shared_string_name"
+                    app:labelText="@string/shared_string_name"
+                    app:panelBackgroundColor="@color/color_transparent"
+                    app:colorControlHighlight="@color/color_transparent"
+                    app:primaryColor="@color/color_white"
+                    app:secondaryColor="@color/white_50_transparent"
+                    app:useDenseSpacing="true"
                    android:importantForAutofill="noExcludeDescendants"
                    android:layout_marginLeft="@dimen/settings_divider_margin_start"
                    android:layout_marginRight="@dimen/content_padding"
                    android:layout_marginStart="@dimen/settings_divider_margin_start"
                    android:layout_marginEnd="@dimen/content_padding">

-                    <EditText
+                    <studio.carbonylgroup.textfieldboxes.ExtendedEditText
                        android:id="@+id/poiNameEditText"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
+                        android:background="@color/color_transparent"
                        android:imeOptions="actionNext"
                        android:importantForAutofill="noExcludeDescendants"
                        android:inputType="textCapSentences"
                        tools:text="@string/lorem_ipsum"/>

-                </com.google.android.material.textfield.TextInputLayout>
+                </net.osmand.plus.widgets.OsmandTextFieldBoxes>
            </LinearLayout>

            <LinearLayout
@ -80,32 +86,33 @@
                    android:background="@null"
                    app:srcCompat="@drawable/ic_action_label"/>

-                <com.google.android.material.textfield.TextInputLayout
+                <net.osmand.plus.widgets.OsmandTextFieldBoxes
                    android:id="@+id/poiTypeTextInputLayout"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
-                    android:hint="@string/poi_dialog_poi_type"
-                    android:importantForAutofill="noExcludeDescendants"
-                    android:layout_marginLeft="24dp"
                    android:layout_weight="1"
-                    android:layout_marginStart="24dp">
+                    android:layout_marginStart="24dp"
+                    android:layout_marginLeft="24dp"
+                    android:importantForAutofill="noExcludeDescendants"
+                    app:endIcon="@drawable/ic_action_arrow_drop_down"
+                    app:labelText="@string/poi_dialog_poi_type"
+                    app:panelBackgroundColor="@color/color_transparent"
+                    app:primaryColor="@color/color_white"
+                    app:secondaryColor="@color/white_50_transparent">

-                    <com.google.android.material.textfield.MaterialAutoCompleteTextView
+                    <studio.carbonylgroup.textfieldboxes.ExtendedEditText
                        android:id="@+id/poiTypeEditText"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
-                        android:minHeight="@dimen/wpt_list_item_height"
-                        android:gravity="bottom|start"
-                        android:paddingBottom="@dimen/text_margin_small"
                        android:completionThreshold="1"
-                        app:drawableRightCompat="@drawable/ic_action_arrow_drop_down"
-                        app:drawableEndCompat="@drawable/ic_action_arrow_drop_down"
-                        android:importantForAutofill="noExcludeDescendants"
+                        android:gravity="bottom|start"
                        android:imeOptions="actionSend"
+                        android:importantForAutofill="noExcludeDescendants"
                        android:inputType="text"
+                        android:paddingBottom="@dimen/text_margin_small"
                        tools:text="@string/lorem_ipsum" />

-                </com.google.android.material.textfield.TextInputLayout>
+                </net.osmand.plus.widgets.OsmandTextFieldBoxes>

                <ImageButton
                    android:id="@+id/onlineDocumentationButton"
--- a/OsmAnd/res/layout/fragment_map_markers_groups.xml
+++ b/OsmAnd/res/layout/fragment_map_markers_groups.xml
@ -22,6 +22,7 @@
        android:layout_height="wrap_content"
        app:srcCompat="@drawable/ic_action_plus"
        app:backgroundTint="?attr/active_color_basic"
+        app:tint="?attr/app_bar_primary_item_color"
        app:fabSize="normal"
        app:useCompatPadding="true"/>

--- a/OsmAnd/res/layout/gpx_description_card.xml
+++ b/OsmAnd/res/layout/gpx_description_card.xml
@ -24,6 +24,7 @@
 			android:ellipsize="end"
 			android:maxLines="5"
 			android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+			android:textColor="@null"
 			tools:text="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard."
 			android:layout_marginStart="@dimen/content_padding"
 			android:layout_marginEnd="@dimen/content_padding" />
--- a/OsmAnd/res/layout/gpx_item_list_header.xml
+++ b/OsmAnd/res/layout/gpx_item_list_header.xml
@ -64,18 +64,20 @@
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1.8"
-                android:minHeight="48dp"
+                android:minHeight="@dimen/card_row_min_height"
                android:paddingLeft="@dimen/content_padding"
-                android:paddingTop="@dimen/content_padding_half"
-                android:paddingBottom="@dimen/content_padding_half"
+				android:paddingStart="@dimen/content_padding"
+				android:paddingRight="0dp"
+				android:paddingEnd="0dp"
                android:orientation="horizontal"
-                android:gravity="center_vertical"
-	            android:paddingStart="@dimen/content_padding">
+                android:gravity="center_vertical">

                <TextView
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
+					android:paddingTop="@dimen/content_padding_half"
+					android:paddingBottom="@dimen/content_padding_half"
 					android:textColor="?android:textColorPrimary"
                    android:textSize="@dimen/default_list_text_size"
                    android:text="@string/shared_string_show_on_map"/>
@ -119,14 +121,16 @@
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1.6"
-                android:minHeight="48dp"
+                android:minHeight="@dimen/card_row_min_height"
                android:paddingLeft="@dimen/content_padding"
+				android:paddingStart="@dimen/content_padding"
+				android:paddingRight="0dp"
+				android:paddingEnd="0dp"
                android:paddingTop="@dimen/content_padding_half"
                android:paddingBottom="@dimen/content_padding_half"
                android:background="?attr/selectableItemBackground"
                android:orientation="horizontal"
-                android:gravity="center_vertical"
-	            android:paddingStart="@dimen/content_padding">
+                android:gravity="center_vertical">

                <TextView
                    android:id="@+id/split_interval_title"
@ -166,7 +170,7 @@
 		    android:layout_height="wrap_content"
 		    android:background="?attr/selectableItemBackground"
 		    android:gravity="center_vertical"
-		    android:minHeight="48dp"
+		    android:minHeight="@dimen/card_row_min_height"
 		    android:orientation="horizontal"
 		    android:paddingLeft="@dimen/content_padding"
 		    android:paddingTop="@dimen/content_padding_half"
--- a/OsmAnd/res/layout/gpx_track_item.xml
+++ b/OsmAnd/res/layout/gpx_track_item.xml
@ -34,10 +34,8 @@
            android:visibility="gone"
            android:paddingTop="4dp"
            android:paddingBottom="4dp"
-            android:paddingRight="@dimen/dialog_content_margin"
-            android:paddingEnd="@dimen/dialog_content_margin"
-            android:paddingLeft="0dp"
-            android:paddingStart="0dp"
+            android:layout_marginRight="@dimen/dialog_content_margin"
+            android:layout_marginEnd="@dimen/dialog_content_margin"
            android:clickable="false"
            android:focusableInTouchMode="false" />

--- a/OsmAnd/res/layout/markers_group_view_holder.xml
+++ b/OsmAnd/res/layout/markers_group_view_holder.xml
@ -44,6 +44,7 @@
 			android:ellipsize="end"
 			android:maxLines="1"
 			android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+			android:textColor="@null"
 			android:visibility="gone"
 			tools:text="Some description"
 			tools:visibility="visible"/>
--- a/OsmAnd/res/layout/plan_route_gpx.xml
+++ b/OsmAnd/res/layout/plan_route_gpx.xml
@ -46,7 +46,8 @@
 			android:layout_height="wrap_content"
 			android:ellipsize="end"
 			android:maxLines="2"
-			android:textAppearance="@style/TextAppearance.ContextMenuSubtitle" />
+			android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+			android:textColor="@null" />

 	</LinearLayout>

--- a/OsmAnd/res/layout/point_editor_fragment_new.xml
+++ b/OsmAnd/res/layout/point_editor_fragment_new.xml
@ -519,6 +519,7 @@
 							android:lines="1"
 							android:text="@string/replace_point_descr"
 							android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+							android:textColor="@null"
 							tools:text="@string/replace_point_descr" />

 					</LinearLayout>
--- a/OsmAnd/res/layout/preference_dropdown_list.xml
+++ b/OsmAnd/res/layout/preference_dropdown_list.xml
@ -22,9 +22,11 @@
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_vertical|end"
 			android:paddingRight="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingLeft="0dp"
+			android:paddingStart="0dp"
 			app:srcCompat="@drawable/ic_action_arrow_drop_down"
-			android:tint="@color/settings_divider"
-			android:paddingEnd="@dimen/content_padding" />
+			android:tint="@color/settings_divider" />

 		<net.osmand.plus.widgets.OsmandTextFieldBoxes
 			android:id="@+id/master_profile_otfb"
--- a/OsmAnd/res/layout/profile_preference_toolbar.xml
+++ b/OsmAnd/res/layout/profile_preference_toolbar.xml
@ -60,6 +60,7 @@
 				android:ellipsize="end"
 				android:maxLines="2"
 				android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+				android:textColor="@null"
 				tools:text="Some description" />
 		</LinearLayout>

--- a/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml
+++ b/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml
@ -66,6 +66,7 @@
 					android:ellipsize="end"
 					android:maxLines="2"
 					android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+					android:textColor="@null"
 					tools:text="Some description" />
 			</LinearLayout>

--- a/OsmAnd/res/layout/quick_action_list.xml
+++ b/OsmAnd/res/layout/quick_action_list.xml
@ -31,6 +31,7 @@
        android:layout_alignParentBottom="true"
        android:layout_margin="@dimen/content_padding"
        android:contentDescription="@string/quick_action_new_action"
+        app:tint="?attr/app_bar_primary_item_color"
        app:backgroundTint="?attr/color_dialog_buttons"
        app:srcCompat="@drawable/ic_action_plus" />

--- a/OsmAnd/res/layout/server_activity.xml
+++ b/OsmAnd/res/layout/server_activity.xml
@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="match_parent"
+    android:padding="10px">
+    <RelativeLayout
+        android:id="@+id/RelativeLayout03"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="20px"
+        android:layout_marginBottom="40px">
+
+        <TextView
+            android:id="@+id/TextView02"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:autoLink="web"
+            android:text="Click button to start server"></TextView>
+    </RelativeLayout>
+
+    <Button
+        android:id="@+id/Button01"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/RelativeLayout03"
+        android:layout_alignParentLeft="true"
+        android:layout_marginBottom="40px"
+        android:text="Start"></Button>
+
+    <Button
+        android:id="@+id/Button03"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/Button01"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentLeft="true"
+        android:text="Stop"></Button>
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignRight="@+id/Button03"
+        android:fitsSystemWindows="true"
+        android:lines="14"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="8dp" />
+
+</RelativeLayout>
--- a/OsmAnd/res/layout/wikivoyage_article_card.xml
+++ b/OsmAnd/res/layout/wikivoyage_article_card.xml
@ -54,6 +54,7 @@
 						android:ellipsize="end"
 						android:maxLines="3"
 						android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+						android:textColor="@null"
 						tools:text="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard."/>

 				</LinearLayout>
@ -84,6 +85,7 @@
 				android:ellipsize="end"
 				android:maxLines="1"
 				android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+				android:textColor="@null"
 				tools:text="England • United Kingdom"
 				android:layout_marginStart="@dimen/content_padding"
 				android:layout_marginEnd="@dimen/content_padding" />
--- a/OsmAnd/res/layout/wikivoyage_search_list_item.xml
+++ b/OsmAnd/res/layout/wikivoyage_search_list_item.xml
@ -61,6 +61,7 @@
 						android:ellipsize="end"
 						android:maxLines="1"
 						android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+						android:textColor="@null"
 						tools:text="Amstellend North Holland"/>

 					<TextView
@ -70,6 +71,7 @@
 						android:ellipsize="end"
 						android:maxLines="1"
 						android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+						android:textColor="@null"
 						tools:text="En, Ru, De, ..."/>

 				</LinearLayout>
--- a/OsmAnd/res/values-ar/phrases.xml
+++ b/OsmAnd/res/values-ar/phrases.xml
@ -448,7 +448,7 @@
    <string name="poi_fee">رسوم</string>
    <string name="poi_smoking">التدخين</string>
    <string name="poi_takeaway">الوجبات الجاهزة</string>
-    <string name="poi_cocktails">الكوكتيل</string>
+    <string name="poi_cocktails">كوكتيلات</string>
    <string name="poi_recycling_type">نوع</string>
    <string name="poi_recycling_accepted_waste">النفايات المقبولة</string>
    <string name="poi_shelter_type">نوع</string>
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@ -983,16 +983,13 @@
    <string name="rotate_map_bearing_opt">حسب اتجاه الحركة</string>
    <string name="rotate_map_none_opt">الشمال في الأعلى</string>
    <string name="rotate_map_compass_opt">حسب البوصلة</string>
-    <string name="gpx_monitoring_start">بدء التسجيل</string>
    <string name="traffic_warning_stop">إشارة توقف</string>
    <string name="live_monitoring_stop">إيقاف التتبع على الإنترنت</string>
-    <string name="gpx_monitoring_stop">إيقاف</string>
    <string name="transport_Stop">موقف</string>
    <string name="transport_stops">مواقف</string>
    <string name="shared_string_audio">صوت</string>
    <string name="shared_string_currently_recording_track">المسار الجار تسجيله</string>
    <string name="record_plugin_name">تسجيل المسار</string>
-    <string name="save_global_track_interval_descr">اختر الفاصل الزمني لتسجيل المسار العام (مفعل عن طريق أداة تسجيل GPX على الخريطة).</string>
    <string name="save_track_interval_descr">اختر الفاصل الزمني لتسجيل المسار أثناء الملاحة</string>
    <string name="voice">صوت مسج</string>
    <string name="get_directions">التوجيه</string>
@ -1412,7 +1409,6 @@
    <string name="access_widget_expand">وسع</string>
    <string name="access_sort">فرز</string>
    <string name="map_mode">وضع الخريطة</string>
-    <string name="number_of_gpx_files_selected_pattern">%s مسار محدد</string>
    <string name="rendering_value_thin_name">رقيقة</string>
    <string name="rendering_value_medium_name">متوسط</string>
    <string name="no_map_markers_found">لم تضف علامات على الخريطة</string>
@ -1867,7 +1863,6 @@
    <string name="lang_ceb">لغة السيبيونو</string>
    <string name="archive_wikipedia_data">لديك بيانات ويكيبيديا منزلة قديمة غير متوافقة. هل تريد أرشفتها؟</string>
    <string name="disable_recording_once_app_killed">منع التسجيل في الخلفية</string>
-    <string name="disable_recording_once_app_killed_descrp">إيقاف تسجيل المسار عند إغلاق التطبيق من نافذة التطبيقات المستخدمة مؤخراً. (إشعار أوسماند سيختفي من شريط الإشعارات)</string>
    <string name="shared_string_import2osmand">استيراد إلى أوسماند</string>
    <string name="osm_edit_context_menu_delete">حذف تعديل OSM</string>
    <string name="rendering_value_disabled_name">معطل</string>
@ -3296,7 +3291,7 @@
    <string name="settings_derived_routing_mode_string">وضع المستخدم ، مشتق من:%s</string>
    <string name="routing_profile_ski">تزلج</string>
    <string name="profile_type_descr_string">النوع:%s</string>
-    <string name="profile_type_base_string">وضع أساسي</string>
+    <string name="profile_type_base_string">ملف التعريف الأساسي</string>
    <string name="profile_alert_need_routing_type_title">حدد نوع الملاحة</string>
    <string name="profile_alert_need_routing_type_msg">يرجى تحديد نوع الملاحة للوضع الجديد</string>
    <string name="profile_alert_need_profile_name_title">أدخل اسم الوضع</string>
@ -3511,7 +3506,7 @@
    <string name="no_recalculation_setting">تعطيل إعادة الحساب</string>
    <string name="route_recalculation_dist_title">الحد الأدنى من المسافة لإعادة حساب المسار</string>
    <string name="route_recalculation_dist_descr">سيتم إعادة حساب المسار إذا كانت المسافة إلى المسار أطول من المعلمة المحددة</string>
-    <string name="profile_type_custom_string">ملف شخصي مخصص</string>
+    <string name="profile_type_custom_string">ملف تعريف مخصص</string>
    <string name="shared_string_angle_param">الزاوية: %s°</string>
    <string name="shared_string_angle">زاوية</string>
    <string name="recalc_angle_dialog_descr">سيتم عرض جزء مستقيم إضافي بين موقعي والمسار المحسوب حتى يتم إعادة حساب المسار</string>
--- a/OsmAnd/res/values-az/strings.xml
+++ b/OsmAnd/res/values-az/strings.xml
@ -70,7 +70,6 @@
    <string name="access_shared_string_not_installed">Quraşdırılmayıb</string>
    <string name="access_sort">Sırala</string>
    <string name="map_mode">Xəritə rejimi</string>
-    <string name="number_of_gpx_files_selected_pattern">%s GPX faylı seçildi</string>
    <string name="rendering_value_medium_name">Orta</string>
    <string name="rendering_value_bold_name">Qalın</string>
    <string name="shared_string_move_up">Yuxarı daşı</string>
@ -834,8 +833,6 @@
    <string name="access_hint_enter_description">Açıqlama daxil et.</string>
    <string name="access_widget_expand">Genişlət</string>
    <string name="access_shared_string_navigate_up">Yuxarı get</string>
-    <string name="gpx_monitoring_start">GPX qeydiyyatını başlat</string>
-    <string name="gpx_monitoring_stop">GPX qeydiyyatını dayandır</string>
    <string name="gpx_start_new_segment">Yeni seqment başlat</string>
    <string name="rendering_attr_hideBuildings_name">Binalar</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Qeyri-nəqliyyat magistrallar</string>
--- a/OsmAnd/res/values-b+be+Latn/strings.xml
+++ b/OsmAnd/res/values-b+be+Latn/strings.xml
@ -89,7 +89,6 @@
    <string name="sleep_mode_stop_dialog">Spynіć fonavy režym GPS?</string>
    <string name="stop_navigation_service">Spynіć</string>
    <string name="confirm_every_run">Pytacca zaŭsiody</string>
-    <string name="save_global_track_interval_descr">Abiarycie interval zapisu sliedu (ukliučajecca vidžetam zapisu GPX na mapie).</string>
    <string name="save_global_track_interval">Ahulny іntervał zapіsu</string>
    <string name="background_service_int">Іntervał abudžeńnia GPS</string>
    <string name="enable_sleep_mode">Uklučyć fonavy režym GPS</string>
@ -136,8 +135,6 @@
    <string name="live_monitoring_m">Adsočvańnie praz Іnternet (patrabujecca GPX)</string>
    <string name="live_monitoring_start">Pačać adsočvańnie praz Іnternet</string>
    <string name="live_monitoring_stop">Spynіć adsočvańnie praz Іnternet</string>
-    <string name="gpx_monitoring_start">Pačać zapіs GPX</string>
-    <string name="gpx_monitoring_stop">Spynіć zapіs GPX</string>
    <string name="gpx_start_new_segment">Pačać novy adrezak</string>
    <string name="rendering_attr_hideBuildings_name">Budynkі</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Nie aŭtamabіlnyja darohі</string>
@ -1434,7 +1431,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
    <string name="access_shared_string_navigate_up">Pierajścі ŭvierch</string>
    <string name="access_sort">Sartavać</string>
    <string name="map_mode">Režym mapy</string>
-    <string name="number_of_gpx_files_selected_pattern">Abrana %s GPX fajłaŭ</string>
    <string name="rendering_value_thin_name">Tonkі</string>
    <string name="rendering_value_medium_name">Siarednі</string>
    <string name="rendering_value_bold_name">Toŭsty</string>
@ -1696,7 +1692,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
    <string name="download_wikipedia_files">Ściahnuć dadatkovyja źviestki Vikipedyi (%1$s MB) ?</string>
    <string name="gps_network_not_enabled">Služba miescaznachodžańnia nie ŭkliučanaja. Ukliučyć jaje?</string>
    <string name="disable_recording_once_app_killed">Praduchіlić aŭtanomny zapіs</string>
-    <string name="disable_recording_once_app_killed_descrp">Zapіs GPX prypynіcca, kali prahrama budzie zabіta (praz nadaŭnіja prahramy). (Apaviaščeńnie ŭ vobłaścі padkazak Android pra fonavy režym OsmAnd źnіknie.)</string>
    <string name="shared_string_import2osmand">Іmpartavać u OsmAnd</string>
    <string name="read_full_article">Čytać artykuł całkam (anłajn)</string>
    <string name="shared_string_wikipedia">Vіkіpedyja</string>
--- a/OsmAnd/res/values-b+hsb/strings.xml
+++ b/OsmAnd/res/values-b+hsb/strings.xml
@ -1479,8 +1479,6 @@
    <string name="route_info">Informacije wo čarje</string>
    <string name="routing_attr_prefer_motorway_name">Awtodróhi preferować</string>
    <string name="routing_attr_prefer_motorway_description">Awtodróhi preferować</string>
-    <string name="gpx_monitoring_start">GPX-nahrawanje započeć</string>
-    <string name="gpx_monitoring_stop">GPX-nahrawanje zastajić</string>
    <string name="distance_farthest">Najdalši jako prěni</string>
    <string name="distance_nearest">Najbliši jako prěni</string>
    <string name="enter_lat_and_lon">Šěrinu a dołhotu zapodać</string>
--- a/OsmAnd/res/values-b+kab/strings.xml
+++ b/OsmAnd/res/values-b+kab/strings.xml
@ -1245,7 +1245,6 @@
    <string name="map_marker">marker</string>
    <string name="full_report">Azen</string>
    <string name="shared_string_topbar">Asawen</string>
-    <string name="number_of_gpx_files_selected_pattern">%S n ifuyla ifernen.</string>
    <string name="map_mode">Takarḍa</string>
    <string name="access_tree_list">Aseklu</string>
    <string name="access_empty_list">(Tabdart d tilemt)</string>
@ -1332,4 +1331,12 @@
    <string name="layer_map_appearance">Swel agdil</string>
    <string name="map_widget_right">Agalis ayeffus</string>
    <string name="map_widget_appearance_rem">Iferdisen i d-iqqimen</string>
+    <string name="gpx_split_interval_none_descr">Fren iɣewwaṛen n unegzum i tebɣiḍ: s wakud neɣ s umeccaq.</string>
+    <string name="track_coloring_solid">Iqqur</string>
+    <string name="plan_route_last_edited">Taẓrigt taneggarut</string>
+    <string name="reverse_route">Abrid yettin</string>
+    <string name="next_segment">Aḥric i d-itteddun</string>
+    <string name="navigation_profile">Amaɣnu n tunigin</string>
+    <string name="rourte_between_points_add_track_desc">Fren afaylu n uḍfar iɣer ara yernu uḥric amaynut.</string>
+    <string name="plan_route_exit_dialog_descr">Tebɣiḍ s tidet ad tmedleḍ abrid n uɣawas war asekles\? Ad tesruḥeḍ akk ibeddilen.</string>
 </resources>
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@ -1248,7 +1248,6 @@
    <string name="gps_wake_up_timer">Iнтэрвал абуджэння GPS</string>
    <string name="lang_sw">Суахілі</string>
    <string name="lang_he">Іўрыт</string>
-    <string name="gpx_monitoring_start">Працягнуць запіс GPX</string>
    <string name="gpx_start_new_segment">Пачаць новы адрэзак</string>
    <string name="lang_fa">Персідская</string>
    <string name="sleep_mode_stop_dialog">Спыніць фонавы рэжым GPS?</string>
@ -1258,7 +1257,6 @@
    <string name="forward">Наперад</string>
    <string name="home">Панэль кіравання</string>
    <string name="keep_navigation_service">Пакінуць</string>
-    <string name="gpx_monitoring_stop">Прыпыніць запіс GPX</string>
    <string name="live_monitoring_start">Пачаць адсочванне праз Інтэрнэт</string>
    <string name="live_monitoring_stop">Спыніць адсочванне праз Інтэрнэт</string>
    <string name="live_monitoring_m">Адсочванне праз Інтэрнэт (патрабуецца GPX)</string>
@ -1305,7 +1303,6 @@
    <string name="save_track_interval_globally">Інтэрвал запісу</string>
    <string name="save_track_to_gpx_globally_descr">Запіс месцазнаходжання ў GPX-файл можа быць уключаны або выключаны з дапамогай кнопкі запісу GPX мапе.</string>
    <string name="confirm_every_run">Пытацца заўсёды</string>
-    <string name="save_global_track_interval_descr">Вызначце інтэрвал запісу следу (уключаецца праз віджэт запісу GPX на мапе).</string>
    <string name="save_global_track_interval">Агульны інтэрвал запісу</string>
    <string name="traffic_warning_speed_limit">Абмежаванне хуткасці</string>
    <string name="traffic_warning_border_control">Памежны кантроль</string>
@ -1592,7 +1589,6 @@
    <string name="local_recordings_delete_all_confirm">Сапраўды хочаце выдаліць %1$d нататак\?</string>
    <string name="shared_string_import2osmand">Імпартаваць у OsmAnd</string>
    <string name="disable_recording_once_app_killed">Прадухіліць аўтаномны запіс</string>
-    <string name="disable_recording_once_app_killed_descrp">Запіс GPX прыпыніцца, калі праграма будзе забітая (праз надаўнія праграмы). (Апавяшчэнне ў вобласці падказак Android пра фонавы рэжым OsmAnd знікне.)</string>
    <string name="gps_network_not_enabled">Служба вызначэння месцазнаходжання выключаная. Уключыць яе\?</string>
    <string name="archive_wikipedia_data">Даныя Вікіпедыі састарэлі і больш непрыдатныя. Заархіваваць іх\?</string>
    <string name="download_wikipedia_files">Спампаваць дадатковыя даныя Вікіпедыі (%1$s МБ)\?</string>
@ -1960,7 +1956,6 @@
    <string name="rendering_value_medium_name">Сярэдні</string>
    <string name="rendering_value_bold_name">Тоўсты</string>
    <string name="map_mode">Рэжым мапы</string>
-    <string name="number_of_gpx_files_selected_pattern">Абрана %s GPX-файлаў</string>
    <string name="add_points_to_map_markers_q">Дадаць усе пункты як адзнакі мапы\?</string>
    <string name="shared_string_add_to_map_markers">Дадаць да адзнак мапы</string>
    <string name="no_map_markers_found">Калі ласка, дадайце адзнакі праз экран мапы</string>
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@ -1092,8 +1092,6 @@
    <string name="lang_he">Иврит</string>
    <string name="forward">Напред</string>
    <string name="home">Табло за управление</string>
-    <string name="gpx_monitoring_start">Старт на записа в GPX</string>
-    <string name="gpx_monitoring_stop">Край на GPX записа</string>
    <string name="gpx_start_new_segment">Започни нов сегмент</string>
    <string name="rendering_attr_hideBuildings_name">Скрий сградите</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Скрий пътищата, които не са за автомобили</string>
@ -1195,7 +1193,6 @@
    <string name="rendering_attr_hideHouseNumbers_name">Номер</string>
    <string name="application_dir_change_warning3">Да премести ли OsmAnd своите файлове на новото място\?</string>
    <string name="general_settings_2">Общи настройки</string>
-    <string name="save_global_track_interval_descr">Изберете интервал при запис на изминат път (достъпен чрез добавката за запис в GPX)</string>
    <string name="save_global_track_interval">Интервал за запис</string>
    <string name="search_for">Търси</string>
    <string name="shared_string_show_all">Покажи всички</string>
@ -1389,7 +1386,6 @@
    <string name="shared_string_show_details">Покажи подробни данни</string>
    <string name="gps_network_not_enabled">Услугата за местоположение е изключена. Включване\?</string>
    <string name="disable_recording_once_app_killed">Предотвратяване на самостоятелно записване</string>
-    <string name="disable_recording_once_app_killed_descrp">Спира на пауза записа на GPX, когато приложението е затворено (от последни приложения). (Иконата на OsmAnd изчезва от лентата за уведомяване на Андроид.)</string>
    <string name="shared_string_import2osmand">Импортиране към OsmAnd</string>
    <string name="read_full_article">Прочетете пълната статия (онлайн)</string>
    <string name="local_recordings_delete_all_confirm">Сигурни ли сте, че искате да изтриете %1$d бележки\?</string>
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@ -879,7 +879,6 @@
    <string name="download_regular_maps">Mapes estàndards</string>
    <string name="rendering_attr_noAdminboundaries_description">No mostris els límits administratius regionals (nivells 5 a 9).</string>
    <string name="map_widget_max_speed">Límit de velocitat</string>
-    <string name="monitoring_control_start">GPX</string>
    <string name="incremental_search_city">Cerca progressiva de municipis</string>
    <string name="safe_mode_description">Executeu l\'aplicació en mode segur (usant Android més lent que el codi nadiu).</string>
    <string name="delete_target_point">Elimina el destí</string>
@ -1279,8 +1278,6 @@
    <string name="live_monitoring_m">Registre de traça en línia (cal GPX)</string>
    <string name="live_monitoring_start">Inicia un registre de traça en línia</string>
    <string name="live_monitoring_stop">Atura el registre de traça en línia</string>
-    <string name="gpx_monitoring_start">Inicia el registre GPX</string>
-    <string name="gpx_monitoring_stop">Atura el registre GPX</string>
    <string name="gpx_start_new_segment">Inicia un segment nou</string>
    <string name="lang_fa">Persa</string>
    <string name="keep_navigation_service">Mantén</string>
@ -1332,7 +1329,6 @@
    <string name="save_track_to_gpx_globally_descr">L\'enregistrament de la posició en un fitxer GPX es pot activar o desactivar amb el giny d\'enregistrament GPX al mapa.</string>
    <string name="save_track_interval_globally">Interval d\'enregistrament</string>
    <string name="confirm_every_run">Es demana confirmació</string>
-    <string name="save_global_track_interval_descr">Indiqueu l\'interval d\'enregistrament general de les traces (s\'activa mitjançant el giny de gravació de GPX del mapa).</string>
    <string name="save_global_track_interval">Interval d\'enregistrament general</string>
    <string name="traffic_warning_speed_limit">Velocitat màxima</string>
    <string name="traffic_warning_border_control">Control de fronteres</string>
@ -1570,7 +1566,6 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
    <string name="download_wikipedia_maps">Viquipèdia</string>
    <string name="gps_network_not_enabled">El servei de posicionament està aturat. El voleu activar\?</string>
    <string name="disable_recording_once_app_killed">Evita la gravació en procés de fons</string>
-    <string name="disable_recording_once_app_killed_descrp">L\'enregistrament en format GPX s\'aturarà quan ho faci OsmAnd (via les aplicacions recents). (La indicació de procés de fons de l\'OsmAnd desapareixerà de la barra de notificacions d\'Android)</string>
    <string name="shared_string_import2osmand">Importa a l\'OsmAnd</string>
    <string name="local_recordings_delete_all_confirm">Esteu segur que voleu esborrar %1$d notes\?</string>
    <string name="archive_wikipedia_data">Teniu dades de Viquipèdia antigues i incompatibles. Les voleu desar?</string>
@ -1945,7 +1940,6 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
    <string name="rec_split">Divisió d\'enregistrament</string>
    <string name="rec_split_title">Utilitza divisió d\'enregistrament</string>
    <string name="map_mode">Mode mapa</string>
-    <string name="number_of_gpx_files_selected_pattern">"Seleccionats  %s arxius GPX"</string>
    <string name="access_default_color">Color per defecte</string>
    <string name="access_category_choice">Trieu la categoria</string>
    <string name="access_hint_enter_name">Introduïu el nom</string>
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@ -860,7 +860,6 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="map_widget_max_speed">Rychlostní omezení</string>
    <string name="rendering_attr_noAdminboundaries_name">Hranice oblastí</string>
    <string name="rendering_attr_noAdminboundaries_description">Potlačit zobrazení správních hranic (administrativní úrovně 5-9).</string>
-    <string name="monitoring_control_start">GPX</string>
    <string name="index_srtm_ele">Vrstevnice</string>
    <string name="download_select_map_types">Ostatní mapy</string>
    <string name="audionotes_plugin_name">Modul zvukové/video poznámky</string>
@ -1241,8 +1240,6 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="live_monitoring_m">On-line sledování (vyžaduje GPX)</string>
    <string name="live_monitoring_start">Spustit on-line sledování</string>
    <string name="live_monitoring_stop">Zastavit on-line sledování</string>
-    <string name="gpx_monitoring_start">Pokračovat v GPX logování</string>
-    <string name="gpx_monitoring_stop">Pozastavit GPX logování</string>
    <string name="gpx_start_new_segment">Začít nový segment</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Cesty, které nejsou pro vozidla</string>
    <string name="rendering_attr_buildings15zoom_name">Budovy při přiblížení 15</string>
@ -1297,7 +1294,6 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="speak_poi">Blízké body zájmu POI</string>
    <string name="save_track_to_gpx_globally_descr">Záznam do GPX souboru může být zapnut nebo vypnut pomocí widgetu Záznam trasy na mapové obrazovce.</string>
    <string name="confirm_every_run">Vždy se zeptat</string>
-    <string name="save_global_track_interval_descr">Vybrat interval ukládání pro globální záznam trasy (aktivovaný přes widget Záznam trasy na mapové obrazovce).</string>
    <string name="save_global_track_interval">Globální interval záznamu</string>
    <string name="traffic_warning_speed_limit">Rychlostní limit</string>
    <string name="traffic_warning_border_control">Hraniční kontrola</string>
@ -1565,7 +1561,6 @@ Délka %2$s</string>
    <string name="download_wikipedia_files">Stáhnout dodatečná Wikipedia data (%1$s MB) \?</string>
    <string name="gps_network_not_enabled">Služba zjištění polohy není zapnuta. Aktivovat\?</string>
    <string name="disable_recording_once_app_killed">Zabránit samostatnému logování</string>
-    <string name="disable_recording_once_app_killed_descrp">Pozastaví záznam GPX trasy pokud je aplikace ukončena (přes nedávné aplikace). (OsmAnd indikátor zmizí ze stavového řádku Androidu.)</string>
    <string name="download_live_updates">Okamžité aktualizace</string>
    <string name="no_updates_available">Nejsou dostupné žádné aktualizace</string>
    <string name="traffic_warning_hazard">Nebezpečí</string>
@ -1932,7 +1927,6 @@ Délka %2$s</string>
    <string name="access_shared_string_navigate_up">Navigovat nahoru</string>
    <string name="access_sort">Setřídit</string>
    <string name="map_mode">Režim mapy</string>
-    <string name="number_of_gpx_files_selected_pattern">%s vybraných GPX souborů</string>
    <string name="rendering_value_thin_name">Tenké</string>
    <string name="rendering_value_medium_name">Střední</string>
    <string name="rendering_value_bold_name">Tučné</string>
@ -3484,4 +3478,13 @@ Zobrazená oblast: %1$s x %2$s</string>
    <string name="plan_route_create_new_route">Vytvořit novou trasu</string>
    <string name="plan_route_select_track_file_for_open">Vyberte trasu k otevření.</string>
    <string name="shared_string_done">Hotovo</string>
+    <string name="please_provide_point_name_error">Zadejte prosím název bodu</string>
+    <string name="quick_action_remove_next_destination_descr">Současný cílový bod na trase bude smazán. Jestliže to je poslední cíl, navigace se zastaví.</string>
+    <string name="search_download_wikipedia_maps">Stáhnout Wikipedia mapy</string>
+    <string name="plugin_wikipedia_description">Získejte informace o zájmových bodech z Wikipedie. Je to váš offline kapesní průvodce - zapněte Wikipedia plugin a užívejte si články o objektech okolo Vás.</string>
+    <string name="add_hidden_group_info">Přidaný bod nebude na mapě vidět, protože vybraná skupina je skrytá. Můžete jej najít v \"%s\".</string>
+    <string name="app_mode_enduro_motorcycle">Enduro motorka</string>
+    <string name="app_mode_motor_scooter">Motorový skútr</string>
+    <string name="app_mode_wheelchair">Invalidní vozík</string>
+    <string name="app_mode_wheelchair_forward">Invalidní vozík vpřed</string>
 </resources>
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@ -126,7 +126,6 @@
    <string name="av_def_action_choose">På anmodning\?</string>
    <string name="av_use_external_camera_descr">Brug systemprogram til foto.</string>
    <string name="av_use_external_camera">Brug kamera</string>
-    <string name="monitoring_control_start">GPX</string>
    <string name="route_descr_lat_lon">Lat %1$.3f, Lon %2$.3f</string>
    <string name="intermediate_point">Mellemliggende destination %1$s</string>
    <string name="snap_to_road_descr">Hold position på vejen under navigation.</string>
@ -1221,8 +1220,6 @@
    <string name="live_monitoring_m">Online sporing (GPX nødvendig)</string>
    <string name="live_monitoring_start">Start online sporing</string>
    <string name="live_monitoring_stop">Stop online sporing</string>
-    <string name="gpx_monitoring_start">Start GPX-logning</string>
-    <string name="gpx_monitoring_stop">Stop GPX-logning</string>
    <string name="gpx_start_new_segment">Start nyt segment</string>
    <string name="lang_fa">Persisk</string>
    <string name="map_preferred_locale_descr">Foretrukket sprog for etiketter på kortet (hvis ikke tilgængelig bruges engelske eller lokale navne).</string>
@ -1274,7 +1271,6 @@
    <string name="save_track_interval_globally">Logningsinterval</string>
    <string name="save_track_to_gpx_globally_descr">Generel positionsslogning til en GPX-fil kan slås til eller fra med GPX-logning udvidelsen på kortet.</string>
    <string name="confirm_every_run">Spørg altid</string>
-    <string name="save_global_track_interval_descr">Angiv logningsinterval for den almindelige optagelse af spor (aktiveres via \'GPX-logning\' på hovedskærmen).</string>
    <string name="save_global_track_interval">Generelt logningsinterval</string>
    <string name="traffic_warning_speed_limit">Hastighedsgrænse</string>
    <string name="traffic_warning_border_control">Grænsekontrol</string>
@ -1565,7 +1561,6 @@
    <string name="shared_string_import2osmand">Importer til OsmAnd</string>
    <string name="local_recordings_delete_all_confirm">Slet %1$d noter. Bekræft?</string>
    <string name="disable_recording_once_app_killed">Forhindre uafhængig logning</string>
-    <string name="disable_recording_once_app_killed_descrp">Hvis markeret vil GPX-logning blive stoppet, når programmet afsluttes (via seneste programmer). OsmAnd-baggrundsmeddelse forsvinder fra meddelelseslinjen.</string>
    <string name="gps_network_not_enabled">Placeringtjenesten er slukket. Slå det til\?</string>
    <string name="archive_wikipedia_data">Der er gamle inkompatible Wikipedia data. Skal de arkiveres?</string>
    <string name="download_wikipedia_files">Hent yderligere data fra Wikipedia (%1$s MB)?</string>
@ -1938,7 +1933,6 @@
    <string name="rendering_value_thin_name">Tynd</string>
    <string name="rendering_value_medium_name">Mellem</string>
    <string name="rendering_value_bold_name">Fed</string>
-    <string name="number_of_gpx_files_selected_pattern">%s GPX-filer valgt</string>
    <string name="map_mode">Korttilstand</string>
    <string name="access_default_color">Standardfarve</string>
    <string name="access_category_choice">Vælg kategori</string>
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -12,7 +12,6 @@
    <string name="world_maps">Weltweite Karten</string>
    <string name="gps_network_not_enabled">Standortservice ist deaktiviert. Einschalten\?</string>
    <string name="disable_recording_once_app_killed">Eigenständige Streckenaufzeichnung unterbinden</string>
-    <string name="disable_recording_once_app_killed_descrp">Die GPX-Aufzeichnung wird angehalten, wenn OsmAnd beendet wird (über „zuletzt verwendete Apps“). (Die Hintergrunddienst-Anzeige verschwindet aus der Android-Benachrichtigungsleiste.)</string>
    <string name="shared_string_import2osmand">In OsmAnd importieren</string>
    <string name="tips_and_tricks_descr">Häufig gestellte Fragen, neueste Änderungen und anderes.</string>
    <string name="delay_to_start_navigation">Zielführung beginnen nach …</string>
@ -29,7 +28,6 @@
    <string name="speak_favorites">Favoriten in der Nähe</string>
    <string name="speak_poi">Nahegelegene POI</string>
    <string name="confirm_every_run">Immer fragen</string>
-    <string name="save_global_track_interval_descr">Aufzeichnungsintervall für die generelle Track-Aufzeichnung festlegen (via Schaltfläche \'GPX\' auf dem Kartenbildschirm).</string>
    <string name="save_global_track_interval">Intervall für generelle Aufzeichnung</string>
    <string name="enable_sleep_mode">GPS-Hintergrunddienst aktivieren</string>
    <string name="sleep_mode_stop_dialog">GPS-Hintergrunddienst beenden?</string>
@ -1013,7 +1011,6 @@
    <string name="map_widget_distancemeasurement">Entfernungsmessung</string>
    <string name="monitoring_settings">Streckenaufzeichnung</string>
    <string name="monitoring_settings_descr">Konfiguration der Streckenaufzeichnung.</string>
-    <string name="monitoring_control_start">GPX</string>
    <string name="map_widget_audionotes">Audio-Notizen</string>
    <string name="audionotes_plugin_description">Machen Sie während einer Reise Audio-, Foto- und Video-Notizen, indem Sie entweder eine Karten-Schaltfläche oder ein Standort-Kontextmenü verwenden.</string>
    <string name="audionotes_plugin_name">Audio-/Video-Notizen</string>
@ -1321,8 +1318,6 @@
 \nTrack %2$s</string>
    <string name="gpx_split_interval">Trennungsintervall</string>
    <string name="gpx_info_subtracks">Track-Segmente: %1$s</string>
-    <string name="gpx_monitoring_start">GPX-Aufzeichnung fortsetzen</string>
-    <string name="gpx_monitoring_stop">GPX-Aufzeichnung anhalten</string>
    <string name="gpx_start_new_segment">Neues Segment starten</string>
    <string name="shared_string_waypoint">Wegpunkt</string>
    <string name="gpx_visibility_txt">Sichtbarkeit</string>
@ -1940,7 +1935,6 @@
    <string name="rendering_value_medium_name">Mittel</string>
    <string name="rendering_value_bold_name">Fett</string>
    <string name="map_mode">Kartenmodus</string>
-    <string name="number_of_gpx_files_selected_pattern">%s GPX-Dateien ausgewählt</string>
    <string name="access_default_color">Standardfarbe</string>
    <string name="access_category_choice">Kategorie auswählen</string>
    <string name="access_hint_enter_name">Namen eingeben</string>
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@ -855,7 +855,6 @@
    <string name="no_buildings_found">Δεν βρέθηκαν κτήρια.</string>
    <string name="route_descr_lat_lon">Πλ %1$.3f μήκ %2$.3f</string>
    <string name="map_widget_max_speed">Όριο ταχύτητας</string>
-    <string name="monitoring_control_start">GPX</string>
    <string name="rendering_attr_noAdminboundaries_name">Όρια</string>
    <string name="rendering_attr_noAdminboundaries_description">Περιορισμός εμφάνισης διοικητικών ορίων (επίπεδα διαχειριστή 5-9).</string>
    <string name="download_select_map_types">Άλλοι χάρτες</string>
@ -1221,8 +1220,6 @@
    <string name="rendering_value_car_name">Αυτοκίνητο</string>
    <string name="rendering_value_bicycle_name">Ποδήλατο</string>
    <string name="rendering_value_pedestrian_name">Πεζοπόρος</string>
-    <string name="gpx_monitoring_start">Συνέχιση καταγραφής GPX</string>
-    <string name="gpx_monitoring_stop">Παύση καταγραφής GPX</string>
    <string name="gpx_start_new_segment">Έναρξη νέου τμήματος</string>
    <string name="shared_string_all">Όλα</string>
    <string name="way_alarms">Προειδοποιήσεις κυκλοφορίας</string>
@ -1518,7 +1515,6 @@
    <string name="access_hint_enter_name">Εισαγωγή ονόματος</string>
    <string name="access_hint_enter_category">Εισαγωγή κατηγορίας</string>
    <string name="access_hint_enter_description">Εισαγωγή περιγραφής.</string>
-    <string name="number_of_gpx_files_selected_pattern">%s GPX αρχεία επιλέχτηκαν</string>
    <string name="rendering_value_thin_name">Λεπτή</string>
    <string name="rendering_value_medium_name">Μέτρια</string>
    <string name="rendering_value_bold_name">Παχιά</string>
@ -2251,7 +2247,6 @@
    <string name="lang_kab">Καμπίλε</string>
    <string name="lang_ber">Βερβερικά</string>
    <string name="disable_recording_once_app_killed">Αποτροπή αυτόνομης καταγραφής</string>
-    <string name="disable_recording_once_app_killed_descrp">Θα παύσει την καταγραφή GPX όταν η εφαρμογή τερματιστεί (μέσω πρόσφατων εφαρμογών). (Η ένδειξη παρασκηνίου OsmAnd εξαφανίζεται από τη γραμμή ειδοποιήσεων του Android.)</string>
    <string name="shared_string_wikipedia">Βικιπαίδεια</string>
    <string name="rendering_value_walkingRoutesScopeOSMC_name">Χρώμα ανάλογα με τη σχέση του δικτύου</string>
    <string name="rendering_value_walkingRoutesOSMC_name">Χρώμα ανάλογα με τα σύμβολα πεζοπορίας OSMC</string>
@ -2323,7 +2318,6 @@
    <string name="fav_point_emoticons_message">Το αγαπημενο μετονομάστηκε σε \'%1$s\' για να προφυλάξει την συμβολοσειρά που περιέχει emoticons σε αρχείο.</string>
    <string name="fav_point_dublicate">Ορίστηκε διπλογραφή ονόματος Αγαπημένου</string>
    <string name="traffic_warning_calming">Χαλάρωση κυκλοφορίας</string>
-    <string name="save_global_track_interval_descr">Ορίστε τα χρονικά διαστήματα καταγραφής για τη γενική εγγραφή ιχνών (ενεργό μέσω του γραφικού στοιχείου καταγραφής GPX στον χάρτη).</string>
    <string name="save_track_to_gpx_globally_headline">Καταγραφή ίχνους κατ΄ απαίτηση</string>
    <string name="enable_proxy_descr">Διαμόρφωση μεσολαβητή HTTP για όλες τις αιτήσεις δικτύου.</string>
    <string name="proxy_host_descr">Προσδιορίστε τον υπολογιστή μεσολάβησης (π.χ. 127.0.0.1).</string>
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@ -304,7 +304,6 @@
    <string name="download_wikipedia_files">Ĉu elŝuti aldonajn Vikipediajn datumojn (%1$s MB)\?</string>
    <string name="gps_network_not_enabled">Pozici-trova servo estas malaktiva. Ĉu aktivigi ĝin?</string>
    <string name="disable_recording_once_app_killed">Preventi de aŭtomata protokolado</string>
-    <string name="disable_recording_once_app_killed_descrp">Paŭzigi GPX-protokoladon je halto de la aplikaĵo (per lastaj aplikaĵoj). (Fona piktogramo de OsmAnd malaperas de Androida sciiga breto.)</string>
    <string name="read_full_article">Legi tutan artikolon (enrete)</string>
    <string name="shared_string_show_details">Montri detalojn</string>
    <string name="osm_edit_context_menu_delete">Forigi OSM-redaktojn</string>
@ -589,7 +588,6 @@
    <string name="stop_navigation_service">Ĉesigi</string>
    <string name="confirm_every_run">Demandi ĉiam</string>
    <string name="save_global_track_interval">Ĝenerala registrada intervalo</string>
-    <string name="save_global_track_interval_descr">Elekti intervalon de registrado por ĝenerala registrado de kurso (aktivigita per la GPX-registrada fenestraĵo sur la mapo).</string>
    <string name="background_service_int">GPS-a vekintervalo</string>
    <string name="enable_sleep_mode">Aktivigi GPS-an fonan reĝimon</string>
    <string name="save_track_to_gpx_globally_headline">Registri spuron laŭpete</string>
@ -629,9 +627,7 @@
    <string name="live_monitoring_m">Enreta spur-registrado (GPX bezonata)</string>
    <string name="live_monitoring_m_descr">Sendi datumojn de spuroj al difinita retservo, se GPX-registrado estas aktiva.</string>
    <string name="live_monitoring_start">Ekigi enretan kurs-registradon</string>
-    <string name="gpx_monitoring_start">Pluigi GPX-registradon</string>
    <string name="live_monitoring_stop">Ĉesigi enretan kurs-registradon</string>
-    <string name="gpx_monitoring_stop">Paŭzigi GPX-registradon</string>
    <string name="gpx_start_new_segment">Ekigi novan segmenton</string>
    <string name="rendering_attr_hideBuildings_name">Konstruaĵoj</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Vojoj ne por aŭtoj</string>
@ -777,7 +773,6 @@
    <string name="access_shared_string_navigate_up">Supren</string>
    <string name="access_sort">Ordigi</string>
    <string name="map_mode">Map-reĝimo</string>
-    <string name="number_of_gpx_files_selected_pattern">%s GPX-dosieroj elektitaj</string>
    <string name="rendering_value_thin_name">Maldika</string>
    <string name="rendering_value_medium_name">Meza</string>
    <string name="rendering_value_bold_name">Dika</string>
@ -1008,7 +1003,6 @@
    <string name="rendering_attr_noAdminboundaries_name">Limoj</string>
    <string name="rendering_attr_noAdminboundaries_description">Ne montri regionajn limojn (administraciaj niveloj 5–9).</string>
    <string name="map_widget_max_speed">Rapidlimo</string>
-    <string name="monitoring_control_start">GPX</string>
    <string name="no_buildings_found">Neniu konstruaĵo trovita.</string>
    <string name="incremental_search_city">Serĉi urbon tajpante komencajn literojn</string>
    <string name="search_villages_and_postcodes">Serĉi pli vilaĝojn/poŝtkodojn</string>
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@ -443,7 +443,6 @@
    <string name="text_size_descr">Define el tamaño del texto en el mapa.</string>
    <string name="background_service_is_enabled_question">El servicio de OsmAnd, aún está funcionando en modo reposo. ¿Quieres pararlo también?</string>
    <string name="sleep_mode_stop_dialog">¿Parar modo reposo del GPS?</string>
-    <string name="save_global_track_interval_descr">Intervalo de registro para la grabación general de trazas (activar mediante el widget de grabación GPX sobre el mapa).</string>
    <string name="save_global_track_interval">Intervalo de registro general</string>
    <string name="background_service_int">Intervalo de activación del GPS</string>
    <string name="save_track_to_gpx_globally_headline">Registro de trazas bajo demanda</string>
@ -469,8 +468,6 @@
    <string name="live_monitoring_m">Seguimiento en línea (requiere GPX)</string>
    <string name="live_monitoring_start">Iniciar seguimiento en línea</string>
    <string name="live_monitoring_stop">Parar seguimiento en línea</string>
-    <string name="gpx_monitoring_start">Reanudar grabación GPX</string>
-    <string name="gpx_monitoring_stop">Pausar grabación GPX</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Vías no aptas para vehículos</string>
    <string name="rendering_attr_hideWoodScrubs_name">Bosques y matorrales</string>
    <string name="no_index_file_to_download">No se encontraron descargas, comprueba tu conexión a Internet.</string>
@ -692,7 +689,6 @@
    <string name="rendering_attr_noAdminboundaries_name">Fronteras</string>
    <string name="rendering_attr_noAdminboundaries_description">Ocultar fronteras regionales (niveles administrativos 5–9).</string>
    <string name="map_widget_max_speed">Límite de velocidad</string>
-    <string name="monitoring_control_start">GPX</string>
    <string name="no_buildings_found">No se encontraron edificios.</string>
    <string name="incremental_search_city">Buscar ciudades incrementalmente</string>
    <string name="search_villages_and_postcodes">Buscar más pueblos o códigos postales</string>
@ -1559,7 +1555,6 @@
    <string name="shared_string_import2osmand">Importar a OsmAnd</string>
    <string name="local_recordings_delete_all_confirm">¿Borrar %1$d nota(s)?</string>
    <string name="disable_recording_once_app_killed">Prevenir grabación independiente</string>
-    <string name="disable_recording_once_app_killed_descrp">La grabación GPX se pausará al cerrar la aplicación (mediante aplicaciones recientes). (La indicación de fondo de OsmAnd, desaparecerá de la barra de notificaciones de Android.)</string>
    <string name="gps_network_not_enabled">Servicio de ubicación desactivado. ¿Quieres activarlo?</string>
    <string name="archive_wikipedia_data">Tienes datos de Wikipedia viejos e incompatibles. ¿Archivarlos?</string>
    <string name="download_wikipedia_files">¿Descargar datos adicionales de Wikipedia (%1$s MB)?</string>
@ -1933,7 +1928,6 @@
    <string name="rendering_value_medium_name">Mediano</string>
    <string name="rendering_value_bold_name">Grueso</string>
    <string name="map_mode">Modo del mapa</string>
-    <string name="number_of_gpx_files_selected_pattern">%s archivos GPX elegidos</string>
    <string name="access_default_color">Color predefinido</string>
    <string name="access_category_choice">Elegir categoría</string>
    <string name="access_hint_enter_name">Ingresar nombre</string>
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@ -443,7 +443,6 @@
    <string name="text_size_descr">Define el tamaño del texto en el mapa.</string>
    <string name="background_service_is_enabled_question">El servicio de OsmAnd, aún está funcionando en modo reposo. ¿Quieres pararlo también?</string>
    <string name="sleep_mode_stop_dialog">¿Parar modo reposo del GPS?</string>
-    <string name="save_global_track_interval_descr">Intervalo de registro para la grabación general de trazas (activar mediante el widget de grabación GPX sobre el mapa).</string>
    <string name="save_global_track_interval">Intervalo de registro general</string>
    <string name="background_service_int">Intervalo de activación del GPS</string>
    <string name="save_track_to_gpx_globally_headline">Registro de trazas bajo demanda</string>
@ -469,8 +468,6 @@
    <string name="live_monitoring_m">Seguimiento en línea (requiere GPX)</string>
    <string name="live_monitoring_start">Iniciar seguimiento en línea</string>
    <string name="live_monitoring_stop">Parar seguimiento en línea</string>
-    <string name="gpx_monitoring_start">Reanudar grabación GPX</string>
-    <string name="gpx_monitoring_stop">Pausar grabación GPX</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Vías no aptas para vehículos</string>
    <string name="rendering_attr_hideWoodScrubs_name">Bosques y matorrales</string>
    <string name="no_index_file_to_download">No se encontraron descargas, comprueba tu conexión a Internet.</string>
@ -692,7 +689,6 @@
    <string name="rendering_attr_noAdminboundaries_name">Fronteras</string>
    <string name="rendering_attr_noAdminboundaries_description">Ocultar fronteras regionales (niveles administrativos 5–9).</string>
    <string name="map_widget_max_speed">Límite de velocidad</string>
-    <string name="monitoring_control_start">GPX</string>
    <string name="no_buildings_found">No se encontraron edificios.</string>
    <string name="incremental_search_city">Buscar ciudades incrementalmente</string>
    <string name="search_villages_and_postcodes">Buscar más pueblos o códigos postales</string>
@ -1559,7 +1555,6 @@
    <string name="shared_string_import2osmand">Importar a OsmAnd</string>
    <string name="local_recordings_delete_all_confirm">¿Borrar %1$d nota(s)?</string>
    <string name="disable_recording_once_app_killed">Prevenir grabación independiente</string>
-    <string name="disable_recording_once_app_killed_descrp">La grabación GPX se pausará al cerrar la aplicación (mediante aplicaciones recientes). (La indicación de fondo de OsmAnd, desaparecerá de la barra de notificaciones de Android.)</string>
    <string name="gps_network_not_enabled">Servicio de ubicación desactivado. ¿Quieres activarlo?</string>
    <string name="archive_wikipedia_data">Tienes datos de Wikipedia viejos e incompatibles. ¿Archivarlos?</string>
    <string name="download_wikipedia_files">¿Descargar datos adicionales de Wikipedia (%1$s MB)?</string>
@ -1933,7 +1928,6 @@
    <string name="rendering_value_medium_name">Mediano</string>
    <string name="rendering_value_bold_name">Grueso</string>
    <string name="map_mode">Modo del mapa</string>
-    <string name="number_of_gpx_files_selected_pattern">%s archivos GPX elegidos</string>
    <string name="access_default_color">Color predefinido</string>
    <string name="access_category_choice">Elegir categoría</string>
    <string name="access_hint_enter_name">Ingresar nombre</string>
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@ -880,7 +880,6 @@
    <string name="no_buildings_found">No se encontraron edificios.</string>
    <string name="search_villages_and_postcodes">Buscar más pueblos/códigos postales</string>
    <string name="map_widget_max_speed">Límite de velocidad</string>
-    <string name="monitoring_control_start">GPX</string>
    <string name="rendering_attr_noAdminboundaries_name">Fronteras</string>
    <string name="rendering_attr_noAdminboundaries_description">Ocultar fronteras regionales (niveles administrativos 5–9).</string>
    <string name="index_srtm_parts">piezas</string>
@ -1270,8 +1269,6 @@
    <string name="live_monitoring_m">Seguimiento en línea (requiere GPX)</string>
    <string name="live_monitoring_start">Iniciar seguimiento en línea</string>
    <string name="live_monitoring_stop">Parar seguimiento en línea</string>
-    <string name="gpx_monitoring_start">Continuar grabación GPX</string>
-    <string name="gpx_monitoring_stop">Detener grabación GPX</string>
    <string name="gpx_start_new_segment">Iniciar nuevo segmento</string>
    <string name="lang_fa">Persa</string>
    <string name="lang_al">Albanés</string>
@ -1317,7 +1314,6 @@
    <string name="save_track_interval_globally">Intervalo de registro</string>
    <string name="save_track_to_gpx_globally_descr">Registra la ubicación en un archivo GPX, pudiendo des/activarlo usando el widget de grabación GPX en el mapa.</string>
    <string name="confirm_every_run">Preguntar siempre</string>
-    <string name="save_global_track_interval_descr">Intervalo de registro para la grabación general de trazas (activar mediante el widget de grabación GPX sobre el mapa).</string>
    <string name="save_global_track_interval">Intervalo de registro general</string>
    <string name="traffic_warning_speed_limit">Límite de velocidad</string>
    <string name="traffic_warning_border_control">Control fronterizo</string>
@ -1559,7 +1555,6 @@
    <string name="download_wikipedia_maps">Wikipedia</string>
    <string name="gps_network_not_enabled">Servicio de ubicación desactivado. ¿Quieres activarlo?</string>
    <string name="disable_recording_once_app_killed">Prevenir grabación independiente</string>
-    <string name="disable_recording_once_app_killed_descrp">La grabación GPX se pausará al cerrar la aplicación (mediante aplicaciones recientes). (La indicación de fondo de OsmAnd, desaparecerá de la barra de notificaciones de Android.)</string>
    <string name="light_theme">Claro</string>
    <string name="dark_theme">Oscuro</string>
    <string name="lang_pms">Piamontés</string>
@ -1929,7 +1924,6 @@
    <string name="no_waypoints_found">No se encontraron puntos de referencia</string>
    <string name="file_name_containes_illegal_char">El nombre del archivo contiene caracteres ilegales</string>
    <string name="map_mode">Modo del mapa</string>
-    <string name="number_of_gpx_files_selected_pattern">%s archivos GPX elegidos</string>
    <string name="rendering_value_thin_name">Fino</string>
    <string name="rendering_value_medium_name">Medio</string>
    <string name="rendering_value_bold_name">Grueso</string>
--- a/OsmAnd/res/values-et/strings.xml
+++ b/OsmAnd/res/values-et/strings.xml
@ -135,7 +135,6 @@
    <string name="access_shared_string_navigate_up">Navigeeri üles</string>
    <string name="access_sort">Sorteeri</string>
    <string name="map_mode">Kaardi režiim</string>
-    <string name="number_of_gpx_files_selected_pattern">%s GPX faili valitud</string>
    <string name="rendering_value_thin_name">Õhuke</string>
    <string name="rendering_value_medium_name">Keskmine</string>
    <string name="rendering_value_bold_name">Rasvane</string>
@ -1128,7 +1127,6 @@
    <string name="download_wikipedia_files">Laadida täiendavaid andmeid Vikipeediast (%1$s MB)\?</string>
    <string name="gps_network_not_enabled">Asukohateenus on välja lülitatud. Lülitada sisse\?</string>
    <string name="disable_recording_once_app_killed">Väldi iseseisvat logimist</string>
-    <string name="disable_recording_once_app_killed_descrp">Peatab GPX logimise rakenduse jõuga sulgemise korral (hiljutiste rakenduste kaudu). (OsmAndi taustnäit kaob Androidi teavitusribalt.)</string>
    <string name="shared_string_import2osmand">OsmAnd import</string>
    <string name="read_full_article">Loe kogu artiklit (veebis)</string>
    <string name="local_indexes_cat_wiki">Vikipeedia</string>
@ -1300,7 +1298,6 @@
    <string name="sleep_mode_stop_dialog">Peata GPS taustarežiim\?</string>
    <string name="stop_navigation_service">Peatu</string>
    <string name="confirm_every_run">Küsi alati</string>
-    <string name="save_global_track_interval_descr">Määra üldise teekonna salvestamise logimise ajavahemik (lubatud kaardil GPX logimise lisa abil).</string>
    <string name="save_global_track_interval">Üldine logimisintervall</string>
    <string name="background_service_int">GPS äratuse ajavahemik</string>
    <string name="enable_sleep_mode">Luba GPS taustarežiim</string>
@ -1346,8 +1343,6 @@
    <string name="live_monitoring_m">Veebis jälgimine (GPX kohustuslik)</string>
    <string name="live_monitoring_start">Alusta veebis jälgimist</string>
    <string name="live_monitoring_stop">Peata veebis jälgimine</string>
-    <string name="gpx_monitoring_start">Alusta GPX logimist</string>
-    <string name="gpx_monitoring_stop">Peata GPX logimine</string>
    <string name="gpx_start_new_segment">Alusta uut lõiku</string>
    <string name="rendering_attr_hideBuildings_name">Hooned</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Liiklusvahenditele mitte mõeldud tee</string>
@ -1652,7 +1647,6 @@
    <string name="rendering_attr_hikingRoutesOSMC_description">Kuva rajad vastavalt OSMC radadele.</string>
    <string name="rendering_attr_noAdminboundaries_name">Piirid</string>
    <string name="map_widget_max_speed">Kiiruspiirang</string>
-    <string name="monitoring_control_start">GPX</string>
    <string name="no_buildings_found">Hooneid ei leidu.</string>
    <string name="incremental_search_city">Otsi linna kasvavalt</string>
    <string name="search_villages_and_postcodes">Otsi veel külasid/postiindekseid</string>
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@ -180,7 +180,6 @@
    <string name="rendering_attr_noAdminboundaries_name">Mugak</string>
    <string name="rendering_attr_noAdminboundaries_description">"Ez erakutsi  eskualde mailako mugak (5-9 administrazio mailak)."</string>
    <string name="map_widget_max_speed">Abiadura muga</string>
-    <string name="monitoring_control_start">GPX</string>
    <string name="no_buildings_found">Ez da eraikinik aurkitu.</string>
    <string name="incremental_search_city">Bilatu herria progresiboki</string>
    <string name="search_villages_and_postcodes">Bilatu herri/posta-kode gehiago</string>
@ -1102,8 +1101,6 @@
    <string name="lang_he">Hebreera</string>
    <string name="forward">Aurrera</string>
    <string name="home">Kontrol panela</string>
-    <string name="gpx_monitoring_start">Jarraitu GPXa grabatzen</string>
-    <string name="gpx_monitoring_stop">Pausatu GPX grabaketa</string>
    <string name="gpx_start_new_segment">Hasi segmentu berria</string>
    <string name="rendering_attr_hideBuildings_name">Eraikinak</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Ez-ibilgailu bideak</string>
@ -1300,7 +1297,6 @@ Lorratza %2$s</string>
    <string name="access_widget_expand">Zabaldu</string>
    <string name="access_sort">Ordenatu</string>
    <string name="map_mode">Maparen argitasun-modua</string>
-    <string name="number_of_gpx_files_selected_pattern">%s GPX fitxategi hautatuta</string>
    <string name="storage_permission_restart_is_required">Aplikazioak orain kanpo biltegian idazteko baimena du, baina horretarako aplikazioa eskuz berrabiarazi behar da.</string>
    <string name="osm_live_user_public_name">Izen publikoa</string>
    <string name="osm_live_hide_user_name">Ez bistaratu nire izena txostenetan</string>
@ -1521,7 +1517,6 @@ Lorratza %2$s</string>
    <string name="track_segments">Lorratzaren segmentuak</string>
    <string name="track_points">Lorratzaren puntuak</string>
    <string name="navigation_over_track">Hasi nabigazioa lorratzari jarraituz?</string>
-    <string name="save_global_track_interval_descr">Zehaztu lorratzen grabatze orokorrerako erregistratze maiztasun bat (Mapan GPX erregistratze trepetaren bidez gaitzen da).</string>
    <string name="save_track_to_gpx_globally_headline">Eskaerapeko lorratz erregistroa</string>
    <string name="none_selected_gpx">Aurretik zehaztu GPX fitxategia luze sakatuz.</string>
    <string name="gpx_info_subtracks">Azpi-lorratzak: %1$s</string>
@ -1708,7 +1703,6 @@ Lorratza %2$s</string>
    <string name="lang_et">Estoniera</string>
    <string name="lang_ast">Asturiera</string>
    <string name="disable_recording_once_app_killed">Eragotzi bigarren planoko egunkaria</string>
-    <string name="disable_recording_once_app_killed_descrp">GPX erregistroa geldiaraziko du aplikazioa hiltzean (azken aplikazioak pantailaren bidez). (OsmAnd bigarren planoan dabilela adierazten duen ikonoa Android jakinarazpen barratik desagertuko da)</string>
    <string name="rendering_value_walkingRoutesOSMC_name">OSMC bidezidor kirol sinboloen araberako koloreztatzea</string>
    <string name="application_dir_change_warning3">Eraman OsmAnd-en datu fitxategiak xede berrira \?</string>
    <string name="storage_directory_multiuser">Erabiltzaile anitzeko biltegiratzea</string>
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@ -774,7 +774,6 @@
 \n 
 \nاَستِر یک ابزار تصویربرداری است که بر روی ماهوارهٔ Terra نصب است و تِرا ماهوار‌ه‌ای فوق‌پیشرفته برای سامانهٔ دیده‌بانی زمینِ ناساست. 
 \nاَستِر محصول تلاش مشترک ناسا، وزارت اقتصاد، صنعت و تجارت ژاپن و سامانه‌های فضایی ژاپن است.</string>
-    <string name="monitoring_control_start">GPX</string>
    <string name="rendering_attr_noPolygons_description">همهٔ عوارض زمین را روی نقشه ناپدید کنید.</string>
    <string name="rendering_attr_noPolygons_name">چندضلعی‌ها</string>
    <string name="rendering_attr_appMode_name">حالت رندرگیری</string>
@ -1299,8 +1298,6 @@
    <string name="live_monitoring_m">ردیابی آنلاین (GPX لازم است)</string>
    <string name="live_monitoring_start">شروع ردیابی آنلاین</string>
    <string name="live_monitoring_stop">توقف ردیابی آنلاین</string>
-    <string name="gpx_monitoring_start">ازسرگیری ضبط GPX</string>
-    <string name="gpx_monitoring_stop">نگه‌داشتن ضبط GPX</string>
    <string name="rendering_attr_hideBuildings_name">ساختمان‌ها</string>
    <string name="gpx_start_new_segment">شروع بخش جدید</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">راه‌های غیرموتوری</string>
@ -1314,7 +1311,6 @@
    <string name="rendering_attr_showSurfaceGrade_name">کیفیت راه</string>
    <string name="rendering_attr_showSurfaces_name">سطح راه</string>
    <string name="rendering_attr_showCycleRoutes_name">مسیرهای دوچرخه</string>
-    <string name="save_global_track_interval_descr">بازهٔ زمانی برای ضبط رد را انتخاب کنید (که از طریق ابزار ضبط GPX روی نقشه فعال می‌شود).</string>
    <string name="save_global_track_interval">بازهٔ زمانی ثبت (سراسری)</string>
    <string name="save_track_to_gpx_globally_descr">می‌توانید با استفاده از ابزارک ضبط GPX روی نقشه، ردنگاری در فایل GPX را خاموش یا روشن کنید.</string>
    <string name="save_track_interval_globally">بازهٔ زمانی ثبت</string>
@ -1616,7 +1612,6 @@
    <string name="move_marker_bottom_sheet_title">نقشه را جابه‌جا کنید تا موقعیت نشانه عوض شود</string>
    <!-- string name="lat_lon_pattern">طول: %1$.5f عرض: %2$.5f</string -->
    <string name="access_sort">مرتب‌سازی</string>
-    <string name="number_of_gpx_files_selected_pattern">%s فایل GPX انتخاب شده است</string>
    <string name="osm_live_email_desc">برای اطلاع‌رسانی دربارهٔ مشارکت‌های شما.</string>
    <string name="download_files_question_space_with_temp">آیا {0} فایل را دانلود می‌کنید؟ 
 \n {3} مگابایت برای ذخیره‌سازی موقت و {1} مگابایت برای ذخیره‌سازی دائمی لازم دارید. (از {2} مگابایت)</string>
@ -2024,7 +2019,6 @@
    <string name="lang_gl">گالیسیایی</string>
    <string name="gps_network_not_enabled">موقعیت‌یاب خاموش است. روشن شود؟</string>
    <string name="disable_recording_once_app_killed">جلوگیری از ثبت خوداتکا</string>
-    <string name="disable_recording_once_app_killed_descrp">هنگامی که برنامه را از طریق برنامه‌های اخیر ببندید ثبت اطلاعات GPX موقتاً متوقف می‌شود. (نشانگر اجرای پس‌زمینه از نوار اعلان حذف می‌شود.)</string>
    <string name="shared_string_import2osmand">درون‌برد به OsmAnd</string>
    <string name="read_full_article">مقالهٔ کامل را بخوانید (آنلاین)</string>
    <string name="shared_string_wikipedia">ویکی‌پدیا</string>
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@ -911,7 +911,6 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
    <string name="access_shared_string_navigate_up">Navigointi ylös</string>
    <string name="access_sort">Lajittele</string>
    <string name="map_mode">Karttatila</string>
-    <string name="number_of_gpx_files_selected_pattern">%s GPX-tiedostoa valittu</string>
    <string name="rendering_value_fine_name">Hieno</string>
    <string name="rendering_value_thin_name">Ohut</string>
    <string name="rendering_value_medium_name">Keskipaksu</string>
@ -1373,8 +1372,6 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
    <string name="live_monitoring_m">Online seuranta (GPX pakollinen)</string>
    <string name="live_monitoring_start">Aloita online seuranta</string>
    <string name="live_monitoring_stop">Lopeta online seuranta</string>
-    <string name="gpx_monitoring_start">Aloita GPX kirjaus</string>
-    <string name="gpx_monitoring_stop">Lopeta GPX kirjaus</string>
    <string name="gpx_start_new_segment">Aloita uusi segmentti</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Tie ei-kulkuneuvoille</string>
    <string name="rendering_attr_hideText_name">Teksti</string>
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@ -16,7 +16,7 @@
    <string name="live_monitoring_url_descr">Préciser l\'adresse web pour le suivi en ligne avec la syntaxe : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
    <string name="live_monitoring_url">Adresse web pour le suivi en ligne</string>
    <string name="gpx_monitoring_disabled_warn">Enregistrer la trace avec le composant GPX ou avec l\'option « Enregistrer l\'itinéraire ».</string>
-    <string name="show_current_gpx_title">Afficher la trace actuelle</string>
+    <string name="show_current_gpx_title">Afficher la trace en cours</string>
    <string name="free_version_message">La version gratuite d\'OsmAnd est limitée à %1$s téléchargements (un téléchargement correspond à l\'installation ou à la mise à jour d\'une carte).</string>
    <string name="free_version_title">Version gratuite</string>
    <string name="poi_context_menu_showdescription">Afficher la description du point d\'intérêt.</string>
@ -479,8 +479,8 @@
    <string name="auto_zoom_map">Zoom automatique de la carte</string>
    <string name="additional_settings">Paramètres supplémentaires</string>
    <string name="shared_string_settings">Paramètres</string>
-    <string name="save_current_track_descr">Enregistrer la trace actuelle comme fichier GPX.</string>
-    <string name="save_current_track">Enregistrer la trace actuelle</string>
+    <string name="save_current_track_descr">Enregistrer la trace en cours comme fichier GPX.</string>
+    <string name="save_current_track">Enregistrer la trace en cours</string>
    <string name="save_track_interval_descr">Indiquez l\'intervalle d\'enregistrement de la trace pendant la navigation</string>
    <string name="save_track_interval">Intervalle d\'enregistrement pendant la navigation</string>
    <string name="save_track_to_gpx_descrp">Une trace GPX est enregistrée automatiquement dans le dossier des traces pendant l\'itinéraire</string>
@ -1250,8 +1250,6 @@
    <string name="live_monitoring_m">Suivi en ligne (GPX requis)</string>
    <string name="live_monitoring_start">Démarrer le suivi en ligne</string>
    <string name="live_monitoring_stop">Arrêter le suivi en ligne</string>
-    <string name="gpx_monitoring_start">Continuer l\'enregistrement GPX</string>
-    <string name="gpx_monitoring_stop">Interrompre l\'enregistrement GPX</string>
    <string name="gpx_start_new_segment">Débuter un nouveau segment</string>
    <string name="rendering_attr_hideBuildings_name">Bâtiments</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Voies non adaptées aux véhicules</string>
@ -1309,7 +1307,6 @@
    <string name="save_track_to_gpx_globally_descr">L\'enregistrement des positions dans un fichier GPX peut être activé ou désactivé depuis le gadget sur la carte.</string>
    <string name="save_track_interval_globally">Intervalle d\'enregistrement</string>
    <string name="confirm_every_run">Toujours demander</string>
-    <string name="save_global_track_interval_descr">Indiquez l\'intervalle d\'enregistrement des traces (activé via le gadget d\'enregistrement GPX sur la carte).</string>
    <string name="save_global_track_interval">Intervalle d\'enregistrement par défaut</string>
    <string name="traffic_warning_speed_limit">Limite de vitesse</string>
    <string name="traffic_warning_border_control">Poste frontière</string>
@ -1549,7 +1546,6 @@
    <string name="shared_string_import2osmand">Importer dans OsmAnd</string>
    <string name="local_recordings_delete_all_confirm">Êtes-vous certain(e) de vouloir supprimer %1$d notes \?</string>
    <string name="gps_network_not_enabled">Le service de localisation est arrêté. Souhaitez-vous l’activer ?</string>
-    <string name="disable_recording_once_app_killed_descrp">Met en pause l\'enregistrement de la trace GPX lors de l\'arrêt d\'OsmAnd (via les applications récentes) et supprime l\'icône OsmAnd de la barre de notification Android.</string>
    <string name="disable_recording_once_app_killed">Interdire la journalisation autonome</string>
    <string name="download_wikipedia_files">Télécharger des données Wikipédia supplémentaires (%1$s Mo) ?</string>
    <string name="lang_ms">Malaisien</string>
@ -1921,7 +1917,6 @@
    <string name="rendering_value_thin_name">Fin</string>
    <string name="rendering_value_medium_name">Moyen</string>
    <string name="rendering_value_bold_name">Épais</string>
-    <string name="number_of_gpx_files_selected_pattern">%s fichiers GPX sélectionnés</string>
    <string name="map_mode">Mode Carte</string>
    <string name="access_default_color">Couleur par défaut</string>
    <string name="access_category_choice">Sélectionnez une catégorie</string>
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@ -20,7 +20,6 @@
    <string name="sleep_mode_stop_dialog">Deter o modo de segundo plano do GPS?</string>
    <string name="stop_navigation_service">Deter</string>
    <string name="confirm_every_run">Preguntar sempre</string>
-    <string name="save_global_track_interval_descr">Especifica o intre de rexistro para a gravación xeral de pistas (activar mediante o trebello da gravación GPX no mapa).</string>
    <string name="save_global_track_interval">Intre de rexistro xeral</string>
    <string name="background_service_int">Intre de activación do GPS</string>
    <string name="enable_sleep_mode">Activar o modo de segundo plano do GPS</string>
@ -69,8 +68,6 @@
    <string name="live_monitoring_m">Seguimento con conexión (requírese GPX)</string>
    <string name="live_monitoring_start">Iniciar o seguimento con conexión</string>
    <string name="live_monitoring_stop">Deter o seguemento con conexión</string>
-    <string name="gpx_monitoring_start">Retomar a gravación de GPX</string>
-    <string name="gpx_monitoring_stop">Deter a gravación de GPX</string>
    <string name="gpx_start_new_segment">Comezar un segmento novo</string>
    <string name="rendering_attr_hideBuildings_name">Edificios</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Estradas que non sexan para vehículos</string>
@ -1615,7 +1612,6 @@ Lon %2$s</string>
    <string name="av_locations">Localizacións</string>
    <string name="rendering_value_boldOutline_name">Bordo groso</string>
    <string name="lang_nv">Navaho</string>
-    <string name="disable_recording_once_app_killed_descrp">Detén o rexistro de GPX cando se pecha a aplicación (mediante a lapela de aplicacións recentes). (A indicación do OsmAnd desaparece da barra das notificacións do Android.)</string>
    <string name="agps_info">Información de A-GPS</string>
    <string name="agps_data_last_downloaded">Datos A-GPS baixados: %1$s</string>
    <string name="delay_to_start_navigation_descr">Indicar o tempo de espera durante o que ficar na pantalla de planificación das rutas.</string>
@ -1985,7 +1981,6 @@ Lon %2$s</string>
    <string name="access_expanded_list">Listaxe despregada</string>
    <string name="access_empty_list">Listaxe baleira</string>
    <string name="access_tree_list">Listaxe en árbore</string>
-    <string name="number_of_gpx_files_selected_pattern">%s ficheiros GPX seleccionados</string>
    <string name="osmand_plus_banner_desc">Descargas ilimitadas dos mapas, actualizacións e plugin da Wikipedia.</string>
    <string name="routing_attr_short_way_name">Camiño con aforro no combustíbel</string>
    <string name="routing_attr_short_way_description">Empregar o camiño con aforro no combustíbel (normalmente máis curto).</string>
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@ -994,8 +994,6 @@
    <string name="download_additional_maps">Preuzeti karte koje nedostaju %1$s (%2$d MB)?</string>
    <string name="live_monitoring_start">Započnite online praćenje</string>
    <string name="live_monitoring_stop">Zaustavi online praćenje</string>
-    <string name="gpx_monitoring_start">Započni GPX bilježenje položaja</string>
-    <string name="gpx_monitoring_stop">Zaustavi GPX bilježenje položaja</string>
    <string name="rendering_attr_hideBuildings_name">Sakrij zgrade</string>
    <string name="rendering_attr_hideText_name">Sakrij tekst</string>
    <string name="rendering_attr_hideWoodScrubs_name">Sakrij šume i šikare</string>
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@ -1249,8 +1249,6 @@
    <string name="live_monitoring_m">Online útvonalrögzítés (GPX szükséges)</string>
    <string name="live_monitoring_start">Online útvonalrögzítés indítása</string>
    <string name="live_monitoring_stop">Online útvonalrögzítés megállítása</string>
-    <string name="gpx_monitoring_start">GPX naplózás folytatása</string>
-    <string name="gpx_monitoring_stop">GPX naplózás szüneteltetése</string>
    <string name="gpx_start_new_segment">Új szakasz kezdése</string>
    <string name="rendering_attr_hideBuildings_name">Épületek</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Gyalogutak</string>
@ -1305,7 +1303,6 @@
    <string name="duration">Időtartam</string>
    <string name="distance">Távolság</string>
    <string name="confirm_every_run">Mindig kérdezzen rá</string>
-    <string name="save_global_track_interval_descr">Adja meg az általános nyomvonalrögzítéshez használandó naplózási időközt (a térképen lévő GPX-naplózó widgettel engedélyezve).</string>
    <string name="save_global_track_interval">Általános naplózási időköz</string>
    <string name="save_track_to_gpx_globally_descr">A GPX-fájlba történő általános pozíciónaplózás be- és kikapcsolható a térképen lévő GPX-naplózó widgettel.</string>
    <string name="save_track_interval_globally">Rögzítési időköz</string>
@ -1552,7 +1549,6 @@
    <string name="local_recordings_delete_all_confirm">Biztosan törölni szeretne %1$d jegyzetet\?</string>
    <string name="disable_recording_once_app_killed">Önálló naplózás megakadályozása</string>
    <string name="gps_network_not_enabled">A helymeghatározó szolgáltatás ki van kapcsolva. Bekapcsolja\?</string>
-    <string name="disable_recording_once_app_killed_descrp">Szüneteltetni fogja a GPX-naplózást, ha az alkalmazást kilőtték (a legutóbbi alkalmazásokon keresztül). (Az OsmAnd háttérben futás jelzője eltűnik az Android értesítési sávjáról.)</string>
    <string name="lang_vo">volapük</string>
    <string name="lang_th">thai</string>
    <string name="lang_te">telugu</string>
@ -1937,7 +1933,6 @@
    <string name="access_shared_string_navigate_up">Navigáció fel</string>
    <string name="access_sort">Rendezés</string>
    <string name="map_mode">Térképmód</string>
-    <string name="number_of_gpx_files_selected_pattern">%s GPX-fájl kijelölve</string>
    <string name="rendering_value_thin_name">Vékony</string>
    <string name="rendering_value_medium_name">Közepes</string>
    <string name="rendering_value_bold_name">Vastag</string>
--- a/OsmAnd/res/values-hy/strings.xml
+++ b/OsmAnd/res/values-hy/strings.xml
@ -495,7 +495,6 @@
    <string name="access_shared_string_navigate_up">Անցնել վերև</string>
    <string name="access_sort">Դասակարգել</string>
    <string name="map_mode">Քարտեզի ռեժիմը</string>
-    <string name="number_of_gpx_files_selected_pattern">%s GPX Ֆայլ(եր) ընտրված են</string>
    <string name="rendering_value_fine_name">Ճշգրիտ</string>
    <string name="rendering_value_thin_name">Բարակ</string>
    <string name="rendering_value_medium_name">Միջին</string>
@ -790,7 +789,6 @@
    <string name="download_wikipedia_files">Ներբեռնել լրացուցիչ Վիքիպեդիայի տվյալները (%1$s MB)?</string>
    <string name="gps_network_not_enabled">Կոորդինատները հայտնաբերման ծառայությունը միացված չէ: Միացնել?</string>
    <string name="disable_recording_once_app_killed">Դադարեցնել ինքնավար գրանցումը</string>
-    <string name="disable_recording_once_app_killed_descrp">Հավելվածը փակելուց հետո (ուրիշ հավելվածը միջոցով), GPX-ի գրանցումը կդադարեցվի: (Ֆոնային պատկերակը անհետանում է Android ծանուցման բարից:)</string>
    <string name="shared_string_import2osmand">Ներմուծել OsmAnd</string>
    <string name="read_full_article">Կարդալ ամբողջական հոդվածը (առցանց)</string>
    <string name="shared_string_wikipedia">Վիքիփեդիա</string>
@ -1094,7 +1092,6 @@
    <string name="sleep_mode_stop_dialog">Դադարեցնել GPS-ի աշխատանքը ֆոնային ռեժիմում?</string>
    <string name="stop_navigation_service">Դադարեցնել</string>
    <string name="confirm_every_run">Միշտ հարցնել</string>
-    <string name="save_global_track_interval_descr">Ընտրեք ժամանակի ընդմիջումը տրեկի գրանցման համար (ներառյալ GPX գրանցումը վիջեթի միջոցով քարտեզի վրա)։</string>
    <string name="save_global_track_interval">Ընդհանուր ժամանակի ընդմիջումը</string>
    <string name="background_service_int">GPS-ի զարթմատ ժամանակի ընդմիջումը</string>
    <string name="enable_sleep_mode">Միացնել GPS ֆոնի ռեժիմը</string>
@ -1146,8 +1143,6 @@
    <string name="live_monitoring_m">Առցանց հետևում(tracking) (GPX պահանջվում է)</string>
    <string name="live_monitoring_start">Սկսեք առցանց հետևելուն(tracking)</string>
    <string name="live_monitoring_stop">Դադարեցնել առցանց հետևելուն(tracking)</string>
-    <string name="gpx_monitoring_start">Շարունակել GPX գրանցումը</string>
-    <string name="gpx_monitoring_stop">Դադարեցնել GPX-ի գրանցումը</string>
    <string name="gpx_start_new_segment">Սկսել նոր սեգմենտ</string>
    <string name="rendering_attr_hideBuildings_name">Շենքեր</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Ոչ ավտոճանապարհներ</string>
--- a/OsmAnd/res/values-id/strings.xml
+++ b/OsmAnd/res/values-id/strings.xml
@ -555,7 +555,6 @@
    <string name="rendering_value_thin_name">Tipis</string>
    <string name="rendering_value_medium_name">Medium</string>
    <string name="rendering_value_bold_name">Tebal</string>
-    <string name="number_of_gpx_files_selected_pattern">%s berkas GPX dipilih</string>
    <string name="map_mode">Mode peta</string>
    <string name="access_default_color">Warna bawaan</string>
    <string name="access_category_choice">Pilih kategori</string>
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@ -873,7 +873,7 @@
    <string name="poi_pump_no">Engin dæla</string>
    <string name="poi_pump_yes">Já</string>
    <string name="poi_water_characteristic_mineral">Steinefnaríkt</string>
-    <string name="poi_water_characteristic_mud">Eiginleikar vatns: leðja</string>
+    <string name="poi_water_characteristic_mud">Leðja</string>
    <string name="poi_water_characteristic_sulfuric">Brennisteinsmengað</string>
    <string name="poi_information_board">Tafla</string>
    <string name="poi_information_route_marker">Leitarmerki</string>
@ -1168,7 +1168,7 @@
    <string name="poi_fuel_91ul">Eldsneyti 91UL</string>
    <string name="poi_fuel_100ll">Eldsneyti 100LL</string>
    <string name="poi_fuel_jeta1">Eldsneyti Jet A-1</string>
-    <string name="poi_fuel_adblue">Eldsneyti AdBlue</string>
+    <string name="poi_fuel_adblue">Vökvi fyrir díselútblástur</string>
    <string name="poi_fuel_wood">Eldsneyti: viður</string>
    <string name="poi_fuel_charcoal">Eldsneyti: viðarkol</string>
    <string name="poi_fuel_coal">Eldsneyti:; kol</string>
@ -2057,7 +2057,7 @@
    <string name="poi_bowls">Keiluspil</string>
    <string name="poi_canadian_football">Kanadískur fótbolti</string>
    <string name="poi_ice_stock">Bæversk krulla</string>
-    <string name="poi_korfbal">Korfbal</string>
+    <string name="poi_korfbal">Korfbolti</string>
    <string name="poi_sport_multi">Fjöl-íþrótta</string>
    <string name="poi_paddle_tennis">Spaðatennis (paddle)</string>
    <string name="poi_pelota">Pelota</string>
@ -2252,7 +2252,7 @@
    <string name="poi_vending_animal_food">Dýrafóður</string>
    <string name="poi_vending_public_transport_plans">Kort yfir almenningssamgöngur</string>
    <string name="poi_vending_drinks_sweets">Drykkir og sælgæti</string>
-    <string name="poi_memorial_cross">Krosslaga</string>
+    <string name="poi_memorial_cross">Krosslögun</string>
    <string name="poi_branch">Útibú</string>
    <string name="poi_memorial_stele">Staur</string>
    <string name="poi_memorial_koshinto">Koshinto</string>
@ -3814,4 +3814,7 @@
    <string name="poi_traffic_signals_vibration_no">Titringur: nei</string>
    <string name="poi_traffic_signals_arrow">Ör</string>
    <string name="poi_traffic_signals_vibration">Titringur</string>
+    <string name="poi_give_box">Gjafakassi</string>
+    <string name="poi_city_block">Götureitur</string>
+    <string name="poi_borough">Kaupstaður</string>
 </resources>
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@ -233,7 +233,7 @@
    <string name="shared_string_downloading">Sæki…</string>
    <string name="shared_string_action_template">Aðgerð {0}</string>
    <string name="shared_string_close">Loka</string>
-    <string name="shared_string_exit">Útgangur</string>
+    <string name="shared_string_exit">Hætta</string>
    <string name="shared_string_show">Sýna</string>
    <string name="shared_string_show_all">Sýna allt</string>
    <string name="shared_string_collapse">Fella saman</string>
@ -740,7 +740,6 @@
    <string name="access_collapsed_list">Samfallinn listi</string>
    <string name="access_expanded_list">Útliðaður listi</string>
    <string name="map_mode">Kortahamur</string>
-    <string name="number_of_gpx_files_selected_pattern">%s GPX-skrár valdar</string>
    <string name="finish_navigation">Hætta leiðsögn</string>
    <string name="avoid_road">Forðast veg</string>
    <string name="number_of_recipients">Fjöldi viðtakenda</string>
@ -1445,7 +1444,7 @@
    <string name="agps_data_last_downloaded">A-GPS-gögn voru sótt: %1$s</string>
    <string name="welmode_download_maps">Sækja kort</string>
    <string name="mark_to_delete">Merki sem á að eyða</string>
-    <string name="confirmation_to_clear_history">Viltu í hreinsa breytingaskrána?</string>
+    <string name="confirmation_to_clear_history">Hreinsa breytingaskrána\?</string>
    <string name="osm_edits">OSM-breytingar</string>
    <string name="parking_place_limited">Tímatakmörkun bílastæðis er</string>
    <string name="your_edits">Breytingarnar þínar</string>
@ -1467,8 +1466,6 @@
    <string name="speak_poi">Nálægur merkisstaður</string>
    <string name="save_global_track_interval">Almennt millibil skráninga</string>
    <string name="save_track_interval_globally">Millibil skráninga</string>
-    <string name="gpx_monitoring_start">Halda áfram með GPX-skráningu</string>
-    <string name="gpx_monitoring_stop">Setja GPX-skráningu í bið</string>
    <string name="gpx_info_distance">Vegalengd: %1$s (%2$s punktar)</string>
    <string name="recording_error">Upptaka mistókst</string>
    <string name="recording_camera_not_available">Myndavél er ekki tiltæk</string>
@ -1532,7 +1529,7 @@
    <string name="map_widget_vector_attributes">Eigindi myndgerðar</string>
    <string name="speed_limit_exceed">Þolvik hraðatakmarka</string>
    <string name="text_size_descr">Stilla stærð texta á korti.</string>
-    <string name="traffic_warning_calming">Hæging á umferð</string>
+    <string name="traffic_warning_calming">Hraðahindrun</string>
    <string name="traffic_warning">Aðvörun vegna umferðar</string>
    <string name="speak_favorites">Eftirlæti í næsta nágrenni</string>
    <string name="way_alarms">Aðvaranir vegna umferðar</string>
@ -2119,7 +2116,7 @@
    <string name="import_gpx_failed_descr">Gat ekki flutt skrána inn. Vinsamlegast athugið hvort OsmAnd hafi réttindi til að lesa skrána þar sem hún er.</string>
    <string name="open_mapillary">Opna Mapillary</string>
    <string name="mapillary_widget">Mapillary græja</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Götumyndir</string>
    <string name="mapillary_image">Mapillary-mynd</string>
    <string name="map_widget_ruler_control">Mælistika út frá miðju hrings</string>
    <string name="shared_string_permissions">Heimildir</string>
@ -2508,7 +2505,6 @@
 \n• Þjöppuð ónettengd vektorkort, uppfærð einu sinni í mánuði 
 \n
 \n• Val á milli heildargagna svæðis eða einungis vegakerfis (dæmi: öll gögn fyrir Japan eru 700 MB en 200 MB fyrir vegakerfið eingöngu)</string>
-    <string name="save_global_track_interval_descr">Veldu millibil skráninga í almenna leiðarskráningu (virkjað með viðmótshlutanum fyrir GPX-skráningu á kortinu).</string>
    <string name="will_open_tomorrow_at">Opnar á morgun klukkan</string>
    <string name="animate_my_location_desc">Virkja hreyfingu við hliðrun staðsetningar minnar á meðan leiðsögn stendur.</string>
    <string name="storage_permission_restart_is_required">Núna hefur forritið heimild til að skrifa í ytri gagnageymslur, en það þarf að endurræsa forritið handvirkt til að geta nýtt sér það.</string>
@ -2538,7 +2534,6 @@
    <string name="osm_live_header">Þessi áskrift virkjar uppfærslur á klukkustundar fresti fyrir öll kort um allan heim.
 \n Hluti innkomunnar fer til OSM-samfélagsins og er greitt fyrir hvert framlag til OSM.
 \n Ef þér líkar við OsmAnd og OSM og vilt styðja við verkefnið og fá stuðning frá þeim, þá er þetta kjörin leið.</string>
-    <string name="disable_recording_once_app_killed_descrp">Mun setja GPX-skráningu í bið þegar forritið er drepið (slökkt á því í gegnum nýleg forrit skjáinn - bakgrunnsvísir OsmAnd hverfur þar með úr tilkynningastiku Android-kerfisins.)</string>
    <string name="fav_point_emoticons_message">Nafni eftirlætisins hefur verið breytt í %1$s til að auðvelda rétta vistun strengsins ásamt tjáningartáknum yfir í skrá.</string>
    <string name="save_track_to_gpx_globally_descr">Hægt er að kveikja og slökkva á almennri skráningu staðsetninga í GPX-skrá með viðmótshlutanum fyrir GPX-skráningu á kortaskjánum.</string>
    <string name="android_19_location_disabled">Síðan í Android útgáfu 4.4 (KitKat) er gamla geymslumappan (%s) úrelt. Á að afrita allar OsmAnd-skrár í nýja möppu\?
@ -3263,7 +3258,7 @@
    <string name="map_during_navigation_info">Skrá á meðan leiðsögn stendur</string>
    <string name="map_during_navigation">Skrá á meðan leiðsögn stendur</string>
    <string name="shared_string_other">Annað</string>
-    <string name="vehicle_parameters_descr">Þyngd, hæð, hraði</string>
+    <string name="vehicle_parameters_descr">Þyngd, hæð, lengd, hraði</string>
    <string name="vehicle_parameters">Breytur varðandi farartæki</string>
    <string name="voice_announces_info">Talskilaboð eru einungis spiluð á meðan leiðsögn stendur.</string>
    <string name="voice_announces_descr">Leiðbeiningar og tilkynningar við leiðsögn</string>
@ -3781,4 +3776,47 @@
 \nVeldu %1$s og þú munt fá aðvaranir og ábendingar um hraðamyndavélar. 
 \n
 \nVeldu %2$s: öllum gögnum sem tengjast hraðamyndavélum; t.d. aðvaranir, tilkynningar, staðsetningar o.fl. verður eytt þar til OsmAnd er sett inn aftur frá grunni.</string>
+    <string name="rourte_between_points_add_track_desc">Veldu ferilskrá þar sem nýjum bút verður bætt inn.</string>
+    <string name="rourte_between_points_desc">Veldu hvernig eigi að tengja punkta; með beinni línu eða reikna leið milli þeirra með þessu sniði.</string>
+    <string name="rourte_between_points_whole_track_button_desc">Allur ferillinn verður endurreiknaður með völdu sniði.</string>
+    <string name="osm_edit_closed_note">Lokaður OSM-minnispunktur</string>
+    <string name="whole_track">Allur ferillinn</string>
+    <string name="track_show_start_finish_icons">Sýna tákn fyrir upphaf/enda</string>
+    <string name="speed_cameras_removed_descr">Þetta tæki er ekki með hraðamyndavélar.</string>
+    <string name="app_mode_go_cart">Gókart</string>
+    <string name="set_working_days_to_continue">Þú verður að skilgreina virka daga til að halda áfram</string>
+    <string name="quick_action_remove_next_destination">Eyða næsta markpunkti</string>
+    <string name="navigation_profile">Leiðsagnarsnið</string>
+    <string name="app_mode_wheelchair_forward">Hjólastóll áfram</string>
+    <string name="plugin_wikipedia_description">Náðu í upplýsingar um merka staði frá Wikipedia. Þetta er þá orðið að vasaleiðsögn án nettengingar - bara virkjaðu Wikipedia-viðbótina og njóttu þess að geta lesið um hlutina í kringum þig.</string>
+    <string name="use_volume_buttons_as_zoom_descr">Virkja þetta til að hægt sé að stýra aðdráttarstigi korts með hljóðstyrkshnöppum.</string>
+    <string name="routing_attr_length_description">Tilgreindu lengd farartækis sem leyfð er á leiðum.</string>
+    <string name="in_case_of_reverse_direction">Ef stefna er öfug</string>
+    <string name="rourte_between_points_next_segment_button_desc">Aðeins næsti bútur verður endurreiknaður með völdu sniði.</string>
+    <string name="app_mode_enduro_motorcycle">Enduro-mótorhjól</string>
+    <string name="route_between_points">Leið milli punkta</string>
+    <string name="next_segment">Næsti bútur</string>
+    <string name="search_download_wikipedia_maps">Sækja Wikipedia-kort</string>
+    <string name="street_level_imagery">Götumyndir</string>
+    <string name="routing_attr_length_name">Takmörk á lengd</string>
+    <string name="plan_a_route">Skipuleggja leið</string>
+    <string name="save_as_new_track">Vista sem nýjan feril</string>
+    <string name="track_coloring_solid">Gegnheilt</string>
+    <string name="app_mode_motor_scooter">Skellinöðrur</string>
+    <string name="reverse_route">Snúa við leið</string>
+    <string name="plan_route_last_edited">Síðast breytt</string>
+    <string name="please_provide_point_name_error">Gefðu þessum punkti eitthvað heiti</string>
+    <string name="plan_route_open_existing_track">Opna tiltækan feril</string>
+    <string name="shared_string_done">Lokið</string>
+    <string name="use_volume_buttons_as_zoom">Hljóðstyrkshnappar stýra aðdrætti</string>
+    <string name="select_track_width">Veldu breidd</string>
+    <string name="overwrite_track">Yfirskrifa feril</string>
+    <string name="app_mode_wheelchair">Hjólastóll</string>
+    <string name="plan_route_import_track">Flytja inn feril</string>
+    <string name="plan_route_create_new_route">Búa til nýja leið</string>
+    <string name="shared_string_custom">Sérsniðið</string>
+    <string name="add_to_a_track">Bæta við feril</string>
+    <string name="gpx_direction_arrows">Stefnuörvar</string>
+    <string name="plan_route_select_track_file_for_open">Veldu ferilskrá til að opna.</string>
+    <string name="lenght_limit_description">Settu inn lengd farartækisins, takmarkanir geta verið á sumum leiðum varðandi lengd farartækja.</string>
 </resources>
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@ -1208,8 +1208,6 @@
    <string name="live_monitoring_m">Tracciamento online (GPX richiesto)</string>
    <string name="live_monitoring_start">Avvia il tracciamento online</string>
    <string name="live_monitoring_stop">Ferma il tracciamento online</string>
-    <string name="gpx_monitoring_start">Riprendi la registrazione GPX</string>
-    <string name="gpx_monitoring_stop">Metti in pausa la registrazione GPX</string>
    <string name="gpx_start_new_segment">Inizia un nuovo segmento</string>
    <string name="lang_fa">Persiano</string>
    <string name="lang_he">Ebraico</string>
@ -1260,7 +1258,6 @@
    <string name="save_track_interval_globally">Intervallo registrazione</string>
    <string name="rendering_attr_publicTransportMode_name">Percorsi bus, filobus, servizi navetta</string>
    <string name="confirm_every_run">Chiedi sempre</string>
-    <string name="save_global_track_interval_descr">Specifica l\'intervallo di tempo per la registrazione del percorso (abilitata attraverso il widget registrazione GPX sulla mappa).</string>
    <string name="save_global_track_interval">Intervallo predefinito di registrazione</string>
    <string name="traffic_warning_speed_limit">Limite di velocità</string>
    <string name="traffic_warning_payment">Casello</string>
@ -1544,7 +1541,6 @@
    <string name="download_wikipedia_files">Scaricare i dati aggiuntivi di Wikipedia (%1$s MB)\?</string>
    <string name="gps_network_not_enabled">Il servizio di localizzazione è spento. Vuoi accenderlo\?</string>
    <string name="disable_recording_once_app_killed">Previeni il login remoto</string>
-    <string name="disable_recording_once_app_killed_descrp">Metterà in pausa la registrazione GPX quando l\'app viene chiusa (attraverso le app recenti). L\'indicatore della modalità background di OsmAnd sparisce dalla barra delle notifiche di Android</string>
    <string name="shared_string_import2osmand">Importa in OsmAnd</string>
    <string name="read_full_article">Leggi l\'articolo intero (online)</string>
    <string name="shared_string_wikipedia">Wikipedia</string>
@ -1922,7 +1918,6 @@
    <string name="rendering_value_medium_name">Medio</string>
    <string name="rendering_value_bold_name">Grosso</string>
    <string name="map_mode">Modalità mappa</string>
-    <string name="number_of_gpx_files_selected_pattern">%s file GPX selezionati</string>
    <string name="access_default_color">Colore preimpostato</string>
    <string name="access_category_choice">Scegli la categoria</string>
    <string name="access_hint_enter_name">Inserisci il nome</string>
@ -3826,4 +3821,20 @@
    <string name="plan_route_select_track_file_for_open">Scegli il file di una traccia da aprire.</string>
    <string name="shared_string_done">Fatto</string>
    <string name="navigation_profile">Profili di navigazione</string>
+    <string name="rourte_between_points_warning_desc">Per utilizzare questa opzione OsmAnd ha bisogno di bloccare la traccia alle strade della mappa.
+\n
+\n Nel prossimo passaggio avrai bisogno di selezionare il profilo di navigazione per determinare le strade permesse e la soglia della distanza per approssimare la strada alle strade.</string>
+    <string name="rourte_between_points_desc">Scegli come collegare i punti, con una linea retta, o calcolando un percorso che li colleghi utilizzando il profilo scelto.</string>
+    <string name="overwrite_track">Sovrascrivi traccia</string>
+    <string name="save_as_new_track">Salva come nuova Traccia</string>
+    <string name="reverse_route">Inverti il percorso</string>
+    <string name="rourte_between_points_next_segment_button_desc">Solo il nuovo segmento sarà ricalcolato utilizzando il profilo scelto.</string>
+    <string name="rourte_between_points_whole_track_button_desc">Tutta la traccia sarà ricalcolata utilizzando il profilo scelto.</string>
+    <string name="whole_track">Tutta la traccia</string>
+    <string name="next_segment">Nuovo segmento</string>
+    <string name="threshold_distance">Soglia distanza</string>
+    <string name="rourte_between_points_add_track_desc">Seleziona un file traccia a cui verrà aggiunto un nuovo segmento.</string>
+    <string name="street_level_imagery">Livello immagini stradali</string>
+    <string name="plan_route_exit_dialog_descr">Sei sicuro di voler chiudere la Pianificazione del percorso senza salvare\? Perderai tutti i cambiamenti.</string>
+    <string name="in_case_of_reverse_direction">In caso di direzione inversa</string>
 </resources>
--- a/OsmAnd/res/values-iw/strings.xml
+++ b/OsmAnd/res/values-iw/strings.xml
@ -1552,8 +1552,6 @@
    <string name="live_monitoring_m">מעקב מקוון (נדרש GPX)</string>
    <string name="live_monitoring_start">הפעלת מעקב מקוון</string>
    <string name="live_monitoring_stop">עצירת מעקב מקוון</string>
-    <string name="gpx_monitoring_start">חידוש רישום GPX</string>
-    <string name="gpx_monitoring_stop">השהיית רישום GPX</string>
    <string name="gpx_start_new_segment">התחלת מקטע חדש</string>
    <string name="rendering_attr_hideBuildings_name">בניינים</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">דרכים מהירות שלא מיועדות למכוניות</string>
@ -2073,7 +2071,6 @@
    <string name="access_shared_string_navigate_up">ניווט למעלה</string>
    <string name="access_sort">מיון</string>
    <string name="map_mode">מצב מפה</string>
-    <string name="number_of_gpx_files_selected_pattern">נבחרו %s קובצי GPX</string>
    <string name="no_map_markers_found">נא להוסיף סמני מפה דרך המפה</string>
    <string name="no_waypoints_found">לא נמצאו נקודות דרך</string>
    <string name="osmand_parking_minute">דק׳</string>
@ -2635,9 +2632,7 @@
 \n 
 \nניתן לשתף נתיבים מוקלטים עם חבריך או להשתמש בהם כתרומה ל־OSM. אתלטים יכולים להשתמש במסלולים מוקלטים כדי לעקוב אחר האימונים שלהם. ניתן לבצע ניתוח מסלול בסיסי ישירות ב־OsmAnd, כמו זמני הקפה, מהירות ממוצעת וכו׳, כמו כן, ניתן לנתח את המסלולים בשלב מאוחר יותר על ידי כלי ניתוח מיוחדים מגורמי צד־שלישי.</string>
    <string name="watch">צפייה</string>
-    <string name="save_global_track_interval_descr">נא לציין מרווח בין הקלטות כלליות של מסלול (מופעל דרך וידג׳ט ה־GPX על המפה).</string>
    <string name="transport_nearby_routes_within">נתיבים קרובים בטווח של עד</string>
-    <string name="disable_recording_once_app_killed_descrp">רישום ה־GPX יושהה כאשר היישומון ייסגר (דרך היישומונים האחרונים). (התראות הרקע של OsmAnd תיעלמנה מסרגל ההודעות של Android.)</string>
    <string name="action_create">פעולת יצירה</string>
    <string name="action_modify">פעולת שינוי</string>
    <string name="action_delete">פעולת מחיקה</string>
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@ -1151,8 +1151,6 @@ POIの更新は利用できません</string>
    <string name="live_monitoring_m">オンライン追跡に関する設定(GPXが必要)</string>
    <string name="live_monitoring_start">オンライントラッキング開始</string>
    <string name="live_monitoring_stop">オンライントラッキング停止</string>
-    <string name="gpx_monitoring_start">GPX記録の再開</string>
-    <string name="gpx_monitoring_stop">GPS記録の一時停止</string>
    <string name="rendering_attr_hideBuildings_name">建物</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">自動車以外の専用道路</string>
    <string name="rendering_attr_hideText_name">文字列</string>
@ -1330,7 +1328,6 @@ POIの更新は利用できません</string>
    <string name="save_track_to_gpx_globally_descr">GPXファイルへ記録される位置情報全般は、マップ画面上のGPXログウィジェットを使用してONとOFFを切り替えることが可能です。</string>
    <string name="save_track_interval_globally">記録間隔</string>
    <string name="confirm_every_run">常に尋ねる</string>
-    <string name="save_global_track_interval_descr">旅程ログ全般の記録間隔を選択します(マップ上のGPXログウィジェットで有効化)</string>
    <string name="save_global_track_interval">ログの記録間隔</string>
    <string name="traffic_warning_speed_limit">制限速度</string>
    <string name="traffic_warning_border_control">国境検問所</string>
@ -1611,7 +1608,6 @@ POIの更新は利用できません</string>
    <string name="download_wikipedia_files">Wikipediaの追加データ(%1$s MB)をダウンロードしますか？</string>
    <string name="gps_network_not_enabled">位置取得機能(現在地、GPS、位置情報サービス等)がオフになっています。オンにしますか？</string>
    <string name="disable_recording_once_app_killed">スタンドアロン動作時のログ記録を停止</string>
-    <string name="disable_recording_once_app_killed_descrp">タスクリストからアプリが停止された場合、GPX記録を一時停止します(OsmAndバックグラウンド動作表示が、Androidの通知エリアに表示されなくなります)</string>
    <string name="rendering_value_default13_name">デフォルト(13)</string>
    <string name="rendering_value_defaultTranslucentCyan_name">デフォルト (半透明シアン)</string>
    <string name="shared_string_import2osmand">OsmAndにインポート</string>
@ -1969,7 +1965,6 @@ POIの更新は利用できません</string>
    <string name="access_widget_expand">展開</string>
    <string name="access_sort">並べ替え</string>
    <string name="map_mode">昼夜モード切替</string>
-    <string name="number_of_gpx_files_selected_pattern">%s個のGPXファイルが選択済み</string>
    <string name="rendering_value_thin_name">細線</string>
    <string name="rendering_value_medium_name">中</string>
    <string name="rendering_value_bold_name">太線</string>
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@ -1196,8 +1196,6 @@
    <string name="live_monitoring_m">온라인 트래킹 (GPX 파일 필요)</string>
    <string name="live_monitoring_start">온라인 트래킹 시작</string>
    <string name="live_monitoring_stop">온라인 트래킹 중지</string>
-    <string name="gpx_monitoring_start">GPX 로깅 시작</string>
-    <string name="gpx_monitoring_stop">GPX 로깅 중지</string>
    <string name="gpx_start_new_segment">새로운 세그먼트 시작</string>
    <string name="lang_fa">페르시아어</string>
    <string name="lang_al">알바니아어</string>
@ -1241,7 +1239,6 @@
    <string name="save_track_to_gpx_globally_descr">GPX 파일에 기록하는 일반적인 위치는 지도 화면에 GPX 로깅 위젯을 사용하여 켜거나 끌 수 있습니다</string>
    <string name="save_track_interval_globally">로깅 간격</string>
    <string name="confirm_every_run">항상 요청</string>
-    <string name="save_global_track_interval_descr">일반 트랙 레코딩에 대한 로깅 간격을 선택합니다 (지도에 GPX 로깅 위젯을 통해 사용 가능)</string>
    <string name="save_global_track_interval">일반 로깅 간격</string>
    <string name="traffic_warning_speed_limit">속도 제한</string>
    <string name="traffic_warning_border_control">국경 통제</string>
@ -1513,7 +1510,6 @@
    <string name="use_fast_recalculation_desc">긴 여행인 경우 경로 다시 계산</string>
    <string name="gps_network_not_enabled">위치 서비스는 사용할 수 없습니다. 위치 서비스를 켜시겠습니까?</string>
    <string name="disable_recording_once_app_killed">단독 로깅 방지</string>
-    <string name="disable_recording_once_app_killed_descrp">앱이 죽을 때 GPX 로깅은 일시 중지 합니다. (OsmAnd 절전 모드 표시는 안드로이드 알림 표시줄에서 사라집니다.)</string>
    <string name="shared_string_import2osmand">OsmAnd로 가져오기</string>
    <string name="read_full_article">전체 기사 읽기 (온라인)</string>
    <string name="shared_string_wikipedia">위키백과</string>
@ -1703,7 +1699,6 @@
    <string name="access_shared_string_navigate_up"/>
    <string name="access_sort"/>
    <string name="map_mode"/>
-    <string name="number_of_gpx_files_selected_pattern"/>
    <string name="rendering_value_thin_name"/>
    <string name="rendering_value_medium_name"/>
    <string name="rendering_value_bold_name"/>
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@ -1224,8 +1224,6 @@ Tam prireiks {1} MB pastoviam saugojimui.
    <string name="live_monitoring_m">Sekimas internete (reikalingas GPX)</string>
    <string name="live_monitoring_start">Pradėti sekimą internete</string>
    <string name="live_monitoring_stop">Stabdyti sekimą internete</string>
-    <string name="gpx_monitoring_start">Pradėti GPX įrašymą</string>
-    <string name="gpx_monitoring_stop">Stabdyti GPX įrašymą</string>
    <string name="gpx_start_new_segment">Pradėti naują segmentą</string>
    <string name="lang_fa">Persų</string>
    <string name="lang_al">Albanų</string>
@ -1271,7 +1269,6 @@ Tam prireiks {1} MB pastoviam saugojimui.
 \n
 \nĮrašytais maršrutais galima pasidalinti su draugais arba pridėti kaip kontribuciją OSM. Sportininkai gali naudoti įrašytus maršrutus norėdami stebėti savo treniruotes. Elementarią analizę, tokią kaip ratų laikai, vidutinis greitis, ir t.t., galima atlikti tiesiai OsmAnd bei, be abejo, vėliau išanalizuoti su trečių šalių progamine įranga.</string>
    <string name="confirm_every_run">Visada klausti</string>
-    <string name="save_global_track_interval_descr">Pasirinkite bendrojo maršruto įrašymo intervalą (įjungiama per GPX valdiklį žemėlapio rodinyje).</string>
    <string name="save_global_track_interval">Bendras įrašymo intervalas</string>
    <string name="traffic_warning_speed_limit">Greičio ribojimas</string>
    <string name="traffic_warning_border_control">Pasienio kontrolė</string>
@ -1509,7 +1506,6 @@ Ilguma %2$s</string>
    <string name="osm_edit_context_menu_delete">Ištrinti OSM taisymus</string>
    <string name="local_recordings_delete_all_confirm">Ketinate ištrinti %1$d pastabas. Ar tikrai to norite?</string>
    <string name="download_wikipedia_maps">Vikipedija</string>
-    <string name="disable_recording_once_app_killed_descrp">Bus pristabdytas GPX įrašymas, jei programa bus išjungta (per Pastarosios programos). (OsmAnd Miego foninio režimo piktograma dings iš Android pranešimų juostos.)</string>
    <string name="download_wikipedia_files">Ar norite atsisiųsti papildomų Wikipedia duomenų (%1$s MB)?</string>
    <string name="archive_wikipedia_data">Jūsų turimi Wikipedia duomenys yra pasenę. Gal norite juos suarchyvuoti?</string>
    <string name="light_theme">Šviesi</string>
@ -1896,7 +1892,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
    <string name="access_map_linked_to_location">Žemėlapis yra susietas su vietos pozicija</string>
    <string name="access_shared_string_navigate_up">Vykti aukštyn</string>
    <string name="map_mode">Žemėlapio režimas</string>
-    <string name="number_of_gpx_files_selected_pattern">Pasirinkti %s GPX failai</string>
    <string name="no_map_markers_found">Prašome pridėti žemėlapio žymeklius per žemėlapį</string>
    <string name="no_waypoints_found">Jokių krypčių taškų nerasta</string>
    <string name="storage_permission_restart_is_required">Dabar programa gebės rašyti į išorinę atmintį. Būtinas rankinis programos paleidimas iš naujo.</string>
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@ -1232,8 +1232,6 @@
    <string name="live_monitoring_m">Sekošana tīklā (no GPX ieraksta)</string>
    <string name="live_monitoring_start">Sākt sekošanu tīklā</string>
    <string name="live_monitoring_stop">Pārtraukt sekošanu tīklā</string>
-    <string name="gpx_monitoring_start">Sākt GPX ierakstu</string>
-    <string name="gpx_monitoring_stop">Pārtraukt GPX ierakstu</string>
    <string name="gpx_start_new_segment">Sākt jaunu segmentu</string>
    <string name="rendering_attr_hideBuildings_name">Ēkas</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Neizbraucamie ceļi</string>
@ -1415,7 +1413,6 @@
    <string name="search_radius_proximity">Attālumā līdz</string>
    <string name="sleep_mode_stop_dialog">Vai izslēgt GPS darbību fonā?</string>
    <string name="stop_navigation_service">Izslēgt</string>
-    <string name="save_global_track_interval_descr">Izvēlieties intervālu treka ierakstam (ieslēgt caur GPX ieraksta logrīku kartē)</string>
    <string name="save_global_track_interval">Ierakstīšanas intervāls</string>
    <string name="enable_sleep_mode">Atļaut gps darboties fonā</string>
    <string name="save_track_to_gpx_globally_headline">Treka ieraksta logošana pēc pieprasījuma</string>
@ -1475,7 +1472,6 @@
    <string name="archive_wikipedia_data">Lejupielādēti novecojuši vikipēdijas dati. Vai arhivēt tos?</string>
    <string name="download_wikipedia_files">Vai lejupielādēt papildus vikipēdijas datus (%1$s MB) ?</string>
    <string name="gps_network_not_enabled">GPS ir izslēgts. Vai ieslēgt to tagad?</string>
-    <string name="disable_recording_once_app_killed_descrp">GPX ieraksts tiks nopauzēts, ja aplikāciju nobeidzēs (caur nesenajiem appiem). (OsmAnd fona servisa indikācija pazudīs no Android piezīmju joslas.)</string>
    <string name="shared_string_import2osmand">Importēt OsmAndā</string>
    <string name="read_full_article">Lasīt visu rakstu (onlainā)</string>
    <string name="shared_string_wikipedia">Vikipēdija</string>
@ -1855,7 +1851,6 @@ failu(s)?
 \n
 \nŠo karti var atkārtoti deaktivizēt šeit vai galvenajā izvēlē - kartes attēlošana. "</string>
    <string name="map_mode">Apgaismojums</string>
-    <string name="number_of_gpx_files_selected_pattern">%s GPX faili atzīmēti</string>
    <string name="rendering_value_thin_name">Tievi</string>
    <string name="rendering_value_medium_name">Viduvēji</string>
    <string name="rendering_value_bold_name">Trekni</string>
--- a/OsmAnd/res/values-ml/strings.xml
+++ b/OsmAnd/res/values-ml/strings.xml
@ -205,7 +205,6 @@
    <string name="access_direction_audio_feedback">ദിശ ശബ്ദസൂചിക</string>
    <string name="access_direction_haptic_feedback">"ദിശ ഹാപ്ടിക്  ഫീഡ്ബാക്ക്"</string>
    <string name="map_mode">മാപ് രീതി</string>
-    <string name="number_of_gpx_files_selected_pattern">"%s ജിപിഎക്സ് ഫയലുകള്‍ തിരഞ്ഞെടുത്തിരിക്കുന്നു "</string>
    <string name="no_waypoints_found">"വഴിത്തിരിവുകളൊന്നും കണ്ടെത്താനായില്ല "</string>
    <string name="osm_editors_ranking">ഓ എസ് എം എഡിറ്ററുഡെ റാങ്കിങ്ങ്</string>
    <string name="osm_live_month_cost_desc">മാസവരി.</string>
@ -272,8 +271,6 @@
    <string name="int_hour">മ.</string>
    <string name="keep_navigation_service">നിലനിര്‍ത്തുക</string>
    <string name="lang_he">"ഹീബ്രൂ ഭാക്ഷ "</string>
-    <string name="gpx_monitoring_start">"ജിപിഎക്സ് റിക്കോഡിങ്ങ് തുടങ്ങുക "</string>
-    <string name="gpx_monitoring_stop">"ജിപിഎക്സ് റിക്കോഡിങ്ങ് നിര്‍ത്തുക "</string>
    <string name="rendering_attr_showSurfaces_name">പാതയുടെ പ്രതലം കാണിക്കുക</string>
    <string name="sort_by_distance">"ദൂരക്രമത്തിലടുക്കുക "</string>
    <string name="loading_smth">%1$s... വന്ന് കൊണ്ടിരിക്കുന്നു…</string>
@ -946,7 +943,6 @@
    <string name="switch_start_finish">പ്രാരംഭ സ്ഥലം ലക്ഷ്യസ്ഥാനവും തിരിച്ചിടുക</string>
    <string name="simulate_your_location_stop_descr">"നിങ്ങളുടെ സ്ഥാനം  സിമുലേറ്റ് ചെയ്യുന്നത് നിര്‍ത്തുക"</string>
    <string name="download_live_updates">"പരിഷ്കരണങ്ങള്‍ "</string>
-    <string name="disable_recording_once_app_killed_descrp">"ആപ്പിനെ (അടുത്തകാലത്തുള്ള അപ്പുകള്‍ -ആന്ഡ്രോയിഡ് വഴി)നിര്‍ത്തിയാല്‍ ജി പി എക്സ് റിക്കോഡിങ്ങ് നിര്‍ത്തും. (ഓഎസ്എംആന്ഡിന്റെ ബാക്ക്ഗ്രൗണ്ട് സൂചിക ആന്ഡ്രോയിഡില്‍ നോട്ടിഫിക്കേഷന്‍ പലകയില്‍ നിന്നും  അപ്രത്യ്ക്ഷമാകും"</string>
    <string name="application_dir_change_warning3">പുതിയ ലക്ഷ്യത്തിലേക്കുള്ള OsmAnd ഡാറ്റാ ഫയലുകൾ നീക്കണോ\?</string>
    <string name="storage_directory_multiuser">ഒന്നിലധികം ഉപഭോക്താക്കളുടെ സംഭരണസ്ഥലം</string>
    <string name="agps_data_last_downloaded">അവസാനം ഡൗണ്‍ലോഡ് ചെയ്തത്: %1$s</string>
@ -2081,7 +2077,6 @@
    <string name="speed_limit_exceed_message">സ്പീഡ് ലിമിറ്റ് ടോളറൻസ് മാർജിൻ തിരഞ്ഞെടുക്കുക, അതിന് മുകളിൽ നിങ്ങൾക്ക് ഒരു വോയ്സ് മുന്നറിയിപ്പ് ലഭിക്കും.</string>
    <string name="fav_point_emoticons_message">സ്ട്രിംഗ് ഇമോട്ടിക്കോണുകൾ ഒരു ഫയലിലേക്ക് ശരിയായി സംരക്ഷിക്കുന്നതിന് പേര് %1$s എന്നതിലേക്ക് പരിഷ്ക്കരിച്ചു.</string>
    <string name="print_route">പ്രിന്റ് റൂട്ട്</string>
-    <string name="save_global_track_interval_descr">" ട്രാക്ക് റെക്കോർഡിംഗിന് പൊതുവായ ലോഗിംഗ് ഇടവേള തിരഞ്ഞെടുക്കുക (മാപ്പിലെ ജിപിഎക്സ് ലോഗിംഗ് വിഡ്ജറ്റ് വഴി പ്രവർത്തനക്ഷമമാക്കിയത്)."</string>
    <string name="save_track_to_gpx_globally_descr">"ജിപിഎക്സ് ഫയലിലേക്കു്  സ്ഥാനം ലോഗ്ഗിങ് ചെയ്യുന്നത്, ഭൂപടത്തിൽ ജിപിഎക്സ് ലോഗിങ് വിഡ്ജെറ്റ് ഉപയോഗിച്ചു് ഓണാക്കുന്നതാണു്."</string>
    <string name="save_current_track_descr">ഇപ്പോൾ നിലവിലുള്ള ട്രാക്ക് ജിപിഎക്സ് ഫയൽ ആയി സംരക്ഷിക്കുക.</string>
    <string name="save_track_to_gpx">നാവിഗേഷൻ സമയത്ത് ട്രാക്ക് ഓട്ടോമാറ്റിക്കായി റെക്കോർഡ് ചെയ്യുക</string>
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@ -1478,7 +1478,6 @@
    <string name="access_widget_expand">Utvid</string>
    <string name="access_sort">Sorter</string>
    <string name="map_mode">Kartmodus</string>
-    <string name="number_of_gpx_files_selected_pattern">%s GPX-filer valgt</string>
    <string name="follow_us">Følg oss</string>
    <string name="use_osm_live_routing">OsmAnd Live-navigering</string>
    <string name="access_no_destination">Reisemål er ikke angitt</string>
@ -1660,7 +1659,6 @@
    <string name="proxy_host_title">Mellomtjenervert</string>
    <string name="proxy_host_descr">Angi din mellomtjeners vertsnavn (f.eks. 127.0.0.1).</string>
    <string name="proxy_port_title">Mellomtjener-port</string>
-    <string name="gpx_monitoring_stop">Ta en pause i GPX-logging</string>
    <string name="gpx_start_new_segment">Start nytt segment</string>
    <string name="no_index_file_to_download">Ingen nedlastinger funnet, sjekk din internettforbindelse.</string>
    <string name="gpx_info_subtracks">Underspor: %1$s</string>
@ -1787,14 +1785,12 @@
    <string name="navigate_point_northing">Nordverdi</string>
    <string name="navigate_point_easting">Østverdi</string>
    <string name="fav_point_emoticons_message">Favorittnavn endret til \"%1$s\" for å muliggjøre lagring av streng med uttrykksikoner til en fil.</string>
-    <string name="save_global_track_interval_descr">Angi loggingsintervall for det generelle sporingsopptaket (påskrudd via miniprogrammet for GPX-logging på kartet).</string>
    <string name="save_track_to_gpx_globally_headline">Sporingslogging på etterspørsel</string>
    <string name="proxy_port_descr">Angi din mellomtjeners portnummer (f.eks. 8118).</string>
    <string name="live_monitoring_m_descr">Send sporingsdata til en angitt nettjeneste hvis GPX-logging er påslått.</string>
    <string name="live_monitoring_m">Nettbasert sporing (GPX kreves)</string>
    <string name="live_monitoring_start">Start nettbasert sporing</string>
    <string name="live_monitoring_stop">Stopp nettbasert sporing</string>
-    <string name="gpx_monitoring_start">Fortsett GPX-logging</string>
    <string name="select_index_file_to_download">Fant ikke noe. Hvis du ikke finner din region, kan du lage den selv (se https://osmand.net).</string>
    <string name="none_selected_gpx">Ingen GPX-filer valgt. Velg en ved lang-trykking.</string>
    <string name="gpx_split_interval">Oppdelingsintervall</string>
@ -2436,7 +2432,6 @@
    <string name="will_open_tomorrow_at">Åpner i morgen</string>
    <string name="winter_and_ski_renderer">Vinter og ski</string>
    <string name="touring_view_renderer">Turvisning</string>
-    <string name="disable_recording_once_app_killed_descrp">Vil sette GPX-logging i pausemodus når programmet avsluttes (via nylig brukte apper). (OsmAnds bakgrunnsindikasjon forsvinner fra Android-varslingslinjen.)</string>
    <string name="route_is_too_long_v2">For lange distanser: Legg til mellomliggende reisemål hvis denne lange ruten ikke er beregnet innen 10 minutter.</string>
    <string name="intermediate_items_sort_return">Optimalisert rekkefølge av mellomliggende reisemål underveis til målet.</string>
    <string name="audionotes_location_not_defined">Sted å assosiere med notatet er ikke definert ennå. \"Bruk posisjon…\" for å tilordne et notat til det angitte stedet.</string>
@ -3723,5 +3718,5 @@
    <string name="plan_route_create_new_route">Opprett ny rute</string>
    <string name="shared_string_done">Ferdig</string>
    <string name="threshold_distance">Terskeldistanse</string>
-    <string name="navigation_profile">Navigasjonsdistanse</string>
+    <string name="navigation_profile">Navigeringsprofil</string>
 </resources>
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@ -1209,8 +1209,6 @@
    <string name="live_monitoring_m">Online tracking (GPX vereist)</string>
    <string name="live_monitoring_start">Start online tracken</string>
    <string name="live_monitoring_stop">Stop online tracken</string>
-    <string name="gpx_monitoring_start">GPX-opname hervatten</string>
-    <string name="gpx_monitoring_stop">GPX-opname pauzeren</string>
    <string name="gpx_start_new_segment">Start nieuw segment</string>
    <string name="keep_navigation_service">Behouden</string>
    <string name="stop_navigation_service">Stoppen</string>
@ -1260,7 +1258,6 @@
    <string name="save_track_interval_globally">Interval tussen geregistreerde punten</string>
    <string name="rendering_attr_publicTransportMode_name">Bus-, trolleybus- en pendeltaxilijnen</string>
    <string name="confirm_every_run">Altijd vragen</string>
-    <string name="save_global_track_interval_descr">Selecteer het loggings-interval voor de GPX-track-opname (te starten via de GPX-opname widget op het kaartscherm).</string>
    <string name="save_global_track_interval">Standaard logging-interval</string>
    <string name="traffic_warning_speed_limit">Maximum snelheid</string>
    <string name="traffic_warning_border_control">Grenscontrole</string>
@ -1566,7 +1563,6 @@
    <string name="archive_wikipedia_data">Er zijn al (verouderde en incompatibele) Wikipedia-gegevens gedownload. Wilt u deze bewaren?</string>
    <string name="download_wikipedia_files">Wilt u Wikipedia-artikelen downloaden (%1$s MB) ?</string>
    <string name="disable_recording_once_app_killed">Voorkom loggen als app wordt gesloten</string>
-    <string name="disable_recording_once_app_killed_descrp">Stopt het opnemen van een GPX-track als de app wordt afgesloten met Recente Applicaties</string>
    <string name="shared_string_import2osmand">Importeren in OsmAnd</string>
    <string name="download_wikipedia_maps">Wikipedia</string>
    <string name="rendering_value_default13_name">Standaard (13)</string>
@ -1923,7 +1919,6 @@
    <string name="rendering_value_medium_name">Gemiddeld</string>
    <string name="rendering_value_bold_name">Vet</string>
    <string name="map_mode">Dag-Nacht stijl</string>
-    <string name="number_of_gpx_files_selected_pattern">%s GPX-bestanden geselecteerd</string>
    <string name="access_default_color">Standaardkleur</string>
    <string name="access_category_choice">Kies categorie</string>
    <string name="access_hint_enter_name">Voer naam in</string>
--- a/OsmAnd/res/values-nn/strings.xml
+++ b/OsmAnd/res/values-nn/strings.xml
@ -17,8 +17,6 @@
    <string name="lang_he">Hebraisk</string>
    <string name="forward">Fram</string>
    <string name="home">Heim</string>
-    <string name="gpx_monitoring_start">Start GPS-opptak</string>
-	<string name="gpx_monitoring_stop">Stopp GPS-opptak</string>
    <string name="rendering_attr_hideBuildings_name">Gøym bygningar</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Gøym vegar som ikkje er for køyretøy</string>
    <string name="rendering_attr_hideText_name">Gøym tekst</string>
@ -266,7 +264,6 @@
 	
 	
 	<string name="map_widget_max_speed">Fartsgrense</string>
-    <string name="monitoring_control_start">GPX</string>
    <string name="no_buildings_found">Fann ingen bygningar.</string>
    <string name="rendering_attr_showRoadMaps_name">Kart med berre vegar</string>
    <string name="safe_mode">Sikkermodus</string>
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@ -3828,6 +3828,8 @@
    <string name="poi_traffic_signals_arrow_yes">Tak</string>
    <string name="poi_traffic_signals_vibration_yes">Tak</string>
    <string name="poi_traffic_signals_vibration_no">Wibracja: nie</string>
-    <string name="poi_city_block">Blok</string>
+    <string name="poi_city_block">Blok miejski</string>
    <string name="poi_borough">Gmina</string>
+    <string name="poi_give_box">Daj pudełko</string>
+    <string name="poi_pump_status_missing_beam">Stan pompy: brak wiązki</string>
 </resources>
--- a/Show more
+++ b/Show more