Merge branch 'master' into travel_obf_gpx_track

# Conflicts:
#	OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java

OsmAnd-api/build.gradle

@@ -1,8 +1,7 @@
 apply plugin: 'com.android.library'
+apply plugin: 'ivy-publish'
 apply plugin: 'com.github.dcendents.android-maven'
 
-group = 'com.github.osmandapp.osmand'
-version = '2.0.0'
 
 android {
     compileSdkVersion 28
@@ -26,6 +25,33 @@ android {
     }
 }
 
+afterEvaluate {
+    publishing {
+        repositories {    
+            ivy {
+                url = System.getenv("OSMAND_BINARIES_IVY_ROOT") ?: "./"
+            }
+        }
+
+        publications {
+             release(IvyPublication) {
+                // Applies the component for the release build variant.
+                from components.release
+                organisation = 'net.osmand'
+                module = 'android-aidl-lib'
+                revision = 'master-snapshot'
+             }
+             debug(IvyPublication) {
+                // Applies the component for the release build variant.
+                from components.debug
+                organisation = 'net.osmand'
+                module = 'android-aidl-lib'
+                revision = 'master-snapshot'
+             }
+        }
+    }
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:support-annotations:28.0.0'
@@ -38,4 +64,4 @@ task sourcesJar(type: Jar) {
 
 artifacts {
     archives sourcesJar
-}
+}

OsmAnd-api/src/net/osmand/aidlapi/IOsmAndAidlInterface.aidl

@@ -2,6 +2,7 @@ package net.osmand.aidlapi;
 
 import net.osmand.aidlapi.map.ALatLon;
 import net.osmand.aidlapi.map.SetMapLocationParams;
+import net.osmand.aidlapi.map.SetLocationParams;
 
 import net.osmand.aidlapi.favorite.group.AFavoriteGroup;
 import net.osmand.aidlapi.favorite.group.AddFavoriteGroupParams;
@@ -901,4 +902,6 @@ interface IOsmAndAidlInterface {
     boolean addRoadBlock(in AddBlockedRoadParams params);
 
     boolean removeRoadBlock(in RemoveBlockedRoadParams params);
+
+    boolean setLocation(in SetLocationParams params);
 }

OsmAnd-api/src/net/osmand/aidlapi/map/ALocation.aidl

@@ -0,0 +1,3 @@
+package net.osmand.aidlapi.map;
+
+parcelable ALocation;

OsmAnd-api/src/net/osmand/aidlapi/map/ALocation.java

@@ -0,0 +1,208 @@
+package net.osmand.aidlapi.map;
+
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import net.osmand.aidlapi.AidlParams;
+
+public class ALocation extends AidlParams {
+
+    private double latitude = 0.0;
+    private double longitude = 0.0;
+    private long time = 0;
+    private boolean hasAltitude = false;
+    private double altitude = 0.0f;
+    private boolean hasSpeed = false;
+    private float speed = 0.0f;
+    private boolean hasBearing = false;
+    private float bearing = 0.0f;
+    private boolean hasAccuracy = false;
+    private float accuracy = 0.0f;
+    private boolean hasVerticalAccuracy = false;
+    private float verticalAccuracy = 0.0f;
+
+    private ALocation() {
+    }
+
+    public ALocation(Parcel in) {
+        readFromParcel(in);
+    }
+
+    public static final Parcelable.Creator<ALocation> CREATOR = new Parcelable.Creator<ALocation>() {
+        @Override
+        public ALocation createFromParcel(Parcel in) {
+            return new ALocation(in);
+        }
+
+        @Override
+        public ALocation[] newArray(int size) {
+            return new ALocation[size];
+        }
+    };
+
+    public double getLatitude() {
+        return latitude;
+    }
+
+    public double getLongitude() {
+        return longitude;
+    }
+
+    public long getTime() {
+        return time;
+    }
+
+    public boolean hasAltitude() {
+        return hasAltitude;
+    }
+
+    public double getAltitude() {
+        return altitude;
+    }
+
+    public boolean hasSpeed() {
+        return hasSpeed;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public boolean hasBearing() {
+        return hasBearing;
+    }
+
+    public float getBearing() {
+        return bearing;
+    }
+
+    public boolean hasAccuracy() {
+        return hasAccuracy;
+    }
+
+    public float getAccuracy() {
+        return accuracy;
+    }
+
+    public boolean hasVerticalAccuracy() {
+        return hasVerticalAccuracy;
+    }
+
+    public float getVerticalAccuracy() {
+        return verticalAccuracy;
+    }
+
+    @Override
+    protected void writeToBundle(Bundle bundle) {
+        bundle.putDouble("latitude", latitude);
+        bundle.putDouble("longitude", longitude);
+        bundle.putLong("time", time);
+        bundle.putBoolean("hasAltitude", hasAltitude);
+        bundle.putDouble("altitude", altitude);
+        bundle.putBoolean("hasSpeed", hasSpeed);
+        bundle.putFloat("speed", speed);
+        bundle.putBoolean("hasBearing", hasBearing);
+        bundle.putFloat("bearing", bearing);
+        bundle.putBoolean("hasAccuracy", hasAccuracy);
+        bundle.putFloat("accuracy", accuracy);
+        bundle.putBoolean("hasVerticalAccuracy", hasVerticalAccuracy);
+        bundle.putFloat("verticalAccuracy", verticalAccuracy);
+    }
+
+    @Override
+    protected void readFromBundle(Bundle bundle) {
+        latitude = bundle.getDouble("latitude");
+        longitude = bundle.getDouble("longitude");
+        time = bundle.getLong("time");
+        hasAltitude = bundle.getBoolean("hasAltitude");
+        altitude = bundle.getDouble("altitude");
+        hasSpeed = bundle.getBoolean("hasSpeed");
+        speed = bundle.getFloat("speed");
+        hasBearing = bundle.getBoolean("hasBearing");
+        bearing = bundle.getFloat("bearing");
+        hasAccuracy = bundle.getBoolean("hasAccuracy");
+        accuracy = bundle.getFloat("accuracy");
+        hasVerticalAccuracy = bundle.getBoolean("hasVerticalAccuracy");
+        verticalAccuracy = bundle.getFloat("verticalAccuracy");
+    }
+
+    public static Builder builder() {
+        return new ALocation().new Builder();
+    }
+
+    public class Builder {
+
+        private Builder() {
+        }
+
+        public Builder setLatitude(double latitude) {
+            ALocation.this.latitude = latitude;
+            return this;
+        }
+
+        public Builder setLongitude(double longitude) {
+            ALocation.this.longitude = longitude;
+            return this;
+        }
+
+        public Builder setTime(long time) {
+            ALocation.this.time = time;
+            return this;
+        }
+
+        public Builder hasAltitude(boolean hasAltitude) {
+            ALocation.this.hasAltitude = hasAltitude;
+            return this;
+        }
+
+        public Builder setAltitude(float altitude) {
+            ALocation.this.altitude = altitude;
+            return this;
+        }
+
+        public Builder hasSpeed(boolean hasSpeed) {
+            ALocation.this.hasSpeed = hasSpeed;
+            return this;
+        }
+
+        public Builder setSpeed(float speed) {
+            ALocation.this.speed = speed;
+            return this;
+        }
+
+        public Builder hasBearing(boolean hasBearing) {
+            ALocation.this.hasBearing = hasBearing;
+            return this;
+        }
+
+        public Builder setBearing(float bearing) {
+            ALocation.this.bearing = bearing;
+            return this;
+        }
+
+        public Builder hasAccuracy(boolean hasAccuracy) {
+            ALocation.this.hasAccuracy = hasAccuracy;
+            return this;
+        }
+
+        public Builder setAccuracy(float accuracy) {
+            ALocation.this.accuracy = accuracy;
+            return this;
+        }
+
+        public Builder hasVerticalAccuracy(boolean hasVerticalAccuracy) {
+            ALocation.this.hasVerticalAccuracy = hasVerticalAccuracy;
+            return this;
+        }
+
+        public Builder setVerticalAccuracy(float verticalAccuracy) {
+            ALocation.this.verticalAccuracy = verticalAccuracy;
+            return this;
+        }
+
+        public ALocation build() {
+            return ALocation.this;
+        }
+    }
+}

OsmAnd-api/src/net/osmand/aidlapi/map/SetLocationParams.aidl

@@ -0,0 +1,3 @@
+package net.osmand.aidlapi.map;
+
+parcelable SetLocationParams;

OsmAnd-api/src/net/osmand/aidlapi/map/SetLocationParams.java

@@ -0,0 +1,54 @@
+package net.osmand.aidlapi.map;
+
+import android.os.Bundle;
+import android.os.Parcel;
+
+import net.osmand.aidlapi.AidlParams;
+
+public class SetLocationParams extends AidlParams {
+
+    private ALocation location;
+    private long timeToNotUseOtherGPS;
+
+    public SetLocationParams(ALocation location, long timeToNotUseOtherGPS) {
+        this.location = location;
+        this.timeToNotUseOtherGPS = timeToNotUseOtherGPS;
+    }
+
+    public SetLocationParams(Parcel in) {
+        readFromParcel(in);
+    }
+
+    public static final Creator<SetLocationParams> CREATOR = new Creator<SetLocationParams>() {
+        @Override
+        public SetLocationParams createFromParcel(Parcel in) {
+            return new SetLocationParams(in);
+        }
+
+        @Override
+        public SetLocationParams[] newArray(int size) {
+            return new SetLocationParams[size];
+        }
+    };
+
+    public ALocation getLocation() {
+        return location;
+    }
+
+    public long getTimeToNotUseOtherGPS() {
+        return timeToNotUseOtherGPS;
+    }
+
+    @Override
+    public void writeToBundle(Bundle bundle) {
+        bundle.putParcelable("location", location);
+        bundle.putLong("timeToNotUseOtherGPS", timeToNotUseOtherGPS);
+    }
+
+    @Override
+    protected void readFromBundle(Bundle bundle) {
+        bundle.setClassLoader(ALocation.class.getClassLoader());
+        location = bundle.getParcelable("location");
+        timeToNotUseOtherGPS = bundle.getLong("timeToNotUseOtherGPS");
+    }
+}

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

@@ -449,6 +449,10 @@ public class GPXUtilities {
 		public String getArticleLang() {
 			return getExtensionsToRead().get("article_lang");
 		}
+
+		public String getDescription() {
+			return getExtensionsToRead().get("desc");
+		}
 	}
 
 	public static class Author extends GPXExtensions {
@@ -1822,6 +1826,25 @@ public class GPXUtilities {
 			}
 			serializer.endTag(null, "metadata");
 
+			for (WptPt l : file.points) {
+				serializer.startTag(null, "wpt"); //$NON-NLS-1$
+				writeWpt(format, serializer, l);
+				serializer.endTag(null, "wpt"); //$NON-NLS-1$
+			}
+
+			for (Route track : file.routes) {
+				serializer.startTag(null, "rte"); //$NON-NLS-1$
+				writeNotNullText(serializer, "name", track.name);
+				writeNotNullText(serializer, "desc", track.desc);
+
+				for (WptPt p : track.points) {
+					serializer.startTag(null, "rtept"); //$NON-NLS-1$
+					writeWpt(format, serializer, p);
+					serializer.endTag(null, "rtept"); //$NON-NLS-1$
+				}
+				writeExtensions(serializer, track);
+				serializer.endTag(null, "rte"); //$NON-NLS-1$
+			}
 
 			for (Track track : file.tracks) {
 				if (!track.generalTrack) {
@@ -1844,26 +1867,6 @@ public class GPXUtilities {
 				}
 			}
 
-			for (Route track : file.routes) {
-				serializer.startTag(null, "rte"); //$NON-NLS-1$
-				writeNotNullText(serializer, "name", track.name);
-				writeNotNullText(serializer, "desc", track.desc);
-
-				for (WptPt p : track.points) {
-					serializer.startTag(null, "rtept"); //$NON-NLS-1$
-					writeWpt(format, serializer, p);
-					serializer.endTag(null, "rtept"); //$NON-NLS-1$
-				}
-				writeExtensions(serializer, track);
-				serializer.endTag(null, "rte"); //$NON-NLS-1$
-			}
-
-			for (WptPt l : file.points) {
-				serializer.startTag(null, "wpt"); //$NON-NLS-1$
-				writeWpt(format, serializer, l);
-				serializer.endTag(null, "wpt"); //$NON-NLS-1$
-			}
-
 			writeExtensions(serializer, file);
 
 			serializer.endTag(null, "gpx"); //$NON-NLS-1$

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

@@ -20,7 +20,7 @@ public abstract class StringBundleWriter {
 
 	public void writeBundle() {
 		for (Entry<String, Item<?>> entry : bundle.getMap().entrySet()) {
-			writeItem(entry.getKey(), entry.getValue());
+			writeItem("osmand:" + entry.getKey(), entry.getValue());
 		}
 	}
 }

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

@@ -41,6 +41,7 @@ public class Amenity extends MapObject {
 	public static final String OSM_DELETE_TAG = "osmand_change";
 	public static final String IMAGE_TITLE = "image_title";
 	public static final String IS_PART = "is_part";
+	public static final String IS_PARENT_OF = "is_parent_of";
 	public static final String IS_AGGR_PART = "is_aggr_part";
 	public static final String CONTENT_JSON = "content_json";
 	public static final String ROUTE_ID = "route_id";

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

@@ -106,25 +106,42 @@ public class Building extends MapObject {
 	
 
 	public float interpolation(String hno) {
-		if(getInterpolationType() != null || getInterpolationInterval() > 0 
-				//|| checkNameAsInterpolation() // disable due to situation in NL #4284 
-				) {
+		if (getInterpolationType() != null || getInterpolationInterval() > 0
+		// || checkNameAsInterpolation() // disable due to situation in NL #4284
+		) {
 			int num = Algorithms.extractFirstIntegerNumber(hno);
 			String fname = super.getName();
 			int numB = Algorithms.extractFirstIntegerNumber(fname);
-			int numT = numB; 
+			int numT = numB;
+			String sname = getName2();
+			if (getInterpolationType() == BuildingInterpolation.ALPHABETIC) {
+				if (num != numB) {
+					// currently not supported
+					return -1;
+				}
+				int hint = (int) hno.charAt(hno.length() - 1);
+				int fch = (int) fname.charAt(fname.length() - 1);
+				int sch = sname.charAt(sname.length() - 1);
+				if (fch == sch) {
+					return -1;
+				}
+				float res = ((float) hint - fch) / (((float) sch - fch));
+				if (res > 1 || res < 0) {
+					return -1;
+				} 
+				return res;
+			}
 			if (num >= numB) {
-				String sname = getName2();
-				if(fname.contains("-") && sname == null){
+				if (fname.contains("-") && sname == null) {
 					int l = fname.indexOf('-');
 					sname = fname.substring(l + 1, fname.length());
 				}
 				if (sname != null) {
 					numT = Algorithms.extractFirstIntegerNumber(sname);
-					if(numT < num) {
+					if (numT < num) {
 						return -1;
 					}
-				} 
+				}
 				if (getInterpolationType() == BuildingInterpolation.EVEN && num % 2 == 1) {
 					return -1;
 				}
@@ -137,8 +154,8 @@ public class Building extends MapObject {
 			} else {
 				return -1;
 			}
-			if(numT > numB){
-				return ((float)num - numB) / (((float)numT - numB));
+			if (numT > numB) {
+				return ((float) num - numB) / (((float) numT - numB));
 			}
 			return 0;
 		}
@@ -165,10 +182,10 @@ public class Building extends MapObject {
 	
 	@Override
 	public String toString() {
-		if(interpolationInterval !=0){
-			return name+"-"+name2 +" (+"+interpolationInterval+") ";
-		} else if(interpolationType != null) {
-			return name+"-"+name2 +" ("+interpolationType+") ";
+		if (interpolationInterval != 0) {
+			return name + "-" + name2 + " (+" + interpolationInterval + ") ";
+		} else if (interpolationType != null) {
+			return name + "-" + name2 + " (" + interpolationType + ") ";
 		}
 		return name;
 	}

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

@@ -1189,6 +1189,7 @@ public class RouteResultPreparation {
 		RouteSegmentResult last = rr;
 		RouteSegmentResult firstRoundabout = rr;
 		RouteSegmentResult lastRoundabout = rr;
+		
 		for (int j = i; j < result.size(); j++) {
 			RouteSegmentResult rnext = result.get(j);
 			last = rnext;
@@ -1215,12 +1216,18 @@ public class RouteResultPreparation {
 		TurnType t = TurnType.getExitTurn(exit, 0, leftSide);
 		// usually covers more than expected
 		float turnAngleBasedOnOutRoads = (float) MapUtils.degreesDiff(last.getBearingBegin(), prev.getBearingEnd());
-		// usually covers less than expected
-		float turnAngleBasedOnCircle = (float) -MapUtils.degreesDiff(firstRoundabout.getBearingBegin(), lastRoundabout.getBearingEnd() + 180);
-		if(Math.abs(turnAngleBasedOnOutRoads - turnAngleBasedOnCircle) > 180) {
-			t.setTurnAngle(turnAngleBasedOnCircle ) ;
+		// Angle based on circle method tries 
+		// 1. to calculate antinormal to roundabout circle on roundabout entrance and 
+		// 2. normal to roundabout circle on roundabout exit
+		// 3. calculate angle difference
+		// This method doesn't work if you go from S to N touching only 1 point of roundabout, 
+		// but it is very important to identify very sharp or very large angle to understand did you pass whole roundabout or small entrance
+		float turnAngleBasedOnCircle = (float) MapUtils.degreesDiff(firstRoundabout.getBearingBegin(), lastRoundabout.getBearingEnd() + 180);
+		if (Math.abs(turnAngleBasedOnOutRoads) > 120) {
+			// correctly identify if angle is +- 180, so we approach from left or right side
+			t.setTurnAngle(turnAngleBasedOnCircle) ;
 		} else {
-			t.setTurnAngle((turnAngleBasedOnCircle + turnAngleBasedOnOutRoads) / 2) ;
+			t.setTurnAngle(turnAngleBasedOnOutRoads) ;
 		}
 		return t;
 	}

OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java

@@ -954,17 +954,15 @@ public class SearchUICore {
 				break;
 			}
 			case COMPARE_AMENITY_TYPE_ADDITIONAL: {
-				if(o1.object instanceof AbstractPoiType && o2.object instanceof AbstractPoiType ) {
-					boolean additional1 = ((AbstractPoiType) o1.object).isAdditional();
-					boolean additional2 = ((AbstractPoiType) o2.object).isAdditional();
-					if (additional1 != additional2) {
-						// -1 - means 1st is less than 2nd
-						return additional1 ? 1 : -1;
-					}
+				boolean additional1 = o1.object instanceof AbstractPoiType && ((AbstractPoiType) o1.object).isAdditional();
+				boolean additional2 = o2.object instanceof AbstractPoiType && ((AbstractPoiType) o2.object).isAdditional();
+				if (additional1 != additional2) {
+					// -1 - means 1st is less than 2nd
+					return additional1 ? 1 : -1;
 				}
 				break;
 			}
-			case COMPARE_DISTANCE_TO_PARENT_SEARCH_RESULT: 
+			case COMPARE_DISTANCE_TO_PARENT_SEARCH_RESULT:
 				double ps1 = o1.parentSearchResult == null ? 0 : o1.parentSearchResult.getSearchDistance(c.loc);
 				double ps2 = o2.parentSearchResult == null ? 0 : o2.parentSearchResult.getSearchDistance(c.loc);
 				if (ps1 != ps2) {
@@ -1004,17 +1002,12 @@ public class SearchUICore {
 					String subType2 = a2.getSubType() == null ? "" : a2.getSubType();
 
 					int cmp = 0;
-
-					if (FILTER_DUPLICATE_POI_SUBTYPE.contains(subType1)) {
-						cmp = 1;
-					} else if (FILTER_DUPLICATE_POI_SUBTYPE.contains(subType2)) {
-						cmp = -1;
-					} 
-					
-					if (cmp != 0) {
-						return cmp;
+					boolean subtypeFilter1 = FILTER_DUPLICATE_POI_SUBTYPE.contains(subType1);
+					boolean subtypeFilter2 = FILTER_DUPLICATE_POI_SUBTYPE.contains(subType2);
+					if (subtypeFilter1 != subtypeFilter2) {
+						// to filter second
+						return subtypeFilter1 ? 1 : -1;
 					}
-
 					cmp = c.collator.compare(type1, type2);
 					if (cmp != 0) {
 						return cmp;
@@ -1047,12 +1040,17 @@ public class SearchUICore {
 
 		@Override
 		public int compare(SearchResult o1, SearchResult o2) {
-			for(ResultCompareStep step : ResultCompareStep.values()) {
+			List<ResultCompareStep> steps = new ArrayList<>();
+			for (ResultCompareStep step : ResultCompareStep.values()) {
 				int r = step.compare(o1, o2, this);
-				if(r != 0) {
+				steps.add(step);
+				if (r != 0) {
+					// debug crashes and identify non-transitive comparision
+					// LOG.debug(String.format("%d: %s o1='%s' o2='%s'", r, steps, o1, o2));
 					return r;
 				}
 			}
+			// LOG.debug(String.format("EQUAL: o1='%s' o2='%s'", o1, o2));
 			return 0;
 		}
 

OsmAnd-java/src/main/java/net/osmand/util/MapUtils.java

@@ -333,8 +333,8 @@ public class MapUtils {
 		});
 	}
 
-	public static String buildGeoUrl(double latitude, double longitude, int zoom) {
-		return "geo:" + ((float) latitude) + "," + ((float) longitude) + "?z=" + zoom;
+	public static String buildGeoUrl(String latitude, String longitude, int zoom) {
+		return "geo:" + latitude + "," + longitude + "?z=" + zoom;
 	}
 
 	// Examples

OsmAnd-telegram/AndroidManifest.xml

@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         android:name="net.osmand.telegram.TelegramApplication"
@@ -46,6 +47,16 @@
 
         </activity>
 
+        <service
+            android:name=".TelegramService"
+            android:label="@string/process_service"
+            android:exported="false"
+            android:foregroundServiceType="location">
+            <intent-filter>
+                <action android:name="net.osmand.telegram.TelegramService" />
+            </intent-filter>
+        </service>
+
         <receiver
             android:name=".InitAppBroadcastReceiver"
             android:enabled="true"

OsmAnd-telegram/build.gradle

@@ -152,4 +152,6 @@ dependencies {
 	implementation("com.github.HITGIF:TextFieldBoxes:1.4.5") {
 		exclude group: 'com.android.support'
 	}
+
+	implementation 'com.google.android.gms:play-services-location:17.1.0'
 }

OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt

@@ -148,7 +148,6 @@ class TelegramApplication : Application() {
 	}
 
 	private fun startTelegramService(intent: Int) {
-		/*
 		var i = intent
 		val serviceIntent = Intent(this, TelegramService::class.java)
 		val telegramService = telegramService
@@ -159,7 +158,6 @@ class TelegramApplication : Application() {
 		serviceIntent.putExtra(TelegramService.USAGE_INTENT, i)
 		serviceIntent.putExtra(TelegramService.SEND_LOCATION_INTERVAL, settings.sendMyLocInterval)
 		ContextCompat.startForegroundService(this, serviceIntent)
-		 */
 	}
 
 	fun startMyLocationService() {

OsmAnd-telegram/src/net/osmand/telegram/TelegramLocationProvider.kt

@@ -3,22 +3,20 @@ package net.osmand.telegram
 import android.annotation.SuppressLint
 import android.content.Context
 import android.hardware.*
-import android.location.GpsStatus
 import android.location.Location
-import android.location.LocationListener
-import android.location.LocationManager
-import android.os.Bundle
+import android.os.Looper
 import android.util.Log
+import com.google.android.gms.location.*
 import net.osmand.PlatformUtil
 import net.osmand.data.LatLon
 import net.osmand.telegram.utils.AndroidUtils
 import net.osmand.util.MapUtils
 import java.util.*
+import kotlin.math.atan2
 
 class TelegramLocationProvider(private val app: TelegramApplication) : SensorEventListener {
 
 	private var lastTimeGPSLocationFixed: Long = 0
-	private var gpsSignalLost: Boolean = false
 
 	private var sensorRegistered = false
 	private val mGravs = FloatArray(3)
@@ -45,31 +43,29 @@ class TelegramLocationProvider(private val app: TelegramApplication) : SensorEve
 	var lastKnownLocation: net.osmand.Location? = null
 		private set
 
-	val gpsInfo = GPSInfo()
+	private var fusedLocationProviderClient: FusedLocationProviderClient? = null
+	private val locationRequest = LocationRequest().apply {
+		interval = 1000
+		fastestInterval = 500
+		maxWaitTime = 2000
+		priority = LocationRequest.PRIORITY_HIGH_ACCURACY
+	}
+	private val locationCallback = object : LocationCallback() {
+		override fun onLocationResult(locationResult: LocationResult?) {
+			super.onLocationResult(locationResult)
+			val lastLocation = locationResult?.lastLocation
+			if (lastLocation != null) {
+				lastTimeGPSLocationFixed = lastLocation.time
+			}
+			setLocation(convertLocation(lastLocation))
+		}
+	}
 
 	private val locationListeners = ArrayList<TelegramLocationListener>()
 	private val compassListeners = ArrayList<TelegramCompassListener>()
-	private var gpsStatusListener: GpsStatus.Listener? = null
 	private val mRotationM = FloatArray(9)
-	private var agpsDataLastTimeDownloaded: Long = 0
 	private val useMagneticFieldSensorCompass = false
 
-	private val gpsListener = object : LocationListener {
-		override fun onLocationChanged(location: Location?) {
-			if (location != null) {
-				lastTimeGPSLocationFixed = location.time
-			}
-			setLocation(convertLocation(location))
-		}
-
-		override fun onProviderDisabled(provider: String) {}
-
-		override fun onProviderEnabled(provider: String) {}
-
-		override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {}
-	}
-	private val networkListeners = LinkedList<LocationListener>()
-
 	val lastKnownLocationLatLon: LatLon?
 		get() = if (lastKnownLocation != null) {
 			LatLon(lastKnownLocation!!.latitude, lastKnownLocation!!.longitude)
@@ -87,110 +83,18 @@ class TelegramLocationProvider(private val app: TelegramApplication) : SensorEve
 
 	@SuppressLint("MissingPermission")
 	fun resumeAllUpdates() {
-		/*
-		val service = app.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-		if (app.isInternetConnectionAvailable) {
-			if (System.currentTimeMillis() - agpsDataLastTimeDownloaded > AGPS_TO_REDOWNLOAD) {
-				//force an updated check for internet connectivity here before destroying A-GPS-data
-				if (app.isInternetConnectionAvailable(true)) {
-					redownloadAGPS()
-				}
-			}
+		if (AndroidUtils.isLocationPermissionAvailable(app) && fusedLocationProviderClient == null) {
+			fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(app)
 		}
-		if (AndroidUtils.isLocationPermissionAvailable(app)) {
-			service.addGpsStatusListener(getGpsStatusListener(service))
-			try {
-				service.requestLocationUpdates(
-					LocationManager.GPS_PROVIDER,
-					GPS_TIMEOUT_REQUEST.toLong(),
-					GPS_DIST_REQUEST.toFloat(),
-					gpsListener
-				)
-			} catch (e: IllegalArgumentException) {
-				Log.d(PlatformUtil.TAG, "GPS location provider not available") //$NON-NLS-1$
-			}
 
-			// try to always ask for network provide : it is faster way to find location
-
-			val providers = service.getProviders(true) ?: return
-			for (provider in providers) {
-				if (provider == null || provider == LocationManager.GPS_PROVIDER) {
-					continue
-				}
-				try {
-					val networkListener = NetworkListener()
-					service.requestLocationUpdates(
-						provider,
-						GPS_TIMEOUT_REQUEST.toLong(),
-						GPS_DIST_REQUEST.toFloat(),
-						networkListener
-					)
-					networkListeners.add(networkListener)
-				} catch (e: IllegalArgumentException) {
-					Log.d(
-						PlatformUtil.TAG,
-						"$provider location provider not available"
-					) //$NON-NLS-1$
-				}
-
-			}
-		}
-		*/
-		registerOrUnregisterCompassListener(true)
-	}
-
-	private fun redownloadAGPS() {
-		/*
 		try {
-			val service = app.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-			service.sendExtraCommand(LocationManager.GPS_PROVIDER, "delete_aiding_data", null)
-			val bundle = Bundle()
-			service.sendExtraCommand("gps", "force_xtra_injection", bundle)
-			service.sendExtraCommand("gps", "force_time_injection", bundle)
-			agpsDataLastTimeDownloaded = System.currentTimeMillis()
-		} catch (e: Exception) {
-			agpsDataLastTimeDownloaded = 0L
-			e.printStackTrace()
+			fusedLocationProviderClient?.requestLocationUpdates(
+					locationRequest, locationCallback, Looper.myLooper())
+		} catch (unlikely: SecurityException) {
+			Log.d(PlatformUtil.TAG, "Lost location permissions. Couldn't request updates. $unlikely")
 		}
-		*/
-	}
 
-	private fun getGpsStatusListener(service: LocationManager): GpsStatus.Listener {
-		gpsStatusListener = object : GpsStatus.Listener {
-			private var gpsStatus: GpsStatus? = null
-
-			@SuppressLint("MissingPermission")
-			override fun onGpsStatusChanged(event: Int) {
-				try {
-					gpsStatus = service.getGpsStatus(gpsStatus)
-				} catch (e: Exception) {
-					e.printStackTrace()
-				}
-				updateGPSInfo(gpsStatus)
-				updateLocation(lastKnownLocation)
-			}
-		}
-		return gpsStatusListener!!
-	}
-
-	private fun updateGPSInfo(s: GpsStatus?) {
-		var fixed = false
-		var n = 0
-		var u = 0
-		if (s != null) {
-			val iterator = s.satellites.iterator()
-			while (iterator.hasNext()) {
-				val g = iterator.next()
-				n++
-				if (g.usedInFix()) {
-					u++
-					fixed = true
-				}
-			}
-		}
-		gpsInfo.fixed = fixed
-		gpsInfo.foundSatellites = n
-		gpsInfo.usedSatellites = u
+		registerOrUnregisterCompassListener(true)
 	}
 
 	fun updateScreenOrientation(orientation: Int) {
@@ -219,14 +123,13 @@ class TelegramLocationProvider(private val app: TelegramApplication) : SensorEve
 
 	@Synchronized
 	fun registerOrUnregisterCompassListener(register: Boolean) {
-		/*
 		if (sensorRegistered && !register) {
-			Log.d(PlatformUtil.TAG, "Disable sensor") //$NON-NLS-1$
+			Log.d(PlatformUtil.TAG, "Disable sensor")
 			(app.getSystemService(Context.SENSOR_SERVICE) as SensorManager).unregisterListener(this)
 			sensorRegistered = false
 			heading = null
 		} else if (!sensorRegistered && register) {
-			Log.d(PlatformUtil.TAG, "Enable sensor") //$NON-NLS-1$
+			Log.d(PlatformUtil.TAG, "Enable sensor")
 			val sensorMgr = app.getSystemService(Context.SENSOR_SERVICE) as SensorManager
 			if (useMagneticFieldSensorCompass) {
 				var s: Sensor? = sensorMgr.getDefaultSensor(Sensor.TYPE_ACCELEROMETER)
@@ -260,7 +163,6 @@ class TelegramLocationProvider(private val app: TelegramApplication) : SensorEve
 			}
 			sensorRegistered = true
 		}
-		*/
 	}
 
 	override fun onAccuracyChanged(sensor: Sensor, accuracy: Int) {}
@@ -365,7 +267,7 @@ class TelegramLocationProvider(private val app: TelegramApplication) : SensorEve
 	}
 
 	private fun getAngle(sinA: Float, cosA: Float) = MapUtils.unifyRotationTo360(
-		(Math.atan2(sinA.toDouble(), cosA.toDouble()) * 180 / Math.PI).toFloat()
+		(atan2(sinA.toDouble(), cosA.toDouble()) * 180 / Math.PI).toFloat()
 	)
 
 	private fun updateLocation(loc: net.osmand.Location?) {
@@ -374,34 +276,12 @@ class TelegramLocationProvider(private val app: TelegramApplication) : SensorEve
 		}
 	}
 
-	private fun useOnlyGPS() =
-		System.currentTimeMillis() - lastTimeGPSLocationFixed < NOT_SWITCH_TO_NETWORK_WHEN_GPS_LOST_MS
-
-	// Working with location checkListeners
-	private inner class NetworkListener : LocationListener {
-
-		override fun onLocationChanged(location: Location) {
-			if (!useOnlyGPS()) {
-				setLocation(convertLocation(location))
-			}
-		}
-
-		override fun onProviderDisabled(provider: String) {}
-
-		override fun onProviderEnabled(provider: String) {}
-
-		override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {}
-	}
-
 	private fun stopLocationRequests() {
-		/*
-		val service = app.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-		service.removeGpsStatusListener(gpsStatusListener)
-		service.removeUpdates(gpsListener)
-		while (!networkListeners.isEmpty()) {
-			service.removeUpdates(networkListeners.poll())
+		try {
+			fusedLocationProviderClient?.removeLocationUpdates(locationCallback)
+		} catch (unlikely: SecurityException) {
+			Log.d(PlatformUtil.TAG, "Lost location permissions. Couldn't remove updates. $unlikely")
 		}
-		*/
 	}
 
 	fun pauseAllUpdates() {
@@ -410,17 +290,7 @@ class TelegramLocationProvider(private val app: TelegramApplication) : SensorEve
 	}
 
 	private fun setLocation(location: net.osmand.Location?) {
-		if (location == null) {
-			updateGPSInfo(null)
-		}
-		if (location != null) {
-			if (gpsSignalLost) {
-				gpsSignalLost = false
-			}
-		}
 		this.lastKnownLocation = location
-
-		// Update information
 		updateLocation(this.lastKnownLocation)
 	}
 
@@ -431,21 +301,10 @@ class TelegramLocationProvider(private val app: TelegramApplication) : SensorEve
 		}
 	}
 
-	class GPSInfo {
-		var foundSatellites = 0
-		var usedSatellites = 0
-		var fixed = false
-	}
-
 	companion object {
 
 		private const val INTERVAL_TO_CLEAR_SET_LOCATION = 30 * 1000
 
-		private const val GPS_TIMEOUT_REQUEST = 0
-		private const val GPS_DIST_REQUEST = 0
-		private const val NOT_SWITCH_TO_NETWORK_WHEN_GPS_LOST_MS = 12000
-		private const val AGPS_TO_REDOWNLOAD = 16L * 60 * 60 * 1000 // 16 hours
-
 		fun convertLocation(l: Location?): net.osmand.Location? {
 			if (l == null) {
 				return null

OsmAnd-telegram/src/net/osmand/telegram/TelegramService.kt

@@ -4,30 +4,27 @@ import android.annotation.SuppressLint
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.content.pm.ServiceInfo
 import android.location.Location
-import android.location.LocationListener
-import android.location.LocationManager
 import android.os.*
+import android.util.Log
 import android.widget.Toast
+import com.google.android.gms.location.*
 import net.osmand.PlatformUtil
 import net.osmand.telegram.TelegramSettings.ShareChatInfo
 import net.osmand.telegram.helpers.TelegramHelper
-import net.osmand.telegram.helpers.TelegramHelper.*
+import net.osmand.telegram.helpers.TelegramHelper.TelegramIncomingMessagesListener
+import net.osmand.telegram.helpers.TelegramHelper.TelegramOutgoingMessagesListener
 import net.osmand.telegram.notifications.TelegramNotification.NotificationType
 import net.osmand.telegram.utils.AndroidUtils
 import org.drinkless.td.libcore.telegram.TdApi
-import java.util.*
 
 private const val UPDATE_WIDGET_INTERVAL_MS = 1000L // 1 sec
 private const val UPDATE_LIVE_MESSAGES_INTERVAL_MS = 10000L // 10 sec
 private const val UPDATE_LIVE_TRACKS_INTERVAL_MS = 30000L // 30 sec
 
-class TelegramService : Service(), LocationListener, TelegramIncomingMessagesListener,
+class TelegramService : Service(), TelegramIncomingMessagesListener,
 		TelegramOutgoingMessagesListener {
-
-	private val log = PlatformUtil.getLog(TelegramService::class.java)
-
+	
 	private fun app() = application as TelegramApplication
 	private val binder = LocationServiceBinder()
 	private var shouldCleanupResources: Boolean = false
@@ -41,10 +38,18 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
 	private var updateWidgetHandler: Handler? = null
 	private var updateWidgetThread = HandlerThread("WidgetUpdateServiceThread")
 
+	// FusedLocationProviderClient - Main class for receiving location updates.
+	private lateinit var fusedLocationProviderClient: FusedLocationProviderClient
+
+	// LocationRequest - Requirements for the location updates, i.e., how often you should receive
+	// updates, the priority, etc.
+	private lateinit var locationRequest: LocationRequest
+
+	// LocationCallback - Called when FusedLocationProviderClient has a new Location.
+	private lateinit var locationCallback: LocationCallback
+
 	var usedBy = 0
 		private set
-	var serviceOffProvider: String = LocationManager.GPS_PROVIDER
-		private set
 	var sendLocationInterval = 0L
 		private set
 
@@ -60,6 +65,42 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
 		updateShareInfoHandler = Handler(mHandlerThread.looper)
 		updateTracksHandler = Handler(tracksHandlerThread.looper)
 		updateWidgetHandler = Handler(updateWidgetThread.looper)
+
+		fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(this)
+
+		locationRequest = LocationRequest().apply {
+			// Sets the desired interval for active location updates. This interval is inexact. You
+			// may not receive updates at all if no location sources are available, or you may
+			// receive them less frequently than requested. You may also receive updates more
+			// frequently than requested if other applications are requesting location at a more
+			// frequent interval.
+			//
+			// IMPORTANT NOTE: Apps running on Android 8.0 and higher devices (regardless of
+			// targetSdkVersion) may receive updates less frequently than this interval when the app
+			// is no longer in the foreground.
+			interval = 1000
+
+			// Sets the fastest rate for active location updates. This interval is exact, and your
+			// application will never receive updates more frequently than this value.
+			fastestInterval = 500
+
+			// Sets the maximum time when batched location updates are delivered. Updates may be
+			// delivered sooner than this interval.
+			maxWaitTime = 2000
+
+			priority = LocationRequest.PRIORITY_HIGH_ACCURACY
+		}
+
+		locationCallback = object : LocationCallback() {
+			override fun onLocationResult(locationResult: LocationResult?) {
+				super.onLocationResult(locationResult)
+				val location = convertLocation(locationResult?.lastLocation)
+				if (System.currentTimeMillis() - lastLocationSentTime > sendLocationInterval * 1000) {
+					lastLocationSentTime = System.currentTimeMillis()
+					app().shareLocationHelper.updateLocation(location)
+				}
+			}
+		}
 	}
 
 	override fun onBind(intent: Intent): IBinder {
@@ -144,27 +185,27 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
 	}
 
 	fun forceLocationUpdate() {
-		val location = getFirstTimeRunDefaultLocation()
-		app().shareLocationHelper.updateLocation(location)
+		getFirstTimeRunDefaultLocation { location ->
+			app().shareLocationHelper.updateLocation(location)
+		}
 	}
 
 	private fun initLocationUpdates() {
-		val firstLocation = getFirstTimeRunDefaultLocation()
-		app().shareLocationHelper.updateLocation(firstLocation)
+		getFirstTimeRunDefaultLocation { location ->
+			app().shareLocationHelper.updateLocation(location)
+		}
 
 		// request location updates
-		/*
-		val locationManager = getSystemService(Context.LOCATION_SERVICE) as LocationManager
 		try {
-			locationManager.requestLocationUpdates(serviceOffProvider, 0, 0f, this@TelegramService)
-		} catch (e: SecurityException) {
+			fusedLocationProviderClient.requestLocationUpdates(
+					locationRequest, locationCallback, Looper.myLooper())
+		} catch (unlikely: SecurityException) {
 			Toast.makeText(this, R.string.no_location_permission, Toast.LENGTH_LONG).show()
-			log.debug("Location service permission not granted")
+			Log.d(PlatformUtil.TAG, "Lost location permissions. Couldn't request updates. $unlikely")
 		} catch (e: IllegalArgumentException) {
 			Toast.makeText(this, R.string.gps_not_available, Toast.LENGTH_LONG).show()
-			log.debug("GPS location provider not available")
+			Log.d(PlatformUtil.TAG, "GPS location provider not available")
 		}
-		*/
 	}
 
 	private fun startShareInfoUpdates() {
@@ -219,62 +260,27 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
 	}
 
 	@SuppressLint("MissingPermission")
-	private fun getFirstTimeRunDefaultLocation(): net.osmand.Location? {
+	private fun getFirstTimeRunDefaultLocation(locationListener: (net.osmand.Location?) -> Unit) {
 		val app = app()
 		if (!AndroidUtils.isLocationPermissionAvailable(app)) {
-			return null
+			locationListener(null)
+			return
 		}
-		var location: net.osmand.Location? = null
-		/*
-		val service = app.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-		val ps = service.getProviders(true) ?: return null
-		val providers = ArrayList(ps)
-		// note, passive provider is from API_LEVEL 8 but it is a constant, we can check for it.
-		// constant should not be changed in future
-		val passiveFirst = providers.indexOf("passive") // LocationManager.PASSIVE_PROVIDER
-		// put passive provider to first place
-		if (passiveFirst > -1) {
-			providers.add(0, providers.removeAt(passiveFirst))
-		}
-		// find location
-		for (provider in providers) {
-			val loc = convertLocation(service.getLastKnownLocation(provider))
-			if (loc != null && (location == null || loc.hasAccuracy() && loc.accuracy < location.accuracy)) {
-				location = loc
-			}
-		}
-		*/
-		return location
+		fusedLocationProviderClient.lastLocation
+				.addOnSuccessListener { location : Location? ->
+					locationListener(convertLocation(location))
+				}
 	}
 
 	private fun removeLocationUpdates() {
 		// remove updates
-		/*
-		val locationManager = getSystemService(Context.LOCATION_SERVICE) as LocationManager
 		try {
-			locationManager.removeUpdates(this)
-		} catch (e: SecurityException) {
-			log.debug("Location service permission not granted")
-		}
-		*/
-	}
-
-	override fun onLocationChanged(l: Location?) {
-		val location = convertLocation(l)
-		if (System.currentTimeMillis() - lastLocationSentTime > sendLocationInterval * 1000) {
-			lastLocationSentTime = System.currentTimeMillis()
-			app().shareLocationHelper.updateLocation(location)
+			fusedLocationProviderClient.removeLocationUpdates(locationCallback)
+		} catch (unlikely: SecurityException) {
+			Log.d(PlatformUtil.TAG, "Lost location permissions. Couldn't remove updates. $unlikely")
 		}
 	}
 
-	override fun onProviderDisabled(provider: String) {
-		Toast.makeText(this, getString(R.string.location_service_no_gps_available), Toast.LENGTH_LONG).show()
-	}
-
-	override fun onProviderEnabled(provider: String) {}
-
-	override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {}
-
 	override fun onTaskRemoved(rootIntent: Intent) {
 		val app = app()
 		if (app.telegramService != null) {
@@ -316,7 +322,7 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
 	}
 
 	override fun onSendLiveLocationError(code: Int, message: String, shareInfo: ShareChatInfo, messageType: Int) {
-		log.debug("Send live location error: $code - $message")
+		Log.d(PlatformUtil.TAG, "Send live location error: $code - $message")
 		when (messageType) {
 			TelegramHelper.MESSAGE_TYPE_TEXT -> shareInfo.pendingTdLibText--
 			TelegramHelper.MESSAGE_TYPE_MAP -> {

OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt

@@ -1,7 +1,6 @@
 package net.osmand.telegram
 
 import android.content.Context
-import android.location.LocationManager
 import android.text.SpannableStringBuilder
 import android.text.style.ForegroundColorSpan
 import androidx.annotation.ColorRes
@@ -505,7 +504,6 @@ class TelegramSettings(private val app: TelegramApplication) {
 			val currentTimeMillis = System.currentTimeMillis()
 			val currentTime = currentTimeMillis / 1000
 			statusChangeTime = currentTimeMillis
-			val gpsEnabled = false
 			/*
 			val lm = app.getSystemService(Context.LOCATION_SERVICE) as LocationManager
 			val gpsEnabled = try {
@@ -521,6 +519,14 @@ class TelegramSettings(private val app: TelegramApplication) {
 				false
 			}
 			*/
+			val gpsEnabled = try {
+					val loc = app.locationProvider.lastKnownLocation
+					val gpsActive = loc != null && ((currentTimeMillis - loc.time) / 1000) < GPS_UPDATE_EXPIRED_TIME
+					val lastSentLocationExpired = ((currentTimeMillis - app.shareLocationHelper.lastLocationUpdateTime) / 1000) > GPS_UPDATE_EXPIRED_TIME
+					(gpsActive || !lastSentLocationExpired)
+			} catch (ex: Exception) {
+				false
+			}
 
 			var initializing = false
 			var sendChatsErrors = false

OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt

@@ -447,8 +447,10 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 	}
 	
 	private fun runOnUi(action: (() -> Unit)) {
-		if (!paused) {
-			runOnUiThread(action)
+		runOnUiThread {
+			if (!paused) {
+				action()
+			}
 		}
 	}
 

OsmAnd/AndroidManifest-nightlyFree.xml

@@ -10,7 +10,7 @@
             android:value="fb792288460976727"/>
         <activity
             android:name="net.osmand.plus.activities.MapActivity"
-            android:theme="@style/FirstSplashScreenFreeDev"
+            android:theme="@style/FirstSplashScreenNightlyFree"
             tools:replace="android:theme"/>
         <service
             android:name="net.osmand.plus.NavigationService"

OsmAnd/build-common.gradle

@@ -1,6 +1,3 @@
-apply plugin: 'com.android.library'
-apply plugin: 'ivy-publish'
-
 task printc {
 	configurations.each { if(it.isCanBeResolved())  println it.name }
 }
@@ -11,21 +8,29 @@ android {
 	// compileNdkVersion "android-ndk-r17b"
 
 	defaultConfig {
-		minSdkVersion 15
 		targetSdkVersion 29
 		multiDexEnabled true
 		vectorDrawables.useSupportLibrary = true
 	}
 
 	lintOptions {
-		tasks.lint.enabled = false
 		abortOnError false
 	}
 
+	// related to kuromoji
+	//packagingOptions {
+	//	exclude '/META-INF/CONTRIBUTORS.md'
+	//	exclude '/META-INF/LICENSE.md'
+	//	exclude '/META-INF/NOTICE.md'
+	//}
+
+	// This is from OsmAndCore_android.aar - for some reason it's not inherited
 	aaptOptions {
 		// Don't compress any embedded resources
 		noCompress "qz"
 		cruncherEnabled = false
+		// Flag notifies aapt to keep the attribute IDs around
+		// additionalParameters "--no-version-vectors"
 	}
 
 	dexOptions {
@@ -34,11 +39,11 @@ android {
 
 	sourceSets {
 		main {
-			manifest.srcFile "AndroidManifest-library.xml"
+			manifest.srcFile "AndroidManifest.xml"
 			jni.srcDirs = []
 			jniLibs.srcDirs = ["libs"]
 			aidl.srcDirs = ["src"]
-			java.srcDirs = ["src", "src-google"]
+			java.srcDirs = ["src"]
 			resources.srcDirs = ["src"]
 			renderscript.srcDirs = ["src"]
 			res.srcDirs = ["res"]
@@ -85,7 +90,7 @@ android {
 		}
 
 		// CoreVersion
-        // Build that doesn't include 3D OpenGL
+		// Build that doesn't include 3D OpenGL
 		legacy {
 			dimension "coreversion"
 		}
@@ -95,20 +100,12 @@ android {
 		debug {
 			debuggable true
 		}
-
 		release {
 			debuggable false
 		}
 	}
 }
 
-def replaceNoTranslate(line) {
-	if (line.contains("\"versionFeatures\"")) {
-		return line.replaceAll(">[^<]*<", ">" + "" + "<")
-	}
-	return line;
-}
-
 task updateNoTranslate(type: Copy) {
 	from('.') {
 		include 'no_translate.xml'
@@ -130,7 +127,7 @@ task validateTranslate {
 						line.contains("1\$ ") || line.contains("2\$ ") || line.contains("3\$ ") ||
 						line.contains("%1s") || line.contains(" 1\$s") ||
 						(line.contains("% \$") || line.contains("% 1") || line.contains("% 2") ||
-                                line.contains("% 3") || line.contains("% s"))) {
+								line.contains("% 3") || line.contains("% s"))) {
 					throw new GradleException("Incorrect translation " + it.getAbsolutePath() + " " + line);
 				}
 			}
@@ -151,7 +148,7 @@ task collectVoiceAssets(type: Sync) {
 }
 
 task cleanNoTranslate(type: Delete) {
-     delete('res/values/no_translate.xml')
+	delete('res/values/no_translate.xml')
 }
 
 task collectFonts(type: Copy) {
@@ -180,7 +177,7 @@ task collectHelpContentsAssets(type: Copy) {
 		include "*.html"
 	}
 	from("../../help/website/blog_articles") {
-		include "osmand-3-8-released.html"
+		include "osmand-3-9-released.html"
 	}
 	into "assets/feature_articles"
 }
@@ -277,8 +274,6 @@ task collectExternalResources {
 // Legacy core build
 import org.apache.tools.ant.taskdefs.condition.Os
 
-import java.util.regex.Pattern
-
 task buildOsmAndCore(type: Exec) {
 	Gradle gradle = getGradle()
 	String tskReqStr = gradle.getStartParameter().getTaskRequests().toString().toLowerCase()
@@ -297,7 +292,7 @@ task buildOsmAndCore(type: Exec) {
 			flavour = flavour.length() == 0 ? "X86_ONLY" : ""
 		}
 	}
-	
+
 	description "Build Legacy OsmAndCore"
 
 	if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
@@ -325,38 +320,11 @@ task cleanupDuplicatesInCore() {
 	}
 }
 
-afterEvaluate {
-	android.libraryVariants.all { variant ->
-		variant.javaCompiler.dependsOn(collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore)
-	}
-}
-
 task appStart(type: Exec) {
-	// linux 
+	// linux
 	commandLine 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity'
 	// windows
-	// commandLine 'cmd', '/c', 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity'      
-}
-
-project.afterEvaluate {
-	publishing {
-		repositories {
-			ivy {
-				url = System.getenv("OSMAND_BINARIES_IVY_ROOT") ?: "./"
-				version = "0.1-SNAPSHOT"
-			}
-		}
-		publications {
-			aar(IvyPublication) {
-				artifact bundleLegacyFatDebugAar {
-					classifier 'debug'
-				}
-				artifact bundleLegacyFatReleaseAar {
-					classifier 'release'
-				}
-			}
-		}
-	}
+	// commandLine 'cmd', '/c', 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity'
 }
 
 dependencies {
@@ -369,7 +337,7 @@ dependencies {
 	implementation 'com.google.android.material:material:1.2.1'
 	implementation 'androidx.browser:browser:1.0.0'
 	implementation 'androidx.preference:preference:1.1.0'
-	implementation fileTree(include:  ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
+	implementation fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
 
 	implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
 	implementation 'commons-codec:commons-codec:1.11'
@@ -387,28 +355,21 @@ dependencies {
 	// JS core
 	implementation group: 'org.mozilla', name: 'rhino', version: '1.7.9'
 // size restrictions
-// implementation 'com.ibm.icu:icu4j:50.1' 
+// implementation 'com.ibm.icu:icu4j:50.1'
 // implementation 'net.sf.trove4j:trove4j:3.0.3'
 
-//	qtcoreImplementation fileTree(include:  ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
-//	qtcoredebugImplementation fileTree(include:  ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
-
 	legacyImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
-//	qtcoredebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
-//	qtcoredebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
-//	qtcoreImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
-//	qtcoreImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
-	implementation ("com.getkeepsafe.taptargetview:taptargetview:1.12.0"){
+
+	implementation("com.getkeepsafe.taptargetview:taptargetview:1.12.0") {
 		exclude group: 'com.android.support'
 	}
 	implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1'
-	implementation ("com.github.HITGIF:TextFieldBoxes:1.4.5"){
+	implementation("com.github.HITGIF:TextFieldBoxes:1.4.5") {
 		exclude group: 'com.android.support'
 	}
-	implementation('com.github.scribejava:scribejava-apis:7.1.1'){
+	implementation('com.github.scribejava:scribejava-apis:7.1.1') {
 		exclude group: "com.fasterxml.jackson.core"
 	}
 	implementation 'com.jaredrummler:colorpicker:1.1.0'
-
 	implementation 'org.bouncycastle:bcpkix-jdk15on:1.56'
-}
+}

OsmAnd/build-library.gradle

@@ -0,0 +1,64 @@
+apply plugin: 'com.android.library'
+apply plugin: 'ivy-publish'
+apply from: 'build-common.gradle'
+
+android {
+
+	defaultConfig {
+		minSdkVersion 15
+	}
+
+	lintOptions {
+		tasks.lint.enabled = false
+	}
+
+	sourceSets {
+		main {
+			manifest.srcFile "AndroidManifest-library.xml"
+			java.srcDirs = ["src", "src-gms", "src-google"]
+		}
+	}
+
+	productFlavors {
+		// CoreVersion
+		// Build that doesn't include 3D OpenGL
+		legacy {
+			dimension "coreversion"
+		}
+	}
+}
+
+def replaceNoTranslate(line) {
+	return line;
+}
+
+afterEvaluate {
+	android.libraryVariants.all { variant ->
+		variant.javaCompiler.dependsOn(collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore)
+	}
+}
+
+project.afterEvaluate {
+	publishing {
+		repositories {
+			ivy {
+				url = System.getenv("OSMAND_BINARIES_IVY_ROOT") ?: "./"
+				version = "0.1-SNAPSHOT"
+			}
+		}
+		publications {
+			aar(IvyPublication) {
+				artifact bundleLegacyFatDebugAar {
+					classifier 'debug'
+				}
+				artifact bundleLegacyFatReleaseAar {
+					classifier 'release'
+				}
+			}
+		}
+	}
+}
+
+dependencies {
+	implementation 'com.google.android.gms:play-services-location:17.1.0'
+}

OsmAnd/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
+apply from: 'build-common.gradle'
 
 // Global Parameters accepted
 // TARGET_APP_NAME    - app name
 // APK_NUMBER_VERSION - version number of apk
 // APK_VERSION_SUFFIX - build number like #99999Z, appended (for dev builds) to Manifest's versionName as X.X.X#99999Z
-//                      Z means flavor: M=-master, D=-main-default, B=-Blackberry, Des=-design, MQA=-main-qt-arm, MQDA=-main-qt-default-arm, S=-sherpafy
+//                      Z means flavor: M=-master, D=-main-default, Des=-design, MQA=-main-qt-arm, MQDA=-main-qt-default-arm, S=-sherpafy
 // APP_EDITION        - date stamp of builds
-// APP_FEATURES       - features +play_market +gps_status -parking_plugin -blackberry -free_version -amazon
 
 // 1. To be done Filter fonts
 // <unzip src="OsmAndCore_android.aar" dest=".">
@@ -17,15 +17,7 @@ apply plugin: 'com.android.application'
 //        </unzip>
 // Less important
 
-task printc {
-	configurations.each { if(it.isCanBeResolved())  println it.name }
-}
-
 android {
-	compileSdkVersion 29
-	buildToolsVersion "29.0.3"
-	// compileNdkVersion "android-ndk-r17b"
-
 	signingConfigs {
 		development {
 			storeFile file("../keystores/debug.keystore")
@@ -44,21 +36,15 @@ android {
 
 	defaultConfig {
 		minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 15
-		targetSdkVersion 29
 		versionCode 390
 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
-		multiDexEnabled true
 		versionName "3.9.0"
 		versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
 		versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName
-		// Stops the Gradle plugin’s automatic rasterization of vectors
-		// vectorDrawables.generatedDensities = ['hdpi']
-		vectorDrawables.useSupportLibrary = true
 	}
 
 	lintOptions {
 		lintConfig file("lint.xml")
-		abortOnError false
 		warningsAsErrors false
 	}
 
@@ -79,48 +65,33 @@ android {
 	//	exclude '/META-INF/NOTICE.md'
 	//}
 
-	// This is from OsmAndCore_android.aar - for some reason it's not inherited
-	aaptOptions {
-		// Don't compress any embedded resources
-		noCompress "qz"
-		cruncherEnabled = false
-		// Flag notifies aapt to keep the attribute IDs around
-		// additionalParameters "--no-version-vectors"
-	}
-
-	dexOptions {
-		javaMaxHeapSize "4g"
-	}
-
 	sourceSets {
-		main {
-			manifest.srcFile "AndroidManifest.xml"
-			jni.srcDirs = []
-			jniLibs.srcDirs = ["libs"]
-			aidl.srcDirs = ["src"]
-			java.srcDirs = ["src"]
-			resources.srcDirs = ["src"]
-			renderscript.srcDirs = ["src"]
-			res.srcDirs = ["res"]
-			assets.srcDirs = ["assets"]
-		}
 		debug {
 			manifest.srcFile "AndroidManifest-debug.xml"
 		}
-		full {
-			java.srcDirs = ["src-google"]
+		androidFull {
+			java.srcDirs = ["src-nogms", "src-google"]
 		}
-		free {
-			java.srcDirs = ["src-google"]
-			manifest.srcFile "AndroidManifest-free.xml"
+		gplayFull {
+			java.srcDirs = ["src-gms", "src-google"]
 		}
-		freedev {
-			java.srcDirs = ["src-google"]
-			manifest.srcFile "AndroidManifest-freedev.xml"
+		gplayFree {
+			java.srcDirs = ["src-gms", "src-google"]
+			manifest.srcFile "AndroidManifest-gplayFree.xml"
 		}
-		freehuawei {
-			java.srcDirs = ["src-huawei"]
-			manifest.srcFile "AndroidManifest-freehuawei.xml"
+		nightlyFree {
+			java.srcDirs = ["src-nogms", "src-google"]
+			manifest.srcFile "AndroidManifest-nightlyFree.xml"
+		}
+		amazonFree {
+			java.srcDirs = ["src-nogms", "src-google"]
+		}
+		amazonFull {
+			java.srcDirs = ["src-nogms", "src-google"]
+		}
+		huawei {
+			java.srcDirs = ["src-nogms", "src-google"]
+			manifest.srcFile "AndroidManifest-huawei.xml"
 		}
 
 		legacy {
@@ -130,67 +101,43 @@ android {
 
 	flavorDimensions "version", "coreversion", "abi"
 	productFlavors {
-		// ABI
-		armv7 {
-			dimension "abi"
-			ndk {
-				abiFilter 'armeabi-v7a'
-			}
-		}
-		arm64 {
-			dimension "abi"
-			ndk {
-				abiFilter 'arm64-v8a'
-			}
-		}
-		x86 {
-			dimension "abi"
-			ndk {
-				abiFilters 'x86', 'x86_64'
-			}
-		}
-		armonly {
-			dimension "abi"
-			ndk {
-				abiFilters 'arm64-v8a', 'armeabi-v7a'
-			}
-		}
-		fat {
-			dimension "abi"
-			ndk {
-				abiFilters 'arm64-v8a', 'x86', 'x86_64', 'armeabi-v7a'
-			}
-		}
-
 		// Version
-		freedev {
+		nightlyFree {
 			dimension "version"
 			applicationId "net.osmand.dev"
 			// resConfig "en"
 		}
-		free {
-			dimension "version"
-			applicationId "net.osmand"
-		}
-		full {
+		androidFull {
 			dimension "version"
 			applicationId "net.osmand.plus"
 		}
-		freehuawei {
+		gplayFree {
+			dimension "version"
+			applicationId "net.osmand"
+		}
+		gplayFull {
+			dimension "version"
+			applicationId "net.osmand.plus"
+		}
+		amazonFree {
+			dimension "version"
+			applicationId "net.osmand"
+		}
+		amazonFull {
+			dimension "version"
+			applicationId "net.osmand.plus"
+		}
+		huawei {
 			dimension "version"
 			applicationId "net.osmand.huawei"
 		}
-		// CoreVersion
-        // Build that doesn't include 3D OpenGL
-		legacy {
-			dimension "coreversion"
-		}
+
         // Build that includes 3D OpenGL release
-		qtcore {
+		opengl {
 			dimension "coreversion"
 		}
         // Build that includes 3D OpenGL debug
-		qtcoredebug {
+		opengldebug {
 			dimension "coreversion"
 		}
 	}
@@ -216,226 +163,9 @@ def replaceNoTranslate(line) {
 	if (line.contains("\"app_edition\"") && System.getenv("APP_EDITION")) {
 		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_EDITION") + "<")
 	}
-	if (line.contains("\"versionFeatures\"") && System.getenv("APP_FEATURES")) {
-		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_FEATURES") + "<")
-	}
 	return line;
 }
 
-task updateNoTranslate(type: Copy) {
-	from('.') {
-		include 'no_translate.xml'
-		filter {
-			line -> replaceNoTranslate(line);
-		}
-	}
-	into 'res/values/'
-}
-
-task validateTranslate {
-	println "Validating translations"
-
-	file("res").eachFileRecurse groovy.io.FileType.FILES, {
-		if (it.name == "strings.xml" || it.name == "phrases.xml") {
-			it.eachLine { line ->
-				if (line.contains("\$ s") || line.contains("\$ d") || line.contains("\$ f") ||
-						line.contains(" \$s") || line.contains(" \$d") || line.contains(" \$f") ||
-						line.contains("1\$ ") || line.contains("2\$ ") || line.contains("3\$ ") ||
-						line.contains("%1s") || line.contains(" 1\$s") ||
-						(line.contains("% \$") || line.contains("% 1") || line.contains("% 2") ||
-                                line.contains("% 3") || line.contains("% s"))) {
-					throw new GradleException("Incorrect translation " + it.getAbsolutePath() + " " + line);
-				}
-			}
-		}
-	}
-}
-
-task downloadWorldMiniBasemap {
-	doLast {
-		ant.get(src: 'http://builder.osmand.net/basemap/World_basemap_mini_2.obf', dest: 'assets/World_basemap_mini.obf', skipexisting: 'true')
-	}
-}
-
-task collectVoiceAssets(type: Sync) {
-	from "../../resources/voice"
-	into "assets/voice"
-	include "**/*.js"
-}
-
-task cleanNoTranslate(type: Delete) {
-     delete('res/values/no_translate.xml')
-}
-
-task collectFonts(type: Copy) {
-	from "../../resources/fonts"
-	from "../../resources/rendering_styles/fonts"
-//	from "../../resources/rendering_styles/fonts/OpenSans"
-	into "assets/fonts"
-	include "*.ttf"
-}
-
-task collectHelpContentsStyle(type: Copy) {
-	from("../../help/website/help/") {
-		include "style.css"
-	}
-	into "assets"
-}
-
-task collectHelpContentsAssets(type: Copy) {
-	from("../../help/website/help") {
-		include "about.html"
-		include "changes.html"
-		include "faq.html"
-		include "map-legend.html"
-	}
-	from("../../help/website/feature_articles") {
-		include "*.html"
-	}
-	from("../../help/website/blog_articles") {
-		include "osmand-3-9-released.html"
-	}
-	into "assets/feature_articles"
-}
-
-task copyPoiCategories(type: Copy) {
-	from("../../resources/poi") {
-		include "poi_categories.json"
-	}
-	into "assets"
-}
-
-task copyMapShaderIcons(type: Sync) {
-	// from "../../resources/rendering_styles/style-icons/map-shaders-png"
-	// into "res/"
-	from "../../resources/rendering_styles/style-icons/map-shaders-vector"
-	into "res/drawable"
-	include "**/*.png",  "**/*.xml"
-	preserve {
-		include '**/*'
-		exclude  "**/h_*"
-	}
-}
-
-task copyMapPOIIcons(type: Sync) {
-	from "../../resources/rendering_styles/style-icons/map-icons-vector"
-	into "res/drawable/"
-	// from "../../resources/rendering_styles/style-icons/map-icons-png"
-	// into "res/"
-
-	include "**/*.png",  "**/*.xml"
-	preserve {
-		include '**/*'
-		exclude "**/mm_*"
-	}
-}
-
-task copyLargePOIIcons(type: Sync) {
-	from "../../resources/rendering_styles/style-icons/poi-icons-vector"
-	into "res/drawable/"
-	include "**/*.png",  "**/*.xml"
-	preserve {
-		include '**/*'
-		exclude "**/mx_*"
-	}
-}
-
-task copyWidgetIconsXhdpi(type: Sync) {
-	from "res/drawable-xxhdpi/"
-	into "res/drawable-large-xhdpi/"
-	include "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
-	preserve {
-		include '*'
-		exclude "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
-	}
-}
-
-task copyWidgetIconsHdpi(type: Sync) {
-	from "res/drawable-xhdpi/"
-	into "res/drawable-large-hdpi/"
-	include "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
-	preserve {
-		include '*'
-		exclude "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
-	}
-}
-
-task copyWidgetIcons(type: Sync) {
-	from "res/drawable-hdpi/"
-	into "res/drawable-large/"
-	include "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
-	preserve {
-		include '*'
-		exclude "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
-	}
-}
-
-task collectExternalResources {
-	dependsOn collectVoiceAssets,
-			collectFonts,
-			collectHelpContentsAssets,
-			collectHelpContentsStyle,
-			copyMapShaderIcons,
-			copyMapPOIIcons,
-			copyLargePOIIcons,
-			updateNoTranslate,
-			validateTranslate,
-			copyWidgetIcons,
-			copyWidgetIconsHdpi,
-			copyWidgetIconsXhdpi,
-			copyPoiCategories,
-			downloadWorldMiniBasemap
-}
-
-// Legacy core build
-import org.apache.tools.ant.taskdefs.condition.Os
-
-task buildOsmAndCore(type: Exec) {
-	Gradle gradle = getGradle()
-	String tskReqStr = gradle.getStartParameter().getTaskRequests().toString().toLowerCase()
-	String flavour = "";
-	if(!tskReqStr.contains("fat")) {
-		if(tskReqStr.contains("arm64")) {
-			flavour = flavour.length() == 0 ? "ARM64_ONLY" : ""
-		}
-		if(tskReqStr.contains("armv7")) {
-			flavour = flavour.length() == 0 ? "ARMV7_ONLY" : ""
-		}
-		if(tskReqStr.contains("armonly")) {
-			flavour = flavour.length() == 0 ? "ARM_ONLY" : ""
-		}
-		if(tskReqStr.contains("x86")) {
-			flavour = flavour.length() == 0 ? "X86_ONLY" : ""
-		}
-	}
-	
-	description "Build Legacy OsmAndCore"
-
-	if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
-		if(flavour.length()  > 0) {
-			environment "$flavour", "1"
-		}
-		commandLine "bash", file("./old-ndk-build.sh").getAbsolutePath()
-	} else {
-		commandLine "cmd", "/c", "echo", "Not supported"
-	}
-}
-
-task cleanupDuplicatesInCore() {
-	dependsOn buildOsmAndCore
-	// doesn't work for legacy debug builds
-	doLast {
-		file("libc++/armeabi-v7a").mkdirs()
-		file("libs/armeabi-v7a/libc++_shared.so").renameTo(file("libc++/armeabi-v7a/libc++_shared.so"))
-		file("libc++/arm64-v8a").mkdirs()
-		file("libs/arm64-v8a/libc++_shared.so").renameTo(file("libc++/arm64-v8a/libc++_shared.so"))
-		file("libc++/x86").mkdirs()
-		file("libs/x86/libc++_shared.so").renameTo(file("libc++/x86/libc++_shared.so"))
-		file("libc++/x86_64").mkdirs()
-		file("libs/x86_64/libc++_shared.so").renameTo(file("libc++/x86_64/libc++_shared.so"))
-	}
-}
-
 afterEvaluate {
 	android.applicationVariants.all { variant ->
 		variant.javaCompiler.dependsOn(collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore)
@@ -447,52 +177,14 @@ afterEvaluate {
 	}
 }
 
-task appStart(type: Exec) {
-	// linux 
-	commandLine 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity'
-	// windows
-	// commandLine 'cmd', '/c', 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity'      
-}
-
 dependencies {
-	implementation project(path: ':OsmAnd-java', configuration: 'android')
-	implementation project(':OsmAnd-api')
-	implementation 'androidx.multidex:multidex:2.0.1'
-	implementation 'androidx.gridlayout:gridlayout:1.0.0'
-	implementation 'androidx.cardview:cardview:1.0.0'
-	implementation 'androidx.appcompat:appcompat:1.2.0'
-	implementation 'com.google.android.material:material:1.2.1'
-	implementation 'androidx.browser:browser:1.0.0'
-	implementation 'androidx.preference:preference:1.1.0'
-	implementation fileTree(include:  ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
+	openglImplementation fileTree(include:  ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
+	opengldebugImplementation fileTree(include:  ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
 
-	implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
-	implementation 'commons-codec:commons-codec:1.11'
-	implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'
-	implementation 'org.apache.commons:commons-compress:1.17'
-	implementation 'com.moparisthebest:junidecode:0.1.1'
-	implementation 'org.immutables:gson:2.5.0'
-	implementation 'com.vividsolutions:jts-core:1.14.0'
-	implementation 'com.google.openlocationcode:openlocationcode:1.0.4'
-	implementation 'com.android.billingclient:billing:2.0.3'
-	// turn off for now
-	//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'
-	// JS core
-	implementation group: 'org.mozilla', name: 'rhino', version: '1.7.9'
-// size restrictions
-// implementation 'com.ibm.icu:icu4j:50.1' 
-// implementation 'net.sf.trove4j:trove4j:3.0.3'
-
-	qtcoreImplementation fileTree(include:  ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
-	qtcoredebugImplementation fileTree(include:  ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
-
-	legacyImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
-	qtcoredebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
-	qtcoredebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
-	qtcoreImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
-	qtcoreImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
+	opengldebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
+	opengldebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
+	openglImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
+	openglImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
 	implementation ("com.getkeepsafe.taptargetview:taptargetview:1.12.0"){
 		exclude group: 'com.android.support'
 	}
@@ -504,8 +196,10 @@ dependencies {
 		exclude group: "com.fasterxml.jackson.core"
 	}
 	implementation 'com.jaredrummler:colorpicker:1.1.0'
-
-	freehuaweiImplementation 'com.huawei.hms:iap:5.0.2.300'
-
 	implementation "org.bouncycastle:bcpkix-jdk15on:1.56"
+
+	huaweiImplementation 'com.huawei.hms:iap:5.0.2.300'
+
+	gplayFreeImplementation 'com.google.android.gms:play-services-location:17.1.0'
+	gplayFullImplementation 'com.google.android.gms:play-services-location:17.1.0'
 }

OsmAnd/no_translate.xml

@@ -12,7 +12,6 @@
     <string name="ga_api_key">UA-28342846-2</string>
     <string name="ga_dispatchPeriod">10</string>
     <string name="ga_debug">true</string>
-    <string name="versionFeatures">+play_market -amazon -blackberry</string>
     <string name="openstreetmap_copyright"><a href="https://www.openstreetmap.org/copyright">&#169; OpenStreetMap</a></string>
     <string name="app_edition"></string>
     <string name="support_email">support@osmand.net</string>

OsmAnd/res/drawable/btn_border_active.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+
+	<corners android:radius="4dp" />
+	<solid android:color="?attr/switch_button_active" />
+</shape>

OsmAnd/res/drawable/ic_action_arrow_down_16.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M9,3H7V8H4L8,13L12,8H9V3Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/ic_action_arrow_up_16.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M9,13H7V8H4L8,3L12,8H9V13Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/seekbar_progress_announcement_time.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@+id/background">
+		<shape android:shape="rectangle">
+			<solid android:color="#4d007eb3" />
+			<corners android:radius="30dp" />
+		</shape>
+	</item>
+	<item android:id="@+id/progress">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/color_white" />
+			<corners android:radius="30dp" />
+		</shape>
+	</item>
+</layer-list>

OsmAnd/res/drawable/seekbar_thumb_announcement_time.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+	<item android:id="@+id/thump">
+		<shape android:shape="oval">
+			<size
+				android:width="12dp"
+				android:height="12dp" />
+			<solid android:color="@color/profile_icon_color_blue_light" />
+		</shape>
+	</item>
+</layer-list>

OsmAnd/res/drawable/seekbar_tickmark_announcement_time.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size
+        android:width="2dp"
+        android:height="2dp" />
+    <solid android:color="#17181A" />
+</shape>

OsmAnd/res/layout/bottom_sheet_announcement_time.xml

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:paddingBottom="@dimen/bottom_sheet_exit_button_margin">
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginTop="@dimen/content_padding_small"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:gravity="center_vertical"
+		android:text="@string/announcement_time_title"
+		android:textColor="?android:textColorPrimary"
+		android:textSize="@dimen/default_list_text_size"
+		osmand:typeface="@string/font_roboto_medium" />
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginTop="@dimen/content_padding_half"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:lineSpacingMultiplier="1.1"
+		android:text="@string/announcement_time_descr"
+		android:textColor="?android:textColorSecondary"
+		android:textSize="@dimen/default_desc_text_size"
+		osmand:typeface="@string/font_roboto_regular" />
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/iv_illustration"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginTop="@dimen/content_padding_small"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:adjustViewBounds="true"
+		osmand:srcCompat="?attr/image_help_announcement_time" />
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/tv_seek_bar_label"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginTop="@dimen/content_padding_small"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:textColor="?attr/active_color_basic"
+		android:textSize="@dimen/default_list_text_size"
+		osmand:typeface="@string/font_roboto_medium"
+		tools:text="Normal" />
+
+	<SeekBar
+		android:id="@+id/seek_bar_arrival"
+		style="@style/Widget.AppCompat.SeekBar.Discrete"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/pages_item_margin"
+		android:maxHeight="2dp"
+		android:paddingTop="11dp"
+		android:paddingBottom="11dp"
+		osmand:tickMark="@drawable/seekbar_tickmark_announcement_time"
+		tools:max="3"
+		tools:progress="1" />
+
+	<View
+		android:id="@+id/divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginTop="@dimen/content_padding_small"
+		android:background="?attr/divider_color_basic" />
+
+	<LinearLayout
+		android:id="@+id/description_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/selectableItemBackground"
+		android:orientation="horizontal"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingTop="@dimen/content_padding_small"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:paddingBottom="@dimen/content_padding_small">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@string/announcement_time_intervals"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
+
+		<androidx.appcompat.widget.AppCompatImageView
+			android:id="@+id/iv_arrow"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:tint="?attr/default_icon_color"
+			app:srcCompat="@drawable/ic_action_arrow_down" />
+
+	</LinearLayout>
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/tv_interval_descr"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:lineSpacingMultiplier="@dimen/line_spacing_multiplier_description"
+		android:textSize="@dimen/default_list_text_size"
+		android:visibility="gone"
+		osmand:typeface="@string/font_roboto_regular"
+		tools:text="Turn
+        \n   • Prepare: 315 - 320 m, 110 sec.
+        \n   • Approach: 60 - 65 m, 20 sec.
+        \n   • Passing: 5 - 10 m, 3 sec.
+        \nArrive at destination: 5 - 10 m, 2 sec.
+        \nOff-route: 25 - 30 m, 9 sec.
+        \nTraffic warnings
+        \n   • Approach: 5 - 10 m, 3 sec.
+        \n   • Passing: 15 - 20 m, 4 sec.
+        \nWaypoint / Favourite / POI
+        \n   • Approach: 80 - 85 m, 25 sec
+        \n   • Passing: 20 - 25 m, 7 sec. "
+		tools:visibility="visible" />
+
+</LinearLayout>

OsmAnd/res/layout/bottom_sheet_item_with_descr_64dp.xml

@@ -27,6 +27,8 @@
         android:layout_weight="1"
         android:layout_marginLeft="@dimen/content_padding"
         android:layout_marginStart="@dimen/content_padding"
+        android:paddingTop="@dimen/content_padding_small"
+        android:paddingBottom="@dimen/content_padding_small"
         android:orientation="vertical">
 
         <net.osmand.plus.widgets.TextViewEx
@@ -34,7 +36,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="end"
-            android:maxLines="1"
             android:textColor="?android:textColorPrimary"
             android:textSize="@dimen/default_list_text_size"
             app:typeface="@string/font_roboto_regular"

OsmAnd/res/layout/bottom_sheet_item_with_switch_pad_32.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:gravity="center_vertical"
+	android:minHeight="@dimen/bottom_sheet_list_item_height"
+	android:paddingStart="@dimen/content_padding"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingEnd="@dimen/content_padding"
+	android:paddingRight="@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_marginEnd="@dimen/bottom_sheet_icon_margin_large"
+		android:layout_marginRight="@dimen/bottom_sheet_icon_margin_large"
+		tools:src="@drawable/ic_action_coordinates_latitude" />
+
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_weight="1"
+		android:ellipsize="end"
+		android:maxLines="4"
+		android:textAppearance="@style/TextAppearance.ListItemTitle"
+		tools:text="Some Title" />
+
+	<androidx.appcompat.widget.SwitchCompat
+		android:id="@+id/compound_button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical|end"
+		android:background="@null"
+		android:clickable="false"
+		android:focusable="false"
+		android:focusableInTouchMode="false"
+		android:saveEnabled="false" />
+
+</LinearLayout>

OsmAnd/res/layout/bottom_sheet_with_switch_divider_and_additional_button.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:baselineAligned="false"
+    android:gravity="center_vertical"
+    android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+    android:paddingStart="@dimen/content_padding"
+    android:paddingEnd="@dimen/content_padding"
+    android:paddingRight="@dimen/content_padding"
+    android:paddingLeft="@dimen/content_padding">
+
+    <LinearLayout
+        android:id="@+id/basic_item_body"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:background="?attr/selectableItemBackground">
+
+        <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"
+                android:paddingTop="@dimen/content_padding_small"
+                android:paddingBottom="@dimen/content_padding"
+                android:textAppearance="@style/TextAppearance.ListItemTitle"
+                tools:text="Some title" />
+
+        </LinearLayout>
+
+        <com.google.android.material.switchmaterial.SwitchMaterial
+            android:id="@+id/switch_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/bottom_sheet_content_margin"
+            android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
+            android:layout_marginEnd="@dimen/bottom_sheet_content_margin"
+            android:layout_marginRight="@dimen/bottom_sheet_content_margin"
+            tools:checked="true" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/additional_button"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/content_padding_half"
+            android:layout_marginBottom="@dimen/content_padding_half"
+            android:background="?attr/divider_color_basic" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/icon_after_divider"
+            style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
+            android:layout_width="@dimen/favorites_icon_right_margin"
+            android:layout_height="@dimen/favorites_icon_right_margin"
+            android:layout_gravity="center"
+            android:layout_marginStart="@dimen/content_padding"
+            android:layout_marginLeft="@dimen/content_padding"
+            app:srcCompat="@drawable/ic_action_track_line_bold_color" />
+
+    </LinearLayout>
+
+</LinearLayout>

OsmAnd/res/layout/dialog_edit_gpx_description.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
+	android:background="?attr/card_and_list_background_basic"
+	xmlns:tools="http://schemas.android.com/tools"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/action_bar_height"
+		android:orientation="horizontal">
+
+		<FrameLayout
+			android:id="@+id/btn_close"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginStart="@dimen/card_padding"
+			android:layout_marginLeft="@dimen/card_padding"
+			android:padding="@dimen/context_menu_padding_margin_small"
+			android:paddingStart="@dimen/context_menu_padding_margin_small"
+			android:paddingEnd="@dimen/context_menu_padding_margin_small">
+
+			<androidx.appcompat.widget.AppCompatImageView
+				android:layout_width="@dimen/favorites_icon_size_small"
+				android:layout_height="@dimen/favorites_icon_size_small"
+				android:tint="?attr/default_icon_color"
+				osmand:srcCompat="@drawable/ic_action_close" />
+		</FrameLayout>
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="@dimen/card_content_padding_large"
+			android:layout_marginStart="@dimen/card_content_padding_large"
+			android:layout_weight="1"
+			android:layout_gravity="center_vertical"
+			android:text="@string/context_menu_edit_descr"
+			android:textColor="?attr/searchbar_text"
+			android:textSize="@dimen/dialog_header_text_size"
+			osmand:typeface="@string/font_roboto_medium" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/btn_save"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginRight="@dimen/content_padding_half"
+			android:layout_marginEnd="@dimen/content_padding_half"
+			android:layout_gravity="center_vertical"
+			android:background="@drawable/btn_border_active"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingTop="@dimen/content_padding_half"
+			android:paddingRight="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingBottom="@dimen/content_padding_half"
+			android:text="@string/shared_string_save"
+			android:textColor="?attr/active_color_basic"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium" />
+
+
+	</LinearLayout>
+
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:background="?attr/divider_color" />
+
+	<net.osmand.plus.widgets.EditTextEx
+		android:id="@+id/description"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:background="?attr/card_and_list_background_basic"
+		android:textColor="?android:attr/textColorPrimary"
+		android:textSize="@dimen/default_list_text_size"
+		osmand:typeface="@string/font_roboto_regular"
+		tools:text="Amsterdam is the Netherlands' capital and financial, cultural and creative centre with more than 850,000 inhabitants. Amsterdam is known for the canals that criss-cross the city, its impressive architecture and more than 1,500 bridges. The city has a heritage dating back to the Dutch Golden Age in the 17th century as well as a diverse art scene and a bustling nightlife." />
+
+</LinearLayout>

OsmAnd/res/layout/dialog_read_gpx_description.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/root"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
+	android:background="?attr/list_background_color">
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/pstsTabBackground">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/action_bar_height"
+			app:titleTextColor="?attr/list_background_color" />
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
+
+		<LinearLayout
+			android:id="@+id/ll"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:background="?attr/list_background_color">
+
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/main_image"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:visibility="gone"
+				android:adjustViewBounds="true"
+				tools:visibility="visible"
+				tools:src="@drawable/img_help_announcement_time_day"/>
+
+			<net.osmand.plus.widgets.WebViewEx
+				android:id="@+id/content"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_margin="@dimen/content_padding"
+				android:layout_marginStart="@dimen/content_padding"
+				android:layout_marginEnd="@dimen/content_padding"
+				android:background="@color/color_transparent" />
+
+			<View
+				android:id="@+id/divider"
+				android:layout_width="match_parent"
+				android:layout_height="1dp"
+				android:background="?attr/divider_color"
+				android:visibility="gone"
+				tools:visibility="visible"/>
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/btn_edit"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="@dimen/content_padding"
+				android:layout_marginStart="@dimen/content_padding"
+				android:layout_marginTop="@dimen/context_menu_padding_margin_small"
+				android:layout_marginBottom="@dimen/context_menu_padding_margin_small"
+				android:gravity="center_vertical"
+				android:padding="@dimen/context_menu_padding_margin_small"
+				android:paddingStart="@dimen/context_menu_padding_margin_small"
+				android:paddingEnd="@dimen/context_menu_padding_margin_small"
+				android:drawablePadding="@dimen/list_content_padding_large"
+				osmand:drawableLeftCompat="@drawable/ic_action_edit_dark"
+				osmand:drawableStartCompat="@drawable/ic_action_edit_dark"
+				osmand:drawableTint="?attr/active_color_basic"
+				android:visibility="gone"
+				android:text="@string/shared_string_edit"
+				android:textColor="?attr/active_color_basic"
+				android:textSize="@dimen/default_list_text_size"
+				osmand:typeface="@string/font_roboto_medium"
+				tools:visibility="visible" />
+
+			<FrameLayout
+				android:id="@+id/bottom_empty_space"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/card_row_min_height"
+				android:foreground="@drawable/bg_contextmenu_shadow"
+				android:foregroundGravity="top|fill_horizontal"
+				android:visibility="gone"
+				tools:visibility="visible">
+
+				<View
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:background="?attr/activity_background_basic" />
+			</FrameLayout>
+
+		</LinearLayout>
+
+	</ScrollView>
+
+</LinearLayout>

OsmAnd/res/layout/gpx_description_preview_card.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="?attr/list_background_color">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/activity_background_basic">
+
+        <include layout="@layout/list_item_divider" />
+
+    </FrameLayout>
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginTop="@dimen/content_padding_small"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:text="@string/shared_string_description"
+		android:textColor="?android:textColorSecondary"
+		android:textSize="@dimen/default_desc_text_size"
+		osmand:typeface="@string/font_roboto_medium" />
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/main_image"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/content_padding_small"
+		android:visibility="gone"
+		android:adjustViewBounds="true"
+		tools:visibility="visible"
+		tools:src="@drawable/img_help_announcement_time_day"/>
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/description"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginTop="@dimen/context_menu_padding_margin_small"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:textColor="?android:textColorPrimary"
+		android:textSize="@dimen/default_list_text_size"
+		android:lineSpacingMultiplier="1.1"
+		osmand:typeface="@string/font_roboto_regular"
+		tools:text="Amsterdam is the Netherlands' capital and financial, cultural and creative centre with more than 850,000 inhabitants. Amsterdam is known for the canals that criss-cross the city, its impressive architecture and more than 1,500 bridges. The city has a heritage dating back to the Dutch Golden Age in the 17th century as well as a diverse art scene and a bustling nightlife."/>
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/context_menu_padding_margin_small"
+		android:layout_marginBottom="@dimen/context_menu_padding_margin_small"
+		android:orientation="horizontal">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/btn_read_full"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/context_menu_padding_margin_small"
+			android:layout_marginLeft="@dimen/context_menu_padding_margin_small"
+			android:layout_gravity="start"
+			android:gravity="center_vertical"
+			android:paddingStart="@dimen/bottom_sheet_content_padding_small"
+			android:paddingLeft="@dimen/bottom_sheet_content_padding_small"
+			android:paddingTop="@dimen/bottom_sheet_content_padding_small"
+			android:paddingRight="@dimen/bottom_sheet_content_padding_small"
+			android:paddingEnd="@dimen/bottom_sheet_content_padding_small"
+			android:paddingBottom="@dimen/bottom_sheet_content_padding_small"
+			android:drawablePadding="@dimen/bottom_sheet_content_padding_small"
+			osmand:drawableStartCompat="@drawable/ic_action_read_article"
+			osmand:drawableLeftCompat="@drawable/ic_action_read_article"
+			osmand:drawableTint="?attr/wikivoyage_active_color"
+			android:text="@string/context_menu_read_full"
+			android:textColor="?attr/wikivoyage_active_color"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/btn_edit"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginRight="@dimen/context_menu_padding_margin_small"
+			android:layout_marginEnd="@dimen/context_menu_padding_margin_small"
+			android:layout_gravity="end"
+			android:gravity="center_vertical"
+			android:padding="@dimen/bottom_sheet_content_padding_small"
+			android:paddingStart="@dimen/bottom_sheet_content_padding_small"
+			android:paddingEnd="@dimen/bottom_sheet_content_padding_small"
+			android:drawablePadding="@dimen/bottom_sheet_content_padding_small"
+			osmand:drawableRightCompat="@drawable/ic_action_edit_dark"
+			osmand:drawableEndCompat="@drawable/ic_action_edit_dark"
+			osmand:drawableTint="?attr/wikivoyage_active_color"
+			android:text="@string/shared_string_edit"
+			android:textColor="?attr/wikivoyage_active_color"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium" />
+
+	</FrameLayout>
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/activity_background_basic">
+
+		<include
+			android:id="@+id/shadow"
+			layout="@layout/card_bottom_divider" />
+
+	</FrameLayout>
+
+</LinearLayout>

OsmAnd/res/layout/gpx_item_altitude.xml

@@ -1,368 +1,321 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:osmand="http://schemas.android.com/apk/res-auto"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:background="?attr/bg_color">
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/bg_color"
+	android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+	<com.github.mikephil.charting.charts.LineChart
+		android:id="@+id/chart"
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/list_item_description_width"
+		android:layout_gravity="center_vertical" />
 
-        <com.github.mikephil.charting.charts.LineChart
-            android:id="@+id/chart"
-            android:layout_width="match_parent"
-            android:layout_height="150dp"
-            android:layout_gravity="center_vertical"/>
+	<LinearLayout
+		android:id="@+id/gpx_join_gaps_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/selectableItemBackground"
+		android:minHeight="@dimen/card_row_min_height"
+		android:orientation="horizontal">
 
-        <LinearLayout
-            android:id="@+id/gpx_join_gaps_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:minHeight="@dimen/card_row_min_height"
-            android:orientation="horizontal">
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/gpx_join_gaps_text"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			android:gravity="center_vertical"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:text="@string/join_segments"
+			android:textColor="?android:attr/textColorPrimary"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
 
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/gpx_join_gaps_text"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:paddingLeft="@dimen/content_padding"
-                android:paddingRight="@dimen/content_padding"
-                android:text="@string/join_segments"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_list_text_size"
-                osmand:typeface="@string/font_roboto_regular"
-	            android:paddingStart="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding" />
+		<androidx.appcompat.widget.SwitchCompat
+			android:id="@+id/gpx_join_gaps_switch"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:background="@null"
+			android:clickable="false"
+			android:focusable="false"
+			android:focusableInTouchMode="false"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding" />
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/gpx_join_gaps_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:background="@null"
-                android:clickable="false"
-                android:focusable="false"
-                android:focusableInTouchMode="false"
-                android:paddingLeft="@dimen/content_padding"
-                android:paddingRight="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding"
-	            android:paddingStart="@dimen/content_padding" />
+	</LinearLayout>
 
-        </LinearLayout>
+	<LinearLayout
+		android:id="@+id/average_range"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:paddingTop="@dimen/context_menu_first_line_top_margin"
+		android:paddingBottom="@dimen/content_padding_small">
 
-        <LinearLayout
-            android:id="@+id/average_range"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="13dp"
-            android:paddingBottom="11dp">
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginEnd="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding_small"
+			android:layout_weight="1"
+			android:orientation="horizontal">
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingLeft="16dp"
-	            android:paddingStart="16dp">
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:orientation="vertical">
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/average_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    osmand:srcCompat="@drawable/ic_action_altitude_average"/>
+				<TextView
+					android:id="@+id/average_desc"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:text="@string/average_altitude"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/default_desc_text_size" />
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="18dp"
-	                android:layout_marginStart="18dp">
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/average_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:textColor="?android:attr/textColorPrimary"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="40 m" />
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/average_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        tools:text="40 m"
-                        android:textColor="?android:attr/textColorPrimary"
-                        osmand:typeface="@string/font_roboto_medium"
-                        android:textSize="@dimen/default_desc_text_size"/>
+			</LinearLayout>
 
-                    <TextView
-                        android:id="@+id/average_desc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginTop="3dp"
-                        android:text="@string/average_altitude"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textSize="@dimen/default_sub_text_size"/>
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/average_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/poi_icon_size"
+				android:layout_marginTop="@dimen/subHeaderPadding"
+				osmand:srcCompat="@drawable/ic_action_altitude_average" />
 
-                </LinearLayout>
+		</LinearLayout>
 
-            </LinearLayout>
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/content_padding_small"
+			android:layout_marginLeft="@dimen/content_padding_small"
+			android:layout_marginEnd="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_weight="1"
+			android:orientation="horizontal">
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal"
-                android:paddingLeft="16dp"
-	            android:paddingStart="16dp">
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:orientation="vertical">
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/range_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    osmand:srcCompat="@drawable/ic_action_altitude_average"/>
+				<TextView
+					android:id="@+id/range_desc"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:text="@string/altitude_range"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/default_desc_text_size" />
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="18dp"
-	                android:layout_marginStart="18dp">
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/range_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:textColor="?android:attr/textColorPrimary"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="30m - 53m" />
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/range_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        tools:text="30m - 53m"
-                        android:textColor="?android:attr/textColorPrimary"
-                        osmand:typeface="@string/font_roboto_medium"
-                        android:textSize="@dimen/default_desc_text_size"/>
+			</LinearLayout>
 
-                    <TextView
-                        android:id="@+id/range_desc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginTop="3dp"
-                        android:text="@string/altitude_range"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textSize="@dimen/default_sub_text_size"/>
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/range_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/poi_icon_size"
+				android:layout_marginTop="@dimen/subHeaderPadding"
+				osmand:srcCompat="@drawable/ic_action_altitude_average" />
 
-                </LinearLayout>
+		</LinearLayout>
 
-            </LinearLayout>
+	</LinearLayout>
 
-        </LinearLayout>
+	<LinearLayout
+		android:id="@+id/list_divider"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
 
-        <LinearLayout
-            android:id="@+id/list_divider"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:layout_marginStart="@dimen/content_padding_small"
+			android:layout_marginLeft="@dimen/content_padding_small"
+			android:layout_marginEnd="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding_small"
+			android:background="?attr/dashboard_divider" />
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingLeft="16dp"
-                android:paddingRight="8dp"
-	            android:paddingStart="16dp"
-	            android:paddingEnd="8dp">
+	</LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/dashboard_divider"/>
+	<LinearLayout
+		android:id="@+id/ascent_descent"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:paddingTop="@dimen/context_menu_first_line_top_margin"
+		android:paddingBottom="@dimen/content_padding_small">
 
-            </LinearLayout>
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginEnd="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding_small"
+			android:layout_weight="1"
+			android:orientation="horizontal">
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal"
-                android:paddingLeft="8dp"
-                android:paddingRight="16dp"
-	            android:paddingStart="8dp"
-	            android:paddingEnd="16dp">
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:orientation="vertical">
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/dashboard_divider"/>
+				<TextView
+					android:id="@+id/ascent_desc"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:text="@string/altitude_ascent"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/default_desc_text_size" />
 
-            </LinearLayout>
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/ascent_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:textColor="?android:attr/textColorPrimary"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="174" />
 
-        </LinearLayout>
+			</LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/ascent_descent"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="13dp"
-            android:paddingBottom="11dp">
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/ascent_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/poi_icon_size"
+				android:layout_marginTop="@dimen/subHeaderPadding"
+				osmand:srcCompat="@drawable/ic_action_altitude_ascent" />
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingLeft="16dp"
-	            android:paddingStart="16dp">
+		</LinearLayout>
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/ascent_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    osmand:srcCompat="@drawable/ic_action_altitude_ascent"/>
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginEnd="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding_small"
+			android:layout_weight="1"
+			android:orientation="horizontal">
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="18dp"
-	                android:layout_marginStart="18dp">
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:orientation="vertical">
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/ascent_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        tools:text="174"
-                        android:textColor="?android:attr/textColorPrimary"
-                        osmand:typeface="@string/font_roboto_medium"
-                        android:textSize="@dimen/default_desc_text_size"/>
+				<TextView
+					android:id="@+id/descent_desc"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:text="@string/altitude_descent"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/default_desc_text_size" />
 
-                    <TextView
-                        android:id="@+id/ascent_desc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginTop="3dp"
-                        android:text="@string/altitude_ascent"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textSize="@dimen/default_sub_text_size"/>
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/descent_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:textColor="?android:attr/textColorPrimary"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="164" />
 
-                </LinearLayout>
+			</LinearLayout>
 
-            </LinearLayout>
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/descent_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/poi_icon_size"
+				android:layout_marginTop="@dimen/subHeaderPadding"
+				osmand:srcCompat="@drawable/ic_action_altitude_descent" />
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal"
-                android:paddingLeft="16dp"
-	            android:paddingStart="16dp">
+		</LinearLayout>
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/descent_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    osmand:srcCompat="@drawable/ic_action_altitude_descent"/>
+	</LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="18dp"
-	                android:layout_marginStart="18dp">
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:background="?attr/dashboard_divider" />
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/descent_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        tools:text="164"
-                        android:textColor="?android:attr/textColorPrimary"
-                        osmand:typeface="@string/font_roboto_medium"
-                        android:textSize="@dimen/default_desc_text_size"/>
+	<LinearLayout
+		android:id="@+id/details_view"
+		android:layout_width="match_parent"
+		android:layout_height="48dp"
+		android:gravity="center"
+		android:orientation="horizontal">
 
-                    <TextView
-                        android:id="@+id/descent_desc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginTop="3dp"
-                        android:text="@string/altitude_descent"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textSize="@dimen/default_sub_text_size"/>
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/analyze_on_map"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			android:background="?attr/selectableItemBackground"
+			android:gravity="start|center_vertical"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:text="@string/analyze_on_map"
+			android:textColor="?attr/color_dialog_buttons"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
 
-                </LinearLayout>
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/overflow_menu"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			android:background="?attr/selectableItemBackground"
+			android:gravity="end|center_vertical"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:text="@string/shared_string_options"
+			android:textColor="?attr/color_dialog_buttons"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
 
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dashboard_divider"/>
-
-        <LinearLayout
-            android:id="@+id/details_view"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:orientation="horizontal"
-            android:gravity="center">
-
-            <ImageButton
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:id="@+id/overflow_menu"
-                android:background="@null"
-                android:paddingRight="16dp"
-                android:paddingLeft="16dp"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                tools:src="@drawable/ic_overflow_menu_dark"
-	            android:paddingStart="16dp"
-	            android:paddingEnd="16dp" />
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:background="?attr/selectableItemBackground"
-                android:id="@+id/split_interval"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:gravity="start|center_vertical"
-                android:textColor="?attr/color_dialog_buttons"
-                android:textSize="@dimen/default_sub_text_size"
-                osmand:textAllCapsCompat="true"
-                osmand:typeface="@string/font_roboto_medium"
-                android:text="@string/gpx_split_interval"
-	            android:paddingEnd="16dp"
-	            android:paddingStart="16dp" />
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:background="?attr/selectableItemBackground"
-                android:id="@+id/analyze_on_map"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:gravity="end|center_vertical"
-                android:textColor="?attr/color_dialog_buttons"
-                android:textSize="@dimen/default_sub_text_size"
-                osmand:textAllCapsCompat="true"
-                osmand:typeface="@string/font_roboto_medium"
-                android:text="@string/analyze_on_map"
-	            android:paddingEnd="16dp"
-	            android:paddingStart="16dp" />
-
-        </LinearLayout>
-
-    </LinearLayout>
+	</LinearLayout>
 
 </LinearLayout>

OsmAnd/res/layout/gpx_item_general.xml

@@ -1,386 +1,339 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:osmand="http://schemas.android.com/apk/res-auto"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:background="?attr/bg_color">
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/bg_color"
+	android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+	<com.github.mikephil.charting.charts.LineChart
+		android:id="@+id/chart"
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/list_item_description_width"
+		android:layout_gravity="center_vertical" />
 
-        <com.github.mikephil.charting.charts.LineChart
-            android:id="@+id/chart"
-            android:layout_width="match_parent"
-            android:layout_height="150dp"
-            android:layout_gravity="center_vertical"/>
+	<LinearLayout
+		android:id="@+id/gpx_join_gaps_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/selectableItemBackground"
+		android:minHeight="@dimen/card_row_min_height"
+		android:orientation="horizontal">
 
-        <LinearLayout
-            android:id="@+id/gpx_join_gaps_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:minHeight="@dimen/card_row_min_height"
-            android:orientation="horizontal">
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/gpx_join_gaps_text"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			android:gravity="center_vertical"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:text="@string/join_segments"
+			android:textColor="?android:attr/textColorPrimary"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
 
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/gpx_join_gaps_text"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:paddingLeft="@dimen/content_padding"
-                android:paddingRight="@dimen/content_padding"
-                android:text="@string/join_segments"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_list_text_size"
-                osmand:typeface="@string/font_roboto_regular"
-	            android:paddingStart="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding" />
+		<androidx.appcompat.widget.SwitchCompat
+			android:id="@+id/gpx_join_gaps_switch"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:background="@null"
+			android:clickable="false"
+			android:focusable="false"
+			android:focusableInTouchMode="false"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding" />
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/gpx_join_gaps_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:background="@null"
-                android:clickable="false"
-                android:focusable="false"
-                android:focusableInTouchMode="false"
-                android:paddingLeft="@dimen/content_padding"
-                android:paddingRight="@dimen/content_padding"
-	            android:paddingStart="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding" />
+	</LinearLayout>
 
-        </LinearLayout>
+	<LinearLayout
+		android:id="@+id/distance_time_span"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:paddingTop="@dimen/context_menu_first_line_top_margin"
+		android:paddingBottom="@dimen/content_padding">
 
-        <LinearLayout
-            android:id="@+id/distance_time_span"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="13dp"
-            android:paddingBottom="11dp">
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginEnd="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding_small"
+			android:layout_weight="1"
+			android:orientation="horizontal">
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingLeft="16dp"
-	            android:paddingStart="16dp">
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:orientation="vertical">
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/distance_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    osmand:srcCompat="@drawable/ic_action_polygom_dark"/>
+				<TextView
+					android:id="@+id/distance_desc"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:text="@string/distance"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/default_desc_text_size" />
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="18dp"
-	                android:layout_marginStart="18dp">
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/distance_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:textColor="?android:attr/textColorPrimary"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="40 km" />
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/distance_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        tools:text="40 km"
-                        android:textColor="?android:attr/textColorPrimary"
-                        osmand:typeface="@string/font_roboto_medium"
-                        android:textSize="@dimen/default_desc_text_size"/>
+			</LinearLayout>
 
-                    <TextView
-                        android:id="@+id/distance_desc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginTop="3dp"
-                        android:text="@string/distance"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textSize="@dimen/default_sub_text_size"/>
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/distance_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/poi_icon_size"
+				android:layout_marginTop="@dimen/subHeaderPadding"
+				osmand:srcCompat="@drawable/ic_action_distance_16" />
 
-                </LinearLayout>
+		</LinearLayout>
 
-            </LinearLayout>
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginEnd="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding_small"
+			android:layout_weight="1"
+			android:orientation="horizontal">
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal"
-                android:paddingLeft="16dp"
-	            android:paddingStart="16dp">
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:orientation="vertical">
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/duration_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    osmand:srcCompat="@drawable/ic_action_time_start"/>
+				<TextView
+					android:id="@+id/duration_desc"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:text="@string/shared_string_time_span"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/default_desc_text_size" />
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="18dp"
-	                android:layout_marginStart="18dp">
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/duration_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:textColor="?android:attr/textColorPrimary"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="3:32:44" />
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/duration_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        tools:text="3:32:44"
-                        android:textColor="?android:attr/textColorPrimary"
-                        osmand:typeface="@string/font_roboto_medium"
-                        android:textSize="@dimen/default_desc_text_size"/>
+			</LinearLayout>
 
-                    <TextView
-                        android:id="@+id/duration_desc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginTop="3dp"
-                        android:text="@string/shared_string_time_span"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textSize="@dimen/default_sub_text_size"/>
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/duration_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/poi_icon_size"
+				android:layout_marginTop="@dimen/subHeaderPadding"
+				osmand:srcCompat="@drawable/ic_action_time_span_16" />
 
-                </LinearLayout>
+		</LinearLayout>
 
-            </LinearLayout>
+	</LinearLayout>
 
-        </LinearLayout>
+	<LinearLayout
+		android:id="@+id/list_divider"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
 
-        <LinearLayout
-            android:id="@+id/list_divider"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:layout_marginStart="@dimen/content_padding_small"
+			android:layout_marginLeft="@dimen/content_padding_small"
+			android:layout_marginEnd="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding_small"
+			android:background="?attr/dashboard_divider" />
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingLeft="@dimen/content_padding"
-                android:paddingRight="@dimen/content_padding_half"
-	            android:paddingStart="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding_half">
+	</LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/dashboard_divider"/>
+	<LinearLayout
+		android:id="@+id/start_end_time"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:paddingTop="@dimen/context_menu_first_line_top_margin"
+		android:paddingBottom="@dimen/content_padding_small">
 
-            </LinearLayout>
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginEnd="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding_small"
+			android:layout_weight="1"
+			android:orientation="horizontal">
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal"
-                android:paddingLeft="@dimen/content_padding_half"
-                android:paddingRight="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding"
-	            android:paddingStart="@dimen/content_padding_half">
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:orientation="vertical">
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/dashboard_divider"/>
+				<TextView
+					android:id="@+id/start_time_desc"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:text="@string/shared_string_start_time"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/default_desc_text_size" />
 
-            </LinearLayout>
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/start_time_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:textColor="?android:attr/textColorPrimary"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="15:04:58" />
 
-        </LinearLayout>
+				<TextView
+					android:id="@+id/start_date_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/default_desc_text_size"
+					tools:text="Aug 8, 2016" />
 
-        <LinearLayout
-            android:id="@+id/start_end_time"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="13dp"
-            android:paddingBottom="11dp">
+			</LinearLayout>
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingLeft="@dimen/content_padding"
-	            android:paddingStart="@dimen/content_padding">
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/start_time_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/poi_icon_size"
+				android:layout_marginTop="@dimen/subHeaderPadding"
+				osmand:srcCompat="@drawable/ic_action_time_start_16" />
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/start_time_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    osmand:srcCompat="@drawable/ic_action_time_start"/>
+		</LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="18dp"
-	                android:layout_marginStart="18dp">
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginEnd="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding_small"
+			android:layout_weight="1"
+			android:orientation="horizontal">
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/start_time_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        tools:text="15:04:58"
-                        android:textColor="?android:attr/textColorPrimary"
-                        osmand:typeface="@string/font_roboto_medium"
-                        android:textSize="@dimen/default_desc_text_size"/>
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:orientation="vertical">
 
-                    <TextView
-                        android:id="@+id/start_date_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        tools:text="Aug 8, 2016"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textSize="@dimen/default_desc_text_size"/>
+				<TextView
+					android:id="@+id/end_time_desc"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:text="@string/shared_string_end_time"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/default_desc_text_size" />
 
-                    <TextView
-                        android:id="@+id/start_time_desc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginTop="@dimen/content_padding_half"
-                        android:text="@string/shared_string_start_time"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textSize="@dimen/default_sub_text_size"/>
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/end_time_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:textColor="?android:attr/textColorPrimary"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="20:58:00" />
 
-                </LinearLayout>
+				<TextView
+					android:id="@+id/end_date_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/default_desc_text_size"
+					tools:text="Aug 8, 2016" />
 
-            </LinearLayout>
+			</LinearLayout>
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal"
-                android:paddingLeft="@dimen/content_padding"
-	            android:paddingStart="@dimen/content_padding">
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/end_time_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/poi_icon_size"
+				android:layout_marginTop="@dimen/subHeaderPadding"
+				osmand:srcCompat="@drawable/ic_action_time_end_16" />
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/end_time_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    osmand:srcCompat="@drawable/ic_action_time_start"/>
+		</LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="18dp"
-	                android:layout_marginStart="18dp">
+	</LinearLayout>
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/end_time_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        tools:text="20:58:00"
-                        android:textColor="?android:attr/textColorPrimary"
-                        osmand:typeface="@string/font_roboto_medium"
-                        android:textSize="@dimen/default_desc_text_size"/>
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:background="?attr/dashboard_divider" />
 
-                    <TextView
-                        android:id="@+id/end_date_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        tools:text="Aug 8, 2016"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textSize="@dimen/default_desc_text_size"/>
+	<LinearLayout
+		android:id="@+id/details_view"
+		android:layout_width="match_parent"
+		android:layout_height="48dp"
+		android:gravity="center"
+		android:orientation="horizontal">
 
-                    <TextView
-                        android:id="@+id/end_time_desc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginTop="@dimen/content_padding_half"
-                        android:text="@string/shared_string_end_time"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textSize="@dimen/default_sub_text_size"/>
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/analyze_on_map"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			android:background="?attr/selectableItemBackground"
+			android:gravity="start|center_vertical"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:text="@string/analyze_on_map"
+			android:textColor="?attr/color_dialog_buttons"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
 
-                </LinearLayout>
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/overflow_menu"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			android:background="?attr/selectableItemBackground"
+			android:gravity="end|center_vertical"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:text="@string/shared_string_options"
+			android:textColor="?attr/color_dialog_buttons"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
 
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dashboard_divider"/>
-
-        <LinearLayout
-            android:id="@+id/details_view"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:orientation="horizontal"
-            android:gravity="center">
-
-            <ImageButton
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:id="@+id/overflow_menu"
-                android:background="@null"
-                android:paddingRight="@dimen/content_padding"
-                android:paddingLeft="@dimen/content_padding"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                tools:src="@drawable/ic_overflow_menu_dark"
-	            android:paddingStart="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding" />
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:background="?attr/selectableItemBackground"
-                android:id="@+id/split_interval"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:paddingLeft="@dimen/content_padding"
-                android:paddingRight="@dimen/content_padding"
-                android:gravity="start|center_vertical"
-                android:textColor="?attr/color_dialog_buttons"
-                android:textSize="@dimen/default_sub_text_size"
-                osmand:textAllCapsCompat="true"
-                osmand:typeface="@string/font_roboto_medium"
-                android:text="@string/gpx_split_interval"
-	            android:paddingEnd="@dimen/content_padding"
-	            android:paddingStart="@dimen/content_padding" />
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:background="?attr/selectableItemBackground"
-                android:id="@+id/analyze_on_map"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:paddingLeft="@dimen/content_padding"
-                android:paddingRight="@dimen/content_padding"
-                android:gravity="end|center_vertical"
-                android:textColor="?attr/color_dialog_buttons"
-                android:textSize="@dimen/default_sub_text_size"
-                osmand:textAllCapsCompat="true"
-                osmand:typeface="@string/font_roboto_medium"
-                android:text="@string/analyze_on_map"
-	            android:paddingEnd="@dimen/content_padding"
-	            android:paddingStart="@dimen/content_padding" />
-
-        </LinearLayout>
-
-    </LinearLayout>
+	</LinearLayout>
 
 </LinearLayout>

OsmAnd/res/layout/gpx_item_speed.xml

@@ -1,368 +1,323 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:osmand="http://schemas.android.com/apk/res-auto"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:background="?attr/bg_color">
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/bg_color"
+	android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+	<com.github.mikephil.charting.charts.LineChart
+		android:id="@+id/chart"
+		android:layout_width="match_parent"
+		android:layout_height="150dp"
+		android:layout_gravity="center_vertical" />
 
-        <com.github.mikephil.charting.charts.LineChart
-            android:id="@+id/chart"
-            android:layout_width="match_parent"
-            android:layout_height="150dp"
-            android:layout_gravity="center_vertical"/>
+	<LinearLayout
+		android:id="@+id/gpx_join_gaps_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/selectableItemBackground"
+		android:minHeight="@dimen/card_row_min_height"
+		android:orientation="horizontal">
 
-        <LinearLayout
-            android:id="@+id/gpx_join_gaps_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:minHeight="@dimen/card_row_min_height"
-            android:orientation="horizontal">
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/gpx_join_gaps_text"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			android:gravity="center_vertical"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:text="@string/join_segments"
+			android:textColor="?android:attr/textColorPrimary"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
 
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/gpx_join_gaps_text"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:paddingLeft="@dimen/content_padding"
-                android:paddingRight="@dimen/content_padding"
-                android:text="@string/join_segments"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_list_text_size"
-                osmand:typeface="@string/font_roboto_regular"
-	            android:paddingStart="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding" />
+		<androidx.appcompat.widget.SwitchCompat
+			android:id="@+id/gpx_join_gaps_switch"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:background="@null"
+			android:clickable="false"
+			android:focusable="false"
+			android:focusableInTouchMode="false"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding" />
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/gpx_join_gaps_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:background="@null"
-                android:clickable="false"
-                android:focusable="false"
-                android:focusableInTouchMode="false"
-                android:paddingLeft="@dimen/content_padding"
-                android:paddingRight="@dimen/content_padding"
-	            android:paddingStart="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding" />
+	</LinearLayout>
 
-        </LinearLayout>
+	<LinearLayout
+		android:id="@+id/average_max"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:paddingTop="13dp"
+		android:paddingBottom="11dp">
 
-        <LinearLayout
-            android:id="@+id/average_max"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="13dp"
-            android:paddingBottom="11dp">
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginEnd="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding_small"
+			android:layout_weight="1"
+			android:orientation="horizontal">
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingLeft="@dimen/content_padding"
-	            android:paddingStart="@dimen/content_padding">
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:orientation="vertical">
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/average_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    osmand:srcCompat="@drawable/ic_action_speed"/>
+				<TextView
+					android:id="@+id/average_desc"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:text="@string/average_speed"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/default_desc_text_size" />
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="18dp"
-	                android:layout_marginStart="18dp">
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/average_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:textColor="?android:attr/textColorPrimary"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="6.8 km/h" />
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/average_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        tools:text="6.8 km/h"
-                        android:textColor="?android:attr/textColorPrimary"
-                        osmand:typeface="@string/font_roboto_medium"
-                        android:textSize="@dimen/default_desc_text_size"/>
+			</LinearLayout>
 
-                    <TextView
-                        android:id="@+id/average_desc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginTop="3dp"
-                        android:text="@string/average_speed"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textSize="@dimen/default_sub_text_size"/>
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/average_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/poi_icon_size"
+				android:layout_marginTop="2dp"
+				osmand:srcCompat="@drawable/ic_action_speed" />
 
-                </LinearLayout>
+		</LinearLayout>
 
-            </LinearLayout>
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/content_padding_small"
+			android:layout_marginLeft="@dimen/content_padding_small"
+			android:layout_marginEnd="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_weight="1"
+			android:orientation="horizontal">
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal"
-                android:paddingLeft="@dimen/content_padding"
-	            android:paddingStart="@dimen/content_padding">
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:orientation="vertical">
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/max_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    osmand:srcCompat="@drawable/ic_action_max_speed"/>
+				<TextView
+					android:id="@+id/max_desc"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:text="@string/max_speed"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/default_desc_text_size" />
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="18dp"
-	                android:layout_marginStart="18dp">
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/max_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:textColor="?android:attr/textColorPrimary"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="31.3 km/h" />
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/max_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        tools:text="31.3 km/h"
-                        android:textColor="?android:attr/textColorPrimary"
-                        osmand:typeface="@string/font_roboto_medium"
-                        android:textSize="@dimen/default_desc_text_size"/>
+			</LinearLayout>
 
-                    <TextView
-                        android:id="@+id/max_desc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginTop="3dp"
-                        android:text="@string/max_speed"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textSize="@dimen/default_sub_text_size"/>
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/max_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/poi_icon_size"
+				android:layout_marginTop="2dp"
+				osmand:srcCompat="@drawable/ic_action_max_speed_16" />
 
-                </LinearLayout>
+		</LinearLayout>
 
-            </LinearLayout>
+	</LinearLayout>
 
-        </LinearLayout>
+	<LinearLayout
+		android:id="@+id/list_divider"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
 
-        <LinearLayout
-            android:id="@+id/list_divider"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:layout_marginStart="@dimen/content_padding_small"
+			android:layout_marginLeft="@dimen/content_padding_small"
+			android:layout_marginEnd="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding_small"
+			android:background="?attr/dashboard_divider" />
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingLeft="@dimen/content_padding"
-                android:paddingRight="@dimen/content_padding_half"
-	            android:paddingStart="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding_half">
+	</LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/dashboard_divider"/>
 
-            </LinearLayout>
+	<LinearLayout
+		android:id="@+id/time_distance"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:paddingTop="13dp"
+		android:paddingBottom="11dp">
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal"
-                android:paddingLeft="@dimen/content_padding_half"
-                android:paddingRight="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding"
-	            android:paddingStart="@dimen/content_padding_half">
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginEnd="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding_small"
+			android:layout_weight="1"
+			android:orientation="horizontal">
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/dashboard_divider"/>
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:orientation="vertical">
 
-            </LinearLayout>
+				<TextView
+					android:id="@+id/time_moving_desc"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:text="@string/shared_string_time_moving"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/default_desc_text_size" />
 
-        </LinearLayout>
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/time_moving_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:textColor="?android:attr/textColorPrimary"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="174" />
 
-        <LinearLayout
-            android:id="@+id/time_distance"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="13dp"
-            android:paddingBottom="11dp">
+			</LinearLayout>
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingLeft="@dimen/content_padding"
-	            android:paddingStart="@dimen/content_padding">
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/time_moving_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/poi_icon_size"
+				android:layout_marginTop="2dp"
+				osmand:srcCompat="@drawable/ic_action_time_span" />
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/time_moving_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    osmand:srcCompat="@drawable/ic_action_time_span"/>
+		</LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="18dp"
-	                android:layout_marginStart="18dp">
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginEnd="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding_small"
+			android:layout_weight="1"
+			android:orientation="horizontal">
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/time_moving_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        tools:text="174"
-                        android:textColor="?android:attr/textColorPrimary"
-                        osmand:typeface="@string/font_roboto_medium"
-                        android:textSize="@dimen/default_desc_text_size"/>
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:orientation="vertical">
 
-                    <TextView
-                        android:id="@+id/time_moving_desc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginTop="3dp"
-                        android:text="@string/shared_string_time_moving"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textSize="@dimen/default_sub_text_size"/>
+				<TextView
+					android:id="@+id/distance_desc"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="3dp"
+					android:background="@null"
+					android:text="@string/distance_moving"
+					android:textColor="?android:attr/textColorSecondary"
+					android:textSize="@dimen/default_desc_text_size" />
 
-                </LinearLayout>
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/distance_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@null"
+					android:textColor="?android:attr/textColorPrimary"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="42 km" />
 
-            </LinearLayout>
+			</LinearLayout>
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal"
-                android:paddingLeft="@dimen/content_padding"
-	            android:paddingStart="@dimen/content_padding">
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/distance_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/poi_icon_size"
+				android:layout_marginTop="5dp"
+				osmand:srcCompat="@drawable/ic_action_polygom_dark" />
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/distance_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    osmand:srcCompat="@drawable/ic_action_polygom_dark"/>
+		</LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginLeft="18dp"
-	                android:layout_marginStart="18dp">
+	</LinearLayout>
 
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/distance_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        tools:text="42 km"
-                        android:textColor="?android:attr/textColorPrimary"
-                        osmand:typeface="@string/font_roboto_medium"
-                        android:textSize="@dimen/default_desc_text_size"/>
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:background="?attr/dashboard_divider" />
 
-                    <TextView
-                        android:id="@+id/distance_desc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginTop="3dp"
-                        android:text="@string/distance_moving"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:textSize="@dimen/default_sub_text_size"/>
+	<LinearLayout
+		android:id="@+id/details_view"
+		android:layout_width="match_parent"
+		android:layout_height="48dp"
+		android:gravity="center"
+		android:orientation="horizontal">
 
-                </LinearLayout>
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/analyze_on_map"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			android:background="?attr/selectableItemBackground"
+			android:gravity="start|center_vertical"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:text="@string/analyze_on_map"
+			android:textColor="?attr/color_dialog_buttons"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
 
-            </LinearLayout>
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/overflow_menu"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			android:background="?attr/selectableItemBackground"
+			android:gravity="end|center_vertical"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:text="@string/shared_string_options"
+			android:textColor="?attr/color_dialog_buttons"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular" />
 
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dashboard_divider"/>
-
-        <LinearLayout
-            android:id="@+id/details_view"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:orientation="horizontal"
-            android:gravity="center">
-
-            <ImageButton
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:id="@+id/overflow_menu"
-                android:background="@null"
-                android:paddingRight="@dimen/content_padding"
-                android:paddingLeft="@dimen/content_padding"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                tools:src="@drawable/ic_overflow_menu_dark"
-	            android:paddingStart="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding" />
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:background="?attr/selectableItemBackground"
-                android:id="@+id/split_interval"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:paddingLeft="@dimen/content_padding"
-                android:paddingRight="@dimen/content_padding"
-                android:gravity="start|center_vertical"
-                android:textColor="?attr/color_dialog_buttons"
-                android:textSize="@dimen/default_sub_text_size"
-                osmand:textAllCapsCompat="true"
-                osmand:typeface="@string/font_roboto_medium"
-                android:text="@string/gpx_split_interval"
-	            android:paddingStart="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding" />
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:background="?attr/selectableItemBackground"
-                android:id="@+id/analyze_on_map"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:paddingLeft="@dimen/content_padding"
-                android:paddingRight="@dimen/content_padding"
-                android:gravity="end|center_vertical"
-                android:textColor="?attr/color_dialog_buttons"
-                android:textSize="@dimen/default_sub_text_size"
-                osmand:textAllCapsCompat="true"
-                osmand:typeface="@string/font_roboto_medium"
-                android:text="@string/analyze_on_map"
-	            android:paddingStart="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding" />
-
-        </LinearLayout>
-
-    </LinearLayout>
+	</LinearLayout>
 
 </LinearLayout>

OsmAnd/res/layout/gpx_overview_fragment.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/recycler_overview"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/content_padding_small_half"
+		android:clipToPadding="false"
+		android:orientation="horizontal"
+		tools:itemCount="4"
+		tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+		tools:listitem="@layout/item_gpx_stat_block" />
+
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:gravity="center"
+		android:orientation="horizontal"
+		android:paddingTop="@dimen/dash_margin"
+		android:paddingBottom="@dimen/dash_margin">
+
+		<androidx.appcompat.widget.AppCompatImageView
+			android:id="@+id/direction"
+			android:layout_width="@dimen/context_menu_transport_icon_size"
+			android:layout_height="@dimen/context_menu_transport_icon_size"
+			osmand:srcCompat="@drawable/ic_direction_arrow" />
+
+		<TextView
+			android:id="@+id/distance"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/content_padding_small_half"
+			android:layout_marginLeft="@dimen/content_padding_small_half"
+			android:maxLines="1"
+			android:textColor="?android:textColorSecondary"
+			android:textSize="@dimen/default_desc_text_size"
+			tools:text="300 km" />
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginTop="@dimen/content_padding_half"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_marginBottom="@dimen/content_padding"
+		android:orientation="horizontal"
+		android:weightSum="4">
+		<!-- todo stretch buttons correctly -->
+
+		<include
+			android:id="@+id/show_button"
+			layout="@layout/item_gpx_action"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" />
+
+		<Space
+			android:layout_width="@dimen/content_padding_half"
+			android:layout_height="match_parent" />
+
+		<include
+			android:id="@+id/appearance_button"
+			layout="@layout/item_gpx_action"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" />
+
+		<Space
+			android:layout_width="@dimen/content_padding_half"
+			android:layout_height="match_parent" />
+
+		<include
+			android:id="@+id/edit_button"
+			layout="@layout/item_gpx_action"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" />
+
+		<Space
+			android:layout_width="@dimen/content_padding_half"
+			android:layout_height="match_parent" />
+
+		<include
+			android:id="@+id/directions_button"
+			layout="@layout/item_gpx_action"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" />
+
+	</LinearLayout>
+
+</LinearLayout>

OsmAnd/res/layout/item_gpx_action.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/filled"
+		android:layout_width="@dimen/fab_recycler_view_padding_bottom"
+		android:layout_height="@dimen/setting_list_item_small_height"
+		tools:alpha="0.1"
+		tools:srcCompat="@drawable/bg_topbar_shield_exit_ref" />
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/image"
+		android:layout_width="@dimen/standard_icon_size"
+		android:layout_height="@dimen/standard_icon_size"
+		android:layout_gravity="center"
+		tools:srcCompat="@drawable/ic_action_hide" />
+
+</FrameLayout>

OsmAnd/res/layout/item_gpx_stat_block.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/value"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:background="@null"
+			android:textColor="?android:attr/textColorPrimary"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:text="700 km" />
+
+		<androidx.appcompat.widget.AppCompatImageView
+			android:id="@+id/image"
+			android:layout_width="@dimen/context_menu_transport_icon_size"
+			android:layout_height="@dimen/context_menu_transport_icon_size"
+			android:layout_gravity="center_vertical"
+			android:layout_marginStart="@dimen/context_menu_first_line_top_margin"
+			android:layout_marginLeft="@dimen/context_menu_first_line_top_margin"
+			tools:src="@drawable/ic_action_track_16" />
+
+	</LinearLayout>
+
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="@null"
+		android:textColor="?android:attr/textColorSecondary"
+		android:textSize="@dimen/default_desc_text_size"
+		tools:text="@string/distance" />
+
+</LinearLayout>

OsmAnd/res/layout/online_routing_engine_fragment.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/list_background_color"
-    android:orientation="vertical">
+    android:background="?attr/list_background_color">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
@@ -15,21 +14,41 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <ScrollView
+        android:id="@+id/segments_scroll"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
+        android:layout_height="match_parent"
+        android:layout_marginBottom="@dimen/dialog_button_ex_height">
 
         <LinearLayout
             android:id="@+id/segments_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" />
+            android:orientation="vertical"
+            android:paddingTop="@dimen/dialog_button_ex_height"
+            android:paddingBottom="@dimen/context_menu_buttons_bottom_height" />
 
     </ScrollView>
 
-    <include
-        layout="@layout/bottom_buttons"
+    <LinearLayout
+        android:id="@+id/control_buttons"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dialog_button_ex_height" />
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:orientation="vertical">
 
-</LinearLayout>
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/buttons_shadow"
+            android:layout_width="match_parent"
+            android:layout_height="8dp"
+            android:layout_gravity="bottom"
+            android:background="@drawable/shadow" />
+
+        <include
+            layout="@layout/bottom_buttons"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dialog_button_ex_height"
+            android:layout_gravity="bottom" />
+
+    </LinearLayout>
+
+</FrameLayout>

OsmAnd/res/layout/online_routing_preference_segment.xml

@@ -129,6 +129,19 @@
             tools:visibility="visible"
             android:visibility="gone" />
 
+        <net.osmand.plus.widgets.TextViewEx
+            android:id="@+id/error_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:letterSpacing="@dimen/description_letter_spacing"
+            android:paddingTop="@dimen/content_padding_half"
+            android:textColor="@color/color_invalid"
+            android:textSize="@dimen/default_desc_text_size"
+            osmand:typeface="@string/font_roboto_regular"
+            tools:text="Error text"
+            tools:visibility="visible"
+            android:visibility="gone" />
+
     </LinearLayout>
 
     <View
@@ -151,36 +164,4 @@
         tools:visibility="visible"
         android:visibility="gone" />
 
-    <LinearLayout
-        android:id="@+id/result_container"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/setting_list_item_group_height"
-        android:orientation="horizontal"
-        tools:visibility="visible"
-        android:visibility="gone">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/result_icon"
-            android:layout_width="@dimen/standard_icon_size"
-            android:layout_height="@dimen/standard_icon_size"
-            android:layout_gravity="center_vertical"
-            android:layout_marginRight="@dimen/content_padding"
-            android:layout_marginLeft="@dimen/content_padding"
-            android:tint="?attr/default_icon_color"
-            tools:src="@drawable/ic_action_gdirections_dark" />
-
-        <net.osmand.plus.widgets.TextViewEx
-            android:id="@+id/result_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start|center_vertical"
-            android:letterSpacing="@dimen/description_letter_spacing"
-            android:singleLine="true"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="@dimen/default_list_text_size"
-            osmand:typeface="@string/font_roboto_regular"
-            tools:text="OK" />
-
-    </LinearLayout>
-
 </LinearLayout>

OsmAnd/res/layout/search_text_layout.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:osmand="http://schemas.android.com/apk/res-auto"
+              android:id="@+id/search_container"
               android:layout_width="match_parent"
               android:layout_height="56dp"
               android:focusableInTouchMode="true"

OsmAnd/res/layout/track_menu.xml

@@ -43,22 +43,27 @@
 					android:paddingStart="@dimen/context_menu_padding_margin_default"
 					android:paddingLeft="@dimen/context_menu_padding_margin_default"
 					android:paddingEnd="@dimen/context_menu_padding_margin_default"
-					android:paddingRight="@dimen/context_menu_padding_margin_default">
+					android:paddingRight="@dimen/context_menu_padding_margin_default"
+					android:paddingBottom="@dimen/context_menu_direction_margin">
 
 					<LinearLayout
 						android:layout_width="0dp"
 						android:layout_height="wrap_content"
-						android:layout_marginTop="@dimen/context_menu_first_line_top_margin"
+						android:layout_marginTop="@dimen/context_menu_second_line_top_margin"
 						android:layout_marginEnd="@dimen/context_menu_padding_margin_default"
 						android:layout_marginRight="@dimen/context_menu_padding_margin_default"
 						android:layout_weight="1"
 						android:orientation="vertical">
 
-						<TextView
+						<net.osmand.plus.widgets.TextViewEx
 							android:id="@+id/title"
-							style="@style/TextAppearance.ContextMenuTitle"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
+							android:letterSpacing="@dimen/text_button_letter_spacing"
+							android:minHeight="@dimen/default_title_line_height"
+							android:textSize="@dimen/default_list_text_size"
+							osmand:lineHeight="@dimen/default_title_line_height"
+							osmand:typeface="@string/font_roboto_medium"
 							tools:text="@string/search_address_building" />
 
 						<TextView
@@ -67,15 +72,16 @@
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
 							android:layout_gravity="center_vertical"
+							android:visibility="gone"
 							tools:text="@string/amenity_type_finance" />
 
 					</LinearLayout>
 
 					<androidx.appcompat.widget.AppCompatImageView
-						android:id="@+id/context_menu_icon_view"
+						android:id="@+id/icon_view"
 						android:layout_width="@dimen/map_widget_icon"
 						android:layout_height="@dimen/map_widget_icon"
-						android:layout_marginTop="@dimen/context_menu_padding_margin_default"
+						android:layout_marginTop="@dimen/context_menu_second_line_top_margin"
 						android:tint="?attr/default_icon_color"
 						osmand:srcCompat="@drawable/ic_action_polygom_dark" />
 
@@ -112,6 +118,79 @@
 
 	</LinearLayout>
 
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/context_menu_toolbar_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:alpha="0">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:background="?attr/actionModeBackground"
+			android:minHeight="@dimen/toolbar_height"
+			android:padding="0dp"
+			osmand:contentInsetEnd="0dp"
+			osmand:contentInsetLeft="0dp"
+			osmand:contentInsetRight="0dp"
+			osmand:contentInsetStart="0dp"
+			osmand:theme="@style/ThemeOverlay.AppCompat.ActionBar">
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_vertical"
+				android:minHeight="@dimen/toolbar_height">
+
+				<ImageButton
+					android:id="@+id/close_button"
+					style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
+					android:layout_width="@dimen/toolbar_height"
+					android:layout_height="@dimen/toolbar_height"
+					android:contentDescription="@string/access_shared_string_navigate_up"
+					osmand:srcCompat="@drawable/ic_arrow_back" />
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/toolbar_title"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginStart="@dimen/content_padding"
+					android:layout_marginLeft="@dimen/content_padding"
+					android:layout_marginEnd="@dimen/content_padding"
+					android:layout_marginRight="@dimen/content_padding"
+					android:layout_weight="1"
+					android:ellipsize="end"
+					android:letterSpacing="@dimen/text_button_letter_spacing"
+					android:maxLines="2"
+					android:textColor="?attr/app_bar_primary_item_color"
+					android:textSize="@dimen/dialog_header_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="@string/routing_settings_2" />
+
+				<include
+					layout="@layout/search_text_layout"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:maxLines="1"
+					android:visibility="gone" />
+
+				<ImageButton
+					android:id="@+id/search_button"
+					style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
+					android:layout_width="@dimen/toolbar_height"
+					android:layout_height="@dimen/toolbar_height"
+					android:contentDescription="@string/access_shared_string_navigate_up"
+					android:visibility="gone"
+					osmand:srcCompat="@drawable/ic_action_search_dark" />
+
+			</LinearLayout>
+
+		</androidx.appcompat.widget.Toolbar>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
 	<com.google.android.material.bottomnavigation.BottomNavigationView
 		android:id="@+id/bottom_navigation"
 		android:layout_width="match_parent"

OsmAnd/res/layout/track_points_card.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<ExpandableListView
+		android:id="@android:id/list"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_marginStart="0dp"
+		android:layout_marginLeft="0dp"
+		android:layout_marginTop="0dp"
+		android:layout_marginEnd="0dp"
+		android:layout_marginRight="0dp"
+		android:divider="@null"
+		android:dividerHeight="0dp"
+		android:drawSelectorOnTop="false"
+		android:groupIndicator="@android:color/transparent" />
+
+</LinearLayout>

OsmAnd/res/layout/trip_recording_fragment.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <net.osmand.plus.widgets.TextViewEx
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:letterSpacing="@dimen/text_button_letter_spacing"
+        android:paddingStart="@dimen/content_padding"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingTop="@dimen/content_padding_small"
+        android:paddingEnd="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding"
+        android:paddingBottom="@dimen/content_padding_small"
+        android:text="@string/monitoring_settings"
+        android:textSize="@dimen/default_list_text_size"
+        osmand:typeface="@string/font_roboto_medium" />
+
+    <include
+        android:id="@+id/show_track_on_map"
+        layout="@layout/bottom_sheet_with_switch_divider_and_additional_button" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/dashboard_divider" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/content_padding"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingTop="@dimen/bottom_sheet_content_margin"
+        android:paddingEnd="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:id="@+id/interval_value"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textSize="@dimen/default_list_text_size"
+            tools:text="Interval value" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/up_down_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            app:srcCompat="@drawable/ic_action_arrow_down" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/always_ask_and_range_slider_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="@dimen/content_padding"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingEnd="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding">
+
+        <com.google.android.material.slider.RangeSlider
+            android:id="@+id/interval_slider"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/save_track_interval_globally"
+            android:stepSize="1"
+            app:haloRadius="@dimen/content_padding_small"
+            app:labelBehavior="gone"
+            app:thumbColor="@color/profile_icon_color_blue_light"
+            app:thumbRadius="@dimen/content_padding_small_half"
+            app:trackColorActive="@color/profile_icon_color_blue_light"
+            app:trackColorInactive="#4D007EB3"
+            app:tickColorInactive="#007EB3"
+            app:trackHeight="@dimen/slider_track_height"
+            tools:visibility="visible" />
+
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/confirm_every_run"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:letterSpacing="@dimen/text_button_letter_spacing"
+            android:minHeight="@dimen/context_menu_buttons_bottom_height"
+            android:paddingLeft="@dimen/content_padding_small"
+            android:paddingRight="@dimen/content_padding_small"
+            android:text="@string/confirm_every_run"
+            android:textColor="?attr/color_dialog_buttons"
+            android:textSize="@dimen/default_list_text_size"
+            osmand:typeface="@string/font_roboto_regular"
+            tools:visibility="visible" />
+    </LinearLayout>
+
+    <View
+        android:id="@+id/second_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="@dimen/content_padding"
+        android:layout_marginBottom="@dimen/bottom_sheet_content_margin_small"
+        android:background="?attr/dashboard_divider" />
+
+</LinearLayout>
+
+
+

OsmAnd/res/menu/edit_description_menu.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto">
+	<item android:id="@+id/action_edit"
+		android:icon="@drawable/ic_action_edit_dark"
+		osmand:showAsAction="always"
+		android:title="@string/shared_string_edit"/>
+</menu>

OsmAnd/res/menu/track_menu_bottom_navigation.xml

@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-<!--	<item-->
-<!--		android:id="@+id/action_overview"-->
-<!--		android:icon="@drawable/ic_action_trail_overview"-->
-<!--		android:title="@string/shared_string_overview" />-->
+
+	<item
+		android:id="@+id/action_overview"
+		android:icon="@drawable/ic_action_trail_overview"
+		android:title="@string/shared_string_overview" />
 
 	<item
 		android:id="@+id/action_track"
 		android:icon="@drawable/ic_action_polygom_dark"
 		android:title="@string/shared_string_gpx_track" />
+
 	<item
 		android:id="@+id/action_points"
 		android:icon="@drawable/ic_action_waypoint"
 		android:title="@string/shared_string_gpx_points" />
 
-<!--	<item-->
-<!--		android:id="@+id/action_options"-->
-<!--		android:icon="@drawable/ic_overflow_menu_white"-->
-<!--		android:title="@string/shared_string_options" />-->
+	<item
+		android:id="@+id/action_options"
+		android:icon="@drawable/ic_overflow_menu_with_background"
+		android:title="@string/shared_string_options" />
 </menu>

OsmAnd/res/menu/track_segment_menu.xml

@@ -9,4 +9,9 @@
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_action_remove_dark"
         android:title="@string/shared_string_delete"/>
+
+    <item
+        android:id="@+id/split_interval"
+        android:icon="@drawable/ic_action_split_interval"
+        android:title="@string/gpx_split_interval"/>
 </menu>

OsmAnd/res/values-af/strings.xml

@@ -2,16 +2,14 @@
   <string name="osmand_parking_hours">Ure</string>
   <string name="osmand_parking_minutes">Minute</string>
   <string name="osmand_parking_position_description_add_time">Die motor was geparkeer om:</string>
-  
-  <string name="use_compass_navigation_descr">Gebruik kompas wanneer rigting nie opgemerk is nie</string>
+    <string name="use_compass_navigation_descr">Gebruik kompas wanneer rigting nie opgemerk is nie</string>
   <string name="use_compass_navigation">Gebruik kompas</string>
   <string name="select_animate_speedup">Kies lewendige roete versnelling</string>
   <string name="global_app_allocated_memory_descr">Toegekende geheue %1$s MB (Android beperking %2$s MB, Dalvik %3$s MB).</string>
   <string name="global_app_allocated_memory">Toegekende geheue</string>
   <string name="native_app_allocated_memory_descr">Totale plaaslike geheue toegeken deur toepassing %1$s MB (Dalvik %2$s MB, ander %3$s MB). Proporsionele geheue%4$s MB (Android beperking %5$s MB, Dalvik %6$s MB).</string>
   <string name="native_app_allocated_memory">Totale plaaslike geheue</string>
-  
-  <string name="starting_point_too_far">Beginpunt is te ver van die naaste pad.</string>
+    <string name="starting_point_too_far">Beginpunt is te ver van die naaste pad.</string>
   <string name="shared_location">Gedeelde ligging</string>
   <string name="osmand_parking_event">Verkry die motor vanaf parkering</string>
   <string name="osmand_parking_warning">Waarskuwing</string>
@@ -39,8 +37,7 @@
   <string name="gpxup_trackable">Volgbare</string>
   <string name="gpxup_private">Privaat</string>
   <string name="asap">SSM</string>
-  
-  <string name="route_roundabout">Verkeersirkel : Neem %1$d uitgang en ry</string>
+    <string name="route_roundabout">Verkeersirkel : Neem %1$d uitgang en ry</string>
   <string name="route_kl">Hou links en ry</string>
   <string name="route_kr">Hou regs en ry</string>
   <string name="rendering_attr_noPolygons_description">Maak alle area landmerke op die kaart deursigtig</string>
@@ -58,12 +55,10 @@
   <string name="navpoint_search_desc">Koordinate</string>
   <string name="transport_search_desc">Vervoer soektog</string>
   <string name="favourites_search_desc">Gunstelinge soektog</string>
-  
-  <string name="offline_navigation_not_available">OsmAnd van-lyn-af navigasie is tydelik nie beskikbaar nie.</string>
+    <string name="offline_navigation_not_available">OsmAnd van-lyn-af navigasie is tydelik nie beskikbaar nie.</string>
   <string name="left_side_navigation">Linkerhand bestuur</string>
   <string name="left_side_navigation_descr">Kies vir gebiede met linkerhand verkeer</string>
-  
-  <string name="unknown_from_location">Beginpunt is nog nie bepaal nie</string>
+    <string name="unknown_from_location">Beginpunt is nog nie bepaal nie</string>
   <string name="unknown_location">Posisie is nog nie bekend nie</string>
   <string name="modify_transparency">Verander deursigtigheid (0 - Deursigtig, 255 - Solied)</string>
   <string name="confirm_interrupt_download">Wil jy die aflaai van die dokument onderbreek?</string>
@@ -72,51 +67,38 @@
   <string name="select_index_file_to_download">Niks gevind nie. As jy nie jou streek kan vind nie, kan jy dit self maak (besoek http://osmand.net).</string>
   <string name="local_indexes_cat_tile">Internet kaarte (teëls)</string>
   <string name="local_indexes_cat_map">Aflyn kaarte (Vektor)</string>
-  
-  <string name="index_settings_descr">Laai kaarte af, beskou inligting en bestuur aflyn kaarte</string>
+    <string name="index_settings_descr">Laai kaarte af, beskou inligting en bestuur aflyn kaarte</string>
   <string name="map_online_plugin_is_not_installed">Skakel die internet kaarte inlasmodule aan om ander kaartbronne te kies</string>
   <string name="map_online_data">Internet kaarte (teëls)</string>
   <string name="map_online_data_descr">Gebruik internet kaarte (Laai teëls af en berg dit in kasgeheue op die SD kaart)</string>
   <string name="shared_string_online_maps">Internet kaarte</string>
   <string name="online_map_settings_descr">Stel die bronne op vir internet of kasgeheue-teël kaarte</string>
-  
-  
-  <string name="osmand_rastermaps_plugin_description">Stellings om verskeie internet of kasgeheue-teël kaarte as basis kaart of as bolê- / onderlê-kaarte op te stel. Hierdie kaarte kan ook op jou rekenaar voorberei word en na die OsmAnd leêr gestuur word.</string>
+    <string name="osmand_rastermaps_plugin_description">Stellings om verskeie internet of kasgeheue-teël kaarte as basis kaart of as bolê- / onderlê-kaarte op te stel. Hierdie kaarte kan ook op jou rekenaar voorberei word en na die OsmAnd leêr gestuur word.</string>
   <string name="osmand_background_plugin_description">Wys stellings om spoor-natrek en navigasie aan te skakel in sluimertoestand (skerm af) deur kort-kort die GPS aan te sit.</string>
   <string name="osmand_accessibility_description">Wys stellings vir spesiale toegankliksheidsfunksies.</string>
-  
-  
-  
-  <string name="osmand_development_plugin_description">Wys stellings vir ontwikkeling en ontfoutingsfunksies bv. bewegende navigasie of beeldvertoon werkverrigting.</string>
+    <string name="osmand_development_plugin_description">Wys stellings vir ontwikkeling en ontfoutingsfunksies bv. bewegende navigasie of beeldvertoon werkverrigting.</string>
   <string name="plugins_screen">Inlasmodule bestuurder</string>
-  
-  <string name="prefs_plugins_descr">Inlasmodule aktiveer die gevorderde instellings en voorsien ekstra funksionaliteit</string>
+    <string name="prefs_plugins_descr">Inlasmodule aktiveer die gevorderde instellings en voorsien ekstra funksionaliteit</string>
   <string name="prefs_plugins">Inlasmodule bestuurder</string>
-  
-  <string name="osm_editing_plugin_description">Wys stellings nodig vir OSM terugvoer bv. versamel / aanpas van OSM POI voorwerpe, oopmaak / komentaarlewer op OSM foute, en bydra van opgeneemde GPX dokumente (vereis OSM inlog besonderhede).</string>
+    <string name="osm_editing_plugin_description">Wys stellings nodig vir OSM terugvoer bv. versamel / aanpas van OSM POI voorwerpe, oopmaak / komentaarlewer op OSM foute, en bydra van opgeneemde GPX dokumente (vereis OSM inlog besonderhede).</string>
   <string name="vector_maps_may_display_faster_on_some_devices">Vektor kaarte vertoon waarskynlik vinniger. Dit mag egter nie goed werk op sommige toestelle nie.</string>
-  
-  <string name="play_commands_of_currently_selected_voice">Speel opdragte van die huidige gekose stem</string>
+    <string name="play_commands_of_currently_selected_voice">Speel opdragte van die huidige gekose stem</string>
   <string name="debugging_and_development">OsmAnd ontwikkeling</string>
   <string name="native_rendering">Inheemse lewering</string>
-  
-  <string name="test_voice_prompts">Toets stemaanwysings</string>
+    <string name="test_voice_prompts">Toets stemaanwysings</string>
   <string name="switch_to_raster_map_to_see">Geen aflyn vektor kaart teenwoordig vir hierdie ligging. Jy kan dit aflaai in instellings (Aflyn inligting), of skakel oor na internet kaarte.</string>
-  
-  <string name="send_files_to_osm">Stuur GPX lêers na OSM?</string>
+    <string name="send_files_to_osm">Stuur GPX lêers na OSM?</string>
   <string name="gpx_visibility_txt">Sigbaarheid</string>
   <string name="gpx_tags_txt">Naamplaatjies</string>
   <string name="shared_string_description">Beskrywing</string>
   <string name="validate_gpx_upload_name_pwd">Spesifiseer asseblief die OSM gebruiker naam en wagwoord om GPX lêers op te laai.</string>
   <string name="default_buttons_support">Ondersteuning</string>
   <string name="support_new_features">Ondersteun nuwe funksies</string>
-  
-  <string name="show_ruler_level">Wys liniaal</string>
+    <string name="show_ruler_level">Wys liniaal</string>
   <string name="info_button">Inligting</string>
   <string name="back_to_location">Terug na ligging</string>
   <string name="shared_string_help">Help</string>
-  
-  <string name="accessibility_mode">Toeganklikheid gebruikswyse</string>
+    <string name="accessibility_mode">Toeganklikheid gebruikswyse</string>
   <string name="accessibility_mode_descr">Skakel die toeganklikheid funksies aan</string>
   <string name="shared_string_on">Aan</string>
   <string name="shared_string_off">Af</string>
@@ -170,28 +152,22 @@
   <string name="use_fluorescent_overlays_descr">Gebruik helder kleure om paaie en roetes te vertoon</string>
   <string name="offline_edition">Aflyn redigering</string>
   <string name="offline_edition_descr">Gebruik altyd aflyn redigering</string>
-  
-  <string name="update_poi_does_not_change_indexes">Interessante plek veranderinge binne die toepassing raak nie afgelaaide kaart lêers nie, veranderinge word eerder in `n plaaslike lêer gestoor.</string>
+    <string name="update_poi_does_not_change_indexes">Interessante plek veranderinge binne die toepassing raak nie afgelaaide kaart lêers nie, veranderinge word eerder in `n plaaslike lêer gestoor.</string>
   <string name="local_openstreetmap_uploading">Besig om op te laai …</string>
   <string name="local_openstreetmap_were_uploaded">{0} interessante plek / Foute is opgelaai</string>
   <string name="local_openstreetmap_uploadall">Laai alles op</string>
-  
-  
-  <string name="local_openstreetmap_upload">Laai wysigings op na OSM</string>
+    <string name="local_openstreetmap_upload">Laai wysigings op na OSM</string>
   <string name="local_openstreetmap_delete">Verwyder verandering</string>
   <string name="local_openstreetmap_descr_title">Uit fase OSM Redigering:</string>
   <string name="local_openstreetmap_settings">Plaaslik gestoorde OSM interessante plekke / Foute</string>
   <string name="local_openstreetmap_settings_descr">Wys en bestuur opgemerkte OSM interessante plekke / Foute in die plaaslike databasis</string>
-  
-  
-  <string name="live_monitoring_interval_descr">Spesifiseer lewendige spoor-natrek interval</string>
+    <string name="live_monitoring_interval_descr">Spesifiseer lewendige spoor-natrek interval</string>
   <string name="live_monitoring_interval">Lewendige spoor-natrek interval</string>
   <string name="live_monitoring_url_descr">Spesifiseer die web adres met parameteroordrag sinsbou: lat = {0}, lon = {1}, tyd stempel = {2}, hdop = {3}, hoogte = {4}, spoed = {5}, rigting={6}</string>
   <string name="live_monitoring_url">Lewendige spoor-natrek webadres</string>
   <string name="gpx_monitoring_disabled_warn">Skakel asseblief \'Meld spoor na GPX\' aan in natrekking instellings.</string>
   <string name="show_current_gpx_title">Wys huidige spoor</string>
-  
-  <string name="free_version_message">Hierdie gratis OsmAnd weergawe is beperk tot %1$s aflaailêers en ondersteun nie aflyn Wikipedia artikels nie.</string>
+    <string name="free_version_message">Hierdie gratis OsmAnd weergawe is beperk tot %1$s aflaailêers en ondersteun nie aflyn Wikipedia artikels nie.</string>
   <string name="free_version_title">Gratis weergawe</string>
   <string name="poi_context_menu_showdescription">Wys POI beskrywing</string>
   <string name="index_name_north_america">Noord Amerika</string>
@@ -215,9 +191,7 @@
   <string name="profile_settings">Profiel Besondere Stellings</string>
   <string name="settings_preset">Gebruikersprofiel</string>
   <string name="settings_preset_descr">Kies \'n gebruiker profiel met \'n persoonlike kaart en navigasie instellings.</string>
-  
-  
-  <string name="routing_settings">Navigasie</string>
+    <string name="routing_settings">Navigasie</string>
   <string name="routing_settings_descr">Spesifiseer navigasie opsies</string>
   <string name="global_settings">Oorhoofse instellings</string>
   <string name="index_settings">Inligting Bestuur</string>
@@ -227,29 +201,16 @@
   <string name="user_name">Jou OSM gebruiker naam</string>
   <string name="open_street_map_login_descr">Vereis vir openstreetmap.org voorleggings</string>
   <string name="user_password">Jou OSM wagwoord</string>
-  
-  <string name="osmand_service">Sluimertoestand Funksionaliteit</string>
+    <string name="osmand_service">Sluimertoestand Funksionaliteit</string>
   <string name="osmand_service_descr">Gebruik om OsmAnd aan te hou terwyl skerm af is</string>
-  
-  
-  
-  
-  
-  
-  
-  <string name="download_files_not_enough_space">Daar is nie genoeg spasie om %1$s MB af te laai nie(beskikbaar:%2$s).</string>
+    <string name="download_files_not_enough_space">Daar is nie genoeg spasie om %1$s MB af te laai nie(beskikbaar:%2$s).</string>
   <string name="download_files_question_space">Beskibare geheue nou {2} MB! Laai {0} lêer(s) ({1} MB) af ?</string>
-  
-  
-  
-  
-  <string name="use_transparent_map_theme">Deursigtige tema</string>
+    <string name="use_transparent_map_theme">Deursigtige tema</string>
   <string name="native_library_not_supported">Inheemse biblioteek word nie op hierdie toestel ondersteun nie.</string>
   <string name="init_native_library">Besig om inheemse biblioteek gereed te maak…</string>
   <string name="choose_auto_follow_route">Outo-senter kaart uitsig</string>
   <string name="choose_auto_follow_route_descr">Tyd tot kaart sal ooreenkom met die huidige posisie</string>
-  
-  <string name="auto_follow_route_navigation">Outo-senter slegs navigasie</string>
+    <string name="auto_follow_route_navigation">Outo-senter slegs navigasie</string>
   <string name="auto_follow_route_navigation_descr">Outo-senter kaart uitsig tydens navigasie.</string>
   <string name="auto_follow_location_enabled">Outo-senter kaart uitsig in gebruik.</string>
   <string name="pref_vector_rendering">Vektor vertoner keuses</string>
@@ -262,11 +223,9 @@
   <string name="city_type_village">Dorpie</string>
   <string name="city_type_town">Dorp</string>
   <string name="city_type_city">Stad</string>
-  
-  <string name="animate_route_off">stop animasie</string>
+    <string name="animate_route_off">stop animasie</string>
   <string name="animate_route">Begin animasie</string>
-  
-  <string name="file_can_not_be_renamed">Lêer kan nie herbenoem word nie.</string>
+    <string name="file_can_not_be_renamed">Lêer kan nie herbenoem word nie.</string>
   <string name="file_with_name_already_exists">Lêer met daardie naam bestaan reeds.</string>
   <string name="poi_query_by_name_matches_categories">Verskeie interessante plek kategorieë gevind vir die soektog:</string>
   <string name="data_to_search_poi_not_available">Plaaslike inligting om interessante plek te soek is nie teenwoordig nie.</string>
@@ -276,26 +235,21 @@
   <string name="button_upgrade_osmandplus">Opgradeer OsmAnd +</string>
   <string name="map_version_changed_info">Die internet-bediener bevat kaart lêers wat nie versoenbaar is met jou huidige weergawe van die toepassing nie. Om dit af te laai en te gebruik opgradeer asseblief die toepassing na `n nuwer weergawe.</string>
   <string name="shared_string_rename">Herbenoem</string>
-  
-  <string name="poi_filter_nominatim">Internet Nominatim</string>
+    <string name="poi_filter_nominatim">Internet Nominatim</string>
   <string name="search_position_current_location_search">Besig om posisie op te spoor…</string>
   <string name="search_position_current_location_found">Ligging (gevind)</string>
   <string name="search_position_address">Adres…</string>
   <string name="search_position_favorites">Gunstelinge…</string>
   <string name="shared_string_undefined">ongedefinieerd</string>
-  
-  
-  <string name="search_position_map_view">Laaste kaart uitsig</string>
+    <string name="search_position_map_view">Laaste kaart uitsig</string>
   <string name="select_search_position">Soek naby:</string>
   <string name="context_menu_item_search">Soek hier naby</string>
-  
-  <string name="route_successfully_saved_at">Roete suksesvol geberg as \'%1$s\'.</string>
+    <string name="route_successfully_saved_at">Roete suksesvol geberg as \'%1$s\'.</string>
   <string name="filename_input">"Dokument naam:
 " </string>
   <string name="file_with_name_already_exist">Lêer met dieselfde naam bestaan reeds.</string>
   <string name="shared_string_save">Berg</string>
-  
-  <string name="local_index_upload_gpx_description">Laai GPX lêers op na OSM gemeenskap. Dit sal gebruik word om kaarte te verbeter.</string>
+    <string name="local_index_upload_gpx_description">Laai GPX lêers op na OSM gemeenskap. Dit sal gebruik word om kaarte te verbeter.</string>
   <string name="local_index_items_uploaded">%1$d van %2$d item (s) opgelaai.</string>
   <string name="local_index_mi_upload_gpx">Stuur na OSM</string>
   <string name="show_more_map_detail">Wys meer kaart detail</string>
@@ -305,17 +259,13 @@
   <string name="favorite_home_category">Huis</string>
   <string name="favorite_friends_category">Vriende</string>
   <string name="favorite_places_category">Plekke</string>
-  
-  <string name="shared_string_name">Naam</string>
+    <string name="shared_string_name">Naam</string>
   <string name="favourites_edit_dialog_category">Kategorie</string>
   <string name="shared_string_no_thanks">Nee, dankie</string>
   <string name="basemap_missing">Basis wêreld kaart (wat die hele wêreld bevat op klein vergroting) ontbreek. Oorweeg dit asseblief om World_basemap_x.obf af te laai vir \'n volledige omgewing.</string>
   <string name="vector_data_missing">Aanboord (\'aflyn\') inligting ontbreek op SD-kaart. Oorweeg dit asseblief om dit af te laai om die kaarte aflyn te gebruik.</string>
   <string name="local_index_gpx_info_show">\n\nDruk en hou vir keuses</string>
-  
-  
-  
-  <string name="local_index_installed">Uitgawe</string>
+    <string name="local_index_installed">Uitgawe</string>
   <string name="local_index_items_backuped">%1$d van %2$d item(s) suksesvol afgeskakel.</string>
   <string name="local_index_items_deleted">%1$d van %2$d item(s) is suksesvol verwyder.</string>
   <string name="local_index_items_restored">%1$d van %2$d item(s) suksesvol geaktiveer.</string>
@@ -324,31 +274,22 @@
   <string name="local_index_descr_title">Aflyn Inligting Bestuurder</string>
   <string name="local_index_mi_restore">Aktiveer</string>
   <string name="local_index_mi_backup">Deaktiveer</string>
-  
-  
-  <string name="shared_string_download">Aflaai</string>
-  
-  <string name="local_index_poi_data">Interessante plek inligting</string>
+    <string name="shared_string_download">Aflaai</string>
+    <string name="local_index_poi_data">Interessante plek inligting</string>
   <string name="local_index_address_data">Adres inligting</string>
   <string name="local_index_transport_data">Vervoer inligting</string>
   <string name="local_index_map_data">Kaart inligting</string>
-  
-  <string name="local_indexes_cat_backup">gedeaktiveer</string>
+    <string name="local_indexes_cat_backup">gedeaktiveer</string>
   <string name="local_indexes_cat_tts">Stem inligting(TTS)</string>
   <string name="local_indexes_cat_voice">Stem inligting(opgeneemd)</string>
-  
-  <string name="local_indexes_cat_poi">Interessante plek inligting</string>
+    <string name="local_indexes_cat_poi">Interessante plek inligting</string>
   <string name="ttsvoice">TTS Stem</string>
   <string name="search_offline_clear_search">Nuwe soektog</string>
   <string name="map_text_size_descr">Kies teks grootte vir die name op die kaart</string>
   <string name="map_text_size">Teks grootte</string>
   <string name="trace_rendering">Die lewering van ontfouting inligting</string>
   <string name="trace_rendering_descr">Vertoon lewering prestasie</string>
-  
-  
-  
-  
-  <string name="installing_new_resources">Besig om nuwe inligting uit te pak…</string>
+    <string name="installing_new_resources">Besig om nuwe inligting uit te pak…</string>
   <string name="internet_connection_required_for_online_route">\'n Aanlyn navigasie diens is gekies, maar geen internetverbinding is beskikbaar nie.</string>
   <string name="tts_language_not_supported_title">Taal word nie ondersteun nie</string>
   <string name="tts_language_not_supported">Die gekose taal word nie ondersteun deur die geïnstalleerde Android TTS (teks-tot-spraak) enjin nie. Wil jy in die mark soek vir \'n ander TTS-enjin? Andersins sal die beskikbare TTS taal gebruik word.</string>
@@ -379,15 +320,9 @@
   <string name="select_tile_source_to_install">Kies (teël) kaarte om te installeer of opgradeer</string>
   <string name="internet_not_available">Internet verbinding benodig vir bewerking is nie beskikbaar nie</string>
   <string name="install_more">Installeer meer…</string>
-  
-  
-  <string name="level_to_switch_vector_raster_descr">Minimum vergroting vlak om vektor kaarte te gebruik</string>
+    <string name="level_to_switch_vector_raster_descr">Minimum vergroting vlak om vektor kaarte te gebruik</string>
   <string name="level_to_switch_vector_raster">Minimum vektor vergroting vlak</string>
-  
-  
-  
-  
-  <string name="create_poi_link_to_osm_doc">"<u> Aanlyn OSM </u> kaart klassifikasie met prentjies"</string>
+    <string name="create_poi_link_to_osm_doc">"<u> Aanlyn OSM </u> kaart klassifikasie met prentjies"</string>
   <string name="error_doing_search">Fout tydens aflyn soek</string>
   <string name="search_osm_offline">Soek adres met behulp van aflyn kaarte</string>
   <string name="system_locale">Stelsel</string>
@@ -451,13 +386,10 @@
   <string name="reading_cached_tiles">Lees gekaste teëls…</string>
   <string name="version_index_is_big_for_memory">Die indeks \"{0}\" pas nie in die geheue nie</string>
   <string name="version_index_is_not_supported">Die weergawe van indeks \"{0}\'\' word nie ondersteun nie</string>
-  
-  
-  <string name="osmand_routing_experimental">OsmAnd aflyn navigasie diens is \'n eksperimentele funksie en dit werk nie vir afstande van meer as ongeveer 20 km nie.\n\nNavigasie diens is tydelik oorgeskakel na aanlyn CloudMade.</string>
+    <string name="osmand_routing_experimental">OsmAnd aflyn navigasie diens is \'n eksperimentele funksie en dit werk nie vir afstande van meer as ongeveer 20 km nie.\n\nNavigasie diens is tydelik oorgeskakel na aanlyn CloudMade.</string>
   <string name="specified_dir_doesnt_exist">Kan nie daardie adres vind nie.</string>
   <string name="application_dir">Bergingsadres</string>
-  
-  <string name="osmand_net_previously_installed">\'n Vorige OsmAnd weergawe is geïnstalleer. Alle aflyn inligting sal ondersteun word deur die nuwe toepassing. Maar Gunsteling punte moet uitgevoer word van die ou toepassing en later ingevoer word deur die nuwe een.</string>
+    <string name="osmand_net_previously_installed">\'n Vorige OsmAnd weergawe is geïnstalleer. Alle aflyn inligting sal ondersteun word deur die nuwe toepassing. Maar Gunsteling punte moet uitgevoer word van die ou toepassing en later ingevoer word deur die nuwe een.</string>
   <string name="build_installed">\'Build\' {0} suksesvol geïnstalleer ({1}).</string>
   <string name="downloading_build">Besig om weergawe af te laai…</string>
   <string name="install_selected_build">Wil jy OsmAnd - {0} van {1} {2} MB installeer ?</string>
@@ -477,8 +409,7 @@
   <string name="download_files_question">Laai {0} lêer(s) af ({1} MB)?</string>
   <string name="items_were_selected">{0} item(s) gekies</string>
   <string name="filter_existing_indexes">Filter afgelaai</string>
-  
-  <string name="shared_string_select_all">Kies alles</string>
+    <string name="shared_string_select_all">Kies alles</string>
   <string name="shared_string_refresh">Verfris</string>
   <string name="fast_route_mode">Vinnigste roete</string>
   <string name="fast_route_mode_descr">"Skakel aan om vinnigste roete te bereken of skakel af vir kortste roete " </string>
@@ -501,23 +432,17 @@
   <string name="download_type_to_filter">tipe om te filter</string>
   <string name="use_high_res_maps">hoë resolusie vertoning</string>
   <string name="use_high_res_maps_descr">Moet nie kaart teëls strek (en vervaag) op \'n hoë digtheid skerm nie</string>
-  
-  <string name="context_menu_item_search_transport">Soek vervoer</string>
+    <string name="context_menu_item_search_transport">Soek vervoer</string>
   <string name="transport_searching_transport">Vervoerresultate (geen teiken):</string>
   <string name="transport_searching_route">Vervoer resultate ({0} na teiken):</string>
-  
-  <string name="transport_search_again">Herstel vervoer soek</string>
-  
-  <string name="voice">Stem</string>
+    <string name="transport_search_again">Herstel vervoer soek</string>
+    <string name="voice">Stem</string>
   <string name="no_vector_map_loaded">Vektor kaarte was nie gelaai nie</string>
-  
-  <string name="gpx_files_not_found">GPX lêers nie gevind in /tracks adres nie</string>
+    <string name="gpx_files_not_found">GPX lêers nie gevind in /tracks adres nie</string>
   <string name="error_reading_gpx">Fout met lees van GPX inligting</string>
   <string name="vector_data">Aflyn vektor kaarte</string>
   <string name="transport_context_menu">Soek vervoer by stop</string>
-  
-  
-  <string name="poi_context_menu_modify">verander interessante plek</string>
+    <string name="poi_context_menu_modify">verander interessante plek</string>
   <string name="poi_context_menu_delete">verwyder interessante plek</string>
   <string name="rotate_map_compass_opt">Volgens kompas</string>
   <string name="rotate_map_bearing_opt">Volgens rigting van beweging</string>
@@ -530,30 +455,25 @@
   <string name="fav_saved_sucessfully">Gunstelinge suksesvol geberg na {0}</string>
   <string name="no_fav_to_save">Geen gunsteling punte om te berg nie</string>
   <string name="shared_string_import">Inbring</string>
-  
-  <string name="error_occurred_loading_gpx">Fout het voorgekom tydens die laai van GPX</string>
+    <string name="error_occurred_loading_gpx">Fout het voorgekom tydens die laai van GPX</string>
   <string name="send_report">Stuur verslag</string>
   <string name="none_region_found">Geen aflyn inligting vir gebiede op SD-kaart gevind nie. Laai gebiede van die Internet af.</string>
   <string name="poi_namefinder_query_empty">Inset soektog navraag om interessante plek te vind</string>
   <string name="any_poi">Enige</string>
-  
-  <string name="thanks_yandex_traffic">Dankie aan Yandex vir verkeersinligting.</string>
+    <string name="thanks_yandex_traffic">Dankie aan Yandex vir verkeersinligting.</string>
   <string name="layer_yandex_traffic">Yandex verkeer</string>
   <string name="layer_route">Roete</string>
   <string name="shared_string_favorites">Gunstelinge</string>
   <string name="layer_osm_bugs">OSM foute</string>
-  
-  <string name="layer_poi">Interessante plek…</string>
+    <string name="layer_poi">Interessante plek…</string>
   <string name="layer_map">Kaartbron…</string>
   <string name="menu_layers">Kaarte</string>
   <string name="context_menu_item_search_poi">Soek interessante plek</string>
-  
-  <string name="use_trackball_descr">Gebruik die trekbal om die kaart te skuif</string>
+    <string name="use_trackball_descr">Gebruik die trekbal om die kaart te skuif</string>
   <string name="use_trackball">Gebruik die trekbal</string>
   <string name="background_service_wait_int_descr">Stel maksimum wagtyd vir agtergrond ligging-vasstelling</string>
   <string name="background_service_wait_int">Maksimum wagtyd vir vasstelling</string>
-  
-  <string name="where_am_i">Waar is ek?</string>
+    <string name="where_am_i">Waar is ek?</string>
   <string name="process_navigation_service">OsmAnd navigasie diens</string>
   <string name="network_provider">Netwerk</string>
   <string name="gps_provider">GPS</string>
@@ -577,8 +497,7 @@
   <string name="voice_data_not_supported">Die weergawe van stem inligting word nie ondersteun nie</string>
   <string name="voice_data_corrupted">Gespesifiseerde stem is beskadig</string>
   <string name="voice_data_unavailable">gekose stem is nie beskikbaar nie</string>
-  
-  <string name="sd_unmounted">SD kaart is nie toeganklik nie.\nJy sal nie in staat wees om kaarte te sien of dinge te vind nie.</string>
+    <string name="sd_unmounted">SD kaart is nie toeganklik nie.\nJy sal nie in staat wees om kaarte te sien of dinge te vind nie.</string>
   <string name="sd_mounted_ro">SD kaart is slegs-lees.\nJy kan net die vooraf geïnstalleerde kaart sien en kan nie van die internet aflaai nie.</string>
   <string name="unzipping_file">Haal lêer uit argief…</string>
   <string name="route_tr">Draai regs en ry</string>
@@ -650,13 +569,9 @@
   <string name="download_question_exist">Aflyn inligting vir {0} bestaan alreeds ({1}). Wiljy dit opgradeer ({2}) ?</string>
   <string name="address">Adres</string>
   <string name="shared_string_download_successful">Aflaai suksesvol</string>
-  
-  
-  
-  <string name="downloading_list_indexes">Besig om die lys van beskikbare gebiede af te laai…</string>
+    <string name="downloading_list_indexes">Besig om die lys van beskikbare gebiede af te laai…</string>
   <string name="list_index_files_was_not_loaded">Die lys van gebiede kon nie verkry word van osmand.net nie.</string>
-  
-  <string name="fav_points_edited">Gunstelingpunt was gewysig</string>
+    <string name="fav_points_edited">Gunstelingpunt was gewysig</string>
   <string name="fav_points_not_exist">Geen gunstelingpunte bestaan nie</string>
   <string name="update_existing">Vervang</string>
   <string name="only_show">Wys slegs</string>
@@ -664,8 +579,7 @@
   <string name="recalculate_route_to_your_location">Kies vervoerwyse (opsioneel):</string>
   <string name="mark_final_location_first">Kies asseblief eers die bestemming</string>
   <string name="get_directions">Aanwysings</string>
-  
-  <string name="opening_hours">Openingsure</string>
+    <string name="opening_hours">Openingsure</string>
   <string name="opening_changeset">Besig om verandering-sessie oop te maak…</string>
   <string name="closing_changeset">Besig om verandering-sessie af te sluit…</string>
   <string name="commiting_node">Besig om node by te voeg…</string>
@@ -677,14 +591,12 @@
   <string name="loading_postcodes">Besig om poskodes te laai…</string>
   <string name="loading_streets">Besig om strate te laai…</string>
   <string name="loading_cities">Besig om stede te laai…</string>
-  
-  <string name="poi">POI (interessante punt)</string>
+    <string name="poi">POI (interessante punt)</string>
   <string name="error_occurred_saving_gpx">Fout tydes GPX berging</string>
   <string name="error_calculating_route">Fout tydens roeteberekening</string>
   <string name="error_calculating_route_occured">`n Fout het voorgekom tydens die roeteberekening</string>
   <string name="empty_route_calculated">Fout: Berekende roete is leeg</string>
-  <string name="new_route_calculated_dist">Nuwe roete is bereken, afstand</string>
-  <string name="arrived_at_destination">Jy het jou bestemming bereik</string>
+    <string name="arrived_at_destination">Jy het jou bestemming bereik</string>
   <string name="invalid_locations">Die koördinate is ongeldig!</string>
   <string name="go_back_to_osmand">Gaan terug na die OsmAnd kaart</string>
   <string name="shared_string_close">Sluit</string>
@@ -693,17 +605,12 @@
   <string name="previous_run_crashed">Die vorige gebruik van OsmAnd het gefaal. Die Log lêer is by {0}. Raporteer asseblief die probleem en heg die log lêer daarby aan.</string>
   <string name="saving_gpx_tracks">Besig om GPX spore op SD te berg…</string>
   <string name="finished_task">Klaar</string>
-  
-  
-  
-  
-  <string name="use_online_routing_descr">Gebruik Internet om die roete te bereken</string>
+    <string name="use_online_routing_descr">Gebruik Internet om die roete te bereken</string>
   <string name="use_online_routing">Gebruik aanlyn navigasie</string>
   <string name="osm_settings_descr">Spesifiseer Openstreetmap.org (OSM) stellings benodig vir OSM toevoegings</string>
   <string name="data_settings_descr">Spesifiseer taal, aflaai/herlaai inligting</string>
   <string name="data_settings">Inligting</string>
-  
-  <string name="osm_settings">OSM veranderings</string>
+    <string name="osm_settings">OSM veranderings</string>
   <string name="auto_zoom_map_descr">Outo vergroot kaart volgens jou spoed</string>
   <string name="auto_zoom_map">Vergroot kaart outomaties</string>
   <string name="additional_settings">Bykomende stellings</string>
@@ -716,10 +623,7 @@
   <string name="update_tile">Opgradeer kaart</string>
   <string name="reload_tile">Laai teël weer af</string>
   <string name="mark_point">Teiken</string>
-  
-  
-  
-  <string name="shared_string_add_to_favorites">Voeg by gunstelinge</string>
+    <string name="shared_string_add_to_favorites">Voeg by gunstelinge</string>
   <string name="use_english_names_descr">Kies tussen plaaslike en engelse name</string>
   <string name="use_english_names">Gebruik Engelse name in die kaart</string>
   <string name="app_settings">Toepassing stellings</string>
@@ -728,10 +632,7 @@
   <string name="choose_street">Kies straat</string>
   <string name="choose_city">Kies stad</string>
   <string name="ChooseCountry">Kies land</string>
-  
-  
-  
-  <string name="show_view_angle">Wys uitsig rigting</string>
+    <string name="show_view_angle">Wys uitsig rigting</string>
   <string name="map_view_3d_descr">Skakel 3D kaart aan</string>
   <string name="map_view_3d">Kaart 3D</string>
   <string name="show_poi_over_map_description">Wys interessante plekke bo-oor die kaart (gebruik die vorige gekose filter)</string>
@@ -741,16 +642,11 @@
   <string name="map_source">Kaartbron</string>
   <string name="use_internet">Gebruik Internet</string>
   <string name="show_location">Wys ligging</string>
-  
-  
-  <string name="show_gps_coordinates_text">Wys die GPS koordinate op die kaart</string>
+    <string name="show_gps_coordinates_text">Wys die GPS koordinate op die kaart</string>
   <string name="use_internet_to_download_tile">Gebruik die internet om ontbrekende teëls af te laai</string>
   <string name="app_description">Navigasie toepassing</string>
   <string name="shared_string_exit">Verlaat</string>
-  
-  
-  
-  <string name="search_button">Soek</string>
+    <string name="search_button">Soek</string>
   <string name="search_activity">Soek</string>
   <string name="searchpoi_activity">Kies POI</string>
   <string name="search_POI_level_btn">Vind meer</string>
@@ -773,19 +669,15 @@
   <string name="navigate_point_format_DM">GGG MM.MM</string>
   <string name="navigate_point_format_DMS">GGG MM SS.SS</string>
   <string name="shared_string_show_on_map">Wys op kaart</string>
-  
-  <string name="search_address_top_text">Kies adres</string>
+    <string name="search_address_top_text">Kies adres</string>
   <string name="search_address_region">Streek</string>
   <string name="search_address_city">Stad</string>
   <string name="search_address_street">Straat</string>
   <string name="search_address_building">Gebou</string>
   <string name="search_address_building_option">Gebou</string>
   <string name="search_address_street_option">Kruisende straat</string>
-  
-  
-  <string name="context_menu_item_update_map">opgradeer kaart</string>
-  
-  <string name="context_menu_item_create_poi">skep interessante plek</string>
+    <string name="context_menu_item_update_map">opgradeer kaart</string>
+    <string name="context_menu_item_create_poi">skep interessante plek</string>
   <string name="shared_string_yes">Ja</string>
   <string name="shared_string_cancel">Kanseleer</string>
   <string name="shared_string_apply">toepas</string>
@@ -798,25 +690,13 @@
   <string name="favourites_context_menu_delete">verwyder gunsteling</string>
   <string name="favourites_remove_dialog_msg">Verwyder gunsteling punt \'%s\'?</string>
   <string name="favourites_remove_dialog_success">Gunsteling punt {0} is suksesvol verwyder.</string>
-  
-  
-  
-  
-  <string name="osb_comment_dialog_message">Boodskap</string>
+    <string name="osb_comment_dialog_message">Boodskap</string>
   <string name="osb_comment_dialog_author">naam van die skrywer</string>
-  
-  
-  <string name="osb_comment_dialog_success">Kommentaar is bygevoeg</string>
+    <string name="osb_comment_dialog_success">Kommentaar is bygevoeg</string>
   <string name="osb_comment_dialog_error">Uitsondering voorgekom: kommentaar is nie bygevoeg nie</string>
-  
-  
-  
-  
-  
-  <string name="poi_edit_title">Verander interessante plek</string>
+    <string name="poi_edit_title">Verander interessante plek</string>
   <string name="poi_create_title">skep interessante plek</string>
-  <string name="poi_error_poi_not_found">Node kan nie gevind word nie of gerief is nie \'n enkele node</string>
-  <string name="poi_remove_confirm_template">Verwyder {0} (Lewer kommentaar)?</string>
+    <string name="poi_remove_confirm_template">Verwyder {0} (Lewer kommentaar)?</string>
   <string name="poi_remove_title">verwyder Interessante plek</string>
   <string name="shared_string_delete">verwyder</string>
   <string name="poi_remove_success">die interessante plek is suksesvol verwyder</string>
@@ -833,32 +713,22 @@
   <string name="default_buttons_commit">Handig in</string>
   <string name="shared_string_clear">Herstel</string>
   <string name="filter_current_poiButton">Filter</string>
-  
-  <string name="edit_filter_save_as_menu_item">Berg As</string>
+    <string name="edit_filter_save_as_menu_item">Berg As</string>
   <string name="edit_filter_delete_dialog_title">Verwyder gekose filter?</string>
   <string name="edit_filter_delete_message">Filter %1$s is verwyder</string>
   <string name="edit_filter_create_message">Filter %1$s is geskep</string>
-  
-  <string name="continue_follow_previous_route_auto">Die vorige navigasie was onvoltooid. Wil jy dit nog volg? (%1$s sekondes)</string>
-  
-  
-  
-  <string name="show_cameras">Wys spoedkameras</string>
+    <string name="continue_follow_previous_route_auto">Die vorige navigasie was onvoltooid. Wil jy dit nog volg? (%1$s sekondes)</string>
+    <string name="show_cameras">Wys spoedkameras</string>
   <string name="show_traffic_warnings">Wys spoedbeperkings</string>
   <string name="avoid_toll_roads">Vermy tolpaaie</string>
-  
-<string name="screen_is_locked">Om die skerm oop te sluit, druk op die slot simbool</string>
+    <string name="screen_is_locked">Om die skerm oop te sluit, druk op die slot simbool</string>
 <string name="map_widget_top_text">Straat naam</string>
 <string name="map_widget_config">Verstelling</string>
-
-<string name="map_widget_back_to_loc">Waar is ek</string>
+    <string name="map_widget_back_to_loc">Waar is ek</string>
 <string name="map_widget_lock_screen">Sluit die skerm</string>
 <string name="map_widget_compass">Kompas</string>
-
-<string name="map_widget_reset">Herstel verstek</string>
-
-
-<string name="map_widget_parking">Parkering</string>
+    <string name="map_widget_reset">Herstel verstek</string>
+    <string name="map_widget_parking">Parkering</string>
 <string name="map_widget_speed">Spoed</string>
 <string name="map_widget_distance">Teiken</string>
 <string name="map_widget_altitude">Hoogte</string>
@@ -881,8 +751,7 @@
 	<string name="filterpoi_activity">Skep PVB filter</string>
 	<string name="select_navigation_mode">Kies vervoertipe</string>
 	<string name="day_night_info">Dag/nag inligting</string>
-	
-	<string name="map_widget_vector_attributes">Kaart voorstelling eienskappe:</string>
+    <string name="map_widget_vector_attributes">Kaart voorstelling eienskappe:</string>
 	<string name="map_widget_renderer">Kaartvoorstelling-styl</string>
 	<string name="layer_map_appearance">Verstel skerm</string>
 	<string name="show_lanes">Toon lane</string>
@@ -891,18 +760,14 @@
 	<string name="avoid_in_routing_title">Vermy…</string>
 	<string name="map_widget_fluorescent">Helder roetes</string>
 	<string name="map_widget_show_ruler">Liniaal</string>
-	
-	<string name="map_widget_view_direction">Kykrigting</string>
+    <string name="map_widget_view_direction">Kykrigting</string>
 	<string name="map_widget_transparent">Deursigtige vel</string>
-	
-	<string name="int_continuosly">Aaneenlopende</string>
+    <string name="int_continuosly">Aaneenlopende</string>
 	<string name="zxing_barcode_scanner_not_found">ZXing Barcode Scanner toepassing is nie geïnstaleer nie. Wil jy dit in die mark soek?</string>
 	<string name="enable_plugin_monitoring_services">Aktiveer spoorsny inlasmodule om ligging aanteken diens te gebruik (aantekening, lewende spoor-natrek)</string>
     <string name="non_optimal_route_calculation">Bereken moontlike ongunstige roete oor lang afstande</string>
-    
-	<string name="gps_not_available">Aktiveer GPS onder instellings</string>
-    
-	<string name="map_widget_monitoring_services">Aanteken dienste</string>
+    <string name="gps_not_available">Aktiveer GPS onder instellings</string>
+    <string name="map_widget_monitoring_services">Aanteken dienste</string>
 	<string name="no_route">Geen roete</string>
 	<string name="delete_target_point">Verwyder oorgangspunt</string>
 	<string name="target_point">Oorgangspunt %1$s</string>
@@ -940,14 +805,7 @@
 		OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ is `n ope bron navigasie toepassing met toegang tot `n wye verskeidenheid wêreldwye OpenStreetMap (OSM) inligting. Alle kaart inligting (vektor of teëlkaarte) kan op die foon geheuekaart gestoor word vir aflyn gebruik. OsmAnd bied ook aan- en aflyn roete berekening insluitend draai-vir-draai stem leiding. OsmAnd+ is betaalde toepassing weergawe, deur dit te koop ondersteun jy die projek, befonds die ontwikkeling van nuwe funksies, en ontvang die nuutste opgraderings. Sommige van die kern funksies: - volledige aflyn werking (stoor afgelaaide vektor of teëlkaarte in `n leër van jou keuse) - kompakte aflyn vektor vir die hele wereld beskikbaar - Onbeperkte aflaai van land en streek kaarte uit die toepassing - Aflyn Wikipedia funksies (Wikipedia belangepunte kan afgelaai word), goed vir besigtigingstoere - oorlegging van verskeie kaart lae moontlik, bv. GPX of navigasie spore, belangepunte, gunstelinge, kontoerlyne, publieke vervoer haltes, ekstra kaarte met verstelbare deursigtigheid - Aflyn soek vir adresse en belangepunte - Aflyn navigasie roete berekening vir kort roetes (eksperimenteel) - Kar, fiets, en voetganger gebruikerswyses met: - opsionele outomatiese dag/nag skakeling - opsionele spoed-afhankliket kaart vergroting - opsionele kaart rigting volgens kompas of koers - opsionele laan begeleiding, spoedbeperking vertoon, opgeneemde en TTS stemme "
 	</string>
 	<string name="day_night_info_description">Sonopkoms : %1$s ↵\nSonsondergang : %2$s</string>
-	
-	
-	
-	
-		
-	
-	
-	<string name="email">e-pos</string>
+    <string name="email">e-pos</string>
 <string name="close_changeset">Sluit verandering-sessie af</string>
 	<string name="access_arrival_time">Aankomstyd</string>
     <string name="item_checked">Gemerk</string>
@@ -956,12 +814,8 @@
     <string name="prefer_motorways">Verkies snelweë</string>
 	<string name="prefer_in_routing_title">Verkies…</string>
 	<string name="prefer_in_routing_descr">Verkies snelweë</string>
-    
-    
     <string name="max_speed_none">geen</string>
     <string name="download_hillshade_maps">Heuwelskadu-oorleggings</string>
-    
-    
     <string name="local_indexes_cat_av">Oudio/video inligting</string>
     <string name="stop_routing_confirm">Is jy seker jy wil die navigasie staak?</string>
     <string name="clear_dest_confirm">Is jy seker jy wil jou bestemmingspunt verwyder?</string>
@@ -987,7 +841,6 @@
     <string name="av_use_external_recorder">Gebruik stelsel opnemer</string>
     <string name="av_use_external_camera_descr">Gebruik stelsel toepassing vir foto</string>
     <string name="av_use_external_camera">Gebruik kamera toepassing</string>
-    
     <string name="av_settings_descr">Maak oudio en video verstellings</string>
     <string name="av_settings">"Oudio/video verstellings 
 " </string>
@@ -998,7 +851,6 @@
     <string name="recording_playing">Oudio van die gespesifiseerde opname is besig om te speel.\n%1$s</string>
     <string name="recording_open_external_player">Maak eksterne speler oop</string>
     <string name="recording_delete_confirm">Wil jy hierdie opname verwyder?</string>
-    
     <string name="recording_unavailable">nie beskikbaar nie</string>
     <string name="recording_context_menu_arecord">Neem `n oudio nota</string>
     <string name="recording_context_menu_vrecord">Neem `n video nota</string>
@@ -1012,10 +864,6 @@
     <string name="map_widget_av_notes">Oudio/video notas</string>
     <string name="osmand_srtm_short_description_80_chars">OsmAnd inlasmodule vir aflyn kontoerlyne</string>
     <string name="osmand_srtm_long_description_1000_chars">Hierdie inlasmodule verskaf kontoerlyne wat in OsmAnd aflyn kaarte getoon kan word.Die wêreld inligting (van 70 grade noord tot 70 grade suid) is gebaseer op metings deur SRTM (Shuttle Radar Topography Mission)en ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer),`n beeld-instrument aanboord Terra, die vlagskip sateliet van NASA se Aarde Observasie Stelsel. ASTER is `n samewerkingsprojek tussen NASA, Japan se Ministerie van Ekonomie, Handel en Industrie (MEHI), en Japan Ruimte Stelsels (J-spacesystems).</string>
-    
-    
-    
-    
     <string name="map_widget_distancemeasurement">Afstandsmeting</string>
     <string name="index_srtm_parts">dele</string>
     <string name="audionotes_plugin_name">Oudio/video notas</string>
@@ -1025,8 +873,7 @@
     <string name="download_srtm_maps">Kontoerlyne</string>
     <string name="download_roads_only_item">Slegs paaie</string>
     <string name="download_roads_only_maps">Paaie-uitsluitlik kaarte</string>
-    
-	<string name="rendering_attr_noAdminboundaries_name">Versteek grense</string>
+    <string name="rendering_attr_noAdminboundaries_name">Versteek grense</string>
 	<string name="audionotes_location_not_defined">Ligging om met die nota te asosieer is nog nie gedefinieer nie. Gebruik ligging … om `n nota aan `n spesifieke ligging toe te ken</string>
     <string name="audionotes_plugin_description">Neem oudio/video notas tydens die rit</string>
     <string name="srtm_plugin_name">Kontoerlyn inlasmodule</string>
@@ -1041,36 +888,20 @@
     <string name="safe_mode">Beskermde wyse</string>
     <string name="native_library_not_running">Die toepassing werk in beskermde wyse (skakel dit af in Instellings).</string>
     <string name="srtm_plugin_description">Vergemoontlik dei aflaai van aflyn kontoerlyne en heuwelsakdus (\'Instellings\'-&gt; \'Inligtingsbestuur\' -&gt; \'Aflaai\' -&gt; Kies verlangde kaart-tipe).</string>
-    
-    
-    
-	
     <string name="route_descr_lat_lon">Breedtegraad %1$.3f, lengtegraad %2$.3f</string>
-    
-    
-    
     <string name="background_service_is_enabled_question">OsmAnd slaapwyse diens is nog aan. Wil jy dit afskakel?</string>
-    
     <string name="support_new_features_descr">Maak donasies om die implementering van nuwe funksies in die toepassing moontlik te maak</string>
 	<string name="incomplete_locale">Onvolledig</string>
-    
-    
-	<string name="layer_hillshade">Heuwelskadu-vel</string>
+    <string name="layer_hillshade">Heuwelskadu-vel</string>
     <string name="map_widget_gps_info">GPS inligting</string>
-    
     <string name="index_name_openmaps">\\\'OpenMaps EU\\\'</string>
     <string name="osmand_play_title_30_chars">OsmAnd Kaarte &amp; Navigasie</string>
-	
-	<string name="osmand_plus_play_title_30_chars">OsmAnd+ Kaarte &amp; Navigasie</string>
-	
-	<string name="download_using_mobile_internet">WiFi is nie gekoppel nie. Wil jy voortgaan om af te laai met die beskikbare internet diens?</string>
+    <string name="osmand_plus_play_title_30_chars">OsmAnd+ Kaarte &amp; Navigasie</string>
+    <string name="download_using_mobile_internet">WiFi is nie gekoppel nie. Wil jy voortgaan om af te laai met die beskikbare internet diens?</string>
     <string name="street_name">Straat</string>
 	<string name="hno">Huisnommer</string>
-    
     <string name="monitoring_settings">Aanteken dienste &amp; Sluimertoestand</string>
     <string name="monitoring_settings_descr">Verstel hoe om roetes op te neem en sluimertoestand aan te skakel</string>
-    
-    
     <string name="choose_osmand_theme_descr">Kies toepassing tema</string>
     <string name="choose_osmand_theme">Toepassing tema</string>
     <string name="accessibility_options">Toeganklikheidskeuses</string>
@@ -1079,7 +910,6 @@
     <string name="local_openstreetmap_act_title">OSM veranderings</string>
     <string name="shared_string_more_actions">Ander aksies</string>
     <string name="shared_string_control_stop">Stop</string>
-    
     <string name="cancel_route">Verwerp roete</string>
     <string name="cancel_navigation">Staak navigasie</string>
     <string name="clear_destination">Verwyder bestemming</string>
@@ -1087,7 +917,6 @@
     <string name="files_limit">%1$d lêers oor</string>
     <string name="available_downloads_left">%1$d lêers beskikbaar om af te laai</string>
     <string name="install_paid">Vol weergawe</string>
-    
     <string name="wait_current_task_finished">Wag asseblief terwyl huidige taak afhandel</string>
     <string name="use_kalman_filter_compass_descr">Gebruik Kalman filter om kompas afwykings te vermy</string>
     <string name="use_kalman_filter_compass">Gebruik Kalman filter</string>
@@ -1120,12 +949,8 @@
     <string name="distance_measurement_finish_editing">Eindig verandering</string>
     <string name="distance_measurement_finish_subtrack">Begin `n nuwe sub-spoor</string>
     <string name="distance_measurement_clear_route">Verwyder all punte</string>
-    
     <string name="distance_measurement_load_gpx">Maak bestaande GPX oop</string>
-    
-    
-	
-	<string name="av_camera_focus">Kamera fokus tipe</string>
+    <string name="av_camera_focus">Kamera fokus tipe</string>
 	<string name="av_camera_focus_descr">Kies interne kamera fokus tipe</string>
 	<string name="av_camera_focus_auto">Outo fokus</string>
 	<string name="av_camera_focus_hiperfocal">Hiperfokale fokus</string>
@@ -1135,12 +960,9 @@
 	<string name="av_camera_focus_continuous">Die kamera prbeer heeltyd in fokus bly</string>
 	<string name="av_photo_play_sound">Speel geluid wanneer foto geneem word</string>
 	<string name="av_photo_play_sound_descr">Kies of geluid gespeel sal word wanneer foto geneem word</string>
-
-	
     <string name="speak_speed_limit">Kondig spoedbeperking aan</string>
     <string name="speak_cameras">Kondig spoedkameras aan</string>
 	<string name="speak_traffic_warnings">Kondig verkeerswaarskuwings aan</string>
-	
     <string name="osb_author_or_password_not_specified">Spesifiseer asseblief OSM gebruiker en kodewoord in Stellings</string>
     <string name="clear_intermediate_points">Verwyder tussenpunte</string>
     <string name="keep_intermediate_points">Hou tussenpunte</string>
@@ -1152,12 +974,9 @@
     <string name="route_via">Via:</string>
     <string name="route_from">Van:</string>
     <string name="osb_author_dialog_password">OSM kodewoord (opsioneel)</string>
-	
     <string name="speak_title">Aankondig…</string>
 	<string name="speak_descr">Verstel aankondig van straatname, verkeerswaarskuwings(geforseerde stoppe, spoed-hobbels), spoedkamera, spoedbeperkings</string>
 	<string name="speak_street_names">Kondig straatname aan(TTS)</string>
-        
-    
     <string name="driving_region_descr">Kies Bestuur Streek: VSA, Europa, VK, Asië en Ander</string>
 	<string name="driving_region">Bestuur Streek</string>
 	<string name="driving_region_japan">Japan</string>
@@ -1169,8 +988,6 @@
 	<string name="about_version">Weergawe:</string>
     <string name="shared_string_about">Omtrent</string>
     <string name="about_settings_descr">Weergawe inligting, lisensie, projeklede</string>
-    
-    
     <string name="local_index_tile_data_zooms">Vergrotings afgelaai: %1$s</string>
     <string name="local_index_tile_data_expire">Verstryk (minute): %1$s</string>
     <string name="local_index_tile_data_downloadable">Aflaaibaar: %1$s</string>
@@ -1185,8 +1002,6 @@
     <string name="edit_tilesource_url_to_load">Bronadres (URL)</string>
     <string name="edit_tilesource_choose_existing">Kies bestaande…</string>
     <string name="maps_define_edit">Definieer/Wysig…</string>
-	
-	
     <string name="keep_and_add_destination_point">Voeg by as bestemmingspunt</string>
     <string name="select_gpx">Kies GPX …</string>
     <string name="route_descr_select_destination">Kies bestemming</string>
@@ -1225,19 +1040,10 @@
     <string name="shared_string_delete_all">Wis alles uit</string>
     <string name="animate_routing_route_not_calculated">Bereken asseblief eers die roete</string>
     <string name="animate_routing_route">Simuleer die berekende roete </string>
-    
     <string name="shared_string_remember_my_choice">Onthou my keuse</string>
-    
     <string name="shared_string_and">en</string>
     <string name="shared_string_or">of</string>
-	
-    
-    
-    
-    
-    
-    
-   	<string name="always_center_position_on_map">Wys posisie altyd in senter</string>
+    <string name="always_center_position_on_map">Wys posisie altyd in senter</string>
     <string name="voice_pref_title">Stem</string>
     <string name="misc_pref_title">Allerlei</string>
     <string name="localization_pref_title">lokalisering</string>
@@ -1254,21 +1060,9 @@
 	<string name="lang_af">Afrikaans</string>
 	<string name="lang_hy">Armeens</string>
 	<string name="lang_eu">Baskies</string>
-	
-	<string name="rendering_value_pink_name">pienk</string>
-	
-	<string name="rendering_value_brown_name">bruin</string>
-	
-	
-	
-	
-	
-    
+    <string name="rendering_value_pink_name">pienk</string>
+    <string name="rendering_value_brown_name">bruin</string>
     <string name="osmo_edit_color">Vertoon kleur</string>
-    
-    
-    
-    
     <string name="rendering_attr_depthContours_description">Vertoon dieptelyne en punte</string>
     <string name="rendering_attr_depthContours_name">Dieptelyne</string>
 	<string name="rendering_attr_contourDensity_description">Digtheid van die hoogtelyne</string>

OsmAnd/res/values-ar/phrases.xml

@@ -86,7 +86,6 @@
     <string name="poi_fishing">معدات الصيد</string>
     <string name="poi_florist">محل بيع الزهور</string>
     <string name="poi_frame">متجر اطارات الصور</string>
-    <string name="poi_furnace">متجر وحدات التدفئة</string>
     <string name="poi_furniture">متجر أثاث</string>
     <string name="poi_gift">دكان الهدايا</string>
     <string name="poi_shop_yes">متجر عام</string>
@@ -596,7 +595,6 @@
     <string name="poi_sanatorium">مصحة</string>
     <string name="poi_healthcare_alternative">طب بديل</string>
     <string name="poi_blood_bank">بنك دم</string>
-    <string name="poi_healthcare_centre">مركز طبي</string>
     <string name="poi_midwife">قابلة</string>
     <string name="poi_physiotherapist">أخصائي علاج طبيعي</string>
     <string name="poi_podiatrist">طبيب الأرجل</string>
@@ -712,7 +710,6 @@
     <string name="poi_smoking_area">منطقة للتدخين</string>
     <string name="poi_mortuary">ثلاجة الموتى</string>
     <string name="poi_crematorium">محرقة</string>
-    <string name="poi_amenity_atm">صراف آلي</string>
     <string name="poi_money_lender">قرض المال</string>
     <string name="poi_bureau_de_change">مكتب الصرافة</string>
     <string name="poi_accountant">محاسب</string>
@@ -1387,7 +1384,6 @@
     <string name="poi_futsal">كرة القدم داخل الصالات</string>
     <string name="poi_boxing">الملاكمة</string>
     <string name="poi_construction_yes">تحت الإنشاء</string>
-    <string name="poi_additional_atm_yes">صراف آلي : نعم</string>
     <string name="poi_atm_no">صراف آلي : لا يوجد</string>
     <string name="poi_fair_trade_yes">التجارة العادلة : نعم</string>
     <string name="poi_fair_trade_no">التجارة العادلة : لا يوجد</string>
@@ -1522,7 +1518,6 @@
     <string name="poi_health_specialty_orthopaedics_yes">طب العظام</string>
     <string name="poi_health_specialty_otolaryngology_yes">الأنف والأذن والحنجرة</string>
     <string name="poi_health_specialty_radiology_yes">الأشعة</string>
-    <string name="poi_health_specialty_radiotheraphy_yes">المعالجة بالإشعاع</string>
     <string name="poi_health_specialty_dermatovenereology_yes">جلدية-تناسلية</string>
     <string name="poi_health_specialty_trauma_yes">الرضوض</string>
     <string name="poi_health_specialty_biology_yes">احياء سريرية</string>
@@ -1621,7 +1616,6 @@
     <string name="poi_park_ride_hov">مركبات فيها أكثر من شخص</string>
     <string name="poi_park_ride_tram">ترام</string>
     <string name="poi_park_ride_ferry">عبّارة</string>
-    <string name="poi_generator_source_biomass">مصدر الطاقة: الكتلة الحيوية</string>
     <string name="reddit">موقع Reddit</string>
     <string name="poi_park_ride">اصطف واركب</string>
     <string name="poi_rtsa_scale_filter">تصنيف الصعوبة</string>
@@ -2376,7 +2370,6 @@
     <string name="poi_street_cabinet_telecom">نوع الكبينة/الخزانة: اتصالات</string>
     <string name="poi_street_cabinet_power">نوع الكبينة/الخزانة: كهرباء</string>
     <string name="poi_in_service_yes">في الخدمة: نعم</string>
-    <string name="poi_fire_hydrant_style_water_source_cistern">صهريج</string>
     <string name="poi_water_source_stream">مجرى</string>
     <string name="poi_water_source_pond">بركه</string>
     <string name="poi_water_source_main">رئيسي</string>
@@ -3676,4 +3669,13 @@
     <string name="poi_waste_transfer_station">محطة نقل نفايات</string>
     <string name="poi_weightbridge">ميزان المركبات</string>
     <string name="poi_ranger_station">مكتب الحارس</string>
+    <string name="poi_diplomatic_services_citizen_services_filter">خدمات المواطن</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">تأشيرات الهجرة</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">تأشيرات لغير المهاجرين</string>
+    <string name="poi_liaison_filter">اتصال</string>
+    <string name="poi_consulate_filter">قنصلية</string>
+    <string name="poi_embassy_filter">سفارة</string>
+    <string name="poi_wildlife_crossing_bat_tunnel">نفق خفافيش</string>
+    <string name="poi_wildlife_crossing_bat_bridge">جسر خفافيش</string>
+    <string name="poi_wildlife_crossing">معبر الحيوانات البرية</string>
 </resources>

OsmAnd/res/values-ar/strings.xml

@@ -1554,7 +1554,6 @@
     <string name="contact_us">اتصل بنا</string>
     <string name="poi_context_menu_modify_osm_change">تعديل OSM</string>
     <string name="dashboard_or_drawer_title">لوحة التحكم أو شريط المراقبة</string>
-    <string name="update">التحديث</string>
     <string name="only_download_over_wifi">Wi-Fi فقط</string>
     <string name="live_update">تحديث مباشر</string>
     <string name="last_update">آخر تحديث: %s</string>
@@ -2827,7 +2826,7 @@
     <string name="touring_view_render_descr">أسلوب الملاحة مع التباين العالي والحد الأعلى من التفاصيل. يتضمن كل خيارات النمط الافتراضي أوسماند، مع عرض أكبر قدر ممكن من التفاصيل ، ولا سيما الطرق والمسارات وطرق السفر الأخرى. التمييز الواضح بين \"جولة الأطلس\" بين أنواع الطرق. مناسبة للاستخدام النهاري والليلي وفي الهواء الطلق.</string>
     <string name="default_render_descr">أسلوب الغرض العام. تقديم نظافة مبسطة في المدن المكتظة بالسكان. الملامح الرئيسية: خطوط الكنتور ، والطرق ، وجودة السطح ، والقيود المفروضة على الوصول ، ودروع الطريق ، والمسارات التي تظهر وفقاً لمقياس SAC ، وميزات رياضة الماء الأبيض.</string>
     <string name="travel_card_download_descr">قم بتنزيل أدلة السفر هذه من ويكي الرحلات لعرض مقالات حول الأماكن في العالم بدون إنترنت.</string>
-    <string name="welcome_to_open_beta_description">دليل السفر حاليا على أساس Wikivoyage. اختبار كافة الميزات أثناء اختبار بيتا المفتوحة مجانا.بعد ذلك، وأدلة السفر ستكون متاحة للمشتركين في أوسماند غير المحدود و اصحاب +أوسماند.</string>
+    <string name="welcome_to_open_beta_description">دليل السفر حاليا على أساس Wikivoyage. اختبار كافة الميزات أثناء اختبار بيتا المفتوحة مجانا.</string>
     <string name="av_locations_selected_desc">ملف GPX مع الإحداثيات والبيانات من الملاحظات المحددة.</string>
     <string name="av_locations_all_desc">ملف GPX مع الإحداثيات والبيانات من كافة الملاحظات.</string>
     <!--string name="release_3_0">• جديد: دعم للسفر دون اتصال عالمية وأدلة. وترتبط المواقع المشار إليها على الخريطة. الحصول على البيانات الأولية من ويكيفوياجي.
@@ -3128,7 +3127,6 @@
     <string name="turn_screen_on_info">إظهار الخريطة على شاشة القفل أثناء التنقل.</string>
     <string name="wake_time">المهلة بعد الاستيقاظ</string>
     <string name="units_and_formats">الوحدات والأشكال</string>
-    <string name="appearance">المظهر</string>
     <string name="map_look_descr">مظهر الخريطة</string>
     <string name="map_look">نظرة علي الخريطة</string>
     <string name="list_of_installed_plugins">الإضافات المثبتة</string>
@@ -3357,8 +3355,8 @@
     <string name="sett_generic_ext_input">لوحة المفاتيح</string>
     <string name="sett_wunderlinq_ext_input">وندرلينك</string>
     <string name="sett_parrot_ext_input">ببغاء</string>
-    <string name="new_route_calculated_dist_dbg">المسار: المسافة%s، وقت التوجيه %s.
-\nالحساب: %.1f ث، %d طريق، %d تجانب)</string>
+    <string name="new_route_calculated_dist_dbg">المسار: المسافة%2$s، وقت التوجيه %1$s.
+\nالحساب: %3$.1f ث، %4$d طريق، %5$d تجانب)</string>
     <string name="lang_oc">الأوكيتانية</string>
     <string name="get_discount_second_part">ثم %1$s</string>
     <string name="apply_to_current_profile">تطبيق فقط على \"%1$s\"</string>
@@ -3549,7 +3547,6 @@
     <string name="select_distance_route_will_recalc">حدد المسافة التي سيتم بعدها إعادة حساب المسار.</string>
     <string name="recalculate_route_in_deviation">إعادة حساب المسار في حالة الانحراف</string>
     <string name="shared_string_square">مربع</string>
-    <string name="shared_string_rhomb">معين</string>
     <string name="shared_string_circle">دائرة</string>
     <string name="select_shape">تحديد الشكل</string>
     <string name="select_group">تحديد المجموعة</string>
@@ -3699,7 +3696,6 @@
     <string name="screen_control">التحكم في الشاشة</string>
     <string name="system_screen_timeout_descr">إيقاف تشغيل الشاشة بعد انتهاء مهلة شاشة النظام.</string>
     <string name="system_screen_timeout">استخدام مهلة انطفاء شاشة النظام</string>
-    <string name="turn_screen_on_options_descr">خيارات تنبيه الشاشة:</string>
     <string name="turn_screen_on_descr">حدد خيارات تنبيه الشاشة (تأكد من وجود أوسماند في المقدمة عند قفل الجهاز):</string>
     <string name="turn_screen_on_navigation_instructions_descr">ستقوم كل تعليمات تنقل بتشغيل الشاشة.</string>
     <string name="turn_screen_on_navigation_instructions">تعليمات الملاحة</string>
@@ -3743,7 +3739,6 @@
     <string name="shared_string_meters">أمتار</string>
     <string name="details_dialog_decr">إظهار أو إخفاء التفاصيل الإضافية للخريطة</string>
     <string name="shared_string_night_map">خريطة ليلية</string>
-    <string name="shared_string_all_time">كل الوقت</string>
     <string name="turn_screen_on_power_button_disabled">ذوي الاحتياجات الخاصه. يتطلب \"إبقاء الشاشة قيد تشغيل\" تحت \"المهلة بعد الاستيقاظ\".</string>
     <string name="vessel_height_limit_description">ضبط الارتفاع لتجنب الجسور المنخفضة. ضع في اعتبارك أنه إذا كان الجسر متحركاً ، فسوف نستخدم ارتفاعه في الحالة المفتوحة.</string>
     <string name="add_online_source">إضافة مصدر عبر الإنترنت</string>
@@ -3905,7 +3900,6 @@
     <string name="development">تطوير</string>
     <string name="use_live_public_transport">بيانات أوسماند لايف</string>
     <string name="use_live_routing">بيانات أوسماند لايف</string>
-    <string name="use_complex_routing">التوجيه المركب</string>
     <string name="complex_routing_descr">التوجيه على مرحلتين لملاحة السيارة.</string>
     <string name="use_native_pt">تطوير النقل العام المحلي</string>
     <string name="use_native_pt_desc">قم بالتبديل إلى جافا (الآمن) حساب توجيه النقل العام</string>
@@ -4015,4 +4009,58 @@
     <string name="routing_attr_allow_intermittent_description">السماح بالممرات المائية المتقطعة</string>
     <string name="routing_attr_allow_intermittent_name">السماح بالممرات المائية المتقطعة</string>
     <string name="voice_prompts_timetable">مطالبة صوتية</string>
+    <string name="add_online_routing_engine">إضافة محرك توجيه عبر الإنترنت</string>
+    <string name="edit_online_routing_engine">تعديل محرك التوجيه عبر الإنترنت</string>
+    <string name="shared_string_subtype">النوع الفرعي</string>
+    <string name="shared_string_vehicle">مركبة</string>
+    <string name="shared_string_api_key">مفتاح API</string>
+    <string name="keep_it_empty_if_not">احتفظ بها فارغة إذا لم تكن كذلك</string>
+    <string name="shared_string_server_url">عنوان URL السيرفر</string>
+    <string name="shared_string_enter_param">أدخل المعيار</string>
+    <string name="online_routing_example_hint">عنوان موقع URL مع جميع المعايير سوف يبدو مثل هذا:</string>
+    <string name="test_route_calculation">اختبار حساب مسار</string>
+    <string name="routing_engine_vehicle_type_driving">القيادة</string>
+    <string name="routing_engine_vehicle_type_foot">قدم</string>
+    <string name="routing_engine_vehicle_type_bike">دراجة هوائية</string>
+    <string name="routing_engine_vehicle_type_car">سيارة</string>
+    <string name="copy_address">نسخ العنوان</string>
+    <string name="online_routing_engine">محرك التوجيه عبر الإنترنت</string>
+    <string name="online_routing_engines">محركات التوجيه عبر الإنترنت</string>
+    <string name="shared_string_folders">المجلدات</string>
+    <string name="select_folder">تحديد مجلد</string>
+    <string name="select_folder_descr">تحديد مجلد أو إضافة واحد جديد</string>
+    <string name="shared_string_empty">فارغ</string>
+    <string name="analyze_by_intervals">التحليل حسب الفواصل الزمنية (الفاصل الزمني)</string>
+    <string name="upload_to_openstreetmap">رفع إلى خريطة الشارع المفتوح</string>
+    <string name="edit_track">تحرير المسار</string>
+    <string name="rename_track">تسمية المسار</string>
+    <string name="change_folder">تغيير المجلد</string>
+    <string name="shared_string_sec">ثانية</string>
+    <string name="announcement_time_passing">تمرير</string>
+    <string name="announcement_time_approach">طريقة</string>
+    <string name="announcement_time_prepare_long">تحضير طويل</string>
+    <string name="announcement_time_prepare">إعداد</string>
+    <string name="announcement_time_off_route">إيقاف المسار</string>
+    <string name="announcement_time_arrive">الوصول إلى الوجهة</string>
+    <string name="shared_string_turn">منعطف</string>
+    <string name="announcement_time_intervals">الوقت والمسافة</string>
+    <string name="announcement_time_descr">وقت الإعلان عن مختلف المطالبات الصوتية يعتمد على نوع موجه، وسرعة التنقل الحالية وسرعة التنقل الافتراضية.</string>
+    <string name="announcement_time_title">وقت الإعلان</string>
+    <string name="start_recording">بدء التسجيل</string>
+    <string name="show_track_on_map">عرض المسار على الخريطة</string>
+    <string name="routing_engine_vehicle_type_wheelchair">منحدرات</string>
+    <string name="routing_engine_vehicle_type_hiking">مشي</string>
+    <string name="routing_engine_vehicle_type_walking">مشي</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">ركوب الدراجات الكهربائية</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">ركوب الدراجات الجبلية</string>
+    <string name="routing_engine_vehicle_type_cycling_road">ركوب الدراجات على الطرق</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">ركوب الدراجات</string>
+    <string name="routing_engine_vehicle_type_hgv">مركبات الحمولة الثقيلة</string>
+    <string name="routing_engine_vehicle_type_small_truck">شاحنة صغيرة</string>
+    <string name="routing_engine_vehicle_type_truck">شاحنة</string>
+    <string name="routing_engine_vehicle_type_scooter">سكوتر</string>
+    <string name="routing_engine_vehicle_type_racingbike">سباق الدراجات</string>
+    <string name="routing_engine_vehicle_type_mtb">MTB</string>
+    <string name="message_server_error">خطأ في الخادم: %1$s</string>
+    <string name="message_name_is_already_exists">الاسم موجود بالفعل</string>
 </resources>

OsmAnd/res/values-az/phrases.xml

@@ -97,7 +97,7 @@
 	<string name="poi_lighting_tower">İşıq qülləsi</string>
 	<string name="poi_recycling">Təkrar emal</string>
 
-	<string name="poi_recycling_container">Konteyner</string>
+    <string name="poi_recycling_container">Konteyner</string>
 	<string name="poi_recycling_glass">Şüşə</string>
 	<string name="poi_recycling_paper">Kağız</string>
 	<string name="poi_recycling_clothes">Geyimlər</string>
@@ -129,7 +129,7 @@
 	<string name="poi_tunnel">Tunel</string>
 	<string name="poi_bridge">Körpü</string>
 
-	<string name="poi_speed_camera">Sürət kamerası</string>
+    <string name="poi_speed_camera">Sürət kamerası</string>
 	<string name="poi_recycling_newspaper">Qəzet</string>
 	<string name="poi_recycling_mobile_phones">Mobil telefonlar</string>
 	<string name="poi_recycling_computers">Kompyuterlər</string>
@@ -138,12 +138,12 @@
 	<string name="poi_recycling_cars">Avtomobillər</string>
 	<string name="poi_recycling_bicycles">Velosipedlər</string>
 
-	<string name="poi_college">Kollec</string>
+    <string name="poi_college">Kollec</string>
 	<string name="poi_driving_school">Sürücülük məktəbi</string>
 	<string name="poi_school">Məktəb</string>
 	<string name="poi_university">Universitet</string>
 
-	<string name="poi_country">Ölkə</string>
+    <string name="poi_country">Ölkə</string>
 	<string name="poi_city">Şəhər</string>
 	<string name="poi_stadium">Stadion</string>
 	<string name="poi_sports_centre">İdman mərkəzi</string>
@@ -151,7 +151,7 @@
 <string name="poi_cafe">Kafe</string>
 	<string name="poi_internet_cafe">İnternet kafe</string>
 
-	<string name="poi_operational_status_open">Açıq</string>
+    <string name="poi_operational_status_open">Açıq</string>
 	<string name="poi_operational_status_closed">Bağlı</string>
 	<string name="poi_water_place_access_family">Ailə</string>
 	<string name="poi_service_vehicle_batteries_yes">Batareyalar</string>

OsmAnd/res/values-az/strings.xml

@@ -45,7 +45,6 @@
     <string name="no_inet_connection">İnternet bağlantısı yoxdur</string>
     <string name="search_location">Məkan axtarılır…</string>
     <string name="storage_free_space">Boş yaddaş</string>
-    <string name="no_update_info">Yeni versiyaları göstərmə</string>
     <string name="int_continuosly">Davam et</string>
     <string name="shared_string_change">Dəyiş</string>
     <string name="get_started">Başla</string>
@@ -725,7 +724,6 @@
     <string name="versions_item">Versiyalar</string>
     <string name="contact_us">Əlaqə</string>
     <string name="use_drawer_btn">Menyu istifadə et</string>
-    <string name="update">Yenilə</string>
     <string name="only_download_over_wifi">Yalnız Wi-Fi ilə endir</string>
     <string name="update_now">İndi yenilə</string>
     <string name="last_update">Son yeniləmə: %s</string>
@@ -788,8 +786,6 @@
     <string name="rendering_attr_contourDensity_name">Kontur xəttinin sıxlığı</string>
     <string name="rendering_attr_contourWidth_description">Kontur xəttinin genişliyi</string>
     <string name="rendering_attr_contourWidth_name">Kontur xəttinin genişliyi</string>
-    <string name="legacy_search">Köhnə axtarış</string>
-    <string name="show_legacy_search">Köhnə axtarışı göstər</string>
     <string name="upload_osm_note_description">OSM qeydinizi anonim və ya OpenStreetMap.org profilinizi istifadə edərək yükləyin.</string>
     <string name="wiki_around">Yaxındakı Vikipediya məqalələri</string>
     <string name="search_map_hint">Şəhər və ya ölkə axtarın</string>
@@ -1099,7 +1095,6 @@
     <string name="error_calculating_route">Marşrut hesablana bilmədi.</string>
     <string name="error_calculating_route_occured">Marşrut hesablana bilmədi.</string>
     <string name="empty_route_calculated">Hesablanan marşrut boşdur.</string>
-    <string name="new_route_calculated_dist">Yeni marşrut hesablandı, məsafə</string>
     <string name="arrived_at_destination">Təyinat nöqtənizə gəlib çatdınız</string>
     <string name="invalid_locations">Yanlış koordinatlar</string>
     <string name="use_online_routing_descr">Marşrutu hesablamaq üçün internet istifadə et.</string>
@@ -1268,7 +1263,6 @@
     <string name="first_usage_wizard_desc">OsmAnd-a məkanınızı müəyyənləşdirmək və həmin region üçün xəritə endirməsi təklif etmək icazəsi verin.</string>
     <string name="give_permission">İcazə ver</string>
     <string name="first_usage_greeting">İnternet bağlantısı olmadan istiqamətlər alın və yeni yerlər kəşf edin</string>
-    <string name="no_update_info_desc">Yeni versiyaları və ya OsmAnd ilə bağlı endirimləri yoxlama.</string>
     <string name="access_disable_offroute_recalc">Çıxanda marşrut yenidən hesablanmasın</string>
     <string name="access_disable_wrong_direction_recalc">Əks istiqamət üçün marşrut yenidən hesablanmasın</string>
     <string name="recalculate_route">Marşrutu yenidən hesabla</string>
@@ -1967,7 +1961,6 @@
     <string name="access_smart_autoannounce_descr">Yalnız hədəf nöqtəyə istiqamət dəyişilən zaman bildir.</string>
     <string name="plugin_mapillary_descr">Hər kəs üçün küçə səviyyəli şəkillər. Yerləri kəşf edin, əməkdaşlıq edin, dünyanı çəkin.</string>
     <string name="auto_split_recording_descr">6 dəqiqə fasilədən sonra yeni seqment, 2 saat fasilədən sonra yeni iz, ya da tarix dəyişdiyində uzun fasilədən sonra yeni fayl başlat.</string>
-    <string name="show_legacy_search_desc">Menyuya köhnə axtarışı əlavə et.</string>
     <string name="save_track_min_distance">Qeydiyyatın minimum yerdəyişməsi</string>
     <string name="save_track_min_distance_descr">Filtr: Nöqtənin qeydiyyatı üçün son mövqedən minimum məsafəni seçin.</string>
     <string name="save_track_precision">Qeydiyyatın minimum dəqiqliyi</string>

OsmAnd/res/values-b+ast/strings.xml

@@ -622,7 +622,6 @@
     <string name="exit_without_saving">¿Colar ensin guardar\?</string>
     <string name="line">Llinia</string>
     <string name="shared_string_options">Opciones</string>
-    <string name="no_update_info">Nun amosar anovamientos</string>
     <string name="index_name_openmaps">OpenMaps EU</string>
     <string name="local_indexes_cat_av">Datos d\'audiu/videu</string>
     <string name="dropbox_plugin_name">Plugin pa Dropbox</string>
@@ -1181,7 +1180,6 @@
     <string name="renderers_descr">Esceuyi l\'aspeutu del renderizáu.</string>
     <string name="show_route">Detalles de la ruta</string>
     <string name="layer_map">Fonte del mapa…</string>
-    <string name="new_route_calculated_dist">Calculóse una ruta nueva, distancia</string>
     <string name="app_settings">Axustes de l\'aplicación</string>
     <string name="add_favorite_dialog_favourite_added_template">Amestóse\'l puntu favoritu «{0}».</string>
     <string name="av_camera_pic_size_descr">Esbilla\'l tamañu de les semeyes de la cámara interna.</string>
@@ -1220,7 +1218,7 @@
     <string name="popular_destinations">Destinos sonaos</string>
     <string name="paid_app">Aplicación de pagu</string>
     <string name="paid_plugin">Plugin de pagu</string>
-    <string name="welcome_to_open_beta_description">Anguaño les guíes de viaxes básense en Wikivoyage. Prueba de baldre toles carauterístiques na beta abierta. Dempués, eses guíes van tar disponibles pa los soscriptores d\'OsmAnd Unlimited y dueños dOsmAnd +.</string>
+    <string name="welcome_to_open_beta_description">Anguaño les guíes de viaxes básense en Wikivoyage. Prueba de baldre toles carauterístiques na beta abierta.</string>
     <string name="start_editing_card_description">Puedes y tendríes d\'editar cualesquier artículu de Wikivoyage. Comparti la conocencia, esperiencia, talentu y atención</string>
     <string name="get_unlimited_access">Consiguir l\'accesu ensin llende</string>
     <string name="all_markers_moved_to_history">Tolos marcadores del mapa moviéronse al historial</string>

OsmAnd/res/values-b+be+Latn/strings.xml

@@ -1266,7 +1266,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="error_calculating_route">Nie ŭdalosia različyć maršrut</string>
     <string name="error_calculating_route_occured">Nie ŭdalosia različyć maršrut</string>
     <string name="empty_route_calculated">Različany maršrut pusty</string>
-    <string name="new_route_calculated_dist">Novy šlach raźličany, adlehłaść</string>
     <string name="arrived_at_destination">Vy prybyli ŭ punkt pryznačeńnia</string>
     <string name="invalid_locations">Niesapraŭdnyja kaardynaty</string>
     <string name="go_back_to_osmand">Viarnucca da mapy OsmAnd</string>
@@ -1359,7 +1358,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="osb_comment_dialog_error">Nie atrymalasia dadać kamientar</string>
     <string name="poi_edit_title">Pravіć POI</string>
     <string name="poi_create_title">Stvaryć POI</string>
-    <string name="poi_error_poi_not_found">Vuziel nie znojdzieny abo zručnasć (amenity) skladajecca z niekaĺkich vuzloŭ, što nie padtrymlivajecca.</string>
     <string name="poi_remove_confirm_template">Vydalić {0} (kamientar)?</string>
     <string name="poi_remove_title">Vydalić POI</string>
     <string name="shared_string_delete">Vydalić</string>
@@ -1940,7 +1938,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="use_drawer_btn">Vykarystoŭvać meniu</string>
     <string name="dashboard_or_drawer_title">Panel kіravańnia cі meniu</string>
     <string name="dashboard_or_drawer_description">Prapanujecca vybar asnoŭnaha eliemientu kiravannia prahramaju praz paneĺ kiravannia abo statyčnaje mieniu. Vaš vybar moža być zmienieny ŭ naladach haloŭnaha ekrana.</string>
-    <string name="update">Abnavіć kožny</string>
     <string name="only_download_over_wifi">Ściahvać toĺki praz Wi-Fi</string>
     <string name="live_update">Biahučaje abnaŭleńnie</string>
     <string name="update_now">Abnavіć zaraz</string>
@@ -1983,8 +1980,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="allow_access_location">Dazvolić dostup da miescaznachodžańnia</string>
     <string name="first_usage_greeting">Prakladvajcie maršruty i adkryvajcie novyja miescy biez Internet-padlučennia</string>
     <string name="search_my_location">Znajsci maju pazicyju</string>
-    <string name="no_update_info_desc">Nie praviarać novyja viersij i znižki ad OsmAnd.</string>
-    <string name="no_update_info">Nie pakazvać novyja viersii</string>
     <string name="update_all_maps_now">Abnavić usie mapy zaraz?</string>
     <string name="clear_tile_data">Ačyścіć keš siecіŭnych mapaŭ</string>
     <string name="routing_attr_short_way_name">Paliŭna-aščadny maršrut</string>
@@ -2232,9 +2227,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="rendering_value_low_name">Nizkaja</string>
     <string name="rendering_attr_contourWidth_name">Taŭščynia haryzantaliaŭ</string>
     <string name="rendering_value_high_name">Vysokaja</string>
-    <string name="legacy_search">Sastarely pošuk</string>
-    <string name="show_legacy_search">Pakazvać sastarely pošuk</string>
-    <string name="show_legacy_search_desc">Dadać sastarely pošuk u spisie, što raskryvajecca.</string>
     <string name="wiki_around">Blizkija artykuly ŭ Vikipedyi</string>
     <string name="route_roundabout_short">Zbočcie na %1$d źjeździe</string>
     <string name="gpx_no_tracks_title">U vas jašče niama GPX-fajlaŭ</string>
@@ -2710,7 +2702,7 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="update_is_available">Abnaŭliennie dastupnaje</string>
     <string name="download_file">Spampavać fajl</string>
     <string name="start_editing_card_image_text">Biasplatny susvietny turystyčny daviednik, jaki moža redahavać kožny.</string>
-    <string name="welcome_to_open_beta_description">Turystyčnyja daviedniki ŭ ciapierašni čas bazujucca na asnovie Wikivoyage. Testujcie usie funkcyi biasplatna padčas adkrytaha beta-testavannia. Potym daviedniki buduć dastupnyja padpiščykam OsmAnd Unlimited i ŭladaĺnikam OsmAnd+.</string>
+    <string name="welcome_to_open_beta_description">Turystyčnyja daviedniki ŭ ciapierašni čas bazujucca na asnovie Wikivoyage. Testujcie usie funkcyi biasplatna padčas adkrytaha beta-testavannia.</string>
     <string name="start_editing_card_description">Vam možna i varta redahavać liuby artykul na Wikivoyage. Dzialiciesia viedami, vopytam, talientam i vašaj ŭvahaj</string>
     <string name="start_editing">Pačać redahavańnie</string>
     <string name="get_unlimited_access">Atrymać nieabmiežavany dostup</string>
@@ -2741,17 +2733,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="shared_string_travel_book">Dzionnik padarožžaŭ</string>
     <string name="download_images">Spampavać vyjavy</string>
     <string name="error_notification_desc">Kali laska, adpraŭcie zdymak ekrana z hetym apaviaščenniem na support@osmand.net</string>
-    <string name="release_3_0">• Novaje: padtrymka svietavych aŭtanomnych turystyčnych daviednikaŭ. Spasylačnyja miasciny zviazany z mapaj. Zychodnyja danyja ad Wikivoyage. 
-\n 
-\n • Vikipiedyja: novy vyhliad, aktyŭnyja spasylki, padtrymka vyjaŭ 
-\n 
-\n • Open Track UI: padtrymka hrup šliachavych kropak 
-\n 
-\n • Paznaki mapy: impart abranych hrup z GPX-fajlaŭ, uvod kaardynat, novy vyhliad 
-\n 
-\n • Padpiska OsmAnd Live ciapier padtrymlivaje ŭsie funkcyi OsmAnd 
-\n 
-\n</string>
     <string name="access_intermediate_arrival_time">Pramiežkavy čas prybyccia</string>
     <string name="map_widget_intermediate_time">Pramiežkavy čas</string>
     <string name="download_wikipedia_description">Spampavać artykuly Vikipedyi dlia %1$s dlia aŭtanomnaha čytannia.</string>
@@ -2770,30 +2751,13 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="shared_string_world">Sviet</string>
     <string name="send_search_query_description">My adpravim vaš pašukovy zapyt «%1$s», a taksama vašaje miescaznachodžannie. \n
         \n Zbirajucca toĺki niepierasanaĺnyja danyja, danyja pošuku vykarystoŭvajucca toĺki dlia taho, kab paliepšyć alharytm pošuku.</string>
-    <string name="search_no_results_description">Niama vynikaŭ?
-\nRaspaviadzicie nam ab hetym.</string>
     <string name="send_search_query">Adpravić pašukovy zapyt?</string>
     <string name="increase_search_radius_to">Pavialičyć radyus pošuku da %1$s</string>
     <string name="thank_you_for_feedback">Dziakuj za Vaš vodhuk</string>
     <string name="poi_cannot_be_found">Vuziel ci šliach nie znajdzieny.</string>
     <string name="search_no_results_feedback">Niama vynikaŭ pošuku?
 \nDajcie nam vodhuk</string>
-    <string name="commiting_way">Fiksujecca šliach…</string>
     <string name="test_voice_desrc">Nacisnicie na knopku i pasluchajcie adpaviednuju halasavuju padkazku, kab vyznačyć adsutnyja abo paškodžanyja padkazki.</string>
-    <string name="release_3_1">• Navihacyja: vypraŭliennie indykataru prahresu, chutkaja zamiena pačatkovaha i kančatkovaha punktaŭ maršrutu
-\n 
-\n• Adznaki mapy: vypraŭliennie ŭkliučennia/vykliučennia hrupaŭ, mahčymasć chavać adznaki na mapie
-\n 
-\n• Redahavannie OSM: mahčymasć redahavannia paznak dlia niekropkavych abjektaŭ i šliachoŭ, vypraŭliennie adsutnych kamientaroŭ na natatkach, reziervovaje kapijavannie pravak
-\n 
-\n• Paliapšennie razboru Wikipedia i Wikivoyage, abnoŭlienyja fajly ŭžo dastupnyja
-\n
-\n• Kantekstnaje mieniu: vypraŭliennie kolieru darožnych znakaŭ u načnym režymie, vypraŭliennie pamieraŭ dadatkovaha mieniu
-\n 
-\n• Račnaja navihacyja: padtrymka farvateru
-\n 
-\n• Vypraŭliennie inšych chibaŭ
-\n</string>
     <string name="markers_remove_dialog_msg">Vydalić adznaku mapy «%s»\?</string>
     <string name="edit_map_marker">Redahavać paznaku mapy</string>
     <string name="third_party_application">Asobny dadatak</string>
@@ -2804,20 +2768,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="keep_passed_markers">Pakinuć projdzienyja paknaki na mapie</string>
     <string name="more_transport_on_stop_hint">Na hetym prypynku josć boĺš hramadskaha transpartu.</string>
     <string name="ask_for_location_permission">Kali laska, dajcie OsmAnd dazvol na miescaznachodžannie dlia praciahu.</string>
-    <string name="release_3_2_pre">• Vypraŭliena chiba pry zapusku, što ŭznikala na niekatorych pryladach
-\n 
-\n• Novyja funkcyi adznak: pakazvajucca ŭžo projdziennyja adznaki
-\n 
-\n• Historyja pošuku zaraz pakazvaje katehoryi, što vy šukali raniej
-\n 
-\n• Vypraŭliena chiba pry zapusku, što ŭznikala z nielacinskimi mapami
-\n 
-\n• Paliapšennie chutkasci admalioŭki na pryladach z Android 8.0
-\n 
-\n• Padtrymka redahavannia šmatvuhoĺnych (niazručnych) abjektaŭ
-\n 
-\n• Vymiarennie dystancyj: dadadziena knopka «Vymiarennie» ŭ «Dziejanni» kantekstnaha mieniu
-\n</string>
     <string name="rendering_value_black_name">Čorny</string>
     <string name="osm_live_plan_pricing">Plan i ceny</string>
     <string name="osm_live_payment_monthly_title">Štomiesiačna</string>
@@ -2888,22 +2838,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="routeInfo_surface_name">Pavierchnia</string>
     <string name="routeInfo_smoothness_name">Hladkasć</string>
     <string name="routeInfo_steepness_name">Pakatasć</string>
-    <string name="release_3_3">• Novy ekran «Napramki»: adliustroŭvaje knopki napramkaŭ dachaty i na pracu, skarot «papiaredni maršrut», spis aktyŭnych GPX-sliadoŭ i adznak, historyju pošuku
-\n
-\n • Dadatkovyja zviestki pad «Detali maršrutu»: typy daroh, pakryccio, pakatasć, hladkasć
-\n
-\n • Navihacyja hramadskaha transpartu padtrymlivaje ŭsie typy: mietro, aŭtobus, tramvaj i inšyja
-\n
-\n • Novyja chutkija dziejanni dlia pakazu/schovu sliadoŭ i režymaŭ dzień/noč
-\n
-\n • Vypraŭlienyja voblasci, jakija vyhliadali jak zatoplienyja, u Hiermanii, Paŭdniovajo Afrycy, Kviebieku
-\n
-\n • Dadatkovaja padtrymka dlia KML- i KMZ-impartu
-\n
-\n • Vypraŭliena padziennie pry adkrycci niekatorych prypynkaŭ hramadskaha transpartu
-\n
-\n • Vydaliena analityka Facebook i Firebase sa svabodnaj viersii (OsmAnd+ nie ŭkliučaje jaje)
-\n</string>
     <string name="use_osm_live_public_transport_description">Ukliučyć hramadski transpart dlia zmien OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Hramadski transpart OsmAnd Live</string>
     <string name="routing_attr_avoid_tram_name">Pazbiahać tramvajaŭ</string>
@@ -2918,11 +2852,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="routing_attr_avoid_subway_description">Pazbiahać mietro i liohkarejkavaha transpartu</string>
     <string name="routing_attr_avoid_ferry_name">Pazbiahać paromaŭ</string>
     <string name="routing_attr_avoid_ferry_description">Pazbiahać paromaŭ</string>
-    <string name="release_3_3_7">• Adliustravannie času pamiž pierasadkami ŭ hramadskim transparcn
-\n • Vypraŭlieny interfiejs \"Padrabiaznasci maršrutu\"
-\n • Vypraŭliena ciomnaja tema dlia \"Maršrut\" i \"Padrabiaznasci maršrutu\"
-\n • Pry vymiarenni adliehlasci budzie adliustroŭvacca azimut
-\n</string>
     <string name="shared_string_degrees">Hradusy</string>
     <string name="shared_string_milliradians">Miliradyjany</string>
     <string name="angular_measeurement">Adzinki vuhloŭ</string>

OsmAnd/res/values-b+hsb/phrases.xml

@@ -87,7 +87,6 @@
     <string name="poi_florist">Kwětkarnja</string>
     <string name="poi_frame">Wobrazowe ramiki</string>
     <string name="poi_free_flying">free flying</string>
-    <string name="poi_furnace">Tepjenski wobchod</string>
     <string name="poi_furniture">Meblowy wobchod</string>
     <string name="poi_garden_centre">Zahrodniske potrjeby</string>
     <string name="poi_garden_furniture">Zahrodowe meble</string>
@@ -1290,7 +1289,6 @@
     <string name="poi_inscription_e">napismo:W</string>
     <string name="poi_inscription_ne">napismo:SW</string>
     <string name="poi_construction_yes">pod konstrukciju</string>
-    <string name="poi_additional_atm_yes">bankomat: haj</string>
     <string name="poi_atm_no">bankomat: ně</string>
     <string name="poi_protected_area">škitane pasmo</string>
     <string name="poi_addr_housename">mjeno domu</string>
@@ -1619,7 +1617,6 @@
     <string name="poi_smoking_area">kurjenski wobłuk</string>
     <string name="poi_mortuary">ćěłownja</string>
     <string name="poi_internet_cafe">internetownja</string>
-    <string name="poi_amenity_atm">bankomat</string>
     <string name="poi_payment_terminal">płaćenski terminal</string>
     <string name="poi_pawnbroker">zastawnja</string>
     <string name="poi_bureau_de_change">měnjernja</string>

OsmAnd/res/values-b+hsb/strings.xml

@@ -753,7 +753,6 @@
     <string name="error_calculating_route">Njemóžach čaru wobličić</string>
     <string name="error_calculating_route_occured">Njemóžach čaru wobličić</string>
     <string name="empty_route_calculated">Wobličena čara je prózdna</string>
-    <string name="new_route_calculated_dist">Nowa čara wobličena, zdalenosć</string>
     <string name="arrived_at_destination">Cil docpěty</string>
     <string name="invalid_locations">Njepłaćiwe koordinaty</string>
     <string name="go_back_to_osmand">Wróćo k OsmAnd</string>
@@ -1142,7 +1141,6 @@
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="other_menu_group">druhe</string>
     <string name="planning_trip_item">Jězbu planować</string>
-    <string name="update">Aktualizowanje</string>
     <string name="last_update">Poslednje aktualizowanje: %s</string>
     <string name="last_map_change">Poslednja změna karty: %s</string>
     <string name="weekly">tydźensce</string>
@@ -1246,7 +1244,6 @@
     <string name="new_filter">Nowy filter</string>
     <string name="osmand_plus_banner_desc">Njewobmjezowane sćehnjenje kartow, aktualizacijow a zapiski Wikipedije.</string>
     <string name="search_my_location">Moje stejišćo namakać</string>
-    <string name="no_update_info">Nowe wersije njepokazać</string>
     <string name="update_all_maps_now">Wšitke karty nětko aktualizować?</string>
     <string name="replace_favorite_confirmation">Sy sej wěsty/a, zo chceš narunać faworit %1$s?</string>
     <string name="coords_search">Pytanje za koordinatami</string>

OsmAnd/res/values-b+kab/strings.xml

@@ -194,7 +194,6 @@
     <string name="update_all">Sedɣi iten akk (%1$s MB)</string>
     <string name="enter_country_name">Sekcem isem n tmurt</string>
     <string name="other_menu_group">Wayeḍ</string>
-    <string name="update">Sedγi</string>
     <string name="update_now">Sedɣi tura</string>
     <string name="last_update">Asedɣi aneggaru : %s</string>
     <string name="update_time">Tallit n trarast</string>
@@ -216,7 +215,6 @@
     <string name="live_updates">Isdɣiten usriden</string>
     <string name="route_duration">Tanazagt :</string>
     <string name="no_inet_connection">Ulac tuqqna n Internet</string>
-    <string name="no_update_info">Ur d skanay isdγiten</string>
     <string name="shared_string_change">Senfel</string>
     <string name="restart_search">Ɛiwed a nadi</string>
     <string name="shared_string_search">Nadi</string>
@@ -660,7 +658,6 @@
     <string name="apply_to_current_profile">Snes kan i \"%1$s\"</string>
     <string name="apply_to_all_profiles">Snes i imavnuyen meṛṛa</string>
     <string name="start_up_message_pref">Izen n usenker</string>
-    <string name="appearance">Arwes</string>
     <string name="configure_profile">Sbadu amaɣnu</string>
     <string name="switch_profile">Beddel amaɣnu</string>
     <string name="application_profile_changed">Amaɣnu n usnas ittwabddel ɣer \"%s\"</string>
@@ -686,7 +683,6 @@
     <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
     <string name="rendering_value_thick_name">Zzur</string>
     <string name="personal_category_name">Udmawan</string>
-    <string name="street_city">%1$s, %2$s</string>
     <string name="shared_string_revert">Tti</string>
     <string name="rendering_value_white_name">Amellal</string>
     <string name="shared_string_maps">Tikarḍiwin</string>

OsmAnd/res/values-b+sr+Latn/strings.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
     <string name="about_version">Verzija:</string>
-    
     <string name="about_settings_descr">Verzija info, licence, članovi projekta</string>
-    
     <string name="av_photo_play_sound_descr">Izaberite da li da se čuje zvuk prilikom snimanja fotografija</string>
 <string name="av_camera_focus_infinity">Fokus je podešen na beskonačno</string>
 	<string name="av_camera_focus_macro">Makro režim fokusa</string>
@@ -16,8 +14,7 @@
     <string name="shared_string_or">ili</string>
 	<string name="auto_zoom_none">Bez auto-zuma</string>
 	<string name="base_world_map">Osnovna karta sveta</string>
-	
-	<string name="local_index_tile_data_expire">Ističe(minuta): %1$s</string>
+    <string name="local_index_tile_data_expire">Ističe(minuta): %1$s</string>
     <string name="local_index_tile_data_maxzoom">Maksimalno uveličanje: %1$s</string>
     <string name="edit_tilesource_elliptic_tile">Ekliptični prikaz zemljine kugle</string>
     <string name="edit_tilesource_maxzoom">Maksimalno uveličanje</string>
@@ -31,9 +28,6 @@
 	<string name="driving_region_europe_asia">Evropa i Azija</string>
 	<string name="driving_region_uk">Velika Britanija, Indija, Australija &amp; Ostalo</string>
 	<string name="local_index_tile_data_minzoom">Minimalni zum: %1$s</string>
-    
-    
-    
     <string name="speak_title">Najavi…</string>
 	<string name="speak_descr">Podešavanje najave naziva ulica, saobraćajnih upozorenja, ograničenja brzine</string>
 	<string name="speak_street_names">Obaveštenje - naziv ulice</string>
@@ -48,12 +42,10 @@
     <string name="context_menu_item_directions_from">Uputstvo od</string>
     <string name="route_descr_map_location">Karta : </string>
     <string name="route_descr_lat_lon">Šir %1$.3f, duž %2$.3f</string>
-    
     <string name="route_to">Do:</string>
     <string name="route_via">Preko:</string>
     <string name="route_from">Iz:</string>
-	
-	<string name="app_mode_default">Pregledaj mapu</string>
+    <string name="app_mode_default">Pregledaj mapu</string>
 	<string name="settings_preset">Primarni profil</string>
 	<string name="destination_point">Destinacija %1$s</string>
     <string name="context_menu_item_destination_point">Postavi kao destinaciju</string>
@@ -71,7 +63,6 @@
     <string name="distance_measurement_start_editing">Počnite uređivanje</string>
     <string name="distance_measurement_finish_editing">Završi uređivanje</string>
     <string name="distance_measurement_clear_route">Obrišite sve tačke</string>
-    
     <string name="distance_measurement_load_gpx">Otvori postojeći GPX</string>
     <string name="wait_current_task_finished">Molimo sačekajte dok se ne završi trenutni zadatak</string>
     <string name="use_kalman_filter_compass">Koristite Kalman filter</string>
@@ -95,26 +86,19 @@
     <string name="shared_string_control_start">Počni</string>
     <string name="map_widget_av_notes">Audio/video beleške</string>
     <string name="map_widget_distancemeasurement">Merenje udaljenosti</string>
-    
     <string name="map_widget_audionotes">Audio beleške</string>
     <string name="download_select_map_types">Ostale mape</string>
     <string name="download_roads_only_item">Samo putevi</string>
     <string name="download_srtm_maps">izohipse</string>
     <string name="rendering_attr_noAdminboundaries_name">Sakrij granice</string>
-	
-	<string name="map_widget_max_speed">Ograničenje brzine</string>
+    <string name="map_widget_max_speed">Ograničenje brzine</string>
     <string name="no_buildings_found">Nema pronađenih objekata.</string>
     <string name="incremental_search_city">Traži grad inkrementalno</string>
     <string name="search_villages_and_postcodes">Pretraga sela/Poštanski kod</string>
-	
-	
-	
-	
-	<string name="native_library_not_supported">Nativna biblioteka nije podržana na ovom uređaju .</string>
+    <string name="native_library_not_supported">Nativna biblioteka nije podržana na ovom uređaju .</string>
 	<string name="init_native_library">Pokretanje nativne biblioteke…</string>
 	<string name="choose_auto_follow_route">Autocentriranje mape</string>
-	
-	<string name="pref_vector_map">Podešavanje vektorske mapa</string>
+    <string name="pref_vector_map">Podešavanje vektorske mapa</string>
 	<string name="city_type_suburb">Predgrađe</string>
 	<string name="city_type_village">Selo</string>
 	<string name="city_type_town">Grad</string>
@@ -127,28 +111,22 @@
 	<string name="button_upgrade_osmandplus">Nadogradite Osmand+</string>
 	<string name="map_version_changed_info">Server sadrži mape datoteke koje nisu u skladu sa trenutnim izdanjem aplikacije. Da biste ih preuzeli i koristili, molimo Vas da, nadogradite aplikaciju na novije izdanje.</string>
 	<string name="shared_string_rename">Preimenovanje</string>
-	
-	<string name="poi_filter_nominatim">Online Nominatim</string>
+    <string name="poi_filter_nominatim">Online Nominatim</string>
 	<string name="search_position_address">Adresa …</string>
 	<string name="shared_string_undefined">Neodređeno</string>
-	
-	<string name="layer_map_appearance">Konfiguracija ekrana</string>
+    <string name="layer_map_appearance">Konfiguracija ekrana</string>
 	<string name="show_lanes">Prikaži trake</string>
 	<string name="avoid_unpaved">Izbegavaj neasfaltirane puteve</string>
 	<string name="avoid_ferries">Izbegavaj trajekte</string>
 	<string name="map_widget_fluorescent">Fluorescentne rute</string>
-	
-	<string name="bg_service_sleep_mode_off">Omogući\n režim spavanja</string>
+    <string name="bg_service_sleep_mode_off">Omogući\n režim spavanja</string>
 	<string name="map_widget_top_text">Naziv ulice</string>
 	<string name="map_widget_config">Podešavanje ekrana</string>
 	<string name="map_widget_back_to_loc">Gde sam</string>
 	<string name="map_widget_lock_screen">Zaključaj ekran</string>
 	<string name="map_widget_compass">Kompas</string>
-	
-	<string name="map_widget_reset">Vrati na podrazumevano</string>
-	
-	
-	<string name="map_widget_speed">Brzina</string>
+    <string name="map_widget_reset">Vrati na podrazumevano</string>
+    <string name="map_widget_speed">Brzina</string>
 	<string name="map_widget_distance">Destinacija</string>
 	<string name="map_widget_altitude">Visina</string>
 	<string name="map_widget_next_turn">Sledeće skretanje</string>
@@ -159,24 +137,17 @@
 	<string name="bg_service_screen_lock_toast">Ekran je zaključan</string>
 	<string name="download_type_to_filter">ukucajte za filtriranje</string>
 	<string name="use_high_res_maps">Ekran visoke rezolucije</string>
-	
-	<string name="voice">glas</string>
+    <string name="voice">glas</string>
 	<string name="no_vector_map_loaded">Vektorske mape nisu učitane</string>
-	
-	<string name="gpx_files_not_found">GPX datoteke se ne nalaze u direktorijumu</string>
+    <string name="gpx_files_not_found">GPX datoteke se ne nalaze u direktorijumu</string>
 	<string name="error_reading_gpx">Greška pri čitanju GPX podataka</string>
-	
-	
-	<string name="poi_context_menu_modify">Izmena POI</string>
+    <string name="poi_context_menu_modify">Izmena POI</string>
 	<string name="poi_context_menu_delete">Brisanje POI</string>
 	<string name="rotate_map_none_opt">Bez rotacije (sever je gore)</string>
 	<string name="rotate_map_to_bearing">Orjentacija mape</string>
-	
-	<string name="map_widget_show_ruler">Lenjir</string>
-	
-	<string name="shared_string_import">Uvezi</string>
-	
-	<string name="error_occurred_loading_gpx">Došlo je do greške prilikom učitavanja GPX</string>
+    <string name="map_widget_show_ruler">Lenjir</string>
+    <string name="shared_string_import">Uvezi</string>
+    <string name="error_occurred_loading_gpx">Došlo je do greške prilikom učitavanja GPX</string>
 	<string name="send_report">Pošalji izveštaj</string>
 	<string name="none_region_found">Nema podataka za datu oblast na SD kartici.  Preuzmite podatke sa Interneta.</string>
 	<string name="any_poi">Bilo koji</string>
@@ -185,10 +156,8 @@
 	<string name="auto_follow_location_enabled">Auto-centriranje karte tokom upotrebe.</string>
 	<string name="day_night_info_description">Izlazak sunca: %1$s \nZalazak sunca: %2$s</string>
 	<string name="day_night_info">Dan/noć informacije</string>
-	
-	<string name="map_widget_renderer">Stil mape</string>
-	
-	<string name="avoid_in_routing_title">Izbegavati…</string>
+    <string name="map_widget_renderer">Stil mape</string>
+    <string name="avoid_in_routing_title">Izbegavati…</string>
 	<string name="rendering_exception">Došlo je do greške tokom renderovanja izabrane oblasti</string>
 	<string name="show_point_options">Koristi lokaciju…</string>
 	<string name="renderer_load_sucess">Render uspešno učitan</string>
@@ -197,8 +166,7 @@
 	<string name="rotate_map_to_bearing_descr">Odaberite poravnavanje ekrana mape</string>
 	<string name="show_route">Detalji rute</string>
 	<string name="poi_namefinder_query_empty">Uneti upit za pretragu POI</string>
-	
-	<string name="layer_osm_bugs">Dnevnik grešaka OSM-a na mreži</string>
+    <string name="layer_osm_bugs">Dnevnik grešaka OSM-a na mreži</string>
 	<string name="layer_poi">POI…</string>
 	<string name="context_menu_item_search_poi">Pretraga POI</string>
 	<string name="where_am_i">Gde sam ja?</string>
@@ -207,8 +175,6 @@
 	<string name="gps_provider">GPS</string>
 	<string name="int_seconds">sekunde</string>
 	<string name="int_min">min.</string>
-	
-    
     <string name="max_speed_none">nijedan</string>
     <string name="stop_routing_confirm">Da li ste sigurni da želite da prekinete navigaciju?</string>
     <string name="recording_context_menu_show">Prikaži</string>
@@ -218,8 +184,7 @@
     <string name="dropbox_plugin_description">Dropbox dodatak omogućava da sinhronizujete putanje i audio/video beleške sa vašim Dropbox nalogom.</string>
     <string name="dropbox_plugin_name">Dropbox dodatak</string>
     <string name="intermediate_points_change_order">Promeni redosled</string>
-    
-	<string name="rendering_value_default_name">Podrazumevano</string>
+    <string name="rendering_value_default_name">Podrazumevano</string>
     <string name="traffic_warning_pedestrian">Pešački prelaz</string>
 	<string name="show_pedestrian_warnings">Prikazuj pešačke prelaze</string>
     <string name="dash_download_msg_none">Da li želite da preuzmete karte za korišćenje van mreže?</string>
@@ -227,7 +192,6 @@
     <string name="dash_download_new_one">Preuzmi novu kartu</string>
     <string name="dash_download_manage">Upravljajte</string>
     <string name="map_locale">Jezik karte</string>
-    
     <string name="navigate_point_zone">Oblast</string>
     <string name="download_tab_downloads">Sva preuzimanja</string>
     <string name="download_tab_updates">Nadogradnje</string>
@@ -237,51 +201,38 @@
     <string name="everything_up_to_date">Sve datoteke su sveže</string>
     <string name="use_opengl_render">Koristi OpenGL za prikaz</string>
     <string name="use_opengl_render_descr">Koristi hardversko ubrzanje OpenGL-a za prikaz (možda ne radi na nekim uređajima)</string>
-    
-    
-	
-	<string name="map_update">Dostupne su nadogradnje %1$s karata</string>
+    <string name="map_update">Dostupne su nadogradnje %1$s karata</string>
 	<string name="search_for">Potraži</string>
-	
-	<string name="shared_string_show_all">PRIKAŽI SVE</string>
+    <string name="shared_string_show_all">PRIKAŽI SVE</string>
 	<string name="coordinates">Koordinate</string>
 	<string name="shared_string_never">Nikad</string>
-    
     <string name="rendering_category_hide">Sakrij</string>
     <string name="rendering_category_details">Pojedinosti</string>
-    
-<string name="search_position_current_location_search">Pretraga položaja…</string>
+    <string name="search_position_current_location_search">Pretraga položaja…</string>
 	<string name="search_position_current_location_found">Položaj (pronađen)</string>
 	<string name="search_position_favorites">Omiljeno…</string>
-	
-	<string name="search_position_map_view">Središte trenutne mape</string>
+    <string name="search_position_map_view">Središte trenutne mape</string>
 	<string name="select_search_position">Izvor:</string>
 	<string name="context_menu_item_search">Traži obližnje</string>
 	<string name="filename_input">"Ime datoteke: "</string>
 	<string name="file_with_name_already_exist">Datoteka sa istim imenom već postoji.</string>
 	<string name="shared_string_save">Sačuvaj</string>
-	
-	<string name="local_index_upload_gpx_description">Otpremite GPIks datoteke zajednici OSM. Upotrebiće se za poboljšanje mapa.</string>
+    <string name="local_index_upload_gpx_description">Otpremite GPIks datoteke zajednici OSM. Upotrebiće se za poboljšanje mapa.</string>
 	<string name="local_index_items_uploaded">%1$d od %2$d stavki je uspešno otpremljeno.</string>
 	<string name="local_index_mi_upload_gpx">Pošalji OSM-u</string>
 	<string name="show_more_map_detail">Prikaži više pojedinosti mape</string>
 	<string name="favourites_delete_multiple_succesful">Omiljena tačka(e) je uspešno izbrisana.</string>
 	<string name="favorite_friends_category">Prijatelji</string>
 	<string name="favorite_places_category">Mesta</string>
-	
-	<string name="shared_string_name">Ime</string>
+    <string name="shared_string_name">Ime</string>
 	<string name="favourites_edit_dialog_category">Vrsta</string>
-	
-	<string name="basemap_missing">Osnovna mapa sveta (koja pokriva ceo svet na malom uveličanju) nedostaje. Molim, preuzmite World_basemap_x.obf radi celokupnosti sredine.</string>
+    <string name="basemap_missing">Osnovna mapa sveta (koja pokriva ceo svet na malom uveličanju) nedostaje. Molim, preuzmite World_basemap_x.obf radi celokupnosti sredine.</string>
 	<string name="local_index_installed">Izdanje</string>
 	<string name="local_index_no_items_to_do">Nema stavki za %1$s</string>
 	<string name="local_index_descr_title">Upravljajte datotekama mapa</string>
 	<string name="local_index_mi_restore">Pokreni</string>
 	<string name="local_index_mi_backup">Isključi</string>
-	
-	
-	
-	<string name="shared_string_download">Preuzmi</string>
+    <string name="shared_string_download">Preuzmi</string>
 	<string name="local_index_poi_data">Podaci POI-a</string>
 	<string name="local_index_address_data">Podaci adresa</string>
 	<string name="local_index_transport_data">Podaci javnog prevoza</string>
@@ -289,18 +240,14 @@
 	<string name="local_indexes_cat_backup">Isključeno</string>
 	<string name="local_indexes_cat_tts">Glasovni podaci (TTS)</string>
 	<string name="local_indexes_cat_voice">Glasovni podaci (snimci)</string>
-	
-	<string name="local_indexes_cat_poi">Podaci POI-a</string>
+    <string name="local_indexes_cat_poi">Podaci POI-a</string>
 	<string name="ttsvoice">Glas TTS-a</string>
 	<string name="search_offline_clear_search">Nova pretraga</string>
 	<string name="map_text_size_descr">Izaberite veličinu pisma za imena na mapama</string>
 	<string name="map_text_size">Veličina pisma na mapi</string>
 	<string name="trace_rendering">Podaci o otklonu grešaka prikaza</string>
 	<string name="trace_rendering_descr">Prikazuj učinak prikaza</string>
-	
-	
-	
-	<string name="installing_new_resources">Raspakujem nove podatke…</string>
+    <string name="installing_new_resources">Raspakujem nove podatke…</string>
 	<string name="internet_connection_required_for_online_route">Izabrana je usluga navođenja preko mrežne veze, ali je mrežna veza nedostupna.</string>
 	<string name="tts_language_not_supported_title">Jezik nije podržan</string>
 	<string name="tts_missing_language_data_title">Nedostaju podaci</string>
@@ -309,8 +256,7 @@
 	<string name="choose_audio_stream">Izlaz navođenja glasom</string>
 	<string name="voice_stream_voice_call">Zvuk govornog poziva</string>
 	<string name="voice_stream_notification">Zvučno obaveštenje</string>
-	
-	<string name="lock_screen_request_explanation">%1$s zahteva ovlašćenja da isključi ekran radi uštede energije.</string>
+    <string name="lock_screen_request_explanation">%1$s zahteva ovlašćenja da isključi ekran radi uštede energije.</string>
     <string name="wake_on_voice">Uključi ekran</string>
     <string name="wake_on_voice_descr">Uključi ekran uređaja (ako je isključen) kada se približi skretanje</string>
     <string name="rendering_category_others">Ostala svojstva mape</string>
@@ -321,7 +267,6 @@
 	<string name="map_widget_left">Leva površ</string>
     <string name="shared_string_show">Prikaži</string>
 	<string name="configure_map">Podesite mapu</string>
-    
     <string name="anonymous_user_hint">Bezimeni korisnik ne može\n- da pravi skupove;\n- da usklađuje skupove i uređaje sa serverom;\n- da upravlja skupovima i uređajima u ličnom uredu.</string>
     <string name="anonymous_user">Bezimeni korisnik</string>
     <string name="logged_as">Prijavljen kao %1$s</string>
@@ -362,10 +307,7 @@
 		\n\nSvetska karta prikazuje sva skijališta i skijaške staze u ovom pregledu je dostupna preuzimanjem  „Svetske skijaške karte“.
 	</string>
 	<string name="shared_string_audio">Zvuk</string>
-	
-	
-	<string name="share_note">Deli belešku</string>
-	
+    <string name="share_note">Deli belešku</string>
     <string name="location_on_map">Geografski položaj:\nŠirina %1$s↵\nDužina %2$s</string>
 	<string name="watch">Pregledaj</string>
 	<string name="notes">Beležnica</string>
@@ -383,9 +325,7 @@
     <string name="version_settings_descr">Preuzmi noćne izgradnje</string>
     <string name="version_settings">Izgradnje</string>
     <string name="shared_string_gpx_points">Tačke</string>
-    
     <string name="shared_string_my_location">Moj položaj</string>
-    
     <string name="home_button">Kuća</string>
     <string name="rendering_attr_subwayMode_name">Linije metroa</string>
     <string name="search_radius_proximity">U blizini</string>

OsmAnd/res/values-be/phrases.xml

@@ -44,7 +44,6 @@
     <string name="poi_copyshop">Капіравальныя паслугі</string>
     <string name="poi_curtain">Салон штор</string>
     <string name="poi_fabric">Тканіны</string>
-    <string name="poi_bedding">Пасьцельная бялізна</string>
     <string name="poi_dive">Абсталяванне для дайвінгу</string>
     <string name="poi_doityourself">Інструменты і будматэрыялы</string>
     <string name="poi_erotic">Сэкс-шоп</string>
@@ -250,7 +249,6 @@
     <string name="poi_healthcare_alternative">Альтэрнатыўная медыцына</string>
     <string name="poi_audiologist">Оталарынголаг</string>
     <string name="poi_blood_bank">Банк крыві</string>
-    <string name="poi_healthcare_centre">Медыцынскі цэнтр</string>
     <string name="poi_midwife">Акушэрка</string>
     <string name="poi_occupational_therapist">Прафесійны лекар</string>
     <string name="poi_optometrist">Оптаметрыст</string>
@@ -381,7 +379,6 @@
     <string name="poi_religion_shinto">Сінтаізм</string>
     <string name="poi_religion_taoist">Даасізм</string>
     <string name="poi_monastery">Кляштар</string>
-    <string name="poi_historic_monastery">Гістарычны кляштар</string>
     <string name="poi_wayside_cross">Прыдарожны крыж</string>
     <string name="poi_wayside_shrine">Прыдарожная святыня</string>
     <string name="poi_information">Інфармацыйны стэнд</string>
@@ -521,7 +518,6 @@
     <string name="poi_crematorium">Крэматорый</string>
     <string name="poi_internet_cafe">Інтэрнэт-кафэ</string>
     <string name="poi_bank">Банк</string>
-    <string name="poi_amenity_atm">Банкамат</string>
     <string name="poi_money_lender">Ліхвяр</string>
     <string name="poi_pawnbroker">Ламбард</string>
     <string name="poi_bureau_de_change">Абмен валют</string>
@@ -610,7 +606,6 @@
     <string name="poi_distance_mark">Пазнака дальнасці</string>
     <string name="poi_seamark_light_vessel">Агонь плывучага маяка (судна)</string>
     <string name="poi_small_craft_facility">Лодкавая станцыя</string>
-    <string name="poi_team_handball">Гандбол</string>
     <string name="poi_shop">Крама</string>
     <string name="poi_transportation">Транспарт</string>
     <string name="poi_education">Адукацыя</string>
@@ -738,7 +733,6 @@
     <string name="poi_craft_winery">Вінны завод</string>
     <string name="poi_gallery">Галерэя мастацтваў</string>
     <string name="poi_lean_to">Лабаз</string>
-    <string name="poi_general_tourist_attraction_yes">Турыстычная славутасьць</string>
     <string name="poi_trail_riding_station">Станцыя для вершнікаў</string>
     <string name="poi_wiki_place">Вікіпедыя</string>
     <string name="poi_wiki_lang_en">Вікіпедыя на англійскай мове</string>
@@ -808,7 +802,6 @@
     <string name="poi_swimming_pool_shop">Тавары для басейна</string>
     <string name="poi_model">Мадэлістам</string>
     <string name="poi_fashion">Крама моды</string>
-    <string name="poi_furnace">Крама абагравальнікаў</string>
     <string name="poi_scuba_diving_shop">Крама тавараў для дайвінгу</string>
     <string name="poi_trophy">Узнагароды, прызы</string>
     <string name="poi_height_restrictor">Абмежавальнік вышыні</string>
@@ -837,7 +830,6 @@
     <string name="poi_energy">Энэргетыка</string>
     <string name="poi_breakwater">Хвалялом</string>
     <string name="poi_groyne">Хвалярэз</string>
-    <string name="poi_tourism_attraction">Турыстычная славутасьць</string>
     <string name="poi_tree">Дрэва</string>
     <string name="poi_opening_hours">Гадзіны працы</string>
     <string name="poi_description">Апісанне</string>
@@ -876,7 +868,6 @@
     <string name="poi_route_hiking_nwn_poi">Нацыянальны пешы маршрут</string>
     <string name="poi_route_hiking_rwn_poi">Рэгіянальны пешы маршрут</string>
     <string name="poi_route_hiking_lwn_poi">Мясцовы пешы маршрут</string>
-    <string name="poi_conservation">Абароненая вобласьць</string>
     <string name="poi_node_networks">Вузлы пешаходнай ці рованай сеткі</string>
     <string name="poi_hiking_routes">Пешыя маршруты</string>
     <string name="poi_traffic_enforcement">Кантроль руху</string>
@@ -990,7 +981,6 @@
     <string name="poi_instagram">Instagram</string>
     <string name="vk">УКантакце</string>
     <string name="poi_google_plus">Google+</string>
-    <string name="poi_mill_pond">Млынавая сажалка</string>
     <string name="poi_building">Будынак</string>
     <string name="poi_military_office">Ваенкамат</string>
     <string name="poi_notary">Натарыус</string>
@@ -1106,7 +1096,6 @@
     <string name="poi_generator_source_geothermal">Крыніца энэргіі: геатэрмальны</string>
     <string name="poi_generator_source_oil">Крыніца энэргіі: мазут</string>
     <string name="poi_generator_source_diesel">Крыніца энэргіі: дызельнае паліва</string>
-    <string name="poi_car_wash_self_service">Самаабслугоўваньне</string>
     <string name="poi_int_name">Міжнародная назва</string>
     <string name="poi_nat_name">Агульнанацыянальная назва</string>
     <string name="poi_reg_name">Рэгіянальная назва</string>
@@ -1127,7 +1116,6 @@
     <string name="poi_information_office">Офіс</string>
     <string name="poi_information_terminal">Тэрмінал</string>
     <string name="poi_information_nature">Прырода</string>
-    <string name="poi_information_wildlife">Інфармацыя: пра дзікую прыроду</string>
     <string name="poi_information_history">Гісторыя</string>
     <string name="poi_information_sign">Знак</string>
     <string name="poi_information_audioguide">Аўдыягід</string>
@@ -1159,8 +1147,6 @@
     <string name="poi_stars_4s">4S (палепшаны першы клас)</string>
     <string name="poi_stars_5">5 (катэгорыя люкс)</string>
     <string name="poi_stars_5s">5S (катэгорыя люкс +)</string>
-    <string name="poi_stars_6">Колькасьць зорак: 6</string>
-    <string name="poi_stars_7">Колькасьць зорак: 7</string>
     <string name="poi_rooms">Колькасць нумароў</string>
     <string name="poi_love_hotel">Love-гатэль</string>
     <string name="poi_takeaway_no">На вынас: не</string>
@@ -1381,7 +1367,6 @@
     <string name="poi_payment_visa_no">Карткі Visa не прымаюцца</string>
     <string name="poi_payment_mastercard_yes">MasterCard</string>
     <string name="poi_payment_mastercard_no">Карткі MasterCard не прымаюцца</string>
-    <string name="poi_payment_none">Бясплатна</string>
     <string name="poi_payment_maestro_yes">Maestro</string>
     <string name="poi_payment_maestro_no">Карткі Maestro не прымаюцца</string>
     <string name="poi_payment_american_express_yes">American Express (AMEX)</string>
@@ -1969,7 +1954,6 @@
     <string name="poi_impromptu_no">Імправізаваны: не</string>
     <string name="poi_sanitary_dump_station_yes">Асенізацыйная зліўная станцыя: ёсць</string>
     <string name="poi_sanitary_dump_station_no">Асенізацыйная зліўная станцыя: адсутнічае</string>
-    <string name="poi_sanitary_dump_station_customers">Асенізацыйная зьліўная станцыя: толькі для наведвальнікаў</string>
     <string name="poi_power_supply_yes">Так</string>
     <string name="poi_power_supply_no">Крыніца сілкавання: адсутнічае</string>
     <string name="poi_power_supply_cee_17_blue">Крыніца сілкавання (штэкер): CEE 17 blue</string>
@@ -2373,7 +2357,6 @@
     <string name="poi_inscription_e">Надпіс:E</string>
     <string name="poi_inscription_ne">Надпіс:NE</string>
     <string name="poi_construction_yes">Падчас будаўніцтва</string>
-    <string name="poi_additional_atm_yes">З банкаматам</string>
     <string name="poi_atm_no">Без банкамата</string>
     <string name="poi_firepit">Кастрышча</string>
     <string name="poi_street_cabinet">Размеркавальная шафа</string>
@@ -2466,7 +2449,6 @@
     <string name="poi_sanitary_dump_station">Асенізацыйная зліўная станцыя</string>
     <string name="poi_medical_system_western_yes">Заходняя</string>
     <string name="poi_medical_system_chinese_yes">Традыцыйная кітайская</string>
-    <string name="poi_medical_system_unknown_yes">Мэдыцынская сістэма: традыцыйная невядома</string>
     <string name="poi_medical_system_ayurveeda_yes">Аюрведа</string>
     <string name="poi_medical_system_kampo_yes">Традыцыйная японская</string>
     <string name="poi_medical_system_mongolian_yes">Традыцыйная мангольская</string>
@@ -2606,7 +2588,6 @@
     <string name="poi_water_source_main">Асноўная</string>
     <string name="poi_water_source_pond">Сажалка</string>
     <string name="poi_water_source_stream">Струмень</string>
-    <string name="poi_fire_hydrant_style_water_source_cistern">Ёмістасць</string>
     <string name="poi_in_service_yes">Выкарыстоўваецца: так</string>
     <string name="poi_street_cabinet_power">Тып шафы: электрычная</string>
     <string name="poi_street_cabinet_telecom">Тып шафы: тэлекамунікацыі</string>
@@ -3557,8 +3538,6 @@
     <string name="poi_park_ride_ferry">Паром</string>
     <string name="poi_park_ride">Перахопліваючая паркоўка</string>
     <string name="poi_park_ride_hov">Аўта з некалькімі пасажырамі</string>
-    <string name="poi_generator_source_biomass">Крыніца энергіі: біямаса</string>
-    <string name="poi_health_specialty_radiotheraphy_yes">Радыятэрапія</string>
     <string name="poi_hazard">Небяспека</string>
     <string name="poi_rtsa_scale_filter">Катэгорыя цяжкасці</string>
     <string name="poi_rtsa_scale_nc">н/к</string>

OsmAnd/res/values-be/strings.xml

@@ -945,7 +945,6 @@
     <string name="error_calculating_route">Не атрымалася разлічыць маршрут.</string>
     <string name="error_calculating_route_occured">Не атрымалася разлічыць маршрут.</string>
     <string name="empty_route_calculated">Разлічаны маршрут пусты.</string>
-    <string name="new_route_calculated_dist">Новы шлях разлічаны, адлегласць</string>
     <string name="arrived_at_destination">Вы прыбылі.</string>
     <string name="invalid_locations">Хібныя каардынаты</string>
     <string name="go_back_to_osmand">Вярнуцца да мапы</string>
@@ -1033,7 +1032,6 @@
     <string name="osb_comment_dialog_error">Не атрымалася дадаць каментар.</string>
     <string name="poi_edit_title">Рэдагаваць POI</string>
     <string name="poi_create_title">Стварыць POI</string>
-    <string name="poi_error_poi_not_found">Вузел не знойдзены або зручнасць (amenity) складаецца з некалькіх вузлоў, што не падтрымліваецца.</string>
     <string name="poi_remove_confirm_template">Выдаліць {0} (каментар)?</string>
     <string name="poi_remove_title">Выдаліць POI</string>
     <string name="poi_remove_success">Выдалена</string>
@@ -1838,7 +1836,6 @@
     <string name="route_distance">Адлегласць:</string>
     <string name="route_duration">Час:</string>
     <string name="rendering_attr_horseRoutes_name">Конныя маршруты</string>
-    <string name="update">Абнавіць</string>
     <string name="only_download_over_wifi">Спампоўваць толькі праз Wi-Fi</string>
     <string name="live_update">Аўтаабнаўленне</string>
     <string name="update_now">Абнавіць зараз</string>
@@ -2035,8 +2032,6 @@
     <string name="replace_favorite_confirmation">Вы сапраўды хочаце замяніць улюбёную мясціну %1$s\?</string>
     <string name="update_all_maps_now">Абнавіць усе мапы зараз?</string>
     <string name="clear_tile_data">Ачысціць кэш сеціўных мапаў</string>
-    <string name="no_update_info_desc">Не правяраць новыя версій і зніжкі ад OsmAnd.</string>
-    <string name="no_update_info">Не паказваць новыя версіі</string>
     <string name="skip_map_downloading">Прамінуць спампоўванне мапаў</string>
     <string name="skip_map_downloading_desc">У вас адсутнічаюць мапы. Вы можаце абраць мапу са спіса альбо спампаваць яе пазней праз \"Меню - %1$s\".</string>
     <string name="search_another_country">Абраць іншы рэгіён</string>
@@ -2109,10 +2104,7 @@
     <string name="routing_attr_allow_motorway_description">Дазваляе выкарыстоўваць аўтамагістралі.</string>
     <string name="lang_sr_latn">Сербская (лацінка)</string>
     <string name="lang_zh_hk">Кітайская (Ганконг)</string>
-    <string name="legacy_search">Састарэлы пошук</string>
-    <string name="show_legacy_search">Паказваць састарэлы пошук</string>
     <string name="rendering_attr_hideWaterPolygons_description">Ваду</string>
-    <string name="show_legacy_search_desc">Дадаць састарэлы пошук у спісе, што раскрываецца.</string>
     <string name="rendering_attr_contourWidth_name">Таўшчыня гарызанталяў</string>
     <string name="rendering_attr_contourWidth_description">Таўшчыня гарызанталяў (ізагіпсы)</string>
     <string name="rendering_attr_contourDensity_description">Шчыльнасць гарызанталяў</string>
@@ -2742,7 +2734,7 @@
     <string name="update_is_available">Даступна абнаўленне</string>
     <string name="download_file">Спампаваць файл</string>
     <string name="start_editing_card_image_text">Бясплатны сусветны турыстычны даведнік, які можа рэдагаваць кожны.</string>
-    <string name="welcome_to_open_beta_description">Турыстычныя даведнікі ў цяперашні час базуюцца на Wikivoyage. Тэстуйце усе функцыі бясплатна падчас адкрытага бэта-тэставання. Потым даведнікі будуць даступныя падпісантам OsmAnd Unlimited і карыстальнікам OsmAnd+.</string>
+    <string name="welcome_to_open_beta_description">Турыстычныя даведнікі ў цяперашні час базуюцца на Wikivoyage. Тэстуйце усе функцыі бясплатна падчас адкрытага бэта-тэставання.</string>
     <string name="start_editing_card_description">Вам можна і варта рэдагаваць любы артыкул на Wikivoyage. Дзяліцеся ведамі, досведам, талентамі, і тым, што заўважылі.</string>
     <string name="start_editing">Пачаць рэдагаванне</string>
     <string name="get_unlimited_access">Атрымаць неабмежаваны доступ</string>
@@ -2809,17 +2801,6 @@
     <string name="unirs_render_descr">Мадыфікацыя прадвызначанага стылю для павялічэння кантрастнасці пешаходных і роварных дарог. Выкарыстоўвае старыя Mapnik-колеры.</string>
     <string name="get_osmand_live">Атрымайце OsmAnd Live, каб разблакаваць усе функцыі: штодзённыя абнаўленні мап з неабмежаванымі спампоўваннямі, усе платныя і бясплатныя ўбудовы, Вікіпедыю, Вікігід і шмат іншага.</string>
     <string name="quick_action_edit_actions">Рэдагаваць дзеянні</string>
-    <string name="release_3_0">• Новае: падтрымка аўтаномных турыстычных даведнікаў. Мясціны звязаныя з мапай. Зыходныя даныя ад Wikivoyage. 
-\n 
-\n • Вікіпедыя: новы выгляд, актыўныя спасылкі, падтрымка выяў 
-\n 
-\n • Open Track UI: падтрымка груп пунктаў шляху 
-\n 
-\n • Адзнакі мапы: імпарт абраных груп з GPX-файлаў, увод каардынат, новы выгляд 
-\n 
-\n • Падпіска OsmAnd Live цяпер падтрымлівае ўсе функцыі OsmAnd 
-\n 
-\n</string>
     <string name="error_notification_desc">Калі ласка, адпраўце здымак экрана з гэтым апавяшчэннем на support@osmand.net</string>
     <string name="coord_input_edit_point">Рэдагаваць пункт</string>
     <string name="coord_input_add_point">Дадаць пункт</string>
@@ -2830,31 +2811,13 @@
     <string name="send_search_query_description">Мы адправім ваш пашуковы запыт \"%1$s\", а таксама вашае месцазнаходжанне.
 \n
 \n Збіраюцца толькі агульныя звесткі, даныя пошуку выкарыстоўваюцца толькі для таго, каб палепшыць алгарытм пошуку.</string>
-    <string name="search_no_results_description">Няма вынікаў?
-\nРаспавядзіце нам аб гэтым.</string>
     <string name="send_search_query">Адправіць пашуковы запыт?</string>
     <string name="increase_search_radius_to">Павялічыць радыус пошуку да %1$s</string>
     <string name="thank_you_for_feedback">Дзякуй за Ваш водгук</string>
     <string name="poi_cannot_be_found">Не атрымалася знайсці вузел ці шлях.</string>
     <string name="search_no_results_feedback">Нічога не знойдзена\? 
 \nПакінце водгук</string>
-    <string name="commiting_way">Фіксуецца шлях…</string>
     <string name="test_voice_desrc">Націсніце на кнопку і паслухайце адпаведную галасавую падказку, каб выявіць адсутныя або пашкоджаныя падказкі</string>
-    <string name="release_3_1">• Навігацыя: выпраўленне індыкатару прагрэсу, хуткая замена пачатковага і канчатковага пунктаў маршруту 
-\n 
-\n • Адзнакі мапы: выпраўленне ўключэння/выключэння групаў, магчымасць хаваць адзнакі на мапе 
-\n 
-\n • Рэдагаванне OSM: магчымасць рэдагавання пазнак для некропкавых аб\'ектаў і шляхоў, выпраўленне адсутных каментароў на нататках, рэзервовае капіяванне правак 
-\n 
-\n • Паляпшэнне разбору Wikipedia і Wikivoyage, абноўленыя файлы ўжо даступныя 
-\n 
-\n • Кантэкстнае меню: выпраўленне колеру дарожных знакаў у начным рэжыме, выпраўленне памераў дадатковага меню 
-\n 
-\n • Рачная навігацыя: падтрымка фарватэру 
-\n 
-\n • Выпраўленне іншых хібаў 
-\n 
-\n</string>
     <string name="markers_remove_dialog_msg">Выдаліць адзнаку мапы «%s»\?</string>
     <string name="edit_map_marker">Рэдагаваць адзнаку мапы</string>
     <string name="third_party_application">Асобная праграма</string>
@@ -2865,21 +2828,6 @@
     <string name="keep_passed_markers">Пакінуць пройдзеныя адзнакі на мапе</string>
     <string name="more_transport_on_stop_hint">На гэтым прыпынку даступна шмат тыпаў грамадскага транспарту.</string>
     <string name="ask_for_location_permission">Калі ласка, дайце OsmAnd дазвол на месцазнаходжанне для працягу.</string>
-    <string name="release_3_2_pre">• Выпраўлена хіба пры запуску, што ўзнікала на некаторых прыладах 
-\n 
-\n • Новыя функцыі адзнак: паказваюцца ўжо пройдзенныя адзнакі
-\n 
-\n • Гісторыя пошуку зараз паказвае катэгорыі, што вы шукалі раней 
-\n 
-\n • Выпраўлена хіба пры запуску, што ўзнікала з нелацінскімі мапамі 
-\n 
-\n • Паляпшэнне хуткасці адмалёўкі на прыладах з Android 8.0 
-\n 
-\n • Падтрымка рэдагавання шматвугольных (нязручных) аб\'ектаў 
-\n 
-\n • Вымярэнне дыстанцый: дададзена кнопка «Вымярэнне» ў «Дзеянні» кантэкстнага меню 
-\n 
-\n</string>
     <string name="rendering_value_black_name">Чорны</string>
     <string name="osm_live_plan_pricing">План і цэны</string>
     <string name="osm_live_payment_monthly_title">Штомесячна</string>
@@ -2952,23 +2900,6 @@
     <string name="quick_action_gpx_tracks_show">Паказаць сляды</string>
     <string name="use_osm_live_public_transport_description">Уключыць грамадскі транспарт для змен OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Грамадскі транспарт OsmAnd Live</string>
-    <string name="release_3_3">• Новы экран «Напрамкі»: адлюстроўвае кнопкі напрамкаў дахаты і на працу, скарот «папярэдні маршрут», спіс актыўных GPX-слядоў і адзнак, гісторыю пошуку
-\n
-\n • Дадатковыя звесткі пад «Дэталі маршруту»: тыпы дарог, пакрыццё, пакатасць, гладкасць
-\n
-\n • Навігацыя грамадскага транспарту падтрымлівае ўсе тыпы: метро, аўтобус, трамвай і іншыя
-\n
-\n • Новыя хуткія дзеянні для паказу/схову слядоў і рэжымаў дзень/ноч
-\n
-\n • Выпраўленыя вобласці, якія выглядалі як затопленыя, у Германіі, Паўднёваё Афрыцы, Квебеку
-\n
-\n • Дадатковая падтрымка для KML- і KMZ-імпарту
-\n
-\n • Выпраўлена падзенне пры адкрыцці некаторых прыпынкаў грамадскага транспарту
-\n
-\n • Выдалена аналітыка Facebook і Firebase са свабоднай версіі (OsmAnd+ не ўключае яе)
-\n
-\n</string>
     <string name="transfers_size">%1$d перасадак</string>
     <string name="add_start_and_end_points">Дадаць пункт адпраўлення і пункт прызначэння</string>
     <string name="route_add_start_point">Дадаць пункт адпраўлення</string>
@@ -3043,16 +2974,6 @@
     <string name="routing_attr_avoid_subway_description">Пазбягаць метро і лёгкарэйкавага транспарту</string>
     <string name="routing_attr_avoid_ferry_name">Без паромаў</string>
     <string name="routing_attr_avoid_ferry_description">Пазбягаць паромаў</string>
-    <string name="release_3_3_7">• Адлюстраванне часу паміж перасадкамі ў грамадскім транспарцн
-\n
-\n • Выпраўлены інтэрфейс \"Падрабязнасці маршруту\"
-\n
-\n • Выпраўлена цёмная тэма для \"Маршрут\" і 
-\n\"Падрабязнасці маршруту\"
-\n
-\n • Пры вымярэнні адлегласці будзе адлюстроўвацца азімут
-\n
-\n</string>
     <string name="send_log">Адправіць журнал</string>
     <string name="files_moved">Перамешчана %1$d файлаў (%2$s).</string>
     <string name="files_copied">Скапіявана %1$d файлаў (%2$s).</string>
@@ -3281,15 +3202,14 @@
 \n</string>
     <string name="turn_screen_on_router">Абуджаць на паваротах</string>
     <string name="app_mode_campervan">Дом на колах</string>
-    <string name="new_route_calculated_dist_dbg">Маршрут: адлегласць %s, час навігацыі %s 
-\nРазлік: %.1f с, %d дарог, %d фрагментаў)</string>
+    <string name="new_route_calculated_dist_dbg">Маршрут: адлегласць %1$s, час навігацыі %2$s
+\nРазлік: %3$.1f с, %4$d дарог, %5$d фрагментаў)</string>
     <string name="lang_oc">Аксітанская</string>
     <string name="app_mode_pickup_truck">Пікап</string>
     <string name="turn_screen_on_info">Паказваць мапу падчас навігацыі на заблакаваным экране.</string>
     <string name="route_parameters_info">Налады пабудовы маршруту абранага профілю \"%1$s\".</string>
     <string name="wake_time">Час працы пасля абуджэння</string>
     <string name="units_and_formats">Адзінкі вымярэння і фарматы</string>
-    <string name="appearance">Выгляд</string>
     <string name="map_look_descr">Выгляд мапы</string>
     <string name="map_look">Выгляд мапы</string>
     <string name="list_of_installed_plugins">Усталяваныя убудовы</string>

OsmAnd/res/values-bg/phrases.xml

@@ -78,7 +78,6 @@
     <string name="poi_copyshop">Копирен център</string>
     <string name="poi_curtain">Магазин за завеси и покривки</string>
     <string name="poi_fabric">Магазин за пердета</string>
-    <string name="poi_bedding">Магазин за чаршафи и завивки</string>
     <string name="poi_dive">Екипировка за гмуркане</string>
     <string name="poi_fishing">Рибарски принадлежности</string>
     <string name="poi_florist">Магазин за цветя</string>
@@ -201,7 +200,6 @@
     <string name="poi_pasta">Магазин за паста</string>
     <string name="poi_camera">Камери и лещи</string>
     <string name="poi_candles">Магазин за свещи</string>
-    <string name="poi_furnace">Магазин за нагревателни елементи</string>
     <string name="poi_garden_furniture">Магазин за градински мебели</string>
     <string name="poi_houseware">Магазин за домашни потреби</string>
     <string name="poi_leather">Магазин за кожи</string>
@@ -299,7 +297,6 @@
     <string name="poi_sanatorium">Санаториум</string>
     <string name="poi_healthcare_alternative">Алтернативна медицина</string>
     <string name="poi_blood_bank">Кръвна банка</string>
-    <string name="poi_healthcare_centre">Медицински център</string>
     <string name="poi_physiotherapist">Физиотерапевт</string>
     <string name="poi_podiatrist">Педиатър</string>
     <string name="poi_psychotherapist">Психотерапевт</string>
@@ -341,7 +338,6 @@
     <string name="poi_aquarium">Аквариум</string>
     <string name="poi_theme_park">Тематичен парк</string>
     <string name="poi_attraction">Туристическа атракция</string>
-    <string name="poi_tourism_attraction">Туристическа атракция</string>
     <string name="poi_hotel">Хотел</string>
     <string name="poi_guest_house">Къща за гости</string>
     <string name="poi_hostel">Хостел</string>

OsmAnd/res/values-bg/strings.xml

@@ -873,7 +873,6 @@
     <string name="error_calculating_route">Грешка при изчисляване на маршрута</string>
     <string name="error_calculating_route_occured">Възникна грешка при изчисляване на маршрута</string>
     <string name="empty_route_calculated">Грешка: Изчисленият маршрут е празен</string>
-    <string name="new_route_calculated_dist">Изчислен е нов маршрут, дистанция</string>
     <string name="arrived_at_destination">Пристигнахте в крайната цел</string>
     <string name="invalid_locations">Невалидни координати</string>
     <string name="go_back_to_osmand">Върни се на картата OsmAnd</string>
@@ -970,7 +969,6 @@
     <string name="osb_comment_dialog_error">Коментарът не може да бъде добавен.</string>
     <string name="poi_edit_title">Редактиране на POI</string>
     <string name="poi_create_title">Създай POI</string>
-    <string name="poi_error_poi_not_found">Точката не може да бъде намерена или избраното съдържа повече от една точка</string>
     <string name="poi_remove_confirm_template">Изтриване на {0} (enter comment)?</string>
     <string name="poi_remove_title">Изтриване на POI</string>
     <string name="shared_string_delete">Изтрий</string>
@@ -1765,7 +1763,6 @@
     <string name="number_of_rows_in_dash">Брой редове %1$s</string>
     <string name="dashboard_or_drawer_description">Можете да управлявате приложението чрез гъвкаво табло или чрез статично меню. Вашият избор може да бъде променен по-късно.</string>
     <string name="rendering_attr_horseRoutes_name">Пътеки за конна езда</string>
-    <string name="update">Обновяване на всеки</string>
     <string name="only_download_over_wifi">Сваляне само през WiFi</string>
     <string name="live_update">Актуализиране на момента</string>
     <string name="update_now">Актуализирай сега</string>
@@ -1925,8 +1922,6 @@
     <string name="first_usage_greeting">Получете упътвания и открийте нови места без да ползвате връзка към Интернет</string>
     <string name="shared_string_change">Промяна</string>
     <string name="search_my_location">Намери моето местоположение</string>
-    <string name="no_update_info_desc">Да не се проверява за нови версии, промоции свързани с OsmAnd</string>
-    <string name="no_update_info">Да не се показват актуализации</string>
     <string name="update_all_maps_now">Обновяване на всички карти сега\?</string>
     <string name="clear_tile_data">Изчистване на всички плочки</string>
     <string name="routing_attr_short_way_name">Икономичен маршрут</string>
@@ -2088,8 +2083,6 @@
     <string name="divider_descr">Елементи по-надолу, отделени с разделител.</string>
     <string name="shared_string_hidden">Скрити</string>
     <string name="hidden_items_descr">Тези елементи са скрити от менюто, но представените опции или добавки все още работят.</string>
-    <string name="wikipedia_poi_languages_promo">Някои статии в Уикипедия може да не са налични на вашия език, изберете езиците, на които статиите в Уикипедия ще се показват на картата.
-\nЩе можете да превключвате между всички налични езици, докато четете статията.</string>
     <string name="configure_profile">Настройване на профил</string>
     <string name="switch_profile">Превключване на профил</string>
     <string name="application_profile_changed">Профилът на приложението е променен на „%s“</string>

OsmAnd/res/values-bs/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
   <string name="asap">Što prije</string>
-  
-  <string name="route_roundabout">Kružni tok : idite %1$d izlaz i idite</string>
+    <string name="route_roundabout">Kružni tok : idite %1$d izlaz i idite</string>
   <string name="route_kl">Držite se lijeve strane i idite</string>
   <string name="route_kr">Držite se desne strane i idite</string>
   <string name="rendering_attr_noPolygons_description">Sve prave slike zemljišta učinite providnim</string>
@@ -17,12 +16,10 @@
   <string name="navpoint_search_desc">Koordinate</string>
   <string name="transport_search_desc">Pretraga transporta</string>
   <string name="favourites_search_desc">Pretraga omiljenih</string>
-  
-  <string name="offline_navigation_not_available">OsmAnd navigacija van mreže trenutno nije dostupna.</string>
+    <string name="offline_navigation_not_available">OsmAnd navigacija van mreže trenutno nije dostupna.</string>
   <string name="left_side_navigation">Vožnja sa lijeve strane</string>
   <string name="left_side_navigation_descr">Izaberite za zemlje gdje se vozi lijevom stranom</string>
-  
-  <string name="unknown_from_location">Početna tačka još uvijek nije određena</string>
+    <string name="unknown_from_location">Početna tačka još uvijek nije određena</string>
   <string name="unknown_location">Pozicija je još uvijek nepoznata</string>
   <string name="modify_transparency">Odredite providnost (0 - providno, 255 - vidljivo)</string>
   <string name="confirm_interrupt_download">Da li ste sigurni da želite prekinuti preuzimanje datoteke?</string>
@@ -31,16 +28,13 @@
   <string name="select_index_file_to_download">Ništa nije pronađeno. Ako ne možete pronaći svoju regiju, možete ju sami napraviti (opširnije na http://osmand.net).</string>
   <string name="local_indexes_cat_tile">Mape van mreže (u sličicama)</string>
   <string name="local_indexes_cat_map">Mape van mreže (vektori)</string>
-  
-  <string name="index_settings_descr">Preuzmite, pogledajte detalje i uredite mape van mreže</string>
+    <string name="index_settings_descr">Preuzmite, pogledajte detalje i uredite mape van mreže</string>
   <string name="map_online_plugin_is_not_installed">Omogući nadogradnju za izbor drugačijih izvora javnih mapa</string>
   <string name="map_online_data">Javne mape (u sličicama)</string>
   <string name="map_online_data_descr">Koristi javne mape (preuzmi i keširaj sličice na memorijsku karticu)</string>
   <string name="shared_string_online_maps">Javne mape</string>
   <string name="online_map_settings_descr">Podesi izvor sličica javnih ili keširanih mapa</string>
-  
-  
-  <string name="osmand_parking_hours">Sati</string>
+    <string name="osmand_parking_hours">Sati</string>
   <string name="osmand_parking_minutes">Minuta</string>
   <string name="osmand_parking_position_description_add_time">Automobil je parkiran od:</string>
   <string name="use_compass_navigation">Koristi kompas</string>
@@ -49,16 +43,12 @@
   <string name="show_cameras">Prikaži kamere za mjerenje brzine</string>
   <string name="show_traffic_warnings">Prikaži saobraćajna upozorenja</string>
   <string name="avoid_toll_roads">Izbjegavaj ceste sa naplatom</string>
-  
-  <string name="map_widget_top_text">Naziv ulice</string>
+    <string name="map_widget_top_text">Naziv ulice</string>
   <string name="map_widget_back_to_loc">Gdje sam</string>
   <string name="map_widget_lock_screen">Zaključaj ekran</string>
   <string name="map_widget_compass">Kompas</string>
-  
-  <string name="map_widget_reset">Resetuj na zadano</string>
-  
-  
-  <string name="map_widget_parking">Parkiralište</string>
+    <string name="map_widget_reset">Resetuj na zadano</string>
+    <string name="map_widget_parking">Parkiralište</string>
   <string name="map_widget_speed">Brzina</string>
   <string name="map_widget_distance">Target</string>
   <string name="map_widget_altitude">Visina</string>
@@ -78,7 +68,6 @@
 <string name="access_arrival_time">Vrijeme dolaska</string>
     <string name="item_checked">provjereno</string>
     <string name="shared_string_map">Karta</string>
-    
     <string name="stop_routing_confirm">Jeste li sigurni da želite zaustaviti navigaciju?</string>
     <string name="clear_dest_confirm">Jeste li sigurni da želite ukloniti tačku odredišta?</string>
     <string name="recording_context_menu_show">Prikaži</string>
@@ -95,8 +84,6 @@
     <string name="recording_default_name">Snimanje</string>
     <string name="shared_string_control_stop">stani</string>
     <string name="shared_string_control_start">pokreni</string>
-    
-    
     <string name="index_srtm_parts">dijelovi</string>
     <string name="download_roads_only_item">Samo ceste</string>
     <string name="rendering_attr_noAdminboundaries_name">Sakrij granice</string>
@@ -120,8 +107,7 @@
     <string name="prefer_in_routing_title">Preferiraj…</string>
 	<string name="prefer_in_routing_descr">Preferiraj autocestu</string>
     <string name="index_name_openmaps">OpenMaps EU</string>
-    
-	<string name="map_widget_gps_info">GPS status</string>
+    <string name="map_widget_gps_info">GPS status</string>
     <string name="shared_string_no">Ne</string>
 	<string name="shared_string_yes">Da</string>
 	</resources>

OsmAnd/res/values-ca/phrases.xml

@@ -216,7 +216,6 @@
     <string name="poi_healthcare_alternative">Medicina alternativa</string>
     <string name="poi_audiologist">Audiologia</string>
     <string name="poi_blood_bank">Banc de sang</string>
-    <string name="poi_healthcare_centre">Centre mèdic</string>
     <string name="poi_midwife">Infermeria obstètrico-ginecològica</string>
     <string name="poi_occupational_therapist">Teràpia ocupacional</string>
     <string name="poi_optometrist">Optometria</string>
@@ -284,7 +283,6 @@
     <string name="poi_paddle_tennis">Pàdel</string>
     <string name="poi_paragliding">Parapent</string>
     <string name="poi_pelota">Joc de pilota</string>
-    <string name="poi_bedding">Matalasseria</string>
     <string name="poi_gas">Gas liquat</string>
     <string name="poi_department_store">Gran magatzem</string>
     <string name="poi_car_parts">Recanvis de cotxe</string>
@@ -312,7 +310,6 @@
     <string name="poi_surfing">Surf</string>
     <string name="poi_swimming">Natació</string>
     <string name="poi_table_tennis">Ping-pong</string>
-    <string name="poi_team_handball">Handbol</string>
     <string name="poi_tennis">Tennis</string>
     <string name="poi_toboggan">Tobogan</string>
     <string name="poi_volleyball">Voleibol</string>
@@ -484,7 +481,6 @@
     <string name="poi_internet_access_public">Accés a Internet: públic</string>
     <string name="poi_internet_access_service">Accés a Internet: servei</string>
     <string name="poi_monastery">Monestir</string>
-    <string name="poi_historic_monastery">Monestir històric</string>
     <string name="poi_wayside_cross">Creu de terme</string>
     <string name="poi_wayside_shrine">Peto d\'ànimes</string>
     <string name="poi_information">Informació</string>
@@ -632,7 +628,6 @@
     <string name="poi_mortuary">Dipòsit de cadàvers</string>
     <string name="poi_crematorium">Crematori</string>
     <string name="poi_bank">Banc</string>
-    <string name="poi_amenity_atm">Caixer automàtic</string>
     <string name="poi_accountant">Comptable</string>
     <string name="poi_bitcoin_yes">Pagament amb bitcoins</string>
     <string name="poi_peak">Cim</string>
@@ -661,7 +656,6 @@
     <string name="poi_anchorage">Ancoratge</string>
     <string name="poi_anchor_berth">Punt d\'ancoratge</string>
     <string name="poi_road_obstacle">Obstacle</string>
-    <string name="poi_general_tourist_attraction_yes">Atracció turística</string>
     <string name="poi_club_art">Agrupació artística</string>
     <string name="poi_club_computer">Associació informàtica</string>
     <string name="poi_club_motorcycle">Club de motos</string>
@@ -834,9 +828,7 @@
     <string name="poi_breakwater">Escullera</string>
     <string name="poi_groyne">Espigó</string>
     <string name="poi_power_cable_distribution_cabinet">Quadre elèctric</string>
-    <string name="poi_conservation">Reserva natural</string>
     <string name="poi_crane">Grua</string>
-    <string name="poi_tourism_attraction">Atracció turística</string>
     <string name="poi_cutline">Tallafoc</string>
     <string name="poi_tree">Arbre</string>
     <string name="poi_highway_crossing">Pas de vianants</string>
@@ -867,7 +859,6 @@
     <string name="poi_enforcement_check">Control de trànsit: control</string>
     <string name="poi_enforcement_access">Control de trànsit: accés</string>
     <string name="poi_enforcement_toll">Control de trànsit: peatge</string>
-    <string name="poi_furnace">Botiga de calefactors</string>
     <string name="poi_trophy">Trofeus i distincions</string>
     <string name="poi_basin">Bassa</string>
     <string name="poi_bump_gate">Porta batent de tancament controlat</string>
@@ -983,7 +974,6 @@
     <string name="poi_recycling_cardboard">Cartró d\'embalar</string>
     <string name="poi_recycling_beverage_cartons">Envasos de cartró de begudes</string>
     <string name="poi_recycling_sheet_metal">Xapa metàl·lica</string>
-    <string name="poi_mill_pond">Bassa del molí</string>
     <string name="twitter">Twitter</string>
     <string name="poi_skype">Skype</string>
     <string name="poi_youtube">YouTube</string>
@@ -1442,8 +1432,6 @@
     <string name="poi_stars_4s">4S (Primera classe superior)</string>
     <string name="poi_stars_5">5 (Luxe)</string>
     <string name="poi_stars_5s">5S (Luxe superior)</string>
-    <string name="poi_stars_6">Estrelles: 6</string>
-    <string name="poi_stars_7">Estrelles: 7</string>
     <string name="poi_rooms">Habitacions</string>
     <string name="poi_love_hotel">Hotel per parelles</string>
     <string name="poi_payment_coins_yes">Monedes</string>
@@ -1468,7 +1456,6 @@
     <string name="poi_payment_visa_no">No s\'accepta tarja Visa</string>
     <string name="poi_payment_mastercard_yes">MasterCard</string>
     <string name="poi_payment_mastercard_no">No s\'accepta Mastercard</string>
-    <string name="poi_payment_none">Sense cost</string>
     <string name="poi_payment_maestro_yes">Targetes Maestro</string>
     <string name="poi_payment_maestro_no">No s\'accepta tarja Maestro</string>
     <string name="poi_payment_american_express_yes">American Express (AMEX)</string>
@@ -1481,7 +1468,6 @@
     <string name="poi_payment_uta_no">No s\'accepten targes UTA</string>
     <string name="poi_tourism_yes">Element turístic</string>
     <string name="poi_water_point">Proveïment d\'aigua</string>
-    <string name="poi_information_wildlife">Indicador informatiu: fauna</string>
     <string name="poi_information_sign">Signe</string>
     <string name="poi_piste_grooming_classic">Clàssic</string>
     <string name="poi_piste_grooming_classic_skating">Clàssic + Patinatge</string>
@@ -1825,7 +1811,6 @@
     <string name="poi_impromptu_no">Acampada lliure: no</string>
     <string name="poi_sanitary_dump_station_yes">Estació de buidatge sanitari: sí</string>
     <string name="poi_sanitary_dump_station_no">Estació de buidatge sanitari: no</string>
-    <string name="poi_sanitary_dump_station_customers">Estació de buidatge sanitari: només clients</string>
     <string name="poi_power_supply_yes">Sí</string>
     <string name="poi_power_supply_no">Subministrament elèctric: no</string>
     <string name="poi_power_supply_cee_17_blue">Subministrament elèctric (endoll): CEE 17 blau</string>
@@ -2716,7 +2701,6 @@
     <string name="poi_water_source_main">Artèria</string>
     <string name="poi_water_source_pond">Estany</string>
     <string name="poi_water_source_stream">Riu</string>
-    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
     <string name="poi_in_service_yes">En servei: sí</string>
     <string name="poi_aerodrome_type_international">Internacional</string>
     <string name="poi_aerodrome_type_regional">Regional</string>

OsmAnd/res/values-ca/strings.xml

@@ -506,7 +506,6 @@
     <string name="shared_string_download_successful">S\'ha baixat</string>
     <string name="opening_hours">Horari d\'obertura</string>
     <string name="poi">PDI</string>
-    <string name="new_route_calculated_dist">S\'ha calculat una ruta nova, distància</string>
     <string name="loading_data">S\'estan carregant les dades…</string>
     <string name="finished_task">Finalitzat</string>
     <string name="update_tile">Actualitza el mapa</string>
@@ -991,7 +990,6 @@
     <string name="incremental_search_building">Cerca progressiva d\'edificis</string>
     <string name="Closest_Amenities">Instal·lacions més properes</string>
     <string name="position_on_map_bottom">Part inferior</string>
-    <string name="poi_error_poi_not_found">No s\'ha trobat el node, o la instal·lació consta de diferents nodes, i això encara no s\'admet.</string>
     <string name="poi_error_io_error_template">S\'ha produït un error d\'E/S durant l\'acció {0}.</string>
     <string name="speak_title">Anuncia…</string>
     <string name="speak_descr">Configureu la notificació dels noms de carrer, incidències de trànsit (cues, bandes sonores), avisos de radar i límits de velocitat.</string>
@@ -1794,7 +1792,6 @@
     <string name="av_audio_bitrate">Taxa de bits de l\'àudio</string>
     <string name="av_audio_bitrate_descr">Seleccioneu la taxa de bits de l\'àudio.</string>
     <string name="looking_up_address">Consulta per adreça</string>
-    <string name="update">Actualitza tots</string>
     <string name="only_download_over_wifi">Baixades només amb WIFI</string>
     <string name="live_update">Actualitza al moment</string>
     <string name="update_now">Actualitza ara</string>
@@ -2005,8 +2002,6 @@
     <string name="give_permission">Autoritza</string>
     <string name="allow_access_location">Permet accedir a la localització</string>
     <string name="search_my_location">Troba la meva localització</string>
-    <string name="no_update_info_desc">No comprovis noves versions ni ofertes relatives a OsmAnd.</string>
-    <string name="no_update_info">No mostris noves versions</string>
     <string name="skip_map_downloading">Omet els mapes en procés de baixada</string>
     <string name="skip_map_downloading_desc">No disposeu de cap mapa local. Podeu triar un mapa de la llista o baixar mapes més tard via «Menú - %1$s».</string>
     <string name="search_another_country">Selecciona un altre país</string>
@@ -2069,9 +2064,6 @@
     <string name="route_roundabout_short">Agafeu la %1$d sortida i continueu</string>
     <string name="search_map_hint">Ciutat o regió</string>
     <string name="wiki_around">Articles de la zona a la Viquipèdia</string>
-    <string name="legacy_search">Cerca de llegat</string>
-    <string name="show_legacy_search">Mostra la cerca de llegat</string>
-    <string name="show_legacy_search_desc">Afegeix la cerca de llegat en la llista desplegable.</string>
     <string name="routing_attr_allow_motorway_name">Utilitza les autopistes</string>
     <string name="routing_attr_allow_motorway_description">Admet autopistes.</string>
     <string name="lang_sr_latn">Serbi (llatí)</string>
@@ -2591,17 +2583,6 @@
     <string name="by_date">Per data</string>
     <string name="by_type">Per tipus</string>
     <string name="modify_the_search_query">Modifiqueu la vostra cerca.</string>
-    <string name="release_3_0">Novetats: Suport a guies de viatges globals sense connexió. Ubicacions esmentades es vinculen al mapa. Dades inicials de ViquiViatges. 
-\n 
-\n• Viquipèdia: nova imatge, enllaços actius, imatges 
-\n 
-\n• IU de rutes Open Track: mostra grups de fites 
-\n 
-\n• Marcadors de mapa: importa determinats grups dels fitxers GPX, nou aspecte de l\'introducció de coordenades 
-\n 
-\n• La subscripció OsmAnd Live ara inclou totes les característiques d\'OsmAnd 
-\n 
-\n</string>
     <string name="one_tap_active">\'Un toc\' actiu</string>
     <string name="what_is_here">El que hi ha aquí:</string>
     <string name="parked_at">aparcat a</string>
@@ -2732,7 +2713,7 @@
     <string name="osmand_team">Equip OsmAnd</string>
     <string name="paid_app">Aplicació de pagament</string>
     <string name="paid_plugin">Connector de pagament</string>
-    <string name="welcome_to_open_beta_description">Les guies de viatge es basen en Viquiviatges. Proveu totes les funcions durant la fase oberta de proves, de franc. Després, les guies de viatge estaran disponibles per als subscriptors de OsmAnd Il·limitat i els propietaris de OsmAnd+.</string>
+    <string name="welcome_to_open_beta_description">Les guies de viatge es basen en Viquiviatges. Proveu totes les funcions durant la fase oberta de proves, de franc.</string>
     <string name="wikivoyage_travel_guide_descr">Guies dels llocs més interessants del planeta, dins OsmAnd, sense cap connexió a Internet.</string>
     <string name="in_app_purchase">Compres des de l\'aplicació</string>
     <string name="in_app_purchase_desc">Pagament únic</string>
@@ -2778,52 +2759,13 @@
     <string name="send_search_query_description">Enviarem la vostra consulta de cerca: a \"%1$s\", junt amb la vostra ubicació.
 \n 
 \n No es recull informació personal, només les dades de la cerca per millorar-la.</string>
-    <string name="search_no_results_description">Cap resultat?
-\nParleu-nos-en al respecte.</string>
     <string name="send_search_query">Voleu enviar la consulta de cerca?</string>
-    <string name="release_3_1">"• Navegació: Correcció en la barra de progrés, intercanvi ràpid del punt inicial i final de la ruta 
-\n
-\n• Marcadors de mapa: Correcció de l\'activació/desactivació de grups, possibilitat d\'amagar marcadors del mapa 
-\n
-\n• Edició OSM: Capacitat per editar les etiquetes per objectes no puntuals, correcció de la pèrdua de comentaris a les notes, còpia de seguretat de les edicions 
-\n
-\n• Millora la anàlisi de Viquipèdia i Wikiviatge, els fitxers actualitzats ja estan disponibles 
-\n
-\n• Menú contextual: Arregla el color dels indicadors de nom de via en el mode nocturn, correcció de la mida del menú addicional 
-\n
-\n• Nàutica: Guiatge pels canals de navegació 
-\n
-\n• Altres correccions d\'errors  
-\n"</string>
     <string name="increase_search_radius_to">Allarga el radi de cerca fins %1$s</string>
-    <string name="commiting_way">Executant via…</string>
     <string name="thank_you_for_feedback">Gràcies per els vostres comentaris</string>
     <string name="poi_cannot_be_found">No s\'ha pogut trobar el node o la via.</string>
     <string name="search_no_results_feedback">Cap resultat en la cerca?
 \nComenteu-nos-ho</string>
     <string name="test_voice_desrc">Premeu un botó i escolteu la corresponent descripció de veu per identificar si estan pendents o són errònies</string>
-    <string name="release_3_2_pre">"• S\'ha corregit el bloqueig d\'entrada d\'alguns dispositius 
-\n
-\n 
-\n • Nova opció dels marcadors: Es mostren els marcadors que ja s\'han assolit 
-\n
-\n 
-\n • L\'historial de cerques ara mostra les categories cercades anteriorment
-\n
-\n 
-\n • S\'ha corregit el bloqueig d\'entrada si alfabets no llatins als mapes 
-\n
-\n 
-\n • Millora dels problemes de velocitat de renderització a dispositius Android 8.0 
-\n
-\n 
-\n • Suport a l\'edició d\'objectes poligonals (fora de serveis) 
-\n
-\n 
-\n • Mesura de distàncies: S\'ha afegit el botó \"Mesura\" dins Accions en el menú contextual  
-\n
-\n 
-\n "</string>
     <string name="ask_for_location_permission">Cal que doneu a OsmAnd accés a la ubicació per continuar.</string>
     <string name="rendering_value_black_name">Negre</string>
     <string name="search_street">Cerca un carrer</string>
@@ -2904,23 +2846,6 @@
     <string name="quick_action_gpx_tracks_hide">Amaga les traces</string>
     <string name="quick_action_gpx_tracks_show">Mostra les traces</string>
     <string name="sit_on_the_stop">Pugeu a la parada</string>
-    <string name="release_3_3">• Nova pantalla \'Adreces\': Mostra els botons de destinació Casa i Feina, drecera de \'ruta anterior\', llista de traces GPX i marcadors actius, historial de cerca
-\n
-\n • Informació addicional desplegant \'Detalls de la ruta\': tipus de via, pavimentació, pendent, estat
-\n
-\n • La navegació en transport públic inclou tot tipus de transport: metro, bus, tram, etc.
-\n
-\n • Noves dreceres per mostrar/amagar traces i pels modes diürn/nocturn
-\n
-\n • Àrees determinades es mostren com inundades a Alemanya, Sud-Àfrica, el Quebec
-\n
-\n • Nou suport a la importació de fitxers KML i KMZ
-\n
-\n • Corregides les penjades en obrir algunes parades de transport públic
-\n
-\n • S\'han eliminat les estadístiques Facebook i Firebase de la versió gratuita (OsmAnd+ ja no les tenia)
-\n
-\n</string>
     <string name="use_osm_live_public_transport_description">Activa les modificacions del transport públic amb OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Transport públic a OsmAnd Live</string>
     <string name="public_transport_warning_descr_blog">Llegiu més sobre com OsmAnd calcula les rutes al nostre bloc.</string>
@@ -2997,14 +2922,6 @@
     <string name="routing_attr_avoid_subway_description">Evita el metro i el tram</string>
     <string name="routing_attr_avoid_ferry_name">Sense ferris</string>
     <string name="routing_attr_avoid_ferry_description">Evita els ferris</string>
-    <string name="release_3_3_7">• Mostra el temps entre transbordaments al transport públic
-\n
-\n• Corregida la IU pels detalls de la ruta
-\n
-\n• Tema nocturn corregit al menú Adreça i als detalls de ruta
-\n
-\n• Mostra l\'azimut en la mesura de la distància
-\n</string>
     <string name="send_log">Envia el registre</string>
     <string name="files_moved">S\'han mogut %1$d arxius (%2$s).</string>
     <string name="files_copied">S\'han copiat %1$d arxius (%2$s).</string>
@@ -3028,7 +2945,6 @@
 \nSempre es pot revisar a \'Configuració\' &gt; \'Privadesa i seguretat\'.</string>
     <string name="choose_data_to_share">Trieu el tipus de dades que voleu compartir:</string>
     <string name="downloaded_maps">Mapes baixats</string>
-    <string name="colleted_data">Dades recollides</string>
     <string name="collected_data_descr">Definiu quines dades permeteu que OsmAnd comparteixi.</string>
     <string name="downloaded_maps_collect_descr">Ajudeu-nos a determinar la popularitat dels mapes de països i de regions.</string>
     <string name="visited_screens_collect_descr">Ajudeu-nos a determinar la popularitat de les característiques d\'OsmAnd.</string>
@@ -3100,8 +3016,6 @@
     <string name="base_profile_descr_boat">Vaixell, rem, vela</string>
     <string name="base_profile_descr_aircraft">Avió, vol planat</string>
     <string name="routing_profile_geocoding">Geocodificació</string>
-    <string name="zoom_by_wunderlinq_descr">Canvieu el zoom del mapa girant la roda amunt i avall. La tecla Esc us retornarà a l\'aplicació WunderLINQ.</string>
-    <string name="zoom_by_wunderlinq">Utilitzeu WunderLINQ per al control</string>
     <string name="quick_action_need_to_add_item_to_list">Afegir com a mínim un element a la llista a la configuració de l\'acció ràpida</string>
     <string name="routing_attr_piste_type_downhill_description">Pistes per esquí alpí o eslàlom i accés als remuntadors.</string>
     <string name="routing_attr_piste_type_sled_name">Trineu</string>
@@ -3195,8 +3109,8 @@
     <string name="shared_string_default">Per defecte</string>
     <string name="lang_oc">Occità</string>
     <string name="app_mode_pickup_truck">Camioneta descoberta</string>
-    <string name="new_route_calculated_dist_dbg">Ruta: distància %s, durada %s
-\nCàlcul: %.1f s, %d vies, %d tessel·les)</string>
+    <string name="new_route_calculated_dist_dbg">Ruta: distància %1$s, durada %2$s
+\nCàlcul: %3$.1f s, %4$d vies, %5$d tessel·les)</string>
     <string name="day">Dia</string>
     <string name="days_2_4">Dies</string>
     <string name="days_5">Dies</string>
@@ -3225,7 +3139,6 @@
     <string name="application_profile_changed">El perfil de l\'aplicació ha canviat a \"%s\"</string>
     <string name="plugins_settings">Configuració del connector</string>
     <string name="shared_string_by_default">Predeterminat</string>
-    <string name="download_detaile_map">Baixeu el mapa detallat %s per veure aquesta àrea.</string>
     <string name="route_parameters">Paràmetres de la ruta</string>
     <string name="change_data_storage_full_description">Voleu moure els arxius de dades OsmAnd a una nova destinació\?
 \n%1$s &gt; %2$s</string>
@@ -3323,7 +3236,6 @@
     <string name="route_parameters_info">Configuració per la navegació en el perfil seleccionat \"%1$s\".</string>
     <string name="wake_time">Retard des de l\'activació</string>
     <string name="units_and_formats">Unitats i formats</string>
-    <string name="appearance">Aparença</string>
     <string name="map_look_descr">Aparença del mapa</string>
     <string name="map_look">Aspecte del mapa</string>
     <string name="list_of_installed_plugins">Connectors instal·lats</string>
@@ -3493,7 +3405,6 @@
 \n</string>
     <string name="routing_profile_direct_to">La més curta</string>
     <string name="shared_string_routing">Càlcul de rutes</string>
-    <string name="shared_string_custom_rendering_style">Estil personalitzat de representació</string>
     <string name="shared_string_include_data">Inclou dades addicionals</string>
     <string name="import_profile_dialog_description">El perfil importat conté dades addicionals. Cliqueu \"Importa\" per importar només les dades del perfil o seleccioneu dades addicionals.</string>
     <string name="export_profile_dialog_description">Podeu seleccionar dades addicionals per exportar juntament amb el perfil.</string>
@@ -3546,7 +3457,6 @@
     <string name="select_distance_route_will_recalc">Seleccioneu la desviació per sobre de la qual es tornarà a calcular la ruta.</string>
     <string name="recalculate_route_in_deviation">Recalcula la ruta cas de desviament</string>
     <string name="shared_string_square">Quadrat</string>
-    <string name="shared_string_rhomb">Rombe</string>
     <string name="shared_string_circle">Cercle</string>
     <string name="select_shape">Seleccioneu forma</string>
     <string name="select_group">Seleccioneu grup</string>

OsmAnd/res/values-cs/phrases.xml

@@ -161,7 +161,6 @@
     <string name="poi_mortuary">Márnice</string>
     <string name="poi_crematorium">Krematorium</string>
     <string name="poi_bank">Banka</string>
-    <string name="poi_amenity_atm">Bankomat</string>
     <string name="poi_accountant">Účetní</string>
     <string name="poi_saddle">Sedlo</string>
     <string name="poi_volcano">Sopka</string>
@@ -272,7 +271,6 @@
     <string name="poi_copyshop">Kopírování</string>
     <string name="poi_curtain">Závěsy/Záclony</string>
     <string name="poi_fabric">Látky</string>
-    <string name="poi_bedding">Lůžkoviny</string>
     <string name="poi_doityourself">Pro domácí kutily</string>
     <string name="poi_erotic">Sexshop</string>
     <string name="poi_fishing">Rybářské potřeby</string>
@@ -443,7 +441,6 @@
     <string name="poi_sanatorium">Ozdravovna</string>
     <string name="poi_healthcare_alternative">Alternativní medicína</string>
     <string name="poi_audiologist">Ušní</string>
-    <string name="poi_healthcare_centre">Zdravotnické centrum</string>
     <string name="poi_midwife">Porodní asistentka</string>
     <string name="poi_occupational_therapist">Ergoterapie</string>
     <string name="poi_podiatrist">Podiatr</string>
@@ -509,7 +506,6 @@
     <string name="poi_skating">Bruslení</string>
     <string name="poi_skateboard">Skateboarding</string>
     <string name="poi_surfing">Surfing</string>
-    <string name="poi_team_handball">Házená</string>
     <string name="poi_toboggan">Bobová dráha</string>
     <string name="poi_museum">Muzeum</string>
     <string name="poi_artwork">Umělecké dílo</string>
@@ -553,7 +549,6 @@
     <string name="poi_internet_access_wired">Internetové připojení: kabel</string>
     <string name="poi_internet_access_public">Internetové připojení: veřejné</string>
     <string name="poi_internet_access_service">Internetové připojení: služba</string>
-    <string name="poi_historic_monastery">Historický klášter</string>
     <string name="poi_wayside_cross">Kříž, křížek</string>
     <string name="poi_wayside_shrine">Kaplička, boží muka</string>
     <string name="poi_information">Informace</string>
@@ -727,7 +722,6 @@
     <string name="poi_piste_skitour">Skialpinismus</string>
     <string name="poi_observation_tower">Rozhledna</string>
     <string name="poi_bell_tower">Zvonice</string>
-    <string name="poi_general_tourist_attraction_yes">Všeobecná turistická atrakce</string>
     <string name="poi_cabin">Chatka</string>
     <string name="poi_lean_to">Trojstranný přístřešek</string>
     <string name="poi_picnic_table">Piknikový stůl</string>
@@ -793,7 +787,6 @@
     <string name="poi_pasta">Obchod s těstovinami</string>
     <string name="poi_pastry">Cukrárna</string>
     <string name="poi_candles">Obchod se svíčkami</string>
-    <string name="poi_furnace">Obchod s topnými jednotkami</string>
     <string name="poi_music">Hudebniny</string>
     <string name="poi_scuba_diving_shop">Potápěčské potřeby</string>
     <string name="poi_tyres">Obchod s pneumatikami</string>
@@ -809,9 +802,7 @@
     <string name="poi_groyne">Pobřežní hráz</string>
     <string name="poi_power_cable_distribution_cabinet">Kabelová rozvodní skříň</string>
     <string name="poi_basin">Nádrž na dešťovou vodu</string>
-    <string name="poi_conservation">Chráněné území</string>
     <string name="poi_crane">Jeřáb</string>
-    <string name="poi_tourism_attraction">Turistická atrakce</string>
     <string name="poi_religious">Náboženská oblast</string>
     <string name="poi_cutline">Průsek lesa</string>
     <string name="poi_tree">Strom</string>
@@ -935,7 +926,6 @@
     <string name="poi_capital">Ano</string>
     <string name="poi_hiking_routes">Turistické trasy</string>
     <string name="poi_perfumery">Parfumerie</string>
-    <string name="poi_mill_pond">Mlýnský rybník</string>
     <string name="poi_cooling_tower">Chladicí věž</string>
     <string name="poi_lighting_tower">Osvětlovací věž</string>
     <string name="poi_landfill_waste_nuclear">Jaderný odpad</string>
@@ -973,7 +963,6 @@
     <string name="poi_information_bicyclemap">Cyklistická mapa</string>
     <string name="poi_information_audioguide">Audioprůvodce</string>
     <string name="poi_information_history">Historie</string>
-    <string name="poi_information_wildlife">Informační značení: živočich</string>
     <string name="poi_information_nature">Příroda</string>
     <string name="poi_information_hikingmap">Turistická mapa</string>
     <string name="poi_information_terminal">Terminál</string>
@@ -1138,7 +1127,6 @@
     <string name="poi_backrest_yes">Opěradlo: ano</string>
     <string name="poi_backrest_no">Opěradlo: ne</string>
     <string name="poi_intermittent">Občasné</string>
-    <string name="poi_car_wash_self_service">Samoobslužné</string>
     <string name="poi_information_sign">Značka</string>
     <string name="poi_commercial">Komerční pozemek</string>
     <string name="poi_retail">Maloobchodní pozemek</string>
@@ -1425,8 +1413,6 @@
     <string name="poi_stars_4s">4S (Vyšší první třída)</string>
     <string name="poi_stars_5">5 (Luxus)</string>
     <string name="poi_stars_5s">5S (Vyšší luxus)</string>
-    <string name="poi_stars_6">Hvězdy: 6</string>
-    <string name="poi_stars_7">Hvězdy: 7</string>
     <string name="poi_rooms">Místnosti</string>
     <string name="poi_love_hotel">Hodinový hotel</string>
     <string name="poi_payment_coins_yes">Mince</string>
@@ -1451,7 +1437,6 @@
     <string name="poi_payment_visa_no">Nepřijímá Visa karty</string>
     <string name="poi_payment_mastercard_yes">MasterCard</string>
     <string name="poi_payment_mastercard_no">Nepřijímá MasterCard karty</string>
-    <string name="poi_payment_none">Bez poplatku</string>
     <string name="poi_payment_account_cards_yes">Účtové karty</string>
     <string name="poi_payment_account_cards_no">Nepřijímá účtové karty</string>
     <string name="poi_payment_maestro_yes">Maestro karty</string>
@@ -2090,7 +2075,6 @@
     <string name="poi_impromptu_no">Improvizované tábořiště: ne</string>
     <string name="poi_sanitary_dump_station_yes">Stanoviště pro vypuštění sanitárního odpadu: ano</string>
     <string name="poi_sanitary_dump_station_no">Stanoviště pro vypuštění sanitárního odpadu: ne</string>
-    <string name="poi_sanitary_dump_station_customers">Stanoviště pro vypuštění sanitárního odpadu: pouze zákazníci</string>
     <string name="poi_refugee_yes">Vybavení pro uprchlíky</string>
     <string name="poi_refugee_no">Uprchlíci: ne</string>
     <string name="poi_social_facility_group_home">Skupinový domov</string>
@@ -2367,7 +2351,6 @@
     <string name="poi_inscription_e">Nápis: V</string>
     <string name="poi_inscription_ne">Nápis: SV</string>
     <string name="poi_construction_yes">Ve výstavbě</string>
-    <string name="poi_additional_atm_yes">Bankomat: ano</string>
     <string name="poi_atm_no">Bankomat: ne</string>
     <string name="poi_firepit">Ohniště</string>
     <string name="poi_street_cabinet">Pouliční skříň</string>
@@ -2449,7 +2432,6 @@
     <string name="poi_sanitary_dump_station">Zařízení pro vypuštění sanitárního odpadu</string>
     <string name="poi_medical_system_western_yes">Západní</string>
     <string name="poi_medical_system_chinese_yes">Tradiční čínský</string>
-    <string name="poi_medical_system_unknown_yes">Zdravotní systém: neznámý tradiční</string>
     <string name="poi_medical_system_ayurveeda_yes">Ájurvéda</string>
     <string name="poi_medical_system_mongolian_yes">Tradiční mongolský</string>
     <string name="poi_medical_system_tibetan_yes">Tradiční tibetský</string>
@@ -2587,7 +2569,6 @@
     <string name="poi_water_source_main">Hlavní</string>
     <string name="poi_water_source_pond">Rybník</string>
     <string name="poi_water_source_stream">Potok</string>
-    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
     <string name="poi_in_service_yes">V provozu: ano</string>
     <string name="poi_street_cabinet_power">Typ skříně: energie</string>
     <string name="poi_street_cabinet_telecom">Typ skříně: telecom</string>
@@ -3479,7 +3460,6 @@
     <string name="poi_denotation">Význam stromu</string>
     <string name="poi_park_ride">Parkoviště (P+R) vázané na dopravu</string>
     <string name="poi_car_pooling">Místo pro spolujízdu autem</string>
-    <string name="poi_health_specialty_radiotheraphy_yes">Radiační onkologie</string>
     <string name="poi_climbing_deepwater_yes">Deep-water soloing (lezení nad hlubokou vodou): ano</string>
     <string name="poi_climbing_deepwater_no">Deep-water soloing (lezení nad hlubokou vodou): ne</string>
     <string name="poi_climbing_bolted_yes">Pevné ukotvení: ano</string>
@@ -3530,7 +3510,6 @@
     <string name="poi_park_ride_hov">Vozidla s jedním nebo více pasažéry (HOV)</string>
     <string name="poi_park_ride_tram">Tramvaj</string>
     <string name="poi_park_ride_ferry">Trajekt</string>
-    <string name="poi_generator_source_biomass">Zdroj energie: biomasa</string>
     <string name="poi_rtsa_scale_filter">Kategorie obtížnosti</string>
     <string name="poi_socket_chademo_output_high">Vysoký</string>
     <string name="poi_socket_chademo_output_medium">Střední</string>

OsmAnd/res/values-cs/strings.xml

@@ -521,7 +521,6 @@
     <string name="error_calculating_route">Nepodařilo se vypočítat trasu.</string>
     <string name="error_calculating_route_occured">Nepodařilo se vypočítat trasu.</string>
     <string name="empty_route_calculated">Vypočítaná trasa je prázdná.</string>
-    <string name="new_route_calculated_dist">Vypočtena nová trasa, vzdálenost</string>
     <string name="arrived_at_destination">Dorazili jste do cíle.</string>
     <string name="invalid_locations">Neplatné souřadnice</string>
     <string name="go_back_to_osmand">Vrátit se k mapě</string>
@@ -619,7 +618,6 @@
     <string name="osb_comment_dialog_error">Nepodařilo se přidat komentář.</string>
     <string name="poi_edit_title">Upravit POI</string>
     <string name="poi_create_title">Vytvořit POI</string>
-    <string name="poi_error_poi_not_found">Uzel nelze nalézt nebo vybavení sestává z několika uzlů, které ještě nejsou podporovány.</string>
     <string name="poi_remove_confirm_template">Vymazat {0} (komentář) \?</string>
     <string name="poi_remove_title">Vymazat POI</string>
     <string name="shared_string_delete">Vymazat</string>
@@ -1189,7 +1187,7 @@
     <string name="share_route_as_gpx">Sdílet trasu jako GPX soubor</string>
     <string name="share_route_subject">Trasa sdílena pomocí OsmAnd</string>
     <string name="arrival_distance">Oznámení příjezdu</string>
-    <string name="arrival_distance_descr">Jak brzo oznamovat příjezd do cíle?</string>
+    <string name="arrival_distance_descr">Jak brzy oznamovat příjezd do cíle\?</string>
     <string name="keep_informing_never">Pouze manuálně (ťuknout na šipku)</string>
     <string name="keep_informing_descr">Znovu opakovat navigační pokyny v pravidelných intervalech.</string>
     <string name="keep_informing">Opakovat navigační pokyny</string>
@@ -1805,7 +1803,6 @@
     <string name="no_location_permission">Udělit oprávnění pro přístup k poloze.</string>
     <string name="no_camera_permission">Udělit oprávnění pro přístup k fotoaparátu.</string>
     <string name="no_microphone_permission">Udělit oprávnění pro přístup k mikrofonu.</string>
-    <string name="update">Aktualizovat každých</string>
     <string name="live_update">Okamžité aktualizace</string>
     <string name="update_now">Aktualizovat nyní</string>
     <string name="missing_write_external_storage_permission">OsmAnd nemá oprávnění používat paměťovou kartu</string>
@@ -2004,8 +2001,6 @@
     <string name="allow_access_location">Povolit přístup k poloze</string>
     <string name="first_usage_greeting">Nechejte se navigovat a objevte nová místa bez nutnosti připojení k Internetu</string>
     <string name="search_my_location">Najít mou polohu</string>
-    <string name="no_update_info_desc">Nekontrolovat nové verze a slevy související s OsmAnd.</string>
-    <string name="no_update_info">Nezobrazovat nové verze</string>
     <string name="update_all_maps_now">Aktualizovat všechny mapy ihned?</string>
     <string name="clear_tile_data">Vymazat všechny dlaždice</string>
     <string name="routing_attr_short_way_name">Ekonomická trasa</string>
@@ -2072,13 +2067,10 @@
     <string name="route_calculation">Výpočet trasy</string>
     <string name="route_roundabout_short">Použijte %1$d. výjezd a pokračujte</string>
     <string name="upload_poi">Nahrát POI</string>
-    <string name="legacy_search">Starší vyhledávání</string>
-    <string name="show_legacy_search">Zobrazit starší způsob vyhledávání</string>
     <string name="routing_attr_allow_motorway_name">Použít dálnice</string>
     <string name="routing_attr_allow_motorway_description">Povolí jízdu po dálnicích.</string>
     <string name="wiki_around">Články Wikipedie v okolí</string>
     <string name="search_map_hint">Město nebo oblast</string>
-    <string name="show_legacy_search_desc">Přidat starší hledání do úvodního panelu.</string>
     <string name="lang_sr_latn">Srbsky (latinka)</string>
     <string name="lang_zh_hk">Čínsky (Hong Kong)</string>
     <string name="rendering_attr_contourDensity_description">Hustota vrstevnic</string>
@@ -2731,15 +2723,6 @@
     <string name="how_to_open_wiki_title">Jak otevřít články Wikipedie?</string>
     <string name="hide_full_description">Skrýt plný popis</string>
     <string name="show_full_description">Zobrazit plný popis</string>
-    <string name="release_3_0">• Nové: Podpora pro celosvětové cestovní průvodce. Odkazovaná místa jsou propojené s mapou. Úvodní data z Wikivoyage.
-\n 
-\n • Wikipedie: nový vzhled, aktivní linky, podpora obrázků
-\n 
-\n • Rozhraní zobrazování tras: podpora skupin přechodových bodů (waypointů)
-\n 
-\n • Mapové značky: import vybraných skupin z GPX souborů, nový vzhled zadávání souřadnic
-\n 
-\n • Předplatné OsmAnd Live nyní zahrnuje všechny funkce OsmAnd</string>
     <string name="error_notification_desc">Zašlete prosím kopii obrazovky s touto chybou na email support@osmand.net</string>
     <string name="quick_action_edit_actions">Upravit akce</string>
     <string name="get_osmand_live">Získejte OsmAnd Live pro odemknutí všech funkcí: Denní aktulizace mapových podkladů s neomezeným počtem stahování, všechny placené moduly, propojení s Wikipedia, Wikivoyage a mnoho dalšího.</string>
@@ -2747,21 +2730,6 @@
     <string name="poi_cannot_be_found">Bod nebo cesta nebyly nalezeny.</string>
     <string name="search_no_results_feedback">Žádný výsledek vyhledávání\?
 \nPoskytněte nám zpětnou vazbu</string>
-    <string name="release_3_1">• Navigace: Opravený indikátor průběhu, přidána možnost pro rychlé prohození začátku a konce trasy 
-\n 
-\n • Mapové značky: Opravena možnost zapnutí/vypnutí skupin, nově možnost skrýt značky na mapě 
-\n 
-\n • Úpravy OSM: Nově možnost upravovat tagy všech objektů zájmu v mapě (nejen bodových jako dosud), opraveny chybějící komentáře v poznámkách, přidána možnost zálohy úprav 
-\n 
-\n • Vylepšené vykreslování článků Wikipedie a Wikivoyage, upravené soubory jsou již k dispozici ke stažení 
-\n 
-\n • Nabídka: Opraveny barvy znaků v nočním režimu, opraveny velikosti dodatečných menu 
-\n 
-\n • Lodní navigace: Nově podpora vodních cest 
-\n 
-\n • Menší opravy nahlášených chyb 
-\n</string>
-    <string name="commiting_way">Odesílání cesty…</string>
     <string name="increase_search_radius_to">Zvětšit okruh hledání na %1$s</string>
     <string name="send_search_query_description">Váš vyhledávací dotaz a poloha budou odeslány na: \"%1$s\".
 \n
@@ -2801,25 +2769,11 @@
     <string name="default_render_descr">Obecný styl. Čisté vykreslování hustě osídlených měst. Obsahuje vrstevnice, trasy, kvalita povrchu cest, omezení přístupu, čísla cest, značení dle SAC, objekty pro vodní sporty.</string>
     <string name="travel_card_download_descr">Stáhněte si cestovní průvodce Wikivoyage a prohlížejte články o místech po celém světě bez připojení na internet.</string>
     <string name="start_editing_card_image_text">Bezplatný cestovní průvodce, který může upravovat každý.</string>
-    <string name="welcome_to_open_beta_description">Cestovní průvodci jsou nyní založené na Wikivoyage. Všechny jejich funkce můžete otestovat zdarma během beta testování. Poté budou zpřístupněny předplatitelům služby OsmAnd Live a uživatelům OsmAnd+.</string>
+    <string name="welcome_to_open_beta_description">Cestovní průvodci jsou nyní založené na Wikivoyage. Všechny jejich funkce můžete otestovat zdarma během beta testování.</string>
     <string name="start_editing_card_description">Můžete (a měli byste) upravovat libovolný článek na Wikivoyage. Sdílejte znalosti, zkušenosti, talent a svoji pozornost.</string>
     <string name="ask_for_location_permission">Pro pokračování prosím udělte OsmAndu oprávnění pro přístup k poloze.</string>
     <string name="rendering_value_black_name">Černá</string>
     <string name="more_transport_on_stop_hint">Z této zastávky je možná další doprava.</string>
-    <string name="release_3_2_pre">• Opraven pád při startu, ke kterému docházelo na některých zařízeních 
-\n 
-\n • Nová akce značek: zobraz značky, které již byly projety 
-\n 
-\n • Vyhledávání v historii nyní ukazuje kategorie, které jste prohledávali v minulosti 
-\n 
-\n• Opravený pád při startu s ne-latinkovými mapami 
-\n 
-\n• Zlepšení rychlosti vykreslování na zařízeních s Android 8.0 
-\n 
-\n• Podpora pro editování plošných objektů 
-\n 
-\n• Měření vzdálenosti: tlačítko \"Měření\" přidáno do akcí v kontextovém menu 
-\n</string>
     <string name="search_street">Hledat ulici</string>
     <string name="start_search_from_city">Nejprve zvolte město/oblast</string>
     <string name="shared_string_restore">Obnovit</string>
@@ -2955,22 +2909,6 @@
     <string name="shared_string_walk">Chůze</string>
     <string name="save_poi_value_exceed_length">Zkraťte délku názvu značky \"%s\" na méně než 255 znaků.</string>
     <string name="save_poi_value_exceed_length_title">Délka hodnoty \"%s\"</string>
-    <string name="release_3_3">"• Nová obrazovka \'Pokyny\': Zobrazuje tlačítka pro cíl Domov a Práce, zkratku pro \'předchozí trasu\', seznam aktivních GPX tras a značek, historii vyhledávání
-\n 
-\n • Doplňující informace pod \'Detaily trasy\': druhy cest, povrch, strmost, kvalita povrchu 
-\n 
-\n • Navigace hromadnou dopravou: metro, autobusy, tramvaj, atd. 
-\n 
-\n • Nové rychlé akce pro skrytí/zobrazení tras a změnu denního/nočního režimu 
-\n 
-\n • Opravené oblasti zobrazené jako zaplavené v Německu, Jižní Africe, Quebecu 
-\n 
-\n • Vylepšená podpora pro import KML a KMZ 
-\n 
-\n • Opravené pády aplikace při otevření některých zastávek hromadné dopravy 
-\n 
-\n • Odstraněné analytické moduly Facebook a Firebase z verze zdarma (OsmAnd+ je neobsahoval) 
-\n "</string>
     <string name="routing_attr_avoid_sett_name">Žádné dlažební kostky</string>
     <string name="routing_attr_avoid_sett_description">Vyhne se dlažebním kostkám</string>
     <string name="shared_string_degrees">Stupně</string>
@@ -2989,15 +2927,6 @@
     <string name="routing_attr_avoid_subway_description">Vyhnout se metru a lehké železniční dopravě</string>
     <string name="routing_attr_avoid_ferry_name">Žádné trajekty</string>
     <string name="routing_attr_avoid_ferry_description">Vyhne se trajektům</string>
-    <string name="release_3_3_7">• Zobrazování času na přestup mezi hromadnou dopravou 
-\n 
-\n • Upravené rozhraní detailů trasy 
-\n 
-\n • Opravené tmavé téma v menu pokynů a detailů trasy 
-\n 
-\n • Zobrazení azimutu v měření vzdálenosti
-\n
-\n</string>
     <string name="send_log">Odeslat protokol</string>
     <string name="files_moved">%1$d souborů přesunuto (%2$s).</string>
     <string name="files_copied">%1$d souborů zkopírováno (%2$s).</string>
@@ -3073,7 +3002,6 @@
     <string name="third_party_routing_type">Navigování třetí strany</string>
     <string name="application_profiles_descr">Zvolte profily, které mají být viditelné v aplikaci.</string>
     <string name="application_profiles">Profily aplikace</string>
-    <string name="zoom_by_wunderlinq">Použít WunderLINQ pro ovládání</string>
     <string name="quick_action_need_to_add_item_to_list">Přidejte alespoň jednu položku do seznamu \'Rychlá akce\'</string>
     <string name="routing_attr_piste_type_downhill_name">Alpské a sjezdové lyžování</string>
     <string name="routing_attr_piste_type_downhill_description">Svahy pro alpské nebo sjezdové lyžování a přístup k lyžařským vlekům.</string>
@@ -3157,8 +3085,8 @@
     <string name="rendering_attr_showLez_name">Zobrazit oblasti s nízkými emisemi</string>
     <string name="temporary_conditional_routing">Zohlednit dočasná omezení</string>
     <string name="shared_string_default">Výchozí</string>
-    <string name="new_route_calculated_dist_dbg">Trasa: vzdálenost %s, potřebný čas %s 
-\nVýpočet: %.1f sekund, %d cest, %d dlaždic)</string>
+    <string name="new_route_calculated_dist_dbg">Trasa: vzdálenost %1$s, potřebný čas %2$s
+\nVýpočet: %3$.1f sekund, %4$d cest, %5$d dlaždic)</string>
     <string name="lang_oc">Okcitánsky</string>
     <string name="app_mode_wagon">Dodávkové auto</string>
     <string name="app_mode_pickup_truck">Pickup auto</string>
@@ -3218,7 +3146,6 @@
     <string name="turn_screen_on_info">Zobrazit mapu na uzamčené obrazovce během navigace.</string>
     <string name="route_parameters_info">Nastavení navádění pro zvolený profil „%1$s“.</string>
     <string name="units_and_formats">Jednotky a formáty</string>
-    <string name="appearance">Vzhled</string>
     <string name="map_look_descr">Vzhled mapy</string>
     <string name="configure_profile">Upravit profil</string>
     <string name="switch_profile">Přepnout profil</string>
@@ -3327,7 +3254,7 @@
     <string name="clear_recorded_data_warning">Opravdu chcete vymazat zaznamenané údaje\?</string>
     <string name="recalculate_route_in_deviation">Přepočítat trasu v případě odchýlení</string>
     <string name="select_distance_route_will_recalc">Zvolte vzdálenost, při které bude trasa přepočítána.</string>
-    <string name="recalculate_route_distance_promo">Trasa bude přepočítaná pokud vzdálenost od trasy k aktuální poloze je větší než zvolená hodnota.</string>
+    <string name="recalculate_route_distance_promo">Trasa bude přepočítána, pokud vzdálenost od trasy k aktuální poloze je větší než zvolená hodnota.</string>
     <string name="n_items_of_z">%1$s z %2$s</string>
     <string name="download_slope_maps">Svahy</string>
     <string name="quick_action_show_hide_terrain">Zobrazit nebo skrýt terén</string>
@@ -3382,8 +3309,6 @@
     <string name="profile_type_custom_string">Vlastní profil</string>
     <string name="import_rendering_file">Importovat soubor vykreslování</string>
     <string name="select_track_file">Vyberte soubor stopy</string>
-    <string name="wikipedia_poi_languages_promo">Některé články Wikipedie nemusí být dostupné ve vašem jazyce. Zvolte jazyky, v nichž se články Wikipedie objeví na mapě.
-\nBěhem čtení článku budete moci přepínat mezi všemi dostupnými jazyky.</string>
     <string name="wiki_menu_download_descr">Pro zobrazení bodů zájmu Wikipedie jsou potřeba další mapy.</string>
     <string name="main_actions_descr">Obsahuje pouze 4 tlačítka.</string>
     <string name="main_actions">Hlavní akce</string>
@@ -4035,7 +3960,6 @@
     <string name="routing_engine_vehicle_type_foot">Chůze</string>
     <string name="routing_engine_vehicle_type_bike">Kolo</string>
     <string name="routing_engine_vehicle_type_car">Auto</string>
-    <string name="message_error_recheck_parameters">Chyba, zkontrolujte parametry</string>
     <string name="copy_address">Kopírovat adresu</string>
     <string name="online_routing_engine">Online navigační služba</string>
     <string name="online_routing_engines">Online navigační služby</string>
@@ -4043,4 +3967,37 @@
     <string name="select_folder">Zvolte složku</string>
     <string name="select_folder_descr">Zvolte složku nebo vytvořte novou</string>
     <string name="shared_string_empty">Prázdné</string>
+    <string name="analyze_by_intervals">Analyzovat podle intervalů (rozdělit interval)</string>
+    <string name="upload_to_openstreetmap">Nahrát do OpenStreetMap</string>
+    <string name="edit_track">Editovat stopu</string>
+    <string name="rename_track">Přejmenovat stopu</string>
+    <string name="change_folder">Změnit složku</string>
+    <string name="shared_string_sec">sek.</string>
+    <string name="announcement_time_passing">Míjení</string>
+    <string name="announcement_time_approach">Přiblížení</string>
+    <string name="announcement_time_prepare_long">Dlouhá příprava</string>
+    <string name="announcement_time_prepare">Příprava</string>
+    <string name="announcement_time_off_route">Odchýlení od trasy</string>
+    <string name="announcement_time_arrive">Dosažení cíle</string>
+    <string name="shared_string_turn">Odbočit</string>
+    <string name="announcement_time_intervals">Intervaly času a vzdálenosti</string>
+    <string name="announcement_time_descr">Čas oznámení různých hlasových pokynů závisí na typu pokynu, aktuální rychlosti navigace a výchozí rychlosti navigace.</string>
+    <string name="announcement_time_title">Čas oznámení</string>
+    <string name="start_recording">Spustit záznam</string>
+    <string name="show_track_on_map">Zobrazit stopu na mapě</string>
+    <string name="routing_engine_vehicle_type_wheelchair">Invalidní vozík</string>
+    <string name="routing_engine_vehicle_type_hiking">Turistika</string>
+    <string name="routing_engine_vehicle_type_walking">Chůze</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">Jízda na elektrokole</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">Horská cyklistika</string>
+    <string name="routing_engine_vehicle_type_cycling_road">Silniční cyklistika</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">Běžná cyklistika</string>
+    <string name="routing_engine_vehicle_type_hgv">Nákladní auto</string>
+    <string name="routing_engine_vehicle_type_small_truck">Malé nákladní auto</string>
+    <string name="routing_engine_vehicle_type_truck">Kamion</string>
+    <string name="routing_engine_vehicle_type_scooter">Skútr</string>
+    <string name="routing_engine_vehicle_type_racingbike">Závodní kolo</string>
+    <string name="routing_engine_vehicle_type_mtb">Horské kolo</string>
+    <string name="message_server_error">Chyba serveru: %1$s</string>
+    <string name="message_name_is_already_exists">Název již existuje</string>
 </resources>

OsmAnd/res/values-cy/strings.xml

@@ -3,26 +3,19 @@
 <string name="show_warnings_descr">Dangos cyfyngiad cyflymder, camerâu cyflymder a thwmpathau traffig</string>
 <string name="map_widget_fluorescent">Lliwiau fflwroleuol</string>
 <string name="map_widget_show_ruler">Mesurydd</string>
-
-<string name="map_widget_view_direction">Golwg cyfeiriad</string>
+    <string name="map_widget_view_direction">Golwg cyfeiriad</string>
 <string name="map_widget_transparent">Golwg tryloyw</string>
-
-
-<string name="bg_service_sleep_mode_off">Rhedeg yn y cefndir</string>
+    <string name="bg_service_sleep_mode_off">Rhedeg yn y cefndir</string>
 <string name="bg_service_sleep_mode_on">Atal y cefndir</string>
 <string name="int_continuosly">Parhaus</string>
 <string name="screen_is_locked">I ddatgloi\'r sgrin pwyswch yr eicon cloi</string>
 <string name="map_widget_top_text">Enw stryd</string>
 <string name="map_widget_config">Ffurfweddiad</string>
-
-<string name="map_widget_back_to_loc">Lle\'r ydw i</string>
+    <string name="map_widget_back_to_loc">Lle\'r ydw i</string>
 <string name="map_widget_lock_screen">Cloi\'e sgrin</string>
 <string name="map_widget_compass">Cwmpawd</string>
-
-<string name="map_widget_reset">Ailosod i\'r rhagosodiad</string>
-
-
-<string name="map_widget_parking">Parcio</string>
+    <string name="map_widget_reset">Ailosod i\'r rhagosodiad</string>
+    <string name="map_widget_parking">Parcio</string>
 <string name="map_widget_speed">Cyflymder</string>
 <string name="map_widget_distance">Targed</string>
 <string name="map_widget_altitude">Uchder</string>
@@ -35,54 +28,41 @@
 <string name="bg_service_screen_unlock">Sgrin datgloi</string>
 <string name="bg_service_screen_lock_toast">Mae\'r sgrin wedi cloi</string>
 <string name="bg_service_interval">Gosod cyfnod deffro:</string>
-
-
-<string name="show_cameras">Dangos camerâu cyflymder</string>
+    <string name="show_cameras">Dangos camerâu cyflymder</string>
 <string name="show_traffic_warnings">Dangos cyfyngiadau cyflymder</string>
 <string name="avoid_toll_roads">Osgoi tollffyrdd</string>
-
-<string name="continue_follow_previous_route_auto">Nid oedd y llywio diwethaf wedi ei gwblhau. Parhau i\'w ddilyn? (%1$s eiliad)</string>
+    <string name="continue_follow_previous_route_auto">Nid oedd y llywio diwethaf wedi ei gwblhau. Parhau i\'w ddilyn? (%1$s eiliad)</string>
 <string name="route_updated_loc_found">Bydd y daith yn cael ei ail-gyfrifo ar ôl canfod y lleoliad</string>
 <string name="osmand_parking_hours">Awr</string>
 <string name="osmand_parking_minutes">Munud</string>
 <string name="osmand_parking_position_description_add_time">Roedd y car wedi ei barcio yn:</string>
-
-<string name="use_compass_navigation_descr">Defnyddio cwmpawd lle nad yw\'r cyfeiriad wedi ei ganfod</string>
+    <string name="use_compass_navigation_descr">Defnyddio cwmpawd lle nad yw\'r cyfeiriad wedi ei ganfod</string>
 <string name="use_compass_navigation">Defnyddio cwmpawd</string>
 <string name="select_animate_speedup">Defnyddio cyflymu animeiddio taith</string>
 <string name="global_app_allocated_memory_descr">Cof Dynodedig %1$s MB (Terfyn Android %2$s MB, Dalvik %3$s MB).</string>
 <string name="global_app_allocated_memory">Cof Dynodedig</string>
-
-
-<string name="layer_map_appearance">Ffurfweddu\'r sgrin</string>
+    <string name="layer_map_appearance">Ffurfweddu\'r sgrin</string>
 <string name="show_lanes">Dangos lonydd</string>
 <string name="avoid_unpaved">Osgoi ffyrdd heb wyneb caled</string>
 <string name="avoid_ferries">Osgoi fferïau</string>
 <string name="native_app_allocated_memory">Cyfanswm cof cynhenid</string>
-
-<string name="starting_point_too_far">Man cychwyn yn rhy bell o\'r ffordd agosaf</string>
+    <string name="starting_point_too_far">Man cychwyn yn rhy bell o\'r ffordd agosaf</string>
 <string name="shared_location">Lleoliad rhanedig</string>
 <string name="avoid_motorway">Ceisiwch osgoi traffyrdd</string>
 <string name="auto_zoom_map_descr">Zoom Auto mapio yn ôl eich cyflymder (tra map wedi eu cydamseru gyda\'r sefyllfa bresennol)</string>
 <string name="auto_zoom_map">Auto chwyddo map</string>
-
-<string name="snap_to_road_descr">Snap sefyllfa i ffyrdd yn ystod llywio</string>
+    <string name="snap_to_road_descr">Snap sefyllfa i ffyrdd yn ystod llywio</string>
 <string name="snap_to_road">Snap i\'r ffordd</string>
 <string name="osmand_short_description_80_chars">OsmAnd yn gais ffynhonnell agored ar gyfer llywio fapiau all-lein ac ar-lein</string>
 <string name="osmand_plus_short_description_80_chars">OsmAnd yn gais ffynhonnell agored ar gyfer llywio fapiau all-lein ac ar-lein</string>
-
-<string name="filterpoi_activity">Creu POI hidlo</string>
+    <string name="filterpoi_activity">Creu POI hidlo</string>
 <string name="recalculate_route_to_your_location">Dull trafnidiaeth:</string>
 <string name="select_navigation_mode">Dewiswch dull trafnidiaeth</string>
-
-<string name="day_night_info_description">Sunrise : %1$s \nSunset : %2$s</string>
+    <string name="day_night_info_description">Sunrise : %1$s \nSunset : %2$s</string>
 <string name="day_night_info">Dydd/nos info</string>
-
-<string name="map_widget_vector_attributes">Priodoleddau Rendro:</string>
+    <string name="map_widget_vector_attributes">Priodoleddau Rendro:</string>
 <string name="map_widget_renderer">Arddull rendro</string>
-
-
-<string name="native_app_allocated_memory_descr">Cyfanswm cof brodorol a ddyrennir gan app %1$s MB (Dalvik %2$s MB, arall %3$s MB).↵
+    <string name="native_app_allocated_memory_descr">Cyfanswm cof brodorol a ddyrennir gan app %1$s MB (Dalvik %2$s MB, arall %3$s MB).↵
 Cyfrannol cof %4$s MB (terfyn Android %5$s MB, Dalvik %6$s MB).</string>
 <string name="osmand_parking_event">Codwch y car o barcio</string>
 <string name="osmand_parking_warning">Rhybudd</string>
@@ -108,8 +88,7 @@ Cyfrannol cof %4$s MB (terfyn Android %5$s MB, Dalvik %6$s MB).</string>
 <string name="gpxup_trackable">Trackable</string>
 <string name="gpxup_private">Preifat</string>
 <string name="asap">cyn gynted â phosibl</string>
-
-<string name="route_roundabout">Cylchfan: cymryd %1$d allanfa ac yn mynd</string>
+    <string name="route_roundabout">Cylchfan: cymryd %1$d allanfa ac yn mynd</string>
 <string name="route_kl">Cadwch i\'r chwith ac ewch</string>
 <string name="route_kr">Cadwch i\'r dde ac ewch</string>
 <string name="rendering_attr_noPolygons_description">Gwneud yr holl nodweddion tir arwynebedd ar fap tryloyw</string>
@@ -127,12 +106,10 @@ Cyfrannol cof %4$s MB (terfyn Android %5$s MB, Dalvik %6$s MB).</string>
 <string name="navpoint_search_desc">Cyfesurynnau</string>
 <string name="transport_search_desc">Cludiant chwilio</string>
 <string name="favourites_search_desc">Ffefrynnau chwilio</string>
-
-<string name="offline_navigation_not_available">OsmAnd llywio all-lein nad yw ar gael dros dro.</string>
+    <string name="offline_navigation_not_available">OsmAnd llywio all-lein nad yw ar gael dros dro.</string>
 <string name="left_side_navigation">Chwith-law gyrru</string>
 <string name="left_side_navigation_descr">Dewiswch ar gyfer gwledydd gyda chwith traffig</string>
-
-<string name="unknown_from_location">Nid yw man cychwyn hwn wedi\'i benderfynu eto</string>
+    <string name="unknown_from_location">Nid yw man cychwyn hwn wedi\'i benderfynu eto</string>
 <string name="unknown_location">Sefyllfa nad yw\'n hysbys eto</string>
 <string name="modify_transparency">Addasu tryloywder (0 - tryloyw, 255 - afloyw)</string>
 <string name="confirm_interrupt_download">Ydych chi eisiau i dorri ar draws llwytho ffeil?</string>
@@ -140,26 +117,18 @@ Cyfrannol cof %4$s MB (terfyn Android %5$s MB, Dalvik %6$s MB).</string>
 <string name="select_index_file_to_download">Ni ddaethpwyd o hyd. Os gallwch ni all ddod o hyd i\'ch rhanbarth, gallwch wneud eich hun (gweler http://osmand.net).</string>
 <string name="local_indexes_cat_tile">Mapiau Ar-lein (teils)</string>
 <string name="local_indexes_cat_map">Fapiau all-lein (fector)</string>
-
-<string name="index_settings_descr">Lawrlwythwch, gweld y manylion, a rheoli mapiau all-lein</string>
+    <string name="index_settings_descr">Lawrlwythwch, gweld y manylion, a rheoli mapiau all-lein</string>
 <string name="map_online_plugin_is_not_installed">Galluogi mapiau plugin ar-lein i ddewis ffynonellau map gwahanol</string>
 <string name="map_online_data">Mapiau Ar-lein (teils)</string>
 <string name="map_online_data_descr">Defnyddio mapiau ar-lein (teils lawrlwytho a cache ar SD cerdyn)</string>
 <string name="shared_string_online_maps">Mapiau Ar-lein</string>
 <string name="online_map_settings_descr">Ffurfweddu ffynonellau teils ar-lein neu cached map</string>
-
-
-<string name="osmand_accessibility_description">Dangos gosodiadau ar gyfer nodweddion hygyrchedd arbennig.</string>
-
-
-
-<string name="osmand_development_plugin_description">Dangos gosodiadau ar gyfer nodweddion datblygu a debugging fel mordwyo hanimeiddio neu arddangos perfformiad rendro.</string>
+    <string name="osmand_accessibility_description">Dangos gosodiadau ar gyfer nodweddion hygyrchedd arbennig.</string>
+    <string name="osmand_development_plugin_description">Dangos gosodiadau ar gyfer nodweddion datblygu a debugging fel mordwyo hanimeiddio neu arddangos perfformiad rendro.</string>
 <string name="plugins_screen">Rheolwr ategyn</string>
-
-<string name="prefs_plugins_descr">Plugins galluogi lleoliadau modd arbenigol ac yn darparu swyddogaeth ychwanegol fel mapiau olrhain teils,, gweithredu dull cwsg, lleoliadau hygyrchedd, ac eraill.</string>
+    <string name="prefs_plugins_descr">Plugins galluogi lleoliadau modd arbenigol ac yn darparu swyddogaeth ychwanegol fel mapiau olrhain teils,, gweithredu dull cwsg, lleoliadau hygyrchedd, ac eraill.</string>
 <string name="prefs_plugins">Rheolwr ategyn</string>
-
-<string name="vector_maps_may_display_faster_on_some_devices">Mapiau fector debygol arddangos yn gyflymach. Efallai na gweithio\'n dda ar rai dyfeisiau.</string>
+    <string name="vector_maps_may_display_faster_on_some_devices">Mapiau fector debygol arddangos yn gyflymach. Efallai na gweithio\'n dda ar rai dyfeisiau.</string>
 <string name="play_commands_of_currently_selected_voice">Chwarae gorchmynion llais a ddewiswyd ar hyn o bryd</string>
 <string name="debugging_and_development">OsmAnd datblygu</string>
 <string name="native_rendering">Rendro Brodorol</string>

OsmAnd/res/values-da/phrases.xml

@@ -34,7 +34,6 @@
     <string name="poi_copyshop">Kopicenter</string>
     <string name="poi_curtain">Gardinbutik</string>
     <string name="poi_fabric">Stofbutik</string>
-    <string name="poi_bedding">Sengetøj</string>
     <string name="poi_dive">Dykkerudstyr</string>
     <string name="poi_doityourself">Byggemarked</string>
     <string name="poi_erotic">Erotisk butik</string>
@@ -340,7 +339,6 @@
     <string name="poi_religion_shinto">Shinto</string>
     <string name="poi_religion_taoist">Taoisme</string>
     <string name="poi_monastery">Kloster</string>
-    <string name="poi_historic_monastery">Historisk kloster</string>
     <string name="poi_wayside_cross">Vejside kors</string>
     <string name="poi_wayside_shrine">Vejkantsalter</string>
     <string name="poi_information">Information</string>
@@ -477,7 +475,6 @@
     <string name="poi_crematorium">Krematorium</string>
     <string name="poi_internet_cafe">Internet cafe</string>
     <string name="poi_bank">Bank</string>
-    <string name="poi_amenity_atm">Hæveautomat</string>
     <string name="poi_money_lender">Pengeudlåner</string>
     <string name="poi_pawnbroker">Pantelåner</string>
     <string name="poi_bureau_de_change">Vekselkontor</string>
@@ -561,7 +558,6 @@
     <string name="poi_healthcare_alternative">Alternativ medicin</string>
     <string name="poi_audiologist">Audiolog</string>
     <string name="poi_blood_bank">Blodbank</string>
-    <string name="poi_healthcare_centre">Medicinsk center</string>
     <string name="poi_midwife">Jordemoder</string>
     <string name="poi_occupational_therapist">Ergoterapeut</string>
     <string name="poi_optometrist">Optiker</string>
@@ -609,7 +605,6 @@
     <string name="poi_aquarium">Akvarie</string>
     <string name="poi_mast">Mast</string>
     <string name="poi_radar">Radar</string>
-    <string name="poi_team_handball">Håndbold</string>
     <string name="poi_shop">Butik</string>
     <string name="poi_emergency">Nødsituation</string>
     <string name="poi_transportation">Transport</string>
@@ -730,7 +725,6 @@
     <string name="poi_bell_tower">Klokketårn</string>
     <string name="poi_ski_rental">Skiudlejning</string>
     <string name="poi_ski_resort">Skisportssted</string>
-    <string name="poi_general_tourist_attraction_yes">Generel turistattraktion</string>
     <string name="poi_cabin">Hytte</string>
     <string name="poi_hunting_lodge">Jagthytte</string>
     <string name="poi_picnic_table">Bordbænkesæt</string>
@@ -830,7 +824,6 @@
     <string name="poi_video_games">Videospil</string>
     <string name="poi_pyrotechnics">Pyroteknik</string>
     <string name="poi_weapons">Våbenbutik</string>
-    <string name="poi_furnace">Varmeapparater</string>
     <string name="poi_free_flying">Freeflying udstyr</string>
     <string name="poi_kent_carriage_gap">Kent carriage gap</string>
     <string name="poi_scuba_diving_shop">Scuba dykning udstyr</string>
@@ -839,8 +832,6 @@
     <string name="poi_groyne">Høfde</string>
     <string name="poi_power_cable_distribution_cabinet">Elskab</string>
     <string name="poi_basin">Basin</string>
-    <string name="poi_conservation">Beskyttet område</string>
-    <string name="poi_building_poi">Bygning</string>
     <string name="poi_crane">Kran</string>
     <string name="poi_cutline">Brandbælte</string>
     <string name="poi_tree">Træ</string>
@@ -850,7 +841,6 @@
     <string name="poi_lcn_ref">Lokal netværk af cykelruter</string>
     <string name="poi_abandoned">Forladt</string>
     <string name="poi_disused">Nedlagt</string>
-    <string name="poi_tourism_attraction">Turistattraktion</string>
     <string name="poi_operator">Operatør</string>
     <string name="poi_maxweight">Max vægt</string>
     <string name="poi_maxheight">Max højde</string>
@@ -984,7 +974,6 @@
     <string name="poi_crossing_traffic_signals">Med stoplys</string>
     <string name="poi_crossing_uncontrolled">Ikke kontrolleret</string>
     <string name="poi_crossing_unmarked">Ikke markeret</string>
-    <string name="poi_mill_pond">Mølledam</string>
     <string name="twitter">Twitter</string>
     <string name="poi_skype">Skype</string>
     <string name="poi_youtube">YouTube</string>
@@ -1164,7 +1153,6 @@
     <string name="poi_power_pole">Elmast</string>
     <string name="poi_lighting_tower">Lysmast</string>
     <string name="poi_urban">Bymæssig</string>
-    <string name="poi_car_wash_self_service">Selvbetjening</string>
     <string name="poi_int_name">International navn</string>
     <string name="poi_nat_name">National navn</string>
     <string name="poi_reg_name">Regional navn</string>
@@ -1190,7 +1178,6 @@
     <string name="poi_information_route_marker">Ruteskilte</string>
     <string name="poi_information_hikingmap">Vandrekort</string>
     <string name="poi_information_nature">Natur</string>
-    <string name="poi_information_wildlife">Informationsmarkør: dyreliv</string>
     <string name="poi_information_history">Historie</string>
     <string name="poi_information_sign">Skilt</string>
     <string name="poi_information_audioguide">Audioguide</string>
@@ -1312,8 +1299,6 @@
     <string name="poi_stars_4s">4S (Superior Førsteklasse)</string>
     <string name="poi_stars_5">5 (Luksus)</string>
     <string name="poi_stars_5s">5S (Superior Luksus)</string>
-    <string name="poi_stars_6">Stjerner: 6</string>
-    <string name="poi_stars_7">Stjerner: 7</string>
     <string name="poi_rooms">Værelser</string>
     <string name="poi_love_hotel">Kærlighedshotel</string>
     <string name="poi_payment_coins_yes">Mønter</string>
@@ -1338,7 +1323,6 @@
     <string name="poi_payment_visa_no">Visakort accepteres ikke</string>
     <string name="poi_payment_mastercard_yes">MasterCard</string>
     <string name="poi_payment_mastercard_no">MasterCard accepteres ikke</string>
-    <string name="poi_payment_none">Vederlagsfrit</string>
     <string name="poi_payment_account_cards_yes">Kontokort</string>
     <string name="poi_payment_account_cards_no">Kontokort accepteres ikke</string>
     <string name="poi_payment_maestro_yes">Maestro kort</string>
@@ -1972,7 +1956,6 @@
     <string name="poi_impromptu_no">Improviseret: nej</string>
     <string name="poi_sanitary_dump_station_yes">Sanitær tømmestation: ja</string>
     <string name="poi_sanitary_dump_station_no">Sanitær tømmestation: nej</string>
-    <string name="poi_sanitary_dump_station_customers">Sanitær tømmestation: kun for kunder</string>
     <string name="poi_power_supply_yes">Ja</string>
     <string name="poi_power_supply_no">Strømforsyning: nej</string>
     <string name="poi_power_supply_cee_17_blue">Strømforsyning (stik): CEE 17 blå</string>
@@ -2384,7 +2367,6 @@
     <string name="poi_inscription_e">Inskription: Ø</string>
     <string name="poi_inscription_ne">Inskription: NØ</string>
     <string name="poi_construction_yes">Under opførelse</string>
-    <string name="poi_additional_atm_yes">Hæveautomat: ja</string>
     <string name="poi_atm_no">Hæveautomat: nej</string>
     <string name="poi_firepit">Bålplads</string>
     <string name="poi_street_cabinet">Gadeskab</string>
@@ -2480,7 +2462,6 @@
     <string name="poi_sanitary_dump_station">Sanitær tømmestation</string>
     <string name="poi_medical_system_western_yes">Vestlig</string>
     <string name="poi_medical_system_chinese_yes">Traditionel Kinesisk</string>
-    <string name="poi_medical_system_unknown_yes">Medicinsk system: ukendt traditionel</string>
     <string name="poi_medical_system_ayurveeda_yes">Ayurveeda</string>
     <string name="poi_medical_system_kampo_yes">Kampo</string>
     <string name="poi_medical_system_mongolian_yes">Traditionelt Mongolsk</string>
@@ -2504,17 +2485,12 @@
     <string name="poi_health_service_test_yes">Sundhedsvæsen: test: ja</string>
     <string name="poi_health_service_test_no">Sundhedsvæsen: test: nej</string>
     <string name="poi_health_facility_type_office">Medicinskkontor</string>
-    <string name="poi_health_facility_type_hospital">Sundhed facilitetstype: hospital</string>
     <string name="poi_health_facility_type_field_hospital">Sundhedsfacilitetstype: felthospital</string>
-    <string name="poi_health_facility_type_clinic">Sundhed facilitetstype: klinik</string>
-    <string name="poi_health_facility_type_health_centre">Sundhed facilitetstype: sundhedscenter</string>
     <string name="poi_health_facility_type_counselling_centre">Sundhedsfacilitetstype: rådgivningscenter</string>
-    <string name="poi_health_facility_type_rehabilitation">Sundhed facilitetstype: rehabilitering</string>
     <string name="poi_health_facility_type_laboratory">Sundhedsfacilitetstype: laboratorium</string>
     <string name="poi_health_facility_type_therapy">Sundhedsfacilitetstype: terapi</string>
     <string name="poi_health_facility_type_department">Sundhedsfacilitetstype: institut</string>
     <string name="poi_health_facility_type_dispensary">Sundhedsfacilitetstype: udlevering af lægemidler</string>
-    <string name="poi_health_facility_type_pharmacy">Sundhed facilitetstype: apotek</string>
     <string name="poi_health_facility_type_first_aid">Sundhedsfacilitetstype: førstehjælp</string>
     <string name="poi_health_facility_type_nursing_home">Sundhedsfacilitetstype: plejehjem</string>
     <string name="poi_health_facility_type_support_group_home">Sundhedsfacilitetstype: bofællesskab</string>
@@ -2562,7 +2538,6 @@
     <string name="poi_counselling_type_marriage_yes">Rådgivning (ægteskab): ja</string>
     <string name="poi_counselling_type_marriage_no">Rådgivning (ægteskab): nej</string>
     <string name="poi_counselling_type_nutrition_yes">Rådgivning (ernæring): ja</string>
-    <string name="poi_counselling_type_nutrition_no">Rådgivning (ernæring): nej</string>
     <string name="poi_counselling_type_rehabilitation_yes">Rådgivning (rehabilitering): ja</string>
     <string name="poi_counselling_type_rehabilitation_no">Rådgivning (rehabilitering): nej</string>
     <string name="poi_counselling_type_sexual_yes">Rådgivning (seksuel): ja</string>
@@ -2631,7 +2606,6 @@
     <string name="poi_water_source_main">Primær</string>
     <string name="poi_water_source_pond">Dam</string>
     <string name="poi_water_source_stream">Vandløb</string>
-    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterne</string>
     <string name="poi_in_service_yes">I tjeneste: ja</string>
     <string name="poi_street_cabinet_power">Gadeskabstype: eldistribution</string>
     <string name="poi_street_cabinet_telecom">Gadeskabstype: tele</string>
@@ -2869,7 +2843,6 @@
     <string name="poi_power_supply">Strømforsyning</string>
     <string name="poi_medical_system">Medicinsystem</string>
     <string name="poi_home_visit">Hjemmebesøg</string>
-    <string name="poi_dishes">Retter</string>
     <string name="poi_cuisine_pizza">Pizza</string>
     <string name="poi_cuisine_burger">Burger</string>
     <string name="poi_cuisine_coffee">Kaffe</string>
@@ -3563,8 +3536,6 @@
     <string name="poi_park_ride_tram">Sporvogn</string>
     <string name="poi_park_ride_ferry">Færge</string>
     <string name="poi_denotation">Betegnelse</string>
-    <string name="poi_generator_source_biomass">Energikilde: biomasse</string>
-    <string name="poi_health_specialty_radiotheraphy_yes">Strålebehandling</string>
     <string name="poi_hazard">Fare</string>
     <string name="poi_rtsa_scale_filter">Sværhedsgrad</string>
     <string name="poi_toll_gantry">Vejafgift anlæg</string>

OsmAnd/res/values-da/strings.xml

@@ -853,7 +853,6 @@
     <string name="error_calculating_route">Ruten kunne ikke beregnes.</string>
     <string name="error_calculating_route_occured">Ruten kunne ikke beregnes.</string>
     <string name="empty_route_calculated">Beregnet rute er tom.</string>
-    <string name="new_route_calculated_dist">Ny rute beregnet, afstand</string>
     <string name="arrived_at_destination">Ankommet.</string>
     <string name="invalid_locations">Ugyldige koordinater</string>
     <string name="go_back_to_osmand">Tilbage til kortet</string>
@@ -922,7 +921,6 @@
     <string name="default_buttons_commit">Udfør</string>
     <string name="amenity_type_geocache">Geocaching</string>
     <string name="commiting_node">Overfør knudepunkt…</string>
-    <string name="poi_error_poi_not_found">Knudepunkt kan ikke findes, eller faciliteter består af flere knudepunkter som endnu ikke er understøttet.</string>
     <string name="route_head">Lige ud</string>
     <string name="incremental_search_building">Søg efter bygning trinvist</string>
     <string name="Closest_Amenities">Nærmeste faciliteter</string>
@@ -1804,7 +1802,6 @@
     <string name="no_address_found">Kan ikke bestemme adresse</string>
     <string name="looking_up_address">Søger efter adressen</string>
     <string name="rendering_attr_horseRoutes_name">Rideruter</string>
-    <string name="update">Opdateringsinterval</string>
     <string name="only_download_over_wifi">Hent kun med Wi-Fi</string>
     <string name="live_update">Realtidsopdatering</string>
     <string name="update_now">Opdater nu</string>
@@ -2004,8 +2001,6 @@
     <string name="get_started">Kom i gang</string>
     <string name="update_all_maps_now">Opdater alle kort nu?</string>
     <string name="clear_tile_data">Ryd alle kortbrikker</string>
-    <string name="no_update_info_desc">Kontroller ikke for nye versioner eller rabatter.</string>
-    <string name="no_update_info">Vis ikke nye versioner</string>
     <string name="search_my_location">Find position</string>
     <string name="skip_map_downloading">Spring over hentning af kort</string>
     <string name="skip_map_downloading_desc">Der ikke nogen offline kort installeret. Vælg et kort fra listen eller hent senere via \'Menu - %1$s\'.</string>
@@ -2081,9 +2076,6 @@
     <string name="wiki_around">Wikipedia artikler i nærheden</string>
     <string name="routing_attr_allow_motorway_name">Brug motorveje</string>
     <string name="routing_attr_allow_motorway_description">Tillader motorveje.</string>
-    <string name="legacy_search">Legacy søgning</string>
-    <string name="show_legacy_search">Vis legacy søgning</string>
-    <string name="show_legacy_search_desc">Tilføj legacy søgning til sidemenuen.</string>
     <string name="lang_sr_latn">Serbisk (latinsk)</string>
     <string name="lang_zh_hk">Kinesisk (Hong Kong)</string>
     <string name="rendering_attr_hideWaterPolygons_description">Vand</string>
@@ -2602,16 +2594,6 @@
     <string name="by_date">Efter dato</string>
     <string name="by_type">Efter type</string>
     <string name="modify_the_search_query">Ændr søgning.</string>
-    <string name="release_3_0">• Nyt: globale offline rejseguider. Henvisning til steder linker til kortet. Data fra Wikivoyage 
-\n 
-\n • Wikipedia: nyt udseende, aktive links, billeder understøttes nu 
-\n 
-\n • Åbn spor grænseflade: understøtter rutepunktsgrupper 
-\n 
-\n • Kortmarkører: import af udvalgte grupper fra GPX-filer, nyt udseende på koordinat indtastning 
-\n 
-\n • OsmAnd Live abonnement indeholder nu alle OsmAnd-funktioner 
-\n</string>
     <string name="av_locations_selected_desc">GPX-fil med koordinaterne og data for de valgte noter.</string>
     <string name="av_locations_all_desc">GPX-fil med koordinater og data for alle noter.</string>
     <string name="osm_recipient_stat">Redigeringer %1$s, sum %2$s mBTC</string>
@@ -2734,7 +2716,7 @@
     <string name="update_is_available">Opdatering er tilgængelig</string>
     <string name="download_file">Hent fil</string>
     <string name="start_editing_card_image_text">Den gratis verdensomspændende rejseguide, som alle kan redigere.</string>
-    <string name="welcome_to_open_beta_description">Rejseguide er baseret på Wikivoyage. Test alle funktionerne gratis i den åbne beta. Bagefter vil rejseguider være tilgængelig for abonnenter af OsmAnd ubegrænset og ejere af OsmAnd+.</string>
+    <string name="welcome_to_open_beta_description">Rejseguide er baseret på Wikivoyage. Test alle funktionerne gratis i den åbne beta.</string>
     <string name="start_editing_card_description">Du kan og bør redigere en artikel på Wikivoyage. Del viden, erfaringer, talent og din opmærksomhed.</string>
     <string name="start_editing">Begynd redigering</string>
     <string name="get_unlimited_access">Få ubegrænset adgang</string>
@@ -2787,44 +2769,13 @@
     <string name="send_search_query_description">Send søgestrengen: \"%1$s\" samt lokationen.
 \n 
 \nDer indsamles ingen personlige oplysninger, kun søgedata, der er nødvendige for at forbedre søgningen.</string>
-    <string name="search_no_results_description">Ingen resultater?
-\nRapporter det.</string>
     <string name="send_search_query">Send søgeforespørgsel?</string>
-    <string name="release_3_1">• Navigation: rettet statuslinje, hurtigt ombytning af start-og slutpunkt på ruten 
-\n
-\n• Kortmarkører: rettet tænd/sluk-grupper, evne til at skjule markører på kortet 
-\n
-\n• OSM redigering: mulighed for at redigere mærker for ikke-punkt objekter, rettet manglende kommentarer til noter, sikkerhedskopiering af redigeringer 
-\n
-\n• Forbedret Wikipedia og Wikivoyage fortolkning, opdaterede filer findes allerede 
-\n
-\n• Kontekstmenu: rettet transport farve i nat-tilstand, rettet yderligere menustørrelser 
-\n
-\n• Bådnavigation: understøtter flodnavigation 
-\n
-\n• Andre fejlrettelser 
-\n</string>
     <string name="increase_search_radius_to">Udvid søgeradius til %1$s</string>
     <string name="thank_you_for_feedback">Tak for tilbagemelding</string>
     <string name="poi_cannot_be_found">Node eller vej kan ikke findes.</string>
     <string name="search_no_results_feedback">Ingen søgeresultater?
 \nGiv tilbagemelding</string>
     <string name="test_voice_desrc">Tryk på en knap og lyt til den tilsvarende talemeddelelse for at høre, om den mangler eller er defekt</string>
-    <string name="commiting_way">Indsendelsesmåde…</string>
-    <string name="release_3_2_pre">• Løst nedbrud ved start, der opstod på nogle enheder 
-\n 
-\n • Ny Markør funktion: visning af de mærker, der allerede er nået 
-\n 
-\n • Søgehistorikken viser nu de kategorier, der er søgt efter tidligere 
-\n 
-\n • Løst nedbrud ved opstart, der opstod med ikke-latinske kort 
-\n 
-\n  • Forbedret renderingshastighed på Android 8.0 enheder 
-\n 
-\n  • Understøtter redigering af polygonobjekter (ikke-facilitet) 
-\n 
-\n  • Afstandsmåling: tilføjet knap til \"Afstandsmåling\" i handlinger i kontekstmenuen 
-\n</string>
     <string name="ask_for_location_permission">Giv OsmAnd adgang til placering for at fortsætte.</string>
     <string name="rendering_value_black_name">Sort</string>
     <string name="more_transport_on_stop_hint">Der er flere forbindelser ved dette stop.</string>
@@ -2905,23 +2856,6 @@
     <string name="quick_action_gpx_tracks_hide">Skjul GPX spor</string>
     <string name="quick_action_gpx_tracks_show">Vis GPX spor</string>
     <string name="add_destination_query">Angiv en destination først</string>
-    <string name="release_3_3">• Ny \'Rutevejledning\': viser hjem- og arbejdsstedsknapper, \'Forrige rute\' genvej, liste over aktive GPX-spor og markører, søgehistorik 
-\n 
-\n  • Yderligere information under \'Ruteoplysninger\': vejtyper, overflade, stejlhed, jævnhed 
-\n 
-\n  • Offentlig transportnavigation, understøtter alle former for transport: metro, bus, sporvogn osv. 
-\n 
-\n  • Ny hurtig genvej til vis/skjul spor og dag-/nattilstand 
-\n 
-\n  • Rettet at områder vises som oversvømmet i Tyskland, Sydafrika, Quebec 
-\n 
-\n  • Yderligere support for KML og KMZ import 
-\n 
-\n  • Rettet fejl ved åbning af visse offentlige transportstoppesteder 
-\n 
-\n  • Fjernet Facebook og Firebase analytics fra den gratis version (OsmAnd + indeholder dem ikke)
-\n
-\n</string>
     <string name="use_osm_live_public_transport_description">Aktivér offentlig transport for OsmAnd Live ændringer.</string>
     <string name="use_osm_live_public_transport">OsmAnd Live offentlig transport</string>
     <string name="add_start_and_end_points">Tilføj afgangs-og ankomststed</string>
@@ -2998,15 +2932,6 @@
     <string name="routing_attr_avoid_subway_description">Undgår metro og letbane</string>
     <string name="routing_attr_avoid_ferry_name">Ingen færger</string>
     <string name="routing_attr_avoid_ferry_description">Undgår færger</string>
-    <string name="release_3_3_7">• Vis tid mellem overførsler i offentlig transport 
-\n 
-\n • Korrigeret brugergrænseflade til ruteoplysningerne 
-\n 
-\n • Rettet mørkt tema i Retningsmenuen og Rutedetaljer 
-\n 
-\n • Vis azimut i Mål afstand
-\n
-\n</string>
     <string name="send_log">Send log</string>
     <string name="files_moved">Flyttede %1$d filer (%2$s).</string>
     <string name="files_copied">Kopieret %1$d filer (%2$s).</string>
@@ -3031,7 +2956,6 @@
     <string name="choose_data_to_share">Vælg den type data der deles:</string>
     <string name="downloaded_maps">Hentede kort</string>
     <string name="visited_screens">Besøgte skærme</string>
-    <string name="colleted_data">Indsamlede data</string>
     <string name="collected_data_descr">Definer hvilke data der deles med OsmAnd.</string>
     <string name="downloaded_maps_collect_descr">Hjælper os med at forstå populariteten af land- og regionskort.</string>
     <string name="visited_screens_collect_descr">Hjælper os med at forstå populariteten af OsmAnd-funktionens.</string>
@@ -3087,8 +3011,6 @@
     <string name="third_party_routing_type">Tredjepartsruteplanlægning</string>
     <string name="application_profiles_descr">Vælg de profiler, der skal være synlige.</string>
     <string name="application_profiles">Programprofiler</string>
-    <string name="zoom_by_wunderlinq_descr">Skift kort zoom ved at rulle hjulet op og ned. Escape vender tilbage til WunderLINQ.</string>
-    <string name="zoom_by_wunderlinq">Brug WunderLINQ til styring</string>
     <string name="quick_action_need_to_add_item_to_list">Tilføj mindst ét punkt til listen i \'Hurtig Handling\' under \'Indstillinger\'</string>
     <string name="routing_attr_piste_type_downhill_name">Alpint/downhill skiløb</string>
     <string name="routing_attr_piste_type_downhill_description">Skiløjper til alpint skiløb eller downhill og adgang til skilifte.</string>
@@ -3193,8 +3115,8 @@
     <string name="rendering_attr_showLez_name">Vis Miljøzoner</string>
     <string name="temporary_conditional_routing">Overvej midlertidige begrænsninger</string>
     <string name="shared_string_default">Standard</string>
-    <string name="new_route_calculated_dist_dbg">Rute: afstand %s, rute tid %s 
-\nBeregning: %.1f s., %d veje, %d fliser</string>
+    <string name="new_route_calculated_dist_dbg">Rute: afstand %1$s, rute tid %2$s
+\nBeregning: %3$.1f s., %4$d veje, %5$d fliser</string>
     <string name="lang_oc">Occitansk</string>
     <string name="app_mode_wagon">Vogn</string>
     <string name="app_mode_pickup_truck">Pickup</string>
@@ -3233,7 +3155,6 @@
     <string name="route_parameters_info">Indstillinger for routing i den valgte profil \"%1$s\".</string>
     <string name="wake_time">Vågnetid</string>
     <string name="units_and_formats">Enheder &amp; formater</string>
-    <string name="appearance">Udseende</string>
     <string name="map_look_descr">Kortets udseende</string>
     <string name="map_look">Kortets udseende</string>
     <string name="list_of_installed_plugins">Installerede udvidelser</string>
@@ -3267,7 +3188,6 @@
     <string name="logcat_buffer">Logcat-buffer</string>
     <string name="plugins_settings">Udvidelsesindstillinger</string>
     <string name="shared_string_by_default">Som standard</string>
-    <string name="download_detaile_map">Hent detaljeret %s kort, for at se området.</string>
     <string name="download_detailed_map">Hent detaljeret %s kort, for at se området.</string>
     <string name="change_data_storage_full_description">Flyt datafiler til den nye destination\?
 \n%1$s&gt;%2$s</string>
@@ -3527,7 +3447,6 @@
     <string name="select_group">Vælg gruppe</string>
     <string name="select_shape">Vælg form</string>
     <string name="shared_string_circle">Cirkel</string>
-    <string name="shared_string_rhomb">Rhombe</string>
     <string name="shared_string_square">Firkant</string>
     <string name="shared_string_min">Min</string>
     <string name="use_system_screen_timeout_promo">Deaktiveret som standard, hvis programmet kører i forgrunden, slukkes skærmen ikke.
@@ -3582,8 +3501,6 @@
     <string name="shared_string_language">Sprog</string>
     <string name="shared_string_all_languages">Alle sprog</string>
     <string name="wiki_menu_download_descr">Yderligere kort er nødvendige for at se Wikipedia Interessepunkter på kortet.</string>
-    <string name="wikipedia_poi_languages_promo">Nogle Wikipedia-artikler er muligvis ikke tilgængelige på nogle sprog. Vælg de sprog, som Wikipedia-artikler skal vises på kortet.
-\nSkift mellem alle tilgængelige sprog, mens artiklen læses.</string>
     <string name="ui_customization_short_descr">Skuffeelementer, genvejsmenu</string>
     <string name="shared_string_drawer">Skuffe</string>
     <string name="ui_customization">Tilpasning af brugergrænseflade</string>

OsmAnd/res/values-de/phrases.xml

@@ -35,7 +35,6 @@
     <string name="poi_artwork">Kunstwerk</string>
     <string name="poi_astronomical_observatory">Astronomisch</string>
     <string name="poi_athletics">Sport</string>
-    <string name="poi_amenity_atm">Geldautomat</string>
     <string name="poi_attraction">Touristische Attraktion</string>
     <string name="poi_atv">Quad-Geschäft</string>
     <string name="poi_audiologist">Gehörspezialist</string>
@@ -60,7 +59,6 @@
     <string name="poi_beauty">Schönheitssalon</string>
     <string name="poi_beauty_salon_nails">Maniküre</string>
     <string name="poi_bed">Schlafzimmereinrichtung</string>
-    <string name="poi_bedding">Bettwarengeschäft</string>
     <string name="poi_craft_beekeeper">Bienenzüchter</string>
     <string name="poi_beverages">Getränkegeschäft</string>
     <string name="poi_bicycle_parking">Fahrradabstellplatz</string>
@@ -242,14 +240,12 @@
     <string name="poi_craft_handicraft">Kunsthandwerk</string>
     <string name="poi_hardware">Eisenwarenhandlung</string>
     <string name="poi_healthcare_alternative">Alternativmedizin</string>
-    <string name="poi_healthcare_centre">Gesundheitszentrum</string>
     <string name="poi_healthcare_rehabilitation">Rehabilitation</string>
     <string name="poi_healthcare_yes">Medizinische Einrichtung</string>
     <string name="poi_hearing_aids">Hörgeräte</string>
     <string name="poi_helipad">Hubschrauberlandeplatz</string>
     <string name="poi_herbalist">Kräuterladen</string>
     <string name="poi_hifi">Hi-Fi-Geschäft</string>
-    <string name="poi_historic_monastery">Historisches Kloster</string>
     <string name="poi_hockey">Hockey</string>
     <string name="poi_horse_racing">Pferderennen</string>
     <string name="poi_horse_track">Pferdestrecke</string>
@@ -611,7 +607,6 @@
     <string name="poi_mast">Mast</string>
     <string name="poi_radar">Radar</string>
     <string name="poi_aquarium">Aquarium</string>
-    <string name="poi_team_handball">Handball</string>
     <string name="poi_shop">Geschäft</string>
     <string name="poi_shop_food">Lebensmittelgeschäft und Supermarkt</string>
     <string name="poi_emergency">Notfall</string>
@@ -712,7 +707,6 @@
     <string name="poi_military_landuse">Militärgebiet</string>
     <string name="poi_forest">Forstwald</string>
     <string name="poi_reservoir">Reservoir</string>
-    <string name="poi_general_tourist_attraction_yes">Allgemeine Sehenswürdigkeit</string>
     <string name="poi_fuel_svo">Pflanzenölkraftstoff</string>
     <string name="poi_training">Übungsgelände</string>
     <string name="poi_quarter">Quartier</string>
@@ -804,7 +798,6 @@
     <string name="poi_pastry">Konditorei</string>
     <string name="poi_candles">Kerzengeschäft</string>
     <string name="poi_fashion">Modegeschäft</string>
-    <string name="poi_furnace">Heizungsgeschäft</string>
     <string name="poi_garden_furniture">Gartenmöbelladen</string>
     <string name="poi_leather">Ledergeschäft</string>
     <string name="poi_music">Musikgeschäft</string>
@@ -822,10 +815,8 @@
     <string name="poi_groyne">Buhne</string>
     <string name="poi_power_cable_distribution_cabinet">Verteilerkasten</string>
     <string name="poi_basin">Wasserbecken</string>
-    <string name="poi_conservation">Schutzgebiet</string>
     <string name="poi_crane">Kran</string>
     <string name="poi_country">Land</string>
-    <string name="poi_tourism_attraction">Sehenswürdigkeit</string>
     <string name="poi_lodging">Unterkunft</string>
     <string name="poi_religious">Heilige Stätte</string>
     <string name="poi_hanami">Kirschblütenfest</string>
@@ -981,7 +972,6 @@
     <string name="poi_animal_shelter_cat">Katzen</string>
     <string name="poi_animal_shelter_dog_cat">Hunde, Katzen</string>
     <string name="poi_animal_shelter_bird">Vögel</string>
-    <string name="poi_mill_pond">Mühlenteich</string>
     <string name="twitter">Twitter</string>
     <string name="poi_skype">Skype</string>
     <string name="poi_youtube">Youtube</string>
@@ -1313,7 +1303,6 @@
     <string name="poi_information_route_marker">Streckenmarkierung</string>
     <string name="poi_information_hikingmap">Wanderkarte</string>
     <string name="poi_information_nature">Natur</string>
-    <string name="poi_information_wildlife">Informationszeichen: Wildleben</string>
     <string name="poi_information_history">Geschichte</string>
     <string name="poi_information_sign">Schild</string>
     <string name="poi_information_audioguide">Sprachführer</string>
@@ -1398,8 +1387,6 @@
     <string name="poi_stars_4s">4S (gehobene Erste Klasse)</string>
     <string name="poi_stars_5">5 (Luxus)</string>
     <string name="poi_stars_5s">5S (gehobener Luxus)</string>
-    <string name="poi_stars_6">Sterne: 6</string>
-    <string name="poi_stars_7">Sterne: 7</string>
     <string name="poi_rooms">Zimmer</string>
     <string name="poi_payment_coins_yes">Münzen</string>
     <string name="poi_payment_coins_no">Münzen nicht akzeptiert</string>
@@ -1421,7 +1408,6 @@
     <string name="poi_payment_visa_no">Visa-Karten nicht akzeptiert</string>
     <string name="poi_payment_mastercard_yes">Mastercard</string>
     <string name="poi_payment_mastercard_no">Mastercard nicht akzeptiert</string>
-    <string name="poi_payment_none">Kostenlos</string>
     <string name="poi_payment_maestro_yes">Maestro-Karten</string>
     <string name="poi_payment_maestro_no">Maestro-Karten nicht akzeptiert</string>
     <string name="poi_payment_american_express_yes">American Express (AMEX)</string>
@@ -2122,7 +2108,6 @@
     <string name="poi_impromptu_no">Improvisiert: nein</string>
     <string name="poi_sanitary_dump_station_yes">Sanitäre Entsorgungsstation: ja</string>
     <string name="poi_sanitary_dump_station_no">Sanitäre Entsorgungsstation: nein</string>
-    <string name="poi_sanitary_dump_station_customers">Sanitäre Entsorgungsstation: Kunden</string>
     <string name="poi_refugee_yes">Flüchtlingsunterkunft</string>
     <string name="poi_social_facility_group_home">Wohngruppe</string>
     <string name="poi_social_facility_assisted_living">Betreutes Wohnen</string>
@@ -2381,7 +2366,6 @@
     <string name="poi_inscription_e">Beschriftung: O</string>
     <string name="poi_inscription_ne">Beschriftung: NO</string>
     <string name="poi_construction_yes">Im Bau</string>
-    <string name="poi_additional_atm_yes">Geldautomat: ja</string>
     <string name="poi_atm_no">Geldautomat: nein</string>
     <string name="poi_firepit">Feuergrube</string>
     <string name="poi_street_cabinet">Verteilerkasten</string>
@@ -2477,7 +2461,6 @@
     <string name="poi_sanitary_dump_station">Sanitäre Entsorgungsstation</string>
     <string name="poi_medical_system_western_yes">Westlich</string>
     <string name="poi_medical_system_chinese_yes">Chinesisch (traditionell)</string>
-    <string name="poi_medical_system_unknown_yes">Medizinisches System: Unbekannt traditionelle</string>
     <string name="poi_medical_system_ayurveeda_yes">Ayurveda</string>
     <string name="poi_medical_system_kampo_yes">Kampo</string>
     <string name="poi_medical_system_mongolian_yes">Traditionell mongolisch</string>
@@ -2493,16 +2476,12 @@
     <string name="poi_health_service_prevention_vaccination_yes">Gesundheitswesen: Impfung: ja</string>
     <string name="poi_health_service_prevention_vaccination_no">Gesundheitswesen: Impfung: nein</string>
     <string name="poi_health_facility_type_office">Arztpraxis</string>
-    <string name="poi_health_facility_type_hospital">Gesundheit-Einrichtungstyp: Krankenhaus</string>
     <string name="poi_health_facility_type_field_hospital">Gesundheitseinrichtung: Feldlazarett</string>
-    <string name="poi_health_facility_type_clinic">Gesundheit-Einrichtungstyp: Klinik</string>
-    <string name="poi_health_facility_type_health_centre">Gesundheit-Einrichtungstyp: Gesundheitszentrum</string>
     <string name="poi_health_facility_type_counselling_centre">Gesundheitseinrichtung: Beratungsstelle</string>
     <string name="poi_health_facility_type_laboratory">Gesundheitseinrichtung: Labor</string>
     <string name="poi_health_facility_type_therapy">Gesundheitseinrichtung: Therapie</string>
     <string name="poi_health_facility_type_department">Gesundheitseinrichtung: Fachabteilung</string>
     <string name="poi_health_facility_type_dispensary">Gesundheitseinrichtung: Ambulanz</string>
-    <string name="poi_health_facility_type_pharmacy">Gesundheit-Einrichtungstyp: Apotheke</string>
     <string name="poi_health_facility_type_first_aid">Gesundheitseinrichtung: Erste Hilfe</string>
     <string name="poi_health_facility_type_nursing_home">Gesundheitseinrichtung: Pflegeheim</string>
     <string name="poi_health_facility_type_support_group_home">Gesundheitseinrichtung: Selbsthilfegruppe</string>
@@ -2627,7 +2606,6 @@
     <string name="poi_water_source_main">Haupt</string>
     <string name="poi_water_source_pond">Teich</string>
     <string name="poi_water_source_stream">Wasserlauf</string>
-    <string name="poi_fire_hydrant_style_water_source_cistern">Zisterne</string>
     <string name="poi_in_service_yes">Im Dienst: ja</string>
     <string name="poi_street_cabinet_power">Kasten-Typ: Strom</string>
     <string name="poi_street_cabinet_telecom">Kasten-Typ: Telekom</string>
@@ -3560,8 +3538,6 @@
     <string name="poi_park_ride_hov">Fahrgemeinschaft</string>
     <string name="poi_park_ride_tram">Straßenbahn</string>
     <string name="poi_park_ride_ferry">Fähre</string>
-    <string name="poi_generator_source_biomass">Energiequelle: Biomasse</string>
-    <string name="poi_health_specialty_radiotheraphy_yes">Strahlentherapie</string>
     <string name="poi_hazard">Gefahr</string>
     <string name="poi_rtsa_scale_filter">Schwierigkeitsklasse</string>
     <string name="poi_rtsa_scale_nc">k. A.</string>

OsmAnd/res/values-de/strings.xml

@@ -720,7 +720,6 @@
     <string name="error_calculating_route">Route konnte nicht berechnet werden.</string>
     <string name="error_calculating_route_occured">Route konnte nicht berechnet werden.</string>
     <string name="empty_route_calculated">Berechnete Route ist leer.</string>
-    <string name="new_route_calculated_dist">Route neu berechnet, Entfernung</string>
     <string name="arrived_at_destination">Sie sind angekommen.</string>
     <string name="invalid_locations">Koordinaten sind ungültig</string>
     <string name="go_back_to_osmand">Zurück zur Karte</string>
@@ -814,7 +813,6 @@
     <string name="osb_comment_dialog_error">Kommentar konnte nicht hinzugefügt werden.</string>
     <string name="poi_edit_title">POI bearbeiten</string>
     <string name="poi_create_title">POI erstellen</string>
-    <string name="poi_error_poi_not_found">Punkt wurde nicht gefunden oder das Objekt besteht aus mehreren Punkten, was noch nicht unterstützt wird.</string>
     <string name="poi_remove_confirm_template">Sicher löschen: {0} (Kommentar)?</string>
     <string name="poi_remove_title">POI löschen</string>
     <string name="shared_string_delete">Löschen</string>
@@ -2021,9 +2019,7 @@
     <string name="allow_access_location">Standortbestimmung zulassen</string>
     <string name="first_usage_greeting">Erhalten Sie Wegbeschreibungen und entdecken Sie neue Orte ohne Internetverbindung</string>
     <string name="search_my_location">Meinen Standort bestimmen</string>
-    <string name="no_update_info">Keine Aktualisierungen anzeigen</string>
     <string name="skip_map_downloading">Herunterladen der Karten überspringen</string>
-    <string name="no_update_info_desc">Keine Versionsaktualisierungen oder OsmAnd-Angebote abfragen.</string>
     <string name="si_mi_meters">Meilen/Meter</string>
     <string name="osm_live_banner_desc">Erhalten Sie unbegrenzte Kartendownloads, fügt wöchentliche, tägliche oder sogar stündliche Updates hinzu.</string>
     <string name="osmand_plus_banner_desc">Unbegrenzte Karten-Downloads, -Aktualisierungen und die Wikipedia-Erweiterung.</string>
@@ -2079,9 +2075,6 @@
     <string name="upload_poi">POI hochladen</string>
     <string name="route_roundabout_short">Nehmen Sie die %1$d Ausfahrt</string>
     <string name="search_map_hint">Stadt oder Region</string>
-    <string name="legacy_search">Alte Suche</string>
-    <string name="show_legacy_search">Alte Suche einblenden</string>
-    <string name="show_legacy_search_desc">Alte Suche im Seitenmenü hinzufügen.</string>
     <string name="routing_attr_allow_motorway_name">Autobahnen benutzen</string>
     <string name="routing_attr_allow_motorway_description">Erlaubt Autobahnen.</string>
     <string name="lang_sr_latn">Serbisch (lateinisch)</string>
@@ -2596,15 +2589,6 @@
     <string name="empty_state_av_notes_desc">Audio-, Video- oder Fotonotizen zu einem beliebigen Punkt auf der Karte hinzufügen, indem Sie die Widgets oder Kontextmenüs verwenden.</string>
     <string name="notes_by_date">Audio-/Video-Notizen nach Datum</string>
     <string name="tap_on_map_to_hide_interface_descr">Ein Tippen auf die Karte schaltet die Steuertasten und Bedienelemente um.</string>
-    <string name="release_3_0">• Neu: Unterstützung weltweiter Offline-Reiseführer. Verknüpfung beschriebener Sehenswürdigkeiten zur Landkarte. Die Inhalte basieren derzeit auf Wikivoyage.
-\n
-\n • Wikipedia: Neues Layout, anklickbare Links, Bilder
-\n
-\n • Unterstützung der Gruppierung von GPX Wegpunkten
-\n
-\n • Kartenmarkierungen: Import auswählbarer Gruppen aus GPX-Dateien, Koordinateneingabe, neues Layout
-\n
-\n • OsmAnd Live-Abonnement unterstützt nun alle OsmAnd Funktionen</string>
     <string name="one_tap_active">\'Ein Klick\' aktiv</string>
     <string name="what_is_here">Was ist hier:</string>
     <string name="without_time_limit">Ohne Zeitbegrenzung</string>
@@ -2721,7 +2705,7 @@
     <string name="update_is_available">Aktualisierung verfügbar</string>
     <string name="download_file">Datei herunterladen</string>
     <string name="start_editing_card_image_text">Der kostenlose weltweite Reiseführer, den jeder bearbeiten kann.</string>
-    <string name="welcome_to_open_beta_description">Die Reisefüher basieren derzeit auf Wikivoyage. Testen Sie alle Funktionen während des Open-Beta-Tests kostenlos. Danach steht die Reiseführerfunktionalität den Abonnenten von OsmAnd Unlimited und den Besitzern von OsmAnd+ zur Verfügung.</string>
+    <string name="welcome_to_open_beta_description">Die Reisefüher basieren derzeit auf Wikivoyage. Testen Sie alle Funktionen während des Open-Beta-Tests kostenlos.</string>
     <string name="start_editing_card_description">Sie können und sollten Artikel auf Wikivoyage bearbeiten. Teilen Sie Wissen, Erfahrung, Talent und Ihre Aufmerksamkeit.</string>
     <string name="start_editing">Bearbeitung starten</string>
     <string name="get_unlimited_access">Erhalten Sie unbegrenzten Zugang</string>
@@ -2789,45 +2773,14 @@
     <string name="send_search_query_description">Ihre Suchanfrage wird an: \"%1$s\" gesendet, zusammen mit Ihrem Standort.
 \n
 \nPersönliche Informationen werden nicht gesammelt, sondern nur Suchdaten, die zur Verbesserung der Suche benötigt werden.</string>
-    <string name="search_no_results_description">Keine Ergebnisse?
-\nNehmen Sie Kontakt mit uns auf.</string>
     <string name="send_search_query">Suchanfrage senden?</string>
     <string name="shared_string_world">Welt</string>
     <string name="increase_search_radius_to">Vergrößerung des Suchradius auf %1$s</string>
-    <string name="release_3_1">• Navigation Fix: Fortschrittsbalken, schneller Wechsel des Start- und Endpunkts der Route 
-\n 
-\n • Map-Marker Fix: Gruppen An-/Ausschalten, Möglichkeit Marker auf der Karte zu verstecken 
-\n 
-\n • OSM-Bearbeitung: Bearbeitung für Nicht-Punkt-Objekte und Wege, Behebung fehlender Kommentare zu Notizen, Sicherung von Änderungen 
-\n 
-\n • Verbessere Wikipedia und Wikivoyage Parsing, aktualisierte Dateien sind bereits verfügbar 
-\n 
-\n • Kontextmenü: fix Transportschilderfarbe im Nachtmodus, fix zusätzliche Menügrößen 
-\n
-\n • Bootnavigation: Unterstützung für Fahrrinnen
-\n 
-\n • Andere Fehlerbehebungen</string>
     <string name="thank_you_for_feedback">Danke für Ihr Feedback</string>
     <string name="poi_cannot_be_found">Knoten oder Weg kann nicht gefunden werden.</string>
     <string name="search_no_results_feedback">Keine Suchergebnisse?
 \nGeben Sie uns eine Rückmeldung</string>
-    <string name="commiting_way">Übertrage Weg…</string>
     <string name="test_voice_desrc">Tippen Sie auf eine Schaltfläche und hören Sie sich die entsprechende Sprachausgabe an, um fehlende oder fehlerhafte Anweisungen zu erkennen</string>
-    <string name="release_3_2_pre">• Absturz beim Start behoben, der bei manchen Geräten auftrat 
-\n 
-\n• Neue Funktion für Markierungen: Anzeigen bereits passierter Markierungen
-\n 
-\n• Suchverlauf zeigt nun zuvor gesuchte Kategorien 
-\n 
-\n• Absturz beim Start von nicht-lateinischen Karten behoben 
-\n 
-\n• Verbesserte Rendering-Geschwindigkeit auf Android 8.0-Geräten 
-\n 
-\n• Unterstützung für die Bearbeitung von Flächen-POI 
-\n 
-\n• Distanz Messen: Schaltfläche \"Messen\" zu Aktionen im Kontextmenü hinzugefügt 
-\n 
-\n</string>
     <string name="ask_for_location_permission">Bitte gewähren Sie OsmAnd den Zugriff auf den Standort, um fortzufahren.</string>
     <string name="rendering_value_black_name">Schwarz</string>
     <string name="search_street">Straße suchen</string>
@@ -2960,23 +2913,6 @@
     <string name="rendering_attr_highway_class_path_name">Weg</string>
     <string name="rendering_attr_highway_class_cycleway_name">Radweg</string>
     <string name="rendering_attr_undefined_name">Undefiniert</string>
-    <string name="release_3_3">• Neuer Bildschirm \'Navigation\': Zeigt Tasten mit den Zielen \'Zuhause\' und \'Arbeit\', eine \'Vorherige Route\'-Verknüpfung, eine Liste aktiver GPX-Tracks und Markierungen, den Suchverlauf. 
-\n 
-\n• Weitere Informationen unter \'Routendetails\': Straßentypen, -oberfläche, Steilheit, Oberflächenbeschaffenheit 
-\n 
-\n• Navigation im öffentlichen Verkehr mit Unterstützung aller Verkehrsmittelarten: U-Bahn, Bus, Straßenbahn, etc. 
-\n 
-\n• Neue Schnellaktion, um Tracks ein-/auszublenden, und für die Tag/Nacht-Modi 
-\n 
-\n• Fix: Gebiete, die in Deutschland, Südafrika, Quebec und anderen Ländern als überflutet angezeigt wurden 
-\n 
-\n• Zusätzliche Unterstützung für den KML- und KMZ-Import 
-\n 
-\n• Abstürze nach Öffnen bestimmter Haltestellen des öffentlichen Verkehrs beseitigt 
-\n 
-\n• Facebook- und Firebase-Analysen aus der kostenlosen Version entfernt (OsmAnd+ enthält sie nicht mehr)
-\n
-\n</string>
     <string name="avoid_pt_types_descr">Wählen Sie öffentliche Verkehrsmittel aus, die Sie für die Navigation vermeiden möchten:</string>
     <string name="avoid_pt_types">Verkehrsmittel ausschließen …</string>
     <string name="shared_string_walk">Gehen</string>
@@ -3001,15 +2937,6 @@
     <string name="routing_attr_avoid_subway_description">Vermeidet U-Bahnen und leichten Schienenverkehr</string>
     <string name="routing_attr_avoid_ferry_name">Keine Fähren</string>
     <string name="routing_attr_avoid_ferry_description">Vermeidet Fähren</string>
-    <string name="release_3_3_7">• Anzeige der Umsteigezeiten in öffentlichen Verkehrsmitteln 
-\n 
-\n• Korrigierte Benutzeroberfläche für die Routendetails 
-\n 
-\n• Korrektur des dunklen Designs im Navigationsmenü und in den Routendetails 
-\n 
-\n• Azimut-Anzeige bei der Entfernungsmessung
-\n
-\n</string>
     <string name="send_log">Log senden</string>
     <string name="files_copied">%1$d Dateien kopiert (%2$s).</string>
     <string name="files_failed">%1$d Dateien (%2$s) konnten nicht kopiert werden.</string>
@@ -3071,7 +2998,6 @@
     <string name="base_profile_descr_public_transport">ÖPNV-Arten</string>
     <string name="base_profile_descr_boat">Schiff, Rudern, Segeln</string>
     <string name="base_profile_descr_aircraft">Flugzeug, Segelflugzeug</string>
-    <string name="colleted_data">Gesammelte Daten</string>
     <string name="base_profile_descr_ski">Skifahren</string>
     <string name="show_compass_ruler">Kompasslineal anzeigen</string>
     <string name="hide_compass_ruler">Kompasslineal ausblenden</string>
@@ -3090,8 +3016,6 @@
     <string name="third_party_routing_type">Routing von Drittanbietern</string>
     <string name="application_profiles_descr">Wählen Sie die Profile aus, die in der App sichtbar sein sollen.</string>
     <string name="application_profiles">App-Profile</string>
-    <string name="zoom_by_wunderlinq_descr">Ändern Sie den Kartenzoom, indem Sie mit dem Rad nach oben und unten scrollen. Escape bringt Sie zurück zur WunderLINQ App.</string>
-    <string name="zoom_by_wunderlinq">WunderLINQ zur Kontrolle verwenden</string>
     <string name="routing_attr_piste_type_skitour_name">Skitouren</string>
     <string name="routing_attr_piste_type_skitour_description">Routen für Skitouren.</string>
     <string name="routing_attr_piste_type_sled_name">Schlitten</string>
@@ -3201,8 +3125,8 @@
     <string name="lang_oc">Okzitanisch</string>
     <string name="app_mode_wagon">Wagen</string>
     <string name="app_mode_pickup_truck">Kleintransporter</string>
-    <string name="new_route_calculated_dist_dbg">Route: Entfernung %s, Fahrzeit %s 
-\nBerechnung: %.1f Sek., %d Straßen, %d Kacheln)</string>
+    <string name="new_route_calculated_dist_dbg">Route: Entfernung %1$s, Fahrzeit %2$s
+\nBerechnung: %3$.1f Sek., %4$d Straßen, %5$d Kacheln)</string>
     <string name="day">Tag</string>
     <string name="days_2_4">Tage</string>
     <string name="days_5">Tage</string>
@@ -3240,7 +3164,6 @@
     <string name="route_parameters_info">Einstellungen für die Routenplanung des gewählten Profils „%1$s“.</string>
     <string name="wake_time">Zeitüberschreitung nach dem Aufwachen</string>
     <string name="units_and_formats">Einheiten und Formate</string>
-    <string name="appearance">Aussehen</string>
     <string name="map_look_descr">Kartendarstellung</string>
     <string name="map_look">Kartendarstellung</string>
     <string name="list_of_installed_plugins">Installierte Erweiterungen</string>
@@ -3274,7 +3197,6 @@
     <string name="logcat_buffer">Logcat-Puffer</string>
     <string name="plugins_settings">Plugin-Einstellungen</string>
     <string name="shared_string_by_default">Standardmäßig</string>
-    <string name="download_detaile_map">"Detaillierte Karte %s  herunterladen, um diesen Bereich zu sehen."</string>
     <string name="download_detailed_map">Laden Sie die detaillierte %s-Karte herunter, um diesen Bereich zu sehen.</string>
     <string name="change_data_storage_full_description">OsmAnd-Datendateien an das neue Ziel verschieben\?
 \n%1$s &gt; %2$s</string>
@@ -3570,7 +3492,6 @@
     <string name="recalculate_route_distance_promo">Die Route wird neu berechnet, wenn die Entfernung von der Route zur aktuellen Position größer als der ausgewählte Wert ist.</string>
     <string name="import_complete_description">Alle Daten aus %1$s werden importiert. Sie können die Schaltflächen unten verwenden, um den benötigten Teil der Anwendung zu öffnen und sie zu verwalten.</string>
     <string name="shared_string_square">Quadrat</string>
-    <string name="shared_string_rhomb">Raute</string>
     <string name="shared_string_circle">Kreis</string>
     <string name="select_shape">Form auswählen</string>
     <string name="select_group">Gruppe auswählen</string>
@@ -3726,7 +3647,6 @@
     <string name="screen_control">Bildschirmsteuerung</string>
     <string name="system_screen_timeout_descr">Schaltet den Bildschirm entsprechend dem Bildschirm-Timeout des Systems aus.</string>
     <string name="system_screen_timeout">Systembildschirm-Timeout verwenden</string>
-    <string name="turn_screen_on_options_descr">Optionen zum Aktivieren des Bildschirms:</string>
     <string name="turn_screen_on_descr">Wählen Sie Optionen zum Aufwecken des Bildschirms (stellen Sie sicher, dass OsmAnd im Vordergrund ist, wenn das Gerät gesperrt wird):</string>
     <string name="turn_screen_on_navigation_instructions_descr">Für jede Navigationsanweisung wird der Bildschirm eingeschaltet.</string>
     <string name="turn_screen_on_navigation_instructions">Navigationsanweisungen</string>
@@ -3924,7 +3844,6 @@
     <string name="development">Entwicklung</string>
     <string name="use_live_public_transport">OsmAnd Live Daten</string>
     <string name="use_live_routing">OsmAnd Live Daten</string>
-    <string name="use_complex_routing">Komplexe Routenberechnung</string>
     <string name="complex_routing_descr">Zwei-Phasen-Routenberechnung für die Autonavigation.</string>
     <string name="use_native_pt">Native ÖPNV Entwicklung</string>
     <string name="use_native_pt_desc">Wechseln zur Java (sicher) Berechnung des ÖPNV-Routings</string>
@@ -4043,7 +3962,6 @@
     <string name="routing_engine_vehicle_type_foot">Zu Fuß</string>
     <string name="routing_engine_vehicle_type_bike">Fahrrad</string>
     <string name="routing_engine_vehicle_type_car">Auto</string>
-    <string name="message_error_recheck_parameters">Fehler, Parameter erneut prüfen</string>
     <string name="shared_string_subtype">Subtyp</string>
     <string name="keep_it_empty_if_not">Leer lassen, wenn kein API-Schlüssel vorhanden</string>
     <string name="copy_address">Adresse kopieren</string>
@@ -4054,4 +3972,30 @@
     <string name="select_folder">Ordner auswählen</string>
     <string name="select_folder_descr">Ordner auswählen oder neuen hinzufügen</string>
     <string name="shared_string_empty">Leer</string>
+    <string name="analyze_by_intervals">Nach Intervallen auswerten (geteiltes Intervall)</string>
+    <string name="upload_to_openstreetmap">Hochladen zu OpenStreetMap</string>
+    <string name="edit_track">Track editieren</string>
+    <string name="rename_track">Track umbenennen</string>
+    <string name="change_folder">Ordner ändern</string>
+    <string name="shared_string_turn">Abbiegung</string>
+    <string name="announcement_time_intervals">Zeit- und Distanzintervalle</string>
+    <string name="announcement_time_descr">Der Ansagezeitpunkt der verschiedenen Sprachansagen hängt vom Ansagetyp, der aktuellen Navigationsgeschwindigkeit und der Standard-Navigationsgeschwindigkeit ab.</string>
+    <string name="announcement_time_title">Ansagezeitpunkt</string>
+    <string name="start_recording">Aufzeichnung starten</string>
+    <string name="show_track_on_map">Track auf der Karte anzeigen</string>
+    <string name="routing_engine_vehicle_type_wheelchair">Rollstuhl</string>
+    <string name="routing_engine_vehicle_type_hiking">Wandern</string>
+    <string name="routing_engine_vehicle_type_walking">Fußgänger</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">E-Bike fahren</string>
+    <string name="routing_engine_vehicle_type_cycling_road">Straßenradsport</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">Bergradsport</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">Normales Radfahren</string>
+    <string name="routing_engine_vehicle_type_hgv">Lkw</string>
+    <string name="routing_engine_vehicle_type_small_truck">Kleintransporter</string>
+    <string name="routing_engine_vehicle_type_truck">Lkw</string>
+    <string name="routing_engine_vehicle_type_scooter">Motorroller</string>
+    <string name="routing_engine_vehicle_type_racingbike">Rennrad</string>
+    <string name="routing_engine_vehicle_type_mtb">Mountainbike</string>
+    <string name="message_server_error">Server-Fehler: %1$s</string>
+    <string name="message_name_is_already_exists">Der Name ist bereits vorhanden</string>
 </resources>

OsmAnd/res/values-el/phrases.xml

@@ -575,7 +575,6 @@
     <string name="poi_healthcare_alternative">Εναλλακτική ιατρική</string>
     <string name="poi_audiologist">ακουολόγος</string>
     <string name="poi_blood_bank">Τράπεζα αίματος</string>
-    <string name="poi_healthcare_centre">Ιατρικό κέντρο</string>
     <string name="poi_midwife">Μαία</string>
     <string name="poi_occupational_therapist">Εργασιοθεραπευτής</string>
     <string name="poi_optometrist">Οπτικός</string>
@@ -977,7 +976,6 @@
     <string name="poi_crematorium">Κρεματόριο</string>
     <string name="poi_internet_cafe">Καφενείο με διαδίκτυο</string>
     <string name="poi_bank">Τράπεζα</string>
-    <string name="poi_amenity_atm">Μηχάνημα αναλήψεων (ΑΤΜ)</string>
     <string name="poi_payment_terminal">Τερματικό πληρωμών</string>
     <string name="poi_money_lender">Δάνεια</string>
     <string name="poi_pawnbroker">Ενεχυροδανειστής</string>
@@ -2508,7 +2506,6 @@
     <string name="poi_inscription_e">Επιγραφή: Α</string>
     <string name="poi_inscription_ne">Επιγραφή: ΒΑ</string>
     <string name="poi_construction_yes">Υπό κατασκευή</string>
-    <string name="poi_additional_atm_yes">ΑΤΜ: ναι</string>
     <string name="poi_atm_no">ΑΤΜ: όχι</string>
     <string name="poi_firepit">Εστία φωτιάς</string>
     <string name="poi_street_cabinet">Ερμάριο δρόμου</string>
@@ -2744,7 +2741,6 @@
     <string name="poi_water_source_main">Κύριο</string>
     <string name="poi_water_source_pond">Δεξαμενή</string>
     <string name="poi_water_source_stream">Ροή</string>
-    <string name="poi_fire_hydrant_style_water_source_cistern">Δεξαμενή</string>
     <string name="poi_in_service_yes">Εν ενεργεία: ναι</string>
     <string name="poi_street_cabinet_power">Τύπος ερμαρίου: ρεύμα</string>
     <string name="poi_street_cabinet_telecom">Τύπος ερμαρίου: τηλεπικοινωνίες</string>

OsmAnd/res/values-el/strings.xml

@@ -702,7 +702,6 @@
     <string name="error_calculating_route">Αδυναμία υπολογισμού διαδρομής.</string>
     <string name="error_calculating_route_occured">Αδυναμία υπολογισμού διαδρομής.</string>
     <string name="empty_route_calculated">Η υπολογισμένη διαδρομή είναι κενή.</string>
-    <string name="new_route_calculated_dist">Υπολογίστηκε νέα διαδρομή, απόσταση</string>
     <string name="arrived_at_destination">Φτάσατε.</string>
     <string name="invalid_locations">Άκυρες συντεταγμένες</string>
     <string name="go_back_to_osmand">Επιστροφή στον χάρτη</string>
@@ -795,7 +794,6 @@
     <string name="osb_comment_dialog_error">Αδυναμία προσθήκης σχολίου</string>
     <string name="poi_edit_title">Επεξεργασία ΣΕ</string>
     <string name="poi_create_title">Δημιουργία ΣΕ</string>
-    <string name="poi_error_poi_not_found">Ο κόμβος δεν μπορεί να βρεθεί ή η υποδομή αποτελείται από πολλούς κόμβους, που δεν υποστηρίζεται ακόμα.</string>
     <string name="poi_remove_confirm_template">Διαγραφή {0} (σχολίου);</string>
     <string name="poi_remove_title">Διαγραφή ΣΕ</string>
     <string name="poi_remove_success">Διαγράφτηκε</string>
@@ -1556,17 +1554,6 @@
     <string name="additional_actions">Πρόσθετες ενέργειες</string>
     <string name="av_locations_selected_desc">Αρχείο GPX με συντεταγμένες και δεδομένα από τις επιλεγμένες σημειώσεις.</string>
     <string name="av_locations_all_desc">Αρχείο GPX με συντεταγμένες και δεδομένα από όλες τις σημειώσεις.</string>
-    <string name="release_3_0">Νέο: Υποστήριξη γενικών ταξιδιωτικών οδηγών χωρίς σύνδεση. Οι αναφερόμενες τοποθεσίες συνδέονται με τον χάρτη. Τα αρχικά δεδομένα από το βικιταξίδια.
-\n 
-\n • Βικιπαίδεια: Υποστηρίζονται τώρα νέα όψη, ενεργοί σύνδεσμοι, εικόνες 
-\n 
-\n • Άνοιγμα διεπαφής χρήστη ιχνών: Υποστήριξη για ομάδες σημείων διαδρομής 
-\n 
-\n • Δείκτες χάρτη: Εισαγωγή επιλεγμένων ομάδων από αρχεία GPX, είσοδος συντεταγμένων, νέα εμφάνιση 
-\n 
-\n • Η συνδρομή στα δεδομένα του OsmAnd Live υποστηρίζει τώρα όλα τα χαρακτηριστικά του OsmAnd 
-\n 
-\n</string>
     <string name="modify_the_search_query">Αλλάξτε την αναζήτησή σας.</string>
     <string name="shared_string_actions">Ενέργειες</string>
     <string name="shared_string_marker">Δείκτης</string>
@@ -1900,9 +1887,6 @@
     <string name="rendering_value_low_name">Χαμηλή</string>
     <string name="rendering_attr_hideWaterPolygons_description">Νερό</string>
     <string name="rendering_attr_hideWaterPolygons_name">Απόκρυψη νερού</string>
-    <string name="legacy_search">Παλιά αναζήτηση</string>
-    <string name="show_legacy_search">Εμφάνιση παλιάς αναζήτησης</string>
-    <string name="show_legacy_search_desc">Προσθήκη της παλιάς αναζήτησης στον κατάλογο σχεδίασης.</string>
     <string name="routing_attr_allow_motorway_name">Να χρησιμοποιήσεις τους αυτοκινητόδρομους</string>
     <string name="routing_attr_allow_motorway_description">Να επιτρέψεις τους αυτοκινητόδρομους.</string>
     <string name="upload_osm_note_description">Ανεβάσετε την OSM σημείωσή σας ανώνυμα ή χρησιμοποιήσετε την κατατομή (προφίλ) σας στο OpenStreetMap.org.</string>
@@ -1978,8 +1962,6 @@
     <string name="allow_access_location">Να επιτραπεί η πρόσβαση στην τοποθεσία</string>
     <string name="first_usage_greeting">Πάρτε οδηγίες και ανακαλύψτε νέες τοποθεσίες χωρίς διαδικτυακή σύνδεση</string>
     <string name="search_my_location">Εύρεση της θέσης μου</string>
-    <string name="no_update_info_desc">Να μην ελέγχετε για νέες εκδόσεις ή τις εκπτώσεις του OsmAnd.</string>
-    <string name="no_update_info">Μα μην εμφανίζονται νέες εκδόσεις</string>
     <string name="update_all_maps_now">Θέλετε να ενημερώσετε όλους τους χάρτες τώρα;</string>
     <string name="clear_tile_data">Καθαρισμός όλων των πλακιδίων</string>
     <string name="routing_attr_short_way_name">Διαδρομή με οικονομία καυσίμων</string>
@@ -2599,7 +2581,6 @@
     <string name="use_drawer_btn">Χρήση μενού</string>
     <string name="dashboard_or_drawer_title">Πίνακας εργαλείων ή στοιχείο ελέγχου μενού</string>
     <string name="dashboard_or_drawer_description">Προσφέρεται επιλογή για πρωτογενή έλεγχο της εφαρμογής μέσω του ευέλικτου πίνακα εργαλείων ή στατικού μενού. Η επιλογή σας μπορεί πάντα να αλλαχθεί στις ρυθμίσεις του πίνακα εργαλείων.</string>
-    <string name="update">Ενημέρωση</string>
     <string name="live_update">Ζωντανή ενημέρωση</string>
     <string name="update_now">Ενημέρωση τώρα</string>
     <string name="missing_write_external_storage_permission">Λείπει άδεια στο OsmAnd για να χρησιμοποιήσει την κάρτα μνήμης</string>
@@ -2737,7 +2718,7 @@
     <string name="update_is_available">Υπάρχει διαθέσιμη ενημέρωση</string>
     <string name="download_file">Λήψη αρχείου</string>
     <string name="start_editing_card_image_text">Ο ελεύθερος παγκόσμιος ταξιδιωτικός οδηγός που οποιοσδήποτε μπορεί να επεξεργαστεί.</string>
-    <string name="welcome_to_open_beta_description">Το OsmAnd Travel βασίζεται, προς το παρόν, στα βικιταξίδια. Ελέγξτε όλα τα χαρακτηριστικά δωρεάν κατά την ανοικτή βήμα δοκιμή. Κατόπιν, οι οδηγοί ταξιδιού θα είναι διαθέσιμοι στους συνδρομητές του απεριόριστου OsmAnd και στους κατόχους του OsmAnd+.</string>
+    <string name="welcome_to_open_beta_description">Το OsmAnd Travel βασίζεται, προς το παρόν, στα βικιταξίδια. Ελέγξτε όλα τα χαρακτηριστικά δωρεάν κατά την ανοικτή βήμα δοκιμή.</string>
     <string name="start_editing_card_description">Μπορείτε και πρέπει να επεξεργαστείτε οποιοδήποτε άρθρο στο βικιταξίδια, Μοιραστείτε τη γνώση, την εμπειρία, το ταλέντο και την προσοχή σας.</string>
     <string name="start_editing">Έναρξη επεξεργασίας</string>
     <string name="get_unlimited_access">Πάρτε απεριόριστη πρόσβαση</string>
@@ -2791,22 +2772,6 @@
     <string name="poi_cannot_be_found">Δεν βρέθηκε κόμβος ή δρόμος.</string>
     <string name="search_no_results_feedback">Χωρίς αποτελέσματα αναζήτησης; 
 \nΑναπληροφορήστε μας</string>
-    <string name="release_3_1">• Πλοήγηση: Διόρθωση γραμμής προόδου, γρήγορη εναλλαγή του αρχικού και τελικού σημείου της διαδρομής
-\n
-\n • Δείκτες χαρτών: διόρθωση ενεργοποίησης/απενεργοποίησης ομάδων, δυνατότητα απόκρυψης δεικτών από τον χάρτη
-\n
-\n • Επεξεργασία OSM: Δυνατότητα επεξεργασίας ετικετών για αντικείμενα και δρόμους, διόρθωση σχολίων που λείπουν σε σημειώσεις, αντίγραφα επεξεργασιών
-\n
-\n • Βελτίωση ανάλυσης βικιπαίδειας και βικιταξιδιών, τα ενημερωμένα αρχεία είναι ήδη διαθέσιμα
-\n
-\n • Μενού περιβάλλοντος: διόρθωση χρώματος πινακίδων μετακίνησης στην νυχτερινή κατάσταση, διόρθωση πρόσθετων μεγεθών μενού
-\n
-\n • Πλοήγηση με σκάφος: υποστήριξη για δίαυλο ασφαλούς πορείας
-\n
-\n • Άλλες διορθώσεις σφαλμάτων
-\n
-\n</string>
-    <string name="commiting_way">Υποβολή διαδρομής…</string>
     <string name="increase_search_radius_to">Αύξηση ακτίνας αναζήτησης σε %1$s</string>
     <string name="send_search_query_description">Το ερώτημα της αναζήτησής σας θα αποσταλεί στο:\"%1$s\",καθώς και την τοποθεσία σας.
 \n 
@@ -2840,20 +2805,6 @@
     <string name="keep_passed_markers">Διατήρηση των δεικτών στον χάρτη</string>
     <string name="more_transport_on_stop_hint">Περισσότερα Μ.Μ.Μ διαθέσιμα σε αυτήν τη στάση.</string>
     <string name="ask_for_location_permission">Παρακαλούμε, δώστε την άδεια στο OsmAnd να προσπελάσει τη θέση σας για να συνεχίσετε.</string>
-    <string name="release_3_2_pre">"• Διορθώθηκαν οι καταρρεύσεις εκκίνησης που συνέβαιναν σε κάποιες συσκευές
-\n
-\n • Νέο χαρακτηριστικό σημαδιών: εμφανίζονται τα σημάδια που έχουν ήδη διασχιστεί
-\n
-\n • Το ιστορικό αναζήτησης εμφανίζει τώρα τις κατηγορίες που έχετε αναζητήσει προηγουμένως
-\n
-\n • Διορθώθηκαν οι καταρρεύσεις εκκίνησης που συνέβαιναν με μη λατινικούς χάρτες
-\n
-\n • Βελτίωση των προβλημάτων απόδοσης ταχύτητας σε συσκευές Android 8.0
-\n
-\n • Υποστήριξη επεξεργασίας αντικειμένων πολυγώνου (χωρίς υπηρεσίες)
-\n
-\n • Μέτρηση απόστασης: προσθήκη πλήκτρου Μέτρησης  στις Ενέργειες στο μενού περιβάλλοντος
-\n"</string>
     <string name="mapillary_menu_title_pano">Εμφάνιση μόνο εικόνων 360°</string>
     <string name="rendering_value_black_name">Μαύρο</string>
     <string name="files_moved">Μετακινήθηκαν %1$d αρχεία (%2$s).</string>
@@ -2881,17 +2832,6 @@
     <string name="routing_attr_avoid_subway_description">Απέφυγε μετρό και ελαφρά μέσα σταθερής τροχιάς</string>
     <string name="routing_attr_avoid_ferry_name">Χωρίς πορθμεία</string>
     <string name="routing_attr_avoid_ferry_description">Απέφυγε πορθμεία</string>
-    <string name="release_3_3_7">• Εμφάνιση του χρόνου μεταξύ μεταφορών στις δημόσιες συγκοινωνίες
-\n
-\n • Διόρθωση διεπαφής χρήστη για τις λεπτομέρειες της διαδρομής
-\n
-\n • Διόρθωση σκούρου θέματος στο μενού κατεύθυνσης και στις λεπτομέρειες διαδρομής
-\n
-\n • Εμφάνιση του αζιμουθίου στη μέτρηση απόστασης
-\n
-\nΜετάφραση
-\n
-\n</string>
     <string name="shared_string_degrees">Μοίρες</string>
     <string name="shared_string_milliradians">Χιλιοστά ακτινίων</string>
     <string name="angular_measeurement">Γωνιακή μονάδα</string>
@@ -2952,23 +2892,6 @@
     <string name="rendering_attr_highway_class_path_name">Μονοπάτι</string>
     <string name="rendering_attr_highway_class_cycleway_name">Ποδηλατόδρομος</string>
     <string name="rendering_attr_undefined_name">Ακαθόριστο</string>
-    <string name="release_3_3">• Νέα οθόνη \'Κατευθύνσεων\' : Εμφανίζει πλήκτρα προορισμού κατοικίας και εργασίας, συντόμευση \'προηγούμενης διαδρομής\', κατάλογο ενεργών ιχνών και σημειωτών GPX, αναζήτηση ιστορικού
-\n
-\n • Πρόσθετες πληροφορίες στο \'Λεπτομέρειες διαδρομής\': τύποι δρόμων, επιφάνεια, απότομες κλίσεις, ομαλότητα
-\n
-\n • Πλοήγηση δημοσίων συγκοινωνιών που υποστηρίζει όλα τα είδη μεταφορών: μετρό, λεωφορείο, τραμ κλπ.
-\n
-\n • Νέα γρήγορη ενέργεια για εμφάνιση/απόκρυψη ιχνών και καταστάσεων ημέρας/νύχτας
-\n
-\n • Διόρθωση περιοχών που εμφανίζονται ως πλημμυρισμένες στη Γερμανία, Νότια Αφρική, Κεμπέκ
-\n
-\n • Πρόσθετη υποστήριξη για εισαγωγή KML και KMZ
-\n
-\n • Διόρθωση καταρρεύσεων στο άνοιγμα κάποιων στάσεων δημοσίων συγκοινωνιών
-\n
-\n • Αφαίρεση των αναλύσεων Facebook και Firebase από την ελεύθερη έκδοση (το OsmAnd+ δεν το συμπεριλαμβάνει)
-\n
-\n</string>
     <string name="use_osm_live_public_transport_description">Ενεργοποίηση των τροποποιήσεων δημοσίων Μ.Μ.Μ με το OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Δημόσια Μ.Μ.Μ OsmAnd Live</string>
     <string name="time_of_day">Ώρα της ημέρας</string>
@@ -3212,8 +3135,8 @@
     <string name="sett_generic_ext_input">Πληκτρολόγιο</string>
     <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
     <string name="sett_parrot_ext_input">Parrot</string>
-    <string name="new_route_calculated_dist_dbg">Διαδρομή: απόσταση %s, χρόνος δρομολογητή %s 
-\nΥπολογισμός: %.1f sec, %d δρόμοι, %d πλακάκια)</string>
+    <string name="new_route_calculated_dist_dbg">Διαδρομή: απόσταση %1$s, χρόνος δρομολογητή %2$s
+\nΥπολογισμός: %3$.1f sec, %4$d δρόμοι, %5$d πλακάκια)</string>
     <string name="lang_oc">Οξιτανικά</string>
     <string name="app_mode_wagon">Οικογενειακό αυτοκίνητο</string>
     <string name="get_discount_title">Αποκτήστε το %1$d %2$s με έκπτωση %3$s.</string>
@@ -3239,7 +3162,6 @@
     <string name="route_parameters_info">Ρυθμίσεις δρομολόγησης στο επιλεγμένο προφίλ \"%1$s\".</string>
     <string name="wake_time">Αναμονή μετά την αφύπνιση</string>
     <string name="units_and_formats">Μονάδες μέτρησης &amp; φορμά</string>
-    <string name="appearance">Εμφάνιση</string>
     <string name="map_look_descr">Εμφάνιση χάρτη</string>
     <string name="map_look">Όψη χάρτη</string>
     <string name="list_of_installed_plugins">Εγκατεστημένα πρόσθετα</string>

OsmAnd/res/values-en-rGB/phrases.xml

@@ -29,8 +29,7 @@
 	<string name="poi_fabric">Drapery shop</string>
 	<string name="poi_erotic">Erotic shop</string>
 	<string name="poi_fashion">Fashion shop</string>
-	<string name="poi_furnace">Heating units shop</string>
-	<string name="poi_furniture">Furniture shop</string>
+    <string name="poi_furniture">Furniture shop</string>
 	<string name="poi_garden_centre">Garden centre</string>
 	<string name="poi_garden_furniture">Garden furniture shop</string>
 	<string name="poi_gas">Liquid gas shop</string>
@@ -66,53 +65,50 @@
 	<string name="poi_weapons">Weapons shop</string>
 	<string name="poi_perfumery">Perfume shop</string>
 
-	<string name="poi_traffic_signals">Traffic signal</string>
+    <string name="poi_traffic_signals">Traffic signal</string>
 
-	<string name="poi_service_tyres">Tyres</string>
+    <string name="poi_service_tyres">Tyres</string>
 	<string name="poi_fuel">Petrol station</string>
 
-	<string name="poi_railway_station">Railway station</string>
+    <string name="poi_railway_station">Railway station</string>
 	<string name="poi_railway_platform">Railway platform</string>
 	<string name="poi_halt">Railway stop</string>
 	<string name="poi_subway_entrance">Underground entrance</string>
 	<string name="poi_subway_station">Underground station</string>
 	<string name="poi_railway_buffer_stop">Railway buffer stop</string>
 
-	<string name="poi_recycling_centre">Type: recycling centre</string>
+    <string name="poi_recycling_centre">Type: recycling centre</string>
 
-	<string name="poi_waste_disposal">Waste disposal</string>
+    <string name="poi_waste_disposal">Waste disposal</string>
 	<string name="poi_waste_basket">Waste basket</string>
 
-	<string name="poi_landuse_railway">Railway area</string>
+    <string name="poi_landuse_railway">Railway area</string>
+    <string name="poi_sports_centre">Sports centre</string>
 
-	<string name="poi_healthcare_centre">Healthcare centre</string>
+    <string name="poi_club_theatre">Theatre club</string>
 
-	<string name="poi_sports_centre">Sports centre</string>
+    <string name="poi_arts_centre">Arts centre</string>
 
-	<string name="poi_club_theatre">Theatre club</string>
-
-	<string name="poi_arts_centre">Arts centre</string>
-
-	<string name="poi_community_centre">Community centre</string>
+    <string name="poi_community_centre">Community centre</string>
 	<string name="poi_social_centre">Social centre</string>
 	<string name="poi_theatre">Theatre</string>
 
-	<string name="poi_harbour_basin">Harbour basin</string>
+    <string name="poi_harbour_basin">Harbour basin</string>
 	<string name="poi_seamark_harbour">Harbour</string>
 
-	<string name="poi_crossing_traffic_signals">With traffic signals</string>
+    <string name="poi_crossing_traffic_signals">With traffic signals</string>
 
-	<string name="poi_railway_crossing">Railway crossing</string>
+    <string name="poi_railway_crossing">Railway crossing</string>
 
-	<string name="poi_tunnel_railway">Railway tunnel</string>
+    <string name="poi_tunnel_railway">Railway tunnel</string>
 	<string name="poi_bridge_railway">Railway bridge</string>
 
-	<string name="poi_route_railway_ref">Route of a railway</string>
+    <string name="poi_route_railway_ref">Route of a railway</string>
 
-	<string name="poi_historic_railway_station">Historic railway station</string>
+    <string name="poi_historic_railway_station">Historic railway station</string>
 	<string name="poi_historic_railway">Historic railway</string>
 
-	<string name="poi_counselling_type_addiction_yes">Counselling (addiction): yes</string>
+    <string name="poi_counselling_type_addiction_yes">Counselling (addiction): yes</string>
 	<string name="poi_counselling_type_addiction_no">Counselling (addiction): no</string>
 	<string name="poi_counselling_type_antenatal_yes">Counselling (antenatal): yes</string>
 	<string name="poi_counselling_type_antenatal_no">Counselling (antenatal): no</string>

OsmAnd/res/values-eo/phrases.xml

@@ -129,7 +129,6 @@
     <string name="poi_florist">Florvendejo</string>
     <string name="poi_frame">Kadroj-de-pentraĵoj-vendejo</string>
     <string name="poi_free_flying">Paraŝutiloj-vendejo</string>
-    <string name="poi_furnace">Hejtil-vendejo</string>
     <string name="poi_furniture">Mebl-vendejo</string>
     <string name="poi_garden_centre">Ĝarden-vendejo</string>
     <string name="poi_garden_furniture">Ĝarden-mebl-vendejo</string>
@@ -227,7 +226,6 @@
     <string name="poi_car">Aŭtomobil-vendejo</string>
     <string name="poi_car_parts">Aŭtomobil-parta vendejo</string>
     <string name="poi_shelter">Ŝirmejo</string>
-    <string name="poi_amenity_atm">Bankaŭtomato</string>
     <string name="poi_bureau_de_change">Monŝanĝejo</string>
     <string name="poi_volcano">Vulkano</string>
     <string name="poi_tree">Arbo</string>
@@ -474,7 +472,6 @@
     <string name="poi_casino">Monludejo</string>
     <string name="poi_population">Loĝantaro</string>
     <string name="poi_landuse_railway">Fervoja tereno</string>
-    <string name="poi_conservation">Naturrezervejo</string>
     <string name="poi_canal">Akvovojo</string>
     <string name="poi_pier">Marponto</string>
     <string name="poi_surveillance">Supergardo</string>
@@ -545,7 +542,6 @@
     <string name="poi_sanatorium">kuracdomo</string>
     <string name="poi_healthcare_alternative">Kontraŭmedicino</string>
     <string name="poi_blood_bank">Sangobanko</string>
-    <string name="poi_healthcare_centre">Medicina centro</string>
     <string name="poi_midwife">Akuŝisto</string>
     <string name="poi_occupational_therapist">Okup-terapiisto</string>
     <string name="poi_optometrist">Okulisto</string>
@@ -1204,7 +1200,6 @@
     <string name="poi_information_route_marker">vojsigno</string>
     <string name="poi_information_hikingmap">mapo piedirada</string>
     <string name="poi_information_nature">naturo</string>
-    <string name="poi_information_wildlife">Informoj pli: bestaro</string>
     <string name="poi_information_history">historio</string>
     <string name="poi_information_sign">signo</string>
     <string name="poi_information_audioguide">son-gvidilo</string>
@@ -1316,8 +1311,6 @@
     <string name="poi_stars_4s">4S (pli-bona unua klaso)</string>
     <string name="poi_stars_5">5 (luksa)</string>
     <string name="poi_stars_5s">5S (pli-bona luksa)</string>
-    <string name="poi_stars_6">Steloj: 6</string>
-    <string name="poi_stars_7">Steloj: 7</string>
     <string name="poi_love_hotel">Amor-hotelo</string>
     <string name="poi_payment_coins_yes">moneroj</string>
     <string name="poi_payment_coins_no">Moneroj malakceptataj</string>
@@ -1341,7 +1334,6 @@
     <string name="poi_payment_visa_no">Visa kartoj malakceptataj</string>
     <string name="poi_payment_mastercard_yes">MasterCard</string>
     <string name="poi_payment_mastercard_no">MasterCard kartoj malakceptataj</string>
-    <string name="poi_payment_none">Senpaga</string>
     <string name="poi_payment_maestro_yes">Maestro</string>
     <string name="poi_payment_maestro_no">Maestro kartoj malakceptataj</string>
     <string name="poi_payment_american_express_yes">American Express (AMEX)</string>
@@ -1962,7 +1954,6 @@
     <string name="poi_impromptu_no">Neformala: ne</string>
     <string name="poi_sanitary_dump_station_yes">Stacio de forigo de fekaĵoj: jes</string>
     <string name="poi_sanitary_dump_station_no">Stacio de forigo de fekaĵoj: ne</string>
-    <string name="poi_sanitary_dump_station_customers">Ejo por forigado de fekaĵoj: nur por klientoj</string>
     <string name="poi_power_supply_yes">jes</string>
     <string name="poi_power_supply_no">Energifonto: ne</string>
     <string name="poi_power_supply_cee_17_blue">Energifonto (ŝtopilo): CEE 17 blua (IEC 60309)</string>
@@ -2289,7 +2280,6 @@
     <string name="poi_forestry_compartment">Vojmontrilo: arbara sekcio</string>
     <string name="poi_forestry_allotment">Vojmontrilo: arbara parcelo</string>
     <string name="poi_construction_yes">Dum konstruado</string>
-    <string name="poi_additional_atm_yes">Bankaŭtomato: jes</string>
     <string name="poi_atm_no">Bankaŭtomato: ne</string>
     <string name="poi_firepit">Lignofajrejo</string>
     <string name="poi_street_cabinet">Ŝranko distribua</string>
@@ -2365,7 +2355,6 @@
     <string name="poi_sanitary_dump_station">Stacio de forigo de fekaĵoj</string>
     <string name="poi_medical_system_western_yes">Okcidenta</string>
     <string name="poi_medical_system_chinese_yes">Ĉina kontraŭ-medicino</string>
-    <string name="poi_medical_system_unknown_yes">Medicina sistemo: tradicia</string>
     <string name="poi_medical_system_ayurveeda_yes">Ajurvedo</string>
     <string name="poi_medical_system_kampo_yes">Kampō (ĉina kontraŭ-medicino)</string>
     <string name="poi_medical_system_mongolian_yes">Mongola kontraŭ-medicino</string>
@@ -2455,7 +2444,6 @@
     <string name="poi_water_source_main">akvokondukilo</string>
     <string name="poi_water_source_pond">lageto</string>
     <string name="poi_water_source_stream">rivereto</string>
-    <string name="poi_fire_hydrant_style_water_source_cistern">cisterno</string>
     <string name="poi_in_service_yes">Funkcias: jes</string>
     <string name="poi_street_cabinet_power">Speco de ŝranko: elektra</string>
     <string name="poi_street_cabinet_telecom">Speco de ŝranko: telefona</string>
@@ -3550,8 +3538,6 @@
     <string name="poi_park_ride_hov">veturiloj kun ≥2 homoj</string>
     <string name="poi_park_ride_tram">tramo</string>
     <string name="poi_park_ride_ferry">pramo</string>
-    <string name="poi_generator_source_biomass">Energifonto: biomaso</string>
-    <string name="poi_health_specialty_radiotheraphy_yes">per-radiad-kuracado (radioterapio)</string>
     <string name="poi_hazard">Danĝerejo</string>
     <string name="poi_rtsa_scale_filter">Malfacilo de montpasejo (RTSA-skalo)</string>
     <string name="poi_rtsa_scale_nc">н/к (sen malfacilo)</string>

OsmAnd/res/values-eo/strings.xml

@@ -233,7 +233,7 @@
     <string name="shared_string_trip_recording">Registrado de kurso</string>
     <string name="shared_string_navigation">Navigi</string>
     <string name="osmand_running_in_background">Labori fone</string>
-    <string name="gps_wake_up_timer">Vek-intervalo de GPS</string>
+    <string name="gps_wake_up_timer">Vek-ofteco de GPS</string>
     <string name="favourites_edit_dialog_title">Informoj pri ŝatataj</string>
     <string name="simulate_your_location_stop_descr">Ĉesigi simuladon de pozicio.</string>
     <string name="simulate_your_location_descr">Simuli vian pozicion uzante komputitan kurson aŭ registritan GPX-spuron.</string>
@@ -587,17 +587,17 @@
     <string name="sleep_mode_stop_dialog">Ĉu ĉesigi GPS-an fonan reĝimon?</string>
     <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="background_service_int">GPS-a vekintervalo</string>
+    <string name="save_global_track_interval">Ĝenerala intertempo de registrado</string>
+    <string name="background_service_int">Vek-ofteco de GPS</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>
     <string name="save_track_to_gpx_globally_descr">Ĝeneralan registradon de pozicio al GPX‑dosiero oni povas (mal)aktivigi per la GPX‑registrada fenestraĵo sur la map‑ekrano.</string>
     <string name="save_current_track_descr">Konservi aktualan spuron kiel GPX-dosieron.</string>
     <string name="save_current_track">Konservi aktualan spuron</string>
     <string name="save_track_to_gpx_descrp">GPX-spuro estas aŭtomate konservata al dosierujo de spuroj dum navigado.</string>
-    <string name="save_track_interval_globally">Registrada intervalo</string>
-    <string name="save_track_interval">Registrada intervalo dum navigado</string>
-    <string name="save_track_interval_descr">Elekti intervalon por registri spurojn dum navigado</string>
+    <string name="save_track_interval_globally">Intertempo de registrado</string>
+    <string name="save_track_interval">Registrada intertempo dum navigado</string>
+    <string name="save_track_interval_descr">Elekti oftecon de registri spuron dum navigado</string>
     <string name="voice_provider_descr">Elekti gvidadan voĉon por navigado.</string>
     <string name="voice_provider">Gvidada voĉo</string>
     <string name="enable_proxy_title">Aktivigi HTTP-retperanton</string>
@@ -654,7 +654,7 @@
     <string name="select_index_file_to_download">Trovis nenion. Se vi ne povas trovi vian regionon, vi povas fari ĝin mem (rigardu https://osmand.net).</string>
     <string name="none_selected_gpx">Unue elektu GPX‑dosieron per frapetadi.</string>
     <string name="local_index_select_gpx_file">Elektu kurson</string>
-    <string name="gpx_split_interval">Divid-intervalo</string>
+    <string name="gpx_split_interval">Intertempo de divido</string>
     <string name="sort_by_distance">Ordigi laŭ distanco</string>
     <string name="sort_by_name">Ordigi laŭ nomo</string>
     <string name="plugin_touringview_name">Turisma map-vido</string>
@@ -728,8 +728,8 @@
     <string name="gpx_info_average_speed">Mezuma rapido: %1$s</string>
     <string name="gpx_info_maximum_speed">Maksimuma rapido: %1$s</string>
     <string name="gpx_info_avg_altitude">Mezuma altitudo: %1$s</string>
-    <string name="gpx_info_diff_altitude">Altituda intervalo: %1$s</string>
-    <string name="gpx_timespan">Tempa intervalo: %1$s</string>
+    <string name="gpx_info_diff_altitude">Variejo de altitudo: %1$s</string>
+    <string name="gpx_timespan">Variejo de tempo: %1$s</string>
     <string name="gpx_info_asc_altitude">Desupro/alsupro: %1$s</string>
     <string name="gpx_timemoving">Tempo movante: %1$s</string>
     <string name="gpx_selection_segment_title">Segmento</string>
@@ -1121,7 +1121,7 @@
     <string name="bg_service_screen_lock_toast">Ekrano ŝlosita</string>
     <string name="map_widget_mini_route">Kurs-mapeto</string>
     <string name="show_cameras">Rapid-kontroliloj</string>
-    <string name="bg_service_interval">Agordi vekintervalon:</string>
+    <string name="bg_service_interval">Agordi vek‑oftecon:</string>
     <string name="show_traffic_warnings">Trafikaj avertoj</string>
     <string name="avoid_toll_roads">Sen pagendaj vojoj</string>
     <string name="continue_follow_previous_route_auto">Ĉu pluigi sekvi la antaŭan nefinitan kurson? (%1$s sekundoj)</string>
@@ -1291,8 +1291,8 @@
     <string name="local_openstreetmap_descr_title">Neunutempa (nesinkrona) redakto de OSM:</string>
     <string name="local_openstreetmap_settings">OSM-interesejoj/rimarkoj konservitaj en aparato</string>
     <string name="local_openstreetmap_settings_descr">Vidi kaj administri loke konservitajn OSM‑interesejojn/rimarkojn.</string>
-    <string name="live_monitoring_interval">Intervalo de enreta kurs-registrado</string>
-    <string name="live_monitoring_interval_descr">Difini intervalon de enreta kurs-registrado.</string>
+    <string name="live_monitoring_interval">Ofteco de enreta kursregistrado</string>
+    <string name="live_monitoring_interval_descr">Difini oftecon de enreta registrado de kurso.</string>
     <string name="live_monitoring_url">Adreso de enreta kurs-registrado</string>
     <string name="live_monitoring_url_descr">Difini la retadreson uzante la jenajn argumentojn: 
 \n lat={0} (latitudo), 
@@ -1753,7 +1753,6 @@
     <string name="error_calculating_route">Ne povas kalkuli kurson.</string>
     <string name="error_calculating_route_occured">Ne povas kalkuli kurson.</string>
     <string name="empty_route_calculated">Kalkulita kurso estas malplena.</string>
-    <string name="new_route_calculated_dist">Nova kurso kalkulita, distanco</string>
     <string name="arrived_at_destination">Vi alvenis al la celo.</string>
     <string name="invalid_locations">Malĝustaj koordinatoj</string>
     <string name="go_back_to_osmand">Reveni al mapo</string>
@@ -1815,7 +1814,6 @@
     <string name="favourites_remove_dialog_success">Forigis ŝatatan punkton “{0}”.</string>
     <string name="poi_edit_title">Redakti interesejon</string>
     <string name="poi_create_title">Krei interesejon</string>
-    <string name="poi_error_poi_not_found">Ne povas trovi nodon aŭ servo konsistas el kelkaj nodoj, tio ĉi ne estas ankoraŭ subtenata.</string>
     <string name="poi_remove_confirm_template">Ĉu forigi {0} (komento)?</string>
     <string name="poi_remove_title">Forigi interesejon</string>
     <string name="poi_remove_success">Forigite</string>
@@ -1929,7 +1927,6 @@
     <string name="use_dashboard_btn">Uzi stirpanelon</string>
     <string name="use_drawer_btn">Uzi menuon</string>
     <string name="dashboard_or_drawer_title">Stirpanelo aŭ menuo</string>
-    <string name="update">Ĝisdatigo</string>
     <string name="dashboard_or_drawer_description">Eblas elekti kiamaniere uzi la aplikaĵon: aŭ per fleksebla stirpanelo aŭ per statika menuo. Vi ĉiam povas ŝanĝi tion en agordoj de stirpanelo.</string>
     <string name="only_download_over_wifi">Elŝuti nur per vifio</string>
     <string name="live_update">Aŭtomataj ĝisdatigoj perinterretaj</string>
@@ -2013,8 +2010,6 @@
     <string name="allow_access_location">Permesi aliron al pozicio</string>
     <string name="first_usage_greeting">Navigi kaj esplori novajn lokojn sen interreta konekto</string>
     <string name="search_my_location">Trovi mian pozicion</string>
-    <string name="no_update_info">Ne montri novajn versiojn</string>
-    <string name="no_update_info_desc">Ne serĉi pri novaj versioj aŭ OsmAnd-rilataj rabatoj.</string>
     <string name="get_it">Havigi ĝin</string>
     <string name="get_for">Havigi ĝin por %1$s</string>
     <string name="osm_live_banner_desc">Havigu senlimigitan elŝutojn de mapoj kaj ĉiusemajnaj, ĉiutagajn kaj eĉ ĉiuhorajn ĝisdatigojn.</string>
@@ -2073,9 +2068,6 @@
     <string name="route_roundabout_short">Elveturu al %1$d-a elveturejo</string>
     <string name="search_map_hint">Urbo aŭ regiono</string>
     <string name="wiki_around">Pri ĉirkaŭaĵo en Vikipedio</string>
-    <string name="legacy_search">Malnova serĉilo</string>
-    <string name="show_legacy_search">Montri malnovan serĉilon</string>
-    <string name="show_legacy_search_desc">Aldoni malnovan serĉilon en la tirmenuon.</string>
     <string name="routing_attr_allow_motorway_name">Uzi aŭtovojojn</string>
     <string name="routing_attr_allow_motorway_description">Uzi aŭtoŝoseojn.</string>
     <string name="lang_sr_latn">Serba (latina)</string>
@@ -2180,7 +2172,7 @@
     <string name="route_altitude">Kursa altitudo</string>
     <string name="altitude_descent">Malsupreniro</string>
     <string name="altitude_ascent">Supreniro</string>
-    <string name="altitude_range">Altituda intervalo</string>
+    <string name="altitude_range">Variejo de altitudo</string>
     <string name="average_altitude">Mezuma altitudo</string>
     <string name="shared_string_time">Tempo</string>
     <string name="total_distance">Tuta distanco</string>
@@ -2594,16 +2586,6 @@
     <string name="by_date">Laŭ dato</string>
     <string name="by_type">Laŭ speco</string>
     <string name="modify_the_search_query">Modifu vian serĉpeton.</string>
-    <string name="release_3_0">• novaĵo: subteno por tutmondaj vojaĝaj gvidiloj seninterrete; priskribataj lokoj ligitaj al la mapo; datumoj el Vikivojaĝo 
-\n 
-\n• Vikipedio: nova stilo, aktivaj ligiloj, subteno por bildoj 
-\n 
-\n• menuo de malfermita kurso: vidigi grupojn de navigadpunktoj
-\n 
-\n• map-markoj: enporti elektitajn grupojn el GPX-dosieroj, enigo de koordinatoj, nova aspekto 
-\n 
-\n• abono al OsmAnd-Live nun inkluzivas ĉiujn eblaĵojn de OsmAnd 
-\n</string>
     <string name="what_is_here">Tie ĉi:</string>
     <string name="parked_at">parkumita je</string>
     <string name="pick_up_till">Reprenu ĝis</string>
@@ -2728,7 +2710,7 @@
     <string name="update_is_available">Ĝisdatigo disponeblas</string>
     <string name="download_file">Elŝuti dosieron</string>
     <string name="start_editing_card_image_text">Senpaga/libera vojaĝ-gvidilo redaktebla de ĉiu.</string>
-    <string name="welcome_to_open_beta_description">Vojaĝaj gvidiloj baziĝas sur Vikivojaĝo. Provu ĉiujn eblojn dum beta-testado senpage. Poste vojaĝaj gvidiloj estos disponeblaj al abonantoj de OsmAnd Unlimited kaj aĉetintoj de OsmAnd+.</string>
+    <string name="welcome_to_open_beta_description">Vojaĝaj gvidiloj baziĝas sur Vikivojaĝo. Provu ĉiujn eblojn dum beta-testado senpage.</string>
     <string name="start_editing_card_description">Vi povas (kaj bonvole fari tion) redakti iujn ajn artikolojn de Vikivojaĝo. Kunhavigu vian scion, sperton, talenton kaj prizorgon.</string>
     <string name="start_editing">Komenci redakti</string>
     <string name="get_unlimited_access">Akiri senliman atingon</string>
@@ -2779,44 +2761,13 @@
     <string name="send_search_query_description">Ni sendos vian serĉ-peton: “%1$s” kun via pozicio.
 \n 
 \nNeniuj personaj informoj estos senditaj, serĉ-datumoj estos uzataj nur por plibonigi la serĉan algoritmon.</string>
-    <string name="search_no_results_description">Neniuj rezultoj?
-\nSciigu nin pri tio.</string>
     <string name="send_search_query">Ĉu sendi serĉ-peton?</string>
-    <string name="release_3_1">• navigado: riparita plenumbreto, eblo por rapide interŝanĝi komencan punkton de kurso por fino 
-\n 
-\n • map-markoj: riparita (mal)aktivigo de grupoj, eblo por kaŝi map-markojn sur la mapo 
-\n 
-\n • OSM-redaktilo: eblo por redakti etikedojn de nepunktoj kaj linioj, riparitaj mankaj komentoj en rimarkoj, sekurkopioj de redaktoj 
-\n 
-\n • plibonigita prilaborado de Vikipedio kaj Vikivojaĝo, aktualigitaj dosieroj jam elŝuteblaj 
-\n 
-\n • kunteksta menuo: riparita koloro de transportaj ŝirmejoj en nokta reĝimo, riparitaj grandoj de kroma menuo 
-\n 
-\n • mar-navigado: subteno por bu-markitaj akvovojoj (etikedo «waterway=fairway»)
-\n
-\n • aliaj erar-riparoj 
-\n</string>
     <string name="increase_search_radius_to">Pliigi serĉan radiuson ĝis %1$s</string>
-    <string name="commiting_way">Alŝutado de linio…</string>
     <string name="thank_you_for_feedback">Dankon por via opinio</string>
     <string name="poi_cannot_be_found">Ne povis trovi nodon aŭ linion.</string>
     <string name="search_no_results_feedback">Neniuj serĉ‑rezultoj\?
 \nInformu nin</string>
     <string name="test_voice_desrc">Premu butonon kaj aŭskultu rilatan voĉan sciigon por aŭskulti ĉu ĝi mankas aŭ eraras</string>
-    <string name="release_3_2_pre">• riparita paneo je starto, kiu okazis ĉe kelkaj aparatoj 
-\n 
-\n• nova eblo de map-markoj: montri jam-pasigitajn markoj
-\n 
-\n• serĉ-historio nun montras antaŭe serĉitajn kategoriojn
-\n 
-\n• riparita paneo je starto, kiu okazis dum vidigi nelatinajn signojn 
-\n 
-\n• plirapidigita bildigado de mapo ĉe Android 8.0 
-\n 
-\n• subteno por redakti plurangulajn objektojn (sed ne por interesejoj) 
-\n 
-\n• mezuri distancon: aldonis ag-butonon “mezuri” al la kunteksta menuo 
-\n</string>
     <string name="ask_for_location_permission">Permesu al OsmAnd aliron al pozicio por pluigi.</string>
     <string name="rendering_value_black_name">Nigra</string>
     <string name="more_transport_on_stop_hint">Pliaj transportiloj disponeblaj el tiu ĉi haltejo.</string>
@@ -2897,22 +2848,6 @@
     <string name="quick_action_show_hide_gpx_tracks_descr">Butono por montri/kaŝi elektitajn spurojn sur la mapo.</string>
     <string name="quick_action_gpx_tracks_hide">Kaŝi spurojn</string>
     <string name="quick_action_gpx_tracks_show">Montri spurojn</string>
-    <string name="release_3_3">• nova ekrano “navigi”: butonoj por navigi al hejmo aŭ laborejo, butono “antaŭa kurso”, listo de aktivaj GPX-spuroj kaj map-markoj, serĉ-historio
-\n
-\n • pliaj informoj ĉe “detaloj pri kurso”: specoj de vojoj, pavimo, klineco, glateco
-\n
-\n • publik-transporta navigado subtenanta ĉiuj transportilojn: aŭtobuson, tramon, metroon, ktp
-\n
-\n • novaj butonoj de rapida ago: montri/kaŝi spurojn kaj baskuli inter taga/nokta reĝimo
-\n
-\n • riparis eraron pri montri areojn kiel superakvitajn (rilata al Germanujo, Sud-Afriko, Kebekio)
-\n
-\n • subteno enporti KML kaj KMZ
-\n
-\n • riparis eraron dum malfermi iujn haltejojn publik-transportajn
-\n
-\n • forigis analizilojn Facebook kaj Firebase el la senpaga version (OsmAnd+ ne havis ilin)
-\n</string>
     <string name="use_osm_live_public_transport_description">Aktivigi publikan transporton por ŝanĝoj OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Publika transporto OsmAnd Live</string>
     <string name="public_transport_warning_descr_blog">Pliaj informoj pri kiel OsmAnd difinas kursojn estas legeblaj ĉe nia taglibro.</string>
@@ -2989,15 +2924,6 @@
     <string name="routing_attr_avoid_subway_description">Eviti subterajn vagonarojn kaj fervojon malpezan</string>
     <string name="routing_attr_avoid_ferry_name">Sen pramoj</string>
     <string name="routing_attr_avoid_ferry_description">Eviti pramojn</string>
-    <string name="release_3_3_7">• montri tempon inter transveturiliĝoj de publika transporto 
-\n 
-\n• korektita uzant‑fasado por detaloj pri kurso 
-\n 
-\n• malhela etoso: riparita menuo “navigi” kaj detaloj pri kurso 
-\n 
-\n• montri azimuton ĉe distanc‑mezurilo
-\n
-\n</string>
     <string name="send_log">Sendi erar‑protokolon</string>
     <string name="files_moved">Movis %1$d dosierojn (%2$s).</string>
     <string name="files_copied">Kopiis %1$d dosierojn (%2$s).</string>
@@ -3078,8 +3004,6 @@
     <string name="third_party_routing_type">Ekstera kurs‑difinilo</string>
     <string name="application_profiles_descr">Elekti profilojn videblajn en la aplikaĵo.</string>
     <string name="application_profiles">Profiloj de aplikaĵo</string>
-    <string name="zoom_by_wunderlinq_descr">Rulumu supren/malsupren por ŝanĝi pligrandigon de mapo. Eskap-klavo revenas al al aplikaĵo WunderLINQ App.</string>
-    <string name="zoom_by_wunderlinq">Stiri per WunderLINQ</string>
     <string name="quick_action_need_to_add_item_to_list">Aldonu almenaŭ unu elementon al la listo en agordoj de “rapida ago”</string>
     <string name="routing_attr_piste_type_downhill_name">Skiado alpa kaj malsuprenira</string>
     <string name="routing_attr_piste_type_downhill_description">Skivojoj por skiado alpa (malsuprenira) kaj vojetoj al skitelferoj.</string>
@@ -3185,8 +3109,8 @@
     <string name="rendering_attr_showLez_name">Zonoj de restrikta emisio (LEZ)</string>
     <string name="temporary_conditional_routing">Konsideri portempajn limigojn</string>
     <string name="shared_string_default">Implicita</string>
-    <string name="new_route_calculated_dist_dbg">Kurso: distanco %s, tempo: %s 
-\n(kalkulita en %.1f s, %d vojoj, %d kaheloj)</string>
+    <string name="new_route_calculated_dist_dbg">Kurso: distanco %1$s, tempo: %2$s
+\n(kalkulita en %3$.1f s, %4$d vojoj, %5$d kaheloj)</string>
     <string name="lang_oc">Okcitana</string>
     <string name="app_mode_wagon">Aŭto (kombino)</string>
     <string name="app_mode_pickup_truck">Aŭto (pickup)</string>
@@ -3227,7 +3151,6 @@
     <string name="route_parameters_info">Agordoj pri kurs‑difinado por la elektita profilo: “%1$s”.</string>
     <string name="wake_time">Aktiveca periodo de ekrano</string>
     <string name="units_and_formats">Unuoj kaj formoj</string>
-    <string name="appearance">Aspekto</string>
     <string name="map_look_descr">Alĝustigi mapon</string>
     <string name="map_look">Map‑aspekto</string>
     <string name="list_of_installed_plugins">Instalitaj kromprogramoj</string>
@@ -3360,7 +3283,6 @@
     <string name="rendering_value_white_name">Blanka</string>
     <string name="swap_two_places">Anstataŭigi: %1$s ⇄ %2$s</string>
     <string name="route_start_point">Komencpunkto</string>
-    <string name="swap_start_and_destination">Anstataŭigi komencpunkton per celo</string>
     <string name="simulate_your_location_gpx_descr">Simuli vian pozicion uzante registritan GPX‑kurson.</string>
     <string name="track_saved">Konservis kurson</string>
     <string name="empty_filename">Malplena dosiernomo</string>
@@ -3582,7 +3504,6 @@
     <string name="select_shape">Elekti formon</string>
     <string name="select_group">Elekti grupon</string>
     <string name="shared_string_circle">Cirklo</string>
-    <string name="shared_string_rhomb">Rombo</string>
     <string name="shared_string_square">Kvadrato</string>
     <string name="shared_string_min">Min.</string>
     <string name="shared_string_octagon">Okangulo</string>
@@ -3710,7 +3631,6 @@
     <string name="screen_control">Aktiveco de ekrano</string>
     <string name="system_screen_timeout_descr">Malŝaltas la ekranon laŭ la sistemaj agordoj.</string>
     <string name="system_screen_timeout">Sistema agordo pri malŝalti ekranon</string>
-    <string name="turn_screen_on_options_descr">Kondiĉoj por ŝalti ekranon:</string>
     <string name="turn_screen_on_descr">Alĝustigi kiam ŝalti ekranon (certiĝu, ke OsmAnd laboras malfone kiam la aparato estas ŝlosita):</string>
     <string name="turn_screen_on_navigation_instructions_descr">Ĉiu naviga gvidilo ŝaltos la ekranon.</string>
     <string name="turn_screen_on_navigation_instructions">Navigaj gvidiloj</string>
@@ -3754,7 +3674,6 @@
     <string name="shared_string_meters">metroj</string>
     <string name="details_dialog_decr">Montri aŭ kaŝi pliajn detalojn sur la mapo</string>
     <string name="shared_string_night_map">Nokta mapo</string>
-    <string name="shared_string_all_time">Ĉiam</string>
     <string name="turn_screen_on_power_button_disabled">Malŝaltita. Postulas “teni ekranon aktiva” en la sekcio “aktiveca periodo de ekrano”.</string>
     <string name="clear_tiles_warning">Per apliki tiujn ĉi ŝanĝojn, la kaŝmemorigitaj datumoj por tiu ĉi fonto de kaheloj forviŝiĝos</string>
     <string name="add_online_source">Aldoni enretan fonton</string>
@@ -3891,7 +3810,7 @@
 \n
 \n</string>
     <string name="monitoring_control_start">Registri</string>
-    <string name="save_global_track_interval_descr">Elektu la intervalon de registrado por la ĝenerala registrado de spuro (aktivigebla per la fenestraĵo “registri spuron” sur la mapo).</string>
+    <string name="save_global_track_interval_descr">Elektu la intertempon de registrado por la ĝenerala registrado de spuro (aktivigebla per la fenestraĵo “registri spuron” sur la mapo).</string>
     <string name="simplified_track">Simpligita spuro</string>
     <string name="simplified_track_description">Nur la linio de kurso estos konservita, la navigadpunktoj estos forigitaj.</string>
     <string name="shared_string_file_name">Dosiernomo</string>
@@ -3918,7 +3837,6 @@
     <string name="development">Programado</string>
     <string name="use_live_public_transport">Datumoj OsmAnd Live</string>
     <string name="use_live_routing">Datumoj OsmAnd Live</string>
-    <string name="use_complex_routing">Komplika kurs-difinado</string>
     <string name="complex_routing_descr">Du-faza difinado de kurso por aŭtomobila navigo.</string>
     <string name="use_native_pt">Indiĝena metodo de publik-transporta navigo</string>
     <string name="use_native_pt_desc">Aktivigi (sekuran) metodon por kalkuli kursojn de publika transporto uzante programlingvon Java</string>
@@ -4042,7 +3960,6 @@
     <string name="routing_engine_vehicle_type_foot">Piediranto</string>
     <string name="routing_engine_vehicle_type_bike">Biciklo</string>
     <string name="routing_engine_vehicle_type_car">Aŭtomobilo</string>
-    <string name="message_error_recheck_parameters">Eraro, rekontrolu parametrojn</string>
     <string name="copy_address">Kopii adreson</string>
     <string name="online_routing_engine">Enreta navigilo</string>
     <string name="online_routing_engines">Enretaj navigiloj</string>
@@ -4050,4 +3967,37 @@
     <string name="select_folder">Elekti dosierujon</string>
     <string name="select_folder_descr">Elekti dosierujon aŭ krei novan</string>
     <string name="shared_string_empty">Malplena</string>
+    <string name="analyze_by_intervals">Analizi laŭ intertempoj (dividoj)</string>
+    <string name="upload_to_openstreetmap">Alŝuti al OpenStreetMap</string>
+    <string name="edit_track">Redakti spuron</string>
+    <string name="rename_track">Renomi spuron</string>
+    <string name="change_folder">Ŝanĝi dosierujon</string>
+    <string name="routing_engine_vehicle_type_small_truck">Kamioneto</string>
+    <string name="routing_engine_vehicle_type_truck">Kamiono</string>
+    <string name="routing_engine_vehicle_type_scooter">Skotero</string>
+    <string name="routing_engine_vehicle_type_racingbike">Biciklo vetkura</string>
+    <string name="routing_engine_vehicle_type_mtb">Montbiciklo</string>
+    <string name="message_server_error">Servila eraro: %1$s</string>
+    <string name="message_name_is_already_exists">Tiu ĉi nomo jam estas uzata</string>
+    <string name="start_recording">Ekigi registri</string>
+    <string name="show_track_on_map">Montri kurson sur mapo</string>
+    <string name="routing_engine_vehicle_type_wheelchair">Rulseĝo</string>
+    <string name="routing_engine_vehicle_type_hiking">Marŝado</string>
+    <string name="routing_engine_vehicle_type_walking">Irado</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">Elektra biciklado</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">Montara biciklado</string>
+    <string name="routing_engine_vehicle_type_cycling_road">Ŝosea biciklado</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">Kutima biciklado</string>
+    <string name="routing_engine_vehicle_type_hgv">Peza kamiono</string>
+    <string name="shared_string_sec">s</string>
+    <string name="announcement_time_passing">Pasado</string>
+    <string name="announcement_time_approach">Alproksimiĝado</string>
+    <string name="announcement_time_prepare_long">Longa preparado</string>
+    <string name="announcement_time_prepare">Preparado</string>
+    <string name="announcement_time_off_route">Devojiĝo de kurso</string>
+    <string name="announcement_time_arrive">Atingo al celo</string>
+    <string name="shared_string_turn">Turno</string>
+    <string name="announcement_time_intervals">Interspacoj distancaj kaj tempaj</string>
+    <string name="announcement_time_descr">Tempo de anonco de diversaj voĉaj sciigoj dependas de ilia specoj, nuna naviga kaj implicita naviga rapido.</string>
+    <string name="announcement_time_title">Tempo de anonco</string>
 </resources>

OsmAnd/res/values-es-rAR/phrases.xml

@@ -78,7 +78,6 @@
     <string name="poi_copyshop">Tienda de fotocopiado;Fotocopiadora</string>
     <string name="poi_curtain">Blanquería;Cortinas</string>
     <string name="poi_fabric">Tienda textil;Telas</string>
-    <string name="poi_bedding">Tienda de ropa de cama</string>
     <string name="poi_dive">Equipo de buceo</string>
     <string name="poi_doityourself">Mejoras para el hogar</string>
     <string name="poi_erotic">Artículos eróticos;Sexshop</string>
@@ -341,7 +340,6 @@
     <string name="poi_healthcare_alternative">Medicina alternativa</string>
     <string name="poi_audiologist">Otorrinolaringólogo;Audiólogo</string>
     <string name="poi_blood_bank">Banco de sangre</string>
-    <string name="poi_healthcare_centre">Centro médico</string>
     <string name="poi_midwife">Obstetra</string>
     <string name="poi_occupational_therapist">Terapeuta ocupacional</string>
     <string name="poi_optometrist">Oftalmólogo;Optometrista</string>
@@ -430,7 +428,6 @@
     <string name="poi_surfing">Surf</string>
     <string name="poi_swimming">Natación</string>
     <string name="poi_table_tennis">Tenis de mesa;Ping Pong</string>
-    <string name="poi_team_handball">Equipo de hándbol</string>
     <string name="poi_tennis">Tenis</string>
     <string name="poi_toboggan">Tobogán</string>
     <string name="poi_volleyball">Voley</string>
@@ -455,7 +452,6 @@
     <string name="poi_aquarium">Acuario</string>
     <string name="poi_theme_park">Parque temático</string>
     <string name="poi_attraction">Atracción turística</string>
-    <string name="poi_general_tourist_attraction_yes">Atracción turística general</string>
     <string name="poi_attraction_amusement_ride">Atracción de feria</string>
     <string name="poi_attraction_animal">Animal (atracción)</string>
     <string name="poi_attraction_big_wheel">Rueda de la fortuna;Noria;Vuelta al mundo</string>
@@ -494,7 +490,6 @@
     <string name="poi_internet_access_public">Conexión a Internet: público</string>
     <string name="poi_internet_access_service">Conexión a Internet: servicio</string>
     <string name="poi_monastery">Monasterio</string>
-    <string name="poi_historic_monastery">Monasterio histórico</string>
     <string name="poi_wayside_cross">Crucero;Cruz en el camino</string>
     <string name="poi_wayside_shrine">Ermita en el camino</string>
     <string name="poi_information">Información</string>
@@ -658,7 +653,6 @@
     <string name="poi_crematorium">Crematorio</string>
     <string name="poi_internet_cafe">Cibercafé</string>
     <string name="poi_bank">Banco</string>
-    <string name="poi_amenity_atm">Cajero automático</string>
     <string name="poi_payment_terminal">Terminal de pago</string>
     <string name="poi_money_lender">Prestamista</string>
     <string name="poi_pawnbroker">Casa de empeños;Prestamista</string>
@@ -816,7 +810,6 @@
     <string name="poi_coffee">Venta de café en granos</string>
     <string name="poi_pasta">Fábrica de pastas</string>
     <string name="poi_pastry">Pastelería</string>
-    <string name="poi_furnace">Artículos de calefacción</string>
     <string name="poi_garden_furniture">Muebles de jardín</string>
     <string name="poi_leather">Marroquinería;Tienda de cueros</string>
     <string name="poi_tyres">Tienda de neumáticos</string>
@@ -837,14 +830,11 @@
     <string name="poi_breakwater">Rompeolas</string>
     <string name="poi_power_cable_distribution_cabinet">Gabinete de distribución cableada</string>
     <string name="poi_basin">Cuenca</string>
-    <string name="poi_building_poi">Edificio</string>
     <string name="poi_crane">Grúa</string>
     <string name="poi_tree">Árbol</string>
     <string name="poi_abandoned">Abandonado</string>
     <string name="poi_disused">En desuso</string>
     <string name="poi_groyne">Espigón</string>
-    <string name="poi_conservation">Conservación del suelo</string>
-    <string name="poi_tourism_attraction">Atracción turística</string>
     <string name="poi_cutline">Cortafuegos forestal</string>
     <string name="poi_icn_ref">Nodo de red internacional de ciclismo</string>
     <string name="poi_ncn_ref">Nodo de red nacional de ciclismo</string>
@@ -984,7 +974,6 @@
     <string name="poi_recycling_cardboard">Cartón</string>
     <string name="poi_recycling_hardcore">Escombros</string>
     <string name="poi_recycling_chipboard">Cartón prensado</string>
-    <string name="poi_mill_pond">Laguna de molino</string>
     <string name="twitter">Twitter</string>
     <string name="poi_skype">Skype</string>
     <string name="poi_youtube">YouTube</string>
@@ -1164,7 +1153,6 @@
     <string name="poi_generator_source_geothermal">Fuente de energía: geotérmica</string>
     <string name="poi_generator_source_oil">Fuente de energía: petróleo</string>
     <string name="poi_generator_source_diesel">Fuente de energía: diésel</string>
-    <string name="poi_car_wash_self_service">Auto servicio</string>
     <string name="poi_int_name">Nombre internacional</string>
     <string name="poi_nat_name">Nombre nacional</string>
     <string name="poi_reg_name">Nombre regional</string>
@@ -1189,7 +1177,6 @@
     <string name="poi_information_route_marker">Marcador de ruta</string>
     <string name="poi_information_hikingmap">Mapa de senderismo</string>
     <string name="poi_information_nature">Naturaleza</string>
-    <string name="poi_information_wildlife">Información: Vida salvaje</string>
     <string name="poi_information_history">Historia</string>
     <string name="poi_information_sign">Señal</string>
     <string name="poi_information_audioguide">Audio-guía</string>
@@ -1312,8 +1299,6 @@
     <string name="poi_stars_4s">4S (Primera Clase Superior)</string>
     <string name="poi_stars_5">5 (Lujoso)</string>
     <string name="poi_stars_5s">5S (Lujoso Superior)</string>
-    <string name="poi_stars_6">Estrellas: 6</string>
-    <string name="poi_stars_7">Estrellas: 7</string>
     <string name="poi_rooms">Habitaciones</string>
     <string name="poi_love_hotel">Albergue transitorio;Telo;Motel;Hotel alojamiento</string>
     <string name="poi_internet_access_yes">Conexión a Internet: sí</string>
@@ -1340,7 +1325,6 @@
     <string name="poi_payment_visa_no">No acepta Visa</string>
     <string name="poi_payment_mastercard_yes">MasterCard</string>
     <string name="poi_payment_mastercard_no">No acepta MasterCard</string>
-    <string name="poi_payment_none">Gratis</string>
     <string name="poi_payment_account_cards_yes">Tarjetas de cuenta</string>
     <string name="poi_payment_account_cards_no">No acepta tarjetas de cuenta</string>
     <string name="poi_payment_maestro_yes">Maestro</string>
@@ -1972,7 +1956,6 @@
     <string name="poi_impromptu_no">Improvisado: no</string>
     <string name="poi_sanitary_dump_station_yes">Estación de descarga sanitaria: sí</string>
     <string name="poi_sanitary_dump_station_no">Estación de descarga sanitaria: no</string>
-    <string name="poi_sanitary_dump_station_customers">Estación de descarga sanitaria sólo para clientes</string>
     <string name="poi_power_supply_yes">Sí</string>
     <string name="poi_power_supply_no">Fuente de alimentación: no</string>
     <string name="poi_power_supply_cee_7_4">Fuente de alimentación (enchufe): CEE 7/4</string>
@@ -2383,7 +2366,6 @@
     <string name="poi_inscription_e">Inscripción: E</string>
     <string name="poi_inscription_ne">Inscripción: NE</string>
     <string name="poi_construction_yes">En construcción</string>
-    <string name="poi_additional_atm_yes">Cajero automático: sí</string>
     <string name="poi_atm_no">Cajero automático: no</string>
     <string name="poi_firepit">Lugar para fogata</string>
     <string name="poi_street_cabinet">Gabinete exterior</string>
@@ -2479,7 +2461,6 @@
     <string name="poi_sanitary_dump_station">Estación de descarga sanitaria</string>
     <string name="poi_medical_system_western_yes">Occidental</string>
     <string name="poi_medical_system_chinese_yes">Chino tradicional</string>
-    <string name="poi_medical_system_unknown_yes">Sistema médico: Desconocido</string>
     <string name="poi_medical_system_ayurveeda_yes">Ayurveda</string>
     <string name="poi_medical_system_kampo_yes">Kampo</string>
     <string name="poi_medical_system_mongolian_yes">Mongol tradicional</string>
@@ -2503,17 +2484,12 @@
     <string name="poi_health_service_test_yes">Servicio de salud: análisis</string>
     <string name="poi_health_service_test_no">Servicio de salud: sin análisis</string>
     <string name="poi_health_facility_type_office">Consultorio médico</string>
-    <string name="poi_health_facility_type_hospital">Tipo de instalación médica: Hospital</string>
     <string name="poi_health_facility_type_field_hospital">Tipo de centro médico: hospital de campaña</string>
-    <string name="poi_health_facility_type_clinic">Tipo de instalación médica: Clínica</string>
-    <string name="poi_health_facility_type_health_centre">Tipo de instalación médica: Centro de salud</string>
     <string name="poi_health_facility_type_counselling_centre">Tipo de centro médico: centro de asesoría</string>
-    <string name="poi_health_facility_type_rehabilitation">Tipo de instalación médica: Rehabilitación</string>
     <string name="poi_health_facility_type_laboratory">Tipo de centro médico: laboratorio</string>
     <string name="poi_health_facility_type_therapy">Tipo de centro médico: terapia</string>
     <string name="poi_health_facility_type_department">Tipo de centro médico: departamento</string>
     <string name="poi_health_facility_type_dispensary">Tipo de centro médico: dispensario</string>
-    <string name="poi_health_facility_type_pharmacy">Tipo de instalación médica: Farmacia</string>
     <string name="poi_health_facility_type_first_aid">Tipo de centro médico: primeros auxilios</string>
     <string name="poi_health_facility_type_nursing_home">Tipo de centro médico: asilo de ancianos;Geriátrico</string>
     <string name="poi_health_facility_type_support_group_home">Tipo de centro médico: grupo de apoyo domiciliario</string>
@@ -2560,7 +2536,6 @@
     <string name="poi_counselling_type_marriage_yes">Asesoría (matrimonio): sí</string>
     <string name="poi_counselling_type_marriage_no">Asesoría (matrimonio): no</string>
     <string name="poi_counselling_type_nutrition_yes">Asesoría (nutrición): sí</string>
-    <string name="poi_counselling_type_nutrition_no">Asesoramiento (nutrición): No</string>
     <string name="poi_counselling_type_rehabilitation_yes">Asesoría (rehabilitación): sí</string>
     <string name="poi_counselling_type_rehabilitation_no">Asesoría (rehabilitación): no</string>
     <string name="poi_counselling_type_sexual_yes">Asesoría (sexual): sí</string>
@@ -2629,7 +2604,6 @@
     <string name="poi_water_source_main">Principal</string>
     <string name="poi_water_source_pond">Estanque</string>
     <string name="poi_water_source_stream">Arroyo</string>
-    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
     <string name="poi_in_service_yes">En servicio: sí</string>
     <string name="poi_fire_hydrant_style_wsh">Estilo de hidrante: wsh</string>
     <string name="poi_street_cabinet_power">Tipo de gabinete: electricidad</string>
@@ -3564,8 +3538,6 @@
     <string name="poi_park_ride_hov">Vehículos de gran capacidad</string>
     <string name="poi_park_ride_tram">Tranvía</string>
     <string name="poi_park_ride_ferry">Transbordador (Ferri)</string>
-    <string name="poi_generator_source_biomass">Fuente de energía: biomasa</string>
-    <string name="poi_health_specialty_radiotheraphy_yes">Radioterapia</string>
     <string name="poi_hazard">Advertencia de peligro</string>
     <string name="poi_rtsa_scale_filter">Categoría de dificultad</string>
     <string name="poi_rtsa_scale_nc">s/c (sin categoría)</string>

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

@@ -1419,7 +1419,6 @@
     <string name="error_calculating_route">No se pudo calcular la ruta.</string>
     <string name="error_calculating_route_occured">No se pudo calcular la ruta.</string>
     <string name="empty_route_calculated">La ruta calculada está vacía.</string>
-    <string name="new_route_calculated_dist">Nueva ruta calculada, distancia</string>
     <string name="arrived_at_destination">Has llegado.</string>
     <string name="invalid_locations">Coordenadas inválidas</string>
     <string name="go_back_to_osmand">Volver al mapa</string>
@@ -1501,7 +1500,6 @@
     <string name="osb_comment_dialog_error">No se pudo añadir el comentario.</string>
     <string name="poi_edit_title">Editar PDI</string>
     <string name="poi_create_title">Crear PDI</string>
-    <string name="poi_error_poi_not_found">No se encontró el nodo, o el PDI se compone de varios nodos, lo cuál todavía no está soportado.</string>
     <string name="poi_remove_confirm_template">¿Borrar {0} (comentario)?</string>
     <string name="poi_remove_title">Borrar PDI</string>
     <string name="poi_remove_success">Borrado</string>
@@ -1801,7 +1799,6 @@
     <string name="no_address_found">Dirección indeterminada</string>
     <string name="looking_up_address">Buscando dirección</string>
     <string name="rendering_attr_horseRoutes_name">Rutas a caballo</string>
-    <string name="update">Actualizar</string>
     <string name="only_download_over_wifi">Descargar sólo con Wi-Fi</string>
     <string name="live_update">Actualización en vivo</string>
     <string name="update_now">Actualizar</string>
@@ -2002,8 +1999,6 @@
     <string name="update_all_maps_now">¿Actualizar todos los mapas ahora?</string>
     <string name="clear_tile_data">Limpiar todas las teselas</string>
     <string name="search_my_location">Encontrar mi ubicación</string>
-    <string name="no_update_info_desc">Omite la búsqueda de nuevas versiones o descuentos relacionados con OsmAnd.</string>
-    <string name="no_update_info">Ocultar nuevas versiones</string>
     <string name="skip_map_downloading">Omitir descargas de mapas</string>
     <string name="skip_map_downloading_desc">Sin mapas descargados. Puedes elegir uno de la lista o descargarlos luego a través de «Menú - %1$s».</string>
     <string name="search_another_country">Elegir otra región</string>
@@ -2076,9 +2071,6 @@
     <string name="route_roundabout_short">Toma la %1$dª salida y continúa</string>
     <string name="search_map_hint">Ciudad o región</string>
     <string name="wiki_around">Artículos de Wikipedia cerca</string>
-    <string name="legacy_search">Búsqueda clásica</string>
-    <string name="show_legacy_search">Mostrar la búsqueda clásica</string>
-    <string name="show_legacy_search_desc">Añade el modo de búsqueda clásica a la lista del panel lateral.</string>
     <string name="routing_attr_allow_motorway_name">Usar autopistas</string>
     <string name="routing_attr_allow_motorway_description">Permite usar autopistas.</string>
     <string name="lang_sr_latn">Serbio (latino)</string>
@@ -2599,16 +2591,6 @@
     <string name="by_date">Por fecha</string>
     <string name="by_type">Por tipo</string>
     <string name="modify_the_search_query">Cambiar la búsqueda.</string>
-    <string name="release_3_0">• Nuevo: Soporte para guías turísticas globales sin conexión a Internet. Las ubicaciones de referencia, están vinculadas al mapa. Datos iniciales de Wikiviajes 
-\n 
-\n • Wikipedia: Nuevo aspecto, enlaces activos, ahora con soporte de imágenes 
-\n 
-\n • Interfaz de usuario de Open Tracks: Soporte para grupos de puntos de ruta 
-\n 
-\n • Marcadores del mapa: Importación de grupos elegidos desde archivos GPX, ingreso de coordenadas, nuevo aspecto 
-\n 
-\n • La suscripción de OsmAnd Live, soporta ahora todas las características de OsmAnd 
-\n</string>
     <string name="av_locations_selected_desc">Archivo GPX con coordenadas y datos de las notas elegidas.</string>
     <string name="av_locations_all_desc">Archivo GPX con coordenadas y datos de todas las notas.</string>
     <string name="osm_recipient_stat">Ediciones: %1$s, total: %2$s mBTC</string>
@@ -2729,7 +2711,7 @@
     <string name="update_is_available">Actualización disponible</string>
     <string name="download_file">Descargar archivo</string>
     <string name="start_editing_card_image_text">La guía turística libre global que cualquiera puede editar.</string>
-    <string name="welcome_to_open_beta_description">Las guías turísticas, se basan actualmente en Wikiviajes. Prueba todas las características durante las pruebas beta abiertas, de forma gratuita. Posteriormente, las guías turísticas estarán disponible para los suscriptores de «OsmAnd ilimitado» y los propietarios de «OsmAnd+».</string>
+    <string name="welcome_to_open_beta_description">Las guías turísticas, se basan actualmente en Wikiviajes. Prueba todas las características durante las pruebas beta abiertas, de forma gratuita.</string>
     <string name="start_editing_card_description">Puedes y debes editar cualquier artículo en Wikiviajes. Comparte tu conocimiento, experiencia, talento y atención.</string>
     <string name="start_editing">Comenzar edición</string>
     <string name="get_unlimited_access">Obtener acceso ilimitado</string>
@@ -2784,44 +2766,13 @@
     <string name="send_search_query_description">Enviaremos la consulta de búsqueda: «%1$s», así como la ubicación. 
 \n
 \nNo se recopilan datos personales, los datos de búsqueda sólo se utilizan para mejorar el algoritmo de búsqueda.</string>
-    <string name="search_no_results_description">¿Sin resultados?
-\nCuéntanos sobre esto.</string>
     <string name="send_search_query">¿Enviar consulta de búsqueda?</string>
-    <string name="release_3_1">• Navegación: Corrección en la barra de progreso, intercambio rápido del punto inicial y final de la ruta 
-\n 
-\n • Marcadores del mapa: Corregido el des/activar grupos, capacidad para ocultar marcadores del mapa 
-\n 
-\n • Edición de OSM: Capacidad de edición de etiquetas para objetos que no sean puntos y de vías, corrección de los comentarios vacíos en las notas, copia de seguridad de ediciones 
-\n 
-\n • Mejor análisis de Wikipedia y Wikiviajes, los archivos actualizados ya están disponibles 
-\n 
-\n • Menú contextual: Corregido el color de los escudos de transporte en el modo nocturno y los tamaños de menú adicionales 
-\n 
-\n • Navegación fluvial: Soporte a la navegación fluvial 
-\n 
-\n • Otras correcciones de errores 
-\n</string>
     <string name="increase_search_radius_to">Ampliar el radio de búsqueda a %1$s</string>
-    <string name="commiting_way">Enviando vía…</string>
     <string name="thank_you_for_feedback">Gracias por sus comentarios</string>
     <string name="poi_cannot_be_found">No se pudo encontrar el nodo o la vía.</string>
     <string name="search_no_results_feedback">¿Sin resultados de búsqueda?
 \nDanos tu opinión</string>
     <string name="test_voice_desrc">Pulsa un botón y escucha su correspondiente aviso por voz para saber si falta o está defectuoso</string>
-    <string name="release_3_2_pre">• Corregido el fallo en el inicio que se producía en algunos dispositivos 
-\n 
-\n • Nueva función de marcadores: Mostrar los marcadores ya atravesados. 
-\n 
-\n • El historial de búsqueda muestra ahora las categorías buscadas anteriormente 
-\n 
-\n • Corregido el fallo en el inicio que se producía con los mapas no latinos 
-\n 
-\n • Mejora en los problemas de velocidad de renderizado en dispositivos Android 8.0 
-\n 
-\n • Soporte para la edición de objetos poligonales (no servicios) 
-\n 
-\n • Medir distancia: Añadir el botón de «Medir distancia» a las acciones en el menú contextual 
-\n</string>
     <string name="ask_for_location_permission">Para continuar, permite a OsmAnd acceder a la ubicación.</string>
     <string name="rendering_value_black_name">Negro</string>
     <string name="more_transport_on_stop_hint">Más transporte disponible desde esta parada.</string>
@@ -2902,22 +2853,6 @@
     <string name="quick_action_show_hide_gpx_tracks_descr">Un botón que muestra u oculta las trazas elegidas en el mapa.</string>
     <string name="quick_action_gpx_tracks_hide">Ocultar trazas</string>
     <string name="quick_action_gpx_tracks_show">Mostrar trazas</string>
-    <string name="release_3_3">• Nueva pantalla «Direcciones»: Muestra los botones de destino «Casa» y «Trabajo», el atajo de la «ruta anterior», la lista de trazas, marcadores GPX activos y el historial de búsqueda.
-\n
-\n • Información adicional en «Detalles de la ruta»: Tipos de caminos, superficie, pendiente y suavidad
-\n
-\n • Soporte en la navegación de transporte público: Metro, autobús, tranvía, etc.
-\n
-\n • Nuevas acciones rápidas: «Mostrar/ocultar trazas» y «Modo diurno/nocturno»
-\n
-\n • Áreas fijas mostradas como inundadas en Alemania, Sudáfrica y Quebec
-\n
-\n • Soporte adicional para la importación de KML y KMZ
-\n
-\n • Corregidos los fallos en la apertura de algunas paradas de transporte público
-\n
-\n • Quitado el análisis de Facebook y Firebase de la versión gratuita (OsmAnd+ no lo incluye)
-\n</string>
     <string name="use_osm_live_public_transport_description">Activar el transporte público para los cambios de OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Transporte público en OsmAnd Live</string>
     <string name="transfers_size">%1$d transbordo(s)</string>
@@ -2994,14 +2929,6 @@
     <string name="routing_attr_avoid_subway_description">Evitar subterráneos y trenes ligeros</string>
     <string name="routing_attr_avoid_ferry_name">Sin ferris o transbordadores</string>
     <string name="routing_attr_avoid_ferry_description">Evitar ferris o transbordadores</string>
-    <string name="release_3_3_7">• Mostrar el tiempo entre transbordos en transporte público
-\n
-\n• Interfaz de usuario corregida para «Detalles de la ruta»
-\n
-\n• Tema oscuro solucionado en el menú «Dirección» y «Detalles de la ruta»
-\n
-\n• Visualización de medida «azimut» en «Medir distancia»
-\n</string>
     <string name="send_log">Enviar registro del problema</string>
     <string name="files_moved">Se movieron %1$d archivos (%2$s).</string>
     <string name="files_copied">Se copiaron %1$d archivos (%2$s).</string>
@@ -3026,7 +2953,6 @@
     <string name="choose_data_to_share">Elige los tipos de datos a compartir:</string>
     <string name="downloaded_maps">Mapas descargados</string>
     <string name="visited_screens">Pantallas visitadas</string>
-    <string name="colleted_data">Datos recopilados</string>
     <string name="collected_data_descr">Define qué datos quieres que OsmAnd comparta.</string>
     <string name="downloaded_maps_collect_descr">Nos ayuda a entender la popularidad de los mapas de regiones y países.</string>
     <string name="visited_screens_collect_descr">Nos ayuda a entender la popularidad de las características de OsmAnd.</string>
@@ -3082,8 +3008,6 @@
     <string name="third_party_routing_type">Navegación de terceros</string>
     <string name="application_profiles_descr">Perfiles que serán visibles en la aplicación.</string>
     <string name="application_profiles">Perfiles de la aplicación</string>
-    <string name="zoom_by_wunderlinq_descr">Cambia el zoom del mapa desplazando la rueda hacia arriba y abajo. La tecla «Escape» retrocede a la aplicación WunderLINQ.</string>
-    <string name="zoom_by_wunderlinq">Controlar con WunderLINQ</string>
     <string name="quick_action_need_to_add_item_to_list">Añadir al menos un elemento a la lista en los ajustes de «Acción rápida»</string>
     <string name="routing_attr_piste_type_downhill_name">Esquí alpino y de descenso</string>
     <string name="routing_attr_piste_type_downhill_description">Pistas de esquí alpino o de descenso y acceso a remontes mecánicos.</string>
@@ -3190,8 +3114,8 @@
     <string name="rendering_attr_showLez_name">Mostrar zonas de baja emisión</string>
     <string name="temporary_conditional_routing">Considerar limitaciones temporales</string>
     <string name="shared_string_default">Predefinido</string>
-    <string name="new_route_calculated_dist_dbg">Ruta: distancia %s, tiempo de navegación %s
-\nCálculo: %.1f seg, %d carreteras, %d teselas)</string>
+    <string name="new_route_calculated_dist_dbg">Ruta: distancia %1$s, tiempo de navegación %2$s
+\nCálculo: %3$.1f seg, %4$d carreteras, %5$d teselas)</string>
     <string name="lang_oc">Occitano</string>
     <string name="app_mode_wagon">Vagón</string>
     <string name="app_mode_pickup_truck">Camioneta</string>
@@ -3232,7 +3156,6 @@
     <string name="route_parameters_info">Ajustes para la navegación del perfil elegido «%1$s».</string>
     <string name="wake_time">Tiempo de espera al encender</string>
     <string name="units_and_formats">Unidades y formatos</string>
-    <string name="appearance">Aspecto</string>
     <string name="map_look_descr">Apariencia del mapa</string>
     <string name="map_look">Aspecto del mapa</string>
     <string name="list_of_installed_plugins">Complementos instalados</string>
@@ -3264,7 +3187,6 @@
     <string name="logcat_buffer">Búfer de Logcat</string>
     <string name="plugins_settings">Ajustes del complemento</string>
     <string name="shared_string_by_default">Predefinido</string>
-    <string name="download_detaile_map">Descarga el mapa detallado de «%s», para ver esta área.</string>
     <string name="download_detailed_map">Descarga el mapa detallado de «%s», para ver esta área.</string>
     <string name="change_data_storage_full_description">¿Mover los archivos de datos de OsmAnd al nuevo destino\?
 \n%1$s &gt; %2$s</string>
@@ -3585,7 +3507,6 @@
     <string name="select_group">Elegir grupo</string>
     <string name="select_shape">Elegir forma</string>
     <string name="shared_string_circle">Círculo</string>
-    <string name="shared_string_rhomb">Rombo</string>
     <string name="shared_string_square">Cuadrado</string>
     <string name="recalculate_route_in_deviation">Recalcular ruta en caso de desviación</string>
     <string name="select_distance_route_will_recalc">Elige la distancia después de la cual la ruta será recalculada.</string>
@@ -3621,8 +3542,6 @@
     <string name="shared_string_languages">Idiomas</string>
     <string name="shared_string_language">Idioma</string>
     <string name="shared_string_all_languages">Todos los idiomas</string>
-    <string name="wikipedia_poi_languages_promo">Algunos artículos de Wikipedia pueden no estar disponibles en tu idioma, elige los idiomas en los que los artículos de Wikipedia aparecerán en el mapa.
-\nPodrás cambiar entre todos los idiomas disponibles mientras lees el artículo.</string>
     <string name="wiki_menu_download_descr">Se necesitan mapas adicionales para ver los puntos de interés de Wikipedia en el mapa.</string>
     <string name="select_wikipedia_article_langs">Marca los idiomas de los artículos de Wikipedia en el mapa. Cambia a cualquier idioma disponible mientras lees el artículo.</string>
     <string name="some_articles_may_not_available_in_lang">Es posible que algunos artículos de Wikipedia no estén disponibles en tu idioma.</string>
@@ -3717,7 +3636,6 @@
     <string name="screen_control">Control de pantalla</string>
     <string name="system_screen_timeout_descr">Apaga la pantalla según el tiempo de espera del sistema.</string>
     <string name="system_screen_timeout">Usar el tiempo de espera de la pantalla del sistema</string>
-    <string name="turn_screen_on_options_descr">Opciones de activación de la pantalla:</string>
     <string name="turn_screen_on_descr">Elige las opciones de activación de la pantalla (asegúrate de que OsmAnd esté en primer plano al bloquear el dispositivo):</string>
     <string name="turn_screen_on_navigation_instructions">Indicaciones de navegación</string>
     <string name="turn_screen_on_navigation_instructions_descr">Cada indicación de navegación activará la pantalla.</string>
@@ -3761,7 +3679,6 @@
     <string name="shared_string_meters">metros</string>
     <string name="details_dialog_decr">Muestra u oculta los detalles adicionales del mapa</string>
     <string name="shared_string_night_map">Mapa nocturno</string>
-    <string name="shared_string_all_time">Todo el tiempo</string>
     <string name="turn_screen_on_power_button_disabled">Desactivado. Es necesario activar «Mantener la pantalla encendida» en «Tiempo de espera al encender».</string>
     <string name="add_online_source">Añadir repositorio en línea</string>
     <string name="clear_tiles_warning">Al aplicar estos cambios, los datos almacenados serán borrados para este repositorio de teselas</string>
@@ -3922,7 +3839,6 @@
     <string name="development">Desarrollo</string>
     <string name="use_live_public_transport">Datos de «OsmAnd Live»</string>
     <string name="use_live_routing">Datos de «OsmAnd Live»</string>
-    <string name="use_complex_routing">Navegación compleja</string>
     <string name="complex_routing_descr">Navegación bifásica en automóvil.</string>
     <string name="use_native_pt">Desarrollo nativo del transporte público</string>
     <string name="use_native_pt_desc">Cambiar al cálculo de ruta Java (seguro) del transporte público</string>
@@ -4047,8 +3963,44 @@
     <string name="routing_engine_vehicle_type_foot">Peatón</string>
     <string name="routing_engine_vehicle_type_bike">Bicicleta</string>
     <string name="routing_engine_vehicle_type_car">Automóvil</string>
-    <string name="message_error_recheck_parameters">Error, vuelve a comprobar los parámetros</string>
     <string name="copy_address">Copiar dirección</string>
     <string name="online_routing_engine">Motor de navegación en línea</string>
     <string name="online_routing_engines">Motores de navegación en línea</string>
+    <string name="shared_string_folders">Carpetas</string>
+    <string name="select_folder">Elegir carpeta</string>
+    <string name="select_folder_descr">Elegir carpeta o añadir una nueva</string>
+    <string name="shared_string_empty">Vacío</string>
+    <string name="analyze_by_intervals">Analizar por intervalos (intervalo de división)</string>
+    <string name="upload_to_openstreetmap">Subir a OpenStreetMap</string>
+    <string name="edit_track">Editar traza</string>
+    <string name="rename_track">Renombrar traza</string>
+    <string name="change_folder">Cambiar carpeta</string>
+    <string name="shared_string_sec">seg</string>
+    <string name="announcement_time_passing">Pasando</string>
+    <string name="announcement_time_approach">Acercarse</string>
+    <string name="announcement_time_prepare_long">Preparación larga</string>
+    <string name="announcement_time_prepare">Preparar</string>
+    <string name="announcement_time_off_route">Fuera de la ruta</string>
+    <string name="announcement_time_arrive">Has llegado al destino</string>
+    <string name="shared_string_turn">Giro</string>
+    <string name="announcement_time_intervals">Intervalos de tiempo y distancia</string>
+    <string name="announcement_time_descr">El tiempo de anuncio de las diferentes indicaciones por voz depende del tipo de mensaje, la velocidad de navegación actual y la velocidad de navegación predefinida.</string>
+    <string name="announcement_time_title">Tiempo de anuncio</string>
+    <string name="start_recording">Iniciar grabación</string>
+    <string name="show_track_on_map">Mostrar traza en el mapa</string>
+    <string name="routing_engine_vehicle_type_wheelchair">Silla de ruedas</string>
+    <string name="routing_engine_vehicle_type_hiking">Senderismo</string>
+    <string name="routing_engine_vehicle_type_walking">Peatón</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">Ciclismo eléctrico</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">Ciclismo de montaña</string>
+    <string name="routing_engine_vehicle_type_cycling_road">Ciclismo de ruta</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">Ciclismo regular</string>
+    <string name="routing_engine_vehicle_type_hgv">Vehículos pesados</string>
+    <string name="routing_engine_vehicle_type_small_truck">Camión pequeño</string>
+    <string name="routing_engine_vehicle_type_truck">Camión</string>
+    <string name="routing_engine_vehicle_type_scooter">Motoneta</string>
+    <string name="routing_engine_vehicle_type_racingbike">Bicicleta de carreras</string>
+    <string name="routing_engine_vehicle_type_mtb">Bicicleta de montaña</string>
+    <string name="message_server_error">Error de servidor: %1$s</string>
+    <string name="message_name_is_already_exists">El nombre ya existe</string>
 </resources>

OsmAnd/res/values-es-rUS/phrases.xml

@@ -78,7 +78,6 @@
     <string name="poi_copyshop">Tienda de fotocopiado;Fotocopiadora</string>
     <string name="poi_curtain">Blanquería;Cortinas</string>
     <string name="poi_fabric">Tienda textil;Telas</string>
-    <string name="poi_bedding">Tienda de ropa de cama</string>
     <string name="poi_dive">Equipo de buceo</string>
     <string name="poi_doityourself">Mejoras para el hogar</string>
     <string name="poi_erotic">Artículos eróticos;Sexshop</string>
@@ -341,7 +340,6 @@
     <string name="poi_healthcare_alternative">Medicina alternativa</string>
     <string name="poi_audiologist">Otorrinolaringólogo;Audiólogo</string>
     <string name="poi_blood_bank">Banco de sangre</string>
-    <string name="poi_healthcare_centre">Centro médico</string>
     <string name="poi_midwife">Obstetra</string>
     <string name="poi_occupational_therapist">Terapeuta ocupacional</string>
     <string name="poi_optometrist">Oftalmólogo;Optometrista</string>
@@ -430,7 +428,6 @@
     <string name="poi_surfing">Surf</string>
     <string name="poi_swimming">Natación</string>
     <string name="poi_table_tennis">Tenis de mesa;Ping Pong</string>
-    <string name="poi_team_handball">Equipo de hándbol</string>
     <string name="poi_tennis">Tenis</string>
     <string name="poi_toboggan">Tobogán</string>
     <string name="poi_volleyball">Voley</string>
@@ -455,7 +452,6 @@
     <string name="poi_aquarium">Acuario</string>
     <string name="poi_theme_park">Parque temático</string>
     <string name="poi_attraction">Atracción turística</string>
-    <string name="poi_general_tourist_attraction_yes">Atracción turística general</string>
     <string name="poi_attraction_amusement_ride">Atracción de feria</string>
     <string name="poi_attraction_animal">Animal (atracción)</string>
     <string name="poi_attraction_big_wheel">Rueda de la fortuna;Noria;Vuelta al mundo;Viaje a la luna;Rueda moscovita;Rueda de Chicago;Rueda chicagua;Rueda gigante;Rueda ferris</string>
@@ -494,7 +490,6 @@
     <string name="poi_internet_access_public">Conexión a Internet: público</string>
     <string name="poi_internet_access_service">Conexión a Internet: servicio</string>
     <string name="poi_monastery">Monasterio</string>
-    <string name="poi_historic_monastery">Monasterio histórico</string>
     <string name="poi_wayside_cross">Crucero;Cruz en el camino</string>
     <string name="poi_wayside_shrine">Ermita en el camino</string>
     <string name="poi_information">Información</string>
@@ -658,7 +653,6 @@
     <string name="poi_crematorium">Crematorio</string>
     <string name="poi_internet_cafe">Cibercafé</string>
     <string name="poi_bank">Banco</string>
-    <string name="poi_amenity_atm">Cajero automático</string>
     <string name="poi_payment_terminal">Terminal de pago</string>
     <string name="poi_money_lender">Prestamista</string>
     <string name="poi_pawnbroker">Casa de empeños;Prestamista</string>
@@ -816,7 +810,6 @@
     <string name="poi_coffee">Venta de café en granos</string>
     <string name="poi_pasta">Fábrica de pastas</string>
     <string name="poi_pastry">Pastelería</string>
-    <string name="poi_furnace">Artículos de calefacción</string>
     <string name="poi_garden_furniture">Muebles de jardín</string>
     <string name="poi_leather">Marroquinería;Tienda de cueros</string>
     <string name="poi_tyres">Tienda de neumáticos</string>
@@ -837,14 +830,11 @@
     <string name="poi_breakwater">Rompeolas</string>
     <string name="poi_power_cable_distribution_cabinet">Gabinete de distribución cableada</string>
     <string name="poi_basin">Cuenca</string>
-    <string name="poi_building_poi">Edificio</string>
     <string name="poi_crane">Grúa</string>
     <string name="poi_tree">Árbol</string>
     <string name="poi_abandoned">Abandonado</string>
     <string name="poi_disused">En desuso</string>
     <string name="poi_groyne">Espigón</string>
-    <string name="poi_conservation">Conservación del suelo</string>
-    <string name="poi_tourism_attraction">Atracción turística</string>
     <string name="poi_cutline">Cortafuegos forestal</string>
     <string name="poi_icn_ref">Nodo de red internacional de ciclismo</string>
     <string name="poi_ncn_ref">Nodo de red nacional de ciclismo</string>
@@ -984,7 +974,6 @@
     <string name="poi_recycling_cardboard">Cartón</string>
     <string name="poi_recycling_hardcore">Escombros</string>
     <string name="poi_recycling_chipboard">Cartón prensado</string>
-    <string name="poi_mill_pond">Laguna de molino</string>
     <string name="twitter">Twitter</string>
     <string name="poi_skype">Skype</string>
     <string name="poi_youtube">YouTube</string>
@@ -1164,7 +1153,6 @@
     <string name="poi_generator_source_geothermal">Fuente de energía: geotérmica</string>
     <string name="poi_generator_source_oil">Fuente de energía: petróleo</string>
     <string name="poi_generator_source_diesel">Fuente de energía: diésel</string>
-    <string name="poi_car_wash_self_service">Auto servicio</string>
     <string name="poi_int_name">Nombre internacional</string>
     <string name="poi_nat_name">Nombre nacional</string>
     <string name="poi_reg_name">Nombre regional</string>
@@ -1189,7 +1177,6 @@
     <string name="poi_information_route_marker">Marcador de ruta</string>
     <string name="poi_information_hikingmap">Mapa de senderismo</string>
     <string name="poi_information_nature">Naturaleza</string>
-    <string name="poi_information_wildlife">Información: Vida salvaje</string>
     <string name="poi_information_history">Historia</string>
     <string name="poi_information_sign">Señal</string>
     <string name="poi_information_audioguide">Audio-guía</string>
@@ -1312,8 +1299,6 @@
     <string name="poi_stars_4s">4S (Primera Clase Superior)</string>
     <string name="poi_stars_5">5 (Lujoso)</string>
     <string name="poi_stars_5s">5S (Lujoso Superior)</string>
-    <string name="poi_stars_6">Estrellas: 6</string>
-    <string name="poi_stars_7">Estrellas: 7</string>
     <string name="poi_rooms">Habitaciones</string>
     <string name="poi_love_hotel">Albergue transitorio;Telo;Motel;Hotel alojamiento</string>
     <string name="poi_internet_access_yes">Conexión a Internet: sí</string>
@@ -1340,7 +1325,6 @@
     <string name="poi_payment_visa_no">No acepta Visa</string>
     <string name="poi_payment_mastercard_yes">MasterCard</string>
     <string name="poi_payment_mastercard_no">No acepta MasterCard</string>
-    <string name="poi_payment_none">Gratis</string>
     <string name="poi_payment_account_cards_yes">Tarjetas de cuenta</string>
     <string name="poi_payment_account_cards_no">No acepta tarjetas de cuenta</string>
     <string name="poi_payment_maestro_yes">Maestro</string>
@@ -1972,7 +1956,6 @@
     <string name="poi_impromptu_no">Improvisado: no</string>
     <string name="poi_sanitary_dump_station_yes">Estación de descarga sanitaria: sí</string>
     <string name="poi_sanitary_dump_station_no">Estación de descarga sanitaria: no</string>
-    <string name="poi_sanitary_dump_station_customers">Estación de descarga sanitaria sólo para clientes</string>
     <string name="poi_power_supply_yes">Sí</string>
     <string name="poi_power_supply_no">Fuente de alimentación: no</string>
     <string name="poi_power_supply_cee_7_4">Fuente de alimentación (enchufe): CEE 7/4</string>
@@ -2383,7 +2366,6 @@
     <string name="poi_inscription_e">Inscripción: E</string>
     <string name="poi_inscription_ne">Inscripción: NE</string>
     <string name="poi_construction_yes">En construcción</string>
-    <string name="poi_additional_atm_yes">Cajero automático: sí</string>
     <string name="poi_atm_no">Cajero automático: no</string>
     <string name="poi_firepit">Lugar para fogata</string>
     <string name="poi_street_cabinet">Gabinete exterior</string>
@@ -2479,7 +2461,6 @@
     <string name="poi_sanitary_dump_station">Estación de descarga sanitaria</string>
     <string name="poi_medical_system_western_yes">Occidental</string>
     <string name="poi_medical_system_chinese_yes">Chino tradicional</string>
-    <string name="poi_medical_system_unknown_yes">Sistema médico: Desconocido</string>
     <string name="poi_medical_system_ayurveeda_yes">Ayurveda</string>
     <string name="poi_medical_system_kampo_yes">Kampo</string>
     <string name="poi_medical_system_mongolian_yes">Mongol tradicional</string>
@@ -2503,17 +2484,12 @@
     <string name="poi_health_service_test_yes">Servicio de salud: análisis</string>
     <string name="poi_health_service_test_no">Servicio de salud: sin análisis</string>
     <string name="poi_health_facility_type_office">Consultorio médico</string>
-    <string name="poi_health_facility_type_hospital">Tipo de instalación médica: Hospital</string>
     <string name="poi_health_facility_type_field_hospital">Tipo de centro médico: hospital de campaña</string>
-    <string name="poi_health_facility_type_clinic">Tipo de instalación médica: Clínica</string>
-    <string name="poi_health_facility_type_health_centre">Tipo de instalación médica: Centro de salud</string>
     <string name="poi_health_facility_type_counselling_centre">Tipo de centro médico: centro de asesoría</string>
-    <string name="poi_health_facility_type_rehabilitation">Tipo de instalación médica: Rehabilitación</string>
     <string name="poi_health_facility_type_laboratory">Tipo de centro médico: laboratorio</string>
     <string name="poi_health_facility_type_therapy">Tipo de centro médico: terapia</string>
     <string name="poi_health_facility_type_department">Tipo de centro médico: departamento</string>
     <string name="poi_health_facility_type_dispensary">Tipo de centro médico: dispensario</string>
-    <string name="poi_health_facility_type_pharmacy">Tipo de instalación médica: Farmacia</string>
     <string name="poi_health_facility_type_first_aid">Tipo de centro médico: primeros auxilios</string>
     <string name="poi_health_facility_type_nursing_home">Tipo de centro médico: asilo de ancianos;Geriátrico</string>
     <string name="poi_health_facility_type_support_group_home">Tipo de centro médico: grupo de apoyo domiciliario</string>
@@ -2561,7 +2537,6 @@
     <string name="poi_counselling_type_marriage_yes">Asesoría (matrimonio): sí</string>
     <string name="poi_counselling_type_marriage_no">Asesoría (matrimonio): no</string>
     <string name="poi_counselling_type_nutrition_yes">Asesoría (nutrición): sí</string>
-    <string name="poi_counselling_type_nutrition_no">Asesoramiento (nutrición): No</string>
     <string name="poi_counselling_type_rehabilitation_yes">Asesoría (rehabilitación): sí</string>
     <string name="poi_counselling_type_rehabilitation_no">Asesoría (rehabilitación): no</string>
     <string name="poi_counselling_type_sexual_yes">Asesoría (sexual): sí</string>
@@ -2630,7 +2605,6 @@
     <string name="poi_water_source_main">Principal</string>
     <string name="poi_water_source_pond">Estanque</string>
     <string name="poi_water_source_stream">Arroyo</string>
-    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
     <string name="poi_in_service_yes">En servicio: sí</string>
     <string name="poi_street_cabinet_power">Tipo de gabinete: electricidad</string>
     <string name="poi_street_cabinet_telecom">Tipo de gabinete: telecomunicación</string>
@@ -3564,8 +3538,6 @@
     <string name="poi_park_ride_hov">Vehículos de gran capacidad</string>
     <string name="poi_park_ride_tram">Tranvía</string>
     <string name="poi_park_ride_ferry">Transbordador (Ferri)</string>
-    <string name="poi_generator_source_biomass">Fuente de energía: biomasa</string>
-    <string name="poi_health_specialty_radiotheraphy_yes">Radioterapia</string>
     <string name="poi_hazard">Advertencia de peligro</string>
     <string name="poi_rtsa_scale_filter">Categoría de dificultad</string>
     <string name="poi_rtsa_scale_nc">s/c (sin categoría)</string>

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

@@ -1419,7 +1419,6 @@
     <string name="error_calculating_route">No se pudo calcular la ruta.</string>
     <string name="error_calculating_route_occured">No se pudo calcular la ruta.</string>
     <string name="empty_route_calculated">La ruta calculada está vacía.</string>
-    <string name="new_route_calculated_dist">Nueva ruta calculada, distancia</string>
     <string name="arrived_at_destination">Has llegado.</string>
     <string name="invalid_locations">Coordenadas inválidas</string>
     <string name="go_back_to_osmand">Volver al mapa</string>
@@ -1501,7 +1500,6 @@
     <string name="osb_comment_dialog_error">No se pudo añadir el comentario.</string>
     <string name="poi_edit_title">Editar PDI</string>
     <string name="poi_create_title">Crear PDI</string>
-    <string name="poi_error_poi_not_found">No se encontró el nodo, o el PDI se compone de varios nodos, lo cuál todavía no está soportado.</string>
     <string name="poi_remove_confirm_template">¿Borrar {0} (comentario)?</string>
     <string name="poi_remove_title">Borrar PDI</string>
     <string name="poi_remove_success">Borrado</string>
@@ -1801,7 +1799,6 @@
     <string name="no_address_found">Dirección indeterminada</string>
     <string name="looking_up_address">Buscando dirección</string>
     <string name="rendering_attr_horseRoutes_name">Rutas a caballo</string>
-    <string name="update">Actualizar</string>
     <string name="only_download_over_wifi">Descargar sólo con Wi-Fi</string>
     <string name="live_update">Actualización en vivo</string>
     <string name="update_now">Actualizar</string>
@@ -2002,8 +1999,6 @@
     <string name="update_all_maps_now">¿Actualizar todos los mapas ahora?</string>
     <string name="clear_tile_data">Limpiar todas las teselas</string>
     <string name="search_my_location">Encontrar mi ubicación</string>
-    <string name="no_update_info_desc">Omite la búsqueda de nuevas versiones o descuentos relacionados con OsmAnd.</string>
-    <string name="no_update_info">Ocultar nuevas versiones</string>
     <string name="skip_map_downloading">Omitir descargas de mapas</string>
     <string name="skip_map_downloading_desc">Sin mapas descargados. Puedes elegir uno de la lista o descargarlos luego a través de «Menú - %1$s».</string>
     <string name="search_another_country">Elegir otra región</string>
@@ -2076,9 +2071,6 @@
     <string name="route_roundabout_short">Toma la %1$dª salida y continúa</string>
     <string name="search_map_hint">Ciudad o región</string>
     <string name="wiki_around">Artículos de Wikipedia cerca</string>
-    <string name="legacy_search">Búsqueda clásica</string>
-    <string name="show_legacy_search">Mostrar la búsqueda clásica</string>
-    <string name="show_legacy_search_desc">Añade el modo de búsqueda clásica a la lista del panel lateral.</string>
     <string name="routing_attr_allow_motorway_name">Usar autopistas</string>
     <string name="routing_attr_allow_motorway_description">Permite usar autopistas.</string>
     <string name="lang_sr_latn">Serbio (latino)</string>
@@ -2599,16 +2591,6 @@
     <string name="by_date">Por fecha</string>
     <string name="by_type">Por tipo</string>
     <string name="modify_the_search_query">Cambiar la búsqueda.</string>
-    <string name="release_3_0">• Nuevo: Soporte para guías turísticas globales sin conexión a Internet. Las ubicaciones de referencia, están vinculadas al mapa. Datos iniciales de Wikiviajes 
-\n 
-\n • Wikipedia: Nuevo aspecto, enlaces activos, ahora con soporte de imágenes 
-\n 
-\n • Interfaz de usuario de Open Tracks: Soporte para grupos de puntos de ruta 
-\n 
-\n • Marcadores del mapa: Importación de grupos elegidos desde archivos GPX, ingreso de coordenadas, nuevo aspecto 
-\n 
-\n • La suscripción de OsmAnd Live, soporta ahora todas las características de OsmAnd 
-\n</string>
     <string name="what_is_here">Aquí hay:</string>
     <string name="parked_at">estacionado a las</string>
     <string name="pick_up_till">Recoger hasta las</string>
@@ -2729,7 +2711,7 @@
     <string name="update_is_available">Actualización disponible</string>
     <string name="download_file">Descargar archivo</string>
     <string name="start_editing_card_image_text">La guía turística libre global que cualquiera puede editar.</string>
-    <string name="welcome_to_open_beta_description">Las guías turísticas, se basan actualmente en Wikiviajes. Prueba todas las características durante las pruebas beta abiertas, de forma gratuita. Posteriormente, las guías turísticas estarán disponible para los suscriptores de «OsmAnd ilimitado» y los propietarios de «OsmAnd+».</string>
+    <string name="welcome_to_open_beta_description">Las guías turísticas, se basan actualmente en Wikiviajes. Prueba todas las características durante las pruebas beta abiertas, de forma gratuita.</string>
     <string name="start_editing_card_description">Puedes y debes editar cualquier artículo en Wikiviajes. Comparte tu conocimiento, experiencia, talento y atención.</string>
     <string name="start_editing">Comenzar edición</string>
     <string name="get_unlimited_access">Obtener acceso ilimitado</string>
@@ -2784,44 +2766,13 @@
     <string name="send_search_query_description">Enviaremos la consulta de búsqueda: «%1$s», así como la ubicación.
 \n
 \nNo se recopilan datos personales, los datos de búsqueda sólo se utilizan para mejorar el algoritmo de búsqueda.</string>
-    <string name="search_no_results_description">¿Sin resultados?
-\nCuéntanos sobre esto.</string>
     <string name="send_search_query">¿Enviar consulta de búsqueda?</string>
-    <string name="release_3_1">• Navegación: Corrección en la barra de progreso, intercambio rápido del punto inicial y final de la ruta 
-\n 
-\n • Marcadores del mapa: Corregido el des/activar grupos, capacidad para ocultar marcadores del mapa 
-\n 
-\n • Edición de OSM: Capacidad de edición de etiquetas para objetos que no sean puntos y de vías, corrección de los comentarios vacíos en las notas, copia de seguridad de ediciones 
-\n 
-\n • Mejor análisis de Wikipedia y Wikiviajes, los archivos actualizados ya están disponibles 
-\n 
-\n • Menú contextual: Corregido el color de los escudos de transporte en el modo nocturno y los tamaños de menú adicionales 
-\n 
-\n • Navegación fluvial: Soporte a la navegación fluvial 
-\n 
-\n • Otras correcciones de errores 
-\n</string>
     <string name="increase_search_radius_to">Ampliar el radio de búsqueda a %1$s</string>
-    <string name="commiting_way">Enviando vía…</string>
     <string name="thank_you_for_feedback">Gracias por sus comentarios</string>
     <string name="poi_cannot_be_found">No se pudo encontrar el nodo o la vía.</string>
     <string name="search_no_results_feedback">¿Sin resultados de búsqueda?
 \nDanos tu opinión</string>
     <string name="test_voice_desrc">Pulsa un botón y escucha su correspondiente aviso por voz para saber si falta o está defectuoso</string>
-    <string name="release_3_2_pre">• Corregido el fallo en el inicio que se producía en algunos dispositivos 
-\n 
-\n • Nueva función de marcadores: Mostrar los marcadores ya atravesados. 
-\n 
-\n • El historial de búsqueda muestra ahora las categorías buscadas anteriormente 
-\n 
-\n • Corregido el fallo en el inicio que se producía con los mapas no latinos 
-\n 
-\n • Mejora en los problemas de velocidad de renderizado en dispositivos Android 8.0 
-\n 
-\n • Soporte para la edición de objetos poligonales (no servicios) 
-\n 
-\n • Medir distancia: Añadir el botón de «Medir distancia» a las acciones en el menú contextual 
-\n</string>
     <string name="ask_for_location_permission">Para continuar, permite a OsmAnd acceder a la ubicación.</string>
     <string name="rendering_value_black_name">Negro</string>
     <string name="more_transport_on_stop_hint">Más transporte disponible desde esta parada.</string>
@@ -2902,22 +2853,6 @@
     <string name="quick_action_show_hide_gpx_tracks_descr">Un botón que muestra u oculta las trazas elegidas en el mapa.</string>
     <string name="quick_action_gpx_tracks_hide">Ocultar trazas</string>
     <string name="quick_action_gpx_tracks_show">Mostrar trazas</string>
-    <string name="release_3_3">• Nueva pantalla «Direcciones»: Muestra los botones de destino «Casa» y «Trabajo», el atajo de la «ruta anterior», la lista de trazas, marcadores GPX activos y el historial de búsqueda.
-\n
-\n • Información adicional en «Detalles de la ruta»: Tipos de caminos, superficie, pendiente y suavidad
-\n
-\n • Soporte en la navegación de transporte público: Metro, autobús, tranvía, etc.
-\n
-\n • Nuevas acciones rápidas: «Mostrar/ocultar trazas» y «Modo diurno/nocturno»
-\n
-\n • Áreas fijas mostradas como inundadas en Alemania, Sudáfrica y Quebec
-\n
-\n • Soporte adicional para la importación de KML y KMZ
-\n
-\n • Corregidos los fallos en la apertura de algunas paradas de transporte público
-\n
-\n • Quitado el análisis de Facebook y Firebase de la versión gratuita (OsmAnd+ no lo incluye)
-\n</string>
     <string name="use_osm_live_public_transport_description">Activar el transporte público para los cambios de OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Transporte público en OsmAnd Live</string>
     <string name="transfers_size">%1$d transbordo(s)</string>
@@ -2994,14 +2929,6 @@
     <string name="routing_attr_avoid_subway_description">Evitar metros y trenes ligeros</string>
     <string name="routing_attr_avoid_ferry_name">Sin ferris o transbordadores</string>
     <string name="routing_attr_avoid_ferry_description">Evitar ferris o transbordadores</string>
-    <string name="release_3_3_7">• Mostrar el tiempo entre transbordos en transporte público 
-\n 
-\n• Interfaz de usuario corregida para «Detalles de la ruta» 
-\n 
-\n• Tema oscuro solucionado en el menú «Dirección» y «Detalles de la ruta» 
-\n 
-\n• Visualización de medida «azimut» en «Medir distancia» 
-\n</string>
     <string name="send_log">Enviar registro del problema</string>
     <string name="files_moved">Se movieron %1$d archivos (%2$s).</string>
     <string name="files_copied">Se copiaron %1$d archivos (%2$s).</string>
@@ -3026,7 +2953,6 @@
     <string name="choose_data_to_share">Elige los tipos de datos a compartir:</string>
     <string name="downloaded_maps">Mapas descargados</string>
     <string name="visited_screens">Pantallas visitadas</string>
-    <string name="colleted_data">Datos recopilados</string>
     <string name="collected_data_descr">Define qué datos quieres que OsmAnd comparta.</string>
     <string name="downloaded_maps_collect_descr">Nos ayuda a entender la popularidad de los mapas de regiones y países.</string>
     <string name="visited_screens_collect_descr">Nos ayuda a entender la popularidad de las características de OsmAnd.</string>
@@ -3082,8 +3008,6 @@
     <string name="third_party_routing_type">Navegación de terceros</string>
     <string name="application_profiles_descr">Perfiles que serán visibles en la aplicación.</string>
     <string name="application_profiles">Perfiles de la aplicación</string>
-    <string name="zoom_by_wunderlinq_descr">Cambia el zoom del mapa desplazando la rueda hacia arriba y abajo. La tecla «Escape» retrocede a la aplicación WunderLINQ.</string>
-    <string name="zoom_by_wunderlinq">Controlar con WunderLINQ</string>
     <string name="quick_action_need_to_add_item_to_list">Añadir al menos un elemento a la lista en los ajustes de «Acción rápida»</string>
     <string name="routing_attr_piste_type_downhill_name">Esquí alpino y de descenso</string>
     <string name="routing_attr_piste_type_downhill_description">Pistas de esquí alpino o de descenso y acceso a remontes mecánicos.</string>
@@ -3190,8 +3114,7 @@
     <string name="rendering_attr_showLez_name">Mostrar zonas de baja emisión</string>
     <string name="temporary_conditional_routing">Considerar limitaciones temporales</string>
     <string name="shared_string_default">Predefinido</string>
-    <string name="new_route_calculated_dist_dbg">Ruta: distancia %s, tiempo de navegación %s
-\nCálculo: %.1f seg, %d carreteras, %d teselas)</string>
+    <string name="new_route_calculated_dist_dbg">Ruta: distancia %1$s, tiempo de navegación %2$s \nCálculo: %3$.1f seg, %4$d carreteras, %5$d teselas)</string>
     <string name="lang_oc">Occitano</string>
     <string name="app_mode_wagon">Vagón</string>
     <string name="app_mode_pickup_truck">Camioneta</string>
@@ -3232,7 +3155,6 @@
     <string name="route_parameters_info">Ajustes para la navegación del perfil elegido «%1$s».</string>
     <string name="wake_time">Tiempo de espera al encender</string>
     <string name="units_and_formats">Unidades y formatos</string>
-    <string name="appearance">Aspecto</string>
     <string name="map_look_descr">Apariencia del mapa</string>
     <string name="map_look">Aspecto del mapa</string>
     <string name="list_of_installed_plugins">Complementos instalados</string>
@@ -3264,7 +3186,6 @@
     <string name="logcat_buffer">Búfer de Logcat</string>
     <string name="plugins_settings">Ajustes del complemento</string>
     <string name="shared_string_by_default">Predefinido</string>
-    <string name="download_detaile_map">Descarga el mapa detallado de «%s», para ver esta área.</string>
     <string name="download_detailed_map">Descarga el mapa detallado de «%s», para ver esta área.</string>
     <string name="change_data_storage_full_description">¿Mover los archivos de datos de OsmAnd al nuevo destino\?
 \n%1$s &gt; %2$s</string>
@@ -3598,8 +3519,6 @@
     <string name="settings_item_read_error">No se pudo leer desde «%1$s».</string>
     <string name="settings_item_write_error">No se pudo escribir en «%1$s».</string>
     <string name="settings_item_import_error">No se pudo importar desde «%1$s».</string>
-    <string name="wikipedia_poi_languages_promo">Algunos artículos de Wikipedia pueden no estar disponibles en tu idioma, elige los idiomas en los que los artículos de Wikipedia aparecerán en el mapa.
-\nPodrás cambiar entre todos los idiomas disponibles mientras lees el artículo.</string>
     <string name="wiki_menu_download_descr">Se necesitan mapas adicionales para ver los puntos de interés de Wikipedia en el mapa.</string>
     <string name="ui_customization_short_descr">Elementos del menú lateral y menú contextual</string>
     <string name="ui_customization_description">Personaliza la cantidad de elementos en el «Menú lateral», «Configuración del mapa» y «Menú contextual». 
@@ -3921,7 +3840,6 @@
     <string name="use_native_pt">Desarrollo nativo del transporte público</string>
     <string name="use_live_routing">Datos de «OsmAnd Live»</string>
     <string name="use_live_public_transport">Datos de «OsmAnd Live»</string>
-    <string name="use_complex_routing">Navegación compleja</string>
     <string name="perform_oauth_authorization_description">Ingresar con OAuth para usar las funciones de edición de OSM</string>
     <string name="perform_oauth_authorization">Ingresar a través de OAuth</string>
     <string name="osm_edit_logout_success">Sesión finalizada</string>
@@ -4030,4 +3948,31 @@
     <string name="profile_type_osmand_string">Perfil de OsmAnd</string>
     <string name="profile_by_default_description">Elige el perfil que será usado al iniciar la aplicación.</string>
     <string name="voice_prompts_timetable">Tiempo de indicaciones por voz</string>
+    <string name="select_folder">Elegir carpeta</string>
+    <string name="shared_string_folders">Carpetas</string>
+    <string name="change_folder">Cambiar carpeta</string>
+    <string name="add_online_routing_engine"></string>
+    <string name="edit_online_routing_engine"></string>
+    <string name="shared_string_subtype"></string>
+    <string name="shared_string_vehicle"></string>
+    <string name="shared_string_api_key"></string>
+    <string name="shared_string_server_url"></string>
+    <string name="shared_string_enter_param"></string>
+    <string name="keep_it_empty_if_not"></string>
+    <string name="online_routing_example_hint"></string>
+    <string name="test_route_calculation"></string>
+    <string name="routing_engine_vehicle_type_driving"></string>
+    <string name="routing_engine_vehicle_type_foot"></string>
+    <string name="routing_engine_vehicle_type_bike"></string>
+    <string name="routing_engine_vehicle_type_car"></string>
+    <string name="message_error_recheck_parameters"></string>
+    <string name="copy_address"></string>
+    <string name="online_routing_engine"></string>
+    <string name="online_routing_engines"></string>
+    <string name="select_folder_descr"></string>
+    <string name="shared_string_empty"></string>
+    <string name="analyze_by_intervals"></string>
+    <string name="upload_to_openstreetmap"></string>
+    <string name="edit_track"></string>
+    <string name="rename_track"></string>
 </resources>

OsmAnd/res/values-es/phrases.xml

@@ -214,7 +214,6 @@
     <string name="poi_sanatorium">Sanatorio</string>
     <string name="poi_healthcare_alternative">Medicina alternativa</string>
     <string name="poi_blood_bank">Banco de sangre</string>
-    <string name="poi_healthcare_centre">Centro médico</string>
     <string name="poi_company">Empresa privada</string>
     <string name="poi_estate_agent">Inmobiliaria</string>
     <string name="poi_lawyer">Abogado</string>
@@ -283,7 +282,6 @@
     <string name="poi_internet_access_wired">Conexión a Internet: cableado</string>
     <string name="poi_internet_access_public">Conexión a Internet: público</string>
     <string name="poi_monastery">Monasterio</string>
-    <string name="poi_historic_monastery">Monasterio histórico</string>
     <string name="poi_information">Información</string>
     <string name="poi_clock">Reloj</string>
     <string name="poi_travel_agent">Agente de viajes</string>
@@ -351,7 +349,6 @@
     <string name="poi_mortuary">Morgue</string>
     <string name="poi_crematorium">Crematorio</string>
     <string name="poi_bank">Banco</string>
-    <string name="poi_amenity_atm">Cajero automático</string>
     <string name="poi_accountant">Estudio contable;Contador</string>
     <string name="poi_cave_entrance">Entrada a cueva</string>
     <string name="poi_volcano">Volcán</string>
@@ -422,7 +419,6 @@
     <string name="poi_bag">Venta de bolsos</string>
     <string name="poi_bed">Muebles de dormitorio</string>
     <string name="poi_fabric">Mercería</string>
-    <string name="poi_bedding">Tienda de ropa de cama</string>
     <string name="poi_ship_chandler">Proveedor naval</string>
     <string name="poi_tableware">Tienda de vajillas</string>
     <string name="poi_window_blind">Tienda de persianas</string>
@@ -651,7 +647,6 @@
     <string name="poi_roller_skating">Patinaje sobre ruedas</string>
     <string name="poi_skiing">Esquí</string>
     <string name="poi_surfing">Surf</string>
-    <string name="poi_team_handball">Balonmano en equipo</string>
     <string name="poi_korfbal">Balonkorf</string>
     <string name="poi_boundary_stone">Mojón</string>
     <string name="poi_attraction_amusement_ride">Atracción de feria</string>
@@ -730,7 +725,6 @@
     <string name="poi_bell_tower">Campanario</string>
     <string name="poi_ski_rental">Alquiler de esquí</string>
     <string name="poi_ski_resort">Estación de esquí</string>
-    <string name="poi_general_tourist_attraction_yes">Atracción turística general</string>
     <string name="poi_cabin">Cabaña</string>
     <string name="poi_lean_to">Cobertizo</string>
     <string name="poi_picnic_table">Mesa de picnic</string>
@@ -794,7 +788,6 @@
     <string name="poi_candles">Tienda de velas</string>
     <string name="poi_fashion">Tienda de moda</string>
     <string name="poi_free_flying">Artículos de paracaidismo</string>
-    <string name="poi_furnace">Tienda de calefactores</string>
     <string name="poi_garden_furniture">Muebles de jardín</string>
     <string name="poi_leather">Marroquinería</string>
     <string name="poi_music">Tienda de música</string>
@@ -836,9 +829,7 @@
     <string name="poi_groyne">Rompeolas</string>
     <string name="poi_power_cable_distribution_cabinet">Gabinete de distribución cableada</string>
     <string name="poi_basin">Cuenca</string>
-    <string name="poi_conservation">Conservación del suelo</string>
     <string name="poi_crane">Grúa</string>
-    <string name="poi_tourism_attraction">Atracción turística</string>
     <string name="poi_cutline">Cortafuegos forestal</string>
     <string name="poi_tree">Árbol</string>
     <string name="poi_icn_ref">Nodo de red internacional de ciclismo</string>
@@ -983,7 +974,6 @@
     <string name="poi_crossing_unmarked">Desmarcado</string>
     <string name="poi_recycling_hardcore">Escombros</string>
     <string name="poi_recycling_chipboard">Cartón prensado</string>
-    <string name="poi_mill_pond">Lago de molino</string>
     <string name="twitter">Twitter</string>
     <string name="poi_skype">Skype</string>
     <string name="poi_youtube">YouTube</string>
@@ -1163,7 +1153,6 @@
     <string name="poi_generator_source_oil">Fuente de energía: petróleo</string>
     <string name="poi_generator_source_diesel">Fuente de energía: diésel</string>
     <string name="poi_trees_nectorine">Nectarina</string>
-    <string name="poi_car_wash_self_service">Auto servicio</string>
     <string name="poi_int_name">Nombre internacional</string>
     <string name="poi_nat_name">Nombre nacional</string>
     <string name="poi_reg_name">Nombre regional</string>
@@ -1189,7 +1178,6 @@
     <string name="poi_information_route_marker">Marcador de ruta</string>
     <string name="poi_information_hikingmap">Mapa de senderismo</string>
     <string name="poi_information_nature">Naturaleza</string>
-    <string name="poi_information_wildlife">Información: Vida salvaje</string>
     <string name="poi_information_history">Historia</string>
     <string name="poi_information_sign">Señal</string>
     <string name="poi_information_audioguide">Audio-guía</string>
@@ -1310,8 +1298,6 @@
     <string name="poi_stars_4s">4S (Primera Clase Superior)</string>
     <string name="poi_stars_5">5 (Lujoso)</string>
     <string name="poi_stars_5s">5S (Lujoso Superior)</string>
-    <string name="poi_stars_6">Estrellas: 6</string>
-    <string name="poi_stars_7">Estrellas: 7</string>
     <string name="poi_rooms">Habitaciones</string>
     <string name="poi_garden_style_rosarium">Estilo de jardín: rosaleda</string>
     <string name="poi_love_hotel">Albergue transitorio</string>
@@ -1339,7 +1325,6 @@
     <string name="poi_payment_visa_no">No acepta Visa</string>
     <string name="poi_payment_mastercard_yes">MasterCard</string>
     <string name="poi_payment_mastercard_no">No acepta MasterCard</string>
-    <string name="poi_payment_none">Gratis</string>
     <string name="poi_payment_account_cards_yes">Tarjetas de cuenta</string>
     <string name="poi_payment_account_cards_no">No acepta tarjetas de cuenta</string>
     <string name="poi_payment_maestro_yes">Maestro</string>
@@ -1971,7 +1956,6 @@
     <string name="poi_impromptu_no">Improvisado: no</string>
     <string name="poi_sanitary_dump_station_yes">Estación de descarga sanitaria: sí</string>
     <string name="poi_sanitary_dump_station_no">Estación de descarga sanitaria: no</string>
-    <string name="poi_sanitary_dump_station_customers">Estación de descarga sanitaria sólo para clientes</string>
     <string name="poi_power_supply_yes">Sí</string>
     <string name="poi_power_supply_no">Fuente de alimentación: no</string>
     <string name="poi_power_supply_cee_17_blue">Fuente de alimentación (enchufe): CEE 17 azul</string>
@@ -2381,7 +2365,6 @@
     <string name="poi_inscription_ne">Inscripción: NE</string>
     <string name="poi_construction_yes">En construcción</string>
     <string name="poi_atm_no">Cajero automático: no</string>
-    <string name="poi_additional_atm_yes">Cajero automático: sí</string>
     <string name="poi_fair_trade_yes">Comercio justo: sí</string>
     <string name="poi_fair_trade_no">Comercio justo: no</string>
     <string name="poi_fair_trade_only">Sólo productos de comercio justo</string>
@@ -2470,7 +2453,6 @@
     <string name="poi_sanitary_dump_station">Estación de descarga sanitaria</string>
     <string name="poi_medical_system_western_yes">Occidental</string>
     <string name="poi_medical_system_chinese_yes">Chino tradicional</string>
-    <string name="poi_medical_system_unknown_yes">Sistema médico: desconocido</string>
     <string name="poi_medical_system_ayurveeda_yes">Ayurveda</string>
     <string name="poi_medical_system_kampo_yes">Kampo</string>
     <string name="poi_medical_system_mongolian_yes">Mongol tradicional</string>
@@ -2547,7 +2529,6 @@
     <string name="poi_counselling_type_marriage_yes">Asesoría (matrimonio): sí</string>
     <string name="poi_counselling_type_marriage_no">Asesoría (matrimonio): no</string>
     <string name="poi_counselling_type_nutrition_yes">Asesoría (nutrición): sí</string>
-    <string name="poi_counselling_type_nutrition_no">Asesoría (nutrición): no</string>
     <string name="poi_counselling_type_rehabilitation_yes">Asesoría (rehabilitación): sí</string>
     <string name="poi_counselling_type_rehabilitation_no">Asesoría (rehabilitación): no</string>
     <string name="poi_counselling_type_sexual_yes">Asesoría (sexual): sí</string>
@@ -2616,7 +2597,6 @@
     <string name="poi_water_source_main">Principal</string>
     <string name="poi_water_source_pond">Estanque</string>
     <string name="poi_water_source_stream">Arroyo</string>
-    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
     <string name="poi_in_service_yes">En servicio: sí</string>
     <string name="poi_forestry_compartment">Señal: compartimento forestal</string>
     <string name="poi_firepit">Lugar para fogata</string>
@@ -3558,8 +3538,6 @@
     <string name="poi_park_ride_hov">Vehículos de gran capacidad</string>
     <string name="poi_park_ride_tram">Tranvía</string>
     <string name="poi_park_ride_ferry">Transbordador</string>
-    <string name="poi_generator_source_biomass">Fuente de energía: biomasa</string>
-    <string name="poi_health_specialty_radiotheraphy_yes">Radioterapia</string>
     <string name="poi_hazard">Advertencia de peligro</string>
     <string name="poi_rtsa_scale_filter">Categoría de dificultad</string>
     <string name="poi_rtsa_scale_nc">s/c (sin categoría)</string>

OsmAnd/res/values-es/strings.xml

@@ -475,7 +475,6 @@
     <string name="error_calculating_route">No se pudo calcular la ruta.</string>
     <string name="error_calculating_route_occured">No se pudo calcular la ruta.</string>
     <string name="empty_route_calculated">La ruta calculada está vacía.</string>
-    <string name="new_route_calculated_dist">Nueva ruta calculada, distancia</string>
     <string name="arrived_at_destination">Has llegado.</string>
     <string name="invalid_locations">Coordenadas inválidas</string>
     <string name="go_back_to_osmand">Volver al mapa</string>
@@ -576,7 +575,6 @@
     <string name="osb_comment_dialog_error">No se pudo añadir el comentario.</string>
     <string name="poi_edit_title">Editar PDI</string>
     <string name="poi_create_title">Crear PDI</string>
-    <string name="poi_error_poi_not_found">No se encontró el nodo, o el PDI se compone de varios nodos, lo cuál todavía no está soportado.</string>
     <string name="poi_remove_confirm_template">¿Borrar {0} (comentario)?</string>
     <string name="poi_remove_title">Borrar PDI</string>
     <string name="shared_string_delete">Borrar</string>
@@ -1797,7 +1795,6 @@
     <string name="no_address_found">Dirección indeterminada</string>
     <string name="looking_up_address">Buscando dirección</string>
     <string name="rendering_attr_horseRoutes_name">Rutas a caballo</string>
-    <string name="update">Actualizar</string>
     <string name="only_download_over_wifi">Descargar sólo con Wi-Fi</string>
     <string name="live_update">Actualización en vivo</string>
     <string name="update_now">Actualizar</string>
@@ -2011,8 +2008,6 @@
     <string name="allow_access_location">Permitir el acceso a la ubicación</string>
     <string name="first_usage_greeting">Obtenga direcciones y descubra lugares nuevos, sin una conexión a Internet</string>
     <string name="search_my_location">Encontrar mi ubicación</string>
-    <string name="no_update_info_desc">Omite la búsqueda de nuevas versiones o descuentos relacionados con OsmAnd.</string>
-    <string name="no_update_info">Ocultar nuevas versiones</string>
     <string name="osm_live_payment_desc">Suscripción mensual. Puedes cancelarla en cualquier momento en Google Play.</string>
     <string name="donation_to_osm">Donación a la comunidad de OSM</string>
     <string name="donation_to_osm_desc">Parte de tu donación se envía a los contribuidores a OSM. El coste de la suscripción sigue siendo el mismo.</string>
@@ -2038,9 +2033,6 @@
     <string name="shared_string_continue">Continuar</string>
     <string name="shared_string_pause">Pausar</string>
     <string name="gpx_logging_no_data">Sin datos</string>
-    <string name="legacy_search">Búsqueda clásica</string>
-    <string name="show_legacy_search">Mostrar la búsqueda clásica</string>
-    <string name="show_legacy_search_desc">Añade el modo de búsqueda clásica a la lista del panel lateral.</string>
     <string name="routing_attr_allow_motorway_name">Usar autopistas</string>
     <string name="routing_attr_allow_motorway_description">Permite usar autopistas.</string>
     <string name="trip_rec_notification_settings">Activar la grabación rápida</string>
@@ -2581,16 +2573,6 @@
     <string name="active_markers_descr">Define el número de indicadores de dirección.</string>
     <string name="shared_string_more_without_dots">Más</string>
     <string name="looking_for_tracks_with_waypoints">Buscando trazas con puntos de referencia</string>
-    <string name="release_3_0">• Nuevo: Soporte para guías turísticas globales sin conexión a Internet. Las ubicaciones de referencia, están vinculadas al mapa. Datos iniciales de Wikiviajes 
-\n 
-\n • Wikipedia: Nuevo aspecto, enlaces activos, ahora con soporte de imágenes 
-\n 
-\n • Interfaz de usuario de Open Tracks: Soporte para grupos de puntos de ruta 
-\n 
-\n • Marcadores del mapa: Importación de grupos elegidos desde archivos GPX, ingreso de coordenadas, nuevo aspecto 
-\n 
-\n • La suscripción de OsmAnd Live, soporta ahora todas las características de OsmAnd 
-\n</string>
     <string name="modify_the_search_query">Cambiar la búsqueda.</string>
     <string name="empty_state_osm_edits">Crear o modificar objetos OSM</string>
     <string name="empty_state_osm_edits_descr">Crea o modifica puntos de interés, abre o comenta notas de OSM y contribuye con grabaciones GPX.</string>
@@ -2727,7 +2709,7 @@
     <string name="update_is_available">Actualización disponible</string>
     <string name="download_file">Descargar archivo</string>
     <string name="start_editing_card_image_text">La guía turística libre global que cualquiera puede editar.</string>
-    <string name="welcome_to_open_beta_description">Las guías turísticas, se basan actualmente en Wikiviajes. Prueba todas las características durante las pruebas beta abiertas, de forma gratuita. Posteriormente, las guías turísticas estarán disponible para los suscriptores de «OsmAnd ilimitado» y los propietarios de «OsmAnd+».</string>
+    <string name="welcome_to_open_beta_description">Las guías turísticas, se basan actualmente en Wikiviajes. Prueba todas las características durante las pruebas beta abiertas, de forma gratuita.</string>
     <string name="start_editing_card_description">Puedes y debes editar cualquier artículo en Wikiviajes. Comparte tu conocimiento, experiencia, talento y atención.</string>
     <string name="start_editing">Comenzar edición</string>
     <string name="get_unlimited_access">Obtener acceso ilimitado</string>
@@ -2780,44 +2762,13 @@
     <string name="send_search_query_description">Enviaremos la consulta de búsqueda: «%1$s», así como la ubicación. 
 \n
 \nNo se recopilan datos personales, los datos de búsqueda sólo se utilizan para mejorar el algoritmo de búsqueda.</string>
-    <string name="search_no_results_description">¿Sin resultados?
-\nCuéntanos sobre esto.</string>
     <string name="send_search_query">¿Enviar consulta de búsqueda?</string>
-    <string name="release_3_1">• Navegación: Corrección en la barra de progreso, intercambio rápido del punto inicial y final de la ruta 
-\n 
-\n • Marcadores del mapa: Corregido el des/activar grupos, capacidad para ocultar marcadores del mapa 
-\n 
-\n • Edición de OSM: Capacidad de edición de etiquetas para objetos que no sean puntos y de vías, corrección de los comentarios vacíos en las notas, copia de seguridad de ediciones 
-\n 
-\n • Mejor análisis de Wikipedia y Wikiviajes, los archivos actualizados ya están disponibles 
-\n 
-\n • Menú contextual: Corregido el color de los escudos de transporte en el modo nocturno y los tamaños de menú adicionales 
-\n 
-\n • Navegación fluvial: Soporte a la navegación fluvial 
-\n 
-\n • Otras correcciones de errores 
-\n</string>
     <string name="increase_search_radius_to">Ampliar el radio de búsqueda a %1$s</string>
     <string name="thank_you_for_feedback">Gracias por sus comentarios</string>
     <string name="poi_cannot_be_found">No se pudo encontrar el nodo o la vía.</string>
     <string name="search_no_results_feedback">¿Sin resultados de búsqueda?
 \nDenos su opinión</string>
-    <string name="commiting_way">Enviando vía…</string>
     <string name="test_voice_desrc">Pulsa un botón y escucha su correspondiente aviso por voz para saber si falta o está defectuoso</string>
-    <string name="release_3_2_pre">• Corregido el fallo en el inicio que se producía en algunos dispositivos 
-\n 
-\n • Nueva función de marcadores: Mostrar los marcadores ya atravesados. 
-\n 
-\n • El historial de búsqueda muestra ahora las categorías buscadas anteriormente 
-\n 
-\n • Corregido el fallo en el inicio que se producía con los mapas no latinos 
-\n 
-\n • Mejora en los problemas de velocidad de renderizado en dispositivos Android 8.0 
-\n 
-\n • Soporte para la edición de objetos poligonales (no servicios) 
-\n 
-\n • Medir distancia: Añadir el botón de «Medir distancia» a las acciones en el menú contextual 
-\n</string>
     <string name="ask_for_location_permission">Para continuar, permite a OsmAnd acceder a la ubicación.</string>
     <string name="rendering_value_black_name">Negro</string>
     <string name="search_street">Buscar la calle</string>
@@ -2898,22 +2849,6 @@
     <string name="quick_action_show_hide_gpx_tracks_descr">Un botón que muestra u oculta las trazas elegidas en el mapa.</string>
     <string name="quick_action_gpx_tracks_hide">Ocultar trazas</string>
     <string name="quick_action_gpx_tracks_show">Mostrar trazas</string>
-    <string name="release_3_3">• Nueva pantalla «Direcciones»: Muestra los botones de destino «Casa» y «Trabajo», el atajo de la «ruta anterior», la lista de trazas, marcadores GPX activos y el historial de búsqueda.
-\n
-\n • Información adicional en «Detalles de la ruta»: Tipos de caminos, superficie, pendiente y suavidad
-\n
-\n • Soporte en la navegación de transporte público: Metro, autobús, tranvía, etc.
-\n
-\n • Nuevas acciones rápidas: «Mostrar/ocultar trazas» y «Modo diurno/nocturno»
-\n
-\n • Áreas fijas mostradas como inundadas en Alemania, Sudáfrica y Quebec
-\n
-\n • Soporte adicional para la importación de KML y KMZ
-\n
-\n • Corregidos los fallos en la apertura de algunas paradas de transporte público
-\n
-\n • Quitado el análisis de Facebook y Firebase de la versión gratuita (OsmAnd+ no lo incluye)
-\n</string>
     <string name="use_osm_live_public_transport_description">Activar el transporte público para los cambios de OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Transporte público en OsmAnd Live</string>
     <string name="transfers_size">%1$d transbordo(s)</string>
@@ -2990,14 +2925,6 @@
     <string name="routing_attr_avoid_subway_description">Evitar metros y trenes ligeros</string>
     <string name="routing_attr_avoid_ferry_name">Sin ferris/transbordadores</string>
     <string name="routing_attr_avoid_ferry_description">Evitar ferris o transbordadores</string>
-    <string name="release_3_3_7">• Mostrar el tiempo entre transbordos en transporte público
-\n
-\n • Interfaz de usuario corregida para «Detalles de la ruta»
-\n
-\n • Tema oscuro solucionado en el menú «Dirección» y «Detalles de la ruta»
-\n
-\n • Visualización de medida «azimut» en «Medir distancia»
-\n</string>
     <string name="send_log">Enviar registro del problema</string>
     <string name="files_moved">Se movieron %1$d archivos (%2$s).</string>
     <string name="files_copied">Se copiaron %1$d archivos (%2$s).</string>
@@ -3115,8 +3042,6 @@
     <string name="third_party_routing_type">Enrutamiento de terceros</string>
     <string name="application_profiles_descr">Perfiles que serán visibles en la aplicación.</string>
     <string name="application_profiles">Perfiles de la aplicación</string>
-    <string name="zoom_by_wunderlinq_descr">Cambia el zoom del mapa desplazando la rueda hacia arriba y hacia abajo. Salir te devuelve a la aplicación WunderLINQ.</string>
-    <string name="zoom_by_wunderlinq">Usa WunderLINQ para controlar</string>
     <string name="quick_action_need_to_add_item_to_list">Añadir al menos un elemento a la lista en los ajustes de «Acción rápida»</string>
     <string name="routing_attr_piste_type_downhill_name">Esquí alpino y de descenso</string>
     <string name="routing_attr_piste_type_downhill_description">Pistas de esquí alpino o de descenso y acceso a remontes mecánicos.</string>
@@ -3185,8 +3110,8 @@
     <string name="gpx_join_gaps">Unir espacios</string>
     <string name="shared_string_default">Predefinido</string>
     <string name="app_mode_camper">Campista</string>
-    <string name="new_route_calculated_dist_dbg">Ruta: distancia %s, tiempo de navegación %s 
-\nCálculo: %.1f seg, %d carreteras, %d teselas)</string>
+    <string name="new_route_calculated_dist_dbg">Ruta: distancia %1$s, tiempo de navegación %2$s
+\nCálculo: %3$.1f seg, %4$d carreteras, %5$d teselas)</string>
     <string name="lang_oc">Occitano</string>
     <string name="app_mode_wagon">Vagón</string>
     <string name="app_mode_pickup_truck">Camioneta</string>
@@ -3227,7 +3152,6 @@
     <string name="route_parameters_info">Ajustes para la navegación del perfil elegido «%1$s».</string>
     <string name="wake_time">Tiempo de espera después de despertar</string>
     <string name="units_and_formats">Unidades y formatos</string>
-    <string name="appearance">Aspecto</string>
     <string name="map_look_descr">Apariencia del mapa</string>
     <string name="map_look">Aspecto del mapa</string>
     <string name="list_of_installed_plugins">Complementos instalados</string>

OsmAnd/res/values-et/phrases.xml

@@ -93,7 +93,6 @@
     <string name="poi_florist">Lillepood</string>
     <string name="poi_frame">Pildiraamid</string>
     <string name="poi_free_flying">Vabalangemistarvete pood</string>
-    <string name="poi_furnace">Küttekehade pood</string>
     <string name="poi_furniture">Mööblipood</string>
     <string name="poi_garden_centre">Aianduskeskus</string>
     <string name="poi_garden_furniture">Aiamööbli pood</string>
@@ -456,7 +455,6 @@
     <string name="poi_healthcare_alternative">Alternatiivmeditsiin</string>
     <string name="poi_audiologist">Audioloog</string>
     <string name="poi_blood_bank">Verepank</string>
-    <string name="poi_healthcare_centre">Meditsiinikeskus</string>
     <string name="poi_midwife">Ämmaemand</string>
     <string name="poi_occupational_therapist">Tööterapeut</string>
     <string name="poi_optometrist">Optometrist</string>
@@ -645,7 +643,7 @@
     <string name="poi_fuel_jeta1">Jet A-1 kütus</string>
     <string name="poi_mountain_pass">Mäekuru</string>
     <string name="poi_waterway_fuel">Paatide bensiinijaam</string>
-    <string name="poi_electricity_combined_charging">Laadimisjaam</string>
+    <string name="poi_electricity_combined_charging">Laadimisjaam;Elektriautode laadimisjaam;Elektriauto laadimine;Laadimispunkt;Elektriautode laadimispunkt</string>
     <string name="poi_park_ride_ferry">Parvlaev</string>
     <string name="poi_9pin">Üheksa kurikaga keegel</string>
     <string name="poi_10pin">Kümne kurikaga keegel</string>
@@ -2728,7 +2726,6 @@
     <string name="poi_water_source_main">Veetrassil</string>
     <string name="poi_water_source_pond">Tiik</string>
     <string name="poi_water_source_stream">Oja</string>
-    <string name="poi_fire_hydrant_style_water_source_cistern">Veemahuti</string>
     <string name="poi_in_service_yes">Kasutuses: jah</string>
     <string name="poi_street_cabinet_power">Kapi liik: toide</string>
     <string name="poi_street_cabinet_telecom">Kapi liik: telekommunikatsioon</string>
@@ -3880,4 +3877,8 @@
     <string name="poi_diplomatic_services_non_immigrant_visas_no">Ei</string>
     <string name="poi_waste_transfer_station">Jäätmejaam</string>
     <string name="poi_lavoir">Avalik pesumaja</string>
+    <string name="poi_swimming_area">Ujumiskoht</string>
+    <string name="poi_wildlife_crossing_bat_tunnel">Tunnel nahkhiirtele</string>
+    <string name="poi_wildlife_crossing_bat_bridge">Sild nahkhiirtele</string>
+    <string name="poi_wildlife_crossing">Metsloomade teeületuskoht</string>
 </resources>

OsmAnd/res/values-et/strings.xml

@@ -881,7 +881,6 @@
     <string name="route_parameters_info">Marsruutimise seaded valitud profiilis \"%1$s\".</string>
     <string name="wake_time">Aegumine peale ärkamist</string>
     <string name="units_and_formats">Ühikud ja formaadid</string>
-    <string name="appearance">Välimus</string>
     <string name="map_look_descr">Kaardi välimus</string>
     <string name="map_look">Kaardi välimus</string>
     <string name="list_of_installed_plugins">Paigaldatud laiendused</string>
@@ -2301,7 +2300,6 @@
     <string name="rec_split_storage_size">Salvestusruumi suurus</string>
     <string name="rec_split_storage_size_desc">Kõikide klippide poolt hõlmata lubatav andmemaht.</string>
     <string name="shared_string_not_selected">Valimata</string>
-    <string name="update">Uuenda</string>
     <string name="updates_size">Uuenduse maht</string>
     <string name="shared_string_type">Liik</string>
     <string name="starting_point">Lähtekoht</string>
@@ -2623,7 +2621,7 @@
     <string name="gpx_file_desc">GPX - sobib ekspordiks JOSM või teistesse OSM redaktoritesse.</string>
     <string name="osm_edits_export_desc">Ekspordi kas OSM märkmetena, huvipunktidena või mõlemana.</string>
     <string name="purchase_dialog_travel_description">Võrguühenduseta reisijuhi funktsioonide saamiseks osta üks järgmistest:</string>
-    <string name="welcome_to_open_beta_description">Reisijuhid põhinevad praegu Wikivoyage\'il. Testige beetaversiooni ajal kõiki funktsioone tasuta. Pärast seda on reisijuhid kättesaadavad piiranguteta OsmAnd tellijatele ja OsmAnd+ omanikele.</string>
+    <string name="welcome_to_open_beta_description">Reisijuhid põhinevad praegu Wikivoyage\'il. Testige beetaversiooni ajal kõiki funktsioone tasuta.</string>
     <string name="start_editing_card_description">Saate ja peaksite redigeerima kõiki artikleid Wikivoyage\'is. Jagage teadmisi, kogemusi, annet ja oma tähelepanu.</string>
     <string name="open_in_browser_wiki">Ava artikkel veebis</string>
     <string name="nautical_render_descr">Merel navigeerimiseks. Sisaldab poisid, tuletorne, jõeteid, mereteid ja tähiseid, sadamaid, meremärkide teenuseid ja sügavuskontuure.</string>
@@ -3331,8 +3329,7 @@
     <string name="routing_attr_allow_classic_only_description">Klassikalises stiilis hooldatud marsruudid ainult ilma uisuradadeta. See hõlmab väiksema mootorsaaniga hooldatud marsruute ja suusatajate käsitsi tehtud radu.</string>
     <string name="routing_attr_difficulty_preference_name">Eelistatud raskusaste</string>
     <string name="routing_attr_difficulty_preference_description">Eelista selle raskusastmega marsruute, ehkki lühema marsruudi korral võib siiski esineda nii raskemaid kui lihtsamaid lõike.</string>
-    <string name="new_route_calculated_dist_dbg">Teekond: vahemaa %s, marsruuteri aeg %s 
-\nArvutamine: %.1f sek, %d teed, %d paani)</string>
+    <string name="new_route_calculated_dist_dbg">Teekond: vahemaa %1$s, marsruuteri aeg %2$s \nArvutamine: %3$.1f sek, %4$d teed, %5$d paani)</string>
     <string name="reset_confirmation_descr">Vajutades nupul %1$s kaovad kõik muudatused.</string>
     <string name="reset_all_profile_settings_descr">Lähtesta kõik profiiliseaded paigaldusjärgsesse olekusse.</string>
     <string name="reset_all_profile_settings">Kas asendame kõik profiiliseaded vaikeväärtustega\?</string>
@@ -3773,7 +3770,6 @@
 \n
 \nTellimusi saate hallata ja tühistada oma AppGallery seadetes.</string>
     <string name="osm_live_payment_desc_hw">Tellimuse eest võetakse tasu valitud perioodi kohta. Tühistage see igal ajal oma AppGallery\'s.</string>
-    <string name="use_complex_routing">Keeruka teekonna koostamine</string>
     <string name="osm_edit_logout_success">Väljalogitud</string>
     <string name="development">Arendus</string>
     <string name="clear_osm_token">Kustuta OpenStreetMap\'i OAuth\'i pääsuluba</string>
@@ -3950,4 +3946,6 @@
     <string name="reverse_all_points">Pööra kõik punktid ümber</string>
     <string name="profile_by_default_description">Vali rakenduse käivitamisel kasutatav profiil.</string>
     <string name="shared_string_last_used">Viimati kasutatud</string>
+    <string name="message_server_error">Serveri viga: %1$s</string>
+    <string name="message_name_is_already_exists">Selline nimi on juba olemas</string>
 </resources>

OsmAnd/res/values-eu/phrases.xml

@@ -81,7 +81,6 @@
     <string name="poi_erotic">Denda erotikoa</string>
     <string name="poi_fashion">Moda denda</string>
     <string name="poi_florist">Loradenda</string>
-    <string name="poi_furnace">Berogailu denda</string>
     <string name="poi_furniture">Altzari denda</string>
     <string name="poi_gift">Opari denda</string>
     <string name="poi_jewelry">Bitxi-denda</string>
@@ -289,7 +288,6 @@
     <string name="poi_water_source_main">Nagusia</string>
     <string name="poi_water_source_pond">Urmaela</string>
     <string name="poi_water_source_stream">Erreka</string>
-    <string name="poi_fire_hydrant_style_water_source_cistern">Zisterna</string>
     <string name="poi_fire_extinguisher">Su-itzalgailua</string>
     <string name="poi_ambulance_station">Anbulantzia geltokia</string>
     <string name="poi_ford">Ibia</string>
@@ -514,7 +512,6 @@
     <string name="poi_dentist">Dentista</string>
     <string name="poi_sanatorium">Erietxea</string>
     <string name="poi_audiologist">Audiologia</string>
-    <string name="poi_healthcare_centre">Medikuntza zentroa</string>
     <string name="poi_midwife">Emagina</string>
     <string name="poi_occupational_therapist">Okupazio-terapeuta</string>
     <string name="poi_optometrist">Optometrista</string>
@@ -634,8 +631,6 @@
     <string name="poi_stars_4s">4S (Lehen klase gorena)</string>
     <string name="poi_stars_5">5 (Luxuzkoa)</string>
     <string name="poi_stars_5s">5S (Luxuzkoa gorena)</string>
-    <string name="poi_stars_6">Izarrak: 6</string>
-    <string name="poi_stars_7">Izarrak: 7</string>
     <string name="poi_vending_milk">Esnea</string>
     <string name="poi_vending_bread">Ogia</string>
     <string name="poi_vending_chewing_gums">Txikleak</string>
@@ -772,7 +767,6 @@
     <string name="poi_payment_visa_no">Ez dira Visa txartelak onartzen</string>
     <string name="poi_payment_mastercard_yes">MasterCard</string>
     <string name="poi_payment_mastercard_no">Ez da MasterCard onartzen</string>
-    <string name="poi_payment_none">Doakoa</string>
     <string name="poi_payment_account_cards_yes">Kontu txartelak</string>
     <string name="poi_payment_account_cards_no">Ez dira kontu txartelak onartzen</string>
     <string name="poi_payment_maestro_yes">Maestro txartelak</string>
@@ -1327,7 +1321,6 @@
     <string name="poi_impromptu_no">Bat-batekoa: ez</string>
     <string name="poi_sanitary_dump_station_yes">Komuneko hondakinen estazioa: bai</string>
     <string name="poi_sanitary_dump_station_no">Komuneko hondakinen estazioa: ez</string>
-    <string name="poi_sanitary_dump_station_customers">Komuneko hondakinen estazioa: bezeroak besterik ez</string>
     <string name="poi_power_supply_yes">Bai</string>
     <string name="poi_power_supply_no">Elektrizitate iturria: ez</string>
     <string name="poi_power_supply_cee_17_blue">Elektrizitate iturria (entxufea): CEE 17 urdina</string>
@@ -1370,7 +1363,6 @@
     <string name="poi_social_facility_for_unemployed">Langabeak</string>
     <string name="poi_social_facility_for_diseased">Gaixoak</string>
     <string name="poi_social_facility_for_child_juvenile">Haurrak, gazteak</string>
-    <string name="poi_additional_atm_yes">Kutxazain automatikoa: bai</string>
     <string name="poi_atm_no">Kutxazain automatikoa: ez</string>
     <string name="poi_construction_yes">Eraikuntzan</string>
     <string name="poi_protected_area">Babestutako area</string>
@@ -1505,7 +1497,6 @@
     <string name="poi_mortuary">Beilatokia</string>
     <string name="poi_internet_cafe">Ziberkafea</string>
     <string name="poi_bank">Bankua</string>
-    <string name="poi_amenity_atm">Kutxazain automatikoa</string>
     <string name="poi_bureau_de_change">Moneta aldaketa</string>
     <string name="poi_accountant">Kontularia</string>
     <string name="poi_saddle">Zela</string>
@@ -1740,7 +1731,6 @@
     <string name="poi_waterway_turning_point">Ubidearen biraketa puntua</string>
     <string name="poi_groyne">Olatu horma</string>
     <string name="poi_power_cable_distribution_cabinet">Kableen banatze armairua</string>
-    <string name="poi_conservation">Kontserbazio landa</string>
     <string name="poi_brownfield">Kutsaturiko orubea</string>
     <string name="poi_greenfield">Orubea</string>
     <string name="poi_mineshaft">Meazulo</string>

OsmAnd/res/values-eu/strings.xml

@@ -927,7 +927,6 @@
     <string name="error_calculating_route">Ezin izan da ibilbidea kalkulatu.</string>
     <string name="error_calculating_route_occured">Ezin izan da ibilbidea kalkulatu.</string>
     <string name="empty_route_calculated">Kalkulatutako ibilbidea hutsik dago.</string>
-    <string name="new_route_calculated_dist">Ibilbide berria kalkulatua, distantzia</string>
     <string name="arrived_at_destination">Iritsi zara.</string>
     <string name="invalid_locations">Baliogabeko koordenatuak</string>
     <string name="go_back_to_osmand">Itzuli mapara</string>
@@ -1025,7 +1024,6 @@
     <string name="osb_comment_dialog_error">Ezin izan da iruzkina gehitu.</string>
     <string name="poi_edit_title">Editatu POI-a</string>
     <string name="poi_create_title">Sortu interesgune bat</string>
-    <string name="poi_error_poi_not_found">Ezin da nodoa aurkitu, edo zerbitzua hainbat nodoz osatuta dago, eta ez dago horretarako euskarririk oraindik.</string>
     <string name="poi_remove_confirm_template">{0} ezabatu (iruzkina)?</string>
     <string name="poi_remove_title">Ezabatu POI-a</string>
     <string name="shared_string_delete">Ezabatu</string>
@@ -1864,7 +1862,6 @@
     <string name="dashboard_or_drawer_description">Aplikazioa kontrol panel aldakor batetik ala finkatutako menu estatiko batetik kudeatzeko aukera dago. Erabakia aldatzeko aukera duzu kontrol panelaren ezarpenetan.</string>
     <string name="speak_poi">Inguruko POI</string>
     <string name="show_zoom_buttons_navigation_descr">Erakutsi zoom botoiak nabigazioan.</string>
-    <string name="update">Eguneratu</string>
     <string name="use_drawer_btn">Erabili menua</string>
     <string name="map_legend">Maparen legenda</string>
     <string name="save_poi_without_poi_type_message">Ziur interesgunea mota gabe gorde nahi duzula\?</string>
@@ -1996,8 +1993,6 @@ mapak eta nabigazioa</string>
 \n
 \nHau aktibatzean ikuspegia \'Negua eta eskia\' estilora aldatzen da, paisaia neguko egoeran bistaratuz. Hau atzera aldatu daiteke gehigarri hau desgaituz eta \'Konfiguratu mapa\' menuko \'Mapa estiloa\' aldatuz.</string>
     <string name="rendering_attr_hideOverground_name">Lur gaineko objektuak</string>
-    <string name="no_update_info_desc">Ez egiaztatu bertsio berriak edo OsmAnd-ekin erlazioa duten deskontuak.</string>
-    <string name="no_update_info">Ez erakutsi bertsio berriak</string>
     <string name="update_all_maps_now">Eguneratu mapa guztiak orain?</string>
     <string name="clear_tile_data">Garbitu tesela guztiak</string>
     <string name="routing_attr_short_way_name">Bide erregai-efizientea</string>
@@ -2078,9 +2073,6 @@ mapak eta nabigazioa</string>
     <string name="rendering_value_fine_name">Ongi</string>
     <string name="search_map_hint">Hiria edo eskualdea</string>
     <string name="wiki_around">Inguruko Wikipediako artikuluak</string>
-    <string name="legacy_search">Bilaketa zaharra</string>
-    <string name="show_legacy_search">Erakutsi bilaketa zaharra</string>
-    <string name="show_legacy_search_desc">Gehitu bilaketa zaharra tiraderako zerrendan.</string>
     <string name="routing_attr_allow_motorway_name">Erabili autobideak</string>
     <string name="routing_attr_allow_motorway_description">Erabili autobideak.</string>
     <string name="lang_sr_latn">Serbiera (latinoa)</string>
@@ -2730,7 +2722,7 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="maps_you_need">Behar dituzun mapak</string>
     <string name="travel_card_download_descr">Deskargatu Wikivoyage bidai gidak munduko tokien inguruko artikuluak ikusteko Internetera konexioa ez duzunean ere.</string>
     <string name="start_editing_card_image_text">Edonork idatzi dezakeen mundu osoko doako gida.</string>
-    <string name="welcome_to_open_beta_description">Bidai-gidak Wikivoyage-n oinarrituta daude. Probatu doan ezaugarri guztiak besta probatze garai irekian. Gero, Bidaia-gidak OsmAnd Unlimited harpidedunentzat eta OsmAnd+ erosleentzat egongo da eskuragarri.</string>
+    <string name="welcome_to_open_beta_description">Bidai-gidak Wikivoyage-n oinarrituta daude. Probatu doan ezaugarri guztiak besta probatze garai irekian.</string>
     <string name="start_editing_card_description">Wikivoyage-ko edozein artikulu aldatu dezakezu. Partekatu ezagutza, esperientzia, talentua eta zure atentzioa.</string>
     <string name="welcome_to_open_beta">Ongi etorri beta irekira</string>
     <string name="contour_lines_hillshade_maps">Sestra-kurbak eta erliebe-itzalak</string>
@@ -2760,17 +2752,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="mapnik_render_descr">\'Mapnik\' estilo lehenetsi zaharra. \'Mapnik\' estiloaren antzeko koloreak.</string>
     <string name="touring_view_render_descr">Errepiderako kontraste eta xehetasun handiko estiloa. Lehenetsitako estiloaren konfigurazio aukera guztiak ditu eta ahal beste xehetasun erakusten ditu, bereziki errepideak, bideak eta bestelako garraio-bideak. Bide moten arteko bereizketa bisual argia. Egunez, gauez zein naturan erabiltzeko egokia.</string>
     <string name="default_render_descr">Erabilera orokorrerako estiloa. Biztanle askoko hirietan garbia. sestra-kurbak, ibilbideak, zoladuraren kalitatea, sarbide-mugak, bideak SAC eskalaren arabera marrazten dira, ur kiroletarako elementuak.</string>
-    <string name="release_3_0">• Berria: Lineaz kanpoko bidi gida globalentzako euskarria. Aipatutako kokalekuak mapan estekatzen dira. Hasierako datuak Wikivoyage-tik.
-\n
-\n • Wikipedia: Itxura berria, esteka aktiboak, irudiak onartzen dira
-\n
-\n • Open Track UI: Bide-puntu taldeentzako euskarria
-\n
-\n • Mapa-markatzaileak: Inportatu hautatutako taldeak GPX fitxategietatik, korrdenatuen sarrera, itxura berria
-\n
-\n • OsmAnd Live harpidetzak orain OsmAnd ezaugarri guztiak onartzen ditu
-\n
-\n</string>
     <string name="access_intermediate_arrival_time">Tarteko iritsiera ordua</string>
     <string name="map_widget_intermediate_time">Tarteko denbora</string>
     <string name="quick_action_edit_actions">Editatu ekintzak</string>
@@ -2785,44 +2766,12 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="send_search_query_description">Zure bilaketa eta kokapena \"%1$s\" zerbitzarira bidaliko da. 
 \n 
 \nEz da informazio pertsonala biltzen, bilaketen datuak algoritmoa hobetzeko biltzen ditugu.</string>
-    <string name="search_no_results_description">Emaitzarik ez?
-\nEman iezaguzu horren berri.</string>
     <string name="send_search_query">Bilaketa-kontsulta bidali?</string>
     <string name="thank_you_for_feedback">Eskerrik asko zure iruzkinagatik</string>
     <string name="poi_cannot_be_found">Ezin izan da nodoa edo bidea aurkitu.</string>
     <string name="search_no_results_feedback">Bilaketaren emaitzarik ez?
 \nEgin iruzkin bat</string>
-    <string name="release_3_1">• Nabigazioa: Konpondu aurreratze barra, aldatu azkar ibilbide baten hasiera eta amaiera puntuen artean
-\n
-\n • Mapa-markatzaileak: konpondu piztu/itzali taldeak, markatzaileak mapatik ezkutatzeko aukera
-\n
-\n • OSM Edizioa: Puntuak ez diren objektuen eta bideen etiketak aldatzeko aukera, konpondu oharretan falta diren iruzkinak, edizioen babes-kopia
-\n
-\n • Hobetu Wikipedia eta Wikivoyage azterketa, eguneratutako fitxategiak eskuragarri daude
-\n
-\n • Testuinguru menua: konpondu garraio babesen kolorea gau moduan, konpondu menu gehigarrien tamainak
-\n
-\n • Ontzi bidezko nabigazioa: ubideen euskarria
-\n
-\n • Bestelako akatsen konponketak
-\n
-\n</string>
-    <string name="commiting_way">Bidea betetzen…</string>
     <string name="test_voice_desrc">Sakatu botoi bat eta entzun dagokion ahots-deskripzioa falta den edo gaizki dagoen antzemateko</string>
-    <string name="release_3_2_pre">• Gailu batzuetan gertatzen zen kaskatzea konponduta
-\n
-\n• Markatzaileen ezaugarri berria: Bistaratu iragandako markatzaileak
-\n
-\n• Bilaketa historiak aurretik bilatutako kategoriak bistaratzen ditu
-\n
-\n• Karaktere mapa ez latinoetan gertatzen zen kraskatzea konponduta 
-\n 
-\n • Android 8.0 gailuetan gertatzen ziren errendatze abiadura arazoak konponduta 
-\n 
-\n • Poligono objektuak editatzeko euskarria (Ez-zerbitzua) 
-\n 
-\n• Distantziaren neurketa: Neurketa botoia gehitu da laster-menuko ekintzetara 
-\n</string>
     <string name="ask_for_location_permission">Eman OsmAnd-i kokalekua eskuratzeko baimena jarraitzeko.</string>
     <string name="rendering_value_black_name">Beltza</string>
     <string name="search_street">Bilatu kalea</string>
@@ -2966,15 +2915,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="routing_attr_avoid_subway_description">Ekidin metroak eta tren arinak</string>
     <string name="routing_attr_avoid_ferry_name">Ferryrik ez</string>
     <string name="routing_attr_avoid_ferry_description">Ekidin ferryak</string>
-    <string name="release_3_3_7">"• Garraio publikoetan  transferentzien arteko denbora erakusten da
-\n
-\n • Interfaze zuzendua ibilbidearen xehetasunetan
-\n
-\n • Itxura iluna zuzendua, norabide menuan eta ibilbidearen xehetasunetan
-\n
-\n • Distantziaren neurketan azimuth erakusten da
-\n
-\n"</string>
     <string name="rendering_attr_surface_unpaved_name">Zolatu gabea</string>
     <string name="rendering_attr_surface_grass_paver_name">Belar zolatua</string>
     <string name="rendering_attr_surface_paved_name">Zolatua</string>
@@ -3008,7 +2948,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="choose_data_to_share">Aukeratu ze motako datuak partekatu nahi dituzun:</string>
     <string name="downloaded_maps">Deskargatutako mapak</string>
     <string name="visited_screens">Bisitatutako pantailak</string>
-    <string name="colleted_data">Jasotako datuak</string>
     <string name="collected_data_descr">Zehaztu zeintzuk datu baimentzen duzun OsmAnd-ek partekatzea.</string>
     <string name="downloaded_maps_collect_descr">Lagundu gaitzazu mapa eta eskualdeen erabilera ulertzen.</string>
     <string name="visited_screens_collect_descr">Lagundu gaitzazu OsmAnd-en ezaugarrien erabilera ulertzen.</string>
@@ -3176,8 +3115,7 @@ Area honi dagokio: %1$s x %2$s</string>
 \n • Arazo konponketa gehiago
 \n
 \n</string>
-    <string name="new_route_calculated_dist_dbg">Ibilbidea: distantzia %s, iraupena %s 
-\nKalkulua: %.1f s, %d errepide, %d lauza)</string>
+    <string name="new_route_calculated_dist_dbg">Ibilbidea: distantzia %1$s, iraupena %2$s \nKalkulua: %3$.1f s, %4$d errepide, %5$d lauza)</string>
     <string name="lang_oc">Okzitaniera</string>
     <string name="app_mode_wagon">Bagoia</string>
     <string name="days_5">Egun</string>
@@ -3215,7 +3153,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="route_parameters_info">Ibilbide ezarpenak hautatutako \"%1$s.\" profilean.</string>
     <string name="wake_time">Esnatu ondorengo denbora-muga</string>
     <string name="units_and_formats">Unitate eta formatuak</string>
-    <string name="appearance">Itxura</string>
     <string name="map_look_descr">Maparen itxura</string>
     <string name="map_look">Maparen bista</string>
     <string name="list_of_installed_plugins">Instalatutako gehigarriak</string>
@@ -3278,25 +3215,7 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="routing_attr_width_name">Zabalera muga</string>
     <string name="routing_attr_width_description">Zehaztu baimendutako ibilgailuaren zabalera muga ibilbideetan.</string>
     <string name="avoid_in_routing_descr_">Saihestu ibilbide eta errepide mota batzuk</string>
-    <string name="release_3_3">"• \'Jarraibideak\' pantaila berria: Etxea eta lana botoiak bistaratzen ditu, \'aurreko ibilbidea\' lasterbidea, GPX lorratz eta markatzaile aktiboen zerrenda, bilaketa historiala
-\n
-\n • Informazio gehigarria \'Ibilbidearen xehetasunak\' atalean: errepide motak, zoladura, maldak, xamurtasuna
-\n
-\n • Garraio publiko bidezko nabigazioak mota guztietako garraioak onartzen ditu: metroa, autobusa, tranbia, eta abar
-\n
-\n • Ekintza azkar berria lorratzak erakutzi edo ezkutatzeko eta egun7gau moduetarako
-\n
-\n • Alemania, Hego Afrika eta Quebec-en urpetuta agertzen ziren zonaldeak konponduta
-\n
-\n •  KML eta KMZ inportaziorako euskarri gehigarria
-\n
-\n • Garraio publiko batzuk irekitzean gertatzen ziren kraskatzeak konponduta
-\n
-\n • Facebook eta Firebase analitikak kendu dira doako bertsiotik (OsmAnd+ bertsioak ez ditu)
-\n
-\n"</string>
     <string name="app_mode_pickup_truck">Kamioneta irekia</string>
-    <string name="swap_start_and_destination">Trukatu irteera eta helmuga</string>
     <string name="default_speed_dialog_msg">Errepide mota ezezagunetan iristeko ordua kalkulatzen du, eta errepide guztietako abiadura mugatzen du (ibilbidea alda lezake)</string>
     <string name="data_storage_preference_summary">%1$s • %2$s</string>
     <string name="data_storage_space_description">%1$s GB libre (%2$s GB-etatik)</string>
@@ -3409,7 +3328,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="reset_confirmation_descr">%1$s sakatzean zure aldaketak baztertuko dira.</string>
     <string name="reset_all_profile_settings_descr">Berrezarri profilaren ezarpenak instalazioan lehenetsitakoetara.</string>
     <string name="reset_all_profile_settings">Berrezarri profileko ezarpen guztiak\?</string>
-    <string name="ltr_or_rtl_combine">%1$s: %2$s</string>
     <string name="file_does_not_contain_routing_rules">\'%1$s\'-k ez dauka ibilbide araurik, hautatu beste fitxategiren bat.</string>
     <string name="not_support_file_type_with_ext">Onartutako %1$s luzapena duen fitxategi bat hautatu behar duzu.</string>
     <string name="import_from_file">Inportatu fitxategitik</string>
@@ -3485,12 +3403,9 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="shared_string_menu">Menua</string>
     <string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
     <string name="shared_string_routing">Ibilbidea</string>
-    <string name="shared_string_custom_rendering_style">Errendatzeko estilo pertsonalizatua</string>
     <string name="shared_string_include_data">Gehitu datu osagarriak</string>
     <string name="import_profile_dialog_description">Inportatutako profilak datu osagarriak ditu. Sakatu Inportatu profileko datuak bakarrik inportatzeko edo hautatu datu gehigarriak.</string>
     <string name="export_profile_dialog_description">Datu osagarriak hauta ditzakezu profilarekin batera esportatzeko.</string>
-    <string name="navigation_notification_desc">Erakutsi sistemaren jakinarazpena nabigazioan zehar nabigazio argibideekin.</string>
-    <string name="navigation_notification">Nabigazio-jakinarazpena</string>
     <string name="shared_string_app_default_w_val">Aplikazioan lehenetsia (%s)</string>
     <string name="no_recalculation_setting">Birkalkulorik ez</string>
     <string name="route_recalculation_dist_title">Gutxieneko distantzia ibilbidea birkalkulatzeko</string>
@@ -3570,7 +3485,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="select_distance_route_will_recalc">Hautatu ibilbidea birkalkulatzeko distantzia.</string>
     <string name="recalculate_route_in_deviation">Birkalkulatu ibilbidea desbideratzekotan</string>
     <string name="shared_string_square">Laukia</string>
-    <string name="shared_string_rhomb">Erronboa</string>
     <string name="shared_string_circle">Zirkulua</string>
     <string name="select_shape">Hautatu forma</string>
     <string name="select_group">Hautatu taldea</string>
@@ -3721,7 +3635,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="screen_control">Pantailaren kontrola</string>
     <string name="system_screen_timeout_descr">Pantaila itzaltzen du sistemako pantailaren denbora-muga agortzean.</string>
     <string name="system_screen_timeout">Erabili sistemako pantailaren denbora-muga</string>
-    <string name="turn_screen_on_options_descr">Pantaila esnatzeko aukerak:</string>
     <string name="turn_screen_on_descr">Hautatu pantailako esnatzeko aukerak (ziurtatu OsmAnd lehen planoan dagoela gailua blokeatzean):</string>
     <string name="turn_screen_on_navigation_instructions_descr">Nabigazio instrukzio bakoitzak pantaila piztuko du.</string>
     <string name="turn_screen_on_navigation_instructions">Nabigaziorako argibideak</string>
@@ -4020,6 +3933,5 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="routing_engine_vehicle_type_foot">Oinez</string>
     <string name="routing_engine_vehicle_type_bike">Bizikleta</string>
     <string name="routing_engine_vehicle_type_car">Kotxea</string>
-    <string name="message_error_recheck_parameters">Errorea, egiaztatu parametroak berriro</string>
     <string name="copy_address">Kopiatu helbidea</string>
 </resources>

OsmAnd/res/values-fa/phrases.xml

@@ -36,7 +36,6 @@
     <string name="poi_copyshop">فروشگاه چاپ و تکثیر</string>
     <string name="poi_curtain">پرده فروشی</string>
     <string name="poi_fabric">پارچه فروشی</string>
-    <string name="poi_bedding">پنبه زنی</string>
     <string name="poi_dive">تجهیزات غواصی</string>
     <string name="poi_doityourself">فروشگاه بهسازی خانه</string>
     <string name="poi_erotic"/>
@@ -251,7 +250,6 @@
     <string name="poi_healthcare_alternative">طب سنتی</string>
     <string name="poi_audiologist">شنوایی سنجی</string>
     <string name="poi_blood_bank">سازمان انتقال خون</string>
-    <string name="poi_healthcare_centre">مرکز پزشکی</string>
     <string name="poi_midwife">ماما</string>
     <string name="poi_occupational_therapist">کاردرمانی</string>
     <string name="poi_optometrist">چشم پزشکی</string>
@@ -388,7 +386,6 @@
     <string name="poi_religion_shinto">شینتو</string>
     <string name="poi_religion_taoist">تائوئیسم</string>
     <string name="poi_monastery">صومعه</string>
-    <string name="poi_historic_monastery">صومعه تاریخی</string>
     <string name="poi_wayside_cross"/>
     <string name="poi_wayside_shrine">زیارتگاه بین راهی</string>
     <string name="poi_information">اطلاعات</string>
@@ -529,7 +526,6 @@
     <string name="poi_crematorium">کوره جسد سوزی</string>
     <string name="poi_internet_cafe">کافی‌نت</string>
     <string name="poi_bank">بانک</string>
-    <string name="poi_amenity_atm">ATM</string>
     <string name="poi_money_lender">وام دهنده پول</string>
     <string name="poi_pawnbroker">بنگاه رهنی</string>
     <string name="poi_bureau_de_change">صرافی</string>
@@ -717,7 +713,6 @@
     <string name="poi_aerialway_summer_access_exit">دسترسی تابستانه: فقط خروج</string>
     <string name="poi_aerialway_summer_access_both">دسترسی تابستانه: ورود و خروج</string>
     <string name="poi_aerialway_length">درازا</string>
-    <string name="poi_additional_atm_yes">خودپرداز: بله</string>
     <string name="poi_addr_housename">نام خانه</string>
     <string name="poi_fireplace">شومینه</string>
     <string name="poi_seasonal">فصلی</string>

OsmAnd/res/values-fa/strings.xml

@@ -276,7 +276,6 @@
     <string name="map_tile_source_descr">منبع کاشی‌های آنلاین یا کاشی‌های ذخیره‌شدهٔ نقشه را انتخاب کنید.</string>
     <string name="error_calculating_route_occured">محاسبهٔ مسیر ناموفق بود.</string>
     <string name="empty_route_calculated">مسیر محاسبه‌شده تُهی است.</string>
-    <string name="new_route_calculated_dist">مسیر جدید؛ مسافت</string>
     <string name="arrived_at_destination">رسیدید.</string>
     <string name="invalid_locations">مختصات نامعتبر</string>
     <string name="go_back_to_osmand">بازگشت به نقشه</string>
@@ -1044,7 +1043,6 @@
     <string name="navigate_point_format_D">DDD.DDDDD</string>
     <string name="navigate_point_format_DM">DDD MM.MMM</string>
     <string name="navigate_point_format_DMS">DDD MM SS.S</string>
-    <string name="poi_error_poi_not_found">نقطه پیدا نشد، یا مکان از چند نقطه تشکیل شده است که فعلاً پشتیبانی نمی‌شود.</string>
     <string name="osb_author_or_password_not_specified">لطفاً نام کاربری و گذرواژه‌تان برای سایت OSM را در قسمت تنظیمات وارد کنید</string>
     <string name="clear_intermediate_points">پاک‌کردن مقصدهای میانی</string>
     <string name="keep_intermediate_points">نگه‌داشتن مقصدهای میانی</string>
@@ -1650,8 +1648,6 @@
     <string name="allow_access_location">اجازهٔ دسترسی به موقعیتتان را بدهید</string>
     <string name="first_usage_greeting">مسیریابی و کشف جاهای تازه بدون اتصال به اینترنت</string>
     <string name="search_my_location">موقعیت من را پیدا کن</string>
-    <string name="no_update_info_desc">بررسی خودکار برای نسخه‌های تازهٔ برنامه یا تخفیف‌های OsmAnd را غیرفعال می‌کند.</string>
-    <string name="no_update_info">نسخه‌های تازه را نشان نده</string>
     <string name="update_all_maps_now">اکنون همهٔ نقشه‌ها را به‌روز می‌کنید؟</string>
     <string name="clear_tile_data">پاک‌کردن همهٔ کاشی‌ها</string>
     <string name="routing_attr_short_way_name">راه صرفه‌جویی سوخت</string>
@@ -2133,7 +2129,6 @@
     <string name="use_drawer_btn">از منو استفاده شود</string>
     <string name="dashboard_or_drawer_title">دکمهٔ پیشخوان یا منو</string>
     <string name="dashboard_or_drawer_description">دو انتخاب دارید که بتوانید از طریق پیشخوانِ قابل‌تنظیم یا منوی ثابت، برنامه را کنترل کنید. همواره می‌توانید این انتخاب را در تنظیمات پیشخوان تغییر دهید.</string>
-    <string name="update">به‌روزرسانی</string>
     <string name="only_download_over_wifi">فقط با وای‌فای دانلود کن</string>
     <string name="live_update">به‌روزرسانی زنده</string>
     <string name="update_now">الآن به‌روز کن</string>
@@ -2430,10 +2425,7 @@
 \n • رد خودتان را ثبت کنید یا یک رد GPX را دانلود و آن را دنبال کنید
 \n</string>
     <string name="distance_moving">مسافت اصلاح‌شده</string>
-    <string name="legacy_search">جست‌وجوی دنباله‌ای</string>
-    <string name="show_legacy_search">نمایش جست‌وجوی دنباله‌ای</string>
-    <string name="show_legacy_search_desc">جست‌وجوی دنباله‌ای را به منو اضافه می‌کند.</string>
-    <string name="osmand_extended_description_part3">نقشه 
+    <string name="osmand_extended_description_part3">نقشه
 \n • نقاط توجه (POIها یا Points of interest) اطرافتان را نشان می‌دهد 
 \n • نقشه را در راستای حرکتتان (یا قطب‌نما) تنظیم می‌کند 
 \n • موقعیت و سوی جهت‌گیری‌تان را نشان می‌دهد 
@@ -2623,16 +2615,6 @@
     <string name="by_date">بر اساس تاریخ</string>
     <string name="by_type">بر اساس نوع</string>
     <string name="modify_the_search_query">جست‌وجوی خود را تغییر دهید.</string>
-    <string name="release_3_0">• جدید: پیاده‌سازی راهنمای آفلاین جهانی برای سفر که در آن مکان‌های موردبحث به نقشه پیوند خورده‌اند. داده‌های اولیه از ویکی‌سفر گرفته شده است. 
-\n 
-\n • ویکی‌پدیا: ظاهر جدید، لینک‌های فعال، پشتیبانی از تصاویر 
-\n 
-\n • رابط کاربری بازکردن مسیر: پشتیبانی از گروه‌های نقاط بین‌راهی 
-\n 
-\n • نشانه‌های نقشه: واردکردن گروهی از نقاط از فایل‌های GPX، ورود مختصات، ظاهر تازه 
-\n 
-\n • از این پس اشتراک OsmAnd Live همهٔ قابلیت‌های OsmAnd را در بر می‌گیرد 
-\n</string>
     <string name="what_is_here">چیزهایی که اینجاست:</string>
     <string name="parked_at">ساعت پارک</string>
     <string name="pick_up_till">برداشتن تا</string>
@@ -2752,7 +2734,7 @@
     <string name="update_is_available">به‌روزرسانی وجود دارد</string>
     <string name="download_file">دانلود فایل</string>
     <string name="start_editing_card_image_text">راهنمای سفر رایگان با پوشش جهانی که همه می‌توانند آن را ویرایش کنند.</string>
-    <string name="welcome_to_open_beta_description">راهنمای «مسافرت» هم‌اکنون بر پایهٔ ویکی‌سفر ساخته شده است. در دورهٔ آزمایش همگانیِ نسخهٔ بتا می‌توانید همهٔ قابلیت‌های آن را به‌رایگان ارزیابی کنید. با پایان دورهٔ آزمایشی، «مسافرت» در اختیار مشترکان نسخهٔ نامحدود OsmAnd و دارندگان OsmAnd+‎ خواهد بود.</string>
+    <string name="welcome_to_open_beta_description">راهنمای «مسافرت» هم‌اکنون بر پایهٔ ویکی‌سفر ساخته شده است. در دورهٔ آزمایش همگانیِ نسخهٔ بتا می‌توانید همهٔ قابلیت‌های آن را به‌رایگان ارزیابی کنید.</string>
     <string name="start_editing_card_description">شما می‌توانید هر یک از مقالات ویکی‌سفر را ویرایش کنید. امیدواریم با انجام این کار دیگران را در دانش، تجربه، استعداد و توجهتان سهیم کنید.</string>
     <string name="start_editing">شروع ویرایش</string>
     <string name="get_unlimited_access">گرفتن دسترسی نامحدود</string>
@@ -2803,46 +2785,13 @@
     <string name="coord_input_save_as_track_descr">%1$s نقطه افزودید. نام فایل را بنویسید و روی «ذخیره» بزنید.</string>
     <string name="point_deleted">نقطهٔ %1$s پاک شد</string>
     <string name="shared_string_world">جهان</string>
-    <string name="search_no_results_description">چیزی پیدا نشد؟
-\nدر این باره با ما صحبت کنید.</string>
     <string name="send_search_query">عبارت جست‌وجویتان ارسال شود؟</string>
     <string name="increase_search_radius_to">افزایش شعاع جست‌وجو به %1$s</string>
     <string name="thank_you_for_feedback">سپاسگزاریم که نظر دادید</string>
     <string name="poi_cannot_be_found">گره یا راه پیدا نشد.</string>
     <string name="search_no_results_feedback">چیزی پیدا نشد؟ 
 \nبازخورد بدهید</string>
-    <string name="release_3_1">"• ناوبری: اصلاح نوار پیشرفت، تعویض فوریِ نقاط ابتدا و انتهای مسیر
-\n
-\n • نشانه‌های نقشه: اصلاح خاموش/روشن‌کردن گروه‌ها، امکان مخفی‌سازی نشانه‌ها روی نقشه
-\n
-\n • ویرایش OSM: امکان ویرایش تگ‌های اشیای غیرنقطه‌ای و راه‌ها، اصلاح مشکل ازقلم‌افتادن پیام‌ها در توضیحات ویرایشی، پشتیبان‌گیری از ویرایش‌ها
-\n
-\n • بهبود تجزیهٔ ویکی‌پدیا و ویکی‌سفر، فایل‌های به‌روزشده اکنون در دسترس قرار دارند
-\n
-\n • منوی زمینه: اصلاح رنگ شمارهٔ پلاک‌های  حمل‌ونقل (مثل شمارهٔ ایستگاه‌های مترو) در حالت شب، اصلاحات دیگر در اندازه‌های منو
-\n
-\n • ناوبری با قایق: پشتیبانی از آبراه روگاه (fairway)
-\n
-\n • اصلاح مشکلاتی دیگر
-\n
-\n"</string>
     <string name="test_voice_desrc">روی یکی از دکمه‌ها بزنید و فرمان گفتاری متناظر با آن را بشنوید تا فرمان‌های مشکل‌دار یا ناموجود را شناسایی کنید</string>
-    <string name="release_3_2_pre">• حل مشکل از کار افتادن در شروع برنامه که روی برخی دستگاه‌ها رخ داده بود 
-\n 
-\n• قابلیت جدید برای نشانه‌ها: نمایش نشانه‌هایی که از آن‌ها گذشته‌اید 
-\n 
-\n• تاریخچهٔ جست‌وجو دسته‌هایی را که قبلاً جُسته‌اید نشان می‌دهد 
-\n 
-\n• حل مشکل از کار افتادن در شروع برنامه که با نقشه‌های غیرلاتین پیش آمده بود 
-\n 
-\n • بهبودهایی برای مشکل سرعت پرداخت نقشه (map render) روی اندروید ۸٫۰ 
-\n 
-\n • پشتیبانی از ویرایش اشیای چندضلعی (non-amenity) 
-\n 
-\n• اندازه‌گیری مسافت: اضافه‌شدن دکمهٔ «اندازه‌گیری» به عملیات‌ها در منوی زمینه 
-\n 
-\n</string>
-    <string name="commiting_way">در حال ثبت راه…</string>
     <string name="ask_for_location_permission">برای ادامه، لطفاً به OsmAnd اجازهٔ دسترسی به موقعیت مکانی را بدهید.</string>
     <string name="rendering_value_black_name">سیاه</string>
     <string name="search_street">جست‌وجوی خیابان</string>
@@ -2923,23 +2872,6 @@
     <string name="quick_action_show_hide_gpx_tracks_descr">دکمه‌ای برای آشکار/پنهان کردن ردهای انتخابی بر روی نقشه.</string>
     <string name="quick_action_gpx_tracks_hide">پنهان‌کردن ردها</string>
     <string name="quick_action_gpx_tracks_show">آشکارکردن ردها</string>
-    <string name="release_3_3">• طراحی جدید برای صفحهٔ «مسیریابی»: اضافه‌شدن دکمه‌های خانه و محل کار برای انتخاب مقصد، میانبر «مسیر قبلی»، لیست نشانه‌ها و ردهای GPX فعال، سابقهٔ جست‌وجو 
-\n 
-\n • اطلاعات بیشتر در قسمت «جزئیات مسیر»: نوع جاده‌ها، سطح، شیب، همواری 
-\n 
-\n • پشتیبانی از همهٔ گونه‌های ترابری در ناوبری حمل‌ونقل عمومی: مترو، اتوبوس، تراموا و... 
-\n 
-\n • گزینه‌های جدید در «عملیات فوری» برای آشکار/پنهان کردن ردها و تغییر حالت شب/روز 
-\n 
-\n • اصلاح مناطقی در آلمان، آفریقای جنوبی و کِبِک که سیل‌زده نمایش داده می‌شدند 
-\n 
-\n • پشتیبانی از ورود KML و KMZ 
-\n 
-\n • حل مشکل از کار افتادن هنگام بازکردن برخی ایستگاه‌های حمل‌ونقل عمومی 
-\n 
-\n • حذف آمارگیرهای Facebook و Firebase از نسخهٔ رایگان (OsmAnd+‎ آن را ندارد)
-\n
-\n</string>
     <string name="use_osm_live_public_transport_description">حمل‌ونقل عمومی با استفاده از به‌روزرسانی‌های OsmAnd Live فعال شود.</string>
     <string name="use_osm_live_public_transport">حمل‌ونقل عمومی با OsmAnd Live</string>
     <string name="transfers_size">%1$d انتقال</string>
@@ -3016,14 +2948,6 @@
     <string name="routing_attr_avoid_subway_description">از مترو و حمل‌ونقل ریلی سبک پرهیز می‌کند</string>
     <string name="routing_attr_avoid_ferry_name">فرابر</string>
     <string name="routing_attr_avoid_ferry_description">از فرابر پرهیز می‌کند</string>
-    <string name="release_3_3_7">• نمایش زمان بین انتقال‌ها در حمل‌ونقل عمومی
-\n
-\n • اصلاح رابط کاربری جزئيات مسیر
-\n
-\n • اصلاح پوستهٔ تیره برای منوی مسیریابی و جزئیات مسیر
-\n
-\n • نمایش سمت (azimuth) در اندازه‌گیری مسافت
-\n</string>
     <string name="files_moved">%1$d فایل منتقل شد (%2$s).</string>
     <string name="files_copied">%1$d فایل کپی شد (%2$s).</string>
     <string name="files_failed">نمی‌توان %1$d فایل (%2$s) را کپی کرد.</string>
@@ -3200,8 +3124,8 @@
     <string name="sett_generic_ext_input">صفحه‌کلید</string>
     <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
     <string name="sett_parrot_ext_input">Parrot</string>
-    <string name="new_route_calculated_dist_dbg">مسیر: مسافت %s، زمان مسیریاب %s 
-\nمحاسبه: %.1f ثانیه، %d جاده، %d کاشی)</string>
+    <string name="new_route_calculated_dist_dbg">مسیر: مسافت %2$s، زمان مسیریاب %1$s
+\nمحاسبه: %3$.1f ثانیه، %4$d جاده، %5$d کاشی)</string>
     <string name="lang_oc">اُکسیتان</string>
     <string name="day">روز</string>
     <string name="week">هفته</string>
@@ -3231,7 +3155,6 @@
     <string name="start_up_message_pref">پیام شروع</string>
     <string name="wake_time">زمان خاموشی پس از بیدارباش</string>
     <string name="units_and_formats">یکاها و قالب‌ها</string>
-    <string name="appearance">ظاهر</string>
     <string name="map_look">چهرهٔ نقشه</string>
     <string name="list_of_installed_plugins">افزونه‌های نصب‌شده</string>
     <string name="configure_navigation">پیکربندی ناوبری</string>
@@ -3284,7 +3207,6 @@
     <string name="analytics_pref_title">تحلیل‌ها</string>
     <string name="logcat_buffer">بافر لاگ‌کت</string>
     <string name="shared_string_by_default">پیشفرض</string>
-    <string name="download_detaile_map">برای دیدن این منطقه، نقشهٔ باجزئیات %s را دانلود کنید.</string>
     <string name="download_detailed_map">برای دیدن این منطقه، نقشهٔ پرجزئیات %s را دانلود کنید.</string>
     <string name="change_data_storage_full_description">فایل‌های دادهٔ OsmAnd را به مقصد جدید انتقال می‌دهید؟
 \n%1$s &gt; %2$s</string>
@@ -3431,7 +3353,6 @@
     <string name="reset_confirmation_descr">زدن روی %1$s، همهٔ تغییراتتان را از بین می‌برد.</string>
     <string name="reset_all_profile_settings_descr">همهٔ تنظیمات پروفایل به حالت اولیهٔ پس از نصب بازنشانی می‌شود.</string>
     <string name="reset_all_profile_settings">همهٔ تنظیمات پروفایل را بازنشانی می‌کنید؟</string>
-    <string name="ltr_or_rtl_combine">%1$s: ‪%2$s‬</string>
     <string name="ltr_or_rtl_combine_via_space">‪%1$s %2$s‬‏</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: ‪%2$s‬</string>
     <string name="file_does_not_contain_routing_rules">در فایل %1$s دستوری برای مسیریابی یافت نشد. لطفاً فایل دیگری انتخاب کنید.</string>
@@ -3609,7 +3530,6 @@
     <string name="quick_action_terrain_show">نمایش ناهمواری‌ها</string>
     <string name="quick_action_terrain_descr">دکمه‌ای برای آشکار یا پنهان کردن لایهٔ ناهمواری‌ها روی نقشه.</string>
     <string name="shared_string_circle">دایره</string>
-    <string name="shared_string_rhomb">لوزی</string>
     <string name="delete_description">حذف توضیحات</string>
     <string name="add_description">افزودن توضیحات</string>
     <string name="select_group">انتخاب گروه</string>
@@ -3742,7 +3662,6 @@
     <string name="screen_control">کنترل صفحه</string>
     <string name="system_screen_timeout_descr">هنگامی که زمان خاموشی صفحه مطابق تنظیمات دستگاه سر برسد، صفحه را خاموش می‌کند.</string>
     <string name="system_screen_timeout">استفاده از زمان خاموشی صفحه در دستگاه</string>
-    <string name="turn_screen_on_options_descr">گزینه‌های بیدارباش صفحه:</string>
     <string name="turn_screen_on_descr">گزینه‌های بیدارباش صفحه را انتخاب کنید (مطمئن شوید هنگام قفل‌کردن دستگاه، OsmAnd در پیش‌زمینه باشد):</string>
     <string name="turn_screen_on_navigation_instructions_descr">هر یک از فرمان‌های ناوبری، صفحه را روشن خواهد کرد.</string>
     <string name="turn_screen_on_navigation_instructions">فرمان‌های ناوبری</string>
@@ -3783,7 +3702,6 @@
     <string name="shared_string_meters">متر</string>
     <string name="details_dialog_decr">جزئیات اضافه‌تر را روی نقشه آشکار یا پنهان کنید</string>
     <string name="shared_string_night_map">نقشهٔ شب</string>
-    <string name="shared_string_all_time">همیشه</string>
     <string name="turn_screen_on_power_button_disabled">غیرفعال است. به گزینهٔ «روشن نگه داشتن صفحه» در قسمت «زمان خاموشی پس از بیدارباش» نیاز دارد.</string>
     <string name="pseudo_mercator_projection">فراتابی شبه مرکاتور</string>
     <string name="rendering_attr_piste_type_connection_name">اتصال</string>
@@ -3940,7 +3858,6 @@
     <string name="use_live_public_transport">دادهٔ OsmAnd Live</string>
     <string name="use_live_routing">دادهٔ OsmAnd Live</string>
     <string name="complex_routing_descr">مسیریابی دومرحله‌ای برای ناوبری خودرویی.</string>
-    <string name="use_complex_routing">مسیریابی پیچیده</string>
     <string name="use_native_pt_desc">برای مسیریابی حمل‌ونقل عمومی از محاسبات جاوا (امن) استفاده می‌کند</string>
     <string name="shared_string_local_maps">نقشه‌های محلی</string>
     <string name="icon_group_special">ویژه</string>
@@ -4036,5 +3953,4 @@
     <string name="routing_engine_vehicle_type_foot">پا</string>
     <string name="routing_engine_vehicle_type_bike">دوچرخه</string>
     <string name="routing_engine_vehicle_type_car">خودرو</string>
-    <string name="message_error_recheck_parameters">خطا، پارامترها را بازبینی کنید</string>
 </resources>

OsmAnd/res/values-fi/strings.xml

@@ -172,7 +172,7 @@
     <string name="global_app_settings">Globaalit sovellusasetukset</string>
     <string name="user_name">OSM käyttäjänimesi</string>
     <string name="open_street_map_login_descr">Tarvitaan openstreetmap.org ehdotuksia varten</string>
-    <string name="user_password">OSM salasanasi</string>
+    <string name="user_password">Salasana</string>
     <string name="download_files_not_enough_space">Ei ole tarpeeksi tilaa jotta voitaisiin ladata %1$s MB (vapaana: %2$s).</string>
     <string name="download_files_question_space">Lataa {0} tiedosto(a)\?
 \n{1} Mt (/ {2} Mt) käytetään.</string>
@@ -314,7 +314,6 @@
     <string name="poi">KP</string>
     <string name="error_occurred_saving_gpx">Virhe tallennettaessa GPX tiedostoa</string>
     <string name="error_calculating_route">Virhe reitin laskennassa</string>
-    <string name="new_route_calculated_dist">Uusi reitti laskettu, etäisyys</string>
     <string name="arrived_at_destination">Olet saapunut perille.</string>
     <string name="invalid_locations">Virheelliset koordinaatit</string>
     <string name="shared_string_close">Sulje</string>
@@ -874,7 +873,6 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
     <string name="give_permission">Anna oikeus</string>
     <string name="allow_access_location">Salli pääsy sijaintiin</string>
     <string name="search_my_location">Löydä sijaintini</string>
-    <string name="no_update_info">Älä näytä uusia versioita</string>
     <string name="update_all_maps_now">Päivitetäänkö kaikki kartat nyt?</string>
     <string name="clear_tile_data">Poista kaikki tiilet</string>
     <string name="routing_attr_short_way_name">Polttoainetaloudellinen reitti</string>
@@ -1302,7 +1300,6 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
     <string name="use_dashboard_btn">Käytä hallintapaneelia</string>
     <string name="use_drawer_btn">Käytä valikkoa</string>
     <string name="dashboard_or_drawer_title">Hallintapaneeli tai valikko-ohjaus</string>
-    <string name="update">Päivitä</string>
     <string name="only_download_over_wifi">Lataa ainoastaan Wi-Fi-yhteydellä</string>
     <string name="live_update">Live päivitys</string>
     <string name="update_now">Päivitä nyt</string>
@@ -1585,7 +1582,6 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
     <string name="upload_osm_note_description">Lataa OSM-huomautuksesi anonyymisti tai käyttämällä OpenStreetMap.org-profiiliasi.</string>
     <string name="wiki_around">Lähimmät Wikipedia-artikkelit</string>
     <string name="upload_poi">Lataa (vie) KP:t</string>
-    <string name="no_update_info_desc">Älä tarkista mitään päivityksiä uusista versioista tai OsmAndiin liittyvistä alennuksista</string>
     <string name="lang_pms">Piemonte</string>
     <string name="lang_bn">Bengali</string>
     <string name="lang_tl">Tagalog</string>
@@ -1805,8 +1801,6 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="rendering_attr_contourWidth_description">Korkeuskäyräviivojen leveys</string>
     <string name="rendering_attr_contourWidth_name">Korkeuskäyräviivojen leveys</string>
     <string name="rendering_attr_hideWaterPolygons_description">Vesi</string>
-    <string name="legacy_search">Vanha haku</string>
-    <string name="show_legacy_search">Näytä vanha haku</string>
     <string name="av_audio_bitrate">Audion bittinopeus</string>
     <string name="av_audio_bitrate_descr">Valitse äänen bittinopeus.</string>
     <string name="none_selected_gpx">GPX tiedostoa ei valittu. Valitaksesi paina ja pidä käytettävissä olevalla jäljellä.</string>
@@ -1877,7 +1871,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="poi_dialog_comment_default">KP:n muutos</string>
     <string name="navigation_intent_invalid">Virheellinen formaatti: %s</string>
     <string name="use_fast_recalculation">Älykäs reitin uudelleen laskenta</string>
-    <string name="use_fast_recalculation_desc">Laske uudelleen ainoastaan reitin alkuosa pidemmille matkoille.</string>
+    <string name="use_fast_recalculation_desc">Laskee uudelleen ainoastaan reitin alkuosan. Hyödyllinen pitkille matkoille.</string>
     <string name="rate_this_app">Arvostele tämä sovellutus</string>
     <string name="user_hates_app_get_feedback">Kerro meille miksi.</string>
     <string name="user_hates_app_get_feedback_long">Ole hyvä ja kerro meille mitä haluaisit muuttaa tässä sovelluksessa.</string>
@@ -2427,7 +2421,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="profile_alert_need_save_msg">Tallenna ensin profiiliin tehdyt muutokset</string>
     <string name="profile_alert_delete_title">Poista profiili</string>
     <string name="profile_alert_delete_msg">Haluatko varmasti poistaa profiilin \"%s\"</string>
-    <string name="select_base_profile_dialog_title">Valitse pohjaprofiili</string>
+    <string name="select_base_profile_dialog_title">Valitse pohjaprofiili jolla aloitetaan</string>
     <string name="base_profile_descr_car">Auto, kuorma-auto, moottoripyörä</string>
     <string name="base_profile_descr_bicycle">Maastopyörä, mopo, hevonen</string>
     <string name="base_profile_descr_pedestrian">Kävely, vaellus, juokseminen</string>
@@ -2529,7 +2523,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="favorites_item">Suosikit</string>
     <string name="subscription_osmandlive_item">Tilaus - OsmAnd Live</string>
     <string name="osmand_purchases_item">OsmAnd ostot</string>
-    <string name="legend_item_description">Kartan symboliikkaopas</string>
+    <string name="legend_item_description">Kartan symboliikkaopas.</string>
     <string name="navigation_profiles_item">Navigointiprofiilit</string>
     <string name="lang_ba">baškiiri</string>
     <string name="move_inside_category">Voit siirtää kohteita vain tämän kategorian sisällä.</string>
@@ -2571,7 +2565,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="week">Viikko</string>
     <string name="shared_string_bearing">Suuntima</string>
     <string name="plan_a_route">Suunnittele reitti</string>
-    <string name="plan_route_last_edited">Viimeksi muokatut</string>
+    <string name="plan_route_last_edited">Viimeksi muokattu</string>
     <string name="plan_route_create_new_route">Luo uusi reitti</string>
     <string name="select_color">Valitse väri</string>
     <string name="select_icon_profile_dialog_title">Valitse kuvake</string>
@@ -2614,4 +2608,135 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="quick_action_transport_hide">Piilota julkinen liikenne</string>
     <string name="icon_group_symbols">Symbolit</string>
     <string name="replace_point_descr">Korvaa toinen kohde tällä.</string>
+    <string name="shared_string_folders">Kansiot</string>
+    <string name="select_folder">Valitse kansio</string>
+    <string name="select_folder_descr">Valitse kansio tai lisää uusi</string>
+    <string name="shared_string_empty">Tyhjä</string>
+    <string name="analyze_by_intervals">Analysoi välein (jaettu välein)</string>
+    <string name="upload_to_openstreetmap">Lähetä OpenStreetMappiin</string>
+    <string name="edit_track">Muokkaa jälkeä</string>
+    <string name="rename_track">Uudelleennimeä jälki</string>
+    <string name="change_folder">Muuta kansiota</string>
+    <string name="select_track_width">Valitse leveys</string>
+    <string name="gpx_split_interval_descr">Valitse kuinka usein merkit näytetään välimatkalle tai ajalle jäljellä.</string>
+    <string name="gpx_split_interval_none_descr">Valitse mieluisin jakoasetus: ajan tai välimatkan perusteella.</string>
+    <string name="shared_string_custom">Mukautettu</string>
+    <string name="gpx_direction_arrows">Suuntanuolet</string>
+    <string name="track_coloring_solid">Kiinteä</string>
+    <string name="plan_route_import_track">Tuo jälki</string>
+    <string name="plan_route_open_existing_track">Avaa olemassaoleva jälki</string>
+    <string name="add_to_a_track">Lisää jälkeen</string>
+    <string name="track_show_start_finish_icons">Näytä alku- ja lopetusikonit</string>
+    <string name="set_working_days_to_continue">Laita työskentelypäivät jatkaaksesi</string>
+    <string name="quick_action_remove_next_destination">Poista lähin määränpääpiste</string>
+    <string name="use_volume_buttons_as_zoom">Zoomaa äänenvoimakkuusnäppäimillä</string>
+    <string name="use_volume_buttons_as_zoom_descr">Hallitse kartan zoomaustasoa laitteen äänenvoimakkuusnäppäimillä.</string>
+    <string name="please_provide_point_name_error">Anna nimi pisteelle</string>
+    <string name="quick_action_remove_next_destination_descr">Poistaa seuraavan määränpään reitiltäsi. Jos se on viimeinen määränpää niin navigointi loppuu.</string>
+    <string name="search_download_wikipedia_maps">Lataa Wikipedia-kartat</string>
+    <string name="plugin_wikipedia_description">Löydä tiedoa kiinnostuksen kohteista Wikipediasta, offline taskuoppaasta joka sisältää artikkeleita paikoista ja sijainneista.</string>
+    <string name="add_hidden_group_info">Lisätty piste ei tule näkymään kartalla koska valittu ryhmä on piilotettu, löydät sen \"%s\" sisältä.</string>
+    <string name="app_mode_enduro_motorcycle">Enduro-moottoripyörä</string>
+    <string name="app_mode_motor_scooter">Skootteri</string>
+    <string name="app_mode_wheelchair">Pyörätuoli</string>
+    <string name="app_mode_wheelchair_forward">Pyörätuoli eteenpäin</string>
+    <string name="osm_edit_closed_note">Suljettu OSM Note</string>
+    <string name="whole_track">Koko jälki</string>
+    <string name="navigation_profile">Navigaatioprofiili</string>
+    <string name="route_between_points_add_track_desc">Valitse jälkitiedosto johon uusi segmentti lisätään.</string>
+    <string name="route_between_points_warning_desc">Seuraavaksi laita jälkesi lähimpään sallittuun tiehen yhdellä navigaatioprofiileistasi jotta voit käyttää tätä asetusta.</string>
+    <string name="route_between_points_desc">Valitse miten pisteet yhdistetään, suoralla viivalla tai laskemalla reitti niiden välillä alla määritellyllä tavalla.</string>
+    <string name="in_case_of_reverse_direction">Jos suunta on päinvastainen</string>
+    <string name="plan_route_select_track_file_for_open">Valitse avattava jälkitiedosto.</string>
+    <string name="shared_string_done">Tehty</string>
+    <string name="overwrite_track">Ylikirjoita jälki</string>
+    <string name="save_as_new_track">Tallenna uutena jälkenä</string>
+    <string name="reverse_route">Päinvastainen reitti</string>
+    <string name="route_between_points_whole_track_button_desc">Koko jälki lasketaan uudelleen käyttäen valittua profiilia.</string>
+    <string name="plan_route_exit_dialog_descr">Haluatko varmasti menettää kaikki muutokset suunnitellusta reitistä\?</string>
+    <string name="marker_save_as_track">Tallenna jälkitiedostona</string>
+    <string name="follow_track">Seuraa jälkeä</string>
+    <string name="follow_track_descr">Valitse seurattava jälkitiedosto</string>
+    <string name="shared_string_save_as_gpx">Tallenna uutena jälkitiedostona</string>
+    <string name="add_segment_to_the_track">Lisää jälkitiedostoon</string>
+    <string name="shared_string_gpx_files">Jäljet</string>
+    <string name="layer_gpx_layer">Jäljet</string>
+    <string name="show_gpx">Jäljet</string>
+    <string name="quick_action_add_gpx">Lisää jäljen väyläpiste</string>
+    <string name="map_widget_monitoring">Matkan nauhoitus</string>
+    <string name="empty_state_my_tracks">Lisää jälkitiedostoja</string>
+    <string name="empty_state_my_tracks_desc">Tuo tai nauhoita jälkitiedostoa</string>
+    <string name="context_menu_item_add_waypoint">Lisää jäljen väyläpiste</string>
+    <string name="shared_string_gpx_route">Jäljen reitti</string>
+    <string name="save_track_to_gpx_globally">Kirjaa jälki GPX tiedostoon</string>
+    <string name="shared_string_file_name">Tiedostonnimi</string>
+    <string name="number_of_gpx_files_selected_pattern">%s ratatiedostoa valittu</string>
+    <string name="gpx_monitoring_stop">Tauota matkan nauhoitus</string>
+    <string name="gpx_monitoring_start">Jatka matkan nauhoitusta</string>
+    <string name="shared_string_redo">Tee uudelleen</string>
+    <string name="open_saved_track">Avaa tallennettu rata</string>
+    <string name="shared_string_is_saved">on tallennettu</string>
+    <string name="one_point_error">Lisää ainakin kaksi pistettä.</string>
+    <string name="sort_last_modified">Viimeksi muokattu</string>
+    <string name="osm_live_payment_desc_hw">Tilaus veloitetaan valitun aikajakson mukaan. Peruuta se omassa AppGalleryssä milloin tahansa.</string>
+    <string name="osm_live_payment_subscription_management_hw">Sinun AppGallery-tili veloitetaan maksun vahvistuksen jälkeen.
+\n
+\nTilaus jatkuu automaattisesti jos sitä ei peruuteta ennen uusintapäivämäärää. Tilisi veloitetaan uusimisajalta (1 kuukausi/3 kuukautta/1 vuosi) vain uusintapäivänä.
+\n
+\nVoit muokata ja peruuttaa tilauksiasi AppGallery-asetuksissasi.</string>
+    <string name="routing_attr_avoid_footways_description">Vältä kävelyteitä</string>
+    <string name="routing_attr_avoid_footways_name">Vältä kävelyteitä</string>
+    <string name="perform_oauth_authorization_description">Kirjaudu sisään käyttäen OAuth käyttääksesi osmedit-ominaisuuksia</string>
+    <string name="perform_oauth_authorization">Kirjaudu käyttämällä OAuth</string>
+    <string name="clear_osm_token">Tyhjennä OpenStreetMap OAuth token</string>
+    <string name="osm_edit_logout_success">Kirjautunut ulos</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">Lisää ainakin kaksi pistettä</string>
+    <string name="plugin_global_prefs_info">Nämä laajennusasetukset ovat globaaleja ja vaikuttavat kaikkiin profiileihin</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
+    <string name="app_mode_gap">Väli</string>
+    <string name="use_two_phase_routing">Käytä kaksivaiheista A*-reititys algoritmiä</string>
+    <string name="shared_string_graph">Graafi</string>
+    <string name="message_need_calculate_route_before_show_graph">%1$s data on käytettävissä ainoastaan teillä, laske reitti käyttäen \"Reitti pisteiden välillä\" nähdäksesi graafit.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Odota.
+\nGraafi on käytössä reitin uudelleenlaskemisen jälkeen.</string>
+    <string name="shared_string_local_maps">Paikalliset kartat</string>
+    <string name="login_open_street_map_org">Kirjaudu sisään OpenStreetMap.org</string>
+    <string name="login_open_street_map">Kirjaudu sisään OpenStreetMap</string>
+    <string name="sign_in_with_open_street_map">Kirjaudu käyttäen OpenStreetMap</string>
+    <string name="open_street_map_login_mode">Sinun pitää kirjautua lähettääksesi uusia tai päivittääksesi tekemäsi muutokset. 
+\n
+\nVoit kirjautua turvallisella OAuth-tavalla tai kirjautua salasanalla.</string>
+    <string name="use_login_password">Käytä kirjautumista ja salasanaa</string>
+    <string name="login_account">Tili</string>
+    <string name="subscription_payment_issue_title">Paina nappulaa korjataksesi tilauksesi maksutavan Google Playssä.</string>
+    <string name="user_login">Kirjaudu</string>
+    <string name="manage_subscription">Muokkaa tilausta</string>
+    <string name="subscription_expired_title">OsmAnd Live-tilaus on vanhentunut</string>
+    <string name="subscription_paused_title">OsmAnd Live-tilaus on pysäytetty</string>
+    <string name="subscription_on_hold_title">OsmAnd Live-tilaus on pidossa</string>
+    <string name="osm_edit_close_note">Sulje OSM Note</string>
+    <string name="osm_edit_comment_note">Kommentoi OSM Notea</string>
+    <string name="osm_login_descr">Voit kirjautua turvallisesti käyttämällä turvallista OAuth-tapaa tai kirjaudu tunnuksellasi ja salasanallasi.</string>
+    <string name="shared_string_add_photo">Lisää kuva</string>
+    <string name="register_on_openplacereviews">Rekistöröidy
+\nOpenPlaceReviews.org-sivulla</string>
+    <string name="register_on_openplacereviews_desc">Kuvat ovat peräisin OpenPlaceReviews.org-sivun vapaasta dataprojektista. Jos haluat lähettää omia kuvia, sinun pitää luoda tunnukset heidän sivulla.</string>
+    <string name="register_opr_create_new_account">Luo uudet tunnukset</string>
+    <string name="register_opr_have_account">Minulla on jo tunnukset</string>
+    <string name="shared_string_search_history">Hakuhistoria</string>
+    <string name="app_mode_kayak">Kajakki</string>
+    <string name="app_mode_motorboat">Moottorivene</string>
+    <string name="cannot_upload_image">Kuvaa ei voitu lähettää, yritä uudelleen myöhemmin</string>
+    <string name="select_picture">Valitse kuva</string>
+    <string name="shared_string_resources">Resurssit</string>
+    <string name="approximate_file_size">Likimääräinen tiedostonkoko</string>
+    <string name="select_data_to_export">Valitse data joka viedään tiedostoon.</string>
+    <string name="file_size_needed_for_import">Tarvitaan tuontiin</string>
+    <string name="export_not_enough_space_descr">Laitteellasi on vain %1$s vapaata tallennustilaa. Vapauta tilaa tai valitse vähemmän vietäviä kohteita.</string>
+    <string name="export_not_enough_space">Ei ole tarpeeksi tilaa</string>
+    <string name="plan_route_split_after">Jaa jälkeen</string>
+    <string name="plan_route_split_before">Jaa ennen</string>
+    <string name="routing_engine_vehicle_type_foot">Kävely</string>
+    <string name="routing_engine_vehicle_type_bike">Polkupyörä</string>
+    <string name="routing_engine_vehicle_type_car">Auto</string>
 </resources>

OsmAnd/res/values-fr/phrases.xml

@@ -22,7 +22,6 @@
     <string name="poi_arts_centre">Centre artistique</string>
     <string name="poi_artwork">Œuvre d’art</string>
     <string name="poi_athletics">Athlétisme</string>
-    <string name="poi_amenity_atm">Distributeur de billets</string>
     <string name="poi_attraction">Attraction touristique</string>
     <string name="poi_baby_hatch">Tour d\'abandon</string>
     <string name="poi_bailiff">Huissier</string>
@@ -203,7 +202,6 @@
     <string name="poi_landmark">Point de repère</string>
     <string name="poi_laundry">Laverie</string>
     <string name="poi_lawyer">Cabinet de juriste</string>
-    <string name="poi_level_crossing">Passage à niveau</string>
     <string name="poi_library">Bibliothèque</string>
     <string name="poi_seamark_light">Feu (amer)</string>
     <string name="poi_seamark_light_float">Bouée lumineuse (amer)</string>
@@ -328,7 +326,6 @@
     <string name="poi_religion_taoist">Taoïsme</string>
     <string name="poi_tattoo">Salon de tatouage</string>
     <string name="poi_taxi">Station de taxis</string>
-    <string name="poi_team_handball">Handball</string>
     <string name="poi_office_telecommunication">Entreprise de télécommunications</string>
     <string name="poi_telephone">Téléphone public</string>
     <string name="poi_tennis">Tennis</string>
@@ -394,7 +391,6 @@
     <string name="poi_tunnel">Tunnel</string>
     <string name="poi_register_office">Bureau d\'état civil</string>
     <string name="poi_customs">Douanes</string>
-    <string name="poi_healthcare_centre">Centre médical</string>
     <string name="poi_speech_therapist">Orthophoniste</string>
     <string name="poi_advertising_agency">Agence de publicité</string>
     <string name="poi_chess">Échecs</string>
@@ -460,7 +456,6 @@
     <string name="poi_seamark_wreck">Épave</string>
     <string name="poi_bag">Maroquinerie</string>
     <string name="poi_military_airfield">Aérodrome militaire</string>
-    <string name="poi_bedding">Magasin de literie</string>
     <string name="poi_erotic">Sex-shop</string>
     <string name="poi_herbalist">Herboriste</string>
     <string name="poi_kitchen">Magasin de cuisines</string>
@@ -505,7 +500,6 @@
     <string name="poi_club_photography">Club de photographie</string>
     <string name="poi_hot_spring">Source d\'eau chaude</string>
     <string name="poi_geyser">Geyser</string>
-    <string name="poi_historic_monastery">Monastère désaffecté</string>
     <string name="poi_fort">Fort</string>
     <string name="poi_american_football">Football américain</string>
     <string name="poi_bmx">BMX</string>
@@ -731,7 +725,6 @@
     <string name="poi_bell_tower">Clocher</string>
     <string name="poi_ski_rental">Location de ski</string>
     <string name="poi_ski_resort">Station de ski</string>
-    <string name="poi_general_tourist_attraction_yes">Attraction touristique</string>
     <string name="poi_cabin">Cabane</string>
     <string name="poi_lean_to">Abri ouvert</string>
     <string name="poi_hunting_lodge">Pavillon de chasse</string>
@@ -813,14 +806,12 @@
     <string name="poi_tyres">Magasin de pneumatiques</string>
     <string name="poi_scuba_diving_shop">Magasin pour la plongée sous-marine</string>
     <string name="poi_swimming_pool_shop">Pisciniste</string>
-    <string name="poi_building_poi">Construction</string>
     <string name="poi_tree">Arbre</string>
     <string name="poi_block">Quartier</string>
     <string name="poi_abandoned">Abandonné</string>
     <string name="poi_pasta">Magasin de pâtes</string>
     <string name="poi_pastry">Pâtisserie</string>
     <string name="poi_free_flying">Magasin d\'articles de vol libre</string>
-    <string name="poi_furnace">Boutique d\'articles de chauffage</string>
     <string name="poi_leather">Magasin de cuir</string>
     <string name="poi_energy">Magasin de fourniture d\'énergie</string>
     <string name="poi_pyrotechnics">Magasin de pyrotechnie</string>
@@ -828,9 +819,7 @@
     <string name="poi_breakwater">Brise-lames</string>
     <string name="poi_power_cable_distribution_cabinet">Armoire de distribution électrique</string>
     <string name="poi_basin">Bassin de rétention d\'eau</string>
-    <string name="poi_conservation">Zone protégée</string>
     <string name="poi_crane">Grue</string>
-    <string name="poi_tourism_attraction">Attraction touristique</string>
     <string name="poi_wiki_lang_ceb">Wiki cébouano</string>
     <string name="poi_wiki_lang_vo">Wiki volapük</string>
     <string name="poi_cycle_barrier">Barrière cycliste</string>
@@ -963,7 +952,6 @@
     <string name="poi_crossing_traffic_signals">Avec feux de circulation</string>
     <string name="poi_crossing_uncontrolled">Sans feux de circulation</string>
     <string name="poi_crossing_unmarked">Sans marquage au sol, ni feux</string>
-    <string name="poi_mill_pond">Retenue d\'eau</string>
     <string name="poi_recycling_scrap_metal">Ferraille</string>
     <string name="poi_recycling_waste">Poubelle (sacs noirs)</string>
     <string name="poi_recycling_cardboard">Carton</string>
@@ -1081,7 +1069,6 @@
     <string name="poi_generator_source_geothermal">Source d\'énergie : géothermie</string>
     <string name="poi_generator_source_oil">Source d\'énergie : pétrole</string>
     <string name="poi_generator_source_diesel">Source d\'énergie : diesel</string>
-    <string name="poi_car_wash_self_service">Self service</string>
     <string name="poi_int_name">Nom international</string>
     <string name="poi_nat_name">Nom national</string>
     <string name="poi_reg_name">Nom régional</string>
@@ -1195,8 +1182,6 @@
     <string name="poi_stars_4s">4S (première classe supérieure)</string>
     <string name="poi_stars_5">5 (luxe)</string>
     <string name="poi_stars_5s">5S (luxe supérieur)</string>
-    <string name="poi_stars_6">Etoiles : 6</string>
-    <string name="poi_stars_7">Etoiles : 7</string>
     <string name="poi_payment_coins_yes">Pièces</string>
     <string name="poi_payment_coins_no">Pièces non acceptées</string>
     <string name="poi_payment_coins_50c12">Pièces de 50 cent, 1€ et 2€</string>
@@ -1425,7 +1410,6 @@
     <string name="poi_payment_cash_no">Espèces non acceptées</string>
     <string name="poi_payment_debit_cards_yes">Cartes de débit</string>
     <string name="poi_payment_debit_cards_no">Cartes de débit non acceptées</string>
-    <string name="poi_payment_none">Gratuit</string>
     <string name="poi_social_facility_for_senior">Seniors</string>
     <string name="poi_social_facility_for_child">Enfants</string>
     <string name="poi_social_facility_for_orphan">Orphelins</string>
@@ -1754,7 +1738,6 @@
     <string name="poi_castle_type_kremlin">Type de château : kremlin</string>
     <string name="poi_sanitary_dump_station_yes">Vidange sanitaire : oui</string>
     <string name="poi_sanitary_dump_station_no">Vidange sanitaire : non</string>
-    <string name="poi_sanitary_dump_station_customers">Station de vidange sanitaire : clients uniquement</string>
     <string name="poi_refugee_no">Réfugiés : non</string>
     <string name="poi_product_charcoal">Produit : charbon</string>
     <string name="poi_tomb_war_grave">Type : tombe de guerre</string>
@@ -1804,7 +1787,6 @@
     <string name="poi_leaf_type_needleleaved">Arbres avec aiguilles</string>
     <string name="poi_leaf_type_mixed">Mélangé</string>
     <string name="poi_trees_kiwi">Kiwi</string>
-    <string name="poi_information_wildlife">Indicateur d’information : vie sauvage</string>
     <string name="poi_information_history">Historique</string>
     <string name="poi_information_route_marker">Indicateur d’itinéraire</string>
     <string name="poi_capacity_parent_no">Pas de places réservées aux parents</string>
@@ -2728,7 +2710,6 @@
     <string name="poi_inscription_se">Inscription : SE</string>
     <string name="poi_inscription_e">Inscription : E</string>
     <string name="poi_inscription_ne">Inscription : NE</string>
-    <string name="poi_additional_atm_yes">DAB : oui</string>
     <string name="poi_atm_no">DAB : non</string>
     <string name="poi_payment_ep_minipay_no">Minipay non accepté</string>
     <string name="poi_payment_ep_minicash_no">MiniCash non accepté</string>
@@ -3035,7 +3016,6 @@
     <string name="poi_water_source_main">Réseau de distribution</string>
     <string name="poi_water_source_pond">Étang</string>
     <string name="poi_water_source_stream">Ruisseau</string>
-    <string name="poi_fire_hydrant_style_water_source_cistern">Citerne</string>
     <string name="poi_crossing_activation_automatic">Activation du passage : automatique</string>
     <string name="poi_crossing_activation_local">Activation du passage : local</string>
     <string name="poi_crossing_activation_remote">Activation du passage : à distance</string>
@@ -3213,7 +3193,6 @@
     <string name="poi_cannabis">Boutique de cannabis</string>
     <string name="poi_denotation">Dénotation</string>
     <string name="poi_rtsa_scale_filter">Catégorie de difficulté</string>
-    <string name="poi_health_specialty_radiotheraphy_yes">Radiothérapie</string>
     <string name="poi_nuclear_explosion_series">Série d\'explosions</string>
     <string name="poi_health_person_type_paramedic">Rôle du personnel de santé : paramédical</string>
     <string name="poi_health_person_type_physician">Rôle du personnel de santé : médecin</string>
@@ -3269,7 +3248,6 @@
     <string name="poi_park_ride_hov">VOM</string>
     <string name="poi_park_ride_tram">Tram</string>
     <string name="poi_park_ride_ferry">Ferry</string>
-    <string name="poi_generator_source_biomass">Source d\'énergie : biomasse</string>
     <string name="poi_rtsa_scale_nc">н/к</string>
     <string name="poi_rtsa_scale_nc_asterisk">н/к*</string>
     <string name="poi_rtsa_scale_1a">1А</string>