Merge branch 'master' into AddVisibleGpxToHistory

# Conflicts:
#	OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java

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

@@ -4,6 +4,7 @@ import net.osmand.Location;
 import net.osmand.PlatformUtil;
 import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion;
 import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteTypeRule;
+import net.osmand.data.LatLon;
 import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 import net.osmand.util.TransliterationHelper;
@@ -37,7 +38,9 @@ public class RouteDataObject {
 	public int[] nameIds;
 	// mixed array [0, height, cumulative_distance height, cumulative_distance, height, ...] - length is length(points)*2
 	public float[] heightDistanceArray = null;
+	public float heightByCurrentLocation;
 	private static final Log LOG = PlatformUtil.getLog(RouteDataObject.class);
+
 	public RouteDataObject(RouteRegion region) {
 		this.region = region;
 	}
@@ -165,6 +168,10 @@ public class RouteDataObject {
 	}
 
 	public float[] calculateHeightArray() {
+		return calculateHeightArray(null);
+	}
+
+	public float[] calculateHeightArray(LatLon currentLocation) {
 		if (heightDistanceArray != null) {
 			return heightDistanceArray;
 		}
@@ -178,7 +185,8 @@ public class RouteDataObject {
 		heightDistanceArray = new float[2 * getPointsLength()];
 		double plon = 0;
 		double plat = 0;
-		float prevHeight = startHeight;
+		float prevHeight = heightByCurrentLocation = startHeight;
+		double prevDistance = 0;
 		for (int k = 0; k < getPointsLength(); k++) {
 			double lon = MapUtils.get31LongitudeX(getPoint31XTile(k));
 			double lat = MapUtils.get31LatitudeY(getPoint31YTile(k));
@@ -200,6 +208,15 @@ public class RouteDataObject {
 				}
 				heightDistanceArray[2 * k] = (float) dd;
 				heightDistanceArray[2 * k + 1] = height;
+
+				if (currentLocation != null) {
+					double distance = MapUtils.getDistance(currentLocation, lat, lon);
+					if (height != HEIGHT_UNDEFINED && distance < prevDistance) {
+						prevDistance = distance;
+						heightByCurrentLocation = height;
+					}
+				}
+
 				if (height != HEIGHT_UNDEFINED) {
 					// interpolate undefined
 					double totalDistance = dd;
@@ -223,6 +240,9 @@ public class RouteDataObject {
 			}
 			plat = lat;
 			plon = lon;
+			if (currentLocation != null) {
+				prevDistance = MapUtils.getDistance(currentLocation, plat, plon);
+			}
 		}
 		return heightDistanceArray;
 	}

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

@@ -0,0 +1,448 @@
+package net.osmand.router;
+
+import net.osmand.GPXUtilities;
+import net.osmand.PlatformUtil;
+import net.osmand.osm.edit.Node;
+import net.osmand.osm.edit.OsmMapUtils;
+import net.osmand.util.MapUtils;
+import org.apache.commons.logging.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RouteColorize {
+
+    public int zoom;
+    public double[] latitudes;
+    public double[] longitudes;
+    public double[] values;
+    public double minValue;
+    public double maxValue;
+    public double[][] palette;
+
+    private List<RouteColorizationPoint> dataList;
+
+    public static final int DARK_GREY = rgbaToDecimal(92, 92, 92, 255);
+    public static final int LIGHT_GREY = rgbaToDecimal(200, 200, 200, 255);
+    public static final int RED = rgbaToDecimal(255,1,1,255);
+    public static final int GREEN = rgbaToDecimal(46,185,0,191);
+    public static final int YELLOW = rgbaToDecimal(255,222,2,227);
+
+    public enum ValueType {
+        ELEVATION,
+        SPEED,
+        SLOPE,
+        NONE
+    }
+
+    private final int VALUE_INDEX = 0;
+    private final int DECIMAL_COLOR_INDEX = 1;//sRGB decimal format
+    private final int RED_COLOR_INDEX = 1;//RGB
+    private final int GREEN_COLOR_INDEX = 2;//RGB
+    private final int BLUE_COLOR_INDEX = 3;//RGB
+    private final int ALPHA_COLOR_INDEX = 4;//RGBA
+
+    private ValueType valueType;
+
+    public static int SLOPE_RANGE = 150;//150 meters
+    private static final double MIN_DIFFERENCE_SLOPE = 0.05d;//5%
+
+    private static final Log LOG = PlatformUtil.getLog(RouteColorize.class);
+
+    /**
+     * @param minValue can be NaN
+     * @param maxValue can be NaN
+     * @param palette  array {{value,color},...} - color in sRGB (decimal) format OR {{value,RED,GREEN,BLUE,ALPHA},...} - color in RGBA format
+     */
+    public RouteColorize(int zoom, double[] latitudes, double[] longitudes, double[] values, double minValue, double maxValue, double[][] palette) {
+        this.zoom = zoom;
+        this.latitudes = latitudes;
+        this.longitudes = longitudes;
+        this.values = values;
+        this.minValue = minValue;
+        this.maxValue = maxValue;
+        this.palette = palette;
+
+        if (Double.isNaN(minValue) || Double.isNaN(maxValue)) {
+            calculateMinMaxValue();
+        }
+        checkPalette();
+        sortPalette();
+    }
+
+    /**
+     * @param type ELEVATION, SPEED, SLOPE
+     */
+    public RouteColorize(int zoom, GPXUtilities.GPXFile gpxFile, ValueType type) {
+
+        if (!gpxFile.hasTrkPt()) {
+            LOG.warn("GPX file is not consist of track points");
+            return;
+        }
+
+        List<Double> latList = new ArrayList<>();
+        List<Double> lonList = new ArrayList<>();
+        List<Double> valList = new ArrayList<>();
+        for (GPXUtilities.Track t : gpxFile.tracks) {
+            for (GPXUtilities.TrkSegment ts : t.segments) {
+                for (GPXUtilities.WptPt p : ts.points) {
+                    latList.add(p.lat);
+                    lonList.add(p.lon);
+                    if (type == ValueType.SPEED) {
+                        valList.add(p.speed);
+                    } else {
+                        valList.add(p.ele);
+                    }
+                }
+            }
+        }
+
+        this.zoom = zoom;
+        latitudes = listToArray(latList);
+        longitudes = listToArray(lonList);
+
+        if (type == ValueType.SLOPE) {
+            values = calculateSlopesByElevations(latitudes, longitudes, listToArray(valList), SLOPE_RANGE);
+        } else {
+            values = listToArray(valList);
+        }
+
+        calculateMinMaxValue();
+        valueType = type;
+        checkPalette();
+        sortPalette();
+    }
+
+    /**
+     * Calculate slopes from elevations needs for right colorizing
+     *
+     * @param slopeRange - in what range calculate the derivative, usually we used 150 meters
+     * @return slopes array, in the begin and the end present NaN values!
+     */
+    public double[] calculateSlopesByElevations(double[] latitudes, double[] longitudes, double[] elevations, double slopeRange) {
+
+        double[] newElevations = elevations;
+        for (int i = 2; i < elevations.length - 2; i++) {
+            newElevations[i] = elevations[i - 2]
+                    + elevations[i - 1]
+                    + elevations[i]
+                    + elevations[i + 1]
+                    + elevations[i + 2];
+            newElevations[i] /= 5;
+        }
+        elevations = newElevations;
+
+        double[] slopes = new double[elevations.length];
+        if (latitudes.length != longitudes.length || latitudes.length != elevations.length) {
+            LOG.warn("Sizes of arrays latitudes, longitudes and values are not match");
+            return slopes;
+        }
+
+        double[] distances = new double[elevations.length];
+        double totalDistance = 0.0d;
+        distances[0] = totalDistance;
+        for (int i = 0; i < elevations.length - 1; i++) {
+            totalDistance += MapUtils.getDistance(latitudes[i], longitudes[i], latitudes[i + 1], longitudes[i + 1]);
+            distances[i + 1] = totalDistance;
+        }
+
+        for (int i = 0; i < elevations.length; i++) {
+            if (distances[i] < slopeRange / 2 || distances[i] > totalDistance - slopeRange / 2) {
+                slopes[i] = Double.NaN;
+            } else {
+                double[] arg = findDerivativeArguments(distances, elevations, i, slopeRange);
+                slopes[i] = (arg[1] - arg[0]) / (arg[3] - arg[2]);
+            }
+        }
+        return slopes;
+    }
+
+    public List<RouteColorizationPoint> getResult(boolean simplify) {
+        List<RouteColorizationPoint> result = new ArrayList<>();
+        if (simplify) {
+            result = simplify();
+        } else {
+            for (int i = 0; i < latitudes.length; i++) {
+                result.add(new RouteColorizationPoint(i, latitudes[i], longitudes[i], values[i]));
+            }
+        }
+        for (RouteColorizationPoint data : result) {
+            data.color = getColorByValue(data.val);
+        }
+        return result;
+    }
+
+    public int getColorByValue(double value) {
+        if (Double.isNaN(value)) {
+            value = (minValue + maxValue) / 2;
+        }
+        for (int i = 0; i < palette.length - 1; i++) {
+            if (value == palette[i][VALUE_INDEX])
+                return (int) palette[i][DECIMAL_COLOR_INDEX];
+            if (value >= palette[i][VALUE_INDEX] && value <= palette[i + 1][VALUE_INDEX]) {
+                int minPaletteColor = (int) palette[i][DECIMAL_COLOR_INDEX];
+                int maxPaletteColor = (int) palette[i + 1][DECIMAL_COLOR_INDEX];
+                double minPaletteValue = palette[i][VALUE_INDEX];
+                double maxPaletteValue = palette[i + 1][VALUE_INDEX];
+                double percent = (value - minPaletteValue) / (maxPaletteValue - minPaletteValue);
+                double resultRed = getRed(minPaletteColor) + percent * (getRed(maxPaletteColor) - getRed(minPaletteColor));
+                double resultGreen = getGreen(minPaletteColor) + percent * (getGreen(maxPaletteColor) - getGreen(minPaletteColor));
+                double resultBlue = getBlue(minPaletteColor) + percent * (getBlue(maxPaletteColor) - getBlue(minPaletteColor));
+                double resultAlpha = getAlpha(minPaletteColor) + percent * (getAlpha(maxPaletteColor) - getAlpha(minPaletteColor));
+                return rgbaToDecimal((int) resultRed, (int) resultGreen, (int) resultBlue, (int) resultAlpha);
+            }
+        }
+        return getDefaultColor();
+    }
+
+    public void setPalette(double[][] palette) {
+        this.palette = palette;
+        checkPalette();
+        sortPalette();
+    }
+
+    private int getDefaultColor() {
+        return rgbaToDecimal(0, 0, 0, 0);
+    }
+
+    private List<RouteColorizationPoint> simplify() {
+        if (dataList == null) {
+            dataList = new ArrayList<>();
+            for (int i = 0; i < latitudes.length; i++) {
+                //System.out.println(latitudes[i] + " " + longitudes[i] + " " + values[i]);
+                dataList.add(new RouteColorizationPoint(i, latitudes[i], longitudes[i], values[i]));
+            }
+        }
+        List<Node> nodes = new ArrayList<>();
+        List<Node> result = new ArrayList<>();
+        for (RouteColorizationPoint data : dataList) {
+            nodes.add(new net.osmand.osm.edit.Node(data.lat, data.lon, data.id));
+        }
+        OsmMapUtils.simplifyDouglasPeucker(nodes, zoom + 5, 1, result, true);
+
+        List<RouteColorizationPoint> simplified = new ArrayList<>();
+
+        for (int i = 1; i < result.size() - 1; i++) {
+            int prevId = (int) result.get(i - 1).getId();
+            int currentId = (int) result.get(i).getId();
+            List<RouteColorizationPoint> sublist = dataList.subList(prevId, currentId);
+            simplified.addAll(getExtremums(sublist));
+        }
+        return simplified;
+    }
+
+    private List<RouteColorizationPoint> getExtremums(List<RouteColorizationPoint> subDataList) {
+        if (subDataList.size() <= 2) {
+            return subDataList;
+        }
+
+        List<RouteColorizationPoint> result = new ArrayList<>();
+        double min;
+        double max;
+        min = max = subDataList.get(0).val;
+        for (RouteColorizationPoint pt : subDataList) {
+            if (min > pt.val) {
+                min = pt.val;
+            }
+            if (max < pt.val) {
+                max = pt.val;
+            }
+        }
+
+        double diff = max - min;
+
+        result.add(subDataList.get(0));
+        for (int i = 1; i < subDataList.size() - 1; i++) {
+            double prev = subDataList.get(i - 1).val;
+            double current = subDataList.get(i).val;
+            double next = subDataList.get(i + 1).val;
+            RouteColorizationPoint currentData = subDataList.get(i);
+
+            if ((current > prev && current > next) || (current < prev && current < next)
+                    || (current < prev && current == next) || (current == prev && current < next)
+                    || (current > prev && current == next) || (current == prev && current > next)) {
+                RouteColorizationPoint prevInResult;
+                if (result.size() > 0) {
+                    prevInResult = result.get(0);
+                    if (prevInResult.val / diff > MIN_DIFFERENCE_SLOPE) {
+                        result.add(currentData);
+                    }
+                } else
+                    result.add(currentData);
+            }
+        }
+        result.add(subDataList.get(subDataList.size() - 1));
+        return result;
+    }
+
+    private void checkPalette() {
+        if (palette == null || palette.length < 2 || palette[0].length < 2 || palette[1].length < 2) {
+            LOG.info("Will use default palette");
+            palette = new double[3][2];
+
+            double[][] defaultPalette = {
+                    {minValue, GREEN},
+                    {valueType == ValueType.SLOPE ? 0 : (minValue + maxValue) / 2, YELLOW},
+                    {maxValue, RED}
+            };
+            palette = defaultPalette;
+        }
+        double min;
+        double max = min = palette[0][VALUE_INDEX];
+        int minIndex = 0;
+        int maxIndex = 0;
+        double[][] sRGBPalette = new double[palette.length][2];
+        for (int i = 0; i < palette.length; i++) {
+            double[] p = palette[i];
+            if (p.length == 2) {
+                sRGBPalette[i] = p;
+            } else if (p.length == 4) {
+                int color = rgbaToDecimal((int) p[RED_COLOR_INDEX], (int) p[GREEN_COLOR_INDEX], (int) p[BLUE_COLOR_INDEX], 255);
+                sRGBPalette[i] = new double[]{p[VALUE_INDEX], color};
+            } else if (p.length >= 5) {
+                int color = rgbaToDecimal((int) p[RED_COLOR_INDEX], (int) p[GREEN_COLOR_INDEX], (int) p[BLUE_COLOR_INDEX], (int) p[ALPHA_COLOR_INDEX]);
+                sRGBPalette[i] = new double[]{p[VALUE_INDEX], color};
+            }
+            if (p[VALUE_INDEX] > max) {
+                max = p[VALUE_INDEX];
+                maxIndex = i;
+            }
+            if (p[VALUE_INDEX] < min) {
+                min = p[VALUE_INDEX];
+                minIndex = i;
+            }
+        }
+        palette = sRGBPalette;
+        if (minValue < min) {
+            palette[minIndex][VALUE_INDEX] = minValue;
+        }
+        if (maxValue > max) {
+            palette[maxIndex][VALUE_INDEX] = maxValue;
+        }
+    }
+
+    private void sortPalette() {
+        java.util.Arrays.sort(palette, new java.util.Comparator<double[]>() {
+            public int compare(double[] a, double[] b) {
+                return Double.compare(a[VALUE_INDEX], b[VALUE_INDEX]);
+            }
+        });
+    }
+
+    /**
+     * @return double[minElevation, maxElevation, minDist, maxDist]
+     */
+    private double[] findDerivativeArguments(double[] distances, double[] elevations, int index, double slopeRange) {
+        double[] result = new double[4];
+        double minDist = distances[index] - slopeRange / 2;
+        double maxDist = distances[index] + slopeRange / 2;
+        result[0] = Double.NaN;
+        result[1] = Double.NaN;
+        result[2] = minDist;
+        result[3] = maxDist;
+        int closestMaxIndex = -1;
+        int closestMinIndex = -1;
+        for (int i = index; i < distances.length; i++) {
+            if (distances[i] == maxDist) {
+                result[1] = elevations[i];
+                break;
+            }
+            if (distances[i] > maxDist) {
+                closestMaxIndex = i;
+                break;
+            }
+        }
+        for (int i = index; i >= 0; i--) {
+            if (distances[i] == minDist) {
+                result[0] = elevations[i];
+                break;
+            }
+            if (distances[i] < minDist) {
+                closestMinIndex = i;
+                break;
+            }
+        }
+        if (closestMaxIndex > 0) {
+            double diff = distances[closestMaxIndex] - distances[closestMaxIndex - 1];
+            double coef = (maxDist - distances[closestMaxIndex - 1]) / diff;
+            if (coef > 1 || coef < 0) {
+                LOG.warn("Coefficient fo max must be 0..1 , coef=" + coef);
+            }
+            result[1] = (1 - coef) * elevations[closestMaxIndex - 1] + coef * elevations[closestMaxIndex];
+        }
+        if (closestMinIndex >= 0) {
+            double diff = distances[closestMinIndex + 1] - distances[closestMinIndex];
+            double coef = (minDist - distances[closestMinIndex]) / diff;
+            if (coef > 1 || coef < 0) {
+                LOG.warn("Coefficient for min must be 0..1 , coef=" + coef);
+            }
+            result[0] = (1 - coef) * elevations[closestMinIndex] + coef * elevations[closestMinIndex + 1];
+        }
+        if (Double.isNaN(result[0]) || Double.isNaN(result[1])) {
+            LOG.warn("Elevations wasn't calculated");
+        }
+        return result;
+    }
+
+    private void calculateMinMaxValue() {
+        if (values.length == 0)
+            return;
+        minValue = maxValue = Double.NaN;
+        for (double value : values) {
+            if ((Double.isNaN(maxValue) || Double.isNaN(minValue)) && !Double.isNaN(value))
+                maxValue = minValue = value;
+            if (minValue > value)
+                minValue = value;
+            if (maxValue < value)
+                maxValue = value;
+        }
+    }
+
+    private double[] listToArray(List<Double> doubleList) {
+        double[] result = new double[doubleList.size()];
+        for (int i = 0; i < doubleList.size(); i++) {
+            result[i] = doubleList.get(i);
+        }
+        return result;
+    }
+
+    private static int rgbaToDecimal(int r, int g, int b, int a) {
+        int value = ((a & 0xFF) << 24) |
+                ((r & 0xFF) << 16) |
+                ((g & 0xFF) << 8)  |
+                ((b & 0xFF) << 0);
+        return value;
+    }
+
+    private int getRed(int value) {
+        return (value >> 16) & 0xFF;
+    }
+
+    private int getGreen(int value) {
+        return (value >> 8) & 0xFF;
+    }
+
+    private int getBlue(int value) {
+        return (value >> 0) & 0xFF;
+    }
+
+    private int getAlpha(int value) {
+        return (value >> 24) & 0xff;
+    }
+
+    public static class RouteColorizationPoint {
+        int id;
+        public double lat;
+        public double lon;
+        public double val;
+        public int color;
+
+        RouteColorizationPoint(int id, double lat, double lon, double val) {
+            this.id = id;
+            this.lat = lat;
+            this.lon = lon;
+            this.val = val;
+        }
+    }
+
+}

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

@@ -53,6 +53,8 @@ public class Algorithms {
 	public static final int XML_FILE_SIGNATURE = 0x3c3f786d;
 	public static final int OBF_FILE_SIGNATURE = 0x08029001;
 	public static final int SQLITE_FILE_SIGNATURE = 0x53514C69;
+	public static final int BZIP_FILE_SIGNATURE = 0x425a;
+	public static final int GZIP_FILE_SIGNATURE = 0x1f8b;
 
 	public static String normalizeSearchText(String s) {
 		boolean norm = false;
@@ -322,6 +324,24 @@ public class Algorithms {
 		return test == ZIP_FILE_SIGNATURE;
 	}
 
+	public static boolean checkFileSignature(InputStream inputStream, int fileSignature) throws IOException {
+		if (inputStream == null) return false;
+		int firstBytes;
+		if (isSmallFileSignature(fileSignature)) {
+			firstBytes = readSmallInt(inputStream);
+		} else {
+			firstBytes = readInt(inputStream);
+		}
+		if (inputStream.markSupported()) {
+			inputStream.reset();
+		}
+		return firstBytes == fileSignature;
+	}
+
+	public static boolean isSmallFileSignature(int fileSignature) {
+		return fileSignature == BZIP_FILE_SIGNATURE || fileSignature == GZIP_FILE_SIGNATURE;
+	}
+
 	/**
 	 * Checks, whether the child directory is a subdirectory of the parent
 	 * directory.
@@ -358,6 +378,14 @@ public class Algorithms {
 		return ((ch1 << 24) + (ch2 << 16) + (ch3 << 8) + ch4);
 	}
 
+	public static int readSmallInt(InputStream in) throws IOException {
+		int ch1 = in.read();
+		int ch2 = in.read();
+		if ((ch1 | ch2) < 0)
+			throw new EOFException();
+		return ((ch1 << 8) + ch2);
+	}
+
 	public static String capitalizeFirstLetterAndLowercase(String s) {
 		if (s != null && s.length() > 1) {
 			// not very efficient algorithm
@@ -537,6 +565,13 @@ public class Algorithms {
 		}
 	}
 
+	public static ByteArrayInputStream createByteArrayIS(InputStream in) throws IOException {
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		streamCopy(in, out);
+		in.close();
+		return new ByteArrayInputStream(out.toByteArray());
+	}
+
 	@SuppressWarnings("ResultOfMethodCallIgnored")
 	public static void updateAllExistingImgTilesToOsmandFormat(File f) {
 		if (f.isDirectory()) {

OsmAnd/res/drawable/ic_action_file_report.xml

@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,2C4.8954,2 4,2.8954 4,4V20C4,21.1046 4.8954,22 6,22H18C19.1046,22 20,21.1046 20,20V8H16C14.8954,8 14,7.1046 14,6V2H6ZM9,9H7V11H9V9ZM7,13H9V15H7V13ZM7,17H9V19H7V17ZM11,11V9H17V11H11ZM17,15V13H11V15H17ZM17,19V17H11V19H17Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14,2L20,8H16C14.8954,8 14,7.1046 14,6V2Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M17,9H11V11H17V9Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M11,13H17V15H11V13Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M11,17H17V19H11V17Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+</vector>

OsmAnd/res/drawable/ic_action_update.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,0.9999L16,4.9999L12,8.9999L12,6C8.6863,6 6,8.6863 6,12C6,12.7351 6.1322,13.4394 6.3741,14.0903L4.8574,15.6071C4.309,14.5232 4,13.2977 4,12C4,7.5817 7.5817,4 12,4V0.9999Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,15.0001L12,18C15.3137,18 18,15.3137 18,12C18,11.2649 17.8678,10.5606 17.6258,9.9097L19.1426,8.3929C19.691,9.4768 20,10.7023 20,12C20,16.4183 16.4183,20 12,20V23.0001L8,19.0001L12,15.0001Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/layout/add_new_favorite_category.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:osmand="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<View
+		android:layout_width="0dp"
+		android:layout_height="0dp"
+		android:focusable="true"
+		android:focusableInTouchMode="true" />
+
+	<com.google.android.material.textfield.TextInputLayout
+		android:id="@+id/name_text_box"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:hint="@string/favorite_category_name"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		app:startIconDrawable="@drawable/ic_action_folder">
+
+		<com.google.android.material.textfield.TextInputEditText
+			android:id="@+id/name_edit_text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:inputType="textCapSentences"
+			android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier" />
+
+	</com.google.android.material.textfield.TextInputLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:letterSpacing="@dimen/description_letter_spacing"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingTop="@dimen/context_menu_first_line_top_margin"
+			android:paddingRight="@dimen/content_padding"
+			android:paddingBottom="@dimen/context_menu_first_line_top_margin"
+			android:text="@string/select_color"
+			android:textColor="?android:textColorSecondary"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/color_name"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="end"
+			android:letterSpacing="@dimen/description_letter_spacing"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingTop="@dimen/context_menu_first_line_top_margin"
+			android:paddingRight="@dimen/content_padding"
+			android:paddingBottom="@dimen/context_menu_first_line_top_margin"
+			android:text="@string/select_color"
+			android:textColor="?android:textColorSecondary"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium" />
+	</LinearLayout>
+
+	<LinearLayout
+		android:id="@+id/select_color"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/content_padding_small"
+		android:layout_marginLeft="@dimen/content_padding_small"
+		android:layout_marginTop="@dimen/context_menu_padding_margin_tiny"
+		android:layout_marginBottom="@dimen/content_padding_half"
+		android:orientation="horizontal" />
+
+</LinearLayout>

OsmAnd/res/layout/bottom_sheet_item_with_descr_and_radio_btn.xml

@@ -9,6 +9,7 @@
 
 	<LinearLayout
 		android:layout_width="match_parent"
+		android:id="@+id/descriptionContainer"
 		android:layout_height="@dimen/bottom_sheet_large_list_item_height"
 		android:gravity="center_vertical"
 		android:orientation="horizontal"

OsmAnd/res/layout/favorite_categories_dialog.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+			android:id="@+id/scroll_container"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:paddingBottom="@dimen/dialog_content_bottom_margin"

OsmAnd/res/layout/preference_colors_card.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content">
+
+	<net.osmand.plus.widgets.FlowLayout
+		android:id="@+id/color_items"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="4dp" />
+</LinearLayout>

OsmAnd/res/values-ar/strings.xml

@@ -2123,10 +2123,8 @@
     <string name="quick_action_interim_dialog">عرض مربع الحوار مؤقتاً</string>
     <string name="favorite_autofill_toast_text">" حفظ إلى "</string>
     <string name="favorite_empty_place_name">مكان</string>
-    <string name="quick_action_showhide_favorites_title">عرض/إخفاء المفضلة</string>
     <string name="quick_action_favorites_show">عرض المفضلة</string>
     <string name="quick_action_favorites_hide">إخفاء المفضلة</string>
-    <string name="quick_action_showhide_poi_title">عرض/إخفاء نقاط الاهتمام</string>
     <string name="quick_action_poi_show">عرض %1$s</string>
     <string name="quick_action_poi_hide">إخفاء %1$s</string>
     <string name="quick_action_add_category">إضافة فئة</string>
@@ -2241,7 +2239,6 @@
 \n • إضافة POI ورفعها مباشرة إلى الموقع (أو في وقت لاحق إن كنت غير متصل بالشبكة)
 \n</string>
     <string name="nothing_found_descr">عدل طلب البحث أو زد النطاق.</string>
-    <string name="quick_action_showhide_osmbugs_title">عرض/إخفاء ملاحظات OSM</string>
     <string name="quick_action_osmbugs_show">إظهار ملاحظات OSM</string>
     <string name="quick_action_osmbugs_hide">إخفاء ملاحظات OSM</string>
     <string name="sorted_by_distance">مرتبة حسب المسافة</string>
@@ -2880,7 +2877,6 @@
     <string name="shared_string_swap">تبديل</string>
     <string name="show_more">اعرض المزيد</string>
     <string name="tracks_on_map">المسارات على الخريطة</string>
-    <string name="quick_action_show_hide_gpx_tracks">إظهار/إخفاء مسارات GPX</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">إظهار أو إخفاء مسارات GPX المحددة على الخريطة.</string>
     <string name="quick_action_gpx_tracks_hide">إخفاء المسارات</string>
     <string name="quick_action_gpx_tracks_show">عرض المسارات</string>
@@ -3072,11 +3068,9 @@
     <string name="quick_action_contour_lines_descr">لإظهار أو إخفاء الخطوط الكنتورية على الخريطة.</string>
     <string name="quick_action_contour_lines_show">إظهار الخطوط الكنتورية</string>
     <string name="quick_action_contour_lines_hide">إخفاء الخطوط الكنتورية</string>
-    <string name="quick_action_show_hide_contour_lines">إظهار/إخفاء الخطوط الكنتورية</string>
     <string name="quick_action_hillshade_descr">لإظهار وإخفاء التضاريس على الخريطة.</string>
     <string name="quick_action_hillshade_show">إظهار التضاريس</string>
     <string name="quick_action_hillshade_hide">إخفاء التضاريس</string>
-    <string name="quick_action_show_hide_hillshade">إظهار/إخفاء التضاريس</string>
     <string name="tts_initialization_error">لا يمكن بدء تشغيل أداة تحويل النص إلى كلام.</string>
     <string name="export_profile">تصدير الوضع</string>
     <string name="exported_osmand_profile">وضع أوسماند: %1$s</string>
@@ -3559,7 +3553,6 @@
     <string name="quick_action_terrain_descr">زر لإظهار طبقة التضاريس أو إخفائها على الخريطة.</string>
     <string name="quick_action_terrain_show">إظهار التضاريس</string>
     <string name="quick_action_terrain_hide">إخفاء التضاريس</string>
-    <string name="quick_action_show_hide_terrain">إظهارأو إخفاء التضاريس</string>
     <string name="download_slope_maps">المنحدرات</string>
     <string name="shared_string_hillshade">التضاريس</string>
     <string name="terrain_empty_state_text">تمكين لعرض المنحدرات أو خريطة التضاريس. يمكنك قراءة المزيد عن أنواع الخرائط هذه على موقعنا.</string>
@@ -3682,7 +3675,6 @@
     <string name="additional_actions_descr">يمكنك الوصول إلى هذه الإجراءات عن طريق النقر على زر \"%1$s\".</string>
     <string name="quick_action_transport_hide">إخفاء وسائل النقل العام</string>
     <string name="quick_action_transport_show">إظهار وسائل النقل العام</string>
-    <string name="quick_action_show_hide_transport">إظهارأو إخفاء وسائل النقل العام</string>
     <string name="quick_action_transport_descr">زر لإظهار أو إخفاء وسائل النقل العام على الخريطة.</string>
     <string name="create_edit_poi">إنشاء أو تعديل نقطة الأهتمام POI</string>
     <string name="parking_positions">مكان الموقف</string>
@@ -3750,7 +3742,6 @@
     <string name="vessel_height_warning_link">ضبط ارتفاع السفينة</string>
     <string name="vessel_height_warning">يمكنك ضبط ارتفاع الحاوية لتجنب الجسور المنخفضة. ضع في اعتبارك أنه إذا كان الجسر متحركاً ، فسوف نستخدم ارتفاعه في الحالة المفتوحة.</string>
     <string name="vessel_width_limit_description">تحديد عرض السفينة لتجنب الجسور الضيقة</string>
-    <string name="quick_action_showhide_mapillary_title">إظهار/إخفاء مابيلاري</string>
     <string name="quick_action_mapillary_hide">إخفاء مابيلاري</string>
     <string name="quick_action_mapillary_show">إظهار مابيلاري</string>
     <string name="quick_action_showhide_mapillary_descr">إظهار أو إخفاء طبقة مابيلاري على الخريطة.</string>

OsmAnd/res/values-az/strings.xml

@@ -741,10 +741,8 @@
     <string name="quick_action_add_favorite">Favorit əlavə et</string>
     <string name="favorite_autofill_toast_text">" burda saxlandı: "</string>
     <string name="favorite_empty_place_name">Yer</string>
-    <string name="quick_action_showhide_favorites_title">Favoritləri göstər/gizlət</string>
     <string name="quick_action_favorites_show">Favoritləri göstər</string>
     <string name="quick_action_favorites_hide">Favoritləri gizlət</string>
-    <string name="quick_action_showhide_poi_title">POI-ni göstər/gizlət</string>
     <string name="quick_action_poi_show">%1$s-i göstər</string>
     <string name="quick_action_poi_hide">%1$s-i gizlət</string>
     <string name="quick_action_add_category">Kateqoriya əlavə et</string>
@@ -754,7 +752,6 @@
     <string name="quick_action_map_styles">Xəritə stilləri</string>
     <string name="increase_search_radius">Axtarış radiusunu artır</string>
     <string name="nothing_found_descr">Axtarış sorğusunu dəyişin və ya axtarış radiusunu artırın.</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM qeydlərini göstər və ya gizlət</string>
     <string name="quick_action_osmbugs_show">OSM qeydlərini göstər</string>
     <string name="quick_action_osmbugs_hide">OSM qeydlərini gizlət</string>
     <string name="quick_action_showhide_osmbugs_descr">Bu fəaliyyət düyməsinə toxunulduqda, xəritədə OSM qeydləri göstəriləcək və ya gizlədiləcək.</string>
@@ -2152,7 +2149,6 @@
     <string name="shared_string_uninstall">Sil</string>
     <string name="shared_string_tones">ton</string>
     <string name="shared_string_meters">metr</string>
-    <string name="quick_action_showhide_mapillary_title">Mapillary-ni göstər/gizlət</string>
     <string name="quick_action_mapillary_hide">Mapillary-ni gizlət</string>
     <string name="quick_action_mapillary_show">Mapillary-ni göstər</string>
     <string name="item_deleted">%1$s silindi</string>

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

@@ -539,7 +539,6 @@
     <string name="increase_search_radius">Aumentar el radiu de gueta</string>
     <string name="nothing_found">Nun s\'alcontró nada</string>
     <string name="nothing_found_descr">Modifica la consulta o aumenta\'l radiu de gueta.</string>
-    <string name="quick_action_showhide_osmbugs_title">Alternar notes d\'OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Tocar esti botón d\'aición amuesa/anubre nel mapa les notes d\'OSM.</string>
     <string name="shared_string_plugin">Plugin</string>
     <string name="srtm_color_scheme">Esquema de colores</string>
@@ -1114,7 +1113,6 @@
     <string name="quick_action_switch_night_mode">Mou nocherniegu</string>
     <string name="quick_action_showhide_favorites_descr">Tocar esti botón d\'aición amuesa/anubre nel mapa los puntos favoritos.</string>
     <string name="quick_action_showhide_poi_descr">Tocar esti botón d\'aición amuesa/anubre nel mapa los PdI.</string>
-    <string name="quick_action_showhide_favorites_title">Amosar/anubrir Favoritos</string>
     <string name="quick_action_add_navigation">Navegación</string>
     <string name="quick_action_bug_descr">Esti mensaxe inclúise nel campu de comentarios.</string>
     <string name="quick_action_gpx_category_descr">Esbilla una estaya opcional.</string>
@@ -1308,7 +1306,6 @@
     <string name="update_all">Anovar too (%1$sMB)</string>
     <string name="quick_action_map_style">Camudar l\'estilu del mapa</string>
     <string name="quick_action_day_night_switch_mode">Cambiar al mou día/nueche</string>
-    <string name="quick_action_showhide_poi_title">Amosar/anubrir PdI</string>
     <string name="quick_action_add_create_items">Creación d\'elementos</string>
     <string name="quick_action_add_configure_map">Configuración del mapa</string>
     <string name="waypoint_one">Puntu 1</string>

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

@@ -2017,7 +2017,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="increase_search_radius">Pavialičyć radyus pošuku</string>
     <string name="nothing_found">Ničoha nie znojdziena</string>
     <string name="nothing_found_descr">Źmianicie pošukavy zapyt abo pavialičcie radyus pošuku.</string>
-    <string name="quick_action_showhide_osmbugs_title">Pakazać/schavać OSM-natatki</string>
     <string name="quick_action_osmbugs_show">Pakazać OSM-natatki</string>
     <string name="quick_action_osmbugs_hide">Schavać OSM-natatki</string>
     <string name="quick_action_showhide_osmbugs_descr">Nacisk na hetuju knopku pakaža ci schavaje OSM-natatki na mapie.</string>
@@ -2156,10 +2155,8 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="quick_action_navigation_voice_off">Ukliučyć Holas</string>
     <string name="quick_action_add_first_intermediate">Dadać pieršy pramiežkavy punkt</string>
     <string name="quick_action_interim_dialog">Pakazać pramiežkavy dyjaloh</string>
-    <string name="quick_action_showhide_favorites_title">Pakazać/schavać upadabanyja</string>
     <string name="quick_action_favorites_show">Pakazać upadabanyja</string>
     <string name="quick_action_favorites_hide">Schavać upadabanyja</string>
-    <string name="quick_action_showhide_poi_title">Pakazać/schavać POI</string>
     <string name="quick_action_poi_show">Pakazać %1$s</string>
     <string name="quick_action_poi_hide">Schavać %1$s</string>
     <string name="quick_action_add_category">Dadać katehoryu</string>
@@ -2823,7 +2820,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="shared_string_swap">Pamianiać</string>
     <string name="show_more">Pakazać boĺš</string>
     <string name="tracks_on_map">Adliustroŭvajemyja sliady</string>
-    <string name="quick_action_show_hide_gpx_tracks">Pakazać/schavać GPX-sliady</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Nacisk na knopku dziejannia pakaža ci schavaje abranyja GPX-sliady na mapie</string>
     <string name="quick_action_gpx_tracks_hide">Schavać GPX-sliady</string>
     <string name="quick_action_gpx_tracks_show">Pakazać GPX-sliady</string>

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

@@ -912,7 +912,6 @@
     <string name="increase_search_radius">Pytanski radius powjetšić</string>
     <string name="nothing_found">Žadyn pytanski wuslědk</string>
     <string name="nothing_found_descr">Změń pytanje abo powjetš jeho radius.</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM-noticy pokazać/schować</string>
     <string name="quick_action_osmbugs_show">OSM-noticy pokazać</string>
     <string name="quick_action_osmbugs_hide">OSM-noticy schować</string>
     <string name="sorted_by_distance">Sortěrowane po zdalenosći</string>
@@ -1021,10 +1020,8 @@
     <string name="add_point_before">Předchadny dypk dodać</string>
     <string name="add_point_after">Přichodny dypk dodać</string>
     <string name="quick_action_start_stop_navigation">Nawigaciju zahajić/přetorhnyć</string>
-    <string name="quick_action_showhide_favorites_title">Fawority pokazać/schować</string>
     <string name="quick_action_favorites_show">Fawority pokazać</string>
     <string name="quick_action_favorites_hide">Fawority schować</string>
-    <string name="quick_action_showhide_poi_title">POI pokazać/schować</string>
     <string name="quick_action_poi_show">%1$s pokazać</string>
     <string name="quick_action_poi_hide">%1$s schować</string>
     <string name="quick_action_add_category">Kategoriju dodać</string>
@@ -1583,10 +1580,8 @@
     <string name="layer_osm_edits">Změny na OSM</string>
     <string name="quick_action_contour_lines_show">Pokazaj wysokostne linije</string>
     <string name="quick_action_contour_lines_hide">Schowaj wysokostne linije</string>
-    <string name="quick_action_show_hide_contour_lines">Wysokostne linije pokazać/schować</string>
     <string name="quick_action_hillshade_show">Pokazaj relief</string>
     <string name="quick_action_hillshade_hide">Schowaj relief</string>
-    <string name="quick_action_show_hide_hillshade">Relief pokazać/schować</string>
     <string name="export_profile">Profil eksportować</string>
     <string name="exported_osmand_profile">OsmAnd-profil: %1$s</string>
     <string name="overwrite_profile_q">Profil \'%1$s\' hižo eksistuje. Chceš jón přepisać\?</string>

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

@@ -1254,7 +1254,6 @@
     <string name="select_distance_route_will_recalc">Fren ameccaq ugar n wanida ara d-yettwasiden ubrid.</string>
     <string name="recalculate_route_distance_promo">Abrid ad yettwasiḍen ticki ameccaq gar ubrid akked wadig-ik yugar azal i d-yettwammlen.</string>
     <string name="download_slope_maps">Iberdan isnawanen</string>
-    <string name="quick_action_show_hide_terrain">Sken/ffer akal</string>
     <string name="quick_action_terrain_hide">Ffer akal</string>
     <string name="quick_action_terrain_show">Sken akal</string>
     <string name="quick_action_terrain_descr">Taqeffalt i uskan neɣ tuffra n tissi n wakal n tkarḍa.</string>

OsmAnd/res/values-be/strings.xml

@@ -2137,10 +2137,8 @@
     <string name="quick_actions_delete">Выдаліць дзеянне</string>
     <string name="quick_actions_delete_text">Сапраўды выдаліць дзеянне \"%s\"\?</string>
     <string name="favorite_empty_place_name">Месца</string>
-    <string name="quick_action_showhide_favorites_title">Паказаць/схаваць улюбёныя мясціны</string>
     <string name="quick_action_favorites_show">Паказаць улюбёныя мясціны</string>
     <string name="quick_action_favorites_hide">Схаваць улюбёныя мясціны</string>
-    <string name="quick_action_showhide_poi_title">Паказаць/схаваць POI</string>
     <string name="quick_action_poi_show">Паказаць %1$s</string>
     <string name="quick_action_poi_hide">Схаваць %1$s</string>
     <string name="quick_action_add_category">Дадаць катэгорыю</string>
@@ -2310,7 +2308,6 @@
     <string name="increase_search_radius">Павялічыць радыус пошуку</string>
     <string name="nothing_found">Нічога не знойдзена</string>
     <string name="nothing_found_descr">Змяніць пошукавы запыт альбо павялічыць радыус пошуку.</string>
-    <string name="quick_action_showhide_osmbugs_title">Паказаць/схаваць OSM-нататкі</string>
     <string name="quick_action_osmbugs_show">Паказаць OSM-нататкі</string>
     <string name="quick_action_osmbugs_hide">Схаваць OSM-нататкі</string>
     <string name="quick_action_showhide_osmbugs_descr">Кнопка для паказу / хавання OSM-нататак на мапе.</string>
@@ -2892,7 +2889,6 @@
     <string name="shared_string_swap">Памяняць</string>
     <string name="show_more">Паказаць больш</string>
     <string name="tracks_on_map">Адлюстроўваемыя сляды</string>
-    <string name="quick_action_show_hide_gpx_tracks">Паказаць/схаваць сляды</string>
     <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>
@@ -3316,11 +3312,9 @@
     <string name="quick_action_contour_lines_descr">Кнопка для адлюстравання/хавання контурных ліній на мапе.</string>
     <string name="quick_action_contour_lines_show">Паказаць контурныя лініі</string>
     <string name="quick_action_contour_lines_hide">Схаваць контурныя лініі</string>
-    <string name="quick_action_show_hide_contour_lines">Паказаць/схаваць контурныя лініі</string>
     <string name="quick_action_hillshade_descr">Кнопка для адлюстравання/хавання зацянення рэльефу на мапе.</string>
     <string name="quick_action_hillshade_show">Паказаць зацяненне рэльефу</string>
     <string name="quick_action_hillshade_hide">Схаваць зацяненне рэльефу</string>
-    <string name="quick_action_show_hide_hillshade">Паказаць/схаваць зацяненне рэльефу</string>
     <string name="tts_initialization_error">Немагчыма запусціць механізм пераўтварэння тэксту ў гаворку.</string>
     <string name="export_profile">Экспарт профілю</string>
     <string name="exported_osmand_profile">Профіль OsmAnd: %1$s</string>
@@ -3437,7 +3431,6 @@
     <string name="shared_string_add_profile">Дадаць профіль</string>
     <string name="n_items_of_z">%1$s з %2$s</string>
     <string name="download_slope_maps">Схілы</string>
-    <string name="quick_action_show_hide_terrain">Паказаць ці схаваць рэльеф</string>
     <string name="quick_action_terrain_hide">Схаваць рэльеф</string>
     <string name="quick_action_terrain_show">Паказаць рэльеф</string>
     <string name="delete_description">Выдаліць апісанне</string>
@@ -3515,11 +3508,9 @@
     <string name="change_application_profile">Змяніць профіль праграмы</string>
     <string name="index_item_world_basemap_detailed">Аглядная мапа свету (падрабязная)</string>
     <string name="quick_action_transport_hide">Схаваць грамадскі транспарт</string>
-    <string name="quick_action_show_hide_transport">Паказаць ці схаваць грамадскі транспарт</string>
     <string name="recalculate_route_in_deviation">Пералічыць маршрут у выпадку адхілення</string>
     <string name="shared_string_uninstall">Выдаліць</string>
     <string name="vessel_width_limit_description">Вызначце шырыню судна, каб пазбягаць вузкіх мастоў</string>
-    <string name="quick_action_showhide_mapillary_title">Паказаць/схаваць Mapillary</string>
     <string name="quick_action_mapillary_hide">Схаваць Mapillary</string>
     <string name="quick_action_mapillary_show">Паказаць Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Пераключальнік для паказу альбо хавання пласта Mapillary.</string>

OsmAnd/res/values-bg/strings.xml

@@ -2063,7 +2063,6 @@
     <string name="recalculate_route_distance_promo">Маршрутът ще бъде преизчислен, ако разстоянието от маршрута до текущото местоположение е повече от избраната стойност.</string>
     <string name="n_items_of_z">%1$s от %2$s</string>
     <string name="download_slope_maps">Склонове</string>
-    <string name="quick_action_show_hide_terrain">Показване/скриване на терена</string>
     <string name="quick_action_terrain_hide">Скриване на терена</string>
     <string name="quick_action_terrain_show">Показване на терена</string>
     <string name="quick_action_terrain_descr">Бутон за показване или скриване на терена върху картата.</string>

OsmAnd/res/values-ca/strings.xml

@@ -2113,10 +2113,8 @@
     <string name="quick_action_duplicate">El nom de l\'acció directa està duplicat</string>
     <string name="quick_action_showhide_favorites_descr">Un commutador per mostrar o amagar els punts Preferits en el mapa.</string>
     <string name="quick_action_showhide_poi_descr">Un commutador per mostrar o amagar els PDIs en el mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Mostra/amaga Preferits</string>
     <string name="quick_action_favorites_show">Mostra Preferits</string>
     <string name="quick_action_favorites_hide">Amaga Preferits</string>
-    <string name="quick_action_showhide_poi_title">Mostra/amaga PDI</string>
     <string name="quick_action_poi_show">Mostra %1$s</string>
     <string name="quick_action_poi_hide">Amaga %1$s</string>
     <string name="quick_action_add_category">Afegeix una categoria</string>
@@ -2382,7 +2380,6 @@
     <string name="srtm_purchase_header">Compreu i instal·leu el connector \'Corbes de nivell\' per visualitzar una gradació vertical d\'àrees.</string>
     <string name="srtm_menu_download_descr">Baixeu el mapa \'Corbes de nivell\' per utilitzar-les en aquesta zona.</string>
     <string name="hide_from_zoom_level">Amaga començant pel nivell d\'escala</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostra o amaga notes OSM</string>
     <string name="quick_action_osmbugs_show">Mostra notes OSM</string>
     <string name="quick_action_osmbugs_hide">Amaga notes OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Botó que mostra o amaga notes OSM al mapa.</string>
@@ -2839,7 +2836,6 @@
     <string name="step_by_step">Totes les cruïlles</string>
     <string name="routeInfo_road_types_name">Tipus de carretera</string>
     <string name="exit_at">Sortida a</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostra/amaga traces</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Un botó per mostrar o amagar les traces seleccionades al mapa.</string>
     <string name="quick_action_gpx_tracks_hide">Amaga les traces</string>
     <string name="quick_action_gpx_tracks_show">Mostra les traces</string>
@@ -3215,11 +3211,9 @@
     <string name="quick_action_contour_lines_descr">Botó per a mostrar o amagar les corbes de nivell en el mapa.</string>
     <string name="quick_action_contour_lines_show">Mostra les corbes de nivell</string>
     <string name="quick_action_contour_lines_hide">Amaga les corbes de nivell</string>
-    <string name="quick_action_show_hide_contour_lines">Mostra/amaga les corbes de nivell</string>
     <string name="quick_action_hillshade_descr">Botó per a mostrar o amagar l\'ombrejat de relleu al mapa.</string>
     <string name="quick_action_hillshade_show">Mostra l\'ombrejat de relleu</string>
     <string name="quick_action_hillshade_hide">Amaga l\'ombrejat de relleu</string>
-    <string name="quick_action_show_hide_hillshade">Mostra/amaga l\'ombrejat de relleu</string>
     <string name="tts_initialization_error">No es pot iniciar el sistema text a veu.</string>
     <string name="utm_format_descr">L\'OsmAnd utilitza l\'estàndard UTM, que és molt similar però no idèntic al format UTM NATO.</string>
     <string name="coordinates_format_info">El format seleccionat s\'aplicarà a tota l\'aplicació.</string>
@@ -3463,7 +3457,6 @@
     <string name="quick_action_terrain_descr">Un botó per mostrar o amagar la capa de terreny al mapa.</string>
     <string name="quick_action_terrain_show">Mostra el terreny</string>
     <string name="quick_action_terrain_hide">Amaga el terreny</string>
-    <string name="quick_action_show_hide_terrain">Mostra o amaga el relleu</string>
     <string name="shared_string_hillshade">Ombrejat del relleu</string>
     <string name="shared_string_legend">Llegenda</string>
     <string name="shared_string_zoom_levels">Nivells de zoom</string>
@@ -3560,7 +3553,6 @@
     <string name="vessel_height_warning">Podeu indicar l\'alçada del vaixell per evitar ponts baixos. Penseu que si el pont és mòbil, li aplicarem l\'alçada de quan estigui obert.</string>
     <string name="vessel_height_limit_description">Indiqueu l\'alçada del vaixell per evitar ponts baixos. Penseu que si el pont és mòbil, li aplicarem l\'alçada de quan estigui obert.</string>
     <string name="vessel_width_limit_description">Indiqueu l\'amplada del vaixell per evitar ponts ajustats</string>
-    <string name="quick_action_showhide_mapillary_title">Mostra/amaga Mapil·lary</string>
     <string name="quick_action_mapillary_hide">Amaga Mapillary</string>
     <string name="quick_action_mapillary_show">Mostra Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Un commutador per mostrar o amagar la capa de Mapillary al mapa.</string>
@@ -3637,7 +3629,6 @@
     <string name="osmand_purchases_item">Compres OsmAnd</string>
     <string name="navigation_profiles_item">Perfils de navegació</string>
     <string name="quick_action_transport_hide">Amaga el transport públic</string>
-    <string name="quick_action_show_hide_transport">Mostra o amaga el transport públic</string>
     <string name="quick_action_transport_descr">Botó que mostra o oculta el transport públic al mapa.</string>
     <string name="create_edit_poi">Crea o edita PDI</string>
     <string name="parking_positions">Posicions d’aparcament</string>

OsmAnd/res/values-cs/strings.xml

@@ -2117,10 +2117,8 @@
     <string name="quick_action_duplicate">Duplicitní název rychlé akce</string>
     <string name="quick_action_showhide_favorites_descr">Tlačítko pro zobrazení nebo skrytí Oblíbených míst na mapě.</string>
     <string name="quick_action_showhide_poi_descr">Tlačítko pro zobrazení nebo skrytí bodů zájmu na mapě.</string>
-    <string name="quick_action_showhide_favorites_title">Zobrazit/skrýt Oblíbená místa</string>
     <string name="quick_action_favorites_show">Zobrazit oblíbená místa</string>
     <string name="quick_action_favorites_hide">Skrýt Oblíbená místa</string>
-    <string name="quick_action_showhide_poi_title">Zobrazit/skrýt POI</string>
     <string name="quick_action_poi_show">Zobrazit %1$s</string>
     <string name="quick_action_poi_hide">Skrýt %1$s</string>
     <string name="quick_action_add_category">Přidat kategorii</string>
@@ -2276,7 +2274,6 @@
     <string name="increase_search_radius">Zvětšit okruh hledání</string>
     <string name="nothing_found">Nic nalezeno</string>
     <string name="nothing_found_descr">Změňte vyhledávací dotaz nebo zvětšete okruh hledání.</string>
-    <string name="quick_action_showhide_osmbugs_title">Zobrazit nebo skrýt OSM poznámky</string>
     <string name="shared_string_permissions">Oprávnění</string>
     <string name="import_gpx_failed_descr">Nepodařilo se naimportovat soubor. Prosím zkontrolujte, zda má OsmAnd oprávnění ke čtení souboru.</string>
     <string name="distance_moving">Vzdálenost opravená</string>
@@ -2843,7 +2840,6 @@
     <string name="routeInfo_road_types_name">Typy silnic</string>
     <string name="exit_at">Výjezd na</string>
     <string name="shared_string_swap">Vyměnit</string>
-    <string name="quick_action_show_hide_gpx_tracks">Zobrazit/skrýt stopy</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Tlačítko pro zobrazení nebo skrytí vybraných stop na mapě.</string>
     <string name="quick_action_gpx_tracks_hide">Skrýt stopy</string>
     <string name="quick_action_gpx_tracks_show">Zobrazit stopy</string>
@@ -3255,7 +3251,6 @@
     <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>
     <string name="quick_action_terrain_hide">Skrýt terén</string>
     <string name="quick_action_terrain_show">Zobrazit terén</string>
     <string name="quick_action_terrain_descr">Tlačítko pro zobrazení nebo skrytí vrstvy terénu na mapě.</string>
@@ -3459,7 +3454,6 @@
     <string name="video_notes">Video poznámky</string>
     <string name="vessel_height_limit_description">Nastavte výšku plavidla, abyste se vyhnuli nízkým mostům. Mějte na paměti, že u pohyblivých mostů se zohledňuje jejich výška v otevřeném stavu.</string>
     <string name="vessel_width_limit_description">Nastavte šířku plavidla, abyste se vyhnuli úzkým mostům</string>
-    <string name="quick_action_showhide_mapillary_title">Zobrazit/skrýt Mapillary</string>
     <string name="quick_action_mapillary_hide">Skrýt Mapillary</string>
     <string name="quick_action_mapillary_show">Zobrazit Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Přepínač pro zobrazení nebo skrytí mapové vrstvy Mapillary.</string>
@@ -3641,7 +3635,6 @@
     <string name="shared_string_drawer">Úvodní panel</string>
     <string name="quick_action_transport_hide">Skrýt veřejnou dopravu</string>
     <string name="quick_action_transport_show">Zobrazit veřejnou dopravu</string>
-    <string name="quick_action_show_hide_transport">Zobrazit nebo skrýt veřejnou dopravu</string>
     <string name="quick_action_transport_descr">Tlačítko pro zobrazení nebo skrytí veřejné dopravy na mapě.</string>
     <string name="create_edit_poi">Vytvořit nebo upravit bod zájmu</string>
     <string name="parking_positions">Parkovací místa</string>
@@ -3758,11 +3751,9 @@
 \n
 \n</string>
     <string name="apply_preference_to_all_profiles">Tuto změnu můžete aplikovat na všechny profily nebo jen na vybraný profil.</string>
-    <string name="quick_action_show_hide_hillshade">Zobrazit/skrýt stínování svahů</string>
     <string name="quick_action_hillshade_hide">Skrýt stínování svahů</string>
     <string name="quick_action_hillshade_show">Zobrazit stínování svahů</string>
     <string name="quick_action_hillshade_descr">Tlačítko pro zobrazení nebo skrytí stínování svahů na mapě.</string>
-    <string name="quick_action_show_hide_contour_lines">Zobrazit/skrýt vrstevnice</string>
     <string name="quick_action_contour_lines_hide">Skrýt vrstevnice</string>
     <string name="quick_action_contour_lines_show">Zobrazit vrstevnice</string>
     <string name="quick_action_contour_lines_descr">Tlačítko pro zobrazení nebo skrytí vrstevnic na mapě.</string>

OsmAnd/res/values-da/strings.xml

@@ -2123,10 +2123,8 @@
     <string name="quick_action_duplicate">Dublet genvejsnavn</string>
     <string name="quick_action_showhide_favorites_descr">En til/fra-knap til at vise eller skjule Favoritpunkter på kortet.</string>
     <string name="quick_action_showhide_poi_descr">En til/fra-knap til at vise eller skjule interessepunkter på kortet.</string>
-    <string name="quick_action_showhide_favorites_title">Vis/skjul Favoritter</string>
     <string name="quick_action_favorites_show">Vis Favoritter</string>
     <string name="quick_action_favorites_hide">Skjul Favoritter</string>
-    <string name="quick_action_showhide_poi_title">Vis/skjul intetessepunkt (IP)</string>
     <string name="quick_action_poi_show">Vis %1$s</string>
     <string name="quick_action_poi_hide">Skjul %1$s</string>
     <string name="quick_action_add_category">Tilføj en kategori</string>
@@ -2394,7 +2392,6 @@
     <string name="hide_from_zoom_level">Skjul fra zoom-niveau</string>
     <string name="sorted_by_distance">Sorteret efter afstand</string>
     <string name="search_favorites">Søg i Favoritter</string>
-    <string name="quick_action_showhide_osmbugs_title">Vis eller skjul OSM-noter</string>
     <string name="quick_action_osmbugs_show">Vis OSM-noter</string>
     <string name="quick_action_osmbugs_hide">Skjul OSM-noter</string>
     <string name="quick_action_showhide_osmbugs_descr">Knap til at vise eller skjule OSM-noter på kortet.</string>
@@ -2849,7 +2846,6 @@
     <string name="routeInfo_road_types_name">Vejtyper</string>
     <string name="exit_at">Stå af ved</string>
     <string name="sit_on_the_stop">Stig på ved stoppested</string>
-    <string name="quick_action_show_hide_gpx_tracks">Vis/skjul GPX spor</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">En knap til at vise eller skjule valgte GPX-spor på kortet.</string>
     <string name="quick_action_gpx_tracks_hide">Skjul GPX spor</string>
     <string name="quick_action_gpx_tracks_show">Vis GPX spor</string>
@@ -3269,11 +3265,9 @@
     <string name="quick_action_contour_lines_descr">Knap der viser eller skjuler højdekurver på kortet.</string>
     <string name="quick_action_contour_lines_show">Vis højdekurver</string>
     <string name="quick_action_contour_lines_hide">Skjul højdekurver</string>
-    <string name="quick_action_show_hide_contour_lines">Vis/skjul højdekurver</string>
     <string name="quick_action_hillshade_descr">En knap der viser eller skjuler reliefskygger på kortet.</string>
     <string name="quick_action_hillshade_show">Vis reliefskygger</string>
     <string name="quick_action_hillshade_hide">Skjul reliefskygger</string>
-    <string name="quick_action_show_hide_hillshade">Vis/skjul reliefskygger</string>
     <string name="rendering_value_white_name">Hvid</string>
     <string name="tts_initialization_error">Tekst-til-tale-programmet kan ikke startes.</string>
     <string name="simulate_your_location_gpx_descr">Simuler positionen ved hjælp af et optaget GPX-spor.</string>
@@ -3436,7 +3430,6 @@
     <string name="recalculate_route_distance_promo">Ruten genberegnes, hvis afstanden fra ruten til den aktuelle placering er større end den valgte værdi.</string>
     <string name="n_items_of_z">%1$s af %2$s</string>
     <string name="download_slope_maps">Skråninger</string>
-    <string name="quick_action_show_hide_terrain">Vis/skjul terræn</string>
     <string name="quick_action_terrain_hide">Skjul terræn</string>
     <string name="quick_action_terrain_show">Vis terræn</string>
     <string name="quick_action_terrain_descr">En knap der viser eller skjuler terrænlag på kortet.</string>
@@ -3562,7 +3555,6 @@
     <string name="osmand_purchases_item">OsmAnd køb</string>
     <string name="quick_action_transport_hide">Skjul offentlig transport</string>
     <string name="quick_action_transport_show">Vis offentlig transport</string>
-    <string name="quick_action_show_hide_transport">Vis/skjul offentlig transport</string>
     <string name="quick_action_transport_descr">En knap til at vise eller skjule offentlig transport på kortet.</string>
     <string name="create_edit_poi">Opret/rediger IP</string>
     <string name="parking_positions">Parkeringsplads</string>
@@ -3606,7 +3598,6 @@
     <string name="details_dialog_decr">Vis eller skjul yderligere kort-detaljer</string>
     <string name="shared_string_night_map">Natkort</string>
     <string name="add_online_source">Tilføj onlinekilde</string>
-    <string name="quick_action_showhide_mapillary_title">Vis/skjul Mapillary</string>
     <string name="quick_action_mapillary_hide">Skjul Mapillary</string>
     <string name="quick_action_mapillary_show">Vis Mapillary</string>
     <string name="quick_action_remove_next_destination">Slet næste destinationspunkt</string>

OsmAnd/res/values-de/strings.xml

@@ -2111,11 +2111,9 @@
     <string name="shared_string_action_name">Aktionsname</string>
     <string name="quick_action_add_marker_descr">Eine Schaltfläche zum Hinzufügen einer Kartenmarkierung in der Bildschirmmitte.</string>
     <string name="favorite_empty_place_name">Ort</string>
-    <string name="quick_action_showhide_favorites_title">Favoriten ein-/ausblenden</string>
     <string name="quick_action_take_audio_note_descr">Eine Schaltfläche, um eine Audio-Notiz in der Bildschirmmitte einzufügen.</string>
     <string name="quick_action_take_video_note_descr">Eine Schaltfläche, um eine Video-Notiz in der Bildschirmmitte einzufügen.</string>
     <string name="quick_action_take_photo_note_descr">Eine Schaltfläche, um eine Foto-Notiz in der Bildschirmmitte einzufügen.</string>
-    <string name="quick_action_showhide_poi_title">POI ein-/ausblenden</string>
     <string name="quick_action_poi_show">%1$s anzeigen</string>
     <string name="quick_action_poi_hide">%1$s ausblenden</string>
     <string name="quick_action_add_category">Kategorie hinzufügen</string>
@@ -2386,7 +2384,6 @@
     <string name="routing_attr_allow_private_name">Privatzugang erlauben</string>
     <string name="routing_attr_allow_private_description">Zugang zu Privatgrund erlauben.</string>
     <string name="srtm_color_scheme">Farbschema</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM-Hinweise ein- oder ausblenden</string>
     <string name="quick_action_osmbugs_show">OSM-Hinweise einblenden</string>
     <string name="quick_action_osmbugs_hide">OSM-Hinweise ausblenden</string>
     <string name="quick_action_showhide_osmbugs_descr">Schaltfläche zum Ein- oder Ausblenden von OSM-Hinweisen auf der Karte.</string>
@@ -2853,7 +2850,6 @@
     <string name="by_transport_type">Von %1$s</string>
     <string name="step_by_step">Schritt für Schritt</string>
     <string name="routeInfo_road_types_name">Straßentypen</string>
-    <string name="quick_action_show_hide_gpx_tracks">Tracks ein-/ausblenden</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Eine Schaltfläche zum Ein- oder Ausblenden ausgewählter Tracks auf der Karte.</string>
     <string name="quick_action_gpx_tracks_hide">Tracks ausblenden</string>
     <string name="quick_action_gpx_tracks_show">Tracks einblenden</string>
@@ -3273,11 +3269,9 @@
     <string name="quick_action_contour_lines_descr">Schaltfläche zum Ein- und Ausblenden von Höhenlinien auf der Karte.</string>
     <string name="quick_action_contour_lines_show">Höhenlinien anzeigen</string>
     <string name="quick_action_contour_lines_hide">Höhenlinien ausblenden</string>
-    <string name="quick_action_show_hide_contour_lines">Höhenlinien ein-/ausblenden</string>
     <string name="quick_action_hillshade_descr">Schaltfläche zum Ein- oder Ausblenden der Reliefdarstellung.</string>
     <string name="quick_action_hillshade_show">Relief anzeigen</string>
     <string name="quick_action_hillshade_hide">Relief ausblenden</string>
-    <string name="quick_action_show_hide_hillshade">Relief ein-/ausblenden</string>
     <string name="tts_initialization_error">Text-to-Speech-Engine kann nicht gestartet werden.</string>
     <string name="simulate_your_location_gpx_descr">Simulation Ihrer Position mit einem aufgezeichneten GPX-Track.</string>
     <string name="export_profile">Profil exportieren</string>
@@ -3498,7 +3492,6 @@
     <string name="quick_action_terrain_descr">Eine Schaltfläche zum Ein- und Ausblenden der Geländeebene auf der Karte.</string>
     <string name="quick_action_terrain_show">Gelände einblenden</string>
     <string name="quick_action_terrain_hide">Gelände ausblenden</string>
-    <string name="quick_action_show_hide_terrain">Gelände ein- oder ausblenden</string>
     <string name="shared_string_hillshade">Relief</string>
     <string name="shared_string_zoom_levels">Zoomstufen</string>
     <string name="shared_string_transparency">Transparenz</string>
@@ -3616,7 +3609,6 @@
     <string name="additional_actions_descr">Sie können auf diese Aktionen zugreifen, indem Sie auf die Schaltfläche \"%1$s\" tippen.</string>
     <string name="quick_action_transport_hide">Öffentliche Verkehrsmittel ausblenden</string>
     <string name="quick_action_transport_show">Öffentliche Verkehrsmittel anzeigen</string>
-    <string name="quick_action_show_hide_transport">Öffentliche Verkehrsmittel anzeigen oder ausblenden</string>
     <string name="quick_action_transport_descr">Schaltfläche zum Ein- oder Ausblenden der öffentlichen Verkehrsmittel auf der Karte.</string>
     <string name="create_edit_poi">POI erstellen oder bearbeiten</string>
     <string name="parking_positions">Parkpositionen</string>
@@ -3689,7 +3681,6 @@
     <string name="vessel_height_warning">Sie können die Schiffshöhe einstellen, um niedrige Brücken zu vermeiden. Denken Sie daran, wenn die Brücke beweglich ist, werden wir ihre Höhe im offenen Zustand verwenden.</string>
     <string name="vessel_height_limit_description">Schiffshöhe einstellen, um niedrige Brücken zu vermeiden. Beachten Sie: Wenn die Brücke beweglich ist, verwendet die Berechnung ihre Höhe im geöffneten Zustand.</string>
     <string name="vessel_width_limit_description">Stellen Sie die Schiffsbreite ein, um schmale Brücken zu vermeiden</string>
-    <string name="quick_action_showhide_mapillary_title">Mapillary ein-/ausblenden</string>
     <string name="quick_action_mapillary_hide">Mapillary ausblenden</string>
     <string name="quick_action_mapillary_show">Mapillary anzeigen</string>
     <string name="quick_action_showhide_mapillary_descr">Eine Umschaltfläche zum Ein- oder Ausblenden des Mapillary-Layers auf der Karte.</string>

OsmAnd/res/values-el/strings.xml

@@ -1532,7 +1532,6 @@
     <string name="online_photos">Φωτογραφίες με σύνδεση</string>
     <string name="shared_string_add_photos">Προσθήκη φωτογραφιών</string>
     <string name="nothing_found">Δεν βρέθηκε τίποτα</string>
-    <string name="quick_action_showhide_osmbugs_title">Εμφάνιση ή απόκρυψη σημειώσεων OSM</string>
     <string name="quick_action_osmbugs_show">Εμφάνιση σημειώσεων OSM</string>
     <string name="quick_action_osmbugs_hide">Απόκρυψη σημειώσεων OSM</string>
     <string name="shared_string_to">Προς</string>
@@ -2635,10 +2634,8 @@
     <string name="quick_action_duplicate">Διπλό όνομα γρήγορης ενέργειας</string>
     <string name="quick_action_showhide_favorites_descr">Εναλλαγή εμφάνισης ή απόκρυψης των αγαπημένων σημείων στον χάρτη.</string>
     <string name="quick_action_showhide_poi_descr">Εναλλαγή εμφάνισης ή απόκρυψης ΣΕ στον χάρτη.</string>
-    <string name="quick_action_showhide_favorites_title">Εμφάνιση/απόκρυψη αγαπημένων</string>
     <string name="quick_action_favorites_show">Εμφάνιση αγαπημένων</string>
     <string name="quick_action_favorites_hide">Απόκρυψη αγαπημένων</string>
-    <string name="quick_action_showhide_poi_title">Εμφάνιση/απόκρυψη ΣΕ</string>
     <string name="quick_action_poi_show">Εμφάνιση %1$s</string>
     <string name="quick_action_poi_hide">Απόκρυψη %1$s</string>
     <string name="quick_action_add_category">Προσθήκη κατηγορίας</string>
@@ -2901,7 +2898,6 @@
     <string name="shared_string_swap">Αλλαγή</string>
     <string name="show_more">Εμφάνιση περισσοτέρων</string>
     <string name="tracks_on_map">Εμφανιζόμενα ίχνη</string>
-    <string name="quick_action_show_hide_gpx_tracks">Εμφάνιση/απόκρυψη ιχνών GPX</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Πλήκτρο εμφάνισης ή απόκρυψης επιλεγμένων ιχνών GPX στον χάρτη.</string>
     <string name="quick_action_gpx_tracks_hide">Απόκρυψη ιχνών GPX</string>
     <string name="quick_action_gpx_tracks_show">Εμφάνιση ιχνών GPX</string>
@@ -3275,11 +3271,9 @@
     <string name="quick_action_contour_lines_descr">Πλήκτρο εμφάνισης ή απόκρυψης ισοϋψών γραμμών στον χάρτη.</string>
     <string name="quick_action_contour_lines_show">Εμφάνιση ισοϋψών γραμμών</string>
     <string name="quick_action_contour_lines_hide">Απόκρυψη ισοϋψών γραμμών</string>
-    <string name="quick_action_show_hide_contour_lines">Εμφάνιση/Απόκρυψη ισοϋψών γραμμών</string>
     <string name="quick_action_hillshade_descr">Εμφάνιση ή απόκρυψη πλήκτρου σκίασης αναγλύφου στον χάρτη.</string>
     <string name="quick_action_hillshade_show">Εμφάνιση σκίασης ανάγλυφου</string>
     <string name="quick_action_hillshade_hide">Απόκρυψη σκίασης ανάγλυφου</string>
-    <string name="quick_action_show_hide_hillshade">Εμφάνιση/Απόκρυψη σκίασης ανάγλυφου</string>
     <string name="tts_initialization_error">Αδυναμία εκκίνησης μηχανής κειμένου σε ομιλία.</string>
     <string name="simulate_your_location_gpx_descr">Προσομοίωση της θέσης σας χρησιμοποιώντας καταγεγραμμένη διαδρομή GPX.</string>
     <string name="export_profile">Εξαγωγή κατατομής (προφίλ)</string>
@@ -3497,7 +3491,6 @@
     <string name="vessel_height_warning">Μπορείτε να ορίσετε ύψος σκάφους για να αποφύγετε χαμηλές γέφυρες. Σημειώστε ότι εάν η γέφυρα είναι κινητή, θα χρησιμοποιηθεί το ύψος της ανοικτής κατάστασης.</string>
     <string name="vessel_height_limit_description">Ορίστε ύψος σκάφος για αποφυγή χαμηλών γεφυρών. Σημειώστε ότι εάν η γέφυρα είναι κινητή, θα χρησιμοποιηθεί το ύψος της στην ανοικτή κατάσταση.</string>
     <string name="vessel_width_limit_description">Ορίστε πλάτος σκάφους για αποφυγή στενών γεφυρών</string>
-    <string name="quick_action_showhide_mapillary_title">Εμφάνιση/Απόκρυψη Mapillary</string>
     <string name="quick_action_mapillary_hide">Απόκρυψη Mapillary</string>
     <string name="quick_action_mapillary_show">Εμφάνιση Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Εναλλαγή εμφάνισης ή απόκρυψης της στρώσης Mapillary του χάρτη.</string>
@@ -3603,7 +3596,6 @@
 \n</string>
     <string name="quick_action_transport_hide">Απόκρυψη δημόσιων συγκοινωνιών</string>
     <string name="quick_action_transport_show">Εμφάνιση δημόσιων συγκοινωνιών</string>
-    <string name="quick_action_show_hide_transport">Εμφάνιση/απόκρυψη δημόσιων συγκοινωνιών</string>
     <string name="quick_action_transport_descr">Πλήκτρο εμφάνισης ή απόκρυψης δημόσιων συγκοινωνιών στον χάρτη.</string>
     <string name="create_edit_poi">Δημιουργία / Επεξεργασία ΣΕ</string>
     <string name="parking_positions">Θέσεις στάθμευσης</string>
@@ -3715,7 +3707,6 @@
     <string name="recalculate_route_distance_promo">Η διαδρομή θα επανυπολογιστεί εάν η απόσταση από τη διαδρομή στην τρέχουσα θέση είναι μεγαλύτερη από την επιλεγμένη τιμή.</string>
     <string name="n_items_of_z">%1$s από %2$s</string>
     <string name="download_slope_maps">Πλαγιές</string>
-    <string name="quick_action_show_hide_terrain">Εμφάνιση / απόκρυψη εδάφους</string>
     <string name="quick_action_terrain_hide">Απόκρυψη εδάφους</string>
     <string name="quick_action_terrain_show">Εμφάνιση εδάφους</string>
     <string name="quick_action_terrain_descr">Ένα πλήκτρο εμφάνισης ή απόκρυψης της στρώσης εδάφους στον χάρτη.</string>

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

@@ -96,7 +96,6 @@
     <string name="quick_action_add_marker_descr">Tapping the action button will add a map marker at the screen centre location.</string>
     <string name="quick_action_add_gpx_descr">Tapping the action button will add a GPX waypoint at the screen centre location.</string>
     <string name="quick_action_showhide_favorites_descr">Tapping the action button will show or hide the favourite points on the map.</string>
-    <string name="quick_action_showhide_favorites_title">Show/hide favourites</string>
     <string name="quick_action_favorites_show">Show Favourites</string>
     <string name="quick_action_favorites_hide">Hide Favourites</string>
     <string name="quick_action_category_descr">Category to save the Favourite in:</string>

OsmAnd/res/values-eo/strings.xml

@@ -2117,10 +2117,8 @@
     <string name="quick_action_duplicate">Duplikata nomo de rapida ago</string>
     <string name="quick_action_showhide_favorites_descr">Butono por montri/kaŝi ŝatatajn ejojn sur la mapo.</string>
     <string name="quick_action_showhide_poi_descr">Butono por montri/kaŝi interesejojn sur la mapo.</string>
-    <string name="quick_action_showhide_favorites_title">Montri/kaŝi ŝatatajn</string>
     <string name="quick_action_favorites_show">Montri ŝatatajn</string>
     <string name="quick_action_favorites_hide">Kaŝi ŝatatajn</string>
-    <string name="quick_action_showhide_poi_title">Montri/kaŝi interesejojn</string>
     <string name="quick_action_poi_show">Montri %1$s</string>
     <string name="quick_action_poi_hide">Kaŝi %1$s</string>
     <string name="quick_action_add_category">Aldoni kategorion</string>
@@ -2386,7 +2384,6 @@
     <string name="hide_from_zoom_level">Kaŝi komence de skal‑nivelo</string>
     <string name="sorted_by_distance">Ordigitaj laŭ distanco</string>
     <string name="search_favorites">Serĉi en ŝatataj</string>
-    <string name="quick_action_showhide_osmbugs_title">Montri aŭ kaŝi OSM-rimarkojn</string>
     <string name="quick_action_osmbugs_show">Montri OSM-rimarkojn</string>
     <string name="quick_action_osmbugs_hide">Kaŝi OSM-rimarkojn</string>
     <string name="quick_action_showhide_osmbugs_descr">Butono por montri/kaŝi OSM‑rimarkojn sur la mapo.</string>
@@ -2842,7 +2839,6 @@
     <string name="routeInfo_road_types_name">Specoj de vojoj</string>
     <string name="exit_at">Eliru ĉe</string>
     <string name="sit_on_the_stop">Atendu ĉe haltejo</string>
-    <string name="quick_action_show_hide_gpx_tracks">Montri/kaŝi spurojn</string>
     <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>
@@ -3263,11 +3259,9 @@
     <string name="quick_action_contour_lines_descr">Butono por montri/kaŝi nivelkurbojn sur la mapo.</string>
     <string name="quick_action_contour_lines_show">Montri nivelkurbojn</string>
     <string name="quick_action_contour_lines_hide">Kaŝi nivelkurbojn</string>
-    <string name="quick_action_show_hide_contour_lines">Montri/kaŝi nivelkurbojn</string>
     <string name="quick_action_hillshade_descr">Butono por montri/kaŝi nivelombrumon (reliefon) sur la mapo.</string>
     <string name="quick_action_hillshade_show">Montri nivelombrumon</string>
     <string name="quick_action_hillshade_hide">Kaŝi nivelombrumon</string>
-    <string name="quick_action_show_hide_hillshade">Montri/kaŝi nivelombrumon</string>
     <string name="default_speed_dialog_msg">Antaŭkalkulas tempon de alveno por vojoj de nekonata speco kaj limigas rapidon por ĉiuj vojoj (povas influi kurs‑difinadon).</string>
     <string name="tts_initialization_error">Ne povas ekigi parolsintezilon.</string>
     <string name="export_profile">Elporti profilon</string>
@@ -3493,7 +3487,6 @@
     <string name="shared_string_legend">Mapklarigo</string>
     <string name="shared_string_hillshade">Nivelombrumo</string>
     <string name="n_items_of_z">%1$s el %2$s</string>
-    <string name="quick_action_show_hide_terrain">Montri aŭ kaŝi teren‑formon</string>
     <string name="quick_action_terrain_hide">Kaŝi teren‑formon</string>
     <string name="quick_action_terrain_show">Montri teren‑formon</string>
     <string name="quick_action_terrain_descr">Butono por montri/kaŝi tavolon de formo de tereno sur la mapo.</string>
@@ -3610,7 +3603,6 @@
     <string name="additional_actions_descr">Vi povas ekigi tiujn agojn per frapeti la butonon “%1$s”.</string>
     <string name="quick_action_transport_hide">Kaŝi publikan transporton</string>
     <string name="quick_action_transport_show">Montri publikan transporton</string>
-    <string name="quick_action_show_hide_transport">Montri aŭ kaŝi publikan transporton</string>
     <string name="quick_action_transport_descr">Butono por montri/kaŝi publikan transporton sur la mapo.</string>
     <string name="create_edit_poi">Krei aŭ redakti interesejon</string>
     <string name="add_edit_favorite">Aldoni aŭ forigi ŝatatan ejojn</string>
@@ -3679,7 +3671,6 @@
     <string name="vessel_height_warning">Vi povas enigi alton de via akvoveturilo por eviti malaltajn pontojn. Estu konscia, ke se ponto estas movebla, la alto en ĝia malfermita stato estos uzata.</string>
     <string name="vessel_height_limit_description">Enigu alton de akvoveturilo por eviti malaltajn pontojn. Estu konscia, ke se ponto estas movebla, la alto en ĝia malfermita stato estos uzata.</string>
     <string name="vessel_width_limit_description">Enigu larĝon de akvoveturilo por eviti mallarĝajn pontojn</string>
-    <string name="quick_action_showhide_mapillary_title">Montri/kaŝi Mapillary</string>
     <string name="quick_action_mapillary_hide">Kaŝi Mapillary</string>
     <string name="quick_action_mapillary_show">Montri Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Ŝaltilo por montri aŭ kaŝi tavolon de Mapillary sur la mapo.</string>

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

@@ -2120,10 +2120,8 @@
     <string name="quick_action_duplicate">Nombre de la acción rápida duplicado</string>
     <string name="quick_action_showhide_favorites_descr">Un botón que muestra u oculta los puntos favoritos en el mapa.</string>
     <string name="quick_action_showhide_poi_descr">Un botón que muestra u oculta los PDI en el mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Mostrar u ocultar Favoritos</string>
     <string name="quick_action_favorites_show">Mostrar Favoritos</string>
     <string name="quick_action_favorites_hide">Ocultar Favoritos</string>
-    <string name="quick_action_showhide_poi_title">Mostrar u ocultar PDI</string>
     <string name="quick_action_poi_show">Mostrar %1$s</string>
     <string name="quick_action_poi_hide">Ocultar %1$s</string>
     <string name="quick_action_add_category">Añadir una categoría</string>
@@ -2388,7 +2386,6 @@
     <string name="hillshade_menu_download_descr">Descarga la capa superpuesta del mapa «Sombreado» para mostrar el sombreado vertical.</string>
     <string name="hillshade_purchase_header">Instala el complemento «Curvas de nivel» para mostrar las áreas verticales graduadas.</string>
     <string name="hide_from_zoom_level">Ocultar desde el nivel de zoom</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostrar u ocultar notas de OSM</string>
     <string name="quick_action_osmbugs_show">Mostrar notas de OSM</string>
     <string name="quick_action_osmbugs_hide">Ocultar notas de OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Un botón que muestra u oculta las notas de OSM en el mapa.</string>
@@ -2846,7 +2843,6 @@
     <string name="routeInfo_road_types_name">Tipos de caminos</string>
     <string name="exit_at">Bajar en</string>
     <string name="sit_on_the_stop">Esperar en la parada</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostrar u ocultar trazas</string>
     <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>
@@ -3267,11 +3263,9 @@
     <string name="quick_action_contour_lines_descr">Un botón que muestra u oculta las curvas de nivel en el mapa.</string>
     <string name="quick_action_contour_lines_show">Mostrar curvas de nivel</string>
     <string name="quick_action_contour_lines_hide">Ocultar curvas de nivel</string>
-    <string name="quick_action_show_hide_contour_lines">Mostrar u ocultar curvas de nivel</string>
     <string name="quick_action_hillshade_descr">Un botón que muestra u oculta el sombreado de las colinas en el mapa.</string>
     <string name="quick_action_hillshade_show">Mostrar el sombreado</string>
     <string name="quick_action_hillshade_hide">Ocultar el sombreado</string>
-    <string name="quick_action_show_hide_hillshade">Mostrar u ocultar el sombreado</string>
     <string name="tts_initialization_error">Imposible iniciar el motor de habla sintetizada.</string>
     <string name="simulate_your_location_gpx_descr">Simular la ubicación usando una traza GPX grabada.</string>
     <string name="export_profile">Exportar perfil</string>
@@ -3495,7 +3489,6 @@
     <string name="terrain_empty_state_text">Permite ver el sombreado o el mapa de pendientes. Puedes leer más sobre estos tipos de mapas en nuestro sitio.</string>
     <string name="shared_string_hillshade">Sombreado</string>
     <string name="download_slope_maps">Pendientes</string>
-    <string name="quick_action_show_hide_terrain">Mostrar u ocultar terreno</string>
     <string name="quick_action_terrain_hide">Ocultar terreno</string>
     <string name="quick_action_terrain_show">Mostrar terreno</string>
     <string name="quick_action_terrain_descr">Un botón que muestra u oculta la capa del terreno en el mapa.</string>
@@ -3614,7 +3607,6 @@
     <string name="additional_actions_descr">Puedes acceder a estas acciones pulsando el botón «%1$s».</string>
     <string name="quick_action_transport_hide">Ocultar transporte público</string>
     <string name="quick_action_transport_show">Mostrar transporte público</string>
-    <string name="quick_action_show_hide_transport">Mostrar u ocultar transporte público</string>
     <string name="quick_action_transport_descr">Botón que muestra u oculta el transporte público en el mapa.</string>
     <string name="create_edit_poi">Crear o editar PDI</string>
     <string name="parking_positions">Puestos de estacionamiento</string>
@@ -3697,7 +3689,6 @@
     <string name="shared_string_legal">Legal</string>
     <string name="keep_active">Mantener</string>
     <string name="shared_string_uninstall">Desinstalar</string>
-    <string name="quick_action_showhide_mapillary_title">Mostrar u ocultar Mapillary</string>
     <string name="quick_action_mapillary_hide">Ocultar Mapillary</string>
     <string name="quick_action_mapillary_show">Mostrar Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Un botón que alterna la capa de Mapillary en el mapa.</string>

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

@@ -2120,10 +2120,8 @@
     <string name="quick_action_duplicate">Nombre de la acción rápida duplicado</string>
     <string name="quick_action_showhide_favorites_descr">Un botón que muestra u oculta los puntos favoritos en el mapa.</string>
     <string name="quick_action_showhide_poi_descr">Un botón que muestra u oculta los PDI en el mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Mostrar u ocultar Favoritos</string>
     <string name="quick_action_favorites_show">Mostrar Favoritos</string>
     <string name="quick_action_favorites_hide">Ocultar Favoritos</string>
-    <string name="quick_action_showhide_poi_title">Mostrar u ocultar PDI</string>
     <string name="quick_action_poi_show">Mostrar %1$s</string>
     <string name="quick_action_poi_hide">Ocultar %1$s</string>
     <string name="quick_action_add_category">Añadir una categoría</string>
@@ -2388,7 +2386,6 @@
     <string name="hillshade_menu_download_descr">Descarga la capa superpuesta del mapa «Sombreado» para mostrar el sombreado vertical.</string>
     <string name="hillshade_purchase_header">Instala el complemento «Curvas de nivel» para mostrar las áreas verticales graduadas.</string>
     <string name="hide_from_zoom_level">Ocultar desde el nivel de zoom</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostrar u ocultar notas de OSM</string>
     <string name="quick_action_osmbugs_show">Mostrar notas de OSM</string>
     <string name="quick_action_osmbugs_hide">Ocultar notas de OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Un botón que muestra u oculta las notas de OSM en el mapa.</string>
@@ -2846,7 +2843,6 @@
     <string name="routeInfo_road_types_name">Tipos de caminos</string>
     <string name="exit_at">Bajar en</string>
     <string name="sit_on_the_stop">Esperar en la parada</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostrar u ocultar trazas</string>
     <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>
@@ -3266,11 +3262,9 @@
     <string name="quick_action_contour_lines_descr">Un botón que muestra u oculta las curvas de nivel en el mapa.</string>
     <string name="quick_action_contour_lines_show">Mostrar curvas de nivel</string>
     <string name="quick_action_contour_lines_hide">Ocultar curvas de nivel</string>
-    <string name="quick_action_show_hide_contour_lines">Mostrar u ocultar curvas de nivel</string>
     <string name="quick_action_hillshade_descr">Un botón que muestra u oculta el sombreado de las colinas en el mapa.</string>
     <string name="quick_action_hillshade_show">Mostrar el sombreado</string>
     <string name="quick_action_hillshade_hide">Ocultar el sombreado</string>
-    <string name="quick_action_show_hide_hillshade">Mostrar u ocultar el sombreado</string>
     <string name="tts_initialization_error">Imposible iniciar el motor de habla sintetizada.</string>
     <string name="simulate_your_location_gpx_descr">Simular la ubicación usando una traza GPX grabada.</string>
     <string name="export_profile">Exportar perfil</string>
@@ -3496,7 +3490,6 @@
     <string name="recalculate_route_distance_promo">La ruta será recalculada si la distancia a la ubicación actual es mayor que el valor elegido.</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Pendientes</string>
-    <string name="quick_action_show_hide_terrain">Mostrar u ocultar terreno</string>
     <string name="quick_action_terrain_hide">Ocultar terreno</string>
     <string name="quick_action_terrain_show">Mostrar terreno</string>
     <string name="quick_action_terrain_descr">Un botón que muestra u oculta la capa del terreno en el mapa.</string>
@@ -3614,7 +3607,6 @@
     <string name="additional_actions_descr">Puedes acceder a estas acciones pulsando el botón «%1$s».</string>
     <string name="quick_action_transport_hide">Ocultar transporte público</string>
     <string name="quick_action_transport_show">Mostrar transporte público</string>
-    <string name="quick_action_show_hide_transport">Mostrar u ocultar transporte público</string>
     <string name="quick_action_transport_descr">Botón que muestra u oculta el transporte público en el mapa.</string>
     <string name="create_edit_poi">Crear o editar PDI</string>
     <string name="parking_positions">Puestos de estacionamiento</string>
@@ -3695,7 +3687,6 @@
 \nPulsa en «%2$s», para borrar todos los datos relacionados con los radares de velocidad (alertas, notificaciones y PDI) hasta reinstalar OsmAnd completamente.</string>
     <string name="keep_active">Mantener</string>
     <string name="shared_string_uninstall">Desinstalar</string>
-    <string name="quick_action_showhide_mapillary_title">Mostrar u ocultar Mapillary</string>
     <string name="quick_action_mapillary_hide">Ocultar Mapillary</string>
     <string name="quick_action_mapillary_show">Mostrar Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Un botón que alterna la capa de Mapillary en el mapa.</string>

OsmAnd/res/values-es/strings.xml

@@ -2117,10 +2117,8 @@
     <string name="quick_action_duplicate">Nombre de la acción rápida duplicado</string>
     <string name="quick_action_showhide_favorites_descr">Un botón que muestra u oculta los Favoritos en el mapa.</string>
     <string name="quick_action_showhide_poi_descr">Un botón que muestra u oculta los PDI en el mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Mostrar/ocultar Favoritos</string>
     <string name="quick_action_favorites_show">Mostrar Favoritos</string>
     <string name="quick_action_favorites_hide">Ocultar Favoritos</string>
-    <string name="quick_action_showhide_poi_title">Mostrar/ocultar PDI</string>
     <string name="quick_action_poi_show">Mostrar %1$s</string>
     <string name="quick_action_poi_hide">Ocultar %1$s</string>
     <string name="quick_action_add_category">Añadir una categoría</string>
@@ -2382,7 +2380,6 @@
     <string name="routing_attr_allow_private_description">Permite acceder a áreas privadas.</string>
     <string name="display_zoom_level">Nivel de zoom de pantalla: %1$s</string>
     <string name="route_is_too_long_v2">Para largas distancias: Añada destinos intermedios si no se encuentra ninguna ruta en 10 minutos.</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostrar u ocultar notas de OSM</string>
     <string name="quick_action_osmbugs_show">Mostrar notas de OSM</string>
     <string name="quick_action_osmbugs_hide">Ocultar notas de OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Botón para mostrar u ocultar las notas de OSM en el mapa.</string>
@@ -2843,7 +2840,6 @@
     <string name="routeInfo_road_types_name">Tipos de caminos</string>
     <string name="exit_at">Bajarse en</string>
     <string name="sit_on_the_stop">Esperar en la parada</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostrar/ocultar trazas</string>
     <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>
@@ -3260,11 +3256,9 @@
     <string name="quick_action_contour_lines_descr">Un botón que muestra u oculta las curvas de nivel en el mapa.</string>
     <string name="quick_action_contour_lines_show">Mostrar curvas de nivel</string>
     <string name="quick_action_contour_lines_hide">Ocultar curvas de nivel</string>
-    <string name="quick_action_show_hide_contour_lines">Mostrar/ocultar curvas de nivel</string>
     <string name="quick_action_hillshade_descr">Un botón que muestra u oculta la sombra de una colina en el mapa.</string>
     <string name="quick_action_hillshade_show">Mostrar el sombreado</string>
     <string name="quick_action_hillshade_hide">Ocultar el sombreado</string>
-    <string name="quick_action_show_hide_hillshade">Mostrar/ocultar el sombreado</string>
     <string name="tts_initialization_error">Imposible iniciar el motor de habla sintetizada.</string>
     <string name="export_profile">Exportar perfil</string>
     <string name="exported_osmand_profile">Perfil de OsmAnd: %1$s</string>
@@ -3464,7 +3458,6 @@
     <string name="recalculate_route_in_deviation">Recalcular ruta en caso de desvío</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Cuestas</string>
-    <string name="quick_action_show_hide_terrain">Mostrar o esconder terreno</string>
     <string name="quick_action_terrain_hide">Esconder terreno</string>
     <string name="quick_action_terrain_show">Mostrar terreno</string>
     <string name="quick_action_terrain_descr">Un botón para mostrar o esconder una capa de terreno en el mapa.</string>
@@ -3513,7 +3506,6 @@
     <string name="map_markers_item">Marcadores de mapa</string>
     <string name="favorites_item">Favoritos</string>
     <string name="navigation_profiles_item">Perfiles de navegación</string>
-    <string name="quick_action_show_hide_transport">Mostrar u ocultar transporte público</string>
     <string name="quick_action_transport_hide">Ocultar transporte público</string>
     <string name="quick_action_transport_show">Mostrar transporte público</string>
     <string name="create_edit_poi">Crear o editar POI</string>
@@ -3692,7 +3684,6 @@
     <string name="vessel_height_warning">Puedes establecer la altura del navío para evitar los puentes bajos. Ten en cuenta que si el puente es móvil, usaremos su altura en estado abierto.</string>
     <string name="vessel_height_limit_description">Fija la altura del navío para evitar los puentes bajos. Ten en cuenta que si el puente es móvil, usaremos su altura en estado abierto.</string>
     <string name="vessel_width_limit_description">Fija el ancho del navío para evitar puentes estrechos</string>
-    <string name="quick_action_showhide_mapillary_title">Mostrar/ocultar Mapillary</string>
     <string name="quick_action_mapillary_hide">Ocultar Mapillary</string>
     <string name="quick_action_mapillary_show">Mostrar Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Un conmutador para mostrar u ocultar la capa de Mapillary en el mapa.</string>

OsmAnd/res/values-et/strings.xml

@@ -162,7 +162,6 @@
     <string name="improve_coverage_install_mapillary_desc">Paigalda Mapillary piltide lisamiseks sellesse asukohta kaardil.</string>
     <string name="no_photos_descr">Siin puuduvad fotod.</string>
     <string name="restart_search">Taaskäivita otsing</string>
-    <string name="quick_action_showhide_osmbugs_title">Lülita OSM märkmed sisse või välja</string>
     <string name="quick_action_osmbugs_show">Näita OSM märkmed</string>
     <string name="quick_action_osmbugs_hide">Peida OSM Notes</string>
     <string name="thank_you_for_feedback">Täname sind tagasiside eest</string>
@@ -601,7 +600,6 @@
     <string name="step_by_step">Pöörangupõhine</string>
     <string name="exit_at">Välju</string>
     <string name="sit_on_the_stop">Sisene peatuses</string>
-    <string name="quick_action_show_hide_gpx_tracks">Kuva/peida rajad</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Nupp valitud radade kaardil kuvamiseks või peitmiseks.</string>
     <string name="quick_action_gpx_tracks_hide">Peida rajad</string>
     <string name="quick_action_gpx_tracks_show">Kuva rajad</string>
@@ -993,11 +991,9 @@
     <string name="quick_action_contour_lines_descr">Nupp kõrgusjoonte kuvamiseks või peitmiseks kaardil.</string>
     <string name="quick_action_contour_lines_show">Kuva kõrgusjooned</string>
     <string name="quick_action_contour_lines_hide">Peida kõrgusjooned</string>
-    <string name="quick_action_show_hide_contour_lines">Kuva/peida kõrgusjooned</string>
     <string name="quick_action_hillshade_descr">Nupp künkavarjutuste kuvamiseks või peitmiseks kaardil.</string>
     <string name="quick_action_hillshade_show">Kuva künkavarjutus</string>
     <string name="quick_action_hillshade_hide">Peida künkavarjutus</string>
-    <string name="quick_action_show_hide_hillshade">Kuva/peida künkavarjutus</string>
     <string name="tts_initialization_error">Kõnesünteesi mootorit ei saa käivitada.</string>
     <string name="export_profile">Ekspordi profiil</string>
     <string name="exported_osmand_profile">OsmAnd profiil: %1$s</string>
@@ -3127,10 +3123,8 @@
     <string name="favorite_empty_place_name">Koht</string>
     <string name="quick_action_duplicates">Dubleerimise vältimiseks nimetati kiirtegevus ümber %1$s.</string>
     <string name="quick_action_duplicate">Kiirtegevuse nime duplikaat</string>
-    <string name="quick_action_showhide_favorites_title">Kuva/peida lemmikud</string>
     <string name="quick_action_favorites_show">Kuva lemmikud</string>
     <string name="quick_action_favorites_hide">Peida lemmikud</string>
-    <string name="quick_action_showhide_poi_title">Kuva/peida HP</string>
     <string name="quick_action_poi_show">Kuva %1$s</string>
     <string name="quick_action_poi_hide">Peida %1$s</string>
     <string name="quick_action_add_category">Lisa kategooria</string>
@@ -3441,7 +3435,6 @@
     <string name="recalculate_route_distance_promo">Teekonna ümberarvutus, kui kaugus teekonnast praegusesse asukohta on suurem valitud väärtusest.</string>
     <string name="n_items_of_z">%1$s %2$s-st</string>
     <string name="download_slope_maps">Nõlvad</string>
-    <string name="quick_action_show_hide_terrain">Kuva või peida maastik</string>
     <string name="quick_action_terrain_hide">Peida maastik</string>
     <string name="quick_action_terrain_show">Kuva maastik</string>
     <string name="quick_action_terrain_descr">Nupp maastikukihi kuvamiseks või peitmiseks kaardil.</string>
@@ -3530,7 +3523,6 @@
     <string name="search_poi_types">Otsi huvipunktide tüüpe</string>
     <string name="quick_action_transport_hide">Peida ühistranspordi teave</string>
     <string name="quick_action_transport_show">Näita ühistranspordi teavet</string>
-    <string name="quick_action_show_hide_transport">Kuva või peida ühistransport</string>
     <string name="quick_action_transport_descr">Nupp, mis kuvab või peidab ühistranspordiandmed kaardil.</string>
     <string name="create_edit_poi">Lisa või muuda huvipunkti</string>
     <string name="shared_string_night_map">Öine kaart</string>
@@ -3541,7 +3533,6 @@
     <string name="vessel_height_warning">Madalate sildade vältimiseks saad kirjeldada laeva kõrguse. Palun arvesta, et liikuva silla puhul me kasutame seda kõrgust ka siis, kui sild on avatud.</string>
     <string name="vessel_height_limit_description">Madalate sildade vältimiseks kirjelda laeva kõrgus. Palun arvesta, et liikuva silla puhul me kasutame seda kõrgust ka siis, kui sild on avatud.</string>
     <string name="vessel_width_limit_description">Lühikeste sildade vältimiseks kirjelda laeva laius</string>
-    <string name="quick_action_showhide_mapillary_title">Näita või peida Mapillary andmed</string>
     <string name="quick_action_mapillary_hide">Peida Mapillary andmed</string>
     <string name="quick_action_mapillary_show">Näita Mapillary andmeid</string>
     <string name="quick_action_showhide_mapillary_descr">Nupp, mis näitab või peidab kaardil Mapillary kihti.</string>

OsmAnd/res/values-eu/strings.xml

@@ -2125,10 +2125,8 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="quick_action_add_parking_descr">Pantailaren erdian aparkaleku bat gehitzeko botoia.</string>
     <string name="favorite_autofill_toast_text">" hona gorde da: "</string>
     <string name="favorite_empty_place_name">Tokia</string>
-    <string name="quick_action_showhide_favorites_title">Erakutsi/ezkutatu gogokoak</string>
     <string name="quick_action_favorites_show">Erakutsi gogokoak</string>
     <string name="quick_action_favorites_hide">Ezkutatu gogokoak</string>
-    <string name="quick_action_showhide_poi_title">Erakutsi/ezkutatu POI</string>
     <string name="quick_action_poi_show">Erakutsi %1$s</string>
     <string name="quick_action_poi_hide">Ezkutatu %1$s</string>
     <string name="quick_action_add_category">Gehitu kategoria bat</string>
@@ -2269,7 +2267,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="increase_search_radius">Handitu bilaketaren erradioa</string>
     <string name="nothing_found">Ez da ezer aurkitu</string>
     <string name="nothing_found_descr">Aldatu bilaketa edo handitu erradioa.</string>
-    <string name="quick_action_showhide_osmbugs_title">Erakutsi edo ezkutatu OSM oharrak</string>
     <string name="quick_action_osmbugs_show">Erakutsi OSM oharrak</string>
     <string name="quick_action_osmbugs_hide">Ezkutatu OSM oharrak</string>
     <string name="quick_action_showhide_osmbugs_descr">Mapan OSM oharrak erakutsi edo ezkutatzeko botoia.</string>
@@ -2846,7 +2843,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="shared_string_swap">Aldatu</string>
     <string name="show_more">Erakutsi gehiago</string>
     <string name="tracks_on_map">Bistaratutako lorratzak</string>
-    <string name="quick_action_show_hide_gpx_tracks">Erakutsi/ezkutatu lorratzak</string>
     <string name="add_intermediate">Gehitu tarteko puntua</string>
     <string name="transfers_size">%1$d transferentzia</string>
     <string name="add_start_and_end_points">Gehitu irteera eta helburua</string>
@@ -3267,11 +3263,9 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="quick_action_contour_lines_descr">Sestra-kurbak mapan erakusteko edo ezkutatzeko botoia.</string>
     <string name="quick_action_contour_lines_show">Erakutsi sestra-kurbak</string>
     <string name="quick_action_contour_lines_hide">Ezkutatu sestra-kurbak</string>
-    <string name="quick_action_show_hide_contour_lines">Erakutsi/ezkutatu sestra-kurbak</string>
     <string name="quick_action_hillshade_descr">Erliebe-itzalak mapan erakutsi edo ezkutatzeko botoia.</string>
     <string name="quick_action_hillshade_show">Erakutsi erliebe-itzalak</string>
     <string name="quick_action_hillshade_hide">Ezkutatu erliebe-itzalak</string>
-    <string name="quick_action_show_hide_hillshade">Erakutsi/ezkutatu erliebe-itzalak</string>
     <string name="tts_initialization_error">Ezin da testu-ahots motorra abiarazi.</string>
     <string name="simulate_your_location_gpx_descr">Simulatu zure posizioa grabatutako GPX lorratz bat erabiliz.</string>
     <string name="export_profile">Esportatu profila</string>
@@ -3491,7 +3485,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="quick_action_terrain_descr">Mapako terreno geruza erakutsi edo ezkutatzeko botoia.</string>
     <string name="quick_action_terrain_show">Erakutsi terrenoa</string>
     <string name="quick_action_terrain_hide">Ezkutatu terrenoa</string>
-    <string name="quick_action_show_hide_terrain">Erakutsi edo ezkutatu terrenoa</string>
     <string name="download_slope_maps">Maldak</string>
     <string name="shared_string_hillshade">Erliebea</string>
     <string name="terrain_empty_state_text">Gaitu erliebea edo malda mapa ikusteko. Mapa mota hauei buruz gehiago irakur dezakezu gure gunean</string>
@@ -3555,7 +3548,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="navigation_profiles_item">Nabigazio profilak</string>
     <string name="quick_action_transport_hide">Ezkutatu garraio publikoa</string>
     <string name="quick_action_transport_show">Erakutsi garraio publikoa</string>
-    <string name="quick_action_show_hide_transport">Erakutsi edo ezkutatu garraio publikoa</string>
     <string name="tracker_item">OsmAnd aztarnaria</string>
     <string name="shared_string_resume">Jarraitu</string>
     <string name="ui_customization_description">Pertsonalizatu \"Tiradera\", \"Konfiguratu mapa\" eta \"Laster-menua\" ataletan dauden elementu kopurua.
@@ -3675,7 +3667,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="shared_string_meters">metro</string>
     <string name="details_dialog_decr">Erakutsi edo ezkutatu maparen xehetasun gehigarriak</string>
     <string name="shared_string_night_map">Gauerako mapa</string>
-    <string name="quick_action_showhide_mapillary_title">Erakutsi/ezkutatu Mapillary</string>
     <string name="quick_action_mapillary_hide">Ezkutatu Mapillary</string>
     <string name="quick_action_mapillary_show">Erakutsi Mapillary</string>
     <string name="shared_string_done">Egina</string>

OsmAnd/res/values-fa/strings.xml

@@ -2180,10 +2180,8 @@
     <string name="quick_action_duplicate">نام تکراری برای کنش فوری</string>
     <string name="quick_action_showhide_favorites_descr">دکمه‌ای برای پنهان/آشکارکردن علاقه‌مندی‌ها روی نقشه.</string>
     <string name="quick_action_showhide_poi_descr">دکمه‌ای برای پنهان/آشکارکردن POIها روی نقشه.</string>
-    <string name="quick_action_showhide_favorites_title">آشکار/پنهان‌کردن علاقه‌مندی‌ها</string>
     <string name="quick_action_favorites_show">نشان‌دادن علاقه‌مندی‌ها</string>
     <string name="quick_action_favorites_hide">مخفی‌کردن علاقه‌مندی‌ها</string>
-    <string name="quick_action_showhide_poi_title">آشکار/پنهان‌کردن POIها</string>
     <string name="quick_action_poi_show">نشان‌دادن %1$s</string>
     <string name="quick_action_poi_hide">پنهان‌کردن %1$s</string>
     <string name="quick_action_add_category">افزودن دسته</string>
@@ -2288,7 +2286,6 @@
     <string name="private_access_routing_req">مقصد شما در ناحیه‌ای با دسترسی خصوصی قرار دارد. دسترسی به جاده‌های خصوصی برای این سفر مجاز شود؟</string>
     <string name="restart_search">شروع مجدد جست‌وجو</string>
     <string name="nothing_found">چیزی پیدا نشد</string>
-    <string name="quick_action_showhide_osmbugs_title">آشکار/پنهان‌کردن یادداشت‌های OSM</string>
     <string name="quick_action_osmbugs_show">آشکارکردن یادداشت‌های OSM</string>
     <string name="quick_action_osmbugs_hide">پنهان‌کردن یادداشت‌های OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">دکمه‌ای برای آشکار/پنهان کردن یادداشت‌های OSM بر روی نقشه.</string>
@@ -2866,7 +2863,6 @@
     <string name="routeInfo_road_types_name">نوع جاده‌ها</string>
     <string name="exit_at">ایستگاه پیاده‌شدن</string>
     <string name="sit_on_the_stop">ایستگاه سوارشدن</string>
-    <string name="quick_action_show_hide_gpx_tracks">آشکار/پنهان کردن ردها</string>
     <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>
@@ -3286,11 +3282,9 @@
     <string name="quick_action_contour_lines_descr">دکمه‌ای برای آشکار/پنهان کردن منحنی‌های میزان روی نقشه.</string>
     <string name="quick_action_contour_lines_show">نشان‌دادن منحنی‌های میزان</string>
     <string name="quick_action_contour_lines_hide">پنهان‌کردن منحنی‌های میزان</string>
-    <string name="quick_action_show_hide_contour_lines">آشکار/پنهان کردن منحنی‌های میزان</string>
     <string name="quick_action_hillshade_descr">دکمه‌ای برای آشکار/پنهان کردن سایه‌روشن‌ها روی نقشه.</string>
     <string name="quick_action_hillshade_show">نشان‌دادن سایه‌روشن‌ها</string>
     <string name="quick_action_hillshade_hide">پنهان‌کردن سایه‌روشن‌ها</string>
-    <string name="quick_action_show_hide_hillshade">آشکار/پنهان کردن سایه‌روشن‌ها</string>
     <string name="tts_initialization_error">شروع موتور متن به گفتار ناموفق بود.</string>
     <string name="simulate_your_location_gpx_descr">موقعیت خود را با استفاده از یک رد GPX ضبط‌شده شبیه‌سازی کنید.</string>
     <string name="exported_osmand_profile">پروفایل OsmAnd:‏ %1$s</string>
@@ -3523,7 +3517,6 @@
     <string name="shared_string_hillshade">سایه‌روشن</string>
     <string name="n_items_of_z">%1$s از %2$s</string>
     <string name="download_slope_maps">شیب‌ها</string>
-    <string name="quick_action_show_hide_terrain">آشکار یا پنهان کردن ناهمواری‌ها</string>
     <string name="quick_action_terrain_hide">پنهان‌کردن ناهمواری‌ها</string>
     <string name="quick_action_terrain_show">نمایش ناهمواری‌ها</string>
     <string name="quick_action_terrain_descr">دکمه‌ای برای آشکار یا پنهان کردن لایهٔ ناهمواری‌ها روی نقشه.</string>
@@ -3640,7 +3633,6 @@
     <string name="additional_actions_descr">برای دسترسی به این کنش‌ها می‌توانید روی دکمهٔ «%1$s» بزنید.</string>
     <string name="quick_action_transport_hide">مخفی‌کردن حمل‌ونقل عمومی</string>
     <string name="quick_action_transport_show">نمایش حمل‌ونقل عمومی</string>
-    <string name="quick_action_show_hide_transport">آشکار یا پنهان کردن حمل‌ونقل عمومی</string>
     <string name="quick_action_transport_descr">دکمه‌ای برای آشکار یا پنهان کردن حمل‌ونقل عمومی روی نقشه.</string>
     <string name="quick_action_switch_profile_descr">با لمس دکمهٔ عملیاتی بین پروفایل‌های انتخاب‌شده جابه‌جا شوید.</string>
     <string name="shared_string_add_profile">افزودن پروفایل</string>
@@ -3710,7 +3702,6 @@
     <string name="vessel_height_warning">می‌توانید ارتفاع کشتی را برای پرهیز از پل‌های کوتاه وارد کنید. به یاد داشته باشید که اگر پل متحرک است، در حالت باز نیز ارتفاع کشتی را در نظر می‌گیریم.</string>
     <string name="vessel_height_limit_description">ارتفاع کشتی را برای پرهیز از پل‌های کوتاه وارد کنید. به یاد داشته باشید که اگر پل متحرک است، در حالت باز نیز ارتفاع کشتی را در نظر می‌گیریم.</string>
     <string name="vessel_width_limit_description">عرض کشتی را برای پرهیز از پل های باریک وارد کنید</string>
-    <string name="quick_action_showhide_mapillary_title">آشکار/پنهان کردن مپیلاری</string>
     <string name="quick_action_mapillary_show">آشکارکردن مپیلاری</string>
     <string name="quick_action_mapillary_hide">پنهان‌کردن مپیلاری</string>
     <string name="quick_action_showhide_mapillary_descr">دکمه‌ای برای آشکار/پنهان کردن لایهٔ مپیلاری روی نقشه.</string>

OsmAnd/res/values-fi/strings.xml

@@ -1920,10 +1920,8 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="quick_action_poi_list">KP lista</string>
     <string name="quick_action_bug_message">Viesti</string>
     <string name="quick_action_add_configure_map">Konfiguroi kartta</string>
-    <string name="quick_action_showhide_favorites_title">Näytä/piilota suosikit</string>
     <string name="quick_action_favorites_show">Näytä suosikit</string>
     <string name="quick_action_favorites_hide">Piilota suosikit</string>
-    <string name="quick_action_showhide_poi_title">Näytä/piilota KP:t</string>
     <string name="quick_action_poi_show">Näytä %1$s</string>
     <string name="quick_action_poi_hide">Piilota %1$s</string>
     <string name="quick_action_add_category">Lisää luokka</string>
@@ -2002,7 +2000,6 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="mapillary">Mapillary</string>
     <string name="restart_search">Käynnistä haku uudelleen</string>
     <string name="nothing_found">Mitään ei löytynyt</string>
-    <string name="quick_action_showhide_osmbugs_title">Näytä/piilota OSM-huomautukset</string>
     <string name="quick_action_osmbugs_show">Näytä OSM-huomautukset</string>
     <string name="quick_action_osmbugs_hide">Piilota OSM-huomautukset</string>
     <string name="sorted_by_distance">Lajiteltu etäisyyden perusteella</string>
@@ -2275,7 +2272,6 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="shared_string_swap">Muuta</string>
     <string name="show_more">Näytä lisää</string>
     <string name="tracks_on_map">Näytetyt jäljet</string>
-    <string name="quick_action_show_hide_gpx_tracks">Näytä/piilota GPX jäljet</string>
     <string name="configure_profile_info">Profiilin asetukset:</string>
     <string name="configure_profile">Määritä profiili</string>
     <string name="switch_profile">Vaihda profiilia</string>
@@ -2306,10 +2302,8 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="layer_osm_edits">OSM-muokkaukset</string>
     <string name="quick_action_contour_lines_show">Näytä korkeuskäyrät</string>
     <string name="quick_action_contour_lines_hide">Piilota korkeuskäyrät</string>
-    <string name="quick_action_show_hide_contour_lines">Näytä/piilota korkeuskäyrät</string>
     <string name="quick_action_hillshade_show">Näytä rinnevarjostus</string>
     <string name="quick_action_hillshade_hide">Piilota rinnevarjostus</string>
-    <string name="quick_action_show_hide_hillshade">Näytä/piilota rinnevarjostus</string>
     <string name="export_profile">Vie profiili</string>
     <string name="exported_osmand_profile">OsmAnd profiili: %1$s</string>
     <string name="overwrite_profile_q">\'%1$s\' on jo olemassa. Korvataanko\?</string>

OsmAnd/res/values-fr/strings.xml

@@ -2099,10 +2099,8 @@
     <string name="favorite_empty_place_name">Emplacement</string>
     <string name="quick_action_duplicates">Ce nom existe déjà, l\'action rapide a été renommée en %1$s.</string>
     <string name="quick_action_duplicate">Nom d\'action rapide en double</string>
-    <string name="quick_action_showhide_favorites_title">Afficher / masquer les favoris</string>
     <string name="quick_action_favorites_show">Afficher les favoris</string>
     <string name="quick_action_favorites_hide">Masquer les favoris</string>
-    <string name="quick_action_showhide_poi_title">Afficher / masquer les points d\'intérêt</string>
     <string name="quick_action_poi_show">Afficher %1$s</string>
     <string name="quick_action_poi_hide">Masquer %1$s</string>
     <string name="quick_action_add_category">Ajouter une catégorie</string>
@@ -2305,7 +2303,6 @@
     <string name="hillshade_purchase_header">Téléchargez le greffon \'Courbes de niveaux\' pour mieux visualiser le relief.</string>
     <string name="hide_from_zoom_level">Masquer à partir du niveau de zoom</string>
     <string name="hillshade_menu_download_descr">Téléchargez la sur-couche \'Ombrage du relief\' pour mieux visualiser le relief.</string>
-    <string name="quick_action_showhide_osmbugs_title">Afficher ou masquer les notes OSM</string>
     <string name="quick_action_osmbugs_show">Afficher les notes OSM</string>
     <string name="quick_action_osmbugs_hide">Masquer les notes OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Bouton pour afficher ou masquer les notes OSM sur la carte.</string>
@@ -2834,7 +2831,6 @@
     <string name="step_by_step">Instructions pas à pas</string>
     <string name="routeInfo_road_types_name">Types de route</string>
     <string name="exit_at">Sortir à</string>
-    <string name="quick_action_show_hide_gpx_tracks">Afficher / masquer les traces</string>
     <string name="quick_action_gpx_tracks_hide">Masquer les traces</string>
     <string name="quick_action_gpx_tracks_show">Afficher les traces</string>
     <string name="use_osm_live_public_transport_description">Activer les modifications de transports publics en temps réel avec OsmAnd Live.</string>
@@ -3255,11 +3251,9 @@
     <string name="quick_action_contour_lines_descr">Bouton affichant ou masquant les courbes de niveaux sur la carte.</string>
     <string name="quick_action_contour_lines_show">Afficher les courbes de niveaux</string>
     <string name="quick_action_contour_lines_hide">Masquer les courbes de niveaux</string>
-    <string name="quick_action_show_hide_contour_lines">Afficher / masquer les courbes de niveaux</string>
     <string name="quick_action_hillshade_descr">Bouton affichant ou masquant l\'ombrage du relief sur la carte.</string>
     <string name="quick_action_hillshade_show">Afficher l\'ombrage du relief</string>
     <string name="quick_action_hillshade_hide">Masquer l\'ombrage du relief</string>
-    <string name="quick_action_show_hide_hillshade">Afficher / masquer l\'ombrage du relief</string>
     <string name="tts_initialization_error">Impossible de démarrer le moteur de synthèse vocale.</string>
     <string name="simulate_your_location_gpx_descr">Simulez votre position à l\'aide d\'une trace GPX enregistrée.</string>
     <string name="export_profile">Exporter le profil</string>
@@ -3486,7 +3480,6 @@
     <string name="terrain_empty_state_text">Active l\'affichage de l\'ombrage du relief et l\'inclinaison. Vous pouvez en savoir plus sur ces types de cartes sur notre site.</string>
     <string name="shared_string_hillshade">Ombrage du relief</string>
     <string name="download_slope_maps">Pentes</string>
-    <string name="quick_action_show_hide_terrain">Affiche ou masque le terrain</string>
     <string name="quick_action_terrain_hide">Masquer le terrain</string>
     <string name="quick_action_terrain_show">Afficher le terrain</string>
     <string name="quick_action_terrain_descr">Un bouton pour afficher ou masquer la couche terrain sur la carte.</string>
@@ -3602,7 +3595,6 @@
     <string name="additional_actions_descr">Vous pouvez accéder à ces actions en appuyant sur le bouton \"%1$s\".</string>
     <string name="quick_action_transport_hide">Masquer les transports publics</string>
     <string name="quick_action_transport_show">Afficher les transports publics</string>
-    <string name="quick_action_show_hide_transport">Affiche ou masque les transports publics</string>
     <string name="quick_action_transport_descr">Bouton pour afficher ou masquer les transports publics sur la carte.</string>
     <string name="create_edit_poi">Créer ou modifier un PI</string>
     <string name="parking_positions">Emplacements de stationnement</string>
@@ -3671,7 +3663,6 @@
     <string name="vessel_height_warning">Vous pouvez définir la hauteur du navire pour éviter les ponts bas. Souvenez-vous que si le pont est mobile, nous utiliserons sa hauteur en position ouverte.</string>
     <string name="vessel_height_limit_description">Définir la hauteur du navire afin d\'éviter les ponts bas. Souvenez-vous que si le pont est mobile, nous utiliserons sa hauteur en position ouverte.</string>
     <string name="vessel_width_limit_description">Définir la largeur du navire pour éviter les ponts étroits</string>
-    <string name="quick_action_showhide_mapillary_title">Afficher/masquer Mapillary</string>
     <string name="quick_action_mapillary_hide">Masquer Mapillary</string>
     <string name="quick_action_mapillary_show">Afficher Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Bouton pour afficher ou masquer la couche Mapillary sur la carte.</string>

OsmAnd/res/values-gl/strings.xml

@@ -2087,10 +2087,8 @@ Lon %2$s</string>
     <string name="quick_action_duplicate">Duplicidade do nome da acción rápida</string>
     <string name="quick_action_showhide_favorites_descr">Un botón que amosa ou agocha os Favoritos no mapa.</string>
     <string name="quick_action_showhide_poi_descr">Un botón que amosa ou agocha os PDI no mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Amosar/Agochar os Favoritos</string>
     <string name="quick_action_favorites_show">Amosar Favoritos</string>
     <string name="quick_action_favorites_hide">Agochar os Favoritos</string>
-    <string name="quick_action_showhide_poi_title">Amosar/Agochar os PDI</string>
     <string name="quick_action_poi_show">Amosar %1$s</string>
     <string name="quick_action_poi_hide">Agochar %1$s</string>
     <string name="quick_action_add_category">Engadir unha categoría</string>
@@ -2228,7 +2226,6 @@ Lon %2$s</string>
     <string name="restart_search">Reiniciar procura</string>
     <string name="increase_search_radius">Aumentar o raio de procura</string>
     <string name="nothing_found">Non se atopou ren</string>
-    <string name="quick_action_showhide_osmbugs_title">Amosar ou agochar as notas do OSM</string>
     <string name="quick_action_osmbugs_show">Amosar notas do OSM</string>
     <string name="quick_action_osmbugs_hide">Agochar notas do OSM</string>
     <string name="sorted_by_distance">Ordenado por distancia</string>
@@ -2853,7 +2850,6 @@ Lon %2$s</string>
     <string name="shared_string_swap">Trocar</string>
     <string name="show_more">Amosar máis</string>
     <string name="tracks_on_map">Pistas amosadas</string>
-    <string name="quick_action_show_hide_gpx_tracks">Amosar/agochar pistas</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Un botón que amosa ou agocha as pistas escollidas no mapa.</string>
     <string name="quick_action_gpx_tracks_hide">Agochar pistas</string>
     <string name="quick_action_gpx_tracks_show">Amosar pistas</string>
@@ -3273,11 +3269,9 @@ Lon %2$s</string>
     <string name="quick_action_contour_lines_descr">Un botón que amosa ou agocha as curvas de nivel no mapa.</string>
     <string name="quick_action_contour_lines_show">Amosar curvas de nivel</string>
     <string name="quick_action_contour_lines_hide">Agochar curvas de nivel</string>
-    <string name="quick_action_show_hide_contour_lines">Amosar/agochar curvas de nivel</string>
     <string name="quick_action_hillshade_descr">Un botón que amosa ou agocha a sombra dos outeiros no mapa.</string>
     <string name="quick_action_hillshade_show">Amosar sombreados</string>
     <string name="quick_action_hillshade_hide">Agochar sombreados</string>
-    <string name="quick_action_show_hide_hillshade">Amosar/agochar sombreados</string>
     <string name="tts_initialization_error">Non é posíbel comezar o motor de síntese de voz.</string>
     <string name="simulate_your_location_gpx_descr">Simular a túa posición empregando unha pista GPX gravada.</string>
     <string name="export_profile">Exportar o perfil</string>
@@ -3552,7 +3546,6 @@ Lon %2$s</string>
     <string name="recalculate_route_distance_promo">A ruta será recalculada se a distancia á localización actual é maior que o valor escollido.</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Pendentes</string>
-    <string name="quick_action_show_hide_terrain">Amosar ou agochar terreo</string>
     <string name="quick_action_terrain_hide">Agochar terreo</string>
     <string name="quick_action_terrain_show">Amosar terreo</string>
     <string name="quick_action_terrain_descr">Un botón que amosa ou agocha a capa do terreo no mapa.</string>
@@ -3621,7 +3614,6 @@ Lon %2$s</string>
     <string name="additional_actions_descr">Podes acceder a estas accións premendo no botón “%1$s”.</string>
     <string name="quick_action_transport_hide">Agochar transporte público</string>
     <string name="quick_action_transport_show">Amosar transporte público</string>
-    <string name="quick_action_show_hide_transport">Amosar ou agochar transporte público</string>
     <string name="quick_action_transport_descr">Botón que amosa ou agocha o transporte público no mapa.</string>
     <string name="create_edit_poi">Crear ou editar PDI</string>
     <string name="parking_positions">Posicións de aparcamento</string>
@@ -3691,7 +3683,6 @@ Lon %2$s</string>
     <string name="vessel_height_warning">Podes definir a altura da embarcación para evitar pontes baixas. Lémbrate se a ponte é móbil, empregaremos a súa altura no estado aberto.</string>
     <string name="vessel_height_limit_description">Define o alto da embarcación para evitar pontes baixas. Lémbrate se a ponte é móbil, empregaremos a súa altura no estado aberto.</string>
     <string name="vessel_width_limit_description">Estabelecer o largo da embarcación para evitar pontes estreitas</string>
-    <string name="quick_action_showhide_mapillary_title">Amosar/agochar o Mapillary</string>
     <string name="quick_action_mapillary_hide">Agochar o Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Un botón para amosar ou agochar a capa do Mapillary no mapa.</string>
     <string name="quick_action_mapillary_show">Amosar o Mapillary</string>

OsmAnd/res/values-hu/strings.xml

@@ -2112,10 +2112,8 @@
     <string name="quick_action_duplicate">A gyorsművelet neve kétszer szerepel</string>
     <string name="quick_action_showhide_favorites_descr">Gomb, amely a térképen megjeleníti vagy elrejti a Kedvenc helyeket.</string>
     <string name="quick_action_showhide_poi_descr">Gomb, amely a térképen megjeleníti vagy elrejti az érdekes pontokat (POI-kat).</string>
-    <string name="quick_action_showhide_favorites_title">Kedvencek megjelenítése/elrejtése</string>
     <string name="quick_action_favorites_show">Kedvencek megjelenítése</string>
     <string name="quick_action_favorites_hide">Kedvencek elrejtése</string>
-    <string name="quick_action_showhide_poi_title">POI-k megjelenítése/elrejtése</string>
     <string name="quick_action_poi_show">%1$s megjelenítése</string>
     <string name="quick_action_poi_hide">%1$s elrejtése</string>
     <string name="quick_action_add_category">Kategória hozzáadása</string>
@@ -2239,7 +2237,6 @@
     <string name="select_street">Utca kijelölése</string>
     <string name="shared_string_in_name">itt: %1$s</string>
     <string name="type_address">Cím megadása</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM-jegyzetek megjelenítése / elrejtése</string>
     <string name="quick_action_osmbugs_show">OSM-jegyzetek megjelenítése</string>
     <string name="quick_action_osmbugs_hide">OSM-jegyzetek elrejtése</string>
     <string name="quick_action_showhide_osmbugs_descr">Gomb, amely a térképen megjeleníti vagy elrejti az OSM-jegyzeteket.</string>
@@ -2797,7 +2794,6 @@
     <string name="step_by_step">Részletes navigáció</string>
     <string name="routeInfo_road_types_name">Úttípusok</string>
     <string name="exit_at">Szálljon le itt:</string>
-    <string name="quick_action_show_hide_gpx_tracks">Nyomvonalak megjelenítése/elrejtése</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Gomb, amely a térképen megjeleníti vagy elrejti a nyomvonalakat.</string>
     <string name="quick_action_gpx_tracks_hide">Nyomvonalak elrejtése</string>
     <string name="quick_action_gpx_tracks_show">Nyomvonalak megjelenítése</string>
@@ -3097,10 +3093,8 @@
     <string name="update_all_maps_q">Biztos, hogy az összes (%1$d) térképet frissíti\?</string>
     <string name="quick_action_contour_lines_show">Szintvonalak megjelenítése</string>
     <string name="quick_action_contour_lines_hide">Szintvonalak elrejtése</string>
-    <string name="quick_action_show_hide_contour_lines">Szintvonalak megjelenítése/elrejtése</string>
     <string name="quick_action_hillshade_show">Domborzatárnyékolás megjelenítése</string>
     <string name="quick_action_hillshade_hide">Domborzatárnyékolás elrejtése</string>
-    <string name="quick_action_show_hide_hillshade">Domborzatárnyékolás megjelenítése/elrejtése</string>
     <string name="track_storage_directory">Nyomvonal tárolási mappája</string>
     <string name="track_storage_directory_descrp">A nyomvonalak tárolhatók a \'rec\' mappában, illetve havi vagy napi bontás szerinti mappákban.</string>
     <string name="store_tracks_in_rec_directory">Nyomvonalak felvétele a \'rec\' mappába</string>
@@ -3414,7 +3408,6 @@
     <string name="recalculate_route_distance_promo">Az útvonal újraszámításra kerül, amennyiben az útvonal és a jelenlegi helyzet közötti távolság nagyobb, mint a kiválasztott érték.</string>
     <string name="n_items_of_z">%1$s a %2$s-ból</string>
     <string name="download_slope_maps">Lejtők</string>
-    <string name="quick_action_show_hide_terrain">Domborzat megjelenítése vagy elrejtése</string>
     <string name="quick_action_terrain_hide">Domborzat elrejtése</string>
     <string name="quick_action_terrain_show">Domborzat megjelenítése</string>
     <string name="quick_action_terrain_descr">Váltógomb, amely a térképen megjeleníti vagy elrejti a domborzati réteget.</string>
@@ -3513,7 +3506,6 @@
     <string name="download_unsupported_action">Nem támogatott művelet: %1$s</string>
     <string name="quick_action_transport_hide">Tömegközlekedés elrejtése</string>
     <string name="quick_action_transport_show">Tömegközlekedés megjelenítése</string>
-    <string name="quick_action_show_hide_transport">Tömegközlekedés megjelenítése vagy elrejtése</string>
     <string name="create_edit_poi">POI készítése vagy módosítása</string>
     <string name="parking_positions">Parkolási pozíció</string>
     <string name="add_edit_favorite">Kedvenc hozzáadása vagy módosítása</string>
@@ -3602,7 +3594,6 @@
     <string name="vessel_height_limit_description">Adja meg a hajómagasságot az alacsony hidak elkerüléséhez. Ne feledje, amennyiben a híd mozdítható, a nyitott állapotú magasságát vesszük figyelembe.</string>
     <string name="vessel_height_warning">Megadhatja a hajómagasságot az alacsony hidak elkerüléséhez. Ne feledje, amennyiben a híd mozdítható, a nyitott állapotú magasságát vesszük figyelembe.</string>
     <string name="vessel_width_limit_description">Adja meg a hajószélességet a keskeny hidak elkerüléséhez</string>
-    <string name="quick_action_showhide_mapillary_title">Mapillary megjelenítése/elrejtése</string>
     <string name="quick_action_mapillary_hide">Mapillary elrejtése</string>
     <string name="quick_action_mapillary_show">Mapillary megjelenítése</string>
     <string name="quick_action_showhide_mapillary_descr">Váltógomb, amely a térképen megjeleníti vagy elrejti a Mapillary réteget.</string>

OsmAnd/res/values-hy/strings.xml

@@ -247,7 +247,6 @@
     <string name="increase_search_radius">Ավելացնել որոնման շառավղը</string>
     <string name="nothing_found">Ոչինչ չի գտնվել</string>
     <string name="nothing_found_descr">Փոխել հարցումը կամ ավելացնել որոնման շառավիղը։</string>
-    <string name="quick_action_showhide_osmbugs_title">Ցույց տալ/թաքցնել OSM նշումները</string>
     <string name="quick_action_osmbugs_show">Ցույց տալ OSM նշումները</string>
     <string name="quick_action_osmbugs_hide">Թաքցնել OSM նշումները</string>
     <string name="quick_action_showhide_osmbugs_descr">Քարտեզի վրա ցույց տալ կամ թաքցնել OSM նշումները կոճակը:</string>
@@ -2484,10 +2483,8 @@
     <string name="quick_action_duplicate">Կրկնօրինակ անուն գտնվեց</string>
     <string name="quick_action_showhide_favorites_descr">Սեղմելով գործողության կոճակը ցույց կտա կամ կթաքցնի «Սիրված» կետերը քարտեզի վրա:</string>
     <string name="quick_action_showhide_poi_descr">Սեղմելով գործողության կոճակը ցույց կտա կամ կթաքցնի POI կետերը քարտեզի վրա:</string>
-    <string name="quick_action_showhide_favorites_title">Ցուցադրել/թաքցնել «Սիրված»-ը</string>
     <string name="quick_action_favorites_show">Ցուցադրել «Սիրված»-ը</string>
     <string name="quick_action_favorites_hide">Թաքցնել «Սիրված»-ը</string>
-    <string name="quick_action_showhide_poi_title">Ցուցադրել/թաքցնել POI</string>
     <string name="quick_action_poi_show">Ցուցադրել %1$s</string>
     <string name="quick_action_poi_hide">Թաքցնել %1$s</string>
     <string name="quick_action_add_category">Ավելացնել կատեգորիա</string>
@@ -2870,7 +2867,6 @@
     <string name="keep_active">Պահել ակտիվ</string>
     <string name="shared_string_uninstall">Ջնջել</string>
     <string name="speed_cameras_alert">Որոշ երկրներում արագության վերահսկողության տեսախցիկների ծանուցումը արգելված է օրենքով ։</string>
-    <string name="quick_action_showhide_mapillary_title">Ցույց տալ/Թաքցնել Mapillary</string>
     <string name="quick_action_mapillary_hide">Թաքցնել</string>
     <string name="quick_action_mapillary_show">Ցույց տալ Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Անջատիչ - Mapillary շերտը ցույց տալու կամ թաքցնել ու քարտեզի վրա:</string>
@@ -2961,7 +2957,6 @@
     <string name="navigation_profiles_item">Նավիգացիոն պրոֆիլներ</string>
     <string name="quick_action_transport_hide">Թաքցնել հասարակական տրանսպորտը</string>
     <string name="quick_action_transport_show">Ցույց տալ հասարակական տրանսպորտը</string>
-    <string name="quick_action_show_hide_transport">Ցույց տալ / թաքցնել հասարակական տրանսպորտը</string>
     <string name="quick_action_transport_descr">Կոճակ, որը ցույց է տալիս կամ թաքցնում է հասարակական տրանսպորտը քարտեզի վրա:</string>
     <string name="create_edit_poi">Ստեղծել / Խմբագրել POI</string>
     <string name="add_edit_favorite">Ավելացնել / Խմբագրել Սիրվածն-րը</string>

OsmAnd/res/values-id/strings.xml

@@ -233,7 +233,6 @@
     <string name="increase_search_radius">Tingkatkan radius pencarian</string>
     <string name="nothing_found">Tidak ada yang ditemukan</string>
     <string name="nothing_found_descr">Ubah kata pencarian atau tingkatkan radius pencarian.</string>
-    <string name="quick_action_showhide_osmbugs_title">Tampil/sembunyikan Catatan OSM</string>
     <string name="quick_action_osmbugs_show">Tampilkan Catatan OSM</string>
     <string name="quick_action_osmbugs_hide">Sembunyikan Catatan OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Mengetuk tombol tindakan akan menampilkan atau menyembunyikan Catatan OSM di peta.</string>

OsmAnd/res/values-is/strings.xml

@@ -1801,10 +1801,8 @@
     <string name="quick_favorites_name_preset">Forstilling á nafni</string>
     <string name="favorite_autofill_toast_text">" vistað í "</string>
     <string name="favorite_empty_place_name">Staður</string>
-    <string name="quick_action_showhide_favorites_title">Birta/Fela eftirlæti</string>
     <string name="quick_action_favorites_show">Birta eftirlæti</string>
     <string name="quick_action_favorites_hide">Fela eftirlæti</string>
-    <string name="quick_action_showhide_poi_title">Birta/Fela merkisstaði</string>
     <string name="quick_action_poi_show">Sýna %1$s</string>
     <string name="quick_action_poi_hide">Fela %1$s</string>
     <string name="quick_action_add_category">Bæta við flokki</string>
@@ -2049,7 +2047,6 @@
     <string name="restart_search">Byrja leit aftur</string>
     <string name="increase_search_radius">Stækka radíus leitar</string>
     <string name="nothing_found">Ekkert fannst</string>
-    <string name="quick_action_showhide_osmbugs_title">Birta/fela OSM-minnispunkta</string>
     <string name="quick_action_osmbugs_show">Birta OSM-minnispunkta</string>
     <string name="quick_action_osmbugs_hide">Fela OSM-minnispunkta</string>
     <string name="sorted_by_distance">Raðað eftir vegalengd</string>
@@ -2850,7 +2847,6 @@
     <string name="routeInfo_road_types_name">Gerðir vega</string>
     <string name="exit_at">Fara útaf við</string>
     <string name="sit_on_the_stop">Fara um borð við stöðvunina</string>
-    <string name="quick_action_show_hide_gpx_tracks">Birta/Fela ferla</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Hnappur til að birta eða fela valda ferla á kortinu.</string>
     <string name="quick_action_gpx_tracks_hide">Fela ferla</string>
     <string name="quick_action_gpx_tracks_show">Birta ferla</string>
@@ -3270,11 +3266,9 @@
     <string name="quick_action_contour_lines_descr">Hnappur til að birta eða fela hæðarlínur á kortinu.</string>
     <string name="quick_action_contour_lines_show">Birta hæðarlínur</string>
     <string name="quick_action_contour_lines_hide">Fela hæðarlínur</string>
-    <string name="quick_action_show_hide_contour_lines">Birta/Fela hæðarlínur</string>
     <string name="quick_action_hillshade_descr">Hnappur til að birta eða fela hæðaskyggingu á kortinu.</string>
     <string name="quick_action_hillshade_show">Birta hæðaskyggingu</string>
     <string name="quick_action_hillshade_hide">Fela hæðaskyggingu</string>
-    <string name="quick_action_show_hide_hillshade">Birta/Fela hæðaskyggingu</string>
     <string name="tts_initialization_error">Gat ekki ræst talgervil.</string>
     <string name="simulate_your_location_gpx_descr">Herma eftir staðsetningu þinni með áður skráðum GPX-ferli.</string>
     <string name="export_profile">Flytja út snið</string>
@@ -3497,7 +3491,6 @@
     <string name="terrain_empty_state_text">Virkja til að sjá hæðaskyggingar eða brekkur á korti. Þú getur lesið meira um þessa eiginleika á vefnum okkar.</string>
     <string name="shared_string_hillshade">Hæðaskygging</string>
     <string name="download_slope_maps">Brekkur</string>
-    <string name="quick_action_show_hide_terrain">Birta eða fela yfirborð</string>
     <string name="quick_action_terrain_hide">Fela yfirborð</string>
     <string name="quick_action_terrain_show">Sýna yfirborð</string>
     <string name="quick_action_terrain_descr">Hnappur til að birta eða fela yfirborðslag á kortinu.</string>
@@ -3610,7 +3603,6 @@
     <string name="additional_actions_descr">Þú getur komist í þessar aðgerðir með því að ýta á \"%1$s\"-hnappinn.</string>
     <string name="subscription_osmandlive_item">Áskrift - OsmAnd Live</string>
     <string name="shared_string_always">Alltaf</string>
-    <string name="quick_action_show_hide_transport">Birta eða fela almenningssamgöngur</string>
     <string name="reset_deafult_order">Endurheimta sjálfgefna röð atriða</string>
     <string name="unsupported_type_error">Óstudd tegund</string>
     <string name="turn_screen_on_navigation_instructions">Leiðsagnarleiðbeiningar</string>
@@ -3672,7 +3664,6 @@
     <string name="speed_camera_pois">Merktar hraðamyndavélar</string>
     <string name="keep_active">Halda virku</string>
     <string name="speed_cameras_alert">Aðvaranir vegna hraðamyndavéla eru bannaðar með lögum í sumum löndum.</string>
-    <string name="quick_action_showhide_mapillary_title">Sýna/fela Mapillary</string>
     <string name="quick_action_mapillary_hide">Fela Mapillary</string>
     <string name="quick_action_mapillary_show">Sýna Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Víxlhnappur til að birta eða fela Mapillary-lagið á kortinu.</string>

OsmAnd/res/values-it/strings.xml

@@ -2120,10 +2120,8 @@
     <string name="quick_action_duplicate">Nome dell\'azione veloce duplicato</string>
     <string name="quick_action_showhide_favorites_descr">Questo pulsante d’azione mostra o nasconde i preferiti sulla mappa.</string>
     <string name="quick_action_showhide_poi_descr">Questo pulsante azione mostra o nasconde i PDI sulla mappa.</string>
-    <string name="quick_action_showhide_favorites_title">Mostra/nascondi preferiti</string>
     <string name="quick_action_favorites_show">Mostra preferiti</string>
     <string name="quick_action_favorites_hide">Nascondi preferiti</string>
-    <string name="quick_action_showhide_poi_title">Mostra/nascondi PDI</string>
     <string name="quick_action_poi_show">Mostra %1$s</string>
     <string name="quick_action_poi_hide">Nascondi %1$s</string>
     <string name="quick_action_add_category">Aggiungi una categoria</string>
@@ -2250,7 +2248,6 @@
     <string name="increase_search_radius">Aumenta il raggio di ricerca</string>
     <string name="nothing_found">Nessun risultato</string>
     <string name="nothing_found_descr">Cambia la ricerca o aumenta il raggio.</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostra/nascondi le Note OSM</string>
     <string name="quick_action_osmbugs_show">Mostra le note OSM</string>
     <string name="quick_action_osmbugs_hide">Nascondi le note OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Toccando il pulsante azione verranno mostrate o nascoste le note OSM sulla mappa.</string>
@@ -2829,7 +2826,6 @@
     <string name="routeInfo_road_types_name">Tipi di strade</string>
     <string name="show_more">Mostra di più</string>
     <string name="tracks_on_map">Tracciati visualizzati</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostra/nascondi tracce GPX</string>
     <string name="quick_action_gpx_tracks_hide">Nascondi Tracciati GPX</string>
     <string name="quick_action_gpx_tracks_show">Mostra Tracciati GPX</string>
     <string name="quick_action_day_night_mode">Modalità %s</string>
@@ -3254,11 +3250,9 @@
     <string name="quick_action_contour_lines_descr">Un controllo per mostrare o nascondere nella mappa le linee isoipse.</string>
     <string name="quick_action_contour_lines_show">Mostra le linee isoipse</string>
     <string name="quick_action_contour_lines_hide">Nascondi le linee isoipse</string>
-    <string name="quick_action_show_hide_contour_lines">Mostra/nascondi le linee isoipse</string>
     <string name="quick_action_hillshade_descr">Un controllo per mostrare o nascondere nella mappa le ombreggiature dei rilievi.</string>
     <string name="quick_action_hillshade_show">Mostra l\'ombreggiatura dei rilievi</string>
     <string name="quick_action_hillshade_hide">Nascondi l\'ombreggiatura dei rilievi</string>
-    <string name="quick_action_show_hide_hillshade">Mostra/nascondi l\'ombreggiatura dei rilievi</string>
     <string name="tts_initialization_error">Impossibile avviare il motore dal-testo-alla-voce.</string>
     <string name="simulate_your_location_gpx_descr">Simula la mia posizione utilizzando una traccia GPX registrata.</string>
     <string name="default_speed_dialog_msg">Utilizzata per stimare l\'orario d\'arrivo per le strade di tipo sconosciute e come limite di velocità per tutte le strade (può influenzare il calcolo del percorso)</string>
@@ -3478,7 +3472,6 @@
     <string name="quick_action_terrain_descr">Un bottone per mostrare o nascondere la vista rilievo sulla mappa.</string>
     <string name="quick_action_terrain_show">Mostra rilievo</string>
     <string name="quick_action_terrain_hide">Nascondi rilievo</string>
-    <string name="quick_action_show_hide_terrain">Mostra/nascondi rilievo</string>
     <string name="download_slope_maps">Pendenze</string>
     <string name="shared_string_hillshade">Ombreggiatura rilievi</string>
     <string name="slope_read_more">Puoi avere maggiori informazioni sulle Pendenze in %1$s.</string>
@@ -3516,7 +3509,6 @@
     <string name="shared_string_items">Oggetti</string>
     <string name="quick_action_transport_hide">Nascondi i trasporti pubblici</string>
     <string name="quick_action_transport_show">Mostra i trasporti pubblici</string>
-    <string name="quick_action_show_hide_transport">Mostra/nascondi i trasporti pubblici</string>
     <string name="quick_action_transport_descr">Il pulsante mostra o nasconde nella mappa i trasporti pubblici.</string>
     <string name="create_edit_poi">Crea/Modifica PDI</string>
     <string name="parking_positions">Posizione di parcheggio</string>
@@ -3672,7 +3664,6 @@
     <string name="vessel_height_warning">Puoi mpostare l\'altezza dell\'imbarcazione per evitare ponti bassi. Ricorda che, se il ponte è mobile, useremo la sua altezza da aperto.</string>
     <string name="vessel_height_limit_description">Imposta l\'altezza dell\'imbarcazione per evitare ponti bassi. Ricorda che, se il ponte è mobile, useremo la sua altezza da aperto.</string>
     <string name="vessel_width_limit_description">Imposta la larghezza della\"imbarcazione per evitare i ponti stretti</string>
-    <string name="quick_action_showhide_mapillary_title">Mostra/nascondi Mapillary</string>
     <string name="quick_action_mapillary_hide">Nascondi Mapillary</string>
     <string name="quick_action_mapillary_show">Mostra Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Un pulsante per visualizzare nella mappa o nascondere il livello Mapillary .</string>

OsmAnd/res/values-iw/strings.xml

@@ -1125,7 +1125,6 @@
     <string name="increase_search_radius">הגדלת רדיוס החיפוש</string>
     <string name="nothing_found">לא נמצא כלום</string>
     <string name="nothing_found_descr">עריכת החיפוש או הגדלת הטווח.</string>
-    <string name="quick_action_showhide_osmbugs_title">הצגה או הסתרה של הערות OSM</string>
     <string name="quick_action_osmbugs_show">הצגת הערות OSM</string>
     <string name="quick_action_osmbugs_hide">הסתרת הערות OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">כפתור להצגה או להסתרה של הערות OSM על המפה.</string>
@@ -1649,10 +1648,8 @@
     <string name="favorite_empty_place_name">מיקום</string>
     <string name="quick_action_showhide_favorites_descr">בורר להצגה או הסתרה של הנקודות המועדפות במפה.</string>
     <string name="quick_action_showhide_poi_descr">בורר להצגה או הסתרה של נקודות עניין במפה.</string>
-    <string name="quick_action_showhide_favorites_title">הצגה/הסתרה של מועדפים</string>
     <string name="quick_action_favorites_show">הצגת מועדפים</string>
     <string name="quick_action_favorites_hide">הסתרת מועדפים</string>
-    <string name="quick_action_showhide_poi_title">הצגה/הסרה של נקודות עניין</string>
     <string name="quick_action_poi_show">הצגת %1$s</string>
     <string name="quick_action_poi_hide">הסתרת %1$s</string>
     <string name="quick_action_add_category">הוספת קטגוריה</string>
@@ -2843,7 +2840,6 @@
     <string name="step_by_step">פנייה אחר פנייה</string>
     <string name="routeInfo_road_types_name">סוגי כבישים</string>
     <string name="exit_at">לצאת ב־</string>
-    <string name="quick_action_show_hide_gpx_tracks">הצגה/הסתרה של מסלולים</string>
     <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>
@@ -3259,11 +3255,9 @@
     <string name="quick_action_contour_lines_descr">כפתור להצגה או להסתרה של קווי מתאר במפה.</string>
     <string name="quick_action_contour_lines_show">הצגת קווי מתאר</string>
     <string name="quick_action_contour_lines_hide">הסתרת קווי מתאר</string>
-    <string name="quick_action_show_hide_contour_lines">הצגה/הסתרה של קווי מתאר</string>
     <string name="quick_action_hillshade_descr">כפתור להצגה או הסתרה של הצללות במפה.</string>
     <string name="quick_action_hillshade_show">הצגת הצללה</string>
     <string name="quick_action_hillshade_hide">הסתרת הצללה</string>
-    <string name="quick_action_show_hide_hillshade">הצגה/הסתרה של הצללה</string>
     <string name="tts_initialization_error">לא ניתן להפעיל מנוע המרת טקסט לדיבור.</string>
     <string name="simulate_your_location_gpx_descr">הדמיית המיקום שלך באמצעות מסלול GPX שהוקלט מראש.</string>
     <string name="export_profile">ייצוא פרופיל</string>
@@ -3470,7 +3464,6 @@
     <string name="shared_string_hillshade">הצללה</string>
     <string name="n_items_of_z">%1$s מתוך %2$s</string>
     <string name="download_slope_maps">מדרונות</string>
-    <string name="quick_action_show_hide_terrain">הצגה או הסתרה של תוואי שטח</string>
     <string name="quick_action_terrain_hide">הסתרת תוואי שטח</string>
     <string name="quick_action_terrain_show">הצגת תוואי שטח</string>
     <string name="quick_action_terrain_descr">כפתור להצגה או הסתרה של שכבת תוואי שטח על גבי המפה.</string>
@@ -3593,7 +3586,6 @@
     <string name="additional_actions_descr">ניתן לגשת לפעולות האלו על ידי לחיצה על הכפתור „%1$s”.</string>
     <string name="quick_action_transport_hide">הסתרת תחבורה ציבורית</string>
     <string name="quick_action_transport_show">הצגת תחבורה ציבורית</string>
-    <string name="quick_action_show_hide_transport">הצגת או הסתרת תחב״צ</string>
     <string name="quick_action_transport_descr">כפתור להצגה או הסתרה של תחבורה ציבורית על המפה.</string>
     <string name="create_edit_poi">יצירה או עריכה של נקודת עניין</string>
     <string name="parking_positions">מקומות חנייה</string>
@@ -3686,7 +3678,6 @@
     <string name="vessel_height_warning">ניתן להגדיר את גובה כלי השיט כדי להימנע מגשרים נמוכים. נא לשים לב שאם הגשר נע, אנו נשתמש בגובהו במצב הפתוח.</string>
     <string name="vessel_height_limit_description">יש להגדיר את גובה כלי השיט כדי להימנע מגשרים נמוכים. נא לשים לב שאם הגשר נע, אנו נשתמש בגובהו במצב הפתוח.</string>
     <string name="vessel_width_limit_description">הגדרת רוחב כלי השיט כדי להימנע מגשרים צרים</string>
-    <string name="quick_action_showhide_mapillary_title">הצגת/הסתרת Mapillary</string>
     <string name="quick_action_mapillary_hide">הסתרת Mapillary</string>
     <string name="quick_action_mapillary_show">הצגת Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">מפסק להצגה או הסתרה של שכבת Mapillary על גבי המפה.</string>

OsmAnd/res/values-ja/strings.xml

@@ -2141,10 +2141,8 @@ POIの更新は利用できません</string>
     <string name="quick_action_duplicate">クイックアクション名の重複</string>
     <string name="quick_action_showhide_favorites_descr">マップ画面でのお気に入り地点の表示/非表示の切替が出来ます。</string>
     <string name="quick_action_showhide_poi_descr">マップ画面でのPOIの表示/非表示の切替が出来ます。</string>
-    <string name="quick_action_showhide_favorites_title">お気に入りの表示/非表示</string>
     <string name="quick_action_favorites_show">お気に入りを表示</string>
     <string name="quick_action_favorites_hide">お気に入りを非表示</string>
-    <string name="quick_action_showhide_poi_title">POIの表示/非表示</string>
     <string name="quick_action_poi_show">%1$sを表示</string>
     <string name="quick_action_poi_hide">%1$sを非表示</string>
     <string name="quick_action_add_category">カテゴリーを追加</string>
@@ -2349,7 +2347,6 @@ POIの更新は利用できません</string>
  • オプションで速度と標高表示ができます
  • 等高線と山陰の表示(要追加プラグイン）
  "</string>
-    <string name="quick_action_showhide_osmbugs_title">OSMメモの表示/非表示</string>
     <string name="quick_action_osmbugs_show">OSMメモを表示</string>
     <string name="quick_action_osmbugs_hide">OSMメモを非表示</string>
     <string name="quick_action_showhide_osmbugs_descr">マップ画面でのOSMメモの表示/非表示を切り替えるボタンです。</string>
@@ -2792,7 +2789,6 @@ POIの更新は利用できません</string>
     <string name="shared_string_swap">入れ替え</string>
     <string name="show_more">さらに表示</string>
     <string name="tracks_on_map">マップ上の経路</string>
-    <string name="quick_action_show_hide_gpx_tracks">GPX経路の表示/非表示</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">マップ上にある選択したGPX経路の表示/非表示を切り替えるボタンです。</string>
     <string name="quick_action_gpx_tracks_hide">経路の非表示</string>
     <string name="quick_action_gpx_tracks_show">経路の表示</string>
@@ -3269,11 +3265,9 @@ POIの更新は利用できません</string>
     <string name="quick_action_contour_lines_descr">マップ上の等高線の表示/非表示を切り替えられるボタンです。</string>
     <string name="quick_action_contour_lines_show">等高線を表示</string>
     <string name="quick_action_contour_lines_hide">等高線を非表示</string>
-    <string name="quick_action_show_hide_contour_lines">等高線を表示/非表示</string>
     <string name="quick_action_hillshade_descr">マップ上の陰影起伏図の表示/非表示を切り替えられるボタンです。</string>
     <string name="quick_action_hillshade_show">陰影起伏図を表示</string>
     <string name="quick_action_hillshade_hide">陰影起伏図を非表示</string>
-    <string name="quick_action_show_hide_hillshade">陰影起伏図の表示/非表示</string>
     <string name="tts_initialization_error">テキスト読み上げエンジンを起動できません。</string>
     <string name="export_profile">プロファイルのエクスポート</string>
     <string name="exported_osmand_profile">OsmAndプロファイル:%1$s</string>
@@ -3497,7 +3491,6 @@ POIの更新は利用できません</string>
     <string name="shared_string_zoom_levels">ズームレベル</string>
     <string name="shared_string_hillshade">陰影起伏図</string>
     <string name="download_slope_maps">勾配</string>
-    <string name="quick_action_show_hide_terrain">地形を表示/非表示</string>
     <string name="quick_action_terrain_hide">地形を非表示</string>
     <string name="quick_action_terrain_show">地形を表示</string>
     <string name="quick_action_terrain_descr">マップ上の地形レイヤーの表示/非表示を切り替えるボタンです。</string>
@@ -3510,7 +3503,6 @@ POIの更新は利用できません</string>
     <string name="shared_string_min">最小</string>
     <string name="quick_action_transport_hide">公共交通機関を非表示</string>
     <string name="quick_action_transport_show">公共交通機関を表示</string>
-    <string name="quick_action_show_hide_transport">公共交通機関の表示/非表示</string>
     <string name="quick_action_transport_descr">マップ内公共交通機関の表示/非表示を切り替えるボタンです。</string>
     <string name="create_edit_poi">POIの作成/編集</string>
     <string name="parking_positions">駐車位置</string>
@@ -3737,7 +3729,6 @@ POIの更新は利用できません</string>
     <string name="vessel_height_warning">低い橋を避けるために船の高さを調整できます。橋が可動式の場合は、開いた状態の高さが参照されます。</string>
     <string name="vessel_height_limit_description">低い橋を避けるために船の高さを設定します。注：橋が可動式の場合は、開いた状態の高さが参照されます。</string>
     <string name="vessel_width_limit_description">狭い橋を避けるために船の幅を設定します</string>
-    <string name="quick_action_showhide_mapillary_title">Mapillaryの表示切替</string>
     <string name="quick_action_mapillary_hide">Mapillaryを非表示</string>
     <string name="quick_action_mapillary_show">Mapillaryを表示</string>
     <string name="quick_action_showhide_mapillary_descr">マップ上のMapillaryレイヤーの表示/非表示を切り替えるトグルボタンです。</string>

OsmAnd/res/values-ka/strings.xml

@@ -1223,7 +1223,6 @@
     <string name="saving_new_profile">ახალი პროფილის ჩაწერა</string>
     <string name="n_items_of_z">%1$s %2$s-დან</string>
     <string name="download_slope_maps">დაქანებები</string>
-    <string name="quick_action_show_hide_terrain">რელიეფის ჩვენება/დამალვა</string>
     <string name="quick_action_terrain_hide">რელიეფის დამალვა</string>
     <string name="quick_action_terrain_show">რელიეფის ჩვენება</string>
     <string name="quick_action_terrain_descr">რელიეფის შრის საჩვენებელი ღილაკი.</string>
@@ -1799,7 +1798,6 @@
     <string name="transfers_size">%1$d გადმოწერა</string>
     <string name="quick_action_gpx_tracks_show">ბილიკების ჩვენება</string>
     <string name="quick_action_gpx_tracks_hide">ბილიკების დამალვა</string>
-    <string name="quick_action_show_hide_gpx_tracks">ბილიკების ჩვენება/დამალვა</string>
     <string name="exit_at">გამოსვლა</string>
     <string name="by_transport_type">%1$s-ით</string>
     <string name="tracks_on_map">ნაჩვენები ბილიკები</string>
@@ -1959,10 +1957,8 @@
     <string name="quick_action_add_configure_map">რუკის გამართვა</string>
     <string name="quick_action_poi_hide">%1$s-ის დამალვა</string>
     <string name="quick_action_poi_show">%1$s-ის ჩვენება</string>
-    <string name="quick_action_showhide_poi_title">POI-ს ჩვენება/დამალვა</string>
     <string name="quick_action_favorites_hide">რჩეულების დამალვა</string>
     <string name="quick_action_favorites_show">რჩეულების ჩვენება</string>
-    <string name="quick_action_showhide_favorites_title">რჩეულების ჩვენება/დამალვა</string>
     <string name="quick_actions_delete">მოქმედების წაშლა</string>
     <string name="dialog_add_action_title">მოქმედების დამატება</string>
     <string name="quick_action_add_favorite">რჩეულის დამატება</string>
@@ -2220,7 +2216,6 @@
     <string name="gpx_direction_arrows">მიმართულების ისრები</string>
     <string name="app_mode_enduro_motorcycle">მოტოციკლი Enduro</string>
     <string name="app_mode_motor_scooter">მოტორიანი სკუტერი</string>
-    <string name="quick_action_showhide_mapillary_title">Mapillary-ის ჩვენება/დამალვა</string>
     <string name="quick_action_mapillary_hide">Mapillary-ის დამალვა</string>
     <string name="quick_action_mapillary_show">Mapillary-ის ჩვენება</string>
     <string name="shared_string_delete_all_q">წავშალოთ ყველა\?</string>
@@ -2287,7 +2282,6 @@
     <string name="route_start_point">საწყისი წერტილი</string>
     <string name="profile_import">პროფილის იმპორტი</string>
     <string name="export_profile">პროფილის ექსპორტი</string>
-    <string name="quick_action_show_hide_hillshade">ბორცვების დამალვა/ჩვენება</string>
     <string name="quick_action_hillshade_hide">ბორცვების დამალვა</string>
     <string name="quick_action_hillshade_show">ბორცვების ჩვენება</string>
     <string name="shared_string_memory_kb_desc">%1$s კბ</string>
@@ -2365,7 +2359,6 @@
     <string name="how_to_open_wiki_title">როგორ გავხსნათ Wikipedia-ს სტატიები\?</string>
     <string name="welcome_to_open_beta">მოგესალმებით სატესტო ვერსიაში</string>
     <string name="show_arrows_on_the_map">რუკაზე ისრების ჩვენება</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM-ჩანაწერების ჩვენება ან დამალვა</string>
     <string name="search_hint">აკრიფეთ ქალაქის სახელი ან მისამართი</string>
     <string name="show_something_on_map">%1$s-ის რუკაზე ჩვენება</string>
     <string name="location_on_map">მდებარეობა:
@@ -2561,7 +2554,6 @@
     <string name="dialogs_and_notifications_title">შეტყობნებები</string>
     <string name="download_map_dialog">რუკის დიალოგის ფანჯარა</string>
     <string name="exported_osmand_profile">OsmAnd-ის პროფილი: %1$s</string>
-    <string name="quick_action_show_hide_contour_lines">კონტურული ხაზების ჩვენება/დამალვა</string>
     <string name="quick_action_contour_lines_hide">კონტურული ხაზების დამალვა</string>
     <string name="quick_action_contour_lines_show">კონტურული ხაზების ჩვენება</string>
     <string name="update_all_maps">ყველა რუკის განახლება</string>

OsmAnd/res/values-kn/strings.xml

@@ -322,11 +322,9 @@
     <string name="quick_action_contour_lines_descr">ನಕ್ಷೆಯಲ್ಲಿ ಬಾಹ್ಯರೇಖೆಗಳನ್ನು ತೋರಿಸಲು ಅಥವಾ ಮರೆಮಾಡಲು ಟಾಗಲ್.</string>
     <string name="quick_action_contour_lines_show">ಬಾಹ್ಯರೇಖೆ ರೇಖೆಗಳನ್ನು ತೋರಿಸಿ</string>
     <string name="quick_action_contour_lines_hide">ಬಾಹ್ಯರೇಖೆ ರೇಖೆಗಳನ್ನು ಮರೆಮಾಡಿ</string>
-    <string name="quick_action_show_hide_contour_lines">ಬಾಹ್ಯರೇಖೆಗಳನ್ನು ತೋರಿಸಿ / ಮರೆಮಾಡಿ</string>
     <string name="quick_action_hillshade_descr">ನಕ್ಷೆಯಲ್ಲಿ \'ಹಿಲ್ಶೇಡ್\' ಅನ್ನು ತೋರಿಸಲು ಅಥವಾ ಮರೆಮಾಡಲು ಟಾಗಲ್ ಮಾಡಿ.</string>
     <string name="quick_action_hillshade_show">ಹಿಲ್ಶೇಡ್ ತೋರಿಸು</string>
     <string name="quick_action_hillshade_hide">ಹಿಲ್ಶೇಡ್ ಅನ್ನು ಮರೆಮಾಡಿ</string>
-    <string name="quick_action_show_hide_hillshade">ಹಿಲ್ಶೇಡ್ ಅನ್ನು ತೋರಿಸಿ / ಮರೆಮಾಡಿ</string>
     <string name="tts_initialization_error">text-to-speech ಎಂಜಿನ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
     <string name="export_profile">ಪ್ರೊಫೈಲನ್ನು ಬೇರೆಡೆಗೆ ರಫ್ತುಮಾಡಿ</string>
     <string name="exported_osmand_profile">OsmAnd ಪ್ರೊಫೈಲ್:%1$s</string>

OsmAnd/res/values-lt/strings.xml

@@ -2048,7 +2048,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="dialog_add_action_title">Pridėti veiksmą</string>
     <string name="quick_actions_delete">Ištrinti veiksmą</string>
     <string name="favorite_empty_place_name">Vieta</string>
-    <string name="quick_action_showhide_poi_title">Rodyti/slėpti LV</string>
     <string name="quick_action_add_category">Pridėti kategoriją</string>
     <string name="quick_action_bug_message">Pranešimas</string>
     <string name="quick_action_map_styles">Žemėlapio stiliai</string>
@@ -2069,7 +2068,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="increase_search_radius">Padidinti paieškos spindulį</string>
     <string name="nothing_found">Nepavyko nieko rasti</string>
     <string name="nothing_found_descr">Pakeiskite paieškos užklausą arba padidinkite paieškos spindulį.</string>
-    <string name="quick_action_showhide_osmbugs_title">Rodyti/slėpti OSM Pastabas</string>
     <string name="quick_action_osmbugs_show">Rodyti OSM Pastabas</string>
     <string name="quick_action_osmbugs_hide">Slėpti OSM Pastabas</string>
     <string name="search_favorites">Ieškoti parankiniuose</string>
@@ -2141,7 +2139,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="quick_favorites_show_favorites_dialog">Rodyti parankinių dialogą</string>
     <string name="quick_action_interim_dialog">Rodyti tarpinį dialogo langą</string>
     <string name="favorite_autofill_toast_text">" įrašytas į "</string>
-    <string name="quick_action_showhide_favorites_title">Rodyti/slėpti parankinius</string>
     <string name="quick_action_favorites_show">Rodyti Parankinius</string>
     <string name="quick_action_favorites_hide">Slėpti Parankinius</string>
     <string name="quick_action_poi_show">Rodyti %1$s</string>
@@ -2620,7 +2617,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="time_of_day">Dienos metas</string>
     <string name="routeInfo_road_types_name">Kelių tipai</string>
     <string name="show_more">Rodyti daugiau</string>
-    <string name="quick_action_show_hide_gpx_tracks">Rodyti/slėpti GPX pėdsakus</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Paspaudus šį mygtuką žemėlapyje parodomi arba paslepiami GPX pėdsakai</string>
     <string name="quick_action_gpx_tracks_hide">Slėpti GPX pėdsakus</string>
     <string name="quick_action_gpx_tracks_show">Rodyti GPX pėdsakus</string>
@@ -2730,7 +2726,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="shared_string_restore">Atkurti</string>
     <string name="search_street">Ieškoti gatvės</string>
     <string name="measure_distance_item">Matuoti atstumą</string>
-    <string name="quick_action_show_hide_transport">Rodyti/paslėpti viešąjį transportą</string>
     <string name="quick_action_transport_hide">Paslėpti viešąjį transportą</string>
     <string name="quick_action_transport_show">Rodyti viešąjį transportą</string>
     <string name="shared_string_add_profile">Pridėti profilį</string>

OsmAnd/res/values-lv/strings.xml

@@ -2072,10 +2072,8 @@ Apraksta laukumu: %1$s x %2$s</string>
     <string name="favorite_empty_place_name">Vieta</string>
     <string name="quick_action_showhide_favorites_descr">Spiežot darbības pogu, tiks rādīti vai slēpti favorīti.</string>
     <string name="quick_action_showhide_poi_descr">Spiežot darbības pogu, tiks rādīti vai slēpti POI.</string>
-    <string name="quick_action_showhide_favorites_title">Rādīt/nerādīt izlasi</string>
     <string name="quick_action_favorites_show">Rādīt favorītus</string>
     <string name="quick_action_favorites_hide">Nerādīt izlasi</string>
-    <string name="quick_action_showhide_poi_title">Rādīt/slēpt POI</string>
     <string name="quick_action_poi_show">Rādīt %1$s</string>
     <string name="quick_action_poi_hide">Paslēpt %1$s</string>
     <string name="quick_action_add_category">Pievienot kategoriju</string>
@@ -2202,7 +2200,6 @@ Apraksta laukumu: %1$s x %2$s</string>
     <string name="increase_search_radius">Paplašināt meklēšanas rādiusu</string>
     <string name="nothing_found">Neko neatrada</string>
     <string name="nothing_found_descr">Meklējiet pēc cita vārda vai palieliniet meklēšanas rādiusu.</string>
-    <string name="quick_action_showhide_osmbugs_title">Rādīt/nerādīt OSM piezīmes</string>
     <string name="routing_attr_allow_private_description">Atļaut piekļūšanu privātajām teritorijām.</string>
     <string name="animate_my_location_desc">Maršruta gaitā iespējot kartes pagriešanas animāciju no manas atrašanās vietas.</string>
     <string name="quick_action_auto_zoom_desc">Ieslēdz vai izslēdz automātisko tālummaiņu, atkarībā no kustības ātruma.</string>
@@ -2670,7 +2667,6 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="step_by_step">Soli pa solim</string>
     <string name="exit_at">Iziet pie</string>
     <string name="sit_on_the_stop">Soliņš pieturā</string>
-    <string name="quick_action_show_hide_gpx_tracks">Rādīt/Slēpt GPX trekus</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Nospiežot šo pogu, tiek parādīti vai slēpti izvēlētie GPX treki uz kartes</string>
     <string name="quick_action_gpx_tracks_hide">Paslēpt GPX trekus</string>
     <string name="quick_action_gpx_tracks_show">Parādīt GPX trekus</string>

OsmAnd/res/values-ml/strings.xml

@@ -1695,7 +1695,6 @@
     <string name="restart_search">"വീണ്ടും തെരയുക "</string>
     <string name="increase_search_radius">"തെരച്ചില്‍ വൃത്തം വലുതാക്കുക "</string>
     <string name="nothing_found">"ഒന്നും കണ്ടെത്താനായില്ല "</string>
-    <string name="quick_action_showhide_osmbugs_title">"ഓഎസ് എം കുറിപ്പുകള്‍ (നോട്ട്സ്) കാണിക്കുക/കാണിക്കാതിരിക്കുക "</string>
     <string name="quick_action_osmbugs_show">ഓഎസ് എം കുറിപ്പുകള്‍ (നോട്ട്സ്) കാണിക്കുക</string>
     <string name="quick_action_osmbugs_hide">"ഓഎസ് എം കുറിപ്പുകള്‍ (നോട്ട്സ്) കാണിക്കാതിരിക്കുക "</string>
     <string name="quick_action_showhide_osmbugs_descr">ഓഎസ് എം കുറിപ്പുകള്‍ (നോട്ട്സ്) കാണാന്‍/കാണാതിരിക്കാന്‍ ഈ ആക്ഷന്‍ ബട്ടണ്‍ അമത്തുക</string>
@@ -2343,10 +2342,8 @@
     <string name="favorite_empty_place_name">സ്ഥലം</string>
     <string name="quick_action_duplicates">"അതിവേഗ പ്രവൃത്തിയുടെ നാമം  ഉപയോഗത്തിലുണ്ട്, ഡ്യൂപ്ലിക്കേഷൻ ഒഴിവാക്കുന്നതിന്  %1$s  എന്നാക്കി മാറ്റി."</string>
     <string name="quick_action_duplicate">ദ്രുത പ്രവർത്തനത്തിന്റെ പേര് ഒന്നിലധികം പകര്‍പ്പിലുണ്ട്</string>
-    <string name="quick_action_showhide_favorites_title">പ്രിയപ്പെട്ടവ കാണിക്കുക / മറയ്ക്കുക</string>
     <string name="quick_action_favorites_show">പ്രിയപ്പെട്ടവ കാണിക്കുക</string>
     <string name="quick_action_favorites_hide">പ്രിയങ്കരങ്ങൾ മറയ്ക്കുക</string>
-    <string name="quick_action_showhide_poi_title">POI കാണിക്കുക / മറയ്ക്കുക</string>
     <string name="quick_action_poi_show">%1$s കാണിക്കുക</string>
     <string name="quick_action_poi_hide">%1$s മറയ്ക്കുക</string>
     <string name="quick_action_add_category">ഒരു വിഭാഗം ചേർക്കുക</string>
@@ -2650,7 +2647,6 @@
     <string name="by_transport_type">%1$s-ല്‍</string>
     <string name="exit_at">പുറത്തേക്ക് എത്തുക</string>
     <string name="sit_on_the_stop">സ്റ്റോപ്പിൽ നിന്ന് കയറുക</string>
-    <string name="quick_action_show_hide_gpx_tracks">GPX ട്രാക്കുകൾ കാണിക്കുക / മറയ്ക്കുക</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">"ഈ  ബട്ടണ്‍ തെരഞ്ഞെടുത്ത GPX ട്രാക്കുകൾ മാപ്പില്‍ കാണിക്കാന്‍ /മറയ്ക്കാന്‍ ഉപയോഗിക്കാം"</string>
     <string name="quick_action_gpx_tracks_hide">GPX ട്രാക്കുകൾ മറയ്ക്കുക</string>
     <string name="quick_action_gpx_tracks_show">GPX ട്രാക്കുകൾ കാണിക്കുക</string>

OsmAnd/res/values-nb/strings.xml

@@ -1970,11 +1970,9 @@
     <string name="quick_action_add_configure_map">Kartinnstilling</string>
     <string name="quick_action_add_category">Legg til en kategori</string>
     <string name="quick_action_favorites_hide">Skjul favoritter</string>
-    <string name="quick_action_showhide_poi_title">Vis/skjul interessepunkt</string>
     <string name="quick_action_poi_show">Vis %1$s</string>
     <string name="quick_action_poi_hide">Skjul %1$s</string>
     <string name="quick_action_favorites_show">Vis favoritter</string>
-    <string name="quick_action_showhide_favorites_title">Vis/skjul favoritter</string>
     <string name="favorite_empty_place_name">Sted</string>
     <string name="quick_action_add_favorite">Legg til favoritt</string>
     <string name="quick_action_navigation_voice">Tale på/av</string>
@@ -2132,7 +2130,6 @@
     <string name="mapillary_menu_filter_description">Filtrer bilder etter innsender, dato eller type. Kun aktivt på nærgående forstørrelsesnivå.</string>
     <string name="improve_coverage_install_mapillary_desc">Installer Mapillary for å legge til bilder i denne kartposisjonen.</string>
     <string name="plugin_mapillary_descr">Foto på gatenivå for alle. Oppdag plasser, samarbeid, fang inn verden.</string>
-    <string name="quick_action_showhide_osmbugs_title">Vis/skjul OSM-notater</string>
     <string name="quick_action_osmbugs_show">Vis OSM-notater</string>
     <string name="quick_action_osmbugs_hide">Skjul OSM-notater</string>
     <string name="quick_action_showhide_osmbugs_descr">Knapp til å vise eller skjule OSM-notater på kartet.</string>
@@ -2852,7 +2849,6 @@
     <string name="routeInfo_road_types_name">Veityper</string>
     <string name="exit_at">Gå av på</string>
     <string name="sit_on_the_stop">Sitt på stoppet</string>
-    <string name="quick_action_show_hide_gpx_tracks">Vis/skjul spor</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Knapp for å vise eller skjule valgte spor på kartet.</string>
     <string name="quick_action_gpx_tracks_hide">Skjul spor</string>
     <string name="quick_action_gpx_tracks_show">Vis spor</string>
@@ -3164,11 +3160,9 @@
     <string name="routing_attr_driving_style_prefer_unpaved_description">Foretrekk veier uten fast dekke framfor med fast dekke for ruting.</string>
     <string name="quick_action_contour_lines_show">Vis koter</string>
     <string name="quick_action_contour_lines_hide">Skjul koter</string>
-    <string name="quick_action_show_hide_contour_lines">Vis/skjul koter</string>
     <string name="quick_action_hillshade_descr">En knapp for å vise eller skjule relieffskygger på kartet.</string>
     <string name="quick_action_hillshade_show">Vis relieffskygge</string>
     <string name="quick_action_hillshade_hide">Skjul relieffskygge</string>
-    <string name="quick_action_show_hide_hillshade">Vis/skjul relieffskygge</string>
     <string name="tts_initialization_error">Kan ikke starte tekst-til-tale-motor.</string>
     <string name="simulate_your_location_gpx_descr">Simuler posisjonen din ved bruk av et innspilt GPX-spor.</string>
     <string name="exported_osmand_profile">OsmAnd-profil: %1$s</string>
@@ -3393,7 +3387,6 @@
     <string name="open_settings">Åpne innstillinger</string>
     <string name="shared_string_terrain">Terreng</string>
     <string name="n_items_of_z">%1$s av %2$s</string>
-    <string name="quick_action_show_hide_terrain">Vis eller skjul terreng</string>
     <string name="quick_action_terrain_hide">Skjul terreng</string>
     <string name="quick_action_terrain_show">Vis terreng</string>
     <string name="delete_description">Slett beskrivelse</string>
@@ -3455,7 +3448,6 @@
     <string name="quick_action_transport_show">Vis offentlig transport</string>
     <string name="back_to_editing">Tilbake til redigering</string>
     <string name="create_edit_poi">Opprett eller rediger interessepunkt</string>
-    <string name="quick_action_show_hide_transport">Vis eller skjul offentlig transport</string>
     <string name="shared_string_add_profile">Legg til profil</string>
     <string name="quick_action_transport_descr">Knapp for vising eller skjuling av offentlig transport på kartet.</string>
     <string name="routing_profile_direct_to">Direkte-til-punkt</string>
@@ -3582,7 +3574,6 @@
     <string name="vessel_height_warning">Du kan sette fartøyhøyde for å unngå lave broer. Hvis broen endrer høyde, brukes høyden i åpen tilstand.</string>
     <string name="quick_action_remove_next_destination">Slett nærmeste målpunkt</string>
     <string name="please_provide_point_name_error">Navngi punktet</string>
-    <string name="quick_action_showhide_mapillary_title">Vis/skjul Mapillary</string>
     <string name="quick_action_mapillary_hide">Skjul Mapillary</string>
     <string name="quick_action_mapillary_show">Vis Mapillary</string>
     <string name="shared_string_bearing">Peiling</string>

OsmAnd/res/values-nl/strings.xml

@@ -2118,10 +2118,8 @@
     <string name="quick_action_duplicate">Sneltoets-duplicaat</string>
     <string name="quick_action_showhide_favorites_descr">Een schakelknop om Favorieten al dan niet te tonen op de kaart.</string>
     <string name="quick_action_showhide_poi_descr">Een schakelknop om POI’s al dan niet op de kaart te tonen.</string>
-    <string name="quick_action_showhide_favorites_title">Favorieten tonen /verbergen</string>
     <string name="quick_action_favorites_show">Favorieten tonen</string>
     <string name="quick_action_favorites_hide">Favorieten verbergen</string>
-    <string name="quick_action_showhide_poi_title">POI’s tonen/verbergen</string>
     <string name="quick_action_poi_show">%1$s tonen</string>
     <string name="quick_action_poi_hide">%1$s verbergen</string>
     <string name="quick_action_add_category">Categorie toevoegen</string>
@@ -2327,7 +2325,6 @@
 \n</string>
     <string name="save_poi_too_many_uppercase">Naam bevat erg veel hoofdletters, toch doorgaan?</string>
     <string name="search_favorites">Zoek in Favorieten</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM-opmerkingen tonen of verbergen</string>
     <string name="quick_action_osmbugs_show">OSM-opmerkingen tonen</string>
     <string name="quick_action_osmbugs_hide">OSM-opmerkingen verbergen</string>
     <string name="quick_action_showhide_osmbugs_descr">Knop om OSM-opmerkingen al dan niet te tonen.</string>
@@ -2859,7 +2856,6 @@
     <string name="shared_string_swap">Wissel</string>
     <string name="show_more">Toon meer</string>
     <string name="tracks_on_map">Getoonde tracks</string>
-    <string name="quick_action_show_hide_gpx_tracks">GPX-tracks tonen/verbergen</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Een knop om geselecteerde GPX-tracks al dan niet te tonen op de kaart.</string>
     <string name="quick_action_gpx_tracks_hide">GPX-tracks verbergen</string>
     <string name="quick_action_gpx_tracks_show">GPX-tracks tonen</string>
@@ -3131,11 +3127,9 @@
     <string name="quick_action_contour_lines_descr">Knop om hoogtelijnen al dan niet te tonen op de kaart.</string>
     <string name="quick_action_contour_lines_show">Hoogtelijnen tonen</string>
     <string name="quick_action_contour_lines_hide">Hoogtelijnen verbergen</string>
-    <string name="quick_action_show_hide_contour_lines">Hoogtelijnen tonen/verbergen</string>
     <string name="quick_action_hillshade_descr">Knop om de reliëfschaduw al dan niet te tonen op de kaart.</string>
     <string name="quick_action_hillshade_show">Reliëfschaduw tonen</string>
     <string name="quick_action_hillshade_hide">Reliëfschaduw verbergen</string>
-    <string name="quick_action_show_hide_hillshade">Reliëfschaduw tonen/verbergen</string>
     <string name="track_saved">Track opgeslagen</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Toon knooppunt van de fietsroutes</string>
     <string name="contour_lines_and_hillshade">Hoogtelijnen en reliëfschaduw</string>
@@ -3408,7 +3402,6 @@
     <string name="profile_backup_failed">Kan profiel niet back-uppen.</string>
     <string name="n_items_of_z">%1$s van %2$s</string>
     <string name="download_slope_maps">Hellingen</string>
-    <string name="quick_action_show_hide_terrain">Terrein tonen / verbergen</string>
     <string name="quick_action_terrain_hide">Terrein verbergen</string>
     <string name="quick_action_terrain_show">Terrein tonen</string>
     <string name="quick_action_terrain_descr">Een knop om de terreinlaag al dan niet te tonen op de kaart.</string>
@@ -3445,7 +3438,6 @@
     <string name="clear_tiles_warning">Het toepassen van deze wijzigingen wist de cache van deze rasterkaartbron</string>
     <string name="vessel_height_warning_link">Stel de hoogte van het vaartuig in</string>
     <string name="vessel_height_warning">Stel de hoogte van het vaartuig in om lage bruggen te vermijden. Let op, als de brug beweegbaar is, gebruiken we de hoogte in geopende toestand.</string>
-    <string name="quick_action_showhide_mapillary_title">Mapillary tonen/verbergen</string>
     <string name="quick_action_mapillary_hide">Mapillary verbergen</string>
     <string name="quick_action_mapillary_show">Mapillary tonen</string>
     <string name="quick_action_showhide_mapillary_descr">Een schakelknop om de Mapillary-laag al dan niet te tonen op de kaart.</string>
@@ -3563,7 +3555,6 @@
     <string name="search_poi_types">POI-types zoeken</string>
     <string name="quick_action_transport_hide">OV-informatie verbergen</string>
     <string name="quick_action_transport_show">OV-informatie tonen</string>
-    <string name="quick_action_show_hide_transport">OV-informatie tonen/verbergen</string>
     <string name="quick_action_transport_descr">Knop om OV-informatie al dan niet te tonen op de kaart.</string>
     <string name="add_edit_favorite">Favoriet toevoegen / bewerken</string>
     <string name="create_edit_poi">POI toevoegen / bewerken</string>

OsmAnd/res/values-oc/strings.xml

@@ -136,7 +136,6 @@
     <string name="shared_string_swap">De l\'envèrs</string>
     <string name="show_more">Mostrar mai</string>
     <string name="tracks_on_map">Traças vesedoiras</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mòstrar/ Amagar la traça GPS</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">De quichar sus lo boton mòstra ò amaga la traça GPS sus la mapa</string>
     <string name="quick_action_gpx_tracks_hide">Amagar la traça GPS</string>
     <string name="quick_action_gpx_tracks_show">Mostrar la traça GPS</string>
@@ -484,11 +483,9 @@
     <string name="quick_action_contour_lines_descr">Un commutador per mostrar o amagar lei corbas de nivèu sus la mapa.</string>
     <string name="quick_action_contour_lines_show">Mostrar lei corbas de nivèu</string>
     <string name="quick_action_contour_lines_hide">Amagar lei corbas de nivèu</string>
-    <string name="quick_action_show_hide_contour_lines">Mòstra/Amaga lei corbas de nivèu</string>
     <string name="quick_action_hillshade_descr">Un commutador per mostrar o amagar l\'ombrejat de relèu de la mapa.</string>
     <string name="quick_action_hillshade_show">Mostrar l’ombrejat de relèu</string>
     <string name="quick_action_hillshade_hide">Amagar l’ombrejat de relèu</string>
-    <string name="quick_action_show_hide_hillshade">Mòstra/Amaga l’ombrejat de relèu</string>
     <string name="export_profile">Exportar lo perfiu</string>
     <string name="exported_osmand_profile">Perfiu d\'OsmAnd: %1$s</string>
     <string name="overwrite_profile_q">Lo perfiu \'%1$s\' existís ja. Lo volètz subrescriure\?</string>

OsmAnd/res/values-pl/strings.xml

@@ -2134,10 +2134,8 @@
     <string name="quick_action_duplicate">Kopia nazwy szybkiej czynności</string>
     <string name="quick_action_showhide_favorites_descr">Przełącznik wyświetlania lub ukrywania ulubionych miejsc na mapie.</string>
     <string name="quick_action_showhide_poi_descr">Przełącznik wyświetlania lub ukrywania użytecznych miejsc na mapie.</string>
-    <string name="quick_action_showhide_favorites_title">Przełącz widoczność ulubionych</string>
     <string name="quick_action_favorites_show">Pokaż Ulubione</string>
     <string name="quick_action_favorites_hide">Ukryj Ulubione</string>
-    <string name="quick_action_showhide_poi_title">Przełącz widoczność użytecznych miejsc</string>
     <string name="quick_action_add_create_items">Tworzenie elementów</string>
     <string name="quick_action_bug_descr">Ta wiadomość uzupełni się w polu komentarza.</string>
     <string name="quick_action_bug_message">Wiadomość</string>
@@ -2282,7 +2280,6 @@
     <string name="hillshade_purchase_header">Zainstaluj wtyczkę \'Poziomice\', aby pokazać stopniowane obszary pionowe.</string>
     <string name="hillshade_menu_download_descr">Pobierz mapę \"Cieniowanie Rzeźby Terenu\", by wyświetlić cieniowanie pionowe.</string>
     <string name="srtm_purchase_header">Kup i zainstaluj wtyczkę \'Poziomice\', aby pokazać stopniowane obszary pionowe.</string>
-    <string name="quick_action_showhide_osmbugs_title">Pokaż lub ukryj uwagi OSM</string>
     <string name="quick_action_osmbugs_show">Pokaż uwagi OSM</string>
     <string name="quick_action_osmbugs_hide">Ukryj uwagi OSM</string>
     <string name="osmand_plus_extended_description_part8">Przybliżony zasięg i jakość mapy: 
@@ -2845,7 +2842,6 @@
     <string name="shared_string_swap">Wymień</string>
     <string name="show_more">Wyświetl więcej</string>
     <string name="tracks_on_map">Wyświetlane ślady</string>
-    <string name="quick_action_show_hide_gpx_tracks">Pokaż/Ukryj ślady</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Przycisk do pokazywania lub ukrywania wybranych śladów na mapie.</string>
     <string name="quick_action_gpx_tracks_hide">Ukryj ślady</string>
     <string name="quick_action_gpx_tracks_show">Pokaż ślady</string>
@@ -3266,10 +3262,8 @@
     <string name="quick_action_contour_lines_descr">Przełącza wyświetlenie poziomic na mapie.</string>
     <string name="quick_action_contour_lines_show">Wyświetl poziomice</string>
     <string name="quick_action_contour_lines_hide">Ukryj poziomice</string>
-    <string name="quick_action_show_hide_contour_lines">Przełącz widoczność poziomic</string>
     <string name="quick_action_hillshade_show">Wyświetl cieniowanie terenu</string>
     <string name="quick_action_hillshade_hide">Ukryj cieniowanie terenu</string>
-    <string name="quick_action_show_hide_hillshade">Przełącz widoczność cieniowania terenu</string>
     <string name="quick_action_hillshade_descr">Przycisk do pokazywania lub ukrywania cieniowania terenu na mapie.</string>
     <string name="tts_initialization_error">Nie można uruchomić mechanizmu zamiany tekstu na mowę.</string>
     <string name="shared_preference">Wspólne</string>
@@ -3486,7 +3480,6 @@
     <string name="quick_action_terrain_descr">Przycisk do wyświetlania lub ukrywania warstwy terenu na mapie.</string>
     <string name="quick_action_terrain_show">Pokaż teren</string>
     <string name="quick_action_terrain_hide">Ukryj teren</string>
-    <string name="quick_action_show_hide_terrain">Pokaż lub ukryj teren</string>
     <string name="download_slope_maps">Nachylenie</string>
     <string name="terrain_empty_state_text">Włącz, aby wyświetlić cieniowanie wzniesień lub stoków. Możesz przeczytać więcej o tego rodzaju mapach na naszej stronie.</string>
     <string name="shared_string_legend">Legenda</string>
@@ -3613,7 +3606,6 @@
     <string name="back_to_editing">Powrót do edycji</string>
     <string name="quick_action_transport_hide">Ukryj transport publiczny</string>
     <string name="quick_action_transport_show">Pokaż transport publiczny</string>
-    <string name="quick_action_show_hide_transport">Pokaż lub ukryj transport publiczny</string>
     <string name="create_edit_poi">Utwórz lub edytuj użyteczne miejsce</string>
     <string name="add_edit_favorite">Dodaj lub edytuj ulubione miejsce</string>
     <string name="quick_action_switch_profile_descr">Przycisk akcji przełącza między wybranymi profilami.</string>
@@ -3665,7 +3657,6 @@
     <string name="vessel_height_limit_description">Ustaw wysokość statku, by unikać niskich mostów. Uwaga: dla mostów zwodzonych liczymy wysokość podniesionego mostu.</string>
     <string name="vessel_height_warning_link">Ustaw wysokość statku</string>
     <string name="vessel_width_limit_description">Ustaw szerokość statku, by unikać wąskich mostów</string>
-    <string name="quick_action_showhide_mapillary_title">Pokaż/ukryj Mapillary</string>
     <string name="quick_action_mapillary_hide">Ukryj Mapillary</string>
     <string name="quick_action_mapillary_show">Pokaż Mapillary</string>
     <string name="width_limit_description">Wprowadź szerokość pojazdu, niektóre restrykcje dróg mogą dotyczyć szerokich pojazdów.</string>

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

@@ -2049,7 +2049,6 @@
     <string name="increase_search_radius">Aumentar o raio de busca</string>
     <string name="nothing_found">Nada encontrado</string>
     <string name="nothing_found_descr">Modifique o texto da pesquisa ou aumente o raio de busca.</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostrar ou ocultar notas do OSM</string>
     <string name="quick_action_osmbugs_show">Mostrar Anotações do OSM</string>
     <string name="quick_action_osmbugs_hide">Ocultar notas OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Botão para mostrar ou ocultar notas do OSM no mapa.</string>
@@ -2457,10 +2456,8 @@
     <string name="quick_action_duplicate">Nome de ação rápida duplicado</string>
     <string name="quick_action_showhide_favorites_descr">Uma alternância para mostrar ou ocultar os pontos Favoritos no mapa.</string>
     <string name="quick_action_showhide_poi_descr">Alternar para mostrar ou ocultar POIs no mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Mostrar/ocultar favoritos</string>
     <string name="quick_action_favorites_show">Mostrar Favoritos</string>
     <string name="quick_action_favorites_hide">Ocultar favoritos</string>
-    <string name="quick_action_showhide_poi_title">Mostrar/ocultar POI</string>
     <string name="quick_action_poi_show">Mostrar %1$s</string>
     <string name="quick_action_poi_hide">Ocultar %1$s</string>
     <string name="quick_action_add_category">Adicionar uma categoria</string>
@@ -2841,7 +2838,6 @@
     <string name="routeInfo_road_types_name">Tipos de estrada</string>
     <string name="exit_at">Desembarque em</string>
     <string name="sit_on_the_stop">Embarque na parada</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostrar/ocultar trilhas</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Um botão para mostrar ou ocultar as trilhas selecionadas no mapa.</string>
     <string name="quick_action_gpx_tracks_hide">Ocultar trilhas</string>
     <string name="quick_action_gpx_tracks_show">Mostrar trilhas</string>
@@ -3259,11 +3255,9 @@
     <string name="quick_action_contour_lines_descr">Botão que mostra ou oculta linhas de contorno no mapa.</string>
     <string name="quick_action_contour_lines_show">Mostrar curvas de nível</string>
     <string name="quick_action_contour_lines_hide">Ocultar linhas de contorno</string>
-    <string name="quick_action_show_hide_contour_lines">Mostrar/ocultar linhas de contorno</string>
     <string name="quick_action_hillshade_descr">Um botão para mostrar ou ocultar sombras de relevo.</string>
     <string name="quick_action_hillshade_show">Mostrar sombras de relevo</string>
     <string name="quick_action_hillshade_hide">Ocultar sombras de relevo</string>
-    <string name="quick_action_show_hide_hillshade">Mostrar/ocultar sombras de relevo</string>
     <string name="tts_initialization_error">Não é possível iniciar o mecanismo de conversão de texto em fala.</string>
     <string name="simulate_your_location_gpx_descr">Simule sua posição usando um rasteador GPX gravada.</string>
     <string name="export_profile">Exportar perfil</string>
@@ -3489,7 +3483,6 @@
     <string name="shared_string_hillshade">Sombras de relevo</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Encostas</string>
-    <string name="quick_action_show_hide_terrain">Mostrar ou ocultar terreno</string>
     <string name="quick_action_terrain_hide">Ocultar terreno</string>
     <string name="quick_action_terrain_show">Mostrar terreno</string>
     <string name="quick_action_terrain_descr">Um botão para mostrar ou ocultar a camada do terreno no mapa.</string>
@@ -3606,7 +3599,6 @@
     <string name="additional_actions_descr">Você pode acessar essas ações tocando no botão “%1$s”.</string>
     <string name="quick_action_transport_hide">Ocultar transporte público</string>
     <string name="quick_action_transport_show">Mostrar transporte público</string>
-    <string name="quick_action_show_hide_transport">Mostrar ou ocultar transporte público</string>
     <string name="quick_action_transport_descr">Botão que mostra ou oculta o transporte público no mapa.</string>
     <string name="create_edit_poi">Criar ou editar POI</string>
     <string name="parking_positions">Posições de estacionamento</string>
@@ -3675,7 +3667,6 @@
     <string name="vessel_height_warning">Você pode definir a altura da embarcação para evitar pontes baixas. Lembre-se, se a ponte for móvel, usaremos sua altura no estado aberto.</string>
     <string name="vessel_height_limit_description">Defina a altura da embarcação para evitar pontes baixas. Lembre-se, se a ponte for móvel, usaremos sua altura no estado aberto.</string>
     <string name="vessel_width_limit_description">Defina a largura da embarcação para evitar pontes estreitas</string>
-    <string name="quick_action_showhide_mapillary_title">Mostrar/ocultar Mapillary</string>
     <string name="quick_action_mapillary_hide">Ocultar Mapillary</string>
     <string name="quick_action_mapillary_show">Mostrar Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Uma alternância para mostrar ou ocultar a camada Mapillary no mapa.</string>

OsmAnd/res/values-pt/strings.xml

@@ -1911,7 +1911,6 @@
     <string name="increase_search_radius">Aumentar raio de pesquisa</string>
     <string name="nothing_found">Nada encontrado</string>
     <string name="nothing_found_descr">Altere a pesquisa ou aumente o raio dela.</string>
-    <string name="quick_action_showhide_osmbugs_title">Mostrar ou ocultar anotações do OSM</string>
     <string name="quick_action_osmbugs_show">Mostrar anotações OSM</string>
     <string name="quick_action_osmbugs_hide">Ocultar anotações do OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Botão para mostrar ou ocultar anotações OSM no mapa.</string>
@@ -2725,10 +2724,8 @@
     <string name="quick_action_duplicate">Nome de ação rápida duplicado</string>
     <string name="quick_action_showhide_favorites_descr">Uma alternância para mostrar ou ocultar os pontos favoritos no mapa.</string>
     <string name="quick_action_showhide_poi_descr">Uma alternância para mostrar ou ocultar PIs no mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Mostrar/esconder favoritos</string>
     <string name="quick_action_favorites_show">Mostrar Favoritos</string>
     <string name="quick_action_favorites_hide">Esconder favoritos</string>
-    <string name="quick_action_showhide_poi_title">Mostrar/esconder POI</string>
     <string name="quick_action_poi_show">Mostrar %1$s</string>
     <string name="quick_action_poi_hide">Esconder %1$s</string>
     <string name="quick_action_add_category">Adicionar uma categoria</string>
@@ -2894,7 +2891,6 @@
     <string name="shared_string_swap">Trocar</string>
     <string name="show_more">Mostrar mais</string>
     <string name="tracks_on_map">Trilhos mostrados</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostrar/ocultar trilhos</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Um botão para mostrar ou ocultar trilhos selecionados no mapa.</string>
     <string name="quick_action_gpx_tracks_hide">Ocultar trilhos</string>
     <string name="routing_attr_avoid_tram_name">Sem elétricos</string>
@@ -3286,11 +3282,9 @@
     <string name="quick_action_contour_lines_descr">Botão que mostra ou oculta curvas de nível no mapa.</string>
     <string name="quick_action_contour_lines_show">Mostrar curvas de nível</string>
     <string name="quick_action_contour_lines_hide">Ocultar curvas de nível</string>
-    <string name="quick_action_show_hide_contour_lines">Mostrar/ocultar curvas de nível</string>
     <string name="quick_action_hillshade_descr">Um botão para mostrar ou ocultar sombras de relevo.</string>
     <string name="quick_action_hillshade_show">Mostrar sombras de relevo</string>
     <string name="quick_action_hillshade_hide">Ocultar sombras de relevo</string>
-    <string name="quick_action_show_hide_hillshade">Mostrar/ocultar sombras de relevo</string>
     <string name="tts_initialization_error">Não é possível iniciar o mecanismo de conversão de texto em fala.</string>
     <string name="simulate_your_location_gpx_descr">Simule a sua posição usando um caminho GPX gravado.</string>
     <string name="export_profile">Exportar o perfil</string>
@@ -3345,7 +3339,6 @@
     <string name="shared_string_hillshade">Sombras de relevo</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Pistas</string>
-    <string name="quick_action_show_hide_terrain">Mostrar ou ocultar terrenos</string>
     <string name="quick_action_terrain_hide">Ocultar terreno</string>
     <string name="quick_action_terrain_show">Mostrar terreno</string>
     <string name="quick_action_terrain_descr">Um botão para mostrar ou esconder a camada do terreno no mapa.</string>
@@ -3593,7 +3586,6 @@
     <string name="search_poi_types_descr">Combinar categorias de POI de categorias diferentes. Toque em trocar para selecionar tudo, toque no lado esquerdo para seleção da categoria.</string>
     <string name="quick_action_transport_hide">Ocultar o transporte público</string>
     <string name="quick_action_transport_show">Mostrar transporte público</string>
-    <string name="quick_action_show_hide_transport">Mostrar ou ocultar transportes públicos</string>
     <string name="quick_action_transport_descr">Botão que mostra ou oculta o transporte público no mapa.</string>
     <string name="create_edit_poi">Criar ou editar um POI</string>
     <string name="parking_positions">Posições de estacionamento</string>
@@ -3712,7 +3704,6 @@
     <string name="vessel_height_warning">Pode definir a altura da embarcação para evitar pontes baixas. Lembre-se, se a ponte for móvel, usaremos sua altura no estado aberto.</string>
     <string name="app_mode_wheelchair_forward">Cadeira de rodas para a frente</string>
     <string name="use_volume_buttons_as_zoom_descr">Controlar o nível de ampliação do mapa pelos botões de volume do aparelho.</string>
-    <string name="quick_action_showhide_mapillary_title">Mostrar/ocultar Mapillary</string>
     <string name="uninstall_speed_cameras">Desinstalar radares de velocidade</string>
     <string name="osm_edit_closed_note">Anotaçaõ OSM fechada</string>
     <string name="shared_string_uninstall_and_restart">Desinstalar e reiniciar</string>

OsmAnd/res/values-ro/strings.xml

@@ -1803,7 +1803,6 @@
     <string name="increase_search_radius">Măriți aria de căutare</string>
     <string name="nothing_found">Nimic găsit</string>
     <string name="nothing_found_descr">Modifică criteriile de căutare sau mărește aria de căutare.</string>
-    <string name="quick_action_showhide_osmbugs_title">Comutare note OSM</string>
     <string name="quick_action_osmbugs_show">Arată notele OSM</string>
     <string name="quick_action_osmbugs_hide">Ascunde notele OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Atingând acest buton de acțiune, se afișează sau se ascund notele OSM de pe hartă.</string>
@@ -2204,7 +2203,6 @@
     <string name="shared_string_swap">Schimbați</string>
     <string name="show_more">Afișați mai multe</string>
     <string name="tracks_on_map">Trasee afișate</string>
-    <string name="quick_action_show_hide_gpx_tracks">Afișați/Ascundeți traseele GPX</string>
     <string name="quick_action_gpx_tracks_hide">Ascundeți traseele GPX</string>
     <string name="quick_action_gpx_tracks_show">Afișați traseele GPX</string>
     <string name="add_destination_query">Selectați destinația mai întâi</string>
@@ -2383,11 +2381,9 @@
     <string name="quick_action_contour_lines_descr">Comută pentru a afișa sau ascunde liniile de contur pe hartă.</string>
     <string name="quick_action_contour_lines_show">Afişează conturul liniilor</string>
     <string name="quick_action_contour_lines_hide">Ascunde conturul liniilor</string>
-    <string name="quick_action_show_hide_contour_lines">Afişează-ascunde conturul liniilor</string>
     <string name="quick_action_hillshade_descr">Comută pentru a arăta sau ascunde umbrele de pe hartă.</string>
     <string name="quick_action_hillshade_show">Arata si umbrele</string>
     <string name="quick_action_hillshade_hide">Ascunde afisarea umbrelor</string>
-    <string name="quick_action_show_hide_hillshade">Afişează/ascunde umbrele</string>
     <string name="tts_initialization_error">Motorul text-to-speech nu porneste.</string>
     <string name="export_profile">Exportă profilul</string>
     <string name="exported_osmand_profile">Profil osmand exportat %1$s</string>
@@ -2825,7 +2821,6 @@
     <string name="shared_string_tones">tone</string>
     <string name="shared_string_meters">metrii</string>
     <string name="add_online_source">Adăugare surse online</string>
-    <string name="quick_action_showhide_mapillary_title">Afișare/ascundere Mapillary</string>
     <string name="quick_action_mapillary_hide">Ascundere Mapillary</string>
     <string name="quick_action_mapillary_show">Afișare Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">O comutare pentru a afișa sau ascunde stratul Mapillary pe hartă.</string>

OsmAnd/res/values-ru/strings.xml

@@ -40,7 +40,6 @@
     <string name="increase_search_radius">Увеличить радиус поиска</string>
     <string name="nothing_found">Ничего не найдено</string>
     <string name="nothing_found_descr">Изменить запрос или увеличить радиус поиска.</string>
-    <string name="quick_action_showhide_osmbugs_title">Показать/скрыть OSM-заметки</string>
     <string name="quick_action_osmbugs_show">Показать OSM-заметки</string>
     <string name="quick_action_osmbugs_hide">Скрыть OSM-заметки</string>
     <string name="quick_action_showhide_osmbugs_descr">Переключатель отображения OSM-заметок на карте.</string>
@@ -147,7 +146,6 @@
     <string name="quick_action_duplicate">Обнаружен дубликат имени</string>
     <string name="quick_action_showhide_favorites_descr">Переключатель, чтобы показать или скрыть избранные точки на карте.</string>
     <string name="quick_action_showhide_poi_descr">Переключатель, чтобы показать или скрыть POI на карте.</string>
-    <string name="quick_action_showhide_favorites_title">Показать/скрыть избранные</string>
     <string name="quick_action_add_category">Категория</string>
     <string name="quick_action_add_create_items">Действия</string>
     <string name="quick_action_fav_name_descr">Если оставить это поле пустым, то оно будет автоматически заполнено адресом или названием места.</string>
@@ -2260,7 +2258,6 @@
     <string name="quick_actions_delete_text">Вы уверены, что хотите удалить действие «%s»\?</string>
     <string name="quick_action_favorites_show">Показать избранные</string>
     <string name="quick_action_favorites_hide">Скрыть избранные</string>
-    <string name="quick_action_showhide_poi_title">Показать/скрыть POI</string>
     <string name="quick_action_poi_show">Показать %1$s</string>
     <string name="quick_action_poi_hide">Скрыть %1$s</string>
     <string name="quick_action_add_configure_map">Настройки карты</string>
@@ -2868,7 +2865,6 @@
     <string name="shared_string_swap">Поменять</string>
     <string name="show_more">Показать больше</string>
     <string name="tracks_on_map">Отображаемые треки</string>
-    <string name="quick_action_show_hide_gpx_tracks">Показать/скрыть треки</string>
     <string name="quick_action_gpx_tracks_hide">Скрыть треки</string>
     <string name="quick_action_gpx_tracks_show">Показать треки</string>
     <string name="time_of_day">Время суток</string>
@@ -3230,11 +3226,9 @@
     <string name="quick_action_contour_lines_descr">Переключатель, показывающая или скрывающая контурные линии на карте.</string>
     <string name="quick_action_contour_lines_show">Показать контурные линии</string>
     <string name="quick_action_contour_lines_hide">Скрыть контурные линии</string>
-    <string name="quick_action_show_hide_contour_lines">Показать/скрыть контурные линии</string>
     <string name="quick_action_hillshade_descr">Переключатель, чтобы показать или скрыть затенение рельефа на карте.</string>
     <string name="quick_action_hillshade_show">Показать затенение рельефа</string>
     <string name="quick_action_hillshade_hide">Скрыть затенение рельефа</string>
-    <string name="quick_action_show_hide_hillshade">Показать/скрыть затенение рельефа</string>
     <string name="export_profile">Экспорт профиля</string>
     <string name="exported_osmand_profile">Профиль OsmAnd: %1$s</string>
     <string name="overwrite_profile_q">«%1$s» уже существует. Перезаписать\?</string>
@@ -3482,7 +3476,6 @@
     <string name="recalculate_route_in_deviation">Пересчитывать маршрут в случае отклонения</string>
     <string name="n_items_of_z">%1$s из %2$s</string>
     <string name="terrain_slider_description">Настройка минимального и максимального уровней масштабирования, при которых слой будет отображаться.</string>
-    <string name="quick_action_show_hide_terrain">Показать или скрыть рельеф</string>
     <string name="quick_action_terrain_descr">Переключатель, чтобы показать или скрыть слой рельефа местности на карте.</string>
     <string name="quick_action_terrain_show">Показать рельеф</string>
     <string name="quick_action_terrain_hide">Скрыть рельеф</string>
@@ -3611,7 +3604,6 @@
     <string name="additional_actions_descr">Функции, доступные при нажатии кнопки «%1$s».</string>
     <string name="quick_action_transport_hide">Скрыть общественный транспорт</string>
     <string name="quick_action_transport_show">Показать общественный транспорт</string>
-    <string name="quick_action_show_hide_transport">Показать/скрыть общественный транспорт</string>
     <string name="add_edit_favorite">Добавить или изменить избранное</string>
     <string name="create_edit_poi">Создать или изменить POI</string>
     <string name="back_to_editing">Возврат к редактированию</string>
@@ -3680,7 +3672,6 @@
     <string name="vessel_height_warning">Вы можете указать высоту судна, чтобы избегать низких мостов. Имейте в виду, что если мост раздвижной, будет использована его высота в открытом состоянии.</string>
     <string name="vessel_height_limit_description">Укажите высоту судна, чтобы избежать низких мостов. Имейте в виду, что если мост раздвижной, будет использована его высота в открытом состоянии.</string>
     <string name="vessel_width_limit_description">Укажите ширину судна, чтобы избежать узких мостов</string>
-    <string name="quick_action_showhide_mapillary_title">Показать/скрыть Mapillary</string>
     <string name="quick_action_mapillary_hide">Скрыть Mapillary</string>
     <string name="quick_action_mapillary_show">Показать Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Переключатель, чтобы показать или скрыть слой Mapillary на карте.</string>

OsmAnd/res/values-sc/strings.xml

@@ -2119,10 +2119,8 @@
     <string name="quick_action_interim_dialog">Ammustra una ventana intermèdia</string>
     <string name="quick_action_showhide_favorites_descr">Unu butone pro ammustrare o cuare sos puntos preferidos in sa mapa.</string>
     <string name="quick_action_showhide_poi_descr">Unu butone pro ammustrare o cuare sos PDI in sa mapa.</string>
-    <string name="quick_action_showhide_favorites_title">Ammustra/cua sos preferidos</string>
     <string name="quick_action_favorites_show">Ammustra sos preferidos</string>
     <string name="quick_action_favorites_hide">Cua sos preferidos</string>
-    <string name="quick_action_showhide_poi_title">Ammustra/cua sos PDI</string>
     <string name="quick_action_poi_show">Ammustra %1$s</string>
     <string name="quick_action_poi_hide">Cua %1$s</string>
     <string name="quick_action_add_category">Annanghe una categoria</string>
@@ -2389,7 +2387,6 @@
     <string name="srtm_purchase_header">Còmpora e installa s\'estensione \'Curvas de Livellu\' pro ammustrare sas àreas verticales graduadas.</string>
     <string name="search_favorites">Chirca in sos preferidos</string>
     <string name="sorted_by_distance">Ordinados pro distàntzia</string>
-    <string name="quick_action_showhide_osmbugs_title">Ammustra/cua sas notas OSM</string>
     <string name="quick_action_osmbugs_show">Ammustra sas notas OSM</string>
     <string name="quick_action_osmbugs_hide">Cua sas notas OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Unu butone pro ammustrare o cuare sas Notas OSM in sa mapa.</string>
@@ -2844,7 +2841,6 @@
     <string name="routeInfo_road_types_name">Castas de àndalas</string>
     <string name="exit_at">Essi in</string>
     <string name="sit_on_the_stop">Àrtzia in sa firmada</string>
-    <string name="quick_action_show_hide_gpx_tracks">Ammustra/cua sas rastas</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Unu butone pro ammustrare o cuare sas rastas ischertadas in sa mapa.</string>
     <string name="quick_action_gpx_tracks_hide">Istichi sas rastas</string>
     <string name="quick_action_gpx_tracks_show">Ammustra sas rastas</string>
@@ -3264,11 +3260,9 @@
     <string name="quick_action_contour_lines_descr">Butone chi ammustrat o cuat sas curvas de livellu in sa mapa.</string>
     <string name="quick_action_contour_lines_show">Ammustra sas curvas de livellu</string>
     <string name="quick_action_contour_lines_hide">Cua sas curvas de livellu</string>
-    <string name="quick_action_show_hide_contour_lines">Ammustra/cua sas curvas de livellu</string>
     <string name="quick_action_hillshade_descr">Unu butone pro ammustrare o cuare sas umbraduras de sos rilievos in sa mapa.</string>
     <string name="quick_action_hillshade_show">Ammustra sas umbraduras de sos rilievos</string>
     <string name="quick_action_hillshade_hide">Cua sas umbraduras de sos rilievos</string>
-    <string name="quick_action_show_hide_hillshade">Ammustra/cua sas umbraduras de sos rilievos</string>
     <string name="tts_initialization_error">Allughidura de su motore de sìntesi vocale fallida.</string>
     <string name="simulate_your_location_gpx_descr">Sìmula sa positzione tua impreende una rasta GPX registrada.</string>
     <string name="export_profile">Esporta su profilu</string>
@@ -3494,7 +3488,6 @@
     <string name="shared_string_hillshade">Umbraduras de sos rilievos</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Pistas</string>
-    <string name="quick_action_show_hide_terrain">Ammustra o cua su terrinu</string>
     <string name="quick_action_terrain_hide">Cua su terrinu</string>
     <string name="quick_action_terrain_show">Ammustra su terrinu</string>
     <string name="quick_action_terrain_descr">Unu butone pro ammustrare o cuare s\'istratu de su terrinu in sa mapa.</string>
@@ -3612,7 +3605,6 @@
     <string name="additional_actions_descr">Podes atzèdere a custas atziones incarchende su butone \"%1$s\".</string>
     <string name="quick_action_transport_hide">Cua sos trasportos pùblicos</string>
     <string name="quick_action_transport_show">Ammustra sos trasportos pùblicos</string>
-    <string name="quick_action_show_hide_transport">Ammustra o cua sos trasportos pùblicos</string>
     <string name="quick_action_transport_descr">Butone pro ammustrare o cuare sos trasportos pùblicos in sa mapa.</string>
     <string name="create_edit_poi">Crea o modìfica unu PDI</string>
     <string name="parking_positions">Logos de parchègiu</string>
@@ -3680,7 +3672,6 @@
     <string name="vessel_height_warning">Podes impostare s\'artària de sa barca pro evitare sos pontes bassos. Ammenta·ti chi, si su ponte est mòbile, amus a impreare s\'artària sua de cando est abertu.</string>
     <string name="vessel_height_limit_description">Imposta s\'artària de sa barca pro evitare sos pontes bassos. Ammenta·ti chi, si su ponte est mòbile, amus a impreare s\'artària sua de cando est abertu.</string>
     <string name="vessel_width_limit_description">Imposta sa largària de sa barca pro evitare pontes astrintos</string>
-    <string name="quick_action_showhide_mapillary_title">Ammustra/cua Mapillary</string>
     <string name="quick_action_mapillary_hide">Cua Mapillary</string>
     <string name="quick_action_mapillary_show">Ammustra Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Unu butone pro ammustrare o cuare s\'istratu de Mapillary in sa mapa.</string>

OsmAnd/res/values-sk/strings.xml

@@ -2124,10 +2124,8 @@
     <string name="quick_action_duplicate">Duplicitný názov rýchlej akcie</string>
     <string name="quick_action_showhide_favorites_descr">Prepínač pre zobrazenie alebo skrytie Obľúbených bodov na mape.</string>
     <string name="quick_action_showhide_poi_descr">Prepínač pre zobrazenie alebo skrytie bodov záujmu na mape.</string>
-    <string name="quick_action_showhide_favorites_title">Zobraziť/skryť Obľúbené body</string>
     <string name="quick_action_favorites_show">Zobraziť Obľúbené body</string>
     <string name="quick_action_favorites_hide">Skryť Obľúbené body</string>
-    <string name="quick_action_showhide_poi_title">Zobraziť/skryť body záujmu</string>
     <string name="quick_action_poi_show">Zobraziť %1$s</string>
     <string name="quick_action_poi_hide">Skryť %1$s</string>
     <string name="quick_action_add_category">Pridať kategóriu</string>
@@ -2387,7 +2385,6 @@
     <string name="srtm_menu_download_descr">Stiahnite mapu \"Vrstevnice\" pre tento región.</string>
     <string name="sorted_by_distance">Zoradené podľa vzdialenosti</string>
     <string name="search_favorites">Hľadať v Obľúbených bodoch</string>
-    <string name="quick_action_showhide_osmbugs_title">Zobraziť alebo skryť OSM poznámky</string>
     <string name="quick_action_osmbugs_show">Zobraziť OSM poznámky</string>
     <string name="quick_action_osmbugs_hide">Skryť OSM poznámky</string>
     <string name="quick_action_showhide_osmbugs_descr">Tlačidlo pre zobrazenie alebo skrytie OSM poznámok na mape.</string>
@@ -2844,7 +2841,6 @@
     <string name="routeInfo_road_types_name">Druhy ciest</string>
     <string name="exit_at">Vystúpte na</string>
     <string name="sit_on_the_stop">Nastúpte na zastávke</string>
-    <string name="quick_action_show_hide_gpx_tracks">Zobraziť/skryť stopy</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Tlačidlo pre zobrazenie alebo skrytie zvolených stôp na mape.</string>
     <string name="quick_action_gpx_tracks_hide">Skryť stopy</string>
     <string name="quick_action_gpx_tracks_show">Zobraziť stopy</string>
@@ -3274,11 +3270,9 @@
     <string name="quick_action_contour_lines_descr">Tlačidlo pre zobrazenie alebo skrytie vrstevníc na mape.</string>
     <string name="quick_action_contour_lines_show">Zobraziť vrstevnice</string>
     <string name="quick_action_contour_lines_hide">Skryť vrstevnice</string>
-    <string name="quick_action_show_hide_contour_lines">Zobraziť/skryť vrstevnice</string>
     <string name="quick_action_hillshade_descr">Tlačidlo pre zobrazenie alebo skrytie tieňovaných svahov na mape.</string>
     <string name="quick_action_hillshade_show">Zobraziť tieňované svahy</string>
     <string name="quick_action_hillshade_hide">Skryť tieňované svahy</string>
-    <string name="quick_action_show_hide_hillshade">Zobraziť/skryť tieňované svahy</string>
     <string name="tts_initialization_error">Nepodarilo sa spustiť modul prevodu textu na reč.</string>
     <string name="simulate_your_location_gpx_descr">Simulovať polohu pomocou zaznamenanej stopy GPX.</string>
     <string name="profile_import">Importovať profil</string>
@@ -3492,7 +3486,6 @@
     <string name="recalculate_route_distance_promo">Trasa bude prepočítaná ak vzdialenosť od trasy k aktuálnej polohe je väčšia ako zvolená hodnota.</string>
     <string name="n_items_of_z">%1$s z %2$s</string>
     <string name="download_slope_maps">Sklony svahov</string>
-    <string name="quick_action_show_hide_terrain">Zobraziť alebo skryť terén</string>
     <string name="quick_action_terrain_hide">Skryť terén</string>
     <string name="quick_action_terrain_show">Zobraziť terén</string>
     <string name="quick_action_terrain_descr">Tlačidlo pre zobrazenie alebo skrytie vrstvy terénu na mape.</string>
@@ -3608,7 +3601,6 @@
 \n</string>
     <string name="quick_action_transport_hide">Skryť verejnú dopravu</string>
     <string name="quick_action_transport_show">Zobraziť verejnú dopravu</string>
-    <string name="quick_action_show_hide_transport">Zobraziť alebo skryť verejnú dopravu</string>
     <string name="quick_action_transport_descr">Tlačidlo na zobrazenie alebo skrytie verejnej dopravy na mape.</string>
     <string name="create_edit_poi">Vytvoriť alebo upraviť bod záujmu</string>
     <string name="parking_positions">Parkovacie miesta</string>
@@ -3689,7 +3681,6 @@
 \nZvoľte %2$s a všetky údaje o rýchlostných radaroch budú odstránené, až kým nebude OsmAnd znovu preinštalovaný.</string>
     <string name="keep_active">Ponechať aktívne</string>
     <string name="speed_cameras_alert">V niektorých krajinách je varovanie pred rýchlostnými radarmi zakázané zákonom.</string>
-    <string name="quick_action_showhide_mapillary_title">Zobraziť/skryť Mapillary</string>
     <string name="quick_action_mapillary_hide">Skryť Mapillary</string>
     <string name="quick_action_mapillary_show">Zobraziť Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Prepínač pre zobrazenie alebo skrytie vrstvy Mapillary na mape.</string>

OsmAnd/res/values-sl/strings.xml

@@ -2095,10 +2095,8 @@
     <string name="quick_actions_delete_text">Ali ste prepričani, da želite izbrisati dejanje »%s«?</string>
     <string name="shared_string_action_name">Ime dejanja</string>
     <string name="favorite_empty_place_name">Mesto</string>
-    <string name="quick_action_showhide_favorites_title">Pokaži/Skrij priljubljene</string>
     <string name="quick_action_favorites_show">Pokaži priljubljene</string>
     <string name="quick_action_favorites_hide">Skrij priljubljene</string>
-    <string name="quick_action_showhide_poi_title">Pokaži/Skrij točke POI</string>
     <string name="quick_action_poi_show">Pokaži %1$s</string>
     <string name="quick_action_poi_hide">Skrij %1$s</string>
     <string name="quick_action_add_category">Dodaj kategorijo</string>
@@ -2258,7 +2256,6 @@
     <string name="increase_search_radius">Povečaj območje iskanja</string>
     <string name="nothing_found">Ni zadetkov</string>
     <string name="nothing_found_descr">Poskusite zamenjati iskalni niz ali pa povečajte obseg iskanja.</string>
-    <string name="quick_action_showhide_osmbugs_title">Preklopi vidnost opomb OSM</string>
     <string name="quick_action_osmbugs_show">Pokaži Opombe OSM</string>
     <string name="quick_action_osmbugs_hide">Skrij Opombe OSM</string>
     <string name="sorted_by_distance">Razvrščeno po razdalji</string>
@@ -2874,7 +2871,6 @@
     <string name="shared_string_swap">Zamenjaj</string>
     <string name="show_more">Pokaži več</string>
     <string name="tracks_on_map">Prikazane sledi</string>
-    <string name="quick_action_show_hide_gpx_tracks">Pokaži/Skrij sledi GPX</string>
     <string name="quick_action_gpx_tracks_hide">Skrij sledi GPX</string>
     <string name="quick_action_gpx_tracks_show">Pokaži sledi GPX</string>
     <string name="add_destination_query">Najprej je treba dodati cilj</string>
@@ -3241,7 +3237,6 @@
     <string name="quick_action_mapillary_hide">Skrij Mapillary</string>
     <string name="quick_action_mapillary_show">Prikaži mapillary</string>
     <string name="add_online_source">Dodaj spletni vir</string>
-    <string name="quick_action_showhide_mapillary_title">Prikaži/skrij Mapillary</string>
     <string name="shared_string_uninstall_and_restart">Odstrani in ponovno zaženi</string>
     <string name="use_volume_buttons_as_zoom">Uporabi gumbe za glasnost za približevanje</string>
     <string name="search_download_wikipedia_maps">Prejmi zemljevide Wikipedije</string>

OsmAnd/res/values-sr/strings.xml

@@ -1245,7 +1245,6 @@
     <string name="increase_search_radius">Повећај област претраге</string>
     <string name="nothing_found">Нема ничег пронађеног</string>
     <string name="nothing_found_descr">Промените претрагу или повећајте област претраге.</string>
-    <string name="quick_action_showhide_osmbugs_title">Приказује или сакрива OSM белешке</string>
     <string name="quick_action_osmbugs_show">Прикажи белешке ОСМ-а</string>
     <string name="quick_action_osmbugs_hide">Сакриј белешке ОСМ-а</string>
     <string name="quick_action_showhide_osmbugs_descr">Дугме да прикажите или да сакријете OSM белешке на карти.</string>
@@ -2218,10 +2217,8 @@
     <string name="quick_favorites_show_favorites_dialog">Прикажи дијалог за Омиљене</string>
     <string name="favorite_autofill_toast_text">" сачувано у "</string>
     <string name="favorite_empty_place_name">Место</string>
-    <string name="quick_action_showhide_favorites_title">Прикажи/сакриј Омиљене</string>
     <string name="quick_action_favorites_show">Прикажи Омиљене</string>
     <string name="quick_action_favorites_hide">Сакриј Омиљене</string>
-    <string name="quick_action_showhide_poi_title">Прикажи/сакриј тачке од интереса</string>
     <string name="quick_action_poi_show">Прикажи %1$s</string>
     <string name="quick_action_poi_hide">Сакриј %1$s</string>
     <string name="quick_action_add_category">Додај категорију</string>
@@ -2901,7 +2898,6 @@
     <string name="show_more">Прикажи још</string>
     <string name="tracks_on_map">Приказане путање</string>
     <string name="sit_on_the_stop">Укрцавање на стајању</string>
-    <string name="quick_action_show_hide_gpx_tracks">Прикажи/сакриј путање</string>
     <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>
@@ -3264,11 +3260,9 @@
     <string name="quick_action_contour_lines_descr">Дугме које приказује или сакрива линије изохипси на карти.</string>
     <string name="quick_action_contour_lines_show">Прикажи изохипсе</string>
     <string name="quick_action_contour_lines_hide">Сакриј изохипсе</string>
-    <string name="quick_action_show_hide_contour_lines">Прикажи/сакриј изохипсе</string>
     <string name="quick_action_hillshade_descr">Дугме које приказује или сакрива рељеф на карти.</string>
     <string name="quick_action_hillshade_show">Прикажи рељеф</string>
     <string name="quick_action_hillshade_hide">Сакриј рељеф</string>
-    <string name="quick_action_show_hide_hillshade">Прикажи/сакриј рељеф</string>
     <string name="tts_initialization_error">Не могу да покренем мотор за синтетизовање гласа.</string>
     <string name="simulate_your_location_gpx_descr">Симулирајте Вашу позицију користећу снимљену GPX стазу.</string>
     <string name="export_profile">Извези профил</string>
@@ -3467,7 +3461,6 @@
     <string name="restore_all_profile_settings">Поврати све поставке профила\?</string>
     <string name="saving_new_profile">Чувам нови профил</string>
     <string name="profile_backup_failed">Не могу да направим резервну копију профила.</string>
-    <string name="quick_action_show_hide_terrain">Прикажи или сакриј терен</string>
     <string name="quick_action_terrain_hide">Сакриј терен</string>
     <string name="quick_action_terrain_show">Прикажи терен</string>
     <string name="quick_action_terrain_descr">Дугме да прикаже или сакрите слој терена на карти.</string>
@@ -3510,7 +3503,6 @@
     <string name="navigation_profiles_item">Профили навођења</string>
     <string name="quick_action_transport_hide">Сакриј јавни превоз</string>
     <string name="quick_action_transport_show">Прикажи јавни превоз</string>
-    <string name="quick_action_show_hide_transport">Прикажи или сакриј јавни превоз</string>
     <string name="quick_action_transport_descr">Дугме које приказује или скрива јавни превоз на карти.</string>
     <string name="parking_positions">Паркинг позиције</string>
     <string name="reset_deafult_order">Поврати подразумевани поредак ставки</string>
@@ -3587,7 +3579,6 @@
     <string name="keep_active">Држи активним</string>
     <string name="shared_string_uninstall">Избриши</string>
     <string name="speed_cameras_alert">Упозорења за радаре су законом забрањене у неким државама.</string>
-    <string name="quick_action_showhide_mapillary_title">Прикажи/сакриј Mapillary</string>
     <string name="quick_action_mapillary_hide">Сакриј Mapillary</string>
     <string name="quick_action_mapillary_show">Прикажи Mapillary</string>
     <string name="lang_yo">Јоруба</string>

OsmAnd/res/values-sv/strings.xml

@@ -2025,10 +2025,8 @@ Om du tycker om OsmAnd och OSM och vill stödja dem så är detta ett utmärkt s
     <string name="quick_action_add_favorite">Lägg till favorit</string>
     <string name="favorite_autofill_toast_text">" har sparats i "</string>
     <string name="favorite_empty_place_name">Plats</string>
-    <string name="quick_action_showhide_favorites_title">Visa/Dölj favoriter</string>
     <string name="quick_action_favorites_show">Visa favoriter</string>
     <string name="quick_action_favorites_hide">Dölj favoriter</string>
-    <string name="quick_action_showhide_poi_title">Visa/Dölj POI</string>
     <string name="quick_action_poi_show">Visa %1$s</string>
     <string name="quick_action_poi_hide">Dölj %1$s</string>
     <string name="quick_action_add_category">Lägg till en kategori</string>
@@ -2125,7 +2123,6 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="select_city">Välj stad</string>
     <string name="select_postcode">Välj postnummer</string>
     <string name="quick_action_auto_zoom">Autozoomning på/av</string>
-    <string name="quick_action_showhide_osmbugs_title">Visa/Dölj OSM-anteckningar</string>
     <string name="quick_action_osmbugs_show">Visa OSM-anteckningar</string>
     <string name="quick_action_osmbugs_hide">Dölj OSM-anteckningar</string>
     <string name="quick_action_showhide_osmbugs_descr">Ett tryck på denna åtgärdsknapp visar eller döljer OSM-anteckningar på kartan.</string>

OsmAnd/res/values-tr/strings.xml

@@ -1981,7 +1981,6 @@
     <string name="rendering_value_low_name">Düşük</string>
     <string name="rendering_attr_hideWaterPolygons_description">Su</string>
     <string name="shared_string_action_name">İşlem Adı</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM notlarını göster ya da gizle</string>
     <string name="quick_action_osmbugs_show">OSM notlarını göster</string>
     <string name="quick_action_osmbugs_hide">OSM notlarını gizle</string>
     <string name="quick_action_showhide_osmbugs_descr">OSM notlarını haritada göstermek veya gizlemek için bir düğme.</string>
@@ -2443,7 +2442,6 @@
     <string name="routeInfo_road_types_name">Yol türleri</string>
     <string name="shared_string_swap">Takas</string>
     <string name="show_more">Daha fazla görüntüle</string>
-    <string name="quick_action_show_hide_gpx_tracks">Yolları göster/gizle</string>
     <string name="quick_action_gpx_tracks_hide">Yolları Gizle</string>
     <string name="quick_action_gpx_tracks_show">Yolları Göster</string>
     <string name="add_home">Ev ekle</string>
@@ -2964,10 +2962,8 @@
     <string name="favorite_autofill_toast_text">" kaydedildi "</string>
     <string name="favorite_empty_place_name">Yer</string>
     <string name="quick_action_duplicate">Hızlı eylem adı yinelenen</string>
-    <string name="quick_action_showhide_favorites_title">Sık Kullanılanları göster/gizle</string>
     <string name="quick_action_favorites_show">Sık Kullanılanları göster</string>
     <string name="quick_action_favorites_hide">Sık Kullanılanları gizle</string>
-    <string name="quick_action_showhide_poi_title">POI göster/gizle</string>
     <string name="quick_action_poi_show">%1$s göster</string>
     <string name="quick_action_poi_hide">%1$s gizle</string>
     <string name="quick_action_add_category">Kategori ekle</string>
@@ -3267,11 +3263,9 @@
     <string name="quick_action_contour_lines_descr">Eş yükselti eğrilerini haritada gösterme veya gizleme düğmesi.</string>
     <string name="quick_action_contour_lines_show">Eş yükselti eğrilerini göster</string>
     <string name="quick_action_contour_lines_hide">Eş yükselti eğrilerini gizle</string>
-    <string name="quick_action_show_hide_contour_lines">Eş yükselti eğrilerini göster/gizle</string>
     <string name="quick_action_hillshade_descr">Haritada tepe gölgelerini göstermek veya gizlemek için bir düğme.</string>
     <string name="quick_action_hillshade_show">Tepe gölgesini göster</string>
     <string name="quick_action_hillshade_hide">Tepe gölgesini gizle</string>
-    <string name="quick_action_show_hide_hillshade">Tepe gölgesini göster/gizle</string>
     <string name="tts_initialization_error">Metinden konuşmaya motoru başlatılamıyor.</string>
     <string name="simulate_your_location_gpx_descr">Kayıtlı bir GPX yolu kullanarak konumunuzu simüle edin.</string>
     <string name="export_profile">Profili dışa aktar</string>
@@ -3497,7 +3491,6 @@
     <string name="recalculate_route_distance_promo">Güzergahtan geçerli konuma olan mesafe seçilen değerden fazla ise güzergah yeniden hesaplanacaktır.</string>
     <string name="n_items_of_z">%1$s / %2$s</string>
     <string name="download_slope_maps">Yamaçlar</string>
-    <string name="quick_action_show_hide_terrain">Araziyi göster veya gizle</string>
     <string name="quick_action_terrain_hide">Araziyi gizle</string>
     <string name="quick_action_terrain_show">Araziyi göster</string>
     <string name="quick_action_terrain_descr">Haritada arazi katmanını göstermek veya gizlemek için bir düğme.</string>
@@ -3615,7 +3608,6 @@
     <string name="additional_actions_descr">Bu eylemlere “%1$s” düğmesine dokunarak erişebilirsiniz.</string>
     <string name="quick_action_transport_hide">Toplu taşıma araçlarını gizle</string>
     <string name="quick_action_transport_show">Toplu taşıma araçlarını göster</string>
-    <string name="quick_action_show_hide_transport">Toplu taşıma araçlarını göster veya gizle</string>
     <string name="quick_action_transport_descr">Haritada toplu taşıma araçlarını gösteren veya gizleyen düğme.</string>
     <string name="create_edit_poi">POI oluştur veya düzenle</string>
     <string name="parking_positions">Park etme alanları</string>
@@ -3683,7 +3675,6 @@
     <string name="vessel_height_warning">Alçak köprülerden kaçınmak için gemi yüksekliğini ayarlayabilirsiniz. Köprü hareket edebiliyorsa, açık durumdaki yüksekliğini kullanacağımızı unutmayın.</string>
     <string name="vessel_height_limit_description">Alçak köprülerden kaçınmak için gemi yüksekliğini ayarlayın. Köprü hareket edebiliyorsa, açık durumdaki yüksekliğini kullanacağımızı unutmayın.</string>
     <string name="vessel_width_limit_description">Dar köprülerden kaçınmak için gemi genişliğini ayarlayın</string>
-    <string name="quick_action_showhide_mapillary_title">Mapillary\'i göster/gizle</string>
     <string name="quick_action_mapillary_hide">Mapillary\'i gizle</string>
     <string name="quick_action_mapillary_show">Mapillary\'i göster</string>
     <string name="quick_action_showhide_mapillary_descr">Harita üzerinde Mapillary katmanını göstermek veya gizlemek için bir geçiş.</string>

OsmAnd/res/values-uk/strings.xml

@@ -2093,10 +2093,8 @@
     <string name="quick_actions_delete">Вилучити дію</string>
     <string name="quick_actions_delete_text">Ви впевнені, що хочете вилучити дію „%s“?</string>
     <string name="favorite_empty_place_name">Місце</string>
-    <string name="quick_action_showhide_favorites_title">Показати/приховати Закладки</string>
     <string name="quick_action_favorites_show">Показати Закладки</string>
     <string name="quick_action_favorites_hide">Приховати Закладки</string>
-    <string name="quick_action_showhide_poi_title">Показати/приховати POI</string>
     <string name="quick_action_poi_show">Показати %1$s</string>
     <string name="quick_action_poi_hide">Приховати %1$s</string>
     <string name="quick_action_add_category">Додати категорію</string>
@@ -2210,7 +2208,6 @@
     <string name="nothing_found">Нічого не знайдено</string>
     <string name="private_access_routing_req">Місце призначення розташовано в області з приватним доступом. Дозволити доступ до приватних доріг у цій подорожі\?</string>
     <string name="nothing_found_descr">Змініть пошуковий запит або ж розширте пошуковий радіус.</string>
-    <string name="quick_action_showhide_osmbugs_title">Показати/приховати примітки OSM</string>
     <string name="quick_action_osmbugs_show">Показати примітки OSM</string>
     <string name="quick_action_osmbugs_hide">Приховати примітки OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Натискання на кнопку дії покаже чи приховає примітки OSM на мапі.</string>
@@ -2804,7 +2801,6 @@
     <string name="shared_string_swap">Поміняти</string>
     <string name="show_more">Показати більше</string>
     <string name="tracks_on_map">Показані треки</string>
-    <string name="quick_action_show_hide_gpx_tracks">Показати/Приховати треки</string>
     <string name="quick_action_gpx_tracks_hide">Приховати треки</string>
     <string name="quick_action_gpx_tracks_show">Показати треки</string>
     <string name="add_destination_query">Спершу додайте пункт призначення</string>
@@ -3267,11 +3263,9 @@
     <string name="quick_action_contour_lines_descr">Увімк/вимк показ горизонталей.</string>
     <string name="quick_action_contour_lines_show">Показати горизонталі</string>
     <string name="quick_action_contour_lines_hide">Сховати горизонталі</string>
-    <string name="quick_action_show_hide_contour_lines">Показати/приховати горизонталі</string>
     <string name="quick_action_hillshade_descr">Кнопка, що показує чи приховує горизонталі на мапі.</string>
     <string name="quick_action_hillshade_show">Показати затемнення рельєфу</string>
     <string name="quick_action_hillshade_hide">Приховати затемнення рельєфу</string>
-    <string name="quick_action_show_hide_hillshade">Показати/приховати затемнення рельєфу</string>
     <string name="tts_initialization_error">Не вдається запустити рушій мовлення.</string>
     <string name="simulate_your_location_gpx_descr">Відтворити свою позицію за допомогою записаного треку GPX.</string>
     <string name="export_profile">Експорт профілю</string>
@@ -3496,7 +3490,6 @@
     <string name="shared_string_hillshade">Пагорб</string>
     <string name="n_items_of_z">%1$s з %2$s</string>
     <string name="download_slope_maps">Схили</string>
-    <string name="quick_action_show_hide_terrain">Показати чи приховати рельєф</string>
     <string name="quick_action_terrain_hide">Сховати місцевість</string>
     <string name="quick_action_terrain_show">Показати місцевість</string>
     <string name="quick_action_terrain_descr">Кнопка для відображення або приховування шару місцевості на мапі.</string>
@@ -3612,7 +3605,6 @@
     <string name="parking_positions">Розташування припаркованого авто</string>
     <string name="quick_action_transport_hide">Приховати громадський транспорт</string>
     <string name="quick_action_transport_show">Показати громадський транспорт</string>
-    <string name="quick_action_show_hide_transport">Показати чи приховати громадський транспорт</string>
     <string name="quick_action_transport_descr">Кнопка показу або приховування громадського транспорту на мапі.</string>
     <string name="create_edit_poi">Створити чи змінити POI</string>
     <string name="add_edit_favorite">Додати чи змінити закладку</string>
@@ -3681,7 +3673,6 @@
     <string name="vessel_height_warning">Ви можете встановити висоту судна, щоб уникнути низьких мостів. Майте на увазі, якщо міст рухомий, використовуватиметься його висота у відкритому стані.</string>
     <string name="vessel_height_limit_description">Встановіть висоту судна, щоб уникнути низьких мостів. Майте на увазі, якщо міст рухомий, використовуватиметься його висота у відкритому стані.</string>
     <string name="vessel_width_limit_description">Встановіть ширину судна, щоб уникнути вузьких мостів</string>
-    <string name="quick_action_showhide_mapillary_title">Увімкнути/вимкнути Mapillary</string>
     <string name="quick_action_mapillary_hide">Вимкнути Mapillary</string>
     <string name="quick_action_mapillary_show">Показати Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">Перемикач показує/приховує шар Mapillary на мапі.</string>

OsmAnd/res/values-zh-rCN/strings.xml

@@ -1249,7 +1249,6 @@
     <string name="increase_search_radius">增加搜索范围</string>
     <string name="nothing_found">什么都没找到</string>
     <string name="nothing_found_descr">更改搜索或增加其半径。</string>
-    <string name="quick_action_showhide_osmbugs_title">显示/隐藏 OSM 注记</string>
     <string name="quick_action_osmbugs_show">显示 OSM 注记</string>
     <string name="quick_action_osmbugs_hide">隐藏 OSM 注记</string>
     <string name="shared_string_add_photos">添加照片</string>
@@ -2382,10 +2381,8 @@
     <string name="quick_action_duplicate">快速动作名称重复</string>
     <string name="quick_action_showhide_favorites_descr">轻触动作按钮将会在地图上显示或隐收藏夹标点。</string>
     <string name="quick_action_showhide_poi_descr">轻触动作按钮将会在地图上显示或隐藏 POI。</string>
-    <string name="quick_action_showhide_favorites_title">显示/隐藏收藏夹</string>
     <string name="quick_action_favorites_show">显示收藏夹</string>
     <string name="quick_action_favorites_hide">隐藏收藏夹</string>
-    <string name="quick_action_showhide_poi_title">显示/隐藏 POI</string>
     <string name="quick_action_poi_show">显示 %1$s</string>
     <string name="quick_action_poi_hide">隐藏 %1$s</string>
     <string name="quick_action_add_category">添加类别</string>
@@ -2732,7 +2729,6 @@
     <string name="step_by_step">逐步</string>
     <string name="routeInfo_road_types_name">道路类型</string>
     <string name="exit_at">退出于</string>
-    <string name="quick_action_show_hide_gpx_tracks">显示/隐藏GPX轨迹</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">在地图中显示或隐藏已选中的GPX轨迹的按钮。</string>
     <string name="quick_action_gpx_tracks_hide">隐藏GPX轨迹</string>
     <string name="quick_action_gpx_tracks_show">显示GPX路径</string>
@@ -2894,7 +2890,6 @@
     <string name="shared_string_transparency">透明度</string>
     <string name="shared_string_zoom_levels">缩放等级</string>
     <string name="shared_string_legend">图例</string>
-    <string name="quick_action_show_hide_terrain">显示/隐藏地形</string>
     <string name="quick_action_terrain_hide">隐藏地形</string>
     <string name="quick_action_terrain_show">显示地形</string>
     <string name="delete_description">删除描述</string>
@@ -2919,7 +2914,6 @@
     <string name="subscription_osmandlive_item">订阅 - OsmAnd Live</string>
     <string name="quick_action_transport_hide">隐藏公共交通</string>
     <string name="quick_action_transport_show">显示公共交通</string>
-    <string name="quick_action_show_hide_transport">显示/隐藏公共交通</string>
     <string name="create_edit_poi">创建/编辑兴趣点</string>
     <string name="edit_online_source">编辑在线资源</string>
     <string name="mercator_projection">正轴等角圆柱投影</string>
@@ -2934,7 +2928,6 @@
     <string name="vessel_height_warning">您可以设置船只高度，以避免过低桥梁。请记住，如果桥是可移动的，我们将使用它在打开状态下的高度。</string>
     <string name="vessel_height_limit_description">设置船只高度，以避免过低桥梁。请记住，如果桥是可移动的，我们将使用它在打开状态下的高度。</string>
     <string name="vessel_width_limit_description">设置船只宽度以避免狭窄的桥梁</string>
-    <string name="quick_action_showhide_mapillary_title">显示/隐藏Mapillary</string>
     <string name="quick_action_mapillary_hide">隐藏Mapillary</string>
     <string name="quick_action_mapillary_show">显示Mapillary</string>
     <string name="item_deleted">%1$s 已删除</string>
@@ -2959,9 +2952,7 @@
     <string name="routing_attr_allow_expert_name">允许专家路线</string>
     <string name="rendering_value_walkingRoutesOSMCNodes_name">节点网络</string>
     <string name="hide_compass_ruler">隐藏罗盘标尺</string>
-    <string name="quick_action_show_hide_hillshade">显示/隐藏山体阴影</string>
     <string name="quick_action_hillshade_hide">隐藏山体阴影</string>
-    <string name="quick_action_show_hide_contour_lines">显示/隐藏轮廓线</string>
     <string name="quick_action_contour_lines_hide">隐藏轮廓线</string>
     <string name="quick_action_terrain_descr">在地图上显示或隐藏地形图层的按钮。</string>
     <string name="details_dialog_decr">显示或隐藏其他地图细节</string>

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

@@ -2092,10 +2092,8 @@
     <string name="quick_favorites_name_preset">預設的名稱</string>
     <string name="favorite_autofill_toast_text">" 儲存到 "</string>
     <string name="favorite_empty_place_name">場所</string>
-    <string name="quick_action_showhide_favorites_title">顯示/隱藏我的收藏</string>
     <string name="quick_action_favorites_show">顯示我的收藏</string>
     <string name="quick_action_favorites_hide">隱藏我的收藏</string>
-    <string name="quick_action_showhide_poi_title">顯示/隱藏 POI</string>
     <string name="quick_action_poi_show">顯示 %1$s</string>
     <string name="quick_action_poi_hide">隱藏 %1$s</string>
     <string name="quick_action_add_category">增加一項類別</string>
@@ -2382,7 +2380,6 @@
     <string name="hillshade_purchase_header">安裝「等高線」外掛程式以顯示漸層垂直區域。</string>
     <string name="hide_from_zoom_level">自此縮放等級開始隱藏</string>
     <string name="sorted_by_distance">按距離排序</string>
-    <string name="quick_action_showhide_osmbugs_title">顯示或隱藏 OSM 註記</string>
     <string name="quick_action_osmbugs_show">顯示 OSM 註記</string>
     <string name="quick_action_osmbugs_hide">隱藏 OSM 註記</string>
     <string name="search_favorites">在我的最愛中搜尋</string>
@@ -2839,7 +2836,6 @@
     <string name="routeInfo_road_types_name">道路類型</string>
     <string name="exit_at">離開於</string>
     <string name="sit_on_the_stop">站點的座位</string>
-    <string name="quick_action_show_hide_gpx_tracks">顯示／隱藏軌跡</string>
     <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>
@@ -3259,11 +3255,9 @@
     <string name="quick_action_contour_lines_descr">在地圖上顯示或隱藏等高線的按鈕。</string>
     <string name="quick_action_contour_lines_show">顯示等高線</string>
     <string name="quick_action_contour_lines_hide">隱藏等高線</string>
-    <string name="quick_action_show_hide_contour_lines">顯示／隱藏等高線</string>
     <string name="quick_action_hillshade_descr">在地圖上顯示或隱藏地形陰影的按鈕。</string>
     <string name="quick_action_hillshade_show">顯示地形陰影</string>
     <string name="quick_action_hillshade_hide">隱藏地形陰影</string>
-    <string name="quick_action_show_hide_hillshade">顯示／隱藏地形陰影</string>
     <string name="tts_initialization_error">無法啟動文字轉語音引擎。</string>
     <string name="simulate_your_location_gpx_descr">使用已紀錄的 GPX 軌跡模擬您的位置。</string>
     <string name="export_profile">匯出設定檔</string>
@@ -3490,7 +3484,6 @@
     <string name="terrain_empty_state_text">啟用以檢視地形陰影或坡度圖。您可以在我們的網站上閱讀更多關於這些地圖類型的資訊。</string>
     <string name="shared_string_hillshade">地形陰影</string>
     <string name="download_slope_maps">坡度</string>
-    <string name="quick_action_show_hide_terrain">顯示或隱藏地形</string>
     <string name="quick_action_terrain_hide">隱藏地形</string>
     <string name="quick_action_terrain_show">顯示地形</string>
     <string name="quick_action_terrain_descr">用於顯示或隱藏地圖上地形圖層的按鈕。</string>
@@ -3607,7 +3600,6 @@
     <string name="additional_actions_descr">您可以透過點選「%1$s」按鈕存取這些動作。</string>
     <string name="quick_action_transport_hide">隱藏大眾運輸</string>
     <string name="quick_action_transport_descr">在地圖上顯示或隱藏大眾運輸的按鈕。</string>
-    <string name="quick_action_show_hide_transport">顯示或隱藏大眾運輸</string>
     <string name="create_edit_poi">建立或編輯 POI</string>
     <string name="parking_positions">停車位置</string>
     <string name="add_edit_favorite">新增與編輯收藏</string>
@@ -3675,7 +3667,6 @@
     <string name="vessel_height_warning">您可以設定船艦高度以避免矮橋。請記住，如果橋是可動式的，我們將會使用其在開啟狀態的高度。</string>
     <string name="vessel_height_limit_description">設定船艦高度以避免矮橋。請記住，如果橋是可動式的，我們將會使用其開啟狀態的高度。</string>
     <string name="vessel_width_limit_description">設定船艦寬度以避免窄橋</string>
-    <string name="quick_action_showhide_mapillary_title">顯示／隱藏 Mapillary</string>
     <string name="quick_action_mapillary_hide">隱藏 Mapillary</string>
     <string name="quick_action_mapillary_show">顯示 Mapillary</string>
     <string name="quick_action_showhide_mapillary_descr">在地圖上顯示或隱藏 Mapillary 圖層的開關。</string>

OsmAnd/res/values/strings.xml

@@ -12,12 +12,14 @@
 
 -->
 
+    <string name="quick_action_showhide_title">Show/hide</string>
+    <string name="copy_poi_name">Copy POI name</string>
     <string name="track_recording_will_be_continued">The recording will be continued.</string>
+    <string name="select_category_descr">Select category or add new one</string>
     <string name="map_widget_distance_by_tap">Distance by tap</string>
     <string name="quick_action_coordinates_widget_descr">A toggle to show or hide the Coordinates widget on the map.</string>
     <string name="quick_action_coordinates_widget_show">Show Coordinates widget</string>
     <string name="quick_action_coordinates_widget_hide">Hide Coordinates widget</string>
-    <string name="quick_action_showhide_coordinates_widget">Show/Hide coordinates widget</string>
     <string name="routing_attr_height_obstacles_description">Routing could avoid strong uphills.</string>
     <string name="app_restart_required">Application restart required to apply some settings.</string>
     <string name="on_pause">On pause</string>
@@ -342,7 +344,6 @@
     <string name="quick_action_showhide_mapillary_descr">A toggle to show or hide the Mapillary layer on the map.</string>
     <string name="quick_action_mapillary_show">Show Mapillary</string>
     <string name="quick_action_mapillary_hide">Hide Mapillary</string>
-    <string name="quick_action_showhide_mapillary_title">Show/hide Mapillary</string>
     <string name="vessel_width_limit_description">Set vessel width to avoid narrow bridges</string>
     <string name="vessel_height_limit_description">Set vessel height to avoid low bridges. Keep in mind, if the bridge is movable, we will use its height in the open state.</string>
     <string name="vessel_height_warning">You can set vessel height to avoid low bridges. Keep in mind, if the bridge is movable, we will use its height in the open state.</string>
@@ -419,7 +420,6 @@
     <string name="parking_positions">Parking positions</string>
     <string name="create_edit_poi">Create or edit POI</string>
     <string name="quick_action_transport_descr">Button showing or hiding public transport on the map.</string>
-    <string name="quick_action_show_hide_transport">Show or hide public transport</string>
     <string name="quick_action_transport_show">Show public transport</string>
     <string name="quick_action_transport_hide">Hide public transport</string>
     <string name="release_3_7">
@@ -521,7 +521,6 @@
     <string name="quick_action_terrain_descr">A button to show or hide terrain layer on the map.</string>
     <string name="quick_action_terrain_show">Show terrain</string>
     <string name="quick_action_terrain_hide">Hide terrain</string>
-    <string name="quick_action_show_hide_terrain">Show or hide terrain</string>
     <string name="download_slope_maps">Slopes</string>
     <string name="n_items_of_z">%1$s of %2$s</string>
     <string name="recalculate_route_distance_promo">The route will be recalculated if the distance from the route to the current location is more than selected value.</string>
@@ -724,11 +723,9 @@
     <string name="quick_action_contour_lines_descr">Button showing or hiding contour lines on the map.</string>
     <string name="quick_action_contour_lines_show">Show contour lines</string>
     <string name="quick_action_contour_lines_hide">Hide contour lines</string>
-    <string name="quick_action_show_hide_contour_lines">Show/hide contour lines</string>
     <string name="quick_action_hillshade_descr">A button to show or hide hillshades on the map.</string>
     <string name="quick_action_hillshade_show">Show hillshade</string>
     <string name="quick_action_hillshade_hide">Hide hillshade</string>
-    <string name="quick_action_show_hide_hillshade">Show/hide hillshade</string>
     <string name="apply_preference_to_all_profiles">You can apply this change to all or only the selected profile.</string>
     <string name="shared_preference">Shared</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">Prefer unpaved roads</string>
@@ -1115,7 +1112,6 @@
     <string name="shared_string_swap">Swap</string>
     <string name="show_more">Show more</string>
     <string name="tracks_on_map">Displayed tracks</string>
-    <string name="quick_action_show_hide_gpx_tracks">Show/hide tracks</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">A button to show or hide selected tracks on the map.</string>
     <string name="quick_action_gpx_tracks_hide">Hide Tracks</string>
     <string name="quick_action_gpx_tracks_show">Show Tracks</string>
@@ -1528,7 +1524,6 @@
     <string name="increase_search_radius">Increase search radius</string>
     <string name="nothing_found">Nothing found</string>
     <string name="nothing_found_descr">Change the search or increase its radius.</string>
-    <string name="quick_action_showhide_osmbugs_title">Show or hide OSM notes</string>
     <string name="quick_action_osmbugs_show">Show OSM notes</string>
     <string name="quick_action_osmbugs_hide">Hide OSM notes</string>
     <string name="quick_action_showhide_osmbugs_descr">Button to show or hide OSM notes on the map.</string>
@@ -2278,7 +2273,7 @@
     <string name="shared_string_add">Add</string>
     <string name="shared_string_add_to_favorites">Add to \'Favorites\'</string>
     <string name="shared_string_my_location">My Position</string>
-    <string name="shared_string_my_places">My Places</string>
+    <string name="shared_string_my_places">My places</string>
     <string name="shared_string_my_favorites">Favorites</string>
     <string name="shared_string_tracks">Tracks</string>
     <string name="shared_string_currently_recording_track">Currently recording track</string>
@@ -4012,10 +4007,8 @@
     <string name="quick_action_duplicate">Quick action name duplicate</string>
     <string name="quick_action_showhide_favorites_descr">A toggle to show or hide the Favorite points on the map.</string>
     <string name="quick_action_showhide_poi_descr">A toggle to show or hide POIs on the map.</string>
-    <string name="quick_action_showhide_favorites_title">Show/hide Favorites</string>
     <string name="quick_action_favorites_show">Show Favorites</string>
     <string name="quick_action_favorites_hide">Hide Favorites</string>
-    <string name="quick_action_showhide_poi_title">Show/hide POI</string>
     <string name="quick_action_poi_show">Show %1$s</string>
     <string name="quick_action_poi_hide">Hide %1$s</string>
     <string name="quick_action_add_category">Add a category</string>

OsmAnd/res/xml/profile_appearance.xml

@@ -21,12 +21,12 @@
 
 	<PreferenceCategory
 		android:key="select_color"
-		android:layout="@layout/preference_category_with_descr"
+		android:layout="@layout/preference_category_with_right_text"
 		android:title="@string/select_color" />
 
 	<Preference
 		android:key="color_items"
-		android:layout="@layout/preference_color_select"
+		android:layout="@layout/preference_colors_card"
 		android:title="@string/select_color"
 		android:selectable="false"/>
 

OsmAnd/src/net/osmand/AndroidUtils.java

@@ -336,6 +336,43 @@ public class AndroidUtils {
 		);
 	}
 
+	public static ColorStateList createCheckedColorIntStateList(@ColorInt int normal, @ColorInt int checked) {
+		return createCheckedColorIntStateList(false, normal, checked, 0, 0);
+	}
+
+	public static ColorStateList createCheckedColorIntStateList(boolean night,
+															 @ColorInt int lightNormal, @ColorInt int lightChecked,
+															 @ColorInt int darkNormal, @ColorInt int darkChecked) {
+		return createColorIntStateList(night, android.R.attr.state_checked,
+				lightNormal, lightChecked, darkNormal, darkChecked);
+	}
+
+	public static ColorStateList createEnabledColorIntStateList(@ColorInt int normal, @ColorInt int pressed) {
+		return createEnabledColorIntStateList(false, normal, pressed, 0, 0);
+	}
+
+	public static ColorStateList createEnabledColorIntStateList(boolean night,
+															 @ColorInt int lightNormal, @ColorInt int lightPressed,
+															 @ColorInt int darkNormal, @ColorInt int darkPressed) {
+		return createColorIntStateList(night, android.R.attr.state_enabled,
+				lightNormal, lightPressed, darkNormal, darkPressed);
+	}
+
+	private static ColorStateList createColorIntStateList(boolean night, int state,
+													   @ColorInt int lightNormal, @ColorInt int lightState,
+													   @ColorInt int darkNormal, @ColorInt int darkState) {
+		return new ColorStateList(
+				new int[][]{
+						new int[]{state},
+						new int[]{}
+				},
+				new int[]{
+						night ? darkState : lightState,
+						night ? darkNormal : lightNormal
+				}
+		);
+	}
+
 	public static StateListDrawable createCheckedStateListDrawable(Drawable normal, Drawable checked) {
 		return createStateListDrawable(normal, checked, android.R.attr.state_checked);
 	}

OsmAnd/src/net/osmand/aidl/ConnectedApp.java

@@ -133,7 +133,7 @@ public class ConnectedApp implements Comparable<ConnectedApp> {
 				CompoundButton btn = view.findViewById(R.id.toggle_item);
 				if (btn != null && btn.getVisibility() == View.VISIBLE) {
 					btn.setChecked(!btn.isChecked());
-					menuAdapter.getItem(position).setColorRes(btn.isChecked() ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
+					menuAdapter.getItem(position).setColor(app, btn.isChecked() ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 					adapter.notifyDataSetChanged();
 					return false;
 				}
@@ -146,7 +146,7 @@ public class ConnectedApp implements Comparable<ConnectedApp> {
 				if (layersPref.set(isChecked)) {
 					ContextMenuItem item = adapter.getItem(position);
 					if (item != null) {
-						item.setColorRes(isChecked ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
+						item.setColor(app, isChecked ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 						item.setSelected(isChecked);
 						adapter.notifyDataSetChanged();
 					}
@@ -162,7 +162,7 @@ public class ConnectedApp implements Comparable<ConnectedApp> {
 				.setListener(listener)
 				.setSelected(layersEnabled)
 				.setIcon(R.drawable.ic_extension_dark)
-				.setColor(layersEnabled ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
+				.setColor(app, layersEnabled ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
 				.createItem());
 	}
 

OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java

@@ -417,8 +417,12 @@ public class OsmandAidlApi {
 	}
 
 	private void registerReceiver(BroadcastReceiver rec, MapActivity ma, String filter) {
+		try {
 			receivers.put(filter, rec);
 			ma.registerReceiver(rec, new IntentFilter(filter));
+		} catch (IllegalStateException e) {
+			LOG.error(e);
+		}
 	}
 
 	private void registerRemoveMapWidgetReceiver(MapActivity mapActivity) {

OsmAnd/src/net/osmand/data/FavouritePoint.java

@@ -11,6 +11,9 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 
 import net.osmand.GPXUtilities.WptPt;
+import net.osmand.Location;
+import net.osmand.ResultMatcher;
+import net.osmand.binary.RouteDataObject;
 import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.settings.backend.BooleanPreference;
@@ -42,6 +45,8 @@ public class FavouritePoint implements Serializable, LocationPoint {
 	private boolean visible = true;
 	private SpecialPointType specialPointType = null;
 	private BackgroundType backgroundType = null;
+	private double altitude;
+	private long timestamp;
 
 	public FavouritePoint() {
 	}
@@ -54,6 +59,20 @@ public class FavouritePoint implements Serializable, LocationPoint {
 			name = "";
 		}
 		this.name = name;
+		timestamp = System.currentTimeMillis();
+		initPersonalType();
+	}
+
+	public FavouritePoint(double latitude, double longitude, String name, String category, double altitude, long timestamp) {
+		this.latitude = latitude;
+		this.longitude = longitude;
+		this.category = category;
+		if (name == null) {
+			name = "";
+		}
+		this.name = name;
+		this.altitude = altitude;
+		this.timestamp = timestamp != 0 ? timestamp : System.currentTimeMillis();
 		initPersonalType();
 	}
 
@@ -69,6 +88,8 @@ public class FavouritePoint implements Serializable, LocationPoint {
 		this.address = favouritePoint.address;
 		this.iconId = favouritePoint.iconId;
 		this.backgroundType = favouritePoint.backgroundType;
+		this.altitude = favouritePoint.altitude;
+		this.timestamp = favouritePoint.timestamp;
 		initPersonalType();
 	}
 
@@ -82,6 +103,35 @@ public class FavouritePoint implements Serializable, LocationPoint {
 		}
 	}
 
+	public void initAltitude(OsmandApplication app) {
+		initAltitude(app, null);
+	}
+
+	public void initAltitude(OsmandApplication app, final Runnable callback) {
+		Location location = new Location("", latitude, longitude);
+		app.getLocationProvider().getRouteSegment(location, null, false,
+				new ResultMatcher<RouteDataObject>() {
+
+					@Override
+					public boolean publish(RouteDataObject routeDataObject) {
+						if (routeDataObject != null) {
+							LatLon latLon = new LatLon(latitude, longitude);
+							routeDataObject.calculateHeightArray(latLon);
+							altitude = routeDataObject.heightByCurrentLocation;
+						}
+						if (callback != null) {
+							callback.run();
+						}
+						return true;
+					}
+
+					@Override
+					public boolean isCancelled() {
+						return false;
+					}
+				});
+	}
+
 	public SpecialPointType getSpecialPointType() {
 		return specialPointType;
 	}
@@ -171,6 +221,22 @@ public class FavouritePoint implements Serializable, LocationPoint {
 		this.longitude = longitude;
 	}
 
+	public double getAltitude() {
+		return altitude;
+	}
+
+	public void setAltitude(double altitude) {
+		this.altitude = altitude;
+	}
+
+	public long getTimestamp() {
+		return timestamp;
+	}
+
+	public void setTimestamp(long timestamp) {
+		this.timestamp = timestamp;
+	}
+
 	public String getCategory() {
 		return category;
 	}
@@ -256,7 +322,8 @@ public class FavouritePoint implements Serializable, LocationPoint {
 		} else if (!originObjectName.equals(fp.originObjectName))
 			return false;
 
-		return (this.latitude == fp.latitude) && (this.longitude == fp.longitude);
+		return (this.latitude == fp.latitude) && (this.longitude == fp.longitude) &&
+				(this.altitude == fp.altitude) && (this.timestamp == fp.timestamp);
 	}
 
 	@Override
@@ -265,6 +332,8 @@ public class FavouritePoint implements Serializable, LocationPoint {
 		int result = 1;
 		result = prime * result + (int) Math.floor(latitude * 10000);
 		result = prime * result + (int) Math.floor(longitude * 10000);
+		result = prime * result + (int) Math.floor(altitude * 10000);
+		result = prime * result + (int) Math.floor(timestamp * 10000);
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
 		result = prime * result + ((category == null) ? 0 : category.hashCode());
 		result = prime * result + ((description == null) ? 0 : description.hashCode());
@@ -289,7 +358,9 @@ public class FavouritePoint implements Serializable, LocationPoint {
 			this.iconId = iconId;
 		}
 
-		public String getCategory() { return FavouritesDbHelper.FavoriteGroup.PERSONAL_CATEGORY; }
+		public String getCategory() {
+			return FavouritesDbHelper.FavoriteGroup.PERSONAL_CATEGORY;
+		}
 
 		public String getName() {
 			return typeName;
@@ -384,7 +455,7 @@ public class FavouritePoint implements Serializable, LocationPoint {
 			name = "";
 		}
 		FavouritePoint fp;
-			fp = new FavouritePoint(pt.lat, pt.lon, name, categoryName);
+		fp = new FavouritePoint(pt.lat, pt.lon, name, categoryName, pt.ele, pt.time);
 		fp.setDescription(pt.desc);
 		if (pt.comment != null) {
 			fp.setOriginObjectName(pt.comment);
@@ -405,6 +476,8 @@ public class FavouritePoint implements Serializable, LocationPoint {
 		WptPt pt = new WptPt();
 		pt.lat = getLatitude();
 		pt.lon = getLongitude();
+		pt.ele = getAltitude();
+		pt.time = getTimestamp();
 		if (!isVisible()) {
 			pt.getExtensionsToWrite().put(HIDDEN, "true");
 		}

OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java

@@ -249,8 +249,7 @@ public class ContextMenuAdapter {
 			final ContextMenuItem item = getItem(position);
 			int layoutId = item.getLayout();
 			layoutId = layoutId != ContextMenuItem.INVALID_ID ? layoutId : DEFAULT_LAYOUT_ID;
-			int currentModeColorRes = app.getSettings().getApplicationMode().getIconColorInfo().getColor(nightMode);
+			int currentModeColor = app.getSettings().getApplicationMode().getProfileColor(nightMode);
-			int currentModeColor = ContextCompat.getColor(app, currentModeColorRes);
 			if (layoutId == R.layout.mode_toggles) {
 				final Set<ApplicationMode> selected = new LinkedHashSet<>();
 				return AppModeDialog.prepareAppModeDrawerView((Activity) getContext(),
@@ -278,15 +277,13 @@ public class ContextMenuAdapter {
 			}
 			if (layoutId == R.layout.main_menu_drawer_btn_switch_profile || 
 					layoutId == R.layout.main_menu_drawer_btn_configure_profile) {
-				int colorResId = item.getColorRes();
+				int colorNoAlpha = item.getColor();
-				int colorNoAlpha = ContextCompat.getColor(app, colorResId);
-				
 				TextView title = convertView.findViewById(R.id.title);
 				title.setText(item.getTitle());
 
 				if (layoutId == R.layout.main_menu_drawer_btn_switch_profile) {
 					ImageView icon = convertView.findViewById(R.id.icon);
-					icon.setImageDrawable(mIconsCache.getIcon(item.getIcon(), colorResId));
+					icon.setImageDrawable(mIconsCache.getPaintedIcon(item.getIcon(), colorNoAlpha));
 					ImageView icArrow = convertView.findViewById(R.id.ic_expand_list);
 					icArrow.setImageDrawable(mIconsCache.getIcon(item.getSecondaryIcon()));
 					TextView desc = convertView.findViewById(R.id.description);
@@ -306,11 +303,8 @@ public class ContextMenuAdapter {
 				return convertView;
 			}
 			if (layoutId == R.layout.profile_list_item) {
-				
 				int tag = item.getTag();
-
+				int colorNoAlpha = item.getColor();
-				int colorResId = item.getColorRes();
-				int colorNoAlpha = ContextCompat.getColor(app, colorResId);
 				TextView title = convertView.findViewById(R.id.title);
 				TextView desc = convertView.findViewById(R.id.description);
 				ImageView icon = convertView.findViewById(R.id.icon);
@@ -331,7 +325,7 @@ public class ContextMenuAdapter {
 					AndroidUiHelper.updateVisibility(icon, true);
 					AndroidUiHelper.updateVisibility(desc, true);
 					AndroidUtils.setTextPrimaryColor(app, title, nightMode);
-					icon.setImageDrawable(mIconsCache.getIcon(item.getIcon(), colorResId));
+					icon.setImageDrawable(mIconsCache.getPaintedIcon(item.getIcon(), colorNoAlpha));
 					desc.setText(item.getDescription());
 					boolean selectedMode = tag == PROFILES_CHOSEN_PROFILE_TAG;
 					if (selectedMode) {
@@ -419,17 +413,18 @@ public class ContextMenuAdapter {
 				}
 			} else {
 				if (item.getIcon() != ContextMenuItem.INVALID_ID) {
-					int colorRes = item.getColorRes();
+					Integer color = item.getColor();
-					if (colorRes == ContextMenuItem.INVALID_ID) {
+					Drawable drawable;
-						if (!item.shouldSkipPainting()) {
+					if (color == null) {
-							colorRes = lightTheme ? R.color.icon_color_default_light : R.color.icon_color_default_dark;
+						int colorRes = lightTheme ? R.color.icon_color_default_light : R.color.icon_color_default_dark;
-						} else {
+						colorRes = item.shouldSkipPainting() ? 0 : colorRes;
-							colorRes = 0;
+						drawable = mIconsCache.getIcon(item.getIcon(), colorRes);
-						}
 					} else if (profileDependent) {
-						colorRes = currentModeColorRes;
+						drawable = mIconsCache.getPaintedIcon(item.getIcon(), currentModeColor);
+					} else {
+						drawable = mIconsCache.getPaintedIcon(item.getIcon(), color);
 					}
-					final Drawable drawable = mIconsCache.getIcon(item.getIcon(), colorRes);
+
 					((AppCompatImageView) convertView.findViewById(R.id.icon)).setImageDrawable(drawable);
 					convertView.findViewById(R.id.icon).setVisibility(View.VISIBLE);
 				} else if (convertView.findViewById(R.id.icon) != null) {

OsmAnd/src/net/osmand/plus/ContextMenuItem.java

@@ -19,8 +19,8 @@ public class ContextMenuItem {
 	private String title;
 	@DrawableRes
 	private int mIcon;
-	@ColorRes
+	@ColorInt
-	private int colorRes;
+	private Integer color;
 	@DrawableRes
 	private int secondaryIcon;
 	private Boolean selected;
@@ -48,7 +48,7 @@ public class ContextMenuItem {
 	private ContextMenuItem(@StringRes int titleId,
 							String title,
 							@DrawableRes int icon,
-							@ColorRes int colorRes,
+							@ColorInt Integer color,
 							@DrawableRes int secondaryIcon,
 							Boolean selected,
 							int progress,
@@ -72,7 +72,7 @@ public class ContextMenuItem {
 		this.titleId = titleId;
 		this.title = title;
 		this.mIcon = icon;
-		this.colorRes = colorRes;
+		this.color = color;
 		this.secondaryIcon = secondaryIcon;
 		this.selected = selected;
 		this.progress = progress;
@@ -109,23 +109,17 @@ public class ContextMenuItem {
 		return mIcon;
 	}
 
-	@ColorRes
+	@ColorInt
-	public int getColorRes() {
+	public Integer getColor() {
-		return colorRes;
+		return color;
-	}
-
-	@ColorRes
-	public int getThemedColorRes(Context context) {
-		if (skipPaintingWithoutColor || getColorRes() != INVALID_ID) {
-			return getColorRes();
-		} else {
-			return UiUtilities.getDefaultColorRes(context);
-		}
 	}
 
 	@ColorInt
 	public int getThemedColor(Context context) {
-		return ContextCompat.getColor(context, getThemedColorRes(context));
+		if (skipPaintingWithoutColor || color != null) {
+			return color;
+		}
+		return ContextCompat.getColor(context, UiUtilities.getDefaultColorRes(context));
 	}
 
 	@DrawableRes
@@ -212,8 +206,10 @@ public class ContextMenuItem {
 		this.secondaryIcon = secondaryIcon;
 	}
 
-	public void setColorRes(int colorRes) {
+	public void setColor(Context context, @ColorRes int colorRes) {
-		this.colorRes = colorRes;
+		if (colorRes != INVALID_ID) {
+			this.color = ContextCompat.getColor(context, colorRes);
+		}
 	}
 
 	public void setSelected(boolean selected) {
@@ -268,8 +264,8 @@ public class ContextMenuItem {
 		private String mTitle;
 		@DrawableRes
 		private int mIcon = INVALID_ID;
-		@ColorRes
+		@ColorInt
-		private int mColorRes = INVALID_ID;
+		private Integer mColor = null;
 		@DrawableRes
 		private int mSecondaryIcon = INVALID_ID;
 		private Boolean mSelected = null;
@@ -307,8 +303,15 @@ public class ContextMenuItem {
 			return this;
 		}
 
-		public ItemBuilder setColor(@ColorRes int colorRes) {
+		public ItemBuilder setColor(@ColorInt Integer color) {
-			mColorRes = colorRes;
+			mColor = color;
+			return this;
+		}
+
+		public ItemBuilder setColor(Context context, @ColorRes int colorRes) {
+			if (colorRes != INVALID_ID) {
+				mColor = ContextCompat.getColor(context, colorRes);
+			}
 			return this;
 		}
 
@@ -422,7 +425,7 @@ public class ContextMenuItem {
 		}
 
 		public ContextMenuItem createItem() {
-			ContextMenuItem item = new ContextMenuItem(mTitleId, mTitle, mIcon, mColorRes, mSecondaryIcon,
+			ContextMenuItem item = new ContextMenuItem(mTitleId, mTitle, mIcon, mColor, mSecondaryIcon,
 					mSelected, mProgress, mLayout, mLoading, mIsCategory, mIsClickable, mSkipPaintingWithoutColor,
 					mOrder, mDescription, mOnUpdateCallback, mItemClickListener, mIntegerListener, mProgressListener,
 					mItemDeleteAction, mHideDivider, mHideCompoundButton, mMinHeight, mTag, mId);

OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java

@@ -361,6 +361,9 @@ public class FavouritesDbHelper {
 	}
 
 	public boolean addFavourite(FavouritePoint p, boolean saveImmediately) {
+		if (Double.isNaN(p.getAltitude()) || p.getAltitude() == 0) {
+			p.initAltitude(context);
+		}
 		if (p.getName().isEmpty() && flatGroups.containsKey(p.getCategory())) {
 			return true;
 		}
@@ -545,6 +548,7 @@ public class FavouritesDbHelper {
 		cancelAddressRequest(p);
 		p.setLatitude(lat);
 		p.setLongitude(lon);
+		p.initAltitude(context);
 		if (description != null) {
 			p.setDescription(description);
 		}

OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java

@@ -32,7 +32,7 @@ import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.mapmarkers.MapMarkersHelper;
-import net.osmand.plus.routing.RouteProvider;
+import net.osmand.plus.routing.GPXRouteParams.GPXRouteParamsBuilder;
 import net.osmand.plus.track.GpxSplitType;
 import net.osmand.util.Algorithms;
 
@@ -964,7 +964,7 @@ public class GpxSelectionHelper {
 		}
 
 		public boolean isFollowTrack(OsmandApplication app) {
-			RouteProvider.GPXRouteParamsBuilder routeParams = app.getRoutingHelper().getCurrentGPXRoute();
+			GPXRouteParamsBuilder routeParams = app.getRoutingHelper().getCurrentGPXRoute();
 			if (routeParams != null) {
 				return gpxFile.path.equals(routeParams.getFile().path);
 			}

OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java

@@ -18,7 +18,7 @@ import net.osmand.GPXUtilities;
 import net.osmand.Location;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.GpxUiHelper;
-import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
+import net.osmand.plus.routing.GPXRouteParams.GPXRouteParamsBuilder;
 import net.osmand.plus.settings.backend.ApplicationMode;
 
 import java.util.ArrayList;
@@ -59,7 +59,7 @@ public class OsmAndLocationSimulation {
 				boolean nightMode = app.getDaynightHelper().isNightModeForMapControls();
 				int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 				ApplicationMode appMode = app.getSettings().getApplicationMode();
-				int selectedModeColor = ContextCompat.getColor(app, appMode.getIconColorInfo().getColor(nightMode));
+				int selectedModeColor = appMode.getProfileColor(nightMode);
 				AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(ma, themeRes));
 				builder.setTitle(R.string.animate_route);
 

OsmAnd/src/net/osmand/plus/OsmandPlugin.java

@@ -468,7 +468,7 @@ public abstract class OsmandPlugin {
 					FragmentManager fm = mapActivity.getSupportFragmentManager();
 					Fragment fragment = fm.findFragmentByTag(fragmentData.tag);
 					if (fragment != null) {
-						fm.beginTransaction().remove(fragment).commit();
+						fm.beginTransaction().remove(fragment).commitAllowingStateLoss();
 					}
 				}
 			}

OsmAnd/src/net/osmand/plus/TargetPointsHelper.java

@@ -10,7 +10,7 @@ import net.osmand.data.LatLon;
 import net.osmand.data.LocationPoint;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.GeocodingLookupService.AddressLookupRequest;
-import net.osmand.plus.routing.RouteProvider.RouteService;
+import net.osmand.plus.routing.RouteService;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.routing.RoutingHelperUtils;
 import net.osmand.plus.settings.backend.ApplicationMode;

OsmAnd/src/net/osmand/plus/UiUtilities.java

@@ -553,7 +553,7 @@ public class UiUtilities {
 		switch (type) {
 			case PROFILE_DEPENDENT:
 				ApplicationMode appMode = app.getSettings().getApplicationMode();
-				activeColor = ContextCompat.getColor(app, appMode.getIconColorInfo().getColor(nightMode));
+				activeColor = appMode.getProfileColor(nightMode);
 				break;
 			case TOOLBAR:
 				activeColor = Color.WHITE;

OsmAnd/src/net/osmand/plus/activities/MapActivity.java

@@ -93,6 +93,7 @@ import net.osmand.plus.importfiles.ImportHelper;
 import net.osmand.plus.mapcontextmenu.AdditionalActionsBottomSheetDialogFragment;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.mapcontextmenu.builders.cards.dialogs.ContextMenuCardDialogFragment;
+import net.osmand.plus.mapcontextmenu.editors.SelectFavoriteCategoryBottomSheet;
 import net.osmand.plus.mapcontextmenu.other.DestinationReachedMenu;
 import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu;
 import net.osmand.plus.mapmarkers.MapMarker;

OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java

@@ -69,7 +69,7 @@ import net.osmand.plus.profiles.ProfileDataObject;
 import net.osmand.plus.profiles.ProfileDataUtils;
 import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
 import net.osmand.plus.routepreparationmenu.WaypointsFragment;
-import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
+import net.osmand.plus.routing.GPXRouteParams.GPXRouteParamsBuilder;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmandSettings;
@@ -441,7 +441,7 @@ public class MapActivityActions implements DialogProvider {
 		}
 
 		adapter.addItem(itemBuilder
-				.setTitleId(R.string.plan_a_route, mapActivity)
+				.setTitleId(R.string.plan_route, mapActivity)
 				.setId(MAP_CONTEXT_MENU_MEASURE_DISTANCE)
 				.setIcon(R.drawable.ic_action_ruler)
 				.setOrder(MEASURE_DISTANCE_ITEM_ORDER)
@@ -489,7 +489,7 @@ public class MapActivityActions implements DialogProvider {
 					//			new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
 					//			REQUEST_LOCATION_FOR_DIRECTIONS_NAVIGATION_PERMISSION);
 					//}
-				} else if (standardId == R.string.plan_a_route) {
+				} else if (standardId == R.string.plan_route) {
 					mapActivity.getContextMenu().close();
 					MeasurementToolFragment.showInstance(mapActivity.getSupportFragmentManager(), new LatLon(latitude, longitude));
 				} else if (standardId == R.string.avoid_road) {
@@ -753,7 +753,7 @@ public class MapActivityActions implements DialogProvider {
 
 			optionsMenuHelper.addItem(new ItemBuilder().setLayout(R.layout.profile_list_item)
 					.setIcon(appMode.getIconRes())
-					.setColor(appMode.getIconColorInfo().getColor(nightMode))
+					.setColor(appMode.getProfileColor(nightMode))
 					.setTag(tag)
 					.setTitle(appMode.toHumanString())
 					.setDescription(modeDescription)
@@ -770,7 +770,7 @@ public class MapActivityActions implements DialogProvider {
 
 		int activeColorPrimaryResId = nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light;
 		optionsMenuHelper.addItem(new ItemBuilder().setLayout(R.layout.profile_list_item)
-				.setColor(activeColorPrimaryResId)
+				.setColor(app, activeColorPrimaryResId)
 				.setTag(PROFILES_CONTROL_BUTTON_TAG)
 				.setTitle(getString(R.string.shared_string_manage))
 				.setListener(new ItemClickListener() {
@@ -963,7 +963,7 @@ public class MapActivityActions implements DialogProvider {
 					}
 				}).createItem());
 
-		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.plan_a_route, mapActivity)
+		optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.plan_route, mapActivity)
 				.setId(DRAWER_MEASURE_DISTANCE_ID)
 				.setIcon(R.drawable.ic_action_plan_route)
 				.setListener(new ItemClickListener() {
@@ -1083,7 +1083,7 @@ public class MapActivityActions implements DialogProvider {
 				.setId(DRAWER_SWITCH_PROFILE_ID)
 				.setIcon(currentMode.getIconRes())
 				.setSecondaryIcon(icArrowResId)
-				.setColor(currentMode.getIconColorInfo().getColor(nightMode))
+				.setColor(currentMode.getProfileColor(nightMode))
 				.setTitle(currentMode.toHumanString())
 				.setDescription(modeDescription)
 				.setListener(new ItemClickListener() {
@@ -1097,7 +1097,7 @@ public class MapActivityActions implements DialogProvider {
 				.createItem());
 		optionsMenuHelper.addItem(new ItemBuilder().setLayout(R.layout.main_menu_drawer_btn_configure_profile)
 				.setId(DRAWER_CONFIGURE_PROFILE_ID)
-				.setColor(currentMode.getIconColorInfo().getColor(nightMode))
+				.setColor(currentMode.getProfileColor(nightMode))
 				.setTitle(getString(R.string.configure_profile))
 				.setListener(new ItemClickListener() {
 					@Override

OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java

@@ -437,7 +437,7 @@ public class MapActivityLayers {
 		} else {
 			builder.setIcon(R.drawable.mx_user_defined);
 		}
-		builder.setColor(ContextMenuItem.INVALID_ID);
+		builder.setColor(activity, ContextMenuItem.INVALID_ID);
 		builder.setSkipPaintingWithoutColor(true);
 		adapter.addItem(builder.createItem());
 	}
@@ -495,7 +495,7 @@ public class MapActivityLayers {
 		OsmandApplication app = getApplication();
 		boolean nightMode = isNightMode(app);
 		int themeRes = getThemeRes(app);
-		int selectedModeColor = ContextCompat.getColor(app, settings.getApplicationMode().getIconColorInfo().getColor(nightMode));
+		int selectedModeColor = settings.getApplicationMode().getProfileColor(nightMode);
 		DialogListItemAdapter dialogAdapter = DialogListItemAdapter.createSingleChoiceAdapter(
 				items, nightMode, selectedItem, app, selectedModeColor, themeRes, new View.OnClickListener() {
 					@Override

OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java

@@ -120,13 +120,13 @@ public class AppModeDialog {
 			final View selection = tb.findViewById(R.id.selection);
 			ImageView iv = (ImageView) tb.findViewById(R.id.app_mode_icon);
 			if (checked) {
-				iv.setImageDrawable(ctx.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode)));
+				iv.setImageDrawable(ctx.getUIUtilities().getPaintedIcon(mode.getIconRes(), mode.getProfileColor(nightMode)));
 				iv.setContentDescription(String.format("%s %s", mode.toHumanString(), ctx.getString(R.string.item_checked)));
-				selection.setBackgroundResource(mode.getIconColorInfo().getColor(nightMode));
+				selection.setBackgroundColor(mode.getProfileColor(nightMode));
 				selection.setVisibility(View.VISIBLE);
 			} else {
 				if (useMapTheme) {
-					iv.setImageDrawable(ctx.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode)));
+					iv.setImageDrawable(ctx.getUIUtilities().getPaintedIcon(mode.getIconRes(), mode.getProfileColor(nightMode)));
 					iv.setBackgroundResource(AndroidUtils.resolveAttribute(themedCtx, android.R.attr.selectableItemBackground));
 				} else {
 					iv.setImageDrawable(ctx.getUIUtilities().getThemedIcon(mode.getIconRes()));
@@ -171,7 +171,7 @@ public class AppModeDialog {
 			final boolean checked = selected.contains(mode);
 			ImageView iv = (ImageView) tb.findViewById(R.id.app_mode_icon);
 			ImageView selection = tb.findViewById(R.id.selection);
-			Drawable drawable = ctx.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode));
+			Drawable drawable = ctx.getUIUtilities().getPaintedIcon(mode.getIconRes(), mode.getProfileColor(nightMode));
 			if (checked) {
 				iv.setImageDrawable(drawable);
 				iv.setContentDescription(String.format("%s %s", mode.toHumanString(), ctx.getString(R.string.item_checked)));
@@ -184,7 +184,7 @@ public class AppModeDialog {
 			} else {
 				if (useMapTheme) {
 					if (Build.VERSION.SDK_INT >= 21) {
-						Drawable active = ctx.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode));
+						Drawable active = ctx.getUIUtilities().getPaintedIcon(mode.getIconRes(), mode.getProfileColor(nightMode));
 						drawable = AndroidUtils.createPressedStateListDrawable(drawable, active);
 					}
 					iv.setImageDrawable(drawable);
@@ -195,7 +195,7 @@ public class AppModeDialog {
 						AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.btn_border_pressed_trans_light, R.drawable.btn_border_pressed_trans_light);
 					}
 				} else {
-					iv.setImageDrawable(ctx.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode)));
+					iv.setImageDrawable(ctx.getUIUtilities().getPaintedIcon(mode.getIconRes(), mode.getProfileColor(nightMode)));
 				}
 				iv.setContentDescription(String.format("%s %s", mode.toHumanString(), ctx.getString(R.string.item_unchecked)));
 			}
@@ -232,7 +232,7 @@ public class AppModeDialog {
 		int metricsY = (int) ctx.getResources().getDimension(R.dimen.route_info_modes_height);
 		View tb = layoutInflater.inflate(layoutId, null);
 		ImageView iv = (ImageView) tb.findViewById(R.id.app_mode_icon);
-		iv.setImageDrawable(ctx.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(isNightMode(ctx, useMapTheme))));
+		iv.setImageDrawable(ctx.getUIUtilities().getPaintedIcon(mode.getIconRes(), mode.getProfileColor(isNightMode(ctx, useMapTheme))));
 		iv.setContentDescription(mode.toHumanString());
 //		tb.setCompoundDrawablesWithIntrinsicBounds(null, ctx.getIconsCache().getIcon(mode.getIconId(), R.color.app_mode_icon_color), null, null);
 		LayoutParams lp = new LinearLayout.LayoutParams(metricsX, metricsY);

OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java

@@ -121,7 +121,7 @@ public class StartGPSStatus extends OsmAndAction {
 		cb.setLayoutParams(lp);
 		cb.setPadding(dp8, 0, 0, 0);
 		int textColorPrimary = ContextCompat.getColor(activity, isNightMode() ? R.color.text_color_primary_dark : R.color.text_color_primary_light);
-		int selectedModeColor = ContextCompat.getColor(activity, getSettings().getApplicationMode().getIconColorInfo().getColor(isNightMode()));
+		int selectedModeColor = getSettings().getApplicationMode().getProfileColor(isNightMode());
 		cb.setTextColor(textColorPrimary);
 		UiUtilities.setupCompoundButton(isNightMode(), selectedModeColor, cb);
 		

OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java

@@ -678,7 +678,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 				if (itemId == R.string.layer_recordings) {
 					SHOW_RECORDINGS.set(!SHOW_RECORDINGS.get());
-					adapter.getItem(pos).setColorRes(SHOW_RECORDINGS.get() ?
+					adapter.getItem(pos).setColor(app, SHOW_RECORDINGS.get() ?
 							R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 					adapter.notifyDataSetChanged();
 					updateLayers(mapView, mapActivity);
@@ -690,7 +690,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 				.setId(RECORDING_LAYER)
 				.setSelected(SHOW_RECORDINGS.get())
 				.setIcon(R.drawable.ic_action_micro_dark)
-				.setColor(SHOW_RECORDINGS.get() ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
+				.setColor(mapActivity, SHOW_RECORDINGS.get() ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
 				.setItemDeleteAction(makeDeleteAction(SHOW_RECORDINGS))
 				.setListener(listener).createItem());
 	}

OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java

@@ -10,6 +10,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 
+import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
@@ -91,6 +92,16 @@ public abstract class BottomSheetDialogFragment extends DialogFragment {
 		}
 	}
 
+	@Nullable
+	protected Drawable getPaintedIcon(@DrawableRes int drawableRes, @ColorInt int color) {
+		OsmandApplication app = getMyApplication();
+		if (app != null) {
+			return app.getUIUtilities().getPaintedIcon(drawableRes, color);
+		} else {
+			return null;
+		}
+	}
+
 	@Nullable
 	protected Drawable getContentIcon(@DrawableRes int drawableRes) {
 		OsmandApplication app = getMyApplication();

OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java

@@ -18,7 +18,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
 import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
+import net.osmand.plus.routing.GPXRouteParams.GPXRouteParamsBuilder;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.settings.backend.OsmandSettings;
 

OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithCompoundButton.java

@@ -8,6 +8,7 @@ import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 
+import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.LayoutRes;
 import androidx.core.content.ContextCompat;
@@ -22,6 +23,7 @@ public class BottomSheetItemWithCompoundButton extends BottomSheetItemWithDescri
 	private ColorStateList buttonTintList;
 	private OnCheckedChangeListener onCheckedChangeListener;
 	@ColorRes private int compoundButtonColorId;
+	@ColorInt private Integer compoundButtonColor;
 
 	private CompoundButton compoundButton;
 
@@ -80,6 +82,10 @@ public class BottomSheetItemWithCompoundButton extends BottomSheetItemWithDescri
 		this.compoundButtonColorId = compoundButtonColorId;
 	}
 
+	public void setCompoundButtonColor(@ColorInt int compoundButtonColor) {
+		this.compoundButtonColor = compoundButtonColor;
+	}
+
 	public CompoundButton getCompoundButton() {
 		return compoundButton;
 	}
@@ -91,7 +97,9 @@ public class BottomSheetItemWithCompoundButton extends BottomSheetItemWithDescri
 		if (compoundButton != null) {
 			compoundButton.setChecked(checked);
 			compoundButton.setOnCheckedChangeListener(onCheckedChangeListener);
-			if (compoundButtonColorId != INVALID_ID) {
+			if (compoundButtonColor != null) {
+				UiUtilities.setupCompoundButton(nightMode, compoundButtonColor, compoundButton);
+			} else if (compoundButtonColorId != INVALID_ID) {
 				UiUtilities.setupCompoundButton(nightMode, ContextCompat.getColor(context, compoundButtonColorId), compoundButton);
 			} else {
 				CompoundButtonCompat.setButtonTintList(compoundButton, buttonTintList);
@@ -105,6 +113,7 @@ public class BottomSheetItemWithCompoundButton extends BottomSheetItemWithDescri
 		protected ColorStateList buttonTintList;
 		protected OnCheckedChangeListener onCheckedChangeListener;
 		@ColorRes protected int compoundButtonColorId = INVALID_ID;
+		@ColorInt protected Integer compoundButtonColor = null;
 
 		public Builder setChecked(boolean checked) {
 			this.checked = checked;
@@ -126,6 +135,11 @@ public class BottomSheetItemWithCompoundButton extends BottomSheetItemWithDescri
 			return this;
 		}
 
+		public Builder setCompoundButtonColor(@ColorInt int compoundButtonColor) {
+			this.compoundButtonColor = compoundButtonColor;
+			return this;
+		}
+		
 		public BottomSheetItemWithCompoundButton create() {
 			return new BottomSheetItemWithCompoundButton(customView,
 					layoutId,

OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java

@@ -1004,7 +1004,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
 				new TransactionBuilder(mapActivity.getSupportFragmentManager(), settings, mapActivity);
 		builder.addFragmentsData(fragmentsData)
 				.addFragmentsData(OsmandPlugin.getPluginsCardsList())
-				.getFragmentTransaction().commit();
+				.getFragmentTransaction().commitAllowingStateLoss();
 	}
 
 	private void removeFragment(String tag) {

OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java

@@ -172,7 +172,7 @@ public class ConfigureMapMenu {
 	                               final MapActivity activity, final int themeRes, final boolean nightMode) {
 		final OsmandApplication app = activity.getMyApplication();
 		final OsmandSettings settings = app.getSettings();
-		final int selectedProfileColorRes = settings.getApplicationMode().getIconColorInfo().getColor(nightMode);
+		final int selectedProfileColor = settings.getApplicationMode().getProfileColor(nightMode);
 		MapLayerMenuListener l = new MapLayerMenuListener(activity, adapter);
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
 				.setId(SHOW_CATEGORY_ID)
@@ -184,7 +184,7 @@ public class ConfigureMapMenu {
 				.setId(FAVORITES_ID)
 				.setTitleId(R.string.shared_string_favorites, activity)
 				.setSelected(settings.SHOW_FAVORITES.get())
-				.setColor(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
+				.setColor(app, selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
 				.setIcon(R.drawable.ic_action_favorite)
 				.setItemDeleteAction(makeDeleteAction(settings.SHOW_FAVORITES))
 				.setListener(l)
@@ -196,7 +196,7 @@ public class ConfigureMapMenu {
 				.setTitleId(R.string.layer_poi, activity)
 				.setSelected(selected)
 				.setDescription(app.getPoiFilters().getSelectedPoiFiltersName(wiki))
-				.setColor(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
+				.setColor(app, selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
 				.setIcon(R.drawable.ic_action_info_dark)
 				.setSecondaryIcon(R.drawable.ic_action_additional_option)
 				.setListener(l).createItem());
@@ -205,7 +205,7 @@ public class ConfigureMapMenu {
 				.setId(POI_OVERLAY_LABELS_ID)
 				.setTitleId(R.string.layer_amenity_label, activity)
 				.setSelected(settings.SHOW_POI_LABEL.get())
-				.setColor(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
+				.setColor(app, selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
 				.setIcon(R.drawable.ic_action_text_dark)
 				.setItemDeleteAction(makeDeleteAction(settings.SHOW_POI_LABEL))
 				.setListener(l).createItem());
@@ -217,7 +217,7 @@ public class ConfigureMapMenu {
 				.setIcon(R.drawable.ic_action_transport_bus)
 				.setSecondaryIcon(R.drawable.ic_action_additional_option)
 				.setSelected(selected)
-				.setColor(selected ? selectedProfileColorRes : ContextMenuItem.INVALID_ID)
+				.setColor(selected ? selectedProfileColor : null)
 				.setListener(l).createItem());
 
 		selected = app.getSelectedGpxHelper().isShowingAnyGpxFiles();
@@ -226,7 +226,7 @@ public class ConfigureMapMenu {
 				.setTitleId(R.string.layer_gpx_layer, activity)
 				.setSelected(app.getSelectedGpxHelper().isShowingAnyGpxFiles())
 				.setDescription(app.getSelectedGpxHelper().getGpxDescription())
-				.setColor(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
+				.setColor(app, selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
 				.setIcon(R.drawable.ic_action_polygom_dark)
 				.setSecondaryIcon(R.drawable.ic_action_additional_option)
 				.setListener(l).createItem());
@@ -236,7 +236,7 @@ public class ConfigureMapMenu {
 				.setId(MAP_MARKERS_ID)
 				.setTitleId(R.string.map_markers, activity)
 				.setSelected(selected)
-				.setColor(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
+				.setColor(app, selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
 				.setIcon(R.drawable.ic_action_flag)
 				.setItemDeleteAction(makeDeleteAction(settings.SHOW_MAP_MARKERS))
 				.setListener(l).createItem());
@@ -267,8 +267,7 @@ public class ConfigureMapMenu {
 	                                           final int themeRes, final boolean nightMode) {
 		final OsmandApplication app = activity.getMyApplication();
 		final OsmandSettings settings = app.getSettings();
-		final int selectedProfileColorRes = settings.APPLICATION_MODE.get().getIconColorInfo().getColor(nightMode);
+		final int selectedProfileColor = settings.APPLICATION_MODE.get().getProfileColor(nightMode);
-		final int selectedProfileColor = ContextCompat.getColor(app, selectedProfileColorRes);
 
 		adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.map_widget_map_rendering, activity)
 				.setId(MAP_RENDERING_CATEGORY_ID)
@@ -705,7 +704,6 @@ public class ConfigureMapMenu {
 						for (int i = 0; i < prefs.size(); i++) {
 							prefs.get(i).set(false);
 						}
-						adapter.getItem(pos).setColorRes(ContextMenuItem.INVALID_ID);
 						a.notifyDataSetInvalidated();
 						activity.refreshMapComplete();
 						activity.getMapLayers().updateLayers(activity.getMapView());
@@ -739,7 +737,7 @@ public class ConfigureMapMenu {
 					}
 				}
 			}
-			builder.setColor(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
+			builder.setColor(activity, selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 			if (useDescription) {
 				final String descr = getDescription(prefs, includedPrefs);
 				builder.setDescription(descr);
@@ -840,7 +838,7 @@ public class ConfigureMapMenu {
 					selected |= prefs.get(i).get();
 				}
 				adapter.getItem(pos).setSelected(selected);
-				adapter.getItem(pos).setColorRes(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
+				adapter.getItem(pos).setColor(activity, selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 				a.notifyDataSetInvalidated();
 			}
 		});
@@ -875,7 +873,7 @@ public class ConfigureMapMenu {
 					} else {
 						adapter.getItem(pos).setSelected(selected);
 					}
-					adapter.getItem(pos).setColorRes(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
+					adapter.getItem(pos).setColor(activity, selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 				}
 				a.notifyDataSetInvalidated();
 				activity.refreshMapComplete();

OsmAnd/src/net/osmand/plus/dialogs/DetailsBottomSheet.java

@@ -98,7 +98,7 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
 
 	@Override
 	public void createMenuItems(Bundle savedInstanceState) {
-		int selectedProfileColorRes = app.getSettings().APPLICATION_MODE.get().getIconColorInfo().getColor(nightMode);
+		int selectedProfileColor = app.getSettings().APPLICATION_MODE.get().getProfileColor(nightMode);
 		float spacing = getResources().getDimension(R.dimen.line_spacing_extra_description);
 		LinearLayout linearLayout = new LinearLayout(app);
 		linearLayout.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
@@ -139,7 +139,7 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
 									streetLightsNightPref.set(!onLeftClick);
 								}
 							})
-							.setCompoundButtonColorId(selectedProfileColorRes)
+							.setCompoundButtonColor(selectedProfileColor)
 							.setChecked(pref.get())
 							.setTitle(propertyName)
 							.setIconHidden(true)
@@ -160,7 +160,7 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
 				} else if (!STREET_LIGHTING_NIGHT.equals(property.getAttrName())) {
 					final BottomSheetItemWithCompoundButton[] item = new BottomSheetItemWithCompoundButton[1];
 					item[0] = (BottomSheetItemWithCompoundButton) new BottomSheetItemWithCompoundButton.Builder()
-							.setCompoundButtonColorId(selectedProfileColorRes)
+							.setCompoundButtonColor(selectedProfileColor)
 							.setChecked(pref.get())
 							.setTitle(propertyName)
 							.setIconHidden(true)
@@ -217,7 +217,7 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
 		}
 		if (adapter != null) {
 			adapter.getItem(position).setSelected(checked);
-			adapter.getItem(position).setColorRes(checked ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
+			adapter.getItem(position).setColor(app, checked ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 			adapter.getItem(position).setDescription(getString(
 					R.string.ltr_or_rtl_combine_via_slash,
 					String.valueOf(selected),

OsmAnd/src/net/osmand/plus/dialogs/MapLayerMenuListener.java

@@ -77,7 +77,7 @@ final class MapLayerMenuListener extends OnRowItemClick {
 				public boolean processResult(Boolean result) {
 					if (item != null) {
 						item.setSelected(result);
-						item.setColorRes(result ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
+						item.setColor(mapActivity, result ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 						adapter.notifyDataSetChanged();
 					}
 					return true;
@@ -86,7 +86,7 @@ final class MapLayerMenuListener extends OnRowItemClick {
 			boolean selected = TransportLinesMenu.isShowLines(mapActivity.getMyApplication());
 			if (!selected && item != null) {
 				item.setSelected(true);
-				item.setColorRes(R.color.osmand_orange);
+				item.setColor(mapActivity, R.color.osmand_orange);
 				adapter.notifyDataSetChanged();
 			}
 			return false;
@@ -94,7 +94,7 @@ final class MapLayerMenuListener extends OnRowItemClick {
 			CompoundButton btn = (CompoundButton) view.findViewById(R.id.toggle_item);
 			if (btn != null && btn.getVisibility() == View.VISIBLE) {
 				btn.setChecked(!btn.isChecked());
-				menuAdapter.getItem(pos).setColorRes(btn.isChecked() ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
+				menuAdapter.getItem(pos).setColor(mapActivity, btn.isChecked() ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 				adapter.notifyDataSetChanged();
 				return false;
 			} else {
@@ -110,7 +110,7 @@ final class MapLayerMenuListener extends OnRowItemClick {
 		final PoiFiltersHelper poiFiltersHelper = mapActivity.getMyApplication().getPoiFilters();
 		final ContextMenuItem item = menuAdapter.getItem(pos);
 		if (item.getSelected() != null) {
-			item.setColorRes(isChecked ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
+			item.setColor(mapActivity, isChecked ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 		}
 		if (itemId == R.string.layer_poi) {
 			PoiUIFilter wiki = poiFiltersHelper.getTopWikiPoiFilter();
@@ -139,7 +139,7 @@ final class MapLayerMenuListener extends OnRowItemClick {
 				@Override
 				public boolean processResult(Boolean result) {
 					item.setSelected(result);
-					item.setColorRes(result ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
+					item.setColor(mapActivity, result ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 					adapter.notifyDataSetChanged();
 					return true;
 				}
@@ -171,7 +171,7 @@ final class MapLayerMenuListener extends OnRowItemClick {
 				boolean selected = app.getSelectedGpxHelper().isShowingAnyGpxFiles();
 				item.setSelected(selected);
 				item.setDescription(app.getSelectedGpxHelper().getGpxDescription());
-				item.setColorRes(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
+				item.setColor(mapActivity, selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 				adapter.notifyDataSetChanged();
 			}
 		});
@@ -189,7 +189,7 @@ final class MapLayerMenuListener extends OnRowItemClick {
 						boolean selected = pf.isShowingAnyPoi(wiki);
 						item.setSelected(selected);
 						item.setDescription(pf.getSelectedPoiFiltersName(wiki));
-						item.setColorRes(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
+						item.setColor(mapActivity, selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 						adapter.notifyDataSetChanged();
 					}
 				};

OsmAnd/src/net/osmand/plus/dialogs/SelectMapViewQuickActionsBottomSheet.java

@@ -174,8 +174,8 @@ public class SelectMapViewQuickActionsBottomSheet extends MenuBottomSheetDialogF
 				if (appMode != null) {
 					boolean selected = key.equals(selectedItem);
 					int iconId = appMode.getIconRes();
-					int colorId = appMode.getIconColorInfo().getColor(nightMode);
+					int color = appMode.getProfileColor(nightMode);
-					Drawable icon = getIcon(iconId, colorId);
+					Drawable icon = getPaintedIcon(iconId, color);
 					String translatedName = appMode.toHumanString();
 					createItemRow(selected, counter, icon, translatedName, key);
 					counter++;

OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java

@@ -516,13 +516,13 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
 				.setTitleId(R.string.shared_string_refresh, getContext())
 				.setIcon(R.drawable.ic_action_refresh_dark)
 				.setListener(listener)
-				.setColor(iconColorResId)
+				.setColor(getContext(), iconColorResId)
 				.createItem());
 		optionsMenuAdapter.addItem(new ContextMenuItem.ItemBuilder()
 				.setTitleId(R.string.shared_string_delete, getContext())
 				.setIcon(R.drawable.ic_action_delete_dark)
 				.setListener(listener)
-				.setColor(iconColorResId)
+				.setColor(getContext(), iconColorResId)
 				.createItem());
 		optionsMenuAdapter.addItem(new ContextMenuItem.ItemBuilder()
 				.setTitleId(R.string.local_index_mi_backup, getContext())
@@ -554,7 +554,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
 				MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 			}
 			if (contextMenuItem.getIcon() != -1) {
-				Drawable icMenuItem = getMyApplication().getUIUtilities().getIcon(contextMenuItem.getIcon(), contextMenuItem.getColorRes());
+				Drawable icMenuItem = getMyApplication().getUIUtilities().getPaintedIcon(contextMenuItem.getIcon(), contextMenuItem.getColor());
 				item.setIcon(icMenuItem);
 			}
 

OsmAnd/src/net/osmand/plus/importfiles/ImportHelper.java

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.AsyncTask.Status;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.OpenableColumns;
@@ -25,6 +26,8 @@ import net.osmand.PlatformUtil;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.FavouritePoint.BackgroundType;
 import net.osmand.plus.AppInitializer;
+import net.osmand.plus.AppInitializer.AppInitializeListener;
+import net.osmand.plus.AppInitializer.InitEvents;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
@@ -687,7 +690,7 @@ public class ImportHelper {
 				} else {
 					fpCat = p.category;
 				}
-				FavouritePoint point = new FavouritePoint(p.lat, p.lon, p.name, fpCat);
+				FavouritePoint point = new FavouritePoint(p.lat, p.lon, p.name, fpCat, p.ele, 0);
 				if (p.desc != null) {
 					point.setDescription(p.desc);
 				}
@@ -707,15 +710,17 @@ public class ImportHelper {
 	@SuppressWarnings("unchecked")
 	private <P> void executeImportTask(final AsyncTask<P, ?, ?> importTask, final P... requests) {
 		if (app.isApplicationInitializing()) {
-			app.getAppInitializer().addListener(new AppInitializer.AppInitializeListener() {
+			app.getAppInitializer().addListener(new AppInitializeListener() {
 				@Override
-				public void onProgress(AppInitializer init, AppInitializer.InitEvents event) {
+				public void onProgress(AppInitializer init, InitEvents event) {
 				}
 
 				@Override
 				public void onFinish(AppInitializer init) {
+					if (importTask.getStatus() == Status.PENDING) {
 						importTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, requests);
 					}
+				}
 			});
 		} else {
 			importTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, requests);

OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java

@@ -1036,6 +1036,8 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 						title = "";
 					}
 					String originObjectName = "";
+					double altitude = 0;
+					long timestamp = System.currentTimeMillis();
 					Object object = getObject();
 					if (object != null) {
 						if (object instanceof Amenity) {
@@ -1043,10 +1045,13 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 						} else if (object instanceof TransportStop) {
 							originObjectName = ((TransportStop) object).toStringEn();
 						}
+						if (object instanceof WptPt) {
+							altitude = ((WptPt) object).ele;
+						}
 					}
 					FavoritePointEditor favoritePointEditor = getFavoritePointEditor();
 					if (favoritePointEditor != null) {
-						favoritePointEditor.add(getLatLon(), title, getStreetStr(), originObjectName);
+						favoritePointEditor.add(getLatLon(), title, getStreetStr(), originObjectName, altitude, timestamp);
 					}
 				}
 			});
@@ -1074,7 +1079,8 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 			for (OsmandMapLayer layer : mapActivity.getMapView().getLayers()) {
 				layer.populateObjectContextMenu(latLon, getObject(), menuAdapter, mapActivity);
 			}
-			mapActivity.getMapActions().addActionsToAdapter(configure ? 0 : latLon.getLatitude(), configure ? 0 : latLon.getLongitude(), menuAdapter, configure ? null : getObject(), configure);		}
+			mapActivity.getMapActions().addActionsToAdapter(configure ? 0 : latLon.getLatitude(), configure ? 0 : latLon.getLongitude(), menuAdapter, configure ? null : getObject(), configure);
+		}
 		return menuAdapter;
 	}
 

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/AddNewFavoriteCategoryBottomSheet.java

@@ -0,0 +1,248 @@
+package net.osmand.plus.mapcontextmenu.editors;
+
+import android.content.res.ColorStateList;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentActivity;
+
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+
+import net.osmand.AndroidUtils;
+import net.osmand.plus.FavouritesDbHelper;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.base.MenuBottomSheetDialogFragment;
+import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
+import net.osmand.plus.helpers.ColorDialogs;
+import net.osmand.plus.myplaces.AddNewTrackFolderBottomSheet;
+import net.osmand.plus.routepreparationmenu.cards.BaseCard;
+import net.osmand.plus.track.ColorsCard;
+import net.osmand.plus.track.CustomColorBottomSheet;
+import net.osmand.util.Algorithms;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+public class AddNewFavoriteCategoryBottomSheet extends MenuBottomSheetDialogFragment implements CustomColorBottomSheet.ColorPickerListener, BaseCard.CardListener {
+
+
+	public static final String TAG = AddNewTrackFolderBottomSheet.class.getName();
+	private static final String KEY_CTX_EDIT_CAT_EDITOR_TAG = "key_ctx_edit_cat_editor_tag";
+	private static final String KEY_CTX_EDIT_GPX_FILE = "key_ctx_edit_gpx_file";
+	private static final String KEY_CTX_EDIT_GPX_CATEGORIES = "key_ctx_edit_gpx_categories";
+	private static final String KEY_CTX_EDIT_CAT_NEW = "key_ctx_edit_cat_new";
+	private static final String KEY_CTX_EDIT_CAT_NAME = "key_ctx_edit_cat_name";
+	private static final String KEY_CTX_EDIT_CAT_COLOR = "key_ctx_edit_cat_color";
+	FavouritesDbHelper favoritesHelper;
+	private boolean isNew = true;
+	private String name = "";
+	private boolean isGpx;
+	private ArrayList<String> gpxCategories;
+	private int selectedColor;
+	private ColorsCard colorsCard;
+	private TextInputEditText editText;
+	private TextInputLayout nameTextBox;
+	private View view;
+	private String editorTag;
+	private SelectFavoriteCategoryBottomSheet.CategorySelectionListener selectionListener;
+
+	public static AddNewFavoriteCategoryBottomSheet createInstance(@NonNull String editorTag, @Nullable Set<String> gpxCategories, boolean isGpx) {
+		AddNewFavoriteCategoryBottomSheet fragment = new AddNewFavoriteCategoryBottomSheet();
+		Bundle bundle = new Bundle();
+		bundle.putString(KEY_CTX_EDIT_CAT_EDITOR_TAG, editorTag);
+		bundle.putBoolean(KEY_CTX_EDIT_GPX_FILE, isGpx);
+		if (gpxCategories != null) {
+			bundle.putStringArrayList(KEY_CTX_EDIT_GPX_CATEGORIES, new ArrayList<>(gpxCategories));
+		}
+		fragment.setArguments(bundle);
+		fragment.setRetainInstance(true);
+		return fragment;
+	}
+
+	public void setSelectionListener(SelectFavoriteCategoryBottomSheet.CategorySelectionListener selectionListener) {
+		this.selectionListener = selectionListener;
+	}
+
+	@Override
+	protected int getRightBottomButtonTextId() {
+		return R.string.shared_string_save;
+	}
+
+	private boolean isGpxCategoryExists(@NonNull String name) {
+		boolean res = false;
+		if (gpxCategories != null) {
+			String nameLC = name.toLowerCase();
+			for (String category : gpxCategories) {
+				if (category.toLowerCase().equals(nameLC)) {
+					res = true;
+					break;
+				}
+			}
+		}
+		return res;
+	}
+
+	@Override
+	protected void onRightBottomButtonClick() {
+		name = editText.getText().toString().trim();
+		FragmentActivity activity = getActivity();
+		if (activity != null) {
+			boolean exists = isGpx ? isGpxCategoryExists(name) : favoritesHelper.groupExists(name);
+			if (exists) {
+				AlertDialog.Builder b = new AlertDialog.Builder(activity);
+				b.setMessage(getString(R.string.favorite_category_dublicate_message));
+				b.setNegativeButton(R.string.shared_string_ok, null);
+				b.show();
+			} else {
+				if (activity instanceof MapActivity) {
+					if (!isGpx) {
+						favoritesHelper.addEmptyCategory(name, selectedColor);
+					}
+					PointEditor editor = ((MapActivity) activity).getContextMenu().getPointEditor(editorTag);
+
+					if (editor != null) {
+						editor.setCategory(name, selectedColor);
+					}
+
+					if (selectionListener != null) {
+						selectionListener.onCategorySelected(name, selectedColor);
+					}
+				}
+				dismiss();
+			}
+		}
+	}
+
+	@Override
+	protected UiUtilities.DialogButtonType getRightBottomButtonType() {
+		return UiUtilities.DialogButtonType.PRIMARY;
+	}
+
+	@Nullable
+	public FavouritesDbHelper getHelper() {
+		return favoritesHelper;
+	}
+
+	@Override
+	public void onSaveInstanceState(@NonNull Bundle outState) {
+		saveState(outState);
+		super.onSaveInstanceState(outState);
+	}
+
+	public void saveState(Bundle bundle) {
+		bundle.putString(KEY_CTX_EDIT_CAT_EDITOR_TAG, editorTag);
+		bundle.putString(KEY_CTX_EDIT_CAT_NEW, Boolean.valueOf(isNew).toString());
+		bundle.putString(KEY_CTX_EDIT_CAT_NAME, editText.getText().toString().trim());
+		bundle.putString(KEY_CTX_EDIT_CAT_COLOR, "" + selectedColor);
+		bundle.putBoolean(KEY_CTX_EDIT_GPX_FILE, isGpx);
+		if (gpxCategories != null) {
+			bundle.putStringArrayList(KEY_CTX_EDIT_GPX_CATEGORIES, gpxCategories);
+		}
+	}
+
+	@Override
+	public void createMenuItems(Bundle savedInstanceState) {
+		OsmandApplication app = requiredMyApplication();
+		favoritesHelper = app.getFavorites();
+
+		if (savedInstanceState != null) {
+			restoreState(savedInstanceState);
+		} else if (getArguments() != null) {
+			restoreState(getArguments());
+		}
+
+
+		items.add(new TitleItem(getString(R.string.favorite_category_add_new_title)));
+		selectedColor = getResources().getColor(R.color.color_favorite);
+
+		view = UiUtilities.getInflater(app, nightMode).inflate(R.layout.add_new_favorite_category, null);
+		nameTextBox = view.findViewById(R.id.name_text_box);
+		nameTextBox.setBoxBackgroundColorResource(nightMode ? R.color.list_background_color_dark : R.color.activity_background_color_light);
+		nameTextBox.setHint(app.getResources().getString(R.string.favorite_category_name));
+		ColorStateList colorStateList = ColorStateList.valueOf(ContextCompat
+				.getColor(app, nightMode ? R.color.text_color_secondary_dark : R.color.text_color_secondary_light));
+		nameTextBox.setDefaultHintTextColor(colorStateList);
+		editText = view.findViewById(R.id.name_edit_text);
+		editText.setText(name);
+		editText.requestFocus();
+		AndroidUtils.softKeyboardDelayed(getActivity(), editText);
+		nameTextBox.setStartIconTintList(ColorStateList.valueOf(selectedColor));
+		nameTextBox.setBoxStrokeColorStateList(ColorStateList.valueOf(selectedColor));
+
+		BaseBottomSheetItem editFolderName = new BaseBottomSheetItem.Builder()
+				.setCustomView(view)
+				.create();
+		items.add(editFolderName);
+		MapActivity mapActivity = (MapActivity) getActivity();
+		List<Integer> colors = new ArrayList<>();
+		for (int color : ColorDialogs.pallette) {
+			colors.add(color);
+		}
+		colorsCard = new ColorsCard(mapActivity, selectedColor, this, colors, app.getSettings().CUSTOM_TRACK_COLORS, null);
+		colorsCard.setListener(this);
+		LinearLayout selectColor = view.findViewById(R.id.select_color);
+		selectColor.addView(colorsCard.build(view.getContext()));
+	}
+
+	private void updateColorSelector(int color) {
+		((TextView) view.findViewById(R.id.color_name)).setText(ColorDialogs.getColorName(color));
+		selectedColor = color;
+		nameTextBox.setStartIconTintList(ColorStateList.valueOf(selectedColor));
+		nameTextBox.setBoxStrokeColorStateList(ColorStateList.valueOf(selectedColor));
+	}
+
+	@Override
+	public void onCardLayoutNeeded(@NonNull BaseCard card) {
+
+	}
+
+	@Override
+	public void onCardPressed(@NonNull BaseCard card) {
+		if (card instanceof ColorsCard) {
+			int color = ((ColorsCard) card).getSelectedColor();
+			updateColorSelector(color);
+		}
+	}
+
+	@Override
+	public void onCardButtonPressed(@NonNull BaseCard card, int buttonIndex) {
+
+	}
+
+	@Override
+	public void onColorSelected(Integer prevColor, int newColor) {
+		colorsCard.onColorSelected(prevColor, newColor);
+		int color = colorsCard.getSelectedColor();
+		updateColorSelector(color);
+	}
+
+	public void restoreState(Bundle bundle) {
+		editorTag = bundle.getString(KEY_CTX_EDIT_CAT_EDITOR_TAG);
+		String isNewStr = bundle.getString(KEY_CTX_EDIT_CAT_NEW);
+		if (isNewStr != null) {
+			isNew = Boolean.parseBoolean(isNewStr);
+		}
+		name = bundle.getString(KEY_CTX_EDIT_CAT_NAME);
+		if (name == null) {
+			name = "";
+		}
+		String colorStr = bundle.getString(KEY_CTX_EDIT_CAT_COLOR);
+		if (!Algorithms.isEmpty(colorStr)) {
+			selectedColor = Integer.parseInt(colorStr);
+		}
+		isGpx = bundle.getBoolean(KEY_CTX_EDIT_GPX_FILE, false);
+		gpxCategories = bundle.getStringArrayList(KEY_CTX_EDIT_GPX_CATEGORIES);
+	}
+}

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditor.java

@@ -27,7 +27,7 @@ public class FavoritePointEditor extends PointEditor {
 		return favorite;
 	}
 
-	public void add(LatLon latLon, String title, String address, String originObjectName) {
+	public void add(LatLon latLon, String title, String address, String originObjectName, double altitude, long timestamp) {
 		MapActivity mapActivity = getMapActivity();
 		if (latLon == null || mapActivity == null) {
 			return;
@@ -37,7 +37,7 @@ public class FavoritePointEditor extends PointEditor {
 		if (!Algorithms.isEmpty(lastCategory) && !app.getFavorites().groupExists(lastCategory)) {
 			lastCategory = "";
 		}
-		favorite = new FavouritePoint(latLon.getLatitude(), latLon.getLongitude(), title, lastCategory);
+		favorite = new FavouritePoint(latLon.getLatitude(), latLon.getLongitude(), title, lastCategory, altitude, timestamp);
 		favorite.setDescription("");
 		favorite.setAddress(address.isEmpty() ? title : address);
 		favorite.setOriginObjectName(originObjectName);
@@ -64,7 +64,6 @@ public class FavoritePointEditor extends PointEditor {
 		favorite.setDescription("");
 		favorite.setAddress("");
 		favorite.setOriginObjectName(originObjectName);
-
 		FavoritePointEditorFragmentNew.showAutoFillInstance(mapActivity, autoFill);
 	}
 

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java

@@ -190,7 +190,7 @@ public class FavoritePointEditorFragment extends PointEditorFragment {
 		final FavouritePoint favorite = getFavorite();
 		if (favorite != null) {
 			final FavouritePoint point = new FavouritePoint(favorite.getLatitude(), favorite.getLongitude(),
-					getNameTextValue(), getCategoryTextValue());
+					getNameTextValue(), getCategoryTextValue(), favorite.getAltitude(), favorite.getTimestamp());
 			point.setDescription(getDescriptionTextValue());
 			point.setAddress(getAddressTextValue());
 			AlertDialog.Builder builder = FavouritesDbHelper.checkDuplicates(point, helper, getMapActivity());

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragmentNew.java

@@ -75,6 +75,9 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew {
 		FavouritesDbHelper helper = getHelper();
 		if (editor != null && helper != null) {
 			FavouritePoint favorite = editor.getFavorite();
+			if (favorite == null && savedInstanceState != null) {
+				favorite = (FavouritePoint) savedInstanceState.getSerializable(FavoriteDialogs.KEY_FAVORITE);
+			}
 			this.favorite = favorite;
 			this.group = helper.getGroup(favorite);
 			this.color = favorite.getColor();
@@ -109,6 +112,12 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew {
 		return view;
 	}
 
+	@Override
+	public void onSaveInstanceState(@NonNull Bundle outState) {
+		super.onSaveInstanceState(outState);
+		outState.putSerializable(FavoriteDialogs.KEY_FAVORITE, getFavorite());
+	}
+
 	private void replacePressed() {
 		Bundle args = new Bundle();
 		args.putSerializable(FavoriteDialogs.KEY_FAVORITE, getFavorite());
@@ -242,7 +251,7 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew {
 		final FavouritePoint favorite = getFavorite();
 		if (favorite != null) {
 			final FavouritePoint point = new FavouritePoint(favorite.getLatitude(), favorite.getLongitude(),
-					getNameTextValue(), getCategoryTextValue());
+					getNameTextValue(), getCategoryTextValue(), favorite.getAltitude(), favorite.getTimestamp());
 			point.setDescription(isDescriptionAvailable() ? getDescriptionTextValue() : null);
 			point.setAddress(isAddressAvailable() ? getAddressTextValue() : null);
 			point.setColor(color);
@@ -258,7 +267,7 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew {
 		final FavouritePoint favorite = getFavorite();
 		if (favorite != null) {
 			final FavouritePoint point = new FavouritePoint(favorite.getLatitude(), favorite.getLongitude(),
-					getNameTextValue(), getCategoryTextValue());
+					getNameTextValue(), getCategoryTextValue(), favorite.getAltitude(), favorite.getTimestamp());
 			point.setDescription(isDescriptionAvailable() ? getDescriptionTextValue() : null);
 			point.setAddress(isAddressAvailable() ? getAddressTextValue() : null);
 			point.setColor(color);

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java

@@ -24,6 +24,7 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 
 import net.osmand.AndroidUtils;
 import net.osmand.plus.OsmandApplication;
@@ -31,6 +32,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.BaseOsmAndFragment;
+import net.osmand.plus.base.BottomSheetDialogFragment;
 import net.osmand.plus.widgets.AutoCompleteTextViewEx;
 import net.osmand.util.Algorithms;
 
@@ -136,9 +138,10 @@ public abstract class PointEditorFragment extends BaseOsmAndFragment {
 			@Override
 			public boolean onTouch(final View v, MotionEvent event) {
 				if (event.getAction() == MotionEvent.ACTION_UP) {
+					FragmentManager fragmentManager = getFragmentManager();
 					DialogFragment dialogFragment = createSelectCategoryDialog();
-					if (dialogFragment != null) {
+					if (fragmentManager != null && dialogFragment != null) {
-						dialogFragment.show(getChildFragmentManager(), SelectCategoryDialogFragment.TAG);
+						dialogFragment.show(fragmentManager, SelectFavoriteCategoryBottomSheet.class.getSimpleName());
 					}
 					return true;
 				}
@@ -179,7 +182,7 @@ public abstract class PointEditorFragment extends BaseOsmAndFragment {
 	protected DialogFragment createSelectCategoryDialog() {
 		PointEditor editor = getEditor();
 		if (editor != null) {
-			return SelectCategoryDialogFragment.createInstance(editor.getFragmentTag());
+			return SelectFavoriteCategoryBottomSheet.createInstance(editor.getFragmentTag());
 		} else {
 			return null;
 		}

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java

@@ -38,6 +38,7 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -49,6 +50,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.BaseOsmAndFragment;
+import net.osmand.plus.base.BottomSheetDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.ColorDialogs;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
@@ -190,9 +192,10 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 		groupList.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
+				FragmentManager fragmentManager = getFragmentManager();
 				DialogFragment dialogFragment  = createSelectCategoryDialog();
-				if (dialogFragment != null) {
+				if (fragmentManager != null && dialogFragment != null) {
-					dialogFragment.show(getChildFragmentManager(), SelectCategoryDialogFragment.TAG);
+					dialogFragment.show(fragmentManager, SelectFavoriteCategoryBottomSheet.class.getSimpleName());
 				}
 			}
 		});
@@ -474,7 +477,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 			if (!ColorDialogs.isPaletteColor(customColor)) {
 				colors.add(customColor);
 			}
-			colorsCard = new ColorsCard(mapActivity, selectedColor, this, colors);
+			colorsCard = new ColorsCard(mapActivity, selectedColor, this, colors, app.getSettings().CUSTOM_TRACK_COLORS, null);
 			colorsCard.setListener(this);
 			LinearLayout selectColor = view.findViewById(R.id.select_color);
 			selectColor.addView(colorsCard.build(view.getContext()));
@@ -732,7 +735,18 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 	protected DialogFragment createSelectCategoryDialog() {
 		PointEditor editor = getEditor();
 		if (editor != null) {
-			return SelectCategoryDialogFragment.createInstance(editor.getFragmentTag());
+			return SelectFavoriteCategoryBottomSheet.createInstance(editor.getFragmentTag());
+		} else {
+			return null;
+		}
+	}
+
+	@Nullable
+	protected AddNewFavoriteCategoryBottomSheet createAddCategoryDialog() {
+		PointEditor editor = getEditor();
+		if (editor != null) {
+			return AddNewFavoriteCategoryBottomSheet.createInstance(editor.getFragmentTag(), getCategories(),
+					!editor.getFragmentTag().equals(FavoritePointEditor.TAG));
 		} else {
 			return null;
 		}
@@ -887,8 +901,6 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 		return true;
 	}
 
-	;
-
 	String getNameTextValue() {
 		EditText nameEdit = view.findViewById(R.id.name_edit);
 		return nameEdit.getText().toString().trim();
@@ -1006,12 +1018,10 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen
 				holder.groupButton.setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View view) {
-						PointEditor editor = getEditor();
+						FragmentManager fragmentManager = getFragmentManager();
-						if (editor != null) {
+						DialogFragment dialogFragment = createAddCategoryDialog();
-							EditCategoryDialogFragment dialogFragment =
+						if (fragmentManager != null && dialogFragment != null) {
-									EditCategoryDialogFragment.createInstance(editor.getFragmentTag(), getCategories(),
+							dialogFragment.show(fragmentManager, SelectFavoriteCategoryBottomSheet.class.getSimpleName());
-											!editor.getFragmentTag().equals(FavoritePointEditor.TAG));
-							dialogFragment.show(requireActivity().getSupportFragmentManager(), EditCategoryDialogFragment.TAG);
 						}
 					}
 				});

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/RtePtEditorFragment.java

@@ -23,7 +23,7 @@ public class RtePtEditorFragment extends WptPtEditorFragment {
 	@Override
 	protected DialogFragment createSelectCategoryDialog() {
 		PointEditor editor = getEditor();
-		return editor != null ? SelectCategoryDialogFragment.createInstance(editor.getFragmentTag()) : null;
+		return editor != null ? SelectFavoriteCategoryBottomSheet.createInstance(editor.getFragmentTag()) : null;
 	}
 
 	public static void showInstance(final MapActivity mapActivity) {