Merge pull request #10387 from osmandapp/master

update test branch
2020-12-11 19:07:41 +01:00 · 2020-12-11 19:07:41 +01:00 · 80b672e213
commit 80b672e213
parent a1e5e4e020 20e2293f9b
81 changed files with 822 additions and 439 deletions
--- a/OsmAnd-api/src/net/osmand/aidlapi/IOsmAndAidlInterface.aidl
+++ b/OsmAnd-api/src/net/osmand/aidlapi/IOsmAndAidlInterface.aidl
@ -78,6 +78,8 @@ import net.osmand.aidlapi.customization.CustomizationInfoParams;
 import net.osmand.aidlapi.customization.ProfileSettingsParams;
 import net.osmand.aidlapi.customization.MapMarginsParams;
 import net.osmand.aidlapi.customization.CustomPluginParams;
+import net.osmand.aidlapi.customization.SelectProfileParams;
+import net.osmand.aidlapi.customization.AProfile;

 import net.osmand.aidlapi.gpx.AGpxFile;
 import net.osmand.aidlapi.gpx.AGpxFileDetails;
@ -886,4 +888,8 @@ interface IOsmAndAidlInterface {
    boolean isMenuOpen();

    int getPluginVersion(in CustomPluginParams params);
+
+    boolean selectProfile(in SelectProfileParams params);
+
+    boolean getProfiles(out List<AProfile> profiles);
 }
--- a/OsmAnd-api/src/net/osmand/aidlapi/customization/AProfile.aidl
+++ b/OsmAnd-api/src/net/osmand/aidlapi/customization/AProfile.aidl
@ -0,0 +1,3 @@
+package net.osmand.aidlapi.customization;
+
+parcelable AProfile;
--- a/OsmAnd-api/src/net/osmand/aidlapi/customization/AProfile.java
+++ b/OsmAnd-api/src/net/osmand/aidlapi/customization/AProfile.java
@ -0,0 +1,129 @@
+package net.osmand.aidlapi.customization;
+
+import android.os.Bundle;
+import android.os.Parcel;
+
+import net.osmand.aidlapi.AidlParams;
+
+public class AProfile extends AidlParams {
+
+	public static final String PROFILE_ID_KEY = "profile_id";
+	public static final String USER_PROFILE_NAME_KEY = "user_profile_name";
+	public static final String PARENT_KEY = "parent";
+	public static final String ICON_NAME_KEY = "icon_name";
+	public static final String ICON_COLOR_KEY = "icon_color";
+	public static final String ROUTING_PROFILE_KEY = "routing_profile";
+	public static final String ROUTE_SERVICE_KEY = "route_service";
+	public static final String LOC_ICON_KEY = "loc_icon";
+	public static final String NAV_ICON_KEY = "nav_icon";
+	public static final String ORDER_KEY = "order";
+
+	private String appModeKey;
+	private String userProfileName;
+	private String parent;
+	private String iconName;
+	private String iconColor;
+	private String routingProfile;
+	private String routeService;
+	private String locIcon;
+	private String navIcon;
+	private int order = -1;
+
+	public AProfile(String appModeKey, String userProfileName, String parent, String iconName, String iconColor,
+					String routingProfile, String routeService, String locIcon, String navIcon, int order) {
+		this.appModeKey = appModeKey;
+		this.userProfileName = userProfileName;
+		this.parent = parent;
+		this.iconName = iconName;
+		this.iconColor = iconColor;
+		this.routingProfile = routingProfile;
+		this.routeService = routeService;
+		this.locIcon = locIcon;
+		this.navIcon = navIcon;
+		this.order = order;
+	}
+
+	public AProfile(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<AProfile> CREATOR = new Creator<AProfile>() {
+		@Override
+		public AProfile createFromParcel(Parcel in) {
+			return new AProfile(in);
+		}
+
+		@Override
+		public AProfile[] newArray(int size) {
+			return new AProfile[size];
+		}
+	};
+
+	public String getStringKey() {
+		return appModeKey;
+	}
+
+	public String getUserProfileName() {
+		return userProfileName;
+	}
+
+	public String getParent() {
+		return parent;
+	}
+
+	public String getIconName() {
+		return iconName;
+	}
+
+	public String getIconColor() {
+		return iconColor;
+	}
+
+	public String getRoutingProfile() {
+		return routingProfile;
+	}
+
+	public String getRouteService() {
+		return routeService;
+	}
+
+	public String getLocIcon() {
+		return locIcon;
+	}
+
+	public String getNavIcon() {
+		return navIcon;
+	}
+
+	public int getOrder() {
+		return order;
+	}
+
+	@Override
+	public void writeToBundle(Bundle bundle) {
+		bundle.putString(PROFILE_ID_KEY, appModeKey);
+		bundle.putString(USER_PROFILE_NAME_KEY, userProfileName);
+		bundle.putString(PARENT_KEY, parent);
+		bundle.putString(ICON_NAME_KEY, iconName);
+		bundle.putString(ICON_COLOR_KEY, iconColor);
+		bundle.putString(ROUTING_PROFILE_KEY, routingProfile);
+		bundle.putString(ROUTE_SERVICE_KEY, routeService);
+		bundle.putString(LOC_ICON_KEY, locIcon);
+		bundle.putString(NAV_ICON_KEY, navIcon);
+		bundle.putInt(ORDER_KEY, order);
+	}
+
+	@Override
+	protected void readFromBundle(Bundle bundle) {
+		appModeKey = bundle.getString(PROFILE_ID_KEY);
+		userProfileName = bundle.getString(USER_PROFILE_NAME_KEY);
+		parent = bundle.getString(PARENT_KEY);
+		iconName = bundle.getString(ICON_NAME_KEY);
+		iconColor = bundle.getString(ICON_COLOR_KEY);
+		routingProfile = bundle.getString(ROUTING_PROFILE_KEY);
+		routeService = bundle.getString(ROUTE_SERVICE_KEY);
+		locIcon = bundle.getString(LOC_ICON_KEY);
+		navIcon = bundle.getString(NAV_ICON_KEY);
+		order = bundle.getInt(ORDER_KEY);
+	}
+}
--- a/OsmAnd-api/src/net/osmand/aidlapi/customization/SelectProfileParams.aidl
+++ b/OsmAnd-api/src/net/osmand/aidlapi/customization/SelectProfileParams.aidl
@ -0,0 +1,3 @@
+package net.osmand.aidlapi.customization;
+
+parcelable SelectProfileParams;
--- a/OsmAnd-api/src/net/osmand/aidlapi/customization/SelectProfileParams.java
+++ b/OsmAnd-api/src/net/osmand/aidlapi/customization/SelectProfileParams.java
@ -0,0 +1,47 @@
+package net.osmand.aidlapi.customization;
+
+import android.os.Bundle;
+import android.os.Parcel;
+
+import net.osmand.aidlapi.AidlParams;
+
+public class SelectProfileParams extends AidlParams {
+
+	public static final String PROFILE_ID_KEY = "profile_id";
+
+	private String appModeKey;
+
+	public SelectProfileParams(String appModeKey) {
+		this.appModeKey = appModeKey;
+	}
+
+	public SelectProfileParams(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<SelectProfileParams> CREATOR = new Creator<SelectProfileParams>() {
+		@Override
+		public SelectProfileParams createFromParcel(Parcel in) {
+			return new SelectProfileParams(in);
+		}
+
+		@Override
+		public SelectProfileParams[] newArray(int size) {
+			return new SelectProfileParams[size];
+		}
+	};
+
+	public String getAppModeKey() {
+		return appModeKey;
+	}
+
+	@Override
+	public void writeToBundle(Bundle bundle) {
+		bundle.putString(PROFILE_ID_KEY, appModeKey);
+	}
+
+	@Override
+	protected void readFromBundle(Bundle bundle) {
+		appModeKey = bundle.getString(PROFILE_ID_KEY);
+	}
+}
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@ -297,7 +297,7 @@ task collectHelpContentsAssets(type: Copy) {
 		include "*.html"
 	}
 	from("../../help/website/blog_articles") {
-		include "osmand-3-8-released.html"
+		include "osmand-3-9-released.html"
 	}
 	into "assets/feature_articles"
 }
--- a/OsmAnd/res/drawable/warnings_stop.xml
+++ b/OsmAnd/res/drawable/warnings_stop.xml
@ -4,25 +4,28 @@
    android:viewportWidth="92"
    android:viewportHeight="92">
  <path
-      android:pathData="M61.5147,6H30.4853C28.894,6 27.3679,6.6321 26.2426,7.7574L7.7574,26.2426C6.6321,27.3679 6,28.894 6,30.4853V61.5147C6,63.106 6.6321,64.6321 7.7574,65.7574L26.2426,84.2426C27.3679,85.3679 28.894,86 30.4853,86H61.5147C63.106,86 64.6321,85.3679 65.7574,84.2426L84.2426,65.7574C85.3679,64.6321 86,63.106 86,61.5147V30.4853C86,28.894 85.3679,27.3679 84.2426,26.2426L65.7574,7.7574C64.6321,6.6321 63.106,6 61.5147,6Z"
-      android:fillColor="#ffffff"/>
+      android:pathData="M29.2426,5H62.7574C63.8182,5 64.8356,5.4214 65.5858,6.1716L85.8284,26.4142C86.5786,27.1644 87,28.1818 87,29.2426V62.7574C87,63.8182 86.5786,64.8356 85.8284,65.5858L65.5858,85.8284C64.8356,86.5786 63.8182,87 62.7574,87H29.2426C28.1818,87 27.1644,86.5786 26.4142,85.8284L6.1716,65.5858C5.4214,64.8356 5,63.8182 5,62.7574V29.2426C5,28.1818 5.4214,27.1644 6.1716,26.4142L26.4142,6.1716C27.1644,5.4214 28.1818,5 29.2426,5Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.2"
+      android:fillType="evenOdd"/>
  <path
-      android:pathData="M61.5147,12L30.4853,12L12,30.4853L12,61.5147L30.4853,80L61.5147,80L80,61.5147L80,30.4853L61.5147,12ZM30.4853,6H61.5147C63.106,6 64.6321,6.6321 65.7574,7.7574L84.2426,26.2426C85.3679,27.3679 86,28.894 86,30.4853V61.5147C86,63.106 85.3679,64.6321 84.2426,65.7574L65.7574,84.2426C64.6321,85.3679 63.106,86 61.5147,86H30.4853C28.894,86 27.3679,85.3679 26.2426,84.2426L7.7574,65.7574C6.6321,64.6321 6,63.106 6,61.5147V30.4853C6,28.894 6.6321,27.3679 7.7574,26.2426L26.2426,7.7574C27.3679,6.6321 28.894,6 30.4853,6Z"
+      android:pathData="M85.1213,64.8787L64.8787,85.1213C64.3161,85.6839 63.553,86 62.7574,86H29.2426C28.447,86 27.6839,85.6839 27.1213,85.1213L6.8787,64.8787C6.3161,64.3161 6,63.553 6,62.7574V29.2426C6,28.447 6.3161,27.6839 6.8787,27.1213L27.1213,6.8787C27.6839,6.3161 28.447,6 29.2426,6H62.7574C63.553,6 64.3161,6.3161 64.8787,6.8787L85.1213,27.1213C85.6839,27.6839 86,28.447 86,29.2426V62.7574C86,63.553 85.6839,64.3161 85.1213,64.8787Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M30.0711,11L11,30.0711V61.9289L30.0711,81H61.9289L81,61.9289V30.0711L61.9289,11H30.0711Z"
      android:fillColor="#F03434"
      android:fillType="evenOdd"/>
  <path
-      android:pathData="M57.7716,18H34.2284C33.698,18 33.1893,18.2107 32.8142,18.5858L18.5858,32.8142C18.2107,33.1893 18,33.698 18,34.2284V57.7716C18,58.302 18.2107,58.8107 18.5858,59.1858L32.8142,73.4142C33.1893,73.7893 33.698,74 34.2284,74H57.7716C58.302,74 58.8107,73.7893 59.1858,73.4142L73.4142,59.1858C73.7893,58.8107 74,58.302 74,57.7716V34.2284C74,33.698 73.7893,33.1893 73.4142,32.8142L59.1858,18.5858C58.8107,18.2107 58.302,18 57.7716,18Z"
-      android:fillColor="#F03434"/>
-  <path
-      android:pathData="M26.6773,50.99C26.6773,51.19 26.6773,51.36 26.6773,51.5C26.6773,51.64 26.6873,51.76 26.7073,51.86C26.7473,52.06 26.8973,52.35 27.1573,52.73C27.4373,53.13 27.9373,53.33 28.6573,53.33C29.0573,53.33 29.4273,53.25 29.7673,53.09C30.1073,52.91 30.3573,52.68 30.5173,52.4C30.6373,52.18 30.7073,51.97 30.7273,51.77C30.7673,51.57 30.7873,51.39 30.7873,51.23V50.96V49.55V49.28C30.7873,48.84 30.7073,48.5 30.5473,48.26C30.3873,48 30.0273,47.71 29.4673,47.39C29.0873,47.19 28.4073,46.91 27.4273,46.55C26.4473,46.19 25.6273,45.62 24.9673,44.84C24.3073,44.06 23.9773,43 23.9773,41.66V40.76C23.9773,39.38 24.4373,38.2 25.3573,37.22C26.2973,36.22 27.4373,35.72 28.7773,35.72C30.1773,35.72 31.3373,36.21 32.2573,37.19C33.1973,38.17 33.6673,39.36 33.6673,40.76V41.66H30.7873V40.76C30.7873,40.62 30.7773,40.49 30.7573,40.37C30.7573,40.25 30.7473,40.14 30.7273,40.04C30.7073,39.94 30.6573,39.82 30.5773,39.68C30.4973,39.54 30.3873,39.37 30.2473,39.17C29.9673,38.77 29.4973,38.57 28.8373,38.57C28.2573,38.57 27.7773,38.78 27.3973,39.2C27.0373,39.62 26.8573,40.14 26.8573,40.76V41.66V41.93C26.8573,42.33 26.9173,42.65 27.0373,42.89C27.1773,43.11 27.4973,43.36 27.9973,43.64C28.1573,43.72 28.3973,43.83 28.7173,43.97C29.0573,44.09 29.4673,44.24 29.9473,44.42C30.9073,44.74 31.7673,45.31 32.5273,46.13C33.2873,46.95 33.6673,48.03 33.6673,49.37V50.99C33.6673,51.69 33.5973,52.28 33.4573,52.76C33.3373,53.24 32.9273,53.94 32.2273,54.86C31.5273,55.74 30.3573,56.18 28.7173,56.18C26.9773,56.18 25.7173,55.62 24.9373,54.5C24.1573,53.36 23.7673,52.19 23.7673,50.99V50.27H26.6773V50.99Z"
+      android:pathData="M23.4568,52.155C23.4568,52.9818 23.5382,53.4855 24.0168,54.185C24.3435,54.6517 24.9268,54.885 25.7668,54.885C26.2335,54.885 26.6652,54.7917 27.0618,54.605C27.8934,54.1647 28.2518,53.3551 28.2518,52.435V50.16C28.2518,49.6467 28.1585,49.25 27.9718,48.97C27.7852,48.6667 27.3652,48.3283 26.7118,47.955C26.2685,47.7217 25.4752,47.395 24.3318,46.975C23.1885,46.555 22.2318,45.89 21.4618,44.98C20.6918,44.07 20.3068,42.8333 20.3068,41.27V40.22C20.3068,38.61 20.8435,37.2333 21.9168,36.09C23.0135,34.9233 24.3435,34.34 25.9068,34.34C27.5402,34.34 28.8935,34.9117 29.9668,36.055C31.0635,37.1983 31.6118,38.5867 31.6118,40.22V41.27H28.2518V40.22C28.2518,38.8503 27.408,37.665 25.9768,37.665C25.3002,37.665 24.7402,37.91 24.2968,38.4C23.8768,38.89 23.6668,39.4967 23.6668,40.22V41.585C23.6668,42.0517 23.7368,42.425 23.8768,42.705C24.0402,42.9617 24.4135,43.2533 24.9968,43.58C25.7302,43.9467 26.5055,44.2026 27.2718,44.49C28.3918,44.8633 29.3952,45.5283 30.2818,46.485C31.1685,47.4417 31.6118,48.7017 31.6118,50.265C31.6118,51.569 31.7362,52.9536 31.3668,54.22C31.2268,54.78 30.7485,55.5967 29.9318,56.67C29.1152,57.6967 27.7502,58.21 25.8368,58.21C23.8068,58.21 22.3368,57.5567 21.4268,56.25C20.5168,54.92 20.0618,53.555 20.0618,52.155V51.315H23.4568V52.155Z"
      android:fillColor="#ffffff"/>
  <path
-      android:pathData="M38.5175,56V38.57H35.1275V35.9H44.8175V38.57H41.3675V56H38.5175Z"
+      android:pathData="M37.2703,58V37.665H33.3153V34.55H44.6203V37.665H40.5953V58H37.2703Z"
      android:fillColor="#ffffff"/>
  <path
-      android:pathData="M47.4729,37.79C47.9329,37.15 48.5129,36.65 49.2129,36.29C49.9329,35.91 50.6729,35.72 51.4329,35.72C52.1729,35.72 52.8629,35.87 53.5029,36.17C54.1629,36.47 54.7129,36.88 55.1529,37.4C55.5929,37.92 55.8929,38.46 56.0529,39.02C56.2129,39.56 56.2929,40.15 56.2929,40.79V51.02C56.2929,51.62 56.2329,52.15 56.1129,52.61C56.0129,53.07 55.7729,53.58 55.3929,54.14C55.0329,54.7 54.5029,55.18 53.8029,55.58C53.1229,55.98 52.3629,56.18 51.5229,56.18C51.0429,56.18 50.5829,56.12 50.1429,56C49.7029,55.86 49.2929,55.68 48.9129,55.46C48.5329,55.24 48.1929,54.99 47.8929,54.71C47.6129,54.43 47.3929,54.14 47.2329,53.84C46.9329,53.22 46.7529,52.72 46.6929,52.34C46.6329,51.96 46.6029,51.52 46.6029,51.02V40.79C46.6029,40.19 46.6629,39.66 46.7829,39.2C46.9229,38.72 47.1529,38.25 47.4729,37.79ZM53.0529,39.38C52.6729,38.82 52.1529,38.54 51.4929,38.54C51.1529,38.54 50.8129,38.64 50.4729,38.84C50.1529,39.02 49.9229,39.23 49.7829,39.47C49.6629,39.71 49.5829,39.95 49.5429,40.19C49.5029,40.43 49.4829,40.63 49.4829,40.79V51.02C49.4829,51.12 49.4829,51.23 49.4829,51.35C49.4829,51.45 49.4929,51.56 49.5129,51.68C49.5329,51.88 49.6929,52.21 49.9929,52.67C50.2929,53.09 50.7929,53.3 51.4929,53.3C51.8529,53.3 52.1729,53.22 52.4529,53.06C52.7529,52.88 52.9629,52.68 53.0829,52.46C53.2229,52.22 53.3129,52 53.3529,51.8C53.3929,51.6 53.4129,51.34 53.4129,51.02V40.79C53.4129,40.39 53.3929,40.11 53.3529,39.95C53.3329,39.79 53.2329,39.6 53.0529,39.38Z"
+      android:pathData="M47.7184,36.755C48.2551,36.0083 48.9317,35.425 49.7484,35.005C50.5884,34.5617 51.4517,34.34 52.3384,34.34C53.2017,34.34 54.0067,34.515 54.7534,34.865C55.5234,35.215 56.1651,35.6933 56.6784,36.3C57.1917,36.9067 57.5417,37.5367 57.7284,38.19C57.9151,38.82 58.0084,39.5083 58.0084,40.255V52.19C58.0084,52.89 57.9384,53.5083 57.7984,54.045C57.6817,54.5817 57.4017,55.1767 56.9584,55.83C56.5384,56.4833 55.9201,57.0433 55.1034,57.51C54.3101,57.9767 53.4234,58.21 52.4434,58.21C50.8816,58.21 49.346,57.5568 48.2084,56.495C47.4829,55.7695 46.9685,54.744 46.8084,53.73C46.7384,53.2867 46.7034,52.7733 46.7034,52.19V40.255C46.7034,39.555 46.7734,38.9367 46.9134,38.4C47.0767,37.84 47.3451,37.2917 47.7184,36.755ZM52.4084,37.63C50.943,37.63 50.0634,38.8996 50.0634,40.255V52.19C50.0634,52.9538 50.2328,53.4624 50.6584,54.115C51.0084,54.605 51.5917,54.85 52.4084,54.85C53.883,54.85 54.6484,53.5653 54.6484,52.19V40.255C54.6484,38.9165 53.9042,37.63 52.4084,37.63Z"
      android:fillColor="#ffffff"/>
  <path
-      android:pathData="M59.2055,56V35.9H63.9155H63.9755C64.5755,35.9 65.1455,36.03 65.6855,36.29C66.2255,36.53 66.7055,36.85 67.1255,37.25C67.5455,37.65 67.8755,38.11 68.1155,38.63C68.3755,39.13 68.5155,39.65 68.5355,40.19V43.1V43.4C68.5355,44.06 68.4055,44.68 68.1455,45.26C67.9055,45.82 67.5755,46.31 67.1555,46.73C66.7355,47.15 66.2355,47.48 65.6555,47.72C65.0955,47.96 64.4955,48.08 63.8555,48.08H63.5855H62.0855V56H59.2055ZM65.2955,44.78C65.4755,44.6 65.5855,44.41 65.6255,44.21C65.6855,44.01 65.7155,43.76 65.7155,43.46V40.49C65.7155,39.93 65.5455,39.47 65.2055,39.11C64.8655,38.73 64.4055,38.54 63.8255,38.54H62.0855V45.35H63.5855C63.9855,45.35 64.3055,45.32 64.5455,45.26C64.8055,45.18 65.0555,45.02 65.2955,44.78Z"
+      android:pathData="M61.4064,58V34.55H66.9714C68.3341,34.55 69.67,35.1951 70.6464,36.125C71.5664,37.0011 72.2438,38.2709 72.2914,39.555V43.3C72.2914,44.07 72.1397,44.7933 71.8364,45.47C71.2764,46.7767 70.2847,47.78 68.9314,48.34C68.1572,48.6718 67.3491,48.76 66.5164,48.76H64.7664V58H61.4064ZM69.0014,43.37V39.905C69.0014,38.6347 68.0868,37.63 66.7964,37.63H64.7664V45.575H66.5164C67.9596,45.575 69.0014,44.8811 69.0014,43.37Z"
      android:fillColor="#ffffff"/>
 </vector>
--- a/OsmAnd/res/values-ar/phrases.xml
+++ b/OsmAnd/res/values-ar/phrases.xml
@ -423,7 +423,7 @@
    <string name="poi_internet_access_type">نوع الوصول إلى الإنترنت</string>
    <string name="poi_bicycle_service">خدمة الدراجات</string>
    <string name="poi_fire_hydrant_type">نوع</string>
-    <string name="poi_fire_hydrant_water_source">مصدر المياه</string>
+    <string name="poi_water_source">مصدر المياه</string>
    <string name="poi_payment_toll_type">طريقة الدفع</string>
    <string name="poi_traffic_signals_sound">الصوت</string>
    <string name="poi_highway_crossing_type">النوع</string>
@ -2377,9 +2377,9 @@
    <string name="poi_street_cabinet_power">نوع الكبينة/الخزانة: طاقة</string>
    <string name="poi_in_service_yes">في الخدمة: نعم</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">صهريج</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">مجرى</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">بركه</string>
-    <string name="poi_fire_hydrant_style_water_source_main">رئيسي</string>
+    <string name="poi_water_source_stream">مجرى</string>
+    <string name="poi_water_source_pond">بركه</string>
+    <string name="poi_water_source_main">رئيسي</string>
    <string name="poi_health_service_child_care_no">الخدمة الصحية: رعاية الأطفال: لا</string>
    <string name="poi_health_service_child_care_yes">الخدمة الصحية: رعاية الأطفال: نعم</string>
    <string name="poi_health_service_examination_no">الخدمة الصحية: الفحص: لا</string>
@ -3316,7 +3316,7 @@
    <string name="poi_pump_status_missing_beam">حالة المضخة: شعاع مفقود</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">شفط</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">مضغوط</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">مياه جوفية</string>
+    <string name="poi_water_source_groundwater">مياه جوفية</string>
    <string name="poi_fire_hydrant_type_pipe">أنابيب</string>
    <string name="poi_drinking_water_refill_network">شبكة تعبئة مياه الشرب</string>
    <string name="poi_drinking_water_refill_no">إعادة تعبئة مياه الشرب:لا</string>
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@ -3407,7 +3407,7 @@
    <string name="route_recalculation">إعادة حساب الطريق</string>
    <string name="accessibility_announce">أعلن</string>
    <string name="login_and_pass">اسم المستخدم و كلمة السر</string>
-    <string name="plugin_global_prefs_info">إعدادات plugin هذه شاملة، وتنطبق على جميع الأوضاع</string>
+    <string name="plugin_global_prefs_info">إعدادات الملحق هذه شاملة، وتنطبق على جميع الأوضاع</string>
    <string name="osm_editing">تعديل OpenStreetMap</string>
    <string name="app_mode_osm">Osm</string>
    <string name="select_nav_icon_descr">سترى الأيقونة فقط أثناء الملاحة أو أثناء التحرك.</string>
@ -3908,7 +3908,7 @@
    <string name="use_complex_routing">التوجيه المركب</string>
    <string name="complex_routing_descr">التوجيه على مرحلتين لملاحة السيارة.</string>
    <string name="use_native_pt">تطوير النقل العام المحلي</string>
-    <string name="use_native_pt_desc">قم بالتبديل إلى Java (الآمن) حساب توجيه النقل العام</string>
+    <string name="use_native_pt_desc">قم بالتبديل إلى جافا (الآمن) حساب توجيه النقل العام</string>
    <string name="perform_oauth_authorization_description">سجّل الدخول باستخدام OAuth لاستخدام ميزات osmedit</string>
    <string name="perform_oauth_authorization">تسجيل الدخول عبر OAuth</string>
    <string name="clear_osm_token">مسح رمز OpenStreetMap OAuth</string>
@ -3936,7 +3936,7 @@
    <string name="mgrs_format_descr">OsmAnd يستخدم MGRS، وهو مشابه لتنسيق UTM NATO .</string>
    <string name="message_you_need_add_two_points_to_show_graphs">تحتاج إلى إضافة نقطتين على الأقل</string>
    <string name="manage_subscription">إدارة الاشتراك</string>
-    <string name="subscription_payment_issue_title">هناك مشكلة في اشتراكك. انقر الزر للانتقال إلى إعدادات اشتراك Google Play لإصلاح طريقة الدفع الخاصة بك.</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>
@ -3955,7 +3955,7 @@
    <string name="gpx_upload_private_visibility_descr">\"خاص\"يعني أن التتبع لن يظهر في أي قوائم عامة ، ولكن نقاط التتبع الصادرة عنه ستظل متاحة من خلال واجهة برمجة تطبيقات GPS API العامة بدون طوابع زمنية ولكن لن يتم ترتيبها ترتيبًا زمنيًا.</string>
    <string name="sign_in_with_open_street_map">تسجيل الدخول عبر الشارع المفتوح</string>
    <string name="gpx_upload_public_visibility_descr">عام يعني أنه سيتم عرض التتبع بشكل عام في تتبعات GPS الخاصة بك وفي قوائم تتبع GPS العامة. البيانات المقدمة عبر API لا تشير إلى صفحة التتبع الخاصة بك. الطوابع الزمنية لنقاط التتبع غير متاحة من خلال واجهة برمجة تطبيقات GPS API العامة، والنقاط غير مرتبة ترتيبًا زمنيًا. ومع ذلك، لا يزال المستخدمون الآخرون قادرين على تنزيل التتبع الأولي من قائمة التتبع العامة وأي طوابع زمنية مضمنة فيه.</string>
-    <string name="gpx_upload_identifiable_visibility_descr">متعرف عليه يعني أنه سيتم عرض التتبع بشكل عام في تتبعات GPS الخاصة بك وفي قوائم تتبع GPS العامة، أي سيتمكن المستخدمون الآخرون من تنزيل التتبع الأولي وربطه باسم المستخدم الخاص بك. ستشير البيانات التي يتم تقديمها عبر API نقاط التتبع إلى صفحة التتبع الأصلية الخاصة بك. الطوابع الزمنية لنقاط التتبع متاحة من خلال واجهة برمجة تطبيقات GPS API العامة.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">سيتم عرض التتبع بشكل عام في تتبع GPS الخاصة بك وفي قوائم تتبع GPS العامة، أي سيتمكن المستخدمون الآخرون من تنزيل التتبع الأولي وربطه باسم المستخدم الخاص بك. ستشير البيانات التي يتم تقديمها عبر API نقاط التتبع إلى صفحة التتبع الأصلية الخاصة بك. الطوابع الزمنية لنقاط التتبع متاحة من خلال واجهة برمجة تطبيقات GPS API العامة.</string>
    <string name="osm_edit_close_note">أغلاق ملاحظة OSM</string>
    <string name="osm_edit_comment_note">تعليق ملاحظة OSM</string>
    <string name="osm_login_descr">قم بتسجيل الدخول باستخدام طريقة المصادقة الآمنة أو استخدم اسم المستخدم وكلمة المرور.</string>
@ -3968,7 +3968,7 @@
    <string name="app_mode_kayak">كاياك (قوارب صغيرة فردية)</string>
    <string name="app_mode_motorboat">زورق</string>
    <string name="shared_string_search_history">سجل البحث</string>
-    <string name="export_not_enough_space_descr">جهازك يحتوي على %1$s فقط متاحة . الرجاء إخلاء بعض المساحة أو إلغاء تحديد بعض العناصر للتصدير.</string>
+    <string name="export_not_enough_space_descr">مساحة جهازك %1$s الخالية فقط. يرجى تحرير بعض المساحة أو إلغاء تحديد بعض العناصر للتصدير.</string>
    <string name="shared_string_resources">المصادر</string>
    <string name="approximate_file_size">حجم الملف التقريبي</string>
    <string name="select_data_to_export">حدد البيانات التي سيتم تصديرها إلى الملف.</string>
@ -3976,7 +3976,7 @@
    <string name="export_not_enough_space">لا يوجد مساحة كافية</string>
    <string name="add_to_mapillary">أضف إلى مابيلاي</string>
    <string name="add_to_opr">إضافة إلى OpenPlaceReviews</string>
-    <string name="add_photos_descr">ويعرض صورًا من عدة مصادر:
+    <string name="add_photos_descr">يعرض صورا من عدة مصادر:
 \nOpenPlaceReviews - صور POI ؛
 \nMapillary - صور على مستوى الشارع ؛
 \nالويب / ويكيميديا - صور POI المحددة في بيانات OpenStreetMap.</string>
@ -3988,7 +3988,7 @@
    <string name="select_picture">تحديد صورة</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
    <string name="lang_de_casual">الألمانية (تقليدية)</string>
-    <string name="elevation_data">يمكنك استخدام بيانات الارتفاع للنظر في الصعود / الهبوط لرحلتك</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>
@ -3998,7 +3998,7 @@
 \n
 \n • مخطط الطريق: الرسوم البيانية للأجزاء مع المسار ، إضافة القدرة على إنشاء وتحرير مسارات مقطع مضاعفة
 \n
-\n • تمت إضافة طريقة مصادقة OAuth لـ OpenStreetMap ، واجهة مستخدم محسنة لمربعات حوار OSM
+\n • تمت إضافة طريقة مصادقة آلية لـ OpenStreetMap ، واجهة مستخدم محسنة لمربعات حوار OSM
 \n
 \n • ألوان مخصصة للمفضلة والمسارات نقاط الطريق
 \n
--- a/OsmAnd/res/values-ast/phrases.xml
+++ b/OsmAnd/res/values-ast/phrases.xml
@ -12,7 +12,7 @@
    <string name="poi_shoes_type">Tipu de calzáu</string>
    <string name="poi_fire_hydrant_type">Tipu</string>
    <string name="poi_fire_hydrant_position">Posición</string>
-    <string name="poi_fire_hydrant_water_source">Orixe del agua</string>
+    <string name="poi_water_source">Orixe del agua</string>
    <string name="poi_payment_toll_type">Tipu de pagu</string>
    <string name="poi_traffic_signals_sound">Soníu</string>
    <string name="poi_highway_crossing_type">Tipu</string>
--- a/OsmAnd/res/values-az/phrases.xml
+++ b/OsmAnd/res/values-az/phrases.xml
@ -24,7 +24,7 @@
 	<string name="poi_shoes_type">Növ</string>
 	<string name="poi_fire_hydrant_type">Növ</string>
 	<string name="poi_fire_hydrant_position">Mövqe</string>
-	<string name="poi_fire_hydrant_water_source">Su mənbəyi</string>
+	<string name="poi_water_source">Su mənbəyi</string>
 	<string name="poi_payment_toll_type">Ödəniş növü</string>
 	<string name="poi_traffic_signals_sound">Səs</string>
 	<string name="poi_highway_crossing_type">Növ</string>
--- a/OsmAnd/res/values-az/strings.xml
+++ b/OsmAnd/res/values-az/strings.xml
@ -1699,7 +1699,7 @@
    <string name="move_to_history">Tarixçəyə daşı</string>
    <string name="group_will_be_removed_after_restart">Proqramı növbəti dəfə başlatdığınızda qrup yox olacaq.</string>
    <string name="show_arrows_on_the_map">Xəritədə oxları göstər</string>
-    <string name="remove_from_map_markers">Xəritə işarələrindən sil</string>
+    <string name="remove_from_map_markers">“Xəritə işarələri”ndən sil</string>
    <string name="descendingly">Z-A</string>
    <string name="ascendingly">A-Z</string>
    <string name="date_added">Əlavə edildi</string>
@ -2170,4 +2170,5 @@
    <string name="osm_edit_closed_note">Bağlanmış OSM qeydi</string>
    <string name="shared_string_custom">Xüsusi</string>
    <string name="plan_route_last_edited">Son düzəliş</string>
+    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
 </resources>
--- a/OsmAnd/res/values-b+hsb/phrases.xml
+++ b/OsmAnd/res/values-b+hsb/phrases.xml
@ -1874,7 +1874,7 @@
    <string name="poi_aerialway_transport">powětrowy transport</string>
    <string name="poi_payment_fuel_type">tankowanske karty</string>
    <string name="poi_fire_hydrant_position">městno</string>
-    <string name="poi_fire_hydrant_water_source">wodowa žórła</string>
+    <string name="poi_water_source">wodowa žórła</string>
    <string name="poi_car_yes">awto: haj</string>
    <string name="poi_car_no">awto: ně</string>
    <string name="poi_scooter_yes">motorske: haj</string>
--- a/OsmAnd/res/values-b+kab/phrases.xml
+++ b/OsmAnd/res/values-b+kab/phrases.xml
@ -530,9 +530,9 @@
    <string name="poi_dispensing_yes">Ih</string>
    <string name="poi_summer_camp">Camp d\'Ã©tÃ©</string>
    <string name="poi_depth">Profondeur du framebuffer</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Flux</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Pond</string>
-    <string name="poi_fire_hydrant_style_water_source_main">MAIN</string>
+    <string name="poi_water_source_stream">Flux</string>
+    <string name="poi_water_source_pond">Pond</string>
+    <string name="poi_water_source_main">MAIN</string>
    <string name="poi_fire_hydrant_position_street">Abrid</string>
    <string name="poi_fire_hydrant_position_green">Adal</string>
    <string name="poi_disease_aids_no">Tallalin timeẓranin</string>
@ -618,7 +618,7 @@
    <string name="poi_brushless">War imeṣleḥ</string>
    <string name="poi_tactile_paving">Anasiw annalan</string>
    <string name="poi_payment_toll_type">Tawsit n lexlaṣ</string>
-    <string name="poi_fire_hydrant_water_source">Tala</string>
+    <string name="poi_water_source">Tala</string>
    <string name="poi_fire_hydrant_position">Adig</string>
    <string name="poi_bicycle_service">Ameẓlu n uvilu</string>
    <string name="poi_vending_type">Anaw n uznuzu</string>
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@ -2603,9 +2603,9 @@
    <string name="poi_fire_hydrant_position_parking_lot">Паркоўка</string>
    <string name="poi_fire_hydrant_position_street">Вуліца</string>
    <string name="poi_fire_hydrant_position_underground">Падземны</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Асноўная</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Сажалка</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Струмень</string>
+    <string name="poi_water_source_main">Асноўная</string>
+    <string name="poi_water_source_pond">Сажалка</string>
+    <string name="poi_water_source_stream">Струмень</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Ёмістасць</string>
    <string name="poi_in_service_yes">Выкарыстоўваецца: так</string>
    <string name="poi_street_cabinet_power">Тып шафы: электрычная</string>
@ -2772,7 +2772,7 @@
    <string name="poi_shoes_type">Тып абутку</string>
    <string name="poi_fire_hydrant_type">Тып</string>
    <string name="poi_fire_hydrant_position">Размяшчэнне</string>
-    <string name="poi_fire_hydrant_water_source">Крыніца вады</string>
+    <string name="poi_water_source">Крыніца вады</string>
    <string name="poi_payment_toll_type">Тып аплаты</string>
    <string name="poi_traffic_signals_sound">Гукавы сігнал</string>
    <string name="poi_highway_crossing_type">Тып</string>
@ -3806,7 +3806,7 @@
    <string name="poi_pump_status_missing_beam">Стан помпы: адсутнічае рычаг</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Усмоктванне</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Пад ціскам</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Падземныя воды</string>
+    <string name="poi_water_source_groundwater">Падземныя воды</string>
    <string name="poi_fire_hydrant_type_pipe">Труба</string>
    <string name="poi_drinking_water_refill_network">Сетка папаўнення пітной вадой</string>
    <string name="poi_drinking_water_refill_no">Папаўненне пітной вадой: не</string>
--- a/OsmAnd/res/values-ber/phrases.xml
+++ b/OsmAnd/res/values-ber/phrases.xml
@ -11,6 +11,6 @@
    <string name="poi_recycling_type">ⴰⵙⵔⵜⵓ</string>
    <string name="poi_covered">ⵉⵜⵜⵡⴰⴷⵍ</string>
    <string name="poi_traffic_signals_sound">ⴰⵎⵙⵍⴰⵢ</string>
-    <string name="poi_fire_hydrant_water_source">ⴰⵖⴱⴰⵍⵓ ⵏ ⵡⴰⵎⴰⵏ</string>
+    <string name="poi_water_source">ⴰⵖⴱⴰⵍⵓ ⵏ ⵡⴰⵎⴰⵏ</string>
    <string name="poi_fire_hydrant_position">ⴰⵏⵙⴰ</string>
 </resources>
--- a/OsmAnd/res/values-bg/phrases.xml
+++ b/OsmAnd/res/values-bg/phrases.xml
@ -410,7 +410,7 @@
    <string name="poi_shoes_type">Тип обувки</string>
    <string name="poi_fire_hydrant_type">Тип</string>
    <string name="poi_fire_hydrant_position">Позиция</string>
-    <string name="poi_fire_hydrant_water_source">Източник на вода</string>
+    <string name="poi_water_source">Източник на вода</string>
    <string name="poi_payment_toll_type">Тип плащане</string>
    <string name="poi_traffic_signals_sound">Звуков сигнал</string>
    <string name="poi_highway_crossing_type">Тип</string>
--- a/OsmAnd/res/values-bn/phrases.xml
+++ b/OsmAnd/res/values-bn/phrases.xml
@ -60,7 +60,7 @@
    <string name="poi_shoes_type">ধরণ</string>
    <string name="poi_fire_hydrant_type">ধরণ</string>
    <string name="poi_fire_hydrant_position">অবস্থান</string>
-    <string name="poi_fire_hydrant_water_source">পানির উৎস</string>
+    <string name="poi_water_source">পানির উৎস</string>
    <string name="poi_payment_toll_type">অর্থ প্রদানের ধরণ</string>
    <string name="poi_traffic_signals_sound">শব্দ</string>
    <string name="poi_highway_crossing_type">ধরণ</string>
--- a/OsmAnd/res/values-br/phrases.xml
+++ b/OsmAnd/res/values-br/phrases.xml
@ -12,7 +12,7 @@
    <string name="poi_shoes_type">Seurt</string>
    <string name="poi_fire_hydrant_type">Seurt</string>
    <string name="poi_fire_hydrant_position">Lec\'hiadur</string>
-    <string name="poi_fire_hydrant_water_source">Pourvezañ dour</string>
+    <string name="poi_water_source">Pourvezañ dour</string>
    <string name="poi_payment_toll_type">Doare paeamant</string>
    <string name="poi_traffic_signals_sound">Son</string>
    <string name="poi_highway_crossing_type">Seurt</string>
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@ -2103,7 +2103,7 @@
    <string name="poi_shoes_type">Tipus</string>
    <string name="poi_fire_hydrant_type">Tipus</string>
    <string name="poi_fire_hydrant_position">Posició</string>
-    <string name="poi_fire_hydrant_water_source">Origen de l\'aigua</string>
+    <string name="poi_water_source">Origen de l\'aigua</string>
    <string name="poi_payment_toll_type">Tipus de pagament</string>
    <string name="poi_traffic_signals_sound">So</string>
    <string name="poi_highway_crossing_type">Tipus</string>
@ -2713,9 +2713,9 @@
    <string name="poi_office_physician">Consulta fisioterapeuta</string>
    <string name="poi_office_therapist">Consulta terapeuta</string>
    <string name="poi_office_podologist">Consulta podòleg</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Artèria</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Estany</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Riu</string>
+    <string name="poi_water_source_main">Artèria</string>
+    <string name="poi_water_source_pond">Estany</string>
+    <string name="poi_water_source_stream">Riu</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
    <string name="poi_in_service_yes">En servei: sí</string>
    <string name="poi_aerodrome_type_international">Internacional</string>
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@ -2584,9 +2584,9 @@
    <string name="poi_fire_hydrant_position_street">Ulice</string>
    <string name="poi_fire_hydrant_position_underground">Podzemní</string>
    <string name="poi_fire_hydrant_style_wsh">Styl hydrantu: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Hlavní</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Rybník</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Potok</string>
+    <string name="poi_water_source_main">Hlavní</string>
+    <string name="poi_water_source_pond">Rybník</string>
+    <string name="poi_water_source_stream">Potok</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
    <string name="poi_in_service_yes">V provozu: ano</string>
    <string name="poi_street_cabinet_power">Typ skříně: energie</string>
@ -2705,7 +2705,7 @@
    <string name="poi_vending_type">Způsob prodeje</string>
    <string name="poi_bicycle_service">Cykloservis</string>
    <string name="poi_fire_hydrant_position">Umístění</string>
-    <string name="poi_fire_hydrant_water_source">Zdroj vody</string>
+    <string name="poi_water_source">Zdroj vody</string>
    <string name="poi_traffic_signals_sound">Zvuk</string>
    <string name="poi_tactile_paving">Dlažba pro slabozraké</string>
    <string name="poi_service_general">Servis</string>
@ -3825,7 +3825,7 @@
    <string name="poi_pump_status_missing_beam">Stav pumpy: chybí rukojeť</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Sání</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Pod tlakem</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Podzemní voda</string>
+    <string name="poi_water_source_groundwater">Podzemní voda</string>
    <string name="poi_fire_hydrant_type_pipe">Roura</string>
    <string name="poi_internet_access_fee_customers">Internetový přístup: zákazníci</string>
    <string name="poi_monastery_type_clerks_regular">Typ klášteru: řeholnický</string>
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@ -679,7 +679,7 @@
    <string name="poi_search_desc">Hledat body zájmu (POI)</string>
    <string name="address_search_desc">Hledat adresu</string>
    <string name="navpoint_search_desc">Souřadnice</string>
-    <string name="transport_search_desc">Hledat veřejnou dopravu</string>
+    <string name="transport_search_desc">Hledání veřejné dopravy</string>
    <string name="favourites_search_desc">Způsob hledání Oblíbeného místa</string>
    <string name="rendering_attr_noPolygons_description">Zobrazit všechny typy půdy průhledně.</string>
    <string name="rendering_attr_noPolygons_name">Polygony</string>
@ -699,11 +699,11 @@
    <string name="gpxup_private">Soukromé</string>
    <string name="osmand_parking_event">Vyzvednout auto z parkoviště</string>
    <string name="osmand_parking_warning">Upozornění</string>
-    <string name="osmand_parking_warning_text">Upozornění k vyzvednutí vašeho auta již bylo přidáno do vašeho kalendáře. Zůstane tam, dokud jej ručně nesmažete.</string>
+    <string name="osmand_parking_warning_text">Do vašeho kalendáře bylo přidána upomínka k vyzvednutí vašeho auta. Můžete ji tam upravit nebo odstranit.</string>
    <string name="osmand_parking_time_limit_title">Nastavte maximální povolenou dobu parkování</string>
    <string name="osmand_parking_delete_confirm">Smazat značku parkovacího místa\?</string>
    <string name="osmand_parking_delete">Smazat místo parkování</string>
-    <string name="osmand_parking_choose_type">Vyberte typ stání</string>
+    <string name="osmand_parking_choose_type">Vyberte typ parkování</string>
    <string name="osmand_parking_lim_text">Časově omezené</string>
    <string name="osmand_parking_no_lim_text">Časově neomezené</string>
    <string name="osmand_parking_add_event">Přidat upozornění do kalendáře</string>
@ -719,14 +719,14 @@
    <string name="osmand_parking_plugin_name">Parkovací místo</string>
    <string name="context_menu_item_add_parking_point">Označit jako místo parkování</string>
    <string name="context_menu_item_delete_parking_point">Smazat místo parkování</string>
-    <string name="starting_point_too_far">Počáteční bod je příliš daleko nejbližší silnici.</string>
+    <string name="starting_point_too_far">Počáteční bod je příliš daleko od nejbližší silnice.</string>
    <string name="shared_location">Sdílená pozice</string>
    <string name="global_app_allocated_memory_descr">Alokovaná paměť %1$s MB (Limit Androidu %2$s MB, Dalvik %3$s MB).</string>
    <string name="global_app_allocated_memory">Alokovaná paměť</string>
    <string name="native_app_allocated_memory_descr">Celková nativní paměť alokovaná aplikací %1$s MB (Dalvik %2$s MB, ostatní %3$s MB).
-Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</string>
+\n Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</string>
    <string name="native_app_allocated_memory">Celková nativní paměť</string>
-    <string name="select_animate_speedup">Vyberte zrychlení simulované navigace</string>
+    <string name="select_animate_speedup">Rychlost simulované navigace:</string>
    <string name="osmand_parking_hours">hodin</string>
    <string name="osmand_parking_minutes">minut</string>
    <string name="osmand_parking_position_description_add_time">Auto je zaparkováno v</string>
@ -736,11 +736,11 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="continue_follow_previous_route_auto">Pokračovat v předchozí nedokončené navigaci? (%1$s sekund)</string>
    <string name="show_cameras">Dopravní radary</string>
    <string name="show_traffic_warnings">Dopravní varování</string>
-    <string name="avoid_toll_roads">Vyhnout se placeným silnicím</string>
+    <string name="avoid_toll_roads">Žádné placené silnice</string>
    <string name="map_widget_top_text">Jméno ulice</string>
    <string name="map_widget_config">Nastavení</string>
    <string name="map_widget_back_to_loc">Moje pozice</string>
-    <string name="map_widget_lock_screen">Uzamknout obrazovku</string>
+    <string name="map_widget_lock_screen">Zámek</string>
    <string name="map_widget_compass">Kompas</string>
    <string name="map_widget_reset">Obnovit výchozí hodnoty</string>
    <string name="map_widget_parking">Parkování</string>
@ -752,16 +752,16 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="map_widget_next_turn_small">Příští odbočka (mini)</string>
    <string name="map_widget_next_next_turn">Přespříští odbočka</string>
    <string name="map_widget_mini_route">Miniaturní mapa trasy</string>
-    <string name="bg_service_screen_lock">Zámek obrazovky</string>
+    <string name="bg_service_screen_lock">Zámek</string>
    <string name="bg_service_screen_lock_toast">Obrazovka je zamčena</string>
    <string name="bg_service_interval">Interval sledování polohy:</string>
-    <string name="screen_is_locked">Stiskněte ikonu zámku pro odemčení obrazovky</string>
-    <string name="bg_service_screen_unlock">Odemknout obrazovku</string>
+    <string name="screen_is_locked">Stiskněte ikonu zámku pro odemčení</string>
+    <string name="bg_service_screen_unlock">Odemknout</string>
    <string name="bg_service_sleep_mode_off">Zapnout\nslužbu na pozadí</string>
    <string name="bg_service_sleep_mode_on">Vypnout\nslužbu na pozadí</string>
    <string name="show_lanes">Jízdní pruhy</string>
-    <string name="avoid_unpaved">Vyhnout se nezpevněným cestám</string>
-    <string name="avoid_ferries">Vyhnout se trajektům</string>
+    <string name="avoid_unpaved">Žádné nezpevněné cesty</string>
+    <string name="avoid_ferries">Žádné trajekty</string>
    <string name="avoid_in_routing_title">Vyhnout se…</string>
    <string name="show_warnings_title">Zobrazit upozornění…</string>
    <string name="show_warnings_descr">Nastavit dopravní varování (omezení rychlosti, značky stop, retardéry, tunely), rychlostní radary a jízdní pruhy.</string>
@ -774,13 +774,13 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="map_widget_view_direction">Zorné pole</string>
    <string name="day_night_info_description">Východ slunce: %1$s
 \nZápad slunce: %2$s</string>
-    <string name="osmand_short_description_80_chars">OsmAnd je open-source navigační program s podporou off-line a on-line map celého světa</string>
+    <string name="osmand_short_description_80_chars">Mobilní zobrazování celosvětových map a navigace pro offline i online mapy OSM</string>
    <string name="osmand_plus_short_description_80_chars">OsmAnd je open-source navigační program s podporou off-line a on-line map celého světa</string>
    <string name="filterpoi_activity">Vytvořit filtr pro POI</string>
-    <string name="select_navigation_mode">Vyberte způsob dopravy</string>
+    <string name="select_navigation_mode">Způsob dopravy:</string>
    <string name="day_night_info">Denní/noční info</string>
    <string name="map_widget_renderer">Styl mapy</string>
-    <string name="avoid_motorway">Vyhnout se dálnicím</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>
@ -806,32 +806,49 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="new_destination_point_dialog">Cíl je již nastaven:</string>
    <string name="target_point">Cíl %1$s</string>
    <string name="shared_string_target_points">Cíle</string>
-    <string name="osmand_long_description_1000_chars">"OsmAnd
+    <string name="osmand_long_description_1000_chars">OsmAnd (OSM Automated Navigation Directions)
 \n
-\nOsmAnd je open-source navigační program s přístupem k široké paletě celosvětových mapových dat OpenStreetMap (OSM). Veškerá mapová data (vektorová nebo rastrová) mohou být uložena na paměťové kartě telefonu pro off-line použití. OsmAnd také nabízí off-line a on-line navigaci včetně hlasových pokynů.
+\nOsmAnd je open-source navigační program s přístupem k široké paletě celosvětových mapových dat OpenStreetMap (OSM). Veškerá mapová data (vektorová nebo rastrová) mohou být uložena na paměťové kartě telefonu pro off-line použití. OsmAnd také nabízí offline a online navigaci včetně hlasových pokynů.
 \n
-\nVýčet některých hlavních funkcí: - dokáže pracovat kompletně off-line (vektorové nebo rastrové mapy lze uložit do úložiště zařízení) - kompaktní off-line vektorové mapy celého světa dostupné zdarma - stahování národních nebo regionálních map přímo z aplikace - možnost zobrazení několika vrstev mapy: GPX trasa, body zájmu, oblíbená místa, vrstevnice, zastávky hromadné dopravy, dodatečné mapy s nastavitelnou průhledností - off-line vyhledávání adres a bodů zájmu - off-line navigace na střední vzdálenosti - režim auto, kolo a pěší s volitelným:
-\n    - přepínáním denního a nočního zobrazení
-\n    - automatickým zvětšováním podle rychlosti pohybu
-\n    - natáčením mapy podle kompasu nebo směru pohybu
-\n    - naváděním do jízdních pruhů, zobrazením rychlostních limitů
-\n    - TTS nebo audio hlasovými pokyny
+\nVýčet některých hlavních funkcí:
+\n - dokáže pracovat kompletně offline (vektorové nebo rastrové mapy lze uložit do úložiště zařízení)
+\n - kompaktní offline vektorové mapy celého světa dostupné zdarma
+\n - stahování národních nebo regionálních map přímo z aplikace
+\n - možnost zobrazení několika vrstev mapy: GPX trasa, body zájmu, oblíbená místa, vrstevnice, zastávky hromadné dopravy, dodatečné mapy s nastavitelnou průhledností
+\n - offline vyhledávání adres a bodů zájmu
+\n - offline navigace na střední vzdálenosti
+\n - režim auto, kolo a pěší s volitelnými funkcemi:
+\n - přepínání denního a nočního zobrazení
+\n - automatické přibližování mapy podle rychlosti pohybu
+\n - otáčení mapy podle kompasu nebo směru pohybu
+\n - navádění do jízdních pruhů, zobrazení rychlostních limitů, nahrané i TTS hlasy
 \n 
-\nOmezení této verze zdarma: - omezený počet map ke stažení - chybějící přístup na off-line Wikipedia POI
+\nOmezení této bezplatné verze:
+\n - omezený počet map ke stažení
+\n - bez offline přístupu k bodům zájmu na Wikipedii
 \n
-\nOsmAnd je aktivně vyvíjen a náš projekt i jeho budoucí vývoj závisí na finančních příspěvcích. Prosím zvažte zakoupení verze OsmAnd+, sponzorování konkrétní nové funkce nebo obecný dar na osmand.net."</string>
-    <string name="osmand_plus_long_description_1000_chars">"OsmAnd+
+\n OsmAnd je aktivně vyvíjen a náš projekt i jeho budoucí vývoj závisí na finančních příspěvcích. Prosím zvažte zakoupení verze OsmAnd+, sponzorování konkrétní nové funkce nebo obecný dar na https://osmand.net.</string>
+    <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions)
 \n
-\nOsmAnd+ je open-source navigační program s přístupem k široké paletě celosvětových mapových dat OpenStreetMap (OSM). Veškerá mapová data (vektorová nebo rastrová) mohou být uložena na paměťové kartě telefonu pro off-line použití. OsmAnd+ také nabízí off-line a on-line navigaci včetně hlasových pokynů.
+\n OsmAnd+ je open source navigační program s přístupem k široké paletě celosvětových mapových dat OpenStreetMap (OSM). Veškerá mapová data (vektorová nebo rastrová) mohou být uložena na paměťové kartě telefonu pro offline použití. OsmAnd+ také nabízí offline a online navigaci včetně hlasových pokynů.
 \n
 \nOsmAnd+ je placená verze aplikace, jejím zakoupením sponzorujete projekt, vývoj nových funkcí a obdržíte nejnovější aktualizace.
 \n
-\nVýčet některých hlavních funkcí: - dokáže pracovat kompletně off-line (vektorové nebo rastrové mapy lze uložit do úložiště zařízení) - kompaktní off-line vektorové mapy celého světa dostupné zdarma - neomezené stahování národních nebo regionálních map přímo z aplikace - funkce off-line Wikipedie (stažení informací o bodech zájmu z Wikipedie), vynikající pro turisty - možnost zobrazení několika vrstev mapy: GPX trasa, body zájmu, oblíbená místa, vrstevnice, zastávky hromadné dopravy, dodatečné mapy s nastavitelnou průhledností - off-line vyhledávání adres a bodů zájmu - off-line navigace na střední vzdálenosti - režim auto, kolo a pěší s volitelným:
-\n    - přepínáním denního a nočního zobrazení
-\n    - automatickým zvětšováním podle rychlosti pohybu
-\n    - natáčením mapy podle kompasu nebo směru pohybu
-\n    - naváděním do jízdních pruhů, zobrazením rychlostních limitů
-\n    - TTS nebo audio hlasovými pokyny"</string>
+\n Výčet některých hlavních funkcí:
+\n - dokáže pracovat kompletně offline (vektorové nebo rastrové mapy lze uložit do úložiště zařízení)
+\n - kompaktní offline vektorové mapy celého světa dostupné zdarma
+\n - neomezené stahování národních nebo regionálních map přímo z aplikace
+\n - funkce offline Wikipedie (stažení informací o bodech zájmu z Wikipedie), vynikající pro turisty
+\n - možnost zobrazení několika vrstev mapy: GPX nebo navigační trasa, body zájmu, oblíbená místa, vrstevnice, zastávky hromadné dopravy, dodatečné mapy s nastavitelnou průhledností
+\n 
+\n - offline vyhledávání adres a bodů zájmu
+\n - offline navigace na střední vzdálenosti
+\n - režim auto, kolo a pěší s volitelnými funkcemi:
+\n - přepínání denního a nočního zobrazení
+\n - automatické přibližování mapy podle rychlosti pohybu
+\n - otáčení mapy podle kompasu nebo směru pohybu
+\n - navádění do jízdních pruhů, zobrazení rychlostních limitů, nahrané i TTS hlasové pokyny
+\n</string>
    <string name="map_widget_monitoring_services">Sledování polohy</string>
    <string name="no_route">Žádná cesta</string>
    <string name="delete_target_point">Smazat cíl</string>
@ -855,7 +872,7 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="rendering_attr_showRoadMaps_name">Silniční mapy</string>
    <string name="incomplete_locale">neúplný</string>
    <string name="no_buildings_found">Nenalezeny žádné budovy.</string>
-    <string name="search_villages_and_postcodes">Hledat obec/PSČ</string>
+    <string name="search_villages_and_postcodes">Hledat více obcí/PSČ</string>
    <string name="route_descr_lat_lon">%1$.3f šířky, %2$.3f délky</string>
    <string name="map_widget_max_speed">Rychlostní omezení</string>
    <string name="rendering_attr_noAdminboundaries_name">Hranice oblastí</string>
@ -868,14 +885,14 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
 \nCelosvětová výšková data (mezi 70° severní šířky a 70° jižní šířky) se zakládají na měřeních SRTM (Shuttle Radar Topography Mission) a ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), snímkovací přístroj na palubě satelitu Terra, vlajkového satelitu Systému pozorování Země NASA. ASTER je společným projektem NASA, japonského ministerstva hospodářství, obchodu a průmyslu (METI) a Japan Space Systems (J-spacesystems).</string>
    <string name="srtm_plugin_name">Vrstevnice</string>
    <string name="download_srtm_maps">Vrstevnice</string>
-    <string name="audionotes_location_not_defined">GPS pozice pro záznam zvukové poznámky ještě není známa. Pokud chcete použít specifickou lokaci použijte \"Možnosti bodu\".</string>
+    <string name="audionotes_location_not_defined">Klepněte na \'Použít polohu...\' pro přidání poznámky k poloze.</string>
    <string name="map_widget_audionotes">Audio poznámky</string>
    <string name="recording_is_recorded">Nahrávání audia/videa. Stiskněte tlačítko Stop pro zastavení.</string>
    <string name="recording_open_external_player">Otevřít externí přehrávač</string>
    <string name="recording_delete_confirm">Smazat tento záznam\?</string>
    <string name="recording_context_menu_arecord">Nahrát zvukovou poznámku</string>
    <string name="recording_context_menu_vrecord">Nahrát video poznámku</string>
-    <string name="recording_can_not_be_played">Záznam nelze přehrát</string>
+    <string name="recording_can_not_be_played">Nepodařilo se přehrát záznam.</string>
    <string name="recording_context_menu_delete">Smazat záznam</string>
    <string name="recording_context_menu_play">Přehrát</string>
    <string name="map_widget_av_notes">Zvukové/video poznámky</string>
@ -884,9 +901,9 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="index_srtm_parts">části</string>
    <string name="av_def_action_video">Nahrát video</string>
    <string name="av_def_action_audio">Nahrát zvuk</string>
-    <string name="av_widget_action_descr">Zvolte výchozí funkci.</string>
+    <string name="av_widget_action_descr">Výchozí akce widgetu:</string>
    <string name="av_widget_action">Výchozí funkce</string>
-    <string name="av_video_format_descr">Zvolte formát videozáznamu.</string>
+    <string name="av_video_format_descr">Formát výstupního videa:</string>
    <string name="av_video_format">Formát videozáznamu</string>
    <string name="av_use_external_recorder_descr">Použít systémový záznamník videa.</string>
    <string name="av_use_external_recorder">Použít externí záznamník</string>
@ -904,10 +921,10 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="shared_string_control_start">Start</string>
    <string name="dropbox_plugin_name">Modul Dropbox</string>
    <string name="intermediate_points_change_order">Změnit pořadí</string>
-    <string name="srtm_paid_version_msg">Prosím zvažte platbu modulu \'Vrstevnice\' pro podporu dalšího vývoje.</string>
+    <string name="srtm_paid_version_msg">Prosím zvažte zakoupení modulu \'Vrstevnice\', abyste podpořili další vývoj.</string>
    <string name="srtm_paid_version_title">Modul Vrstevnice</string>
    <string name="shared_string_control_stop">Zastavit</string>
-    <string name="dropbox_plugin_description">Modul Dropbox vám umožňuje synchronizovat trasy, audio a video poznámky s vaším účtem Dropbox.</string>
+    <string name="dropbox_plugin_description">Synchronizuje trasy a audio/video poznámky s vaším účtem Dropbox.</string>
    <string name="osmand_srtm_long_description_1000_chars">Tento modul poskytuje zobrazení vrstevnic a vrstvy stínování kopců, které mohou být zobrazené na standardních OsmAnd mapách. Tato funkce je vhodná především pro sportovce, turisty, chodce a vůbec všechny, které zajímá profil terénu.
 \n
 \nCelosvětová výšková data (mezi 70° severní šířky a 70° jižní šířky) se zakládají na měřeních SRTM (Shuttle Radar Topography Mission) a ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), snímkovacího přístroje na palubě satelitu Terra, vlajkového satelitu Systému pozorování Země NASA. ASTER je společným projektem NASA, japonského ministerstva hospodářství, obchodu a průmyslu (METI) a Japan Space Systems (J-spacesystems).</string>
@ -929,7 +946,7 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="index_name_openmaps">OpenMaps EU</string>
    <string name="download_hillshade_maps">Stínování kopců</string>
    <string name="prefer_in_routing_descr">Upřednostňovat dálnice.</string>
-    <string name="av_def_action_choose">Vybrat při použití</string>
+    <string name="av_def_action_choose">Na žádost\?</string>
    <string name="access_arrival_time">Čas příjezdu</string>
    <string name="layer_hillshade">Stínování</string>
    <string name="map_widget_gps_info">Info o GPS</string>
@ -939,7 +956,7 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="item_checked">zvoleno</string>
    <string name="item_unchecked">nezvoleno</string>
    <string name="choose_osmand_theme">Vzhled aplikace</string>
-    <string name="choose_osmand_theme_descr">Vyberte si vzhled aplikace.</string>
+    <string name="choose_osmand_theme_descr">Přizpůsobte si vzhled aplikace.</string>
    <string name="street_name">Název ulice</string>
    <string name="hno">číslo domu</string>
    <string name="download_using_mobile_internet">Není připojení přes WiFi. Použít současné připojení k internetu pro stahování\?</string>
@ -947,7 +964,7 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="files_limit">Zbývá %1$d souborů</string>
    <string name="monitoring_settings">Záznam cesty</string>
    <string name="accessibility_options">Volby usnadnění</string>
-    <string name="select_address_activity">Vybrat adresu</string>
+    <string name="select_address_activity">Zadat adresu</string>
    <string name="favourites_list_activity">Vybrat Oblíbené</string>
    <string name="local_openstreetmap_act_title">Editace OSM</string>
    <string name="shared_string_more_actions">Další akce</string>
@ -959,13 +976,13 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="use_magnetic_sensor">Používat magnetický senzor</string>
    <string name="wait_current_task_finished">Čekejte prosím na dokončení úlohy</string>
    <string name="use_magnetic_sensor_descr">K určení směru použít magnetický senzor místo senzoru natočení.</string>
-    <string name="cancel_route">Zrušit trasu</string>
+    <string name="cancel_route">Zrušit trasu\?</string>
    <string name="clear_destination">Smazat cíl</string>
    <string name="local_indexes_cat_srtm">Vrstevnice</string>
    <string name="shared_string_downloading">Stahování…</string>
    <string name="other_location">Ostatní</string>
    <string name="local_osm_changes_backup_successful">Soubor se změnami mapy OSM vytvořen %1$s</string>
-    <string name="local_osm_changes_backup_failed">Nezdařilo se zálohovat změny mapy OSM</string>
+    <string name="local_osm_changes_backup_failed">Nezdařilo se zálohovat změny OSM.</string>
    <string name="local_osm_changes_backup">Zálohovat změny mapy OSM</string>
    <string name="delete_point">Smazat bod</string>
    <string name="plugin_distance_point_time">čas</string>
@ -973,7 +990,7 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="plugin_distance_point_speed">rychlost</string>
    <string name="plugin_distance_point_ele">nadmořská výška</string>
    <string name="plugin_distance_point">bod</string>
-    <string name="gpx_file_name">Jméno GPX souboru</string>
+    <string name="gpx_file_name">Název souboru GPX</string>
    <string name="gpx_saved_sucessfully">Soubor GPX uložen do {0}</string>
    <string name="osmand_distance_planning_plugin_name">Výpočet vzdálenosti a plánovač</string>
    <string name="use_distance_measurement_help">* Stiskněte pro označení bodu. 
@ -989,7 +1006,7 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="osmand_distance_planning_plugin_description">Vytvářejte cesty klikáním na mapu nebo úpravou stávajících GPX souborů pro plánování výletů a měření vzdálenosti mezi body. Výsledek je možné uložit jako GPX a později použít pro navádění.</string>
    <string name="destination_point">Cíl %1$s</string>
    <string name="context_menu_item_destination_point">Nastavit jako cíl</string>
-    <string name="please_select_address">Zvolte nejprve město nebo ulici</string>
+    <string name="please_select_address">Zadejte nejprve město nebo ulici</string>
    <string name="search_street_in_neighborhood_cities">Hledat ulice v okolních obcích</string>
    <string name="intermediate_items_sort_return">Pořadí mezicílů optimalizováno na cestě do cíle.</string>
    <string name="intermediate_items_sort_by_distance">Utřídit ode dveří ke dveřím</string>
@ -1018,13 +1035,13 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="context_menu_item_directions_to">Navigovat sem</string>
    <string name="context_menu_item_directions_from">Navigovat odsud</string>
    <string name="speak_title">Hlásit…</string>
-    <string name="speak_descr">Konfigurace hlášení názvů ulic, dopravních upozornění, radarů, rychlostních omezení.</string>
+    <string name="speak_descr">Nastavte hlášení názvů ulic, dopravních upozornění (vynucených zastavení, zpomalovačů), radarů a rychlostních omezení.</string>
    <string name="speak_street_names">Názvy ulic (TTS)</string>
    <string name="driving_region_japan">Japonsko</string>
    <string name="driving_region_us">Spojené státy</string>
    <string name="driving_region_canada">Kanada</string>
    <string name="driving_region_europe_asia">Evropa, Asie, Latinská Amerika a podobné</string>
-    <string name="driving_region_uk">Británie, Indie a podobné</string>
+    <string name="driving_region_uk">Spojené království, Indie a podobné</string>
    <string name="about_version">Verze:</string>
    <string name="shared_string_about">O aplikaci</string>
    <string name="about_settings_descr">Informace o verzi, licenci, členech projektu</string>
@ -1165,7 +1182,7 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="osmo_edit_color">Zobrazit barvu</string>
    <string name="int_days">dnů</string>
    <string name="osmo_connect_menu">Připojit</string>
-    <string name="interrupt_music_descr">Hlasové pokyny nesníží jen hlasitost, ale pozastaví hudbu.</string>
+    <string name="interrupt_music_descr">Hlasové pokyny pozastaví hudbu.</string>
    <string name="interrupt_music">Pozastavit hudbu</string>
    <string name="share_route_as_gpx">Sdílet trasu jako GPX soubor</string>
    <string name="share_route_subject">Trasa sdílena pomocí OsmAnd</string>
@ -1521,7 +1538,7 @@ Délka %2$s</string>
    <string name="routing_attr_height_name">Výškové omezení</string>
    <string name="routing_attr_height_description">Zadejte výšku vozidla, která musí být povolena na cestách.</string>
    <string name="use_fast_recalculation">Inteligentní přepočítávání trasy</string>
-    <string name="use_fast_recalculation_desc">Přepočítá pouze počáteční úsek trasy. Může se hodit pro dlouhé trasy.</string>
+    <string name="use_fast_recalculation_desc">Přepočítá pouze počáteční úsek trasy, vhodné pro dlouhé trasy.</string>
    <string name="shared_string_logoff">Odhlásit</string>
    <string name="shared_string_import2osmand">Importovat do OsmAnd</string>
    <string name="read_full_article">Přečíst celý článek (on-line)</string>
@ -2501,7 +2518,7 @@ Zobrazená oblast: %1$s x %2$s</string>
    <string name="subsequent_dest_description">Přesune cíl nahoru a vytvoří ho</string>
    <string name="osmand_extended_description_part1">OsmAnd (OSM Automated Navigation Directions) je mapová a navigační aplikace s přístupem k volným a kvalitním celosvětovým údajům z OpenStreetMap (OSM).
 \n
-\nVyužívejte hlasovou a optickou navigaci, zobrazení POI (bodů zájmu), vytváření a správu GPX tras, znázornění vrstevnic a nadmořské výšky (pomocí doplňkového modulu), výběr z režimů auto, cyklista a pěší, editaci OSM a mnoho dalšího.</string>
+\n Využívejte hlasovou a optickou navigaci, zobrazení bodů zájmu, vytváření a správu GPX stop, znázornění vrstevnic a nadmořské výšky (pomocí doplňkového modulu), výběr z režimů auto, cyklista a pěší, editaci OSM a mnoho dalšího.</string>
    <string name="toast_empty_name_error">Bezejmenné místo</string>
    <string name="tunnel_warning">Blíží se tunel</string>
    <string name="show_tunnels">Tunely</string>
@ -2566,22 +2583,22 @@ Zobrazená oblast: %1$s x %2$s</string>
 \n• Hlaste chyby v datech
 \n•Nahrávejte GPX trasy do OSM přímo z aplikace
 \n• Přidávejte body zájmu a rovnou je nahrávejte do OSM (nebo později, pokud jste zrovna offline)</string>
-    <string name="osmand_extended_description_part8">OsmAnd je aktivně vyvíjený open-source software. Do aplikace může každý přispět hlášením chyb, vylepšováním překladů nebo programováním nových funkcí. Projekt je také závislý na finančních příspěvcích pro programování a testování nových funkcí.
-\nPřibližné pokrytí a kvalita map:
-\n• Západní Evropa: ****
-\n• Východní Evropa: ***
-\n• Rusko: ***
-\n• Severní Amerika: ***
-\n• Jižní Amerika: **
-\n• Asie: **
-\n• Japonsko &amp; Korea: ***
-\n• Střední Východ: **
-\n• Afrika: **
-\n• Antarktida: *
-\nMapy většiny států na zeměkouli jsou dostupné ke stažení!
-\nZískejte spolehlivého navigátora ve své zemi - ať je to Francie, Německo, Mexiko, Spojené království, Španělsko, Nizozemí, USA, Rusko, Brazílie či jakákoliv jiná.</string>
+    <string name="osmand_extended_description_part8">OsmAnd je aktivně vyvíjený open source software. Do aplikace může každý přispět hlášením chyb, vylepšováním překladů nebo programováním nových funkcí. Projekt je také závislý na finančních příspěvcích pro vývoj a testování nových funkcí.
+\n Přibližné pokrytí a kvalita map:
+\n • Západní Evropa: ****
+\n • Východní Evropa: ***
+\n • Rusko: ***
+\n • Severní Amerika: ***
+\n • Jižní Amerika: **
+\n • Asie: **
+\n • Japonsko &amp; Korea: ***
+\n • Střední Východ: **
+\n • Afrika: **
+\n • Antarktida: *
+\n Mapy většiny států na zeměkouli jsou dostupné ke stažení!
+\n Získejte spolehlivého navigátora ve své zemi - ať je to Francie, Německo, Mexiko, Spojené království, Španělsko, Nizozemí, USA, Rusko, Brazílie či jakákoliv jiná.</string>
    <string name="osmand_plus_extended_description_part1">OsmAnd+ (OSM Automated Navigation Directions) je mapová a navigační aplikace s přístupem ke kvalitním, bezplatným a celosvětovým datům OpenStreetMap (OSM).
-\nMůžete využít hlasovou a optickou navigaci, prohlížet si POI (body zájmu), vytvářet a spravovat GPX trasy, zobrazit vrstevnice a údaje o nadmořské výšce, vybírat mezi režimem Auto, Cyklista a Pěší, editovat OSM a mnoho dalšího.
+\nMůžete využít hlasovou a optickou navigaci, prohlížet si POI (body zájmu), vytvářet a spravovat GPX trasy, zobrazit vrstevnice a údaje o nadmořské výšce, vybírat mezi režimem auto, cyklista a pěší, editovat OSM a mnoho dalšího.
 \n
 \nOsmAnd+ je placenou verzí aplikace. Jejím zakoupením podpoříte projekt, přispějete na vývoj nových funkcí a získáte nejnovější aktualizace.
 \n
@ -2593,19 +2610,20 @@ Zobrazená oblast: %1$s x %2$s</string>
 \n• Podporuje mezicíle v itineráři
 \n• Automatické přepočítání trasy při odchýlení
 \n• Hledání míst podle adresy, typu (např. restaurace, hotel, čerpací stanice, muzeum) či podle geografických souřadnic</string>
-    <string name="osmand_plus_extended_description_part3">"Prohlížení mapy
-\n• Ukazuje vaši pozici a orientaci
-\n• Volitelné otáčení podle směru vašeho pohybu (nebo podle kompasu)
-\n• Ukládání důležitých míst do složky Moje místa
-\n•  Zobrazuje POI (body zájmu) ve vašem okolí
-\n• Zobrazuje specializované online dlaždice, satelitní mapy (z Bingu), různé překryvné informace jako navigační GPX trasy a další vrstvy s volitelnou průhledností
-\n• Názvy míst lze zobrazit v angličtině, v místním jazyce nebo ve fonetickém přepisu"</string>
-    <string name="osmand_plus_extended_description_part4">Využívá data OSM a Wikipedie
-\n• Kvalitní informace z nejlepších komunitních projektů na světě
-\n• OSM data dostupná podle země nebo regionu
-\n• Body zájmu z Wikipedie, skvělé pro vyhlídkové trasy
-\n• Bezplatné a neomezené stahování přímo z aplikace
-\n• Kompaktní vektorové offline mapy aktualizované nejméně jednou za měsíc
+    <string name="osmand_plus_extended_description_part3">Prohlížení mapy
+\n • Zobrazení vaší pozice a orientace
+\n • Volitelné otáčení podle směru vašeho pohybu (nebo podle kompasu)
+\n • Ukládání důležitých míst jako Oblíbených bodů
+\n • Zobrazení POI (bodů zájmu) ve vašem okolí
+\n • Zobrazení specializovaných online dlaždic, satelitních map (z Bingu), různých překryvných informací jako turistických/navigačních GPX stop a dalších vrstev s volitelnou průhledností
+\n• Názvy míst lze zobrazit v angličtině, v místním jazyce nebo ve fonetickém přepisu
+\n</string>
+    <string name="osmand_plus_extended_description_part4">Využívejte data OSM a Wikipedie
+\n • Kvalitní informace z nejlepších komunitních projektů na světě
+\n • OSM data dostupná podle země nebo regionu
+\n • Body zájmu z Wikipedie, skvělé pro vyhlídkové trasy
+\n • Bezplatné a neomezené stahování přímo z aplikace
+\n • Kompaktní vektorové offline mapy aktualizované nejméně jednou za měsíc
 \n
 \n• Výběr mezi kompletními daty regionu a pouze silniční mapou (například celá mapa Japonska zabírá 700 MB, silniční pouze 200 MB)</string>
    <string name="osmand_plus_extended_description_part5">Bezpečnostní funkce
@ -2627,19 +2645,20 @@ Zobrazená oblast: %1$s x %2$s</string>
 \n• Záznam trasy funguje také na pozadí (když je zařízení v režimu spánku) 
 \nOsmAnd je aktivně vyvíjený open-source software. Do aplikace může každý přispět hlášením chyb, vylepšováním překladů nebo programováním nových funkcí. Projekt je také závislý na finančních příspěvcích pro programování a testování nových funkcí.
 \n</string>
-    <string name="osmand_plus_extended_description_part8">"Přibližné pokrytí a kvalita map:
+    <string name="osmand_plus_extended_description_part8">Přibližné pokrytí a kvalita map:
 \n • Západní Evropa: ****
 \n • Východní Evropa: ***
 \n • Rusko: ***
 \n • Severní Amerika: ***
 \n • Jižní Amerika: **
 \n • Asie: **
-\n • Japonsko &amp; Korea: ***
+\n • Japonsko a Korea: ***
 \n • Střední Východ: **
 \n • Afrika: **
 \n • Antarktida: *
-\nMapy většiny států na zeměkouli jsou dostupné ke stažení
-\nOd Afghánistánu po Zimbabwe, od Austrálie po USA, Argentinu, Brazílii, Kanadu, Francii, Německo, Mexiko, Spojené království, Španělsko, … "</string>
+\n Mapy většiny států na zeměkouli jsou dostupné ke stažení
+\n Od Afghánistánu po Zimbabwe, od Austrálie po USA. Argentina, Brazílie, Kanada, Francie, Německo, Mexiko, Spojené království, Španělsko, …
+\n</string>
    <string name="group_deleted">Skupina smazána</string>
    <string name="clear_all_intermediates">Smazat všechny mezicíle</string>
    <string name="select_waypoints_category_description">Přidat všechny mezicíle na trase nebo vybrat jednotlivé kategorie.</string>
@ -3106,9 +3125,9 @@ Zobrazená oblast: %1$s x %2$s</string>
    <string name="rendering_attr_highway_class_track_grade4_name">4. třída</string>
    <string name="rendering_attr_highway_class_track_grade5_name">5. třída</string>
    <string name="external_input_device">Externí vstupní zařízení</string>
-    <string name="external_input_device_descr">Zvolte zařízení, jako je obecná klávesnice nebo WunderLINQ pro externí ovládání.</string>
+    <string name="external_input_device_descr">Zvolte externí ovládací zařízení, jako je klávesnice nebo WunderLINQ.</string>
    <string name="sett_no_ext_input">Žádné</string>
-    <string name="sett_generic_ext_input">Obecná klávesnice</string>
+    <string name="sett_generic_ext_input">Klávesnice</string>
    <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
    <string name="sett_parrot_ext_input">Parrot</string>
    <string name="turn_on_profile_desc">Pro použití tohoto nastavení zapněte prosím alespoň jeden profil aplikace.</string>
@ -3586,9 +3605,9 @@ Zobrazená oblast: %1$s x %2$s</string>
    <string name="file_already_imported">Soubor je již importovaný v OsmAnd</string>
    <string name="use_two_phase_routing">Použít dvoufázový algoritmus A* pro výpočet trasy</string>
    <string name="shared_string_graph">Graf</string>
-    <string name="message_need_calculate_route_before_show_graph">Údaje %1$s jsou dostupné pouze na cestách, pro jejich získání musíte vypočítat trasu pomocí “Trasa medzi body”.</string>
-    <string name="message_graph_will_be_available_after_recalculation">Počkejte na přepočet trasy.
-\nGraf bude dostupný po přepočtu.</string>
+    <string name="message_need_calculate_route_before_show_graph">Údaje %1$s jsou dostupné pouze na cestách, pro jejich zobrazení musíte vypočítat trasu pomocí “Trasa mezi body”.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Prosím čekejte.
+\nGraf bude dostupný po přepočtu trasy.</string>
    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
    <string name="pseudo_mercator_projection">Pseudo-Mercatorovo zobrazení</string>
    <string name="one_image_per_tile">Jeden obrazový soubor pro každou dlaždici</string>
@ -3723,9 +3742,9 @@ Zobrazená oblast: %1$s x %2$s</string>
    <string name="turn_screen_on_power_button">Tlačítko napájení</string>
    <string name="turn_screen_on_proximity_sensor">Senzor přiblížení</string>
    <string name="turn_screen_on_wake_time_descr">Zvolte časový limit vypnutí obrazovky po probuzení (\"%1$s\" znamená bez časového limitu.)</string>
-    <string name="message_you_need_add_two_points_to_show_graphs">Musíte přidat aspoň dva body</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">Přidejte aspoň dva body</string>
    <string name="manage_subscription">Spravovat předplatné</string>
-    <string name="subscription_payment_issue_title">S vaším předplatným je problém. Klikněte na tlačítko pro přechod do nastavení předplatného v Google Play a opravte způsob platby.</string>
+    <string name="subscription_payment_issue_title">S vaším předplatným je problém. Klepněte na tlačítko pro přechod do nastavení předplatného v Google Play a opravte způsob platby.</string>
    <string name="subscription_expired_title">Předplatné OsmAnd Live skončilo</string>
    <string name="subscription_paused_title">Předplatné OsmAnd Live je pozastaveno</string>
    <string name="subscription_on_hold_title">Předplatné OsmAnd Live je zablokované</string>
@ -3915,7 +3934,7 @@ Zobrazená oblast: %1$s x %2$s</string>
    <string name="shared_string_add_photo">Přidat fotku</string>
    <string name="register_on_openplacereviews">Zaregistrovat na
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">Fotografie poskytuje open source projekt OpenPlaceReviews.org. Abyste mohli nahrát své fotografie, musíte se přihlásit na webové stránce.</string>
+    <string name="register_on_openplacereviews_desc">Fotografie poskytuje open data projekt OpenPlaceReviews.org. Abyste mohli nahrát své fotografie, musíte se přihlásit na jeho webové stránce.</string>
    <string name="register_opr_create_new_account">Vytvořit nový účet</string>
    <string name="register_opr_have_account">Už mám účet</string>
    <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
@ -3954,7 +3973,7 @@ Zobrazená oblast: %1$s x %2$s</string>
    <string name="add_photos_descr">OsmAnd zobrazuje fotografie z několika zdrojů:
 \nOpenPlaceReviews - fotografie bodů zájmu
 \nMapillary - pouliční fotografie
-\nWeb / Wikimedia - fotografie bodů zájmu specifikované v OpenStreetMap datech.</string>
+\nWeb / Wikimedia - fotografie bodů zájmu podle OpenStreetMap dat.</string>
    <string name="shared_string_resources">Zdroje</string>
    <string name="approximate_file_size">Přibližná velikost souboru</string>
    <string name="select_data_to_export">Vyberte data k exportu do souboru.</string>
@ -3968,4 +3987,20 @@ Zobrazená oblast: %1$s x %2$s</string>
    <string name="use_dev_url_descr">Přepnout na dev.openstreetmap.org místo openstreetmap.org pro otestování odesílání OSM poznámek, bodů zájmu a GPX stop.</string>
    <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>
+    <string name="plan_route_split_after">Rozdělit po</string>
+    <string name="plan_route_add_new_segment">Přidat nový úsek</string>
+    <string name="release_3_9">• Přidána možnost exportovat a importovat všechna data včetně nastavení, zdrojů a oblíbených bodů
+\n
+\n• Plánování trasy: grafy pro úseky trasy; přidána možnost vytvářet a upravovat více úseků trasy
+\n
+\n• Přidána přihlašovací metoda OAuth pro OpenStreetMap, vylepšené uživatelské rozhraní pro OSM dialogy
+\n
+\n• Podpora pro vlastní barvy u oblíbených bodů a mezicílů trasy
+\n
+\n</string>
 </resources>
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@ -2628,9 +2628,9 @@
    <string name="poi_fire_hydrant_position_street">Gaden</string>
    <string name="poi_fire_hydrant_position_underground">Under jorden</string>
    <string name="poi_fire_hydrant_style_wsh">Brandhanetype: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Primær</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Dam</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Vandløb</string>
+    <string name="poi_water_source_main">Primær</string>
+    <string name="poi_water_source_pond">Dam</string>
+    <string name="poi_water_source_stream">Vandløb</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterne</string>
    <string name="poi_in_service_yes">I tjeneste: ja</string>
    <string name="poi_street_cabinet_power">Gadeskabstype: eldistribution</string>
@ -2785,7 +2785,7 @@
    <string name="poi_shoes_type">Type</string>
    <string name="poi_fire_hydrant_type">Type</string>
    <string name="poi_fire_hydrant_position">Position</string>
-    <string name="poi_fire_hydrant_water_source">Vandkilde</string>
+    <string name="poi_water_source">Vandkilde</string>
    <string name="poi_payment_toll_type">Betalingstype</string>
    <string name="poi_traffic_signals_sound">Lyd</string>
    <string name="poi_highway_crossing_type">Type</string>
@ -3828,7 +3828,7 @@
    <string name="poi_drinking_water_refill_yes">Påfyldning af drikkevand: ja</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Sugning</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Under tryk</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Grundvand</string>
+    <string name="poi_water_source_groundwater">Grundvand</string>
    <string name="poi_fire_hydrant_type_pipe">Rør</string>
    <string name="poi_fire_hydrant_pressure_filter">Tryk</string>
    <string name="poi_pump_status_missing_beam">Pumpe tilstand: ingen stråle</string>
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@ -743,7 +743,7 @@
    <string name="poi_abandoned">Aufgegeben</string>
    <string name="poi_maxheight">Maximale Höhe</string>
    <string name="poi_phone">Telefon</string>
-    <string name="poi_website">Internetseite</string>
+    <string name="poi_website">Website</string>
    <string name="poi_description">Beschreibung</string>
    <string name="poi_opening_hours">Öffnungszeiten</string>
    <string name="poi_barrier_entrance">Durchlass in Mauer oder Zaun</string>
@ -2624,9 +2624,9 @@
    <string name="poi_fire_hydrant_position_street">Straße</string>
    <string name="poi_fire_hydrant_position_underground">Unterflur</string>
    <string name="poi_fire_hydrant_style_wsh">Hydrantart: Schacht</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Haupt</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Teich</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Wasserlauf</string>
+    <string name="poi_water_source_main">Haupt</string>
+    <string name="poi_water_source_pond">Teich</string>
+    <string name="poi_water_source_stream">Wasserlauf</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Zisterne</string>
    <string name="poi_in_service_yes">Im Dienst: ja</string>
    <string name="poi_street_cabinet_power">Kasten-Typ: Strom</string>
@ -2779,7 +2779,7 @@
    <string name="poi_shoes_type">Art</string>
    <string name="poi_fire_hydrant_type">Art</string>
    <string name="poi_fire_hydrant_position">Position</string>
-    <string name="poi_fire_hydrant_water_source">Wasserquelle</string>
+    <string name="poi_water_source">Wasserquelle</string>
    <string name="poi_payment_toll_type">Zahlungsart</string>
    <string name="poi_highway_crossing_type">Art</string>
    <string name="poi_tactile_paving">Ertastbares Pflaster</string>
@ -2837,7 +2837,7 @@
    <string name="poi_xmas_note">Weihnachten: Hinweis</string>
    <string name="poi_xmas_opening_hours">Weihnachten: Öffnungszeiten</string>
    <string name="poi_xmas_location">Weihnachten: Örtlichkeit</string>
-    <string name="poi_xmas_url">Weihnachten: Internetseite</string>
+    <string name="poi_xmas_url">Weihnachten: Website</string>
    <string name="poi_vending_type">Verkaufsart</string>
    <string name="poi_bicycle_service">Fahrradwerkstatt</string>
    <string name="poi_service_general">Dienstleistung</string>
@ -3059,7 +3059,7 @@
    <string name="poi_locomotive">Lokomotive</string>
    <string name="poi_nutrition_supplements">Nahrungsergänzungsmittel</string>
    <string name="poi_photo_studio">Fotostudio</string>
-    <string name="poi_free_flying_characteristic">Charakteristisch</string>
+    <string name="poi_free_flying_characteristic">Flugmerkmale</string>
    <string name="poi_emergency_infrastructure">Notfallinfrastruktur</string>
    <string name="poi_cliff">Kliff</string>
    <string name="poi_animal_keeping">Tierhaltung</string>
@ -3564,20 +3564,20 @@
    <string name="poi_health_specialty_radiotheraphy_yes">Strahlentherapie</string>
    <string name="poi_hazard">Gefahr</string>
    <string name="poi_rtsa_scale_filter">Schwierigkeitsklasse</string>
-    <string name="poi_rtsa_scale_nc">н/к</string>
-    <string name="poi_rtsa_scale_nc_asterisk">н/к*</string>
+    <string name="poi_rtsa_scale_nc">k. A.</string>
+    <string name="poi_rtsa_scale_nc_asterisk">k. A.*</string>
    <string name="poi_rtsa_scale_1a">1A</string>
    <string name="poi_rtsa_scale_1a_asterisk">1А*</string>
-    <string name="poi_rtsa_scale_1b">1Б</string>
-    <string name="poi_rtsa_scale_1b_asterisk">1Б*</string>
+    <string name="poi_rtsa_scale_1b">1B</string>
+    <string name="poi_rtsa_scale_1b_asterisk">1B*</string>
    <string name="poi_rtsa_scale_2a">2А</string>
-    <string name="poi_rtsa_scale_2a_asterisk">2А*</string>
-    <string name="poi_rtsa_scale_2b">2Б</string>
-    <string name="poi_rtsa_scale_2b_asterisk">2Б*</string>
-    <string name="poi_rtsa_scale_3a">3А</string>
-    <string name="poi_rtsa_scale_3a_asterisk">3А*</string>
-    <string name="poi_rtsa_scale_3b">3Б</string>
-    <string name="poi_rtsa_scale_3b_asterisk">3Б*</string>
+    <string name="poi_rtsa_scale_2a_asterisk">2A*</string>
+    <string name="poi_rtsa_scale_2b">2B</string>
+    <string name="poi_rtsa_scale_2b_asterisk">2B*</string>
+    <string name="poi_rtsa_scale_3a">3A</string>
+    <string name="poi_rtsa_scale_3a_asterisk">3A*</string>
+    <string name="poi_rtsa_scale_3b">3B</string>
+    <string name="poi_rtsa_scale_3b_asterisk">3B*</string>
    <string name="poi_flare">Gasfackel/Fackel</string>
    <string name="poi_change_delete">Gelöschtes Objekt</string>
    <string name="poi_health_specialty_radiotherapy_yes">Strahlentherapie</string>
@ -3820,10 +3820,10 @@
    <string name="poi_drinking_water_refill_yes">ja</string>
    <string name="poi_drinking_water_refill_no">Trinkwassernachfüllung: nein</string>
    <string name="poi_drinking_water_refill_network">Trinkwasser-Nachfüllnetz</string>
-    <string name="poi_internet_access_fee_customers">Internetzugangsgebühr für Kunden</string>
+    <string name="poi_internet_access_fee_customers">Internetzugang: Kunden</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Ansaugung</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Unter Druck</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Grundwasser</string>
+    <string name="poi_water_source_groundwater">Grundwasser</string>
    <string name="poi_fire_hydrant_type_pipe">Rohr</string>
    <string name="poi_fire_hydrant_pressure_filter">Druck</string>
    <string name="poi_pump_status_missing_beam">Pumpenzustand: fehlender Arm</string>
@ -3848,7 +3848,7 @@
    <string name="poi_recycling_small_electrical_appliances">Kleine Elektrogeräte</string>
    <string name="poi_nuts">Nussladen</string>
    <string name="poi_fuel_lng">Flüssigerdgas</string>
-    <string name="poi_parking_layby">Parken in Parallelstraße</string>
+    <string name="poi_parking_layby">Rastplatz</string>
    <string name="poi_parking_sheds">Überdachter Parkplatz</string>
    <string name="poi_parking_rooftop">Dachparkplätze</string>
    <string name="poi_gpx_point">GPX-Wegpunkt</string>
@ -3886,4 +3886,5 @@
    <string name="poi_siren">Sirene</string>
    <string name="poi_nurse">Krankenpfleger/in</string>
    <string name="poi_mobile_money_agent">Mobiler Geldvermittler</string>
+    <string name="poi_lifeguard_base">Rettungsschwimmerbasis</string>
 </resources>
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -177,7 +177,7 @@
    <string name="plugins_screen">Erweiterungen</string>
    <string name="prefs_plugins_descr">Erweiterungen aktivieren weitere Einstellungen und zusätzliche Funktionen.</string>
    <string name="prefs_plugins">Erweiterungen</string>
-    <string name="osm_editing_plugin_description">Machen Sie OSM-Beiträge wie das Erstellen oder Ändern von OSM-POI-Objekten, das Eröffnen oder Kommentieren von OSM-Notizen und das Einreichen aufgezeichneter GPX-Dateien in OsmAnd, indem Sie Ihren Benutzernamen und Ihr Passwort angeben. OpenStreetMap.org ist ein gemeinschaftliches, frei zugängliches, globales Kartografierungsprojekt.</string>
+    <string name="osm_editing_plugin_description">Machen Sie OSM-Beiträge wie das Erstellen oder Ändern von OSM-POI-Objekten, das Eröffnen oder Kommentieren von OSM-Hinweisen und das Einreichen aufgezeichneter GPX-Dateien in OsmAnd, indem Sie Ihren Benutzernamen und Ihr Passwort angeben. OpenStreetMap.org ist ein gemeinschaftliches, frei zugängliches, globales Kartografierungsprojekt.</string>
    <string name="vector_maps_may_display_faster_on_some_devices">Vektorkarten werden wahrscheinlich schneller angezeigt. Funktioniert nur auf manchen Geräten.</string>
    <string name="play_commands_of_currently_selected_voice">Eine Stimme auswählen und mittels Abspielen von Ansagen testen:</string>
    <string name="debugging_and_development">OsmAnd-Entwicklung</string>
@ -249,13 +249,13 @@
    <string name="offline_edition_descr">Wenn die Offline-Bearbeitung aktiviert ist, werden Änderungen zunächst lokal gespeichert und auf Anforderung hochgeladen, andernfalls werden Änderungen sofort hochgeladen.</string>
    <string name="update_poi_does_not_change_indexes">Das Bearbeiten von POIs innerhalb von OsmAnd beeinflusst nicht die heruntergeladenen Offline-Karten, sondern wird in einer Datei auf Ihrem Gerät gespeichert.</string>
    <string name="local_openstreetmap_uploading">Hochladen …</string>
-    <string name="local_openstreetmap_were_uploaded">{0} POI/Notizen wurden hochgeladen</string>
+    <string name="local_openstreetmap_were_uploaded">{0} POI/Hinweise wurden hochgeladen</string>
    <string name="local_openstreetmap_uploadall">Alle hochladen</string>
    <string name="local_openstreetmap_upload">Änderung zu OSM hochladen</string>
    <string name="local_openstreetmap_delete">Änderung löschen</string>
    <string name="local_openstreetmap_descr_title">Asynchrone OSM-Bearbeitung:</string>
-    <string name="local_openstreetmap_settings">OSM-POIs/-Notizen auf dem Gerät gespeichert</string>
-    <string name="local_openstreetmap_settings_descr">Anzeigen und Verwalten von OSM-POIs/-Notizen in Ihrer Gerätedatenbank.</string>
+    <string name="local_openstreetmap_settings">OSM-POIs/-Hinweise auf dem Gerät gespeichert</string>
+    <string name="local_openstreetmap_settings_descr">Anzeigen und Verwalten von OSM-POIs/-Hinweisen in Ihrer Gerätedatenbank.</string>
    <string name="live_monitoring_m">Online-Aufzeichnung (benötigt GPX)</string>
    <string name="live_monitoring_m_descr">Track-Daten zu einem festgelegten Internetdienst senden, wenn die GPX-Aufzeichnung aktiviert ist.</string>
    <string name="live_monitoring_url">Webadresse zur Aufzeichnung</string>
@ -587,7 +587,7 @@
    <string name="layer_yandex_traffic">Yandex-Verkehr</string>
    <string name="layer_route">Route</string>
    <string name="shared_string_favorites">Favoriten</string>
-    <string name="layer_osm_bugs">OSM-Notizen (online)</string>
+    <string name="layer_osm_bugs">OSM-Hinweise (online)</string>
    <string name="layer_poi">POI-Overlay …</string>
    <string name="layer_amenity_label">POI-Overlay-Bezeichnungen</string>
    <string name="layer_map">Kartenquelle …</string>
@ -1571,7 +1571,7 @@
    <string name="routing_attr_height_description">Höhe des Fahrzeugs für Routenberechnung angeben.</string>
    <string name="download_wikipedia_maps">Wikipedia</string>
    <string name="use_fast_recalculation">Schnelle Routenneuberechnung</string>
-    <string name="use_fast_recalculation_desc">Nur den Anfangsteil neu berechnen. Kann bei längeren Routen benutzt werden.</string>
+    <string name="use_fast_recalculation_desc">Berechnet nur den Anfangsteil der Route neu, was bei langen Reisen nützlich ist.</string>
    <string name="lang_es_ar">Spanisch (Argentinien)</string>
    <string name="lang_th">Thailändisch</string>
    <string name="lang_ms">Malaysisch</string>
@ -2395,10 +2395,10 @@
    <string name="routing_attr_allow_private_name">Privatzugang erlauben</string>
    <string name="routing_attr_allow_private_description">Zugang zu Privatgrund erlauben.</string>
    <string name="srtm_color_scheme">Farbschema</string>
-    <string name="quick_action_showhide_osmbugs_title">OSM-Notizen ein- oder ausblenden</string>
-    <string name="quick_action_osmbugs_show">OSM-Notizen einblenden</string>
-    <string name="quick_action_osmbugs_hide">OSM-Notizen ausblenden</string>
-    <string name="quick_action_showhide_osmbugs_descr">Schaltfläche zum Ein- oder Ausblenden von OSM-Notizen auf der Karte.</string>
+    <string name="quick_action_showhide_osmbugs_title">OSM-Hinweise ein- oder ausblenden</string>
+    <string name="quick_action_osmbugs_show">OSM-Hinweise einblenden</string>
+    <string name="quick_action_osmbugs_hide">OSM-Hinweise ausblenden</string>
+    <string name="quick_action_showhide_osmbugs_descr">Schaltfläche zum Ein- oder Ausblenden von OSM-Hinweisen auf der Karte.</string>
    <string name="sorted_by_distance">Nach Entfernung sortiert</string>
    <string name="search_favorites">In Favoriten suchen</string>
    <string name="hillshade_menu_download_descr">Laden Sie die Reliefkarte herunter, um vertikale Schattierungen anzuzeigen.</string>
@ -2583,7 +2583,7 @@
    <string name="shared_string_gpx_waypoints">Track-Wegpunkte</string>
    <string name="modify_the_search_query">Suchanfrage verändern.</string>
    <string name="empty_state_osm_edits">OSM-Objekte erstellen oder ändern</string>
-    <string name="empty_state_osm_edits_descr">OSM-POIs erstellen oder verändern, OSM-Notizen eröffnen oder bearbeiten und aufgezeichnete GPX-Dateien hinzufügen.</string>
+    <string name="empty_state_osm_edits_descr">OSM-POIs erstellen oder verändern, OSM-Hinweise erstellen oder bearbeiten und aufgezeichnete GPX-Dateien hinzufügen.</string>
    <string name="shared_string_deleted">Gelöscht</string>
    <string name="shared_string_edited">Bearbeitet</string>
    <string name="shared_string_added">Hinzugefügt</string>
@ -2645,16 +2645,16 @@
    <string name="nautical_renderer">Nautisch</string>
    <string name="copy_location_name">Ort/POI-Name kopieren</string>
    <string name="toast_empty_name_error">Unbenannter Ort</string>
-    <string name="show_closed_notes">Geschlossene Notizen anzeigen</string>
-    <string name="switch_osm_notes_visibility_desc">OSM-Notizen auf der Karte ein- oder ausblenden.</string>
+    <string name="show_closed_notes">Geschlossene Hinweise anzeigen</string>
+    <string name="switch_osm_notes_visibility_desc">OSM-Hinweise auf der Karte ein- oder ausblenden.</string>
    <string name="gpx_file_desc">GPX - geeignet für den Export in JOSM oder andere OSM-Editoren.</string>
    <string name="osc_file_desc">OSC - geeignet für den Export nach OSM.</string>
    <string name="shared_string_gpx_file">GPX-Datei</string>
    <string name="osc_file">OSC-Datei</string>
    <string name="choose_file_type">Dateityp auswählen</string>
-    <string name="osm_edits_export_desc">Als OSM-Notizen, POIs oder beides exportieren.</string>
+    <string name="osm_edits_export_desc">Als OSM-Hinweise, POIs oder beides exportieren.</string>
    <string name="all_data">Alle Daten</string>
-    <string name="osm_notes">OSM-Notizen</string>
+    <string name="osm_notes">OSM-Hinweise</string>
    <string name="tunnel_warning">Tunnel voraus</string>
    <string name="show_tunnels">Tunnel</string>
    <string name="shared_string_current">Aktuell</string>
@ -3432,7 +3432,7 @@
    <string name="osm_editing">OSM-Bearbeitung</string>
    <string name="app_mode_osm">OSM</string>
    <string name="select_nav_icon_descr">Symbol, das beim Navigieren oder Bewegen angezeigt wird.</string>
-    <string name="multimedia_notes_view_descr">Ihre OSM-Notizen sind in %1$s.</string>
+    <string name="multimedia_notes_view_descr">Ihre OSM-Hinweise sind in %1$s.</string>
    <string name="button_rate">Bewerten</string>
    <string name="logcat_buffer_descr">Protokolle der Anwendung einsehen und freigeben</string>
    <string name="permission_is_required">Für die Verwendung dieser Option ist eine Berechtigung erforderlich.</string>
@ -3927,7 +3927,7 @@
    <string name="use_complex_routing">Komplexe Routenberechnung</string>
    <string name="complex_routing_descr">Zwei-Phasen-Routenberechnung für die Autonavigation.</string>
    <string name="use_native_pt">Native ÖPNV Entwicklung</string>
-    <string name="use_native_pt_desc">Wechseln zu Java (sicher) Berechnung des ÖPNV-Routings</string>
+    <string name="use_native_pt_desc">Wechseln zur Java (sicher) Berechnung des ÖPNV-Routings</string>
    <string name="osm_edit_logout_success">Abgemeldet</string>
    <string name="file_already_imported">Datei wurde bereits in OsmAnd importiert</string>
    <string name="perform_oauth_authorization">Anmelden über OAuth</string>
@ -3936,11 +3936,11 @@
    <string name="snowmobile_render_descr">Für das Schneemobilfahren mit speziellen Straßen und Tracks.</string>
    <string name="perform_oauth_authorization_description">Anmelden mit OAuth zur Nutzung der osmedit-Funktionen</string>
    <string name="use_two_phase_routing">2-Phasen-A*-Routing-Algorithmus verwenden</string>
-    <string name="message_need_calculate_route_before_show_graph">%1$s Daten sind nur auf den Straßen verfügbar, Sie müssen eine Route mit \"Route zwischen Punkten\" berechnen, um sie zu erhalten.</string>
+    <string name="message_need_calculate_route_before_show_graph">%1$s Daten sind nur auf Straßen verfügbar, Sie müssen eine Route mit \"Route zwischen Punkten\" berechnen, um eine grafische Darstellung zu erhalten.</string>
    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
    <string name="navigate_point_mgrs">MGRS</string>
-    <string name="message_graph_will_be_available_after_recalculation">Warte auf die Neuberechnung der Route.
-\nDie Graphik wird nach der Neuberechnung verfügbar sein.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Bitte warten Sie.
+\nDie Grafik wird nach der Neuberechnung der Route verfügbar sein.</string>
    <string name="icon_group_amenity">Einrichtung</string>
    <string name="icon_group_transport">ÖPNV</string>
    <string name="icon_group_service">Dienstleistung</string>
@ -3951,9 +3951,9 @@
    <string name="icon_group_symbols">Symbole</string>
    <string name="shared_string_local_maps">Lokale Karten</string>
    <string name="icon_group_special">Spezial</string>
-    <string name="message_you_need_add_two_points_to_show_graphs">Sie müssen mindestens zwei Punkte hinzufügen</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">Fügen Sie mindestens zwei Punkte hinzu</string>
    <string name="manage_subscription">Abonnement verwalten</string>
-    <string name="subscription_payment_issue_title">Es gibt ein Problem mit Ihrem Abonnement. Klicken Sie auf die Schaltfläche, um zu den Einstellungen des Google Play Abonnements zu gelangen und Ihre Zahlungsmethode zu überprüfen.</string>
+    <string name="subscription_payment_issue_title">Es gibt ein Problem mit Ihrem Abonnement. Tippen Sie auf die Schaltfläche, um zu den Einstellungen des Google Play Abonnements zu gelangen und Ihre Zahlungsmethode zu überprüfen.</string>
    <string name="subscription_expired_title">OsmAnd Live Abonnement ist abgelaufen</string>
    <string name="subscription_paused_title">OsmAnd Live Abonnement wurde ausgesetzt</string>
    <string name="subscription_on_hold_title">OsmAnd Live Abonnement liegt auf Eis</string>
@ -3990,7 +3990,7 @@
    <string name="add_photos_descr">OsmAnd zeigt Fotos aus verschiedenen Quellen:
 \nOpenPlaceReviews - POI Fotos;
 \nMapillary - Bilder auf Straßenebene;
-\nWeb / Wikimedia - POI Fotos, die in OpenStreetMap Daten angegeben sind.</string>
+\nWeb / Wikimedia - POI-Fotos gemäß OpenStreetMap-Daten.</string>
    <string name="shared_string_resources">Quellen</string>
    <string name="approximate_file_size">Ungefähre Dateigröße</string>
    <string name="select_data_to_export">Wählen Sie die Daten aus, die in die Datei exportiert werden sollen.</string>
@ -4004,6 +4004,20 @@
    <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 für die Berücksichtigung von Aufstieg / Abstieg auf Ihrer Strecke verwenden</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>
+    <string name="release_3_9">• Option zum Exportieren und Importieren aller Daten einschließlich Einstellungen, Ressourcen, meine Orte hinzugefügt
+\n
+\n• Route planen: Diagramme für Streckenabschnitte mit Route, und es wurde die Möglichkeit hinzugefügt, mehrere Streckenabschnitte zu erstellen und zu bearbeiten
+\n
+\n • OAuth-Authentifizierungsverfahren für OpenStreetMap hinzugefügt, verbesserte Benutzeroberfläche der OSM-Dialoge
+\n
+\n • Unterstützung benutzerdefinierter Farben für Favoriten und Track-Wegpunkte
+\n
+\n</string>
+    <string name="app_mode_gap">Lücke</string>
+    <string name="plan_route_join_segments">Segmente verbinden</string>
+    <string name="plan_route_add_new_segment">Neues Segment hinzufügen</string>
 </resources>
--- a/OsmAnd/res/values-el/phrases.xml
+++ b/OsmAnd/res/values-el/phrases.xml
@ -12,7 +12,7 @@
    <string name="poi_shoes_type">Τύπος</string>
    <string name="poi_fire_hydrant_type">Τύπος</string>
    <string name="poi_fire_hydrant_position">Θέση</string>
-    <string name="poi_fire_hydrant_water_source">Πηγή νερού</string>
+    <string name="poi_water_source">Πηγή νερού</string>
    <string name="poi_payment_toll_type">Τύπος πληρωμής</string>
    <string name="poi_traffic_signals_sound">Ήχος</string>
    <string name="poi_highway_crossing_type">Τύπος</string>
@ -2741,9 +2741,9 @@
    <string name="poi_fire_hydrant_position_street">Οδός</string>
    <string name="poi_fire_hydrant_position_underground">Υπόγειος</string>
    <string name="poi_fire_hydrant_style_wsh">Μορφή κρουνού: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Κύριο</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Δεξαμενή</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Ροή</string>
+    <string name="poi_water_source_main">Κύριο</string>
+    <string name="poi_water_source_pond">Δεξαμενή</string>
+    <string name="poi_water_source_stream">Ροή</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Δεξαμενή</string>
    <string name="poi_in_service_yes">Εν ενεργεία: ναι</string>
    <string name="poi_street_cabinet_power">Τύπος ερμαρίου: ρεύμα</string>
@ -3785,7 +3785,7 @@
    <string name="poi_pump_status_missing_beam">Κατάσταση αντλίας: ελλείπων βραχίονας</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Αναρρόφηση</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Πιεσμένο</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Υπόγεια ύδατα</string>
+    <string name="poi_water_source_groundwater">Υπόγεια ύδατα</string>
    <string name="poi_fire_hydrant_type_pipe">Σωλήνας</string>
    <string name="poi_drinking_water_refill_network">Δίκτυο ξαναγεμίσματος πόσιμου νερού</string>
    <string name="poi_drinking_water_refill_no">Ξαναγέμισμα πόσιμου νερού: όχι</string>
--- a/OsmAnd/res/values-eo/phrases.xml
+++ b/OsmAnd/res/values-eo/phrases.xml
@ -2452,9 +2452,9 @@
    <string name="poi_fire_hydrant_position_street">strato</string>
    <string name="poi_fire_hydrant_position_underground">subtero</string>
    <string name="poi_fire_hydrant_style_wsh">Tipo de hidranto: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">akvokondukilo</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">lageto</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">rivereto</string>
+    <string name="poi_water_source_main">akvokondukilo</string>
+    <string name="poi_water_source_pond">lageto</string>
+    <string name="poi_water_source_stream">rivereto</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">cisterno</string>
    <string name="poi_in_service_yes">Funkcias: jes</string>
    <string name="poi_street_cabinet_power">Speco de ŝranko: elektra</string>
@ -2766,7 +2766,7 @@
    <string name="poi_shoes_type">Ŝuoj</string>
    <string name="poi_fire_hydrant_type">Speco de hidranto</string>
    <string name="poi_fire_hydrant_position">Pozicio de hidranto</string>
-    <string name="poi_fire_hydrant_water_source">Fonto de akvo</string>
+    <string name="poi_water_source">Fonto de akvo</string>
    <string name="poi_payment_toll_type">Pagmaniero</string>
    <string name="poi_traffic_signals_sound">Sono</string>
    <string name="poi_highway_crossing_type">Speco de stratpasejo</string>
@ -3813,7 +3813,7 @@
    <string name="poi_drinking_water_refill_network">Plenigi per trinkebla akvo: reto</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">senprema</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">prema</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">grundakvo</string>
+    <string name="poi_water_source_groundwater">grundakvo</string>
    <string name="poi_fire_hydrant_type_pipe">tubo</string>
    <string name="poi_fire_hydrant_pressure_filter">Premo de hidranto</string>
    <string name="poi_pump_status_missing_beam">Stato de pumpilo: levilo mankas</string>
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@ -2626,9 +2626,9 @@
    <string name="poi_fire_hydrant_position_parking_lot">En estacionamiento;En aparcamiento</string>
    <string name="poi_fire_hydrant_position_street">En la calle</string>
    <string name="poi_fire_hydrant_position_underground">Subterráneo</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Principal</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Estanque</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Arroyo</string>
+    <string name="poi_water_source_main">Principal</string>
+    <string name="poi_water_source_pond">Estanque</string>
+    <string name="poi_water_source_stream">Arroyo</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
    <string name="poi_in_service_yes">En servicio: sí</string>
    <string name="poi_fire_hydrant_style_wsh">Estilo de hidrante: wsh</string>
@ -2785,7 +2785,7 @@
    <string name="poi_shoes_type">Tipo de calzado</string>
    <string name="poi_fire_hydrant_type">Tipo de hidrante</string>
    <string name="poi_fire_hydrant_position">Ubicación del hidrante</string>
-    <string name="poi_fire_hydrant_water_source">Origen del agua</string>
+    <string name="poi_water_source">Origen del agua</string>
    <string name="poi_payment_toll_type">Forma de pago (peaje)</string>
    <string name="poi_traffic_signals_sound">Sonido</string>
    <string name="poi_highway_crossing_type">Tipo de cruce</string>
@ -3827,7 +3827,7 @@
    <string name="poi_drinking_water_refill_network">Red de recarga de agua potable</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Succión</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Presurizado</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Agua subterránea</string>
+    <string name="poi_water_source_groundwater">Agua subterránea</string>
    <string name="poi_fire_hydrant_type_pipe">Tubería</string>
    <string name="poi_fire_hydrant_pressure_filter">Presión</string>
    <string name="poi_pump_status_missing_beam">Estado de la bomba: sin palanca</string>
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@ -2627,9 +2627,9 @@
    <string name="poi_fire_hydrant_position_street">En la calle</string>
    <string name="poi_fire_hydrant_position_underground">Subterráneo</string>
    <string name="poi_fire_hydrant_style_wsh">Estilo de hidrante: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Principal</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Estanque</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Arroyo</string>
+    <string name="poi_water_source_main">Principal</string>
+    <string name="poi_water_source_pond">Estanque</string>
+    <string name="poi_water_source_stream">Arroyo</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
    <string name="poi_in_service_yes">En servicio: sí</string>
    <string name="poi_street_cabinet_power">Tipo de gabinete: electricidad</string>
@ -2785,7 +2785,7 @@
    <string name="poi_shoes_type">Tipo de calzado</string>
    <string name="poi_fire_hydrant_type">Tipo de hidrante</string>
    <string name="poi_fire_hydrant_position">Ubicación del hidrante</string>
-    <string name="poi_fire_hydrant_water_source">Origen del agua</string>
+    <string name="poi_water_source">Origen del agua</string>
    <string name="poi_payment_toll_type">Forma de pago (peaje)</string>
    <string name="poi_traffic_signals_sound">Sonido</string>
    <string name="poi_highway_crossing_type">Tipo de cruce</string>
@ -3827,7 +3827,7 @@
    <string name="poi_drinking_water_refill_network">Red de recarga de agua potable</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Succión</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Presurizado</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Agua subterránea</string>
+    <string name="poi_water_source_groundwater">Agua subterránea</string>
    <string name="poi_fire_hydrant_type_pipe">Tubería</string>
    <string name="poi_fire_hydrant_pressure_filter">Presión</string>
    <string name="poi_pump_status_missing_beam">Estado de la bomba: sin palanca</string>
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@ -2613,9 +2613,9 @@
    <string name="poi_fire_hydrant_position_street">En la calle</string>
    <string name="poi_fire_hydrant_position_underground">Subterráneo</string>
    <string name="poi_fire_hydrant_style_wsh">Estilo de hidrante: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Principal</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Estanque</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Arroyo</string>
+    <string name="poi_water_source_main">Principal</string>
+    <string name="poi_water_source_pond">Estanque</string>
+    <string name="poi_water_source_stream">Arroyo</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
    <string name="poi_in_service_yes">En servicio: sí</string>
    <string name="poi_forestry_compartment">Señal: compartimento forestal</string>
@ -2774,7 +2774,7 @@
    <string name="poi_shoes_type">Tipo</string>
    <string name="poi_fire_hydrant_type">Tipo</string>
    <string name="poi_fire_hydrant_position">Ubicación</string>
-    <string name="poi_fire_hydrant_water_source">Origen del agua</string>
+    <string name="poi_water_source">Origen del agua</string>
    <string name="poi_payment_toll_type">Forma de pago</string>
    <string name="poi_traffic_signals_sound">Sonido</string>
    <string name="poi_highway_crossing_type">Tipo</string>
@ -3794,7 +3794,7 @@
    <string name="poi_mountain_rescue">Rescate de montaña</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Succión</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Presurizado</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Agua subterránea</string>
+    <string name="poi_water_source_groundwater">Agua subterránea</string>
    <string name="poi_fire_hydrant_type_pipe">Tubo</string>
    <string name="poi_drinking_water_refill_network">Red de recarga de agua potable</string>
    <string name="poi_drinking_water_refill_no">Recarga de agua potable: no</string>
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@ -3941,13 +3941,13 @@
    <string name="select_data_to_export">Seleccione los datos para exportar al fichero.</string>
    <string name="file_size_needed_for_import">Necesario para importar</string>
    <string name="export_not_enough_space">No hay espacio suficiente</string>
-    <string name="release_3_9">• Se ha añadido la opción de exportar e importar todos los datos, incluyendo los ajustes, los recursos y «Mis sitios»
+    <string name="release_3_9">"• Se ha añadido la opción de exportar e importar todos los datos, incluyendo los ajustes, los recursos y «Mis sitios»
 \n
-\n • Planificar ruta: se añadieron gráficos para los segmentos con la ruta y capacidad de crear o editar trazas de segmentos múltiples
+\n • Planificar ruta: se añadieron gráficos para los segmentos de traza con la ruta y capacidad de crear o editar segmentos  de traza múltiples
 \n
 \n • Se ha añadido el método de autenticación OAuth para OpenStreetMap y se ha mejorado la interfaz de usuario de los diálogos de OSM
 \n
 \n • Se añadieron colores personalizados para los favoritos y los puntos de referencia de la traza
 \n
-\n</string>
+\n"</string>
 </resources>
--- a/OsmAnd/res/values-et/phrases.xml
+++ b/OsmAnd/res/values-et/phrases.xml
@ -145,7 +145,7 @@
    <string name="poi_shoes_type">Liik</string>
    <string name="poi_fire_hydrant_type">Liik</string>
    <string name="poi_fire_hydrant_position">Asukoht</string>
-    <string name="poi_fire_hydrant_water_source">Vee allikas</string>
+    <string name="poi_water_source">Vee allikas</string>
    <string name="poi_payment_toll_type">Makseviis</string>
    <string name="poi_traffic_signals_sound">Heli</string>
    <string name="poi_highway_crossing_type">Liik</string>
@ -2725,9 +2725,9 @@
    <string name="poi_fire_hydrant_position_street">Tänav</string>
    <string name="poi_fire_hydrant_position_underground">Maa-alune</string>
    <string name="poi_fire_hydrant_style_wsh">Hüdrandi liik: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Veetrassil</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Tiik</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Oja</string>
+    <string name="poi_water_source_main">Veetrassil</string>
+    <string name="poi_water_source_pond">Tiik</string>
+    <string name="poi_water_source_stream">Oja</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Veemahuti</string>
    <string name="poi_in_service_yes">Kasutuses: jah</string>
    <string name="poi_street_cabinet_power">Kapi liik: toide</string>
@ -3610,9 +3610,9 @@
    <string name="poi_vehicle_military">Sõidukiga ligipääs: sõjaväeline</string>
    <string name="poi_vehicle_delivery">Sõidukiga ligipääs: kohaletoimetamine</string>
    <string name="poi_vehicle_forestry">Sõidukiga ligipääs: metsandus</string>
-    <string name="poi_motorcar_yes">Auto ligipääs:</string>
+    <string name="poi_motorcar_yes">Ligipääs autole: jah</string>
    <string name="poi_motorcar_private">Auto ligipääs: privaatne</string>
-    <string name="poi_motorcar_no">Auto ligipääs: ei</string>
+    <string name="poi_motorcar_no">Ligipääs autole: ei</string>
    <string name="poi_motorcar_destination">Auto ligipääs: sihtkoht</string>
    <string name="poi_motorcar_permissive">Auto ligipääs: lubatav</string>
    <string name="poi_motorcar_customers">Auto ligipääs: kliendid</string>
@ -3810,7 +3810,7 @@
    <string name="poi_pump_status_missing_beam">Pumba olek: kiir puudub</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Imatav</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Hüdrant</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Pinnavesi</string>
+    <string name="poi_water_source_groundwater">Pinnavesi</string>
    <string name="poi_fire_hydrant_type_pipe">Toru</string>
    <string name="poi_traffic_signals_vibration">Värin</string>
    <string name="poi_fire_hydrant_pressure_filter">Surve</string>
@ -3837,4 +3837,10 @@
    <string name="poi_diplomatic_embassy">Saatkond</string>
    <string name="poi_consulate_filter">Konsulaat</string>
    <string name="poi_embassy_filter">Saatkond</string>
+    <string name="poi_diplomatic_services_immigrant_visas_yes">Jah</string>
+    <string name="poi_diplomatic_services_immigrant_visas_no">Ei</string>
+    <string name="poi_diplomatic_services_citizen_services_yes">Jah</string>
+    <string name="poi_diplomatic_services_citizen_services_no">Ei</string>
+    <string name="poi_siren">Sireen</string>
+    <string name="poi_lifeguard_base">Vetelpäästejaam</string>
 </resources>
--- a/OsmAnd/res/values-et/strings.xml
+++ b/OsmAnd/res/values-et/strings.xml
@ -232,7 +232,7 @@
    <string name="route_via">Läbi:</string>
    <string name="route_from">Kust:</string>
    <string name="distance_measurement_clear_route">Eemalda kõik punktid</string>
-    <string name="cancel_route">Katkesta teekond</string>
+    <string name="cancel_route">Katkestame teekonna\?</string>
    <string name="layer_hillshade">Künkavarjutuse kiht</string>
    <string name="download_hillshade_maps">Künkavarjutused</string>
    <string name="precise_routing_mode_descr">Arvuta täpsed teekonnad ilma tõrgeteta. Ikka kaugusega piiratud ja aeglane.</string>
@ -464,7 +464,7 @@
    <string name="osc_file">OSC fail</string>
    <string name="choose_file_type">Vali faililiik</string>
    <string name="all_data">Kõik andmed</string>
-    <string name="osm_notes">OSM teated</string>
+    <string name="osm_notes">OSM märked</string>
    <string name="shared_string_current">Praegune</string>
    <string name="last_intermediate_dest_description">Lisab vahepeatuse</string>
    <string name="first_intermediate_dest_description">Lisab algpeatuse</string>
@ -3842,4 +3842,12 @@
 \nOpenPlaceReviews - huvipunkti fotod;
 \nMapillary - tänavavaated;
 \nWikimedia või veeb - OpenStreetMap\'i andmetes kirjeldatud fotod.</string>
+    <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>
+    <string name="plan_route_join_segments">Liida lõigud</string>
 </resources>
--- a/OsmAnd/res/values-eu/phrases.xml
+++ b/OsmAnd/res/values-eu/phrases.xml
@ -286,9 +286,9 @@
    <string name="poi_fire_hydrant_position_street">Kalea</string>
    <string name="poi_fire_hydrant_position_underground">Lurrazpikoa</string>
    <string name="poi_fire_hydrant_style_wsh">Ur-hargune mota: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Nagusia</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Urmaela</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Erreka</string>
+    <string name="poi_water_source_main">Nagusia</string>
+    <string name="poi_water_source_pond">Urmaela</string>
+    <string name="poi_water_source_stream">Erreka</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Zisterna</string>
    <string name="poi_fire_extinguisher">Su-itzalgailua</string>
    <string name="poi_ambulance_station">Anbulantzia geltokia</string>
@ -1190,7 +1190,7 @@
    <string name="poi_shoes_type">Mota</string>
    <string name="poi_fire_hydrant_type">Mota</string>
    <string name="poi_fire_hydrant_position">Kokalekua</string>
-    <string name="poi_fire_hydrant_water_source">Ur jatorria</string>
+    <string name="poi_water_source">Ur jatorria</string>
    <string name="poi_payment_toll_type">Ordainketa mota</string>
    <string name="poi_traffic_signals_sound">Soinua</string>
    <string name="poi_highway_crossing_type">Mota</string>
@ -3810,7 +3810,7 @@
    <string name="poi_pump_status_missing_beam">Bonbaren egora: Habea faltan</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Xurgatzea</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Presiopean</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Lurrazpiko ura</string>
+    <string name="poi_water_source_groundwater">Lurrazpiko ura</string>
    <string name="poi_fire_hydrant_type_pipe">Hodia</string>
    <string name="poi_fire_hydrant_pressure_filter">Presioa</string>
    <string name="poi_traffic_signals_arrow_yes">Bai</string>
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@ -619,7 +619,7 @@
    <string name="poi_clothes_type">نوع</string>
    <string name="poi_shoes_type">نوع</string>
    <string name="poi_fire_hydrant_position">موقعیت</string>
-    <string name="poi_fire_hydrant_water_source">منبع آب</string>
+    <string name="poi_water_source">منبع آب</string>
    <string name="poi_payment_toll_type">شیوهٔ پرداخت</string>
    <string name="poi_traffic_signals_sound">صدا</string>
    <string name="poi_wheelchair_accessibility">دسترسی ویلچر</string>
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@ -3481,7 +3481,7 @@
    <string name="live_monitoring_descr">اجازه می‌دهد موقعیت کنونی با استفاده از ضبط سفر هم‌رسانی شود.</string>
    <string name="tracks_view_descr">ردهای ضبط‌شدهٔ شما در %1$s یا در پوشهٔ OsmAnd قرار دارند.</string>
    <string name="multimedia_notes_view_descr">یادداشت‌های OSMای شما در %1$s قرار دارند.</string>
-    <string name="osm_edits_view_descr">می‌توانید همهٔ ویرایش‌ها یا یادداشت‌های OSMای خود را که آپلود کرده‌اید در %1$s ببینید. نقاط آپلودشده را دیگر در OsmAnd نمی‌بینید.</string>
+    <string name="osm_edits_view_descr">می‌توانید همهٔ ویرایش‌ها یا یادداشت‌های OSMای خود را که آپلود نکرده‌اید در %1$s ببینید. نقاط آپلودشده را دیگر در OsmAnd نمی‌بینید.</string>
    <string name="logcat_buffer_descr">لاگ‌های جزئی برنامه را بررسی و هم‌رسانی کنید</string>
    <string name="multimedia_use_system_camera">استفاده از برنامهٔ سیستم</string>
    <string name="multimedia_photo_play_sound">صدای شاتر دوربین</string>
@ -3976,12 +3976,12 @@
    <string name="subscription_payment_issue_title">در رابطه با اشتراک شما مشکلی وجود دارد. روی دکمه کلیک کنید تا به تنظیمات اشتراک گوگل‌پلی بروید و شیوهٔ پرداخت خود را اصلاح نمایید.</string>
    <string name="markers_history">تاریخچهٔ نشانه‌ها</string>
    <string name="send_files_to_openstreetmap">ارسال فایل GPX به اوپن‌استریت‌مپ</string>
-    <string name="gpx_upload_public_visibility_descr">عمومی یا Public به این معنی است که رد به‌صورت عمومی در ردهای جی‌پی‌اس شما و لیست ردهای عمومی جی‌پی‌اس نمایش داده می‌شود. دادهٔ نقاط رد که از طریق API در دسترس قرار می‌گیرد، به صفحهٔ ردهای شما ارجاع نمی‌دهد. مهر زمان نقاط رد از طریق API جی‌پی‌اس‌های عمومی دست‌یافتنی نیست و نقاط رد بر اساس زمان مرتب نیستند. به هر حال، سایر کاربران هنوز می‌توانند فایل رد خام را از لیست ردهای عمومی دانلود کنند و این فایل مهر زمان نقاط را هم دارد.</string>
-    <string name="gpx_upload_private_visibility_descr">خصوصی یا Private به این معنی است که رد در هیچ‌یک از لیست‌های عمومی نشان داده نمی‌شود اما نقاط رد از طریق API جی‌پی‌اس‌های عمومی بدون مهر زمان و بدون ترتیب زمانی دست‌یافتنی است.</string>
-    <string name="gpx_upload_identifiable_visibility_descr">قابل‌شناسایی یا Identifiable به این معنی است که رد به‌صورت عمومی در لیست ردهای جی‌پی‌اس شما و لیست عمومی ردهای جی‌پی‌اس نمایش داده می‌شود، یعنی سایر کاربران می‌توانند رد خام را دانلود کنند و بدانند که مربوط به نام کاربری شماست. دادهٔ نقاط رد که از طریق API در دسترس قرار می‌گیرد، به صفحهٔ ردهای شما ارجاع می‌دهد. مهر زمان نقاط رد از طریق API جی‌پی‌اس‌های عمومی دست‌یافتنی است.</string>
-    <string name="gpx_upload_trackable_visibility_descr">قابل‌ردیابی یا Trackable به این معنی است که رد در هیچ‌یک از لیست‌های عمومی نشان داده نمی‌شود اما نقاط رد + مهر زمان نقاط از طریق API جی‌پی‌اس‌های عمومی دست‌یافتنی است. سایر کاربران فقط می‌توانند نقاط پردازش‌شدهٔ رد شما را دانلود کنند که مستقیماً امکان ارجاع به نام کاربری شما را ندارد.</string>
+    <string name="gpx_upload_public_visibility_descr">«عمومی» یا Public به این معنی است که رد به‌صورت عمومی در ردهای جی‌پی‌اس شما و لیست ردهای عمومی جی‌پی‌اس در قالب خام نمایش داده می‌شود. دادهٔ نقاط رد که از طریق API در دسترس قرار می‌گیرد، به صفحهٔ ردهای شما ارجاع نمی‌دهد. مهر زمان نقاط رد از طریق API جی‌پی‌اس‌های عمومی دست‌یافتنی نیست و نقاط رد بر اساس زمان مرتب نیستند.</string>
+    <string name="gpx_upload_private_visibility_descr">«خصوصی» یا Private به این معنی است که رد در هیچ لیست عمومی‌ای نشان داده نمی‌شود اما نقاط رد از طریق API جی‌پی‌اس‌های عمومی بدون مهر زمان و بدون ترتیب زمانی دست‌یافتنی است.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">«قابل‌شناسایی» یا Identifiable به این معنی است که رد به‌صورت عمومی در لیست ردهای جی‌پی‌اس شما و لیست عمومی ردهای جی‌پی‌اس نمایش داده می‌شود، یعنی سایر کاربران می‌توانند رد خام را دانلود کنند و بدانند که مربوط به نام کاربری شماست. دادهٔ نقاط رد همراه با مهر زمان از طریق API به‌طور عمومی در دسترس است و به صفحهٔ ردهای شما ارجاع می‌دهد.</string>
+    <string name="gpx_upload_trackable_visibility_descr">«قابل‌ردیابی» یا Trackable به این معنی است که رد در هیچ لیست عمومی‌ای نشان داده نمی‌شود اما نقاط پردازش‌شدهٔ رد + مهر زمان نقاط (که مستقیماً امکان ارجاع به نام کاربری شما ندارد) از طریق API جی‌پی‌اس‌های عمومی قابل‌دانلود است.</string>
    <string name="shared_string_add_photo">افزودن عکس</string>
-    <string name="register_on_openplacereviews_desc">عکس‌ها از طریق پروژهٔ داده‌باز OpenPlaceReviews.org ارائه می‌شود. برای آپلود عکس‌های خود لازم است در این وبگاه ثبت نام کنید.</string>
+    <string name="register_on_openplacereviews_desc">عکس‌ها به‌واسطهٔ پروژهٔ داده‌باز OpenPlaceReviews.org ارائه می‌شود. برای آپلود عکس‌های خود لازم است در این وبگاه ثبت نام کنید.</string>
    <string name="register_on_openplacereviews">ثبت نام در
 \nOpenPlaceReviews.org</string>
    <string name="register_opr_create_new_account">ساخت حساب جدید</string>
--- a/OsmAnd/res/values-fi/phrases.xml
+++ b/OsmAnd/res/values-fi/phrases.xml
@ -45,7 +45,7 @@
    <string name="poi_shoes_type">Tyyppi</string>
    <string name="poi_fire_hydrant_type">Tyyppi</string>
    <string name="poi_fire_hydrant_position">Sijainti</string>
-    <string name="poi_fire_hydrant_water_source">Vesipiste</string>
+    <string name="poi_water_source">Vesipiste</string>
    <string name="poi_payment_toll_type">Maksutapa</string>
    <string name="poi_traffic_signals_sound">Ääni</string>
    <string name="poi_highway_crossing_type">Tapa</string>
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@ -911,7 +911,7 @@
    <string name="poi_recycling_cars">Automobiles</string>
    <string name="poi_recycling_bicycles">Vélos</string>
    <string name="poi_shower">Douche</string>
-    <string name="poi_email">Email</string>
+    <string name="poi_email">Courriel</string>
    <string name="poi_fax">Fax</string>
    <string name="facebook">Facebook</string>
    <string name="poi_drinking_water_yes">Oui</string>
@ -1958,7 +1958,7 @@
    <string name="poi_shoes_type">Type</string>
    <string name="poi_fire_hydrant_type">Type</string>
    <string name="poi_fire_hydrant_position">Position</string>
-    <string name="poi_fire_hydrant_water_source">Alimentation en eau</string>
+    <string name="poi_water_source">Alimentation en eau</string>
    <string name="poi_payment_toll_type">Type de paiement</string>
    <string name="poi_highway_crossing_type">Type</string>
    <string name="poi_service_general">Service</string>
@ -3032,9 +3032,9 @@
    <string name="poi_protection_title">Titre de la protection</string>
    <string name="poi_fire_hydrant_pressure">Pression</string>
    <string name="poi_fire_hydrant_flow_capacity">Débit</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Réseau de distribution</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Étang</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Ruisseau</string>
+    <string name="poi_water_source_main">Réseau de distribution</string>
+    <string name="poi_water_source_pond">Étang</string>
+    <string name="poi_water_source_stream">Ruisseau</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Citerne</string>
    <string name="poi_crossing_activation_automatic">Activation du passage : automatique</string>
    <string name="poi_crossing_activation_local">Activation du passage : local</string>
@ -3822,7 +3822,7 @@
    <string name="poi_fire_hydrant_pressure_filter">Pression</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Aspiration</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Pressurisé</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Eaux souterraines</string>
+    <string name="poi_water_source_groundwater">Eaux souterraines</string>
    <string name="poi_fire_hydrant_type_pipe">Tuyau</string>
    <string name="poi_traffic_signals_arrow_yes">Oui</string>
    <string name="poi_traffic_signals_vibration_yes">Oui</string>
@ -3882,7 +3882,7 @@
    <string name="poi_embassy_branch_embassy">Succursale</string>
    <string name="poi_nuts">Magasin de noix</string>
    <string name="poi_diplomatic_services_citizen_services_filter">Services aux citoyens</string>
-    <string name="poi_diplomatic_services_immigrant_visas_filter">Visas d\'immigrant</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Visas pour immigrants</string>
    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Visas pour non-immigrants</string>
    <string name="poi_diplomatic_liaison">Liaison diplomatique</string>
 </resources>
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@ -3406,9 +3406,9 @@
    <string name="route_recalculation">Recalcul de l\'itinéraire</string>
    <string name="accessibility_announce">Annonce</string>
    <string name="login_and_pass">Nom d\'utilisateur et mot de passe</string>
-    <string name="plugin_global_prefs_info">Les paramètres du greffon sont globaux et s\'appliquent à tous les profils</string>
+    <string name="plugin_global_prefs_info">Les paramètres de ce greffon sont globaux et s\'appliquent à tous les profils</string>
    <string name="osm_editing">Édition OSM</string>
-    <string name="osm_edits_view_descr">Vous pouvez consulter vos modifications et vos bugs OSM non envoyés dans %1$s. Les points envoyés ne sont plus affichés dans OsmAnd.</string>
+    <string name="osm_edits_view_descr">Vous pouvez consulter vos modifications et vos bugs OSM non envoyés dans %1$s. Les points téléversés ne sont plus affichés dans OsmAnd.</string>
    <string name="app_mode_osm">OSM</string>
    <string name="select_nav_icon_descr">Icône affiché pendant la navigation ou en déplacement.</string>
    <string name="select_map_icon_descr">Icône affiché à l\'arrêt.</string>
@ -3907,9 +3907,9 @@
 \nA moins qu\'il ne soit annulé avant sa date de renouvellement, l\'abonnement sera automatiquement débité à chaque échéance (mensuelle / trimestrielle / annuelle).
 \n
 \nVous pouvez gérer et annuler vos abonnements dans vos paramètres AppGallery.</string>
-    <string name="message_need_calculate_route_before_show_graph">Seulement %1$s données disponibles sur les routes. Vous devez calculer l\'itinéraire via \"Itinéraire entre 2 points\".</string>
-    <string name="message_graph_will_be_available_after_recalculation">Recalcul de l\'itinéraire en cours.
-\nLe graphique sera disponible à l\'issue du calcul.</string>
+    <string name="message_need_calculate_route_before_show_graph">Seulement %1$s données disponibles sur les routes, calculez l\'itinéraire via \"Itinéraire entre 2 points\" pour voir les graphiques.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Attendez svp.
+\nLe graphique sera disponible à l\'issue du calcul de l\'itinéraire.</string>
    <string name="snowmobile_render_descr">Pour la conduite en motoneige avec des routes et des pistes dédiées.</string>
    <string name="shared_string_graph">Graphique</string>
    <string name="app_mode_gap">Écart</string>
@ -3926,7 +3926,7 @@
    <string name="mgrs_format_descr">OsmAnd utilise le système de référence MDRS de l\'OTAN dérivé des formats UTM et UPS.</string>
    <string name="navigate_point_format_mgrs">MGRS</string>
    <string name="navigate_point_mgrs">MGRS</string>
-    <string name="message_you_need_add_two_points_to_show_graphs">Vous devez, au moins, ajouter deux points</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">Ajoutez au moins deux points</string>
    <string name="subscription_on_hold_title">L\'abonnement OsmAnd Live est en attente</string>
    <string name="subscription_expired_title">L’abonnement OsmAnd Live a expiré</string>
    <string name="subscription_paused_title">L\'abonnement OsmAnd Live a été suspendu</string>
@ -3940,7 +3940,7 @@
    <string name="markers_history">Historique des marqueurs</string>
    <string name="send_files_to_openstreetmap">Envoyer un fichier GPX vers OpenStreetMap</string>
    <string name="enter_text_separated">Saisissez les étiquettes séparées par des virgules.</string>
-    <string name="subscription_payment_issue_title">Il y a un problème avec votre abonnement. Cliquez sur le bouton pour accéder aux paramètres de l\'abonnement Google Play et corriger votre mode de paiement.</string>
+    <string name="subscription_payment_issue_title">Il y a un problème avec votre abonnement. Tapez sur le bouton pour accéder aux paramètres de l\'abonnement Google Play et corriger votre mode de paiement.</string>
    <string name="osm_edit_comment_note">Commenter la note OSM</string>
    <string name="osm_edit_close_note">Fermer la note OSM</string>
    <string name="shared_string_add_photo">Ajouter une photo</string>
@ -3952,10 +3952,10 @@
 \n
 \nsoit avec OAuth soit avec votre identifiant et mot de passe.</string>
    <string name="osm_login_descr">Vous pouvez vous connecter avec la méthode sécurisée OAuth ou avec votre identifiant et votre mot de passe.</string>
-    <string name="register_on_openplacereviews_desc">Les photos sont fournies par le projet OpenPlaceReviews.org. Vous devez vous connecter au site web pour envoyer vos photos.</string>
+    <string name="register_on_openplacereviews_desc">Les photos sont fournies par le projet OpenPlaceReviews.org. Vous devez vous connecter au site web pour leur envoyer vos photos.</string>
    <string name="shared_string_search_history">Historique de recherche</string>
    <string name="app_mode_kayak">Kayak</string>
-    <string name="export_not_enough_space_descr">Votre appareil n\'a que %1$s disponible. Veuillez libérer de l\'espace ou désélectionner l\'export pour certains éléments.</string>
+    <string name="export_not_enough_space_descr">Votre appareil n\'a que %1$s disponible. Veuillez libérer de l\'espace ou désélectionner l\'export de certains éléments.</string>
    <string name="app_mode_motorboat">Bateau à moteur</string>
    <string name="shared_string_resources">Ressources</string>
    <string name="approximate_file_size">Taille approximative du fichier</string>
@ -3978,20 +3978,21 @@
    <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 les dénivellés sur votre itinéraire</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
-\n • Planifier l\'itinéraire : graphiques pour les segments avec l\'itinéraire, ajout de la possibilité de créer et de modifier des pistes à segments multiples
+\n • Planifier l\'itinéraire : graphiques pour les segments de piste pour l\'itinéraire et ajout de la possibilité de créer et de modifier des pistes à segments multiples
 \n
 \n • Ajout de la méthode d\'authentification OAuth pour OpenStreetMap, amélioration de l\'interface utilisateur des boîtes de dialogue OSM
 \n
-\n • Couleurs personnalisées pour les favoris et les points de passage
+\n • Support des couleurs personnalisées pour les favoris et les points de passage
 \n
 \n</string>
    <string name="plan_route_join_segments">Joindre les segments</string>
    <string name="plan_route_split_before">Couper avant</string>
    <string name="plan_route_split_after">Couper après</string>
    <string name="plan_route_add_new_segment">Ajouter un nouveau segment</string>
-    <string name="gpx_upload_identifiable_visibility_descr">« Identifiable » siginifie que la trace sera affichée publiquement dans « Vos traces GPS » ainsi que dans les listes de traces GPS publiques. Ceci signifie que les autres utilisateurs peuvent télécharger la trace brute et l\'associer avec votre nom d\'utilisateur. Quand ils sont servis par l\'API de point de cheminement, les données de points de trace horodatés provenant de l\'API GPS publique feront référence à la page de votre trace originelle.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">« Identifiable » siginifie que la trace sera affichée publiquement dans « Mes traces GPS » ainsi que dans les listes de traces GPS publiques. Ainsi les autres utilisateurs peuvent télécharger la trace brute et l\'associer avec votre nom d\'utilisateur. Les données de points de passage horodatés fournis par l\'API GPS publique feront référence à la page d\'origine de votre trace.</string>
+    <string name="gpx_upload_public_visibility_descr">« Public » signifie que la trace est affichée publiquement dans vos traces GPS et dans les listes de traces GPS publiques. Les données diffusées via l\'API ne font pas référence à votre page de traces. Les horodatages des points de trace ne sont pas disponibles via l\'API GPS publique et les points de trace ne sont pas classés par ordre chronologique.</string>
 </resources>
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@ -1010,7 +1010,7 @@
    <string name="poi_shoes_type">Tipo</string>
    <string name="poi_fire_hydrant_type">Tipo</string>
    <string name="poi_fire_hydrant_position">Posición do hidrante</string>
-    <string name="poi_fire_hydrant_water_source">Orixe da auga</string>
+    <string name="poi_water_source">Orixe da auga</string>
    <string name="poi_payment_toll_type">Tipo de pagamento</string>
    <string name="poi_traffic_signals_sound">Son</string>
    <string name="poi_highway_crossing_type">Tipo</string>
@ -3422,9 +3422,9 @@
    <string name="poi_fire_hydrant_position_parking_lot">No aparcadoiro</string>
    <string name="poi_fire_hydrant_position_street">Na rúa</string>
    <string name="poi_fire_hydrant_style_wsh">Estilo do hidrante: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Principal</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Lagoa</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Regato</string>
+    <string name="poi_water_source_main">Principal</string>
+    <string name="poi_water_source_pond">Lagoa</string>
+    <string name="poi_water_source_stream">Regato</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
    <string name="poi_military_checkpoint">Posto de control militar</string>
    <string name="poi_bicycle_parking_lockers">Portelos</string>
@ -3813,7 +3813,7 @@
    <string name="poi_seamark_water_level_part_submerged">Nivel da auga: parcialmente somerxido</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Succión</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Presurizado</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Augas subterráneas</string>
+    <string name="poi_water_source_groundwater">Augas subterráneas</string>
    <string name="poi_fire_hydrant_type_pipe">Tubaxe</string>
    <string name="poi_fire_hydrant_pressure_filter">Presión</string>
    <string name="poi_pump_status_missing_beam">Estado da bomba: sen chave</string>
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@ -1713,7 +1713,7 @@
    <string name="poi_brushless">Kefétlen</string>
    <string name="poi_internet_access_type">Internetcsatlakozás típusa</string>
    <string name="poi_fire_hydrant_position">Hely</string>
-    <string name="poi_fire_hydrant_water_source">Vízforrás</string>
+    <string name="poi_water_source">Vízforrás</string>
    <string name="poi_payment_toll_type">Fizetési mód</string>
    <string name="poi_traffic_signals_sound">Hangjelzés</string>
    <string name="poi_highway_crossing_type">Típus</string>
@ -2565,9 +2565,9 @@
    <string name="poi_fire_hydrant_position_parking_lot">Parkolóhely</string>
    <string name="poi_fire_hydrant_position_street">Utca</string>
    <string name="poi_fire_hydrant_position_underground">Föld alatt</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Fő</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Tó</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Patak</string>
+    <string name="poi_water_source_main">Fő</string>
+    <string name="poi_water_source_pond">Tó</string>
+    <string name="poi_water_source_stream">Patak</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Ciszterna</string>
    <string name="poi_street_cabinet_power">Közműszekrény típusa: villamos energia</string>
    <string name="poi_street_cabinet_telecom">Közműszekrény típusa: távközlés</string>
@ -3804,7 +3804,7 @@
    <string name="poi_borough">Kerület</string>
    <string name="poi_city_block">Háztömb</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Nyomás alatti</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Talajvíz</string>
+    <string name="poi_water_source_groundwater">Talajvíz</string>
    <string name="poi_fire_hydrant_type_pipe">Cső</string>
    <string name="poi_drinking_water_refill_network">Ivóvíz-utántöltő hálózat</string>
    <string name="poi_drinking_water_refill_no">Ivóvíz-utántöltés nincs</string>
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@ -129,7 +129,7 @@
    <string name="poi_social_facility_shelter">Skýli</string>
    <string name="poi_social_facility_for_disabled">Fatlaðir</string>
    <string name="poi_site_type_city">Borg</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Lækur</string>
+    <string name="poi_water_source_stream">Lækur</string>
    <string name="poi_aerodrome_type_public">Opinbert</string>
    <string name="poi_aerodrome_type_military">Hernaðar</string>
    <string name="poi_aerodrome_type_private">Einka</string>
@ -1367,8 +1367,8 @@
    <string name="poi_free_flying_official_no">Opinbert: nei</string>
    <string name="poi_emergency_yes">Neyðartilfelli: já</string>
    <string name="poi_emergency_no">Neyðartilfelli: nei</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Aðal</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Tjörn</string>
+    <string name="poi_water_source_main">Aðal</string>
+    <string name="poi_water_source_pond">Tjörn</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Tankur</string>
    <string name="poi_street_cabinet_power">Tegund skáps: rafmagn</string>
    <string name="poi_street_cabinet_telecom">Tegund skáps: samskipti</string>
@ -1398,7 +1398,7 @@
    <string name="poi_xmas_tree">Jólatré</string>
    <string name="poi_additional_type">Aukalegt</string>
    <string name="poi_bicycle_service">Reiðhjólaþjónusta</string>
-    <string name="poi_fire_hydrant_water_source">Vatnsuppspretta</string>
+    <string name="poi_water_source">Vatnsuppspretta</string>
    <string name="poi_automated">Sjálfvirk</string>
    <string name="poi_theatre_genre_shadow_play">Skuggaleikhús</string>
    <string name="poi_bandstand">Hljómsveitarpallur</string>
@ -3806,7 +3806,7 @@
    <string name="poi_pump_status_missing_beam">Staða dælu: vantar bita</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Sog</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Undir þrýstingi</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Grunnvatn</string>
+    <string name="poi_water_source_groundwater">Grunnvatn</string>
    <string name="poi_fire_hydrant_type_pipe">Leiðsla</string>
    <string name="poi_fire_hydrant_pressure_filter">Þrýstingur</string>
    <string name="poi_traffic_signals_arrow_yes">Já</string>
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@ -709,7 +709,7 @@
    <string name="poi_shoes_type">Tipo</string>
    <string name="poi_fire_hydrant_type">Tipo</string>
    <string name="poi_fire_hydrant_position">Posizione</string>
-    <string name="poi_fire_hydrant_water_source">Fonte d\'acqua</string>
+    <string name="poi_water_source">Fonte d\'acqua</string>
    <string name="poi_payment_toll_type">Tipo di pagamento</string>
    <string name="poi_traffic_signals_sound">Suono</string>
    <string name="poi_highway_crossing_type">Tipo</string>
@ -2286,9 +2286,9 @@
    <string name="poi_payment_mtsmoney_yes">MTS-Money</string>
    <string name="poi_payment_mtsmoney_no">MTS-Money non accettato</string>
    <string name="poi_brewery_additional">Nome della birreria</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Principale</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Stagno</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Ruscello</string>
+    <string name="poi_water_source_main">Principale</string>
+    <string name="poi_water_source_pond">Stagno</string>
+    <string name="poi_water_source_stream">Ruscello</string>
    <string name="poi_valley_balka">Balka</string>
    <string name="poi_display_yes">Display: sì</string>
    <string name="poi_display_no">Display: no</string>
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@ -4001,4 +4001,15 @@
    <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>
+    <string name="release_3_9">"• Aggiunta l\'opzione per esportare e importare tutti i dati incluse le impostazioni, le risorse e i preferiti
+\n
+\n • Creazione del percorso: grafici per parti del percorso, aggiunta anche la possibilità di creare e modificare tracce composte da più segmenti
+\n
+\n • Aggiunto il metodi di autenticazione OAuth per  OpenStreetMap, migliorata la UI dei dialoghi OSM
+\n
+\n • Supporto alla personalizzazione dei colori per i preferiti e i punti intermedi delle tracce
+\n
+\n"</string>
 </resources>
--- a/OsmAnd/res/values-iw/phrases.xml
+++ b/OsmAnd/res/values-iw/phrases.xml
@ -138,7 +138,7 @@
    <string name="poi_additional_type">נוסף</string>
    <string name="poi_payment_type">סוג תשלום</string>
    <string name="poi_bicycle_service">שירות אופניים</string>
-    <string name="poi_fire_hydrant_water_source">מקור מים</string>
+    <string name="poi_water_source">מקור מים</string>
    <string name="poi_service_general">שירות</string>
    <string name="poi_subway_station_filter">תחנת רכבת תחתית</string>
    <string name="poi_pump">משאבה</string>
--- a/OsmAnd/res/values-iw/strings.xml
+++ b/OsmAnd/res/values-iw/strings.xml
@ -2171,7 +2171,7 @@
    <string name="plugin_install_needs_network">צריך חיבור לאינטרנט כדי להתקין את התוסף הזה.</string>
    <string name="get_plugin">קבלה</string>
    <string name="use_fast_recalculation">חישוב חכם לנתיב מחדש</string>
-    <string name="use_fast_recalculation_desc">לחשב מחדש רק את החלק ההתחלתי של המסלול, יכול לשמש לטיולים ארוכים.</string>
+    <string name="use_fast_recalculation_desc">לחשב מחדש רק את החלק ההתחלתי של המסלול, שימושי לטיולים ארוכים.</string>
    <string name="do_you_like_osmand">OsmAnd נושא חן בעיניך?</string>
    <string name="we_really_care_about_your_opinion">הדעה והמשוב שלך יקרים לנו.</string>
    <string name="rate_this_app">דירוג היישומון הזה</string>
@ -3926,7 +3926,7 @@
    <string name="use_complex_routing">חישוב מורכב של מסלול</string>
    <string name="complex_routing_descr">חישוב מסלול דו־שלבי לניווט במכונית.</string>
    <string name="use_native_pt">פיתוח עצמי לתחבורה ציבורית</string>
-    <string name="use_native_pt_desc">מעבר לחישוב ניווט בתחבורה ציבורית ב־Java (בטוח)</string>
+    <string name="use_native_pt_desc">מעבר לחישוב מסלול בתחבורה ציבורית ב־Java (בטוח)</string>
    <string name="perform_oauth_authorization_description">יש להיכנס עם OAuth כדי להשתמש ביכולות של osmedit</string>
    <string name="perform_oauth_authorization">להיכנס דרך OAuth</string>
    <string name="clear_osm_token">למחוק את אסימון ה־OAuth של OpenStreetMap</string>
@ -3936,8 +3936,8 @@
    <string name="snowmobile_render_descr">לנהיגה ברכבי שלג עם דרכים ומסלולים יעודיים.</string>
    <string name="message_need_calculate_route_before_show_graph">הנתונים של %1$s זמינים בדרכים בלבד, עליך לחשב מסלול באמצעות „מסלול בין נקודות” כדי לקבל אותם.</string>
    <string name="shared_string_graph">תרשים</string>
-    <string name="message_graph_will_be_available_after_recalculation">נא להמתין לחישוב המסלול מחדש.
-\nהתרשים יהיה זמין לאחר החישוב מחדש.</string>
+    <string name="message_graph_will_be_available_after_recalculation">"נא להמתין.
+\nהתרשים יהיה זמין לאחר חישוב  מחדש."</string>
    <string name="ltr_or_rtl_combine_via_dash">%1$s ‏— %2$s</string>
    <string name="shared_string_local_maps">מפות מקומיות</string>
    <string name="icon_group_amenity">שירות לציבור</string>
@ -3964,7 +3964,7 @@
    <string name="open_street_map_login_mode">עליך להיכנס כדי להעלות שינויים חדשים או כאלו שנערכו.
 \n
 \nניתן להיכנס בשיטת OAuth המאובטחת או באמצעות שם הכניסה והססמה שלך.</string>
-    <string name="subscription_payment_issue_title">יש בעיה עם המינוי שלך. יש ללחוץ על הכפתור כדי לגשת להגדרות המינוי של Google Play ולתקן את שיטת התשלום שלך.</string>
+    <string name="subscription_payment_issue_title">יש בעיה עם המינוי שלך. יש לגעת כפתור כדי לגשת להגדרות המינוי של Google Play ולתקן את שיטת התשלום שלך.</string>
    <string name="subscription_on_hold_title">המינוי ל־OsmAnd Live מוחזק</string>
    <string name="markers_history">היסטוריית סמנים</string>
    <string name="send_files_to_openstreetmap">שליחת קובץ GPX ל־OpenStreetMap</string>
@ -3976,7 +3976,7 @@
    <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_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>
@ -3994,7 +3994,7 @@
    <string name="add_photos_descr">OsmAnd מציג תמונות ממגוון מקורות:
 \nOpenPlaceReviews - תמונות של נקודות עניין;
 \nMapillary - תמונות ברמת הרחוב;
-\nאינטרנט / ויקימדיה - תמונות נקודות עניין שמצוינות בנתונים של OpenStreetMap.</string>
+\nאינטרנט / ויקימדיה - תמונות נקודות עניין בהתאם לנתונים של OpenStreetMap.</string>
    <string name="select_groups_for_import">נא לבחור קבוצות שייובאו.</string>
    <string name="select_items_for_import">נא לבחור פריטים שייובאו.</string>
    <string name="use_dev_url_descr">לעבור להשתמש ב־dev.openstreetmap.org במקום ב־openstreetmap.org כדי לבדוק העלאות של הערות OSM / נקודות עניין / GPX.</string>
@ -4003,10 +4003,19 @@
    <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="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="release_3_9">• נוספה אפשרות לייצר ולייבא את כל הנתונים לרבות הגדרות, משאבים והמיקומים שלי
+\n
+\n • תכנון מסלול: תרשימים למקטעי דרך עם המסלול ונוספה האפשרות ליצור ולערוך מגוון מקטעי מסלול
+\n
+\n • נוספה שיטת אימות OAuth עבור OpenStreetMap, מנשק משתמש משופר לתיבות הדו־שיח של OSM
+\n
+\n • תמיכה בצבעים מותאמים אישית למועדפים ולנקודות דרך במסלול
+\n
+\n</string>
 </resources>
--- a/OsmAnd/res/values-ja/phrases.xml
+++ b/OsmAnd/res/values-ja/phrases.xml
@ -1075,7 +1075,7 @@
    <string name="poi_internet_access_type">インターネット接続の種類</string>
    <string name="poi_vending_type">自動販売機の種類</string>
    <string name="poi_bicycle_service">自転車関連サービス</string>
-    <string name="poi_fire_hydrant_water_source">水源</string>
+    <string name="poi_water_source">水源</string>
    <string name="poi_payment_toll_type">支払いの種類</string>
    <string name="poi_traffic_signals_sound">視覚障害者用信号機音声</string>
    <string name="poi_tactile_paving">視覚障害者誘導用ブロック</string>
@ -1893,10 +1893,10 @@
    <string name="poi_fire_hydrant_type_dry_barrel">消火栓</string>
    <string name="poi_fire_hydrant_type_pond">貯水池</string>
    <string name="poi_fire_hydrant_type_wall">壁面</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">貯水池</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">川・流水</string>
+    <string name="poi_water_source_pond">貯水池</string>
+    <string name="poi_water_source_stream">川・流水</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">水槽</string>
-    <string name="poi_fire_hydrant_style_water_source_main">配管</string>
+    <string name="poi_water_source_main">配管</string>
    <string name="poi_highway_crossing_type">交差点タイプ</string>
    <string name="poi_crossing_bell_yes">踏切警告音:有り</string>
    <string name="poi_crossing_bell_no">踏切警告音:無し</string>
@ -3821,7 +3821,7 @@
    <string name="poi_pump_status_missing_beam">状態:釣瓶・管がない</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">吸引</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">加圧</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">地下水</string>
+    <string name="poi_water_source_groundwater">地下水</string>
    <string name="poi_nuts">ナッツ専門店</string>
    <string name="poi_beehive">養蜂箱</string>
    <string name="poi_departures_board_realtime">リアルタイム時刻表</string>
--- a/OsmAnd/res/values-kn/phrases.xml
+++ b/OsmAnd/res/values-kn/phrases.xml
@ -11,7 +11,7 @@
    <string name="poi_shoes_type">ಮಾದರಿ</string>
    <string name="poi_fire_hydrant_type">ಮಾದರಿ</string>
    <string name="poi_fire_hydrant_position">ಸ್ಥಾನ</string>
-    <string name="poi_fire_hydrant_water_source">ನೀರಿನ ಮೂಲ</string>
+    <string name="poi_water_source">ನೀರಿನ ಮೂಲ</string>
    <string name="poi_payment_toll_type">ಪಾವತಿಸುವ ವಿಧಾನ</string>
    <string name="poi_traffic_signals_sound">ಧ್ವನಿ</string>
    <string name="poi_highway_crossing_type">ಮಾದರಿ</string>
--- a/OsmAnd/res/values-lt/phrases.xml
+++ b/OsmAnd/res/values-lt/phrases.xml
@ -119,7 +119,7 @@
    <string name="poi_bicycle_service">Dviračių aptarnavimas</string>
    <string name="poi_shoes_type">Tipas</string>
    <string name="poi_fire_hydrant_type">Tipas</string>
-    <string name="poi_fire_hydrant_water_source">Vandens šaltinis</string>
+    <string name="poi_water_source">Vandens šaltinis</string>
    <string name="poi_payment_toll_type">Mokėjimo tipas</string>
    <string name="poi_highway_crossing_type">Tipas</string>
    <string name="poi_service_general">Paslauga</string>
--- a/OsmAnd/res/values-lv/phrases.xml
+++ b/OsmAnd/res/values-lv/phrases.xml
@ -11,7 +11,7 @@
    <string name="poi_shoes_type">Kurpes</string>
    <string name="poi_fire_hydrant_type">Ugunsdzēsības hidranti</string>
    <string name="poi_fire_hydrant_position">Vieta</string>
-    <string name="poi_fire_hydrant_water_source">Ūdens ņemšanas vieta</string>
+    <string name="poi_water_source">Ūdens ņemšanas vieta</string>
    <string name="poi_payment_toll_type">Apmaksas veids</string>
    <string name="poi_traffic_signals_sound">Skaņa</string>
    <string name="poi_highway_crossing_type">Veids</string>
@ -2700,9 +2700,9 @@
    <string name="poi_fire_hydrant_position_street">Hidranta atrašanās vieta: iela</string>
    <string name="poi_fire_hydrant_position_underground">"Hidranta atrašanās vieta:  zemē"</string>
    <string name="poi_fire_hydrant_style_wsh">Hidranta stils: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Galvenais</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Dīķis</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Caurplūde</string>
+    <string name="poi_water_source_main">Galvenais</string>
+    <string name="poi_water_source_pond">Dīķis</string>
+    <string name="poi_water_source_stream">Caurplūde</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
    <string name="poi_in_service_yes">Lietošanā: jā</string>
    <string name="poi_street_cabinet_power">Skapja tips: elektrība</string>
--- a/OsmAnd/res/values-ml/phrases.xml
+++ b/OsmAnd/res/values-ml/phrases.xml
@ -856,7 +856,7 @@
 	<string name="poi_shoes_type">തരം [ഷൂ]</string>
 	<string name="poi_fire_hydrant_type">തരം [അഗ്നിശമനി]</string>
 	<string name="poi_fire_hydrant_position">സ്ഥാനം [അഗ്നിശമനി]</string>
-	<string name="poi_fire_hydrant_water_source">ജലസ്രോ‌തസ് [അഗ്നിശമനം]</string>
+	<string name="poi_water_source">ജലസ്രോ‌തസ് [അഗ്നിശമനം]</string>
 	<string name="poi_payment_toll_type">പേയ്മെന്റ് ടൈപ്പ്</string>
 	<string name="poi_traffic_signals_sound">ശബ്ദമുണ്ടാക്കുന്ന ട്രാ‌ഫിക് സിഗ്നല്‍</string>
 	<string name="poi_highway_crossing_type">തരം [ക്രോ‌സിങ്ങ്]</string>
@ -2474,9 +2474,9 @@
 	<string name="poi_office_physician">ഫിസിഷ്യന്റെ ഓഫീസ്</string>
 	<string name="poi_office_therapist">തെറാപിസ്റ്റ് ഓഫീസ്</string>
 	<string name="poi_office_podologist">പൊഡൊളജിസ്ട് ഓഫീസ്</string>
-	<string name="poi_fire_hydrant_style_water_source_main">പ്രധാന</string>
-	<string name="poi_fire_hydrant_style_water_source_pond">കുളം</string>
-	<string name="poi_fire_hydrant_style_water_source_stream">അരുവി</string>
+	<string name="poi_water_source_main">പ്രധാന</string>
+	<string name="poi_water_source_pond">കുളം</string>
+	<string name="poi_water_source_stream">അരുവി</string>
 	<string name="poi_salt_yes">"ഉപ്പ് "</string>
 	<string name="poi_crossing_activation_automatic">തനിയെ പ്രവര്‍ത്തിക്കുന്ന ക്രോസിങ്ങ്</string>
 	<string name="poi_crossing_activation_local">ക്രോസ്സിങ്ങ് പ്രവര്‍ത്തനം ലോക്കല്‍</string>
--- a/OsmAnd/res/values-mr/phrases.xml
+++ b/OsmAnd/res/values-mr/phrases.xml
@ -109,5 +109,5 @@
    <string name="poi_cuisine_japanese">जपानी</string>
    <string name="poi_cuisine_chinese">चीनी</string>
    <string name="poi_cuisine_indian">भारतीय</string>
-    <string name="poi_fire_hydrant_water_source">पाण्याचा स्त्रोत</string>
+    <string name="poi_water_source">पाण्याचा स्त्रोत</string>
 </resources>
--- a/OsmAnd/res/values-nb/phrases.xml
+++ b/OsmAnd/res/values-nb/phrases.xml
@ -372,7 +372,7 @@
    <string name="poi_aerodrome_type_regional">Regional</string>
    <string name="poi_internet_access_type">Internettilgangstype</string>
    <string name="poi_bicycle_service">Sykkelservice</string>
-    <string name="poi_fire_hydrant_water_source">Vannkilde</string>
+    <string name="poi_water_source">Vannkilde</string>
    <string name="poi_payment_toll_type">Betalingstype</string>
    <string name="poi_traffic_signals_sound">Lyd</string>
    <string name="poi_self_service">Selvbetjening</string>
@ -1552,7 +1552,7 @@
    <string name="poi_sms">SMS</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Undertrykk</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Under trykk</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Grunnvann</string>
+    <string name="poi_water_source_groundwater">Grunnvann</string>
    <string name="poi_fire_hydrant_type_pipe">Rør</string>
    <string name="poi_drinking_water_refill_network">Nettverk for påfyll av drikkevann</string>
    <string name="poi_drinking_water_refill_no">Drikkevannspåfylling: Nei</string>
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@ -1398,7 +1398,7 @@
    <string name="poi_shoes_type">Soort</string>
    <string name="poi_fire_hydrant_type">Soort</string>
    <string name="poi_fire_hydrant_position">Plaatsing</string>
-    <string name="poi_fire_hydrant_water_source">Waterherkomst</string>
+    <string name="poi_water_source">Waterherkomst</string>
    <string name="poi_payment_toll_type">Betalingswijze</string>
    <string name="poi_traffic_signals_sound">Geluidssignaal</string>
    <string name="poi_highway_crossing_type">Soort</string>
@ -3090,9 +3090,9 @@
    <string name="poi_fire_hydrant_position_green">Dries</string>
    <string name="poi_fire_hydrant_position_lane">Rijbaan</string>
    <string name="poi_fire_hydrant_style_wsh">Brandkraan: schacht</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Hoofdleiding</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Vijver</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Waterloop</string>
+    <string name="poi_water_source_main">Hoofdleiding</string>
+    <string name="poi_water_source_pond">Vijver</string>
+    <string name="poi_water_source_stream">Waterloop</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Citerne</string>
    <string name="poi_in_service_yes">In dienst: ja</string>
    <string name="poi_street_cabinet_power">Kast type: stroom</string>
--- a/OsmAnd/res/values-oc/phrases.xml
+++ b/OsmAnd/res/values-oc/phrases.xml
@ -13,7 +13,7 @@
    <string name="poi_fire_hydrant_position">Localizacion de la bòrna</string>
    <string name="poi_traffic_signals_sound">Senhau de circulacion sonòr</string>
    <string name="poi_tactile_paving">Marca d\'assisténcia au sòu</string>
-    <string name="poi_fire_hydrant_water_source">Sorgent</string>
+    <string name="poi_water_source">Sorgent</string>
    <string name="poi_payment_toll_type">Tipe de pagament</string>
    <string name="poi_highway_crossing_type">Tipe</string>
    <string name="poi_service_general">Servici</string>
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@ -2301,9 +2301,9 @@
    <string name="poi_fire_hydrant_position_street">Ulica</string>
    <string name="poi_fire_hydrant_position_underground">Pod ziemią</string>
    <string name="poi_fire_hydrant_style_wsh">Typ hydrantu: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Sieć</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Staw</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Strumień</string>
+    <string name="poi_water_source_main">Sieć</string>
+    <string name="poi_water_source_pond">Staw</string>
+    <string name="poi_water_source_stream">Strumień</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Cysterna</string>
    <string name="poi_in_service_yes">Działa: tak</string>
    <string name="poi_military_checkpoint">Wojskowy punkt kontroli</string>
@ -2775,7 +2775,7 @@
    <string name="poi_shoes_type">Obuwie</string>
    <string name="poi_fire_hydrant_type">Rodzaj</string>
    <string name="poi_fire_hydrant_position">Położenie</string>
-    <string name="poi_fire_hydrant_water_source">Źródło wody</string>
+    <string name="poi_water_source">Źródło wody</string>
    <string name="poi_payment_toll_type">Metoda płatności</string>
    <string name="poi_traffic_signals_sound">Sygnał dźwiękowy</string>
    <string name="poi_highway_crossing_type">Rodzaj</string>
@ -3820,7 +3820,7 @@
    <string name="poi_internet_access_fee_customers">Dostęp do Internetu: klienci</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Ssanie</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Pod ciśnieniem</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Woda podziemna</string>
+    <string name="poi_water_source_groundwater">Woda podziemna</string>
    <string name="poi_fire_hydrant_type_pipe">Rura</string>
    <string name="poi_fire_hydrant_pressure_filter">Ciśnienie</string>
    <string name="poi_traffic_signals_arrow">Strzałka</string>
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@ -2458,7 +2458,7 @@
    <string name="poi_shoes_type">Tipo</string>
    <string name="poi_fire_hydrant_type">Tipo</string>
    <string name="poi_fire_hydrant_position">Posição</string>
-    <string name="poi_fire_hydrant_water_source">Fonte de água</string>
+    <string name="poi_water_source">Fonte de água</string>
    <string name="poi_payment_toll_type">Tipo de pagamento</string>
    <string name="poi_traffic_signals_sound">Som</string>
    <string name="poi_highway_crossing_type">Tipo</string>
@ -2783,9 +2783,9 @@
    <string name="poi_fire_hydrant_position_street">Rua</string>
    <string name="poi_fire_hydrant_position_underground">Subterrâneo</string>
    <string name="poi_fire_hydrant_style_wsh">Estilo de hidrante: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Rede de água</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Lagoa</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Ribeirão/Rio</string>
+    <string name="poi_water_source_main">Rede de água</string>
+    <string name="poi_water_source_pond">Lagoa</string>
+    <string name="poi_water_source_stream">Ribeirão/Rio</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
    <string name="poi_in_service_yes">Em serviço: sim</string>
    <string name="poi_street_cabinet_power">Tipo de gabinete: força</string>
@ -3820,7 +3820,7 @@
    <string name="poi_drinking_water_refill_network">Rede de recarga de água potável</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Sucção</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Pressurizado</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Água subterrânea</string>
+    <string name="poi_water_source_groundwater">Água subterrânea</string>
    <string name="poi_fire_hydrant_type_pipe">Tubo</string>
    <string name="poi_fire_hydrant_pressure_filter">Pressão</string>
    <string name="poi_pump_status_missing_beam">Status da bomba: falta de feixe</string>
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@ -1538,7 +1538,7 @@
    <string name="routing_attr_height_name">Limite de altura</string>
    <string name="routing_attr_height_description">Especifique a altura permitida do veículo nas rotas.</string>
    <string name="use_fast_recalculation">Recálculo de rota inteligente</string>
-    <string name="use_fast_recalculation_desc">Recalcular apenas a parte inicial da rota. Pode ser usado para viagens longas.</string>
+    <string name="use_fast_recalculation_desc">Recalcular apenas a parte inicial da rota, útil para viagens longas.</string>
    <string name="rendering_value_disabled_name">Desativado</string>
    <string name="rendering_value_walkingRoutesScopeOSMC_name">Cor por afiliação de rede</string>
    <string name="rendering_value_walkingRoutesOSMC_name">Cor por símbolo de caminhada OSMC</string>
@ -3915,7 +3915,7 @@
    <string name="use_complex_routing">Roteamento complexo</string>
    <string name="complex_routing_descr">Roteamento de duas fases para navegação automotiva.</string>
    <string name="use_native_pt">Desenvolvimento de transporte público nativo</string>
-    <string name="use_native_pt_desc">Mudar para cálculo de roteamento de transporte público em Java (seguro)</string>
+    <string name="use_native_pt_desc">Mudar para cálculo de rota de transporte público em Java (seguro)</string>
    <string name="what_is_new">O que há de novo</string>
    <string name="perform_oauth_authorization_description">Entrar com OAuth para usar os recursos osmedit</string>
    <string name="perform_oauth_authorization">Entrar via OAuth</string>
@ -3925,9 +3925,9 @@
    <string name="use_two_phase_routing">Use o algoritmo de roteamento 2-phase A *</string>
    <string name="snowmobile_render_descr">Para dirigir em motos de neve com estradas e trilhas exclusivas.</string>
    <string name="shared_string_graph">Gráfico</string>
-    <string name="message_need_calculate_route_before_show_graph">Dados de %1$s disponíveis apenas nas estradas, você precisa calcular uma rota usando “Rota entre pontos” para obtê-la.</string>
-    <string name="message_graph_will_be_available_after_recalculation">Aguarde o recálculo da rota.
-\nO gráfico estará disponível após o recálculo.</string>
+    <string name="message_need_calculate_route_before_show_graph">Dados de %1$s disponíveis apenas em estradas, calcule uma rota usando “Rota entre pontos” para ver os gráficos.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Por favor, espere.
+\nO gráfico estará disponível após o recálculo da rota.</string>
    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
    <string name="shared_string_local_maps">Mapas locais</string>
    <string name="icon_group_amenity">Amenidade</string>
@ -3941,9 +3941,9 @@
    <string name="navigate_point_mgrs">MGRS</string>
    <string name="navigate_point_format_mgrs">MGRS</string>
    <string name="mgrs_format_descr">OsmAnd usa MGRS, que é semelhante ao formato UTM NATO.</string>
-    <string name="message_you_need_add_two_points_to_show_graphs">Você precisa adicionar pelo menos dois pontos</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">Adicione pelo menos dois pontos</string>
    <string name="manage_subscription">Gerenciar assinatura</string>
-    <string name="subscription_payment_issue_title">Há um problema com sua assinatura. Clique no botão para ir para as configurações de assinatura do Google Play para corrigir sua forma de pagamento.</string>
+    <string name="subscription_payment_issue_title">Há um problema com sua assinatura. Toque no botão para ir para as configurações de assinatura do Google Play para corrigir sua forma de pagamento.</string>
    <string name="subscription_expired_title">A assinatura do OsmAnd Live expirou</string>
    <string name="subscription_paused_title">A assinatura do OsmAnd Live foi pausada</string>
    <string name="subscription_on_hold_title">A assinatura do OsmAnd Live está em espera</string>
@ -3962,7 +3962,7 @@
    <string name="enter_text_separated">Insira as etiquetas separadas por vírgula.</string>
    <string name="gpx_upload_public_visibility_descr">\"Público\" significa que o traçado é mostrado publicamente em seus traços GPS e em listagens públicas de traços GPS e na lista pública de traços com carimbos de data/hora em formato bruto. Os dados fornecidos por meio da API não fazem referência à sua página de rastreamento. Os carimbos de data/hora do ponto de rastreamento não estão disponíveis por meio da API GPS pública e os pontos de rastreamento não são ordenados cronologicamente.</string>
    <string name="gpx_upload_private_visibility_descr">\"Privado\" significa que o rastreamento não aparece em nenhuma listagem pública, mas os pontos de trilha dele em ordem não sincronizada estão disponíveis por meio da API GPS pública sem carimbos de data/hora.</string>
-    <string name="gpx_upload_identifiable_visibility_descr">\"Identificável\" significa que o traço será mostrado publicamente em Seus traços de GPS e em listas públicas de traços de GPS, ou seja, outros usuários poderão fazer download do traço bruto e associá-lo ao seu nome de usuário. Os dados de pontos de rastreamento com carimbo de data/hora públicos da API GPS servidos por meio da API de pontos de rastreamento farão referência à sua página de rastreamento original.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">\"Identificável\" significa que o traço será mostrado publicamente em seus traços de GPS e em listas públicas de traços de GPS, ou seja, outros usuários poderão fazer download do traço bruto e associá-lo ao seu nome de usuário. Os dados de pontos de rastreamento com carimbo de data/hora públicos da API GPS servidos por meio da API de pontos de rastreamento farão referência à sua página de rastreamento original.</string>
    <string name="gpx_upload_trackable_visibility_descr">\"Rastreável\" significa que o rastreamento não aparece em nenhuma listagem pública, mas os pontos de trilha processados com carimbos de data/hora (que não podem ser associados a você diretamente) são feitos por meio de downloads da API GPS pública.</string>
    <string name="osm_edit_close_note">Fechar nota do OSM</string>
    <string name="osm_edit_comment_note">Comentário de nota do OSM</string>
@ -3970,7 +3970,7 @@
    <string name="shared_string_add_photo">Adicionar foto</string>
    <string name="register_on_openplacereviews">Cadastre-se em
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">As fotos são fornecidas pelo projeto de dados abertos OpenPlaceReviews.org. Para carregar suas fotos você precisa se inscrever no site.</string>
+    <string name="register_on_openplacereviews_desc">As fotos são fornecidas pelo projeto de dados abertos OpenPlaceReviews.org. Para enviar suas fotos, você precisa se inscrever em seu site.</string>
    <string name="register_opr_create_new_account">Criar nova conta</string>
    <string name="register_opr_have_account">Eu já tenho uma conta</string>
    <string name="shared_string_search_history">Histórico de busca</string>
@ -3981,7 +3981,7 @@
    <string name="add_photos_descr">OsmAnd mostra fotos de várias fontes:
 \nOpenPlaceReviews - fotos de POI;
 \nMapillary - imagens de nível da rua;
-\nWeb / Wikimedia - fotos de POI especificadas nos dados do OpenStreetMap.</string>
+\nWeb / Wikimedia - fotos de POI especificadas de acordo com os dados do OpenStreetMap.</string>
    <string name="shared_string_resources">Recursos</string>
    <string name="approximate_file_size">Tamanho aproximado do arquivo</string>
    <string name="select_data_to_export">Selecione os dados a serem exportados para o arquivo.</string>
@ -3996,15 +3996,15 @@
    <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 os dados de elevação para consideração de subida / descida para sua viagem</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
-\n • Planejar rota: gráficos para segmentos com a rota, adicionada a capacidade de criar e editar faixas de múltiplos segmentos
+\n  • Plano de rota: gráficos para segmentos de trilha com rota, e adicionou a capacidade de criar e editar vários segmentos de trilha
 \n
 \n  • Método de autenticação OAuth adicionado para OpenStreetMap, interface de usuário aprimorada de caixas de diálogo OSM
 \n
-\n  • Cores personalizadas para favoritos e rastreia pontos de referência
+\n  • Suporta cores personalizadas para favoritos e rastreia pontos de referência
 \n
 \n"</string>
    <string name="plan_route_join_segments">Unir segmentos</string>
--- a/OsmAnd/res/values-pt/phrases.xml
+++ b/OsmAnd/res/values-pt/phrases.xml
@ -250,7 +250,7 @@
    <string name="poi_shoes_type">Tipo</string>
    <string name="poi_fire_hydrant_type">Tipo</string>
    <string name="poi_fire_hydrant_position">Posição</string>
-    <string name="poi_fire_hydrant_water_source">Fonte de água</string>
+    <string name="poi_water_source">Fonte de água</string>
    <string name="poi_payment_toll_type">Forma de pagamento</string>
    <string name="poi_traffic_signals_sound">Som</string>
    <string name="poi_highway_crossing_type">Tipo</string>
@ -2749,9 +2749,9 @@
    <string name="poi_fire_hydrant_position_street">Rua</string>
    <string name="poi_fire_hydrant_position_underground">Subterrâneo</string>
    <string name="poi_fire_hydrant_style_wsh">Estilo de hidrante: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Rede de água</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Lagoa</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Ribeirão/Rio</string>
+    <string name="poi_water_source_main">Rede de água</string>
+    <string name="poi_water_source_pond">Lagoa</string>
+    <string name="poi_water_source_stream">Ribeirão/Rio</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
    <string name="poi_in_service_yes">Em serviço: sim</string>
    <string name="poi_street_cabinet_power">Tipo de gabinete: força</string>
@ -3805,7 +3805,7 @@
    <string name="poi_sms">SMS</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Sucção</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Pressurizado</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Águas subterrâneas</string>
+    <string name="poi_water_source_groundwater">Águas subterrâneas</string>
    <string name="poi_fire_hydrant_type_pipe">Tubo</string>
    <string name="poi_fire_hydrant_pressure_filter">Pressão</string>
    <string name="poi_pump_status_missing_beam">Estado da bomba: falta de feixe</string>
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@ -2662,10 +2662,10 @@
    <string name="poi_fire_hydrant_position_parking_lot">Автостоянка</string>
    <string name="poi_fire_hydrant_position_street">Улица</string>
    <string name="poi_fire_hydrant_position_underground">Подземный</string>
-    <string name="poi_fire_hydrant_water_source">Источник воды</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Основной</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Пруд</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Поток</string>
+    <string name="poi_water_source">Источник воды</string>
+    <string name="poi_water_source_main">Основной</string>
+    <string name="poi_water_source_pond">Пруд</string>
+    <string name="poi_water_source_stream">Поток</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Ёмкость</string>
    <string name="poi_in_service_yes">Используется: да</string>
    <string name="poi_street_cabinet_power">Тип шкафа: электрический</string>
@ -3766,7 +3766,7 @@
    <string name="poi_climbing_multipitch_no">Многоуровневые маршруты: нет</string>
    <string name="poi_climbing_multipitch_yes">Многоуровневые маршруты: есть</string>
    <string name="poi_nuclear_explosion_salvo_second_or_later_detonation">Взрывной залп: вторая или более поздняя детонация залпового теста</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Подземные воды</string>
+    <string name="poi_water_source_groundwater">Подземные воды</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Сухой</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Мокрый</string>
    <string name="poi_pile">Куча</string>
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@ -1763,7 +1763,7 @@
    <string name="poi_shoes_type">Casta</string>
    <string name="poi_fire_hydrant_type">Casta</string>
    <string name="poi_fire_hydrant_position">Positzione</string>
-    <string name="poi_fire_hydrant_water_source">Mitza de abba</string>
+    <string name="poi_water_source">Mitza de abba</string>
    <string name="poi_payment_toll_type">Casta de pagamentu</string>
    <string name="poi_traffic_signals_sound">Sonu</string>
    <string name="poi_highway_crossing_type">Casta</string>
@ -2806,9 +2806,9 @@
    <string name="poi_fire_hydrant_position_street">In sa carrera</string>
    <string name="poi_fire_hydrant_position_underground">Suta terra</string>
    <string name="poi_fire_hydrant_style_wsh">Istile de s\'idrante: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Printzipale</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Poju</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Trainu</string>
+    <string name="poi_water_source_main">Printzipale</string>
+    <string name="poi_water_source_pond">Poju</string>
+    <string name="poi_water_source_stream">Trainu</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Tzisterna</string>
    <string name="poi_in_service_yes">In servìtziu: eja</string>
    <string name="poi_street_cabinet_power">Casta de cabina: eletritzidade</string>
@ -3621,7 +3621,7 @@
    <string name="poi_vehicle_military">Atzessu pro sos veìculos: militares</string>
    <string name="poi_vehicle_delivery">Atzessu pro sos veìculos: intregas</string>
    <string name="poi_vehicle_forestry">Atzessu pro sos veìculos: foresteria</string>
-    <string name="poi_motorcar_yes">Atzessu pro sas automòbiles:</string>
+    <string name="poi_motorcar_yes">Atzessu pro sas automòbiles: eja</string>
    <string name="poi_motorcar_private">Atzessu pro sas automòbiles: privadu</string>
    <string name="poi_motorcar_no">Atzessu pro sas automòbiles: nono</string>
    <string name="poi_motorcar_destination">Atzessu pro sas automòbiles: destinatzione</string>
@ -3816,7 +3816,7 @@
    <string name="poi_drinking_water_refill_network">Retza de ricàrriga de abba potàbile</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Sutzione</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Presurizada</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Abba suta de terra</string>
+    <string name="poi_water_source_groundwater">Abba suta de terra</string>
    <string name="poi_fire_hydrant_type_pipe">Pompa</string>
    <string name="poi_fire_hydrant_pressure_filter">Pressione</string>
    <string name="poi_pump_status_missing_beam">Istadu de sa pompa: mancat sa trave</string>
@ -3879,4 +3879,5 @@
    <string name="poi_siren">Sirena</string>
    <string name="poi_nurse">Infermieri</string>
    <string name="poi_mobile_money_agent">Agente de denaru mòbile</string>
+    <string name="poi_lifeguard_base">Base de sos bagninos</string>
 </resources>
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@ -4000,4 +4000,17 @@
    <string name="lang_de_casual">Tedescu (informale)</string>
    <string name="elevation_data">Podes impreare sos datos de s\'artària pro valutare s\'Artziada / Achirrada pro su biàgiu tuo</string>
    <string name="app_mode_light_aircraft">Aèreu lèbiu</string>
+    <string name="plan_route_join_segments">Auni sos segmentos</string>
+    <string name="plan_route_split_before">Iscroba in antis de</string>
+    <string name="plan_route_split_after">Iscroba a pustis de</string>
+    <string name="plan_route_add_new_segment">Annanghe unu segmentu nou</string>
+    <string name="release_3_9">• Annanghidura de un\'optzione pro esportare e importare totu sos datos incluende sas impostatziones, sas risursas, e sos \"logos meos\"
+\n
+\n • Pranificatzione de s\'àndala: gràficos pro segmentos cun s\'àndala e annanghidura de s\'abilidade de creare e modificare segmentos de rastas mùltiplos
+\n
+\n • Annanghidura de su mètodu de autenticatzione OAuth pro OpenStreetMap, IU de sas ventaneddas de diàlogu de OSM megiorada
+\n
+\n • Colores personalizados pro sos preferidos e sos puntos de coladòrgiu de sas rastas
+\n
+\n</string>
 </resources>
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@ -1754,9 +1754,9 @@
    <string name="poi_fire_hydrant_position_street">Na ulici</string>
    <string name="poi_fire_hydrant_position_underground">Pod zemou</string>
    <string name="poi_fire_hydrant_style_wsh">Vzhľad hydrantu: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Vodovod</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Rybník</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Potok</string>
+    <string name="poi_water_source_main">Vodovod</string>
+    <string name="poi_water_source_pond">Rybník</string>
+    <string name="poi_water_source_stream">Potok</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
    <string name="poi_material_wood">Materiál: drevo</string>
    <string name="poi_material_metal">Materiál: kov</string>
@ -1914,7 +1914,7 @@
    <string name="poi_shoes_type">Typ</string>
    <string name="poi_fire_hydrant_type">Typ</string>
    <string name="poi_fire_hydrant_position">Umiestnenie</string>
-    <string name="poi_fire_hydrant_water_source">Zdroj vody</string>
+    <string name="poi_water_source">Zdroj vody</string>
    <string name="poi_payment_toll_type">Spôsob platby</string>
    <string name="poi_traffic_signals_sound">Zvuk</string>
    <string name="poi_highway_crossing_type">Typ</string>
@ -3630,7 +3630,7 @@
    <string name="poi_drinking_water_refill">Doplnenie pitnej vody</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Nasávanie</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Pod tlakom</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Spodná voda</string>
+    <string name="poi_water_source_groundwater">Spodná voda</string>
    <string name="poi_fire_hydrant_type_pipe">Potrubie</string>
    <string name="poi_drinking_water_refill_network">Sieť doplnenia pitnej vody</string>
    <string name="poi_drinking_water_refill_no">Doplnenie pitnej vody: nie</string>
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@ -3949,7 +3949,7 @@
    <string name="mgrs_format_descr">OsmAnd používa MGSR, ktorý je podobný ako formát UTM NATO.</string>
    <string name="message_you_need_add_two_points_to_show_graphs">Musíte pridať aspoň dva body</string>
    <string name="manage_subscription">Spravovať predplatné</string>
-    <string name="subscription_payment_issue_title">S vaším predplatným je problém. Stlačte tlačidlo pre prechod do nastavení predplatného v Google Play a opravte váš spôsob platby.</string>
+    <string name="subscription_payment_issue_title">S vašim predplatným je problém. Stlačte tlačidlo pre prechod do nastavení predplatného v Google Play a opravte váš spôsob platby.</string>
    <string name="subscription_expired_title">Predplatné OsmAnd Live skončilo</string>
    <string name="subscription_paused_title">Predplatné OsmAnd Live je pozastavené</string>
    <string name="subscription_on_hold_title">Predplatné OsmAnd Live je zablokované</string>
@ -3979,7 +3979,7 @@
    <string name="app_mode_motorboat">Motorový čln</string>
    <string name="add_to_mapillary">Pridať do Mapillary</string>
    <string name="add_to_opr">Pridať do OpenPlaceReviews</string>
-    <string name="add_photos_descr">OsmAnd szobrazuje fotografie z rôznych zdrojov:
+    <string name="add_photos_descr">OsmAnd zobrazuje fotografie z rôznych zdrojov:
 \nOpenPlaceReviews - fotografie bodov záujmu;
 \nMapillary - fotografie z ulice;
 \nWeb / Wikimedia - fotografie bodov záujmu špeficikované v údajoch OpenStreetMap.</string>
@ -4001,6 +4001,19 @@
    <string name="gpx_upload_private_visibility_descr">\"Súkromná\" znamená, že trasa sa nezobrazí vo verejných zoznamoch, ale body trasy z nej v budú dostupné v neusporiadanom poradí cez verejné GPS rozhranie (API) bez časových pečiatok.</string>
    <string name="gpx_upload_identifiable_visibility_descr">\"Identifikovateľná\" znamená, že trasa sa zobrazí verejne vo vašich GPS stopách a vo verejných zoznamoch GPS stôp, tzn. iní používatelia budú môcť stiahnuť nespracovanú trasu a prepojiť su s vašim používateľkým menom. Verejné body trasy s časovými pečiatkami poskytované cez GPS rozhranie (API) budú odkazovať na vašu pôvodnú stránku s trasou.</string>
    <string name="gpx_upload_trackable_visibility_descr">\"Sledovateľná\" znamená, že trasa sa nezobrazí vo verejných zoznamoch, ale spracované body trasy s časovými pečiatkami (ktoré nie je možné spojiť s vami), budú dostupné na stiahnutie cez verejné GPS rozhranie (API).</string>
-    <string name="elevation_data">Môžete použiť údaje nadmorskej výšky pre zohľadnenie výstupu / zostupu na vašom výlete</string>
+    <string name="elevation_data">Údaje o nadmorskej výške môžete použiť na zaznamenanie stúpania / klesania vašej cesty</string>
    <string name="app_mode_light_aircraft">Ľahké lietadlo</string>
+    <string name="plan_route_join_segments">Prepojte segmenty</string>
+    <string name="plan_route_split_before">Rozdeliť predtým</string>
+    <string name="plan_route_split_after">Rozdeliť po</string>
+    <string name="plan_route_add_new_segment">Pridať nový segment</string>
+    <string name="release_3_9">• Pridaná možnosť exportu a importu všetkých údajov vrátane nastavení, zdrojov, mojich miest
+\n
+\n• Plánovanie trasy: grafy pre segmenty trasy s trasou a pridaná možnosť vytvárať a upravovať viac segmentov trasy
+\n
+\n• Pridaná metóda autentifikácie OAuth pre OpenStreetMap, vylepšené užívateľské rozhranie dialógov OSM
+\n
+\n• Podpora vlastných farieb pre obľúbené položky a sledovanie trasových bodov
+\n
+\n</string>
 </resources>
--- a/OsmAnd/res/values-sl/phrases.xml
+++ b/OsmAnd/res/values-sl/phrases.xml
@ -400,7 +400,7 @@
    <string name="poi_clothes_type">Vrsta</string>
    <string name="poi_shoes_type">Vrsta</string>
    <string name="poi_fire_hydrant_type">Vrsta</string>
-    <string name="poi_fire_hydrant_water_source">Vodni vir</string>
+    <string name="poi_water_source">Vodni vir</string>
    <string name="poi_payment_toll_type">Vrsta plačila</string>
    <string name="poi_traffic_signals_sound">Zvok</string>
    <string name="poi_highway_crossing_type">Vrsta</string>
--- a/OsmAnd/res/values-sr/phrases.xml
+++ b/OsmAnd/res/values-sr/phrases.xml
@ -11,7 +11,7 @@
    <string name="poi_shoes_type">Врста</string>
    <string name="poi_fire_hydrant_type">Врста</string>
    <string name="poi_fire_hydrant_position">Положај</string>
-    <string name="poi_fire_hydrant_water_source">Извор воде</string>
+    <string name="poi_water_source">Извор воде</string>
    <string name="poi_payment_toll_type">Начин плаћања</string>
    <string name="poi_traffic_signals_sound">Звук</string>
    <string name="poi_highway_crossing_type">Врста</string>
@ -3211,9 +3211,9 @@
    <string name="poi_street_cabinet_power">Тип кабинета: енергетски</string>
    <string name="poi_in_service_yes">У употреби: да</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Цистерна</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Ток</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Понд</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Главни</string>
+    <string name="poi_water_source_stream">Ток</string>
+    <string name="poi_water_source_pond">Понд</string>
+    <string name="poi_water_source_main">Главни</string>
    <string name="poi_fire_hydrant_style_wsh">Стил хидранта: wsh</string>
    <string name="poi_fire_hydrant_position_underground">Подземни</string>
    <string name="poi_fire_hydrant_position_street">Улица</string>
@ -3770,7 +3770,7 @@
    <string name="poi_pump_status_missing_beam">Статус пумпе: недостаје сноп</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">Усисни</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Под притиском</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Подземна вода</string>
+    <string name="poi_water_source_groundwater">Подземна вода</string>
    <string name="poi_fire_hydrant_type_pipe">Цев</string>
    <string name="poi_drinking_water_refill_network">Мрежа за поновно доливање питке воде</string>
    <string name="poi_drinking_water_refill_no">Доливање воде за пиће: не</string>
--- a/OsmAnd/res/values-sv/phrases.xml
+++ b/OsmAnd/res/values-sv/phrases.xml
@ -27,7 +27,7 @@
    <string name="poi_shoes_type">Typ</string>
    <string name="poi_fire_hydrant_type">Typ</string>
    <string name="poi_fire_hydrant_position">Position</string>
-    <string name="poi_fire_hydrant_water_source">Vattenkälla</string>
+    <string name="poi_water_source">Vattenkälla</string>
    <string name="poi_payment_toll_type">Betalningsmetod</string>
    <string name="poi_traffic_signals_sound">Ljud</string>
    <string name="poi_highway_crossing_type">Typ</string>
@ -2739,9 +2739,9 @@
    <string name="poi_fire_hydrant_position_street">Gata</string>
    <string name="poi_fire_hydrant_position_underground">Underjord</string>
    <string name="poi_fire_hydrant_style_wsh">Brandpoststil: wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Huvud</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Damm</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Vattendrag</string>
+    <string name="poi_water_source_main">Huvud</string>
+    <string name="poi_water_source_pond">Damm</string>
+    <string name="poi_water_source_stream">Vattendrag</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Cistern</string>
    <string name="poi_in_service_yes">I tjänst: Ja</string>
    <string name="poi_street_cabinet_power">Skåptyp: el</string>
--- a/OsmAnd/res/values-tr/phrases.xml
+++ b/OsmAnd/res/values-tr/phrases.xml
@ -1007,7 +1007,7 @@
    <string name="poi_shoes_type">Tür</string>
    <string name="poi_fire_hydrant_type">Tür</string>
    <string name="poi_fire_hydrant_position">Konum</string>
-    <string name="poi_fire_hydrant_water_source">Su kaynağı</string>
+    <string name="poi_water_source">Su kaynağı</string>
    <string name="poi_payment_toll_type">Ödeme türü</string>
    <string name="poi_traffic_signals_sound">Ses</string>
    <string name="poi_highway_crossing_type">Tür</string>
@ -2999,7 +2999,7 @@
    <string name="poi_bandy">Bandy</string>
    <string name="poi_street_cabinet">Sokak dolabı</string>
    <string name="poi_firepit">Ateş çukuru</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Ana</string>
+    <string name="poi_water_source_main">Ana</string>
    <string name="poi_fire_hydrant_style_wsh">Musluk tarzı: wsh</string>
    <string name="poi_fire_hydrant_position_underground">Yer altı</string>
    <string name="poi_fire_hydrant_position_street">Sokak</string>
@ -3125,11 +3125,11 @@
    <string name="poi_display_yes">Ekran: evet</string>
    <string name="poi_dispensing_yes">Evet</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">Su deposu</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Dere</string>
+    <string name="poi_water_source_stream">Dere</string>
    <string name="poi_fire_hydrant_type_dry_barrel">Kuru varil</string>
    <string name="poi_fire_hydrant_type_pillar">Sütun</string>
    <string name="poi_fire_hydrant_type_pond">Gölet</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Gölet</string>
+    <string name="poi_water_source_pond">Gölet</string>
    <string name="poi_consulate_filter">Konsolosluk</string>
    <string name="poi_embassy_filter">Büyük elçilik</string>
    <string name="poi_diplomatic_services_citizen_services_filter">Vatandaş hizmetleri</string>
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@ -1393,7 +1393,7 @@
    <string name="plugin_install_needs_network">Bu eklentiyi yüklemek için çevrim içi olmanız gerekmektedir.</string>
    <string name="get_plugin">Al</string>
    <string name="use_fast_recalculation">Akıllı rota yeniden hesaplama</string>
-    <string name="use_fast_recalculation_desc">Güzergahın yalnızca ilk bölümünü yeniden hesaplar. Uzun yolculuklar için kullanılabilir.</string>
+    <string name="use_fast_recalculation_desc">Güzergahın yalnızca ilk bölümünü yeniden hesaplar, uzun yolculuklar için kullanışlıdır.</string>
    <string name="do_you_like_osmand">OsmAnd\'ı Sevdinizmi?</string>
    <string name="we_really_care_about_your_opinion">Fikir ve geri bildirimleriniz değerlidir.</string>
    <string name="rate_this_app">Bu Uygulamayı Oyla</string>
@ -3875,7 +3875,7 @@
    <string name="use_complex_routing">Karmaşık yönlendirme</string>
    <string name="complex_routing_descr">Araç navigasyonu için iki aşamalı yönlendirme.</string>
    <string name="use_native_pt">Yerel Toplu Taşıma geliştirme</string>
-    <string name="use_native_pt_desc">Java (güvenli) Toplu Taşıma yönlendirme hesaplamasına geçin</string>
+    <string name="use_native_pt_desc">Java (güvenli) Toplu Taşıma güzergah hesaplamasına geçin</string>
    <string name="what_is_new">Yenilikler</string>
    <string name="perform_oauth_authorization_description">osmedit özelliklerini kullanmak için OAuth ile oturum açın</string>
    <string name="perform_oauth_authorization">OAuth ile oturum aç</string>
@ -3885,9 +3885,9 @@
    <string name="use_two_phase_routing">2 aşamalı A* yönlendirme algoritması kullan</string>
    <string name="snowmobile_render_descr">Ayrılmış yollar ve parkurlarla kar arabası sürüşü için.</string>
    <string name="shared_string_graph">Grafik</string>
-    <string name="message_need_calculate_route_before_show_graph">%1$s verileri yalnızca yollarda kullanılabilir, elde etmek için “Noktalar arasındaki güzergah” kullanarak bir rota hesaplamanız gerekir.</string>
-    <string name="message_graph_will_be_available_after_recalculation">Güzergahın yeniden hesaplanmasını bekleyin.
-\nGrafik yeniden hesaplandıktan sonra kullanılabilir olacak.</string>
+    <string name="message_need_calculate_route_before_show_graph">%1$s verileri yalnızca yollarda kullanılabilir, grafikleri görmek için “Noktalar arasındaki güzergah” kullanarak bir rota hesaplayın.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Lütfen bekleyin.
+\nGüzergah yeniden hesaplandıktan sonra grafik kullanılabilir olacak.</string>
    <string name="app_mode_gap">Boşluk</string>
    <string name="navigate_point_mgrs">MGRS</string>
    <string name="navigate_point_format_mgrs">MGRS</string>
@ -3902,7 +3902,7 @@
    <string name="icon_group_sport">Spor</string>
    <string name="icon_group_emergency">Acil</string>
    <string name="icon_group_travel">Seyahat</string>
-    <string name="message_you_need_add_two_points_to_show_graphs">En az iki nokta eklemelisiniz</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">En az iki nokta ekleyin</string>
    <string name="login_open_street_map">OpenStreetMap\'te oturum aç</string>
    <string name="login_open_street_map_org">OpenStreetMap.org\'da oturum aç</string>
    <string name="open_street_map_login_mode">Yenilikleri veya değişiklikleri karşıya yüklemek için oturum açmanız gerekir.
@ -3912,7 +3912,7 @@
    <string name="user_login">Giriş bilgisi</string>
    <string name="login_account">Hesap</string>
    <string name="manage_subscription">Aboneliği yönet</string>
-    <string name="subscription_payment_issue_title">Aboneliğinizle ilgili bir sorun var. Ödeme yönteminizi düzeltmek üzere Google Play abonelik ayarlarına gitmek için düğmeye tıklayın.</string>
+    <string name="subscription_payment_issue_title">Aboneliğinizle ilgili bir sorun var. Ödeme yönteminizi düzeltmek üzere Google Play abonelik ayarlarına gitmek için düğmeye dokunun.</string>
    <string name="subscription_expired_title">OsmAnd Live aboneliğinin süresi doldu</string>
    <string name="subscription_paused_title">OsmAnd Live aboneliği duraklatıldı</string>
    <string name="subscription_on_hold_title">OsmAnd Live aboneliği beklemede</string>
@ -3930,7 +3930,7 @@
    <string name="shared_string_add_photo">Fotoğraf ekle</string>
    <string name="register_on_openplacereviews">OpenPlaceReviews.org\'a
 \nkaydolun</string>
-    <string name="register_on_openplacereviews_desc">Fotoğraflar açık veri projesi OpenPlaceReviews.org tarafından sağlanmaktadır. Fotoğraflarınızı yüklemek için web sitesine kaydolmanız gerekir.</string>
+    <string name="register_on_openplacereviews_desc">Fotoğraflar OpenPlaceReviews.org açık veri projesi tarafından sağlanmaktadır. Fotoğraflarınızı yüklemek için web sitelerine kaydolmanız gerekir.</string>
    <string name="register_opr_create_new_account">Yeni hesap oluştur</string>
    <string name="register_opr_have_account">Zaten bir hesabım var</string>
    <string name="shared_string_search_history">Arama geçmişi</string>
@ -3941,7 +3941,7 @@
    <string name="add_photos_descr">OsmAnd çeşitli kaynaklardan fotoğraflar gösterir:
 \nOpenPlaceReviews - POI fotoğrafları;
 \nMapillary - sokak seviyesi görüntüleri;
-\nİnternet / Wikimedia - OpenStreetMap verilerinde belirtilen POI fotoğrafları.</string>
+\nİnternet / Wikimedia - OpenStreetMap verilerine göre POI fotoğrafları.</string>
    <string name="shared_string_resources">Kaynaklar</string>
    <string name="approximate_file_size">Yaklaşık dosya boyutu</string>
    <string name="select_data_to_export">Dosyaya aktarılacak verileri seçin.</string>
@ -3956,19 +3956,19 @@
    <string name="cannot_upload_image">Resim yüklenemiyor, lütfen daha sonra tekrar deneyin</string>
    <string name="select_picture">Resim seç</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
-    <string name="elevation_data">Yolculuğunuzun Çıkış / İniş değerleri için Yükseklik verilerini kullanabilirsiniz</string>
+    <string name="elevation_data">Yolculuğunuzun yükselme/alçalma değerlerini hesaplamak için yükseklik verilerini kullanabilirsiniz</string>
    <string name="app_mode_light_aircraft">Hafif uçak</string>
    <string name="plan_route_join_segments">Bölümleri birleştir</string>
    <string name="plan_route_split_before">Önce böl</string>
    <string name="plan_route_split_after">Sonra böl</string>
-    <string name="plan_route_add_new_segment">Yeni bölüm ekle</string>
+    <string name="plan_route_add_new_segment">Yeni bir bölüm ekle</string>
    <string name="release_3_9">• Ayarlar, kaynaklar, yerlerim dahil tüm verileri dışa ve içe aktarma seçeneği eklendi
 \n
-\n • Güzergah Planla: güzergahla birlikte bölümler için grafikler, birden çok bölüm izi oluşturma ve düzenleme yeteneği eklendi
+\n • Güzergah Planla: güzergahla birlikte izleme bölümleri için grafikler, ve birden çok izleme bölümü oluşturma ve düzenleme yeteneği eklendi
 \n
 \n • OpenStreetMap için OAuth kimlik doğrulama yöntemi eklendi, OSM iletişim kutularının kullanıcı arayüzü iyileştirildi
 \n
-\n • Sık kullanılanlar ve yol ara noktaları için özel renkler
+\n • Sık kullanılanlar ve yol ara noktaları için özel renk desteği
 \n
 \n</string>
 </resources>
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@ -528,7 +528,7 @@
    <string name="poi_shoes_type">Вид взуття</string>
    <string name="poi_fire_hydrant_type">Вид</string>
    <string name="poi_fire_hydrant_position">Розміщення</string>
-    <string name="poi_fire_hydrant_water_source">Джерело води</string>
+    <string name="poi_water_source">Джерело води</string>
    <string name="poi_payment_toll_type">Вид оплати</string>
    <string name="poi_traffic_signals_sound">Звуковий сигнал</string>
    <string name="poi_highway_crossing_type">Вид</string>
@ -1873,15 +1873,15 @@
    <string name="poi_fire_hydrant_style_wsh">Дизайн гідранта: wsh</string>
    <string name="poi_shelter_type_abandoned">Вид укриття: занедбане</string>
    <string name="poi_dog_yes">Вхід з собаками дозволений</string>
-    <string name="poi_fire_hydrant_style_water_source_main">Основний</string>
+    <string name="poi_water_source_main">Основний</string>
    <string name="poi_payment_ep_quick_no">Карти Quick не приймаються</string>
    <string name="poi_internet_access_type_wlan">Бездротовий (Wi-Fi)</string>
    <string name="poi_dog_no">Вхід з собаками заборонений</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">Ставок</string>
+    <string name="poi_water_source_pond">Ставок</string>
    <string name="poi_payment_eurowag_yes">Eurowag</string>
    <string name="poi_internet_access_type_terminal">Термінал</string>
    <string name="poi_refugee_yes">Зручності, призначені для біженців</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">Потік</string>
+    <string name="poi_water_source_stream">Потік</string>
    <string name="poi_internet_access_type_wired">Провідний</string>
    <string name="poi_refugee_no">Біженці: немає</string>
    <string name="poi_payment_eurowag_no">Картки Eurowag не приймаються</string>
@ -3631,7 +3631,7 @@
    <string name="poi_bath_type">Вид</string>
    <string name="poi_bath_open_air">На відкритому повітрі</string>
    <string name="poi_vehicle_forestry">Доступ на автомобілі: лісове господарство</string>
-    <string name="poi_motorcar_yes">Доступ на автомобілі:</string>
+    <string name="poi_motorcar_yes">Доступ на автомобілі: так</string>
    <string name="poi_motorcar_private">Доступ на автомобілі: приватний</string>
    <string name="poi_motorcar_no">Доступ на автомобілі: немає</string>
    <string name="poi_motorcar_destination">Доступ на автомобілі: пункт призначення</string>
@ -3811,7 +3811,7 @@
    <string name="poi_fire_hydrant_type_pipe">Труба</string>
    <string name="poi_fire_hydrant_pressure_filter">Тиск</string>
    <string name="poi_pump_status_missing_beam">Стан насосу: відсутній важіль</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">Підземні води</string>
+    <string name="poi_water_source_groundwater">Підземні води</string>
    <string name="poi_traffic_signals_arrow_yes">Увімкнено</string>
    <string name="poi_traffic_signals_vibration_yes">Увімкнено</string>
    <string name="poi_traffic_signals_vibration_no">Вібрація: вимкнено</string>
@ -3871,4 +3871,5 @@
    <string name="poi_siren">Сирена</string>
    <string name="poi_nurse">Медсестра</string>
    <string name="poi_mobile_money_agent">Мобільний грошовий агент</string>
+    <string name="poi_lifeguard_base">Рятувальна станція</string>
 </resources>
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@ -1116,7 +1116,7 @@
    <string name="show_zoom_buttons_navigation">Показувати кнопки зміни масштабу</string>
    <string name="save_as_favorites_points">Зберегти як групу Закладок</string>
    <string name="select_destination_and_intermediate_points">Виберіть призначення</string>
-    <string name="layer_amenity_label">Підписи до цікавих точок</string>
+    <string name="layer_amenity_label">Підписи до цікавих місць</string>
    <string name="loading_smth">Завантаження %1$s…</string>
    <string name="map_widget_plain_time">Поточний час</string>
    <string name="shared_string_waypoint">Маршрутна точка</string>
@ -1542,7 +1542,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="light_theme">Світла</string>
    <string name="dark_theme">Темна</string>
    <string name="lang_pms">П’ємонтський</string>
@ -2641,7 +2641,7 @@
    <string name="choose_file_type">Виберіть тип файлу</string>
    <string name="osm_edits_export_desc">Виберіть вид експорту: OSM-нотатки, POI чи і те і те.</string>
    <string name="all_data">Усі дані</string>
-    <string name="osm_notes">OSM-нотатки</string>
+    <string name="osm_notes">Примітки OSM</string>
    <string name="will_open_tomorrow_at">Відкриється завтра о</string>
    <string name="rendering_attr_hidePOILabels_name">Підписи до цікавих точок</string>
    <string name="shared_string_without_name">Без назви</string>
@ -3913,7 +3913,7 @@
    <string name="use_complex_routing">Комплексна маршрутизація</string>
    <string name="complex_routing_descr">Двофазна маршрутизація для автомобільної навігації.</string>
    <string name="use_native_pt">Розвиток власного громадського транспорту</string>
-    <string name="use_native_pt_desc">Перемкнутися на розрахунок маршруту громадським транспортом за допомогою Java (безпечний)</string>
+    <string name="use_native_pt_desc">Перемкнутися на обчислення маршруту громадським транспортом за допомогою Java (безпечний)</string>
    <string name="perform_oauth_authorization_description">Увійти за допомогою OAuth для користування функцією osmedit</string>
    <string name="perform_oauth_authorization">Увійти через OAuth</string>
    <string name="clear_osm_token">Очистити токен OAuth OpenStreetMap</string>
@ -3926,9 +3926,9 @@
    <string name="use_two_phase_routing">Використання 2-фазного A* алгоритму маршрутизації</string>
    <string name="snowmobile_render_descr">Для їзди на снігоходах із відведеними дорогами та трасами.</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="message_need_calculate_route_before_show_graph">%1$s дані доступні лише для доріг, обчисліть маршрут за допомогою «Маршрут між точками», щоб побачити графіки.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Будь ласка заждіть.
+\nГрафік буде доступний після переобчислення маршруту.</string>
    <string name="app_mode_gap">Розрив</string>
    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
    <string name="shared_string_local_maps">Місцеві мапи</string>
@ -3945,7 +3945,7 @@
    <string name="mgrs_format_descr">OsmAnd використовує MGRS, який подібний формату UTM NATO.</string>
    <string name="message_you_need_add_two_points_to_show_graphs">Додайте принаймні дві точки</string>
    <string name="manage_subscription">Керувати передплатою</string>
-    <string name="subscription_payment_issue_title">Виникла проблема з передплатою. Натисніть кнопку, щоб перейти до налаштувань передплати у Google Play, щоб виправити спосіб оплати.</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>
@ -3971,7 +3971,7 @@
    <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_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>
@ -3981,14 +3981,14 @@
    <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_descr">На вашому пристрої вільно лише %1$s. Звільніть місце або приберіть позначки з деяких елементів для експортування.</string>
    <string name="export_not_enough_space">Бракує простору</string>
    <string name="add_to_mapillary">Додати до Mapillary</string>
    <string name="add_to_opr">Додати до OpenPlaceReviews</string>
    <string name="add_photos_descr">OsmAnd демонструє світлини з кількох джерел:
 \nOpenPlaceReviews — світлини POI;
 \nMapillary - зображення вулиць;
-\nМережа / Вікімедіа — світлини POI, вказані в даних OpenStreetMap.</string>
+\nМережа / Вікімедіа — світлини POI, за даними OpenStreetMap.</string>
    <string name="select_groups_for_import">Виберіть групи, які буде імпортовано.</string>
    <string name="select_items_for_import">Виберіть елементи, які буде імпортовано.</string>
    <string name="use_dev_url_descr">Перейдіть на dev.openstreetmap.org замість openstreetmap.org для випробувань завантаження Приміток / POI / GPX OSM.</string>
@ -3997,6 +3997,19 @@
    <string name="select_picture">Вибрати зображення</string>
    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
    <string name="lang_de_casual">Німецька (неформальна)</string>
-    <string name="elevation_data">Ви можете використовувати дані про висоту для розгляду сходження / спуску для вашої подорожі</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="release_3_9">• Додано можливість експортувати та імпортувати всі дані, включно з налаштуваннями, ресурсами, моїми місцями
+\n
+\n• План маршруту: графіки для сегментів треків з маршрутом та додано можливість створення і зміни кількох сегментів треку
+\n
+\n• Додано метод автентифікації OAuth для OpenStreetMap, покращено вигляд діалогів OSM
+\n
+\n• Підтримка власних кольорів закладок та маршрутних точок треку
+\n
+\n</string>
 </resources>
--- a/OsmAnd/res/values-zh-rCN/phrases.xml
+++ b/OsmAnd/res/values-zh-rCN/phrases.xml
@ -6,7 +6,7 @@
    <string name="poi_shoes_type">类型</string>
    <string name="poi_fire_hydrant_type">类型</string>
    <string name="poi_fire_hydrant_position">位置</string>
-    <string name="poi_fire_hydrant_water_source">水源</string>
+    <string name="poi_water_source">水源</string>
    <string name="poi_payment_toll_type">支付类别</string>
    <string name="poi_fuel_type">燃料类型</string>
    <string name="poi_payment_fuel_type">加油卡</string>
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@ -2236,7 +2236,7 @@
    <string name="poi_shoes_type">類型</string>
    <string name="poi_fire_hydrant_type">類型</string>
    <string name="poi_fire_hydrant_position">位置</string>
-    <string name="poi_fire_hydrant_water_source">水源</string>
+    <string name="poi_water_source">水源</string>
    <string name="poi_payment_toll_type">支付型式</string>
    <string name="poi_traffic_signals_sound">聲音</string>
    <string name="poi_highway_crossing_type">類型</string>
@ -2780,9 +2780,9 @@
    <string name="poi_fire_hydrant_position_street">街道</string>
    <string name="poi_fire_hydrant_position_underground">地下</string>
    <string name="poi_fire_hydrant_style_wsh">消防栓型式︰wsh</string>
-    <string name="poi_fire_hydrant_style_water_source_main">主要管道</string>
-    <string name="poi_fire_hydrant_style_water_source_pond">池塘</string>
-    <string name="poi_fire_hydrant_style_water_source_stream">河流</string>
+    <string name="poi_water_source_main">主要管道</string>
+    <string name="poi_water_source_pond">池塘</string>
+    <string name="poi_water_source_stream">河流</string>
    <string name="poi_fire_hydrant_style_water_source_cistern">水槽</string>
    <string name="poi_in_service_yes">在職︰是的</string>
    <string name="poi_military_checkpoint">軍事檢查哨</string>
@ -3819,7 +3819,7 @@
    <string name="poi_drinking_water_refill_network">飲用水填充網路</string>
    <string name="poi_osmand_fire_hydrant_pressure_suction">吸力</string>
    <string name="poi_osmand_fire_hydrant_pressure_pressurized">加壓</string>
-    <string name="poi_fire_hydrant_style_water_source_groundwater">地下水</string>
+    <string name="poi_water_source_groundwater">地下水</string>
    <string name="poi_fire_hydrant_type_pipe">管線</string>
    <string name="poi_fire_hydrant_pressure_filter">壓力</string>
    <string name="poi_pump_status_missing_beam">幫浦狀態：無桿</string>
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@ -1534,7 +1534,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_walkingRoutesScopeOSMC_name">依網絡從屬著色</string>
@ -3925,9 +3925,9 @@
    <string name="file_already_imported">檔案已在 OsmAnd 匯入</string>
    <string name="use_two_phase_routing">使用 2 相的 A* 路線演算法</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="message_need_calculate_route_before_show_graph">%1$s 資料僅供道路使用，請使用「兩點間的路線」計算路線以檢視圖表。</string>
+    <string name="message_graph_will_be_available_after_recalculation">請稍候。
+\n重新計算路線後即可使用圖表。</string>
    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
    <string name="app_mode_gap">分隔</string>
    <string name="shared_string_local_maps">本機地圖</string>
@ -3942,7 +3942,7 @@
    <string name="navigate_point_mgrs">MGRS</string>
    <string name="navigate_point_format_mgrs">MGRS</string>
    <string name="mgrs_format_descr">OsmAnd 使用 MGRS，其類似於 UTM NATO 格式。</string>
-    <string name="message_you_need_add_two_points_to_show_graphs">您必須新增至少兩個點</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">新增至少兩個點</string>
    <string name="manage_subscription">管理訂閱</string>
    <string name="subscription_payment_issue_title">您的訂閱似乎有點問題。點擊按鈕以跳到 Google Play 訂閱設定以修復您的付款方式。</string>
    <string name="subscription_expired_title">OsmAnd Live 訂閱已過期</string>
@ -3970,7 +3970,7 @@
    <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_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>
@ -3981,7 +3981,7 @@
    <string name="add_photos_descr">OsmAnd 從多個來源顯示照片：
 \nOpenPlaceReviews - POI 照片；
 \nMapillary - 街景；
-\n網路／維基媒體 - 特定 OpenStreetMap 資料的 POI 照片。</string>
+\n網路／維基媒體 - 根據 OpenStreetMap 資料的 POI 照片。</string>
    <string name="shared_string_resources">資源</string>
    <string name="approximate_file_size">大約檔案大小</string>
    <string name="select_data_to_export">選取要匯出到檔案的資料。</string>
@ -3996,7 +3996,7 @@
    <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="elevation_data">您可以將海拔資料用來說明您旅程的上升與下降</string>
    <string name="app_mode_light_aircraft">輕型飛機</string>
    <string name="plan_route_join_segments">加入線段</string>
    <string name="plan_route_split_before">分離前</string>
@ -4004,11 +4004,11 @@
    <string name="plan_route_add_new_segment">加入新線段</string>
    <string name="release_3_9">• 新增匯出與匯入所有資料（包含設定、資源與我的位置）的選項
 \n
-\n • 路線計畫：有路線的線段圖，並有建立與編輯多個線段軌跡的功能
+\n • 路線計畫：有路線的軌跡線段圖，並有建立與編輯多個軌跡線段的功能
 \n
 \n • 加入 OpenStreetMap 的 OAuth 驗證方式，改善 OSM 對話框的使用者介面
 \n
-\n • 自訂最愛與軌跡航點的顏色
+\n • 支援自訂最愛與軌跡航點的顏色
 \n
 \n</string>
 </resources>
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@ -13,7 +13,7 @@
 	<string name="poi_shoes_type">Type</string>
 	<string name="poi_fire_hydrant_type">Type</string>
 	<string name="poi_fire_hydrant_position">Position</string>
-	<string name="poi_fire_hydrant_water_source">Water source</string>
+	<string name="poi_water_source">Water source</string>
 	<string name="poi_payment_toll_type">Payment type</string>
 	<string name="poi_traffic_signals_sound">Sound</string>
 	<string name="poi_highway_crossing_type">Type</string>
@ -3011,10 +3011,9 @@
 	<string name="poi_fire_hydrant_position_street">Street</string>
 	<string name="poi_fire_hydrant_position_underground">Underground</string>
 	<string name="poi_fire_hydrant_style_wsh">Hydrant style: wsh</string>
-	<string name="poi_fire_hydrant_style_water_source_main">Main</string>
-	<string name="poi_fire_hydrant_style_water_source_pond">Pond</string>
-	<string name="poi_fire_hydrant_style_water_source_stream">Stream</string>
-	<string name="poi_fire_hydrant_style_water_source_cistern">Cistern</string>
+	<string name="poi_water_source_main">Main</string>
+	<string name="poi_water_source_pond">Pond</string>
+	<string name="poi_water_source_stream">Stream</string>
 	<string name="poi_in_service_yes">In service: yes</string>

 	<string name="poi_street_cabinet_power">Cabinet type: power</string>
@ -4234,7 +4233,7 @@
 	<string name="poi_drinking_water_refill_network">Drinking water refill network</string>

 	<string name="poi_fire_hydrant_type_pipe">Pipe</string>
-	<string name="poi_fire_hydrant_style_water_source_groundwater">Groundwater</string>
+	<string name="poi_water_source_groundwater">Groundwater</string>

 	<string name="poi_osmand_fire_hydrant_pressure_pressurized">Pressurized</string>
 	<string name="poi_osmand_fire_hydrant_pressure_suction">Suction</string>
@ -4308,4 +4307,15 @@

 	<string name="poi_lifeguard_base">Lifeguard base</string>

+	<string name="poi_health_specialty_vaccination_yes">Vaccination</string>
+	<string name="poi_vaccination_covid19">Vaccination: COVID19</string>
+
+	<string name="poi_water_source_tube_well">Tube well</string>
+	<string name="poi_water_source_water_works">Water works</string>
+	<string name="poi_water_source_tap">Tap</string>
+	<string name="poi_water_source_water_tank">Water tank</string>
+	<string name="poi_water_source_powered_pump">Powered pump</string>
+	<string name="poi_water_source_well">Well</string>
+	<string name="poi_water_source_river">River</string>
+	<string name="poi_water_source_lake">Lake</string>
 </resources>
--- a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
+++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
@ -40,6 +40,7 @@ import net.osmand.aidl.navigation.ADirectionInfo;
 import net.osmand.aidl.navigation.OnVoiceNavigationParams;
 import net.osmand.aidl.quickaction.QuickActionInfoParams;
 import net.osmand.aidl.tiles.ASqliteDbFile;
+import net.osmand.aidlapi.customization.AProfile;
 import net.osmand.aidlapi.info.AppInfoParams;
 import net.osmand.aidlapi.map.ALatLon;
 import net.osmand.data.FavouritePoint;
@ -79,6 +80,7 @@ import net.osmand.plus.routing.RouteDirectionInfo;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.routing.VoiceRouter;
 import net.osmand.plus.settings.backend.ApplicationMode;
+import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBean;
 import net.osmand.plus.settings.backend.ExportSettingsType;
 import net.osmand.plus.settings.backend.OsmAndAppCustomization;
 import net.osmand.plus.settings.backend.OsmandSettings;
@ -2337,6 +2339,35 @@ public class OsmandAidlApi {
 		return CANNOT_ACCESS_API_ERROR;
 	}

+	public boolean selectProfile(String appModeKey) {
+		final ApplicationMode appMode = ApplicationMode.valueOfStringKey(appModeKey, null);
+		if (appMode != null) {
+			app.runInUIThread(new Runnable() {
+				@Override
+				public void run() {
+					if (!ApplicationMode.values(app).contains(appMode)) {
+						ApplicationMode.changeProfileAvailability(appMode, true, app);
+					}
+					app.getSettings().APPLICATION_MODE.set(appMode);
+				}
+			});
+			return true;
+		}
+		return false;
+	}
+
+	public boolean getProfiles(List<AProfile> profiles) {
+		for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
+			ApplicationModeBean bean = mode.toModeBean();
+			AProfile aProfile = new AProfile(bean.stringKey, bean.userProfileName, bean.parent, bean.iconName,
+					bean.iconColor.name(), bean.routingProfile, bean.routeService.name(), bean.locIcon.name(),
+					bean.navIcon.name(), bean.order);
+
+			profiles.add(aProfile);
+		}
+		return true;
+	}
+
 	private static class FileCopyInfo {
 		long startTime;
 		long lastAccessTime;
--- a/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java
+++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java
@ -22,12 +22,14 @@ import net.osmand.aidlapi.contextmenu.ContextMenuButtonsParams;
 import net.osmand.aidlapi.contextmenu.RemoveContextMenuButtonsParams;
 import net.osmand.aidlapi.contextmenu.UpdateContextMenuButtonsParams;
 import net.osmand.aidlapi.copyfile.CopyFileParams;
+import net.osmand.aidlapi.customization.AProfile;
 import net.osmand.aidlapi.customization.CustomPluginParams;
 import net.osmand.aidlapi.customization.CustomizationInfoParams;
 import net.osmand.aidlapi.customization.MapMarginsParams;
 import net.osmand.aidlapi.customization.OsmandSettingsInfoParams;
 import net.osmand.aidlapi.customization.OsmandSettingsParams;
 import net.osmand.aidlapi.customization.ProfileSettingsParams;
+import net.osmand.aidlapi.customization.SelectProfileParams;
 import net.osmand.aidlapi.customization.SetWidgetsParams;
 import net.osmand.aidlapi.events.AKeyEventsParams;
 import net.osmand.aidlapi.favorite.AFavorite;
@ -1372,6 +1374,28 @@ public class OsmandAidlServiceV2 extends Service implements AidlCallbackListener
 			}
 			return CANNOT_ACCESS_API_ERROR;
 		}
+
+		@Override
+		public boolean selectProfile(SelectProfileParams params) {
+			try {
+				OsmandAidlApi api = getApi("selectProfile");
+				return api != null && api.selectProfile(params.getAppModeKey());
+			} catch (Exception e) {
+				handleException(e);
+				return false;
+			}
+		}
+
+		@Override
+		public boolean getProfiles(List<AProfile> profiles) {
+			try {
+				OsmandAidlApi api = getApi("getProfiles");
+				return api != null && api.getProfiles(profiles);
+			} catch (Exception e) {
+				handleException(e);
+				return false;
+			}
+		}
 	};

 	private void setCustomization(OsmandAidlApi api, CustomizationInfoParams params) {
--- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
@ -173,7 +173,7 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
 		contextMenuAdapter.addItem(createItem(R.string.versions_item, NULL_ID,
 				"feature_articles/changes.html"));
 		contextMenuAdapter.addItem(createItem(R.string.what_is_new, NULL_ID,
-				"feature_articles/osmand-3-8-released.html"));
+				"feature_articles/osmand-3-9-released.html"));

 		String releasedate = "";
 		if (!this.getString(R.string.app_edition).isEmpty()) {
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@ -84,7 +84,7 @@ public class OptionsBottomSheetDialogFragment extends MenuBottomSheetDialogFragm

 		if (addNewSegmentAllowed) {
 			BaseBottomSheetItem addNewSegment = new BottomSheetItemWithDescription.Builder()
-					//.setIcon(getContentIcon(R.drawable.ic_action_trim_right))
+					.setIcon(getContentIcon(R.drawable.ic_action_new_segment))
 					.setTitle(getString(R.string.plan_route_add_new_segment))
 					.setLayoutId(R.layout.bottom_sheet_item_with_descr_pad_32dp)
 					.setOnClickListener(new View.OnClickListener() {
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java
@ -163,7 +163,7 @@ public class SelectedPointBottomSheetDialogFragment extends MenuBottomSheetDialo

 			// new segment
 			BaseBottomSheetItem addNewSegment = new BottomSheetItemWithDescription.Builder()
-					//.setIcon(getContentIcon(R.drawable.ic_action_trim_right))
+					.setIcon(getContentIcon(R.drawable.ic_action_new_segment))
 					.setTitle(getString(R.string.plan_route_add_new_segment))
 					.setLayoutId(R.layout.bottom_sheet_item_with_descr_pad_32dp)
 					.setOnClickListener(new View.OnClickListener() {
@ -183,7 +183,7 @@ public class SelectedPointBottomSheetDialogFragment extends MenuBottomSheetDialo

 			// join
 			BaseBottomSheetItem joinSegments = new BottomSheetItemWithDescription.Builder()
-					//.setIcon(getContentIcon(R.drawable.ic_action_trim_right))
+					.setIcon(getContentIcon(R.drawable.ic_action_join_segments))
 					.setTitle(getString(R.string.plan_route_join_segments))
 					.setLayoutId(R.layout.bottom_sheet_item_with_descr_pad_32dp)
 					.setOnClickListener(new View.OnClickListener() {
@ -203,7 +203,7 @@ public class SelectedPointBottomSheetDialogFragment extends MenuBottomSheetDialo

 			// split
 			BaseBottomSheetItem splitAfter = new BottomSheetItemWithDescription.Builder()
-					//.setIcon(getContentIcon(R.drawable.ic_action_trim_right))
+					.setIcon(getContentIcon(R.drawable.ic_action_split_after))
 					.setTitle(getString(R.string.plan_route_split_after))
 					.setLayoutId(R.layout.bottom_sheet_item_with_descr_pad_32dp)
 					.setOnClickListener(new View.OnClickListener() {
@ -221,7 +221,7 @@ public class SelectedPointBottomSheetDialogFragment extends MenuBottomSheetDialo
 			items.add(splitAfter);

 			BaseBottomSheetItem splitBefore = new BottomSheetItemWithDescription.Builder()
-					//.setIcon(getContentIcon(R.drawable.ic_action_trim_right))
+					.setIcon(getContentIcon(R.drawable.ic_action_split_after))
 					.setTitle(getString(R.string.plan_route_split_before))
 					.setLayoutId(R.layout.bottom_sheet_item_with_descr_pad_32dp)
 					.setOnClickListener(new View.OnClickListener() {
--- a/OsmAnd/src/net/osmand/plus/settings/backend/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/ApplicationMode.java
@ -786,6 +786,6 @@ public class ApplicationMode {
 		@Expose
 		public NavigationIcon navIcon = null;
 		@Expose
-		int order = -1;
+		public int order = -1;
 	}
 }