Merge branch 'master' into gpx_overview_description_edit_ui

2021-02-15 22:06:22 +05:00 · 2021-02-15 22:06:22 +05:00 · 5bfc041da9
commit 5bfc041da9
parent 8af6416366 65db4e43b5
189 changed files with 3784 additions and 2037 deletions
--- a/OsmAnd-api/src/net/osmand/aidlapi/map/ALocation.java
+++ b/OsmAnd-api/src/net/osmand/aidlapi/map/ALocation.java
@ -25,6 +25,24 @@ public class ALocation extends AidlParams {
    private ALocation() {
    }

+    public ALocation(double latitude, double longitude, long time, boolean hasAltitude, double altitude,
+                     boolean hasSpeed, float speed, boolean hasBearing, float bearing,
+                     boolean hasAccuracy, float accuracy, boolean hasVerticalAccuracy, float verticalAccuracy) {
+        this.latitude = latitude;
+        this.longitude = longitude;
+        this.time = time;
+        this.hasAltitude = hasAltitude;
+        this.altitude = altitude;
+        this.hasSpeed = hasSpeed;
+        this.speed = speed;
+        this.hasBearing = hasBearing;
+        this.bearing = bearing;
+        this.hasAccuracy = hasAccuracy;
+        this.accuracy = accuracy;
+        this.hasVerticalAccuracy = hasVerticalAccuracy;
+        this.verticalAccuracy = verticalAccuracy;
+    }
+
    public ALocation(Parcel in) {
        readFromParcel(in);
    }
--- a/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java
+++ b/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java
@ -60,7 +60,8 @@ public class GPXUtilities {

 	private final static NumberFormat latLonFormat = new DecimalFormat("0.00#####", new DecimalFormatSymbols(
 			new Locale("EN", "US")));
-	private final static NumberFormat decimalFormat = new DecimalFormat("#.###", new DecimalFormatSymbols(
+	// speed, ele, hdop
+	private final static NumberFormat decimalFormat = new DecimalFormat("#.#", new DecimalFormatSymbols(
 			new Locale("EN", "US")));

 	public enum GPXColor {
@ -1255,6 +1256,10 @@ public class GPXUtilities {
 			return g;
 		}

+		public boolean containsRoutePoint(WptPt point) {
+			return getRoutePoints().contains(point);
+		}
+
 		public List<WptPt> getRoutePoints() {
 			List<WptPt> points = new ArrayList<>();
 			for (int i = 0; i < routes.size(); i++) {
@ -2476,6 +2481,7 @@ public class GPXUtilities {
 				firstSegment.routeSegments = routeSegments;
 				firstSegment.routeTypes = routeTypes;
 			}
+		gpxFile.addGeneralTrack();
 		} catch (Exception e) {
 			gpxFile.error = e;
 			log.error("Error reading gpx", e); //$NON-NLS-1$
@ -2590,4 +2596,4 @@ public class GPXUtilities {
 			to.error = from.error;
 		}
 	}
-}
+}
--- a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
@ -83,7 +83,7 @@ public class BinaryMapIndexReader {

 	public final static int TRANSPORT_STOP_ZOOM = 24;
 	public static final int SHIFT_COORDINATES = 5;
-	public static final int LABEL_ZOOM_ENCODE = 26;
+	public static final int LABEL_ZOOM_ENCODE = 31 - SHIFT_COORDINATES;
 	private final static Log log = PlatformUtil.getLog(BinaryMapIndexReader.class);
 	public static boolean READ_STATS = false;
 	public static final SearchPoiTypeFilter ACCEPT_ALL_POI_TYPE_FILTER = new SearchPoiTypeFilter() {
--- a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapPoiReaderAdapter.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapPoiReaderAdapter.java
@ -37,7 +37,12 @@ public class BinaryMapPoiReaderAdapter {
 	private static final int CATEGORY_MASK = (1 << SHIFT_BITS_CATEGORY) - 1;
 	private static final int ZOOM_TO_SKIP_FILTER_READ = 6;
 	private static final int ZOOM_TO_SKIP_FILTER = 3;
-	private static final int BUCKET_SEARCH_BY_NAME = 15; // should be bigger 100? 
+	private static final int BUCKET_SEARCH_BY_NAME = 15; // should be bigger 100?
+	private static final int BASE_POI_SHIFT = SHIFT_BITS_CATEGORY;// 7
+	private static final int FINAL_POI_SHIFT = BinaryMapIndexReader.SHIFT_COORDINATES;// 5
+	private static final int BASE_POI_ZOOM = 31 - BASE_POI_SHIFT;// 24 zoom
+	private static final int FINAL_POI_ZOOM = 31 - FINAL_POI_SHIFT;// 26 zoom
+

 	public static class PoiSubType {
 		public boolean text;
@ -714,6 +719,8 @@ public class BinaryMapPoiReaderAdapter {
 		Amenity am = null;
 		int x = 0;
 		int y = 0;
+		int precisionXY = 0;
+		boolean hasLocation = false;
 		StringBuilder retValue = new StringBuilder();
 		PoiCategory amenityType = null;
 		LinkedList<String> textTags = null;
@ -740,12 +747,22 @@ public class BinaryMapPoiReaderAdapter {
 						am.setRoutePoint(arp);
 					}
 				}
+				if (hasLocation) {
+					if (precisionXY != 0) {
+						int[] xy = MapUtils.calculateFinalXYFromBaseAndPrecisionXY(BASE_POI_ZOOM, FINAL_POI_ZOOM, precisionXY, x >> BASE_POI_SHIFT, y >> BASE_POI_SHIFT, true);
+						int x31 = xy[0] << FINAL_POI_SHIFT;
+						int y31 = xy[1] << FINAL_POI_SHIFT;
+						am.setLocation(MapUtils.get31LatitudeY(y31), MapUtils.get31LongitudeX(x31));
+					} else {
+						am.setLocation(MapUtils.get31LatitudeY(y), MapUtils.get31LongitudeX(x));
+					}
+				}
 				return am;
 			case OsmandOdb.OsmAndPoiBoxDataAtom.DX_FIELD_NUMBER:
-				x = (codedIS.readSInt32() + (px << (24 - zoom))) << 7;
+				x = (codedIS.readSInt32() + (px << (BASE_POI_ZOOM - zoom))) << BASE_POI_SHIFT;
 				break;
 			case OsmandOdb.OsmAndPoiBoxDataAtom.DY_FIELD_NUMBER:
-				y = (codedIS.readSInt32() + (py << (24 - zoom))) << 7;
+				y = (codedIS.readSInt32() + (py << (BASE_POI_ZOOM - zoom))) << BASE_POI_SHIFT;
 				req.numberOfVisitedObjects++;
 				if (checkBounds) {
 					if (left31 > x || right31 < x || top31 > y || bottom31 < y) {
@ -754,7 +771,8 @@ public class BinaryMapPoiReaderAdapter {
 					}
 				}
 				am = new Amenity();
-				am.setLocation(MapUtils.get31LatitudeY(y), MapUtils.get31LongitudeX(x));
+				hasLocation = true;
+				//am.setLocation(MapUtils.get31LatitudeY(y), MapUtils.get31LongitudeX(x)); // set precise coordinates
 				break;
 			case OsmandOdb.OsmAndPoiBoxDataAtom.SUBCATEGORIES_FIELD_NUMBER:
 				int subtypev = codedIS.readUInt32();
@ -827,6 +845,11 @@ public class BinaryMapPoiReaderAdapter {
 			case OsmandOdb.OsmAndPoiBoxDataAtom.NOTE_FIELD_NUMBER:
 				am.setDescription(codedIS.readString());
 				break;
+			case OsmandOdb.OsmAndPoiBoxDataAtom.PRECISIONXY_FIELD_NUMBER:
+				if (hasLocation) {
+					precisionXY = codedIS.readInt32();
+				}
+				break;
 			default:
 				skipUnknownField(t);
 				break;
--- a/OsmAnd-java/src/main/java/net/osmand/binary/OsmandOdb.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/OsmandOdb.java
@ -54371,6 +54371,24 @@ public final class OsmandOdb {
     */
    com.google.protobuf.ByteString
        getTextValuesBytes(int index);
+
+    // optional int32 precisionXY = 16;
+    /**
+     * <code>optional int32 precisionXY = 16;</code>
+     *
+     * <pre>
+     * precision in 1-xy-xy-xy binary format
+     * </pre>
+     */
+    boolean hasPrecisionXY();
+    /**
+     * <code>optional int32 precisionXY = 16;</code>
+     *
+     * <pre>
+     * precision in 1-xy-xy-xy binary format
+     * </pre>
+     */
+    int getPrecisionXY();
  }
  /**
   * Protobuf type {@code OsmAnd.OBF.OsmAndPoiBoxDataAtom}
@ -54539,6 +54557,11 @@ public final class OsmandOdb {
              textValues_.add(input.readBytes());
              break;
            }
+            case 128: {
+              bitField0_ |= 0x00000200;
+              precisionXY_ = input.readInt32();
+              break;
+            }
          }
        }
      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -55048,6 +55071,30 @@ public final class OsmandOdb {
      return textValues_.getByteString(index);
    }

+    // optional int32 precisionXY = 16;
+    public static final int PRECISIONXY_FIELD_NUMBER = 16;
+    private int precisionXY_;
+    /**
+     * <code>optional int32 precisionXY = 16;</code>
+     *
+     * <pre>
+     * precision in 1-xy-xy-xy binary format
+     * </pre>
+     */
+    public boolean hasPrecisionXY() {
+      return ((bitField0_ & 0x00000200) == 0x00000200);
+    }
+    /**
+     * <code>optional int32 precisionXY = 16;</code>
+     *
+     * <pre>
+     * precision in 1-xy-xy-xy binary format
+     * </pre>
+     */
+    public int getPrecisionXY() {
+      return precisionXY_;
+    }
+
    private void initFields() {
      dx_ = 0;
      dy_ = 0;
@ -55062,6 +55109,7 @@ public final class OsmandOdb {
      note_ = "";
      textCategories_ = java.util.Collections.emptyList();
      textValues_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      precisionXY_ = 0;
    }
    private byte memoizedIsInitialized = -1;
    public final boolean isInitialized() {
@ -55122,6 +55170,9 @@ public final class OsmandOdb {
      for (int i = 0; i < textValues_.size(); i++) {
        output.writeBytes(15, textValues_.getByteString(i));
      }
+      if (((bitField0_ & 0x00000200) == 0x00000200)) {
+        output.writeInt32(16, precisionXY_);
+      }
      getUnknownFields().writeTo(output);
    }

@ -55203,6 +55254,10 @@ public final class OsmandOdb {
        size += dataSize;
        size += 1 * getTextValuesList().size();
      }
+      if (((bitField0_ & 0x00000200) == 0x00000200)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(16, precisionXY_);
+      }
      size += getUnknownFields().getSerializedSize();
      memoizedSerializedSize = size;
      return size;
@ -55345,6 +55400,8 @@ public final class OsmandOdb {
        bitField0_ = (bitField0_ & ~0x00000800);
        textValues_ = com.google.protobuf.LazyStringArrayList.EMPTY;
        bitField0_ = (bitField0_ & ~0x00001000);
+        precisionXY_ = 0;
+        bitField0_ = (bitField0_ & ~0x00002000);
        return this;
      }

@ -55430,6 +55487,10 @@ public final class OsmandOdb {
          bitField0_ = (bitField0_ & ~0x00001000);
        }
        result.textValues_ = textValues_;
+        if (((from_bitField0_ & 0x00002000) == 0x00002000)) {
+          to_bitField0_ |= 0x00000200;
+        }
+        result.precisionXY_ = precisionXY_;
        result.bitField0_ = to_bitField0_;
        onBuilt();
        return result;
@ -55525,6 +55586,9 @@ public final class OsmandOdb {
          }
          onChanged();
        }
+        if (other.hasPrecisionXY()) {
+          setPrecisionXY(other.getPrecisionXY());
+        }
        this.mergeUnknownFields(other.getUnknownFields());
        return this;
      }
@ -56506,6 +56570,55 @@ public final class OsmandOdb {
        return this;
      }

+      // optional int32 precisionXY = 16;
+      private int precisionXY_ ;
+      /**
+       * <code>optional int32 precisionXY = 16;</code>
+       *
+       * <pre>
+       * precision in 1-xy-xy-xy binary format
+       * </pre>
+       */
+      public boolean hasPrecisionXY() {
+        return ((bitField0_ & 0x00002000) == 0x00002000);
+      }
+      /**
+       * <code>optional int32 precisionXY = 16;</code>
+       *
+       * <pre>
+       * precision in 1-xy-xy-xy binary format
+       * </pre>
+       */
+      public int getPrecisionXY() {
+        return precisionXY_;
+      }
+      /**
+       * <code>optional int32 precisionXY = 16;</code>
+       *
+       * <pre>
+       * precision in 1-xy-xy-xy binary format
+       * </pre>
+       */
+      public Builder setPrecisionXY(int value) {
+        bitField0_ |= 0x00002000;
+        precisionXY_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int32 precisionXY = 16;</code>
+       *
+       * <pre>
+       * precision in 1-xy-xy-xy binary format
+       * </pre>
+       */
+      public Builder clearPrecisionXY() {
+        bitField0_ = (bitField0_ & ~0x00002000);
+        precisionXY_ = 0;
+        onChanged();
+        return this;
+      }
+
      // @@protoc_insertion_point(builder_scope:OsmAnd.OBF.OsmAndPoiBoxDataAtom)
    }

@ -65008,37 +65121,38 @@ public final class OsmandOdb {
      "tegories\030\003 \003(\r\022\025\n\rsubcategories\030\005 \003(\r\"i\n" +
      "\020OsmAndPoiBoxData\022\014\n\004zoom\030\001 \001(\r\022\t\n\001x\030\002 \001" +
      "(\r\022\t\n\001y\030\003 \001(\r\0221\n\007poiData\030\005 \003(\0132 .OsmAnd." +
-      "OBF.OsmAndPoiBoxDataAtom\"\360\001\n\024OsmAndPoiBo",
+      "OBF.OsmAndPoiBoxDataAtom\"\205\002\n\024OsmAndPoiBo",
      "xDataAtom\022\n\n\002dx\030\002 \002(\021\022\n\n\002dy\030\003 \002(\021\022\022\n\ncat" +
      "egories\030\004 \003(\r\022\025\n\rsubcategories\030\005 \003(\r\022\014\n\004" +
      "name\030\006 \001(\t\022\016\n\006nameEn\030\007 \001(\t\022\n\n\002id\030\010 \001(\004\022\024" +
      "\n\014openingHours\030\n \001(\t\022\014\n\004site\030\013 \001(\t\022\r\n\005ph" +
      "one\030\014 \001(\t\022\014\n\004note\030\r \001(\t\022\026\n\016textCategorie" +
-      "s\030\016 \003(\r\022\022\n\ntextValues\030\017 \003(\t\"\032\n\007IdTable\022\017" +
-      "\n\007routeId\030\001 \003(\022\"F\n\017RestrictionData\022\014\n\004ty" +
-      "pe\030\001 \002(\005\022\014\n\004from\030\002 \002(\005\022\n\n\002to\030\003 \002(\005\022\013\n\003vi" +
-      "a\030\004 \001(\005\"x\n\tRouteData\022\016\n\006points\030\001 \002(\014\022\022\n\n" +
-      "pointTypes\030\004 \001(\014\022\022\n\npointNames\030\005 \001(\014\022\r\n\005",
-      "types\030\007 \002(\014\022\017\n\007routeId\030\014 \002(\005\022\023\n\013stringNa" +
-      "mes\030\016 \001(\014\"\304\005\n\022OsmAndRoutingIndex\022\014\n\004name" +
-      "\030\001 \002(\t\022?\n\005rules\030\002 \003(\01320.OsmAnd.OBF.OsmAn" +
-      "dRoutingIndex.RouteEncodingRule\022>\n\trootB" +
-      "oxes\030\003 \003(\0132+.OsmAnd.OBF.OsmAndRoutingInd" +
-      "ex.RouteDataBox\022A\n\014basemapBoxes\030\004 \003(\0132+." +
-      "OsmAnd.OBF.OsmAndRoutingIndex.RouteDataB" +
-      "ox\022=\n\006blocks\030\005 \003(\0132-.OsmAnd.OBF.OsmAndRo" +
-      "utingIndex.RouteDataBlock\032;\n\021RouteEncodi" +
-      "ngRule\022\013\n\003tag\030\003 \002(\t\022\r\n\005value\030\005 \002(\t\022\n\n\002id",
-      "\030\007 \001(\r\032\231\001\n\014RouteDataBox\022\014\n\004left\030\001 \002(\021\022\r\n" +
-      "\005right\030\002 \002(\021\022\013\n\003top\030\003 \002(\021\022\016\n\006bottom\030\004 \002(" +
-      "\021\022\023\n\013shiftToData\030\005 \001(\007\022:\n\005boxes\030\007 \003(\0132+." +
-      "OsmAnd.OBF.OsmAndRoutingIndex.RouteDataB" +
-      "ox\032\303\001\n\016RouteDataBlock\022$\n\007idTable\030\005 \001(\0132\023" +
-      ".OsmAnd.OBF.IdTable\022*\n\013dataObjects\030\006 \003(\013" +
-      "2\025.OsmAnd.OBF.RouteData\0221\n\014restrictions\030" +
-      "\007 \003(\0132\033.OsmAnd.OBF.RestrictionData\022,\n\013st" +
-      "ringTable\030\010 \001(\0132\027.OsmAnd.OBF.StringTable" +
-      "B\036\n\021net.osmand.binaryB\tOsmandOdb"
+      "s\030\016 \003(\r\022\022\n\ntextValues\030\017 \003(\t\022\023\n\013precision" +
+      "XY\030\020 \001(\005\"\032\n\007IdTable\022\017\n\007routeId\030\001 \003(\022\"F\n\017" +
+      "RestrictionData\022\014\n\004type\030\001 \002(\005\022\014\n\004from\030\002 " +
+      "\002(\005\022\n\n\002to\030\003 \002(\005\022\013\n\003via\030\004 \001(\005\"x\n\tRouteDat" +
+      "a\022\016\n\006points\030\001 \002(\014\022\022\n\npointTypes\030\004 \001(\014\022\022\n",
+      "\npointNames\030\005 \001(\014\022\r\n\005types\030\007 \002(\014\022\017\n\007rout" +
+      "eId\030\014 \002(\005\022\023\n\013stringNames\030\016 \001(\014\"\304\005\n\022OsmAn" +
+      "dRoutingIndex\022\014\n\004name\030\001 \002(\t\022?\n\005rules\030\002 \003" +
+      "(\01320.OsmAnd.OBF.OsmAndRoutingIndex.Route" +
+      "EncodingRule\022>\n\trootBoxes\030\003 \003(\0132+.OsmAnd" +
+      ".OBF.OsmAndRoutingIndex.RouteDataBox\022A\n\014" +
+      "basemapBoxes\030\004 \003(\0132+.OsmAnd.OBF.OsmAndRo" +
+      "utingIndex.RouteDataBox\022=\n\006blocks\030\005 \003(\0132" +
+      "-.OsmAnd.OBF.OsmAndRoutingIndex.RouteDat" +
+      "aBlock\032;\n\021RouteEncodingRule\022\013\n\003tag\030\003 \002(\t",
+      "\022\r\n\005value\030\005 \002(\t\022\n\n\002id\030\007 \001(\r\032\231\001\n\014RouteDat" +
+      "aBox\022\014\n\004left\030\001 \002(\021\022\r\n\005right\030\002 \002(\021\022\013\n\003top" +
+      "\030\003 \002(\021\022\016\n\006bottom\030\004 \002(\021\022\023\n\013shiftToData\030\005 " +
+      "\001(\007\022:\n\005boxes\030\007 \003(\0132+.OsmAnd.OBF.OsmAndRo" +
+      "utingIndex.RouteDataBox\032\303\001\n\016RouteDataBlo" +
+      "ck\022$\n\007idTable\030\005 \001(\0132\023.OsmAnd.OBF.IdTable" +
+      "\022*\n\013dataObjects\030\006 \003(\0132\025.OsmAnd.OBF.Route" +
+      "Data\0221\n\014restrictions\030\007 \003(\0132\033.OsmAnd.OBF." +
+      "RestrictionData\022,\n\013stringTable\030\010 \001(\0132\027.O" +
+      "smAnd.OBF.StringTableB\036\n\021net.osmand.bina",
+      "ryB\tOsmandOdb"
    };
    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -65296,7 +65410,7 @@ public final class OsmandOdb {
          internal_static_OsmAnd_OBF_OsmAndPoiBoxDataAtom_fieldAccessorTable = new
            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
              internal_static_OsmAnd_OBF_OsmAndPoiBoxDataAtom_descriptor,
-              new java.lang.String[] { "Dx", "Dy", "Categories", "Subcategories", "Name", "NameEn", "Id", "OpeningHours", "Site", "Phone", "Note", "TextCategories", "TextValues", });
+              new java.lang.String[] { "Dx", "Dy", "Categories", "Subcategories", "Name", "NameEn", "Id", "OpeningHours", "Site", "Phone", "Note", "TextCategories", "TextValues", "PrecisionXY", });
          internal_static_OsmAnd_OBF_IdTable_descriptor =
            getDescriptor().getMessageTypes().get(36);
          internal_static_OsmAnd_OBF_IdTable_fieldAccessorTable = new
--- a/OsmAnd-java/src/main/java/net/osmand/osm/RouteActivityType.java
+++ b/OsmAnd-java/src/main/java/net/osmand/osm/RouteActivityType.java
@ -1,42 +1,76 @@
 package net.osmand.osm;

-public enum RouteActivityType {
-	WATER("Water", "yellow"),  WINTER("Winter", "yellow"), SNOWMOBILE("Snowmobile", "yellow"), RIDING("Riding", "yellow"), RACING("Racing", "yellow"),
-	MOUNTAINBIKE("Mountainbike", "blue"), CYCLING("Cycling", "blue"),
-	HIKING("Hiking", "orange"),  RUNNING("Running", "orange"), WALKING("Walking", "orange"),
-	OFFROAD("Off-road", "yellow"), 
-	MOTORBIKE("Motorbike", "green"), CAR("Car", "green");
-	// less specific bottom order
+import java.util.ArrayList;
+import java.util.List;

+public class RouteActivityType {
+	private static final List<RouteActivityType> values = new ArrayList<>();
+	public static final String DEFAULT_ICON = "special_marker";
+	public static final String DEFAULT_COLOR = "orange";
+
+	public static final RouteActivityType WATER = createType("water", "yellow").icon("special_kayak").reg();
+	public static final RouteActivityType WINTER = createType("winter", "yellow").icon("special_skiing").reg();
+	public static final RouteActivityType SNOWMOBILE = createType("snowmobile", "yellow").icon("special_snowmobile").reg();
+	public static final RouteActivityType RIDING = createType("riding", "yellow").icon("special_horse").reg();
+	public static final RouteActivityType RACING = createType("racing", "yellow").icon("raceway").reg();
+	public static final RouteActivityType MOUNTAINBIKE = createType("mountainbike", "blue").icon("sport_cycling").reg();
+	public static final RouteActivityType CYCLING = createType("cycling", "blue").icon("special_bicycle").reg();
+	public static final RouteActivityType HIKING = createType("hiking", "orange").icon("special_trekking").reg();
+	public static final RouteActivityType RUNNING = createType("running", "orange").icon("running").reg();
+	public static final RouteActivityType WALKING = createType("walking", "orange").icon("special_walking").reg();
+	public static final RouteActivityType OFFROAD = createType("offroad", "yellow").icon("special_offroad").reg();
+	public static final RouteActivityType MOTORBIKE = createType("motorbike", "green").icon("special_motorcycle").reg();
+	public static final RouteActivityType CAR = createType("car", "green").icon("shop_car").reg();
+	// less specific bottom order
 	String name;
 	String color;
+	String icon;

-	private RouteActivityType(String nm, String clr) {
+	RouteActivityType(String nm, String clr) {
 		this.name = nm;
 		this.color = clr;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	public String getColor() {
 		return color;
 	}
-	
+
+	public String getIcon() {
+		return icon;
+	}
+
+	public static RouteActivityType getOrCreateTypeFromName(String name) {
+		for (RouteActivityType rat : values) {
+			if (rat.name.equalsIgnoreCase(name)) {
+				return rat;
+			}
+		}
+		return createType(name.toLowerCase(), DEFAULT_COLOR).icon(DEFAULT_ICON).reg();
+	}
+
+	private static RouteActivityTypeBuilder createType(String name, String color) {
+		RouteActivityTypeBuilder builder = new RouteActivityTypeBuilder();
+		builder.routeActivityType = new RouteActivityType(name, color);
+		return builder;
+	}
+
 	public static RouteActivityType getTypeFromTags(String[] tags) {
 		RouteActivityType activityType = null;
 		for (String tg : tags) {
 			RouteActivityType rat = RouteActivityType.convertFromOsmGPXTag(tg);
 			if (rat != null) {
-				if (activityType == null || activityType.ordinal() > rat.ordinal()) {
+				if (activityType == null || values.indexOf(activityType) > values.indexOf(rat)) {
 					activityType = rat;
 				}
 			}
 		}
 		return activityType;
 	}
-	
+
 	public static RouteActivityType convertFromOsmGPXTag(String tg) {
 		String t = tg.toLowerCase();
 		if ("mountain hiking".equalsIgnoreCase(t)) {
@ -215,4 +249,18 @@ public enum RouteActivityType {
 		return null;
 	}

+	public static class RouteActivityTypeBuilder {
+
+		private RouteActivityType routeActivityType;
+
+		public RouteActivityTypeBuilder icon(String icon) {
+			routeActivityType.icon = icon;
+			return this;
+		}
+
+		private RouteActivityType reg() {
+			values.add(routeActivityType);
+			return routeActivityType;
+		}
+	}
 }
--- a/OsmAnd-java/src/main/java/net/osmand/osm/edit/EntityParser.java
+++ b/OsmAnd-java/src/main/java/net/osmand/osm/edit/EntityParser.java
@ -21,7 +21,7 @@ import net.osmand.osm.edit.Relation.RelationMember;
 import net.osmand.util.Algorithms;

 public class EntityParser {
-	
+
 	public static void parseMapObject(MapObject mo, Entity e, Map<String, String> tags) {
 		mo.setId(e.getId());
 		if(mo instanceof Amenity) {
@ -123,7 +123,7 @@ public class EntityParser {
 			mo.setName(ref);
 		}
 	}
-	
+
 	private static void setNameFromBrand(MapObject mo, Map<String, String> tags) {
 		String ref = tags.get(OSMTagKey.BRAND.getValue());
 		if(ref != null){
@ -140,7 +140,7 @@ public class EntityParser {
 			op += " [" + ref + "]";
 		mo.setName(op);
 	}
-	
+

 	private static String getWebSiteURL(Map<String, String> tagValues, boolean checkWikipedia) {
 		String siteUrl = null;
@ -170,14 +170,14 @@ public class EntityParser {
 		}
 		return siteUrl;
 	}
-	
-	
+
+
 	public static List<Amenity> parseAmenities(MapPoiTypes poiTypes, Entity entity, Map<String, String> tags,
 			List<Amenity> amenitiesList) {
 		amenitiesList.clear();
 		// it could be collection of amenities
 		boolean relation = entity instanceof Relation;
-		boolean purerelation = relation && 
+		boolean purerelation = relation &&
 				!("multipolygon".equals(tags.get("type")) || "boundary".equals(tags.get("type")));
 		Collection<Map<String, String>> it = MapRenderingTypes.splitTagsIntoDifferentObjects(tags);
 		for (Map<String, String> ts : it) {
@ -201,9 +201,7 @@ public class EntityParser {
 		}
 		return amenitiesList;
 	}
-	
-	
-	
+
 	private static boolean checkAmenitiesToAdd(Amenity a, List<Amenity> amenitiesList){
 		// check amenity for duplication
 		for(Amenity b : amenitiesList){
@ -212,9 +210,9 @@ public class EntityParser {
 			}
 		}
 		return true;
-		
+
 	}
-	
+
 	public static Building parseBuilding(Entity e){
 		Building b = new Building();
 		parseMapObject(b, e, e.getTags());
@ -228,7 +226,7 @@ public class EntityParser {
 			List<Node> nodes = ((Way) e).getNodes();
 			for(int i = 0; i < nodes.size(); i++) {
 				Node node = nodes.get(i);
-				if(node != null && "yes".equals(node.getTag(OSMTagKey.ENTRANCE)) && 
+				if(node != null && "yes".equals(node.getTag(OSMTagKey.ENTRANCE)) &&
 						!Algorithms.isEmpty(node.getTag(OSMTagKey.REF))) {
 					b.addEntrance(node.getTag(OSMTagKey.REF), node.getLatLon());
 				}
@ -236,11 +234,11 @@ public class EntityParser {
 		}
 		return b;
 	}
-	
+
 	public static City parseCity(Node el) {
 		return parseCity(el, CityType.valueFromString(el.getTag(OSMTagKey.PLACE.getValue())));
 	}
-	
+
 	public static City parseCity(Entity el, CityType t) {
 		if(t == null) {
 			return null;
@ -252,15 +250,15 @@ public class EntityParser {
 		c.setIsin(isin);
 		return c;
 	}
-	
-	
+
+
 	public static TransportRoute parserRoute(Relation r, String ref){
 		TransportRoute rt = new TransportRoute();
 		parseMapObject(rt, r, r.getTags());
 		rt.setRef(ref);
 		return rt;
 	}
-	
+
 	public static TransportStop parseTransportStop(Entity e){
 		TransportStop st = new TransportStop();
 		parseMapObject(st, e, e.getTags());
--- a/OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlanner.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlanner.java
@ -658,7 +658,7 @@ public class BinaryRoutePlanner {
 							break;
 						}
 					}
-					if (rv == viaId && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
+					if (rv == viaId && via && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
 						type = MapRenderingTypes.RESTRICTION_NO_STRAIGHT_ON;
 						break;
 					}
@ -675,7 +675,7 @@ public class BinaryRoutePlanner {
 						}
 					}

-					if (rv == viaId && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
+					if (rv == viaId && via && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
 						type = MapRenderingTypes.RESTRICTION_NO_STRAIGHT_ON;
 						break;
 					}
--- a/OsmAnd-java/src/main/java/net/osmand/util/MapUtils.java
+++ b/OsmAnd-java/src/main/java/net/osmand/util/MapUtils.java
@ -49,6 +49,47 @@ public class MapUtils {
        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '_', '~'
    };

+	public static int calculateFromBaseZoomPrecisionXY(int baseZoom, int finalZoom, int xFinal, int yFinal) {
+		int px = xFinal;
+		int py = yFinal;
+		int precisionNumber = 1;
+		for (int zoom = finalZoom - 1; zoom >= baseZoom; zoom--) {
+			int x = px / 2; // (int) MapUtils.getTileNumberX(zoom, lon);
+			int y = py / 2; // (int) MapUtils.getTileNumberY(zoom, lat);
+			int deltax = px - x * 2;
+			int deltay = py - y * 2;
+			precisionNumber = (precisionNumber << 2) + (deltax << 1) + deltay;
+			// StringBuilder spaces = new StringBuilder();
+			// for (int i = 0; i < 32 - zoom; i++) {
+			//	spaces.append(' ');
+			// }
+			// System.out.println(String.format("%d %s + %d %s %s + %d", zoom, Integer.toBinaryString(x), deltax, spaces.toString(), Integer.toBinaryString(y), deltay));
+			px = x;
+			py = y;
+		}
+		// System.out.println(String.format("Bits: %d %s (%d)", Integer.toBinaryString(precisionNumber).length(), Integer.toBinaryString(precisionNumber), precisionNumber));
+		return precisionNumber;
+	}
+
+	public static int[] calculateFinalXYFromBaseAndPrecisionXY(int bazeZoom, int finalZoom,
+			int precisionXY, int xBase, int yBase, boolean ignoreNotEnoughPrecision) {
+		// System.out.println(String.format("Base x, y at zoom %d: %d %d", zoomToStart, xBaseApproximation, yBaseApproximation));
+		// calculate finish approximation using precisionNumber
+		int finalX = xBase;
+		int finalY = yBase;
+		int precisionCalc = precisionXY;
+		for (int zoom = bazeZoom; zoom < finalZoom; zoom++) {
+			if (precisionCalc <= 1 && precisionCalc > 0 && !ignoreNotEnoughPrecision) {
+				 throw new IllegalArgumentException("Not enough bits to retrieve zoom approximation");
+			}
+			finalY = finalY * 2 + (precisionXY & 1);
+			finalX = finalX * 2 + ((precisionXY & 2) >> 1);
+			precisionXY = precisionXY >> 2;
+		}
+		// System.out.println(String.format("Calc x, y at zoom %d: %d %d", finalZoom, finalX, finalY));
+		return new int[] { finalX, finalY };
+	}
+


 	public static double getDistance(LatLon l, double latitude, double longitude) {
--- a/OsmAnd-telegram/res/values-uk/strings.xml
+++ b/OsmAnd-telegram/res/values-uk/strings.xml
@ -135,10 +135,10 @@
    <string name="mile">мл</string>
    <string name="km">км</string>
    <string name="m">м</string>
-    <string name="nm">мор.м.</string>
+    <string name="nm">nmi</string>
    <string name="min_mile">хв/м</string>
    <string name="min_km">хв/км</string>
-    <string name="nm_h">вузл</string>
+    <string name="nm_h">вузлів</string>
    <string name="m_s">м/с</string>
    <string name="km_h">км/г</string>
    <string name="mile_per_hour">мл/г</string>
--- a/OsmAnd/.gitignore
+++ b/OsmAnd/.gitignore
@ -39,8 +39,6 @@ mx_*
 valgrind/
 bin/
 dist/
-res/values/no_translate.xml
-res/values/skip_translate.xml
 assets/specialphrases/*
 assets/voice/*
 assets/fonts/*
--- a/OsmAnd/AndroidManifest-gplayFree.xml
+++ b/OsmAnd/AndroidManifest-gplayFree.xml
@ -4,7 +4,7 @@

    <application
        android:icon="@mipmap/icon_free"
-		android:label="@string/app_name_free"
+		android:label="@string/app_name"
        tools:replace="android:icon, android:label">

        <meta-data
--- a/OsmAnd/AndroidManifest-huawei.xml
+++ b/OsmAnd/AndroidManifest-huawei.xml
@ -4,7 +4,7 @@

 	<application
 		android:icon="@mipmap/icon_free"
-		android:label="@string/app_name_free"
+		android:label="OsmAnd — Offline Maps &amp; GPS Navigation"
 		tools:replace="android:icon, android:label">

 		<meta-data
--- a/OsmAnd/AndroidManifest-library.xml
+++ b/OsmAnd/AndroidManifest-library.xml
@ -40,9 +40,6 @@
 	<uses-feature android:name="android.hardware.bluetooth" android:required="false" />
 	<uses-feature android:name="com.sec.feature.spen_usp" android:required="false"/>

-	<uses-sdk android:targetSdkVersion="26"
-		tools:overrideLibrary="com.getkeepsafe.taptargetview, studio.carbonylgroup.textfieldboxes, android.support.customtabs"/>
-
 	<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"
 		android:xlargeScreens="true" android:anyDensity="true" />

--- a/OsmAnd/AndroidManifest-nightlyFree.xml
+++ b/OsmAnd/AndroidManifest-nightlyFree.xml
@ -5,9 +5,6 @@
    <application
        android:icon="@mipmap/icon_nightly"
        tools:replace="android:icon">
-        <meta-data
-            android:name="com.facebook.sdk.ApplicationId"
-            android:value="fb792288460976727"/>
        <activity
            android:name="net.osmand.plus.activities.MapActivity"
            android:theme="@style/FirstSplashScreenNightlyFree"
--- a/OsmAnd/build-common.gradle
+++ b/OsmAnd/build-common.gradle
@ -106,15 +106,6 @@ android {
 	}
 }

-task updateNoTranslate(type: Copy) {
-	from('.') {
-		include 'no_translate.xml'
-		filter {
-			line -> replaceNoTranslate(line);
-		}
-	}
-	into 'res/values/'
-}

 task validateTranslate {
 	println "Validating translations"
@ -147,10 +138,6 @@ task collectVoiceAssets(type: Sync) {
 	include "**/*.js"
 }

-task cleanNoTranslate(type: Delete) {
-	delete('res/values/no_translate.xml')
-}
-
 task collectFonts(type: Copy) {
 	from "../../resources/fonts"
 	from "../../resources/rendering_styles/fonts"
@ -262,7 +249,6 @@ task collectExternalResources {
 			copyMapShaderIcons,
 			copyMapPOIIcons,
 			copyLargePOIIcons,
-			updateNoTranslate,
 			validateTranslate,
 			copyWidgetIcons,
 			copyWidgetIconsHdpi,
--- a/OsmAnd/build-library.gradle
+++ b/OsmAnd/build-library.gradle
@ -24,14 +24,11 @@ android {
 		// Build that doesn't include 3D OpenGL
 		legacy {
 			dimension "coreversion"
+			resValue "string", "app_edition", ""
 		}
 	}
 }

-def replaceNoTranslate(line) {
-	return line;
-}
-
 afterEvaluate {
 	android.libraryVariants.all { variant ->
 		variant.javaCompiler.dependsOn(collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore)
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@ -36,9 +36,9 @@ android {

 	defaultConfig {
 		minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 15
-		versionCode 390
+		versionCode 400
 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
-		versionName "3.9.0"
+		versionName "4.0.0"
 		versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
 		versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName
 	}
@ -105,31 +105,45 @@ android {
 		nightlyFree {
 			dimension "version"
 			applicationId "net.osmand.dev"
+			resValue "string", "app_name", "OsmAnd Nightly"
+			resValue "string", "app_edition", System.getenv("APP_EDITION") ? System.getenv("APP_EDITION") : ""
 			// resConfig "en"
 		}
 		androidFull {
 			dimension "version"
 			applicationId "net.osmand.plus"
+			resValue "string", "app_name", "OsmAnd~"
+			resValue "string", "app_edition", System.getenv("APP_EDITION") ? System.getenv("APP_EDITION") : ""
 		}
 		gplayFree {
 			dimension "version"
 			applicationId "net.osmand"
+			resValue "string", "app_name", "OsmAnd"
+			resValue "string", "app_edition", System.getenv("APP_EDITION") ? System.getenv("APP_EDITION") : ""
 		}
 		gplayFull {
 			dimension "version"
 			applicationId "net.osmand.plus"
+			resValue "string", "app_name", "OsmAnd+"
+			resValue "string", "app_edition", System.getenv("APP_EDITION") ? System.getenv("APP_EDITION") : ""
 		}
 		amazonFree {
 			dimension "version"
 			applicationId "net.osmand"
+			resValue "string", "app_name", "OsmAnd"
+			resValue "string", "app_edition", ""
 		}
 		amazonFull {
 			dimension "version"
 			applicationId "net.osmand.plus"
+			resValue "string", "app_name", "OsmAnd+"
+			resValue "string", "app_edition", ""
 		}
 		huawei {
 			dimension "version"
 			applicationId "net.osmand.huawei"
+			resValue "string", "app_name", "OsmAnd"
+			resValue "string", "app_edition", ""
 		}

        // Build that includes 3D OpenGL release
@ -153,19 +167,6 @@ android {

 }

-def replaceNoTranslate(line) {
-	if (line.contains("\"app_name\"") && System.getenv("TARGET_APP_NAME")) {
-		return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_NAME") + "<")
-	}
-	if (line.contains("\"app_name_free\"") && System.getenv("TARGET_APP_NAME")) {
-		return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_NAME") + "<")
-	}
-	if (line.contains("\"app_edition\"") && System.getenv("APP_EDITION")) {
-		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_EDITION") + "<")
-	}
-	return line;
-}
-
 afterEvaluate {
 	android.applicationVariants.all { variant ->
 		variant.javaCompiler.dependsOn(collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore)
--- a/OsmAnd/res/drawable/bottom_navigation_item_bg_dark.xml
+++ b/OsmAnd/res/drawable/bottom_navigation_item_bg_dark.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item android:drawable="@color/wikivoyage_card_bg_dark" android:state_selected="false" />
+
+	<item android:drawable="@drawable/navigation_item_active_bg_dark" android:state_selected="true" />
+
+</selector>
--- a/OsmAnd/res/drawable/bottom_navigation_item_bg_light.xml
+++ b/OsmAnd/res/drawable/bottom_navigation_item_bg_light.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item android:drawable="@color/wikivoyage_card_bg_light" android:state_selected="false" />
+
+	<item android:drawable="@drawable/navigation_item_active_bg_light" android:state_selected="true" />
+
+</selector>
--- a/OsmAnd/res/drawable/ic_action_ruler_line.xml
+++ b/OsmAnd/res/drawable/ic_action_ruler_line.xml
@ -0,0 +1,23 @@
+<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="M16,3C16.5523,3 17,3.4477 17,4V5.1707C17.8524,5.472 18.528,6.1476 18.8293,7H20C20.5523,7 21,7.4477 21,8C21,8.5523 20.5523,9 20,9H18.8293C18.528,9.8524 17.8524,10.528 17,10.8293V12C17,12.5523 16.5523,13 16,13C15.4477,13 15,12.5523 15,12V10.8293C14.1476,10.528 13.472,9.8524 13.1707,9H12C11.4477,9 11,8.5523 11,8C11,7.4477 11.4477,7 12,7H13.1707C13.472,6.1476 14.1476,5.472 15,5.1707V4C15,3.4477 15.4477,3 16,3ZM17,8C17,8.5523 16.5523,9 16,9C15.4477,9 15,8.5523 15,8C15,7.4477 15.4477,7 16,7C16.5523,7 17,7.4477 17,8Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M6,19.5C6,20.3284 5.3284,21 4.5,21C3.6716,21 3,20.3284 3,19.5C3,18.6716 3.6716,18 4.5,18C5.3284,18 6,18.6716 6,19.5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12.7071,12.7071C13.0976,12.3166 13.0976,11.6834 12.7071,11.2929C12.3166,10.9024 11.6834,10.9024 11.2929,11.2929L10.2929,12.2929C9.9024,12.6834 9.9024,13.3166 10.2929,13.7071C10.6834,14.0976 11.3166,14.0976 11.7071,13.7071L12.7071,12.7071Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M9.7071,15.7071C10.0976,15.3166 10.0976,14.6834 9.7071,14.2929C9.3166,13.9024 8.6834,13.9024 8.2929,14.2929L7.2929,15.2929C6.9024,15.6834 6.9024,16.3166 7.2929,16.7071C7.6834,17.0976 8.3166,17.0976 8.7071,16.7071L9.7071,15.7071Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
--- a/OsmAnd/res/drawable/navigation_item_active_bg_dark.xml
+++ b/OsmAnd/res/drawable/navigation_item_active_bg_dark.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="rectangle">
+			<solid android:color="@color/active_color_primary_dark" />
+		</shape>
+	</item>
+
+	<item android:top="2dp">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/wikivoyage_card_bg_dark" />
+		</shape>
+	</item>
+
+</layer-list>
--- a/OsmAnd/res/drawable/navigation_item_active_bg_light.xml
+++ b/OsmAnd/res/drawable/navigation_item_active_bg_light.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="rectangle">
+			<solid android:color="@color/active_color_primary_light" />
+		</shape>
+	</item>
+
+	<item android:top="2dp">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/wikivoyage_card_bg_light" />
+		</shape>
+	</item>
+
+</layer-list>
--- a/OsmAnd/res/layout/favorite_category_dialog_item.xml
+++ b/OsmAnd/res/layout/favorite_category_dialog_item.xml
@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	android:orientation="horizontal">

-    <Button
-        android:id="@+id/button"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+	<Button
+		android:id="@+id/button"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:background="?attr/selectableItemBackground"
+		android:gravity="start|center_vertical"
+		android:letterSpacing="@dimen/text_button_letter_spacing"
+		android:paddingStart="10dp"
+		android:paddingLeft="10dp"
+		android:paddingEnd="10dp"
+		android:paddingRight="10dp"
+		android:textAllCaps="false"
+		android:textColor="?attr/textColorAlertDialogListItem"
+		android:textSize="@dimen/default_list_text_size"
 		osmand:drawableLeftCompat="@drawable/ic_action_folder"
 		osmand:drawableStartCompat="@drawable/ic_action_folder"
-		android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:background="?attr/selectableItemBackground"
-        android:text="Restaurant"
-        android:gravity="start|center_vertical"
-        android:textSize="@dimen/default_list_text_size"
-        android:textAllCaps="false"
-	    android:textColor="?attr/textColorAlertDialogListItem"
-	    android:paddingStart="10dp"
-	    android:paddingEnd="10dp" />
+		tools:text="@string/poi_filter_restaurants" />

 </LinearLayout>
--- a/OsmAnd/res/layout/fragment_import_complete.xml
+++ b/OsmAnd/res/layout/fragment_import_complete.xml
@ -66,28 +66,64 @@

 		<include layout="@layout/divider" />

-		<FrameLayout
+		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="@dimen/dialog_button_height"
 			android:layout_marginStart="@dimen/content_padding"
 			android:layout_marginTop="@dimen/content_padding_small"
 			android:layout_marginEnd="@dimen/content_padding"
 			android:layout_marginBottom="@dimen/content_padding_small"
-			android:background="?attr/dlg_btn_secondary">
+			android:orientation="horizontal" >

-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/button_close"
-				android:layout_width="match_parent"
+			<FrameLayout
+				android:layout_width="0dp"
 				android:layout_height="match_parent"
-				android:background="?attr/selectableItemBackground"
-				android:gravity="center"
-				android:text="@string/shared_string_close"
-				android:textColor="?attr/active_color_basic"
-				android:textSize="@dimen/default_desc_text_size"
-				osmand:typeface="@string/font_roboto_medium"
-				tools:text="Button" />
+				android:background="?attr/dlg_btn_secondary"
+				android:layout_weight="1">

-		</FrameLayout>
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/button_close"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:background="?attr/selectableItemBackground"
+					android:gravity="center"
+					android:text="@string/shared_string_close"
+					android:textColor="?attr/active_color_basic"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_medium" />
+
+			</FrameLayout>
+
+			<View
+				android:id="@+id/buttons_divider"
+				android:layout_width="@dimen/content_padding"
+				android:layout_height="match_parent"
+				android:visibility="gone"
+				tools:visibility="visible" />
+
+			<FrameLayout
+				android:id="@+id/button_restart_container"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:background="?attr/dlg_btn_secondary"
+				android:layout_weight="1"
+				android:visibility="gone"
+				tools:visibility="visible">
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/button_restart"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:background="?attr/selectableItemBackground"
+					android:gravity="center"
+					android:text="@string/restart"
+					android:textColor="?attr/active_color_basic"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_medium" />
+
+			</FrameLayout>
+
+		</LinearLayout>

 	</LinearLayout>

--- a/OsmAnd/res/layout/gpx_overview_fragment.xml
+++ b/OsmAnd/res/layout/gpx_overview_fragment.xml
@ -6,6 +6,22 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">

+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/description"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:ellipsize="end"
+		android:letterSpacing="@dimen/description_letter_spacing"
+		android:maxLines="2"
+		android:minHeight="@dimen/default_desc_line_height"
+		android:textColor="?android:textColorSecondary"
+		android:textSize="@dimen/default_desc_text_size"
+		osmand:lineHeight="@dimen/default_desc_line_height"
+		osmand:typeface="@string/font_roboto_regular"
+		tools:text="Amsterdam is the Netherlands' capital and financial, cultural and creative centre with more" />
+
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recycler_overview"
 		android:layout_width="match_parent"
--- a/OsmAnd/res/layout/gpx_track_item.xml
+++ b/OsmAnd/res/layout/gpx_track_item.xml
@ -37,6 +37,7 @@
            android:layout_marginRight="@dimen/dialog_content_margin"
            android:layout_marginEnd="@dimen/dialog_content_margin"
            android:clickable="false"
+            android:scrollbars="none"
            android:focusableInTouchMode="false" />

        <androidx.appcompat.widget.AppCompatImageView
--- a/OsmAnd/res/layout/track_menu.xml
+++ b/OsmAnd/res/layout/track_menu.xml
@ -125,6 +125,49 @@

 	</LinearLayout>

+	<LinearLayout
+		android:id="@+id/back_button_container"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/content_padding_half"
+		android:layout_marginTop="@dimen/content_padding_half"
+		android:layout_marginRight="@dimen/content_padding_half"
+		android:background="?attr/flow_toolbar_bg"
+		android:visibility="gone"
+		tools:visibility="visible">
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="@dimen/setting_list_item_small_height"
+			android:orientation="horizontal"
+			android:paddingStart="@dimen/content_padding_half"
+			android:paddingLeft="@dimen/content_padding_half"
+			android:paddingEnd="@dimen/content_padding_small"
+			android:paddingRight="@dimen/content_padding_small">
+
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/back_button_icon"
+				android:layout_width="@dimen/standard_icon_size"
+				android:layout_height="@dimen/standard_icon_size"
+				android:layout_gravity="center_vertical"
+				android:layout_marginEnd="@dimen/content_padding_half"
+				android:layout_marginRight="@dimen/content_padding_half"
+				android:tint="?attr/active_color_basic"
+				osmand:srcCompat="@drawable/ic_arrow_back" />
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/back_button_text"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:textColor="?attr/active_color_basic"
+				osmand:typeface="@string/font_roboto_medium"
+				tools:text="@string/shared_string_tracks" />
+
+		</LinearLayout>
+
+	</LinearLayout>
+
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/context_menu_toolbar_container"
 		android:layout_width="match_parent"
@ -206,7 +249,7 @@
 		android:layout_height="@dimen/context_menu_action_buttons_height"
 		android:layout_gravity="bottom"
 		android:background="?attr/wikivoyage_card_bg_color"
-		osmand:itemBackground="?attr/wikivoyage_card_bg_color"
+		osmand:itemBackground="?attr/bottom_navigation_item_background"
 		osmand:itemIconTint="@color/bottom_navigation_color_selector_light"
 		osmand:itemTextColor="@color/bottom_navigation_color_selector_light"
 		osmand:labelVisibilityMode="labeled"
--- a/OsmAnd/res/layout/travel_download_update_card.xml
+++ b/OsmAnd/res/layout/travel_download_update_card.xml
@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:osmand="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:layout_marginLeft="@dimen/text_margin_small"
-	android:layout_marginRight="@dimen/text_margin_small"
-	android:background="?attr/wikivoyage_travel_card_bg"
-	android:orientation="vertical"
-	android:layout_marginEnd="@dimen/text_margin_small"
-	android:layout_marginStart="@dimen/text_margin_small">
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_margin="@dimen/content_padding"
-		android:orientation="vertical">
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/bottom_sheet_content_padding_small">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/title"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginEnd="@dimen/content_padding"
-				android:layout_marginRight="@dimen/content_padding"
-				android:layout_marginTop="4dp"
-				android:layout_weight="1"
-				android:ellipsize="end"
-				android:maxLines="1"
-				android:textColor="?attr/wikivoyage_primary_text_color"
-				android:textSize="@dimen/travel_card_primary_text_size"
-				osmand:typeface="@string/font_roboto_medium"
-				tools:text="Download file"/>
-
-			<androidx.appcompat.widget.AppCompatImageView
-				android:id="@+id/icon"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				tools:ignore="ContentDescription"
-				tools:src="@drawable/travel_card_download_icon"/>
-
-		</LinearLayout>
-
-		<net.osmand.plus.widgets.TextViewEx
-			android:id="@+id/description"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:lineSpacingMultiplier="@dimen/text_button_line_spacing_multiplier"
-			android:textColor="@color/wikivoyage_secondary_text"
-			android:textSize="@dimen/travel_card_primary_text_size"
-			osmand:typeface="@string/font_roboto_regular"
-			tools:text="Download this Wikivoyage travel guides file to view articles about places around the world without an internet connection."/>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:id="@+id/file_data_container"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/content_padding"
-		android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
-		android:layout_marginRight="@dimen/bottom_sheet_content_margin_small"
-		android:background="?attr/wikivoyage_travel_card_stroke_bg"
-		android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
-		android:paddingLeft="@dimen/content_padding"
-		android:paddingRight="@dimen/content_padding"
-		android:layout_marginStart="@dimen/bottom_sheet_content_margin_small"
-		android:paddingEnd="@dimen/content_padding"
-		android:paddingStart="@dimen/content_padding"
-		android:layout_marginEnd="@dimen/bottom_sheet_content_margin_small">
-
-		<androidx.appcompat.widget.AppCompatImageView
-			android:id="@+id/file_icon"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:layout_marginEnd="@dimen/content_padding"
-			android:layout_marginRight="@dimen/content_padding"
-			tools:ignore="ContentDescription"
-			tools:src="@drawable/ic_action_read_article"
-			tools:tint="?attr/wikivoyage_active_color"/>
-
-		<LinearLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:layout_weight="1"
-			android:orientation="vertical">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/file_title"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:maxLines="1"
-				android:textColor="?attr/wikivoyage_primary_text_color"
-				android:textSize="@dimen/default_list_text_size"
-				osmand:typeface="@string/font_roboto_regular"
-				tools:text="Wikivoyage"/>
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/file_description"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:maxLines="1"
-				android:textColor="@color/wikivoyage_secondary_text"
-				android:textSize="@dimen/default_sub_text_size"
-				osmand:typeface="@string/font_roboto_regular"
-				tools:text="255 Mb • Update 11 April"/>
-
-			<ProgressBar
-				android:id="@+id/progress_bar"
-				style="?android:attr/progressBarStyleHorizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="2dp"
-				android:minHeight="0dp"
-				android:visibility="gone"
-				tools:visibility="visible"/>
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/bottom_sheet_content_margin_small"
-		android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
-		android:layout_marginRight="@dimen/bottom_sheet_content_margin_small"
-		android:layout_marginEnd="@dimen/bottom_sheet_content_margin_small"
-		android:layout_marginStart="@dimen/bottom_sheet_content_margin_small">
-
-		<FrameLayout
-			android:id="@+id/secondary_btn_container"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:background="?attr/wikivoyage_secondary_btn_bg">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/secondary_button"
-				android:layout_width="match_parent"
-				android:layout_height="@dimen/wikivoyage_card_button_height"
-				android:layout_gravity="center"
-				android:background="?attr/selectableItemBackgroundBorderless"
-				android:ellipsize="end"
-				android:gravity="center"
-				android:letterSpacing="@dimen/text_button_letter_spacing"
-				android:maxLines="1"
-				android:textColor="?attr/wikivoyage_active_color"
-				android:textSize="@dimen/text_button_text_size"
-				osmand:typeface="@string/font_roboto_medium"
-				tools:ignore="UnusedAttribute"
-				tools:text="Later"/>
-
-		</FrameLayout>
-
-		<View
-			android:id="@+id/buttons_divider"
-			android:layout_width="@dimen/bottom_sheet_content_margin_small"
-			android:layout_height="match_parent"/>
-
-		<FrameLayout
-			android:id="@+id/primary_btn_container"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:background="?attr/wikivoyage_primary_btn_bg">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/primary_button"
-				android:layout_width="match_parent"
-				android:layout_height="@dimen/wikivoyage_card_button_height"
-				android:layout_gravity="center"
-				android:background="?attr/selectableItemBackgroundBorderless"
-				android:ellipsize="end"
-				android:gravity="center"
-				android:letterSpacing="@dimen/text_button_letter_spacing"
-				android:maxLines="1"
-				android:textColor="?attr/wikivoyage_primary_btn_text_color"
-				android:textSize="@dimen/text_button_text_size"
-				osmand:typeface="@string/font_roboto_medium"
-				tools:ignore="UnusedAttribute"
-				tools:text="Update"/>
-
-		</FrameLayout>
-
-	</LinearLayout>
-
-</LinearLayout>
--- a/OsmAnd/res/layout/travel_needed_maps_card.xml
+++ b/OsmAnd/res/layout/travel_needed_maps_card.xml
@ -18,16 +18,34 @@
 		android:layout_margin="@dimen/content_padding"
 		android:orientation="vertical">

-		<net.osmand.plus.widgets.TextViewEx
+		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/content_padding"
-			android:ellipsize="end"
-			android:maxLines="1"
-			android:text="@string/maps_you_need"
-			android:textColor="?attr/wikivoyage_primary_text_color"
-			android:textSize="@dimen/travel_card_primary_text_size"
-			osmand:typeface="@string/font_roboto_medium"/>
+			android:layout_marginBottom="@dimen/bottom_sheet_content_padding_small">
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/title"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginEnd="@dimen/content_padding"
+				android:layout_marginRight="@dimen/content_padding"
+				android:layout_marginTop="4dp"
+				android:layout_weight="1"
+				android:ellipsize="end"
+				android:maxLines="1"
+				android:textColor="?attr/wikivoyage_primary_text_color"
+				android:textSize="@dimen/travel_card_primary_text_size"
+				osmand:typeface="@string/font_roboto_medium"
+				tools:text="Download file" />
+
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/icon"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				tools:ignore="ContentDescription"
+				tools:src="@drawable/travel_card_download_icon" />
+
+		</LinearLayout>

 		<net.osmand.plus.widgets.TextViewEx
 			android:id="@+id/description"
--- a/OsmAnd/res/layout/wikivoyage_button_card.xml
+++ b/OsmAnd/res/layout/wikivoyage_button_card.xml
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="@dimen/content_padding"
+		android:background="?attr/wikivoyage_card_bg_color"
+		android:gravity="center_vertical">
+
+		<include
+			android:id="@+id/button"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/dialog_button_height"
+			layout="@layout/bottom_sheet_dialog_button" />
+
+	</LinearLayout>
+
+	<include
+		android:id="@+id/shadow"
+		layout="@layout/card_bottom_divider"
+		android:visibility="visible" />
+</LinearLayout>
--- a/OsmAnd/res/layout/wikivoyage_travel_gpx_card.xml
+++ b/OsmAnd/res/layout/wikivoyage_travel_gpx_card.xml
@ -139,31 +139,83 @@
 					<LinearLayout
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:orientation="vertical"
 						android:paddingTop="@dimen/content_padding_half"
 						android:paddingBottom="@dimen/content_padding_small">

-						<net.osmand.plus.widgets.TextViewEx
-							android:id="@+id/user_name"
+						<LinearLayout
+							android:id="@+id/user_label"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:background="@drawable/btn_border_bg_light"
-							android:gravity="center_vertical"
-							android:ellipsize="end"
-							android:maxLines="1"
-							android:paddingTop="@dimen/subHeaderPadding"
-							android:paddingBottom="@dimen/subHeaderPadding"
-							android:paddingLeft="@dimen/bottom_sheet_content_padding_small"
-							android:paddingRight="@dimen/bottom_sheet_content_padding_small"
-							android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
-							android:textColor="?attr/active_color_basic"
-							android:textSize="@dimen/default_desc_text_size"
-							osmand:typeface="@string/font_roboto_medium"
-							android:drawablePadding="@dimen/content_padding_small_half"
-							android:drawableStart="@drawable/ic_action_user_account_16"
-							android:drawableLeft="@drawable/ic_action_user_account_16"
-							tools:drawableTint="?attr/wikivoyage_active_color"
-							tools:text="Lorem Ipsum" />
+							android:background="?attr/btn_border_bg"
+							android:layout_marginLeft="@dimen/content_padding_half"
+							android:layout_marginStart="@dimen/content_padding_half">
+
+							<androidx.appcompat.widget.AppCompatImageView
+								android:id="@+id/user_icon"
+								android:layout_width="@dimen/poi_icon_size"
+								android:layout_height="@dimen/poi_icon_size"
+								android:layout_gravity="center_vertical"
+								android:layout_marginLeft="@dimen/content_padding_small_half"
+								android:layout_marginStart="@dimen/content_padding_small_half"
+								android:contentDescription="@string/shared_string_icon"
+								tools:src="@drawable/ic_action_user_account_16" />
+
+							<net.osmand.plus.widgets.TextViewEx
+								android:id="@+id/user_name"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:gravity="center_vertical"
+								android:ellipsize="end"
+								android:maxLines="1"
+								android:paddingTop="@dimen/subHeaderPadding"
+								android:paddingBottom="@dimen/subHeaderPadding"
+								android:paddingLeft="@dimen/content_padding_small_half"
+								android:paddingRight="@dimen/content_padding_small_half"
+								android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+								android:textColor="?attr/active_color_basic"
+								android:textSize="@dimen/default_desc_text_size"
+								osmand:typeface="@string/font_roboto_medium"
+								tools:drawableTint="?attr/wikivoyage_active_color"
+								tools:text="@string/mapillary_menu_title_username" />
+						</LinearLayout>
+
+						<LinearLayout
+							android:id="@+id/activity_type_label"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:background="?attr/btn_border_bg"
+							android:visibility="gone"
+							android:layout_marginLeft="@dimen/content_padding_half"
+							android:layout_marginStart="@dimen/content_padding_half">
+
+							<androidx.appcompat.widget.AppCompatImageView
+								android:id="@+id/activity_type_icon"
+								android:layout_width="@dimen/poi_icon_size"
+								android:layout_height="@dimen/poi_icon_size"
+								android:layout_gravity="center_vertical"
+								android:layout_marginLeft="@dimen/content_padding_small_half"
+								android:layout_marginStart="@dimen/content_padding_small_half"
+								android:contentDescription="@string/shared_string_icon"
+								tools:src="@drawable/ic_action_bicycle_dark" />
+
+							<net.osmand.plus.widgets.TextViewEx
+								android:id="@+id/activity_type"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:gravity="center_vertical"
+								android:ellipsize="end"
+								android:maxLines="1"
+								android:paddingTop="@dimen/subHeaderPadding"
+								android:paddingBottom="@dimen/subHeaderPadding"
+								android:paddingLeft="@dimen/content_padding_small_half"
+								android:paddingRight="@dimen/content_padding_small_half"
+								android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+								android:textColor="?attr/active_color_basic"
+								android:textSize="@dimen/default_desc_text_size"
+								osmand:typeface="@string/font_roboto_medium"
+								tools:drawableTint="?attr/wikivoyage_active_color"
+								tools:text="@string/shared_string_profiles" />
+						</LinearLayout>
 					</LinearLayout>

 				</LinearLayout>
@ -172,7 +224,6 @@

 			<View
 				android:layout_width="match_parent"
-				android:visibility="invisible"
 				android:layout_height="1dp"
 				android:background="?attr/wikivoyage_card_divider_color" />

--- a/OsmAnd/res/layout/wpt_list_item.xml
+++ b/OsmAnd/res/layout/wpt_list_item.xml
@ -103,6 +103,7 @@
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:maxLines="2"
+                    android:scrollbars="none"
                    android:textColor="@color/wikivoyage_secondary_text"
                    android:textSize="@dimen/default_sub_text_size"
                    osmand:typeface="@string/font_roboto_regular"
--- a/OsmAnd/res/values-af/strings.xml
+++ b/OsmAnd/res/values-af/strings.xml
@ -795,7 +795,6 @@
    <string name="poi_filter_sightseeing">Besigtigingstoere</string>
    <string name="show_warnings_descr">Verstel verkeer waarskuwings (spoedbeperkings, geforseerde stoppe, spoedhobbels), spoed kameras, en laan inligting</string>
 	<string name="avoid_motorway">Vermy snelweë</string>
-	<string name="snap_to_road_descr">Knip posisie aan paaie vas gedurende navigasie</string>
 	<string name="snap_to_road">Knip vas aan pad</string>
 	<string name="osmand_long_description_1000_chars">
 		OsmAnd (OSM Automated Navigation Directions) is `n ope bron navigasie toepassing met toegang tot `n wye verskeidenheid wêreldwye OpenStreetMap (OSM) inligting. Alle kaart inligting (vektor of teël kaarte) kan gestoor word op die foon geheue kaart vir aflyn gebruik. OsmAnd bied ook aan- en aflyn routeberekening funksionaliteit insluitend draai-vir-draai stem begeleiding. Sommige van die kern funksies: - Volledege aflyn funksionaliteit (stoor afgelaaide vektor of teël kaarte in `n kiesbare leër) - Kompakte aflyn vektor kaarte vir die hele wëreld beskikbaar - aflaai van land of streek kaarte direk uit die toepassing - Oorlegging van verskeie kaart lae moontlik, bv GPX of navigasie spore, Belangepunte, gunstelinge, kontoerlyne, publieke vervoer haltes, ekstra kaarte met verstelbare deurskynendheid - Aflyn
--- a/OsmAnd/res/values-ar/phrases.xml
+++ b/OsmAnd/res/values-ar/phrases.xml
@ -2133,7 +2133,7 @@
    <string name="poi_water_characteristic_mineral">المعدنيه</string>
    <string name="poi_pump_powered">تعمل بالطاقة</string>
    <string name="poi_pump_manual">يدوي</string>
-    <string name="poi_source_biomass">مصدر الطاقة: الكتلة الحيوية</string>
+    <string name="poi_generator_source_biomass">مصدر الطاقة: الكتلة الحيوية</string>
    <string name="poi_deadlock">طريق مسدود</string>
    <string name="poi_architecture_umgebinde">العمارة: umgebinde</string>
    <string name="poi_architecture_constructivism">العمارة: البنائية</string>
@ -3075,7 +3075,7 @@
    <string name="poi_motorcar_destination">السماح بدخول السيارات: للعبور للوجهة</string>
    <string name="poi_motorcar_no">السماح بدخول السيارات: لا</string>
    <string name="poi_motorcar_private">السماح بدخول السيارات:خاص</string>
-    <string name="poi_motorcar_yes">السماح بدخول السيارات:</string>
+    <string name="poi_motorcar_yes">السماح بدخول السيارات:نعم</string>
    <string name="poi_vehicle_forestry">السماح بدخول المركبات: الخاصة بالغابات</string>
    <string name="poi_vehicle_delivery">السماح بدخول المركبات: لتسليم الطلبات</string>
    <string name="poi_vehicle_military">السماح بدخول المركبات: العسكرية</string>
@ -3586,7 +3586,7 @@
    <string name="poi_internet_access_service">الوصول إلى الإنترنت: خدمة</string>
    <string name="poi_internet_access_public">الوصول إلى الإنترنت: عام</string>
    <string name="poi_internet_access_wired">ولوج الإنترنت: سلكي</string>
-    <string name="poi_internet_access_terminal">"ولوج  الإنترنت: terminal"</string>
+    <string name="poi_internet_access_terminal">ولوج الإنترنت: terminal</string>
    <string name="poi_internet_access_wlan">ولوج الإنترنت: wlan</string>
    <string name="poi_denomination_mahayana">ماهايانا</string>
    <string name="poi_denomination_maronite">ماروني</string>
@ -3679,4 +3679,14 @@
    <string name="poi_wildlife_crossing_bat_bridge">جسر خفافيش</string>
    <string name="poi_wildlife_crossing">معبر الحيوانات البرية</string>
    <string name="poi_attraction_slide">شريط التمرير</string>
+    <string name="poi_craft_winery">مصنع شراب</string>
+    <string name="poi_hanami">هانامي</string>
+    <string name="poi_wayside_shrine">ضريح على جانب الطريق</string>
+    <string name="poi_wayside_cross">صليب جانبي</string>
+    <string name="poi_monastery">ديرصومعة</string>
+    <string name="poi_denomination_wesleyan">الديانة</string>
+    <string name="poi_denomination_dutch_reformed">كنيسة المصلحة الهولندية</string>
+    <string name="poi_denomination_united_methodist">الكنيسة الميثودية</string>
+    <string name="poi_denomination_pentecostal">الخمسينية</string>
+    <string name="poi_denomination_presbyterian">المشيخية</string>
 </resources>
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
--- a/OsmAnd/res/values-az/strings.xml
+++ b/OsmAnd/res/values-az/strings.xml
@ -979,7 +979,6 @@
    <string name="impassable_road">Yollardan yayın…</string>
    <string name="routing_attr_avoid_toll_name">Pullu yollardan yayın</string>
    <string name="ending_point_too_far">Son nöqtə ən yaxın yoldan çox uzaqdır.</string>
-    <string name="snap_to_road_descr">Naviqasiya zamanı mövqeni yollara bərkit.</string>
    <string name="snap_to_road">Yola bərkit</string>
    <string name="avoid_unpaved">Asfaltsız yollardan yayın</string>
    <string name="avoid_toll_roads">Pullu yollardan yayın</string>
@ -1967,7 +1966,6 @@
    <string name="save_track_precision_descr">Filtr: Nöqtənin qeydiyyatı üçün minimum dəqiqlik seçin.</string>
    <string name="rendering_attr_surfaceIntegrity_name">Yol səthinin keyfiyyəti</string>
    <string name="routing_attr_short_way_name">Yanacağa qənaətli yol</string>
-    <string name="routing_attr_short_way_description">Yanacağa qənaətli yoldan istifadə et (adətən daha qısa).</string>
    <string name="access_direction_haptic_feedback_descr">Hədəf nöqtənin istiqamətini titrəmə ilə göstər.</string>
    <string name="use_osm_live_routing_description">OsmAnd Live dəyişiklikləri üçün naviqasiyanı aktivləşdir.</string>
    <string name="storage_permission_restart_is_required">İndi proqramın xarici yaddaşa yazmasına icazə verilir, lakin bunun üçün yenidən başlatmaq lazımdır.</string>
--- a/OsmAnd/res/values-b+ast/strings.xml
+++ b/OsmAnd/res/values-b+ast/strings.xml
@ -1278,7 +1278,6 @@
    <string name="speak_poi">PdI cercanos</string>
    <string name="routing_attr_avoid_unpaved_name">Evitar carreteres ensin pavimentar</string>
    <string name="routing_attr_avoid_motorway_name">Evitar autopistes</string>
-    <string name="snap_to_road_descr">Axusta la posición a los caminos na navegación.</string>
    <string name="snap_to_road">Axustar a la carretera</string>
    <string name="keep_informing_never">Namái a mano (toca na flecha)</string>
    <string name="keep_informing">Repitir les instrucciones de navegación</string>
--- a/OsmAnd/res/values-b+be+Latn/strings.xml
+++ b/OsmAnd/res/values-b+be+Latn/strings.xml
@ -562,7 +562,6 @@ Punktaŭ maršrutu %2$s</string>
    <string name="avoid_motorway">Paźbiahać aŭtamahіstralaŭ</string>
    <string name="auto_zoom_map_descr">Uzrovień pavieličennia zhodna vašaj chutkasci (kali mapa sinchranizujecca z ciapierašnim stanoviščam).</string>
    <string name="auto_zoom_map">Aŭtamatyčnaje pamianšeńnie/pavieličeńnie</string>
-    <string name="snap_to_road_descr">Pryviazvacca da daroh padčas navihacyi.</string>
    <string name="snap_to_road">Pryviazvacca da daroh</string>
    <string name="interrupt_music_descr">Halasavyja padkazki prypyniajuć muzyku, a nie toĺki pryhlušajuć jaje.</string>
    <string name="interrupt_music">Pierapynieńnie muzykі</string>
@ -1983,7 +1982,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
    <string name="update_all_maps_now">Abnavić usie mapy zaraz?</string>
    <string name="clear_tile_data">Ačyścіć keš siecіŭnych mapaŭ</string>
    <string name="routing_attr_short_way_name">Paliŭna-aščadny maršrut</string>
-    <string name="routing_attr_short_way_description">Različvaje paliva-aščadny maršrut (zvyčajna najkaraciejšy).</string>
    <string name="replace_favorite_confirmation">Vy sapraŭdy chočacie zamianić upadabanaje %1$s?</string>
    <string name="rendering_attr_hideOverground_name">Nadziemnyja abjekty</string>
    <string name="shared_string_change">Źmianіć</string>
--- a/OsmAnd/res/values-b+hsb/strings.xml
+++ b/OsmAnd/res/values-b+hsb/strings.xml
@ -444,7 +444,6 @@
    <string name="avoid_motorway">Awtodróhi wobeńć</string>
    <string name="auto_zoom_map_descr">Přiměrja wulkosć karty wotpowědujo aktualnej spěšnosći (karta so z tuchwilnym stejišćom synchronizuje).</string>
    <string name="auto_zoom_map">Awtomatiski zoom</string>
-    <string name="snap_to_road_descr">W běhu nawigacije poziciski dypk na dróhach zdźeržować.</string>
    <string name="snap_to_road">Na dróze wostać</string>
    <string name="interrupt_music_descr">Připowědźenje přetorhnje hudźbu.</string>
    <string name="interrupt_music">Wothrawanje hudźby přetorhować</string>
@ -1360,7 +1359,6 @@
    <string name="give_permission">Dowolić</string>
    <string name="allow_access_location">Přistup k stejišću dowolić</string>
    <string name="routing_attr_short_way_name">Naftu lutowacy puć</string>
-    <string name="routing_attr_short_way_description">Naftu lutowacy puć wužić (zwjetša krótši).</string>
    <string name="confirmation_to_delete_history_items">Wubrane objekty z archiwa wotstronić?</string>
    <string name="select_map_marker">Chorhojčku wubrać</string>
    <string name="map_markers_other">Druhe chorhojčki</string>
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@ -3582,7 +3582,7 @@
    <string name="poi_historic_tank">Танк</string>
    <string name="poi_charcoal_pile">Куча вуголля</string>
    <string name="poi_hookah_lounge">Кальянная</string>
-    <string name="poi_source_biomass">Крыніца энергіі: біямаса</string>
+    <string name="poi_generator_source_biomass">Крыніца энергіі: біямаса</string>
    <string name="poi_snowmobile_filter">Даступна для снегаходаў</string>
    <string name="poi_access_bus">Даступна для аўтобусаў</string>
    <string name="poi_access_caravan">Даступна для прычапных дамоў на колах</string>
@ -3823,5 +3823,11 @@
    <string name="poi_recycling_small_electrical_appliances">Маленькія электрапрыборы</string>
    <string name="poi_beehive">Вулей</string>
    <string name="poi_nuts">Крама арэхаў</string>
-    <string name="poi_fuel_lng"></string>
+    <string name="poi_fuel_lng"/>
+    <string name="poi_diplomatic_services_citizen_services_filter">Паслугі для грамадзян</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Іміграцыйныя візы</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Неіміграцыйныя візы</string>
+    <string name="poi_liaison_filter">Сувязь</string>
+    <string name="poi_consulate_filter">Консульства</string>
+    <string name="poi_embassy_filter">Амбасада</string>
 </resources>
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@ -88,7 +88,7 @@
    <string name="files_limit">засталося %1$d файлаў</string>
    <string name="available_downloads_left">Засталося %1$d файлаў для спампоўвання</string>
    <string name="install_paid">Поўная версія</string>
-    <string name="cancel_route">Скасаваць маршрут</string>
+    <string name="cancel_route">Скасаваць маршрут\?</string>
    <string name="cancel_navigation">Спыніць навігацыю</string>
    <string name="clear_destination">Выдаліць месца прызначэння</string>
    <string name="download_using_mobile_internet">Wi-Fi не падлучаны. Выкарыстаць дзейнае падлучэнне да Інтэрнэту для спампоўвання?</string>
@ -232,7 +232,6 @@
    <string name="avoid_motorway">Без аўтамагістраляў</string>
    <string name="auto_zoom_map_descr">Узровень павелічэння згодна вашай хуткасці (калі мапа сінхранізуецца з цяперашнім становішчам).</string>
    <string name="auto_zoom_map">Аўтаматычнае памяншэнне/павелічэнне</string>
-    <string name="snap_to_road_descr">Прывязвацца да дарог падчас навігацыі.</string>
    <string name="snap_to_road">Прывязвацца да дарог</string>
    <string name="osmand_play_title_30_chars">OsmAnd Мапы і навігацыя</string>
    <string name="osmand_short_description_80_chars">Прагляд глабальнай мабільнай мапы і навігатар для аўтаномных і сеціўных мапаў OSM</string>
@ -515,7 +514,7 @@
    <string name="use_fluorescent_overlays">Флюарэсцэнтныя пласты</string>
    <string name="use_fluorescent_overlays_descr">Ужываць флюарэсцэнтныя колеры для слядоў і шляхоў.</string>
    <string name="offline_edition">Пазасеціўнае рэдагаванне</string>
-    <string name="offline_edition_descr">Заўсёды выкарыстоўваць аўтаномнае рэдагаванне.</string>
+    <string name="offline_edition_descr">Калі выкарыстоўваецца рэдагаванне на прыладзе, то змены будуць захаваныя лакальна і загружаныя на сервер толькі па запыце, інакш яны будуць загружацца неадкладна.</string>
    <string name="update_poi_does_not_change_indexes">Змены цікавых пунктаў (POI) у праграме не паўплываюць на cпампаваныя файлы мапаў, змены захоўваюцца як файлы на вашай прыладзе.</string>
    <string name="local_openstreetmap_uploading">Запампоўка…</string>
    <string name="local_openstreetmap_were_uploaded">{0} POI/нататкі запампаваныя</string>
@ -1574,7 +1573,7 @@
    <string name="routing_attr_height_name">Абмежаванне па вышыні</string>
    <string name="routing_attr_height_description">Пазначыць вышыню транспартнага сродку для разліку маршруту.</string>
    <string name="use_fast_recalculation">Разумны пераразлік маршруту</string>
-    <string name="use_fast_recalculation_desc">Пераразлічваць толькі пачатак маршруту. Падыходзіць для доўгіх паездак.</string>
+    <string name="use_fast_recalculation_desc">Пераразлічваць толькі пачатак маршруту. Карысна для доўгіх паездак.</string>
    <string name="shared_string_logoff">Выйсці</string>
    <string name="rendering_value_disabled_name">Выключана</string>
    <string name="rendering_value_walkingRoutesOSMC_name">Афарбоўка па пешаходнаму сімвалу OSMC</string>
@ -1985,7 +1984,7 @@
    <string name="map_widget_bearing">Адносны азімут</string>
    <string name="map_widget_magnetic_bearing">Магнітны азімут</string>
    <string name="use_osm_live_routing">Навігацыя OsmAnd Live</string>
-    <string name="access_no_destination">Пункт прызначэння не зададзены</string>
+    <string name="access_no_destination">Убудова спецыяльных магчымасцей: Пункт прызначэння не зададзены</string>
    <string name="follow_us">Сачыце за намі</string>
    <string name="access_direction_audio_feedback">Гукавая напрамкі</string>
    <string name="access_direction_audio_feedback_descr">Індыцыраваць гукам кірунак на мэтавы пункт.</string>
@ -2028,7 +2027,6 @@
    <string name="shared_string_change">Змяніць</string>
    <string name="get_started">Пачаць</string>
    <string name="routing_attr_short_way_name">Паліўна-ашчадны маршрут</string>
-    <string name="routing_attr_short_way_description">Разлічвае паліва-ашчадны маршрут (звычайна найкарацейшы).</string>
    <string name="replace_favorite_confirmation">Вы сапраўды хочаце замяніць улюбёную мясціну %1$s\?</string>
    <string name="update_all_maps_now">Абнавіць усе мапы зараз?</string>
    <string name="clear_tile_data">Ачысціць кэш сеціўных мапаў</string>
@ -2483,7 +2481,7 @@
    <string name="average">Сярэдняя</string>
    <string name="of">%1$d з %2$d</string>
    <string name="ascent_descent">Пад\'ём/Cпуск</string>
-    <string name="moving_time">Час руху</string>
+    <string name="moving_time">Час у руху</string>
    <string name="max_min">Макс/Мін</string>
    <string name="min_max">Мін/Макс</string>
    <string name="rendering_value_translucent_pink_name">Паўпразрысты ружовы</string>
@ -2671,7 +2669,7 @@
    <string name="first_intermediate_dest_description">Дадае першы прыпынак</string>
    <string name="subsequent_dest_description">Перамясціць прызначэнне далей і стварыць яго</string>
    <string name="show_closed_notes">Паказаць закрытыя нататкі</string>
-    <string name="switch_osm_notes_visibility_desc">Паказаць/схаваць OSM-нататкі на мапе.</string>
+    <string name="switch_osm_notes_visibility_desc">Паказаць або схаваць OSM-нататкі на мапе.</string>
    <string name="gpx_file_desc">GPX падыходзіць для экспарту ў JOSM і іншыя OSM-рэдактары.</string>
    <string name="osc_file_desc">OSC падыходзіць для экспарту ў OpenStreetMap.</string>
    <string name="shared_string_gpx_file">GPX-файл</string>
@ -3159,9 +3157,9 @@
    <string name="osmand_default_routing">Навігацыя OsmAnd</string>
    <string name="third_party_routing_type">Іншая навігацыя</string>
    <string name="quick_action_need_to_add_item_to_list">Дадаць прынамсі адзін элемент у спіс \"Хуткае дзеянне\" у наладах</string>
-    <string name="routing_attr_piste_type_downhill_name">Альпійская/горныя лыжы</string>
+    <string name="routing_attr_piste_type_downhill_name">Альпійскія і горныя лыжы</string>
    <string name="routing_attr_piste_type_downhill_description">Схілы для горных лыжаў і доступ да пад\'ёмнікаў.</string>
-    <string name="routing_attr_piste_type_nordic_name">Лыжныя гонкі / паўночныя тыпы</string>
+    <string name="routing_attr_piste_type_nordic_name">Бегавыя і скандынаўскія лыжы</string>
    <string name="routing_attr_piste_type_nordic_description">Трасы для лыжных гонак і іх паўночных тыпаў.</string>
    <string name="routing_attr_allow_intermediate_name">Дазволіць прамежкавыя маршруты</string>
    <string name="routing_attr_allow_intermediate_description">Больш складаныя трасы са стромкімі ўчасткамі. Пэўныя перашкоды, якіх варта пазбягаць.</string>
@ -3429,9 +3427,9 @@
    <string name="osmand_purchases_item">Пакупкі OsmAnd</string>
    <string name="legend_item_description">Даведка па знаках мапы.</string>
    <string name="navigation_profiles_item">Профілі навігацыі</string>
-    <string name="create_edit_poi">Стварыць/Рэдагаваць POI</string>
+    <string name="create_edit_poi">Стварыць ці Рэдагаваць POI</string>
    <string name="parking_positions">Месца паркоўкі</string>
-    <string name="add_edit_favorite">Дадаць / рэдагаваць улюбёнае</string>
+    <string name="add_edit_favorite">Дадаць ці рэдагаваць улюбёнае</string>
    <string name="reset_deafult_order">Аднавіць прадвызначаны парадак элементаў</string>
    <string name="back_to_editing">Вярнуцца да рэдагавання</string>
    <string name="quick_action_transport_show">Паказаць грамадскі транспарт</string>
@ -3439,7 +3437,7 @@
    <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_show_hide_terrain">Паказаць ці схаваць рэльеф</string>
    <string name="quick_action_terrain_hide">Схаваць рэльеф</string>
    <string name="quick_action_terrain_show">Паказаць рэльеф</string>
    <string name="delete_description">Выдаліць апісанне</string>
@ -3517,7 +3515,7 @@
    <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="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>
@ -3531,7 +3529,7 @@
    <string name="item_deleted">Выдалена: %1$s</string>
    <string name="speed_cameras_restart_descr">Перазапусціце праграму для поўнага выдалення даных камер кантролю хуткасці.</string>
    <string name="use_volume_buttons_as_zoom_descr">Кіраванне ўзроўнем маштабавання мапы пры дапамозе кнопак рэгулявання гучнасці.</string>
-    <string name="plugin_wikipedia_description">Інфармацыя пра славутасці з Вікіпедыі. Гэта ваш кішэнны даведнік - уключыце ўбудову вікіпедыі і чытайце артыкулы пра аб’екты вакол вас.</string>
+    <string name="plugin_wikipedia_description">Інфармацыя пра славутасці з Вікіпедыі, вашага кішэннага даведніка з артыкуламі пра аб’екты вакол вас.</string>
    <string name="app_mode_enduro_motorcycle">Матацыкл Эндура</string>
    <string name="app_mode_motor_scooter">Мотаролер</string>
    <string name="shared_string_uninstall_and_restart">Выдаліць і перазапусціць</string>
@ -3549,8 +3547,8 @@
    <string name="open_saved_track">Адкрыць захаваны след</string>
    <string name="shared_string_is_saved">захавана</string>
    <string name="save_track_to_gpx">Аўтаматычна запісваць след падчас навігацыі</string>
-    <string name="disable_recording_once_app_killed_descrp">Запіс GPX прыпыніцца, калі праграма будзе забітая (праз надаўнія праграмы). (Апавяшчэнне ў вобласці падказак Android пра фонавы рэжым OsmAnd знікне.)</string>
-    <string name="save_global_track_interval_descr">Вызначце інтэрвал запісу следу (уключаецца праз віджэт запісу GPX на мапе).</string>
+    <string name="disable_recording_once_app_killed_descrp">Спыненне запісу GPX, падчас прымусовага спынення (праз апошнія прыкладанні). (Апавяшчэнне ў вобласці падказак Android пра фонавы рэжым OsmAnd знікне.)</string>
+    <string name="save_global_track_interval_descr">Вызначце інтэрвал запісу трэка (уключаецца праз віджэт \"Запіс паездкі\" на мапе).</string>
    <string name="monitoring_control_start">ЗАПІС</string>
    <string name="shared_string_done">Завершана</string>
    <string name="shared_string_save_as_gpx">Захаваць як новы файл следу</string>
@ -3655,7 +3653,7 @@
    <string name="previous_segment">Папярэдні сегмент</string>
    <string name="all_previous_segments">Усе папярэднія сегменты</string>
    <string name="only_selected_segment_recalc">Толькі абраны сегмент пералічыцца з выкарыстаннем абранага профілю.</string>
-    <string name="osm_edits_view_descr">Прагляд вашых правак альбо хібаў OSM, яшчэ не адпраўленых у %1$s. Запампаваныя пункты больш не будуць паказвацца.</string>
+    <string name="osm_edits_view_descr">Прагледзець усе вашы яшчэ не загружаныя паўкі OSM або памылкі ў %1$s. Ужо загружаныя змены больш не будуць паказвацца.</string>
    <string name="live_monitoring_adress_descr">Пазначце сеціўны адрас з наступнымі параметрамі: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
    <string name="monitoring_min_distance_descr_recommendation">Рэкамендацыя: наладка ў 5 метраў можа вас задаволіць, калі вам не патрэбна фіксаваць больш кароткія перамяшчэнні, і вы не хочаце відавочна збіраць даныя ў стане спакою.</string>
    <string name="monitoring_min_distance_descr_side_effect">Пабочныя эфекты: перыяды ў стане спакою не запісваюцца наогул альбо па адным пункце кожны. Невялікія (у рэальным свеце) перамяшчэнні (напрыклад, убок, што адзначаюць магчымы паварот у вашай паездцы) могуць быць адфільтраваныя. Файл змяшчае менш інфармацыі для наступнай апрацоўкі і мае горшую статыстыку, адфільтроўваючы відавочна лішнія пункты падчас запісу. Пры гэтым патэнцыйна захоўваюцца артэфакты, выкліканыя дрэнным прыёмам альбо эфектамі модуля GPS.</string>
@ -3861,7 +3859,7 @@
    <string name="shared_string_redo">Вярнуць</string>
    <string name="release_3_8">• Абноўлена функцыя планавання маршруту. З’явілася магчымасць выкарыстоўваць розныя тыпы навігацыі для кожнага сегмента і прымацоўваць сляды
 \n
-\n • Новае меню \"Выгляд\" для слядоў. Можна абраць колер, таўшчыню, уключыць стрэлкі кірунку, адзнакі старту / фінішу
+\n • Новае меню \"Выгляд\" для слядоў. Можна абраць колер, таўшчыню, уключыць стрэлкі кірунку, адзнакі старту і фінішу
 \n
 \n • Палепшана бачнасць роварных вузлоў.
 \n
@ -3892,12 +3890,199 @@
    <string name="use_native_pt">Натыўны грамадскі транспарт (у распрацоўцы)</string>
    <string name="perform_oauth_authorization">Увайсці праз OAuth</string>
    <string name="use_two_phase_routing">Выкарыстоўваць 2-фазны алгарытм маршрутызацыі A *</string>
-    <string name="use_native_pt_desc">Перайсці на разлік маршруту грамадскага транспарту на Java (бяспечны)</string>
+    <string name="use_native_pt_desc">Перайсці на разлік маршруту грамадскага транспарту з дапамогай Java (бяспечны)</string>
    <string name="file_already_imported">Файл ужо імпартаваны ў OsmAnd</string>
    <string name="start_finish_icons">Значкі старту і фінішу</string>
-    <string name="perform_oauth_authorization_description">Увайдзіце праз OAuth, каб выкарыстоўваць функцыі osmedit</string>
+    <string name="perform_oauth_authorization_description">Выканайце ўваход з дапамогай OAuth, каб выкарыстоўваць функцыі osmedit</string>
    <string name="clear_osm_token">Ачысціць токен OpenStreetMap OAuth</string>
-    <string name="osm_edit_logout_success">Выхад выкананы</string>
+    <string name="osm_edit_logout_success">Вы выйшлі</string>
    <string name="use_live_public_transport">Даныя OsmAnd Live</string>
    <string name="use_live_routing">Даныя OsmAnd Live</string>
+    <string name="voice_prompts_timetable">Час галасавых падказак</string>
+    <string name="lang_de_casual">Нямецкая (неафіцыйная)</string>
+    <string name="navigate_point_mgrs">MGRS</string>
+    <string name="snowmobile_render_descr">Для язды на снегаходах па вызначаных дарогах і трасах.</string>
+    <string name="navigate_point_format_mgrs">MGRS</string>
+    <string name="mgrs_format_descr">OsmAnd выкарыстоўвае MGRS, які падобны да фармату UTM NATO.</string>
+    <string name="shared_string_graph">Графік</string>
+    <string name="message_need_calculate_route_before_show_graph">Даныя %1$s даступныя толькі для дарог, разлічылі маршрут, выкарыстоўваючы \"Маршрут паміж кропкамі\", каб убачыць графікі.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Калі ласка пачакайце.
+\nГрафік будзе даступны пасля пераразліку маршруту.</string>
+    <string name="shared_string_local_maps">Лакальныя мапы</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
+    <string name="app_mode_gap">Разрыў</string>
+    <string name="icon_group_amenity">Выгады</string>
+    <string name="icon_group_special">Спецыяльныя</string>
+    <string name="icon_group_transport">Транспарт</string>
+    <string name="icon_group_service">Паслугі</string>
+    <string name="icon_group_symbols">Сімвалы</string>
+    <string name="icon_group_sport">Спорт</string>
+    <string name="icon_group_emergency">Экстраныя службы</string>
+    <string name="icon_group_travel">Вандроўка</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">Дадайце прынамсі два пункты</string>
+    <string name="login_open_street_map">Увайсці ў OpenStreetMap</string>
+    <string name="login_open_street_map_org">Увайсці ў OpenStreetMap.org</string>
+    <string name="sign_in_with_open_street_map">Увайсці з дапамогай OpenStreetMap</string>
+    <string name="open_street_map_login_mode">Вам неабходна ўвайсці ў сістэму, каб загрузіць новыя або адрэдагаваныя змены.
+\n
+\nВы можаце ўвайсці, выкарыстоўваючы бяспечны метад OAuth, або з дапамогай сваіх імя карыстальніка і пароля.</string>
+    <string name="use_login_password">Выкарыстоўваць імя карыстальніка і пароль</string>
+    <string name="login_account">Уліковы запіс</string>
+    <string name="user_login">Аўтарызавацца</string>
+    <string name="manage_subscription">Кіраванне падпіскай</string>
+    <string name="subscription_payment_issue_title">Націсніце кнопку, каб перайсці ў налады падпіскі Google Play і выправіць спосаб аплаты.</string>
+    <string name="subscription_expired_title">Мінуў тэрмін дзеяння падпіскі OsmAnd Live</string>
+    <string name="subscription_paused_title">Падпіска OsmAnd Live была прыпынена</string>
+    <string name="subscription_on_hold_title">Падпіска OsmAnd Live прыпынена</string>
+    <string name="markers_history">Гісторыя маркераў</string>
+    <string name="send_files_to_openstreetmap">Адправіць файл GPX на OpenStreetMap</string>
+    <string name="enter_text_separated">Увадзіце тэгі праз коску.</string>
+    <string name="gpx_upload_public_visibility_descr">\"Агульнадаступны\" азначае, што трасіроўка публічна адлюстроўваецца ў вашых GPS-трасіроўках і ў агульнадаступных спісах GPS-трасіровак, а таксама ў агульнадаступным спісе трасіровак з пазнакамі часу ў неапрацаваным выглядзе. Даныя, прадстаўленыя праз API, не спасылаюцца на вашу старонку трасіроўкі. Меткі часу трасіроўкі недаступныя праз агульнадаступны API GPS і не размяшчаюцца ў храналагічным парадку.</string>
+    <string name="gpx_upload_private_visibility_descr">\"Прыватны\" азначае, што след не з\'явіцца ў любым агульнадаступным спісе, але кантрольныя пункты з яго даступныя ў адвольным парадку праз агульнадаступны GPS API без пазнак часу.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">\"Ідэнтыфікаваны\" азначае, што трасіроўка будзе публічна адлюстроўвацца ў вашай GPS-трасіроўкі і ў агульнадаступных спісах GPS-трасіровак, гэта значыць, што іншыя карыстальнікі змогуць загрузіць неапрацаваны след і звязаць яго з вашым імем карыстальніка. Агульнадаступныя даныя трасіроўкі з GPS API, якія абслугоўваюцца з дапамогай API пунктаў адсочвання, спасылаюцца на пачатковую старонку трасіроўкі.</string>
+    <string name="gpx_upload_trackable_visibility_descr">\"Адсочванне\" азначае, што трэк не з\'явіцца ў любым агульнадаступным спісе, але апрацоўка маршрутных пунктаў з яго (якія не могуць быць непасрэдна звязаны з вамі) ажыццяўляецца з выкарыстаннем загрузак з агульнадаступнага API GPS.</string>
+    <string name="osm_edit_close_note">Закрыць нататку OSM</string>
+    <string name="osm_edit_comment_note">Каментаваць нататку OSM</string>
+    <string name="osm_login_descr">Вы можаце ўвайсці, выкарыстоўваючы бяспечны метад OAuth або з дапамогай сваіх імя карыстальніка і пароля.</string>
+    <string name="shared_string_add_photo">Дадаць фотаздымак</string>
+    <string name="register_on_openplacereviews">Зарэгістравацца на
+\nOpenPlaceReviews.org</string>
+    <string name="register_on_openplacereviews_desc">Фотаздымкі прадастаўлены праектам з адкрытымі данымі OpenPlaceReviews.org. Каб загрузіць фатаграфіі, зарэгіструйцеся на іх сайце.</string>
+    <string name="register_opr_create_new_account">Стварыць уліковы запіс</string>
+    <string name="register_opr_have_account">У мяне ўжо ёсць уліковы запіс</string>
+    <string name="shared_string_search_history">Гісторыя пошуку</string>
+    <string name="app_mode_kayak">Каяк</string>
+    <string name="app_mode_motorboat">Маторная лодка</string>
+    <string name="cannot_upload_image">Немагчыма загрузіць выяву, паўтарыце спробу пазней</string>
+    <string name="select_picture">Выберыце выявы</string>
+    <string name="shared_string_resources">Рэсурсы</string>
+    <string name="approximate_file_size">Прыблізны памер файла</string>
+    <string name="select_data_to_export">Выберыце даныя, якія вы хочаце экспартаваць у файл.</string>
+    <string name="file_size_needed_for_import">Неабходна для імпартавання</string>
+    <string name="export_not_enough_space_descr">На вашай прыладзе свабодна толькі %1$s. Вызваліце месца альбо зніміце пазнаку з некаторых элементаў для экспартавання.</string>
+    <string name="export_not_enough_space">Недастаткова месца</string>
+    <string name="select_groups_for_import">Выберыце групы, якія трэба імпартаваць.</string>
+    <string name="select_items_for_import">Выберыце элементы, якія трэба імпартаваць.</string>
+    <string name="add_to_mapillary">Дадаць да Mapillary</string>
+    <string name="add_to_opr">Дадаць да OpenPlaceReviews</string>
+    <string name="use_dev_url_descr">Пераключыцца на выкарыстанне dev.openstreetmap.org замест openstreetmap.org для тэсціравання адпраўкі нататак OSM / POI / GPX.</string>
+    <string name="use_dev_url">Выкарыстоўваць dev.openstreetmap.org</string>
+    <string name="add_photos_descr">OsmAnd паказвае фотаздымкі з некалькіх крыніц;
+\nOpenPlaceReviews - фотаздымкі POI;
+\nMapillary - выявы вуліц;
+\nWeb / Wikimedia - фотаздымкі POI паводле дадзеных з OpenStreetMap.</string>
+    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
+    <string name="elevation_data">Вы можаце выкарыстоўваць даныя пра вышыні, каб улічыць ўздымы/спускі падчас вашай паездкі</string>
+    <string name="app_mode_light_aircraft">Лёгкі самалёт</string>
+    <string name="plan_route_join_segments">Аб\'яднаць сегменты</string>
+    <string name="plan_route_split_before">Падзяліць да</string>
+    <string name="plan_route_split_after">Падзяліць пасля</string>
+    <string name="plan_route_add_new_segment">Дадаць новы сегмент</string>
+    <string name="profile_type_user_string">Профіль карыстальніка</string>
+    <string name="release_3_9">"• Дададзена магчымасць экспарту і імпарту ўсіх даных, уключаючы налады, рэсурсы, мае месцы.
+\n
+\n • Планаванне маршруту: графікі для сегментаў трэка з маршрутам, дададзена магчымасць ствараць і рэдагаваць некалькі сегментаў трэка.
+\n
+\n • Дададзены OAuth метад аўтэнтыфікацыі для OpenStreetMap, палепшаны інтэрфейс дыялогаў OSM.
+\n
+\n  • Падтрымка карыстальніцкіх колераў для абранага і маршрутных пунктаў трэка.
+\n
+\n"</string>
+    <string name="reverse_all_points">Вярнуць назад усе пункты</string>
+    <string name="profile_by_default_description">Выберыце профіль, які будзе выкарыстоўвацца падчас запуску прыкладання.</string>
+    <string name="shared_string_last_used">Апошні раз выкарыстоўвалася</string>
+    <string name="routing_attr_prefer_hiking_routes_description">Аддаваць перавагу пешаходным маршрутам</string>
+    <string name="routing_attr_prefer_hiking_routes_name">Аддаваць перавагу пешаходным маршрутам</string>
+    <string name="routing_attr_allow_streams_description">Дазвольце ручаі і меліярацыйныя каналы</string>
+    <string name="routing_attr_allow_streams_name">Дазвольце ручаі і меліярацыйныя каналы</string>
+    <string name="routing_attr_allow_intermittent_description">Дазволіць перарывістыя водныя маршруты</string>
+    <string name="routing_attr_allow_intermittent_name">Дазволіць перарывістыя водныя маршруты</string>
+    <string name="add_online_routing_engine">Дадаць анлайн-маршрутызатар</string>
+    <string name="edit_online_routing_engine">Рэдагаваць анлайн-маршрутызатар</string>
+    <string name="shared_string_subtype">Падтып</string>
+    <string name="shared_string_vehicle">Транспартны сродак</string>
+    <string name="shared_string_api_key">Ключ API</string>
+    <string name="shared_string_server_url">URL-адрас сервера</string>
+    <string name="shared_string_enter_param">Увядзіце параметр</string>
+    <string name="keep_it_empty_if_not">Пакінуць пустым, калі не</string>
+    <string name="online_routing_example_hint">URL-адрас з усімі параметрамі будзе выглядаць так:</string>
+    <string name="test_route_calculation">Тэст разліку маршруту</string>
+    <string name="routing_engine_vehicle_type_driving">Ваджэнне</string>
+    <string name="routing_engine_vehicle_type_foot">Пешшу</string>
+    <string name="routing_engine_vehicle_type_bike">Ровар</string>
+    <string name="routing_engine_vehicle_type_car">Аўтамабіль</string>
+    <string name="copy_address">Капіраваць адрас</string>
+    <string name="online_routing_engine">Анлайн-маршрутызатар</string>
+    <string name="online_routing_engines">Анлайн-маршрутызатары</string>
+    <string name="shared_string_folders">Папкі</string>
+    <string name="select_folder">Выберыце папку</string>
+    <string name="select_folder_descr">Выберыце папку або стварыце новую</string>
+    <string name="shared_string_empty">Пуста</string>
+    <string name="analyze_by_intervals">Аналіз паводле інтэрвалаў</string>
+    <string name="upload_to_openstreetmap">Выгрузіць на OpenStreetMap</string>
+    <string name="edit_track">Змяніць трэк</string>
+    <string name="rename_track">Перайменаваць трэк</string>
+    <string name="change_folder">Змяніць папку</string>
+    <string name="shared_string_sec">сек.</string>
+    <string name="announcement_time_passing">Пры праходжанні</string>
+    <string name="announcement_time_approach">Набліжэнне</string>
+    <string name="announcement_time_prepare_long">Заўчасная падрыхтоўка</string>
+    <string name="announcement_time_prepare">Падрыхтавацца</string>
+    <string name="announcement_time_off_route">Па-за маршрутам</string>
+    <string name="announcement_time_arrive">Прыбыццё ў пункт прызначэння</string>
+    <string name="shared_string_turn">Паварот</string>
+    <string name="announcement_time_intervals">Інтэрвалы часу і адлегласці</string>
+    <string name="profile_type_osmand_string">Профіль OsmAnd</string>
+    <string name="announcement_time_title">Час абвяшчэння</string>
+    <string name="announcement_time_descr">Час розных галасавых падказак залежыць ад тыпу запыту, бягучай хуткасці навігацыі і хуткасці навігацыі па змаўчанні.</string>
+    <string name="start_recording">Пачаць запіс</string>
+    <string name="show_track_on_map">Паказаць трэк на мапе</string>
+    <string name="routing_engine_vehicle_type_wheelchair">Інвалідны вазок</string>
+    <string name="routing_engine_vehicle_type_hiking">Пешы турызм</string>
+    <string name="routing_engine_vehicle_type_walking">Хадзьба</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">Электраровар</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">Горны ровар</string>
+    <string name="routing_engine_vehicle_type_cycling_road">Дарожны ровар</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">Звычайны ровар</string>
+    <string name="routing_engine_vehicle_type_hgv">Грузавік</string>
+    <string name="routing_engine_vehicle_type_small_truck">Малы грузавік</string>
+    <string name="routing_engine_vehicle_type_truck">Грузавік</string>
+    <string name="routing_engine_vehicle_type_scooter">Скутэр</string>
+    <string name="routing_engine_vehicle_type_racingbike">Гоначны ровар</string>
+    <string name="routing_engine_vehicle_type_mtb">Горны ровар</string>
+    <string name="message_server_error">Памылка сервера: %1$s</string>
+    <string name="message_name_is_already_exists">Назва ўжо існуе</string>
+    <string name="delete_online_routing_engine">Выдаліць анлайн-маршрутызатар\?</string>
+    <string name="context_menu_read_full">Чытаць цалкам</string>
+    <string name="context_menu_edit_descr">Змяніць апісанне</string>
+    <string name="delete_waypoints">Выдаліць маршрутныя пункты</string>
+    <string name="copy_to_map_markers">Капіраваць да пазнак мапы</string>
+    <string name="copy_to_map_favorites">Капіраваць да абранага</string>
+    <string name="upload_photo">Выгрузка</string>
+    <string name="upload_photo_completed">Выгрузка завершана</string>
+    <string name="uploading_count">Выгрузка %1$d з %2$d</string>
+    <string name="uploaded_count">Выгружана %1$d з %2$d</string>
+    <string name="toast_select_edits_for_upload">Выберыце змены для выгрузкі</string>
+    <string name="hillshade_slope_contour_lines">Рэльеф мясцовасці / Схілы / Гарызанталі</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews — гэта грамадскі праект пра месцы агульнага карыстання, такія як, рэстараны, гатэлі, музеі, пункты шляху. Ён збірае ўсе агульнадаступныя даныя пра іх, такія як, выявы, водгукі, спасылкі на іншыя сістэмы, спасылкі OpenStreetMap, Вікіпедыя.
+\n
+\nУсе даныя OpenPlaceReview з\'яўляюцца адкрытымі і даступны тут: http://openplacereviews.org/data.
+\n
+\nВы можаце прачытаць больш па адрасу: http://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">Выкарыстаць test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Увайсці ў OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Вада</string>
+    <string name="activity_type_winter_name">Зіма</string>
+    <string name="activity_type_snowmobile_name">Снегаход</string>
+    <string name="activity_type_riding_name">Язда</string>
+    <string name="activity_type_racing_name">Гонка</string>
+    <string name="activity_type_mountainbike_name">Горны ровар</string>
+    <string name="activity_type_cycling_name">Язда на ровары</string>
+    <string name="activity_type_hiking_name">Пешы турызм</string>
+    <string name="activity_type_running_name">Бег</string>
+    <string name="activity_type_walking_name">Пешаход</string>
+    <string name="activity_type_offroad_name">Пазадарожнік</string>
+    <string name="activity_type_motorbike_name">Матацыкл</string>
+    <string name="activity_type_car_name">Аўтамабіль</string>
 </resources>
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@ -208,7 +208,6 @@
    <string name="avoid_motorway">Без магистрали</string>
    <string name="auto_zoom_map_descr">Авто-мащабиране съобразно вашата скорост (само за синхронизирани карти)</string>
    <string name="auto_zoom_map">Авто-мащабиране</string>
-    <string name="snap_to_road_descr">Позицията да се придържа към пътя по време на пътуване</string>
    <string name="snap_to_road">Придържай мястото към пътя</string>
    <string name="osmand_play_title_30_chars">OsmAnd за карти и навигация</string>
    <string name="osmand_short_description_80_chars">Мобилни карти и навигация от OSM</string>
@ -1925,7 +1924,6 @@
    <string name="update_all_maps_now">Обновяване на всички карти сега\?</string>
    <string name="clear_tile_data">Изчистване на всички плочки</string>
    <string name="routing_attr_short_way_name">Икономичен маршрут</string>
-    <string name="routing_attr_short_way_description">Използване на икономичен маршрут (обичайно по-кратък).</string>
    <string name="replace_favorite_confirmation">Наистина ли искате да заместите %1$s?</string>
    <string name="rendering_attr_hideOverground_name">Надземни обекти</string>
    <string name="osm_live_payment_desc">Абонаментна такса се начислява всеки месец. Можете да я отмените от Google Play по всяко време.</string>
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@ -641,7 +641,6 @@
    <string name="avoid_motorway">Sense autopistes</string>
    <string name="auto_zoom_map_descr">Nivell de zoom en funció de la velocitat (mentre el mapa estigui sincronitzat amb la posició actual).</string>
    <string name="auto_zoom_map">Zoom automàtic del mapa</string>
-    <string name="snap_to_road_descr">Ajusta la posició a les carreteres durant la navegació.</string>
    <string name="snap_to_road">Desplaça a la carretera</string>
    <string name="asap">MCP</string>
    <string name="prefs_plugins_descr">Els connectors activen els paràmetres del mode expert i de funcionalitats addicionals.</string>
@ -1987,7 +1986,6 @@
    <string name="shared_string_change">Modifica</string>
    <string name="get_started">Comença</string>
    <string name="routing_attr_short_way_name">Ruta amb menys consum</string>
-    <string name="routing_attr_short_way_description">Utilitza la ruta de menys consum (normalment la més curta).</string>
    <string name="replace_favorite_confirmation">Confirmeu que voleu substituir el Preferit %1$s?</string>
    <string name="update_all_maps_now">Voleu actualitzar tots els mapes ara mateix?</string>
    <string name="clear_tile_data">Esborra totes les tessel·les</string>
@ -3813,7 +3811,6 @@
 \nWeb / Wikimedia: fotos dels PDIs d\'OpenStreetMap.</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
    <string name="icon_group_amenity">Equipament</string>
-    <string name="elevation_data">Podeu utilitzar les dades d’elevació per acumular l\'ascens/descens de la vostra ruta</string>
    <string name="app_mode_light_aircraft">Avioneta</string>
    <string name="gpx_upload_identifiable_visibility_descr">\"Identificable\" vol dir que la traça es mostrarà públicament a les vostres traces GPS i als llistats públics de traces GPS, és a dir, els altres usuaris la podran baixar en brut i associada al vostre usuari. Les dades cronològiques de pas per les fites de l’API GPS que es publiquen mitjançant l’API de fites faran referència a la pàgina de la vostra traça original.</string>
    <string name="gpx_upload_private_visibility_descr">\"Privada\" vol dir que la traça no es mostra a cap llistat públic, però les fites que conté estan disponibles a través de l\'API pública GPS, desordenades i sense enregistraments temporals.</string>
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@ -3561,7 +3561,7 @@
    <string name="poi_charcoal_pile">Milíř</string>
    <string name="poi_historic_tank">Historický tank</string>
    <string name="poi_hookah_lounge">Salonek s vodní dýmkou</string>
-    <string name="poi_source_biomass">Zdroj energie: biomasa</string>
+    <string name="poi_generator_source_biomass">Zdroj energie: biomasa</string>
    <string name="poi_glacier_type_hanging">Převislý</string>
    <string name="poi_glacier_type_shelf">Šelfový</string>
    <string name="poi_substation_compensation">Kompenzační</string>
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@ -781,7 +781,6 @@
    <string name="day_night_info">Denní/noční info</string>
    <string name="map_widget_renderer">Styl mapy</string>
    <string name="avoid_motorway">Žádné dálnice</string>
-    <string name="snap_to_road_descr">Zachytí kurzor na nejbližší silnici/cestu během navigace.</string>
    <string name="map_widget_vector_attributes">Vlastnosti vykreslování</string>
    <string name="poi_filter_parking">Parkoviště</string>
    <string name="poi_filter_public_transport">Veřejná doprava</string>
@ -2004,7 +2003,6 @@
    <string name="update_all_maps_now">Aktualizovat všechny mapy ihned?</string>
    <string name="clear_tile_data">Vymazat všechny dlaždice</string>
    <string name="routing_attr_short_way_name">Ekonomická trasa</string>
-    <string name="routing_attr_short_way_description">Použít ekonomickou trasu (obvykle kratší).</string>
    <string name="replace_favorite_confirmation">Opravdu chcete nahradit Oblíbené místo „%1$s“\?</string>
    <string name="rendering_attr_hideOverground_name">Nadzemní objekty</string>
    <string name="shared_string_change">Změnit</string>
@ -3919,7 +3917,6 @@
    <string name="use_dev_url">Použít dev.openstreetmap.org</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
    <string name="lang_de_casual">Němčina (hovorová)</string>
-    <string name="elevation_data">Můžete použít výšková data pro započítání výstupu/sestupu na trase</string>
    <string name="app_mode_light_aircraft">Lehké letadlo</string>
    <string name="plan_route_join_segments">Spojit úseky</string>
    <string name="plan_route_split_before">Rozdělit před</string>
--- a/OsmAnd/res/values-cy/strings.xml
+++ b/OsmAnd/res/values-cy/strings.xml
@ -51,7 +51,6 @@
 <string name="avoid_motorway">Ceisiwch osgoi traffyrdd</string>
 <string name="auto_zoom_map_descr">Zoom Auto mapio yn ôl eich cyflymder (tra map wedi eu cydamseru gyda\'r sefyllfa bresennol)</string>
 <string name="auto_zoom_map">Auto chwyddo map</string>
-    <string name="snap_to_road_descr">Snap sefyllfa i ffyrdd yn ystod llywio</string>
 <string name="snap_to_road">Snap i\'r ffordd</string>
 <string name="osmand_short_description_80_chars">OsmAnd yn gais ffynhonnell agored ar gyfer llywio fapiau all-lein ac ar-lein</string>
 <string name="osmand_plus_short_description_80_chars">OsmAnd yn gais ffynhonnell agored ar gyfer llywio fapiau all-lein ac ar-lein</string>
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@ -3582,7 +3582,7 @@
    <string name="poi_charcoal_pile">Trækulsbunke</string>
    <string name="poi_historic_tank">Historisk tank</string>
    <string name="poi_hookah_lounge">Vandpibe bar</string>
-    <string name="poi_source_biomass">Energikilde: biomasse</string>
+    <string name="poi_generator_source_biomass">Energikilde: biomasse</string>
    <string name="poi_snowmobile_filter">Snescooter adgang</string>
    <string name="poi_access_bus">Busadgang</string>
    <string name="poi_access_caravan">Campingvogn adgang</string>
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@ -128,7 +128,6 @@
    <string name="av_use_external_camera">Brug kamera</string>
    <string name="route_descr_lat_lon">Lat %1$.3f, Lon %2$.3f</string>
    <string name="intermediate_point">Mellemliggende destination %1$s</string>
-    <string name="snap_to_road_descr">Hold position på vejen under navigation.</string>
    <string name="snap_to_road">Fastgør til vejen</string>
    <string name="osmand_short_description_80_chars">Globale mobilkort og navigation til offline og online OSM-kort</string>
    <string name="osmand_plus_short_description_80_chars">Global mobilkortvisning og navigation til offline og online OSM-kort</string>
@ -1995,7 +1994,6 @@
    <string name="route_stops_before">%1$s stop før</string>
    <string name="rendering_attr_hideOverground_name">Objekter over jorden</string>
    <string name="routing_attr_short_way_name">Brændstofbesparende rute</string>
-    <string name="routing_attr_short_way_description">Brug brændstofbesparende rute (normalt kortere).</string>
    <string name="replace_favorite_confirmation">Erstat Favorit %1$s?</string>
    <string name="shared_string_change">Skift</string>
    <string name="get_started">Kom i gang</string>
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@ -3582,7 +3582,7 @@
    <string name="poi_charcoal_pile">Kohlenmeiler</string>
    <string name="poi_historic_tank">Historischer Panzer</string>
    <string name="poi_hookah_lounge">Wasserpfeifen-Lounge</string>
-    <string name="poi_source_biomass">Energiequelle: Biomasse</string>
+    <string name="poi_generator_source_biomass">Energiequelle: Biomasse</string>
    <string name="poi_snowmobile_filter">Zufahrt Schneemobil</string>
    <string name="poi_access_bus">Anbindung Linienbus</string>
    <string name="poi_access_caravan">Zufahrt Wohnwagen</string>
@ -3881,4 +3881,14 @@
    <string name="poi_wildlife_crossing_bat_tunnel">Fledermaustunnel</string>
    <string name="poi_wildlife_crossing_bat_bridge">Fledermausbrücke</string>
    <string name="poi_wildlife_crossing">Wildwechsel</string>
+    <string name="poi_mobile_library">Halteposition der Fahrbücherei</string>
+    <string name="poi_summit_register_no">Gipfelbuch: nein</string>
+    <string name="poi_summit_register_yes">Gipfelbuch: ja</string>
+    <string name="poi_piste_status_closed">Pistenstatus: geschlossen</string>
+    <string name="poi_piste_status_open">Pistenstatus: geöffnet</string>
+    <string name="poi_patrolled_no">Bewacht: nein</string>
+    <string name="poi_patrolled_yes">Bewacht: ja</string>
+    <string name="poi_gladed_yes">Geglättet: ja</string>
+    <string name="poi_piste_name">Pistenname</string>
+    <string name="poi_piste_ski_jump">Skispringen</string>
 </resources>
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -97,7 +97,6 @@
    <string name="avoid_motorway">Keine Autobahnen</string>
    <string name="auto_zoom_map_descr">Kartenvergrößerung der Geschwindigkeit anpassen (während der Kartennachführung).</string>
    <string name="auto_zoom_map">Automatische Vergrößerung</string>
-    <string name="snap_to_road_descr">Standort während der Navigation auf Straßen einrasten.</string>
    <string name="snap_to_road">Auf Straße einrasten</string>
    <string name="osmand_play_title_30_chars">OsmAnd Karten &amp; Navigation</string>
    <string name="osmand_short_description_80_chars">Globale Landkarten- und Navigationsanwendung für Offline- und Online-OSM-Karten</string>
@ -1999,7 +1998,6 @@
    <string name="route_stops_before">%1$s Haltestellen davor</string>
    <string name="rendering_attr_hideOverground_name">Oberirdische Objekte</string>
    <string name="routing_attr_short_way_name">Kraftstoffsparende Route</string>
-    <string name="routing_attr_short_way_description">Kraftstoffsparende Route verwenden (in der Regel kürzer).</string>
    <string name="replace_favorite_confirmation">Wollen Sie den Favoriten \'%1$s\' wirklich ersetzen?</string>
    <string name="shared_string_change">Ändern</string>
    <string name="get_started">Erste Schritte</string>
@ -3923,7 +3921,6 @@
    <string name="cannot_upload_image">Bild kann nicht hochgeladen werden, bitte versuchen Sie es später erneut</string>
    <string name="select_picture">Bild auswählen</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
-    <string name="elevation_data">Sie können Höhendaten verwenden, um Steigungen und Gefälle auf Ihrer Reise zu berücksichtigen</string>
    <string name="app_mode_light_aircraft">Kleinflugzeug</string>
    <string name="plan_route_split_before">Teilen vor</string>
    <string name="plan_route_split_after">Teilen nach</string>
@ -4022,4 +4019,20 @@
    <string name="open_place_reviews">OpenPlaceReviews</string>
    <string name="opr_use_dev_url">test.openplacereviews.org verwenden</string>
    <string name="login_open_place_reviews">Anmelden bei OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Wasser</string>
+    <string name="activity_type_winter_name">Winter</string>
+    <string name="activity_type_snowmobile_name">Schneemobil</string>
+    <string name="activity_type_riding_name">Reiten</string>
+    <string name="activity_type_mountainbike_name">Mountainbike</string>
+    <string name="activity_type_cycling_name">Fahrrad</string>
+    <string name="activity_type_hiking_name">Wandern</string>
+    <string name="activity_type_running_name">Laufen</string>
+    <string name="activity_type_walking_name">Fußgänger</string>
+    <string name="activity_type_offroad_name">Geländegängig</string>
+    <string name="activity_type_motorbike_name">Motorrad</string>
+    <string name="activity_type_car_name">Auto</string>
+    <string name="announcement_time_prepare">Zweite Ankündigung (mittlere Distanz)</string>
+    <string name="shared_string_sec">sek</string>
+    <string name="activity_type_racing_name">Rennsport</string>
+    <string name="announcement_time_prepare_long">Erste Ankündigung (größere Distanz)</string>
 </resources>
--- a/OsmAnd/res/values-el/phrases.xml
+++ b/OsmAnd/res/values-el/phrases.xml
@ -3534,7 +3534,7 @@
    <string name="poi_climbing_crag">Ναι</string>
    <string name="reddit">Reddit</string>
    <string name="poi_historic_tank">Ιστορική δεξαμενή</string>
-    <string name="poi_source_biomass">Πηγή ενέργειας: βιομάζα</string>
+    <string name="poi_generator_source_biomass">Πηγή ενέργειας: βιομάζα</string>
    <string name="poi_snowmobile_filter">Πρόσβαση σε χιονοόχημα</string>
    <string name="poi_access_bus">Πρόσβαση σε λεωφορείο</string>
    <string name="poi_access_caravan">Πρόσβαση σε τροχόσπιτο</string>
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@ -20,7 +20,6 @@
    <string name="avoid_motorway">Όχι αυτοκινητόδρομους</string>
    <string name="auto_zoom_map_descr">Επίπεδο εστίασης χάρτη ανάλογα με την ταχύτητά σας (ενώ ο χάρτης συγχρονίζεται με την τρέχουσα θέση).</string>
    <string name="auto_zoom_map">Αυτόματη εστίαση χάρτη</string>
-    <string name="snap_to_road_descr">Προσανατολισμός στους δρόμους κατά τη διάρκεια της πλοήγησης.</string>
    <string name="snap_to_road">Προσανατολισμός στο δρόμο</string>
    <string name="osmand_short_description_80_chars">Προβολή φορητού παγκόσμιου χάρτη &amp; πλοήγηση για χάρτες OSM χωρίς και με διαδίκτυο</string>
    <string name="osmand_long_description_1000_chars">OsmAnd (OSM Αυτοματοποιημένες Οδηγίες Πλοήγησης)
@ -1965,7 +1964,6 @@
    <string name="update_all_maps_now">Θέλετε να ενημερώσετε όλους τους χάρτες τώρα;</string>
    <string name="clear_tile_data">Καθαρισμός όλων των πλακιδίων</string>
    <string name="routing_attr_short_way_name">Διαδρομή με οικονομία καυσίμων</string>
-    <string name="routing_attr_short_way_description">Χρησιμοποιήστε τη διαδρομή με οικονομία καυσίμων (συνήθως συντομότερη).</string>
    <string name="replace_favorite_confirmation">Είσαστε σίγουρος/η ότι θέλετε να αντικαταστήσετε το Αγαπημένο %1$s;</string>
    <string name="rendering_attr_hideOverground_name">Υπέργεια αντικείμενα</string>
    <string name="shared_string_change">Αλλαγή</string>
--- a/OsmAnd/res/values-eo/phrases.xml
+++ b/OsmAnd/res/values-eo/phrases.xml
@ -3582,7 +3582,7 @@
    <string name="poi_charcoal_pile">Karbigejo</string>
    <string name="poi_historic_tank">Tanko historia</string>
    <string name="poi_hookah_lounge">Salono por fumi akvopipon</string>
-    <string name="poi_source_biomass">Energifonto: biomaso</string>
+    <string name="poi_generator_source_biomass">Energifonto: biomaso</string>
    <string name="poi_snowmobile_filter">Aliro por motorsledoj</string>
    <string name="poi_access_bus">Aliro por aŭtobusoj</string>
    <string name="poi_access_caravan">Aliro por kampad-postveturiloj</string>
@ -3881,4 +3881,14 @@
    <string name="poi_wildlife_crossing_bat_bridge">Ponto por vespertoj</string>
    <string name="poi_wildlife_crossing">Trairejo por sovaĝaj bestoj</string>
    <string name="poi_swimming_area">Naĝejo natura</string>
+    <string name="poi_piste_status_closed">Stato de skivojo: fermita</string>
+    <string name="poi_piste_status_open">Stato de skivojo: malfermita</string>
+    <string name="poi_patrolled_no">Kontrolata: ne</string>
+    <string name="poi_patrolled_yes">Kontrolata: jes</string>
+    <string name="poi_gladed_yes">Senarbigita: jes</string>
+    <string name="poi_piste_name">Nomo de skivojo</string>
+    <string name="poi_piste_ski_jump">Skisaltejo</string>
+    <string name="poi_mobile_library">Movebla biblioteko (haltloko)</string>
+    <string name="poi_summit_register_no">Pint‑taglibro: ne</string>
+    <string name="poi_summit_register_yes">Pint‑taglibro: jes</string>
 </resources>
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@ -1056,7 +1056,6 @@
    <string name="avoid_motorway">Sen aŭtovojojn</string>
    <string name="auto_zoom_map">Aŭtomate skali mapon</string>
    <string name="auto_zoom_map_descr">Skali mapon depende de via rapido (kiam mapo estas samtempigita kun aktuala pozicio).</string>
-    <string name="snap_to_road_descr">Proksimumigi pozicion al vojo dum navigado.</string>
    <string name="snap_to_road">Proksimumigi al vojo</string>
    <string name="interrupt_music">Paŭzigi muzikon</string>
    <string name="interrupt_music_descr">Voĉaj anoncoj paǔzigas ludadon de muziko.</string>
@ -1991,7 +1990,6 @@
    <string name="shared_string_change">Ŝanĝi</string>
    <string name="get_started">Ekigi</string>
    <string name="routing_attr_short_way_name">Brulaĵ-ŝparema kurso</string>
-    <string name="routing_attr_short_way_description">Kalkuli brulaĵ-ŝpareman kurson (kutime plej mallongan).</string>
    <string name="replace_favorite_confirmation">Ĉu vi volas anstataŭigi la ŝatatan ejon %1$s?</string>
    <string name="clear_tile_data">Forviŝi ĉiujn kahelojn</string>
    <string name="update_all_maps_now">Ĉu ĝisdatigi ĉiujn mapojn nun?</string>
@ -3919,7 +3917,6 @@
    <string name="select_picture">Elektu bildon</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
    <string name="lang_de_casual">Germana (ordinara)</string>
-    <string name="elevation_data">Vi povas uzi datumojn pri altitudo por kalkuli suprenirojn/malsuprenirojn de via kurso</string>
    <string name="app_mode_light_aircraft">Malpeza aviadilo</string>
    <string name="plan_route_join_segments">Kunigi segmentojn</string>
    <string name="plan_route_split_before">Dividi antaŭ</string>
@ -4020,4 +4017,17 @@
    <string name="open_place_reviews">OpenPlaceReviews</string>
    <string name="opr_use_dev_url">Uzi test.openplacereviews.org</string>
    <string name="login_open_place_reviews">Ensaluti al OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Akvo</string>
+    <string name="activity_type_winter_name">Vintro</string>
+    <string name="activity_type_snowmobile_name">Motorsledo</string>
+    <string name="activity_type_riding_name">Rajdado</string>
+    <string name="activity_type_racing_name">Kurkonkurso</string>
+    <string name="activity_type_mountainbike_name">Montbiciklo</string>
+    <string name="activity_type_cycling_name">Biciklado</string>
+    <string name="activity_type_hiking_name">Marŝado</string>
+    <string name="activity_type_running_name">Kurado</string>
+    <string name="activity_type_walking_name">Piedirado</string>
+    <string name="activity_type_offroad_name">Ekstervoje</string>
+    <string name="activity_type_motorbike_name">Motorciklo</string>
+    <string name="activity_type_car_name">Aŭto</string>
 </resources>
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@ -3222,7 +3222,7 @@
    <string name="poi_water_supply_pump">Bomba</string>
    <string name="poi_water_supply_borehole">Perforación</string>
    <string name="poi_water_supply_water_trucking">Camión de agua</string>
-    <string name="poi_water_supply_water_tank">Depósito de agua</string>
+    <string name="poi_water_supply_water_tank">Tanque de agua</string>
    <string name="poi_water_supply_bottled_water">Botella de agua</string>
    <string name="poi_water_place_access_community">Comunidad</string>
    <string name="poi_water_place_access_family">Familia</string>
@ -3582,7 +3582,7 @@
    <string name="poi_charcoal_pile">Carbonera;Pila de carbón</string>
    <string name="poi_historic_tank">Tanque histórico</string>
    <string name="poi_hookah_lounge">Bar de cachimbas;Salón Hookah</string>
-    <string name="poi_source_biomass">Fuente de energía: biomasa</string>
+    <string name="poi_generator_source_biomass">Fuente de energía: biomasa</string>
    <string name="poi_snowmobile_filter">Acceso para motonieves</string>
    <string name="poi_access_bus">Acceso para colectivos</string>
    <string name="poi_access_caravan">Acceso para casas móviles</string>
@ -3869,7 +3869,7 @@
    <string name="poi_water_source_river">Río</string>
    <string name="poi_water_source_well">Pozo</string>
    <string name="poi_water_source_powered_pump">Bomba accionada</string>
-    <string name="poi_water_source_water_tank">Depósito de agua</string>
+    <string name="poi_water_source_water_tank">Tanque de agua</string>
    <string name="poi_water_source_tap">Canilla</string>
    <string name="poi_water_source_water_works">Planta potabilizadora</string>
    <string name="poi_water_source_tube_well">Pozo entubado</string>
@ -3881,4 +3881,14 @@
    <string name="poi_wildlife_crossing_bat_bridge">Puente para murciélagos</string>
    <string name="poi_wildlife_crossing">Cruce de vida silvestre</string>
    <string name="poi_swimming_area">Área de natación</string>
+    <string name="poi_mobile_library">Biblioteca móvil (parada)</string>
+    <string name="poi_summit_register_no">Registro de la cumbre: no</string>
+    <string name="poi_summit_register_yes">Registro de la cumbre: sí</string>
+    <string name="poi_piste_status_closed">Estado de la pista: cerrado</string>
+    <string name="poi_piste_status_open">Estado de la pista: abierto</string>
+    <string name="poi_patrolled_no">Patrullado: no</string>
+    <string name="poi_patrolled_yes">Patrullado: sí</string>
+    <string name="poi_gladed_yes">Arboleda: sí</string>
+    <string name="poi_piste_name">Nombre de la pista</string>
+    <string name="poi_piste_ski_jump">Salto con esquís</string>
 </resources>
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@ -742,7 +742,6 @@
    <string name="avoid_motorway">Sin autopistas</string>
    <string name="auto_zoom_map_descr">Nivel de zoom según la velocidad (mientras el mapa se sincroniza con la ubicación actual).</string>
    <string name="auto_zoom_map">Zoom automático del mapa</string>
-    <string name="snap_to_road_descr">Ajusta la ubicación al camino durante la navegación.</string>
    <string name="snap_to_road">Ajustar al camino</string>
    <string name="interrupt_music_descr">Las indicaciones por voz pausan la reproducción de música.</string>
    <string name="interrupt_music">Pausar música</string>
@ -1992,7 +1991,6 @@
    <string name="rendering_attr_hideOverground_name">Objetos en superficie</string>
    <string name="replace_favorite_confirmation">¿Reemplazar el Favorito «%1$s»?</string>
    <string name="routing_attr_short_way_name">Ruta de bajo consumo (corta)</string>
-    <string name="routing_attr_short_way_description">Usa la ruta de menor consumo en combustible (usualmente la más corta).</string>
    <string name="shared_string_change">Cambiar</string>
    <string name="get_started">Empezar</string>
    <string name="update_all_maps_now">¿Actualizar todos los mapas ahora?</string>
@ -3674,7 +3672,7 @@
    <string name="height_limit_description">Proporciona la altura del vehículo, pueden aplicarse algunas restricciones de ruta para vehículos altos.</string>
    <string name="weight_limit_description">Proporciona el peso del vehículo, pueden aplicarse algunas restricciones de ruta para vehículos pesados.</string>
    <string name="screen_timeout">Tiempo de espera de la pantalla</string>
-    <string name="shared_string_tones">tonos</string>
+    <string name="shared_string_tones">toneladas</string>
    <string name="shared_string_meters">metros</string>
    <string name="details_dialog_decr">Muestra u oculta los detalles adicionales del mapa</string>
    <string name="shared_string_night_map">Mapa nocturno</string>
@ -3921,7 +3919,6 @@
    <string name="select_picture">Elegir imagen</string>
    <string name="lang_de_casual">Alemán (casual)</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
-    <string name="elevation_data">Puedes usar los datos de elevación para tener en cuenta el ascenso y descenso del viaje</string>
    <string name="app_mode_light_aircraft">Avión ligero</string>
    <string name="plan_route_join_segments">Unir segmentos</string>
    <string name="plan_route_split_before">Dividir antes</string>
@ -4022,4 +4019,17 @@
    <string name="open_place_reviews">OpenPlaceReviews</string>
    <string name="opr_use_dev_url">Usar test.openplacereviews.org</string>
    <string name="login_open_place_reviews">Acceder a OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Agua</string>
+    <string name="activity_type_winter_name">Invierno</string>
+    <string name="activity_type_snowmobile_name">Motonieve</string>
+    <string name="activity_type_riding_name">Equitación</string>
+    <string name="activity_type_racing_name">Carreras</string>
+    <string name="activity_type_mountainbike_name">Bicicleta de montaña</string>
+    <string name="activity_type_cycling_name">Bicicleta</string>
+    <string name="activity_type_hiking_name">Senderismo</string>
+    <string name="activity_type_running_name">Correr</string>
+    <string name="activity_type_walking_name">Peatón</string>
+    <string name="activity_type_offroad_name">Todo terreno</string>
+    <string name="activity_type_motorbike_name">Motocicleta</string>
+    <string name="activity_type_car_name">Automóvil</string>
 </resources>
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@ -844,7 +844,7 @@
    <string name="poi_nwn_ref">Nodo de red nacional de senderismo</string>
    <string name="poi_rwn_ref">Nodo de red regional de senderismo</string>
    <string name="poi_lwn_ref">Nodo de red local de senderismo</string>
-    <string name="poi_opening_hours">Horario de atención;Horario de apertura</string>
+    <string name="poi_opening_hours">Horario de apertura</string>
    <string name="poi_collection_times">Horario de recolección</string>
    <string name="poi_description">Descripción</string>
    <string name="poi_phone">Teléfono</string>
@ -2723,7 +2723,7 @@
    <string name="poi_aquaculture_mussels">Acuicultura: mejillones</string>
    <string name="poi_min_age">Edad mínima</string>
    <string name="poi_organic_yes">Sí</string>
-    <string name="poi_organic_no">No</string>
+    <string name="poi_organic_no">Productos orgánicos: no</string>
    <string name="poi_organic_only">Únicamente</string>
    <string name="poi_traffic_mirror">Espejo de tráfico</string>
    <string name="poi_diplomatic_consulate">Consulado</string>
@ -3582,7 +3582,7 @@
    <string name="poi_charcoal_pile">Carbonera;Pila de carbón</string>
    <string name="poi_historic_tank">Tanque histórico</string>
    <string name="poi_hookah_lounge">Bar de cachimbas;Salón Hookah</string>
-    <string name="poi_source_biomass">Fuente de energía: biomasa</string>
+    <string name="poi_generator_source_biomass">Fuente de energía: biomasa</string>
    <string name="poi_snowmobile_filter">Acceso para motonieves</string>
    <string name="poi_access_bus">Acceso para autobuses</string>
    <string name="poi_access_caravan">Acceso para caravanas</string>
@ -3868,7 +3868,7 @@
    <string name="poi_lavoir">Lavadero público de ropa</string>
    <string name="poi_waste_transfer_station">Estación de transferencia de residuos</string>
    <string name="poi_weightbridge">Báscula puente</string>
-    <string name="poi_ranger_station">Estación de guardabosque</string>
+    <string name="poi_ranger_station">Estación de guardabosques</string>
    <string name="poi_water_source_lake">Lago</string>
    <string name="poi_water_source_river">Río</string>
    <string name="poi_water_source_well">Pozo</string>
@ -3881,4 +3881,14 @@
    <string name="poi_wildlife_crossing_bat_bridge">Puente para murciélagos</string>
    <string name="poi_wildlife_crossing">Cruce de vida silvestre</string>
    <string name="poi_swimming_area">Área de natación</string>
+    <string name="poi_summit_register_yes">Registro de la cumbre: sí</string>
+    <string name="poi_summit_register_no">Registro de la cumbre: no</string>
+    <string name="poi_piste_status_open">Estado de la pista: abierto</string>
+    <string name="poi_piste_status_closed">Estado de la pista: cerrado</string>
+    <string name="poi_piste_ski_jump">Salto con esquís</string>
+    <string name="poi_piste_name">Nombre de la pista</string>
+    <string name="poi_patrolled_yes">Patrullado: sí</string>
+    <string name="poi_patrolled_no">Patrullado: no</string>
+    <string name="poi_mobile_library">Biblioteca móvil (parada)</string>
+    <string name="poi_gladed_yes">Arboleda: sí</string>
 </resources>
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@ -742,7 +742,6 @@
    <string name="avoid_motorway">Sin autopistas</string>
    <string name="auto_zoom_map_descr">Nivel de zoom según la velocidad (mientras el mapa se sincroniza con la ubicación actual).</string>
    <string name="auto_zoom_map">Zoom automático del mapa</string>
-    <string name="snap_to_road_descr">Ajusta la ubicación al camino durante la navegación.</string>
    <string name="snap_to_road">Ajustar al camino</string>
    <string name="interrupt_music_descr">Las indicaciones por voz pausan la reproducción de música.</string>
    <string name="interrupt_music">Pausar música</string>
@ -772,25 +771,25 @@
 \n Los PDI de OsmAnd están siendo desarrollados activamente. Nuestro proyecto y su continuo progreso, se basa en contribuciones económicas para desarrollar y probar nuevas funcionalidades. Por favor, considera comprar OsmAnd+, financiar nuevas funciones o hacer una donación general en https://osmand.net.</string>
    <string name="osmand_plus_play_title_30_chars">Navegación y Mapas OsmAnd+</string>
    <string name="osmand_plus_short_description_80_chars">Visor y navegador móvil global de mapas OSM con y sin conexión</string>
-    <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions, y en español, Guía de Navegación Automatizada de OSM) 
-\n 
-\nOsmAnd+ es un software de navegación de código abierto con acceso a una amplia variedad de datos globales de OSM. Todos los datos del mapa (vectores y teselas), pueden ser almacenados en la memoria del teléfono para su uso sin conexión. Ofrece funcionalidades de rutas con y sin conexión, incluyendo guía de giro-a-giro por voz. 
-\n 
-\n OsmAnd+ es la versión de pago de la aplicación, comprándola ayudas al proyecto, financias el desarrollo de nuevas funciones, y recibes las últimas actualizaciones. 
-\n 
-\n Algunas de las funciones fundamentales: 
-\n - Completa funcionalidad sin conexión (guarda los mapas vectoriales o teselas descargados en el almacenamiento del dispositivo) 
-\n - Mapas mundiales vectoriales compactos disponibles 
-\n - Descarga ilimitada de mapas de países o regiones directamente desde la aplicación 
-\n - Posibilidad de superponer varias capas de mapa, como GPX o rutas de navegación, Puntos de Interés, Favoritos, curvas de nivel, paradas de transporte público, mapas adicionales con transparencia personalizable 
-\n 
-\n - Búsqueda sin conexión de direcciones y sitios (PDI) 
-\n - Rutas sin conexión para distancias de rango medio 
-\n - Modos de automóvil, bicicleta y peatón con opcional: 
-\n - Cambio automático de modo diurno/nocturno 
-\n - Zoom del mapa según la velocidad 
-\n - Alineación del mapa, según brújula o dirección del movimiento 
-\n - Indicación de carriles, mostrar límites de velocidad, voces grabadas y sintetizadas 
+    <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions, y en español, Guía de Navegación Automatizada de OSM)
+\n
+\n OsmAnd+ es un software de navegación de código abierto con acceso a una amplia variedad de datos globales de OSM. Todos los datos del mapa (vectores y teselas), pueden ser almacenados en la memoria del teléfono para su uso sin conexión. Ofrece funcionalidades de rutas con y sin conexión, incluyendo guía de giro-a-giro por voz.
+\n
+\n OsmAnd+ es la versión de pago de la aplicación, comprándola ayudas al proyecto, financias el desarrollo de nuevas funciones, y recibes las últimas actualizaciones.
+\n
+\n Algunas de las funciones fundamentales:
+\n - Completa funcionalidad sin conexión (guarda los mapas vectoriales o teselas descargados en el almacenamiento del dispositivo)
+\n - Mapas mundiales vectoriales compactos disponibles
+\n - Descarga ilimitada de mapas de países o regiones directamente desde la aplicación
+\n - Posibilidad de superponer varias capas de mapa, como GPX o rutas de navegación, Puntos de Interés, Favoritos, curvas de nivel, paradas de transporte público, mapas adicionales con transparencia personalizable
+\n
+\n - Búsqueda sin conexión de direcciones y sitios (PDI)
+\n - Rutas sin conexión para distancias de rango medio
+\n - Modos de automóvil, bicicleta y peatón con opcional:
+\n - Cambio automático de modo diurno/nocturno
+\n - Zoom del mapa según la velocidad
+\n - Alineación del mapa, según brújula o dirección del movimiento
+\n - Indicación de carriles, mostrar límites de velocidad, voces grabadas y sintetizadas
 \n</string>
    <string name="filterpoi_activity">Crear filtro PDI</string>
    <string name="recalculate_route_to_your_location">Modo transporte:</string>
@ -1222,8 +1221,7 @@
    <string name="osmand_net_previously_installed">Todos los datos sin conexión en la versión vieja de OsmAnd son compatibles con la nueva versión, pero los puntos de Favoritos deben exportarse desde la versión vieja y luego, importarse en la nueva.</string>
    <string name="build_installed">Compilación {0} instalada ({1}).</string>
    <string name="downloading_build">Descargando compilación…</string>
-    <string name="install_selected_build">¿Instalar OsmAnd?
-\nVersión: {0}
+    <string name="install_selected_build">¿Instalar OsmAnd {0}\?
 \nFecha: {1}
 \nTamaño: {2} MB</string>
    <string name="loading_builds_failed">Error al recuperar la lista de compilaciones de OsmAnd</string>
@ -1992,7 +1990,6 @@
    <string name="route_stops_before">%1$s parada(s) anterior(es)</string>
    <string name="rendering_attr_hideOverground_name">Objetos en superficie</string>
    <string name="routing_attr_short_way_name">Ruta de bajo consumo (corta)</string>
-    <string name="routing_attr_short_way_description">Usa la ruta de menor consumo en combustible (usualmente la más corta).</string>
    <string name="replace_favorite_confirmation">¿Reemplazar el Favorito «%1$s»?</string>
    <string name="shared_string_change">Cambiar</string>
    <string name="get_started">Empezar</string>
@ -2063,7 +2060,7 @@
    <string name="shared_string_notifications">Notificaciones</string>
    <string name="gpx_no_tracks_title">Sin archivos de trazas aún</string>
    <string name="gpx_no_tracks_title_folder">También puedes añadir archivos de trazas a la carpeta</string>
-    <string name="gpx_add_track">Añadir GPX</string>
+    <string name="gpx_add_track">Añadir más…</string>
    <string name="shared_string_appearance">Aspecto</string>
    <string name="rendering_value_fine_name">Muy fino</string>
    <string name="route_calculation">Cálculo de la ruta</string>
@ -2438,7 +2435,7 @@
    <string name="average">Promedio</string>
    <string name="of">%1$d de %2$d</string>
    <string name="ascent_descent">Ascenso/Descenso</string>
-    <string name="moving_time">Tiempo moviéndose</string>
+    <string name="moving_time">Tiempo en movimiento</string>
    <string name="max_min">Máx/Min</string>
    <string name="min_max">Min/Máx</string>
    <string name="rendering_value_translucent_pink_name">Rosa translúcido</string>
@ -3650,7 +3647,7 @@
    <string name="system_screen_timeout">Usar el tiempo de espera de la pantalla del sistema</string>
    <string name="storage_format">Formato de almacenamiento</string>
    <string name="sqlite_db_file">Archivo SQLiteDB</string>
-    <string name="shared_string_tones">tonos</string>
+    <string name="shared_string_tones">toneladas</string>
    <string name="shared_string_night_map">Mapa nocturno</string>
    <string name="shared_string_meters">metros</string>
    <string name="shared_string_delete_all_q">¿Borrar todo\?</string>
@ -3728,8 +3725,8 @@
    <string name="route_between_points">Ruta entre puntos</string>
    <string name="plan_a_route">Planificar ruta</string>
    <string name="osm_edit_closed_note">Nota de OSM cerrada</string>
-    <string name="gpx_split_interval_none_descr">Marca la opción de división deseada: por tiempo o por distancia.</string>
-    <string name="gpx_split_interval_descr">Marca el intervalo en el que se mostrarán las marcas con distancia o tiempo en la traza.</string>
+    <string name="gpx_split_interval_none_descr">Elige la opción de división deseada: por tiempo o por distancia.</string>
+    <string name="gpx_split_interval_descr">Elige el intervalo de la traza en el que se mostrarán las marcas con la distancia o el tiempo.</string>
    <string name="gpx_direction_arrows">Flechas de dirección</string>
    <string name="app_mode_wheelchair_forward">Silla de ruedas (hacia adelante)</string>
    <string name="app_mode_wheelchair">Silla de ruedas</string>
@ -3934,7 +3931,6 @@
    <string name="plan_route_add_new_segment">Añadir nuevo segmento</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
    <string name="lang_de_casual">Alemán (casual)</string>
-    <string name="elevation_data">Puedes usar los datos de elevación para tener en cuenta el ascenso y descenso del viaje</string>
    <string name="app_mode_light_aircraft">Avión ligero</string>
    <string name="shared_string_last_used">Usado por última vez</string>
    <string name="routing_attr_prefer_hiking_routes_name">Preferir rutas de senderismo</string>
@ -3947,32 +3943,93 @@
    <string name="profile_type_user_string">Perfil de usuario</string>
    <string name="profile_type_osmand_string">Perfil de OsmAnd</string>
    <string name="profile_by_default_description">Elige el perfil que será usado al iniciar la aplicación.</string>
-    <string name="voice_prompts_timetable">Tiempo de indicaciones por voz</string>
+    <string name="voice_prompts_timetable">Tiempo de los avisos por voz</string>
    <string name="select_folder">Elegir carpeta</string>
    <string name="shared_string_folders">Carpetas</string>
    <string name="change_folder">Cambiar carpeta</string>
-    <string name="add_online_routing_engine"></string>
-    <string name="edit_online_routing_engine"></string>
-    <string name="shared_string_subtype"></string>
-    <string name="shared_string_vehicle"></string>
-    <string name="shared_string_api_key"></string>
-    <string name="shared_string_server_url"></string>
-    <string name="shared_string_enter_param"></string>
-    <string name="keep_it_empty_if_not"></string>
-    <string name="online_routing_example_hint"></string>
-    <string name="test_route_calculation"></string>
-    <string name="routing_engine_vehicle_type_driving"></string>
-    <string name="routing_engine_vehicle_type_foot"></string>
-    <string name="routing_engine_vehicle_type_bike"></string>
-    <string name="routing_engine_vehicle_type_car"></string>
-    <string name="message_error_recheck_parameters"></string>
-    <string name="copy_address"></string>
-    <string name="online_routing_engine"></string>
-    <string name="online_routing_engines"></string>
-    <string name="select_folder_descr"></string>
-    <string name="shared_string_empty"></string>
-    <string name="analyze_by_intervals"></string>
-    <string name="upload_to_openstreetmap"></string>
-    <string name="edit_track"></string>
-    <string name="rename_track"></string>
+    <string name="add_online_routing_engine">Añadir motor de navegación en línea</string>
+    <string name="edit_online_routing_engine">Editar motor de navegación en línea</string>
+    <string name="shared_string_subtype">Subtipo</string>
+    <string name="shared_string_vehicle">Vehículo</string>
+    <string name="shared_string_api_key">Clave de la API</string>
+    <string name="shared_string_server_url">URL del servidor</string>
+    <string name="shared_string_enter_param">Ingresa parámetro</string>
+    <string name="keep_it_empty_if_not">Si no, mantenerlo vacío</string>
+    <string name="online_routing_example_hint">La URL con todos los parámetros se verá así:</string>
+    <string name="test_route_calculation">Cálculo de la ruta de prueba</string>
+    <string name="routing_engine_vehicle_type_driving">Automóvil</string>
+    <string name="routing_engine_vehicle_type_foot">Peatón</string>
+    <string name="routing_engine_vehicle_type_bike">Bicicleta</string>
+    <string name="routing_engine_vehicle_type_car">Automóvil</string>
+    <string name="message_error_recheck_parameters"/>
+    <string name="copy_address">Copiar dirección</string>
+    <string name="online_routing_engine">Motor de navegación en línea</string>
+    <string name="online_routing_engines">Motores de navegación en línea</string>
+    <string name="select_folder_descr">Elegir carpeta o añadir una nueva</string>
+    <string name="shared_string_empty">Vacío</string>
+    <string name="analyze_by_intervals">Analizar intervalos divididos</string>
+    <string name="upload_to_openstreetmap">Subir a OpenStreetMap</string>
+    <string name="edit_track">Editar traza</string>
+    <string name="rename_track">Renombrar traza</string>
+    <string name="uploading_count">Subiendo %1$d de %2$d</string>
+    <string name="uploaded_count">Se subieron %1$d de %2$d</string>
+    <string name="upload_photo_completed">Subida completa</string>
+    <string name="upload_photo">Subiendo</string>
+    <string name="toast_select_edits_for_upload">Marcar ediciones a subir</string>
+    <string name="start_recording">Iniciar grabación</string>
+    <string name="show_track_on_map">Mostrar traza en el mapa</string>
+    <string name="shared_string_turn">Girar</string>
+    <string name="shared_string_sec">seg</string>
+    <string name="routing_engine_vehicle_type_wheelchair">Silla de ruedas</string>
+    <string name="routing_engine_vehicle_type_walking">Peatón</string>
+    <string name="routing_engine_vehicle_type_truck">Camión</string>
+    <string name="routing_engine_vehicle_type_small_truck">Camión pequeño</string>
+    <string name="routing_engine_vehicle_type_scooter">Motoneta</string>
+    <string name="routing_engine_vehicle_type_racingbike">Bicicleta de carreras</string>
+    <string name="routing_engine_vehicle_type_mtb">Bicicleta de montaña</string>
+    <string name="routing_engine_vehicle_type_hiking">Senderismo</string>
+    <string name="routing_engine_vehicle_type_hgv">Vehículos pesados</string>
+    <string name="routing_engine_vehicle_type_cycling_road">Ciclismo de ruta</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">Ciclismo regular</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">Ciclismo de montaña</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">Ciclismo eléctrico</string>
+    <string name="opr_use_dev_url">Usar test.openplacereviews.org</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews es un proyecto impulsado por la comunidad sobre lugares públicos como restaurantes, hoteles, museos, puntos de referencia. Recoge toda la información pública sobre ellos como fotos, reseñas, enlaces a otros servicios como OpenStreetMap y Wikipedia.
+\n
+\nTodos los datos de OpenPlaceReviews son abiertos y están disponibles para todos: http://openplacereviews.org/data.
+\n
+\nPuedes leer más en: https://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="message_server_error">Error de servidor: %1$s</string>
+    <string name="message_name_is_already_exists">El nombre ya existe</string>
+    <string name="login_open_place_reviews">Acceder a OpenPlaceReviews</string>
+    <string name="hillshade_slope_contour_lines">Sombreado / Pendiente / Curvas de nivel</string>
+    <string name="delete_waypoints">Borrar puntos de referencia</string>
+    <string name="delete_online_routing_engine">¿Borrar este motor de navegación en línea\?</string>
+    <string name="copy_to_map_markers">Copiar a «Marcadores del mapa»</string>
+    <string name="copy_to_map_favorites">Copiar a favoritos</string>
+    <string name="context_menu_read_full">Leer completo</string>
+    <string name="context_menu_edit_descr">Editar descripción</string>
+    <string name="announcement_time_title">Tiempo de anuncio</string>
+    <string name="announcement_time_prepare_long">Preparación larga</string>
+    <string name="announcement_time_prepare">Preparar</string>
+    <string name="announcement_time_passing">Pasando</string>
+    <string name="announcement_time_off_route">Fuera de la ruta</string>
+    <string name="announcement_time_intervals">Intervalos de tiempo y distancia</string>
+    <string name="announcement_time_descr">El tiempo de anuncio de las diferentes indicaciones por voz depende del tipo de mensaje, la velocidad de navegación actual y la velocidad de navegación predefinida.</string>
+    <string name="announcement_time_arrive">Has llegado al destino</string>
+    <string name="announcement_time_approach">Acercarse</string>
+    <string name="activity_type_winter_name">Invierno</string>
+    <string name="activity_type_water_name">Agua</string>
+    <string name="activity_type_walking_name">Peatón</string>
+    <string name="activity_type_snowmobile_name">Motonieve</string>
+    <string name="activity_type_running_name">Correr</string>
+    <string name="activity_type_riding_name">Equitación</string>
+    <string name="activity_type_racing_name">Carreras</string>
+    <string name="activity_type_offroad_name">Todo terreno</string>
+    <string name="activity_type_mountainbike_name">Bicicleta de montaña</string>
+    <string name="activity_type_motorbike_name">Motocicleta</string>
+    <string name="activity_type_hiking_name">Senderismo</string>
+    <string name="activity_type_cycling_name">Bicicleta</string>
+    <string name="activity_type_car_name">Automóvil</string>
 </resources>
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@ -3582,7 +3582,7 @@
    <string name="poi_charcoal_pile">Pila de carbón vegetal</string>
    <string name="poi_historic_tank">Tanque histórico</string>
    <string name="poi_hookah_lounge">Salón del narguile</string>
-    <string name="poi_source_biomass">Fuente de energía: biomasa</string>
+    <string name="poi_generator_source_biomass">Fuente de energía: biomasa</string>
    <string name="poi_snowmobile_filter">Acceso para motos de nieve</string>
    <string name="poi_access_bus">Acceso al autobús</string>
    <string name="poi_access_caravan">Acceso a la caravana</string>
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@ -825,7 +825,6 @@
 \n - Indicación de carriles, mostrar límites de velocidad, voces grabadas y sintetizadas 
 \n</string>
    <string name="avoid_motorway">Sin autopistas</string>
-    <string name="snap_to_road_descr">Ajusta la ubicación al camino durante la navegación.</string>
    <string name="snap_to_road">Ajustar al camino</string>
    <string name="context_menu_item_first_intermediate_point">Añadir como primer destino intermedio</string>
    <string name="context_menu_item_last_intermediate_point">Añadir como último destino intermedio</string>
@ -1988,7 +1987,6 @@
    <string name="update_all_maps_now">¿Actualizar todos los mapas ahora?</string>
    <string name="clear_tile_data">Limpiar todas las teselas</string>
    <string name="routing_attr_short_way_name">Ruta de bajo consumo (corta)</string>
-    <string name="routing_attr_short_way_description">Usa la ruta de menor consumo en combustible (usualmente la más corta).</string>
    <string name="replace_favorite_confirmation">¿Reemplazar el Favorito «%1$s»?</string>
    <string name="rendering_attr_hideOverground_name">Objetos en superficie</string>
    <string name="shared_string_change">Cambiar</string>
@ -3927,7 +3925,6 @@
    <string name="select_items_for_import">Seleccione los elementos que se importarán.</string>
    <string name="use_dev_url_descr">Cambie para usar dev.openstreetmap.org en lugar de openstreetmap.org para probar la carga de OSM Note / POI / GPX.</string>
    <string name="use_dev_url">Usar dev.openstreetmap.org</string>
-    <string name="elevation_data">Puede utilizar los datos de elevación para tener en cuenta el ascenso/descenso de su viaje</string>
    <string name="app_mode_light_aircraft">Aeronave ligera</string>
    <string name="plan_route_join_segments">Unir segmentos</string>
    <string name="plan_route_split_before">Dividir antes</string>
--- a/OsmAnd/res/values-et/phrases.xml
+++ b/OsmAnd/res/values-et/phrases.xml
@ -3596,7 +3596,7 @@
    <string name="poi_charcoal_pile">Puusöe hunnik</string>
    <string name="poi_historic_tank">Ajalooline tank</string>
    <string name="poi_hookah_lounge">Vesipiibu salong</string>
-    <string name="poi_source_biomass">Energiaallikas: biomass</string>
+    <string name="poi_generator_source_biomass">Energiaallikas: biomass</string>
    <string name="poi_taxi_office">Takso kontor</string>
    <string name="poi_vehicle_yes">Sõidukiga ligipääs: jah</string>
    <string name="poi_vehicle_private">Sõidukiga ligipääs: privaatne</string>
--- a/OsmAnd/res/values-et/strings.xml
+++ b/OsmAnd/res/values-et/strings.xml
@ -1469,7 +1469,6 @@
    <string name="routing_attr_prefer_motorway_name">Eelista kiirteid</string>
    <string name="routing_attr_prefer_motorway_description">Eelista kiirteid</string>
    <string name="routing_attr_short_way_name">Kütusesäästlik tee</string>
-    <string name="routing_attr_short_way_description">Kasuta kütusesäästlikku teed (tavaliselt lühem).</string>
    <string name="routing_attr_avoid_toll_name">Väldi tasulisi teid</string>
    <string name="routing_attr_avoid_toll_description">Väldib tasulisi teid</string>
    <string name="routing_attr_avoid_unpaved_name">Väldi sillutamata teid</string>
@ -1691,7 +1690,6 @@
    <string name="use_compass_navigation">Kasuta kompassi</string>
    <string name="avoid_motorway">Väldi kiirteid</string>
    <string name="auto_zoom_map">Automaatne kaardi suurendamine</string>
-    <string name="snap_to_road_descr">Hoia navigeerimise ajal asukoht teel.</string>
    <string name="snap_to_road">Kinnitu teele</string>
    <string name="interrupt_music_descr">Hääljuhised peatavad muusika esitamise.</string>
    <string name="interrupt_music">Peata muusika</string>
@ -3841,7 +3839,6 @@
    <string name="markers_history">Markerite ajalugu</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
    <string name="app_mode_light_aircraft">Kerglennukid</string>
-    <string name="elevation_data">Võid kasutada kõugusandmeid teekonna tõusu ja laskumise arvutamisel</string>
    <string name="plan_route_add_new_segment">Lisa uus lõik</string>
    <string name="plan_route_split_after">Tükelda pärast</string>
    <string name="plan_route_split_before">Tükelda enne</string>
--- a/OsmAnd/res/values-eu/phrases.xml
+++ b/OsmAnd/res/values-eu/phrases.xml
@ -3575,7 +3575,7 @@
    <string name="poi_changing_table_fee_no">Aldatzeko mahaia ordainpekoa: ez</string>
    <string name="poi_charcoal_pile">Ikatz meta</string>
    <string name="poi_historic_tank">Tanke historikoa</string>
-    <string name="poi_source_biomass">Energia iturria: biomasa</string>
+    <string name="poi_generator_source_biomass">Energia iturria: biomasa</string>
    <string name="poi_rescue_box">Salbamendu kutxa</string>
    <string name="poi_access_bus">Autobusetarako sarbidea</string>
    <string name="poi_access_caravan">Karabanetarako sarbidea</string>
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@ -234,7 +234,6 @@
    <string name="avoid_motorway">Autobiderik ez</string>
    <string name="auto_zoom_map_descr">Zooma maila abiaduraren arabera (mapa uneko kokapenarekin sinkronizatua dagoela).</string>
    <string name="auto_zoom_map">Auto zoom-a egin mapan</string>
-    <string name="snap_to_road_descr">Atxikitu kokapena errepidera nabigatu bitartean.</string>
    <string name="snap_to_road">Atxikitu errepidera</string>
    <string name="osmand_play_title_30_chars">OsmAnd Maps &amp; Nabigazioa</string>
    <string name="osmand_short_description_80_chars">Mapa ikusle eta nabigatzaile mugikor globala lineaz kanpoko eta sare bidezko OSM mapetarako</string>
@ -1996,7 +1995,6 @@ mapak eta nabigazioa</string>
    <string name="update_all_maps_now">Eguneratu mapa guztiak orain?</string>
    <string name="clear_tile_data">Garbitu tesela guztiak</string>
    <string name="routing_attr_short_way_name">Bide erregai-efizientea</string>
-    <string name="routing_attr_short_way_description">Erabili bide erregai-efizientea (normalean laburragoa).</string>
    <string name="replace_favorite_confirmation">Ziur %1$s gogokoa ordezkatu nahi duzula?</string>
    <string name="shared_string_change">Aldatu</string>
    <string name="get_started">Hasi</string>
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@ -503,7 +503,6 @@
    <string name="show_warnings_descr">پیکربندی‌های مربوط به هشدارهای ترافیکی (مانند محدودیت‌های سرعت، توقف‌های اجباری، سرعتگیرها، تونل‌ها)، اخطارهای دوربین سرعت و اطلاعات خط عبوری را انجام دهید.</string>
    <string name="use_compass_navigation_descr">اگر جهت شناسایی نشد از قطب‌نما استفاده شود.</string>
    <string name="avoid_motorway">آزادراه</string>
-    <string name="snap_to_road_descr">در هنگام ناوبری، موقعیت را به جاده‌ها بچسبان.</string>
    <string name="snap_to_road">چسبیدن به راه</string>
    <string name="osmand_play_title_30_chars">نقشه و ناوبری با OsmAnd</string>
    <string name="osmand_short_description_80_chars">برنامهٔ همراه برای مشاهدهٔ نقشه جهانی و ناوبری با نقشه‌های آفلاین و آنلاین OSM</string>
@ -1651,7 +1650,6 @@
    <string name="update_all_maps_now">اکنون همهٔ نقشه‌ها را به‌روز می‌کنید؟</string>
    <string name="clear_tile_data">پاک‌کردن همهٔ کاشی‌ها</string>
    <string name="routing_attr_short_way_name">راه صرفه‌جویی سوخت</string>
-    <string name="routing_attr_short_way_description">انتخاب راه مناسب برای مصرف سوخت کمتر (معمولاً کوتاه‌تر).</string>
    <string name="replace_favorite_confirmation">آیا این نقطهٔ جدید را جانشین «%1$s» می‌کنید؟</string>
    <string name="rendering_attr_hideOverground_name">اشیای روی زمین</string>
    <string name="shared_string_change">تغییر</string>
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@ -33,7 +33,6 @@
    <string name="use_compass_navigation">Käytä kompassia</string>
    <string name="avoid_motorway">Vältä moottoriteitä</string>
    <string name="auto_zoom_map">Automaattinen kartan zoomaus</string>
-    <string name="snap_to_road_descr">Kiinnitä sijainti teihin navigoinnin aikana</string>
    <string name="snap_to_road">Kiinnitä tiehen</string>
    <string name="osmand_short_description_80_chars">OsmAnd on avoimen lähdekoodin navigointisovellus offline ja online kartoille</string>
    <string name="osmand_plus_short_description_80_chars">OsmAnd on avoimen lähdekoodin navigointisovellus offline ja online kartoille</string>
@ -876,7 +875,6 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
    <string name="update_all_maps_now">Päivitetäänkö kaikki kartat nyt?</string>
    <string name="clear_tile_data">Poista kaikki tiilet</string>
    <string name="routing_attr_short_way_name">Polttoainetaloudellinen reitti</string>
-    <string name="routing_attr_short_way_description">Käytä polttoainetta säästävää reittiä (tavallisesti lyhin).</string>
    <string name="shared_string_change">Muuta</string>
    <string name="get_started">Aloita</string>
    <string name="coords_search">Koordinaattihaku</string>
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@ -3531,7 +3531,7 @@
    <string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
    <string name="poi_socket_as3112_yes">AS/NZS 3112</string>
    <string name="poi_historic_tank">Tank historique</string>
-    <string name="poi_source_biomass">Source d\'énergie : biomasse</string>
+    <string name="poi_generator_source_biomass">Source d\'énergie : biomasse</string>
    <string name="poi_cuisine_buschenschank">Buschenschank</string>
    <string name="poi_cuisine_deli">Épicerie fine</string>
    <string name="poi_motorcycle_type_dualsport">Trail (moto)</string>
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@ -781,7 +781,6 @@
    <string name="int_continuosly">En continu</string>
    <string name="osmand_short_description_80_chars">Logiciel de cartographie et de navigation fonctionnant avec des cartes OSM hors-ligne et en ligne</string>
    <string name="osmand_plus_short_description_80_chars">OsmAnd est un logiciel libre de navigation pouvant fonctionner avec des cartes hors-ligne ou en ligne</string>
-    <string name="snap_to_road_descr">Déplacer la position sur la route en cours de navigation.</string>
    <string name="snap_to_road">Déplacer sur la route</string>
    <string name="osmand_long_description_1000_chars">OsmAnd (OSM Automated Navigation Directions) 
 \n 
@ -1984,7 +1983,6 @@
    <string name="shared_string_change">Modifier</string>
    <string name="get_started">Démarrer</string>
    <string name="routing_attr_short_way_name">Trajet économe en carburant</string>
-    <string name="routing_attr_short_way_description">Suivre un trajet économe en carburant (habituellement plus court).</string>
    <string name="skip_map_downloading">Ignorer le téléchargement des cartes</string>
    <string name="skip_map_downloading_desc">Aucune carte hors ligne n\'est installée. Vous pouvez sélectionner une carte dans la liste ou télécharger une carte plus tard depuis le menu « %1$s ».</string>
    <string name="search_another_country">Sélectionner une autre région</string>
@ -3290,7 +3288,7 @@
    <string name="added_profiles_descr">Profils ajoutés par le greffon</string>
    <string name="shared_string_turn_off">Désactiver</string>
    <string name="new_plugin_added">Nouveau greffon ajouté</string>
-    <string name="join_segments">Relier les segments</string>
+    <string name="join_segments">Joindre les segments</string>
    <string name="add_new_profile_q">Ajouter le profil \'%1$s\' \?</string>
    <string name="save_heading">Inclure la direction</string>
    <string name="save_heading_descr">Inclure la direction de chaque point lors de l\'enregistrement d\'une trace.</string>
@ -3907,7 +3905,6 @@
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
    <string name="lang_de_casual">Allemand (courant)</string>
    <string name="app_mode_light_aircraft">Aviation légère</string>
-    <string name="elevation_data">Vous pouvez utiliser l\'altitude pour prendre en compte le dénivellé de votre itinéraire</string>
    <string name="gpx_upload_trackable_visibility_descr">« Traçable » signifie que la trace ne s\'affichera pas dans les listes publiques, mais que les points de cheminement horodatés qu\'elle contient seront téléchargeables depuis l\'API GPS publique (ces points sont traités afin de n\'avoir aucun lien direct avec vous).</string>
    <string name="release_3_9">• Ajout d\'une option pour exporter et importer toutes les données, y compris les paramètres, les ressources, mes lieux
 \n
@ -3959,7 +3956,7 @@
    <string name="shared_string_empty">Vide</string>
    <string name="announcement_time_approach">Approche</string>
    <string name="announcement_time_prepare">Préparation</string>
-    <string name="announcement_time_prepare_long">Longue préparation</string>
+    <string name="announcement_time_prepare_long">Préparation longue</string>
    <string name="announcement_time_arrive">Arrivé à destination</string>
    <string name="shared_string_turn">Bifurcation</string>
    <string name="show_track_on_map">Afficher la trace sur la carte</string>
@ -4005,4 +4002,22 @@
    <string name="open_place_reviews">OpenPlaceReviews</string>
    <string name="opr_use_dev_url">Utilisez test.openplacereviews.org</string>
    <string name="login_open_place_reviews">Se connecter à OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Eau</string>
+    <string name="activity_type_winter_name">Hiver</string>
+    <string name="activity_type_snowmobile_name">Motoneige</string>
+    <string name="activity_type_cycling_name">Vélo</string>
+    <string name="activity_type_mountainbike_name">VTT</string>
+    <string name="activity_type_hiking_name">Randonnée</string>
+    <string name="activity_type_running_name">Course à pied</string>
+    <string name="activity_type_walking_name">Marche</string>
+    <string name="activity_type_car_name">Voiture</string>
+    <string name="activity_type_riding_name">Promenade</string>
+    <string name="activity_type_offroad_name">Voies non revêtues</string>
+    <string name="activity_type_motorbike_name">Moto</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews est un projet communautaire sur les lieux publics comme les restaurants, hôtels, musées… Il recueille toutes les informations publiques les concernant telles que des photos, des avis, des liens vers d\'autres systèmes, des liens vers OpenStreetMap ou Wikipedia.
+\n
+\nToutes les données d\'OpenPlaceReview sont ouvertes et accessibles à tous sur http://openplacereviews.org/data.
+\n
+\nPour en savoir, consultez http://openplacereviews.org.</string>
+    <string name="activity_type_racing_name">Course automobile</string>
 </resources>
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@ -3582,7 +3582,7 @@
    <string name="poi_charcoal_pile">Morea de carbón</string>
    <string name="poi_historic_tank">Tanque histórico</string>
    <string name="poi_hookah_lounge">Bar de cachimbas</string>
-    <string name="poi_source_biomass">Fonte de enerxía: biomasa</string>
+    <string name="poi_generator_source_biomass">Fonte de enerxía: biomasa</string>
    <string name="poi_snowmobile_filter">Acesso para motos de neve</string>
    <string name="poi_access_bus">Acceso para buses</string>
    <string name="poi_access_caravan">Acceso para caravanas</string>
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@ -494,7 +494,6 @@
    <string name="avoid_motorway">Sen autoestradas</string>
    <string name="auto_zoom_map_descr">Variar o achegamento do mapa segundo a velocidade (mentres o mapa estiver sincronizado coa posición actual).</string>
    <string name="auto_zoom_map">Achegamento automático do mapa</string>
-    <string name="snap_to_road_descr">Axustar a posición ás estradas durante a navegación.</string>
    <string name="snap_to_road">Axustar á estrada</string>
    <string name="interrupt_music_descr">As indicacións por voz deteñen a reprodución de música.</string>
    <string name="interrupt_music">Deter a música</string>
@ -1976,7 +1975,6 @@ Lon %2$s</string>
    <string name="access_tree_list">Listaxe en árbore</string>
    <string name="osmand_plus_banner_desc">Descargas ilimitadas dos mapas, actualizacións e plugin da Wikipedia.</string>
    <string name="routing_attr_short_way_name">Camiño con aforro no combustíbel</string>
-    <string name="routing_attr_short_way_description">Empregar o camiño con aforro no combustíbel (normalmente máis curto).</string>
    <string name="shared_string_change">Mudar</string>
    <string name="get_started">Comezar</string>
    <string name="route_stops_before">%1$s paradas antes</string>
@ -3928,7 +3926,6 @@ Lon %2$s</string>
 \nWeb / Wikimedia - imaxes POI segundo datos do OpenStreetMap.</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
    <string name="lang_de_casual">Alemán casual</string>
-    <string name="elevation_data">Podes empregar os datos de elevación para ter en conta o ascenso e descenso da viaxe</string>
    <string name="app_mode_light_aircraft">Avión lixeiro</string>
    <string name="plan_route_join_segments">Unir segmentos</string>
    <string name="plan_route_split_before">Dividir antes</string>
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@ -1421,4 +1421,49 @@
    <string name="keep_both">Zadrzi oboje</string>
    <string name="import_duplicates_title">Neke stavke već postoje</string>
    <string name="select_data_to_import">Odaberite podatke koje želite uvesti.</string>
+    <string name="routing_engine_vehicle_type_wheelchair">Invalidska kolica</string>
+    <string name="routing_engine_vehicle_type_hiking">Planinarenje</string>
+    <string name="routing_engine_vehicle_type_walking">Pješačenje</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">Električni biciklizam</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">Planinski biciklizam</string>
+    <string name="routing_engine_vehicle_type_cycling_road">Cestovni biciklizam</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">Standardni biciklizam</string>
+    <string name="routing_engine_vehicle_type_hgv">Teretni kamion</string>
+    <string name="routing_engine_vehicle_type_small_truck">Mali kamion</string>
+    <string name="routing_engine_vehicle_type_truck">Kamion</string>
+    <string name="routing_engine_vehicle_type_scooter">Skuter</string>
+    <string name="routing_engine_vehicle_type_racingbike">Trkaći bicikl</string>
+    <string name="routing_engine_vehicle_type_mtb">Planinski bicikl</string>
+    <string name="message_server_error">Pogreška na poslužitelju: %1$s</string>
+    <string name="message_name_is_already_exists">Ovo ime već postoji</string>
+    <string name="delete_online_routing_engine">Izbrisati ovaj mrežni usmjerivač\?</string>
+    <string name="context_menu_edit_descr">Uredi opis</string>
+    <string name="delete_waypoints">Obriši putne točke</string>
+    <string name="copy_to_map_markers">Kopiraj u oznake na karti</string>
+    <string name="copy_to_map_favorites">Kopiraj u favorite</string>
+    <string name="upload_photo">Prenošenje</string>
+    <string name="upload_photo_completed">Prijenos završen</string>
+    <string name="uploading_count">Prenosi se %1$d od %2$d</string>
+    <string name="uploaded_count">Preneseno %1$d od %2$d</string>
+    <string name="toast_select_edits_for_upload">Odaberite uređivanja za prijenos</string>
+    <string name="hillshade_slope_contour_lines">Linije padine / Kosine / Konture</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews je projekt, razvijan od strane zajednice, koji daje informacije o mjestima kao što su restorani, hoteli, muzeji, putne točke. Ovaj projekt sakuplja sve javne informacije o tim mjestima, kao što su slike, recenzije, linkovi na druge sustave OpenStreetMap, Wikipedia.
+\n
+\nSvi OpenPlaceReview podaci su javni i dostupni svima: http://openplacereviews.org/data.
+\n
+\nPročitajte više na: http://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">Koristiti test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Prijavite se za OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Voda</string>
+    <string name="activity_type_winter_name">Zima</string>
+    <string name="activity_type_snowmobile_name">Motorne sanke</string>
+    <string name="activity_type_racing_name">Trkanje</string>
+    <string name="activity_type_mountainbike_name">Planinski bicikl</string>
+    <string name="activity_type_cycling_name">Bicikliranje</string>
+    <string name="activity_type_hiking_name">Planinarenje</string>
+    <string name="activity_type_running_name">Trčanje</string>
+    <string name="activity_type_walking_name">Pješačenje</string>
+    <string name="activity_type_motorbike_name">Motocikl</string>
+    <string name="activity_type_car_name">Auto</string>
 </resources>
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@ -54,7 +54,7 @@
    <string name="poi_service_tyres">Autógumi-szerelő</string>
    <string name="poi_car_wash">Autómosó</string>
    <string name="poi_fuel">Benzinkút;Töltőállomás;Gázolajtöltő-állomás</string>
-    <string name="poi_electricity_combined_charging">Elektromos töltőállomás</string>
+    <string name="poi_electricity_combined_charging">Elektromos töltőállomás;Elektromos autó töltése;Villanyautó töltése;Elektromos töltőpont</string>
    <string name="poi_compressed_air">Sűrített levegő</string>
    <string name="poi_parking">Parkoló</string>
    <string name="poi_motorcycle_parking">Motorkerékpár-parkoló</string>
@ -3582,7 +3582,7 @@
    <string name="poi_charcoal_pile">Faszénégető boksa</string>
    <string name="poi_historic_tank">Történelmi harckocsi</string>
    <string name="poi_hookah_lounge">Vízipipázó társalgóhely</string>
-    <string name="poi_source_biomass">Energiaforrás: biomassza</string>
+    <string name="poi_generator_source_biomass">Energiaforrás: biomassza</string>
    <string name="poi_taxi_office">Taxiiroda</string>
    <string name="poi_cellar_entrance">Pincebejárat</string>
    <string name="poi_craft_builder">Kőműves</string>
@ -3879,4 +3879,14 @@
    <string name="poi_wildlife_crossing_bat_tunnel">Denevéralagút</string>
    <string name="poi_wildlife_crossing_bat_bridge">Denevérhíd</string>
    <string name="poi_wildlife_crossing">Vadátjáró</string>
+    <string name="poi_summit_register_no">Csúcsnapló nincs</string>
+    <string name="poi_summit_register_yes">Csúcsnapló van</string>
+    <string name="poi_patrolled_no">Hegyi mentő nincs</string>
+    <string name="poi_patrolled_yes">Hegyi mentő van</string>
+    <string name="poi_gladed_yes">Erdei pálya</string>
+    <string name="poi_mobile_library">Mozgó könyvtár tartózkodási helye</string>
+    <string name="poi_piste_status_closed">Pálya állapota: zárva</string>
+    <string name="poi_piste_status_open">Pálya állapota: nyitva</string>
+    <string name="poi_piste_name">Pálya neve</string>
+    <string name="poi_piste_ski_jump">Síugrósánc</string>
 </resources>
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@ -822,7 +822,6 @@
 \n</string>
    <string name="osmand_plus_short_description_80_chars">Globális mobil térkép és navigáció, offline és online OSM térképekkel</string>
    <string name="avoid_motorway">Autópálya nélkül</string>
-    <string name="snap_to_road_descr">Úthoz rögzítés navigáció közben.</string>
    <string name="snap_to_road">Úthoz illesztés</string>
    <string name="add_as_last_destination_point">Hozzáadás utolsó köztes célpontként</string>
    <string name="add_as_first_destination_point">Hozzáadás első köztes célpontként</string>
@ -2010,7 +2009,6 @@
    <string name="update_all_maps_now">Frissíted most az összes térképet?</string>
    <string name="clear_tile_data">Összes csempe törlése</string>
    <string name="routing_attr_short_way_name">Üzemanyag-takarékos útvonal</string>
-    <string name="routing_attr_short_way_description">Üzemanyag-takarékos útvonal tervezése (általában rövidebb).</string>
    <string name="replace_favorite_confirmation">Lecseréled a(z) %1$s Kedvencet\?</string>
    <string name="driving_region_australia">Ausztrália</string>
    <string name="get_for">Beszerzés %1$s-ért</string>
@ -3166,7 +3164,7 @@
    <string name="routing_attr_allow_expert_description">Rendkívül nehéz útvonalak veszélyes akadályokkal és környezettel.</string>
    <string name="routing_attr_allow_skating_only_name">Csak korcsolyázó mozgással futható utak engedélyezése</string>
    <string name="routing_attr_allow_skating_only_description">Szabad vagy korcsolyázó stílushoz karbantartott utak, klasszikus nyomok nélkül.</string>
-    <string name="routing_attr_allow_classic_only_description">Klasszikus stílushoz karbantartott útvonalak, korcsolyázó nyomok nélkül. Ide tartoznak a kisebb hójárókkal karbantartott lazább pályájú útvonalak és a síelők által kézzel karbantartott nyomok is.</string>
+    <string name="routing_attr_allow_classic_only_description">Klasszikus stílushoz karbantartott útvonalak, korcsolyázó nyomok nélkül. Ide tartoznak a kisebb motoros szánokkal karbantartott lazább pályájú útvonalak és a síelők által kézzel karbantartott nyomok is.</string>
    <string name="rendering_attr_highway_class_track_grade1_name">1. osztály (burkolt)</string>
    <string name="rendering_attr_highway_class_track_grade2_name">2. osztály (kavicsos)</string>
    <string name="rendering_attr_highway_class_track_grade3_name">3. osztály (kemény földút)</string>
@ -3912,7 +3910,6 @@
    <string name="select_picture">Kép kijelölése</string>
    <string name="lang_de_casual">német (tegeződő)</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
-    <string name="elevation_data">A magassági adatok felhasználásával figyelembe veheti az utazás során az emelkedést / lejtést</string>
    <string name="app_mode_light_aircraft">Könnyű légi jármű</string>
    <string name="plan_route_split_before">Elvágás előtte</string>
    <string name="plan_route_split_after">Elvágás utána</string>
@ -3961,7 +3958,7 @@
    <string name="select_folder">Mappa kijelölése</string>
    <string name="select_folder_descr">Mappa kijelölése vagy új hozzáadása</string>
    <string name="shared_string_empty">Üres</string>
-    <string name="analyze_by_intervals">Intervallumonkénti elemzés (felosztási intervallumok)</string>
+    <string name="analyze_by_intervals">Elemzés felosztási intervallumonként</string>
    <string name="upload_to_openstreetmap">Feltöltés az OpenStreetMapre</string>
    <string name="edit_track">Nyomvonal szerkesztése</string>
    <string name="rename_track">Nyomvonal átnevezése</string>
@ -4005,4 +4002,26 @@
    <string name="uploading_count">%1$d / %2$d feltöltés alatt</string>
    <string name="uploaded_count">%1$d / %2$d feltöltve</string>
    <string name="toast_select_edits_for_upload">Szerkesztések kijelölése feltöltéshez</string>
+    <string name="activity_type_snowmobile_name">Motoros szán</string>
+    <string name="hillshade_slope_contour_lines">Domborzatárnyékolás / lejtés / szintvonalak</string>
+    <string name="open_place_reviews_plugin_description">Az OpenPlaceReviews egy közösségvezérelt projekt nyilvános helyekről (éttermek, szállodák, múzeumok, útpontok). Minden nyilvános információt összegyűjt róluk, például fényképeket, értékelésüket, más rendszerek – OpenStreetMap, Wikipedia – linkeket.
+\n
+\nMinden OpenPlaceReview-adat nyitott és mindenki számára elérhető itt: https://openplacereviews.org/data.
+\n
+\nBővebben itt olvashat: https://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">A test.openplacereviews.org használata</string>
+    <string name="login_open_place_reviews">Bejelentkezés az OpenPlaceReviews-ba</string>
+    <string name="activity_type_water_name">Víz</string>
+    <string name="activity_type_winter_name">Tél</string>
+    <string name="activity_type_riding_name">Lovaglás</string>
+    <string name="activity_type_racing_name">Versenykerékpározás</string>
+    <string name="activity_type_mountainbike_name">Hegyi kerékpározás</string>
+    <string name="activity_type_cycling_name">Kerékpározás</string>
+    <string name="activity_type_hiking_name">Túrázás</string>
+    <string name="activity_type_running_name">Futás</string>
+    <string name="activity_type_walking_name">Séta</string>
+    <string name="activity_type_offroad_name">Terepjáró</string>
+    <string name="activity_type_motorbike_name">Motorkerékpár</string>
+    <string name="activity_type_car_name">Személyautó</string>
 </resources>
--- a/OsmAnd/res/values-hy/strings.xml
+++ b/OsmAnd/res/values-hy/strings.xml
@ -430,7 +430,6 @@
    <string name="update_all_maps_now">Թարմացնել բոլոր քարտեզները հիմա?</string>
    <string name="clear_tile_data">Ջնջել բոլոր տայլերը</string>
    <string name="routing_attr_short_way_name">Վառելիք տնտեսող ճանապարհ</string>
-    <string name="routing_attr_short_way_description">Կիրառել վառելիք տնտեսող ճանապարհ (սովորաբար ավելի կարճ)։</string>
    <string name="replace_favorite_confirmation">Վստահ եք, որ ցանկանում եք փոխարինել Սիրածները %1$s\?</string>
    <string name="rendering_attr_hideOverground_name">Վերգետնյա օբյեկտներ</string>
    <string name="shared_string_change">Փոխել</string>
@ -1437,7 +1436,6 @@
    <string name="avoid_motorway">Առանց ավտոմայրուղիներից</string>
    <string name="auto_zoom_map_descr">Ավտոմատ կերպով փոխել քարտեզի մասշտաբը ըստ արագությանը։</string>
    <string name="auto_zoom_map">Ավտո-մասշտաբ</string>
-    <string name="snap_to_road_descr">Կապել ընթացիկ դիրքը ճանապարհին։</string>
    <string name="snap_to_road">Կապել ճանապարհին</string>
    <string name="interrupt_music_descr">Ձայնային հրահանգներ դադարեցնում են երաժշտության նվագումը։</string>
    <string name="interrupt_music">Ընդհատել երաժշտությունը</string>
--- a/OsmAnd/res/values-id/strings.xml
+++ b/OsmAnd/res/values-id/strings.xml
@ -424,7 +424,6 @@
    <string name="update_all_maps_now">Apakah anda ingin memperbahurui semua peta sekarang?</string>
    <string name="clear_tile_data">Bersihkan Semua ubin</string>
    <string name="routing_attr_short_way_name">Cara hemat bahan bakar</string>
-    <string name="routing_attr_short_way_description">Gunakan cara hemat bahan bakar (biasanya lebih pendek).</string>
    <string name="replace_favorite_confirmation">Apakah kamu yakin kamu ingin mengganti favorit %1$s?</string>
    <string name="rendering_attr_hideOverground_name">Benda-benda di atas tanah</string>
    <string name="shared_string_change">Ganti</string>
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@ -3582,7 +3582,7 @@
    <string name="poi_charcoal_pile">Kolahaugur</string>
    <string name="poi_historic_tank">Sögulegur tankur</string>
    <string name="poi_hookah_lounge">Hookah-skáli</string>
-    <string name="poi_source_biomass">Orkugjafi: lífmassi</string>
+    <string name="poi_generator_source_biomass">Orkugjafi: lífmassi</string>
    <string name="poi_snowmobile_filter">Aðgangur vélsleða</string>
    <string name="poi_access_bus">Aðgangur fólksflutningabíla</string>
    <string name="poi_access_caravan">Aðgangur hjólhýsa</string>
@ -3881,4 +3881,14 @@
    <string name="poi_wildlife_crossing_bat_bridge">Brú fyrir leðurblökur</string>
    <string name="poi_wildlife_crossing">Þverun villtra dýra</string>
    <string name="poi_swimming_area">Sundsvæði</string>
+    <string name="poi_mobile_library">Stæði fyrir bókabíl</string>
+    <string name="poi_summit_register_no">Skráning á tind: nei</string>
+    <string name="poi_summit_register_yes">Skráning á tind: já</string>
+    <string name="poi_piste_status_closed">Staða brautar: lokuð</string>
+    <string name="poi_piste_status_open">Staða brautar: opin</string>
+    <string name="poi_patrolled_no">Eftirlit: nei</string>
+    <string name="poi_patrolled_yes">Eftirlit: já</string>
+    <string name="poi_gladed_yes">Skafið: já</string>
+    <string name="poi_piste_name">Heiti brautar</string>
+    <string name="poi_piste_ski_jump">Skíðastökk</string>
 </resources>
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@ -1374,7 +1374,6 @@
    <string name="get_it">Ná í það</string>
    <string name="get_for">Ná í það fyrir %1$s</string>
    <string name="routing_attr_short_way_name">Leið með hagkvæmri eldsneytisnýtingu</string>
-    <string name="routing_attr_short_way_description">Nota leið með hagkvæmri eldsneytisnýtingu (venjulega styttri).</string>
    <string name="replace_favorite_confirmation">Ertu viss að þú viljir skipta út eftirlætinu %1$s?</string>
    <string name="confirmation_to_delete_history_items">Fjarlægja valin atriði úr breytingaskránni?</string>
    <string name="change_markers_position">Breyta staðsetningu kortamerkis</string>
@ -1835,7 +1834,6 @@
    <string name="close_changeset">Loka breytingasetti</string>
    <string name="use_compass_navigation_descr">Nota áttavita þegar stefna finnst ekki á annan máta.</string>
    <string name="auto_zoom_map_descr">Sjálfvirkur aðdráttur korts miðað við hraða þinn (á meðan kort er samstillt við virka staðsetningu).</string>
-    <string name="snap_to_road_descr">Staðsetning grípi í vegi á meðan leiðsögn stendur.</string>
    <string name="interrupt_music_descr">Gera hlé á tónlist á meðan talskilaboð eru flutt.</string>
    <string name="do_not_send_anonymous_app_usage">Ekki senda nafnlausar upplýsingar um notkun forritsins</string>
    <string name="do_not_send_anonymous_app_usage_desc">OsmAnd sendir almennar upplýsingar um þá hluta forritsins sem þó opnar. Við söfnum ekki neinum gögnum um staðsetningar eða hegðun notenda, né heldur um neitt af því sem notendur setja inn til leitar, niðurhald eða skoðunar.</string>
@ -3904,7 +3902,6 @@
    <string name="register_on_openplacereviews_desc">Ljósmyndir eru í boði frá opna gagnaverkefninu OpenPlaceReviews.org. Til að geta sent inn myndir þarftu að skrá þig á vefsvæðinu þeirra.</string>
    <string name="osm_edit_comment_note">Gera athugasemd við OSM-minnispunkt</string>
    <string name="gpx_upload_trackable_visibility_descr">\"Rekjanlegt\" þýðir að ferillinn birtist ekki á neinum opinberum listum, en meðhöndlaðir ferilpunktar með tímamerkjum úr ferlinum (sem ekki er hægt að tengja beint við þig) munu birtast í gögnum sem eru sótt í gegnum opinbert GPS API-forritsviðmót.</string>
-    <string name="elevation_data">Þú getur notað hæðargögn til útreikninga á hækkun/lækkun í ferðunum þínum</string>
    <string name="add_photos_descr">OsmAnd birtir ljósmyndir frá ýmsum þjónustum:
 \nOpenPlaceReviews - ljósmyndir POI-merkisstaða;
 \nMapillary - myndefni í götuhæð;
@ -3972,7 +3969,7 @@
    <string name="select_folder">Veldu möppu</string>
    <string name="select_folder_descr">Veldu möppu eða bættu við nýrri</string>
    <string name="shared_string_empty">Tómt</string>
-    <string name="analyze_by_intervals">Greina eftir millibilum (uppskipting millibila)</string>
+    <string name="analyze_by_intervals">Greina eftir uppskiptingu millibila</string>
    <string name="upload_to_openstreetmap">Senda inn í OpenStreetMap</string>
    <string name="edit_track">Breyta ferli</string>
    <string name="rename_track">Endurnefna feril</string>
@ -4005,4 +4002,32 @@
    <string name="routing_engine_vehicle_type_mtb">Fjallahjól</string>
    <string name="message_server_error">Villa í netþjóni: %1$s</string>
    <string name="message_name_is_already_exists">Nafnið er þegar til staðar</string>
+    <string name="delete_online_routing_engine">Eyða þessari leiðagerð á netinu\?</string>
+    <string name="context_menu_read_full">Lesa óstytt</string>
+    <string name="context_menu_edit_descr">Breyta lýsingu</string>
+    <string name="delete_waypoints">Eyða ferilpunktum</string>
+    <string name="copy_to_map_markers">Afrita í kortamerki</string>
+    <string name="copy_to_map_favorites">Afrita í eftirlæti</string>
+    <string name="upload_photo">Sendi inn</string>
+    <string name="upload_photo_completed">Innsendingu er lokið</string>
+    <string name="uploading_count">Sendi inn %1$d af %2$d</string>
+    <string name="uploaded_count">Sent inn %1$d af %2$d</string>
+    <string name="toast_select_edits_for_upload">Veldu breytingar til að senda inn</string>
+    <string name="hillshade_slope_contour_lines">Hæðaskygging / Halli / Hæðarlínur</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">Nota test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Skrá inn á OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Vatn</string>
+    <string name="activity_type_winter_name">Vetur</string>
+    <string name="activity_type_snowmobile_name">Vélsleðar</string>
+    <string name="activity_type_riding_name">Útreiðar</string>
+    <string name="activity_type_racing_name">Kappakstur</string>
+    <string name="activity_type_mountainbike_name">Fjallahjól</string>
+    <string name="activity_type_cycling_name">Hjólreiðar</string>
+    <string name="activity_type_hiking_name">Gönguferðir</string>
+    <string name="activity_type_running_name">Hlaup</string>
+    <string name="activity_type_walking_name">Gangandi</string>
+    <string name="activity_type_offroad_name">Utanvegaakstur</string>
+    <string name="activity_type_motorbike_name">Vélhjól</string>
+    <string name="activity_type_car_name">Akandi</string>
 </resources>
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@ -2921,7 +2921,7 @@
    <string name="poi_logging">Registrazione</string>
    <string name="poi_horse_riding">Equitazione</string>
    <string name="poi_water_characteristic_mud">Fango</string>
-    <string name="poi_source_biomass">Fonte di energia: biomassa</string>
+    <string name="poi_generator_source_biomass">Fonte di energia: biomassa</string>
    <string name="poi_deadlock">Deadlock</string>
    <string name="poi_animal_shelter_wildlife">Fauna selvatica</string>
    <string name="poi_trees_rubber">Gomma</string>
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@ -791,7 +791,6 @@
 \n - Allineamento della mappa in base alla direzione o alla bussola 
 \n - Indicazioni di corsia, indicazione del limite di velocità, voci registrate e dal testo-alla-voce
 \n</string>
-    <string name="snap_to_road_descr">Blocca la posizione sulle strade durante la navigazione.</string>
    <string name="snap_to_road">Blocca sulle strade</string>
    <string name="avoid_motorway">Evita le autostrade</string>
    <string name="intermediate_point_too_far">La destinazione intermedia %1$s è troppo lontana dalla strada più vicina.</string>
@ -1981,7 +1980,6 @@
    <string name="lang_hsb">Sorabo superiore</string>
    <string name="rendering_attr_hideOverground_name">Oggetti sopra il terreno</string>
    <string name="routing_attr_short_way_name">Percorso più efficiente rispetto ai consumi</string>
-    <string name="routing_attr_short_way_description">Utilizza la via migliore rispetto ai consumi (di solito la più breve).</string>
    <string name="replace_favorite_confirmation">Sei sicuro di voler sostituire il preferito %1$s?</string>
    <string name="shared_string_change">Cambia</string>
    <string name="get_started">Inizia</string>
@ -3910,7 +3908,6 @@
    <string name="select_picture">Scegli la foto</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
    <string name="lang_de_casual">Tedesco (informale)</string>
-    <string name="elevation_data">Puoi utililizzare i dati dell\'altitudine per valutare la Salita/Discesa del tuo percorso</string>
    <string name="app_mode_light_aircraft">Ultraleggeri</string>
    <string name="plan_route_split_after">Spezza dopo</string>
    <string name="plan_route_add_new_segment">Aggiungi un nuovo segmento</string>
--- a/OsmAnd/res/values-iw/strings.xml
+++ b/OsmAnd/res/values-iw/strings.xml
@ -47,7 +47,6 @@
    <string name="avoid_motorway">ללא כבישים סלולים</string>
    <string name="auto_zoom_map_descr">תקריב המפה בהתאמה אוטומטית למהירות (בעוד שהמפה מסתנכרנת עם המיקום הנוכחי).</string>
    <string name="auto_zoom_map">שינוי תקריב אוטומטי במפה</string>
-    <string name="snap_to_road_descr">הצמדת המיקום לדרכים במהלך הניווט.</string>
    <string name="snap_to_road">הצמדה לדרך</string>
    <string name="osmand_short_description_80_chars">OsmAnd הנו יישומון צפייה במפות וניווט עם מפות מקוונות ובלתי מקוונות של OSM</string>
    <string name="osmand_plus_short_description_80_chars">OsmAnd הנו יישום ניווט בקוד פתוח עבור מפות מקוונות ובלתי מקוונות</string>
@ -2023,7 +2022,6 @@
    <string name="update_all_maps_now">לעדכן את כל המפות כעת?</string>
    <string name="clear_tile_data">מחיקת כל האריחים</string>
    <string name="routing_attr_short_way_name">דרך חסכונית בדלק</string>
-    <string name="routing_attr_short_way_description">שימוש בדרך חסכונית בדלק (בד״כ קצרה יותר).</string>
    <string name="replace_favorite_confirmation">להחליף את המועדף %1$s?</string>
    <string name="rendering_attr_hideOverground_name">עצמים מעל הקרקע</string>
    <string name="shared_string_change">שינוי</string>
@ -3920,7 +3918,6 @@
    <string name="select_picture">בחירת תמונה</string>
    <string name="lang_de_casual">גרמנית (עממית)</string>
    <string name="ltr_or_rtl_combine_via_star">‏%1$s‏ * %2$s</string>
-    <string name="elevation_data">אפשר להשתמש בנתוני רום לצורך חישוב עליה/ירידה במהלך הטיול</string>
    <string name="app_mode_light_aircraft">כלי טיס קל</string>
    <string name="plan_route_join_segments">צירוף מקטעים</string>
    <string name="plan_route_split_before">לפצל לפני</string>
@ -3970,7 +3967,7 @@
    <string name="select_folder">בחירת תקינה</string>
    <string name="select_folder_descr">נא לבחור תיקייה או להוסיף אחת חדשה</string>
    <string name="shared_string_empty">ריק</string>
-    <string name="analyze_by_intervals">ניתוח לפי מרווחים (פיצול מרווחים)</string>
+    <string name="analyze_by_intervals">ניתוח מרווחי פיצול</string>
    <string name="upload_to_openstreetmap">העלאה ל־OpenStreetMap</string>
    <string name="edit_track">עריכת מסלול</string>
    <string name="rename_track">שינוי שם מסלול</string>
@ -4016,4 +4013,24 @@
    <string name="open_place_reviews">OpenPlaceReviews</string>
    <string name="opr_use_dev_url">להשתמש ב־test.openplacereviews.org</string>
    <string name="login_open_place_reviews">כניסה ל־OpenPlaceReviews</string>
+    <string name="announcement_time_descr">זמן ההכרזה של ההנחיות הקוליות השונות תלוי בסוג ההכרזה, במהירות הניווט הנוכחית ובמהירות הניווט כבררת מחדל.</string>
+    <string name="hillshade_slope_contour_lines">הצללה / מדרון / קווי מתאר</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews הוא מיזם בהובלת הקהילה בנוגע למקומות ציבוריים כגון מסעדות, מלונות, מוזיאונים ונקודות דרך. הוא אוסף מידע ציבורי עליהם כגון תמונות, סקירות, קישורים למערכות אחרות שמקושרות ל־OpenStreetMap, ויקיפדיה.
+\n
+\nכל הנתונים של OpenPlaceReview הם פתוחים וזמינים לציבור הרחב: http://openplacereviews.org/data.
+\n
+\nניתן לקרוא עוד באתר: http://openplacereviews.org</string>
+    <string name="activity_type_water_name">מים</string>
+    <string name="activity_type_winter_name">חורף</string>
+    <string name="activity_type_snowmobile_name">אופנוע שלג</string>
+    <string name="activity_type_riding_name">רכיבה</string>
+    <string name="activity_type_racing_name">מירוץ</string>
+    <string name="activity_type_mountainbike_name">אופני הרים</string>
+    <string name="activity_type_cycling_name">רכיבת אופניים</string>
+    <string name="activity_type_hiking_name">טיול שטח</string>
+    <string name="activity_type_running_name">ריצה</string>
+    <string name="activity_type_walking_name">הליכה</string>
+    <string name="activity_type_offroad_name">שטח</string>
+    <string name="activity_type_motorbike_name">אופנוע</string>
+    <string name="activity_type_car_name">מכונית</string>
 </resources>
--- a/OsmAnd/res/values-ja/phrases.xml
+++ b/OsmAnd/res/values-ja/phrases.xml
@ -3553,7 +3553,7 @@
    <string name="poi_climbing_crag">可</string>
    <string name="reddit">Reddit</string>
    <string name="poi_historic_tank">歴史的な戦車</string>
-    <string name="poi_source_biomass">動力源:バイオマス燃料</string>
+    <string name="poi_generator_source_biomass">動力源:バイオマス燃料</string>
    <string name="poi_snowmobile_filter">スノーモービルでのアクセス</string>
    <string name="poi_access_bus">バスでのアクセス</string>
    <string name="poi_access_caravan">キャラバン・キャンピングトレーラーでのアクセス</string>
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@ -687,7 +687,6 @@ POIの更新は利用できません</string>
    <string name="use_compass_navigation_descr">方向が全く検出できない場合電子コンパスを使用します</string>
    <string name="use_compass_navigation">電子コンパスを使用</string>
    <string name="avoid_motorway">高速道路を使わない</string>
-    <string name="snap_to_road_descr">有効化でナビゲーション中は現在位置が道路から外れないようになります</string>
    <string name="snap_to_road">道路に合わせる</string>
    <string name="osmand_play_title_30_chars">OsmAnd Maps &amp; Navigation</string>
    <string name="osmand_short_description_80_chars">OSMオフライン＆オンライン両対応、グローバルモバイルマップ＆ナビゲーション</string>
@ -2097,7 +2096,6 @@ POIの更新は利用できません</string>
    <string name="shared_string_record">記録</string>
    <string name="gpx_logging_no_data">データなし</string>
    <string name="routing_attr_short_way_name">燃費を抑えたルート</string>
-    <string name="routing_attr_short_way_description">燃費を抑えることを重視した(通常より短い)ルートを優先します。</string>
    <string name="clear_tile_data">すべてのタイルを消去</string>
    <string name="navigate_point_olc">オープンロケーションコード(OLC)</string>
    <string name="navigate_point_olc_info_invalid">OLCの値が正しくありません</string>
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@ -812,7 +812,6 @@
    <string name="poi_filter_restaurants">რესტორნები</string>
    <string name="poi_filter_sightseeing">ღირსშესანიშნაობები</string>
    <string name="avoid_motorway">მოტოციკლეტის გზებისათვის თავის არიდება</string>
-    <string name="snap_to_road_descr">ნავიგაციისას პიზიციის გზებისათვის მიბმა.</string>
    <string name="snap_to_road">გზისთვის მიბმა</string>
    <string name="osmand_short_description_80_chars">OsmAnd არის ნავიგაციის აპლიკაცია ღია წყაროთი გათიშული და ონლაინ რუკების მხარდაჭერით</string>
    <string name="map_widget_intermediate_distance">შუალედური დანიშნულების პუნქტი</string>
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@ -888,7 +888,6 @@
    <string name="use_compass_navigation_descr">GPS로 진행방향이 탐지되지 않을 때 나침반을 사용</string>
    <string name="use_compass_navigation">나침반 사용</string>
    <string name="avoid_motorway">전용도로 회피</string>
-    <string name="snap_to_road_descr">운행하는 동안 차량을 도로에 밀착시킴</string>
    <string name="snap_to_road">도로에 밀착</string>
    <string name="osmand_play_title_30_chars">OsmAnd 지도 및 내비게이션</string>
    <string name="osmand_short_description_80_chars">글로벌 모바일 맵 뷰어 및 오프라인 및 온라인 OSM 지도를 위한 운행</string>
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@ -774,7 +774,6 @@
    <string name="map_widget_renderer">Atvaizdavimo stilius</string>
    <string name="osmand_short_description_80_chars">OsmAnd - atviro kodo navigacijos programa su interneto/parsiųstais žemėlapius</string>
    <string name="avoid_motorway">Vengti greitkelių</string>
-    <string name="snap_to_road_descr">Poziciją rodyti ant kelių kai naviguojama.</string>
    <string name="snap_to_road">Rodyti ant kelio</string>
    <string name="osmand_long_description_1000_chars">OsmAnd (OSM Automated Navigation Directions)
 \n
@ -1949,7 +1948,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
    <string name="share_history_subject">bendrinta iš OsmAnd</string>
    <string name="update_all_maps_now">Ar norite atnaujinti visus žemėlapius?</string>
    <string name="routing_attr_short_way_name">Taupus kelias</string>
-    <string name="routing_attr_short_way_description">Važiuoti taupiuoju keliu (paprastai trumpesnis).</string>
    <string name="rendering_attr_hideOverground_name">Antžeminiai objektai</string>
    <string name="shared_string_change">Pakeisti</string>
    <string name="get_started">Pradėti</string>
--- a/OsmAnd/res/values-lv/phrases.xml
+++ b/OsmAnd/res/values-lv/phrases.xml
@ -3212,5 +3212,5 @@
    <string name="poi_climbing_crag_filter">Klints kāpšanas treniņvietas</string>
    <string name="poi_climbing_crag">Jā</string>
    <string name="reddit">Reddit</string>
-    <string name="poi_source_biomass">Enerģijas avots: biomasa</string>
+    <string name="poi_generator_source_biomass">Enerģijas avots: biomasa</string>
 </resources>
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@ -789,7 +789,6 @@
    <string name="poi_filter_restaurants">Restorāni</string>
    <string name="poi_filter_sightseeing">Apskates vietas</string>
    <string name="avoid_motorway">Izvairīties no automaģistrālēm</string>
-    <string name="snap_to_road_descr">Navigācijas laikā tuvināt ceļam</string>
    <string name="snap_to_road">Tuvināt ceļam</string>
    <string name="osmand_short_description_80_chars">OsmAnd ir atvērtā koda navigācijas lietotne bezsaistes un tiešsaistes kartēm</string>
    <string name="osmand_long_description_1000_chars">OsmAnd (OSM Automated Navigation Directions) 
@ -1948,7 +1947,6 @@ failu(s)?
    <string name="update_all_maps_now">Vai vēlaties atjaunot visas kartes?</string>
    <string name="clear_tile_data">Iztīrīt bilžu kešatmiņu</string>
    <string name="routing_attr_short_way_name">Ekonomiskais maršruts</string>
-    <string name="routing_attr_short_way_description">Lietot ekonomisko maršrutu (parasti īsākais).</string>
    <string name="replace_favorite_confirmation">Vai nomainīt izlases vienību %1$s?</string>
    <string name="rendering_attr_hideOverground_name">Virszemes objektus</string>
    <string name="shared_string_change">Mainīt</string>
--- a/OsmAnd/res/values-ml/strings.xml
+++ b/OsmAnd/res/values-ml/strings.xml
@ -505,7 +505,6 @@
    <string name="get_for">%1$s മേടിക്കുക</string>
    <string name="si_mi_meters">"മൈല്‍/മീറ്റര്‍ "</string>
    <string name="routing_attr_short_way_name">"മൈലേജ് കൂടുതലുള്ള വഴി "</string>
-    <string name="routing_attr_short_way_description">മൈലേജ് കൂടുതലുള്ള വഴി ഉപയോഗിക്കുക</string>
    <string name="get_started">തുടങ്ങുക</string>
    <string name="back_to_search">തെരച്ചിലിലോട്ട് തിരിച്ച് പോവുക</string>
    <string name="confirmation_to_delete_history_items">തെരഞ്ഞെടുത്തവ ഹിസ്റ്ററിയില്‍ നിന്നും നീക്കട്ടെ?</string>
@ -978,7 +977,6 @@
    <string name="index_srtm_parts">കഷണങ്ങള്‍</string>
    <string name="close_changeset">"ചേഞ്ച്സെറ്റ്  അടയ്ക്കുക"</string>
    <string name="show_warnings_title">മുന്നറിയിപ്പുകള്‍ കാണിക്കുക…</string>
-    <string name="snap_to_road_descr">റോഡില്‍ തന്നെ നിന്ന് വഴികാട്ടുക</string>
    <string name="context_menu_item_add_parking_point">"പാര്‍ക്കിങ്ങ് ആയി രേഖപ്പെടുത്തുക "</string>
    <string name="support_new_features">"പുതിയതായുള്ള  സവിശേഷതകള്‍ "</string>
    <string name="show_ruler_level">സ്കേല്‍ കാണിക്കുക</string>
--- a/OsmAnd/res/values-nb/phrases.xml
+++ b/OsmAnd/res/values-nb/phrases.xml
@ -1506,7 +1506,7 @@
    <string name="poi_hazard_additional_minefield">Fare: Minefelt</string>
    <string name="poi_hazard_additional_avalanche">Fare: Snøskred</string>
    <string name="poi_hazard_additional_flood">Fare: Oversvømmelse</string>
-    <string name="poi_source_biomass">Energikilde: Biomasse</string>
+    <string name="poi_generator_source_biomass">Energikilde: Biomasse</string>
    <string name="poi_motorhome_yes">Ja</string>
    <string name="poi_bus_yes">Ja</string>
    <string name="poi_snowmobile_yes">Ja</string>
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@ -41,7 +41,6 @@
    <string name="avoid_motorway">Ingen motorveier</string>
    <string name="auto_zoom_map_descr">Zoomnivå i henhold til hastigheten din (mens kartet er synkronisert med gjeldende posisjon).</string>
    <string name="auto_zoom_map">Auto-zoom kart</string>
-    <string name="snap_to_road_descr">Hold posisjon på veien under navigering.</string>
    <string name="snap_to_road">Hold på vei</string>
    <string name="osmand_short_description_80_chars">Global mobilkartvisning &amp; navigering for offline og nettbaserte OSM-kart</string>
    <string name="osmand_plus_short_description_80_chars">Global mobilkartvisning &amp; navigering for offline og nettbaserte OSM-kart</string>
@ -1558,7 +1557,6 @@
    <string name="replace_favorite_confirmation">Er du sikker på at du vil erstatte favoritt %1$s\?</string>
    <string name="get_started">Kom i gang</string>
    <string name="routing_attr_short_way_name">Drivstoff-effektiv vei</string>
-    <string name="routing_attr_short_way_description">Bruk drivstoffeffektiv vei (vanligvis kortere).</string>
    <string name="edit_tilesource_expiration_time">Utløper (minutter)</string>
    <string name="local_index_tile_data_expire">Utløper (minutter): %1$s</string>
    <string name="current_track">Aktuelle spor</string>
@ -3846,7 +3844,6 @@
 \nOpenPlaceReviews - interessepunktbilder;
 \nMapillary - bilder på gatenivå;
 \nWeb / Wikimedia - interessepunktbilder i henhold til OpenStreetMap-data.</string>
-    <string name="elevation_data">Du kan bruke høydedata for å ta hensyn til stigning/nedstigning på turen din</string>
    <string name="app_mode_light_aircraft">Småfly</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
    <string name="lang_de_casual">Tysk (uformell)</string>
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@ -2738,7 +2738,7 @@
    <string name="poi_climbing_crag">Ja</string>
    <string name="reddit">Reddit</string>
    <string name="poi_historic_tank">Historische tank</string>
-    <string name="poi_source_biomass">Energiebron: biomassa</string>
+    <string name="poi_generator_source_biomass">Energiebron: biomassa</string>
    <string name="poi_access_disabled">Gehandicaptentoegang</string>
    <string name="poi_snowmobile_yes">Ja</string>
    <string name="poi_bus_yes">Ja</string>
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@ -790,7 +790,6 @@
 \n - Rijstrookindicatie, snelheidswaarschuwingen en stembegeleiding met opgenomen- en TTS-stemmen
 \n</string>
    <string name="avoid_motorway">Geen snelwegen</string>
-    <string name="snap_to_road_descr">Positie op de weg uitlijnen tijdens navigatie.</string>
    <string name="snap_to_road">Positie op de weg uitlijnen</string>
    <string name="intermediate_point_too_far">Tussenpunt %1$s te ver van dichtstbijzijnde weg.</string>
    <string name="arrived_at_intermediate_point">Je bent aangekomen op je Tussenpunt</string>
@ -1982,7 +1981,6 @@
    <string name="shared_string_change">Wijzig</string>
    <string name="get_started">Aan de slag</string>
    <string name="routing_attr_short_way_name">Economische route</string>
-    <string name="routing_attr_short_way_description">Economische route gebruiken (meestal korter).</string>
    <string name="replace_favorite_confirmation">Wil je Favoriet %1$s inderdaad vervangen\?</string>
    <string name="update_all_maps_now">Nu alle kaarten updaten\?</string>
    <string name="si_mi_meters">Mijl/meter</string>
@ -3941,7 +3939,6 @@
 \nOpenPlaceReviews - foto\'s van interessepunten;
 \nMapillary - foto\'s vanop straatniveau;
 \nWikimedia / het Web - foto\'s van interessepunten zoals gelinkt in OpenStreetMap.</string>
-    <string name="elevation_data">Je kan hoogtedata gebruiken om het hoogteverschil van je route te berekenen</string>
    <string name="release_3_9">• Een optie is toegevoegd om alle data te exporten, waaronder instellingen, andere bronnen en mijn plaatsen
 \n
 \n • Plan een route: diagram met individuele segmenten is toegevoegd, verschillende segmenten kunnen nu gemaakt en aangepast worden
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@ -3582,7 +3582,7 @@
    <string name="poi_charcoal_pile">Stos węgla drzewnego</string>
    <string name="poi_historic_tank">Czołg historyczny</string>
    <string name="poi_hookah_lounge">Hookah lounge - Salon fajki wodnej (shisha)</string>
-    <string name="poi_source_biomass">Źródło energii: biomasa</string>
+    <string name="poi_generator_source_biomass">Źródło energii: biomasa</string>
    <string name="poi_snowmobile_filter">Dostęp dla skuterów śnieżnych</string>
    <string name="poi_access_bus">Dostęp dla autobusów</string>
    <string name="poi_access_caravan">Dostęp dla przyczepy kempingowej</string>
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@ -796,7 +796,6 @@
 \nOsmAnd jest aktywnie rozwijany i dalszy rozwój jest uzależniony od wkładu pieniężnego na finansowanie rozwoju i testowania nowych funkcjonalności. Proszę rozważyć zakup OsmAnd+, lub finansowanie konkretnych nowych funkcji lub dokonania ogólnej darowizny na https://osmand.net.</string>
    <string name="osmand_plus_short_description_80_chars">OsmAnd to aplikacja open source do nawigacji obsługująca mapy offline i online</string>
    <string name="avoid_motorway">Unikaj autostrad</string>
-    <string name="snap_to_road_descr">Przyciąga położenie do dróg podczas nawigacji.</string>
    <string name="snap_to_road">Przyciąganie do drogi</string>
    <string name="day_night_info">Informacja o dniu/nocy</string>
    <string name="map_widget_vector_attributes">Atrybuty renderowania</string>
@ -1993,7 +1992,6 @@
    <string name="shared_string_change">Zmień</string>
    <string name="get_started">Rozpocznij</string>
    <string name="routing_attr_short_way_name">Ekonomiczna trasa</string>
-    <string name="routing_attr_short_way_description">Użyj trasy oszczędzającej paliwo (zwykle najkrótszej).</string>
    <string name="replace_favorite_confirmation">Zastąpić ulubiony punkt %1$s?</string>
    <string name="skip_map_downloading">Pomiń pobieranie map</string>
    <string name="first_usage_greeting">Otrzymuj wskazówki dojazdu i odkrywaj nowe miejsca bez połączenia z Internetem</string>
@ -3920,7 +3918,6 @@
    <string name="lang_de_casual">Niemiecki (styl potoczny)</string>
    <string name="gpx_upload_public_visibility_descr">\"Publiczny\" oznacza, że ślad jest pokazywany publicznie w śladach GPS i na publicznych listach śladów GPS oraz na publicznej liście śladów z surowymi znacznikami czasowymi. Dane obsługiwane przez API nie odnoszą się do strony śladów. Znaczniki czasu punktów śladowych nie są dostępne za pośrednictwem publicznego API GPS, a punkty śladowe nie są uporządkowane chronologicznie.</string>
    <string name="app_mode_light_aircraft">Lekki samolot</string>
-    <string name="elevation_data">Możesz użyć danych wysokości, aby uwzględnić wzniesienie / zejście podczas podróży</string>
    <string name="plan_route_join_segments">Połącz segmenty</string>
    <string name="plan_route_split_before">Podziel przed</string>
    <string name="plan_route_split_after">Podziel po</string>
@ -4008,4 +4005,25 @@
    <string name="uploading_count">Przesyłanie %1$d z %2$d</string>
    <string name="uploaded_count">Przesłano %1$d z %2$d</string>
    <string name="toast_select_edits_for_upload">Wybierz zmiany do przesłania</string>
+    <string name="hillshade_slope_contour_lines">Wzniesienia / Nachylenie / Linie konturowe</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews to społeczny projekt dotyczący miejsc publicznych, takich jak restauracje, hotele, muzea, punkty trasy. Gromadzi wszystkie publiczne informacje o nich, takie jak zdjęcia, recenzje, linki do innych systemów, link OpenStreetMap, Wikipedia.
+\n
+\nWszystkie dane OpenPlaceReview są otwarte i dostępne dla każdego: http://openplacereviews.org/data.
+\n
+\nMożesz przeczytać więcej na: http://openplacereviews.org</string>
+    <string name="opr_use_dev_url">Użyj test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Zaloguj się do OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Woda</string>
+    <string name="activity_type_winter_name">Zima</string>
+    <string name="activity_type_snowmobile_name">Skuter</string>
+    <string name="activity_type_riding_name">Jazda konna</string>
+    <string name="activity_type_racing_name">Wyścigi</string>
+    <string name="activity_type_mountainbike_name">Kolarstwo górskie</string>
+    <string name="activity_type_cycling_name">Kolarstwo</string>
+    <string name="activity_type_hiking_name">Turystyka piesza</string>
+    <string name="activity_type_running_name">Bieganie</string>
+    <string name="activity_type_walking_name">Pieszo</string>
+    <string name="activity_type_motorbike_name">Motocykl</string>
+    <string name="activity_type_offroad_name">Poza drogą</string>
+    <string name="activity_type_car_name">Samochód</string>
 </resources>
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@ -3582,7 +3582,7 @@
    <string name="poi_charcoal_pile">Pilha de carvão</string>
    <string name="poi_historic_tank">Tanque histórico</string>
    <string name="poi_hookah_lounge">Salão do cachimbo de água</string>
-    <string name="poi_source_biomass">Fonte de energia: biomassa</string>
+    <string name="poi_generator_source_biomass">Fonte de energia: biomassa</string>
    <string name="poi_access_motorcycle">Acesso de motocicletas</string>
    <string name="poi_access_mofa">Acesso de bicicleta motorizada</string>
    <string name="poi_access_hgv">Acesso de veículos pesados</string>
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@ -217,7 +217,7 @@
    <string name="proxy_pref_descr">Especifique um servidor proxy.</string>
    <string name="settings_privacy">Privacidade</string>
    <string name="shared_string_gpx_points">Pontos</string>
-    <string name="navigation_over_track">Iniciar a navegação pela trilha?</string>
+    <string name="navigation_over_track">Iniciar a navegação ao longo da trilha\?</string>
    <string name="speak_pedestrian">Faixas de pedestre</string>
    <string name="rendering_attr_roadStyle_name">Estilo das vias</string>
    <string name="avoid_roads_msg">Obter uma rota alternativa, selecionando quais vias evitar</string>
@ -578,7 +578,6 @@
    <string name="route_from">De:</string>
    <string name="settings_preset">Perfil predefinido</string>
    <string name="settings_preset_descr">Configurações de exibição e navegação de mapa são gravadas por perfil de uso. Defina seu perfil padrão aqui.</string>
-    <string name="snap_to_road_descr">Ajustar posição às vias próximas durante a navegação.</string>
    <string name="snap_to_road">Ajustar com a via</string>
    <string name="osmand_short_description_80_chars">OsmAnd é um aplicativo de navegação de código aberto para mapas off-line e on-line</string>
    <string name="osmand_long_description_1000_chars">OsmAnd (Direções de Navegação Automatizada do OSM) 
@ -1876,7 +1875,6 @@
    <string name="access_disable_wrong_direction_recalc_descr">Desabilitar recálculo de rota se só estiver se movendo na direção oposta.</string>
    <string name="follow_us">Siga-nos</string>
    <string name="routing_attr_short_way_name">Via mais econômica</string>
-    <string name="routing_attr_short_way_description">Utilizar caminho econômico (geralmente mais curto).</string>
    <string name="edit_filter">Editar categorias</string>
    <string name="subcategories">Subcategorias</string>
    <string name="selected_categories">Categorias selecionadas</string>
@ -3914,7 +3912,6 @@
    <string name="select_picture">Selecione a foto</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
    <string name="lang_de_casual">Alemão (casual)</string>
-    <string name="elevation_data">Você pode usar dados de elevação para contabilizar a subida/descida de sua viagem</string>
    <string name="app_mode_light_aircraft">Avião leve</string>
    <string name="release_3_9">"• Adicionada opção para exportar e importar todos os dados, incluindo configurações, recursos, meus lugares
 \n
@ -4007,4 +4004,25 @@
    <string name="uploaded_count">Carregado %1$d de %2$d</string>
    <string name="toast_select_edits_for_upload">Selecione as edições para carregamento</string>
    <string name="hillshade_slope_contour_lines">Sombras de relevo / Encostas / Curvas de nível</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews é um projeto conduzido pela comunidade sobre locais públicos como restaurantes, hotéis, museus, pontos de passagem. Ele coleta todas as informações públicas sobre eles, como fotos, comentários, links para outros sistemas, link OpenStreetMap, Wikipédia.
+\n
+\nTodos os dados do OpenPlaceReview estão abertos e disponíveis para todos: http://openplacereviews.org/data.
+\n
+\nVocê pode ler mais em: http://openplacereviews.org</string>
+    <string name="activity_type_motorbike_name">Motorbike</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">Usar test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Entrar para OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Água</string>
+    <string name="activity_type_winter_name">Inverno</string>
+    <string name="activity_type_snowmobile_name">Moto de neve</string>
+    <string name="activity_type_riding_name">Equitação</string>
+    <string name="activity_type_racing_name">Corrida</string>
+    <string name="activity_type_mountainbike_name">Mountainbike</string>
+    <string name="activity_type_cycling_name">Ciclismo</string>
+    <string name="activity_type_hiking_name">Caminhada</string>
+    <string name="activity_type_running_name">Corrida</string>
+    <string name="activity_type_walking_name">A pé</string>
+    <string name="activity_type_offroad_name">Fora de estrada</string>
+    <string name="activity_type_car_name">Carro</string>
 </resources>
--- a/OsmAnd/res/values-pt/phrases.xml
+++ b/OsmAnd/res/values-pt/phrases.xml
@ -3582,7 +3582,7 @@
    <string name="poi_charcoal_pile">Pilha de carvão</string>
    <string name="poi_historic_tank">Tanque histórico</string>
    <string name="poi_hookah_lounge">Salão Hookah</string>
-    <string name="poi_source_biomass">Fonte de energia: biomassa</string>
+    <string name="poi_generator_source_biomass">Fonte de energia: biomassa</string>
    <string name="poi_snowmobile_filter">Acesso de moto de neve</string>
    <string name="poi_access_bus">Acesso de ônibus</string>
    <string name="poi_access_caravan">Acesso de caravana</string>
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@ -763,7 +763,6 @@
    <string name="show_warnings_title">Mostrar alertas…</string>
    <string name="show_warnings_descr">Configure avisos de trânsito (limites de velocidade, paragens forçadas, redutores de velocidade, túneis), avisos de radares de velocidade e informações da faixa.</string>
    <string name="avoid_motorway">Sem autoestradas</string>
-    <string name="snap_to_road_descr">Encaixe posição de estradas durante a navegação.</string>
    <string name="snap_to_road">Ajustar à estrada</string>
    <string name="osmand_short_description_80_chars">Visualização e navegação móvel de mapas globais do OSM offline e online</string>
    <string name="osmand_plus_short_description_80_chars">OsmAnd é uma aplicação de navegação de código aberto para mapas off-line e on-line</string>
@ -2101,7 +2100,6 @@
    <string name="update_all_maps_now">Atualizar todos os mapas agora\?</string>
    <string name="clear_tile_data">Limpar todas as telhas</string>
    <string name="routing_attr_short_way_name">Percurso económico</string>
-    <string name="routing_attr_short_way_description">Utilizar percurso económico (geralmente mais curto).</string>
    <string name="replace_favorite_confirmation">Tem a certeza que quer substituir o favorito %1$s\?</string>
    <string name="rendering_attr_hideOverground_name">Objetos à superfície</string>
    <string name="get_started">Começar</string>
@ -3919,7 +3917,6 @@
    <string name="use_dev_url_descr">Mude para usar dev.openstreetmap.org ao invés de openstreetmap.org para testar enviar uma OSM Nota / POI / GPX.</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
    <string name="lang_de_casual">Alemão (casual)</string>
-    <string name="elevation_data">Pode usar dados de elevação para representar a subida / descida da sua viagem</string>
    <string name="app_mode_light_aircraft">Aeronaves ligeiras</string>
    <string name="plan_route_join_segments">Unir segmentos</string>
    <string name="plan_route_split_before">Dividir antes</string>
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@ -46,7 +46,6 @@
    <string name="avoid_motorway">Evită autostrăzile</string>
    <string name="auto_zoom_map_descr">Auto zoom hartă funcție de viteză (când harta e sincronizată cu poziția curentă)</string>
    <string name="auto_zoom_map">Auto zoom hartă</string>
-    <string name="snap_to_road_descr">Menține poziția pe drum în timpul navigării</string>
    <string name="snap_to_road">Poziționează pe drum</string>
    <string name="osmand_short_description_80_chars">OsmAnd este o aplicație open source pentru navigare cu hărți offline și online</string>
    <string name="osmand_long_description_1000_chars">
@ -2276,7 +2275,6 @@
    <string name="routing_attr_allow_motorway_description">Permiteți autostrăzile.</string>
    <string name="search_hint">Introduceți orașul, adresa, numele POI</string>
    <string name="osm_live_payment_desc">Abonament perceput pe lună. Anulați-l pe Google Play în orice moment.</string>
-    <string name="routing_attr_short_way_description">Utilizați un mod eficient de combustibil (de obicei mai scurt).</string>
    <string name="rendering_value_black_name">Negru</string>
    <string name="shared_string_launch">Lansează</string>
    <string name="navigation_over_track">Pornesc navigarea de-a lungul traseului\?</string>
--- a/Show more
+++ b/Show more