Merge remote-tracking branch 'origin/master' into configure_menu_items_fix

# Conflicts:
#	OsmAnd/res/values-hu/strings.xml
#	OsmAnd/res/values-sc/strings.xml
#	OsmAnd/res/values-uk/strings.xml

OsmAnd/res/drawable/bg_right_menu_dark.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_contextmenu_shadow_left_light" />
+    </item>
+    <item>
+        <shape>
+            <solid
+                android:color="@color/list_background_color_dark" />
+        </shape>
+    </item>
+</layer-list>

OsmAnd/res/drawable/bg_right_menu_light.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_contextmenu_shadow_left_light" />
+    </item>
+    <item>
+        <shape>
+            <solid
+                android:color="@color/list_background_color_light" />
+        </shape>
+    </item>
+</layer-list>

OsmAnd/res/drawable/ic_action_add.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M12,6C11.4477,6 11,6.4477 11,7V11H7C6.4477,11 6,11.4477 6,12C6,12.5523 6.4477,13 7,13H11V17C11,17.5523 11.4477,18 12,18C12.5523,18 13,17.5523 13,17V13H17C17.5523,13 18,12.5523 18,12C18,11.4477 17.5523,11 17,11H13V7C13,6.4477 12.5523,6 12,6Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/ic_action_manage_profiles.xml

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,2C2.8954,2 2,2.8954 2,4V4.2676C2.2942,4.0974 2.6357,4 3,4H21C21.3643,4 21.7058,4.0974 22,4.2676V4C22,2.8954 21.1046,2 20,2H4Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M8.1111,9H16C16.1099,9 16.2048,9.077 16.2275,9.1846L16.8202,12H7.1798L7.7497,9.2933C7.7856,9.1224 7.9364,9 8.1111,9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,15C8.5523,15 9,14.5523 9,14C9,13.4477 8.5523,13 8,13C7.4477,13 7,13.4477 7,14C7,14.5523 7.4477,15 8,15Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16,15C16.5523,15 17,14.5523 17,14C17,13.4477 16.5523,13 16,13C15.4477,13 15,13.4477 15,14C15,14.5523 15.4477,15 16,15Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M2,4C0.8954,4 0,4.8954 0,6V20C0,21.1046 0.8954,22 2,22H22C23.1046,22 24,21.1046 24,20V6C24,4.8954 23.1046,4 22,4H2ZM6,12.75L6.7711,9.0873C6.9045,8.4536 7.4636,8 8.1111,8H16C16.5828,8 17.0859,8.4082 17.206,8.9785L18,12.75V18C18,18.5523 17.5523,19 17,19C16.4477,19 16,18.5523 16,18V17.5H8V18C8,18.5523 7.5523,19 7,19C6.4477,19 6,18.5523 6,18V12.75Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/ic_action_notification.xml

@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,22V5C22,3.3431 20.6569,2 19,2H5C3.3431,2 2,3.3431 2,5V22H4V7H20V22H22Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M4,7h16v5h-16z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M4,12h16v10h-16z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+</vector>

OsmAnd/res/drawable/ic_action_privacy_and_security.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.5988,5.5545C18.7397,5.593 18.8734,5.6281 19,5.6602V14C19,16.1095 18.9281,16.5624 18.3884,17.1621C18.1087,17.4729 17.6552,17.8508 16.8883,18.3299L16.6011,16.6065C16.5366,16.2195 16.3148,15.8765 15.9884,15.6589L15.7541,15.5027C15.2536,15.1691 14.7108,14.9036 14.1402,14.7134C12.751,14.2503 11.249,14.2503 9.8598,14.7134C9.2892,14.9036 8.7464,15.1691 8.2459,15.5027L8.0116,15.6589C7.6852,15.8765 7.4634,16.2195 7.3989,16.6065L7.1548,18.0714C6.6216,17.7127 6.221,17.3925 5.9142,17.0858C5.5004,16.672 5.3095,16.3264 5.1946,15.9489C5.0634,15.5179 5,14.9433 5,14V5.7348C5.2262,5.6872 5.4712,5.6312 5.7351,5.5653C7.2372,5.1897 9.3455,4.492 12.0591,3.197C15.147,4.4891 17.2321,5.1818 18.5988,5.5545ZM21,14C21,18 21,19 12,23C4,19 3,18 3,14V4C3,4 6,4 12,1C19,4 21,4 21,4V14ZM15,10C15,11.6569 13.6569,13 12,13C10.3431,13 9,11.6569 9,10C9,8.3432 10.3431,7 12,7C13.6569,7 15,8.3432 15,10Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/ic_action_transport_stop.xml

@@ -0,0 +1,29 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14,4C14,2.8954 14.8954,2 16,2H22C23.1046,2 24,2.8954 24,4V12C24,13.1046 23.1046,14 22,14H16C14.8954,14 14,13.1046 14,12V4ZM22,4H16V6H22V4ZM20,8H16V10H20V8Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M1,7C1.6403,6.3597 2.5087,6 3.4142,6H8.5858C9.4913,6 10.3597,6.3597 11,7C11.6403,7.6403 12,8.5087 12,9.4142V18C12,18.7403 11.5978,19.3866 11,19.7324V20.5C11,21.3284 10.3284,22 9.5,22C8.6716,22 8,21.3284 8,20.5V20H4V20.5C4,21.3284 3.3284,22 2.5,22C1.6716,22 1,21.3284 1,20.5V19.7324C0.4022,19.3866 0,18.7403 0,18V9.4142C0,8.5087 0.3597,7.6403 1,7ZM2,10H10V14H2V10ZM4,17C4,17.5523 3.5523,18 3,18C2.4477,18 2,17.5523 2,17C2,16.4477 2.4477,16 3,16C3.5523,16 4,16.4477 4,17ZM9,18C9.5523,18 10,17.5523 10,17C10,16.4477 9.5523,16 9,16C8.4477,16 8,16.4477 8,17C8,17.5523 8.4477,18 9,18Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16,4H22V6H16V4Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M16,8H20V10H16V8Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M20,12H18V20H17C16.4477,20 16,20.4477 16,21C16,21.5523 16.4477,22 17,22H21C21.5523,22 22,21.5523 22,21C22,20.4477 21.5523,20 21,20H20V12Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>

OsmAnd/res/drawable/img_help_height_limit_day.xml

@@ -0,0 +1,56 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="360dp"
+    android:height="90dp"
+    android:viewportWidth="360"
+    android:viewportHeight="90">
+  <path
+      android:pathData="M0,0h360v90h-360z"
+      android:fillColor="#F5F5F5"/>
+  <path
+      android:pathData="M16,82h328v8h-328z"
+      android:fillColor="#D7D8DB"/>
+  <path
+      android:pathData="M272,20C272,14.477 276.477,10 282,10H344V22H272V20Z"
+      android:fillColor="#D7D8DB"/>
+  <path
+      android:pathData="M272,22H344V82H272V22Z"
+      android:fillColor="#AEB0B7"/>
+  <path
+      android:pathData="M124,33C122.343,33 121,34.343 121,36V67H119V75H128.062C128.554,78.946 131.92,82 136,82C140.08,82 143.446,78.946 143.938,75H201.062C201.554,78.946 204.92,82 209,82C213.08,82 216.446,78.946 216.938,75H222V56L215,41H196V71H193V33H124ZM136,77C134.343,77 133,75.657 133,74C133,72.343 134.343,71 136,71C137.657,71 139,72.343 139,74C139,75.657 137.657,77 136,77ZM206.171,75C206.583,76.165 207.694,77 209,77C210.306,77 211.417,76.165 211.829,75C211.94,74.687 212,74.351 212,74C212,72.343 210.657,71 209,71C207.343,71 206,72.343 206,74C206,74.351 206.06,74.687 206.171,75ZM212.253,45L217,56H200V45H212.253Z"
+      android:fillColor="#237BFF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M260,16L266,22L272,16H260Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M260,88L266,82L272,88H260Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M265,26C265,25.448 265.448,25 266,25C266.552,25 267,25.448 267,26V33C267,33.552 266.552,34 266,34C265.448,34 265,33.552 265,33V26Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M265,56C265,55.448 265.448,55 266,55C266.552,55 267,55.448 267,56V63C267,63.552 266.552,64 266,64C265.448,64 265,63.552 265,63V56Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M266,40C265.448,40 265,40.448 265,41V48C265,48.552 265.448,49 266,49C266.552,49 267,48.552 267,48V41C267,40.448 266.552,40 266,40Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M265,71C265,70.448 265.448,70 266,70C266.552,70 267,70.448 267,71V78C267,78.552 266.552,79 266,79C265.448,79 265,78.552 265,78V71Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M82,42C82,59.673 67.673,74 50,74C32.327,74 18,59.673 18,42C18,24.327 32.327,10 50,10C67.673,10 82,24.327 82,42Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M50,68C64.359,68 76,56.359 76,42C76,27.641 64.359,16 50,16C35.641,16 24,27.641 24,42C24,56.359 35.641,68 50,68ZM50,74C67.673,74 82,59.673 82,42C82,24.327 67.673,10 50,10C32.327,10 18,24.327 18,42C18,59.673 32.327,74 50,74Z"
+      android:fillColor="#EE5622"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M38,22L50,30L62,22H38Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M46,34V40H54V34H58V50H54V44H46L46,50H42V34H46Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M50,54L38,62H62L50,54Z"
+      android:fillColor="#000000"/>
+</vector>

OsmAnd/res/drawable/img_help_height_limit_night.xml

@@ -0,0 +1,56 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="360dp"
+    android:height="90dp"
+    android:viewportWidth="360"
+    android:viewportHeight="90">
+  <path
+      android:pathData="M0,0h360v90h-360z"
+      android:fillColor="#28292A"/>
+  <path
+      android:pathData="M16,82h328v8h-328z"
+      android:fillColor="#4B4D4E"/>
+  <path
+      android:pathData="M272,20C272,14.477 276.477,10 282,10H344V22H272V20Z"
+      android:fillColor="#4B4C4E"/>
+  <path
+      android:pathData="M272,22H344V82H272V22Z"
+      android:fillColor="#1F1F1F"/>
+  <path
+      android:pathData="M124,33C122.343,33 121,34.343 121,36V67H119V75H128.062C128.554,78.946 131.92,82 136,82C140.08,82 143.446,78.946 143.938,75H201.062C201.554,78.946 204.92,82 209,82C213.08,82 216.446,78.946 216.938,75H222V56L215,41H196V71H193V33H124ZM136,77C134.343,77 133,75.657 133,74C133,72.343 134.343,71 136,71C137.657,71 139,72.343 139,74C139,75.657 137.657,77 136,77ZM206.171,75C206.583,76.165 207.694,77 209,77C210.306,77 211.417,76.165 211.829,75C211.94,74.687 212,74.351 212,74C212,72.343 210.657,71 209,71C207.343,71 206,72.343 206,74C206,74.351 206.06,74.687 206.171,75ZM212.253,45L217,56H200V45H212.253Z"
+      android:fillColor="#237BFF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M260,16L266,22L272,16H260Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M260,88L266,82L272,88H260Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M265,26C265,25.448 265.448,25 266,25C266.552,25 267,25.448 267,26V33C267,33.552 266.552,34 266,34C265.448,34 265,33.552 265,33V26Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M265,56C265,55.448 265.448,55 266,55C266.552,55 267,55.448 267,56V63C267,63.552 266.552,64 266,64C265.448,64 265,63.552 265,63V56Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M266,40C265.448,40 265,40.448 265,41V48C265,48.552 265.448,49 266,49C266.552,49 267,48.552 267,48V41C267,40.448 266.552,40 266,40Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M265,71C265,70.448 265.448,70 266,70C266.552,70 267,70.448 267,71V78C267,78.552 266.552,79 266,79C265.448,79 265,78.552 265,78V71Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M82,42C82,59.673 67.673,74 50,74C32.327,74 18,59.673 18,42C18,24.327 32.327,10 50,10C67.673,10 82,24.327 82,42Z"
+      android:fillColor="#F5F5F5"/>
+  <path
+      android:pathData="M50,68C64.359,68 76,56.359 76,42C76,27.641 64.359,16 50,16C35.641,16 24,27.641 24,42C24,56.359 35.641,68 50,68ZM50,74C67.673,74 82,59.673 82,42C82,24.327 67.673,10 50,10C32.327,10 18,24.327 18,42C18,59.673 32.327,74 50,74Z"
+      android:fillColor="#EE5622"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M38,22L50,30L62,22H38Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M46,34V40H54V34H58V50H54V44H46L46,50H42V34H46Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M50,54L38,62H62L50,54Z"
+      android:fillColor="#000000"/>
+</vector>

OsmAnd/res/drawable/img_help_weight_limit_day.xml

@@ -0,0 +1,35 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="360dp"
+    android:height="90dp"
+    android:viewportWidth="360"
+    android:viewportHeight="90">
+  <path
+      android:pathData="M0,0h360v90h-360z"
+      android:fillColor="#F5F5F5"/>
+  <path
+      android:pathData="M16,82h328v8h-328z"
+      android:fillColor="#D7D8DB"/>
+  <path
+      android:pathData="M59,30C57.343,30 56,31.343 56,33V64H54V72H63.062C63.554,75.946 66.92,79 71,79C75.08,79 78.446,75.946 78.938,72H136.062C136.554,75.946 139.92,79 144,79C148.08,79 151.446,75.946 151.938,72H157V53L150,38H131V68H128V30H59ZM71,74C69.343,74 68,72.657 68,71C68,69.343 69.343,68 71,68C72.657,68 74,69.343 74,71C74,72.657 72.657,74 71,74ZM141.171,72C141.583,73.165 142.694,74 144,74C145.306,74 146.417,73.165 146.829,72C146.94,71.687 147,71.351 147,71C147,69.343 145.657,68 144,68C142.343,68 141,69.343 141,71C141,71.351 141.06,71.687 141.171,72ZM147.253,42L152,53H135V42H147.253Z"
+      android:fillColor="#237BFF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M56,79V82L62,88L68,82L161,82V79H56Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M149,82L155,88L161,82L149,82Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M312,42C312,59.673 297.673,74 280,74C262.327,74 248,59.673 248,42C248,24.327 262.327,10 280,10C297.673,10 312,24.327 312,42Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M280,68C294.359,68 306,56.359 306,42C306,27.641 294.359,16 280,16C265.641,16 254,27.641 254,42C254,56.359 265.641,68 280,68ZM280,74C297.673,74 312,59.673 312,42C312,24.327 297.673,10 280,10C262.327,10 248,24.327 248,42C248,59.673 262.327,74 280,74Z"
+      android:fillColor="#EE5622"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M282,30L282,44H278V30H272V26H288V30H282Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M264,48C264,46.895 264.895,46 266,46H268C269.105,46 270,46.895 270,48V50H278C278,48.895 278.895,48 280,48C281.105,48 282,48.895 282,50H290V48C290,46.895 290.895,46 292,46H294C295.105,46 296,46.895 296,48V56C296,57.105 295.105,58 294,58H292C290.895,58 290,57.105 290,56V54L282,54C282,55.105 281.105,56 280,56C278.895,56 278,55.105 278,54H270V56C270,57.105 269.105,58 268,58H266C264.895,58 264,57.105 264,56V48Z"
+      android:fillColor="#000000"/>
+</vector>

OsmAnd/res/drawable/img_help_weight_limit_night.xml

@@ -0,0 +1,35 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="360dp"
+    android:height="90dp"
+    android:viewportWidth="360"
+    android:viewportHeight="90">
+  <path
+      android:pathData="M0,0h360v90h-360z"
+      android:fillColor="#28292A"/>
+  <path
+      android:pathData="M16,82h328v8h-328z"
+      android:fillColor="#4B4D4E"/>
+  <path
+      android:pathData="M59,30C57.343,30 56,31.343 56,33V64H54V72H63.062C63.554,75.946 66.92,79 71,79C75.08,79 78.446,75.946 78.938,72H136.062C136.554,75.946 139.92,79 144,79C148.08,79 151.446,75.946 151.938,72H157V53L150,38H131V68H128V30H59ZM71,74C69.343,74 68,72.657 68,71C68,69.343 69.343,68 71,68C72.657,68 74,69.343 74,71C74,72.657 72.657,74 71,74ZM141.171,72C141.583,73.165 142.694,74 144,74C145.306,74 146.417,73.165 146.829,72C146.94,71.687 147,71.351 147,71C147,69.343 145.657,68 144,68C142.343,68 141,69.343 141,71C141,71.351 141.06,71.687 141.171,72ZM147.253,42L152,53H135V42H147.253Z"
+      android:fillColor="#237BFF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M56,79V82L62,88L68,82L161,82V79H56Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M149,82L155,88L161,82L149,82Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M312,42C312,59.673 297.673,74 280,74C262.327,74 248,59.673 248,42C248,24.327 262.327,10 280,10C297.673,10 312,24.327 312,42Z"
+      android:fillColor="#F5F5F5"/>
+  <path
+      android:pathData="M280,68C294.359,68 306,56.359 306,42C306,27.641 294.359,16 280,16C265.641,16 254,27.641 254,42C254,56.359 265.641,68 280,68ZM280,74C297.673,74 312,59.673 312,42C312,24.327 297.673,10 280,10C262.327,10 248,24.327 248,42C248,59.673 262.327,74 280,74Z"
+      android:fillColor="#EE5622"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M282,30L282,44H278V30H272V26H288V30H282Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M264,48C264,46.895 264.895,46 266,46H268C269.105,46 270,46.895 270,48V50H278C278,48.895 278.895,48 280,48C281.105,48 282,48.895 282,50H290V48C290,46.895 290.895,46 292,46H294C295.105,46 296,46.895 296,48V56C296,57.105 295.105,58 294,58H292C290.895,58 290,57.105 290,56V54L282,54C282,55.105 281.105,56 280,56C278.895,56 278,55.105 278,54H270V56C270,57.105 269.105,58 268,58H266C264.895,58 264,57.105 264,56V48Z"
+      android:fillColor="#000000"/>
+</vector>

OsmAnd/res/drawable/img_help_width_limit_day.xml

@@ -0,0 +1,55 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="360dp"
+    android:height="90dp"
+    android:viewportWidth="360"
+    android:viewportHeight="90">
+  <path
+      android:pathData="M0,0h360v90h-360z"
+      android:fillColor="#F5F5F5"/>
+  <path
+      android:pathData="M16,82h328v8h-328z"
+      android:fillColor="#D7D8DB"/>
+  <path
+      android:pathData="M108,89L114,83L108,77V89Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M180,89L174,83L180,77V89Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M118,84C117.448,84 117,83.552 117,83C117,82.448 117.448,82 118,82H125C125.552,82 126,82.448 126,83C126,83.552 125.552,84 125,84H118Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M148,84C147.448,84 147,83.552 147,83C147,82.448 147.448,82 148,82H155C155.552,82 156,82.448 156,83C156,83.552 155.552,84 155,84H148Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M132,83C132,83.552 132.448,84 133,84L140,84C140.552,84 141,83.552 141,83C141,82.448 140.552,82 140,82L133,82C132.448,82 132,82.448 132,83Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M163,84C162.448,84 162,83.552 162,83C162,82.448 162.448,82 163,82H170C170.552,82 171,82.448 171,83C171,83.552 170.552,84 170,84H163Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M168.813,51.648L165.005,37.684C164.412,35.509 162.436,34 160.181,34H127.819C125.564,34 123.588,35.509 122.995,37.684L119.162,51.738L117.012,51.43C115.422,51.203 114,52.437 114,54.042C114,56.228 115.772,58 117.958,58H118V77C118,79.209 119.791,81 122,81C124.209,81 126,79.209 126,77V75H162V77C162,79.209 163.791,81 166,81C168.209,81 170,79.209 170,77V58H170.012C172.214,58 174,56.215 174,54.012C174,52.413 172.598,51.175 171.011,51.374L168.813,51.648ZM160.181,38H127.819C127.368,38 126.973,38.302 126.854,38.737L123.128,52.401C123.659,52.436 124.234,52.471 124.853,52.507C129.155,52.752 135.578,53 144,53C152.422,53 158.845,52.752 163.147,52.507C163.766,52.471 164.341,52.436 164.872,52.401L161.146,38.737C161.027,38.302 160.632,38 160.181,38ZM124,62C124,59.791 125.791,58 128,58C130.209,58 132,59.791 132,62C132,64.209 130.209,66 128,66C125.791,66 124,64.209 124,62ZM156,62C156,59.791 157.791,58 160,58C162.209,58 164,59.791 164,62C164,64.209 162.209,66 160,66C157.791,66 156,64.209 156,62Z"
+      android:fillColor="#237BFF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M152,53.5C152,51.015 154.015,49 156.5,49V49C158.985,49 161,51.015 161,53.5V53.5C161,55.985 158.985,58 156.5,58V58C154.015,58 152,55.985 152,53.5V53.5Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#237BFF"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M312,42C312,59.673 297.673,74 280,74C262.327,74 248,59.673 248,42C248,24.327 262.327,10 280,10C297.673,10 312,24.327 312,42Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M280,68C294.359,68 306,56.359 306,42C306,27.641 294.359,16 280,16C265.641,16 254,27.641 254,42C254,56.359 265.641,68 280,68ZM280,74C297.673,74 312,59.673 312,42C312,24.327 297.673,10 280,10C262.327,10 248,24.327 248,42C248,59.673 262.327,74 280,74Z"
+      android:fillColor="#EE5622"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M260.002,54L268.002,42L260.002,30V54Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M276.002,42.004L274.002,34H270.002L274.002,50H278.003L280.002,42.004L282.002,50H286.002L290.002,34H286.002L284.002,42L282.002,34.004L282.003,34H278.002L278.002,34.004L276.002,42.004Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M292.003,42L300.003,54V30L292.003,42Z"
+      android:fillColor="#000000"/>
+</vector>

OsmAnd/res/drawable/img_help_width_limit_night.xml

@@ -0,0 +1,55 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="360dp"
+    android:height="90dp"
+    android:viewportWidth="360"
+    android:viewportHeight="90">
+  <path
+      android:pathData="M0,0h360v90h-360z"
+      android:fillColor="#28292A"/>
+  <path
+      android:pathData="M16,82h328v8h-328z"
+      android:fillColor="#4B4D4E"/>
+  <path
+      android:pathData="M108,89L114,83L108,77V89Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M180,89L174,83L180,77V89Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M118,84C117.448,84 117,83.552 117,83C117,82.448 117.448,82 118,82H125C125.552,82 126,82.448 126,83C126,83.552 125.552,84 125,84H118Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M148,84C147.448,84 147,83.552 147,83C147,82.448 147.448,82 148,82H155C155.552,82 156,82.448 156,83C156,83.552 155.552,84 155,84H148Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M132,83C132,83.552 132.448,84 133,84L140,84C140.552,84 141,83.552 141,83C141,82.448 140.552,82 140,82L133,82C132.448,82 132,82.448 132,83Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M163,84C162.448,84 162,83.552 162,83C162,82.448 162.448,82 163,82H170C170.552,82 171,82.448 171,83C171,83.552 170.552,84 170,84H163Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M168.813,51.648L165.005,37.684C164.412,35.509 162.436,34 160.181,34H127.819C125.564,34 123.588,35.509 122.995,37.684L119.162,51.738L117.012,51.43C115.422,51.203 114,52.437 114,54.042C114,56.228 115.772,58 117.958,58H118V77C118,79.209 119.791,81 122,81C124.209,81 126,79.209 126,77V75H162V77C162,79.209 163.791,81 166,81C168.209,81 170,79.209 170,77V58H170.012C172.214,58 174,56.215 174,54.012C174,52.413 172.598,51.175 171.011,51.374L168.813,51.648ZM160.181,38H127.819C127.368,38 126.973,38.302 126.854,38.737L123.128,52.401C123.659,52.436 124.234,52.471 124.853,52.507C129.155,52.752 135.578,53 144,53C152.422,53 158.845,52.752 163.147,52.507C163.766,52.471 164.341,52.436 164.872,52.401L161.146,38.737C161.027,38.302 160.632,38 160.181,38ZM124,62C124,59.791 125.791,58 128,58C130.209,58 132,59.791 132,62C132,64.209 130.209,66 128,66C125.791,66 124,64.209 124,62ZM156,62C156,59.791 157.791,58 160,58C162.209,58 164,59.791 164,62C164,64.209 162.209,66 160,66C157.791,66 156,64.209 156,62Z"
+      android:fillColor="#237BFF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M152,53.5C152,51.015 154.015,49 156.5,49V49C158.985,49 161,51.015 161,53.5V53.5C161,55.985 158.985,58 156.5,58V58C154.015,58 152,55.985 152,53.5V53.5Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#237BFF"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M312,42C312,59.673 297.673,74 280,74C262.327,74 248,59.673 248,42C248,24.327 262.327,10 280,10C297.673,10 312,24.327 312,42Z"
+      android:fillColor="#F5F5F5"/>
+  <path
+      android:pathData="M280,68C294.359,68 306,56.359 306,42C306,27.641 294.359,16 280,16C265.641,16 254,27.641 254,42C254,56.359 265.641,68 280,68ZM280,74C297.673,74 312,59.673 312,42C312,24.327 297.673,10 280,10C262.327,10 248,24.327 248,42C248,59.673 262.327,74 280,74Z"
+      android:fillColor="#EE5622"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M260.002,54L268.002,42L260.002,30V54Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M276.002,42.004L274.002,34H270.002L274.002,50H278.003L280.002,42.004L282.002,50H286.002L290.002,34H286.002L284.002,42L282.002,34.004L282.003,34H278.002L278.002,34.004L276.002,42.004Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M292.003,42L300.003,54V30L292.003,42Z"
+      android:fillColor="#000000"/>
+</vector>

OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml

@@ -20,7 +20,9 @@
             android:layout_height="@dimen/dashboard_map_toolbar"
             android:minHeight="@dimen/dashboard_map_toolbar"
             app:contentInsetLeft="54dp"
-            app:contentInsetStart="54dp">
+            app:contentInsetStart="54dp"
+            app:contentInsetRight="0dp"
+            app:contentInsetEnd="0dp">
 
             <LinearLayout
                 android:layout_width="match_parent"

OsmAnd/res/layout-land/fragment_plan_route_half_screen.xml

@@ -23,7 +23,9 @@
             android:background="?attr/bg_color"
             android:minHeight="@dimen/dashboard_map_toolbar"
             app:contentInsetLeft="54dp"
-            app:contentInsetStart="54dp">
+            app:contentInsetStart="54dp"
+            app:contentInsetRight="0dp"
+            app:contentInsetEnd="0dp">
 
             <LinearLayout
                 android:layout_width="match_parent"

OsmAnd/res/layout-land/point_editor_fragment.xml

@@ -22,7 +22,9 @@
             android:minHeight="@dimen/dashboard_map_toolbar"
             android:theme="?attr/toolbar_theme"
             app:contentInsetLeft="72dp"
-            app:contentInsetStart="72dp">
+            app:contentInsetStart="72dp"
+            app:contentInsetRight="0dp"
+            app:contentInsetEnd="0dp">
 
         </androidx.appcompat.widget.Toolbar>
 

OsmAnd/res/layout/bottom_sheet_item_toolbar_title.xml

@@ -7,7 +7,9 @@
 	android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
 	android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
 	osmand:contentInsetLeft="54dp"
-	osmand:contentInsetStart="54dp">
+	osmand:contentInsetStart="54dp"
+	osmand:contentInsetRight="0dp"
+	osmand:contentInsetEnd="0dp">
 
 	<net.osmand.plus.widgets.TextViewEx
 		android:id="@+id/title"

OsmAnd/res/layout/chart_marker_view.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center">
@@ -31,7 +31,7 @@
                 android:textColor="@color/gpx_chart_blue"
                 android:textStyle="bold"
                 android:ellipsize="end"
-                android:singleLine="true"/>
+                android:maxLines="1"/>
 
             <TextView
                 android:id="@+id/text_alt_units"
@@ -41,7 +41,7 @@
                 android:textSize="@dimen/default_sub_text_size"
                 android:textColor="?android:attr/textColorSecondary"
                 android:ellipsize="end"
-                android:singleLine="true"/>
+                android:maxLines="1"/>
 
         </LinearLayout>
 
@@ -74,7 +74,7 @@
                 android:textColor="@color/gpx_chart_orange"
                 android:textStyle="bold"
                 android:ellipsize="end"
-                android:singleLine="true"/>
+                android:maxLines="1"/>
 
             <TextView
                 android:id="@+id/text_spd_units"
@@ -84,7 +84,7 @@
                 android:textSize="@dimen/default_sub_text_size"
                 android:textColor="?android:attr/textColorSecondary"
                 android:ellipsize="end"
-                android:singleLine="true"/>
+                android:maxLines="1"/>
 
         </LinearLayout>
 
@@ -109,7 +109,7 @@
                 android:textColor="@color/gpx_chart_green"
                 android:textStyle="bold"
                 android:ellipsize="end"
-                android:singleLine="true"/>
+                android:maxLines="1"/>
 
             <TextView
                 android:id="@+id/text_slp_units"
@@ -119,10 +119,10 @@
                 android:textSize="@dimen/default_sub_text_size"
                 android:textColor="?android:attr/textColorSecondary"
                 android:ellipsize="end"
-                android:singleLine="true"/>
+                android:maxLines="1"/>
 
         </LinearLayout>
 
     </LinearLayout>
 
-</RelativeLayout>
+</FrameLayout>

OsmAnd/res/layout/dashboard_toolbar.xml

@@ -8,7 +8,9 @@
     android:layout_height="@dimen/dashboard_map_toolbar"
     android:background="@color/app_bar_color_light"
     app:contentInsetLeft="4dp"
-    app:contentInsetStart="4dp">
+    app:contentInsetStart="4dp"
+    app:contentInsetRight="0dp"
+    app:contentInsetEnd="0dp">
 
     <LinearLayout
         android:layout_width="match_parent"

OsmAnd/res/layout/fragment_direction_indication_dialog.xml

@@ -16,7 +16,9 @@
         android:background="?attr/actionModeBackground"
         android:minHeight="@dimen/dashboard_map_toolbar"
         app:contentInsetLeft="54dp"
-        app:contentInsetStart="54dp">
+        app:contentInsetStart="54dp"
+        app:contentInsetRight="0dp"
+        app:contentInsetEnd="0dp">
 
         <LinearLayout
             android:layout_width="match_parent"

OsmAnd/res/layout/fragment_edit_poi.xml

@@ -17,7 +17,9 @@
         android:minHeight="@dimen/dashboard_map_toolbar"
         android:theme="?attr/toolbar_theme"
         app:contentInsetLeft="@dimen/settings_divider_margin_start"
-        app:contentInsetStart="@dimen/settings_divider_margin_start"/>
+        app:contentInsetStart="@dimen/settings_divider_margin_start"
+        app:contentInsetRight="0dp"
+        app:contentInsetEnd="0dp"/>
 
     <ScrollView
         android:layout_width="fill_parent"

OsmAnd/res/layout/fragment_map_markers_dialog.xml

@@ -28,7 +28,9 @@
                     android:layout_height="match_parent"
                     android:minHeight="@dimen/dashboard_map_toolbar"
                     app:contentInsetLeft="54dp"
-                    app:contentInsetStart="54dp">
+                    app:contentInsetStart="54dp"
+                    app:contentInsetRight="0dp"
+                    app:contentInsetEnd="0dp">
 
 					<LinearLayout
 						android:layout_width="match_parent"

OsmAnd/res/layout/fragment_simple_list.xml

@@ -18,7 +18,7 @@
             style="@style/Widget.AppCompat.Button.Borderless"
             android:layout_width="52dp"
             android:layout_height="52dp"
-            android:src="@drawable/ic_action_mode_back"/>
+            android:src="@drawable/ic_arrow_back"/>
 
         <net.osmand.plus.widgets.TextViewEx
             android:id="@+id/titleTextView"

OsmAnd/res/layout/fragment_wikivoyage_article_dialog.xml

@@ -17,7 +17,9 @@
 			android:gravity="center_vertical"
 			android:minHeight="@dimen/toolbar_height"
 			osmand:contentInsetLeft="54dp"
-			osmand:contentInsetStart="54dp">
+			osmand:contentInsetStart="54dp"
+			osmand:contentInsetRight="0dp"
+			osmand:contentInsetEnd="0dp">
 
 			<LinearLayout
 				android:layout_width="match_parent"

OsmAnd/res/layout/global_preference_toolbar.xml

@@ -8,7 +8,9 @@
 	android:background="?attr/actionModeBackground"
 	android:minHeight="@dimen/toolbar_height"
 	app:contentInsetLeft="0dp"
-	app:contentInsetStart="0dp">
+	app:contentInsetStart="0dp"
+	app:contentInsetRight="0dp"
+	app:contentInsetEnd="0dp">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -21,7 +23,7 @@
 			android:layout_width="@dimen/toolbar_height"
 			android:layout_height="@dimen/toolbar_height"
 			android:contentDescription="@string/access_shared_string_navigate_up"
-			android:src="@drawable/ic_action_mode_back" />
+			android:src="@drawable/ic_arrow_back" />
 
 		<LinearLayout
 			android:layout_width="wrap_content"

OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml

@@ -7,7 +7,9 @@
 	android:layout_height="wrap_content"
 	android:background="?attr/actionModeBackground"
 	app:contentInsetLeft="0dp"
-	app:contentInsetStart="0dp">
+	app:contentInsetStart="0dp"
+	app:contentInsetRight="0dp"
+	app:contentInsetEnd="0dp">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -27,7 +29,7 @@
 				android:layout_width="@dimen/toolbar_height"
 				android:layout_height="@dimen/toolbar_height"
 				android:contentDescription="@string/access_shared_string_navigate_up"
-				android:src="@drawable/ic_action_mode_back" />
+				android:src="@drawable/ic_arrow_back" />
 
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/toolbar_title"

OsmAnd/res/layout/item_info_fragment.xml

@@ -18,7 +18,9 @@
 			android:minHeight="@dimen/dashboard_map_toolbar"
 			android:theme="?attr/toolbar_theme"
 			app:contentInsetLeft="72dp"
-			app:contentInsetStart="72dp" />
+			app:contentInsetStart="72dp"
+			app:contentInsetRight="0dp"
+			app:contentInsetEnd="0dp" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 

OsmAnd/res/layout/local_index_live_updates_list_item.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="fill_parent"
+    android:layout_width="match_parent"
-                android:layout_height="72dp"
+    android:layout_height="wrap_content"
     android:background="?attr/bg_color"
     android:descendantFocusability="blocksDescendants"
     android:minHeight="@dimen/list_item_height"
@@ -16,9 +16,10 @@
         android:layout_marginStart="@dimen/list_content_padding"
         android:layout_marginRight="@dimen/favorites_icon_right_margin"
         android:layout_marginEnd="@dimen/favorites_icon_right_margin"
-        android:layout_marginTop="@dimen/favorites_icon_top_margin"
         android:focusable="false"
-        android:src="@drawable/ic_map"/>
+        android:layout_centerVertical="true"
+        android:src="@drawable/ic_map"
+        android:contentDescription="@string/map_downloaded" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -39,7 +40,7 @@
             android:lines="1"
             android:textColor="?android:textColorPrimary"
             android:textSize="@dimen/default_list_text_size"
-            tools:text="Belarus"/>
+            tools:text="Belarus" />
 
         <TextView
             android:id="@+id/subheaderTextView"
@@ -50,7 +51,7 @@
             android:textColor="?android:textColorSecondary"
             android:textSize="@dimen/default_sub_text_size"
             tools:text="11.1 MB"
-            tools:visibility="gone"/>
+            tools:visibility="gone" />
 
         <TextView
             android:id="@+id/descriptionTextView"
@@ -62,7 +63,7 @@
             android:lines="1"
             android:textColor="?android:textColorSecondary"
             android:textSize="@dimen/default_sub_text_size"
-            tools:text="Last Update: 1 Dec 2015"/>
+            tools:text="Last Update: 1 Dec 2015" />
     </LinearLayout>
 
     <ImageButton
@@ -76,7 +77,7 @@
         android:layout_gravity="center_vertical"
         android:background="?attr/dashboard_button"
         android:focusable="false"
-        android:src="@drawable/ic_overflow_menu_white"/>
+        android:src="@drawable/ic_overflow_menu_white" />
 
     <View
         android:id="@+id/divider"
@@ -85,5 +86,5 @@
         android:layout_alignParentBottom="true"
         android:layout_marginLeft="56dp"
         android:layout_marginStart="56dp"
-        android:background="?attr/dashboard_divider"/>
+        android:background="?attr/dashboard_divider" />
 </RelativeLayout>

OsmAnd/res/layout/main_menu_drawer_btn_configure_profile.xml

@@ -37,7 +37,8 @@
 
 		<FrameLayout
 			android:layout_width="0dp"
-			android:layout_height="@dimen/card_row_min_height"
+			android:layout_height="wrap_content"
+			android:minHeight="@dimen/card_row_min_height"
 			android:layout_gravity="center_vertical"
 			android:layout_weight="1">
 

OsmAnd/res/layout/map_context_menu_fragment.xml

@@ -548,7 +548,9 @@
             android:layout_height="@dimen/dashboard_map_toolbar"
             android:background="@color/app_bar_color_light"
             app:contentInsetLeft="4dp"
-            app:contentInsetStart="4dp">
+            app:contentInsetStart="4dp"
+            app:contentInsetRight="0dp"
+            app:contentInsetEnd="0dp">
 
             <LinearLayout
                 android:layout_width="match_parent"

OsmAnd/res/layout/map_marker_selection_fragment.xml

@@ -18,7 +18,7 @@
             style="@style/Widget.AppCompat.Button.Borderless"
             android:layout_width="52dp"
             android:layout_height="52dp"
-            android:src="@drawable/ic_action_mode_back"/>
+            android:src="@drawable/ic_arrow_back"/>
 
         <net.osmand.plus.widgets.TextViewEx
             android:id="@+id/titleTextView"

OsmAnd/res/layout/maps_in_category_fragment.xml

@@ -18,7 +18,8 @@
             android:theme="?attr/toolbar_theme"
             app:contentInsetLeft="72dp"
             app:contentInsetStart="72dp"
-            />
+            app:contentInsetRight="0dp"
+            app:contentInsetEnd="0dp"/>
     </com.google.android.material.appbar.AppBarLayout>
 
     <include

OsmAnd/res/layout/note.xml

@@ -20,7 +20,10 @@
 		android:layout_height="wrap_content"
 		android:minHeight="@dimen/list_item_height"
 		android:paddingLeft="@dimen/list_content_padding"
-		android:paddingStart="@dimen/list_content_padding">
+		android:paddingStart="@dimen/list_content_padding"
+		android:paddingRight="0dp"
+		android:paddingEnd="0dp">
+
 		<CheckBox
 			android:id="@+id/check_local_index"
 			android:layout_width="wrap_content"

OsmAnd/res/layout/plan_route_info.xml

@@ -40,8 +40,8 @@
 						android:layout_marginLeft="@dimen/context_menu_buttons_padding_bottom"
 						android:layout_marginRight="@dimen/context_menu_buttons_padding_bottom"
 						android:orientation="horizontal"
-						android:paddingStart="40dp"
+						android:paddingStart="@dimen/route_info_app_modes_padding"
-						android:paddingLeft="40dp"
+						android:paddingLeft="@dimen/route_info_app_modes_padding"
 						android:paddingEnd="@dimen/route_info_app_modes_padding"
 						android:paddingRight="@dimen/route_info_app_modes_padding"
 						android:layout_marginStart="@dimen/context_menu_buttons_padding_bottom"

OsmAnd/res/layout/plan_route_toolbar_and_up_down_row.xml

@@ -16,6 +16,8 @@
         android:visibility="gone"
         app:contentInsetLeft="54dp"
         app:contentInsetStart="54dp"
+        app:contentInsetRight="0dp"
+        app:contentInsetEnd="0dp"
         tools:visibility="visible">
 
         <LinearLayout

OsmAnd/res/layout/point_editor_fragment.xml

@@ -25,7 +25,9 @@
             android:minHeight="@dimen/dashboard_map_toolbar"
             android:theme="?attr/toolbar_theme"
             app:contentInsetLeft="72dp"
-            app:contentInsetStart="72dp">
+            app:contentInsetStart="72dp"
+            app:contentInsetRight="0dp"
+            app:contentInsetEnd="0dp">
 
         </androidx.appcompat.widget.Toolbar>
 

OsmAnd/res/layout/profile_preference_toolbar.xml

@@ -7,6 +7,8 @@
 	android:minHeight="@dimen/dashboard_map_toolbar"
 	osmand:contentInsetLeft="0dp"
 	osmand:contentInsetStart="0dp"
+	osmand:contentInsetRight="0dp"
+	osmand:contentInsetEnd="0dp"
 	osmand:theme="@style/ThemeOverlay.AppCompat.ActionBar">
 
 	<LinearLayout
@@ -22,7 +24,7 @@
 			android:layout_width="@dimen/toolbar_height"
 			android:layout_height="@dimen/toolbar_height"
 			android:contentDescription="@string/access_shared_string_navigate_up"
-			android:src="@drawable/ic_action_mode_back"
+			android:src="@drawable/ic_arrow_back"
 			android:tint="?attr/default_icon_color" />
 
 		<LinearLayout

OsmAnd/res/layout/profile_preference_toolbar_big.xml

@@ -6,6 +6,8 @@
 	android:layout_height="wrap_content"
 	osmand:contentInsetLeft="0dp"
 	osmand:contentInsetStart="0dp"
+	osmand:contentInsetRight="0dp"
+	osmand:contentInsetEnd="0dp"
 	osmand:theme="@style/ThemeOverlay.AppCompat.ActionBar">
 
 	<LinearLayout
@@ -27,7 +29,7 @@
 				android:layout_width="@dimen/toolbar_height"
 				android:layout_height="@dimen/toolbar_height"
 				android:contentDescription="@string/access_shared_string_navigate_up"
-				android:src="@drawable/ic_action_mode_back"
+				android:src="@drawable/ic_arrow_back"
 				android:tint="?attr/default_icon_color" />
 
 			<net.osmand.plus.widgets.TextViewEx

OsmAnd/res/layout/profile_preference_toolbar_with_icon.xml

@@ -7,7 +7,9 @@
     android:background="?attr/actionModeBackground"
     android:minHeight="@dimen/toolbar_height"
     osmand:contentInsetLeft="0dp"
-    osmand:contentInsetStart="0dp">
+    osmand:contentInsetStart="0dp"
+    osmand:contentInsetRight="0dp"
+    osmand:contentInsetEnd="0dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -21,7 +23,7 @@
             android:layout_width="@dimen/toolbar_height"
             android:layout_height="@dimen/toolbar_height"
             android:contentDescription="@string/access_shared_string_navigate_up"
-            android:src="@drawable/ic_action_mode_back"
+            android:src="@drawable/ic_arrow_back"
             android:tint="?attr/app_bar_primary_item_color"/>
 
         <LinearLayout

OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml

@@ -6,6 +6,8 @@
 	android:layout_height="wrap_content"
 	osmand:contentInsetLeft="0dp"
 	osmand:contentInsetStart="0dp"
+	osmand:contentInsetRight="0dp"
+	osmand:contentInsetEnd="0dp"
 	osmand:theme="@style/ThemeOverlay.AppCompat.ActionBar">
 
 	<LinearLayout
@@ -27,7 +29,7 @@
 				android:layout_width="@dimen/toolbar_height"
 				android:layout_height="@dimen/toolbar_height"
 				android:contentDescription="@string/access_shared_string_navigate_up"
-				android:src="@drawable/ic_action_mode_back"
+				android:src="@drawable/ic_arrow_back"
 				android:tint="?attr/default_icon_color" />
 
 			<LinearLayout

OsmAnd/res/layout/quick_action_create_edit_dialog.xml

@@ -31,6 +31,8 @@
         android:contentInsetLeft="72dp"
         app:contentInsetLeft="72dp"
         app:contentInsetStart="72dp"
+        app:contentInsetRight="0dp"
+        app:contentInsetEnd="0dp"
         android:background="?attr/actionModeBackground"/>
 
     <RelativeLayout

OsmAnd/res/layout/search_advanced_coords.xml

@@ -18,7 +18,9 @@
             android:minHeight="@dimen/dashboard_map_toolbar"
             android:theme="?attr/toolbar_theme"
             app:contentInsetLeft="54dp"
-            app:contentInsetStart="54dp">
+            app:contentInsetStart="54dp"
+            app:contentInsetRight="0dp"
+            app:contentInsetEnd="0dp">
 
             <LinearLayout
                 android:layout_width="match_parent"

OsmAnd/res/layout/search_custom_poi.xml

@@ -19,7 +19,9 @@
             android:minHeight="@dimen/dashboard_map_toolbar"
             android:theme="?attr/toolbar_theme"
             app:contentInsetLeft="54dp"
-            app:contentInsetStart="54dp">
+            app:contentInsetStart="54dp"
+            app:contentInsetRight="0dp"
+            app:contentInsetEnd="0dp">
 
             <LinearLayout
                 android:layout_width="match_parent"

OsmAnd/res/layout/search_dialog_fragment.xml

@@ -24,7 +24,9 @@
                 android:minHeight="@dimen/dashboard_map_toolbar"
                 android:theme="?attr/toolbar_theme"
                 app:contentInsetLeft="54dp"
-                app:contentInsetStart="54dp">
+                app:contentInsetStart="54dp"
+                app:contentInsetRight="0dp"
+                app:contentInsetEnd="0dp">
 
                 <include layout="@layout/search_text_layout"/>
 
@@ -40,6 +42,8 @@
                 android:visibility="gone"
                 app:contentInsetLeft="54dp"
                 app:contentInsetStart="54dp"
+                app:contentInsetRight="0dp"
+                app:contentInsetEnd="0dp"
                 tools:visibility="visible">
 
                 <LinearLayout

OsmAnd/res/layout/search_favs_fragment.xml

@@ -18,7 +18,9 @@
             android:minHeight="@dimen/dashboard_map_toolbar"
             android:theme="?attr/toolbar_theme"
             app:contentInsetLeft="54dp"
-            app:contentInsetStart="54dp">
+            app:contentInsetStart="54dp"
+            app:contentInsetRight="0dp"
+            app:contentInsetEnd="0dp">
 
             <include layout="@layout/search_text_layout"/>
 

OsmAnd/res/layout/search_history_list_item.xml

@@ -21,7 +21,9 @@
         android:descendantFocusability="blocksDescendants"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/list_content_padding"
-	    android:paddingStart="@dimen/list_content_padding">
+	    android:paddingStart="@dimen/list_content_padding"
+        android:paddingRight="0dp"
+        android:paddingEnd="0dp">
 
         <ImageView
             android:id="@+id/icon"

OsmAnd/res/layout/search_poi_filter.xml

@@ -18,7 +18,9 @@
             android:minHeight="@dimen/dashboard_map_toolbar"
             android:theme="?attr/toolbar_theme"
             app:contentInsetLeft="54dp"
-            app:contentInsetStart="54dp">
+            app:contentInsetStart="54dp"
+            app:contentInsetRight="0dp"
+            app:contentInsetEnd="0dp">
 
             <LinearLayout
                 android:layout_width="match_parent"

OsmAnd/res/layout/split_segments_layout.xml

@@ -17,7 +17,9 @@
             android:layout_height="match_parent"
             android:theme="?attr/actionBarStyle"
             app:contentInsetLeft="54dp"
-            app:contentInsetStart="54dp">
+            app:contentInsetStart="54dp"
+            app:contentInsetRight="0dp"
+            app:contentInsetEnd="0dp">
 
             <TextView
                 android:id="@+id/title"

OsmAnd/res/layout/tab_content.xml

@@ -36,6 +36,8 @@
             android:contentInsetLeft="0dp"
             app:contentInsetLeft="0dp"
             app:contentInsetStart="0dp"
+            app:contentInsetRight="0dp"
+            app:contentInsetEnd="0dp"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"/>

OsmAnd/res/layout/wikipedia_dialog_fragment.xml

@@ -17,7 +17,9 @@
 		android:gravity="center_vertical"
 		android:minHeight="@dimen/toolbar_height"
 		osmand:contentInsetLeft="54dp"
-		osmand:contentInsetStart="54dp">
+		osmand:contentInsetStart="54dp"
+		osmand:contentInsetRight="0dp"
+		osmand:contentInsetEnd="0dp">
 
 		<LinearLayout
 			android:layout_width="match_parent"

OsmAnd/res/layout/wikivoyage_explore.xml

@@ -22,7 +22,9 @@
             android:background="?attr/wikivoyage_bg_color"
             android:minHeight="@dimen/dashboard_map_toolbar"
             osmand:contentInsetLeft="54dp"
-            osmand:contentInsetStart="54dp">
+            osmand:contentInsetStart="54dp"
+            app:contentInsetRight="0dp"
+            app:contentInsetEnd="0dp">
 
             <LinearLayout
                 android:layout_width="match_parent"

OsmAnd/res/values-ar/strings.xml

@@ -2926,7 +2926,7 @@
     <string name="angular_measeurement_descr">تغيير قياس زاوية الازيموث.</string>
     <string name="save_poi_value_exceed_length_title">طول \"%s\" قيمة</string>
     <string name="public_transport_warning_descr_blog">تعرف على المزيد حول كيفية حساب أوسماند للطرق في مدونتنا.</string>
-    <string name="public_transport_warning_title">يخضع التنقل في وسائل النقل العام حالياً للاختبار التجريبي ، ويتوقع الأخطاء .</string>
+    <string name="public_transport_warning_title">يخضع التنقل في وسائل النقل العام حاليًا للاختبار التجريبي ، ويتوقع أن يكون فيه أخطاء .</string>
     <string name="add_intermediate">إضافة نقطة وسيطة</string>
     <string name="transfers_size">%1$d تحويلات</string>
     <string name="rendering_attr_surface_sett_name">ضبط</string>

OsmAnd/res/values-cs/strings.xml

@@ -3424,4 +3424,23 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="search_poi_types_descr">Zkombinujte body zájmu různých kategorií. Klepnutím na přepínač vyberete všechny, klepnutím na levou stranu vyberete kategorie.</string>
     <string name="extra_maps_menu_group">Další mapy</string>
     <string name="download_unsupported_action">Nepodporovaná akce %1$s</string>
+    <string name="context_menu_actions">Akce kontextového menu</string>
+    <string name="reorder_or_hide_from">Seřaďte nebo skryjte položky z %1$s.</string>
+    <string name="shared_string_divider">Oddělovač</string>
+    <string name="divider_descr">Na této pozici bude umístěn oddělovač.</string>
+    <string name="shared_string_hidden">Skryté</string>
+    <string name="hidden_items_descr">Tyto položky jsou skryté z menu, ale příslušná nastavení a moduly zůstanou funkční.</string>
+    <string name="reset_items_descr">Skrytá nastavení se resetují do svého původního stavu.</string>
+    <string name="tracker_item">Stopování OsmAnd</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">Rychlá akce</string>
+    <string name="radius_ruler_item">Kruhové pravítko</string>
+    <string name="measure_distance_item">Měřit vzdálenost</string>
+    <string name="travel_item">Cestování (Wikivoyage a Wikipedie)</string>
+    <string name="map_markers_item">Mapové značky</string>
+    <string name="favorites_item">Oblíbené</string>
+    <string name="subscription_osmandlive_item">Předplatné - OsmAnd Live</string>
+    <string name="osmand_purchases_item">Nákupy v OsmAnd</string>
+    <string name="legend_item_description">Průvodce symboly na mapě</string>
+    <string name="navigation_profiles_item">Navigační profily</string>
 </resources>

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

@@ -2915,7 +2915,7 @@ Lon %2$s</string>
     <string name="by_transport_type">En %1$s</string>
     <string name="step_by_step">Giro a giro</string>
     <string name="routeInfo_road_types_name">Tipos de caminos</string>
-    <string name="exit_at">Bajarse en</string>
+    <string name="exit_at">Bajar en</string>
     <string name="sit_on_the_stop">Esperar en la parada</string>
     <string name="quick_action_show_hide_gpx_tracks">Mostrar/ocultar trazas GPX</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Un botón que muestra u oculta las trazas GPX elegidas en el mapa.</string>
@@ -2989,7 +2989,7 @@ Lon %2$s</string>
     <string name="public_transport_warning_descr_blog">Lea más sobre el cálculo de las rutas de OsmAnd en nuestro blog.</string>
     <string name="public_transport_warning_title">La navegación en transporte público se encuentra actualmente en fase de pruebas beta, se esperan errores e imprecisiones.</string>
     <string name="add_intermediate">Añadir punto intermedio</string>
-    <string name="shared_string_walk">A pie</string>
+    <string name="shared_string_walk">Caminar</string>
     <string name="save_poi_value_exceed_length">Acorte la longitud de la etiqueta «%s» a menos de 255 caracteres.</string>
     <string name="save_poi_value_exceed_length_title">Longitud del valor de «%s»</string>
     <string name="avoid_pt_types_descr">Marca los tipos de transporte público a evitar para la navegación:</string>

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

@@ -2915,7 +2915,7 @@ Lon %2$s</string>
     <string name="by_transport_type">En %1$s</string>
     <string name="step_by_step">Giro a giro</string>
     <string name="routeInfo_road_types_name">Tipos de caminos</string>
-    <string name="exit_at">Bajarse en</string>
+    <string name="exit_at">Bajar en</string>
     <string name="sit_on_the_stop">Esperar en la parada</string>
     <string name="quick_action_show_hide_gpx_tracks">Mostrar/ocultar trazas GPX</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Un botón que muestra u oculta las trazas GPX elegidas en el mapa.</string>
@@ -2989,7 +2989,7 @@ Lon %2$s</string>
     <string name="public_transport_warning_descr_blog">Lea más sobre el cálculo de las rutas de OsmAnd en nuestro blog.</string>
     <string name="public_transport_warning_title">La navegación en transporte público se encuentra actualmente en fase de pruebas beta, se esperan errores e imprecisiones.</string>
     <string name="add_intermediate">Añadir punto intermedio</string>
-    <string name="shared_string_walk">A pie</string>
+    <string name="shared_string_walk">Caminar</string>
     <string name="save_poi_value_exceed_length">Acorte la longitud de la etiqueta «%s» a menos de 255 caracteres.</string>
     <string name="save_poi_value_exceed_length_title">Longitud del valor de «%s»</string>
     <string name="avoid_pt_types_descr">Marca los tipos de transporte público a evitar para la navegación:</string>

OsmAnd/res/values-fa/strings.xml

@@ -3713,4 +3713,7 @@
     <string name="favorites_item">برگزیده‌ها</string>
     <string name="subscription_osmandlive_item">اشتراک - OsmAnd Live</string>
     <string name="osmand_purchases_item">خریدهای OsmAnd</string>
+    <string name="lang_scn">سیسیلی</string>
+    <string name="lang_kk">قزاقی</string>
+    <string name="lang_pnb">پنجابی</string>
 </resources>

OsmAnd/res/values-fi/strings.xml

@@ -2537,4 +2537,11 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="routing_attr_prefer_unpaved_name">Suosi päällystämättömiä teitä</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">Suosi päällystämättömiä teitä</string>
     <string name="arrive_at_time">Perillä %1$s</string>
+    <string name="measure_distance_item">Mittaa etäisyys</string>
+    <string name="map_markers_item">Karttamarkkerit</string>
+    <string name="favorites_item">Suosikit</string>
+    <string name="subscription_osmandlive_item">Tilaus - OsmAnd Live</string>
+    <string name="osmand_purchases_item">OsmAnd ostot</string>
+    <string name="legend_item_description">Kartan symboliikkaopas</string>
+    <string name="navigation_profiles_item">Navigointiprofiilit</string>
 </resources>

OsmAnd/res/values-hu/strings.xml

@@ -3532,9 +3532,9 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
     <string name="app_mode_ski_touring">Túrasízés</string>
     <string name="app_mode_ski_snowmobile">Motoros hószán</string>
     <string name="custom_osmand_plugin">Egyéni OsmAnd bővítmény</string>
-    <string name="settings_item_read_error">%1$s olvasása sikertelen.</string>
+    <string name="settings_item_read_error">Sikertelen olvasás innen: \'%1$s\'.</string>
-    <string name="settings_item_write_error">%1$s írása sikertelen.</string>
+    <string name="settings_item_write_error">Sikertelen írás ide: \'%1$s\'.</string>
-    <string name="settings_item_import_error">%1$s importálása sikertelen.</string>
+    <string name="settings_item_import_error">Sikertelen importálás innen: \'%1$s\'.</string>
     <string name="ui_customization">Felhasználói felület testreszabása</string>
     <string name="shared_string_drawer">Menü</string>
     <string name="reorder_or_hide_from">%1$s: elemek átrendezése vagy elrejtése.</string>
@@ -3548,7 +3548,7 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
     <string name="sort_by_category">Rendezés kategória szerint</string>
     <string name="index_name_antarctica">Antarktika</string>
     <string name="shared_string_hidden">Rejtett</string>
-    <string name="reset_items_descr">A beállítások az eredeti állapotba fognak visszaállni elrejtés után.</string>
+    <string name="reset_items_descr">A beállítások elrejtése visszaállítja őket az eredeti állapotukba.</string>
     <string name="main_actions">Fő műveletek</string>
     <string name="move_inside_category">Csak ezen a kategórián belül lehetséges az elemek áthelyezése.</string>
     <string name="developer_plugin">Fejlesztő bővítmény</string>
@@ -3562,7 +3562,7 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
     <string name="context_menu_actions">Opciók menü elemei</string>
     <string name="ui_customization_description">Személyre szabhatja az elemek számát a Menüben, a Térkép beállításában és az Opciókban. 
 \n 
-\nA használaton kívüli bővítmények letiltásával elrejtheti őket a %1$s menüből.</string>
+\nA használaton kívüli bővítmények kikapcsolásával elrejtheti őket a %1$s menüből.</string>
     <string name="ui_customization_short_descr">Menü elemek, Opciók</string>
     <string name="select_wikipedia_article_langs">Jelölje ki a térképen megjelenő Wikipédia szócikkek nyelvét. A szócikk olvasása közben válthat valamennyi elérhető nyelv között.</string>
     <string name="some_articles_may_not_available_in_lang">Előfordulhat, hogy néhány Wikipédia szócikk nem érhető el az ön nyelvén.</string>
@@ -3596,4 +3596,16 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
     <string name="lang_lmo">lombard</string>
     <string name="custom_color">Egyéni szín</string>
     <string name="extra_maps_menu_group">Egyéb térképek</string>
+    <string name="tracker_item">OsmAnd helymegosztás</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">Gyorsművelet</string>
+    <string name="radius_ruler_item">Sugaras vonalzó</string>
+    <string name="measure_distance_item">Távolságmérés</string>
+    <string name="travel_item">Utazás (Wikivoyage és Wikipédia)</string>
+    <string name="map_markers_item">Térképjelölők</string>
+    <string name="favorites_item">Kedvencek</string>
+    <string name="subscription_osmandlive_item">Előfizetés - OsmAnd Live</string>
+    <string name="osmand_purchases_item">OsmAnd vásárlások</string>
+    <string name="legend_item_description">Útmutató a térkép szimbolikájához</string>
+    <string name="navigation_profiles_item">Navigációs profilok</string>
 </resources>

OsmAnd/res/values-nb/strings.xml

@@ -3534,4 +3534,14 @@
     <string name="reset_plugin_to_default">Tilbakestill programtilleggsinnstillinger til forvalg</string>
     <string name="download_unsupported_action">Ustøttet handling %1$s</string>
     <string name="extra_maps_menu_group">Ekstra kart</string>
+    <string name="shared_string_divider">Inndeler</string>
+    <string name="some_articles_may_not_available_in_lang">Det kan hende noen Wikipedia-artikler ikke finnes på norsk.</string>
+    <string name="custom_color">Egendefinert farge</string>
+    <string name="search_poi_types">Søk etter interessepunkttyper</string>
+    <string name="quick_action_item">Hurtighandling</string>
+    <string name="osmand_purchases_item">OsmAnd-kjøp</string>
+    <string name="favorites_item">Favoritter</string>
+    <string name="map_markers_item">Kartmarkører</string>
+    <string name="measure_distance_item">Mål avstand</string>
+    <string name="travel_item">Reising (Wikivoyage og Wikipedia)</string>
 </resources>

OsmAnd/res/values-nl/strings.xml

@@ -2270,10 +2270,9 @@ voor Gebied: %1$s x %2$s</string>
     <string name="routing_attr_allow_private_description">Ga ook over privé-terreinen.</string>
     <string name="display_zoom_level">Zoomniveau weergave: %1$s</string>
     <string name="route_is_too_long_v2">Voor grote afstanden: voeg tussenpunten toe als binnen de 10 minuten geen route berekend is.</string>
-    <string name="osmand_extended_description_part1">OsmAnd (OSM, Automated Navigation Directions) is een kaart- en navigatieprogramma dat de gratis, wereldwijde en gedetailleerde OpenStreetMap (OSM) data gebruikt. 
+    <string name="osmand_extended_description_part1">"OsmAnd (OSM, Automated Navigation Directions) is een kaart- en navigatieprogramma dat de gratis, wereldwijde en gedetailleerde OpenStreetMap (OSM) data gebruikt. 
 \n  
-\n
+\nGebruikt visuele en gesproken navigatie, toont POI\'s (point of interest), maakt en volgt GPX-tracks, toont hoogtelijnen en hoogte informatie (via plug-in), kiest tussen auto, fiets, wandelen of andere, je kan de OSM-kaart bewerken en nog veel meer."</string>
-\nGebruikt visuele en gesproken navigatie, toont POI\'s (point of interest), maakt en volgt GPX-tracks, toont hoogtelijnen en hoogte informatie (via plug-in), kiest tussen auto, fiets, wandelen of andere, je kan de OSM-kaart bewerken en nog veel meer.</string>
     <string name="osmand_extended_description_part2">"
  GPS-navigatie
 • Offline (geen datakosten) of online (snellere) routeberekening
@@ -2565,7 +2564,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="daily_map_updates">Kaartupdates: Elk uur</string>
     <string name="in_app_purchase">In-app aankoop</string>
     <string name="in_app_purchase_desc">Eenmalige betaling</string>
-    <string name="in_app_purchase_desc_ex">"Eens aangekocht,  kun je het permanent blijven gebruiken."</string>
+    <string name="in_app_purchase_desc_ex">Eens aangekocht, kun je het permanent blijven gebruiken.</string>
     <string name="purchase_unlim_title">%1$s Kopen</string>
     <string name="wikivoyage_offline">Wikivoyage offline</string>
     <string name="unlimited_downloads">Onbeperkte downloads</string>
@@ -3371,9 +3370,9 @@ voor Gebied: %1$s x %2$s</string>
     <string name="please_provide_profile_name_message">Kies een naam voor het profiel</string>
     <string name="open_settings">Open instellingen</string>
     <string name="plugin_disabled">Plugin uitgeschakeld</string>
-    <string name="plugin_disabled_descr">Deze plugin is een afzonderlijke App. Je zal die afzonderlijk dienen te verwijderen als je die niet meer nodig denkt te hebben.
+    <string name="plugin_disabled_descr">"Deze plug-in is een afzonderlijke App,  je zal die afzonderlijk dienen te verwijderen als je die niet meer nodig denkt te hebben. 
 \n 
-\nDe plugin blijft op je toestel bij het verwijderen van OsmAnd.</string>
+\nDe plug-in blijft op je toestel bij het verwijderen van OsmAnd."</string>
     <string name="shared_string_menu">Menu</string>
     <string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
     <string name="shared_string_routing">Routering</string>
@@ -3423,4 +3422,19 @@ voor Gebied: %1$s x %2$s</string>
     <string name="shared_string_circle">cirkel</string>
     <string name="shared_string_rhomb">Ruit</string>
     <string name="shared_string_min">Min</string>
+    <string name="search_poi_types_descr">Combineer POI-types uit verschillende categorieën. Tik op \"Schakelen\" om alles te selecteren, tik op de linkerkant voor de categoriekeuze.</string>
+    <string name="extra_maps_menu_group">Extra kaarten</string>
+    <string name="download_unsupported_action">Niet ondersteunde actie %1$s</string>
+    <string name="tracker_item">OsmAnd zoeker</string>
+    <string name="mapillary_item">OsmAnd &amp; Mapillary</string>
+    <string name="quick_action_item">Snelle actie</string>
+    <string name="radius_ruler_item">Radius liniaal</string>
+    <string name="measure_distance_item">Afstand meten</string>
+    <string name="travel_item">Reizen (Wikivoyage en Wikipedia)</string>
+    <string name="map_markers_item">Markeervlaggetjes</string>
+    <string name="favorites_item">Favorieten</string>
+    <string name="subscription_osmandlive_item">Abonnement - OsmAnd Live</string>
+    <string name="osmand_purchases_item">OsmAnd aankopen</string>
+    <string name="legend_item_description">De gids voor de kaartsymbolen</string>
+    <string name="navigation_profiles_item">Navigatieprofielen</string>
 </resources>