From 47a3d0fc4e7263f9bf08983de418f5022e8cd9bb Mon Sep 17 00:00:00 2001
From: Corwin-Kh <serge.kharchenko@gmail.com>
Date: Thu, 26 Sep 2024 01:29:54 +0300
Subject: [PATCH 01/83] Changed test UI to test obd

---
 .../net/osmand/shared/obd/OBDDataComputer.kt  |   8 +-
 .../net/osmand/shared/obd/OBDDispatcher.kt    |  10 +-
 OsmAnd/res/layout/fragment_obd_main.xml       | 432 ++++++++----------
 .../fragment_vehicle_metrics_settings.xml     |  61 +++
 OsmAnd/res/values/strings.xml                 |   1 +
 OsmAnd/res/xml/vehicle_metrics_settings.xml   |  14 +
 .../plus/plugins/odb/VehicleMetricsPlugin.kt  |  88 +++-
 .../plugins/odb/dialogs/OBDMainFragment.kt    |  56 +--
 .../dialogs/VehicleMetricsSettingsFragment.kt | 162 +++++++
 .../fragments/SettingsScreenType.java         |   2 +
 10 files changed, 538 insertions(+), 296 deletions(-)
 create mode 100644 OsmAnd/res/layout/fragment_vehicle_metrics_settings.xml
 create mode 100644 OsmAnd/res/xml/vehicle_metrics_settings.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/VehicleMetricsSettingsFragment.kt

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataComputer.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataComputer.kt
index e31b356a1b8..02e942f2a09 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataComputer.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataComputer.kt
@@ -101,9 +101,9 @@ object OBDDataComputer {
 		FUEL_LEFT_DISTANCE(true,
 			listOf(OBD_FUEL_LEVEL_COMMAND),
 			{ data -> OBDValue(OBD_FUEL_LEVEL_COMMAND, data) }),
-		FUEL_LEFT_LITERS(false,
-			listOf(OBD_FUEL_LEVEL_COMMAND),
-			{ data -> OBDValue(OBD_FUEL_LEVEL_COMMAND, data) }),
+//		FUEL_LEFT_LITERS(false,
+//			listOf(OBD_FUEL_LEVEL_COMMAND),
+//			{ data -> OBDValue(OBD_FUEL_LEVEL_COMMAND, data) }),
 		FUEL_LEFT_PERCENT(false,
 			listOf(OBD_FUEL_LEVEL_COMMAND),
 			{ data -> OBDValue(OBD_FUEL_LEVEL_COMMAND, data) }),
@@ -231,7 +231,7 @@ object OBDDataComputer {
 					null
 				}
 
-				FUEL_LEFT_LITERS,
+//				FUEL_LEFT_LITERS,
 				FUEL_LEFT_PERCENT -> {
 					if (locValues.size > 0) {
 						locValues[locValues.size - 1].doubleValue
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDispatcher.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDispatcher.kt
index 1db5df88e74..0ec4bb8d2c5 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDispatcher.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDispatcher.kt
@@ -141,11 +141,17 @@ object OBDDispatcher {
 		readStatusListener = listener
 	}
 
-	fun setReadWriteStreams(readStream: Source, writeStream: Sink) {
+	fun setReadWriteStreams(readStream: Source?, writeStream: Sink?) {
 		scope?.cancel()
 		inputStream = readStream
 		outputStream = writeStream
-		startReadObdLooper()
+		if(readStream != null && writeStream != null) {
+			startReadObdLooper()
+		}
+	}
+
+	fun stopReading() {
+		setReadWriteStreams(null, null)
 	}
 
 	private fun consumeResponse(command: OBDCommand, result: String) {
diff --git a/OsmAnd/res/layout/fragment_obd_main.xml b/OsmAnd/res/layout/fragment_obd_main.xml
index becb38e24b8..20e47cbfd34 100644
--- a/OsmAnd/res/layout/fragment_obd_main.xml
+++ b/OsmAnd/res/layout/fragment_obd_main.xml
@@ -1,286 +1,238 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:background="?attr/bg_color"
 	android:clickable="true"
 	android:fitsSystemWindows="false"
+	android:orientation="vertical"
 	android:focusable="true">
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
 		android:layout_width="match_parent"
-		android:layout_height="@dimen/toolbar_height_expanded"
+		android:layout_height="@dimen/toolbar_height"
 		android:background="?attr/actionModeBackground">
 
-		<com.google.android.material.appbar.CollapsingToolbarLayout
-			android:id="@+id/toolbar_layout"
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
 			android:layout_width="match_parent"
-			android:layout_height="@dimen/toolbar_height_expanded"
-			android:background="?attr/actionModeBackground"
-			app:collapsedTitleTextAppearance="@style/AppBarTitle"
-			app:expandedTitleGravity="start|bottom"
-			app:expandedTitleMargin="@dimen/content_padding"
-			app:expandedTitleTextAppearance="@style/AppBarTitle"
-			app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-			app:scrimAnimationDuration="0"
-			app:title="@string/external_sensors_plugin_name">
-
-			<androidx.appcompat.widget.Toolbar
-				android:id="@+id/toolbar"
-				android:layout_width="match_parent"
-				android:layout_height="@dimen/toolbar_height"
-				android:fitsSystemWindows="true"
-				app:layout_collapseMode="pin"
-				app:menu="@menu/ble_sensors_menu">
-
-			</androidx.appcompat.widget.Toolbar>
-
-		</com.google.android.material.appbar.CollapsingToolbarLayout>
+			android:layout_height="@dimen/toolbar_height" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
 	<LinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_margin="@dimen/content_padding"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/content_padding"
 		android:orientation="vertical">
 
-		<EditText
-			android:id="@+id/responses"
+		<LinearLayout
 			android:layout_width="match_parent"
-			android:layout_height="0dp"
-			android:layout_weight="1"
-			android:background="#111" />
+			android:layout_height="60dp"
+			android:orientation="horizontal">
+
+			<ToggleButton
+				android:id="@+id/btn1"
+				android:layout_width="250dp"
+				android:layout_height="match_parent" />
 
-		<EditText
-			android:id="@+id/device_name"
+			<EditText
+				android:id="@+id/resp1"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:layout_marginLeft="@dimen/content_padding_half" />
+		</LinearLayout>
+
+		<LinearLayout
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/content_padding_half"
-			android:layout_marginBottom="@dimen/content_padding_half"
-			android:background="#111"
-			android:hint="device name" />
+			android:layout_height="60dp"
+			android:orientation="horizontal"
+			android:visibility="gone">
 
+			<ToggleButton
+				android:id="@+id/btn2"
+				android:layout_width="250dp"
+				android:layout_height="match_parent" />
 
-		<Button
-			android:id="@+id/connect"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/content_padding_half"
-			android:layout_marginBottom="@dimen/content_padding_half"
-			android:text="Connect" />
+			<EditText
+				android:id="@+id/resp2"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:layout_marginLeft="@dimen/content_padding_half" />
+		</LinearLayout>
 
 		<LinearLayout
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/content_padding"
-			android:orientation="vertical">
+			android:layout_height="60dp"
+			android:orientation="horizontal">
 
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal">
-
-				<ToggleButton
-					android:id="@+id/btn1"
-					android:layout_width="300dp"
-					android:layout_height="40dp" />
-
-				<EditText
-					android:id="@+id/resp1"
-					android:layout_width="match_parent"
-					android:layout_height="80dp"
-					android:layout_marginLeft="@dimen/content_padding_half" />
-			</LinearLayout>
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal">
-
-				<ToggleButton
-					android:id="@+id/btn2"
-					android:layout_width="300dp"
-					android:layout_height="40dp" />
-
-				<EditText
-					android:id="@+id/resp2"
-					android:layout_width="match_parent"
-					android:layout_height="80dp"
-					android:layout_marginLeft="@dimen/content_padding_half" />
-			</LinearLayout>
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal">
-
-				<ToggleButton
-					android:id="@+id/btn3"
-					android:layout_width="300dp"
-					android:layout_height="40dp" />
-
-				<EditText
-					android:id="@+id/resp3"
-					android:layout_width="match_parent"
-					android:layout_height="80dp"
-					android:layout_marginLeft="@dimen/content_padding_half" />
-			</LinearLayout>
-
-			<LinearLayout
+			<ToggleButton
+				android:id="@+id/btn3"
+				android:layout_width="250dp"
+				android:layout_height="match_parent" />
+
+			<EditText
+				android:id="@+id/resp3"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal">
-
-				<ToggleButton
-					android:id="@+id/btn4"
-					android:layout_width="300dp"
-					android:layout_height="40dp" />
-
-				<EditText
-					android:id="@+id/resp4"
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_marginLeft="@dimen/content_padding_half" />
-			</LinearLayout>
-
-			<LinearLayout
+				android:layout_height="match_parent"
+				android:layout_marginLeft="@dimen/content_padding_half" />
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="60dp"
+			android:orientation="horizontal">
+
+			<ToggleButton
+				android:id="@+id/btn4"
+				android:layout_width="250dp"
+				android:layout_height="match_parent" />
+
+			<EditText
+				android:id="@+id/resp4"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal">
-
-				<ToggleButton
-					android:id="@+id/btn5"
-					android:layout_width="300dp"
-					android:layout_height="40dp" />
-
-				<EditText
-					android:id="@+id/resp5"
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_marginLeft="@dimen/content_padding_half" />
-			</LinearLayout>
-
-			<LinearLayout
+				android:layout_height="match_parent"
+				android:layout_marginLeft="@dimen/content_padding_half" />
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="60dp"
+			android:orientation="horizontal">
+
+			<ToggleButton
+				android:id="@+id/btn5"
+				android:layout_width="250dp"
+				android:layout_height="match_parent" />
+
+			<EditText
+				android:id="@+id/resp5"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal">
-
-				<ToggleButton
-					android:id="@+id/btn6"
-					android:layout_width="300dp"
-					android:layout_height="40dp" />
-
-				<EditText
-					android:id="@+id/resp6"
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_marginLeft="@dimen/content_padding_half" />
-			</LinearLayout>
-
-			<LinearLayout
+				android:layout_height="match_parent"
+				android:layout_marginLeft="@dimen/content_padding_half" />
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="60dp"
+			android:orientation="horizontal">
+
+			<ToggleButton
+				android:id="@+id/btn6"
+				android:layout_width="250dp"
+				android:layout_height="match_parent" />
+
+			<EditText
+				android:id="@+id/resp6"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal">
-
-				<ToggleButton
-					android:id="@+id/btn7"
-					android:layout_width="300dp"
-					android:layout_height="40dp" />
-
-				<EditText
-					android:id="@+id/resp7"
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_marginLeft="@dimen/content_padding_half" />
-			</LinearLayout>
-
-			<LinearLayout
+				android:layout_height="match_parent"
+				android:layout_marginLeft="@dimen/content_padding_half" />
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="60dp"
+			android:orientation="horizontal">
+
+			<ToggleButton
+				android:id="@+id/btn7"
+				android:layout_width="250dp"
+				android:layout_height="match_parent" />
+
+			<EditText
+				android:id="@+id/resp7"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal">
-
-				<ToggleButton
-					android:id="@+id/btn8"
-					android:layout_width="300dp"
-					android:layout_height="40dp" />
-
-				<EditText
-					android:id="@+id/resp8"
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_marginLeft="@dimen/content_padding_half" />
-			</LinearLayout>
-
-			<LinearLayout
+				android:layout_height="match_parent"
+				android:layout_marginLeft="@dimen/content_padding_half" />
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="60dp"
+			android:orientation="horizontal">
+
+			<ToggleButton
+				android:id="@+id/btn8"
+				android:layout_width="250dp"
+				android:layout_height="match_parent" />
+
+			<EditText
+				android:id="@+id/resp8"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal">
-
-				<ToggleButton
-					android:id="@+id/btn9"
-					android:layout_width="300dp"
-					android:layout_height="40dp" />
-
-				<EditText
-					android:id="@+id/resp9"
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_marginLeft="@dimen/content_padding_half" />
-			</LinearLayout>
-
-			<LinearLayout
+				android:layout_height="match_parent"
+				android:layout_marginLeft="@dimen/content_padding_half" />
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="60dp"
+			android:orientation="horizontal">
+
+			<ToggleButton
+				android:id="@+id/btn9"
+				android:layout_width="250dp"
+				android:layout_height="match_parent" />
+
+			<EditText
+				android:id="@+id/resp9"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal">
-
-				<ToggleButton
-					android:id="@+id/btn10"
-					android:layout_width="300dp"
-					android:layout_height="40dp" />
-
-				<EditText
-					android:id="@+id/resp10"
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_marginLeft="@dimen/content_padding_half" />
-			</LinearLayout>
-			<LinearLayout
+				android:layout_height="match_parent"
+				android:layout_marginLeft="@dimen/content_padding_half" />
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+
+			<ToggleButton
+				android:id="@+id/btn10"
+				android:layout_width="250dp"
+				android:layout_height="40dp" />
+
+			<EditText
+				android:id="@+id/resp10"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal">
-
-				<ToggleButton
-					android:id="@+id/btn11"
-					android:layout_width="300dp"
-					android:layout_height="40dp" />
-
-				<EditText
-					android:id="@+id/resp11"
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_marginLeft="@dimen/content_padding_half" />
-			</LinearLayout>
-			<LinearLayout
+				android:layout_height="match_parent"
+				android:layout_marginLeft="@dimen/content_padding_half" />
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="60dp"
+			android:orientation="horizontal">
+
+			<ToggleButton
+				android:id="@+id/btn11"
+				android:layout_width="250dp"
+				android:layout_height="match_parent" />
+
+			<EditText
+				android:id="@+id/resp11"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal">
+				android:layout_height="match_parent"
+				android:layout_marginLeft="@dimen/content_padding_half" />
+		</LinearLayout>
 
-				<ToggleButton
-					android:id="@+id/btn12"
-					android:layout_width="300dp"
-					android:layout_height="40dp" />
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="60dp"
+			android:orientation="horizontal">
 
-				<EditText
-					android:id="@+id/resp12"
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_marginLeft="@dimen/content_padding_half" />
-			</LinearLayout>
+			<ToggleButton
+				android:id="@+id/btn12"
+				android:layout_width="250dp"
+				android:layout_height="match_parent" />
 
+			<EditText
+				android:id="@+id/resp12"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:layout_marginLeft="@dimen/content_padding_half" />
 		</LinearLayout>
+
 	</LinearLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
diff --git a/OsmAnd/res/layout/fragment_vehicle_metrics_settings.xml b/OsmAnd/res/layout/fragment_vehicle_metrics_settings.xml
new file mode 100644
index 00000000000..1213a304148
--- /dev/null
+++ b/OsmAnd/res/layout/fragment_vehicle_metrics_settings.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/activity_background_color"
+	android:clickable="true"
+	android:focusable="true"
+	android:orientation="vertical">
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/actionModeBackground">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/toolbar_height"
+			app:title="@string/vehicle_metrics_plugin_settings" />
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/available_devices_list"
+		android:layout_width="match_parent"
+		android:layout_height="200dp"
+		android:background="#eee" />
+
+	<TextView
+		android:id="@+id/empty_view"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:text="Please, pair OBD device first"
+		android:textColor="@android:color/darker_gray"
+		android:textSize="18sp"
+		android:visibility="gone" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/content_padding_half"
+		android:orientation="horizontal">
+
+		<Button
+			android:id="@+id/connectBtn"
+			android:layout_width="120dp"
+			android:layout_height="40dp" />
+
+		<TextView
+			android:id="@+id/status"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_marginStart="@dimen/content_padding"
+			android:gravity="center_vertical" />
+
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index f8c7df1b00f..f12d45423ac 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -63,6 +63,7 @@
 
     <string name="shared_string_obd">OBD</string>
     <string name="obd_widget_group">Vehicle Metrics</string>
+    <string name="vehicle_metrics_plugin_settings">Vehicle Metrics settings</string>
     <string name="percent_unit">%</string>
     <string name="obd_rpm">RPM</string>
     <string name="rpm_unit">rpm</string>
diff --git a/OsmAnd/res/xml/vehicle_metrics_settings.xml b/OsmAnd/res/xml/vehicle_metrics_settings.xml
new file mode 100644
index 00000000000..f0b6fc4500c
--- /dev/null
+++ b/OsmAnd/res/xml/vehicle_metrics_settings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:title="@string/external_sensors_plugin_name">
+
+	<Preference
+		android:key="antplus_info"
+		android:layout="@layout/preference_with_descr"
+		android:persistent="false"
+		android:selectable="false"
+		android:title="@string/plugin_global_prefs_info"
+		tools:icon="@drawable/ic_action_info_dark" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/plugins/odb/VehicleMetricsPlugin.kt b/OsmAnd/src/net/osmand/plus/plugins/odb/VehicleMetricsPlugin.kt
index bf921a7cd48..fa7e9bef95b 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/odb/VehicleMetricsPlugin.kt
+++ b/OsmAnd/src/net/osmand/plus/plugins/odb/VehicleMetricsPlugin.kt
@@ -7,6 +7,7 @@ import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothSocket
 import android.graphics.drawable.Drawable
 import android.view.View
+import android.widget.Toast
 import net.osmand.Location
 import net.osmand.PlatformUtil
 import net.osmand.aidlapi.OsmAndCustomizationConstants
@@ -18,6 +19,7 @@ import net.osmand.plus.plugins.odb.dialogs.OBDMainFragment
 import net.osmand.plus.settings.backend.ApplicationMode
 import net.osmand.plus.settings.backend.OsmandSettings
 import net.osmand.plus.settings.backend.preferences.CommonPreference
+import net.osmand.plus.settings.fragments.SettingsScreenType
 import net.osmand.plus.utils.AndroidUtils
 import net.osmand.plus.utils.BLEUtils
 import net.osmand.plus.views.mapwidgets.MapWidgetInfo
@@ -31,10 +33,8 @@ import net.osmand.plus.widgets.ctxmenu.data.ContextMenuItem
 import net.osmand.shared.data.KLatLon
 import net.osmand.shared.obd.OBDCommand
 import net.osmand.shared.obd.OBDDataComputer
-import net.osmand.shared.obd.OBDDataField
 import net.osmand.shared.obd.OBDDataFieldType.*
 import net.osmand.shared.obd.OBDDispatcher
-import net.osmand.shared.obd.OBDResponseListener
 import okio.IOException
 import okio.sink
 import okio.source
@@ -62,21 +62,29 @@ class VehicleMetricsPlugin(app: OsmandApplication) : OsmandPlugin(app),
 		widgetsInfos.add(creator.createWidgetInfo(speedWidget))
 		val rpmWidget: MapWidget = createMapWidgetForParams(mapActivity, WidgetType.OBD_RPM)
 		widgetsInfos.add(creator.createWidgetInfo(rpmWidget))
-		val airIntakeTempWidget: MapWidget = createMapWidgetForParams(mapActivity, WidgetType.OBD_AIR_INTAKE_TEMP)
+		val airIntakeTempWidget: MapWidget =
+			createMapWidgetForParams(mapActivity, WidgetType.OBD_AIR_INTAKE_TEMP)
 		widgetsInfos.add(creator.createWidgetInfo(airIntakeTempWidget))
-		val ambientAirTempWidget: MapWidget = createMapWidgetForParams(mapActivity, WidgetType.OBD_AMBIENT_AIR_TEMP)
+		val ambientAirTempWidget: MapWidget =
+			createMapWidgetForParams(mapActivity, WidgetType.OBD_AMBIENT_AIR_TEMP)
 		widgetsInfos.add(creator.createWidgetInfo(ambientAirTempWidget))
-		val batteryVoltageWidget: MapWidget = createMapWidgetForParams(mapActivity, WidgetType.OBD_BATTERY_VOLTAGE)
+		val batteryVoltageWidget: MapWidget =
+			createMapWidgetForParams(mapActivity, WidgetType.OBD_BATTERY_VOLTAGE)
 		widgetsInfos.add(creator.createWidgetInfo(batteryVoltageWidget))
-		val fuelLevelWidget: MapWidget = createMapWidgetForParams(mapActivity, WidgetType.OBD_FUEL_LEVEL)
+		val fuelLevelWidget: MapWidget =
+			createMapWidgetForParams(mapActivity, WidgetType.OBD_FUEL_LEVEL)
 		widgetsInfos.add(creator.createWidgetInfo(fuelLevelWidget))
-		val fuelLeftDistanceWidget: MapWidget = createMapWidgetForParams(mapActivity, WidgetType.OBD_FUEL_LEFT_DISTANCE)
+		val fuelLeftDistanceWidget: MapWidget =
+			createMapWidgetForParams(mapActivity, WidgetType.OBD_FUEL_LEFT_DISTANCE)
 		widgetsInfos.add(creator.createWidgetInfo(fuelLeftDistanceWidget))
-		val fuelConsumptionRateWidget: MapWidget = createMapWidgetForParams(mapActivity, WidgetType.OBD_FUEL_CONSUMPTION_RATE)
+		val fuelConsumptionRateWidget: MapWidget =
+			createMapWidgetForParams(mapActivity, WidgetType.OBD_FUEL_CONSUMPTION_RATE)
 		widgetsInfos.add(creator.createWidgetInfo(fuelConsumptionRateWidget))
-		val fuelTypeWidget: MapWidget = createMapWidgetForParams(mapActivity, WidgetType.OBD_FUEL_TYPE)
+		val fuelTypeWidget: MapWidget =
+			createMapWidgetForParams(mapActivity, WidgetType.OBD_FUEL_TYPE)
 		widgetsInfos.add(creator.createWidgetInfo(fuelTypeWidget))
-		val engineCoolantTempWidget: MapWidget = createMapWidgetForParams(mapActivity, WidgetType.OBD_ENGINE_COOLANT_TEMP)
+		val engineCoolantTempWidget: MapWidget =
+			createMapWidgetForParams(mapActivity, WidgetType.OBD_ENGINE_COOLANT_TEMP)
 		widgetsInfos.add(creator.createWidgetInfo(engineCoolantTempWidget))
 	}
 
@@ -185,6 +193,36 @@ class VehicleMetricsPlugin(app: OsmandApplication) : OsmandPlugin(app),
 		}
 	}
 
+	@SuppressLint("MissingPermission")
+	fun getPairedOBDDevicesList(activity: Activity): List<String> {
+		var deviceList = listOf<String>()
+		if (BLEUtils.isBLEEnabled(activity) && AndroidUtils.hasBLEPermission(activity)) {
+			val bluetoothAdapter = BLEUtils.getBluetoothAdapter(activity)
+			bluetoothAdapter?.let { adapter ->
+				adapter.cancelDiscovery()
+				val pairedDevices = adapter.bondedDevices.toList()
+				deviceList = pairedDevices.filter { device ->
+					device.uuids?.any { parcelUuid -> parcelUuid.uuid == uuid } == true
+				}.map { it.name ?: "Unknown Device" }
+			}
+
+		} else {
+			Toast.makeText(activity, "Please, grant BLUETOOTH_SCAN permission", Toast.LENGTH_LONG)
+				.show()
+		}
+		return deviceList
+	}
+
+	fun disconnect() {
+		socket?.apply {
+			if (isConnected) {
+				close()
+				socket = null
+				OBDDispatcher.stopReading()
+			}
+		}
+	}
+
 	@SuppressLint("MissingPermission")
 	fun connectToObd(activity: Activity, name: String): Boolean {
 		if (connectedDevice == null) {
@@ -206,7 +244,7 @@ class VehicleMetricsPlugin(app: OsmandApplication) : OsmandPlugin(app),
 						val obdDevice: BluetoothDevice? =
 							pairedDevices.find { it.name == name }
 						connectedDevice = obdDevice
-						connectToDevice()
+						connectToDevice(activity)
 					}
 				} else {
 					AndroidUtils.requestBLEPermissions(activity)
@@ -221,7 +259,7 @@ class VehicleMetricsPlugin(app: OsmandApplication) : OsmandPlugin(app),
 	}
 
 	@SuppressLint("MissingPermission")
-	private fun connectToDevice() {
+	private fun connectToDevice(activity: Activity) {
 		try {
 			socket = connectedDevice?.createRfcommSocketToServiceRecord(uuid)
 			socket?.apply {
@@ -230,18 +268,39 @@ class VehicleMetricsPlugin(app: OsmandApplication) : OsmandPlugin(app),
 					val input = inputStream.source()
 					val output = outputStream.sink()
 					OBDDispatcher.setReadWriteStreams(input, output)
+					app.runInUIThread {
+						Toast.makeText(
+							activity,
+							"Connected to ${connectedDevice?.name ?: "Unknown device"}",
+							Toast.LENGTH_LONG).show()
+					}
 				}
 			}
 		} catch (error: IOException) {
 			LOG.error("Can't connect to device. $error")
+			app.runInUIThread {
+				Toast.makeText(
+					activity,
+					"Can\'t connect to ${connectedDevice?.name ?: "Unknown device"}",
+					Toast.LENGTH_LONG).show()
+			}
 		}
 	}
 
+	override fun getSettingsScreenType(): SettingsScreenType {
+		return SettingsScreenType.VEHICLE_METRICS_SETTINGS
+	}
+
+
 	@SuppressLint("MissingPermission")
 	fun getConnectedDeviceName(): String? {
 		return connectedDevice?.name
 	}
 
+	fun isConnected(): Boolean {
+		return socket?.isConnected == true
+	}
+
 	companion object {
 		private val LOG = PlatformUtil.getLog(VehicleMetricsPlugin::class.java)
 	}
@@ -257,6 +316,9 @@ class VehicleMetricsPlugin(app: OsmandApplication) : OsmandPlugin(app),
 	}
 
 	override fun updateLocation(location: Location) {
-		OBDDataComputer.registerLocation(OBDDataComputer.OBDLocation(location.time, KLatLon(location.latitude, location.longitude)))
+		OBDDataComputer.registerLocation(
+			OBDDataComputer.OBDLocation(
+				location.time,
+				KLatLon(location.latitude, location.longitude)))
 	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/OBDMainFragment.kt b/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/OBDMainFragment.kt
index 8ccd7b4d14a..8954eb92602 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/OBDMainFragment.kt
+++ b/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/OBDMainFragment.kt
@@ -1,5 +1,6 @@
 package net.osmand.plus.plugins.odb.dialogs
 
+//import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.FUEL_LEFT_LITERS
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -8,18 +9,18 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.EditText
+import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.FragmentManager
-import com.google.android.material.appbar.AppBarLayout
 import net.osmand.plus.R
 import net.osmand.plus.base.BaseOsmAndFragment
 import net.osmand.plus.plugins.PluginsHelper
 import net.osmand.plus.plugins.odb.VehicleMetricsPlugin
 import net.osmand.plus.utils.AndroidUtils
+import net.osmand.plus.utils.ColorUtilities
 import net.osmand.shared.obd.OBDDataComputer
 import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.BATTERY_VOLTAGE
 import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.FUEL_CONSUMPTION_RATE
 import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.FUEL_LEFT_DISTANCE
-import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.FUEL_LEFT_LITERS
 import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.FUEL_LEFT_PERCENT
 import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.FUEL_TYPE
 import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.RPM
@@ -29,10 +30,7 @@ import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.TEMPERATURE_COOLANT
 import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.TEMPERATURE_INTAKE
 
 class OBDMainFragment : BaseOsmAndFragment() {
-	private var appBar: AppBarLayout? = null
-	private var responsesView: EditText? = null
 	private var deviceName: EditText? = null
-	private var connectBtn: Button? = null
 	private var fuelLeftDistBtn: Button? = null
 	private var fuelLeftLitersBtn: Button? = null
 	private var fuelConsumptionBtn: Button? = null
@@ -75,9 +73,16 @@ class OBDMainFragment : BaseOsmAndFragment() {
 		return R.layout.fragment_obd_main
 	}
 
+	private fun setupToolbar(view: View) {
+		val toolbar = view.findViewById<Toolbar>(R.id.toolbar)
+		toolbar.setTitleTextColor(ColorUtilities.getActiveButtonsAndLinksTextColor(app, nightMode))
+		toolbar.setNavigationIcon(AndroidUtils.getNavigationIconResId(app))
+		toolbar.setNavigationContentDescription(R.string.shared_string_close)
+		toolbar.setNavigationOnClickListener { v: View? -> requireActivity().onBackPressed() }
+	}
+
 	private fun setupUI(view: View) {
-		appBar = view.findViewById(R.id.appbar)
-		responsesView = view.findViewById(R.id.responses)
+		setupToolbar(view)
 		fuelLeftDistResp = view.findViewById(R.id.resp1)
 		fuelLeftLitersResp = view.findViewById(R.id.resp2)
 		fuelConsumptionResp = view.findViewById(R.id.resp3)
@@ -90,18 +95,6 @@ class OBDMainFragment : BaseOsmAndFragment() {
 		fuelLeftPersResp = view.findViewById(R.id.resp10)
 		tempAmbientResp = view.findViewById(R.id.resp11)
 		deviceName = view.findViewById(R.id.device_name)
-		connectBtn = view.findViewById(R.id.connect)
-		connectBtn?.setOnClickListener {
-//			val devName = it
-			val devName = "Android-Vlink"
-			Thread {
-				if (plugin?.connectToObd(requireActivity(), devName) == true) {
-					addToResponses("Connected to ${plugin?.getConnectedDeviceName()}")
-				} else {
-					addToResponses("Can't connect to $devName")
-				}
-			}.start()
-		}
 		fuelLeftDistBtn = view.findViewById(R.id.btn1)
 		fuelLeftLitersBtn = view.findViewById(R.id.btn2)
 		fuelConsumptionBtn = view.findViewById(R.id.btn3)
@@ -135,13 +128,6 @@ class OBDMainFragment : BaseOsmAndFragment() {
 
 	}
 
-
-	override fun onDestroyView() {
-		super.onDestroyView()
-		appBar = null
-	}
-
-
 	companion object {
 		val TAG = OBDMainFragment::class.java.simpleName
 		fun showInstance(manager: FragmentManager) {
@@ -156,27 +142,23 @@ class OBDMainFragment : BaseOsmAndFragment() {
 		}
 	}
 
-	fun addToResponses(msg: String) {
-		app.runInUIThread {
-			responsesView?.setText("${responsesView?.text}\n***$msg")
-		}
-	}
-
 	private val widgets = mutableListOf<OBDDataComputer.OBDComputerWidget>()
 
 	override fun onStart() {
 		super.onStart()
 		OBDDataComputer.OBDTypeWidget.entries.forEach {
-			widgets.add(OBDDataComputer.registerWidget(it, 0) )
+			widgets.add(OBDDataComputer.registerWidget(it, 0))
 		}
 		updateWidgets()
 	}
 
-	private fun updateWidgets(){
+	private fun updateWidgets() {
 		widgets.forEach {
-			updateWidgetsData(it.type, if(it.computeValue() == null) " - " else it.computeValue().toString())
+			updateWidgetsData(
+				it.type,
+				if (it.computeValue() == null) " - " else it.computeValue().toString())
 		}
-		handler.postDelayed({updateWidgets()}, 100)
+		handler.postDelayed({ updateWidgets() }, 100)
 	}
 
 	override fun onStop() {
@@ -190,7 +172,7 @@ class OBDMainFragment : BaseOsmAndFragment() {
 				SPEED -> updateWidgetData(speedResp, result)
 				RPM -> updateWidgetData(rpmResp, result)
 				FUEL_LEFT_DISTANCE -> updateWidgetData(fuelLeftDistResp, result)
-				FUEL_LEFT_LITERS -> updateWidgetData(fuelLeftLitersResp, result)
+//				FUEL_LEFT_LITERS -> updateWidgetData(fuelLeftLitersResp, result)
 				FUEL_LEFT_PERCENT -> updateWidgetData(fuelLeftPersResp, result)
 				FUEL_CONSUMPTION_RATE -> updateWidgetData(fuelConsumptionResp, result)
 				TEMPERATURE_INTAKE -> updateWidgetData(tempIntakeResp, result)
diff --git a/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/VehicleMetricsSettingsFragment.kt b/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/VehicleMetricsSettingsFragment.kt
new file mode 100644
index 00000000000..eac6670016e
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/VehicleMetricsSettingsFragment.kt
@@ -0,0 +1,162 @@
+package net.osmand.plus.plugins.odb.dialogs
+
+import android.annotation.SuppressLint
+import android.graphics.Color
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import androidx.annotation.ColorRes
+import androidx.appcompat.widget.Toolbar
+import androidx.core.view.ViewCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import net.osmand.plus.R
+import net.osmand.plus.base.BaseOsmAndFragment
+import net.osmand.plus.helpers.AndroidUiHelper
+import net.osmand.plus.plugins.PluginsHelper
+import net.osmand.plus.plugins.odb.VehicleMetricsPlugin
+import net.osmand.plus.utils.AndroidUtils
+import net.osmand.plus.utils.ColorUtilities
+
+class VehicleMetricsSettingsFragment : BaseOsmAndFragment() {
+	private var plugin: VehicleMetricsPlugin? = null
+
+	var recyclerView: RecyclerView? = null
+	var adapter: DeviceAdapter? = null
+	var emptyView: View? = null
+
+	private var items = listOf<String>()
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		plugin = PluginsHelper.getPlugin(
+			VehicleMetricsPlugin::class.java)
+	}
+
+	@SuppressLint("MissingPermission")
+	override fun onCreateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+		savedInstanceState: Bundle?): View? {
+		updateNightMode()
+		val view =
+			themedInflater.inflate(R.layout.fragment_vehicle_metrics_settings, container, false)
+		items = plugin!!.getPairedOBDDevicesList(requireActivity())
+		checkIfEmpty()
+		setupToolbar(view)
+		setupDeviceList(view)
+		updateConnectBtn(view)
+		//		setupUI(view);
+		AndroidUtils.addStatusBarPadding21v(requireMyActivity(), view)
+		return view
+	}
+
+	private fun updateConnectBtn(view: View) {
+		val btn = view.findViewById<Button>(R.id.connectBtn)
+		val status = view.findViewById<TextView>(R.id.status)
+		if (plugin?.isConnected() == true) {
+			btn.setText("Disconnect")
+			status.setText("Connected to ${plugin?.getConnectedDeviceName()}")
+		} else {
+			btn.setText("Connect")
+			status.setText("Disconnected")
+		}
+		btn.setOnClickListener { onConnectBtnClicked() }
+	}
+
+	private fun onConnectBtnClicked() {
+		plugin?.let {
+			if (it.getConnectedDeviceName() != null) {
+				it.disconnect()
+			} else {
+				val selectedPosition = adapter?.selectedPosition
+				selectedPosition?.let { position ->
+					if (position != RecyclerView.NO_POSITION) {
+						Thread {
+							it.connectToObd(requireActivity(), items[position])
+							view?.let { Handler(Looper.getMainLooper()).post { updateConnectBtn(it) } }
+						}.start()
+					}
+				}
+			}
+		}
+	}
+
+	private fun setupDeviceList(view: View) {
+		emptyView = view.findViewById(R.id.empty_view)
+		recyclerView = view.findViewById(R.id.available_devices_list)
+		adapter = DeviceAdapter(items)
+		recyclerView?.layoutManager = LinearLayoutManager(activity)
+		recyclerView?.adapter = adapter
+	}
+
+	private fun setupToolbar(view: View) {
+		val appbar = view.findViewById<View>(R.id.appbar)
+		ViewCompat.setElevation(appbar, elevation)
+		val toolbar = view.findViewById<Toolbar>(R.id.toolbar)
+		toolbar.setTitleTextColor(ColorUtilities.getActiveButtonsAndLinksTextColor(app, nightMode))
+		toolbar.setNavigationIcon(AndroidUtils.getNavigationIconResId(app))
+		toolbar.setNavigationContentDescription(R.string.shared_string_close)
+		toolbar.setNavigationOnClickListener { v: View? -> requireActivity().onBackPressed() }
+	}
+
+	private val elevation = 5.0f
+
+	@ColorRes
+	override fun getStatusBarColorId(): Int {
+		AndroidUiHelper.setStatusBarContentColor(view, nightMode)
+		return if (nightMode) R.color.status_bar_main_dark else R.color.status_bar_main_light
+	}
+
+	override fun getContentStatusBarNightMode(): Boolean {
+		return true
+	}
+
+	private fun checkIfEmpty() {
+		if (items.isEmpty()) {
+			recyclerView?.visibility = View.GONE
+			emptyView?.visibility = View.VISIBLE
+		} else {
+			recyclerView?.visibility = View.VISIBLE
+			emptyView?.visibility = View.GONE
+		}
+	}
+
+	class DeviceAdapter(private val items: List<String>) :
+		RecyclerView.Adapter<DeviceAdapter.ViewHolder>() {
+		var selectedPosition: Int = RecyclerView.NO_POSITION
+
+		class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+			val textView: TextView = itemView.findViewById(android.R.id.text1)
+		}
+
+		override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+			val view = LayoutInflater.from(parent.context)
+				.inflate(android.R.layout.simple_list_item_1, parent, false)
+			return ViewHolder(view)
+		}
+
+		override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+			holder.textView.text = items[position]
+			holder.textView.setTextColor(Color.BLACK)
+			if (position == selectedPosition) {
+				holder.itemView.setBackgroundColor(Color.LTGRAY)
+			} else {
+				holder.itemView.setBackgroundColor(Color.TRANSPARENT)
+			}
+			holder.itemView.setOnClickListener {
+				val previousPosition = selectedPosition
+				selectedPosition = holder.adapterPosition
+				notifyItemChanged(previousPosition)
+				notifyItemChanged(selectedPosition)
+			}
+		}
+
+		override fun getItemCount() = items.size
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/SettingsScreenType.java b/OsmAnd/src/net/osmand/plus/settings/fragments/SettingsScreenType.java
index ed20a55b903..fdfddc08697 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/SettingsScreenType.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/SettingsScreenType.java
@@ -8,6 +8,7 @@
 import net.osmand.plus.plugins.externalsensors.ExternalSettingsWriteToTrackSettingsFragment;
 import net.osmand.plus.plugins.externalsensors.dialogs.ExternalDevicesListFragment;
 import net.osmand.plus.plugins.monitoring.MonitoringSettingsFragment;
+import net.osmand.plus.plugins.odb.dialogs.VehicleMetricsSettingsFragment;
 import net.osmand.plus.plugins.osmedit.fragments.OsmEditingFragment;
 import net.osmand.plus.plugins.weather.dialogs.WeatherSettingsFragment;
 import net.osmand.plus.settings.datastorage.DataStorageFragment;
@@ -42,6 +43,7 @@ public enum SettingsScreenType {
 	DEVELOPMENT_SETTINGS(DevelopmentSettingsFragment.class.getName(), false, null, R.xml.development_settings, R.layout.global_preference_toolbar),
 	SIMULATION_NAVIGATION(SimulationNavigationSettingFragment.class.getName(), true, ApplyQueryType.NONE, R.xml.simulation_navigation_setting, R.layout.profile_preference_toolbar_with_switch),
 	ANT_PLUS_SETTINGS(ExternalDevicesListFragment.class.getName(), false, null, R.xml.antplus_settings, R.layout.global_preference_toolbar),
+	VEHICLE_METRICS_SETTINGS(VehicleMetricsSettingsFragment.class.getName(), false, null, R.xml.antplus_settings, R.layout.global_preference_toolbar),
 	WEATHER_SETTINGS(WeatherSettingsFragment.class.getName(), true, ApplyQueryType.SNACK_BAR, R.xml.weather_settings, R.layout.profile_preference_toolbar),
 	EXTERNAL_SETTINGS_WRITE_TO_TRACK_SETTINGS(ExternalSettingsWriteToTrackSettingsFragment.class.getName(), true, ApplyQueryType.BOTTOM_SHEET, R.xml.external_sensors_write_to_track_settings, R.layout.profile_preference_toolbar),
 	DANGEROUS_GOODS(DangerousGoodsFragment.class.getName(), true, ApplyQueryType.NONE, R.xml.dangerous_goods_parameters, R.layout.global_preference_toolbar),

From dacbbd4a0dc947fd351a9b3a85ba386512295360 Mon Sep 17 00:00:00 2001
From: 0xRe1nk0 <0xre1nk0@gmail.com>
Date: Thu, 26 Sep 2024 05:46:49 +0300
Subject: [PATCH 02/83] Show sensor data for recording track

---
 .../kotlin/net/osmand/shared/gpx/GpxUtilities.kt     |  1 +
 .../osmand/shared/gpx/primitives/GpxExtensions.kt    | 12 ++++++++++++
 .../myplaces/tracks/dialogs/GPXItemPagerAdapter.java |  3 ++-
 .../externalsensors/SensorAttributesUtils.java       |  6 +++++-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt
index 15d9b94fb2b..34ce326b177 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt
@@ -743,6 +743,7 @@ object GpxUtilities {
 			} else {
 				regularExtensions[key] = value
 			}
+			wptPt.getDeferredExtensionsToWrite()[key] = value
 		}
 		if (regularExtensions.isNotEmpty()) {
 			wptPt.setExtensionsWriter("extensions", createExtensionsWriter(regularExtensions, true))
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/primitives/GpxExtensions.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/primitives/GpxExtensions.kt
index 167cadebf23..7c1ad4ffa4c 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/primitives/GpxExtensions.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/primitives/GpxExtensions.kt
@@ -5,6 +5,7 @@ import net.osmand.shared.util.KAlgorithms
 
 open class GpxExtensions {
 	var extensions: MutableMap<String, String>? = null
+	var deferredExtensions: MutableMap<String, String>? = null
 	var extensionsWriters: MutableMap<String, GpxUtilities.GpxExtensionsWriter>? = null
 
 	fun getExtensionsToRead(): Map<String, String> {
@@ -18,6 +19,17 @@ open class GpxExtensions {
 		return extensions!!
 	}
 
+	fun getDeferredExtensionsToRead(): Map<String, String> {
+		return deferredExtensions ?: emptyMap()
+	}
+
+	fun getDeferredExtensionsToWrite(): MutableMap<String, String> {
+		if (deferredExtensions == null) {
+			deferredExtensions = LinkedHashMap()
+		}
+		return deferredExtensions!!
+	}
+
 	fun getExtensionsWritersToWrite(): MutableMap<String, GpxUtilities.GpxExtensionsWriter> {
 		if (extensionsWriters == null) {
 			extensionsWriters = LinkedHashMap()
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/GPXItemPagerAdapter.java b/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/GPXItemPagerAdapter.java
index 180f53ad299..c205302234f 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/GPXItemPagerAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/GPXItemPagerAdapter.java
@@ -38,6 +38,7 @@
 import com.github.mikephil.charting.listener.OnChartGestureListener;
 import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
 
+import net.osmand.plus.plugins.PluginsHelper;
 import net.osmand.plus.settings.backend.preferences.CommonPreference;
 import net.osmand.plus.settings.backend.preferences.ListStringPreference;
 import net.osmand.shared.gpx.GpxFile;
@@ -174,7 +175,7 @@ private void updateAnalysis() {
 		if (isShowCurrentTrack()) {
 			GpxFile gpxFile = displayHelper.getGpx();
 			if (gpxFile != null && !gpxFile.isEmpty()) {
-				analysis = gpxFile.getAnalysis(0);
+				analysis = gpxFile.getAnalysis(0, null, null, PluginsHelper.getTrackPointsAnalyser());
 				gpxItem = GpxUiHelper.makeGpxDisplayItem(app, gpxFile, GPX, analysis);
 			}
 		} else if (getFilteredGpxFile() != null) {
diff --git a/OsmAnd/src/net/osmand/plus/plugins/externalsensors/SensorAttributesUtils.java b/OsmAnd/src/net/osmand/plus/plugins/externalsensors/SensorAttributesUtils.java
index 6a52a882455..d3c36b73b25 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/externalsensors/SensorAttributesUtils.java
+++ b/OsmAnd/src/net/osmand/plus/plugins/externalsensors/SensorAttributesUtils.java
@@ -62,7 +62,11 @@ public static boolean hasTemperatureData(@NonNull GpxTrackAnalysis analysis) {
 	}
 
 	public static float getPointAttribute(@NonNull WptPt wptPt, @NonNull String key, float defaultValue) {
-		return Algorithms.parseFloatSilently(wptPt.getExtensionsToRead().get(key), defaultValue);
+		String value = wptPt.getDeferredExtensionsToRead().get(key);
+		if (Algorithms.isEmpty(value)) {
+			value = wptPt.getExtensionsToRead().get(key);
+		}
+		return Algorithms.parseFloatSilently(value, defaultValue);
 	}
 
 	public static void getAvailableGPXDataSetTypes(@NonNull GpxTrackAnalysis analysis, @NonNull List<GPXDataSetType[]> availableTypes) {

From 955d56d30bb92526420ae155bdc357630b00ce0b Mon Sep 17 00:00:00 2001
From: dmpr0 <dmpr0.ua@gmail.com>
Date: Thu, 26 Sep 2024 14:08:02 +0300
Subject: [PATCH 03/83] Added icons for intake temperature widget

---
 .../ic_action_obd_temperature_intake.xml      | 18 +++++++
 .../widget_obd_temperature_intake_day.xml     | 47 +++++++++++++++++++
 .../widget_obd_temperature_intake_night.xml   | 47 +++++++++++++++++++
 3 files changed, 112 insertions(+)
 create mode 100644 OsmAnd/res/drawable/ic_action_obd_temperature_intake.xml
 create mode 100644 OsmAnd/res/drawable/widget_obd_temperature_intake_day.xml
 create mode 100644 OsmAnd/res/drawable/widget_obd_temperature_intake_night.xml

diff --git a/OsmAnd/res/drawable/ic_action_obd_temperature_intake.xml b/OsmAnd/res/drawable/ic_action_obd_temperature_intake.xml
new file mode 100644
index 00000000000..32d3ff286e3
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_obd_temperature_intake.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,2C3.7909,2 2,3.7909 2,6V18C2,20.2091 3.7909,22 6,22H18C20.2091,22 22,20.2091 22,18V17.2149C21.4581,17.5013 20.7857,17.7787 20,17.9141V18C20,19.1046 19.1046,20 18,20H6C4.8954,20 4,19.1046 4,18V6C4,4.8954 4.8954,4 6,4H18C19.1046,4 20,4.8954 20,6V7.3959C20.6444,6.9779 21.3176,6.6072 22,6.2528V6C22,3.7909 20.2091,2 18,2H6Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,6C8.5523,6 9,6.4477 9,7V14.2676C9.5978,14.6134 10,15.2597 10,16C10,17.1046 9.1046,18 8,18C6.8954,18 6,17.1046 6,16C6,15.2597 6.4022,14.6134 7,14.2676V7C7,6.4477 7.4477,6 8,6Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,8.5203C12.5579,8.232 13.2193,8 14,8C15.3058,8 16.278,8.6493 16.9902,9.1249L17.0547,9.1679C17.837,9.6895 18.3456,10 19,10C19.6544,10 20.163,9.6895 20.9453,9.1679L21.0098,9.1249C21.2962,8.9336 21.6247,8.7143 22,8.5203V10.8686L21.9902,10.8751C21.278,11.3508 20.3058,12 19,12C17.6942,12 16.722,11.3508 16.0098,10.8751L15.9453,10.8321C15.163,10.3105 14.6544,10 14,10C13.3456,10 12.837,10.3105 12.0547,10.8321L12,10.8686V8.5203Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,12.5203C12.5579,12.232 13.2193,12 14,12C15.3058,12 16.278,12.6492 16.9902,13.1249L17.0547,13.1679C17.837,13.6895 18.3456,14 19,14C19.6544,14 20.163,13.6895 20.9453,13.1679L21.0098,13.1249C21.2962,12.9336 21.6247,12.7143 22,12.5203V14.8686L21.9902,14.8751C21.278,15.3508 20.3058,16 19,16C17.6942,16 16.722,15.3508 16.0098,14.8751L15.9453,14.8321C15.163,14.3105 14.6544,14 14,14C13.3456,14 12.837,14.3105 12.0547,14.8321L12,14.8686V12.5203Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_obd_temperature_intake_day.xml b/OsmAnd/res/drawable/widget_obd_temperature_intake_day.xml
new file mode 100644
index 00000000000..fe6c0751fc3
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_obd_temperature_intake_day.xml
@@ -0,0 +1,47 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,6C2,3.7909 3.7909,2 6,2H18C20.2091,2 22,3.7909 22,6V18C22,20.2091 20.2091,22 18,22H6C3.7909,22 2,20.2091 2,18V6Z"
+      android:fillColor="#394642"/>
+  <path
+      android:pathData="M18,4C19.1046,4 20,4.8954 20,6V7.3959C20.8124,6.8689 21.6706,6.4171 22.5352,5.9784C23.2033,5.6393 24,6.1288 24,6.878V15.4034C24,15.7376 23.8331,16.0496 23.5551,16.2352L23.1005,16.5386C23.0795,16.5526 23.0579,16.5671 23.0355,16.5821C22.4548,16.971 21.4097,17.6711 20,17.9141V18C20,19.1046 19.1046,20 18,20H6C4.8954,20 4,19.1046 4,18V6C4,4.8954 4.8954,4 6,4H18Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="4"
+          android:startX="17.2742"
+          android:endY="20"
+          android:endX="17.2742"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF000000"/>
+        <item android:offset="1" android:color="#FF333333"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M8,6C8.5523,6 9,6.4477 9,7V14.2676C9.5978,14.6134 10,15.2597 10,16C10,17.1046 9.1046,18 8,18C6.8954,18 6,17.1046 6,16C6,15.2597 6.4022,14.6134 7,14.2676V7C7,6.4477 7.4477,6 8,6Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="2"
+          android:startX="9"
+          android:endY="18"
+          android:endX="9"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFC107"/>
+        <item android:offset="0.695" android:color="#FFD2B138"/>
+        <item android:offset="1" android:color="#FF1D73FA"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M12,12.5203C12.5579,12.232 13.2193,12 14,12C15.3058,12 16.278,12.6492 16.9902,13.1249L17.0547,13.1679C17.837,13.6895 18.3456,14 19,14C19.6544,14 20.163,13.6895 20.9453,13.1679L21.0098,13.1249C21.2962,12.9336 21.6247,12.7143 22,12.5203V14.8686L21.9902,14.8751C21.278,15.3508 20.3058,16 19,16C17.6942,16 16.722,15.3508 16.0098,14.8751L15.9453,14.8321C15.163,14.3105 14.6544,14 14,14C13.3456,14 12.837,14.3105 12.0547,14.8321L12,14.8686V12.5203Z"
+      android:strokeAlpha="0.6"
+      android:fillColor="#E9BA20"
+      android:fillAlpha="0.6"/>
+  <path
+      android:pathData="M12,8.5203C12.5579,8.232 13.2193,8 14,8C15.3058,8 16.278,8.6493 16.9902,9.1249L17.0547,9.1679C17.837,9.6895 18.3456,10 19,10C19.6544,10 20.163,9.6895 20.9453,9.1679L21.0098,9.1249C21.2962,8.9336 21.6247,8.7143 22,8.5203V10.8686L21.9902,10.8751C21.278,11.3508 20.3058,12 19,12C17.6942,12 16.722,11.3508 16.0098,10.8751L15.9453,10.8321C15.163,10.3105 14.6544,10 14,10C13.3456,10 12.837,10.3105 12.0547,10.8321L12,10.8686V8.5203Z"
+      android:fillColor="#E9BA20"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_obd_temperature_intake_night.xml b/OsmAnd/res/drawable/widget_obd_temperature_intake_night.xml
new file mode 100644
index 00000000000..d1682a8e15e
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_obd_temperature_intake_night.xml
@@ -0,0 +1,47 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,6C2,3.7909 3.7909,2 6,2H18C20.2091,2 22,3.7909 22,6V18C22,20.2091 20.2091,22 18,22H6C3.7909,22 2,20.2091 2,18V6Z"
+      android:fillColor="#595959"/>
+  <path
+      android:pathData="M18,4C19.1046,4 20,4.8954 20,6V7.3959C20.8124,6.8689 21.6706,6.4171 22.5352,5.9784C23.2033,5.6393 24,6.1288 24,6.878V15.4034C24,15.7376 23.8331,16.0496 23.5551,16.2352L23.1005,16.5386C23.0795,16.5526 23.0579,16.5671 23.0355,16.5821C22.4548,16.971 21.4097,17.6711 20,17.9141V18C20,19.1046 19.1046,20 18,20H6C4.8954,20 4,19.1046 4,18V6C4,4.8954 4.8954,4 6,4H18Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="4"
+          android:startX="17.2742"
+          android:endY="20"
+          android:endX="17.2742"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF000000"/>
+        <item android:offset="1" android:color="#FF333333"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M8,6C8.5523,6 9,6.4477 9,7V14.2676C9.5978,14.6134 10,15.2597 10,16C10,17.1046 9.1046,18 8,18C6.8954,18 6,17.1046 6,16C6,15.2597 6.4022,14.6134 7,14.2676V7C7,6.4477 7.4477,6 8,6Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="2"
+          android:startX="9"
+          android:endY="18"
+          android:endX="9"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFC107"/>
+        <item android:offset="0.695" android:color="#FFD2B138"/>
+        <item android:offset="1" android:color="#FF1D73FA"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M12,12.5203C12.5579,12.232 13.2193,12 14,12C15.3058,12 16.278,12.6492 16.9902,13.1249L17.0547,13.1679C17.837,13.6895 18.3456,14 19,14C19.6544,14 20.163,13.6895 20.9453,13.1679L21.0098,13.1249C21.2962,12.9336 21.6247,12.7143 22,12.5203V14.8686L21.9902,14.8751C21.278,15.3508 20.3058,16 19,16C17.6942,16 16.722,15.3508 16.0098,14.8751L15.9453,14.8321C15.163,14.3105 14.6544,14 14,14C13.3456,14 12.837,14.3105 12.0547,14.8321L12,14.8686V12.5203Z"
+      android:strokeAlpha="0.6"
+      android:fillColor="#E9BA20"
+      android:fillAlpha="0.6"/>
+  <path
+      android:pathData="M12,8.5203C12.5579,8.232 13.2193,8 14,8C15.3058,8 16.278,8.6493 16.9902,9.1249L17.0547,9.1679C17.837,9.6895 18.3456,10 19,10C19.6544,10 20.163,9.6895 20.9453,9.1679L21.0098,9.1249C21.2962,8.9336 21.6247,8.7143 22,8.5203V10.8686L21.9902,10.8751C21.278,11.3508 20.3058,12 19,12C17.6942,12 16.722,11.3508 16.0098,10.8751L15.9453,10.8321C15.163,10.3105 14.6544,10 14,10C13.3456,10 12.837,10.3105 12.0547,10.8321L12,10.8686V8.5203Z"
+      android:fillColor="#E9BA20"/>
+</vector>

From 81b693334e051d52cea90540ef892998fe289a7d Mon Sep 17 00:00:00 2001
From: nazar-kutz <vitaminkuna@gmail.com>
Date: Thu, 26 Sep 2024 14:12:02 +0300
Subject: [PATCH 04/83] Fix "Regression: Route context card title broken
 #20741"

---
 .../commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt
index 15d9b94fb2b..01fdfe599f3 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt
@@ -414,6 +414,10 @@ object GpxUtilities {
 
 	fun writeGpxFile(file: KFile, gpxFile: GpxFile): KException? {
 		return try {
+			if (KAlgorithms.isEmpty(gpxFile.path)) {
+				file.getParentFile()?.createDirectories()
+				gpxFile.path = if (file.isAbsolute()) file.path() else file.absolutePath()
+			}
 			writeGpx(file, null, gpxFile, null)
 		} catch (e: KException) {
 			log.error("Failed to write gpx '$file.path()'", e)

From 210a9e2b97615ebe90598d6ece181d77bfeec7e5 Mon Sep 17 00:00:00 2001
From: nazar-kutz <vitaminkuna@gmail.com>
Date: Thu, 26 Sep 2024 14:15:09 +0300
Subject: [PATCH 05/83] Small improvement

---
 .../src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt
index 01fdfe599f3..25bd7f59dd4 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt
@@ -414,8 +414,8 @@ object GpxUtilities {
 
 	fun writeGpxFile(file: KFile, gpxFile: GpxFile): KException? {
 		return try {
+			file.getParentFile()?.createDirectories()
 			if (KAlgorithms.isEmpty(gpxFile.path)) {
-				file.getParentFile()?.createDirectories()
 				gpxFile.path = if (file.isAbsolute()) file.path() else file.absolutePath()
 			}
 			writeGpx(file, null, gpxFile, null)

From 7dfe32ec9c8060ea5f99beb7d225648ab4296ed0 Mon Sep 17 00:00:00 2001
From: Corwin-Kh <serge.kharchenko@gmail.com>
Date: Thu, 26 Sep 2024 14:30:03 +0300
Subject: [PATCH 06/83] Chenged test UI

---
 .../net/osmand/shared/data/BTDeviceInfo.kt    |  9 ++++++
 .../net/osmand/shared/obd/OBDCommand.kt       | 29 ++++++++++---------
 .../net/osmand/shared/obd/OBDDataComputer.kt  | 25 +++++++++++++++-
 .../net/osmand/shared/obd/OBDDataFieldType.kt |  1 +
 .../net/osmand/shared/obd/OBDDispatcher.kt    | 15 +++++++---
 .../kotlin/net/osmand/shared/obd/OBDUtils.kt  | 16 ++++++++++
 OsmAnd/res/values/strings.xml                 |  3 ++
 .../osmand/plus/plugins/odb/OBDTextWidget.kt  |  4 +++
 .../plugins/odb/OBDWidgetDataFieldType.kt     |  1 +
 .../plus/plugins/odb/VehicleMetricsPlugin.kt  | 14 +++++----
 .../plugins/odb/dialogs/OBDMainFragment.kt    |  7 ++++-
 .../dialogs/VehicleMetricsSettingsFragment.kt | 12 +++++---
 .../plus/views/mapwidgets/WidgetType.java     |  1 +
 13 files changed, 108 insertions(+), 29 deletions(-)
 create mode 100644 OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/data/BTDeviceInfo.kt

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/data/BTDeviceInfo.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/data/BTDeviceInfo.kt
new file mode 100644
index 00000000000..bdbf723d539
--- /dev/null
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/data/BTDeviceInfo.kt
@@ -0,0 +1,9 @@
+package net.osmand.shared.data
+
+import net.osmand.shared.util.Localization
+
+data class BTDeviceInfo(val name: String, val address: String) {
+	companion object {
+		val UNKNOWN_DEVICE = BTDeviceInfo(Localization.getString("unknown_bt_device"), "")
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDCommand.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDCommand.kt
index 0fb526e88e4..7b5f9f552a1 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDCommand.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDCommand.kt
@@ -1,21 +1,24 @@
 package net.osmand.shared.obd
 
 enum class OBDCommand(
+	val commandGroup: String,
 	val command: String,
 	private val responseParser: (String) -> String,
-	val isStale: Boolean = false) {
-	OBD_SUPPORTED_LIST1_COMMAND("00", OBDUtils::parseSupportedCommandsResponse, true),
-	OBD_SUPPORTED_LIST2_COMMAND("20", OBDUtils::parseSupportedCommandsResponse, true),
-	OBD_SUPPORTED_LIST3_COMMAND("40", OBDUtils::parseSupportedCommandsResponse, true),
-	OBD_BATTERY_VOLTAGE_COMMAND("42", OBDUtils::parseBatteryVoltageResponse),
-	OBD_AMBIENT_AIR_TEMPERATURE_COMMAND("46", OBDUtils::parseAmbientTempResponse),
-	OBD_RPM_COMMAND("0C", OBDUtils::parseRpmResponse),
-	OBD_SPEED_COMMAND("0D", OBDUtils::parseSpeedResponse),
-	OBD_AIR_INTAKE_TEMP_COMMAND("0F", OBDUtils::parseIntakeAirTempResponse),
-	OBD_ENGINE_COOLANT_TEMP_COMMAND("05", OBDUtils::parseEngineCoolantTempResponse),
-	OBD_FUEL_CONSUMPTION_RATE_COMMAND("5E", OBDUtils::parseFuelConsumptionRateResponse),
-	OBD_FUEL_TYPE_COMMAND("51", OBDUtils::parseFuelTypeResponse, true),
-	OBD_FUEL_LEVEL_COMMAND("2F", OBDUtils::parseFuelLevelResponse);
+	val isStale: Boolean = false,
+	val isMultiPartResponse: Boolean = false) {
+	OBD_SUPPORTED_LIST1_COMMAND("01", "00", OBDUtils::parseSupportedCommandsResponse, true),
+	OBD_SUPPORTED_LIST2_COMMAND("01", "20", OBDUtils::parseSupportedCommandsResponse, true),
+	OBD_SUPPORTED_LIST3_COMMAND("01", "40", OBDUtils::parseSupportedCommandsResponse, true),
+	OBD_BATTERY_VOLTAGE_COMMAND("01", "42", OBDUtils::parseBatteryVoltageResponse),
+	OBD_AMBIENT_AIR_TEMPERATURE_COMMAND("01", "46", OBDUtils::parseAmbientTempResponse),
+	OBD_RPM_COMMAND("01", "0C", OBDUtils::parseRpmResponse),
+	OBD_SPEED_COMMAND("01", "0D", OBDUtils::parseSpeedResponse),
+	OBD_AIR_INTAKE_TEMP_COMMAND("01", "0F", OBDUtils::parseIntakeAirTempResponse),
+	OBD_ENGINE_COOLANT_TEMP_COMMAND("01", "05", OBDUtils::parseEngineCoolantTempResponse),
+	OBD_FUEL_CONSUMPTION_RATE_COMMAND("01", "5E", OBDUtils::parseFuelConsumptionRateResponse),
+	OBD_FUEL_TYPE_COMMAND("01", "51", OBDUtils::parseFuelTypeResponse, true),
+	OBD_VIN_COMMAND("09", "02", OBDUtils::parseVINResponse, true, true),
+	OBD_FUEL_LEVEL_COMMAND("01", "2F", OBDUtils::parseFuelLevelResponse);
 
 	fun parseResponse(response: String): String {
 		return responseParser.invoke(response.lowercase())
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataComputer.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataComputer.kt
index 02e942f2a09..ccc860192e7 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataComputer.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataComputer.kt
@@ -101,7 +101,8 @@ object OBDDataComputer {
 		FUEL_LEFT_DISTANCE(true,
 			listOf(OBD_FUEL_LEVEL_COMMAND),
 			{ data -> OBDValue(OBD_FUEL_LEVEL_COMMAND, data) }),
-//		FUEL_LEFT_LITERS(false,
+
+		//		FUEL_LEFT_LITERS(false,
 //			listOf(OBD_FUEL_LEVEL_COMMAND),
 //			{ data -> OBDValue(OBD_FUEL_LEVEL_COMMAND, data) }),
 		FUEL_LEFT_PERCENT(false,
@@ -122,6 +123,9 @@ object OBDDataComputer {
 		FUEL_TYPE(false,
 			listOf(OBD_FUEL_TYPE_COMMAND),
 			{ data -> OBDIntValue(OBD_FUEL_TYPE_COMMAND, data) }),
+		VIN(false,
+			listOf(OBD_VIN_COMMAND),
+			{ data -> OBDStringValue(OBD_VIN_COMMAND, data) }),
 		TEMPERATURE_COOLANT(false,
 			listOf(OBD_ENGINE_COOLANT_TEMP_COMMAND),
 			{ data -> OBDIntValue(OBD_ENGINE_COOLANT_TEMP_COMMAND, data) });
@@ -247,6 +251,12 @@ object OBDDataComputer {
 						null
 					}
 				}
+
+				VIN -> if (locValues.size > 0) {
+					(locValues[locValues.size - 1] as OBDStringValue).value
+				} else {
+					null
+				}
 			}
 		}
 
@@ -317,4 +327,17 @@ object OBDDataComputer {
 			return accepted
 		}
 	}
+
+	class OBDStringValue(cmd: OBDCommand, data: Map<OBDCommand, OBDDataField?>) :
+		OBDValue(cmd, data) {
+		var value = ""
+		override fun acceptData(dataField: OBDDataField?): Boolean {
+			var accepted = false
+			dataField?.let {
+				value = it.getValue()
+				accepted = true
+			}
+			return accepted
+		}
+	}
 }
\ No newline at end of file
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataFieldType.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataFieldType.kt
index 9e37cd56e4c..239f2603e52 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataFieldType.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataFieldType.kt
@@ -10,6 +10,7 @@ enum class OBDDataFieldType(val nameId: String, private val unitNameId: String)
 	BATTERY_VOLTAGE("obd_battery_voltage_desc", "unit_volt"),
 	AIR_INTAKE_TEMP("obd_air_intake_temp_desc", "degree_celsius"),
 	COOLANT_TEMP("obd_engine_coolant_temp", "degree_celsius"),
+	VIN("obd_vin", ""),
 	FUEL_TYPE("obd_fuel_type", "");
 
 	fun getDisplayName(): String {
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDispatcher.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDispatcher.kt
index 0ec4bb8d2c5..4b2a4c88d2b 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDispatcher.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDispatcher.kt
@@ -26,7 +26,6 @@ object OBDDispatcher {
 	private val log = LoggerFactory.getLogger("OBDDispatcher")
 	private const val TERMINATE_SYMBOL = "\r\r>"
 	private const val RESPONSE_LINE_TERMINATOR = "\r"
-	private const val READ_DATA_COMMAND_CODE = "01"
 	private var job: Job? = null
 	private var scope: CoroutineScope? = null
 	private var readStatusListener: OBDReadStatusListener? = null
@@ -49,12 +48,12 @@ object OBDDispatcher {
 						for (command in commandQueue) {
 							if (command.isStale) {
 								val cachedCommandResponse = staleCommandsCache[command]
-								if (cachedCommandResponse != null) {
+								if (cachedCommandResponse != null && cachedCommandResponse != OBDUtils.INVALID_RESPONSE_CODE) {
 									consumeResponse(command, cachedCommandResponse)
 									continue
 								}
 							}
-							val fullCommand = "$READ_DATA_COMMAND_CODE${command.command}\r"
+							val fullCommand = "${command.commandGroup}${command.command}\r"
 							val bufferToWrite = Buffer()
 							bufferToWrite.write(fullCommand.encodeToByteArray())
 							outStream.write(bufferToWrite, bufferToWrite.size)
@@ -99,7 +98,14 @@ object OBDDispatcher {
 							}
 							var response = resultRaw.toString()
 							response = response.replace(TERMINATE_SYMBOL, "")
-							val listResponses = response.split(RESPONSE_LINE_TERMINATOR)
+							var listResponses = response.split(RESPONSE_LINE_TERMINATOR)
+//							val listResponses = if(command.isMultiPartResponse) {
+//								listOf(response)
+//							} else {
+//							}
+							if(command.isMultiPartResponse) {
+								listResponses = listOf(response.split(RESPONSE_LINE_TERMINATOR).subList(2, listResponses.size).joinToString(separator = ""))
+							}
 							for (responseIndex in 1 until listResponses.size) {
 								val result = command.parseResponse(listResponses[responseIndex])
 								log.debug("raw_response_$responseIndex: $result")
@@ -161,6 +167,7 @@ object OBDDispatcher {
 			OBDCommand.OBD_AIR_INTAKE_TEMP_COMMAND -> OBDDataField(OBDDataFieldType.AIR_INTAKE_TEMP, result)
 			OBDCommand.OBD_ENGINE_COOLANT_TEMP_COMMAND -> OBDDataField(OBDDataFieldType.COOLANT_TEMP, result)
 			OBDCommand.OBD_FUEL_TYPE_COMMAND -> OBDDataField(OBDDataFieldType.FUEL_TYPE, result)
+			OBDCommand.OBD_VIN_COMMAND -> OBDDataField(OBDDataFieldType.VIN, result)
 			OBDCommand.OBD_FUEL_LEVEL_COMMAND -> OBDDataField(OBDDataFieldType.FUEL_LVL, result)
 			OBDCommand.OBD_AMBIENT_AIR_TEMPERATURE_COMMAND -> OBDDataField(OBDDataFieldType.AMBIENT_AIR_TEMP, result)
 			OBDCommand.OBD_BATTERY_VOLTAGE_COMMAND -> OBDDataField(OBDDataFieldType.BATTERY_VOLTAGE, result)
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDUtils.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDUtils.kt
index c4b44b1e404..392189db97f 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDUtils.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDUtils.kt
@@ -96,6 +96,22 @@ object OBDUtils {
 		return INVALID_RESPONSE_CODE
 	}
 
+	fun parseVINResponse(response: String): String {
+		val responseParts = response.split(" ")
+
+		if (responseParts[0] == "49" &&
+			responseParts[1] == OBDCommand.OBD_VIN_COMMAND.command.lowercase() &&
+			responseParts.size > 3) {
+			val vinBuilder = StringBuilder()
+			for (i in 3 .. responseParts.size) {
+				val hexByte = responseParts[i]
+				vinBuilder.append(hexByte.toInt(16).toChar())
+			}
+			return vinBuilder.toString()
+		}
+		return INVALID_RESPONSE_CODE
+	}
+
 	fun parseFuelConsumptionRateResponse(response: String): String {
 		val hexValues = response.trim().split(" ")
 		if (hexValues.size >= 4 && hexValues[0] == "41" && hexValues[1] == OBDCommand.OBD_FUEL_CONSUMPTION_RATE_COMMAND.command.lowercase()) {
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index f12d45423ac..238f07af225 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -10,6 +10,9 @@
 	- For wording and consistency, please note https://docs.osmand.net/docs/technical/contributions/translating-osmand
 	Thx - Hardy
 -->
+    <string name="unknown_bt_device">Unknown device</string>
+    <string name="obd_vin">VIN</string>
+    <string name="obd_vin_desc">VIN code over OBD</string>
     <string name="unit_volt">V</string>
 	<string name="wikimedia">Wikimedia</string>
 	<string name="open_in_browser">Open in browser</string>
diff --git a/OsmAnd/src/net/osmand/plus/plugins/odb/OBDTextWidget.kt b/OsmAnd/src/net/osmand/plus/plugins/odb/OBDTextWidget.kt
index b01901d78a4..ac328464c30 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/odb/OBDTextWidget.kt
+++ b/OsmAnd/src/net/osmand/plus/plugins/odb/OBDTextWidget.kt
@@ -68,6 +68,10 @@ class OBDTextWidget @JvmOverloads constructor(
 				obdDataWidgetType = OBDTypeWidget.FUEL_TYPE
 				formatter = OBDFuelTypeFormatter()
 			}
+			VIN -> {
+				obdDataWidgetType = OBDTypeWidget.VIN
+				formatter = OBDComputerWidgetFormatter("%s")
+			}
 		}
 		//todo implement setting correct time for widget (0 for instant)
 		widgetComputer = OBDDataComputer.registerWidget(obdDataWidgetType, averageTimeSeconds, formatter)
diff --git a/OsmAnd/src/net/osmand/plus/plugins/odb/OBDWidgetDataFieldType.kt b/OsmAnd/src/net/osmand/plus/plugins/odb/OBDWidgetDataFieldType.kt
index b03b4daf7ee..3097b29e899 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/odb/OBDWidgetDataFieldType.kt
+++ b/OsmAnd/src/net/osmand/plus/plugins/odb/OBDWidgetDataFieldType.kt
@@ -17,5 +17,6 @@ enum class OBDWidgetDataFieldType(
 	BATTERY_VOLTAGE(WidgetType.OBD_BATTERY_VOLTAGE, R.drawable.ic_action_thermometer, OBDCommand.OBD_BATTERY_VOLTAGE_COMMAND, OBDDataFieldType.BATTERY_VOLTAGE),
 	AIR_INTAKE_TEMP(WidgetType.OBD_AIR_INTAKE_TEMP, R.drawable.ic_action_signal, OBDCommand.OBD_AIR_INTAKE_TEMP_COMMAND, OBDDataFieldType.AIR_INTAKE_TEMP),
 	COOLANT_TEMP(WidgetType.OBD_ENGINE_COOLANT_TEMP, R.drawable.ic_action_sensor_bicycle_power_outlined, OBDCommand.OBD_ENGINE_COOLANT_TEMP_COMMAND, OBDDataFieldType.COOLANT_TEMP),
+	VIN(WidgetType.OBD_VIN, R.drawable.ic_action_sensor_bicycle_power_outlined, OBDCommand.OBD_ENGINE_COOLANT_TEMP_COMMAND, OBDDataFieldType.COOLANT_TEMP),
 	FUEL_TYPE(WidgetType.OBD_FUEL_TYPE, R.drawable.ic_action_speed_outlined, OBDCommand.OBD_FUEL_TYPE_COMMAND, OBDDataFieldType.FUEL_TYPE)
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/plugins/odb/VehicleMetricsPlugin.kt b/OsmAnd/src/net/osmand/plus/plugins/odb/VehicleMetricsPlugin.kt
index fa7e9bef95b..9bc4a10da4e 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/odb/VehicleMetricsPlugin.kt
+++ b/OsmAnd/src/net/osmand/plus/plugins/odb/VehicleMetricsPlugin.kt
@@ -30,6 +30,7 @@ import net.osmand.plus.views.mapwidgets.widgets.MapWidget
 import net.osmand.plus.widgets.ctxmenu.ContextMenuAdapter
 import net.osmand.plus.widgets.ctxmenu.callback.OnDataChangeUiAdapter
 import net.osmand.plus.widgets.ctxmenu.data.ContextMenuItem
+import net.osmand.shared.data.BTDeviceInfo
 import net.osmand.shared.data.KLatLon
 import net.osmand.shared.obd.OBDCommand
 import net.osmand.shared.obd.OBDDataComputer
@@ -194,8 +195,8 @@ class VehicleMetricsPlugin(app: OsmandApplication) : OsmandPlugin(app),
 	}
 
 	@SuppressLint("MissingPermission")
-	fun getPairedOBDDevicesList(activity: Activity): List<String> {
-		var deviceList = listOf<String>()
+	fun getPairedOBDDevicesList(activity: Activity): List<BTDeviceInfo> {
+		var deviceList = listOf<BTDeviceInfo>()
 		if (BLEUtils.isBLEEnabled(activity) && AndroidUtils.hasBLEPermission(activity)) {
 			val bluetoothAdapter = BLEUtils.getBluetoothAdapter(activity)
 			bluetoothAdapter?.let { adapter ->
@@ -203,7 +204,7 @@ class VehicleMetricsPlugin(app: OsmandApplication) : OsmandPlugin(app),
 				val pairedDevices = adapter.bondedDevices.toList()
 				deviceList = pairedDevices.filter { device ->
 					device.uuids?.any { parcelUuid -> parcelUuid.uuid == uuid } == true
-				}.map { it.name ?: "Unknown Device" }
+				}.map { if (it != null) BTDeviceInfo(it.name, it.address) else  BTDeviceInfo.UNKNOWN_DEVICE }
 			}
 
 		} else {
@@ -221,10 +222,11 @@ class VehicleMetricsPlugin(app: OsmandApplication) : OsmandPlugin(app),
 				OBDDispatcher.stopReading()
 			}
 		}
+		connectedDevice = null
 	}
 
 	@SuppressLint("MissingPermission")
-	fun connectToObd(activity: Activity, name: String): Boolean {
+	fun connectToObd(activity: Activity, deviceInfo: BTDeviceInfo): Boolean {
 		if (connectedDevice == null) {
 			if (BLEUtils.isBLEEnabled(activity)) {
 				if (AndroidUtils.hasBLEPermission(activity)) {
@@ -242,7 +244,7 @@ class VehicleMetricsPlugin(app: OsmandApplication) : OsmandPlugin(app),
 							LOG.debug(it.name)
 						}
 						val obdDevice: BluetoothDevice? =
-							pairedDevices.find { it.name == name }
+							pairedDevices.find { it.name == deviceInfo.name && it.address == deviceInfo.address }
 						connectedDevice = obdDevice
 						connectToDevice(activity)
 					}
@@ -253,7 +255,7 @@ class VehicleMetricsPlugin(app: OsmandApplication) : OsmandPlugin(app),
 		} else {
 			socket?.close()
 			connectedDevice = null
-			connectToObd(activity, name)
+			connectToObd(activity, deviceInfo)
 		}
 		return socket != null && socket?.isConnected == true
 	}
diff --git a/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/OBDMainFragment.kt b/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/OBDMainFragment.kt
index 8954eb92602..ed37b37c108 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/OBDMainFragment.kt
+++ b/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/OBDMainFragment.kt
@@ -28,6 +28,7 @@ import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.SPEED
 import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.TEMPERATURE_AMBIENT
 import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.TEMPERATURE_COOLANT
 import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.TEMPERATURE_INTAKE
+import net.osmand.shared.obd.OBDDataComputer.OBDTypeWidget.VIN
 
 class OBDMainFragment : BaseOsmAndFragment() {
 	private var deviceName: EditText? = null
@@ -42,6 +43,7 @@ class OBDMainFragment : BaseOsmAndFragment() {
 	private var fuelTypeBtn: Button? = null
 	private var fuelLeftPersBtn: Button? = null
 	private var tempAmbientBtn: Button? = null
+	private var vinBtn: Button? = null
 	private var fuelLeftDistResp: EditText? = null
 	private var fuelLeftLitersResp: EditText? = null
 	private var fuelConsumptionResp: EditText? = null
@@ -49,7 +51,7 @@ class OBDMainFragment : BaseOsmAndFragment() {
 	private var speedResp: EditText? = null
 	private var tempIntakeResp: EditText? = null
 	private var tempCoolantResp: EditText? = null
-	private var resp8: EditText? = null
+	private var vinResp: EditText? = null
 	private var fuelTypeResp: EditText? = null
 	private var fuelLeftPersResp: EditText? = null
 	private var tempAmbientResp: EditText? = null
@@ -106,6 +108,7 @@ class OBDMainFragment : BaseOsmAndFragment() {
 		fuelTypeBtn = view.findViewById(R.id.btn9)
 		fuelLeftPersBtn = view.findViewById(R.id.btn10)
 		tempAmbientBtn = view.findViewById(R.id.btn11)
+		vinBtn = view.findViewById(R.id.btn12)
 		fuelLeftDistBtn?.text = "fuel left distance"
 		fuelLeftLitersBtn?.text = "fuel left liters"
 		fuelConsumptionBtn?.text = "fuel consumption"
@@ -117,6 +120,7 @@ class OBDMainFragment : BaseOsmAndFragment() {
 		fuelTypeBtn?.text = "fuel type"
 		fuelLeftPersBtn?.text = "fuel left percent"
 		tempAmbientBtn?.text = "ambient air temperature"
+		vinBtn?.text = "vin"
 	}
 
 	override fun onCreate(savedInstanceState: Bundle?) {
@@ -180,6 +184,7 @@ class OBDMainFragment : BaseOsmAndFragment() {
 				BATTERY_VOLTAGE -> updateWidgetData(batteryVoltageResp, result)
 				FUEL_TYPE -> updateWidgetData(fuelTypeResp, result)
 				TEMPERATURE_COOLANT -> updateWidgetData(tempCoolantResp, result)
+				VIN -> updateWidgetData(vinResp, result)
 			}
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/VehicleMetricsSettingsFragment.kt b/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/VehicleMetricsSettingsFragment.kt
index eac6670016e..e01ea9c9526 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/VehicleMetricsSettingsFragment.kt
+++ b/OsmAnd/src/net/osmand/plus/plugins/odb/dialogs/VehicleMetricsSettingsFragment.kt
@@ -22,6 +22,7 @@ import net.osmand.plus.plugins.PluginsHelper
 import net.osmand.plus.plugins.odb.VehicleMetricsPlugin
 import net.osmand.plus.utils.AndroidUtils
 import net.osmand.plus.utils.ColorUtilities
+import net.osmand.shared.data.BTDeviceInfo
 
 class VehicleMetricsSettingsFragment : BaseOsmAndFragment() {
 	private var plugin: VehicleMetricsPlugin? = null
@@ -30,7 +31,7 @@ class VehicleMetricsSettingsFragment : BaseOsmAndFragment() {
 	var adapter: DeviceAdapter? = null
 	var emptyView: View? = null
 
-	private var items = listOf<String>()
+	private var items = listOf<BTDeviceInfo>()
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
@@ -127,23 +128,26 @@ class VehicleMetricsSettingsFragment : BaseOsmAndFragment() {
 		}
 	}
 
-	class DeviceAdapter(private val items: List<String>) :
+	class DeviceAdapter(private val items: List<BTDeviceInfo>) :
 		RecyclerView.Adapter<DeviceAdapter.ViewHolder>() {
 		var selectedPosition: Int = RecyclerView.NO_POSITION
 
 		class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 			val textView: TextView = itemView.findViewById(android.R.id.text1)
+			val subTextView: TextView = itemView.findViewById(android.R.id.text2)
 		}
 
 		override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
 			val view = LayoutInflater.from(parent.context)
-				.inflate(android.R.layout.simple_list_item_1, parent, false)
+				.inflate(android.R.layout.simple_list_item_2, parent, false)
 			return ViewHolder(view)
 		}
 
 		override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-			holder.textView.text = items[position]
+			holder.textView.text = items[position].name
+			holder.subTextView.text = items[position].address
 			holder.textView.setTextColor(Color.BLACK)
+			holder.subTextView.setTextColor(Color.GRAY)
 			if (position == selectedPosition) {
 				holder.itemView.setBackgroundColor(Color.LTGRAY)
 			} else {
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/WidgetType.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/WidgetType.java
index ae0fc625749..f6ad520fca1 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/WidgetType.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/WidgetType.java
@@ -119,6 +119,7 @@ public enum WidgetType {
 	OBD_FUEL_LEVEL("obd_fuel_level", R.string.obd_fuel_level, R.string.obd_fuel_level_desc, R.drawable.widget_weather_temperature_day, R.drawable.widget_weather_temperature_night, 0, VEHICLE_METRICS, RIGHT),
 	OBD_FUEL_LEFT_DISTANCE("obd_fuel_left_distance", R.string.obd_fuel_left_distance, R.string.obd_fuel_left_distance_desc, R.drawable.widget_weather_temperature_day, R.drawable.widget_weather_temperature_night, 0, VEHICLE_METRICS, RIGHT),
 	OBD_FUEL_CONSUMPTION_RATE("obd_fuel_consumption_rate", R.string.obd_fuel_consumption_rate, R.string.obd_fuel_consumption_rate_desc, R.drawable.widget_weather_temperature_day, R.drawable.widget_weather_temperature_night, 0, VEHICLE_METRICS, RIGHT),
+	OBD_VIN("obd_vin", R.string.obd_vin, R.string.obd_vin_desc, R.drawable.widget_weather_temperature_day, R.drawable.widget_weather_temperature_night, 0, VEHICLE_METRICS, RIGHT),
 	OBD_FUEL_TYPE("obd_fuel_type", R.string.obd_fuel_type, R.string.obd_fuel_type_desc, R.drawable.widget_weather_temperature_day, R.drawable.widget_weather_temperature_night, 0, VEHICLE_METRICS, RIGHT),
 
 	TEMPERATURE("temperature_sensor", R.string.shared_string_temperature, R.string.sensor_temperature_desc, R.drawable.widget_weather_temperature_day, R.drawable.widget_weather_temperature_night, 0, ANT_PLUS, RIGHT),

From 41a6e880c29be69c6abc6072e12265e53db05776 Mon Sep 17 00:00:00 2001
From: alex-osm <alex.morozov.osm@gmail.com>
Date: Thu, 26 Sep 2024 14:49:04 +0300
Subject: [PATCH 07/83] Fix map freezes by long tracks with gradient coloring

---
 .../core/android/MapRendererContext.java      | 10 +++++++++
 OsmAnd/src/net/osmand/plus/Version.java       | 22 +++++++++++++------
 .../src/net/osmand/plus/shared/SharedUtil.kt  |  1 +
 .../plus/track/Gpx3DVisualizationType.java    | 11 ++--------
 .../osmand/plus/views/layers/GPXLayer.java    | 17 +++++++++++---
 .../views/layers/geometry/GeometryWay.java    | 10 +++++++++
 .../views/layers/geometry/GpxGeometryWay.java | 18 +++++++--------
 7 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/OsmAnd/src/net/osmand/core/android/MapRendererContext.java b/OsmAnd/src/net/osmand/core/android/MapRendererContext.java
index 94296a5f762..e03b0745885 100644
--- a/OsmAnd/src/net/osmand/core/android/MapRendererContext.java
+++ b/OsmAnd/src/net/osmand/core/android/MapRendererContext.java
@@ -116,6 +116,7 @@ public class MapRendererContext {
 	private volatile MapRendererView mapRendererView;
 
 	private float cachedReferenceTileSize;
+	private boolean heightmapsActive;
 
 	public MapRendererContext(OsmandApplication app, float density) {
 		this.app = app;
@@ -145,10 +146,15 @@ public void setMapRendererView(@Nullable MapRendererView mapRendererView) {
 	public MapRendererView getMapRendererView() {
 		return mapRendererView;
 	}
+
 	public boolean isVectorLayerEnabled() {
 		return !app.getSettings().MAP_ONLINE_DATA.get();
 	}
 
+	public boolean isHeightmapsActive() {
+		return heightmapsActive;
+	}
+
 	public void setNightMode(boolean nightMode) {
 		if (nightMode != this.nightMode) {
 			this.nightMode = nightMode;
@@ -403,11 +409,15 @@ public void recreateHeightmapProvider() {
 			SRTMPlugin srtmPlugin = PluginsHelper.getActivePlugin(SRTMPlugin.class);
 			if (srtmPlugin == null || !srtmPlugin.is3DMapsEnabled()) {
 				mapRendererView.resetElevationDataProvider();
+				heightmapsActive = false;
 				return;
 			}
 			GeoTiffCollection geoTiffCollection = getGeoTiffCollection();
 			int elevationTileSize = mapRendererView.getElevationDataTileSize();
 			mapRendererView.setElevationDataProvider(new SqliteHeightmapTileProvider(geoTiffCollection, elevationTileSize));
+			heightmapsActive = true;
+		} else {
+			heightmapsActive = false;
 		}
 	}
 	public void resetHeightmapProvider() {
diff --git a/OsmAnd/src/net/osmand/plus/Version.java b/OsmAnd/src/net/osmand/plus/Version.java
index e307b006861..c205c174d80 100644
--- a/OsmAnd/src/net/osmand/plus/Version.java
+++ b/OsmAnd/src/net/osmand/plus/Version.java
@@ -35,6 +35,9 @@ public class Version {
 	private final String appName;
 	private final String appVersion;
 
+	private static Boolean openGlEsVersionSupported;
+	private static Boolean openGlExists;
+
 	public static boolean isHuawei() {
 		return getBuildFlavor().contains("huawei");
 	}
@@ -192,17 +195,22 @@ public static boolean isOpenGlAvailable(@NonNull OsmandApplication app) {
 		if (!NativeCore.isAvailable() || isQnxOperatingSystem() || !isOpenGlEsVersionSupported(app)) {
 			return false;
 		}
-		File nativeLibraryDir = new File(app.getApplicationInfo().nativeLibraryDir);
-		if (checkOpenGlExists(nativeLibraryDir)) return true;
-		// check opengl doesn't work correctly on some devices when native libs are not unpacked
+		if (openGlExists == null) {
+			File nativeLibraryDir = new File(app.getApplicationInfo().nativeLibraryDir);
+			openGlExists = checkOpenGlExists(nativeLibraryDir);
+			// check opengl doesn't work correctly on some devices when native libs are not unpacked
+		}
 		return true;
 	}
 
 	public static boolean isOpenGlEsVersionSupported(@NonNull OsmandApplication app) {
-		ActivityManager activityManager = (ActivityManager) app.getSystemService(Context.ACTIVITY_SERVICE);
-		ConfigurationInfo deviceConfigurationInfo = activityManager.getDeviceConfigurationInfo();
-		int majorVersion = (deviceConfigurationInfo.reqGlEsVersion & 0xffff0000) >> 16;
-		return majorVersion >= 3;
+		if (openGlEsVersionSupported == null) {
+			ActivityManager activityManager = (ActivityManager) app.getSystemService(Context.ACTIVITY_SERVICE);
+			ConfigurationInfo deviceConfigurationInfo = activityManager.getDeviceConfigurationInfo();
+			int majorVersion = (deviceConfigurationInfo.reqGlEsVersion & 0xffff0000) >> 16;
+			openGlEsVersionSupported = majorVersion >= 3;
+		}
+		return openGlEsVersionSupported;
 	}
 
 	public static boolean isQnxOperatingSystem() {
diff --git a/OsmAnd/src/net/osmand/plus/shared/SharedUtil.kt b/OsmAnd/src/net/osmand/plus/shared/SharedUtil.kt
index b32f32c71e5..97048f420fb 100644
--- a/OsmAnd/src/net/osmand/plus/shared/SharedUtil.kt
+++ b/OsmAnd/src/net/osmand/plus/shared/SharedUtil.kt
@@ -180,6 +180,7 @@ object SharedUtil {
 	@JvmStatic
 	fun jGpxFile(gpxFile: GpxFile): GPXFile {
 		val jGpxFile = GPXFile(gpxFile.author)
+		jGpxFile.path = gpxFile.path
 		jGpxFile.metadata = jMetadata(gpxFile.metadata)
 		val jTracks = jGpxFile.tracks
 		for (track in gpxFile.tracks) {
diff --git a/OsmAnd/src/net/osmand/plus/track/Gpx3DVisualizationType.java b/OsmAnd/src/net/osmand/plus/track/Gpx3DVisualizationType.java
index a7c23ded1fa..870ce4dc938 100644
--- a/OsmAnd/src/net/osmand/plus/track/Gpx3DVisualizationType.java
+++ b/OsmAnd/src/net/osmand/plus/track/Gpx3DVisualizationType.java
@@ -11,9 +11,7 @@
 import androidx.annotation.StringRes;
 
 import net.osmand.plus.R;
-import net.osmand.plus.plugins.PluginsHelper;
 import net.osmand.plus.plugins.externalsensors.SensorAttributesUtils;
-import net.osmand.plus.plugins.srtm.SRTMPlugin;
 import net.osmand.shared.gpx.primitives.WptPt;
 import net.osmand.util.CollectionUtils;
 
@@ -63,7 +61,7 @@ public boolean is3dType() {
 	private static final Float SPEED_TO_HEIGHT_SCALE = 10.0f;
 	private static final Float TEMPERATURE_TO_HEIGHT_OFFSET = 100.0f;
 
-	public static double getPointElevation(@NonNull WptPt point, @NonNull Track3DStyle style) {
+	public static double getPointElevation(@NonNull WptPt point, @NonNull Track3DStyle style, boolean heightmapsActive) {
 		double pointElevation = getValidElevation(point.getEle());
 		Gpx3DVisualizationType type = style.getVisualizationType();
 
@@ -75,7 +73,7 @@ public static double getPointElevation(@NonNull WptPt point, @NonNull Track3DSty
 			case HEART_RATE, BICYCLE_CADENCE, BICYCLE_POWER, TEMPERATURE, SPEED_SENSOR ->
 					getSensorElevation(point, type);
 		};
-		boolean addGpxHeight = is3DMapsEnabled() && !CollectionUtils.equalsToAny(type, ALTITUDE, NONE);
+		boolean addGpxHeight = heightmapsActive && !CollectionUtils.equalsToAny(type, ALTITUDE, NONE);
 		return addGpxHeight ? elevation + pointElevation : elevation;
 	}
 
@@ -107,9 +105,4 @@ public static float getSensorElevation(@NonNull WptPt point, @NonNull Gpx3DVisua
 	private static double getValidElevation(double elevation) {
 		return Double.isNaN(elevation) ? 0 : elevation;
 	}
-
-	private static boolean is3DMapsEnabled() {
-		SRTMPlugin plugin = PluginsHelper.getActivePlugin(SRTMPlugin.class);
-		return plugin != null && plugin.is3DMapsEnabled();
-	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
index b0aff004766..17c281cf814 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
@@ -22,6 +22,7 @@
 import androidx.core.content.ContextCompat;
 
 import net.osmand.PlatformUtil;
+import net.osmand.core.android.MapRendererContext;
 import net.osmand.plus.shared.SharedUtil;
 import net.osmand.core.android.MapRendererView;
 import net.osmand.core.jni.*;
@@ -57,6 +58,7 @@
 import net.osmand.plus.track.fragments.TrackAppearanceFragment;
 import net.osmand.plus.track.fragments.TrackMenuFragment;
 import net.osmand.plus.track.helpers.GpxAppearanceHelper;
+import net.osmand.plus.views.corenative.NativeCoreContext;
 import net.osmand.shared.gpx.GpxDbHelper;
 import net.osmand.plus.track.helpers.GpxDisplayGroup;
 import net.osmand.plus.track.helpers.GpxDisplayItem;
@@ -520,6 +522,14 @@ private int calculateHash(Object... o) {
 		return Arrays.hashCode(o);
 	}
 
+	private boolean isHeightmapsActive() {
+		MapRendererContext mapRendererContext = NativeCoreContext.getMapRendererContext();
+		if (mapRendererContext != null) {
+			return mapRendererContext.isHeightmapsActive();
+		}
+		return false;
+	}
+
 	private void drawSelectedFilesSplits(@NonNull Canvas canvas, @NonNull RotatedTileBox tileBox,
 	                                     @NonNull List<SelectedGpxFile> selectedGPXFiles) {
 		if (tileBox.getZoom() >= START_ZOOM) {
@@ -546,6 +556,7 @@ private void drawSelectedFilesSplitsOpenGl(@NonNull MapRendererView mapRenderer,
 	                                           @NonNull List<SelectedGpxFile> selectedGPXFiles, boolean forceUpdate) {
 		if (tileBox.getZoom() >= START_ZOOM) {
 			boolean changed = forceUpdate;
+			boolean heightmapsActive = isHeightmapsActive();
 			int startFinishPointsCount = 0;
 			int splitLabelsCount = 0;
 			for (SelectedGpxFile selectedGpxFile : selectedGPXFiles) {
@@ -618,8 +629,8 @@ private void drawSelectedFilesSplitsOpenGl(@NonNull MapRendererView mapRenderer,
 							WptPt start = segment.getPoints().get(0);
 							WptPt finish = segment.getPoints().get(segment.getPoints().size() - 1);
 							if (visualizationType != Gpx3DVisualizationType.NONE && trackLinePosition == Gpx3DLinePositionType.TOP) {
-								startFinishHeights.add((float) Gpx3DVisualizationType.getPointElevation(start, track3DStyle));
-								startFinishHeights.add((float) Gpx3DVisualizationType.getPointElevation(finish, track3DStyle));
+								startFinishHeights.add((float) Gpx3DVisualizationType.getPointElevation(start, track3DStyle, heightmapsActive));
+								startFinishHeights.add((float) Gpx3DVisualizationType.getPointElevation(finish, track3DStyle, heightmapsActive));
 							}
 							startFinishPoints.add(new PointI(Utilities.get31TileNumberX(start.getLon()), Utilities.get31TileNumberY(start.getLat())));
 							startFinishPoints.add(new PointI(Utilities.get31TileNumberX(finish.getLon()), Utilities.get31TileNumberY(finish.getLat())));
@@ -643,7 +654,7 @@ private void drawSelectedFilesSplitsOpenGl(@NonNull MapRendererView mapRenderer,
 							if (visualizationType == Gpx3DVisualizationType.NONE || trackLinePosition != Gpx3DLinePositionType.TOP) {
 								splitLabel = new SplitLabel(point31, name, NativeUtilities.createColorARGB(color, 179));
 							} else {
-								float labelHeight = (float) Gpx3DVisualizationType.getPointElevation(point, track3DStyle);
+								float labelHeight = (float) Gpx3DVisualizationType.getPointElevation(point, track3DStyle, heightmapsActive);
 								splitLabel = new SplitLabel(point31, name, NativeUtilities.createColorARGB(color, 179), labelHeight);
 							}
 							splitLabels.add(splitLabel);
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWay.java b/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWay.java
index 32e8604644c..2a308669968 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWay.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWay.java
@@ -7,10 +7,12 @@
 
 import net.osmand.Location;
 import net.osmand.PlatformUtil;
+import net.osmand.core.android.MapRendererContext;
 import net.osmand.core.android.MapRendererView;
 import net.osmand.core.jni.VectorLineArrowsProvider;
 import net.osmand.core.jni.VectorLinesCollection;
 import net.osmand.data.RotatedTileBox;
+import net.osmand.plus.views.corenative.NativeCoreContext;
 import net.osmand.shared.gpx.GpxUtilities;
 import net.osmand.plus.track.Gpx3DVisualizationType;
 import net.osmand.plus.views.layers.geometry.GeometryWayDrawer.DrawPathData;
@@ -102,6 +104,14 @@ public MapRendererView getMapRenderer() {
 		return context.getMapRenderer();
 	}
 
+	protected boolean isHeightmapsActive() {
+		MapRendererContext mapRendererContext = NativeCoreContext.getMapRendererContext();
+		if (mapRendererContext != null) {
+			return mapRendererContext.isHeightmapsActive();
+		}
+		return false;
+	}
+
 	protected void updateWay(@NonNull GeometryWayProvider locationProvider, @NonNull RotatedTileBox tb) {
 		updateWay(locationProvider, null, tb);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/geometry/GpxGeometryWay.java b/OsmAnd/src/net/osmand/plus/views/layers/geometry/GpxGeometryWay.java
index 20a8a45ae15..242ec516086 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/geometry/GpxGeometryWay.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/geometry/GpxGeometryWay.java
@@ -10,7 +10,6 @@
 import net.osmand.plus.track.Gpx3DVisualizationType;
 import net.osmand.plus.track.Track3DStyle;
 import net.osmand.shared.routing.ColoringType;
-import net.osmand.shared.routing.RouteColorize.ColorizationType;
 import net.osmand.shared.routing.RouteColorize.RouteColorizationPoint;
 import net.osmand.router.RouteSegmentResult;
 import net.osmand.shared.gpx.primitives.WptPt;
@@ -97,7 +96,7 @@ public void updateSegment(RotatedTileBox tb, List<WptPt> points,
 
 			Track3DStyle track3DStyle = getTrack3DStyle();
 			if (hasMapRenderer() && track3DStyle != null && track3DStyle.getVisualizationType().is3dType()) {
-				updateGpx3dWay(tb, points, routeSegments);
+				updateGpx3dWay(tb, points, routeSegments, isHeightmapsActive());
 			} else if (coloringType.isTrackSolid()) {
 				if (hasMapRenderer()) {
 					Map<Integer, GeometryWayStyle<?>> styleMap = new TreeMap<>();
@@ -109,7 +108,7 @@ public void updateSegment(RotatedTileBox tb, List<WptPt> points,
 				}
 			} else if (coloringType.isGradient()) {
 				if (hasMapRenderer()) {
-					updateGpxGradientWay(tb, points);
+					updateGpxGradientWay(tb, points, isHeightmapsActive());
 				} else {
 					updateWay(new GeometryWayWptPtProvider(points), tb);
 				}
@@ -123,12 +122,12 @@ public void updateSegment(RotatedTileBox tb, List<WptPt> points,
 		}
 	}
 
-	protected void updateGpxGradientWay(@NonNull RotatedTileBox tb, @NonNull List<WptPt> points) {
+	protected void updateGpxGradientWay(@NonNull RotatedTileBox tb, @NonNull List<WptPt> points, boolean heightmapsActive) {
 		List<RouteColorizationPoint> colorizationPoints = new ArrayList<>();
 		List<Float> pointHeights = new ArrayList<>();
 		for (int i = 0; i < points.size(); i++) {
 			WptPt wptPt = points.get(i);
-			pointHeights.add((float) getPointElevation(wptPt));
+			pointHeights.add((float) getPointElevation(wptPt, heightmapsActive));
 			RouteColorizationPoint point = new RouteColorizationPoint(i, wptPt.getLat(), wptPt.getLon(), 0);
 			point.setPrimaryColor(getPointGradientColor(coloringType, wptPt));
 			colorizationPoints.add(point);
@@ -136,7 +135,8 @@ protected void updateGpxGradientWay(@NonNull RotatedTileBox tb, @NonNull List<Wp
 		updateWay(new GradientGeometryWayProvider(null, colorizationPoints, pointHeights), createGradientStyles(colorizationPoints), tb);
 	}
 
-	protected void updateGpx3dWay(@NonNull RotatedTileBox tileBox, @NonNull List<WptPt> points, @Nullable List<RouteSegmentResult> segments) {
+	protected void updateGpx3dWay(@NonNull RotatedTileBox tileBox, @NonNull List<WptPt> points,
+	                              @Nullable List<RouteSegmentResult> segments, boolean heightmapsActive) {
 		ColoringType outlineColoringType = getOutlineColoringType();
 		List<RouteColorizationPoint> colorization = new ArrayList<>(points.size());
 		List<Integer> routeColors = coloringType.isRouteInfoAttribute()
@@ -144,7 +144,7 @@ protected void updateGpx3dWay(@NonNull RotatedTileBox tileBox, @NonNull List<Wpt
 
 		for (int i = 0; i < points.size(); i++) {
 			WptPt wptPt = points.get(i);
-			double value = getPointElevation(wptPt);
+			double value = getPointElevation(wptPt, heightmapsActive);
 			RouteColorizationPoint point = new RouteColorizationPoint(i, wptPt.getLat(), wptPt.getLon(), value);
 			point.setPrimaryColor(getPointColor(coloringType, wptPt, routeColors, i));
 			if (outlineColoringType != null) {
@@ -155,9 +155,9 @@ protected void updateGpx3dWay(@NonNull RotatedTileBox tileBox, @NonNull List<Wpt
 		updateWay(new Geometry3DWayProvider(colorization), createGradient3DStyles(colorization), tileBox);
 	}
 
-	private double getPointElevation(@NonNull WptPt point) {
+	private double getPointElevation(@NonNull WptPt point, boolean heightmapsActive) {
 		Track3DStyle style = getTrack3DStyle();
-		return style != null ? Gpx3DVisualizationType.getPointElevation(point, style) : 0;
+		return style != null ? Gpx3DVisualizationType.getPointElevation(point, style, heightmapsActive) : 0;
 	}
 
 	@ColorInt

From 14a8aac51da2f42bb2a9e561cc27664feae88a4f Mon Sep 17 00:00:00 2001
From: chumv <chumva.forever@gmail.com>
Date: Thu, 26 Sep 2024 15:54:07 +0300
Subject: [PATCH 08/83] Try to fix GPXTrackAnalysisUpdatesTest

---
 .../net/osmand/shared/gpx/GpxDbHelper.kt      |  2 --
 .../GPXTrackAnalysisUpdatesTest.java          | 33 ++++++++++++++++---
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDbHelper.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDbHelper.kt
index ca7bfa10e7c..26034ae34c4 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDbHelper.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDbHelper.kt
@@ -33,7 +33,6 @@ object GpxDbHelper : GpxReaderAdapter {
 	private const val READER_TASKS_LIMIT = 4
 	private var readers = mutableListOf<GpxReader>()
 	private var readerSync = Synchronizable()
-	var readTrackItemCount: Long = 0
 
 	private var initialized: Boolean = false
 
@@ -250,7 +249,6 @@ object GpxDbHelper : GpxReaderAdapter {
 		}
 		val item = dataItems[file]
 		if (GpxDbUtils.isAnalyseNeeded(item)) {
-			readTrackItemCount++
 			readGpxItem(file, item, callback)
 		}
 		return item
diff --git a/OsmAnd/test/java/net/osmand/test/activities/GPXTrackAnalysisUpdatesTest.java b/OsmAnd/test/java/net/osmand/test/activities/GPXTrackAnalysisUpdatesTest.java
index c5c6a7b3c0a..f5dd4262835 100644
--- a/OsmAnd/test/java/net/osmand/test/activities/GPXTrackAnalysisUpdatesTest.java
+++ b/OsmAnd/test/java/net/osmand/test/activities/GPXTrackAnalysisUpdatesTest.java
@@ -22,8 +22,12 @@
 import net.osmand.plus.track.helpers.GpxSelectionHelper;
 import net.osmand.plus.utils.OsmAndFormatter;
 import net.osmand.plus.views.OsmandMapTileView;
+import net.osmand.shared.data.KQuadRect;
+import net.osmand.shared.gpx.GpxDataItem;
 import net.osmand.shared.gpx.GpxDbHelper;
+import net.osmand.shared.gpx.GpxDbHelper.GpxDataItemCallback;
 import net.osmand.shared.gpx.GpxFile;
+import net.osmand.shared.gpx.GpxTrackAnalysis;
 import net.osmand.test.common.AndroidTest;
 import net.osmand.test.common.BaseIdlingResource;
 import net.osmand.test.common.ResourcesImporter;
@@ -77,6 +81,12 @@ public void onGpxSaved(@Nullable String error, @NotNull GpxFile gpxFile) {
 						file = new File(ImportHelper.getGpxDestinationDir(app, true), SELECTED_GPX_NAME);
 						gpxFile.setPath(file.getAbsolutePath());
 						selectionHelper.selectGpxFile(gpxFile, GpxSelectionParams.getDefaultSelectionParams());
+
+						KQuadRect rect = gpxFile.getRect();
+						if (rect.getLeft() != 0 && rect.getRight() != 0) {
+							app.getOsmandMap().getMapView().fitRectToMap(rect.getLeft(), rect.getRight(),
+									rect.getTop(), rect.getBottom(), (int) rect.width(), (int) rect.height(), 0);
+						}
 					}
 				}
 			});
@@ -110,6 +120,8 @@ private class ObserveDistToFinishIdlingResource extends BaseIdlingResource {
 		private static final int LOW_FPS_VALUE = 15;
 		private static final int LOW_FPS_COUNT = 10;
 
+		private GpxTrackAnalysis analysis;
+
 		private int checksCounter;
 		private int lowFpsCounter;
 
@@ -124,7 +136,7 @@ private void startHandler() {
 				checksCounter++;
 
 				checkFPS();
-				checkAnalysisUpdate();
+				checkAnalysisUpdate(); // simulate multiple calls for getting GpxDataItem
 
 				if (isIdleNow()) {
 					notifyIdleTransition();
@@ -151,10 +163,21 @@ private void checkFPS() {
 		}
 
 		private void checkAnalysisUpdate() {
-			gpxDbHelper.getItem(SharedUtil.kFile(file)); // simulate multiple calls for getting GpxDataItem
-			long readItemCount = gpxDbHelper.getReadTrackItemCount();
-			if (readItemCount > 2) {
-				throw new AssertionError("To many updates of analysis " + readItemCount);
+			GpxDataItem dataItem = gpxDbHelper.getItem(SharedUtil.kFile(file), new GpxDataItemCallback() {
+				@Override
+				public boolean isCancelled() {
+					return false;
+				}
+
+				@Override
+				public void onGpxDataItemReady(@NotNull GpxDataItem item) {
+					if (analysis != item.getAnalysis()) {
+						throw new AssertionError("To many updates of analysis ");
+					}
+				}
+			});
+			if (analysis == null && dataItem != null) {
+				analysis = dataItem.getAnalysis();
 			}
 		}
 

From 8b20df10544d2758d9050163f06def054a4a281c Mon Sep 17 00:00:00 2001
From: chumv <chumva.forever@gmail.com>
Date: Thu, 26 Sep 2024 17:07:18 +0300
Subject: [PATCH 09/83] Add null checks in GPXTrackAnalysisUpdatesTest

---
 .../osmand/test/activities/GPXTrackAnalysisUpdatesTest.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/test/java/net/osmand/test/activities/GPXTrackAnalysisUpdatesTest.java b/OsmAnd/test/java/net/osmand/test/activities/GPXTrackAnalysisUpdatesTest.java
index f5dd4262835..41efdaadf1c 100644
--- a/OsmAnd/test/java/net/osmand/test/activities/GPXTrackAnalysisUpdatesTest.java
+++ b/OsmAnd/test/java/net/osmand/test/activities/GPXTrackAnalysisUpdatesTest.java
@@ -171,8 +171,9 @@ public boolean isCancelled() {
 
 				@Override
 				public void onGpxDataItemReady(@NotNull GpxDataItem item) {
-					if (analysis != item.getAnalysis()) {
-						throw new AssertionError("To many updates of analysis ");
+					GpxTrackAnalysis trackAnalysis = item.getAnalysis();
+					if (analysis != null && trackAnalysis != null && analysis != trackAnalysis) {
+						throw new AssertionError("To many updates of analysis");
 					}
 				}
 			});

From 4cdead7a4d681b28e1dc13e31676d5d4cd1efc1d Mon Sep 17 00:00:00 2001
From: nazar-kutz <vitaminkuna@gmail.com>
Date: Thu, 26 Sep 2024 19:21:48 +0300
Subject: [PATCH 10/83] Implement quick actions for Trip Recording (issue
 #20800)

---
 OsmAnd/res/values/strings.xml                 | 10 +++
 .../monitoring/OsmandMonitoringPlugin.java    | 68 ++++++++++++++----
 .../monitoring/TripRecordingBottomSheet.java  | 21 +-----
 .../TripRecordingOptionsBottomSheet.java      | 29 +++-----
 .../actions/BaseTripRecordingAction.java      | 34 +++++++++
 .../actions/FinishTripRecordingAction.java    | 59 +++++++++++++++
 .../SaveRecordedTripAndContinueAction.java    | 64 +++++++++++++++++
 .../actions/StartNewTripSegmentAction.java    | 58 +++++++++++++++
 .../actions/TripRecordingAction.java          | 71 +++++++++++++++++++
 .../plus/quickaction/QuickActionIds.java      |  4 ++
 .../src/net/osmand/plus/track/GpxDialogs.java |  8 +--
 11 files changed, 373 insertions(+), 53 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/BaseTripRecordingAction.java
 create mode 100644 OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/FinishTripRecordingAction.java
 create mode 100644 OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/SaveRecordedTripAndContinueAction.java
 create mode 100644 OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/StartNewTripSegmentAction.java
 create mode 100644 OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/TripRecordingAction.java

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index cbd4fb79395..8064a52f340 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -10,6 +10,16 @@
 	- For wording and consistency, please note https://docs.osmand.net/docs/technical/contributions/translating-osmand
 	Thx - Hardy
 -->
+    <string name="track_does_not_contain_data_to_save">Track doesn\'t contain data to save.</string>
+    <string name="quick_action_finish_trip_recording_summary">A button to save the GPX track and finish trip recording.</string>
+    <string name="start_trip_recording_first_m">Please start trip recording first.</string>
+    <string name="new_segment_started_m">Started recording a new track segment.</string>
+    <string name="quick_action_save_recorded_trip_and_continue_summary">A button to save the current recorded trip as a GPX file and continue recording a new track without interruption.</string>
+    <string name="quick_action_save_recorded_trip_and_continue">Recorded Trip &amp; Continue</string>
+    <string name="quick_action_new_trip_segment">A button to start a new segment in the ongoing GPX track recording.</string>
+    <string name="new_trip_segment">New trip segment</string>
+    <string name="quick_action_start_pause_recording">A button to start, pause or resume recording of the GPX track.</string>
+    <string name="quick_action_verb_start_pause">Start / Pause</string>
     <string name="unknown_bt_device">Unknown device</string>
     <string name="obd_vin">VIN</string>
     <string name="obd_vin_desc">VIN code over OBD</string>
diff --git a/OsmAnd/src/net/osmand/plus/plugins/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/plugins/monitoring/OsmandMonitoringPlugin.java
index e900751bd93..dc1168ed365 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/plugins/monitoring/OsmandMonitoringPlugin.java
@@ -18,6 +18,11 @@
 import net.osmand.Location;
 import net.osmand.PlatformUtil;
 import net.osmand.data.ValueHolder;
+import net.osmand.plus.plugins.monitoring.actions.FinishTripRecordingAction;
+import net.osmand.plus.plugins.monitoring.actions.SaveRecordedTripAndContinueAction;
+import net.osmand.plus.plugins.monitoring.actions.StartNewTripSegmentAction;
+import net.osmand.plus.plugins.monitoring.actions.TripRecordingAction;
+import net.osmand.plus.quickaction.QuickActionType;
 import net.osmand.shared.gpx.GpxFile;
 import net.osmand.plus.NavigationService;
 import net.osmand.plus.OsmAndTaskManager.OsmAndTaskRunnable;
@@ -229,17 +234,9 @@ public SelectedGpxFile getCurrentTrack() {
 		return app.getSavingTrackHelper().getCurrentTrack();
 	}
 
-	public boolean wasTrackMonitored() {
-		return settings.SAVE_GLOBAL_TRACK_TO_GPX.get();
-	}
-
-	public boolean hasDataToSave() {
-		return app.getSavingTrackHelper().hasDataToSave();
-	}
-
 	public void askShowTripRecordingDialog(@NonNull FragmentActivity activity) {
 		FragmentManager fragmentManager = activity.getSupportFragmentManager();
-		if (hasDataToSave() || wasTrackMonitored()) {
+		if (hasDataToSave() || isRecordingTrack()) {
 			TripRecordingBottomSheet.showInstance(fragmentManager);
 		} else {
 			askStartRecording(activity);
@@ -263,7 +260,7 @@ private void askStartRecordingStep2(@NonNull FragmentActivity activity) {
 
 	public void startRecording(@Nullable FragmentActivity activity) {
 		app.getSavingTrackHelper().startNewSegment();
-		app.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.set(true);
+		setRecordingTrack(true);
 		app.startNavigationService(NavigationService.USED_BY_GPX);
 
 		if (activity != null) {
@@ -271,6 +268,15 @@ public void startRecording(@Nullable FragmentActivity activity) {
 		}
 	}
 
+	public boolean finishRecording() {
+		if (mapActivity != null && hasDataToSave()) {
+			saveCurrentTrack(null, mapActivity);
+			app.getNotificationHelper().refreshNotifications();
+			return true;
+		}
+		return false;
+	}
+
 	public void saveCurrentTrack() {
 		saveCurrentTrack(null, null, true, false);
 	}
@@ -374,12 +380,28 @@ public void updateWidgets() {
 		}
 	}
 
+	public void pauseOrResumeRecording() {
+		if (isRecordingTrack()) {
+			setRecordingTrack(false);
+			NavigationService navigationService = app.getNavigationService();
+			if (navigationService != null) {
+				navigationService.stopIfNeeded(app, NavigationService.USED_BY_GPX);
+			}
+		} else {
+			setRecordingTrack(true);
+			app.startNavigationService(NavigationService.USED_BY_GPX);
+			if (mapActivity != null) {
+				AndroidUtils.requestNotificationPermissionIfNeeded(mapActivity);
+			}
+		}
+	}
+
 	public void stopRecording() {
 		stopRecording(false);
 	}
 
 	public void stopRecording(boolean clearData) {
-		settings.SAVE_GLOBAL_TRACK_TO_GPX.set(false);
+		setRecordingTrack(false);
 		app.getSavingTrackHelper().onStopRecording(clearData);
 		if (app.getNavigationService() != null) {
 			app.getNavigationService().stopIfNeeded(app, NavigationService.USED_BY_GPX);
@@ -390,6 +412,18 @@ public boolean isSaving() {
 		return isSaving;
 	}
 
+	public void setRecordingTrack(boolean recording) {
+		settings.SAVE_GLOBAL_TRACK_TO_GPX.set(recording);
+	}
+
+	public boolean isRecordingTrack() {
+		return settings.SAVE_GLOBAL_TRACK_TO_GPX.get();
+	}
+
+	public boolean hasDataToSave() {
+		return app.getSavingTrackHelper().hasDataToSave();
+	}
+
 	public boolean isLiveMonitoringEnabled() {
 		return liveMonitoringHelper.isLiveMonitoringEnabled();
 	}
@@ -404,8 +438,8 @@ public void startGPXMonitoring(@Nullable FragmentActivity activity) {
 		if (choice.value || activity == null) {
 			Runnable runnable = () -> {
 				app.getSavingTrackHelper().startNewSegment();
+				setRecordingTrack(true);
 				settings.SAVE_GLOBAL_TRACK_INTERVAL.set(vs.value);
-				settings.SAVE_GLOBAL_TRACK_TO_GPX.set(true);
 				settings.SAVE_GLOBAL_TRACK_REMEMBER.set(choice.value);
 
 				if (activity != null) {
@@ -423,4 +457,14 @@ public void startGPXMonitoring(@Nullable FragmentActivity activity) {
 	public DashFragmentData getCardFragment() {
 		return DashTrackFragment.FRAGMENT_DATA;
 	}
+
+	@Override
+	protected List<QuickActionType> getQuickActionTypes() {
+		List<QuickActionType> quickActionTypes = new ArrayList<>();
+		quickActionTypes.add(TripRecordingAction.TYPE);
+		quickActionTypes.add(StartNewTripSegmentAction.TYPE);
+		quickActionTypes.add(SaveRecordedTripAndContinueAction.TYPE);
+		quickActionTypes.add(FinishTripRecordingAction.TYPE);
+		return quickActionTypes;
+	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/plugins/monitoring/TripRecordingBottomSheet.java b/OsmAnd/src/net/osmand/plus/plugins/monitoring/TripRecordingBottomSheet.java
index 0989d084ca8..1aff447b737 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/monitoring/TripRecordingBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/plugins/monitoring/TripRecordingBottomSheet.java
@@ -217,20 +217,8 @@ private void setupResumePauseButton(View container) {
 				blockStatisticsBuilder.runUpdatingStatBlocksIfNeeded();
 				handler.startChartUpdatesIfNotRunning();
 			}
-			if (isRecordingTrack) {
-				settings.SAVE_GLOBAL_TRACK_TO_GPX.set(false);
-				NavigationService navigationService = app.getNavigationService();
-				if (navigationService != null) {
-					navigationService.stopIfNeeded(app, NavigationService.USED_BY_GPX);
-				}
-			} else {
-				app.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.set(true);
-				app.startNavigationService(NavigationService.USED_BY_GPX);
-
-				FragmentActivity activity = getMapActivity();
-				if (activity != null) {
-					AndroidUtils.requestNotificationPermissionIfNeeded(activity);
-				}
+			if (plugin != null) {
+				plugin.pauseOrResumeRecording();
 			}
 			updateStatus();
 			createItem(resumePauseButton, !isRecordingTrack ? ItemType.PAUSE : ItemType.RESUME);
@@ -241,10 +229,7 @@ private void setupFinishButton(View container) {
 		CardView finishButton = container.findViewById(R.id.button_center_right);
 		createItem(finishButton, ItemType.FINISH);
 		finishButton.setOnClickListener(v -> {
-			MapActivity mapActivity = getMapActivity();
-			if (mapActivity != null && plugin != null && hasDataToSave()) {
-				plugin.saveCurrentTrack(null, mapActivity);
-				app.getNotificationHelper().refreshNotifications();
+			if (plugin != null && plugin.finishRecording()) {
 				dismiss();
 			}
 		});
diff --git a/OsmAnd/src/net/osmand/plus/plugins/monitoring/TripRecordingOptionsBottomSheet.java b/OsmAnd/src/net/osmand/plus/plugins/monitoring/TripRecordingOptionsBottomSheet.java
index 54ae62b581a..0fa7c0ab5d8 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/monitoring/TripRecordingOptionsBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/plugins/monitoring/TripRecordingOptionsBottomSheet.java
@@ -103,12 +103,9 @@ public void createMenuItems(Bundle savedInstanceState) {
 
 		items.add(new BaseBottomSheetItem.Builder()
 				.setCustomView(buttonClear)
-				.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						if (fragmentManager != null && hasDataToSave()) {
-							TripRecordingClearDataBottomSheet.showInstance(fragmentManager, TripRecordingOptionsBottomSheet.this);
-						}
+				.setOnClickListener(v -> {
+					if (fragmentManager != null && hasDataToSave()) {
+						TripRecordingClearDataBottomSheet.showInstance(fragmentManager, TripRecordingOptionsBottomSheet.this);
 					}
 				})
 				.create());
@@ -117,12 +114,9 @@ public void onClick(View v) {
 
 		items.add(new BaseBottomSheetItem.Builder()
 				.setCustomView(buttonDiscard)
-				.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						if (fragmentManager != null) {
-							TripRecordingDiscardBottomSheet.showInstance(fragmentManager, TripRecordingOptionsBottomSheet.this);
-						}
+				.setOnClickListener(v -> {
+					if (fragmentManager != null) {
+						TripRecordingDiscardBottomSheet.showInstance(fragmentManager, TripRecordingOptionsBottomSheet.this);
 					}
 				})
 				.create());
@@ -131,13 +125,10 @@ public void onClick(View v) {
 
 		items.add(new BaseBottomSheetItem.Builder()
 				.setCustomView(buttonOnline)
-				.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						boolean wasOnlineMonitored = !settings.LIVE_MONITORING.get();
-						settings.LIVE_MONITORING.set(wasOnlineMonitored);
-						createItem(buttonOnline, wasOnlineMonitored ? ItemType.STOP_ONLINE : ItemType.START_ONLINE);
-					}
+				.setOnClickListener(v -> {
+					boolean wasOnlineMonitored = !settings.LIVE_MONITORING.get();
+					settings.LIVE_MONITORING.set(wasOnlineMonitored);
+					createItem(buttonOnline, wasOnlineMonitored ? ItemType.STOP_ONLINE : ItemType.START_ONLINE);
 				})
 				.create());
 
diff --git a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/BaseTripRecordingAction.java b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/BaseTripRecordingAction.java
new file mode 100644
index 00000000000..f4cffb149b4
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/BaseTripRecordingAction.java
@@ -0,0 +1,34 @@
+package net.osmand.plus.plugins.monitoring.actions;
+
+import androidx.annotation.Nullable;
+
+import net.osmand.plus.plugins.PluginsHelper;
+import net.osmand.plus.plugins.monitoring.OsmandMonitoringPlugin;
+import net.osmand.plus.quickaction.QuickAction;
+import net.osmand.plus.quickaction.QuickActionType;
+
+abstract class BaseTripRecordingAction extends QuickAction {
+
+	public BaseTripRecordingAction(QuickActionType actionType) {
+		super(actionType);
+	}
+
+	public BaseTripRecordingAction(QuickAction quickAction) {
+		super(quickAction);
+	}
+
+	protected boolean isRecordingTrack() {
+		OsmandMonitoringPlugin plugin = getPlugin();
+		return plugin != null && plugin.isRecordingTrack();
+	}
+
+	protected boolean hasDataToSave() {
+		OsmandMonitoringPlugin plugin = getPlugin();
+		return plugin != null && plugin.hasDataToSave();
+	}
+
+	@Nullable
+	protected OsmandMonitoringPlugin getPlugin() {
+		return PluginsHelper.getPlugin(OsmandMonitoringPlugin.class);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/FinishTripRecordingAction.java b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/FinishTripRecordingAction.java
new file mode 100644
index 00000000000..cafcc49348e
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/FinishTripRecordingAction.java
@@ -0,0 +1,59 @@
+package net.osmand.plus.plugins.monitoring.actions;
+
+import static net.osmand.plus.quickaction.QuickActionIds.FINISH_TRIP_RECORDING_ACTION;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.plugins.monitoring.OsmandMonitoringPlugin;
+import net.osmand.plus.quickaction.QuickAction;
+import net.osmand.plus.quickaction.QuickActionType;
+
+public class FinishTripRecordingAction extends BaseTripRecordingAction {
+
+	public static final QuickActionType TYPE = new QuickActionType(FINISH_TRIP_RECORDING_ACTION,
+			"finish.trip.recording", FinishTripRecordingAction.class)
+			.nameRes(R.string.shared_string_trip_recording)
+			.iconRes(R.drawable.ic_action_trip_rec_finish)
+			.nonEditable()
+			.category(QuickActionType.MY_PLACES)
+			.nameActionRes(R.string.shared_string_finish);
+
+	public FinishTripRecordingAction() {
+		super(TYPE);
+	}
+
+	public FinishTripRecordingAction(QuickAction quickAction) {
+		super(quickAction);
+	}
+
+	@Override
+	public void execute(@NonNull MapActivity mapActivity) {
+		OsmandMonitoringPlugin plugin = getPlugin();
+		if (plugin != null) {
+			OsmandApplication app = mapActivity.getMyApplication();
+			if (!plugin.isRecordingTrack()) {
+				app.showToastMessage(R.string.start_trip_recording_first_m);
+			} else if (!plugin.hasDataToSave()) {
+				app.showToastMessage(R.string.track_does_not_contain_data_to_save);
+			} else {
+				plugin.finishRecording();
+			}
+		}
+	}
+
+	@Override
+	public void drawUI(@NonNull ViewGroup parent, @NonNull MapActivity mapActivity) {
+		View view = LayoutInflater.from(parent.getContext())
+				.inflate(R.layout.quick_action_with_text, parent, false);
+		((TextView) view.findViewById(R.id.text)).setText(R.string.quick_action_finish_trip_recording_summary);
+		parent.addView(view);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/SaveRecordedTripAndContinueAction.java b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/SaveRecordedTripAndContinueAction.java
new file mode 100644
index 00000000000..44d44ea55dd
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/SaveRecordedTripAndContinueAction.java
@@ -0,0 +1,64 @@
+package net.osmand.plus.plugins.monitoring.actions;
+
+import static net.osmand.plus.quickaction.QuickActionIds.SAVE_RECORDED_TRIP_AND_CONTINUE_ACTION;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.plugins.monitoring.OsmandMonitoringPlugin;
+import net.osmand.plus.quickaction.QuickAction;
+import net.osmand.plus.quickaction.QuickActionType;
+import net.osmand.plus.track.helpers.save.SaveGpxHelper;
+import net.osmand.shared.gpx.GpxFile;
+
+public class SaveRecordedTripAndContinueAction extends BaseTripRecordingAction {
+
+	public static final QuickActionType TYPE = new QuickActionType(SAVE_RECORDED_TRIP_AND_CONTINUE_ACTION,
+			"save.trip.and.continue", SaveRecordedTripAndContinueAction.class)
+			.nameRes(R.string.quick_action_save_recorded_trip_and_continue)
+			.iconRes(R.drawable.ic_action_trip_rec_save)
+			.nonEditable()
+			.category(QuickActionType.MY_PLACES)
+			.nameActionRes(R.string.shared_string_save);
+
+	public SaveRecordedTripAndContinueAction() {
+		super(TYPE);
+	}
+
+	public SaveRecordedTripAndContinueAction(QuickAction quickAction) {
+		super(quickAction);
+	}
+
+	@Override
+	public void execute(@NonNull MapActivity mapActivity) {
+		OsmandMonitoringPlugin plugin = getPlugin();
+		if (plugin != null) {
+			OsmandApplication app = mapActivity.getMyApplication();
+			if (!plugin.isRecordingTrack()) {
+				app.showToastMessage(R.string.start_trip_recording_first_m);
+			} else if (!plugin.hasDataToSave()) {
+				app.showToastMessage(R.string.track_does_not_contain_data_to_save);
+			} else {
+				GpxFile gpxFile = app.getSavingTrackHelper().getCurrentTrack().getGpxFile();
+				SaveGpxHelper.saveCurrentTrack(app, gpxFile, errorMessage -> {
+					plugin.saveCurrentTrack(null, mapActivity, false, true);
+				});
+			}
+		}
+	}
+
+	@Override
+	public void drawUI(@NonNull ViewGroup parent, @NonNull MapActivity mapActivity) {
+		View view = LayoutInflater.from(parent.getContext())
+				.inflate(R.layout.quick_action_with_text, parent, false);
+		((TextView) view.findViewById(R.id.text)).setText(R.string.quick_action_save_recorded_trip_and_continue_summary);
+		parent.addView(view);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/StartNewTripSegmentAction.java b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/StartNewTripSegmentAction.java
new file mode 100644
index 00000000000..9df75b46b45
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/StartNewTripSegmentAction.java
@@ -0,0 +1,58 @@
+package net.osmand.plus.plugins.monitoring.actions;
+
+import static net.osmand.plus.quickaction.QuickActionIds.START_NEW_TRIP_SEGMENT_ACTION;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.plugins.monitoring.OsmandMonitoringPlugin;
+import net.osmand.plus.quickaction.QuickAction;
+import net.osmand.plus.quickaction.QuickActionType;
+
+public class StartNewTripSegmentAction extends BaseTripRecordingAction {
+
+	public static final QuickActionType TYPE = new QuickActionType(START_NEW_TRIP_SEGMENT_ACTION,
+			"start.new.trip.segment", StartNewTripSegmentAction.class)
+			.nameRes(R.string.new_trip_segment)
+			.iconRes(R.drawable.ic_action_trip_rec_new_segment)
+			.nonEditable()
+			.category(QuickActionType.MY_PLACES)
+			.nameActionRes(R.string.shared_string_control_start);
+
+	public StartNewTripSegmentAction() {
+		super(TYPE);
+	}
+
+	public StartNewTripSegmentAction(QuickAction quickAction) {
+		super(quickAction);
+	}
+
+	@Override
+	public void execute(@NonNull MapActivity mapActivity) {
+		OsmandMonitoringPlugin plugin = getPlugin();
+		if (plugin != null) {
+			OsmandApplication app = mapActivity.getMyApplication();
+			if (plugin.isRecordingTrack()) {
+				app.getSavingTrackHelper().startNewSegment();
+				app.showToastMessage(R.string.new_segment_started_m);
+			} else {
+				app.showToastMessage(R.string.start_trip_recording_first_m);
+			}
+		}
+	}
+
+	@Override
+	public void drawUI(@NonNull ViewGroup parent, @NonNull MapActivity mapActivity) {
+		View view = LayoutInflater.from(parent.getContext())
+				.inflate(R.layout.quick_action_with_text, parent, false);
+		((TextView) view.findViewById(R.id.text)).setText(R.string.quick_action_new_trip_segment);
+		parent.addView(view);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/TripRecordingAction.java b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/TripRecordingAction.java
new file mode 100644
index 00000000000..0a786c8c13d
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/TripRecordingAction.java
@@ -0,0 +1,71 @@
+package net.osmand.plus.plugins.monitoring.actions;
+
+import static net.osmand.plus.quickaction.QuickActionIds.TRIP_RECORDING_ACTION;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.plugins.monitoring.OsmandMonitoringPlugin;
+import net.osmand.plus.quickaction.QuickAction;
+import net.osmand.plus.quickaction.QuickActionType;
+
+public class TripRecordingAction extends BaseTripRecordingAction {
+
+	public static final QuickActionType TYPE = new QuickActionType(TRIP_RECORDING_ACTION,
+			"trip.recording.startpause", TripRecordingAction.class)
+			.nameRes(R.string.shared_string_trip_recording)
+			.iconRes(R.drawable.ic_action_trip_rec_start)
+			.nonEditable()
+			.category(QuickActionType.MY_PLACES)
+			.nameActionRes(R.string.quick_action_verb_start_pause);
+
+	public TripRecordingAction() {
+		super(TYPE);
+	}
+
+	public TripRecordingAction(QuickAction quickAction) {
+		super(quickAction);
+	}
+
+	@Override
+	public void execute(@NonNull MapActivity mapActivity) {
+		OsmandMonitoringPlugin plugin = getPlugin();
+		if (plugin != null) {
+			if (plugin.hasDataToSave()) {
+				plugin.pauseOrResumeRecording();
+			} else {
+				plugin.askShowTripRecordingDialog(mapActivity);
+			}
+		}
+	}
+
+	@Override
+	public int getIconRes(Context context) {
+		return isRecordingTrack()
+				? R.drawable.ic_action_trip_rec_pause
+				: R.drawable.ic_action_trip_rec_start;
+	}
+
+	@Override
+	public String getActionText(@NonNull OsmandApplication app) {
+		String nameRes = app.getString(getNameRes());
+		String actionName = isRecordingTrack() ? app.getString(R.string.shared_string_pause) : app.getString(R.string.shared_string_control_start);
+		return app.getString(R.string.ltr_or_rtl_combine_via_dash, actionName, nameRes);
+	}
+
+	@Override
+	public void drawUI(@NonNull ViewGroup parent, @NonNull MapActivity mapActivity) {
+		View view = LayoutInflater.from(parent.getContext())
+				.inflate(R.layout.quick_action_with_text, parent, false);
+		((TextView) view.findViewById(R.id.text)).setText(R.string.quick_action_start_pause_recording);
+		parent.addView(view);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionIds.java b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionIds.java
index d13e257f912..6b23a209a6d 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionIds.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionIds.java
@@ -70,4 +70,8 @@ public class QuickActionIds {
 	public static final int OPEN_SEARCH_VIEW_ACTION = 70;
 	public static final int SHOW_HIDE_DRAWER_ACTION = 71;
 	public static final int NAVIGATE_PREVIOUS_SCREEN_ACTION = 72;
+	public static final int TRIP_RECORDING_ACTION = 73;
+	public static final int START_NEW_TRIP_SEGMENT_ACTION = 74;
+	public static final int SAVE_RECORDED_TRIP_AND_CONTINUE_ACTION = 75;
+	public static final int FINISH_TRIP_RECORDING_ACTION = 76;
 }
diff --git a/OsmAnd/src/net/osmand/plus/track/GpxDialogs.java b/OsmAnd/src/net/osmand/plus/track/GpxDialogs.java
index 1d3b7878fc9..678c4791bad 100644
--- a/OsmAnd/src/net/osmand/plus/track/GpxDialogs.java
+++ b/OsmAnd/src/net/osmand/plus/track/GpxDialogs.java
@@ -236,8 +236,8 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
 				item.setSelected(!item.getSelected());
 				alertDialogAdapter.notifyDataSetInvalidated();
 				if (position == 0 && showCurrentGpx && item.getSelected()) {
-					OsmandMonitoringPlugin monitoringPlugin = PluginsHelper.getActivePlugin(OsmandMonitoringPlugin.class);
-					if (monitoringPlugin == null) {
+					OsmandMonitoringPlugin plugin = PluginsHelper.getActivePlugin(OsmandMonitoringPlugin.class);
+					if (plugin == null) {
 						AlertDialog.Builder confirm = new AlertDialog.Builder(new ContextThemeWrapper(activity, themeRes));
 						confirm.setPositiveButton(R.string.shared_string_ok, (dialog, which) -> {
 							Bundle params = new Bundle();
@@ -247,8 +247,8 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
 						confirm.setNegativeButton(R.string.shared_string_cancel, null);
 						confirm.setMessage(activity.getString(R.string.enable_plugin_monitoring_services));
 						confirm.show();
-					} else if (!app.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.get()) {
-						monitoringPlugin.askShowTripRecordingDialog(activity);
+					} else if (!plugin.isRecordingTrack()) {
+						plugin.askShowTripRecordingDialog(activity);
 					}
 				}
 			} else {

From a42f1f75ad2fb79aaa08debbc1acdcc32946edbb Mon Sep 17 00:00:00 2001
From: alex-osm <alex.morozov.osm@gmail.com>
Date: Thu, 26 Sep 2024 20:43:14 +0300
Subject: [PATCH 11/83] Do not put temp gpx files into gpx database

---
 .../commonMain/kotlin/net/osmand/shared/gpx/GpxDataItem.kt | 7 +++++++
 .../commonMain/kotlin/net/osmand/shared/gpx/GpxDbHelper.kt | 2 +-
 .../commonMain/kotlin/net/osmand/shared/gpx/GpxReader.kt   | 3 +++
 .../kotlin/net/osmand/shared/gpx/GpxUtilities.kt           | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDataItem.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDataItem.kt
index 2ab1893cd72..0ba8c5ac8c1 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDataItem.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDataItem.kt
@@ -2,6 +2,7 @@ package net.osmand.shared.gpx
 
 import net.osmand.shared.io.KFile
 import net.osmand.shared.routing.ColoringType
+import net.osmand.shared.util.PlatformUtil
 
 class GpxDataItem(
 	file: KFile
@@ -9,6 +10,12 @@ class GpxDataItem(
 
 	private var analysis: GpxTrackAnalysis? = null
 
+	companion object {
+		fun isRegularTrack(file: KFile) = file.path().startsWith(PlatformUtil.getOsmAndContext().getGpxDir().path())
+	}
+
+	fun isRegularTrack() = Companion.isRegularTrack(file)
+
 	fun getAnalysis(): GpxTrackAnalysis? {
 		return analysis
 	}
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDbHelper.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDbHelper.kt
index 26034ae34c4..a2f635a6d04 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDbHelper.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDbHelper.kt
@@ -248,7 +248,7 @@ object GpxDbHelper : GpxReaderAdapter {
 			return null
 		}
 		val item = dataItems[file]
-		if (GpxDbUtils.isAnalyseNeeded(item)) {
+		if (GpxDbUtils.isAnalyseNeeded(item) && GpxDataItem.isRegularTrack(file)) {
 			readGpxItem(file, item, callback)
 		}
 		return item
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxReader.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxReader.kt
index 4f79184b486..9822ed59cdb 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxReader.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxReader.kt
@@ -93,6 +93,9 @@ class GpxReader(private val adapter: GpxReaderAdapter)
 		if (gpxFile.error == null) {
 			val analyser = PlatformUtil.getOsmAndContext().getTrackPointsAnalyser()
 			updatedItem.setAnalysis(gpxFile.getAnalysis(file.lastModified(), null, null, analyser))
+			if (!updatedItem.isRegularTrack()) {
+				return updatedItem
+			}
 			val creationTime: Long = updatedItem.requireParameter(GpxParameter.FILE_CREATION_TIME)
 			if (creationTime <= 0) {
 				updatedItem.setParameter(GpxParameter.FILE_CREATION_TIME, GpxUtilities.getCreationTime(gpxFile))
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt
index 25bd7f59dd4..2ac69d55e8c 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt
@@ -974,7 +974,7 @@ object GpxUtilities {
 			gpxFile.modifiedTime = file.lastModified()
 			gpxFile.pointsModifiedTime = gpxFile.modifiedTime
 			if (gpxFile.error != null) {
-				log.info("Error reading gpx ${gpxFile.path}")
+				log.info("Error reading gpx ${gpxFile.path}: ${gpxFile.error!!.message}")
 			}
 			gpxFile
 		} catch (e: IOException) {

From 29fe3d793ab83c68120fcb0d3c5b9c15cbf0e35d Mon Sep 17 00:00:00 2001
From: 0xRe1nk0 <0xre1nk0@gmail.com>
Date: Fri, 27 Sep 2024 09:37:26 +0300
Subject: [PATCH 12/83] Add reset average speed action

---
 OsmAnd/res/layout/setting_action_button.xml   | 19 +++++++++++++
 OsmAnd/res/values/strings.xml                 |  1 +
 .../AverageSpeedWidgetSettingFragment.java    | 11 ++++++++
 .../utils/AverageSpeedComputer.java           |  4 +++
 .../widgets/AverageSpeedWidget.java           | 28 ++++++++++++++++++-
 .../mapwidgets/widgets/SimpleWidget.java      | 12 +++++++-
 6 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 OsmAnd/res/layout/setting_action_button.xml

diff --git a/OsmAnd/res/layout/setting_action_button.xml b/OsmAnd/res/layout/setting_action_button.xml
new file mode 100644
index 00000000000..3a640cb6c0d
--- /dev/null
+++ b/OsmAnd/res/layout/setting_action_button.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:minHeight="@dimen/bottom_sheet_list_item_height">
+
+	<TextView
+		android:id="@+id/action_title"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_marginHorizontal="@dimen/content_padding"
+		android:textColor="?attr/active_color_basic"
+		android:textSize="@dimen/default_list_text_size"
+		tools:text="Action" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 6a2eb4a29ff..f9fa6b57900 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -10,6 +10,7 @@
 	- For wording and consistency, please note https://docs.osmand.net/docs/technical/contributions/translating-osmand
 	Thx - Hardy
 -->
+    <string name="reset_average_speed">Reset average speed</string>
     <string name="unit_volt">V</string>
 	<string name="wikimedia">Wikimedia</string>
 	<string name="open_in_browser">Open in browser</string>
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/configure/settings/AverageSpeedWidgetSettingFragment.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/configure/settings/AverageSpeedWidgetSettingFragment.java
index cfd0d6f6f4d..af9ad1573bb 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/configure/settings/AverageSpeedWidgetSettingFragment.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/configure/settings/AverageSpeedWidgetSettingFragment.java
@@ -59,6 +59,7 @@ protected void setupContent(@NonNull LayoutInflater themedInflater, @NonNull Vie
 		setupSkipStopsSetting();
 		themedInflater.inflate(R.layout.divider, container);
 		super.setupContent(themedInflater, container);
+		setupSettingAction(themedInflater, container);
 	}
 
 	private void setupIntervalSliderCard() {
@@ -85,6 +86,16 @@ private void setupSkipStopsSetting() {
 		skipStopsContainer.setBackground(getPressedStateDrawable());
 	}
 
+	private void setupSettingAction(@NonNull LayoutInflater themedInflater, @NonNull ViewGroup container) {
+		themedInflater.inflate(R.layout.divider, container);
+		View actionView = themedInflater.inflate(R.layout.setting_action_button, null);
+		actionView.setBackground(getPressedStateDrawable());
+		actionView.setOnClickListener(v -> speedWidget.resetAverageSpeed());
+		TextView title = actionView.findViewById(R.id.action_title);
+		title.setText(R.string.reset_average_speed);
+		container.addView(actionView);
+	}
+
 	@Override
 	public void onSaveInstanceState(@NonNull Bundle outState) {
 		super.onSaveInstanceState(outState);
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/utils/AverageSpeedComputer.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/utils/AverageSpeedComputer.java
index 56df0fa1c46..ec64805a880 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/utils/AverageSpeedComputer.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/utils/AverageSpeedComputer.java
@@ -148,6 +148,10 @@ public static int getConvertedSpeedToSkip(@NonNull SpeedConstants speedSystem) {
 		}
 	}
 
+	public void resetLocations() {
+		locations.clear();
+	}
+
 	private static class SegmentsList {
 
 		private final Segment[] segments;
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/AverageSpeedWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/AverageSpeedWidget.java
index 4a3ab14d991..db20fa07c5e 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/AverageSpeedWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/AverageSpeedWidget.java
@@ -5,17 +5,23 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.preferences.CommonPreference;
+import net.osmand.plus.utils.ColorUtilities;
 import net.osmand.plus.utils.OsmAndFormatter;
 import net.osmand.plus.utils.OsmAndFormatter.FormattedValue;
+import net.osmand.plus.utils.UiUtilities;
 import net.osmand.plus.views.layers.base.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.mapwidgets.WidgetsPanel;
 import net.osmand.plus.views.mapwidgets.utils.AverageSpeedComputer;
-import net.osmand.plus.views.mapwidgets.WidgetType;
+import net.osmand.plus.widgets.popup.PopUpMenuItem;
 import net.osmand.util.Algorithms;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class AverageSpeedWidget extends SimpleWidget {
 
 	private static final String MEASURED_INTERVAL_PREF_ID = "average_speed_measured_interval_millis";
@@ -77,6 +83,26 @@ private void updateAverageSpeed() {
 		}
 	}
 
+	@Nullable
+	@Override
+	protected List<PopUpMenuItem> getWidgetActions() {
+		List<PopUpMenuItem> actions = new ArrayList<>();
+		UiUtilities uiUtilities = app.getUIUtilities();
+		int iconColor = ColorUtilities.getDefaultIconColor(app, nightMode);
+
+		actions.add(new PopUpMenuItem.Builder(app)
+				.setIcon(uiUtilities.getPaintedIcon(R.drawable.ic_action_reset_to_default_dark, iconColor))
+				.setTitleId(R.string.reset_average_speed)
+				.setOnClickListener(item -> resetAverageSpeed())
+				.showTopDivider(true)
+				.create());
+		return actions;
+	}
+
+	public void resetAverageSpeed() {
+		averageSpeedComputer.resetLocations();
+	}
+
 	@Override
 	public void copySettings(@NonNull ApplicationMode appMode, @Nullable String customId) {
 		copySettingsFromMode(appMode, appMode, customId);
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/SimpleWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/SimpleWidget.java
index 6efa85f67e0..1d78279ad4a 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/SimpleWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/SimpleWidget.java
@@ -217,6 +217,11 @@ public void showContextWidgetMenu(@NonNull View view) {
 					.setOnClickListener(item -> ConfigureWidgetsFragment.showInstance(mapActivity, widgetInfo.getWidgetPanel(), appMode, widgetId, true))
 					.create());
 
+			List<PopUpMenuItem> widgetActions = getWidgetActions();
+			if (!Algorithms.isEmpty(widgetActions)) {
+				items.addAll(widgetActions);
+			}
+
 			WidgetSettingsBaseFragment fragment = widgetType != null ? widgetType.getSettingsFragment(app, widgetInfo) : null;
 			if (fragment != null) {
 				items.add(new PopUpMenuItem.Builder(app)
@@ -229,7 +234,7 @@ public void showContextWidgetMenu(@NonNull View view) {
 							WidgetSettingsBaseFragment.showFragment(manager, args, null, fragment);
 						})
 						.setIcon(uiUtilities.getPaintedIcon(R.drawable.ic_action_settings_outlined, iconColor))
-						.showTopDivider(true)
+						.showTopDivider(Algorithms.isEmpty(widgetActions))
 						.create());
 			}
 
@@ -261,6 +266,11 @@ public void showContextWidgetMenu(@NonNull View view) {
 		}
 	}
 
+	@Nullable
+	protected List<PopUpMenuItem> getWidgetActions() {
+		return null;
+	}
+
 	@Override
 	public final void updateInfo(@Nullable OsmandMapLayer.DrawSettings drawSettings) {
 		boolean shouldHideTopWidgets = (verticalWidget && mapActivity.getWidgetsVisibilityHelper().shouldHideVerticalWidgets());

From a5f7a154627e76d1f0d3eafe2b68d790856c73d0 Mon Sep 17 00:00:00 2001
From: 0xRe1nk0 <0xre1nk0@gmail.com>
Date: Fri, 27 Sep 2024 09:43:53 +0300
Subject: [PATCH 13/83] Merge fix

---
 OsmAnd/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 8278dc3ffe5..40766b86e3d 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -67,6 +67,7 @@
 
     <string name="shared_string_obd">OBD</string>
     <string name="obd_widget_group">Vehicle Metrics</string>
+    <string name="vehicle_metrics_plugin_settings">Vehicle Metrics settings</string>
     <string name="percent_unit">%</string>
     <string name="obd_rpm">RPM</string>
     <string name="rpm_unit">rpm</string>

From f643b7ae751de5c6bf603b867440438d902e3e55 Mon Sep 17 00:00:00 2001
From: alex-osm <alex.morozov.osm@gmail.com>
Date: Fri, 27 Sep 2024 11:33:06 +0300
Subject: [PATCH 14/83] Fix zip files import

---
 OsmAnd/src/net/osmand/PlatformUtil.java       | 36 +++++++++++++++++--
 .../settings/backend/backup/ZipWriter.java    |  3 ++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/PlatformUtil.java b/OsmAnd/src/net/osmand/PlatformUtil.java
index e4b6ae40837..16f3130fa94 100644
--- a/OsmAnd/src/net/osmand/PlatformUtil.java
+++ b/OsmAnd/src/net/osmand/PlatformUtil.java
@@ -1,5 +1,6 @@
 package net.osmand;
 
+import android.os.Build;
 import android.util.Xml;
 
 import androidx.annotation.NonNull;
@@ -11,7 +12,11 @@
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlSerializer;
 
+import java.io.File;
 import java.io.IOException;
+import java.util.zip.ZipException;
+
+import dalvik.system.ZipPathValidator;
 
 /**
  * That class is replacing of standard LogFactory due to
@@ -32,6 +37,10 @@ public class PlatformUtil {
 
 	private static OsmandRegions osmandRegions;
 
+	static {
+		setupZipPathValidator();
+	}
+
 	private static class OsmandLogImplementation implements Log {
 
 		private final String fullName;
@@ -133,8 +142,6 @@ public boolean isTraceEnabled() {
 			return android.util.Log.isLoggable(TAG, android.util.Log.VERBOSE);
 		}
 
-
-
 		@Override
 		public boolean isDebugEnabled() {
 			// For debug purposes always true
@@ -204,4 +211,29 @@ public static XmlSerializer newSerializer() {
 		return Xml.newSerializer();
 	}
 
+	public static void setupZipPathValidator() {
+		if (Build.VERSION.SDK_INT >= 34) {
+			ZipPathValidator.setCallback(new ZipPathValidator.Callback() {
+				@Override
+				public void onZipEntryAccess(@NonNull String path) throws ZipException {
+					// Skip this check as we have such paths in OSF files ("/tracks/name.gpx")
+					//if (path.startsWith("/")) {
+					//	 throw new ZipException("Invalid zip entry path: " + path);
+					//}
+					if (path.contains("..")) {
+						// If the string does contain "..", break it down into its actual name elements to
+						// ensure it actually contains ".." as a name, not just a name like "foo..bar" or even
+						// "foo..", which should be fine.
+						File file = new File(path);
+						while (file != null) {
+							if (file.getName().equals("..")) {
+								throw new ZipException("Invalid zip entry path: " + path);
+							}
+							file = file.getParentFile();
+						}
+					}
+				}
+			});
+		}
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/backup/ZipWriter.java b/OsmAnd/src/net/osmand/plus/settings/backend/backup/ZipWriter.java
index d5dc6eaf8b8..7d40962d504 100644
--- a/OsmAnd/src/net/osmand/plus/settings/backend/backup/ZipWriter.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/backup/ZipWriter.java
@@ -55,6 +55,9 @@ private void writeItemToStream(@NonNull SettingsItemWriter<? extends SettingsIte
 
 	protected ZipEntry createNewEntry(@NonNull SettingsItemWriter<? extends SettingsItem> itemWriter,
 									  @NonNull String fileName) {
+		if (fileName.startsWith(File.separator)) {
+			fileName = fileName.substring(1);
+		}
 		ZipEntry entry = new ZipEntry(fileName);
 		if (itemWriter.getItem() instanceof FileSettingsItem) {
 			FileSettingsItem fileSettingsItem = (FileSettingsItem) itemWriter.getItem();

From 2734860396ad7eebaafb2280b1d128efd6ea1e83 Mon Sep 17 00:00:00 2001
From: Ettore Atalan <atalanttore@googlemail.com>
Date: Thu, 26 Sep 2024 16:05:16 +0000
Subject: [PATCH 15/83] Translated using Weblate (German)

Currently translated at 100.0% (5302 of 5302 strings)
---
 OsmAnd/res/values-de/strings.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 7ef2274c919..b7d9f972415 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -5950,4 +5950,14 @@
     <string name="obd_plugin_description">Zugriff auf Ihre Fahrzeuginformationen über das OBD-Protokoll</string>
     <string name="obd_support">OBD Unterstützung</string>
     <string name="obd_battery_voltage">Batteriespannung</string>
+    <string name="obd_rpm_desc">Zeigt mithilfe des OBD-Sensors die Drehzahl des Fahrzeugtachos an</string>
+    <string name="obd_air_intake_temp_desc">Zeigt mithilfe des OBD-Sensors die Ansauglufttemperatur des Fahrzeugs an</string>
+    <string name="obd_ambient_air_temp_desc">Zeigt mithilfe des OBD-Sensors die Umgebungslufttemperatur an</string>
+    <string name="obd_engine_coolant_temp_desc">Zeigt mithilfe des OBD-Sensors die Motorkühlmitteltemperatur an</string>
+    <string name="obd_battery_voltage_desc">Zeigt mithilfe des OBD-Sensors die Batteriespannung an</string>
+    <string name="obd_fuel_left_distance_desc">Zeigt mithilfe des OBD-Sensors an, wie weit das Fahrzeug mit dem linken Kraftstoffstand noch fahren kann</string>
+    <string name="obd_fuel_level_desc">Zeigt mithilfe des OBD-Sensors den Kraftstoffstand des Fahrzeugs an</string>
+    <string name="obd_fuel_type_desc">Zeigt mithilfe des OBD-Sensors die Kraftstoffart des Fahrzeugs an</string>
+    <string name="obd_fuel_level">Kraftstoffstand</string>
+    <string name="obd_fuel_consumption_rate_desc">Zeigt den Kraftstoffverbrauch des Fahrzeugs basierend auf dem OBD-Standort an</string>
 </resources>
\ No newline at end of file

From b98df0e1909bc77db76576d10933b6d91445467a Mon Sep 17 00:00:00 2001
From: Evgenii Martynenko <deathstallker@yandex.ru>
Date: Thu, 26 Sep 2024 10:30:20 +0000
Subject: [PATCH 16/83] Translated using Weblate (Russian)

Currently translated at 99.0% (5249 of 5302 strings)
---
 OsmAnd/res/values-ru/strings.xml | 34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index f84d9b48630..a2cb50ad6db 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -5935,29 +5935,29 @@
     <string name="wikimedia">Викимедиа</string>
     <string name="percent_unit">%</string>
     <string name="shared_string_obd">OBD</string>
-    <string name="obd_widget_group">Показатели автомобиля</string>
-    <string name="obd_rpm">RPM</string>
+    <string name="obd_widget_group">Показатели ТС</string>
+    <string name="obd_rpm">Обороты</string>
     <string name="rpm_unit">об/мин</string>
-    <string name="obd_speed_desc">Виджет показывает скорость автомобиля через датчик OBD</string>
-    <string name="obd_rpm_desc">Виджет показывает обороты тахометра автомобиля через датчик OBD</string>
+    <string name="obd_speed_desc">Виджет показывает скорость автомобиля по датчику OBD</string>
+    <string name="obd_rpm_desc">Виджет показывает обороты с тахометра транспортного средства по датчику OBD</string>
     <string name="unit_volt">В</string>
-    <string name="obd_air_intake_temp_desc">Виджет показывает температуру всасываемого воздуха через датчик OBD</string>
-    <string name="obd_battery_voltage_desc">Виджет показывает напряжение аккумулятора через датчик OBD</string>
-    <string name="obd_fuel_left_distance_desc">Виджет показывает расстояние, которое может проехать автомобиль на оставшемся уровне топлива по датчику OBD</string>
-    <string name="obd_air_intake_temp">Температура всасываемого воздуха</string>
-    <string name="obd_ambient_air_temp">Температура окружающего воздуха</string>
+    <string name="obd_air_intake_temp_desc">Виджет показывает температуру всасываемого воздуха по датчику OBD</string>
+    <string name="obd_battery_voltage_desc">Виджет показывает напряжение аккумулятора по датчику OBD</string>
+    <string name="obd_fuel_left_distance_desc">Виджет показывает расстояние, которое может проехать транспортное средство на оставшемся уровне топлива по датчику OBD</string>
+    <string name="obd_air_intake_temp">t° всасываемого воздуха</string>
+    <string name="obd_ambient_air_temp">t° окружающего воздуха</string>
     <string name="obd_battery_voltage">Напряжение батареи</string>
     <string name="obd_fuel_level">Уровень топлива</string>
     <string name="obd_fuel_consumption_rate">Расход топлива</string>
     <string name="obd_fuel_left_distance">Оставшееся топливо (расстояние)</string>
     <string name="obd_fuel_type">Тип топлива</string>
-    <string name="obd_plugin_description">Доступ к информации о вашем автомобиле по протоколу OBD</string>
-    <string name="obd_ambient_air_temp_desc">Виджет показывает температуру окружающего воздуха через датчик OBD</string>
-    <string name="obd_engine_coolant_temp_desc">Виджет показывает температуру охлаждающей жидкости двигателя через датчик OBD</string>
-    <string name="obd_fuel_level_desc">Виджет показывает уровень топлива в автомобиле через датчик OBD</string>
-    <string name="obd_fuel_type_desc">Виджет показывает тип топлива автомобиля через датчик OBD</string>
-    <string name="obd_engine_coolant_temp">Температура охлаждающей жидкости двигателя</string>
-    <string name="obd_fuel_consumption_rate_desc">Виджет показывает расход топлива автомобилем на основе данных OBD и местоположения</string>
-    <string name="obd_plugin_name">Показатели автомобиля</string>
+    <string name="obd_plugin_description">Доступ к информации о вашем транспортном средстве (ТС) по протоколу OBD</string>
+    <string name="obd_ambient_air_temp_desc">Виджет показывает температуру окружающего воздуха по датчику OBD</string>
+    <string name="obd_engine_coolant_temp_desc">Виджет показывает температуру охлаждающей жидкости двигателя по датчику OBD</string>
+    <string name="obd_fuel_level_desc">Виджет показывает уровень топлива в транспортном средстве по датчику OBD</string>
+    <string name="obd_fuel_type_desc">Виджет показывает тип топлива транспортного средства по датчику OBD</string>
+    <string name="obd_engine_coolant_temp">t° охлаждающей жидкости двигателя</string>
+    <string name="obd_fuel_consumption_rate_desc">Виджет показывает расход топлива транспортным средством на основе данных OBD и местоположения</string>
+    <string name="obd_plugin_name">Показатели ТС</string>
     <string name="obd_support">Поддержка OBD</string>
 </resources>
\ No newline at end of file

From 8bd57ade8683a80f4f6ca5994bb8118a5b4c347c Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Thu, 26 Sep 2024 22:53:28 +0000
Subject: [PATCH 17/83] Translated using Weblate (Ukrainian)

Currently translated at 98.9% (5244 of 5302 strings)
---
 OsmAnd/res/values-uk/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 1d42c266837..daaf7ced97d 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -4715,7 +4715,7 @@
     <string name="compass_visible_if_map_rotated">Показується після повороту мапи</string>
     <string name="compass_always_hidden">Постійно прихований</string>
     <string name="compass_always_visible">Показується постійно</string>
-    <string name="compass_click_desc">Підказка: Торкніться віджета компаса, щоб змінити режим орієнтації мапи.</string>
+    <string name="compass_click_desc">Двічі торкніться віджета компаса, щоб змінити режим орієнтації мапи.</string>
     <string name="compass_desc">Показує напрямок на північ.</string>
     <string name="rendering_attr_depthContourColorScheme_description">Колір ізоліній глибин</string>
     <string name="auto_backup_preference_desc">Типово Android створює резервні копії Закладок, ключів мап і налаштувань OsmAnd, щоб відновити їх на нових пристроях або після перевстановлення. Ця резервна копія має обмеження у 25 МБ.

From f43b7d5c5c34684910c75e3325479518a5ab826c Mon Sep 17 00:00:00 2001
From: Tommi <surfing@tommi.space>
Date: Thu, 26 Sep 2024 14:15:29 +0000
Subject: [PATCH 18/83] Translated using Weblate (Italian)

Currently translated at 99.6% (5285 of 5302 strings)
---
 OsmAnd/res/values-it/strings.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 11a3a286dcf..f59110803a8 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -5919,4 +5919,19 @@
     <string name="obd_fuel_type_bifuel_hydrogen">Bifuel a idrogeno</string>
     <string name="obd_fuel_type_hybrid_hydrogen">Ibrida a idrogeno</string>
     <string name="obd_fuel_type_hydrogen">Idrogeno</string>
+    <string name="obd_fuel_type_electric">Elettrico</string>
+    <string name="obd_fuel_type_bifuel_electricity">Bicarburante elettrico</string>
+    <string name="obd_fuel_type_bifuel_electric_combustion">Biocarburante con motore a combustione e elettrico</string>
+    <string name="obd_fuel_type_unknown">Tipo di carburante sconosciuto</string>
+    <string name="shared_string_obd">OBD</string>
+    <string name="obd_widget_group">Misure del veicolo</string>
+    <string name="rpm_unit">giri/min</string>
+    <string name="obd_speed_desc">Mostra la velocità del veicolo sopra il sensore OBD</string>
+    <string name="obd_fuel_consumption_rate">Tasso di consumo del carburante</string>
+    <string name="obd_fuel_left_distance">Carburante restante (distanza)</string>
+    <string name="obd_fuel_type">Tipo di carburante</string>
+    <string name="obd_plugin_name">Misure del veicolo</string>
+    <string name="percent_unit">%</string>
+    <string name="obd_rpm">Giri/minuto</string>
+    <string name="obd_rpm_desc">Mostra il tachimetro giri/minuto sopra il sensore OBD</string>
 </resources>
\ No newline at end of file

From 1971302a172aafe35c1533b76830bd01cb08e045 Mon Sep 17 00:00:00 2001
From: "Miguel A. Bouzada" <mbouzada@gmail.com>
Date: Thu, 26 Sep 2024 09:02:01 +0000
Subject: [PATCH 19/83] Translated using Weblate (Galician)

Currently translated at 69.3% (3679 of 5302 strings)
---
 OsmAnd/res/values-gl/strings.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index 9d20cb89b39..f1acef53906 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -1835,7 +1835,7 @@
     <string name="shared_string_read_more">Ler máis</string>
     <string name="road_blocked">Estrada bloqueada</string>
     <string name="shared_string_select">Escoller</string>
-    <string name="switch_start_finish">Inverter o punto de partida e o destino</string>
+    <string name="switch_start_finish">Inverter os puntos de partida e destino</string>
     <string name="rendering_attr_hideIcons_name">Iconas de puntos de interese</string>
     <string name="item_removed">Elemento retirado</string>
     <string name="n_items_removed">elementos retirados</string>
@@ -3118,7 +3118,7 @@
     <string name="manage_profiles_descr">Crear, importar, editar perfís</string>
     <string name="manage_profiles">Xestionar perfís da aplicación…</string>
     <string name="osmand_settings_descr">Afecta a toda a aplicación</string>
-    <string name="osmand_settings">Axustes do OsmAnd</string>
+    <string name="osmand_settings">Axustes de OsmAnd</string>
     <string name="copy_from_other_profile">Copiar doutro perfil</string>
     <string name="turn_screen_on">Acender a pantalla</string>
     <string name="map_during_navigation_info">Mapa durante a navegación</string>
@@ -3431,7 +3431,7 @@
     <string name="main_actions_descr">Só ten catro botóns.</string>
     <string name="main_actions">Accións principais</string>
     <string name="move_inside_category">Só podes mover obxectos dentro desta categoría.</string>
-    <string name="select_wikipedia_article_langs">Escolle as linguas para os artigos da Wikipedia no mapa. Muda a calquera lingua dispoñíbel mentres les o artigo.</string>
+    <string name="select_wikipedia_article_langs">Seleccione os idiomas dos artigos da Wikipedia no mapa. Cambie a calquera idioma dispoñíbel mentres le o artigo.</string>
     <string name="some_articles_may_not_available_in_lang">Algúns artigos da Wikipedia poden non estar dispoñíbeis na túa lingua.</string>
     <string name="lang_zhyue">Cantonés</string>
     <string name="lang_zhminnan">Min do sur</string>
@@ -4193,4 +4193,5 @@
     <string name="route_roundabout_exit">Colle a saída %1$d</string>
     <string name="quick_action_to_my_location">Á miña localización</string>
     <string name="choose_map_orientation">Escoller a orientación do mapa</string>
+    <string name="backup_and_restore">Copia de seguranza e restauración</string>
 </resources>
\ No newline at end of file

From ac612e9e9f2e0bee9bccb47082ed7314df1eb29a Mon Sep 17 00:00:00 2001
From: "Miguel A. Bouzada" <mbouzada@gmail.com>
Date: Fri, 27 Sep 2024 08:47:09 +0000
Subject: [PATCH 20/83] Translated using Weblate (Galician)

Currently translated at 79.9% (3895 of 4873 strings)
---
 OsmAnd/res/values-gl/phrases.xml | 155 ++++++++++++++++---------------
 1 file changed, 78 insertions(+), 77 deletions(-)

diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index cb2a61916bc..bd12f10b332 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -83,7 +83,7 @@
     <string name="poi_aerodrome">Aeroporto;Aeródromo</string>
     <string name="poi_helipad">Heliporto</string>
     <string name="poi_lighthouse">Faro</string>
-    <string name="poi_bicycle_rental">Alugamento de bicicletas</string>
+    <string name="poi_bicycle_rental">Alugueiro de bicicletas</string>
     <string name="poi_bicycle_parking">Aparcadoiro de bicicletas</string>
     <string name="poi_aerialway_cable_car">Tranvía</string>
     <string name="poi_aerialway_gondola">Góndola</string>
@@ -373,7 +373,7 @@
     <string name="poi_water_transport">Transporte acuático</string>
     <string name="poi_bicycle_transport">Transporte en bicicleta</string>
     <string name="poi_aerialway_transport">Teleférico</string>
-    <string name="poi_node_networks">Nós da rede de sendeiros/bicicletas</string>
+    <string name="poi_node_networks">Nodos da rede de sendeirismo/ciclismo</string>
     <string name="poi_hiking_routes">Roteiros de sendeirismo</string>
     <string name="poi_power">Enerxía</string>
     <string name="poi_communication">Comunicación</string>
@@ -1033,7 +1033,7 @@
     <string name="poi_theatre_genre">Xénero</string>
     <string name="poi_fee">Taxa</string>
     <string name="poi_smoking">Fumadores</string>
-    <string name="poi_delivery">Entrega</string>
+    <string name="poi_delivery">Entrega a domicilio</string>
     <string name="poi_cocktails">Cócteis</string>
     <string name="poi_beauty_salon_service">Servizo</string>
     <string name="poi_recycling_type">Tipo</string>
@@ -1249,7 +1249,7 @@
     <string name="poi_fee_yes">Si;Taxa</string>
     <string name="poi_fee_no">Non</string>
     <string name="poi_wheelchair_accessibility">Accesibilidade para cadeiras de rodas</string>
-    <string name="poi_access_destination">Acceso do destino</string>
+    <string name="poi_access_destination">Acceso ao destino</string>
     <string name="poi_content_silage">Contido: ensilado</string>
     <string name="poi_content_manure">Contido: estrume</string>
     <string name="poi_trade_building_supplies">Materiais da construción</string>
@@ -1701,22 +1701,22 @@
     <string name="poi_network">Rede</string>
     <string name="poi_amusement_arcade">Centro recreativo</string>
     <string name="poi_end_date">Data do remate</string>
-    <string name="poi_vending_bicycle_tube">Válvulas de bicicleta</string>
+    <string name="poi_vending_bicycle_tube">Cámaras de aire para bicicleta</string>
     <string name="poi_bridge_bicycle">Ponte ciclista</string>
     <string name="poi_service_bicycle_retail_no">Venda de bicicletas: non</string>
-    <string name="poi_service_bicycle_repair_no">Arranxo de bicicletas: non</string>
-    <string name="poi_service_bicycle_rental_no">Alugamento de bicicletas: non</string>
-    <string name="poi_service_bicycle_pump_no">Inchado de bicicletas: non</string>
+    <string name="poi_service_bicycle_repair_no">Reparación de bicicletas: non</string>
+    <string name="poi_service_bicycle_rental_no">Alugueiro de bicicletas: non</string>
+    <string name="poi_service_bicycle_pump_no">Bomba de aire para bicicletas: non</string>
     <string name="poi_service_bicycle_diy_no">Ferramentas para autoarranxado: non</string>
     <string name="poi_service_bicycle_cleaning_no">Limpeza de bicicletas: non</string>
     <string name="poi_service_bicycle_chaintool_no">Ferramentas para a cadea: non</string>
     <string name="poi_service_bicycle_second_hand_yes">Venda de bicicletas de segunda man;Bicicletas de segunda man;Bicicletas usadas</string>
     <string name="poi_service_bicycle_second_hand_no">Venda de bicicletas de segunda man: non</string>
-    <string name="poi_bicycle_repair_station">Estación de arranxo para bicicletas</string>
+    <string name="poi_bicycle_repair_station">Estación de reparación para bicicletas;Estación de autoreparación de bicicletas</string>
     <string name="poi_ramp_bicycle_yes">Rampla para bicicletas: si</string>
     <string name="poi_ramp_bicycle_no">Rampla para bicicletas: non</string>
     <string name="poi_cargo_bicycle">Bicicletas</string>
-    <string name="poi_bicycle_parking_tree">Árbore en bicicletas</string>
+    <string name="poi_bicycle_parking_tree">Árbore de bicicletas</string>
     <string name="poi_bicycle_yes">Bicicleta: si</string>
     <string name="poi_bicycle_no">Bicicleta: non</string>
     <string name="poi_atm">Caixeiro automático</string>
@@ -1754,7 +1754,7 @@
     <string name="poi_drive_in_yes">Si;No automóbil</string>
     <string name="poi_drive_through_yes">Si;Dende o automóbil</string>
     <string name="poi_takeaway_filter_yes">Si;Comida para levar</string>
-    <string name="poi_delivery_filter_yes">Si;Servizo a domicilio;Reparto</string>
+    <string name="poi_delivery_filter_yes">Si;Entrega a domicilio</string>
     <string name="poi_outdoor_seating_filter_yes">Si;Asentos ao aire libre</string>
     <string name="poi_cocktails_yes">Si;Cócteis</string>
     <string name="poi_self_service_yes">Si;Autoservizo</string>
@@ -1766,17 +1766,17 @@
     <string name="poi_beach_sand">Area</string>
     <string name="poi_bench_yes">Si;Asento</string>
     <string name="poi_surveillance_yes">Vixiancia: si</string>
-    <string name="poi_service_bicycle_charging_yes">Cargador eléctrico: si</string>
-    <string name="poi_backcountry_yes">Si</string>
-    <string name="poi_scout_yes">Si</string>
+    <string name="poi_service_bicycle_charging_yes">Cargador eléctrico: si;Carga de bicicletas;Carga de bicicletas eléctricas</string>
+    <string name="poi_backcountry_yes">Si;Campo a través</string>
+    <string name="poi_scout_yes">Si;Explorador</string>
     <string name="poi_group_only_yes">Só grupos: si</string>
-    <string name="poi_washing_machine_yes">Si</string>
-    <string name="poi_shower_filter_yes">Si</string>
+    <string name="poi_washing_machine_yes">Si;Lavadora</string>
+    <string name="poi_shower_filter_yes">Si;Cabezal de ducha</string>
     <string name="poi_shower_yes">Ducha: si</string>
-    <string name="poi_caravans_yes">Si</string>
+    <string name="poi_caravans_yes">Si;Caravanas</string>
     <string name="poi_impromptu_yes">Improvisado: si</string>
     <string name="poi_sanitary_dump_station_yes">Estación de refugallos sanitarios: si</string>
-    <string name="poi_power_supply_yes">Si</string>
+    <string name="poi_power_supply_yes">Si;Suministro eléctrico</string>
     <string name="poi_social_facility_for_underprivileged">Desfavorecidos</string>
     <string name="poi_handrail_yes">Varanda: si</string>
     <string name="poi_ramp_yes">Rampla: si</string>
@@ -1792,9 +1792,9 @@
     <string name="poi_microwave_oven_yes">Forno microondas: si</string>
     <string name="poi_water_heater_yes">Quentador de auga: si</string>
     <string name="poi_fair_trade_yes">Comercio xusto: si</string>
-    <string name="poi_compressed_air_yes">Si</string>
-    <string name="poi_car_wash_yes">Si</string>
-    <string name="poi_vacuum_cleaner_yes">Si</string>
+    <string name="poi_compressed_air_yes">Si;Aire comprimido</string>
+    <string name="poi_car_wash_yes">Si;Lavado de coches</string>
+    <string name="poi_vacuum_cleaner_yes">Si;Aspiradora</string>
     <string name="poi_button_operated_yes">Operado por botóns: si</string>
     <string name="poi_free_flying_official_yes">Oficial: si</string>
     <string name="poi_free_flying_guest_guidelines_yes">Directrices do convidado: si</string>
@@ -2015,17 +2015,17 @@
     <string name="poi_provided_for_boy_yes">Atende mozos: si</string>
     <string name="poi_treat_inpatient_yes">Servizos hospitalarios: si</string>
     <string name="poi_counselling_yes">Asesoramento: si</string>
-    <string name="poi_home_visit_yes">Si</string>
+    <string name="poi_home_visit_yes">Si;Visita a domicilio</string>
     <string name="poi_disease_malaria_yes">Paludismo ou malaria: si</string>
     <string name="poi_disease_ebola_yes">Ébola: si</string>
     <string name="poi_disease_autism_yes">Autismo: si</string>
     <string name="poi_disease_aids_yes">Sida: si</string>
     <string name="poi_in_service_yes">En servizo: si</string>
-    <string name="poi_dispensing_yes">Si</string>
+    <string name="poi_dispensing_yes">Si;Baixo receita médica</string>
     <string name="poi_display_yes">Pantalla: si</string>
     <string name="poi_passenger_information_display_yes">Pantalla da información ó pasaxeiro: si</string>
-    <string name="poi_organic_yes">Si</string>
-    <string name="poi_fast_food_cafeteria">Si</string>
+    <string name="poi_organic_yes">Si;Orgánico</string>
+    <string name="poi_fast_food_cafeteria">Si;Cafetería;Cantina</string>
     <string name="poi_drink_wine_yes">Viño: si</string>
     <string name="poi_motorcycle_sales_yes_used">Venda de motos: si, de segunda mán</string>
     <string name="poi_animal_shelter_purpose_adoption_yes">Adopcións: si</string>
@@ -2053,7 +2053,7 @@
     <string name="poi_climbing_bolted_yes">Áncoras fixas: si</string>
     <string name="poi_climbing_summit_log_yes">Rexistro da escalada no cume: si</string>
     <string name="poi_barbecue_grill">Grella do churrasco: si</string>
-    <string name="poi_bulk_purchase_yes">Si</string>
+    <string name="poi_bulk_purchase_yes">Si;Mercado por xunto;Mercado grosista</string>
     <string name="poi_aerialway_occupancy">Capacidade da cabina/cadeira/automóbil</string>
     <string name="poi_aerialway_bubble_yes">Gurgulla</string>
     <string name="poi_aerialway_bubble_no">Sen gurgulla</string>
@@ -2065,7 +2065,7 @@
     <string name="poi_payment_girocard_yes">Girocard</string>
     <string name="poi_payment_discover_card_yes">Discover Card</string>
     <string name="poi_payment_pikepass_yes">PIKEPASS</string>
-    <string name="poi_payment_pikepass_designated">PIKEPASS (indicado)</string>
+    <string name="poi_payment_pikepass_designated">PIKEPASS (sinalizado)</string>
     <string name="poi_payment_icsf_yes">IC Stored Fare</string>
     <string name="poi_payment_prepaid_ticket_yes">Tíquets de prepagamento</string>
     <string name="poi_payment_jcb_yes">JCB</string>
@@ -2116,9 +2116,9 @@
     <string name="poi_brewery_additional">Nome da cervexaría</string>
     <string name="poi_microbrewery_yes">Si;Microcervexaría</string>
     <string name="poi_microbrewery_no">Cervexaría artesá: non</string>
-    <string name="poi_delivery_yes">Servizo a domicilio: si</string>
-    <string name="poi_delivery_no">Servizo a domicilio: non</string>
-    <string name="poi_delivery_only">Só servizo a domicilio</string>
+    <string name="poi_delivery_yes">Entrega a domicilio</string>
+    <string name="poi_delivery_no">Sen entrega a domicilio</string>
+    <string name="poi_delivery_only">Só entrega a domicilio</string>
     <string name="poi_second_hand_yes">Artigos de segunda mán</string>
     <string name="poi_second_hand_no">Sen artigos de segunda mán</string>
     <string name="poi_second_hand_only">Só artigos de segunda mán</string>
@@ -2326,13 +2326,13 @@
     <string name="poi_route_railway_ref">Liña ferroviaria</string>
     <string name="poi_historic_yes">Atracción histórica</string>
     <string name="poi_shop_additional_yes">Con tenda</string>
-    <string name="poi_service_bicycle_retail_yes">Retallista;Comercio polo miúdo;Venda de bicicletas</string>
-    <string name="poi_service_bicycle_repair_yes">Arranxo</string>
-    <string name="poi_service_bicycle_rental_yes">Alugamento</string>
-    <string name="poi_service_bicycle_pump_yes">Inchadoiro</string>
-    <string name="poi_service_bicycle_diy_yes">Ferramentas para o autoarranxo</string>
-    <string name="poi_service_bicycle_cleaning_yes">Limpeza</string>
-    <string name="poi_service_bicycle_chaintool_yes">Ferramenta para as cadeas</string>
+    <string name="poi_service_bicycle_retail_yes">Retallista;Venda polo miúdo;Venda de bicicletas</string>
+    <string name="poi_service_bicycle_repair_yes">Reparación;Reparación de bicicletas</string>
+    <string name="poi_service_bicycle_rental_yes">Alugueiro;Alugueiro de bicicletas</string>
+    <string name="poi_service_bicycle_pump_yes">Bomba de aire;Bomba de aire para bicicletas</string>
+    <string name="poi_service_bicycle_diy_yes">Ferramentas de bricolaxe;Ferramentas de bricolaxe para reparación de bicicletas</string>
+    <string name="poi_service_bicycle_cleaning_yes">Limpeza;Limpeza de bicicletas</string>
+    <string name="poi_service_bicycle_chaintool_yes">Tronzacadeas;Ferramenta para cadeas de bicicletas</string>
     <string name="poi_service_bicycle_charging_no">Cargador eléctrico: non</string>
     <string name="poi_wildlife_hide">Observatorio de vida salvaxe</string>
     <string name="poi_training_language">Adestramento: lingua</string>
@@ -2846,7 +2846,7 @@
     <string name="poi_license_classes">Clases de licenza</string>
     <string name="poi_hill">Outeiro</string>
     <string name="poi_shoe_repair">Arranxo do calzado</string>
-    <string name="poi_bulk_purchase_only">Só</string>
+    <string name="poi_bulk_purchase_only">Só;Só mercado por xunto;Só mercado grosista</string>
     <string name="poi_pipeline_substation">Subestación de tubaxes</string>
     <string name="poi_substation_transmission">Transmisión</string>
     <string name="poi_substation_distribution">Distribución</string>
@@ -3504,7 +3504,7 @@
     <string name="poi_aquaculture_mussels">Acuicultura: mexillóns</string>
     <string name="poi_min_age">Idade mínima</string>
     <string name="poi_organic_no">Non</string>
-    <string name="poi_organic_only">Soamente</string>
+    <string name="poi_organic_only">Só;Só orgánico</string>
     <string name="poi_traffic_mirror">Espello de tráfico</string>
     <string name="poi_diplomatic_consulate">Consulado</string>
     <string name="poi_craft_confectionery">Elaboración de doces e confeitaría</string>
@@ -3524,7 +3524,7 @@
     <string name="poi_denotation_natural_monument">Monumento da natureza</string>
     <string name="poi_denotation_landmark">Referencia terrestre</string>
     <string name="poi_park_ride">Aparcadoiro disuasorio</string>
-    <string name="poi_park_ride_yes">Si</string>
+    <string name="poi_park_ride_yes">Si;Aparcadoiro disuasorio</string>
     <string name="poi_park_ride_train">Tren</string>
     <string name="poi_park_ride_bus">Bus</string>
     <string name="poi_park_ride_metro">Metro</string>
@@ -3547,7 +3547,7 @@
     <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">Chama de gas;Queimadura de facho</string>
+    <string name="poi_flare">Facho de gas;Morea de fachos</string>
     <string name="poi_change_delete">Obxecto eliminado</string>
     <string name="poi_healthcare_speciality_radiotherapy">Radioterapia</string>
     <string name="poi_climbing_crag_filter">Penedo de escalada</string>
@@ -3562,9 +3562,9 @@
     <string name="poi_hazard_additional_minefield">Perigo: campo minado</string>
     <string name="poi_hazard_additional_contamination">Perigo: contaminación</string>
     <string name="poi_defibrillator_location">Localización</string>
-    <string name="poi_changing_table_yes">Cambiador de cueiros: si</string>
-    <string name="poi_changing_table_no">Cambiador de cueiros: non</string>
-    <string name="poi_changing_table_limited">Cambiador de cueiros: limitado</string>
+    <string name="poi_changing_table_yes">Si;Cambiador de cueiros: si</string>
+    <string name="poi_changing_table_no">Non;Cambiador de cueiros: non</string>
+    <string name="poi_changing_table_limited">Limitado;Cambiador de cueiros: limitado</string>
     <string name="poi_changing_table_location_room">Localización do cambiador de cueiros: sala aparte</string>
     <string name="poi_changing_table_location_male_toilet">Localización do cambiador de cueiros: no servizo masculino</string>
     <string name="poi_changing_table_location_female_toilet">Localización do cambiador de cueiros: no servizo feminino</string>
@@ -3597,7 +3597,7 @@
     <string name="poi_vehicle_military">Acceso para vehículos: militar</string>
     <string name="poi_vehicle_delivery">Acceso para vehículos: entregas</string>
     <string name="poi_vehicle_forestry">Acceso para vehículos: forestal</string>
-    <string name="poi_motorcar_yes">Acceso para automóbiles: si</string>
+    <string name="poi_motorcar_yes">Si;Automóbiles</string>
     <string name="poi_motorcar_private">Acceso para automóbiles: privado</string>
     <string name="poi_motorcar_no">Acceso para automóbiles: non</string>
     <string name="poi_motorcar_destination">Acceso para automóbiles: destino</string>
@@ -3627,8 +3627,8 @@
     <string name="poi_bicycle_private">Acceso para bicicletas: privado</string>
     <string name="poi_bicycle_dismount">Acceso para bicicletas: a pé (desmontado)</string>
     <string name="poi_bicycle_destination">Acceso para bicicletas: destino</string>
-    <string name="poi_bicycle_permissive">Acceso para bicicletas: permisivo</string>
-    <string name="poi_bicycle_customers">Acceso para bicicletas: clientes</string>
+    <string name="poi_bicycle_permissive">Acceso para bicicletas: permitido</string>
+    <string name="poi_bicycle_customers">Acceso para bicicletas: só clientes</string>
     <string name="poi_horse_private">Acceso para cabalos: privado</string>
     <string name="poi_horse_destination">Acceso para cabalos: destino</string>
     <string name="poi_horse_permissive">Acceso para cabalos: permisivo</string>
@@ -3661,34 +3661,34 @@
     <string name="poi_taxi_designated">Acceso para taxis: designado</string>
     <string name="poi_taxi_no">Acceso para taxis: non</string>
     <string name="poi_disabled_no">Acceso para discapacitados: non</string>
-    <string name="poi_snowmobile_yes">Si</string>
-    <string name="poi_snowmobile_designated">Designado</string>
-    <string name="poi_snowmobile_permissive">Permisivo</string>
-    <string name="poi_bus_yes">Si</string>
-    <string name="poi_bus_designated">Designado</string>
-    <string name="poi_caravan_yes">Si</string>
-    <string name="poi_caravan_designated">Designado</string>
-    <string name="poi_motorhome_yes">Si</string>
-    <string name="poi_motorhome_designated">Designado</string>
-    <string name="poi_trailer_yes">Si</string>
-    <string name="poi_trailer_designated">Designado</string>
-    <string name="poi_motorcycle_yes">Si</string>
-    <string name="poi_motorcycle_permissive">Permisivo</string>
-    <string name="poi_motorcycle_destination">Destino</string>
-    <string name="poi_motorcycle_designated">Designado</string>
-    <string name="poi_moped_yes">Si</string>
-    <string name="poi_moped_designated">Designado</string>
-    <string name="poi_mofa_yes">Si</string>
-    <string name="poi_mofa_designated">Designado</string>
-    <string name="poi_hgv_yes">Si</string>
-    <string name="poi_hgv_destination">Destino</string>
-    <string name="poi_hgv_permissive">Permisivo</string>
-    <string name="poi_hgv_designated">Designado</string>
-    <string name="poi_hgv_delivery">Entregas</string>
-    <string name="poi_goods_yes">Si</string>
-    <string name="poi_goods_designated">Designado</string>
-    <string name="poi_disabled_yes">Si</string>
-    <string name="poi_disabled_designated">Designado</string>
+    <string name="poi_snowmobile_yes">Si;Motos de neve</string>
+    <string name="poi_snowmobile_designated">Sinalizado;Sinalizado para motos de neve</string>
+    <string name="poi_snowmobile_permissive">Permitido; Acceso permitido para motos de neve</string>
+    <string name="poi_bus_yes">Si;Bus;Autobuses</string>
+    <string name="poi_bus_designated">Sinalizado;Sinalizado para autobuses</string>
+    <string name="poi_caravan_yes">Si;Caravana</string>
+    <string name="poi_caravan_designated">Sinalizado;Sinalizado para caravanas</string>
+    <string name="poi_motorhome_yes">Si;Autocaravana</string>
+    <string name="poi_motorhome_designated">Sinalizado;Sinalizado para autocaravanas</string>
+    <string name="poi_trailer_yes">Si;Remolque</string>
+    <string name="poi_trailer_designated">Sinalizado;Sinalizado para remolques</string>
+    <string name="poi_motorcycle_yes">Si;Motocicleta</string>
+    <string name="poi_motorcycle_permissive">Permitido;Acceso permitido para motocicletas</string>
+    <string name="poi_motorcycle_destination">Destino;Acceso para motocicletas só ao destino</string>
+    <string name="poi_motorcycle_designated">Sinalizado;Sinalizado para motocicletas</string>
+    <string name="poi_moped_yes">Si;Ciclomotor</string>
+    <string name="poi_moped_designated">Sinalizado;Sinalizado para ciclomotores</string>
+    <string name="poi_mofa_yes">Si;Bicicletas motorizadas</string>
+    <string name="poi_mofa_designated">Sinalizado;Sinalizado para bicicletas motorizadas</string>
+    <string name="poi_hgv_yes">Si:LGV;HGV;Camión;Camións;Vehículo pesado de mercadorías</string>
+    <string name="poi_hgv_destination">Destino;Acceso para camións só ao destino</string>
+    <string name="poi_hgv_permissive">Permitido;Acceso permitido para camións</string>
+    <string name="poi_hgv_designated">Indicado;Acceso indicado para camións</string>
+    <string name="poi_hgv_delivery">Entregas;Acceso para camións de reparto</string>
+    <string name="poi_goods_yes">Si:Acceso a vehículos comerciais lixeiros</string>
+    <string name="poi_goods_designated">Indicado;Indicado para vehículos comerciais lixeiros</string>
+    <string name="poi_disabled_yes">Si;Acceso para discapacitados</string>
+    <string name="poi_disabled_designated">Sinalado;Acceso sinalado para discapacitados</string>
     <string name="poi_cellar_entrance">Entrada da adega</string>
     <string name="poi_health_food">Alimentación saudábel</string>
     <string name="poi_craft_builder">Construtor ou albanel</string>
@@ -3756,7 +3756,7 @@
     <string name="poi_volcano_status_active">Activo</string>
     <string name="poi_volcano_status_inactive">Inactivo</string>
     <string name="poi_volcano_number_of_eruptions">Número de erupcións</string>
-    <string name="poi_memorial_ghost_bike">Bicicleta pantasma</string>
+    <string name="poi_memorial_ghost_bike">Bicicleta pantasma;Bicicleta branca</string>
     <string name="poi_paintball">Paintball</string>
     <string name="poi_mountain_rescue">Rescate de montaña</string>
     <string name="poi_shop_security">Tenda de seguranza</string>
@@ -3893,7 +3893,7 @@
     <string name="poi_kickboxing">Kickboxing</string>
     <string name="poi_horseshoes">Ferradura</string>
     <string name="poi_fencing">Esgrima</string>
-    <string name="poi_cycle_polo">Polo de bicicleta</string>
+    <string name="poi_cycle_polo">Bicipolo;Ciclopolo</string>
     <string name="poi_curling">Curling</string>
     <string name="poi_crossfit">Crossfit</string>
     <string name="poi_cockfighting">Pelexa de galos</string>
@@ -3931,4 +3931,5 @@
     <string name="poi_health_post">Posto de saúde</string>
     <string name="poi_water_filter">Auga;Auga potábel</string>
     <string name="poi_vending_machine_fuel_filter">Surtidores automáticos de combustíbel; Máquina expendedora de combustíbel</string>
+    <string name="poi_ship_delivery">Acceso a barcos: entregas</string>
 </resources>
\ No newline at end of file

From db93a47bf76f09c7acebec703a6cd3f8155a6d59 Mon Sep 17 00:00:00 2001
From: "Miguel A. Bouzada" <mbouzada@gmail.com>
Date: Fri, 27 Sep 2024 08:57:57 +0000
Subject: [PATCH 21/83] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (4873 of 4873 strings)
---
 OsmAnd/res/values-es-rAR/phrases.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index 73f963f72a5..88e3d4be363 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -3674,7 +3674,7 @@
     <string name="poi_trailer_designated">Designado;Designado para remolques</string>
     <string name="poi_motorcycle_yes">Sí;Motocicleta</string>
     <string name="poi_motorcycle_permissive">Permisivo;Acceso permisivo para motocicletas</string>
-    <string name="poi_motorcycle_destination">Destino;Acceso para motocicletas sólo a destino</string>
+    <string name="poi_motorcycle_destination">Destino;Acceso para motocicletas solo a destino</string>
     <string name="poi_motorcycle_designated">Designado;Designado para motocicletas</string>
     <string name="poi_moped_yes">Sí;Ciclomotor</string>
     <string name="poi_moped_designated">Designado;Designado para ciclomotores</string>

From 46ba596966d5caafd3b2ee8c8867372d81ae23a7 Mon Sep 17 00:00:00 2001
From: "Miguel A. Bouzada" <mbouzada@gmail.com>
Date: Fri, 27 Sep 2024 09:15:49 +0000
Subject: [PATCH 22/83] Translated using Weblate (Galician)

Currently translated at 79.9% (3895 of 4873 strings)
---
 OsmAnd/res/values-gl/phrases.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index bd12f10b332..3ad2c73d59b 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -3683,7 +3683,7 @@
     <string name="poi_hgv_yes">Si:LGV;HGV;Camión;Camións;Vehículo pesado de mercadorías</string>
     <string name="poi_hgv_destination">Destino;Acceso para camións só ao destino</string>
     <string name="poi_hgv_permissive">Permitido;Acceso permitido para camións</string>
-    <string name="poi_hgv_designated">Indicado;Acceso indicado para camións</string>
+    <string name="poi_hgv_designated">Sinalizado;Acceso sinalizado para camións</string>
     <string name="poi_hgv_delivery">Entregas;Acceso para camións de reparto</string>
     <string name="poi_goods_yes">Si:Acceso a vehículos comerciais lixeiros</string>
     <string name="poi_goods_designated">Indicado;Indicado para vehículos comerciais lixeiros</string>

From 3a6474788dd2f9083d2222bd35a2c5073736fae9 Mon Sep 17 00:00:00 2001
From: RZR-UA <youonly@ukr.net>
Date: Fri, 27 Sep 2024 14:28:57 +0200
Subject: [PATCH 23/83] Set GpxMultiSegmentsApproximation as default (4.9)

---
 .../src/net/osmand/plus/settings/backend/OsmandSettings.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
index 05b9bb0478a..3852b810660 100644
--- a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
@@ -14,7 +14,7 @@
 import static net.osmand.plus.routing.TransportRoutingHelper.PUBLIC_TRANSPORT_KEY;
 import static net.osmand.plus.settings.backend.storages.IntermediatePointsStorage.INTERMEDIATE_POINTS;
 import static net.osmand.plus.settings.backend.storages.IntermediatePointsStorage.INTERMEDIATE_POINTS_DESCRIPTION;
-import static net.osmand.plus.settings.enums.ApproximationType.APPROX_CPP;
+import static net.osmand.plus.settings.enums.ApproximationType.APPROX_GEO_CPP;
 import static net.osmand.plus.settings.enums.LocationSource.ANDROID_API;
 import static net.osmand.plus.settings.enums.LocationSource.GOOGLE_PLAY_SERVICES;
 import static net.osmand.plus.settings.enums.RoutingType.HH_CPP;
@@ -1475,7 +1475,7 @@ public boolean isProxyEnabled() {
 
 	public static boolean IGNORE_MISSING_MAPS = false;
 	public final CommonPreference<RoutingType> ROUTING_TYPE = new EnumStringPreference<>(this, "routing_method", HH_CPP, RoutingType.values()).makeProfile().cache();
-	public final CommonPreference<ApproximationType> APPROXIMATION_TYPE = new EnumStringPreference<>(this, "approximation_type_r48_fallback", APPROX_CPP, ApproximationType.values()).makeProfile().cache();
+	public final CommonPreference<ApproximationType> APPROXIMATION_TYPE = new EnumStringPreference<>(this, "approximation_method_r49_default", APPROX_GEO_CPP, ApproximationType.values()).makeProfile().cache();
 
 	public final CommonPreference<Boolean> ENABLE_TIME_CONDITIONAL_ROUTING = new BooleanPreference(this, "enable_time_conditional_routing", true).makeProfile();
 

From 4605371d9a0caa57c50fc2217cd2cd1695a935b8 Mon Sep 17 00:00:00 2001
From: vshcherb <victor.shcherb@gmail.com>
Date: Fri, 27 Sep 2024 16:58:58 +0300
Subject: [PATCH 24/83] Update OsmandMapTileView.java

---
 OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index 0b4a7dae2be..adb1166b1d8 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -1991,10 +1991,10 @@ public void showMessage(String msg) {
 
 	private class MapTileViewMultiTouchZoomListener implements MultiTouchZoomListener, DoubleTapZoomListener {
 
-		private static final float ZONE_0_ANGLE_THRESHOLD = 5;
-		private static final float ZONE_1_ANGLE_THRESHOLD = 20;
-		private static final float ZONE_2_ANGLE_THRESHOLD = 30;
-		private static final float ZONE_3_ANGLE_THRESHOLD = 60;
+		private static final float ZONE_0_ANGLE_THRESHOLD = 2;
+		private static final float ZONE_1_ANGLE_THRESHOLD = 10;
+		private static final float ZONE_2_ANGLE_THRESHOLD = 15;
+		private static final float ZONE_3_ANGLE_THRESHOLD = 30;
 		private static final float ZONE_0_ZOOM_THRESHOLD = 0.15f;
 		private static final float ZONE_1_ZOOM_THRESHOLD = 0.6f;
 		private static final float ZONE_2_ZOOM_THRESHOLD = 1.5f;

From a9e4f8782edca284362c9179d8003e001f3dcc52 Mon Sep 17 00:00:00 2001
From: alex-osm <alex.morozov.osm@gmail.com>
Date: Fri, 27 Sep 2024 17:39:28 +0300
Subject: [PATCH 25/83] Fix SinkStringWriter

---
 .../net/osmand/shared/io/SinkStringWriter.kt      | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/OsmAnd-shared/src/androidMain/kotlin/net/osmand/shared/io/SinkStringWriter.kt b/OsmAnd-shared/src/androidMain/kotlin/net/osmand/shared/io/SinkStringWriter.kt
index 58e7be7c533..aa9855f71a6 100644
--- a/OsmAnd-shared/src/androidMain/kotlin/net/osmand/shared/io/SinkStringWriter.kt
+++ b/OsmAnd-shared/src/androidMain/kotlin/net/osmand/shared/io/SinkStringWriter.kt
@@ -1,6 +1,5 @@
 package net.osmand.shared.io
 
-import okio.BufferedSink
 import okio.IOException
 import okio.Sink
 import okio.buffer
@@ -8,11 +7,17 @@ import java.io.StringWriter
 
 class SinkStringWriter(sink: Sink) : StringWriter() {
 
-	private val bufferedSink: BufferedSink = sink.buffer()
+	private val bufferedSink = sink.buffer()
 
 	@Throws(IOException::class)
 	override fun write(c: Int) {
-		bufferedSink.writeUtf8CodePoint(c)
+		bufferedSink.writeUtf8(c.toChar().toString())
+	}
+
+	override fun write(str: String?) {
+		if (str != null) {
+			bufferedSink.writeUtf8(str)
+		}
 	}
 
 	@Throws(IOException::class)
@@ -29,4 +34,8 @@ class SinkStringWriter(sink: Sink) : StringWriter() {
 	override fun flush() {
 		bufferedSink.flush()
 	}
+
+	override fun toString(): String {
+		return bufferedSink.toString()
+	}
 }

From 5385ebc8ddcb2ca6e66bc8e1ffcda2c3bb138894 Mon Sep 17 00:00:00 2001
From: Corwin-Kh <serge.kharchenko@gmail.com>
Date: Sat, 28 Sep 2024 04:14:04 +0300
Subject: [PATCH 26/83] Implememnted serialization for filters in library

---
 .../osmand/shared/gpx/SmartFolderHelper.kt    |  12 +-
 .../net/osmand/shared/gpx/data/SmartFolder.kt |   7 +-
 .../shared/gpx/filters/BaseTrackFilter.kt     |   5 +-
 .../shared/gpx/filters/DateTrackFilter.kt     |  49 ++++++---
 .../shared/gpx/filters/ListTrackFilter.kt     |  22 ++--
 .../shared/gpx/filters/OtherTrackFilter.kt    |  12 +-
 .../shared/gpx/filters/RangeTrackFilter.kt    |   4 +-
 .../gpx/filters/RangeTrackFilterSerializer.kt | 103 ++++++++++++++++++
 .../filters/SingleFieldTrackFilterParams.kt   |   3 +
 .../shared/gpx/filters/TextTrackFilter.kt     |  21 +++-
 .../shared/gpx/filters/TrackFilterList.kt     |   4 +-
 .../gpx/filters/TrackFilterSerializer.kt      |  67 ++++++++++++
 .../shared/gpx/filters/TrackFilterType.kt     |   6 +-
 .../gpx/filters/TrackFiltersConstants.kt      |   1 +
 .../shared/gpx/filters/TrackFiltersHelper.kt  |   3 +-
 .../kotlin/net/osmand/shared/FiltersTest.kt   |  50 +++++++++
 16 files changed, 324 insertions(+), 45 deletions(-)
 create mode 100644 OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/RangeTrackFilterSerializer.kt
 create mode 100644 OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterSerializer.kt
 create mode 100644 OsmAnd-shared/src/commonTest/kotlin/net/osmand/shared/FiltersTest.kt

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/SmartFolderHelper.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/SmartFolderHelper.kt
index 000fc2ecd83..fb75573a8ae 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/SmartFolderHelper.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/SmartFolderHelper.kt
@@ -1,6 +1,6 @@
 package net.osmand.shared.gpx
 
-import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import net.osmand.shared.KAsyncTask
 import net.osmand.shared.api.KStateChangedListener
@@ -30,6 +30,12 @@ object SmartFolderHelper {
 		}
 	}
 
+	val json = Json {
+		isLenient = true
+		ignoreUnknownKeys = true
+		classDiscriminator = "className"
+	}
+
 	init {
 		osmAndSettings.registerPreference(TRACK_FILTERS_SETTINGS_PREF, "")
 		osmAndSettings.addPreferenceListener(TRACK_FILTERS_SETTINGS_PREF, settingsChangedListener)
@@ -101,7 +107,7 @@ object SmartFolderHelper {
 		val newFolder = SmartFolder(name)
 		newFolder.creationTime = currentTimeMillis()
 		newFolder.filters = enabledFilters
-		KCollectionUtils.addToList(smartFolderCollection, newFolder)
+		smartFolderCollection = KCollectionUtils.addToList(smartFolderCollection, newFolder)
 		updateSmartFolderItems(newFolder)
 		writeSettings()
 		notifyFolderCreatedListeners(newFolder)
@@ -151,7 +157,7 @@ object SmartFolderHelper {
 
 	private fun writeSettings() {
 		isWritingSettings = true
-		val json = Json.encodeToString(ListSerializer(SmartFolder.serializer()), smartFolderCollection)
+		val json = json.encodeToString(smartFolderCollection)
 		osmAndSettings.setStringPreference(TRACK_FILTERS_SETTINGS_PREF, json)
 		isWritingSettings = false
 	}
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/SmartFolder.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/SmartFolder.kt
index fffe12e8048..3c95e19f554 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/SmartFolder.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/SmartFolder.kt
@@ -4,6 +4,7 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import net.osmand.shared.gpx.TrackItem
 import net.osmand.shared.gpx.filters.BaseTrackFilter
+import net.osmand.shared.gpx.filters.TrackFilterSerializer
 import net.osmand.shared.gpx.filters.TrackFolderAnalysis
 import net.osmand.shared.util.KCollectionUtils
 
@@ -19,7 +20,7 @@ class SmartFolder(@Serializable var folderName: String) : TracksGroup, Comparabl
 	@Serializable
 	var creationTime = 0L
 
-	@Serializable
+	@Serializable(with = TrackFilterSerializer::class)
 	var filters: MutableList<BaseTrackFilter>? = null
 
 	@Transient
@@ -66,4 +67,8 @@ class SmartFolder(@Serializable var folderName: String) : TracksGroup, Comparabl
 		trackItems = ArrayList()
 		folderAnalysis = null
 	}
+
+	override fun equals(other: Any?): Boolean {
+		return super.equals(other)
+	}
 }
\ No newline at end of file
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/BaseTrackFilter.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/BaseTrackFilter.kt
index 338a7428902..1195290cbb3 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/BaseTrackFilter.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/BaseTrackFilter.kt
@@ -2,13 +2,14 @@ package net.osmand.shared.gpx.filters
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 import net.osmand.shared.gpx.TrackItem
 
 @Serializable
-abstract class BaseTrackFilter(
+sealed class BaseTrackFilter(
 	@Serializable
 	@SerialName("filterType") val trackFilterType: TrackFilterType,
-	var filterChangedListener: FilterChangedListener?) {
+	@Transient var filterChangedListener: FilterChangedListener? = null) {
 
 	abstract fun isEnabled(): Boolean
 
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt
index 3ea76094b4c..76d6e809f36 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt
@@ -9,26 +9,47 @@ import net.osmand.shared.extensions.currentTimeMillis
 import net.osmand.shared.gpx.GpxParameter
 import net.osmand.shared.gpx.TrackItem
 
-class DateTrackFilter(trackFilterType: TrackFilterType, dateFrom: Long,
-	filterChangedListener: FilterChangedListener?) : BaseTrackFilter(trackFilterType, filterChangedListener) {
+@Serializable
+class DateTrackFilter : BaseTrackFilter {
 
-	var initialValueFrom = dateFrom
+	constructor(
+		trackFilterType: TrackFilterType, dateFrom: Long,
+		filterChangedListener: FilterChangedListener?) : super(
+		trackFilterType,
+		filterChangedListener) {
+		initialValueFrom = dateFrom
+		initialValueFromDateTime = Instant.fromEpochMilliseconds(initialValueFrom)
+			.toLocalDateTime(TimeZone.currentSystemDefault())
+		valueFromDateTime = Instant.fromEpochMilliseconds(initialValueFrom)
+			.toLocalDateTime(TimeZone.currentSystemDefault())
+		valueFrom = initialValueFrom
+		valueTo = initialValueTo
+	}
+
+	var initialValueFrom: Long
 	var initialValueTo = currentTimeMillis()
 
-	private var initialValueFromDateTime = Instant.fromEpochMilliseconds(initialValueFrom).toLocalDateTime(TimeZone.currentSystemDefault())
-	private var initialValueToDateTime = Instant.fromEpochMilliseconds(initialValueTo).toLocalDateTime(TimeZone.currentSystemDefault())
-	private var valueFromDateTime = Instant.fromEpochMilliseconds(initialValueFrom).toLocalDateTime(TimeZone.currentSystemDefault())
-	private var valueToDateTime = Instant.fromEpochMilliseconds(initialValueTo).toLocalDateTime(TimeZone.currentSystemDefault())
+	private var initialValueFromDateTime: LocalDateTime
+
+	private var initialValueToDateTime = Instant.fromEpochMilliseconds(initialValueTo)
+		.toLocalDateTime(TimeZone.currentSystemDefault())
+	private var valueFromDateTime: LocalDateTime
+	private var valueToDateTime = Instant.fromEpochMilliseconds(initialValueTo)
+		.toLocalDateTime(TimeZone.currentSystemDefault())
 
 	private fun updateDateTime() {
-		initialValueFromDateTime = Instant.fromEpochMilliseconds(initialValueFrom).toLocalDateTime(TimeZone.currentSystemDefault())
-		initialValueToDateTime = Instant.fromEpochMilliseconds(initialValueTo).toLocalDateTime(TimeZone.currentSystemDefault())
-		valueFromDateTime = Instant.fromEpochMilliseconds(valueFrom).toLocalDateTime(TimeZone.currentSystemDefault())
-		valueToDateTime = Instant.fromEpochMilliseconds(valueTo).toLocalDateTime(TimeZone.currentSystemDefault())
+		initialValueFromDateTime = Instant.fromEpochMilliseconds(initialValueFrom)
+			.toLocalDateTime(TimeZone.currentSystemDefault())
+		initialValueToDateTime = Instant.fromEpochMilliseconds(initialValueTo)
+			.toLocalDateTime(TimeZone.currentSystemDefault())
+		valueFromDateTime = Instant.fromEpochMilliseconds(valueFrom)
+			.toLocalDateTime(TimeZone.currentSystemDefault())
+		valueToDateTime =
+			Instant.fromEpochMilliseconds(valueTo).toLocalDateTime(TimeZone.currentSystemDefault())
 	}
 
 	@Serializable
-	var valueFrom = initialValueFrom
+	var valueFrom: Long = 0
 		set(value) {
 			field = value
 			updateDateTime()
@@ -36,7 +57,7 @@ class DateTrackFilter(trackFilterType: TrackFilterType, dateFrom: Long,
 		}
 
 	@Serializable
-	var valueTo = initialValueTo
+	var valueTo: Long = 0
 		set(value) {
 			field = value
 			updateDateTime()
@@ -56,7 +77,7 @@ class DateTrackFilter(trackFilterType: TrackFilterType, dateFrom: Long,
 	override fun isTrackAccepted(trackItem: TrackItem): Boolean {
 
 		trackItem.dataItem?.let {
-			it.getParameter<Long>(GpxParameter.FILE_CREATION_TIME)?.let{creationTime ->
+			it.getParameter<Long>(GpxParameter.FILE_CREATION_TIME)?.let { creationTime ->
 				return creationTime in valueFrom..valueTo
 			}
 		}
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/ListTrackFilter.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/ListTrackFilter.kt
index d5c7ef7724f..75fea473f14 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/ListTrackFilter.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/ListTrackFilter.kt
@@ -5,13 +5,17 @@ import net.osmand.shared.data.StringIntPair
 import net.osmand.shared.gpx.GpxParameter
 import net.osmand.shared.gpx.TrackItem
 import net.osmand.shared.util.KAlgorithms
-import net.osmand.shared.util.MultiNameSerializer
 import net.osmand.shared.util.SerialNames
 
-open class ListTrackFilter(
-	trackFilterType: TrackFilterType,
-	filterChangedListener: FilterChangedListener?) :
-	BaseTrackFilter(trackFilterType, filterChangedListener) {
+@Serializable
+open class ListTrackFilter : BaseTrackFilter {
+
+	constructor(
+		trackFilterType: TrackFilterType,
+		filterChangedListener: FilterChangedListener?) : super(
+		trackFilterType,
+		filterChangedListener) {
+	}
 
 	var collectionFilterParams: SingleFieldTrackFilterParams
 
@@ -49,8 +53,12 @@ open class ListTrackFilter(
 		return !KAlgorithms.isEmpty(selectedItems)
 	}
 
-	@SerialNames("selectedItems", "selectedFolders", "selectedCities", "selectedColors", "selectedWidths")
-	@Serializable(with = MultiNameSerializer::class)
+	@SerialNames(
+		"selectedItems",
+		"selectedFolders",
+		"selectedCities",
+		"selectedColors",
+		"selectedWidths")
 	var selectedItems = ArrayList<String>()
 		protected set
 	var allItems: MutableList<String> = arrayListOf()
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/OtherTrackFilter.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/OtherTrackFilter.kt
index ca46ed0b4b3..0057da4b42b 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/OtherTrackFilter.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/OtherTrackFilter.kt
@@ -5,10 +5,14 @@ import net.osmand.shared.gpx.TrackItem
 import net.osmand.shared.util.KAlgorithms
 import net.osmand.shared.util.PlatformUtil
 
-class OtherTrackFilter(
-	trackFilterType: TrackFilterType,
-	filterChangedListener: FilterChangedListener?) :
-	BaseTrackFilter(trackFilterType, filterChangedListener) {
+@Serializable
+class OtherTrackFilter : BaseTrackFilter {
+
+	constructor(
+		trackFilterType: TrackFilterType,
+		filterChangedListener: FilterChangedListener?) : super(
+		trackFilterType,
+		filterChangedListener)
 
 	@Serializable
 	var selectedParams = ArrayList<OtherTrackParam>()
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/RangeTrackFilter.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/RangeTrackFilter.kt
index c03df29cac9..f108accbd11 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/RangeTrackFilter.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/RangeTrackFilter.kt
@@ -1,12 +1,12 @@
 package net.osmand.shared.gpx.filters
 
 import kotlinx.serialization.Serializable
-import net.osmand.shared.gpx.TrackItem
 import net.osmand.shared.gpx.GpxParameter
+import net.osmand.shared.gpx.TrackItem
 import kotlin.math.ceil
 import kotlin.math.floor
 
-@Serializable
+@Serializable(with = RangeTrackFilterSerializer::class)
 open class RangeTrackFilter<T : Comparable<T>>
 	: BaseTrackFilter {
 
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/RangeTrackFilterSerializer.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/RangeTrackFilterSerializer.kt
new file mode 100644
index 00000000000..598d4bb0f67
--- /dev/null
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/RangeTrackFilterSerializer.kt
@@ -0,0 +1,103 @@
+package net.osmand.shared.gpx.filters
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.InternalSerializationApi
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.SerialKind
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.descriptors.buildSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlin.reflect.KClass
+
+object RangeTrackFilterSerializer : KSerializer<RangeTrackFilter<*>> {
+
+	@OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
+	override val descriptor: SerialDescriptor =
+		buildClassSerialDescriptor(RangeTrackFilter::class.simpleName ?: "RangeTrackFilter") {
+			element("filterType", TrackFilterType.serializer().descriptor)
+			element("minValue", buildSerialDescriptor("minValue", SerialKind.CONTEXTUAL))
+			element("maxValue", buildSerialDescriptor("maxValue", SerialKind.CONTEXTUAL))
+			element("valueFrom", buildSerialDescriptor("minValue", SerialKind.CONTEXTUAL))
+			element("valueTo", buildSerialDescriptor("maxValue", SerialKind.CONTEXTUAL))
+		}
+
+	override fun serialize(encoder: Encoder, value: RangeTrackFilter<*>) {
+		val compositeOutput = encoder.beginStructure(descriptor)
+		val serializer = serializerForClass(value.minValue::class)
+		compositeOutput.encodeSerializableElement(
+			descriptor,
+			0,
+			TrackFilterType.serializer(),
+			value.trackFilterType)
+		compositeOutput.encodeSerializableElement(descriptor, 1, serializer, value.minValue)
+		compositeOutput.encodeSerializableElement(descriptor, 2, serializer, value.maxValue)
+		compositeOutput.encodeSerializableElement(descriptor, 3, serializer, value.valueFrom)
+		compositeOutput.encodeSerializableElement(descriptor, 4, serializer, value.valueTo)
+		compositeOutput.endStructure(descriptor)
+	}
+
+	override fun deserialize(decoder: Decoder): RangeTrackFilter<*> {
+		val compositeInput = decoder.beginStructure(descriptor)
+		var typeName: String? = null
+		var minValue: Comparable<Any>? = null
+		var maxValue: Comparable<Any>? = null
+		var valueFrom: Comparable<Any>? = null
+		var valueTo: Comparable<Any>? = null
+		var trackFilterType = compositeInput.decodeSerializableElement(
+			descriptor,
+			0,
+			TrackFilterType.serializer())
+
+		val parameterSerializer = when (trackFilterType.property?.typeClass) {
+			Int::class -> Int.serializer()
+			Long::class -> Long.serializer()
+			Double::class -> Double.serializer()
+			Float::class -> Float.serializer()
+			else -> throw IllegalArgumentException("Unsupported data type")
+		}
+
+		minValue = compositeInput.decodeSerializableElement(
+			descriptor,
+			1,
+			parameterSerializer as KSerializer<Comparable<Any>>)
+		maxValue = compositeInput.decodeSerializableElement(
+			descriptor,
+			2,
+			parameterSerializer as KSerializer<Comparable<Any>>)
+		valueFrom = compositeInput.decodeSerializableElement(
+			descriptor,
+			3,
+			parameterSerializer as KSerializer<Comparable<Any>>)
+		valueTo = compositeInput.decodeSerializableElement(
+			descriptor,
+			4,
+			parameterSerializer as KSerializer<Comparable<Any>>)
+
+		compositeInput.endStructure(descriptor)
+		TrackFiltersHelper.createFilter(trackFilterType, null)
+		val filter = RangeTrackFilter(
+			minValue = minValue,
+			maxValue = maxValue,
+			trackFilterType = trackFilterType,
+			null
+		)
+		filter.valueTo = valueTo
+		filter.valueFrom = valueFrom
+		return filter
+	}
+
+	private fun serializerForClass(kClass: KClass<*>): KSerializer<Any> {
+		return when (kClass) {
+			Int::class -> Int.serializer()
+			Double::class -> Double.serializer()
+			String::class -> String.serializer()
+			Long::class -> Long.serializer()
+			Float::class -> Float.serializer()
+			else -> throw SerializationException("No serializer for class $kClass")
+		} as KSerializer<Any>
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/SingleFieldTrackFilterParams.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/SingleFieldTrackFilterParams.kt
index 34f13e4667f..f56c8d35d4a 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/SingleFieldTrackFilterParams.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/SingleFieldTrackFilterParams.kt
@@ -1,6 +1,9 @@
 package net.osmand.shared.gpx.filters
 
+import kotlinx.serialization.Serializable
 
+
+@Serializable
 open class SingleFieldTrackFilterParams {
 	open fun hasSelectAllVariant(): Boolean {
 		return false
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TextTrackFilter.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TextTrackFilter.kt
index 39ee268cfd9..62139e8956c 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TextTrackFilter.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TextTrackFilter.kt
@@ -1,16 +1,22 @@
 package net.osmand.shared.gpx.filters
 
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 import net.osmand.shared.api.KStringMatcherMode
 import net.osmand.shared.gpx.TrackItem
 import net.osmand.shared.util.KAlgorithms
 import net.osmand.shared.util.KStringMatcher
 import net.osmand.shared.util.PlatformUtil
 
-class TextTrackFilter(
-	trackFilterType: TrackFilterType,
-	filterChangedListener: FilterChangedListener?)
-	: BaseTrackFilter(trackFilterType, filterChangedListener) {
+@Serializable
+class TextTrackFilter
+	: BaseTrackFilter {
+
+	constructor(
+		trackFilterType: TrackFilterType,
+		filterChangedListener: FilterChangedListener?) : super(
+		trackFilterType,
+		filterChangedListener)
 
 	@Serializable
 	var value = ""
@@ -22,6 +28,7 @@ class TextTrackFilter(
 			filterChangedListener?.onFilterChanged()
 		}
 
+	@Transient
 	private var nameMatcher = createMatcher()
 
 	private fun updateMatcher() {
@@ -29,11 +36,13 @@ class TextTrackFilter(
 	}
 
 	private fun createMatcher(): KStringMatcher {
-		return PlatformUtil.getOsmAndContext().getNameStringMatcher(value.trim { it <= ' ' },
+		return PlatformUtil.getOsmAndContext().getNameStringMatcher(
+			value.trim { it <= ' ' },
 			KStringMatcherMode.CHECK_CONTAINS)
 	}
 
-	override fun isTrackAccepted(trackItem: TrackItem): Boolean = nameMatcher.matches(trackItem.name)
+	override fun isTrackAccepted(trackItem: TrackItem): Boolean =
+		nameMatcher.matches(trackItem.name)
 
 	override fun isEnabled(): Boolean = !KAlgorithms.isEmpty(value)
 
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterList.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterList.kt
index 4b20f69cc73..eec89d86175 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterList.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterList.kt
@@ -1,6 +1,6 @@
 package net.osmand.shared.gpx.filters
 
-import kotlinx.serialization.json.Json
+import net.osmand.shared.gpx.SmartFolderHelper
 import net.osmand.shared.gpx.data.SmartFolder
 import net.osmand.shared.util.KAlgorithms
 import net.osmand.shared.util.LoggerFactory
@@ -12,7 +12,7 @@ object TrackFilterList {
 		var savedFilters: List<SmartFolder>? = null
 		if (!KAlgorithms.isEmpty(str)) {
 			try {
-				savedFilters = Json.decodeFromString<List<SmartFolder>?>(str)
+				savedFilters = SmartFolderHelper.json.decodeFromString<List<SmartFolder>?>(str)
 			} catch (e: Throwable) {
 				log.error("Failed to parse track filter: '$str'", e)
 			}
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterSerializer.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterSerializer.kt
new file mode 100644
index 00000000000..24d6b73a3f7
--- /dev/null
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterSerializer.kt
@@ -0,0 +1,67 @@
+package net.osmand.shared.gpx.filters
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.decodeFromJsonElement
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+
+object TrackFilterSerializer : KSerializer<List<BaseTrackFilter>?> {
+	override val descriptor: SerialDescriptor =
+		ListSerializer(BaseTrackFilter.serializer()).descriptor
+
+	@OptIn(ExperimentalSerializationApi::class)
+	override fun serialize(encoder: Encoder, value: List<BaseTrackFilter>?) {
+		if (value == null) {
+			encoder.encodeNull()
+		} else {
+			val listEncoder = encoder.beginCollection(descriptor, value.size)
+			value.forEach { filter ->
+				listEncoder.encodeSerializableElement(
+					descriptor, 0, BaseTrackFilter.serializer(), filter
+				)
+			}
+			listEncoder.endStructure(descriptor)
+		}
+	}
+
+	override fun deserialize(decoder: Decoder): List<BaseTrackFilter> {
+		val jsonDecoder = decoder as? JsonDecoder
+			?: throw SerializationException("This class can be loaded only by JSON")
+		val jsonArray = jsonDecoder.decodeJsonElement().jsonArray
+		return jsonArray.map { jsonElement ->
+			val jsonObject = jsonElement.jsonObject
+			val filterType =
+				jsonObject["filterType"]?.jsonPrimitive?.content?.let { TrackFilterType.valueOf(it) }
+					?: throw SerializationException("Missing filterType")
+			when (filterType.filterType) {
+				FilterType.RANGE -> jsonDecoder.json.decodeFromJsonElement<RangeTrackFilter<Comparable<Any>>>(
+					jsonObject)
+
+				FilterType.DATE_RANGE -> jsonDecoder.json.decodeFromJsonElement<DateTrackFilter>(
+					jsonObject)
+
+				FilterType.OTHER -> jsonDecoder.json.decodeFromJsonElement<OtherTrackFilter>(
+					jsonObject)
+
+				FilterType.TEXT -> jsonDecoder.json.decodeFromJsonElement<TextTrackFilter>(
+					jsonObject)
+
+				FilterType.SINGLE_FIELD_LIST -> {
+					if (filterType == TrackFilterType.FOLDER) {
+						jsonDecoder.json.decodeFromJsonElement<FolderTrackFilter>(jsonObject)
+					} else {
+						jsonDecoder.json.decodeFromJsonElement<ListTrackFilter>(jsonObject)
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterType.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterType.kt
index 8a411a6e8e9..e48b472d14e 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterType.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterType.kt
@@ -1,11 +1,13 @@
 package net.osmand.shared.gpx.filters
 
+import kotlinx.serialization.Serializable
 import net.osmand.shared.gpx.GpxParameter
 import net.osmand.shared.gpx.filters.OtherTrackParam.VISIBLE_ON_MAP
 import net.osmand.shared.gpx.filters.OtherTrackParam.WITH_WAYPOINTS
 import net.osmand.shared.util.Localization
 import net.osmand.shared.util.PlatformUtil
 
+@Serializable
 enum class TrackFilterType(
 	private val nameResId: String,
 	val filterType: FilterType,
@@ -27,14 +29,14 @@ enum class TrackFilterType(
 		FilterType.RANGE,
 		GpxParameter.TIME_SPAN,
 		MeasureUnitType.TIME_DURATION,
-		listOf(0L, TrackFiltersConstants.DEFAULT_MAX_VALUE.toLong()),
+		listOf(0L, TrackFiltersConstants.DURATION_MAX_VALUE.toLong()),
 		false),
 	TIME_IN_MOTION(
 		"moving_time",
 		FilterType.RANGE,
 		GpxParameter.TIME_MOVING,
 		MeasureUnitType.TIME_DURATION,
-		listOf(0L, TrackFiltersConstants.DEFAULT_MAX_VALUE.toLong()),
+		listOf(0L, TrackFiltersConstants.DURATION_MAX_VALUE.toLong()),
 		false),
 	LENGTH(
 		"routing_attr_length_name",
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFiltersConstants.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFiltersConstants.kt
index 3953b87210f..4f7a499e816 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFiltersConstants.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFiltersConstants.kt
@@ -3,6 +3,7 @@ package net.osmand.shared.gpx.filters
 interface TrackFiltersConstants {
 	companion object {
 		const val DEFAULT_MAX_VALUE = 300f
+		const val DURATION_MAX_VALUE = 300f * 1000 * 60
 		const val LENGTH_MAX_VALUE = 700000f
 		const val SPEED_MAX_VALUE = 83.33333f
 		const val ALTITUDE_MAX_VALUE = 12000f
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFiltersHelper.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFiltersHelper.kt
index 1a215875cba..99caee1b56b 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFiltersHelper.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFiltersHelper.kt
@@ -84,8 +84,7 @@ object TrackFiltersHelper {
 	fun createFilter(
 		trackFilterType: TrackFilterType,
 		filterChangedListener: FilterChangedListener?): BaseTrackFilter {
-		val newFilter: BaseTrackFilter
-		newFilter = when (trackFilterType.filterType) {
+		val newFilter: BaseTrackFilter = when (trackFilterType.filterType) {
 			TEXT -> {
 				createTextFilter(
 					trackFilterType,
diff --git a/OsmAnd-shared/src/commonTest/kotlin/net/osmand/shared/FiltersTest.kt b/OsmAnd-shared/src/commonTest/kotlin/net/osmand/shared/FiltersTest.kt
new file mode 100644
index 00000000000..3c3a76d772e
--- /dev/null
+++ b/OsmAnd-shared/src/commonTest/kotlin/net/osmand/shared/FiltersTest.kt
@@ -0,0 +1,50 @@
+package net.osmand.shared
+
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.modules.SerializersModule
+import net.osmand.shared.extensions.currentTimeMillis
+import net.osmand.shared.gpx.data.SmartFolder
+import net.osmand.shared.gpx.filters.BaseTrackFilter
+import net.osmand.shared.gpx.filters.FilterType
+import net.osmand.shared.gpx.filters.TrackFilterType
+import net.osmand.shared.gpx.filters.TrackFiltersHelper.createFilter
+import kotlin.test.Test
+import kotlin.test.assertTrue
+
+class FiltersTest {
+
+	@Test
+	fun testSerialization() {
+		val smartFolderCollection: MutableList<SmartFolder> = mutableListOf()
+		val folder = SmartFolder("test folder")
+		folder.creationTime = currentTimeMillis()
+		folder.filters = createFilters()
+		smartFolderCollection.add(folder)
+		val jsonStr = json.encodeToString(smartFolderCollection)
+		val readCollection = json.decodeFromString<List<SmartFolder>?>(jsonStr)
+		assertTrue { readCollection != null }
+		assertTrue { folder.folderName == readCollection!![0].folderName }
+		assertTrue { folder.creationTime == readCollection!![0].creationTime }
+		assertTrue { folder.filters == readCollection!![0].filters }
+	}
+
+	val json = Json {
+		isLenient = true
+		ignoreUnknownKeys = true
+		classDiscriminator = "className"
+	}
+
+	private fun createFilters(): MutableList<BaseTrackFilter> {
+		val newFiltersFilters = ArrayList<BaseTrackFilter>()
+		for (trackFilterType in TrackFilterType.entries) {
+			if (trackFilterType.filterType == FilterType.RANGE ||
+				trackFilterType.filterType == FilterType.DATE_RANGE ||
+				trackFilterType.filterType == FilterType.OTHER
+			) {
+				newFiltersFilters.add(createFilter(trackFilterType, null))
+			}
+		}
+		return newFiltersFilters
+	}
+}
\ No newline at end of file

From c11001bfbda6e39f77f70aa55ef70706ace60f57 Mon Sep 17 00:00:00 2001
From: mcliquid <info@mcliquid.de>
Date: Fri, 27 Sep 2024 14:52:45 +0000
Subject: [PATCH 27/83] Translated using Weblate (German)

Currently translated at 100.0% (5307 of 5307 strings)
---
 OsmAnd/res/values-de/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index b7d9f972415..eed9c000d84 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -5960,4 +5960,9 @@
     <string name="obd_fuel_type_desc">Zeigt mithilfe des OBD-Sensors die Kraftstoffart des Fahrzeugs an</string>
     <string name="obd_fuel_level">Kraftstoffstand</string>
     <string name="obd_fuel_consumption_rate_desc">Zeigt den Kraftstoffverbrauch des Fahrzeugs basierend auf dem OBD-Standort an</string>
+    <string name="unknown_bt_device">Unbekanntes Gerät</string>
+    <string name="obd_vin">VIN (Fahrzeug Identifizierung Nummer)</string>
+    <string name="obd_vin_desc">VIN-Code über OBD</string>
+    <string name="vehicle_metrics_plugin_settings">Fahrzeugmetrik-Einstellungen</string>
+    <string name="reset_average_speed">Durchschnittliche Geschwindigkeit zurücksetzen</string>
 </resources>
\ No newline at end of file

From 5ec349ed80ec4c9523d2a39b50bc5981547364d6 Mon Sep 17 00:00:00 2001
From: Evgenii Martynenko <deathstallker@yandex.ru>
Date: Fri, 27 Sep 2024 17:50:06 +0000
Subject: [PATCH 28/83] Translated using Weblate (Russian)

Currently translated at 99.1% (5262 of 5307 strings)
---
 OsmAnd/res/values-ru/strings.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index a2cb50ad6db..c2b15201eb5 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -79,7 +79,7 @@
     <string name="srtm_color_scheme">Цветовая схема</string>
     <string name="show_from_zoom_level">Показывать начиная с масштаба</string>
     <string name="animate_my_location">Анимация моего положения</string>
-    <string name="animate_my_location_desc">Включить анимацию прокрутки карты с моим положением во время навигации.</string>
+    <string name="animate_my_location_desc">Плавное панорамирование карты при движении. Вносит небольшую задержку.</string>
     <string name="display_zoom_level">Масштаб: %1$s</string>
     <string name="favorite_group_name">Имя группы</string>
     <string name="change_color">Выбрать цвет</string>
@@ -334,7 +334,7 @@
     <string name="recording_description">Запись %1$s %3$s %2$s</string>
     <string name="recording_default_name">Запись</string>
     <string name="map_widget_av_notes">Медиазаметки</string>
-    <string name="osmand_srtm_short_description_80_chars">OsmAnd-плагин для линий высот</string>
+    <string name="osmand_srtm_short_description_80_chars">Плагин OsmAnd для офлайн-топографических функций, таких как контурные линии, отмывка рельефа, уклоны</string>
     <string name="map_widget_distancemeasurement">Измерение расстояний</string>
     <string name="audionotes_location_not_defined">Нажмите «Использовать позицию…», чтобы добавить заметку к месту.</string>
     <string name="map_widget_audionotes">Аудиозаметки</string>
@@ -4754,7 +4754,7 @@
     <string name="compass_visible_if_map_rotated">Виден, если карта повернута</string>
     <string name="compass_always_hidden">Скрыт</string>
     <string name="compass_always_visible">Виден</string>
-    <string name="compass_click_desc">Нажатие на компас переключает режим ориентации.</string>
+    <string name="compass_click_desc">Двойное нажатие на компас переключает режим ориентации.</string>
     <string name="compass_desc">Кнопка с указателем севера.</string>
     <string name="rendering_attr_depthContourColorScheme_description">Цветовая схема линий глубины (изобат)</string>
     <string name="rendering_attr_depthContourWidth_description">Толщина контурных линий глубины (изобат)</string>
@@ -5938,7 +5938,7 @@
     <string name="obd_widget_group">Показатели ТС</string>
     <string name="obd_rpm">Обороты</string>
     <string name="rpm_unit">об/мин</string>
-    <string name="obd_speed_desc">Виджет показывает скорость автомобиля по датчику OBD</string>
+    <string name="obd_speed_desc">Виджет показывает скорость транспортного средства по датчику OBD</string>
     <string name="obd_rpm_desc">Виджет показывает обороты с тахометра транспортного средства по датчику OBD</string>
     <string name="unit_volt">В</string>
     <string name="obd_air_intake_temp_desc">Виджет показывает температуру всасываемого воздуха по датчику OBD</string>
@@ -5960,4 +5960,9 @@
     <string name="obd_fuel_consumption_rate_desc">Виджет показывает расход топлива транспортным средством на основе данных OBD и местоположения</string>
     <string name="obd_plugin_name">Показатели ТС</string>
     <string name="obd_support">Поддержка OBD</string>
+    <string name="unknown_bt_device">Неизвестное устройство</string>
+    <string name="obd_vin">VIN</string>
+    <string name="obd_vin_desc">VIN-код по OBD</string>
+    <string name="vehicle_metrics_plugin_settings">Настройки показателей ТС</string>
+    <string name="reset_average_speed">Сбросить среднюю скорость</string>
 </resources>
\ No newline at end of file

From 0a9e91c317c418165308098e5c42f525da840784 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Fri, 27 Sep 2024 11:33:33 +0000
Subject: [PATCH 29/83] Translated using Weblate (Spanish)

Currently translated at 100.0% (5307 of 5307 strings)
---
 OsmAnd/res/values-es/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index f9b591609b8..3081c745212 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -5957,4 +5957,9 @@
     <string name="obd_fuel_type_hybrid_hydrogen">Híbrido con hidrógeno</string>
     <string name="obd_widget_group">Métricas del panel de control</string>
     <string name="obd_plugin_name">Métricas del panel de control</string>
+    <string name="unknown_bt_device">Dispositivo desconocido</string>
+    <string name="obd_vin">VIN</string>
+    <string name="obd_vin_desc">Código VIN a través de OBD</string>
+    <string name="vehicle_metrics_plugin_settings">Configuración de métricas del vehículo</string>
+    <string name="reset_average_speed">Restablecer velocidad media</string>
 </resources>
\ No newline at end of file

From c7375d19ed4550342161b8a71d6b3d069704b758 Mon Sep 17 00:00:00 2001
From: ERYpTION <eryption.ar9q2@slmail.me>
Date: Fri, 27 Sep 2024 12:38:20 +0000
Subject: [PATCH 30/83] Translated using Weblate (Danish)

Currently translated at 100.0% (5307 of 5307 strings)
---
 OsmAnd/res/values-da/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index b8ec086779e..4115322dce4 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -5960,5 +5960,10 @@
     <string name="obd_fuel_left_distance">Brændstof tilbage (afstand)</string>
     <string name="obd_fuel_type">Brændstoftype</string>
     <string name="obd_plugin_description">Får adgang til dine køretøjsoplysninger via OBD-protokollen</string>
-    <string name="obd_plugin_name">Køretøjets målinger</string>
+    <string name="obd_plugin_name">Køretøjets parametre</string>
+    <string name="unknown_bt_device">Ukendt enhed</string>
+    <string name="obd_vin">VIN</string>
+    <string name="obd_vin_desc">VIN-kode via OBD</string>
+    <string name="vehicle_metrics_plugin_settings">Indstillinger for køretøjets parametre</string>
+    <string name="reset_average_speed">Nulstil gennemsnitshastighed</string>
 </resources>
\ No newline at end of file

From 2523efa6b7bdd8ecb574ff231aae85637b626f9c Mon Sep 17 00:00:00 2001
From: 109247019824 <stoyan@gmx.com>
Date: Sat, 28 Sep 2024 01:34:16 +0000
Subject: [PATCH 31/83] Translated using Weblate (Bulgarian)

Currently translated at 74.5% (3955 of 5307 strings)
---
 OsmAnd/res/values-bg/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index 1df8911dd17..18aacc095d1 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -4354,4 +4354,13 @@
     <string name="annual_subscription">Годишен абонамент</string>
     <string name="osm_live_payment_annual_title">Годишно</string>
     <string name="monthly_subscription">Месечен абонамент</string>
+    <string name="unit_volt">В</string>
+    <string name="wikimedia">Wikimedia</string>
+    <string name="unknown_bt_device">Неизвестно устройство</string>
+    <string name="obd_vin">VIN</string>
+    <string name="obd_vin_desc">VIN код през OBD</string>
+    <string name="open_in_browser">Отваряне в браузър</string>
+    <string name="shared_string_source">Източник</string>
+    <string name="shared_string_no_internet_connection">Няма връзка с интернет</string>
+    <string name="no_internet_descr">Проверете връзката и пробвайте отново.</string>
 </resources>
\ No newline at end of file

From debe10b2c35b21aa272fbdc36815ee72440f5c9c Mon Sep 17 00:00:00 2001
From: "Miguel A. Bouzada" <mbouzada@gmail.com>
Date: Fri, 27 Sep 2024 09:32:16 +0000
Subject: [PATCH 32/83] Translated using Weblate (Galician)

Currently translated at 80.6% (3931 of 4873 strings)
---
 OsmAnd/res/values-gl/phrases.xml | 146 ++++++++++++++++++-------------
 1 file changed, 86 insertions(+), 60 deletions(-)

diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index 3ad2c73d59b..bf641d0f18b 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -219,8 +219,8 @@
     <string name="poi_hotel">Hotel</string>
     <string name="poi_hostel">Hostal</string>
     <string name="poi_motel">Motel</string>
-    <string name="poi_alpine_hut">Cabana alpina;Refuxio de montaña</string>
-    <string name="poi_chalet">Chalé;Refuxio</string>
+    <string name="poi_alpine_hut">Cabana alpina;Abeiro de montaña:Abeiro</string>
+    <string name="poi_chalet">Chalé;Abeiro</string>
     <string name="poi_place_of_worship">Lugar de culto</string>
     <string name="poi_religion_christian">Cristiandade</string>
     <string name="poi_religion_jewish">Xudaísmo</string>
@@ -294,7 +294,7 @@
     <string name="poi_craft_electrician">Electricista</string>
     <string name="poi_craft_gardener">Xardineiro</string>
     <string name="poi_craft_handicraft">Taballos manuais (artesán)</string>
-    <string name="poi_craft_hvac">Climatizacións</string>
+    <string name="poi_craft_hvac">Calefacción, ventilación, aire acondicionado</string>
     <string name="poi_craft_insulation">Illamento</string>
     <string name="poi_craft_jeweller">Xoeiro</string>
     <string name="poi_craft_painter">Pintor</string>
@@ -691,7 +691,7 @@
     <string name="poi_drinking_water_yes">Si;Auga potábel</string>
     <string name="poi_drinking_water_no">Non</string>
     <string name="poi_supervised_yes">Vixiado</string>
-    <string name="poi_supervised_no">Non vixiado</string>
+    <string name="poi_supervised_no">Sen supervisión</string>
     <string name="poi_seasonal_yes">Si;De temporada</string>
     <string name="poi_seasonal_no">Non</string>
     <string name="poi_seasonal_dry_season">Estación seca</string>
@@ -794,8 +794,8 @@
     <string name="poi_tourism_yes">Atracción turística</string>
     <string name="poi_attraction_animal">Animal (atracción)</string>
     <string name="poi_attraction_water_slide">Tobogán de auga</string>
-    <string name="poi_wilderness_hut">Cabana illada;Refuxio</string>
-    <string name="poi_hunting_lodge">Cabana de cazadores;Refuxio</string>
+    <string name="poi_wilderness_hut">Cabana illada;Abeiro</string>
+    <string name="poi_hunting_lodge">Cabana de cazadores;Abeiro</string>
     <string name="poi_religion_unitarian_universalist">Universalismo unitario</string>
     <string name="poi_wine_cellar">Adega</string>
     <string name="poi_piste_snow_park">Parque de neve</string>
@@ -888,7 +888,7 @@
     <string name="poi_board_type_public_transport">Transporte público</string>
     <string name="poi_board_type_technology">Tecnoloxía</string>
     <string name="poi_board_type_astronomy">Astronomía</string>
-    <string name="poi_smoking_no">Non</string>
+    <string name="poi_smoking_no">Non permitido</string>
     <string name="poi_smoking_outside">Só fóra</string>
     <string name="poi_smoking_yes">Si</string>
     <string name="poi_smoking_separated">Nunha sala separada</string>
@@ -933,7 +933,7 @@
     <string name="poi_aerialway_capacity">Capacidade por hora</string>
     <string name="poi_aerialway_duration">Tempo medio da viaxe, minutos</string>
     <string name="poi_aerialway_heating_yes">Si;Calefacción</string>
-    <string name="poi_aerialway_heating_no">Sen calefación</string>
+    <string name="poi_aerialway_heating_no">Sen calefacción</string>
     <string name="poi_aerialway_bicycle_yes">Permitido</string>
     <string name="poi_aerialway_bicycle_no">Bicicleta: non permitida</string>
     <string name="poi_aerialway_bicycle_summer">Permitido só no verán</string>
@@ -955,34 +955,34 @@
     <string name="poi_stars_5s">5 Superior</string>
     <string name="poi_rooms">Habitacións</string>
     <string name="poi_payment_coins_yes">Moedas</string>
-    <string name="poi_payment_coins_no">Non se admiten moedas</string>
+    <string name="poi_payment_coins_no">Non se aceptan moedas</string>
     <string name="poi_payment_coins_50c12">Moedas de 50c, 1€ e 2€</string>
     <string name="poi_payment_telephone_cards_yes">Tarxetas de teléfono</string>
-    <string name="poi_payment_telephone_cards_no">Non se admiten cartóns telefónicos</string>
+    <string name="poi_payment_telephone_cards_no">Non se aceptan tarxetas telefónicas</string>
     <string name="poi_payment_credit_cards_yes">Tarxetas de crédito</string>
-    <string name="poi_payment_credit_cards_no">Non se admiten tarxetas de crédito</string>
+    <string name="poi_payment_credit_cards_no">Non se aceptan tarxetas de crédito</string>
     <string name="poi_payment_notes_yes">Billetes</string>
-    <string name="poi_payment_notes_no">Non se admiten billetes</string>
+    <string name="poi_payment_notes_no">Non se aceptan billetes</string>
     <string name="poi_payment_electronic_purses_yes">Moedeiros electrónicos</string>
-    <string name="poi_payment_electronic_purses_no">Non se admiten moedeiros electrónicos</string>
+    <string name="poi_payment_electronic_purses_no">Non se aceptan moedeiros electrónicos</string>
     <string name="poi_payment_cash_yes">Cartos en metálico</string>
-    <string name="poi_payment_cash_no">Non se admiten cartos en metálico</string>
+    <string name="poi_payment_cash_no">Non se aceptan cartos en efectivo</string>
     <string name="poi_payment_debit_cards_yes">Tarxetas de débito</string>
-    <string name="poi_payment_debit_cards_no">Non se admiten tarxetas de débito</string>
+    <string name="poi_payment_debit_cards_no">Non se aceptan tarxetas de débito</string>
     <string name="poi_payment_bitcoin_yes">Bitcoin</string>
-    <string name="poi_payment_bitcoin_no">Non se admite Bitcoin</string>
+    <string name="poi_payment_bitcoin_no">Non se aceptan Bitcoin</string>
     <string name="poi_payment_visa_yes">Visa</string>
-    <string name="poi_payment_visa_no">Non se admiten tarxetas Visa</string>
+    <string name="poi_payment_visa_no">Non se aceptan tarxetas Visa</string>
     <string name="poi_payment_mastercard_yes">MasterCard</string>
-    <string name="poi_payment_mastercard_no">Non se admite MasterCard</string>
+    <string name="poi_payment_mastercard_no">Non se aceptan tarxetas MasterCard</string>
     <string name="poi_payment_maestro_yes">Tarxetas Maestro</string>
-    <string name="poi_payment_maestro_no">Non se admiten tarxetas Maestro</string>
+    <string name="poi_payment_maestro_no">Non se aceptan tarxetas Maestro</string>
     <string name="poi_payment_american_express_yes">American Expres (AMEX)</string>
-    <string name="poi_payment_american_express_no">Non se admiten tarxetas American Expres (AMEX)</string>
+    <string name="poi_payment_american_express_no">Non se aceptan tarxetas American Expres (AMEX)</string>
     <string name="poi_payment_diners_club_yes">Diners Club</string>
-    <string name="poi_payment_diners_club_no">Non se admiten tarxetas Diners Club</string>
+    <string name="poi_payment_diners_club_no">Non se aceptan tarxetas Diners Club</string>
     <string name="poi_payment_visa_electron_yes">Visa Electron</string>
-    <string name="poi_payment_visa_electron_no">Non se admiten tarxetas Visa Electron</string>
+    <string name="poi_payment_visa_electron_no">Non se aceptan tarxetas Visa Electron</string>
     <string name="poi_payment_others_yes">Outros</string>
     <string name="poi_payment_others_no">Non se admiten outros xeitos de pagamento</string>
     <string name="poi_fuel_type">Tipo de combustíbel</string>
@@ -1273,10 +1273,10 @@
     <string name="poi_garden">Xardín</string>
     <string name="poi_grass">Herba</string>
     <string name="poi_capacity_disabled_yes">Si;Espazo para persoas con discapacidade</string>
-    <string name="poi_capacity_disabled_no">Non hai prazas reservadas para persoas con deficiencias</string>
+    <string name="poi_capacity_disabled_no">Non hai prazas reservadas para persoas con discapacidade</string>
     <string name="poi_capacity_disabled">Prazas reservadas para persoas con deficiencias</string>
     <string name="poi_payment_efectivo_yes">Efectivo</string>
-    <string name="poi_payment_efectivo_no">Non admite cartos en metálico</string>
+    <string name="poi_payment_efectivo_no">Non se acepta Efectivo</string>
     <string name="poi_payment_litecoin_yes">Litecoin</string>
     <string name="poi_payment_litecoin_no">Non se admite Litecoin</string>
     <string name="poi_payment_cheque_yes">Cheques</string>
@@ -1400,11 +1400,11 @@
     <string name="poi_highway_crossing">Paso de peóns</string>
     <string name="poi_bicycle_parking_stands">Ancoraxes en forma de U invertida</string>
     <string name="poi_enforcement_traffic_signals">Control de semáforos</string>
-    <string name="poi_payment_account_cards_no">Non se admiten tarxetas de conta</string>
-    <string name="poi_payment_dkv_no">Non se admite DKV</string>
-    <string name="poi_payment_uta_no">Non se admiten tarxetas UTA</string>
-    <string name="poi_payment_girocard_no">Non se admite Girocard</string>
-    <string name="poi_payment_discover_card_no">Non se admite Discover Card</string>
+    <string name="poi_payment_account_cards_no">Non se aceptan tarxetas de conta (Account &amp; Card)</string>
+    <string name="poi_payment_dkv_no">Non se aceptan tarxetas DKV</string>
+    <string name="poi_payment_uta_no">Non se aceptan tarxetas UTA</string>
+    <string name="poi_payment_girocard_no">Non se acepta Girocard</string>
+    <string name="poi_payment_discover_card_no">Non se acepta Discover Card</string>
     <string name="poi_payment_pikepass_no">Non se admite PIKEPASS</string>
     <string name="poi_payment_icsf_no">Non se admiten tarxetas IC Stored Fare</string>
     <string name="poi_payment_jcb_no">Non se admiten tarxetas JCB</string>
@@ -1445,7 +1445,7 @@
     <string name="poi_resource_platinum">Platino</string>
     <string name="poi_resource_slate">Louxa</string>
     <string name="poi_wetland_tidalflat">Humidal costeiro</string>
-    <string name="poi_shelter_type_tent">Tipo de abeiro: carpa</string>
+    <string name="poi_shelter_type_tent">Tipo de abeiro: toldo</string>
     <string name="poi_shelter_type_abandoned">Tipo de abeiro: abandonado</string>
     <string name="poi_internet_access_type_terminal">Por terminal</string>
     <string name="poi_internet_access_type_service">Tipo de acceso á internet: servizo</string>
@@ -1730,7 +1730,7 @@
     <string name="poi_microbrewery">Cervexaría artesanal</string>
     <string name="poi_seasonal">Estacional</string>
     <string name="poi_motorcycle_services">Servizos</string>
-    <string name="poi_animal_shelter_purpose">Obxectivo</string>
+    <string name="poi_animal_shelter_purpose">Propósito</string>
     <string name="poi_boat_rental_type">Alugamento de embarcacións</string>
     <string name="poi_operational_status">Estado operativo</string>
     <string name="poi_water_purification">Depuración das aguas</string>
@@ -1876,8 +1876,8 @@
     <string name="poi_ice_stock">Icestock</string>
     <string name="poi_korfbal">Baloncorf</string>
     <string name="poi_attraction_swing_carousel">Cabaliños ou carrusel</string>
-    <string name="poi_cabin">Cabana;Refuxio</string>
-    <string name="poi_lean_to">Pendello;Refuxio</string>
+    <string name="poi_cabin">Cabana;Abeiro</string>
+    <string name="poi_lean_to">Pendello;Abeiro</string>
     <string name="poi_religious">Área relixiosa</string>
     <string name="poi_wayside_shrine">Ermida no camiño</string>
     <string name="poi_club_charity">Clube da caridade</string>
@@ -1962,7 +1962,7 @@
     <string name="poi_parking_multi_storey">Varios andares</string>
     <string name="poi_bicycle_parking_anchors">Ancoraxes</string>
     <string name="poi_bicycle_parking_wall_loops">Ancoraxes de roda</string>
-    <string name="poi_bicycle_parking_shed">Pendello</string>
+    <string name="poi_bicycle_parking_shed">Alpendre</string>
     <string name="poi_bicycle_parking_bollard">Pivote (bolardo)</string>
     <string name="poi_leaf_type_broadleaved">Folla ampla</string>
     <string name="poi_leaf_type_needleleaved">Folla acicular</string>
@@ -2028,8 +2028,8 @@
     <string name="poi_fast_food_cafeteria">Si;Cafetería;Cantina</string>
     <string name="poi_drink_wine_yes">Viño: si</string>
     <string name="poi_motorcycle_sales_yes_used">Venda de motos: si, de segunda mán</string>
-    <string name="poi_animal_shelter_purpose_adoption_yes">Adopcións: si</string>
-    <string name="poi_animal_shelter_purpose_release_yes">En liberdade: si</string>
+    <string name="poi_animal_shelter_purpose_adoption_yes">Adopción: si</string>
+    <string name="poi_animal_shelter_purpose_release_yes">Liberación: si</string>
     <string name="poi_winter_room_yes">Refuxio de inverno: si</string>
     <string name="poi_reservation_yes">Reserva: si</string>
     <string name="poi_boat_motorboat_rental_yes">Lanchas a motor: si</string>
@@ -2256,15 +2256,15 @@
     <string name="poi_flagpole">Mastro da bandeira</string>
     <string name="poi_bin_yes">Con cesto do lixo</string>
     <string name="poi_bin_no">Sen cesto do lixo</string>
-    <string name="poi_shelter_type_picnic_shelter">Merendeiro</string>
+    <string name="poi_shelter_type_picnic_shelter">Parque de merendas;Pícnic</string>
     <string name="poi_shelter_type_weather_shelter">Meteorolóxico</string>
-    <string name="poi_shelter_type_lean_to">Marquesiña</string>
-    <string name="poi_shelter_type_basic_hut">Cabana sinxela</string>
+    <string name="poi_shelter_type_lean_to">Pendello</string>
+    <string name="poi_shelter_type_basic_hut">Cabana</string>
     <string name="poi_shelter_type_building">Edificio</string>
-    <string name="poi_shelter_type_wildlife_hide">Observación agochada dos animais</string>
+    <string name="poi_shelter_type_wildlife_hide">Observatorio da fauna salvaxe</string>
     <string name="poi_shelter_type_rock_shelter">Abeiro na rocha</string>
-    <string name="poi_shelter_type_sun_shelter">Refuxio do sol</string>
-    <string name="poi_shelter_type_field_shelter">Abeiro de campo</string>
+    <string name="poi_shelter_type_sun_shelter">Abeiro do sol</string>
+    <string name="poi_shelter_type_field_shelter">Abeiro rural</string>
     <string name="poi_internet_access_type_wlan">Wi-Fi</string>
     <string name="poi_internet_access_type_wired">Por cabo</string>
     <string name="poi_internet_access_type_no">Sen acceso á Internet</string>
@@ -3141,7 +3141,7 @@
     <string name="poi_generator_output_electricity_no">Saída (electricidade): non</string>
     <string name="poi_owner">Dono</string>
     <string name="poi_animal_shelter_purpose_adoption_no">Adopción: non</string>
-    <string name="poi_animal_shelter_purpose_release_no">Rehabilitación e liberación: non</string>
+    <string name="poi_animal_shelter_purpose_release_no">Liberación: non</string>
     <string name="poi_spaceport">Porto espacial</string>
     <string name="poi_direction_n">Dirección: norte</string>
     <string name="poi_direction_nne">Dirección: norte-nordeste</string>
@@ -3643,11 +3643,11 @@
     <string name="poi_motorhome_no">Acceso para autocaravanas: non</string>
     <string name="poi_trailer_no">Acceso con remolque: non</string>
     <string name="poi_psv_yes">Acceso para transporte público: si</string>
-    <string name="poi_psv_designated">Acceso para transporte público: designado</string>
+    <string name="poi_psv_designated">Acceso para transporte público: sinalizado</string>
     <string name="poi_psv_no">Acceso para transporte público: non</string>
     <string name="poi_bus_no">Acceso para buses: non</string>
     <string name="poi_tourist_bus_yes">Acceso para buses turísticos: si</string>
-    <string name="poi_tourist_bus_designated">Acceso para buses turísticos: designado</string>
+    <string name="poi_tourist_bus_designated">Acceso para autobuses turísticos: sinalizado</string>
     <string name="poi_tourist_bus_no">Acceso para buses turísticos: no</string>
     <string name="poi_coach_yes">Acceso para buses de longa distancia: si</string>
     <string name="poi_coach_no">Acceso para buses de longa distancia: non</string>
@@ -3658,7 +3658,7 @@
     <string name="poi_agricultural_yes">Acceso para vehículos agrícolas: si</string>
     <string name="poi_agricultural_no">Acceso para vehículos agrícolas: non</string>
     <string name="poi_taxi_yes">Acceso para taxis: si</string>
-    <string name="poi_taxi_designated">Acceso para taxis: designado</string>
+    <string name="poi_taxi_designated">Acceso para taxis: sinalizado</string>
     <string name="poi_taxi_no">Acceso para taxis: non</string>
     <string name="poi_disabled_no">Acceso para discapacitados: non</string>
     <string name="poi_snowmobile_yes">Si;Motos de neve</string>
@@ -3686,9 +3686,9 @@
     <string name="poi_hgv_designated">Sinalizado;Acceso sinalizado para camións</string>
     <string name="poi_hgv_delivery">Entregas;Acceso para camións de reparto</string>
     <string name="poi_goods_yes">Si:Acceso a vehículos comerciais lixeiros</string>
-    <string name="poi_goods_designated">Indicado;Indicado para vehículos comerciais lixeiros</string>
+    <string name="poi_goods_designated">Sinalizado;Sinalizado para vehículos comerciais lixeiros</string>
     <string name="poi_disabled_yes">Si;Acceso para discapacitados</string>
-    <string name="poi_disabled_designated">Sinalado;Acceso sinalado para discapacitados</string>
+    <string name="poi_disabled_designated">Sinalizado;Acceso sinalizado para discapacitados</string>
     <string name="poi_cellar_entrance">Entrada da adega</string>
     <string name="poi_health_food">Alimentación saudábel</string>
     <string name="poi_craft_builder">Construtor ou albanel</string>
@@ -3727,7 +3727,7 @@
     <string name="poi_bath_type_river">Río</string>
     <string name="poi_bath_type_lake">Lagoa</string>
     <string name="poi_bath_type_foot_bath">Baño de pés</string>
-    <string name="poi_bath_open_air_yes">Si</string>
+    <string name="poi_bath_open_air_yes">Si;Aseos ao ar libre</string>
     <string name="poi_bath_open_air_no">Non</string>
     <string name="poi_monastery_type_monastics">Tipo de mosteiro: monástico</string>
     <string name="poi_monastery_type_convent">Tipo de mosteiro: convento</string>
@@ -3766,11 +3766,11 @@
     <string name="poi_dive_centre">Centro de mergullo</string>
     <string name="poi_sms">SMS</string>
     <string name="poi_video_telephone">Vídeo</string>
-    <string name="poi_sms_yes">Si</string>
+    <string name="poi_sms_yes">Si;SMS</string>
     <string name="poi_sms_no">Non</string>
     <string name="poi_covered_booth">Cabina</string>
     <string name="poi_booth">Tipo de cabina</string>
-    <string name="poi_video_yes">Si</string>
+    <string name="poi_video_yes">Si;Vídeo</string>
     <string name="poi_video_no">Non</string>
     <string name="poi_internet_access_fee_customers">Acceso á internet: clientes</string>
     <string name="poi_traffic_signals_sound_locate">Só é permitido ó camiñar</string>
@@ -3779,7 +3779,7 @@
     <string name="poi_tactile_paving_incorrect">Incorrecto</string>
     <string name="poi_drinking_water_refill_network">Rede de recarga de auga potábel</string>
     <string name="poi_drinking_water_refill_no">Recarga de auga potábel: non</string>
-    <string name="poi_drinking_water_refill_yes">Si</string>
+    <string name="poi_drinking_water_refill_yes">Si;Reenchido de auga potábel;Reencher</string>
     <string name="poi_seamark_obstruction">Obstrución</string>
     <string name="poi_seamark_water_level_below_mwl">Nivel da auga: por debaixo do nivel medio da auga</string>
     <string name="poi_seamark_water_level_above_mwl">Nivel da auga: por encima do nivel medio da auga</string>
@@ -3796,8 +3796,8 @@
     <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>
-    <string name="poi_traffic_signals_arrow_yes">Si</string>
-    <string name="poi_traffic_signals_vibration_yes">Si</string>
+    <string name="poi_traffic_signals_arrow_yes">Si;Frecha de sinalización de tráfico</string>
+    <string name="poi_traffic_signals_vibration_yes">Si;Sinais de vibración do tráfico</string>
     <string name="poi_traffic_signals_vibration_no">Vibración: non</string>
     <string name="poi_traffic_signals_arrow">Frecha</string>
     <string name="poi_traffic_signals_vibration">Vibración</string>
@@ -3806,10 +3806,10 @@
     <string name="poi_borough">Concello</string>
     <string name="poi_nuts">Froitos secos</string>
     <string name="poi_beehive">Colmea</string>
-    <string name="poi_departures_board_timetable">Horarios</string>
-    <string name="poi_departures_board_realtime">Tempo real</string>
-    <string name="poi_departures_board_delay">Atraso</string>
-    <string name="poi_departures_board_yes">Si</string>
+    <string name="poi_departures_board_timetable">Horarios;Taboleiro de saídas</string>
+    <string name="poi_departures_board_realtime">Tempo real;Taboleiro de saídas</string>
+    <string name="poi_departures_board_delay">Atraso;Taboleiro de saídas</string>
+    <string name="poi_departures_board_yes">Si;Taboleiro de saídas</string>
     <string name="poi_departures_board_no">Taboleiro de saídas: non</string>
     <string name="poi_elevator">Ascensor</string>
     <string name="poi_traffic_signals_arrow_no">Frecha: non</string>
@@ -3818,7 +3818,7 @@
     <string name="poi_drinking_water_refill">Recarga de auga potábel</string>
     <string name="poi_fuel_lng">GNL</string>
     <string name="poi_parking_layby">Apartadoiro</string>
-    <string name="poi_parking_sheds">Pendellos</string>
+    <string name="poi_parking_sheds">Alpendres</string>
     <string name="poi_parking_rooftop">Terrazo</string>
     <string name="poi_gpx_point">Punto GPX</string>
     <string name="poi_radar_tower">Torre de radar</string>
@@ -3857,7 +3857,7 @@
     <string name="poi_mobile_money_agent">Axente de diñeiro móbil</string>
     <string name="poi_lavoir">Lavadoiro</string>
     <string name="poi_waste_transfer_station">Estación de transferencia de residuos</string>
-    <string name="poi_weighbridge">Balanza</string>
+    <string name="poi_weighbridge">Báscula ponte;Báscula de camións</string>
     <string name="poi_ranger_station">Posto de garda forestal</string>
     <string name="poi_water_source_lake">Lago</string>
     <string name="poi_water_source_river">Río</string>
@@ -3932,4 +3932,30 @@
     <string name="poi_water_filter">Auga;Auga potábel</string>
     <string name="poi_vending_machine_fuel_filter">Surtidores automáticos de combustíbel; Máquina expendedora de combustíbel</string>
     <string name="poi_ship_delivery">Acceso a barcos: entregas</string>
+    <string name="poi_shelter_filter">Abeiro</string>
+    <string name="poi_heating_no">Non</string>
+    <string name="poi_furniture_bedroom">Dormitorio;Mobles de dormitorio</string>
+    <string name="poi_us_maps_recreation_area_facility_group_shelter">Albergue para grupos</string>
+    <string name="poi_ice_cream_yes">Si;Xeado</string>
+    <string name="poi_mattress_yes">Si;Colchón</string>
+    <string name="poi_furniture_used">Usado;Mobles usados</string>
+    <string name="poi_authentication_none_yes">Si;Sen autenticación</string>
+    <string name="poi_permanent_camping_only">Só;Só campamento permanente</string>
+    <string name="poi_not_pt_shelter_yes">Abeiro (non para transporte público)</string>
+    <string name="poi_furniture_office">Oficina;Mobiliario de oficina</string>
+    <string name="poi_furniture_yes">Si;Mobles</string>
+    <string name="poi_furniture_bed">Cama;Mobles</string>
+    <string name="poi_permanent_camping_yes">Si;Campamento permanente</string>
+    <string name="poi_shelter_no">Abeiro: non</string>
+    <string name="poi_furniture_living_room">Sala de estar;Mobles para sala de estar</string>
+    <string name="poi_shelter_yes">Si;Abeiro</string>
+    <string name="poi_coffee_yes">Si;Café</string>
+    <string name="poi_tobacco_yes">Si;Tabaco</string>
+    <string name="poi_membership_yes">Si;Membresía;Afiliación</string>
+    <string name="poi_service_fleurop_yes">Si;Fleurop;Interflora;Envío de flores</string>
+    <string name="poi_furniture_kitchen">Cociña;Mobles de cociña</string>
+    <string name="poi_furniture_sofa">Sofá;Mobles</string>
+    <string name="poi_heating_yes">Si;Calefacción</string>
+    <string name="poi_heating_filter">Calefacción</string>
+    <string name="poi_agrarian_yes">Si;Agrícola</string>
 </resources>
\ No newline at end of file

From 9a5b394c817f7379ed5410ec4ba8476608710f75 Mon Sep 17 00:00:00 2001
From: Franco <francobenedetti.59+weblate1@gmail.com>
Date: Sat, 28 Sep 2024 00:00:59 +0000
Subject: [PATCH 33/83] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (5307 of 5307 strings)
---
 OsmAnd/res/values-es-rAR/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 35bb8053d66..eff029418d4 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -5973,4 +5973,9 @@
     <string name="obd_fuel_type">Tipo de combustible</string>
     <string name="obd_plugin_description">Accede a la información de tu vehículo mediante el protocolo OBD</string>
     <string name="obd_support">Compatibilidad OBD</string>
+    <string name="reset_average_speed">Reiniciar la velocidad promedio</string>
+    <string name="unknown_bt_device">Dispositivo desconocido</string>
+    <string name="obd_vin">VIN</string>
+    <string name="vehicle_metrics_plugin_settings">Ajustes de «Estadísticas del vehículo»</string>
+    <string name="obd_vin_desc">Código VIN sobre OBD</string>
 </resources>
\ No newline at end of file

From 1b91ff304ff0c335fddf8f25991b25d338f7469a Mon Sep 17 00:00:00 2001
From: Max Kojin <nnngrach@gmail.com>
Date: Sat, 28 Sep 2024 23:07:41 +0500
Subject: [PATCH 34/83] deleting duplicated translations

---
 OsmAnd-telegram/res/values-ar-rSA/strings.xml |  1 -
 OsmAnd-telegram/res/values-he/strings.xml     |  1 -
 OsmAnd-telegram/res/values-hu/strings.xml     |  1 -
 OsmAnd-telegram/res/values-id/strings.xml     |  1 -
 OsmAnd-telegram/res/values-pt-rPT/strings.xml |  1 -
 OsmAnd/res/values-ar/strings.xml              |  1 -
 OsmAnd/res/values-ars/strings.xml             |  1 -
 OsmAnd/res/values-ast/strings.xml             | 24 -------------------
 OsmAnd/res/values-az/strings.xml              |  1 -
 OsmAnd/res/values-b+hsb/strings.xml           |  1 -
 OsmAnd/res/values-b+sr+Latn/strings.xml       |  1 -
 OsmAnd/res/values-be/strings.xml              |  1 -
 OsmAnd/res/values-bg/strings.xml              |  1 -
 OsmAnd/res/values-ca/strings.xml              |  2 --
 OsmAnd/res/values-cs/strings.xml              |  3 ---
 OsmAnd/res/values-cy/strings.xml              |  1 -
 OsmAnd/res/values-da/strings.xml              |  4 ----
 OsmAnd/res/values-de/strings.xml              |  4 ----
 OsmAnd/res/values-el/strings.xml              |  1 -
 OsmAnd/res/values-eo/strings.xml              |  1 -
 OsmAnd/res/values-es-rAR/strings.xml          |  2 --
 OsmAnd/res/values-es-rUS/strings.xml          |  2 --
 OsmAnd/res/values-es/strings.xml              |  2 --
 OsmAnd/res/values-et/strings.xml              |  1 -
 OsmAnd/res/values-eu/strings.xml              |  2 --
 OsmAnd/res/values-fa/strings.xml              |  2 --
 OsmAnd/res/values-fi/strings.xml              |  3 ---
 OsmAnd/res/values-fr/strings.xml              |  2 --
 OsmAnd/res/values-ga/strings.xml              |  1 -
 OsmAnd/res/values-gl/strings.xml              |  1 -
 OsmAnd/res/values-hu/strings.xml              |  1 -
 OsmAnd/res/values-in/strings.xml              |  1 -
 OsmAnd/res/values-is/strings.xml              |  1 -
 OsmAnd/res/values-it/strings.xml              |  2 --
 OsmAnd/res/values-iw/strings.xml              |  1 -
 OsmAnd/res/values-ja/strings.xml              |  2 --
 OsmAnd/res/values-ka/strings.xml              |  1 -
 OsmAnd/res/values-ko/strings.xml              |  1 -
 OsmAnd/res/values-lt/strings.xml              |  1 -
 OsmAnd/res/values-lv/strings.xml              |  1 -
 OsmAnd/res/values-mk/strings.xml              |  1 -
 OsmAnd/res/values-nb/strings.xml              |  1 -
 OsmAnd/res/values-nl/strings.xml              |  4 ----
 OsmAnd/res/values-oc/strings.xml              |  1 -
 OsmAnd/res/values-pl/strings.xml              |  2 --
 OsmAnd/res/values-pt-rBR/strings.xml          |  2 --
 OsmAnd/res/values-pt/strings.xml              |  3 ---
 OsmAnd/res/values-ro/strings.xml              |  2 --
 OsmAnd/res/values-ru/strings.xml              |  1 -
 OsmAnd/res/values-sc/strings.xml              |  1 -
 OsmAnd/res/values-sk/strings.xml              |  4 ----
 OsmAnd/res/values-sl/strings.xml              |  1 -
 OsmAnd/res/values-sr/strings.xml              |  1 -
 OsmAnd/res/values-sv/strings.xml              |  2 --
 OsmAnd/res/values-tr/strings.xml              |  1 -
 OsmAnd/res/values-tt/strings.xml              |  1 -
 OsmAnd/res/values-tzm/strings.xml             |  1 -
 OsmAnd/res/values-uk/strings.xml              |  1 -
 OsmAnd/res/values-zh-rCN/strings.xml          |  1 -
 OsmAnd/res/values-zh-rTW/strings.xml          |  2 --
 60 files changed, 115 deletions(-)

diff --git a/OsmAnd-telegram/res/values-ar-rSA/strings.xml b/OsmAnd-telegram/res/values-ar-rSA/strings.xml
index 42bae9b25a2..7555678cb06 100644
--- a/OsmAnd-telegram/res/values-ar-rSA/strings.xml
+++ b/OsmAnd-telegram/res/values-ar-rSA/strings.xml
@@ -271,7 +271,6 @@
     <string name="logcat_buffer">لوجكات العازلة</string>
     <string name="logcat_buffer_descr">تحقق من السجلات التفصيلية للتطبيق وشاركها</string>
     <string name="send_report">إرسال تقرير</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
     <string name="send_live_location_error">إرسال خطأ في الموقع المباشر: %1$s</string>
     <string name="shared_string_error">خطأ</string>
diff --git a/OsmAnd-telegram/res/values-he/strings.xml b/OsmAnd-telegram/res/values-he/strings.xml
index 89773fede38..f1ca12c64e1 100644
--- a/OsmAnd-telegram/res/values-he/strings.xml
+++ b/OsmAnd-telegram/res/values-he/strings.xml
@@ -270,7 +270,6 @@
     <string name="logcat_buffer">מכלא Logcat</string>
     <string name="logcat_buffer_descr">בדיקה ושיתוף יומני תיעוד מפורטים של היישומים</string>
     <string name="send_report">שליחת דיווח</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
     <string name="shared_string_error">שגיאה</string>
     <string name="send_live_location_error">שגיאה בשליחת מיקום בזמן אמת: %1$s</string>
diff --git a/OsmAnd-telegram/res/values-hu/strings.xml b/OsmAnd-telegram/res/values-hu/strings.xml
index 71767dc857a..b4f7fab43c8 100644
--- a/OsmAnd-telegram/res/values-hu/strings.xml
+++ b/OsmAnd-telegram/res/values-hu/strings.xml
@@ -274,6 +274,5 @@
     <string name="send_report">Jelentés küldése</string>
     <string name="shared_string_error">Hiba</string>
     <string name="send_live_location_error">Élő helymeghatározási hiba küldése: %1$s</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-id/strings.xml b/OsmAnd-telegram/res/values-id/strings.xml
index ed5e5af9f9d..4d6b6b07399 100644
--- a/OsmAnd-telegram/res/values-id/strings.xml
+++ b/OsmAnd-telegram/res/values-id/strings.xml
@@ -149,7 +149,6 @@
     <string name="buffer_time">Waktu kadaluwarsa buffer</string>
     <string name="time_zone_descr">Pilih zona waktu untuk ditampilkan pada pesan lokasi Anda.</string>
     <string name="set_time_timeline_descr">Pilih waktu untuk ditampilkan</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="min_logging_accuracy_descr">Saring: tidak ada pencatatan kecuali akurasi dicapai</string>
     <string name="proxy_port">Port</string>
     <string name="shared_string_error">Terjadi kesalahan</string>
diff --git a/OsmAnd-telegram/res/values-pt-rPT/strings.xml b/OsmAnd-telegram/res/values-pt-rPT/strings.xml
index e3df3837916..3f98dfcd437 100644
--- a/OsmAnd-telegram/res/values-pt-rPT/strings.xml
+++ b/OsmAnd-telegram/res/values-pt-rPT/strings.xml
@@ -271,7 +271,6 @@
     <string name="logcat_buffer">Buffer de logcat</string>
     <string name="logcat_buffer_descr">Verifique e compartilhe registos detalhados da app</string>
     <string name="send_report">Enviar o relatório</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
     <string name="shared_string_error">Erro</string>
     <string name="send_live_location_error">Enviar erro de localização em tempo real: %1$s</string>
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index 874661360eb..7258a19bfda 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -3848,7 +3848,6 @@
 \nسيتوفر الرسم البياني بعد إعادة الحساب.</string>
     <string name="snowmobile_render_descr">للقيادة على الجليد مع طرق ومسارات مخصصة.</string>
     <string name="shared_string_graph">رسم بياني</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>
     <string name="icon_group_special">خاص</string>
diff --git a/OsmAnd/res/values-ars/strings.xml b/OsmAnd/res/values-ars/strings.xml
index 40f05442fea..57ef186d742 100644
--- a/OsmAnd/res/values-ars/strings.xml
+++ b/OsmAnd/res/values-ars/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
     <string name="touring_view_render_descr">أسلوب الملاحة مع التباين العالي والحد الأعلى من التفاصيل. يتضمن كل خيارات النمط الافتراضي أوسماند، مع عرض أكبر قدر ممكن من التفاصيل ، ولا سيما الطرق والمسارات وطرق السفر الأخرى. التمييز الواضح بين \"جولة الأطلس\" بين أنواع الطرق. مناسبة للاستخدام النهاري والليلي وفي الهواء الطلق.</string>
     <string name="shared_string_hillshade">التضاريس</string>
diff --git a/OsmAnd/res/values-ast/strings.xml b/OsmAnd/res/values-ast/strings.xml
index 5ccd64bbe9f..6e8f9ce9b16 100644
--- a/OsmAnd/res/values-ast/strings.xml
+++ b/OsmAnd/res/values-ast/strings.xml
@@ -512,7 +512,6 @@
     <string name="shared_string_color">Color</string>
     <string name="file_can_not_be_moved">Nun se pudo mover el ficheru.</string>
     <string name="shared_string_move">Mover</string>
-    <string name="routing_attr_driving_style_name">Driving style</string>
     <string name="altitude_descent">Descent</string>
     <string name="altitude_ascent">Ascent</string>
     <string name="average_altitude">Altitú media</string>
@@ -818,7 +817,6 @@
     <string name="of">%1$d de %2$d</string>
     <string name="ascent_descent">Ascent/Descent</string>
     <string name="home">Panel</string>
-    <string name="always_center_position_on_map">Display position always in center</string>
     <string name="lang_sr_latn">Serbian (latin)</string>
     <string name="lang_zh_hk">Chinu (Ḥong Kong)</string>
     <string name="lang_gn_py">Guaranín</string>
@@ -936,7 +934,6 @@
     <string name="altitude">Altitú</string>
     <string name="i_am_here">Toi equí</string>
     <string name="arrival_distance_factor_normally">Normal</string>
-    <string name="arrival_distance_factor_at_last">In the last meters</string>
     <string name="offline_edition">Edición ensin internet</string>
     <string name="offline_edition_descr">If offline editing is enabled, then changes will be saved locally first and uploaded by request, otherwise changes will be uploaded immediately.</string>
     <string name="local_openstreetmap_uploading">Xubiendo…</string>
@@ -1329,7 +1326,6 @@
     <string name="apply_filters">Apply filters</string>
     <string name="map_marker">Marcador del mapa</string>
     <string name="map_widget_plain_time">Hora actual</string>
-    <string name="routing_attr_weight_name">Weight limit</string>
     <string name="routing_attr_height_name">Llende d\'altor</string>
     <string name="route_is_too_long_v2">Pa distancies llongues: Amiesta destinos intermedios si nun s\'atopa nengún camín en 10 minutos.</string>
     <string name="speak_cameras">Radares de velocidá</string>
@@ -1372,8 +1368,6 @@
     <string name="price_free">Free</string>
     <string name="get_discount_title">Get %1$d %2$s at %3$s off.</string>
     <string name="get_discount_first_part">%1$s for the first %2$s</string>
-    <string name="get_discount_first_few_part">%1$s for the first %2$s</string>
-    <string name="get_discount_second_part">then %1$s</string>
     <string name="configure_profile_info">Settings for profile:</string>
     <string name="shared_string_example">Exemplu</string>
     <string name="wake_time">Timeout after wake-up</string>
@@ -1472,8 +1466,6 @@
     <string name="routing_attr_piste_type_downhill_description">Slopes for alpine or downhill skiing and access to ski lifts.</string>
     <string name="routing_attr_piste_type_downhill_name">Alpine and downhill skiing</string>
     <string name="quick_action_need_to_add_item_to_list">Add at least one item to the list in the \'Quick action\' settings</string>
-    <string name="routing_attr_avoid_sett_description">Avoids cobblestone and sett</string>
-    <string name="routing_attr_avoid_sett_name">No cobblestone or sett</string>
     <string name="run_full_osmand_msg">You are using {0} Map which is powered by OsmAnd. Do you want to launch OsmAnd full version\?</string>
     <string name="routeInfo_steepness_name">Steepness</string>
     <string name="routeInfo_smoothness_name">Smoothness</string>
@@ -1641,7 +1633,6 @@
     <string name="use_english_names_descr">Select between local and English names.</string>
     <string name="mark_point">Target</string>
     <string name="reload_tile">Reload tile</string>
-    <string name="update_tile">Update map</string>
     <string name="data_settings_descr">Specify language, download/reload data.</string>
     <string name="osm_settings_descr">Specify OpenStreetMap.org (OSM) settings needed for OSM submissions.</string>
     <string name="use_online_routing">Use online navigation</string>
@@ -1866,7 +1857,6 @@
     <string name="rendering_attr_hmRendered_name">Show more map detail</string>
     <string name="rendering_attr_hmRendered_description">Increase amount of map detail shown.</string>
     <string name="rendering_attr_contourLines_name">Show contour lines</string>
-    <string name="rendering_attr_contourLines_description">Display from zoom level (requires contour data):</string>
     <string name="rendering_attr_appMode_description">Optimize map for</string>
     <string name="rendering_attr_noPolygons_description">Make all areal land features on map transparent.</string>
     <string name="share_route_subject">Route shared via OsmAnd</string>
@@ -2223,7 +2213,6 @@
     <string name="auto_zoom_farthest">To long-range</string>
     <string name="auto_zoom_far">To mid-range</string>
     <string name="auto_zoom_close">To close-up</string>
-    <string name="auto_zoom_none">No auto zoom</string>
     <string name="animate_routing_gpx">Simulate using GPX track</string>
     <string name="app_mode_boat">Embarcación</string>
     <string name="app_mode_hiking">Hiking</string>
@@ -2588,7 +2577,6 @@
     <string name="rendering_attr_showCycleRoutes_name">Cycle routes</string>
     <string name="rendering_attr_showSurfaces_name">Show road surface</string>
     <string name="rendering_attr_showSurfaceGrade_name">Show road quality</string>
-    <string name="rendering_attr_showAccess_name">Show access restrictions and toll</string>
     <string name="rendering_attr_hideAccess_name">Access restrictions</string>
     <string name="rendering_attr_lessDetailed_name">Menos detalles</string>
     <string name="rendering_attr_buildings15zoom_name">Buildings on zoom 15</string>
@@ -2652,7 +2640,6 @@
     <string name="delete_filter">Delete filter</string>
     <string name="create_custom_poi">Create custom filter</string>
     <string name="selected_categories">Selected categories</string>
-    <string name="edit_filter">Edit categories</string>
     <string name="translit_names">Transliterate names</string>
     <string name="rendering_attr_surfaceIntegrity_name">Road surface integrity</string>
     <string name="rendering_attr_contourColorScheme_name">Contour lines color scheme</string>
@@ -2762,7 +2749,6 @@
     <string name="download_wikipedia_files">Download additional Wikipedia data (%1$s MB)\?</string>
     <string name="lang_oc">Occitanu</string>
     <string name="lang_nv">Navajo</string>
-    <string name="quick_action_auto_zoom">Auto zoom map on/off</string>
     <string name="select_city">Select city</string>
     <string name="type_postcode">Teclexa\'l códigu postal</string>
     <string name="shared_string_in_name">in %1$s</string>
@@ -2771,7 +2757,6 @@
     <string name="animate_my_location_desc">Turn on animated map panning of \'My position\' during navigation.</string>
     <string name="favorite_group_name">Group name</string>
     <string name="display_zoom_level">Display zoom level: %1$s</string>
-    <string name="show_from_zoom_level">Display starting at zoom level</string>
     <string name="srtm_purchase_header">Buy and install the \'Contour lines\' plugin to show graded vertical areas.</string>
     <string name="srtm_menu_download_descr">Download the \'Contour line\' map for use in this region.</string>
     <string name="hide_from_zoom_level">Hide starting from zoom level</string>
@@ -3073,7 +3058,6 @@
     <string name="routing_attr_driving_style_prefer_unpaved_name">Prefer unpaved roads</string>
     <string name="shared_preference">Shared</string>
     <string name="apply_preference_to_all_profiles">Apply this change to all or the selected profile.</string>
-    <string name="quick_action_hillshade_descr">A button to show or hide hillshades on the map.</string>
     <string name="quick_action_contour_lines_descr">Button showing or hiding contour lines on the map.</string>
     <string name="layer_osm_edits">OSM edits</string>
     <string name="tts_initialization_error">Nun se pue aniciar el motor de testu a voz.</string>
@@ -3252,7 +3236,6 @@
     <string name="search_poi_types_descr">Combine POI types from different categories. Tap switch to select all, tap left side to category selection.</string>
     <string name="extra_maps_menu_group">Mapes adicionales</string>
     <string name="download_unsupported_action">Unsupported action %1$s</string>
-    <string name="tracker_item">OsmAnd tracker</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
     <string name="quick_action_item">Aición rápida</string>
     <string name="radius_ruler_item">Radius ruler</string>
@@ -3299,7 +3282,6 @@
     <string name="height_limit_description">Apurri l\'altor del vehículu. Puen aplicase dalgunes torgues d\'encaminamientu pa vehículos altos.</string>
     <string name="weight_limit_description">Apurri\'l pesu del vehículu. Puen aplicase dalgunes torgues d\'encaminamientu pa vehículos pesaos.</string>
     <string name="lenght_limit_description">Apurri la llongura del vehículu. Puen aplicase dalgunes torgues d\'encaminamientu pa vehículos llongos.</string>
-    <string name="gpx_parse_error">OsmAnd GPX is not well formed, please contact the support team to investigate further.</string>
     <string name="shared_string_always">Siempres</string>
     <string name="screen_control">Screen control</string>
     <string name="system_screen_timeout_descr">Turns the screen off as per the system\'s screen timeout.</string>
@@ -3776,7 +3758,6 @@
     <string name="track_recording_description">¿Quies dexar de rexistrar\?
 \nVan perdese tolos datos ensin guardar.</string>
     <string name="on_pause">On pause</string>
-    <string name="app_restart_required">Application restart required to apply some settings.</string>
     <string name="routing_attr_height_obstacles_description">Routing could avoid strong uphills.</string>
     <string name="quick_action_coordinates_widget_descr">Un alternador p\'amosar/anubrir el widget Coordenaes nel mapa.</string>
     <string name="map_widget_distance_by_tap">Distance by tap</string>
@@ -3836,7 +3817,6 @@
     <string name="update_all_maps_added">Update all maps added to %1$s\?</string>
     <string name="shared_string_feet">pies</string>
     <string name="srtm_unit_format">Contour lines unit variant</string>
-    <string name="srtm_download_list_help_message">OsmAnd provides contour lines data in meters and feet. You will need to re-download the file to change the format.</string>
     <string name="srtm_download_single_help_message">Please select the variant. You will need to re-download the file to change the format.</string>
     <string name="exit_number">Númberu de les salíes</string>
     <string name="announce_when_exceeded">Announce when exceeded</string>
@@ -3947,7 +3927,6 @@
     <string name="message_graph_will_be_available_after_recalculation">Espera.
 \nEl gráficu va tar disponible dempués de volver calcular el camín.</string>
     <string name="shared_string_local_maps">Mapes llocales</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_amenity">Amenity</string>
     <string name="icon_group_special">Special</string>
     <string name="icon_group_transport">Tresporte</string>
@@ -4073,7 +4052,6 @@
     <string name="osmand_cloud_help_descr">¿Precises ayuda\? Ponte en contautu con nós per %1$s</string>
     <string name="osmand_cloud_create_account_descr">Introduz la to direición de corréu pa recibir un códigu de verificación
 \ny enllaciar tolos datos con ella.</string>
-    <string name="osmand_cloud_login_descr">Please enter the e-mail address you registred with. A one-time password for the next step will be sent to it.</string>
     <string name="verify_email_address">Verify the e-mail address</string>
     <string name="verify_email_address_descr">El códigu de verificación unvióse a %1$s. Introduzlu nel campu d\'abaxo.</string>
     <string name="cloud_email_not_registered">This e-mail address is not registered for OsmAnd Cloud</string>
@@ -4135,7 +4113,6 @@
     <string name="send_crash_log">Send crash log</string>
     <string name="send_logcat_log">Send logcat log</string>
     <string name="purchases_feature_desc_nautical">Get access to nautical depth information</string>
-    <string name="purchases_feature_desc_terrain">Terrain contour lines, full hillshade map with dark shades and slope maps with colors to show peaks and lowlands.</string>
     <string name="purchases_feature_desc_wikivoyage">Esplora Wikivoyage ensin internet. Los artículos dixébrense per países y rexones, y tán disponibles en toles llingües.</string>
     <string name="purchases_feature_desc_wikipedia">Esplora Wikipedia ensin internet. Los artículos dixébrense per países y rexones, y tán disponibles en toles llingües.</string>
     <string name="purchases_feature_desc_combined_wiki">Explore Wikipedia articles on the go, without an internet connection. Offline data divided by countries and available in all languages.</string>
@@ -4205,7 +4182,6 @@
     <string name="rendering_value_walkingRoutesOSMC_description">Color routes according to their individual local color (if present on OpenStreetMap) and hiking shield symbol.</string>
     <string name="rendering_value_walkingRoutesScopeOSMC_description">Color by network affiliation.</string>
     <string name="rendering_value_walkingRoutesOSMCNodes_description">Color routes according to their node network type (international, regional, local).</string>
-    <string name="walking_route_osmc_description">Color routes according to their individual local color (if present on OpenStreetMap) and type (international, regional, local).</string>
     <string name="travel_routes">Travel routes</string>
     <string name="setting_supported_by_style">This setting is provided by map style \'%1$s\'</string>
     <string name="direct_line_maps_required_descr">El cálculu de la ruta tarda más de lo normal.
diff --git a/OsmAnd/res/values-az/strings.xml b/OsmAnd/res/values-az/strings.xml
index ea66e04deba..781b6443fba 100644
--- a/OsmAnd/res/values-az/strings.xml
+++ b/OsmAnd/res/values-az/strings.xml
@@ -2051,7 +2051,6 @@
     <string name="shared_string_is_saved">saxlanıldı</string>
     <string name="sort_name_descending">Ad: Z – A</string>
     <string name="sort_name_ascending">Ad: A – Z</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_sport">İdman</string>
     <string name="login_account">Hesab</string>
     <string name="user_login">İstifadəçi adı</string>
diff --git a/OsmAnd/res/values-b+hsb/strings.xml b/OsmAnd/res/values-b+hsb/strings.xml
index 2b83952ad17..d0ee3d53e8e 100644
--- a/OsmAnd/res/values-b+hsb/strings.xml
+++ b/OsmAnd/res/values-b+hsb/strings.xml
@@ -1497,7 +1497,6 @@
     <string name="shared_string_icon">Symbol</string>
     <string name="manage_profiles">Profile aplikacije zarjadować…</string>
     <string name="in_app_purchase">Kupy w aplikaciji</string>
-    <string name="wikivoyage_offline">Wikivoyage offline</string>
     <string name="unlimited_downloads">Njewobmjezowane sćehnjenja</string>
     <string name="wikipedia_offline">Wikipedija offline</string>
     <string name="get_unlimited_access">Wobstaraj sej njewobmjezowany přistup</string>
diff --git a/OsmAnd/res/values-b+sr+Latn/strings.xml b/OsmAnd/res/values-b+sr+Latn/strings.xml
index 6fa352e5a4e..0798799f9ab 100644
--- a/OsmAnd/res/values-b+sr+Latn/strings.xml
+++ b/OsmAnd/res/values-b+sr+Latn/strings.xml
@@ -3053,7 +3053,6 @@
     <string name="message_graph_will_be_available_after_recalculation">Molimo sačekaj.
 \nGrafikon će biti dostupan nakon ponovnog izračunavanja rute.</string>
     <string name="shared_string_local_maps">Lokalne mape</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_amenity">Slobodno vreme</string>
     <string name="icon_group_special">Specijalna</string>
     <string name="icon_group_transport">Prevoz</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 0fc2997462d..c71d4469bc1 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -3796,7 +3796,6 @@
     <string name="message_graph_will_be_available_after_recalculation">Калі ласка, пачакайце.
 \nГрафік будзе даступны пасля пераразліку маршруту.</string>
     <string name="shared_string_local_maps">Лакальныя мапы</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_amenity">Выгоды</string>
     <string name="icon_group_special">Адмысловыя</string>
     <string name="icon_group_transport">Транспарт</string>
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index 2aacdf41efc..358a5f91b4f 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -2208,7 +2208,6 @@
     <string name="message_graph_will_be_available_after_recalculation">Изчакайте.
 \nГрафиката ще е достъпна след преизчисляване на маршрута.</string>
     <string name="shared_string_local_maps">Местни карти</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_amenity">Удобства</string>
     <string name="icon_group_special">Специални</string>
     <string name="icon_group_transport">Транспорт</string>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index d2f4b7c37a8..dcd4607147a 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1454,7 +1454,6 @@
     <string name="mark_to_delete">Marqueu per esborrar</string>
     <string name="simulate_your_location">Simula la vostra ubicació</string>
     <string name="drawer">Llista senzilla</string>
-    <string name="short_location_on_map">Lat %1$s\nLon %2$s</string>
     <string name="tips_and_tricks_descr">Preguntes més freqüents, canvis recents i altres.</string>
     <string name="routing_settings_2">Paràmetres de navegació</string>
     <string name="general_settings_2">Paràmetres generals</string>
@@ -3680,7 +3679,6 @@
     <string name="shared_string_always">Sempre</string>
     <string name="screen_control">Control de pantalla</string>
     <string name="development">Desenvolupament</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="use_native_pt_desc">Canvieu el càlcul de rutes de Transport Public a Java (segur)</string>
     <string name="start_finish_icons">Icones d\'inici i final</string>
     <string name="contour_lines_thanks">Gràcies per comprar \'Corbes de nivell\'</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 7f3116c33fc..3d6313f0ebe 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -3477,7 +3477,6 @@
     <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>
     <string name="sqlite_db_file">Soubor SQLiteDB</string>
@@ -4346,7 +4345,6 @@
     <string name="continue_with">Pokračovat s %1$s</string>
     <string name="you_can_get_feature_as_part_of_pattern">Získejte “%1$s” jako součást předplatného (%2$s). Srovnání:</string>
     <string name="nautical_depth">Námořní hloubka</string>
-    <string name="offline_wikivoyage">Offline Wikivoyage</string>
     <string name="wikipedia_and_wikivoyage_offline">Wikipedie a Wikivoyage offline</string>
     <string name="unlimited_map_downloads">Neomezený počet map ke stažení</string>
     <string name="purchases_feature_desc_combined_wiki">Prozkoumejte články Wikipedie bez připojení na internet. Offline data jsou rozdělena podle zemí a dostupná ve všech jazycích.</string>
@@ -4562,7 +4560,6 @@
     <string name="rendering_attr_showMtbScale_description">Zobrazit trasy podle jejich stupnice MTB.</string>
     <string name="rendering_attr_showMtbScale_name">Zobrazit stupnici MTB</string>
     <string name="co2_mission">Emise CO2</string>
-    <string name="import_export">Import/export</string>
     <string name="export_to_file">Export do souboru</string>
     <string name="shared_string_expires">Platnost končí</string>
     <string name="shared_string_purchased_on">Zakoupeno dne</string>
diff --git a/OsmAnd/res/values-cy/strings.xml b/OsmAnd/res/values-cy/strings.xml
index 72f1c8ec571..3225ed5017b 100644
--- a/OsmAnd/res/values-cy/strings.xml
+++ b/OsmAnd/res/values-cy/strings.xml
@@ -346,7 +346,6 @@
     <string name="shared_string_add_profile">Ychwanegu proffil</string>
     <string name="add_online_source">Ychwanegu ffynhonnell ar-lein</string>
     <string name="add_address">Ychwanegu cyfeiriad</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="shared_string_add_photo">Ychwanegu llun</string>
     <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
     <string name="plan_route_add_new_segment">Ychwanegu segment newydd</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 32dbb8572e1..c578aea35cf 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2657,7 +2657,6 @@
     <string name="in_app_purchase">Køb i app</string>
     <string name="in_app_purchase_desc">Engangsbetaling</string>
     <string name="purchase_unlim_title">Køb - %1$s</string>
-    <string name="wikivoyage_offline">Wikivoyage offline</string>
     <string name="unlimited_downloads">Ubegrænset hentninger</string>
     <string name="wikipedia_offline">Wikipedia offline</string>
     <string name="unlock_all_features">Lås op for alle funktioner i OsmAnd</string>
@@ -3497,7 +3496,6 @@
     <string name="favorites_item">Favoritter</string>
     <string name="subscription_osmandlive_item">Abonnement - OsmAnd Live</string>
     <string name="navigation_profiles_item">Navigationsprofiler</string>
-    <string name="tracker_item">OsmAnd tracker</string>
     <string name="osmand_purchases_item">OsmAnd køb</string>
     <string name="quick_action_transport_descr">En knap til at vise eller skjule offentlig transport på kortet.</string>
     <string name="create_edit_poi">Opret eller rediger IP</string>
@@ -3635,7 +3633,6 @@
     <string name="all_next_segments_will_be_recalc">Alle efterfølgende segmenter genberegnes ved hjælp af den valgte profil.</string>
     <string name="all_previous_segments_will_be_recalc">Alle tidligere segmenter genberegnes ved hjælp af den valgte profil.</string>
     <string name="start_finish_icons">Start- og slutikoner</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="export_not_enough_space">Der er ikke plads nok</string>
     <string name="routing_attr_length_name">Længde</string>
     <string name="contour_lines_thanks">Tak for dit køb af \'Topografi\'</string>
@@ -3929,7 +3926,6 @@
     <string name="unlimited_map_downloads">Ubegrænset download af kort</string>
     <string name="wikipedia_and_wikivoyage_offline">Wikipedia og Wikivoyage offline</string>
     <string name="offline_wikipeadia">Offline Wikipedia</string>
-    <string name="offline_wikivoyage">Offline Wikivoyage</string>
     <string name="you_can_get_feature_as_part_of_pattern">Få \"%1$s\" som en del af %2$s abonnementet. Sammenligning:</string>
     <string name="ltr_or_rtl_combine_via_or">%1$s af %2$s</string>
     <string name="continue_with">Fortsæt med %1$s</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 0a2a0ad12ab..08bfbe98014 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -2674,7 +2674,6 @@
     <string name="in_app_purchase_desc">Einmalige Zahlung</string>
     <string name="in_app_purchase_desc_ex">Nach dem Kauf steht es Ihnen dauerhaft zur Verfügung.</string>
     <string name="purchase_unlim_title">Kaufen - %1$s</string>
-    <string name="wikivoyage_offline">Wikivoyage offline</string>
     <string name="unlimited_downloads">Unbegrenzte Downloads</string>
     <string name="wikipedia_offline">Wikipedia offline</string>
     <string name="unlock_all_features">Alle OsmAnd-Funktionen freischalten</string>
@@ -3525,7 +3524,6 @@
     <string name="map_markers_item">Kartenmarkierungen</string>
     <string name="favorites_item">Favoriten</string>
     <string name="divider_descr">Elemente unterhalb dieses Punktes werden durch einen Trenner getrennt.</string>
-    <string name="tracker_item">OsmAnd Tracker</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
     <string name="travel_item">Reisen (Wikivoyage und Wikipedia)</string>
     <string name="subscription_osmandlive_item">Abonnement - OsmAnd Live</string>
@@ -3786,7 +3784,6 @@
     <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 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">Bitte warten Sie.
 \nDie Grafik wird nach der Neuberechnung der Route verfügbar sein.</string>
@@ -4979,7 +4976,6 @@
     <string name="shared_string_do_not_exist">Nicht vorhanden</string>
     <string name="backup_error_failed_to_fetch_remote_items">Fehler beim Abrufen der Dateiliste vom Server.</string>
     <string name="last_sync">Letzte Synchronisierung</string>
-    <string name="import_export">Import/Export</string>
     <string name="export_to_file">In Datei exportieren</string>
     <string name="res_unknown">Unbekannt</string>
     <string name="shared_string_modified">Geändert</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 87d5fbe0990..c2b15c8e17f 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -3682,7 +3682,6 @@
     <string name="wiki_menu_download_descr">Απαιτούνται πρόσθετοι χάρτες για να προβάλετε τα ΣΕ της Wikipedia στον χάρτη.</string>
     <string name="select_wikipedia_article_langs">Επιλέξτε τις γλώσσες για τα άρθρα Wikipedia στον χάρτη. Αλλάξτε σε οποιαδήποτε διαθέσιμη γλώσσα κατά την ανάγνωση του άρθρου.</string>
     <string name="radius_ruler_item">Χάρακας ακτίνας</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="map_markers_desc">Το γραφικό στοιχείο δείχνει την απόσταση ή την εκτιμώμενη ώρα άφιξης (ETA) για τους δύο πρώτους δείκτες στη λίστα δεικτών χάρτη.</string>
     <string name="shared_string_next_sunset">Επόμενο ηλιοβασίλεμα</string>
     <string name="shared_string_next_sunrise">Επόμενη ανατολή</string>
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index 82fe6facce5..1cebcdd317f 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -3776,7 +3776,6 @@
     <string name="message_need_calculate_route_before_show_graph">Datumoj de %1$s estas disponeblaj nur por vojoj, kalkulu la kurson uzante “kalkuli kurson inter punktoj” por montri diagramon.</string>
     <string name="message_graph_will_be_available_after_recalculation">Bonvolu atendi.
 \nDiagramo estos videbla post rekalkuli kurson.</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="shared_string_local_maps">Lokaj mapoj</string>
     <string name="icon_group_amenity">Oportunaĵo</string>
     <string name="icon_group_special">Specialaj</string>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index d56b4fe354d..25ee89fe0a2 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -3515,7 +3515,6 @@
 \nGestiona o cancela las suscripciones cuando quieras, en los ajustes de Google Play.</string>
     <string name="search_poi_types">Buscar por tipos de PDI</string>
     <string name="search_poi_types_descr">Combina tipos de PDI de diferentes categorías. Pulsa «Alternar» para marcar todo y el lado izquierdo para elegir una categoría.</string>
-    <string name="tracker_item">OsmAnd Tracker</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
     <string name="quick_action_item">Acción rápida</string>
     <string name="radius_ruler_item">Regla radial</string>
@@ -3779,7 +3778,6 @@
     <string name="message_need_calculate_route_before_show_graph">Los datos de «%1$s» sólo están disponibles con los caminos, calcula una ruta usando «Ruta entre puntos» para ver los gráficos.</string>
     <string name="message_graph_will_be_available_after_recalculation">Ten paciencia.
 \nEl gráfico estará disponible al recalcular la ruta.</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s – %2$s</string>
     <string name="shared_string_local_maps">Mapas locales</string>
     <string name="icon_group_amenity">Comodidad</string>
     <string name="icon_group_special">Especial</string>
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index a390a265e8c..3a383217dcd 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -3477,7 +3477,6 @@
     <string name="mapillary_item">OsmAnd + Mapillary</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="travel_item">Viajes (Wikiviajes y Wikipedia)</string>
-    <string name="tracker_item">OsmAnd Tracker</string>
     <string name="subscription_osmandlive_item">Suscripción - OsmAnd Live</string>
     <string name="some_articles_may_not_available_in_lang">Es posible que algunos artículos de Wikipedia no estén disponibles en tu idioma.</string>
     <string name="select_wikipedia_article_langs">Marca los idiomas de los artículos de Wikipedia en el mapa. Cambia a cualquier idioma disponible mientras lees el artículo.</string>
@@ -3781,7 +3780,6 @@
     <string name="message_need_calculate_route_before_show_graph">Los datos de «%1$s» sólo están disponibles con los caminos, calcula una ruta usando «Ruta entre puntos» para ver los gráficos.</string>
     <string name="message_graph_will_be_available_after_recalculation">Ten paciencia.
 \nEl gráfico estará disponible al recalcular la ruta.</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s – %2$s</string>
     <string name="icon_group_travel">Viaje</string>
     <string name="icon_group_transport">Transporte</string>
     <string name="icon_group_symbols">Símbolos</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 30443ddbfca..52bab5a686f 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -3601,7 +3601,6 @@
     <string name="lang_ur">Urdu</string>
     <string name="lang_tg">Tayiko</string>
     <string name="lang_bar">Bávaro</string>
-    <string name="tracker_item">OsmAnd Tracker</string>
     <string name="legend_item_description">La guía para la simbología de un mapa.</string>
     <string name="parking_positions">Posiciones de aparcamiento</string>
     <string name="turn_screen_on_power_button_disabled">Desactivado. Es necesario activar «Mantener la pantalla encendida» en «Tiempo de espera al encender».</string>
@@ -3760,7 +3759,6 @@
     <string name="development">Desarrollo</string>
     <string name="file_already_imported">El archivo ya fue importado en OsmAnd</string>
     <string name="shared_string_local_maps">Mapas locales</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s – %2$s</string>
     <string name="icon_group_amenity">Comodidad</string>
     <string name="icon_group_special">Especial</string>
     <string name="icon_group_transport">Transporte</string>
diff --git a/OsmAnd/res/values-et/strings.xml b/OsmAnd/res/values-et/strings.xml
index 164bd9adfd0..0461951ab2e 100644
--- a/OsmAnd/res/values-et/strings.xml
+++ b/OsmAnd/res/values-et/strings.xml
@@ -3711,7 +3711,6 @@
     <string name="use_live_routing">OsmAnd andmed reaalajas</string>
     <string name="use_live_public_transport">OsmAnd andmed reaalajas</string>
     <string name="snowmobile_render_descr">Mootorsaanide sõitmine eraldi määratud teedel ja radadel.</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_special">Eriteenused</string>
     <string name="icon_group_amenity">Mugavus</string>
     <string name="shared_string_local_maps">Kohalikud kaardid</string>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 8ec4f119ec2..16a61340ced 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -1470,7 +1470,6 @@
     <string name="waypoint_visit_before">Bisitatu aurretik</string>
     <string name="simulate_your_location">Simulatu zure kokapena</string>
     <string name="drawer">Zerrenda soila</string>
-    <string name="short_location_on_map">Lat %1$s\nLon %2$s</string>
     <string name="tips_and_tricks_descr">Maiz egindako galderak, azken aldaketak, eta bestelakoak.</string>
     <string name="routing_settings_2">Nabigazio ezarpenak</string>
     <string name="shared_string_deselect">Desautatu</string>
@@ -3783,7 +3782,6 @@
     <string name="message_graph_will_be_available_after_recalculation">Itxaron mesedez.
 \nIbilbidea birkalkulatu ondoren grafikoa eskuragarri egongo da.</string>
     <string name="shared_string_local_maps">Tokiko mapak</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_special">Berezia</string>
     <string name="icon_group_transport">Garraioa</string>
     <string name="icon_group_service">Zerbitzua</string>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index e24ae60653d..f8312fa451b 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -3511,7 +3511,6 @@
 \nاشتراک شما به‌طور خودکار تمدید می‌شود مگر اینکه پیش از دورهٔ تمدید انتخاب‌شده لغو شود.
 \n
 \nهر زمان که خواستید از طریق تنظیمات گوگل‌پلی اشتراک خود را مدیریت یا لغو کنید.</string>
-    <string name="tracker_item">OsmAnd tracker</string>
     <string name="legend_item_description">راهنمای نمادشناسی نقشه.</string>
     <string name="navigation_profiles_item">نمایه‌های ناوبری</string>
     <string name="lang_zhyue">کانتونی</string>
@@ -3799,7 +3798,6 @@
     <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="message_you_need_add_two_points_to_show_graphs">دست‌کم دو نقطه اضافه کنید</string>
     <string name="login_open_street_map">ورود به اوپن‌استریت‌مپ</string>
     <string name="login_open_street_map_org">ورود به OpenStreetMap.org</string>
diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml
index 2f846101cd7..b1616146e8c 100644
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@@ -2637,7 +2637,6 @@
     <string name="osm_edit_logout_success">Kirjautunut ulos</string>
     <string name="message_you_need_add_two_points_to_show_graphs">Lisää ainakin kaksi pistettä</string>
     <string name="plugin_global_prefs_info">Nämä laajennusasetukset ovat globaaleja ja vaikuttavat kaikkiin profiileihin</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="use_two_phase_routing">Käytä kaksivaiheista A*-reititys algoritmiä</string>
     <string name="shared_string_graph">Graafi</string>
     <string name="message_need_calculate_route_before_show_graph">%1$s data on käytettävissä ainoastaan teillä, laske reitti käyttäen \"Reitti pisteiden välillä\" nähdäksesi graafit.</string>
@@ -3187,7 +3186,6 @@
     <string name="no_recalculation_setting">Ei uudelleenlaskentaa</string>
     <string name="restore_all_profile_settings_descr">Kaikki profiilin asetukset palautetaan alkuperäiseen tilaansa tämän profiilin luomisen/tuonnin jälkeen.</string>
     <string name="lang_bar">Baijeri</string>
-    <string name="tracker_item">OsmAnd Tracker</string>
     <string name="create_edit_poi">Luo tai muokkaa KP:tä</string>
     <string name="parking_positions">Pysäköintipaikat</string>
     <string name="add_edit_favorite">Lisää tai muokkaa suosikkia</string>
@@ -3699,7 +3697,6 @@
     <string name="unlimited_map_downloads">Rajoittamattomat karttalataukset</string>
     <string name="wikipedia_and_wikivoyage_offline">Wikipedia ja Wikivoyage offline-tilassa</string>
     <string name="offline_wikipeadia">Offline Wikipedia</string>
-    <string name="offline_wikivoyage">Offline Wikivoyage</string>
     <string name="nautical_depth">Merellinen syvyys</string>
     <string name="you_can_get_feature_as_part_of_pattern">Hanki \"%1$s\" osana %2$s suunnitelmaa. Vertailu:</string>
     <string name="ltr_or_rtl_combine_via_or">%1$s tai %2$s</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 9892ba09bbd..9ea716a59d2 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -3517,7 +3517,6 @@
     <string name="radius_ruler_item">Règle de mesure par rayon</string>
     <string name="map_markers_item">Marques</string>
     <string name="legend_item_description">Guide des symboles cartographiques</string>
-    <string name="tracker_item">OsmAnd Tracker</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
     <string name="quick_action_item">Action rapide</string>
     <string name="measure_distance_item">Mesurer une distance</string>
@@ -3778,7 +3777,6 @@
 \nLe graphique sera disponible à l\'issue du calcul d\'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="ltr_or_rtl_combine_via_dash">%1$s - %2$s</string>
     <string name="shared_string_local_maps">Cartes locales</string>
     <string name="icon_group_amenity">Loisir</string>
     <string name="icon_group_special">Spécial</string>
diff --git a/OsmAnd/res/values-ga/strings.xml b/OsmAnd/res/values-ga/strings.xml
index 32bbcca7fc9..333198fdaf0 100644
--- a/OsmAnd/res/values-ga/strings.xml
+++ b/OsmAnd/res/values-ga/strings.xml
@@ -1146,7 +1146,6 @@
     <string name="shared_string_trip">Turas</string>
     <string name="average_altitude">Airde mheánach</string>
     <string name="subcategories">Fochatagóirí</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="south_abbreviation">D</string>
     <string name="regular_price">Gnáthphraghas</string>
     <string name="shared_string_read">Léigh</string>
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index 9d20cb89b39..9707e3a8d46 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -3778,7 +3778,6 @@
     <string name="file_already_imported">O ficheiro xa foi importado no OsmAnd</string>
     <string name="use_two_phase_routing">Usar algoritmo de enrutamento A* de 2 fases</string>
     <string name="shared_string_graph">Gráfica</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="navigate_point_mgrs">MGRS</string>
     <string name="navigate_point_format_mgrs">MGRS</string>
     <string name="mgrs_format_descr">O OsmAnd emprega MGRS, que é semellante ó formato UTM NATO.</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 9204f21b147..f8d5ce996ae 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -3773,7 +3773,6 @@
     <string name="osm_edit_logout_success">Kijelentkezett</string>
     <string name="use_two_phase_routing">Kétszakaszos A* útvonaltervezési algoritmus használata</string>
     <string name="file_already_imported">A fájl már importálva van az OsmAndba</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="snowmobile_render_descr">Motorosszán vezetéshez külön utakkal és pályákkal.</string>
     <string name="shared_string_graph">Grafikon</string>
     <string name="message_need_calculate_route_before_show_graph">%1$s adatok csak utakról állnak rendelkezésre. Az ábrák megtekintéséhez az „Útvonal tervezése pontok között” funkcióval számítsa ki az útvonalat.</string>
diff --git a/OsmAnd/res/values-in/strings.xml b/OsmAnd/res/values-in/strings.xml
index 551dde158bd..09028ace981 100644
--- a/OsmAnd/res/values-in/strings.xml
+++ b/OsmAnd/res/values-in/strings.xml
@@ -1693,7 +1693,6 @@
     <string name="route_descr_lat_lon">Lin %1$.3f, buj %2$.3f</string>
     <string name="ltr_or_rtl_triple_combine_via_space">%1$s %2$s %3$s</string>
     <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="n_items_of_z">%1$s / %2$s</string>
     <string name="poi_remove_confirm_template">Hapus {0} (komentar)\?</string>
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index 57a828da393..f5747af10e1 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -3784,7 +3784,6 @@
 \n
 \nÞú getur stýrt og aflýst áskriftunum þínum með því að fara í AppGallery stillingarnar þínar.</string>
     <string name="shared_string_graph">Graf</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s - %2$s</string>
     <string name="shared_string_local_maps">Staðkort</string>
     <string name="icon_group_amenity">Aðstaða</string>
     <string name="icon_group_special">Sértákn</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 8ba76e4fa7b..ed3d8f537f8 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2602,7 +2602,6 @@
     <string name="in_app_purchase_desc">Pagamento unico</string>
     <string name="in_app_purchase_desc_ex">Una volta acquistato, sarà permanentemente a vostra disposizione.</string>
     <string name="purchase_unlim_title">Acquista - %1$s</string>
-    <string name="wikivoyage_offline">Wikivoyage offline</string>
     <string name="unlimited_downloads">Download illimitati</string>
     <string name="wikipedia_offline">Wikipedia offline</string>
     <string name="unlock_all_features">Sblocca tutte le funzionalità di OsmAnd</string>
@@ -3772,7 +3771,6 @@
     <string name="message_need_calculate_route_before_show_graph">%1$s dati disponibili solo sulle strade, calcola un percorso utilizzando \"Percorso tra punti\" per visualizzare il grafico.</string>
     <string name="message_graph_will_be_available_after_recalculation">Attendere prego... 
 \nIl grafo sarà disponibile dopo il ricalcolo del percorso.</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="navigate_point_mgrs">MGRS</string>
     <string name="navigate_point_format_mgrs">MGRS</string>
     <string name="mgrs_format_descr">OsmAnd utilizza MGRS, che è simile al formato UTM NATO.</string>
diff --git a/OsmAnd/res/values-iw/strings.xml b/OsmAnd/res/values-iw/strings.xml
index ed68835610f..607ed2d8114 100644
--- a/OsmAnd/res/values-iw/strings.xml
+++ b/OsmAnd/res/values-iw/strings.xml
@@ -3782,7 +3782,6 @@
     <string name="shared_string_graph">תרשים</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>
     <string name="icon_group_special">מיוחד</string>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index 243d0a49cde..e1fff349328 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -3498,7 +3498,6 @@ POIの更新は利用できません</string>
     <string name="ui_customization">ユーザーインターフェイスのカスタマイズ</string>
     <string name="extra_maps_menu_group">追加マップ</string>
     <string name="download_unsupported_action">%1$sのアクションはサポートされていません</string>
-    <string name="tracker_item">OsmAnd Tracker</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
     <string name="quick_action_item">クイックアクション</string>
     <string name="radius_ruler_item">半径定規</string>
@@ -3779,7 +3778,6 @@ POIの更新は利用できません</string>
     <string name="file_already_imported">ファイルはすでにOsmAndにインポートされています</string>
     <string name="icon_group_amenity">店舗・施設</string>
     <string name="shared_string_local_maps">ローカルマップ</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_special">特別</string>
     <string name="icon_group_transport">交通</string>
     <string name="icon_group_service">設備・技術</string>
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index 931a1e27552..c65a31f3104 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -1707,7 +1707,6 @@
     <string name="routing_attr_length_name">სიგრძე</string>
     <string name="item_deleted">%1$s წაშლილია</string>
     <string name="routing_attr_difficulty_preference_name">არჩეული სირთულე</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s - %2$s</string>
     <string name="icon_group_amenity">კომფორტი</string>
     <string name="icon_group_special">სპეციალური</string>
     <string name="icon_group_transport">ტრანსპორტი</string>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index f3c4b6f03d3..79e47d11895 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -3952,7 +3952,6 @@
     <string name="token_is_not_valid">토큰은 유효하지 않습니다</string>
     <string name="check_for_updates">업데이트 확인</string>
     <string name="download_cloud_version">클라우드 버전 다운로드</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="select_layer">레이어 선택</string>
     <string name="beats_per_minute_short">bpm</string>
     <string name="ant_plus_searching">찾는 중</string>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 4bfded37fbb..81a493f7d42 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -2898,7 +2898,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="quick_action_switch_day_mode">Dienos režimas</string>
     <string name="quick_action_add_gpx_descr">Mygtukas, skirtas pridėti GPX kelio tašką ekrano viduryje.</string>
     <string name="quick_action_navigation_voice_descr">Perjungiklis, skirtas išjungti arba įjungti balso nurodymus navigacijos metu.</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
     <string name="custom_color">Pasirinktinė spalva</string>
     <string name="lang_mn">Mongolų</string>
diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index bf45bf152df..55139e07253 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -3282,7 +3282,6 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="message_graph_will_be_available_after_recalculation">Gaidiet maršruta pārrēķināšanu.
 \nGrafika būs redzama pēc brīža.</string>
     <string name="shared_string_local_maps">Vietējās kartes</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_special">Speciālais</string>
     <string name="icon_group_transport">Transports</string>
     <string name="icon_group_service">Serviss</string>
diff --git a/OsmAnd/res/values-mk/strings.xml b/OsmAnd/res/values-mk/strings.xml
index 2296ea7d040..8f9efddef99 100644
--- a/OsmAnd/res/values-mk/strings.xml
+++ b/OsmAnd/res/values-mk/strings.xml
@@ -1024,7 +1024,6 @@
     <string name="icon_group_transport">Transport</string>
     <string name="icon_group_special">Poesbno</string>
     <string name="icon_group_amenity">Udobnost</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="shared_string_local_maps">Lokalni karti</string>
     <string name="osm_edit_logout_success">Odjaven</string>
     <string name="clear_osm_token">Isčistete go OpenStreetMap OAuth tokenot</string>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 4f028e9e6f9..de405fc0c5d 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -3719,7 +3719,6 @@
     <string name="file_already_imported">Filen er allerede importert i OsmAnd</string>
     <string name="message_graph_will_be_available_after_recalculation">Vent.
 \nGraf vil være tilgjengelig etter omberegning av ruten.</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="shared_string_graph">Graf</string>
     <string name="message_need_calculate_route_before_show_graph">%1$s-data er tilgjengelig kun på veiene, beregn en rute med “Rute mellom punkter” for å se grafer.</string>
     <string name="shared_string_gpx_route">Spor rute</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index d2293f19a4a..17693c9d5c6 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -2562,7 +2562,6 @@
     <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="purchase_unlim_title">%1$s Kopen</string>
-    <string name="wikivoyage_offline">Wikivoyage offline</string>
     <string name="unlimited_downloads">Onbeperkte downloads</string>
     <string name="wikipedia_offline">Wikipedia offline</string>
     <string name="unlock_all_features">Ontgrendel alle OsmAnd-functies</string>
@@ -3365,7 +3364,6 @@
     <string name="search_poi_types_descr">Combineer POI-types uit verschillende categorieën. Tik op \"Selecteer alles\" om alles binnen een categorie te selecteren, of kies individuele types.</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 tracker</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
     <string name="quick_action_item">Sneltoets</string>
     <string name="radius_ruler_item">Radius liniaal</string>
@@ -3664,7 +3662,6 @@
     <string name="shared_string_graph">Grafiek</string>
     <string name="message_graph_will_be_available_after_recalculation">Wacht totdat route herberekend is.
 \nNa herberekening is de grafiek zichtbaar.</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="import_track_descr">Kies een trackbestand om te volgen of importeer het vanaf je apparaat.</string>
     <string name="shared_string_custom">Aangepast</string>
     <string name="perform_oauth_authorization_description">Voer een OAuth-login uit om osm edit functies te gebruiken</string>
@@ -4363,7 +4360,6 @@
     <string name="shared_string_not_included">Niet inbegrepen</string>
     <string name="cancel_anytime_in_gplay">Annuleer het abonnement op elk moment via Google Play.</string>
     <string name="nautical_depth">Zeediepte</string>
-    <string name="offline_wikivoyage">Offline Wikivoyage</string>
     <string name="send_crash_log">Crashrapport verzenden</string>
     <string name="you_can_get_feature_as_part_of_pattern">Verkrijg \"%1$s\" als onderdeel van het %2$s abonnement. Vergelijking:</string>
     <string name="offline_wikipeadia">Offline Wikipedia</string>
diff --git a/OsmAnd/res/values-oc/strings.xml b/OsmAnd/res/values-oc/strings.xml
index 15d00fd81a0..9c6efb2858e 100644
--- a/OsmAnd/res/values-oc/strings.xml
+++ b/OsmAnd/res/values-oc/strings.xml
@@ -1882,7 +1882,6 @@
     <string name="app_mode_kayak">Caiac</string>
     <string name="icon_group_travel">Viatge</string>
     <string name="icon_group_symbols">Simbòl</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="message_graph_will_be_available_after_recalculation">Esperatz.
 \nLo grafic serà disponible après lo recalcul dau percors.</string>
     <string name="use_live_routing">Donadas d\'OsmAnd Live</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 790949a9fe2..62b33715cb9 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -3627,7 +3627,6 @@
     <string name="item_deleted">Usunięto %1$s</string>
     <string name="speed_cameras_restart_descr">Uruchom ponownie aplikację, aby usunąć wszystkie dane o fotoradarach.</string>
     <string name="shared_string_uninstall_and_restart">Odinstaluj i zrestartuj</string>
-    <string name="tracker_item">OsmAnd Tracker</string>
     <string name="lenght_limit_description">Podaj długość pojazdu, niektóre ograniczenia tras mogą być stosowane dla długich pojazdów.</string>
     <string name="speed_cameras_removed_descr">To urządzenie nie ma fotoradarów.</string>
     <string name="use_volume_buttons_as_zoom_descr">Steruj poziomem powiększenia mapy za pomocą przycisków głośności na urządzeniu.</string>
@@ -3772,7 +3771,6 @@
     <string name="clear_osm_token">Wyczyść token OpenStreetMap OAuth</string>
     <string name="osm_edit_logout_success">Wylogowano</string>
     <string name="file_already_imported">Plik jest już zaimportowany do OsmAnd</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="navigate_point_mgrs">MGRS</string>
     <string name="navigate_point_format_mgrs">MGRS</string>
     <string name="use_two_phase_routing">Użyj 2-fazowego algorytmu routingu A *</string>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index f9730411dfd..c4c05ad3114 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -2608,7 +2608,6 @@
     <string name="in_app_purchase_desc">Pagamento uma só vez</string>
     <string name="in_app_purchase_desc_ex">Uma vez adquirido, ele sempre será disponível para você.</string>
     <string name="purchase_unlim_title">Comprar - %1$s</string>
-    <string name="wikivoyage_offline">Wikivoyage offline</string>
     <string name="unlimited_downloads">Downloads ilimitados</string>
     <string name="wikipedia_offline">Wikipédia offline</string>
     <string name="purchase_dialog_title">Escolher plano</string>
@@ -3774,7 +3773,6 @@
     <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>
     <string name="icon_group_special">Especial</string>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index a76d5e55bef..bb502fad2db 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -2176,7 +2176,6 @@
     <string name="in_app_purchase_desc">Pagamento de uma só vez</string>
     <string name="in_app_purchase_desc_ex">Uma vez comprado, estará sempre disponível para si.</string>
     <string name="purchase_unlim_title">Comprar - %1$s</string>
-    <string name="wikivoyage_offline">Wikivoyage offline</string>
     <string name="unlimited_downloads">Descarregamentos ilimitados</string>
     <string name="wikipedia_offline">Wikipédia offline</string>
     <string name="unlock_all_features">Desbloquear todas as características do OsmAnd</string>
@@ -3481,7 +3480,6 @@
     <string name="wiki_menu_download_descr">São necessários mapas adicionais para visualizar os POIs da Wikipédia no mapa.</string>
     <string name="select_wikipedia_article_langs">Selecione os idiomas dos artigos da Wikipédia no mapa. Pode mudar para qualquer idioma disponível enquanto lê um artigo da Wikipédia.</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
-    <string name="tracker_item">OsmAnd tracker</string>
     <string name="quick_action_item">Botão de ações rápidas</string>
     <string name="radius_ruler_item">Régua radial</string>
     <string name="measure_distance_item">Medir distância</string>
@@ -3780,7 +3778,6 @@
     <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">Aguarde um momento.
 \nO gráfico estará disponível após a rota ser recalculada.</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s – %2$s</string>
     <string name="navigate_point_mgrs">MGRS</string>
     <string name="navigate_point_format_mgrs">MGRS</string>
     <string name="mgrs_format_descr">O OsmAnd utiliza o MGRS, que é semelhante ao formato UTM NATO.</string>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index c8dd92d88a2..6ee164c748d 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -3197,7 +3197,6 @@
     <string name="message_graph_will_be_available_after_recalculation">Vă rugăm să așteptați.
 \nGraficul va fi disponibil după recalcularea traseului.</string>
     <string name="shared_string_local_maps">Hărți locale</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_amenity">Facilități</string>
     <string name="icon_group_special">Speciale</string>
     <string name="icon_group_transport">Transporturi</string>
@@ -4975,7 +4974,6 @@
     <string name="cloud_no_conflicts">Nu sunt conflicte.</string>
     <string name="shared_string_do_not_exist">Nu există</string>
     <string name="last_sync">Ultima sincronizare</string>
-    <string name="import_export">Import/Export</string>
     <string name="export_to_file">Exportă în fișier</string>
     <string name="shared_string_expires">Expiră</string>
     <string name="open_weather_action_description">Vă permite să deschideți un ecran cu informații meteo detaliate.</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index c3ddac293e9..17088968ae0 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -3792,7 +3792,6 @@
     <string name="snowmobile_render_descr">Для езды на снегоходах по выделенным дорогам и трассам.</string>
     <string name="development">Разработка</string>
     <string name="shared_string_local_maps">Местная карта</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_amenity">Удобства</string>
     <string name="icon_group_transport">Транспорт</string>
     <string name="icon_group_symbols">Символы</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index ccaeaf9e82f..d224f0153f7 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -3778,7 +3778,6 @@
     <string name="shared_string_graph">Gràficu</string>
     <string name="message_graph_will_be_available_after_recalculation">Pro praghere iseta.
 \nSu gràficu at a èssere a disponimentu a pustis de su càrculu nou de s\'àndala.</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_emergency">Apretu/Emergèntzia</string>
     <string name="icon_group_special">Ispetziales</string>
     <string name="icon_group_transport">Trasportu</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index ff7dc1b10a0..ad39cab5daa 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2687,7 +2687,6 @@
     <string name="in_app_purchase_desc">Jednorazová platba</string>
     <string name="in_app_purchase_desc_ex">Po zakúpení bude pre vás trvalo dostupné.</string>
     <string name="purchase_unlim_title">Kúpiť - %1$s</string>
-    <string name="wikivoyage_offline">Wikivoyage offline</string>
     <string name="unlimited_downloads">Neobmedzené sťahovania</string>
     <string name="wikipedia_offline">Wikipédia offline</string>
     <string name="unlock_all_features">Odomknite všetky funkcie OsmAnd</string>
@@ -3774,7 +3773,6 @@
     <string name="message_need_calculate_route_before_show_graph">Údaje %1$s sú dostupné len na cestách, pre ich získanie musíte vypočítať trasu pomocou “Trasa medzi bodmi”.</string>
     <string name="message_graph_will_be_available_after_recalculation">Počkajte na prepočet trasy.
 \nGraf bude dostupný po prepočte.</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="shared_string_local_maps">Lokálne mapy</string>
     <string name="icon_group_amenity">Občianska vybavenosť</string>
     <string name="icon_group_special">Špeciálne</string>
@@ -4119,7 +4117,6 @@
     <string name="unlimited_map_downloads">Neobmedzený počet stiahnutých máp</string>
     <string name="wikipedia_and_wikivoyage_offline">Wikipedia a Wikivoyage offline</string>
     <string name="offline_wikipeadia">Offline Wikipédia</string>
-    <string name="offline_wikivoyage">Offline Wikivoyage</string>
     <string name="nautical_depth">Námorná hĺbka</string>
     <string name="you_can_get_feature_as_part_of_pattern">Získajte “%1$s” ako súčasť: predplatné %2$s. Porovnanie:</string>
     <string name="ltr_or_rtl_combine_via_or">%1$s alebo %2$s</string>
@@ -4974,7 +4971,6 @@
     <string name="download_cloud_version">Stiahnuť verziu z cloudu</string>
     <string name="shared_string_do_not_exist">Neexistuje</string>
     <string name="last_sync">Posledná synchronizácia</string>
-    <string name="import_export">Import/export</string>
     <string name="export_to_file">Exportovať do súboru</string>
     <string name="si_nm_mt">Námorné míle/metre</string>
     <string name="si_nm_ft">Námorné míle/stopy</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 32a81d92f3a..0195b8f0ea9 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -4033,7 +4033,6 @@
     <string name="speed_camera_pois">Hitrostne kamere</string>
     <string name="delete_all_actions_message_q">Nepreklicno izbrisati %d hitrih dejanj\?</string>
     <string name="shared_string_delete_all_q">Izbrisati vse\?</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_amenity">Dobrine</string>
     <string name="routing_attr_length_description">Določi omejitev dolžine vozila, ki bo dovoljena na poteh.</string>
     <string name="shared_string_legal">Zakonito</string>
diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index 53dfbb127e9..4ef2dafa569 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -3809,7 +3809,6 @@
     <string name="message_graph_will_be_available_after_recalculation">Молимо сачекајте.
 \nГрафикон ће бити доступан након поновног израчунавања путање.</string>
     <string name="shared_string_local_maps">Местне карте</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_amenity">Пријатност</string>
     <string name="icon_group_special">Нарочита</string>
     <string name="icon_group_transport">Превоз</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 5a7f2639dce..bf24dd07136 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -3030,7 +3030,6 @@
     <string name="message_graph_will_be_available_after_recalculation">Vänligen vänta.
 \nGrafen kommer bli tillgänglig efter att färdvägen omberäknats.</string>
     <string name="shared_string_local_maps">Lokala kartor</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s - %2$s</string>
     <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
     <string name="icon_group_transport">Kollektivtrafik</string>
     <string name="icon_group_amenity">bekvämligheter</string>
@@ -4077,7 +4076,6 @@
     <string name="cloud_all_changes_uploaded">Alla ändringar har laddats upp</string>
     <string name="cloud_all_changes_downloaded">Alla ändringar är nedladdade</string>
     <string name="backup_error_failed_to_fetch_remote_items">Misslyckades att hämta listan över filer från servern.</string>
-    <string name="import_export">Import/export</string>
     <string name="export_to_file">Exportera till fil</string>
     <string name="shared_string_purchased_on">Köpt</string>
     <string name="open_weather_action_description">Ger dig möjlighet att öppna en vy med detaljerad väderinformation.</string>
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index e6fe833acc3..6dfea474038 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -3785,7 +3785,6 @@
     <string name="navigate_point_format_mgrs">MGRS</string>
     <string name="mgrs_format_descr">OsmAnd, UTM NATO biçimine benzer olan MGRS\'yi kullanmaktadır.</string>
     <string name="shared_string_local_maps">Yerel haritalar</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_amenity">Tesis</string>
     <string name="icon_group_special">Özel</string>
     <string name="icon_group_transport">Ulaşım</string>
diff --git a/OsmAnd/res/values-tt/strings.xml b/OsmAnd/res/values-tt/strings.xml
index c2011c63454..90a13557b44 100644
--- a/OsmAnd/res/values-tt/strings.xml
+++ b/OsmAnd/res/values-tt/strings.xml
@@ -91,7 +91,6 @@
     <string name="monitoring_control_start">REC</string>
     <string name="use_live_routing">OsmAnd Live мәгълүматы</string>
     <string name="use_live_public_transport">OsmAnd Live мәгълүматы</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_sport">Спорт</string>
     <string name="use_login_password">Логин һәм парол куллану</string>
     <string name="login_account">Хисап язмасы</string>
diff --git a/OsmAnd/res/values-tzm/strings.xml b/OsmAnd/res/values-tzm/strings.xml
index 3ceedee074e..eaf1b67dcfa 100644
--- a/OsmAnd/res/values-tzm/strings.xml
+++ b/OsmAnd/res/values-tzm/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
     <string name="shared_string_local_maps">Takaṛḍa tadɣarant</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_service">Tanafut</string>
     <string name="shared_string_name"/>
     <string name="shared_string_all"/>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index ed0fecac031..97268cb15c1 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -3787,7 +3787,6 @@
     <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="shared_string_local_maps">Місцеві мапи</string>
     <string name="icon_group_amenity">Зручності</string>
     <string name="icon_group_special">Спеціальні</string>
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index e730c1998f4..b3c4575eeb8 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -3288,7 +3288,6 @@
     <string name="message_graph_will_be_available_after_recalculation">请稍候。
 \n图表将在重新计算路线后可用。</string>
     <string name="shared_string_local_maps">本地地图</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="icon_group_amenity">便利设施</string>
     <string name="icon_group_special">特殊</string>
     <string name="voice_prompts_timetable">语音提示时间</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 13f068d0909..e4bc59c14e1 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -3508,7 +3508,6 @@
 \n隨時從您的 Google Play 設定中管理或取消您的訂閱。</string>
     <string name="search_poi_types">搜尋 POI 類型</string>
     <string name="search_poi_types_descr">組合來自不同分類的 POI 類型。點擊開關以全選，點擊左側選取分類。</string>
-    <string name="tracker_item">OsmAnd tracker</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
     <string name="quick_action_item">快速動作</string>
     <string name="radius_ruler_item">半徑尺規</string>
@@ -3771,7 +3770,6 @@
     <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="shared_string_local_maps">本機地圖</string>
     <string name="icon_group_amenity">便利設施</string>
     <string name="icon_group_special">特殊</string>

From bb74a5007a46013c7a944bc5979cd9443607bb31 Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Sat, 28 Sep 2024 12:33:58 +0000
Subject: [PATCH 35/83] Translated using Weblate (French)

Currently translated at 99.9% (5305 of 5307 strings)
---
 OsmAnd/res/values-fr/strings.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 89c0e21c5c8..2b19d210155 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -4683,7 +4683,7 @@
     <string name="auto_backup_title">Backup automatique</string>
     <string name="shared_string_duplicate">Dupliquer</string>
     <string name="rendering_attr_depthContourWidth_description">Largeur des lignes de profondeur</string>
-    <string name="compass_click_desc">Astuce : appuyez sur la boussole pour basculer entre les modes d\'orientation de la carte.</string>
+    <string name="compass_click_desc">Appuyez deux fois sur la boussole pour basculer entre les modes d\'orientation de la carte.</string>
     <string name="rendering_attr_depthContourColorScheme_description">Jeu de couleurs des lignes de profondeur</string>
     <string name="av_notes_photo_widget_desc">Appuyez sur le gadget pour prendre une photo.</string>
     <string name="av_notes_video_widget_desc">Appuyez sur le gadget pour enregistrer une vidéo.</string>
@@ -5947,4 +5947,8 @@
     <string name="obd_plugin_description">Accède aux informations de votre véhicule via le protocole OBD</string>
     <string name="obd_support">Prise en charge de l\'OBD</string>
     <string name="obd_fuel_consumption_rate_desc">Affiche la consommation de carburant du véhicule selon l\'OBD et la localisation</string>
+    <string name="unknown_bt_device">Appareil inconnu</string>
+    <string name="obd_vin">VIN</string>
+    <string name="vehicle_metrics_plugin_settings">Paramètres de mesure du véhicule</string>
+    <string name="reset_average_speed">Effacer la vitesse moyenne</string>
 </resources>
\ No newline at end of file

From 2f0d814e28aa6178d38cc62a426c2c84baa9d625 Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Sat, 28 Sep 2024 22:13:36 +0000
Subject: [PATCH 36/83] Translated using Weblate (Slovak)

Currently translated at 99.1% (5263 of 5307 strings)
---
 OsmAnd/res/values-sk/strings.xml | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index ff7dc1b10a0..7f1bbfa51fd 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -4691,7 +4691,7 @@
     <string name="distance_to_intermediate_widget_desc">Nástroj zobrazuje zostávajúcu vzdialenosť k prvému prechodnému bodu. Keď je prechodný bod dosiahnutý, vzdialenosť je aktualizovaná k ďalšiemu prechodnému bodu.</string>
     <string name="distance_to_destination_widget_desc">Nástroj zobrazuje zostávajúcu vzdialenosť k poslednému cieľovému bodu.</string>
     <string name="widget_with_dot">Nástroj.</string>
-    <string name="compass_click_desc">Pomôcka: Stlačte tlačidlo kompasu pre prepnutie režimu orientácie mapy.</string>
+    <string name="compass_click_desc">Dvakrát stlačte tlačidlo kompasu pre prepnutie režimu orientácie mapy.</string>
     <string name="compass_desc">Zobrazuje smer k severu.</string>
     <string name="rendering_attr_depthContourColorScheme_description">Farebná schéma hĺbkových vrstevníc</string>
     <string name="rendering_attr_depthContourWidth_description">Hrúbka čiary hĺbkových vrstevníc</string>
@@ -5886,4 +5886,29 @@
     <string name="contour_layers_action_descr">Zmeniť vrstvy vrstevníc</string>
     <string name="type_of_activity">Druh aktivity</string>
     <string name="change_activity">Zmeniť aktivitu</string>
+    <string name="unit_volt">V</string>
+    <string name="obd_fuel_type_not_provided">Nezadaný druh paliva</string>
+    <string name="obd_fuel_type_gasoline">Benzín</string>
+    <string name="obd_fuel_type_ethanol">Etanol</string>
+    <string name="obd_fuel_type_diesel">Nafta</string>
+    <string name="obd_fuel_type_lpg">LPG (skvapalnený plyn)</string>
+    <string name="obd_fuel_type_cng">CNG (stlačený plyn)</string>
+    <string name="shared_string_obd">OBD</string>
+    <string name="obd_fuel_type_unknown">Neznámy druh paliva</string>
+    <string name="reset_average_speed">Vymazať priemernú rýchlosť</string>
+    <string name="obd_vin_desc">VIN kód cez OBD</string>
+    <string name="unknown_bt_device">Neznáme zariadenie</string>
+    <string name="obd_vin">VIN</string>
+    <string name="obd_fuel_type_methanol">Metanol</string>
+    <string name="obd_fuel_type_propane">Propán</string>
+    <string name="obd_fuel_type_electric">Elektrina</string>
+    <string name="shared_string_decrease">Znížiť</string>
+    <string name="shared_string_increase">Zvýšiť</string>
+    <string name="wikimedia">Wikimedia</string>
+    <string name="open_in_browser">Otvoriť v prehliadači</string>
+    <string name="shared_string_source">Zdroj</string>
+    <string name="shared_string_no_internet_connection">Nie je pripojenie k internetu</string>
+    <string name="no_internet_descr">Prosím skontrolujte pripojenie a skúste znovu.</string>
+    <string name="no_photos_available_descr">K tejto lokalite zatiaľ neboli pridané žiadne fotografie používateľov</string>
+    <string name="no_photos_available">Nie sú dostupné žiadne fotografie</string>
 </resources>
\ No newline at end of file

From 3f436ed5c2e61b875dfb18fa8697d08e90dcbb3c Mon Sep 17 00:00:00 2001
From: D M <emid308@yandex.ru>
Date: Sat, 28 Sep 2024 12:02:39 +0000
Subject: [PATCH 37/83] Translated using Weblate (Serbian)

Currently translated at 100.0% (5307 of 5307 strings)
---
 OsmAnd/res/values-sr/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index 8437029187d..93d5c05072e 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -5954,4 +5954,9 @@
     <string name="obd_fuel_type_bifuel_hydrogen">Двогоривно радно Водоник</string>
     <string name="obd_battery_voltage_desc">Приказује напон батерије преко ДНВ сензора</string>
     <string name="obd_fuel_left_distance_desc">Показује раздаљину коју возило може да пређе са преосталим горивом преко ОБД сензора</string>
+    <string name="unknown_bt_device">Непознати уређај</string>
+    <string name="vehicle_metrics_plugin_settings">Подешавања метрике возила</string>
+    <string name="obd_vin">ИБВ</string>
+    <string name="obd_vin_desc">ИБВ код преко ДНВ</string>
+    <string name="reset_average_speed">Ресетуј просечну брзину</string>
 </resources>
\ No newline at end of file

From 1476ae7b1c719c3fc4602d77638918d8e0469c30 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sat, 28 Sep 2024 04:36:46 +0000
Subject: [PATCH 38/83] Translated using Weblate (Hebrew)

Currently translated at 84.1% (4467 of 5307 strings)
---
 OsmAnd/res/values-iw/strings.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/OsmAnd/res/values-iw/strings.xml b/OsmAnd/res/values-iw/strings.xml
index ed68835610f..cc7d6bd2f5c 100644
--- a/OsmAnd/res/values-iw/strings.xml
+++ b/OsmAnd/res/values-iw/strings.xml
@@ -5035,4 +5035,21 @@
     <string name="quick_action_map_overlay">שכבת על</string>
     <string name="quick_action_map_style">סגנון מפה</string>
     <string name="missing_maps_ignore_details">המפות שהורדו מכסות את הנתיב שלך? אפשר לנווט באמצעות אם האזור הזה לא מוכר לך.</string>
+    <string name="wikimedia">ויקימדיה</string>
+    <string name="open_in_browser">פתיחה בדפדפן</string>
+    <string name="shared_string_source">מקור</string>
+    <string name="shared_string_no_internet_connection">אין חיבור לאינטרנט</string>
+    <string name="no_internet_descr">נא לבדוק את החיבור לאינטרנט ולנסות שוב.</string>
+    <string name="no_photos_available_descr">לא נוספו תמונות משתמשים למקום הזה עדיין</string>
+    <string name="contour_layers_action_descr">שינוי שכבות מתאר</string>
+    <string name="search_action_descr">פתיחת החיפוש.</string>
+    <string name="no_photos_available">אין תמונות זמינות</string>
+    <string name="my_location_action_descr">מירכוז המפה על המקום הנוכחי שלך.</string>
+    <string name="drawer_button_description">פתיחת התפריט הראשי.</string>
+    <string name="reset_average_speed">איפוס המהירות הממוצעת</string>
+    <string name="unknown_bt_device">התקן לא ידוע</string>
+    <string name="shared_string_decrease">הפחתה</string>
+    <string name="shared_string_increase">הגדלה</string>
+    <string name="change_zoom_action_descr">שינוי התקריב במפה.</string>
+    <string name="navigation_action_descr">פתיחת הניווט.</string>
 </resources>
\ No newline at end of file

From ef9e783cc0e08245149594e30814787c3696307c Mon Sep 17 00:00:00 2001
From: ERYpTION <eryption.ar9q2@slmail.me>
Date: Sat, 28 Sep 2024 07:00:55 +0000
Subject: [PATCH 39/83] Translated using Weblate (Danish)

Currently translated at 79.6% (3879 of 4873 strings)
---
 OsmAnd/res/values-da/phrases.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 57809b87cb6..7b5140ad6ee 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -345,7 +345,7 @@
     <string name="poi_viewpoint">Udsigtspunkt</string>
     <string name="poi_camp_site">Campingplads</string>
     <string name="poi_caravan_site">Campingvognsplads</string>
-    <string name="poi_picnic_site">Picnicplads</string>
+    <string name="poi_picnic_site">Picnic-plads</string>
     <string name="poi_spring">Kilde</string>
     <string name="poi_cemetery">Gravplads</string>
     <string name="poi_grave_yard">Kirkegård</string>
@@ -4051,4 +4051,6 @@
     <string name="poi_us_maps_recreation_area_activity_group_camping">Gruppecamping</string>
     <string name="poi_indoor_seating_bar_table">Indendørs siddepladser: barbord</string>
     <string name="poi_direction">Retning</string>
+    <string name="poi_us_maps_recreation_area_activity_group_picnicking">Gruppe-picnic</string>
+    <string name="poi_us_maps_recreation_area_activity_picnicking">Picnic</string>
 </resources>
\ No newline at end of file

From 1c3779cb6073e6376402ee22a64dc9de1d2b0854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=98=86Verdulo?= <tomek@disroot.org>
Date: Sat, 28 Sep 2024 21:55:34 +0000
Subject: [PATCH 40/83] Translated using Weblate (Esperanto)

Currently translated at 100.0% (5307 of 5307 strings)
---
 OsmAnd/res/values-eo/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index 199c9672210..7c378add48d 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -5951,4 +5951,9 @@
     <string name="obd_rpm_desc">Montras rivoluan rapidon de motoro raportatan de OBD-sentilo</string>
     <string name="obd_fuel_type_desc">Montras specon de brulaĵo raportatan de OBD-sentilo</string>
     <string name="obd_engine_coolant_temp_desc">Montras temperaturon de malvarmiga likvaĵo raportatan de OBD-sentilo</string>
+    <string name="unknown_bt_device">Nekonata aparato</string>
+    <string name="obd_vin">VIN</string>
+    <string name="obd_vin_desc">Montras VIN-numeron raportatan de OBD-sentilo</string>
+    <string name="vehicle_metrics_plugin_settings">Agordoj pri statistikoj pri veturilo</string>
+    <string name="reset_average_speed">Nuligi mezuman rapidon</string>
 </resources>
\ No newline at end of file

From b0a5149c4e33c5d4141e5117fa6f60f0a42b5eed Mon Sep 17 00:00:00 2001
From: ZeljkoBG <zeljko.velickovic@gmail.com>
Date: Sat, 28 Sep 2024 07:36:47 +0000
Subject: [PATCH 41/83] Translated using Weblate (Serbian (Latin script))

Currently translated at 100.0% (5307 of 5307 strings)
---
 OsmAnd/res/values-b+sr+Latn/strings.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-b+sr+Latn/strings.xml b/OsmAnd/res/values-b+sr+Latn/strings.xml
index 8cf00f4ba09..b9d4ac0ee73 100644
--- a/OsmAnd/res/values-b+sr+Latn/strings.xml
+++ b/OsmAnd/res/values-b+sr+Latn/strings.xml
@@ -2759,7 +2759,7 @@
     <string name="shared_string_paused">Pauzirano</string>
     <string name="shared_string_pause">&amp;Pauziraj</string>
     <string name="shared_string_continue">Nastavi</string>
-    <string name="shared_string_resume">Rezime</string>
+    <string name="shared_string_resume">Nastavi</string>
     <string name="shared_string_notifications">Obaveštenja</string>
     <string name="trip_rec_notification_settings_desc">Prikazuj obaveštenje koje omogućava pokretanje snimanja putovanja.</string>
     <string name="trip_rec_notification_settings">Uključi brzo snimanje</string>
@@ -3862,7 +3862,7 @@
     <string name="profile_type_user_string">Korisnički profil</string>
     <string name="release_3_9">• Dodata je mogućnost za izvoz i uvoz svih podataka, uključujući podešavanja, izvore, moja mesta
 \n
-\n • Planiranje rute: grafikoni za odsečke sa putanjom, i dodata je mogućnost stvaranja i uređivanja višestrukih odsečaka ruta
+\n • Plan rute: grafikoni za odsečke sa putanjom, i dodata je mogućnost stvaranja i uređivanja višestrukih odsečaka ruta
 \n
 \n • Dodan je način prijave OAuth za OpenStritMap, poboljšano korisničko sučelje prozorčića OSM-a
 \n
@@ -5208,7 +5208,7 @@
     <string name="help_article_map_tracks_on_map_name">Trase i rute</string>
     <string name="help_article_map_vector_maps_name">Vektorske mape (stil mape)</string>
     <string name="help_article_navigation_auto_car_name">Android Auto</string>
-    <string name="help_article_plan_route_name">Planiranje rute</string>
+    <string name="help_article_plan_route_name">Plan rute</string>
     <string name="help_article_troubleshooting_crash_logs_name">Dnevnik rušenja programa</string>
     <string name="help_article_troubleshooting_general_name">Generalno</string>
     <string name="help_article_troubleshooting_track_recording_issues_name">Snimanje trase</string>
@@ -5962,4 +5962,8 @@
     <string name="obd_plugin_description">Pristupa informacijama o vašem vozilu preko OBD protokola</string>
     <string name="obd_engine_coolant_temp_desc">Prikazuje temperaturu rashladne tečnosti motora preko OBD senzora</string>
     <string name="obd_fuel_left_distance_desc">Pokazuje razdaljinu koju vozilo može da pređe sa preostalim gorivom preko OBD senzora</string>
+    <string name="obd_vin">VIN</string>
+    <string name="unknown_bt_device">Nepoznat uređaj</string>
+    <string name="obd_vin_desc">VIN kod preko OBD-a</string>
+    <string name="reset_average_speed">Poništi prosečnu brzinu</string>
 </resources>
\ No newline at end of file

From 9c45c23df88c74cca9aec79dd8e2b248501aa2e9 Mon Sep 17 00:00:00 2001
From: D M <emid308@yandex.ru>
Date: Sat, 28 Sep 2024 12:09:06 +0000
Subject: [PATCH 42/83] Translated using Weblate (Serbian (Latin script))

Currently translated at 100.0% (5307 of 5307 strings)
---
 OsmAnd/res/values-b+sr+Latn/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-b+sr+Latn/strings.xml b/OsmAnd/res/values-b+sr+Latn/strings.xml
index b9d4ac0ee73..4f2af3d11d7 100644
--- a/OsmAnd/res/values-b+sr+Latn/strings.xml
+++ b/OsmAnd/res/values-b+sr+Latn/strings.xml
@@ -5966,4 +5966,5 @@
     <string name="unknown_bt_device">Nepoznat uređaj</string>
     <string name="obd_vin_desc">VIN kod preko OBD-a</string>
     <string name="reset_average_speed">Poništi prosečnu brzinu</string>
+    <string name="vehicle_metrics_plugin_settings">Podešavanja metrike vozila</string>
 </resources>
\ No newline at end of file

From c4a6fb84498c484a5b7aeb4e712a3a2b03996b8a Mon Sep 17 00:00:00 2001
From: nazar-kutz <vitaminkuna@gmail.com>
Date: Sun, 29 Sep 2024 19:53:51 +0300
Subject: [PATCH 43/83] Fix "Analyze by intervals - "None" does not work
 #20503"

---
 .../tracks/dialogs/SplitSegmentDialogFragment.java     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/SplitSegmentDialogFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/SplitSegmentDialogFragment.java
index 8bc939cb386..7cc61d281f3 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/SplitSegmentDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/SplitSegmentDialogFragment.java
@@ -36,6 +36,7 @@
 import net.osmand.plus.track.SplitTrackAsyncTask.SplitTrackListener;
 import net.osmand.plus.track.helpers.GpxDisplayGroup;
 import net.osmand.plus.track.helpers.GpxDisplayItem;
+import net.osmand.plus.track.helpers.GpxSelectionHelper;
 import net.osmand.plus.track.helpers.GpxSelectionHelper.GpxDisplayItemType;
 import net.osmand.plus.track.helpers.SelectedGpxFile;
 import net.osmand.plus.track.helpers.TrackDisplayGroup;
@@ -198,8 +199,13 @@ private void updateHeader() {
 						R.layout.popup_list_text_item, options));
 				popup.setOnItemClickListener((parent, view, position, id) -> {
 					selectedSplitInterval = position;
-					GpxSelectionParams params = GpxSelectionParams.getDefaultSelectionParams();
-					SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(getGpx(), params);
+					GpxFile gpxFile = getGpx();
+					GpxSelectionHelper gpxSelectionHelper = app.getSelectedGpxHelper();
+					SelectedGpxFile sf = gpxSelectionHelper.getSelectedFileByPath(gpxFile.getPath());
+					if (sf == null) {
+						GpxSelectionParams params = GpxSelectionParams.getDefaultSelectionParams();
+						sf = gpxSelectionHelper.selectGpxFile(gpxFile, params);
+					}
 					List<GpxDisplayGroup> groups = getDisplayGroups();
 					if (groups.size() > 0) {
 						updateSplit(groups, sf);

From dfb958c21e20fd94315834042d682ec2beecd5a3 Mon Sep 17 00:00:00 2001
From: nazar-kutz <vitaminkuna@gmail.com>
Date: Sun, 29 Sep 2024 20:39:33 +0300
Subject: [PATCH 44/83] Fix "Translation of items in the help #20558"

---
 OsmAnd/res/values/strings.xml                    |  3 +++
 .../net/osmand/plus/help/HelpArticleUtils.java   | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 40766b86e3d..cfbb5d6efbd 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -10,6 +10,9 @@
 	- For wording and consistency, please note https://docs.osmand.net/docs/technical/contributions/translating-osmand
 	Thx - Hardy
 -->
+    <string name="help_article_personal_color_palette_schemes_name">Color Schemes</string>
+    <string name="movies_list">Movies list</string>
+    <string name="third_links">Third Links</string>
 	<string name="reset_average_speed">Reset average speed</string>
 	<string name="unknown_bt_device">Unknown device</string>
 	<string name="obd_vin">VIN</string>
diff --git a/OsmAnd/src/net/osmand/plus/help/HelpArticleUtils.java b/OsmAnd/src/net/osmand/plus/help/HelpArticleUtils.java
index e4abd302559..69c95282f45 100644
--- a/OsmAnd/src/net/osmand/plus/help/HelpArticleUtils.java
+++ b/OsmAnd/src/net/osmand/plus/help/HelpArticleUtils.java
@@ -108,10 +108,12 @@ private static String getArticlePairedName(@NonNull Context ctx, @NonNull String
 			case "plugins_custom":
 				return ctx.getString(R.string.custom_osmand_plugin);
 			case "search":
+			case "web_web_search":
 				return ctx.getString(R.string.shared_string_search);
 			case "map_legend":
 				return ctx.getString(R.string.map_legend);
 			case "map":
+			case "web_web_map":
 				return ctx.getString(R.string.shared_string_map);
 			case "map_configure_map_menu":
 				return ctx.getString(R.string.configure_map);
@@ -137,10 +139,12 @@ private static String getArticlePairedName(@NonNull Context ctx, @NonNull String
 			case "personal_myplaces":
 				return ctx.getString(R.string.shared_string_my_places);
 			case "personal_osmand_cloud":
+			case "web_web_cloud":
 				return ctx.getString(R.string.osmand_cloud);
 			case "personal_tracks":
 				return ctx.getString(R.string.shared_string_gpx_tracks);
 			case "plan_route_create_route":
+			case "web_planner":
 				return ctx.getString(R.string.plan_a_route);
 			case "plan_route_travel_guides":
 				return ctx.getString(R.string.wikivoyage_travel_guide);
@@ -161,6 +165,18 @@ private static String getArticlePairedName(@NonNull Context ctx, @NonNull String
 				return ctx.getString(R.string.map_widget_config);
 			case "widgets_quick_action":
 				return ctx.getString(R.string.quick_action_item);
+			case "plugins_topography":
+				return ctx.getString(R.string.srtm_plugin_name);
+			case "web":
+				return ctx.getString(R.string.website);
+			case "troubleshooting_third_links":
+				return ctx.getString(R.string.third_links);
+			case "Movies list":
+				return ctx.getString(R.string.movies_list);
+			case "personal_maps_resources":
+				return ctx.getString(R.string.maps_and_resources);
+			case "route_parameters":
+				return ctx.getString(R.string.route_parameters);
 		}
 		return null;
 	}

From 26762bd11105502c0b37d24c9a00c80034c019ff Mon Sep 17 00:00:00 2001
From: nazar-kutz <vitaminkuna@gmail.com>
Date: Sun, 29 Sep 2024 20:41:30 +0300
Subject: [PATCH 45/83] small fix

---
 OsmAnd/res/values/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index cfbb5d6efbd..c4291554e88 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -10,9 +10,9 @@
 	- For wording and consistency, please note https://docs.osmand.net/docs/technical/contributions/translating-osmand
 	Thx - Hardy
 -->
-    <string name="help_article_personal_color_palette_schemes_name">Color Schemes</string>
-    <string name="movies_list">Movies list</string>
-    <string name="third_links">Third Links</string>
+	<string name="help_article_personal_color_palette_schemes_name">Color Schemes</string>
+	<string name="movies_list">Movies list</string>
+	<string name="third_links">Third Links</string>
 	<string name="reset_average_speed">Reset average speed</string>
 	<string name="unknown_bt_device">Unknown device</string>
 	<string name="obd_vin">VIN</string>

From d93015ec18138af7ffd20730f10cd58d2600f640 Mon Sep 17 00:00:00 2001
From: nazar-kutz <vitaminkuna@gmail.com>
Date: Sun, 29 Sep 2024 20:44:15 +0300
Subject: [PATCH 46/83] small fix

---
 OsmAnd/src/net/osmand/plus/help/HelpArticleUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/help/HelpArticleUtils.java b/OsmAnd/src/net/osmand/plus/help/HelpArticleUtils.java
index 69c95282f45..69daa492e66 100644
--- a/OsmAnd/src/net/osmand/plus/help/HelpArticleUtils.java
+++ b/OsmAnd/src/net/osmand/plus/help/HelpArticleUtils.java
@@ -171,7 +171,7 @@ private static String getArticlePairedName(@NonNull Context ctx, @NonNull String
 				return ctx.getString(R.string.website);
 			case "troubleshooting_third_links":
 				return ctx.getString(R.string.third_links);
-			case "Movies list":
+			case "troubleshooting_movies_list":
 				return ctx.getString(R.string.movies_list);
 			case "personal_maps_resources":
 				return ctx.getString(R.string.maps_and_resources);

From f682f6ad62b73d296079a7245a83eda29f12a53f Mon Sep 17 00:00:00 2001
From: nazar-kutz <vitaminkuna@gmail.com>
Date: Sun, 29 Sep 2024 22:29:46 +0300
Subject: [PATCH 47/83] Small code improvement

---
 ...seTripRecordingAction.java => BaseMonitoringAction.java} | 6 +++---
 .../monitoring/actions/FinishTripRecordingAction.java       | 6 +++---
 .../actions/SaveRecordedTripAndContinueAction.java          | 6 +++---
 .../monitoring/actions/StartNewTripSegmentAction.java       | 4 ++--
 .../plugins/monitoring/actions/TripRecordingAction.java     | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/{BaseTripRecordingAction.java => BaseMonitoringAction.java} (80%)

diff --git a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/BaseTripRecordingAction.java b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/BaseMonitoringAction.java
similarity index 80%
rename from OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/BaseTripRecordingAction.java
rename to OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/BaseMonitoringAction.java
index f4cffb149b4..ba52d8c6ac5 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/BaseTripRecordingAction.java
+++ b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/BaseMonitoringAction.java
@@ -7,13 +7,13 @@
 import net.osmand.plus.quickaction.QuickAction;
 import net.osmand.plus.quickaction.QuickActionType;
 
-abstract class BaseTripRecordingAction extends QuickAction {
+abstract class BaseMonitoringAction extends QuickAction {
 
-	public BaseTripRecordingAction(QuickActionType actionType) {
+	public BaseMonitoringAction(QuickActionType actionType) {
 		super(actionType);
 	}
 
-	public BaseTripRecordingAction(QuickAction quickAction) {
+	public BaseMonitoringAction(QuickAction quickAction) {
 		super(quickAction);
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/FinishTripRecordingAction.java b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/FinishTripRecordingAction.java
index cafcc49348e..62f3fe81a0e 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/FinishTripRecordingAction.java
+++ b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/FinishTripRecordingAction.java
@@ -16,7 +16,7 @@
 import net.osmand.plus.quickaction.QuickAction;
 import net.osmand.plus.quickaction.QuickActionType;
 
-public class FinishTripRecordingAction extends BaseTripRecordingAction {
+public class FinishTripRecordingAction extends BaseMonitoringAction {
 
 	public static final QuickActionType TYPE = new QuickActionType(FINISH_TRIP_RECORDING_ACTION,
 			"finish.trip.recording", FinishTripRecordingAction.class)
@@ -39,9 +39,9 @@ public void execute(@NonNull MapActivity mapActivity) {
 		OsmandMonitoringPlugin plugin = getPlugin();
 		if (plugin != null) {
 			OsmandApplication app = mapActivity.getMyApplication();
-			if (!plugin.isRecordingTrack()) {
+			if (!isRecordingTrack()) {
 				app.showToastMessage(R.string.start_trip_recording_first_m);
-			} else if (!plugin.hasDataToSave()) {
+			} else if (!hasDataToSave()) {
 				app.showToastMessage(R.string.track_does_not_contain_data_to_save);
 			} else {
 				plugin.finishRecording();
diff --git a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/SaveRecordedTripAndContinueAction.java b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/SaveRecordedTripAndContinueAction.java
index 44d44ea55dd..91c484c81fe 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/SaveRecordedTripAndContinueAction.java
+++ b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/SaveRecordedTripAndContinueAction.java
@@ -18,7 +18,7 @@
 import net.osmand.plus.track.helpers.save.SaveGpxHelper;
 import net.osmand.shared.gpx.GpxFile;
 
-public class SaveRecordedTripAndContinueAction extends BaseTripRecordingAction {
+public class SaveRecordedTripAndContinueAction extends BaseMonitoringAction {
 
 	public static final QuickActionType TYPE = new QuickActionType(SAVE_RECORDED_TRIP_AND_CONTINUE_ACTION,
 			"save.trip.and.continue", SaveRecordedTripAndContinueAction.class)
@@ -41,9 +41,9 @@ public void execute(@NonNull MapActivity mapActivity) {
 		OsmandMonitoringPlugin plugin = getPlugin();
 		if (plugin != null) {
 			OsmandApplication app = mapActivity.getMyApplication();
-			if (!plugin.isRecordingTrack()) {
+			if (!isRecordingTrack()) {
 				app.showToastMessage(R.string.start_trip_recording_first_m);
-			} else if (!plugin.hasDataToSave()) {
+			} else if (!hasDataToSave()) {
 				app.showToastMessage(R.string.track_does_not_contain_data_to_save);
 			} else {
 				GpxFile gpxFile = app.getSavingTrackHelper().getCurrentTrack().getGpxFile();
diff --git a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/StartNewTripSegmentAction.java b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/StartNewTripSegmentAction.java
index 9df75b46b45..188c99e0ab2 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/StartNewTripSegmentAction.java
+++ b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/StartNewTripSegmentAction.java
@@ -16,7 +16,7 @@
 import net.osmand.plus.quickaction.QuickAction;
 import net.osmand.plus.quickaction.QuickActionType;
 
-public class StartNewTripSegmentAction extends BaseTripRecordingAction {
+public class StartNewTripSegmentAction extends BaseMonitoringAction {
 
 	public static final QuickActionType TYPE = new QuickActionType(START_NEW_TRIP_SEGMENT_ACTION,
 			"start.new.trip.segment", StartNewTripSegmentAction.class)
@@ -39,7 +39,7 @@ public void execute(@NonNull MapActivity mapActivity) {
 		OsmandMonitoringPlugin plugin = getPlugin();
 		if (plugin != null) {
 			OsmandApplication app = mapActivity.getMyApplication();
-			if (plugin.isRecordingTrack()) {
+			if (isRecordingTrack()) {
 				app.getSavingTrackHelper().startNewSegment();
 				app.showToastMessage(R.string.new_segment_started_m);
 			} else {
diff --git a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/TripRecordingAction.java b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/TripRecordingAction.java
index 0a786c8c13d..970e39da403 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/TripRecordingAction.java
+++ b/OsmAnd/src/net/osmand/plus/plugins/monitoring/actions/TripRecordingAction.java
@@ -17,7 +17,7 @@
 import net.osmand.plus.quickaction.QuickAction;
 import net.osmand.plus.quickaction.QuickActionType;
 
-public class TripRecordingAction extends BaseTripRecordingAction {
+public class TripRecordingAction extends BaseMonitoringAction {
 
 	public static final QuickActionType TYPE = new QuickActionType(TRIP_RECORDING_ACTION,
 			"trip.recording.startpause", TripRecordingAction.class)
@@ -39,7 +39,7 @@ public TripRecordingAction(QuickAction quickAction) {
 	public void execute(@NonNull MapActivity mapActivity) {
 		OsmandMonitoringPlugin plugin = getPlugin();
 		if (plugin != null) {
-			if (plugin.hasDataToSave()) {
+			if (hasDataToSave()) {
 				plugin.pauseOrResumeRecording();
 			} else {
 				plugin.askShowTripRecordingDialog(mapActivity);

From 5387779922455620dc96da060d896aabe1f21860 Mon Sep 17 00:00:00 2001
From: Corwin-Kh <serge.kharchenko@gmail.com>
Date: Mon, 30 Sep 2024 02:09:56 +0300
Subject: [PATCH 48/83] Fixed parsing DateFilter from previous version

---
 .../net/osmand/shared/extensions/ClockExtensions.kt |  4 +++-
 .../osmand/shared/gpx/filters/DateTrackFilter.kt    | 13 ++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/extensions/ClockExtensions.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/extensions/ClockExtensions.kt
index f6647778205..1a14e157366 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/extensions/ClockExtensions.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/extensions/ClockExtensions.kt
@@ -1,5 +1,7 @@
 package net.osmand.shared.extensions
 
 import kotlinx.datetime.Clock
+import kotlinx.datetime.LocalDateTime
 
-fun currentTimeMillis(): Long = Clock.System.now().toEpochMilliseconds()
\ No newline at end of file
+fun currentTimeMillis(): Long = Clock.System.now().toEpochMilliseconds()
+fun minLocalDateTime(): LocalDateTime = LocalDateTime(-999_999_999, 1, 1, 0, 0)
\ No newline at end of file
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt
index 76d6e809f36..efbafc8ace5 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt
@@ -5,7 +5,9 @@ import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 import net.osmand.shared.extensions.currentTimeMillis
+import net.osmand.shared.extensions.minLocalDateTime
 import net.osmand.shared.gpx.GpxParameter
 import net.osmand.shared.gpx.TrackItem
 
@@ -26,14 +28,19 @@ class DateTrackFilter : BaseTrackFilter {
 		valueTo = initialValueTo
 	}
 
-	var initialValueFrom: Long
+	@Transient
+	var initialValueFrom: Long = 0
+	@Transient
 	var initialValueTo = currentTimeMillis()
 
-	private var initialValueFromDateTime: LocalDateTime
+	@Transient
+	private var initialValueFromDateTime: LocalDateTime = minLocalDateTime()
 
+	@Transient
 	private var initialValueToDateTime = Instant.fromEpochMilliseconds(initialValueTo)
 		.toLocalDateTime(TimeZone.currentSystemDefault())
-	private var valueFromDateTime: LocalDateTime
+	@Transient
+	private var valueFromDateTime: LocalDateTime = minLocalDateTime()
 	private var valueToDateTime = Instant.fromEpochMilliseconds(initialValueTo)
 		.toLocalDateTime(TimeZone.currentSystemDefault())
 

From eb125b33a45f359d929b3ac7cda63030e70c6dc9 Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Sun, 29 Sep 2024 07:28:21 +0000
Subject: [PATCH 49/83] Translated using Weblate (French)

Currently translated at 99.9% (5306 of 5307 strings)
---
 OsmAnd/res/values-fr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 2b19d210155..2306fd0a2e8 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -5951,4 +5951,5 @@
     <string name="obd_vin">VIN</string>
     <string name="vehicle_metrics_plugin_settings">Paramètres de mesure du véhicule</string>
     <string name="reset_average_speed">Effacer la vitesse moyenne</string>
+    <string name="obd_vin_desc">Code VIN par OBD</string>
 </resources>
\ No newline at end of file

From 0a60666ceb334e6b7c408641acf2be960cdbc39a Mon Sep 17 00:00:00 2001
From: Hakuchi <heimlikloh@mail.com>
Date: Sun, 29 Sep 2024 15:31:33 +0000
Subject: [PATCH 50/83] Translated using Weblate (German)

Currently translated at 100.0% (5307 of 5307 strings)
---
 OsmAnd/res/values-de/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index eed9c000d84..53dff562765 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -2051,8 +2051,8 @@
     <string name="shared_string_notifications">Benachrichtigungen</string>
     <string name="shared_string_appearance">Aussehen</string>
     <string name="route_calculation">Routenberechnung</string>
-    <string name="gpx_no_tracks_title">Sie haben noch keine Trackdateien.</string>
-    <string name="gpx_no_tracks_title_folder">Trackdateien können dem Ordner hinzugefügt werden.</string>
+    <string name="gpx_no_tracks_title">Sie haben noch keine Trackdateien</string>
+    <string name="gpx_no_tracks_title_folder">Trackdateien können dem Ordner hinzugefügt werden</string>
     <string name="gpx_add_track">Weitere hinzufügen …</string>
     <string name="upload_poi">POI hochladen</string>
     <string name="route_roundabout_short">Nehmen Sie die %1$d Ausfahrt</string>

From 63874049be10011efa8689063094d63e11bb1735 Mon Sep 17 00:00:00 2001
From: 99 efi <fegyed71@gmail.com>
Date: Sun, 29 Sep 2024 09:04:22 +0000
Subject: [PATCH 51/83] Translated using Weblate (Hungarian)

Currently translated at 100.0% (5307 of 5307 strings)
---
 OsmAnd/res/values-hu/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 4fc58bf5b83..898775f592d 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -5954,4 +5954,9 @@
     <string name="obd_fuel_type_bifuel_hydrogen">Hidrogénnel működő Bifuel</string>
     <string name="obd_fuel_type_hybrid_hydrogen">Hibrid hidrogén</string>
     <string name="obd_fuel_type_bifuel_propane">Propánnal működő Bifuel</string>
+    <string name="reset_average_speed">Átlagsebesség nullázása</string>
+    <string name="unknown_bt_device">Ismeretlen eszköz</string>
+    <string name="obd_vin_desc">OBD általi VIN-kód</string>
+    <string name="vehicle_metrics_plugin_settings">Járműmetrika beállítások</string>
+    <string name="obd_vin">VIN</string>
 </resources>
\ No newline at end of file

From 6afe01fe736ed364a04010217b9c57d867223104 Mon Sep 17 00:00:00 2001
From: mike140 <140mic@gmail.com>
Date: Sun, 29 Sep 2024 20:38:42 +0000
Subject: [PATCH 52/83] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (5307 of 5307 strings)
---
 OsmAnd/res/values-uk/strings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index daaf7ced97d..53bd209db89 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -5907,4 +5907,15 @@
     <string name="no_photos_available_descr">До цієї локації ще не додано жодної фотографії користувача</string>
     <string name="no_photos_available">Фото відсутні</string>
     <string name="open_in_browser">Відкрити в браузері</string>
+    <string name="shared_string_source">Джерело</string>
+    <string name="shared_string_no_internet_connection">Немає підключення до Інтернету</string>
+    <string name="no_internet_descr">Будь ласка, перевірте з\'єднання та спробуйте ще раз.</string>
+    <string name="obd_fuel_type_gasoline">Бензин</string>
+    <string name="obd_fuel_type_methanol">Метанол</string>
+    <string name="obd_fuel_type_ethanol">Етанол</string>
+    <string name="obd_fuel_type_lpg">Зріджений газ</string>
+    <string name="obd_fuel_type_propane">Пропан</string>
+    <string name="unknown_bt_device">Невідомий пристрій</string>
+    <string name="obd_fuel_type_not_provided">Тип палива не вказано</string>
+    <string name="obd_fuel_type_diesel">Дизель</string>
 </resources>
\ No newline at end of file

From 9b96bac5935cfc8d4e403e6ba48079c016ea7107 Mon Sep 17 00:00:00 2001
From: Tymofii Lytvynenko <till.svit@gmail.com>
Date: Mon, 30 Sep 2024 04:51:03 +0000
Subject: [PATCH 53/83] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (5307 of 5307 strings)
---
 OsmAnd/res/values-uk/strings.xml | 52 ++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 53bd209db89..b2d32e68800 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -5918,4 +5918,56 @@
     <string name="unknown_bt_device">Невідомий пристрій</string>
     <string name="obd_fuel_type_not_provided">Тип палива не вказано</string>
     <string name="obd_fuel_type_diesel">Дизель</string>
+    <string name="unit_volt">В</string>
+    <string name="wikimedia">Вікімедіа</string>
+    <string name="obd_fuel_type_bifuel_gasoline">Двопаливний бензин</string>
+    <string name="obd_fuel_type_bifuel_methanol">Двопаливний метанол</string>
+    <string name="obd_fuel_type_bifuel_ethanol">Двопаливний етанол</string>
+    <string name="obd_air_intake_temp_desc">Віджет показує температуру всмоктуваного повітря за датчиком OBD</string>
+    <string name="obd_ambient_air_temp_desc">Віджет показує температуру навколишнього повітря за датчиком OBD</string>
+    <string name="percent_unit">%</string>
+    <string name="obd_rpm">Оберти</string>
+    <string name="rpm_unit">об/хв</string>
+    <string name="obd_speed_desc">Віджет показує швидкість машини за датчиком OBD</string>
+    <string name="obd_rpm_desc">Віджет показує оберти з тахометра машини за датчиком OBD</string>
+    <string name="obd_fuel_type_desc">Віджет показує тип пального машини за датчиком OBD</string>
+    <string name="obd_air_intake_temp">t° всмоктуваного повітря</string>
+    <string name="obd_ambient_air_temp">t° навколишнього повітря</string>
+    <string name="obd_battery_voltage">Напруга акумулятора</string>
+    <string name="obd_support">Підтримка OBD</string>
+    <string name="obd_plugin_name">Показники машини</string>
+    <string name="obd_plugin_description">Доступ до даних про вашу машину за протоколом OBD</string>
+    <string name="obd_fuel_type">Тип пального</string>
+    <string name="obd_vin">VIN</string>
+    <string name="obd_fuel_type_cng">Стиснений природний газ (CNG)</string>
+    <string name="obd_fuel_type_bifuel_lpg">Двопаливний: LPG</string>
+    <string name="obd_fuel_type_bifuel_propane">Двопаливний: пропан</string>
+    <string name="obd_fuel_type_bifuel_electricity">Двопаливний: електрика</string>
+    <string name="obd_fuel_type_hybrid_gasoline">Гібрид: бензин</string>
+    <string name="obd_fuel_type_hybrid_ethanol">Гібрид: етанол</string>
+    <string name="obd_fuel_type_hybrid_diesel">Гібрид: дизель</string>
+    <string name="obd_fuel_type_hybrid_electric">Гібрид: електрика</string>
+    <string name="obd_fuel_type_hybrid_electric_combustion">Гібрид: електрика та двигун внутрішнього згорання</string>
+    <string name="obd_fuel_type_hybrid_regenerative">Гібрид: відновлюваний</string>
+    <string name="obd_fuel_type_hybrid_hydrogen">Гібрид: водень</string>
+    <string name="shared_string_obd">OBD</string>
+    <string name="obd_widget_group">Показники машини</string>
+    <string name="vehicle_metrics_plugin_settings">Налаштування показників машини</string>
+    <string name="obd_engine_coolant_temp_desc">Віджет показує температуру охолоджувальної рідини двигуна за датчиком OBD</string>
+    <string name="obd_battery_voltage_desc">Віджет показує напругу акумулятора за датчиком OBD</string>
+    <string name="obd_fuel_left_distance_desc">Віджет показує відстань, яку може проїхати машина на залишковому рівні пального за датчиком OBD</string>
+    <string name="obd_engine_coolant_temp">t° охолоджувальної рідини двигуна</string>
+    <string name="obd_fuel_level">Рівень пального</string>
+    <string name="obd_fuel_consumption_rate">Споживання пального</string>
+    <string name="obd_fuel_left_distance">Залишок пального (відстань)</string>
+    <string name="reset_average_speed">Скинути середню швидкість</string>
+    <string name="obd_vin_desc">VIN-код за OBD</string>
+    <string name="obd_fuel_type_electric">Електрика</string>
+    <string name="obd_fuel_type_bifuel_cng">Двопаливний: CNG</string>
+    <string name="obd_fuel_type_bifuel_hydrogen">Двопаливний: водень</string>
+    <string name="obd_fuel_type_bifuel_electric_combustion">Двопаливний: електрика та двигун внутрішнього згорання</string>
+    <string name="obd_fuel_type_hydrogen">Водень</string>
+    <string name="obd_fuel_type_unknown">Невідомий тип пального</string>
+    <string name="obd_fuel_level_desc">Віджет показує рівень пального в машині за датчиком OBD</string>
+    <string name="obd_fuel_consumption_rate_desc">Віджет показує споживання пального машиною на основі даних OBD про розташування</string>
 </resources>
\ No newline at end of file

From efd95d14e44db7979e3f75eb65f60e5bc9a26e70 Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Sun, 29 Sep 2024 21:07:24 +0000
Subject: [PATCH 54/83] Translated using Weblate (Slovak)

Currently translated at 99.2% (5268 of 5307 strings)
---
 OsmAnd/res/values-sk/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 7f1bbfa51fd..9d944ee7029 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -5911,4 +5911,9 @@
     <string name="no_internet_descr">Prosím skontrolujte pripojenie a skúste znovu.</string>
     <string name="no_photos_available_descr">K tejto lokalite zatiaľ neboli pridané žiadne fotografie používateľov</string>
     <string name="no_photos_available">Nie sú dostupné žiadne fotografie</string>
+    <string name="percent_unit">%</string>
+    <string name="obd_plugin_name">Merania vozidla</string>
+    <string name="obd_plugin_description">Sprístupní informácie o vozidle cez protokol OBD</string>
+    <string name="vehicle_metrics_plugin_settings">Nastavenia Meraní vozidla</string>
+    <string name="obd_support">Podpora OBD</string>
 </resources>
\ No newline at end of file

From f051e056b5f0346cf3b3f6f44b553eb95eef96ba Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Sun, 29 Sep 2024 21:08:34 +0000
Subject: [PATCH 55/83] Translated using Weblate (Slovak)

Currently translated at 92.5% (4509 of 4873 strings)
---
 OsmAnd/res/values-sk/phrases.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index 94959c60e10..ec9209dd0ac 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -2008,7 +2008,7 @@
     <string name="poi_ramp_stroller_no">Rampa pre detské kočíky: nie</string>
     <string name="poi_ramp_bicycle_no">Rampa pre bicykle: nie</string>
     <string name="poi_ramp_luggage_no">Rampa pre batožinu: nie</string>
-    <string name="poi_defibrillator">Defibrilátor</string>
+    <string name="poi_defibrillator">Defibrilátor;AED</string>
     <string name="poi_site_type_city">Veľkomesto</string>
     <string name="poi_prison_camp">Bývalý väzenský tábor</string>
     <string name="poi_concentration_camp">Typ: koncentračný tábor</string>

From cee22b4b0f3ea32c3816cacb83a9d7f1cffd0ab1 Mon Sep 17 00:00:00 2001
From: ZeljkoBG <zeljko.velickovic@gmail.com>
Date: Sun, 29 Sep 2024 08:24:04 +0000
Subject: [PATCH 56/83] Translated using Weblate (Serbian (Latin script))

Currently translated at 100.0% (5307 of 5307 strings)
---
 OsmAnd/res/values-b+sr+Latn/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-b+sr+Latn/strings.xml b/OsmAnd/res/values-b+sr+Latn/strings.xml
index 4f2af3d11d7..88dc18fa992 100644
--- a/OsmAnd/res/values-b+sr+Latn/strings.xml
+++ b/OsmAnd/res/values-b+sr+Latn/strings.xml
@@ -2143,7 +2143,7 @@
     <string name="marker_save_as_track_descr">Izvezi markere u sledeću datoteku GPX-a:</string>
     <string name="coordinate_input">Unos koordinata</string>
     <string name="shared_string_sort">Sortiranje</string>
-    <string name="plan_route">Planiranje rute</string>
+    <string name="plan_route">Plan rute</string>
     <string name="shared_string_finish">Kraj</string>
     <string name="my_location">Moja pozicija</string>
     <string name="add_location_as_first_point_descr">Dodaj svoj lokaciju kao tačku polaska da isplaniraš savršeno putovanje.</string>
@@ -2930,7 +2930,7 @@
     <string name="osm_edit_closed_note">Zatvorena OSM beleška</string>
     <string name="set_working_days_to_continue">Podesi radne dane za nastavak</string>
     <string name="route_between_points">Ruta između tačaka</string>
-    <string name="plan_a_route">Planiranje rute</string>
+    <string name="plan_a_route">Plan rute</string>
     <string name="add_to_a_track">Dodaj u trasu</string>
     <string name="track_show_start_finish_icons">Prikazati ikonu za početak i kraj</string>
     <string name="select_track_width">Izaberi širinu</string>

From ce5980b9d1a11963dfa47113e8d6c7909037a8ae Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Mon, 30 Sep 2024 02:23:16 +0000
Subject: [PATCH 57/83] Translated using Weblate (Chinese (Traditional Han
 script))

Currently translated at 100.0% (5307 of 5307 strings)
---
 OsmAnd/res/values-zh-rTW/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 7f2ceecd654..d048a496342 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -5946,4 +5946,9 @@
     <string name="obd_plugin_name">車輛指標</string>
     <string name="obd_plugin_description">透過 OBD 協定存取您的車輛資訊</string>
     <string name="obd_support">OBD 支援</string>
+    <string name="obd_vin">車輛識別號碼</string>
+    <string name="obd_vin_desc">透過 OBD 讀取 VIN 碼</string>
+    <string name="vehicle_metrics_plugin_settings">車輛指標設定</string>
+    <string name="unknown_bt_device">未知裝置</string>
+    <string name="reset_average_speed">重設平均速率</string>
 </resources>
\ No newline at end of file

From d02241f864eb1b54a6a302a1eb661f116a238663 Mon Sep 17 00:00:00 2001
From: Evgenii Martynenko <deathstallker@yandex.ru>
Date: Sun, 29 Sep 2024 11:03:11 +0000
Subject: [PATCH 58/83] Translated using Weblate (Russian)

Currently translated at 89.3% (4355 of 4873 strings)
---
 OsmAnd/res/values-ru/phrases.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 167701ac007..695f041cb09 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -4389,4 +4389,16 @@
     <string name="poi_diet_pescetarian_no">Пескетарианская диета: нет</string>
     <string name="poi_cash_in_customers">Клиенты</string>
     <string name="poi_engineer">Инженерный офис</string>
+    <string name="poi_indoor_seating_yes">Места внутри: да</string>
+    <string name="poi_cash_in">Депозит наличными</string>
+    <string name="poi_indoor_seating_bar_table">Места внутри: барный стол</string>
+    <string name="poi_indoor_seating_no">Нет мест внутри</string>
+    <string name="poi_music_venue">Музыкальная площадка</string>
+    <string name="poi_us_maps_recreation_area_activity">Зона отдыха</string>
+    <string name="poi_self_checkout">Касса самообслуживания</string>
+    <string name="poi_impromptu">Импровизированный</string>
+    <string name="poi_reservation">Бронирование</string>
+    <string name="poi_waste_accepted">Принимаемые отходы</string>
+    <string name="poi_photo_booth">Фотобудка;Фотокабина</string>
+    <string name="poi_second_hand_filter">Товары, бывшие в употреблении</string>
 </resources>
\ No newline at end of file

From 8b9b06881b9080ee63ca59bb9ce9c3dd1ac8e8c0 Mon Sep 17 00:00:00 2001
From: dmpr0 <dmpr0.ua@gmail.com>
Date: Mon, 30 Sep 2024 12:27:55 +0300
Subject: [PATCH 59/83] Fix typo in icon name

---
 .../{ic_aciton_hang_gliding.xml => ic_action_hang_gliding.xml}  | 0
 OsmAnd/src/net/osmand/plus/profiles/ProfileIcons.java           | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename OsmAnd/res/drawable/{ic_aciton_hang_gliding.xml => ic_action_hang_gliding.xml} (100%)

diff --git a/OsmAnd/res/drawable/ic_aciton_hang_gliding.xml b/OsmAnd/res/drawable/ic_action_hang_gliding.xml
similarity index 100%
rename from OsmAnd/res/drawable/ic_aciton_hang_gliding.xml
rename to OsmAnd/res/drawable/ic_action_hang_gliding.xml
diff --git a/OsmAnd/src/net/osmand/plus/profiles/ProfileIcons.java b/OsmAnd/src/net/osmand/plus/profiles/ProfileIcons.java
index 2b7c9b3a172..1d221892c05 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/ProfileIcons.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/ProfileIcons.java
@@ -31,7 +31,7 @@ public enum ProfileIcons {
 	AIRCRAFT(R.drawable.ic_action_aircraft, R.string.app_mode_aircraft, "ic_action_aircraft"),
 	HELICOPTER(R.drawable.ic_action_helicopter, R.string.app_mode_helicopter, "ic_action_helicopter"),
 	PARAGLIDING(R.drawable.ic_action_paragliding, R.string.app_mode_paragliding, "ic_action_paragliding"),
-	HANG_GLIDING(R.drawable.ic_aciton_hang_gliding, R.string.app_mode_hang_gliding, "ic_aciton_hang_gliding"),
+	HANG_GLIDING(R.drawable.ic_action_hang_gliding, R.string.app_mode_hang_gliding, "ic_action_hang_gliding"),
 	TRANSPORTER(R.drawable.ic_action_personal_transporter, R.string.app_mode_personal_transporter, "ic_action_personal_transporter"),
 	MONOWHEEL(R.drawable.ic_action_monowheel, R.string.app_mode_monowheel, "ic_action_monowheel"),
 	SCOOTER(R.drawable.ic_action_scooter, R.string.app_mode_scooter, "ic_action_scooter"),

From 473b8a8f185da7b48bef00c80f6a77c6b3d6130c Mon Sep 17 00:00:00 2001
From: Corwin-Kh <serge.kharchenko@gmail.com>
Date: Mon, 30 Sep 2024 12:49:28 +0300
Subject: [PATCH 60/83] Changed getting minLocalDateTime

---
 .../kotlin/net/osmand/shared/extensions/ClockExtensions.kt   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/extensions/ClockExtensions.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/extensions/ClockExtensions.kt
index 1a14e157366..add221000ba 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/extensions/ClockExtensions.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/extensions/ClockExtensions.kt
@@ -1,7 +1,10 @@
 package net.osmand.shared.extensions
 
 import kotlinx.datetime.Clock
+import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
 
 fun currentTimeMillis(): Long = Clock.System.now().toEpochMilliseconds()
-fun minLocalDateTime(): LocalDateTime = LocalDateTime(-999_999_999, 1, 1, 0, 0)
\ No newline at end of file
+fun minLocalDateTime(): LocalDateTime = Instant.fromEpochMilliseconds(0).toLocalDateTime(TimeZone.currentSystemDefault())
\ No newline at end of file

From 0f13c0566f3f3dd553523f2e07c556904d775a4e Mon Sep 17 00:00:00 2001
From: Alex Andrewschenko <andrewschenko@gmail.com>
Date: Mon, 30 Sep 2024 12:15:41 +0200
Subject: [PATCH 61/83] Add native function to read geotiffs

---
 OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java b/OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java
index 6e9ad1982cf..8b9d34c91b5 100644
--- a/OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java
+++ b/OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java
@@ -392,6 +392,9 @@ public boolean needRequestPrivateAccessRouting(RoutingContext ctx, int[] x31Coor
 	}
 	protected static native boolean nativeNeedRequestPrivateAccessRouting(RoutingContext ctx, int[] x31Coordinates, int[] y31Coordinates);
 
+	protected static native ByteBuffer getGeotiffTile(
+		String tilePath, String outColorFilename, String midColorFilename, int type, int size, int zoom, int x, int y);
+
 	/**/
 	// Empty native impl
 	/*

From acfadc338711e5d516bd246f13a94c112fa01bba Mon Sep 17 00:00:00 2001
From: nazar-kutz <vitaminkuna@gmail.com>
Date: Mon, 30 Sep 2024 13:20:45 +0300
Subject: [PATCH 62/83] Fix problems with using the same GPX file

---
 .../dialogs/SplitSegmentDialogFragment.java     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/SplitSegmentDialogFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/SplitSegmentDialogFragment.java
index 7cc61d281f3..a07b7a2285e 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/SplitSegmentDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/SplitSegmentDialogFragment.java
@@ -66,6 +66,7 @@ public class SplitSegmentDialogFragment extends BaseOsmAndDialogFragment {
 
 	private TrkSegment segment;
 	private GpxDisplayItem item;
+	private SelectedGpxFile selectedGpxFile;
 
 	private final List<String> options = new ArrayList<>();
 	private final List<Double> distanceSplit = new ArrayList<>();
@@ -87,6 +88,11 @@ public class SplitSegmentDialogFragment extends BaseOsmAndDialogFragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		GpxFile gpxFile = getGpx();
+		if (gpxFile != null) {
+			selectedGpxFile = new SelectedGpxFile();
+			selectedGpxFile.setGpxFile(gpxFile, app);
+		}
 		minMaxSpeedPaint.setTextSize(getResources().getDimension(R.dimen.default_split_segments_data));
 		minMaxSpeedPaint.setTypeface(FontCache.getMediumFont());
 		minMaxSpeedPaint.setStyle(Paint.Style.FILL);
@@ -199,16 +205,9 @@ private void updateHeader() {
 						R.layout.popup_list_text_item, options));
 				popup.setOnItemClickListener((parent, view, position, id) -> {
 					selectedSplitInterval = position;
-					GpxFile gpxFile = getGpx();
-					GpxSelectionHelper gpxSelectionHelper = app.getSelectedGpxHelper();
-					SelectedGpxFile sf = gpxSelectionHelper.getSelectedFileByPath(gpxFile.getPath());
-					if (sf == null) {
-						GpxSelectionParams params = GpxSelectionParams.getDefaultSelectionParams();
-						sf = gpxSelectionHelper.selectGpxFile(gpxFile, params);
-					}
 					List<GpxDisplayGroup> groups = getDisplayGroups();
 					if (groups.size() > 0) {
-						updateSplit(groups, sf);
+						updateSplit(groups, selectedGpxFile);
 					}
 					popup.dismiss();
 					updateSplitIntervalView(splitIntervalView);
@@ -414,7 +413,7 @@ private boolean hasFilterType(GpxDisplayItemType filterType) {
 	}
 
 	private boolean shouldDismiss() {
-		return displayHelper == null || item == null || segment == null;
+		return displayHelper == null || selectedGpxFile == null || item == null || segment == null;
 	}
 
 	private class SplitSegmentsAdapter extends ArrayAdapter<GpxDisplayItem> {

From f4dceefa31e2791d49c8c14b27117045e5508ffc Mon Sep 17 00:00:00 2001
From: alex-osm <alex.morozov.osm@gmail.com>
Date: Mon, 30 Sep 2024 15:26:00 +0300
Subject: [PATCH 63/83] Cleanup DateTrackFilter

---
 .../shared/extensions/ClockExtensions.kt      |  3 +-
 .../shared/gpx/filters/DateTrackFilter.kt     | 54 +++++++------------
 2 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/extensions/ClockExtensions.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/extensions/ClockExtensions.kt
index add221000ba..a8d6bd4f899 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/extensions/ClockExtensions.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/extensions/ClockExtensions.kt
@@ -7,4 +7,5 @@ import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 
 fun currentTimeMillis(): Long = Clock.System.now().toEpochMilliseconds()
-fun minLocalDateTime(): LocalDateTime = Instant.fromEpochMilliseconds(0).toLocalDateTime(TimeZone.currentSystemDefault())
\ No newline at end of file
+fun millisToLocalDateTime(milliseconds: Long): LocalDateTime =
+	Instant.fromEpochMilliseconds(milliseconds).toLocalDateTime(TimeZone.currentSystemDefault())
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt
index efbafc8ace5..79a375eb501 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt
@@ -1,13 +1,10 @@
 package net.osmand.shared.gpx.filters
 
-import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDateTime
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import net.osmand.shared.extensions.currentTimeMillis
-import net.osmand.shared.extensions.minLocalDateTime
+import net.osmand.shared.extensions.millisToLocalDateTime
 import net.osmand.shared.gpx.GpxParameter
 import net.osmand.shared.gpx.TrackItem
 
@@ -20,39 +17,31 @@ class DateTrackFilter : BaseTrackFilter {
 		trackFilterType,
 		filterChangedListener) {
 		initialValueFrom = dateFrom
-		initialValueFromDateTime = Instant.fromEpochMilliseconds(initialValueFrom)
-			.toLocalDateTime(TimeZone.currentSystemDefault())
-		valueFromDateTime = Instant.fromEpochMilliseconds(initialValueFrom)
-			.toLocalDateTime(TimeZone.currentSystemDefault())
+		initialValueTo = currentTimeMillis()
 		valueFrom = initialValueFrom
 		valueTo = initialValueTo
+		updateDateTime()
 	}
 
 	@Transient
 	var initialValueFrom: Long = 0
 	@Transient
-	var initialValueTo = currentTimeMillis()
+	var initialValueTo: Long = 0
 
 	@Transient
-	private var initialValueFromDateTime: LocalDateTime = minLocalDateTime()
-
+	private var initialValueFromDateTime: LocalDateTime? = null
+	@Transient
+	private var initialValueToDateTime: LocalDateTime? = null
 	@Transient
-	private var initialValueToDateTime = Instant.fromEpochMilliseconds(initialValueTo)
-		.toLocalDateTime(TimeZone.currentSystemDefault())
+	private var valueFromDateTime: LocalDateTime? = null
 	@Transient
-	private var valueFromDateTime: LocalDateTime = minLocalDateTime()
-	private var valueToDateTime = Instant.fromEpochMilliseconds(initialValueTo)
-		.toLocalDateTime(TimeZone.currentSystemDefault())
+	private var valueToDateTime: LocalDateTime? = null
 
 	private fun updateDateTime() {
-		initialValueFromDateTime = Instant.fromEpochMilliseconds(initialValueFrom)
-			.toLocalDateTime(TimeZone.currentSystemDefault())
-		initialValueToDateTime = Instant.fromEpochMilliseconds(initialValueTo)
-			.toLocalDateTime(TimeZone.currentSystemDefault())
-		valueFromDateTime = Instant.fromEpochMilliseconds(valueFrom)
-			.toLocalDateTime(TimeZone.currentSystemDefault())
-		valueToDateTime =
-			Instant.fromEpochMilliseconds(valueTo).toLocalDateTime(TimeZone.currentSystemDefault())
+		initialValueFromDateTime = millisToLocalDateTime(initialValueFrom)
+		initialValueToDateTime = millisToLocalDateTime(initialValueTo)
+		valueFromDateTime = millisToLocalDateTime(valueFrom)
+		valueToDateTime = millisToLocalDateTime(valueTo)
 	}
 
 	@Serializable
@@ -71,18 +60,13 @@ class DateTrackFilter : BaseTrackFilter {
 			filterChangedListener?.onFilterChanged()
 		}
 
-	override fun isEnabled(): Boolean {
-		return !isDatesEquals(initialValueFromDateTime, valueFromDateTime) || !isDatesEquals(
-			initialValueToDateTime,
-			valueToDateTime)
-	}
+	override fun isEnabled() =
+		!isDatesEquals(initialValueFromDateTime, valueFromDateTime) ||
+				!isDatesEquals(initialValueToDateTime, valueToDateTime)
 
-	private fun isDatesEquals(date1: LocalDateTime, date2: LocalDateTime): Boolean {
-		return date1.date == date2.date
-	}
+	private fun isDatesEquals(date1: LocalDateTime?, date2: LocalDateTime?) = date1?.date == date2?.date
 
 	override fun isTrackAccepted(trackItem: TrackItem): Boolean {
-
 		trackItem.dataItem?.let {
 			it.getParameter<Long>(GpxParameter.FILE_CREATION_TIME)?.let { creationTime ->
 				return creationTime in valueFrom..valueTo
@@ -112,7 +96,5 @@ class DateTrackFilter : BaseTrackFilter {
 				isDatesEquals(valueToDateTime, other.valueToDateTime)
 	}
 
-	override fun hashCode(): Int {
-		return valueFrom.hashCode() + valueTo.hashCode()
-	}
+	override fun hashCode() = valueFrom.hashCode() + valueTo.hashCode()
 }
\ No newline at end of file

From 4fdeb57fdce1ae1077659c47df652d50d045a17f Mon Sep 17 00:00:00 2001
From: alex-osm <alex.morozov.osm@gmail.com>
Date: Mon, 30 Sep 2024 15:58:28 +0300
Subject: [PATCH 64/83] Cleanup code

---
 .../net/osmand/shared/gpx/data/SmartFolder.kt | 21 +++++--------------
 .../shared/gpx/filters/ListTrackFilter.kt     | 15 ++++---------
 .../tracks/SearchMyPlacesTracksFragment.java  | 19 ++++++++++-------
 .../tracks/dialogs/TracksFilterFragment.kt    |  2 +-
 4 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/SmartFolder.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/SmartFolder.kt
index 3c95e19f554..baf2640e457 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/SmartFolder.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/SmartFolder.kt
@@ -14,21 +14,18 @@ class SmartFolder(@Serializable var folderName: String) : TracksGroup, Comparabl
 	@Transient
 	private var trackItems: List<TrackItem>? = null
 
-	constructor() : this("") {
-	}
+	constructor() : this("")
 
 	@Serializable
 	var creationTime = 0L
 
 	@Serializable(with = TrackFilterSerializer::class)
-	var filters: MutableList<BaseTrackFilter>? = null
+	var filters: List<BaseTrackFilter>? = null
 
 	@Transient
 	private var folderAnalysis: TrackFolderAnalysis? = null
 
-	override fun getName(): String {
-		return folderName
-	}
+	override fun getName() = folderName
 
 	override fun getTrackItems(): List<TrackItem> {
 		var trackItems = this.trackItems
@@ -55,20 +52,12 @@ class SmartFolder(@Serializable var folderName: String) : TracksGroup, Comparabl
 		return analysis
 	}
 
-	override fun getDirName(): String {
-		return folderName
-	}
+	override fun getDirName() = folderName
 
-	override fun lastModified(): Long {
-		return creationTime
-	}
+	override fun lastModified() = creationTime
 
 	fun resetItems() {
 		trackItems = ArrayList()
 		folderAnalysis = null
 	}
-
-	override fun equals(other: Any?): Boolean {
-		return super.equals(other)
-	}
 }
\ No newline at end of file
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/ListTrackFilter.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/ListTrackFilter.kt
index 75fea473f14..c63434e7303 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/ListTrackFilter.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/ListTrackFilter.kt
@@ -10,12 +10,8 @@ import net.osmand.shared.util.SerialNames
 @Serializable
 open class ListTrackFilter : BaseTrackFilter {
 
-	constructor(
-		trackFilterType: TrackFilterType,
-		filterChangedListener: FilterChangedListener?) : super(
-		trackFilterType,
-		filterChangedListener) {
-	}
+	constructor(trackFilterType: TrackFilterType, filterChangedListener: FilterChangedListener?) :
+			super(trackFilterType, filterChangedListener)
 
 	var collectionFilterParams: SingleFieldTrackFilterParams
 
@@ -111,11 +107,8 @@ open class ListTrackFilter : BaseTrackFilter {
 	override fun initWithValue(value: BaseTrackFilter) {
 		if (value is ListTrackFilter) {
 			setSelectedItems(
-				if (value.selectedItems == null) {
-					ArrayList()
-				} else {
-					ArrayList(value.selectedItems)
-				})
+				ArrayList(value.selectedItems)
+			)
 			for (item in selectedItems) {
 				if (!allItems.contains(item)) {
 					allItems.add(item)
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/tracks/SearchMyPlacesTracksFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/tracks/SearchMyPlacesTracksFragment.java
index 492bc5fc128..19ddf3ffb10 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/tracks/SearchMyPlacesTracksFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/tracks/SearchMyPlacesTracksFragment.java
@@ -120,14 +120,17 @@ protected void updateButtonsState() {
 			boolean filtersChanged = false;
 			TracksSearchFilter searchFilter = (TracksSearchFilter) adapter.getFilter();
 			List<BaseTrackFilter> currentFilters = searchFilter.getAppliedFilters();
-			if (currentFilters.size() != smartFolder.getFilters().size()) {
-				filtersChanged = true;
-			} else {
-				for (BaseTrackFilter folderFilter : smartFolder.getFilters()) {
-					BaseTrackFilter currentFilter = searchFilter.getFilterByType(folderFilter.getTrackFilterType());
-					if (currentFilter == null || !currentFilter.equals(folderFilter)) {
-						filtersChanged = true;
-						break;
+			List<BaseTrackFilter> filters = smartFolder.getFilters();
+			if (filters != null) {
+				if (currentFilters.size() != filters.size()) {
+					filtersChanged = true;
+				} else {
+					for (BaseTrackFilter folderFilter : filters) {
+						BaseTrackFilter currentFilter = searchFilter.getFilterByType(folderFilter.getTrackFilterType());
+						if (currentFilter == null || !currentFilter.equals(folderFilter)) {
+							filtersChanged = true;
+							break;
+						}
 					}
 				}
 			}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/TracksFilterFragment.kt b/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/TracksFilterFragment.kt
index db99a1e8651..cfe4d3779b0 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/TracksFilterFragment.kt
+++ b/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/TracksFilterFragment.kt
@@ -265,7 +265,7 @@ class TracksFilterFragment : BaseOsmAndDialogFragment(),
 	private fun filterChanged(): Boolean {
 		var changed = false
 
-		var initialFilters: List<BaseTrackFilter>? = if (smartFolder == null) {
+		val initialFilters: List<BaseTrackFilter>? = if (smartFolder == null) {
 			this.initialFilterState.appliedFilters
 		} else {
 			smartFolder?.filters

From c96790a973b786a71c814c6c02ac73e73794e4b9 Mon Sep 17 00:00:00 2001
From: Ivan <ivan.pirogovsky@gmail.com>
Date: Mon, 30 Sep 2024 16:12:06 +0300
Subject: [PATCH 65/83] Cities in POI search (#20954)

* Cities in POI search

* Cities in POI search

* Cities in POI search
---
 .../main/java/net/osmand/data/Amenity.java    | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java b/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java
index 04773b1c081..ab2d8b9bc76 100644
--- a/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java
+++ b/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java
@@ -697,23 +697,35 @@ public String getCityFromTagGroups(String lang) {
 		}
 		String result = null;
 		for (Map.Entry<Integer, List<TagValuePair>> entry : tagGroups.entrySet()) {
+			String translated = "";
+			String nonTranslated = "";
+			City.CityType type = null;
 			for (TagValuePair tagValue : entry.getValue()) {
-				if (tagValue.tag.endsWith("city:" + lang)) {
-					if (result == null) {
-						result = tagValue.value;
-					} else {
-						result += ", " + tagValue.value;
-					}
-					break;
+				if (tagValue.tag.endsWith("name:" + lang)) {
+					translated = tagValue.value;
 				}
-				if (tagValue.tag.endsWith("city")) {
-					result = tagValue.value;
+				if (tagValue.tag.endsWith("name")) {
+					nonTranslated = tagValue.value;
 				}
+				if (tagValue.tag.equals("place")) {
+					type = City.CityType.valueFromString(tagValue.value.toUpperCase());
+				}
+			}
+			String name = translated.isEmpty() ? nonTranslated : translated;
+			if (!name.isEmpty() && isCityTypeAccept(type)) {
+				result = result == null ? name : result + ", " + name;
 			}
 		}
 		return result;
 	}
 
+	private boolean isCityTypeAccept(City.CityType type) {
+		if (type == null) {
+			return false;
+		}
+		return type.storedAsSeparateAdminEntity();
+	}
+
 	public List<LatLon> getPolygon() {
 		List<LatLon> res = new ArrayList<>();
 		if (x == null) {

From 29c6c9a6e387d61a37481716b3a48820fec025d8 Mon Sep 17 00:00:00 2001
From: alex-osm <alex.morozov.osm@gmail.com>
Date: Mon, 30 Sep 2024 17:07:47 +0300
Subject: [PATCH 66/83] Fix filters deserialization

---
 .../kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt | 6 ++++++
 .../kotlin/net/osmand/shared/gpx/filters/ListTrackFilter.kt | 2 +-
 .../net/osmand/shared/gpx/filters/OtherTrackFilter.kt       | 2 +-
 .../net/osmand/shared/gpx/filters/TrackFilterSerializer.kt  | 2 +-
 .../net/osmand/shared/gpx/filters/TrackFiltersHelper.kt     | 5 ++---
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt
index 79a375eb501..cb69e990630 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/DateTrackFilter.kt
@@ -86,9 +86,15 @@ class DateTrackFilter : BaseTrackFilter {
 				initialValueFrom = valueFrom
 			}
 			updateDateTime()
+			super.initWithValue(value)
 		}
 	}
 
+	override fun initFilter() {
+		super.initFilter()
+		updateDateTime()
+	}
+
 	override fun equals(other: Any?): Boolean {
 		return super.equals(other) &&
 				other is DateTrackFilter &&
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/ListTrackFilter.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/ListTrackFilter.kt
index c63434e7303..43fdc71b1e0 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/ListTrackFilter.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/ListTrackFilter.kt
@@ -115,7 +115,7 @@ open class ListTrackFilter : BaseTrackFilter {
 					allItemsCollection[item] = 0
 				}
 			}
-			filterChangedListener?.onFilterChanged()
+			super.initWithValue(value)
 		}
 	}
 
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/OtherTrackFilter.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/OtherTrackFilter.kt
index 0057da4b42b..446f6c6f3ae 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/OtherTrackFilter.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/OtherTrackFilter.kt
@@ -97,7 +97,7 @@ class OtherTrackFilter : BaseTrackFilter {
 					selectedParams.add(OtherTrackParam.WITH_WAYPOINTS)
 				}
 			}
-			filterChangedListener?.onFilterChanged()
+			super.initWithValue(value)
 		}
 	}
 
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterSerializer.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterSerializer.kt
index 24d6b73a3f7..5617b4c7f27 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterSerializer.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFilterSerializer.kt
@@ -61,7 +61,7 @@ object TrackFilterSerializer : KSerializer<List<BaseTrackFilter>?> {
 						jsonDecoder.json.decodeFromJsonElement<ListTrackFilter>(jsonObject)
 					}
 				}
-			}
+			}.apply { initFilter() }
 		}
 	}
 }
\ No newline at end of file
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFiltersHelper.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFiltersHelper.kt
index 99caee1b56b..2dba9d8f09d 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFiltersHelper.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFiltersHelper.kt
@@ -1,13 +1,12 @@
 package net.osmand.shared.gpx.filters
 
-import kotlinx.datetime.Clock
 import net.osmand.shared.extensions.currentTimeMillis
 import net.osmand.shared.gpx.GpxParameter
-import net.osmand.shared.gpx.filters.FilterType.TEXT
-import net.osmand.shared.gpx.filters.FilterType.RANGE
 import net.osmand.shared.gpx.filters.FilterType.DATE_RANGE
 import net.osmand.shared.gpx.filters.FilterType.OTHER
+import net.osmand.shared.gpx.filters.FilterType.RANGE
 import net.osmand.shared.gpx.filters.FilterType.SINGLE_FIELD_LIST
+import net.osmand.shared.gpx.filters.FilterType.TEXT
 import kotlin.reflect.KClass
 
 object TrackFiltersHelper {

From 29da28b5110450621b8ae33cf8bd800be67f5034 Mon Sep 17 00:00:00 2001
From: alex-osm <alex.morozov.osm@gmail.com>
Date: Mon, 30 Sep 2024 18:20:56 +0300
Subject: [PATCH 67/83] Added temp extra logs for gpx db items

---
 .../src/commonMain/kotlin/net/osmand/shared/gpx/GpxDatabase.kt  | 2 ++
 .../plus/settings/backend/backup/items/FileSettingsItem.java    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDatabase.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDatabase.kt
index da246054c42..b3550444d2e 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDatabase.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDatabase.kt
@@ -198,6 +198,7 @@ class GpxDatabase {
 	private fun readItemFile(query: SQLiteCursor): KFile {
 		var fileDir: String = query.getString(query.getColumnIndex(FILE_DIR.columnName))
 		val fileName = query.getString(query.getColumnIndex(FILE_NAME.columnName))
+		log.info(">>>> ++++ readItemFile fileDir=$fileDir fileName=$fileName")
 
 		val appDir = PlatformUtil.getOsmAndContext().getAppDir()
 		val gpxDir = PlatformUtil.getOsmAndContext().getGpxDir()
@@ -207,6 +208,7 @@ class GpxDatabase {
 		fileDir = fileDir.replace(gpxDir.toString(), "")
 		fileDir = fileDir.replace(appDir.toString(), "")
 		val dir = if (fileDir.isEmpty()) gpxDir else KFile(gpxDir, fileDir)
+		log.info(">>>> ==== readItemFile fileDir=$fileDir dir=$dir gpxDir=$gpxDir")
 		return KFile(dir, fileName)
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/backup/items/FileSettingsItem.java b/OsmAnd/src/net/osmand/plus/settings/backend/backup/items/FileSettingsItem.java
index addfc209b6c..23aedf67fc5 100644
--- a/OsmAnd/src/net/osmand/plus/settings/backend/backup/items/FileSettingsItem.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/backup/items/FileSettingsItem.java
@@ -181,6 +181,7 @@ public FileSettingsItem(@NonNull OsmandApplication app, @NonNull File file) thro
 		this.file = file;
 		this.appPath = app.getAppPath(null);
 		String fileName = getFileName();
+		SettingsHelper.LOG.info(">>>> FileSettingsItem file.getPath()=" + file.getPath() + " file.getAbsolutePath()=" + file.getAbsolutePath() + " appPath=" + app.getAppPath(null).getPath());
 		if (fileName != null) {
 			this.subtype = FileSubtype.getSubtypeByFileName(fileName);
 		}

From e7f1c70cd48f77cc2b8189cfc1f5a856328c0e28 Mon Sep 17 00:00:00 2001
From: Ivan <ivan.pirogovsky@gmail.com>
Date: Mon, 30 Sep 2024 18:47:51 +0300
Subject: [PATCH 68/83] Fix crash (#20956)

---
 .../main/java/net/osmand/data/DataTileManager.java   | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/OsmAnd-java/src/main/java/net/osmand/data/DataTileManager.java b/OsmAnd-java/src/main/java/net/osmand/data/DataTileManager.java
index 15a45b5d7c1..4d4f800f465 100644
--- a/OsmAnd-java/src/main/java/net/osmand/data/DataTileManager.java
+++ b/OsmAnd-java/src/main/java/net/osmand/data/DataTileManager.java
@@ -1,16 +1,10 @@
 package net.osmand.data;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import gnu.trove.map.hash.TLongObjectHashMap;
-
 import net.osmand.util.MapUtils;
 
+import java.util.*;
+
 /**
  * @param <T> - object to store in that manager
  */
@@ -121,7 +115,7 @@ public List<T> getObjects(int leftX31, int topY31, int rightX31, int bottomY31,
 	 */
 	public List<T> getClosestObjects(double latitude, double longitude, double radius) {
 		if (isEmpty()) {
-			return Collections.emptyList();
+			return new ArrayList<>();
 		}
 		double tileDist = radius / MapUtils.getTileDistanceWidth(latitude, zoom);
 		int tileDistInt = (int) Math.ceil(tileDist);

From 7e2af08ec929ff7e720a1d3ff46b9724d01b6037 Mon Sep 17 00:00:00 2001
From: Evgenii Martynenko <deathstallker@yandex.ru>
Date: Mon, 30 Sep 2024 11:12:11 +0000
Subject: [PATCH 69/83] Translated using Weblate (Russian)

Currently translated at 98.9% (5265 of 5320 strings)
---
 OsmAnd/res/values-ru/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 5194a714853..ae39d8f8159 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -5964,4 +5964,8 @@
     <string name="obd_vin_desc">VIN-код по OBD</string>
     <string name="vehicle_metrics_plugin_settings">Настройки показателей ТС</string>
     <string name="reset_average_speed">Сбросить среднюю скорость</string>
+    <string name="quick_action_finish_trip_recording_summary">Кнопка сохранения трека GPX и завершения записи маршрута.</string>
+    <string name="start_trip_recording_first_m">Сначала начните запись поездки.</string>
+    <string name="new_segment_started_m">Начало записи нового сегмента трека.</string>
+    <string name="track_does_not_contain_data_to_save">Трек не содержит данных для сохранения.</string>
 </resources>
\ No newline at end of file

From dc5f8e56a8821b3893402b20668102e98f7abd6b Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 30 Sep 2024 14:55:34 +0000
Subject: [PATCH 70/83] Translated using Weblate (Spanish)

Currently translated at 99.9% (5316 of 5320 strings)
---
 OsmAnd/res/values-es/strings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 473e8535b01..17d44d42ee4 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -5960,4 +5960,15 @@
     <string name="obd_vin_desc">Código VIN a través de OBD</string>
     <string name="vehicle_metrics_plugin_settings">Configuración de métricas del vehículo</string>
     <string name="reset_average_speed">Restablecer velocidad media</string>
+    <string name="start_trip_recording_first_m">Por favor, inicie primero la grabación del viaje.</string>
+    <string name="new_segment_started_m">Comenzó la grabación de un nuevo segmento de pista.</string>
+    <string name="quick_action_new_trip_segment">Un botón para iniciar un nuevo segmento en la grabación de la pista GPX en curso.</string>
+    <string name="track_does_not_contain_data_to_save">La pista no contiene datos para guardar.</string>
+    <string name="quick_action_finish_trip_recording_summary">Un botón para guardar la pista GPX y finalizar la grabación del viaje.</string>
+    <string name="quick_action_save_recorded_trip_and_continue_summary">Un botón para guardar el viaje actual grabado como un archivo GPX y continuar grabando una nueva pista sin interrupciones.</string>
+    <string name="new_trip_segment">Nuevo tramo del viaje</string>
+    <string name="quick_action_start_pause_recording">Un botón para iniciar, pausar o reanudar la grabación de la pista GPX.</string>
+    <string name="quick_action_verb_start_pause">Iniciar / Pausar</string>
+    <string name="help_article_personal_color_palette_schemes_name">Combinación de colores</string>
+    <string name="movies_list">Lista de vídeos</string>
 </resources>
\ No newline at end of file

From 873402a64e1e60a84968505f21135db9cf3253c4 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 30 Sep 2024 16:49:46 +0000
Subject: [PATCH 71/83] Translated using Weblate (Spanish)

Currently translated at 99.9% (5318 of 5320 strings)
---
 OsmAnd/res/values-es/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 17d44d42ee4..3d47a38873b 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -5971,4 +5971,6 @@
     <string name="quick_action_verb_start_pause">Iniciar / Pausar</string>
     <string name="help_article_personal_color_palette_schemes_name">Combinación de colores</string>
     <string name="movies_list">Lista de vídeos</string>
+    <string name="quick_action_save_recorded_trip_and_continue">Viaje grabado y continuación</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
 </resources>
\ No newline at end of file

From 7cc5eb927fa2f34d8262d4c059065ac076f92b87 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 30 Sep 2024 16:50:20 +0000
Subject: [PATCH 72/83] Translated using Weblate (Spanish)

Currently translated at 100.0% (277 of 277 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/es/
---
 OsmAnd-telegram/res/values-es/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd-telegram/res/values-es/strings.xml b/OsmAnd-telegram/res/values-es/strings.xml
index 967e5392d39..2ebad9439b6 100644
--- a/OsmAnd-telegram/res/values-es/strings.xml
+++ b/OsmAnd-telegram/res/values-es/strings.xml
@@ -272,7 +272,7 @@
     <string name="logcat_buffer_descr">Comprueba y comparte los registros detallados de la aplicación</string>
     <string name="send_report">Enviar informe</string>
     <string name="send_live_location_error">Enviar error de ubicación en vivo: %1$s</string>
-    <string name="ltr_or_rtl_combine_via_dash">%1$s – %2$s</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
     <string name="shared_string_error">Error</string>
     <string name="location_source_summary">Por defecto, OsmAnd instalado desde Google Play utiliza Google Play Services para determinar la ubicación.

From 972326220c6c37531018f46246ec42982c2d2117 Mon Sep 17 00:00:00 2001
From: Franco <francobenedetti.59+weblate1@gmail.com>
Date: Mon, 30 Sep 2024 17:49:19 +0000
Subject: [PATCH 73/83] Translated using Weblate (Spanish (Argentina))

Currently translated at 99.8% (5314 of 5320 strings)
---
 OsmAnd/res/values-es-rAR/strings.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index e1a19ab055c..025e55cca23 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -5976,4 +5976,14 @@
     <string name="obd_vin">VIN</string>
     <string name="vehicle_metrics_plugin_settings">Ajustes de «Estadísticas del vehículo»</string>
     <string name="obd_vin_desc">Código VIN sobre OBD</string>
+    <string name="quick_action_save_recorded_trip_and_continue">Grabar viaje y continuar</string>
+    <string name="track_does_not_contain_data_to_save">La traza no tiene datos que guardar.</string>
+    <string name="quick_action_finish_trip_recording_summary">Un botón que guarda la traza GPX y finaliza la grabación del viaje.</string>
+    <string name="start_trip_recording_first_m">Iniciar la grabación del viaje antes.</string>
+    <string name="new_segment_started_m">Se ha iniciado a grabar un nuevo segmento de la traza.</string>
+    <string name="quick_action_save_recorded_trip_and_continue_summary">Un botón que guarda la grabación del viaje actual en un archivo GPX y continúa grabando una nueva traza sin interrupción.</string>
+    <string name="quick_action_new_trip_segment">Un botón que inicia un nuevo segmento en la grabación actual de la traza GPX.</string>
+    <string name="new_trip_segment">Nuevo segmento del viaje</string>
+    <string name="quick_action_verb_start_pause">Iniciar / Pausar</string>
+    <string name="quick_action_start_pause_recording">Un botón que inicia, pausa o reanuda la grabación de la traza GPX.</string>
 </resources>
\ No newline at end of file

From 850b6d7ba1f0384a657095fe26260039b105ad89 Mon Sep 17 00:00:00 2001
From: Franco <francobenedetti.59+weblate1@gmail.com>
Date: Mon, 30 Sep 2024 17:54:30 +0000
Subject: [PATCH 74/83] Translated using Weblate (Spanish (Argentina))

Currently translated at 99.9% (5317 of 5320 strings)
---
 OsmAnd/res/values-es-rAR/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 025e55cca23..1c1705f0c7f 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -5986,4 +5986,9 @@
     <string name="new_trip_segment">Nuevo segmento del viaje</string>
     <string name="quick_action_verb_start_pause">Iniciar / Pausar</string>
     <string name="quick_action_start_pause_recording">Un botón que inicia, pausa o reanuda la grabación de la traza GPX.</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
+    <string name="help_article_personal_color_palette_schemes_name">Esquemas de colores</string>
+    <string name="movies_list">Lista de películas</string>
+    <string name="third_links">Enlaces externos</string>
+    <string name="tracker_item">OsmAnd Tracker</string>
 </resources>
\ No newline at end of file

From 1e0c40f128d425e84483ca829067a507b44d8241 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 30 Sep 2024 18:48:28 +0000
Subject: [PATCH 75/83] Translated using Weblate (Spanish)

Currently translated at 100.0% (5320 of 5320 strings)
---
 OsmAnd/res/values-es/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 3d47a38873b..846a39cdaba 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -5973,4 +5973,6 @@
     <string name="movies_list">Lista de vídeos</string>
     <string name="quick_action_save_recorded_trip_and_continue">Viaje grabado y continuación</string>
     <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
+    <string name="third_links">Enlaces de terceros</string>
+    <string name="tracker_item">Rastreador de OsmAnd</string>
 </resources>
\ No newline at end of file

From 9b3b7c8562c5aa1f0b44f065569fcba0c33a7898 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 30 Sep 2024 19:08:49 +0000
Subject: [PATCH 76/83] Translated using Weblate (Spanish)

Currently translated at 100.0% (5320 of 5320 strings)
---
 OsmAnd/res/values-es/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 846a39cdaba..d4dfc3933c3 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -5756,7 +5756,7 @@
     <string name="daynight_mode_sensor_summary">Utiliza el sensor de iluminación ambiental del dispositivo para alternar entre temas claros y oscuros según los niveles de luz ambiental.</string>
     <string name="daynight_mode_sunrise_sunset_summary">Cambia automáticamente entre temas diurnos y nocturnos según las horas locales de salida y puesta del sol.</string>
     <string name="daynight_mode_night_summary">Siempre muestra el mapa en un tema oscuro, adecuado para condiciones nocturnas o de poca luz.</string>
-    <string name="daynight_mode_day_summary">Muestra siempre el mapa en un tema claro, ideal para visibilidad diurna.</string>
+    <string name="daynight_mode_day_summary">Siempre muestra el mapa en un tema claro, ideal para la visibilidad diurna.</string>
     <string name="daynight_mode_app_theme">Tema de la aplicación</string>
     <string name="key_event_action_continuous_zoom_out">Reducción continua</string>
     <string name="key_event_action_continuous_zoom_in">Zoom continuo</string>

From 86a3a743e5fbe8df190591396ac57f7f38350617 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 30 Sep 2024 19:09:51 +0000
Subject: [PATCH 77/83] Translated using Weblate (Spanish)

Currently translated at 100.0% (5320 of 5320 strings)
---
 OsmAnd/res/values-es/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index d4dfc3933c3..c3f9f1ee518 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -5754,7 +5754,7 @@
     <string name="map_settings_weather_wind_animation">Animación del viento</string>
     <string name="tomorrow">Mañana</string>
     <string name="daynight_mode_sensor_summary">Utiliza el sensor de iluminación ambiental del dispositivo para alternar entre temas claros y oscuros según los niveles de luz ambiental.</string>
-    <string name="daynight_mode_sunrise_sunset_summary">Cambia automáticamente entre temas diurnos y nocturnos según las horas locales de salida y puesta del sol.</string>
+    <string name="daynight_mode_sunrise_sunset_summary">Cambia automáticamente entre los temas de día y de noche en función de las horas locales del amanecer y el atardecer.</string>
     <string name="daynight_mode_night_summary">Siempre muestra el mapa en un tema oscuro, adecuado para condiciones nocturnas o de poca luz.</string>
     <string name="daynight_mode_day_summary">Siempre muestra el mapa en un tema claro, ideal para la visibilidad diurna.</string>
     <string name="daynight_mode_app_theme">Tema de la aplicación</string>
@@ -5762,7 +5762,7 @@
     <string name="key_event_action_continuous_zoom_in">Zoom continuo</string>
     <string name="remove_key_assignment_summary">Se eliminará la asignación de la clave para la acción seleccionada.</string>
     <string name="remove_key_assignment">Eliminar asignación de la clave</string>
-    <string name="daynight_mode_app_theme_summary">La visualización del mapa se ajusta con el tema general de la aplicación: modo diurno para un tema claro y modo nocturno para un tema oscuro</string>
+    <string name="daynight_mode_app_theme_summary">La pantalla del mapa se alinea con el modo día de la aplicación para un tema claro y el modo noche para un tema oscuro</string>
     <string name="weather_source_ecmwf_description">Centro Europeo de Previsiones Meteorológicas a Plazo Medio</string>
     <string name="weather_source_GFS_description">Sistema de pronóstico global de los centros nacionales de predicción ambiental</string>
     <string name="weather_source_ecmwf_title">ECMWF</string>

From 7d0e18e668c93594ddea2a12b848a7da705960bb Mon Sep 17 00:00:00 2001
From: ERYpTION <eryption.ar9q2@slmail.me>
Date: Mon, 30 Sep 2024 19:41:29 +0000
Subject: [PATCH 78/83] Translated using Weblate (Danish)

Currently translated at 99.9% (5318 of 5320 strings)
---
 OsmAnd/res/values-da/strings.xml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index df25c0f01b4..87384c1ab90 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -5755,7 +5755,7 @@
     <string name="missing_maps_ignore">Brug downloadede kort</string>
     <string name="daynight_mode_sensor_summary">Bruger enhedens lyssensor til at skifte mellem lyse og mørke temaer alt efter det omgivende lysniveau.</string>
     <string name="daynight_mode_sunrise_sunset_summary">Skifter automatisk mellem dag- og nattemaer baseret på lokale solopgangs- og solnedgangstider.</string>
-    <string name="daynight_mode_night_summary">Viser altid kortet i et mørkt tema, der er velegnet til nattetid eller svage lysforhold.</string>
+    <string name="daynight_mode_night_summary">Viser altid kortet i et mørkt tema, der er velegnet til natlige eller svage lysforhold.</string>
     <string name="daynight_mode_day_summary">Viser altid kortet i et lyst tema, ideelt til synlighed i dagtimerne.</string>
     <string name="daynight_mode_app_theme">App-tema</string>
     <string name="key_event_action_continuous_zoom_out">Kontinuerligt zoom ud</string>
@@ -5764,7 +5764,7 @@
     <string name="remove_key_assignment">Fjern tasttildeling</string>
     <string name="map_settings_weather_wind_animation">Animation af vind</string>
     <string name="tomorrow">I morgen</string>
-    <string name="daynight_mode_app_theme_summary">Kortets visning tilpasses appens overordnede tema - dagtilstand ved et lyst tema og nattilstand ved et mørkt tema</string>
+    <string name="daynight_mode_app_theme_summary">Kortets visning tilpasses appens overordnede tema — dagtilstand for et lyst tema og nattilstand for et mørkt tema</string>
     <string name="shared_string_modify">Tilpas</string>
     <string name="weather_source_GFS_description">Globalt prognosesystem fra nationale centre for miljøforudsigelser</string>
     <string name="weather_source_ecmwf_title">ECMWF</string>
@@ -5962,4 +5962,19 @@
     <string name="obd_vin_desc">VIN-kode via OBD</string>
     <string name="vehicle_metrics_plugin_settings">Indstillinger for køretøjets parametre</string>
     <string name="reset_average_speed">Nulstil gennemsnitshastighed</string>
+    <string name="quick_action_finish_trip_recording_summary">En knap til at gemme GPX-sporet og afslutte optagelse af tur.</string>
+    <string name="start_trip_recording_first_m">Start optagelse af tur først.</string>
+    <string name="new_segment_started_m">Startede optagelse af et nyt sporsegment.</string>
+    <string name="quick_action_save_recorded_trip_and_continue">Optaget tur og fortsæt</string>
+    <string name="quick_action_new_trip_segment">En knap til at starte et nyt segment i den igangværende GPX-sporoptagelse.</string>
+    <string name="new_trip_segment">Nyt tursegment</string>
+    <string name="quick_action_start_pause_recording">En knap til at starte, sætte på pause eller genoptage optagelsen af GPX-sporet.</string>
+    <string name="quick_action_verb_start_pause">Start / Pause</string>
+    <string name="help_article_personal_color_palette_schemes_name">Farvesammensætninger</string>
+    <string name="movies_list">Filmliste</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
+    <string name="quick_action_save_recorded_trip_and_continue_summary">En knap til at gemme den aktuelt optagne tur som en GPX-fil og fortsætte optagelsen af et nyt spor uden afbrydelse.</string>
+    <string name="track_does_not_contain_data_to_save">Sporet indeholder ikke data, der skal gemmes.</string>
+    <string name="offline_wikivoyage">Offline Wikivoyage</string>
+    <string name="wikivoyage_offline">Wikivoyage offline</string>
 </resources>
\ No newline at end of file

From f9c6c7a2476a919c7db85d6c6cf8d6bbf6cc037c Mon Sep 17 00:00:00 2001
From: D M <emid308@yandex.ru>
Date: Mon, 30 Sep 2024 19:25:27 +0000
Subject: [PATCH 79/83] Translated using Weblate (Serbian)

Currently translated at 100.0% (5320 of 5320 strings)
---
 OsmAnd/res/values-sr/strings.xml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index ba38d173fb0..99d9e447710 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -5752,14 +5752,14 @@
     <string name="tomorrow">Сутрадан</string>
     <string name="map_settings_weather_wind_animation">Опонашање ветра</string>
     <string name="daynight_mode_sensor_summary">Користи светлосни пријемник уређаја као прекидач између светлих и тамних тема у складу са разинама околишног светла.</string>
-    <string name="daynight_mode_sunrise_sunset_summary">Аутоматски пребацује између дневне и ноћне теме на основу местног времена изласка и заласка сунца.</string>
-    <string name="daynight_mode_night_summary">Увек приказује карту у тамној теми, погодној за ноћне услове или услове слабог осветљења.</string>
-    <string name="daynight_mode_day_summary">Увек приказуј карту у светлој теми, погодној за видљивост током дана.</string>
+    <string name="daynight_mode_sunrise_sunset_summary">Аутоматски пребацује између дневне и ноћне теме на основу локалног времена изласка и заласка сунца.</string>
+    <string name="daynight_mode_night_summary">Увек приказује мапу у тамној теми, погодној за ноћне услове или услове слабог осветљења.</string>
+    <string name="daynight_mode_day_summary">Увек приказује мапу у светлој теми, идеално за видљивост током дана.</string>
     <string name="daynight_mode_app_theme">Тема програма</string>
     <string name="key_event_action_continuous_zoom_out">Непрекидно умањење</string>
     <string name="remove_key_assignment_summary">Додељивање дугмади за изабрану радњу ће бити уклоњено.</string>
     <string name="remove_key_assignment">Уклони додељивање дугмади</string>
-    <string name="daynight_mode_app_theme_summary">Приказ карте је у складу са општом темом програма — дневни начин за светлу тему и ноћни начин за тамну тему</string>
+    <string name="daynight_mode_app_theme_summary">Приказ мапе је у складу са општом темом апликације — дневни режим за светлу тему и ноћни режим за тамну тему</string>
     <string name="key_event_action_continuous_zoom_in">Непрекидно увећање</string>
     <string name="weather_data_sources_prompt">ОсмАнд пружа податке временских прилика из два извора:</string>
     <string name="weather_source_ecmwf_description">Европско средиште за средњерочна предвиђања временских прилика</string>
@@ -5958,4 +5958,18 @@
     <string name="obd_vin">ИБВ</string>
     <string name="obd_vin_desc">ИБВ код преко ДНВ</string>
     <string name="reset_average_speed">Ресетуј просечну брзину</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
+    <string name="new_segment_started_m">Почело је снимање новог сегмента путање.</string>
+    <string name="new_trip_segment">Нови сегмент путовања</string>
+    <string name="quick_action_start_pause_recording">Дугме за покретање, паузирање или наставак снимања ГПКС стазе.</string>
+    <string name="quick_action_verb_start_pause">Покрени / Паузирај</string>
+    <string name="help_article_personal_color_palette_schemes_name">Шеме боја</string>
+    <string name="track_does_not_contain_data_to_save">Путања не садржи податке за чување.</string>
+    <string name="quick_action_finish_trip_recording_summary">Дугме за чување ГПКС стазе и завршетак снимања путовања.</string>
+    <string name="start_trip_recording_first_m">Прво започните снимање путовања.</string>
+    <string name="quick_action_new_trip_segment">Дугме за покретање новог сегмента у текућем ГПКС снимању стазе.</string>
+    <string name="quick_action_save_recorded_trip_and_continue_summary">Дугме за чување тренутно снимљеног путовања као ГПКС фајла и наставак снимања нове стазе без прекида.</string>
+    <string name="quick_action_save_recorded_trip_and_continue">Снимљено путовање и наставите</string>
+    <string name="movies_list">Листа филмова</string>
+    <string name="third_links">Други линкови</string>
 </resources>
\ No newline at end of file

From 6631bb30aed303c8ba2c6f9a0f8afc023fe6a0bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=98=86Verdulo?= <tomek@disroot.org>
Date: Mon, 30 Sep 2024 20:11:30 +0000
Subject: [PATCH 80/83] Translated using Weblate (Esperanto)

Currently translated at 100.0% (5320 of 5320 strings)
---
 OsmAnd/res/values-eo/strings.xml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index 6d44987b4ff..d210c202e1e 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -5751,7 +5751,7 @@
     <string name="quick_action_move_map_right">Mapo dekstren</string>
     <string name="quick_action_move_map_down">Mapo malsupren</string>
     <string name="quick_action_new_route">Nova kurso</string>
-    <string name="quick_action_previous_app_profile">Antaŭa aplikaĵa profilo</string>
+    <string name="quick_action_previous_app_profile">Aplikaĵa profilo: antaŭa</string>
     <string name="shared_string_simulate">Simuli</string>
     <string name="quick_action_terrain">Maniero kolorigi terenon</string>
     <string name="quick_action_first_intermediate">Unua intercelo</string>
@@ -5769,7 +5769,7 @@
     <string name="quick_action_location_by_gpx">Pozicio laŭ GPX</string>
     <string name="quick_action_move_map_up">Mapo supren</string>
     <string name="shared_string_set">Agordi</string>
-    <string name="quick_action_next_app_profile">Sekva aplikaĵa profilo</string>
+    <string name="quick_action_next_app_profile">Aplikaĵa profilo: sekva</string>
     <string name="shared_string_create">Krei</string>
     <string name="shared_string_replace">Anstataŭigi</string>
     <string name="quick_action_display_position_in_center">Markilo de nuna pozicio: ĉiam centre</string>
@@ -5955,4 +5955,18 @@
     <string name="obd_vin_desc">Montras VIN-numeron raportatan de OBD-sentilo</string>
     <string name="vehicle_metrics_plugin_settings">Agordoj pri statistikoj pri veturilo</string>
     <string name="reset_average_speed">Nuligi mezuman rapidon</string>
+    <string name="start_trip_recording_first_m">Unue komencu registri spuron.</string>
+    <string name="new_segment_started_m">Komencis registri novan segmenton de spuro.</string>
+    <string name="quick_action_save_recorded_trip_and_continue">Konservi spuron kaj pluigi</string>
+    <string name="new_trip_segment">Nova segmento de spuro</string>
+    <string name="quick_action_start_pause_recording">Butono por ekigi, paŭzigi kaj plugi registri GPX-spuron.</string>
+    <string name="quick_action_verb_start_pause">Ekigi / paŭzigi</string>
+    <string name="help_article_personal_color_palette_schemes_name">Kolor-skemoj</string>
+    <string name="movies_list">Listo de filmetoj</string>
+    <string name="third_links">Neoficialaj ligiloj</string>
+    <string name="track_does_not_contain_data_to_save">Spuro enhavas neniun datumon por konservi.</string>
+    <string name="quick_action_finish_trip_recording_summary">Butono por konservi GPX-spuron kaj fini registradon.</string>
+    <string name="quick_action_save_recorded_trip_and_continue_summary">Butono por konservi la nune registratan spuron kiel GPX-dosieron kaj pluigi registri spuron.</string>
+    <string name="quick_action_new_trip_segment">Butono por ekigi novan segmenton en la nune registrata GPX-spuro.</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
 </resources>
\ No newline at end of file

From 497ec83ea281a71114c7aacaf0c5c73577a55e45 Mon Sep 17 00:00:00 2001
From: D M <emid308@yandex.ru>
Date: Mon, 30 Sep 2024 19:28:41 +0000
Subject: [PATCH 81/83] Translated using Weblate (Serbian (Latin script))

Currently translated at 100.0% (5320 of 5320 strings)
---
 OsmAnd/res/values-b+sr+Latn/strings.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/OsmAnd/res/values-b+sr+Latn/strings.xml b/OsmAnd/res/values-b+sr+Latn/strings.xml
index c2f0c7420e2..27b50316599 100644
--- a/OsmAnd/res/values-b+sr+Latn/strings.xml
+++ b/OsmAnd/res/values-b+sr+Latn/strings.xml
@@ -5966,4 +5966,18 @@
     <string name="obd_vin_desc">VIN kod preko OBD-a</string>
     <string name="reset_average_speed">Poništi prosečnu brzinu</string>
     <string name="vehicle_metrics_plugin_settings">Podešavanja metrike vozila</string>
+    <string name="track_does_not_contain_data_to_save">Putanja ne sadrži podatke za čuvanje.</string>
+    <string name="quick_action_finish_trip_recording_summary">Dugme za čuvanje GPKS staze i završetak snimanja putovanja.</string>
+    <string name="start_trip_recording_first_m">Prvo započnite snimanje putovanja.</string>
+    <string name="quick_action_save_recorded_trip_and_continue">Snimljeno putovanje i nastavite</string>
+    <string name="help_article_personal_color_palette_schemes_name">Šeme boja</string>
+    <string name="quick_action_new_trip_segment">Dugme za pokretanje novog segmenta u tekućem GPKS snimanju staze.</string>
+    <string name="new_segment_started_m">Počelo je snimanje novog segmenta putanje.</string>
+    <string name="quick_action_save_recorded_trip_and_continue_summary">Dugme za čuvanje trenutno snimljenog putovanja kao GPKS fajla i nastavak snimanja nove staze bez prekida.</string>
+    <string name="third_links">Drugi linkovi</string>
+    <string name="new_trip_segment">Novi segment putovanja</string>
+    <string name="quick_action_start_pause_recording">Dugme za pokretanje, pauziranje ili nastavak snimanja GPKS staze.</string>
+    <string name="quick_action_verb_start_pause">Pokreni / Pauziraj</string>
+    <string name="movies_list">Lista filmova</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
 </resources>
\ No newline at end of file

From aafcb213a43d526ce9a4dedd9867d76e95795342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=98=86Verdulo?= <tomek@disroot.org>
Date: Mon, 30 Sep 2024 20:49:06 +0000
Subject: [PATCH 82/83] Translated using Weblate (Esperanto)

Currently translated at 51.9% (144 of 277 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/eo/
---
 OsmAnd-telegram/res/values-eo/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd-telegram/res/values-eo/strings.xml b/OsmAnd-telegram/res/values-eo/strings.xml
index 532a5f60fee..42918c46521 100644
--- a/OsmAnd-telegram/res/values-eo/strings.xml
+++ b/OsmAnd-telegram/res/values-eo/strings.xml
@@ -143,4 +143,5 @@
     <string name="unit_of_length_descr">Ŝanĝi unuojn por reprezenti distancoj.</string>
     <string name="logcat_buffer">Bufro logcat</string>
     <string name="logcat_buffer_descr">Legi kaj kunhavigi detalajn protokolojn de la aplikaĵo</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
 </resources>
\ No newline at end of file

From d650f369db8a3012acc03e922165a0710e806e7a Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Tue, 1 Oct 2024 09:22:26 +0300
Subject: [PATCH 83/83] Rename phrase
 (https://github.com/osmandapp/OsmAnd/issues/20883)

---
 OsmAnd/res/values-ar/phrases.xml        | 2 +-
 OsmAnd/res/values-ars/phrases.xml       | 2 +-
 OsmAnd/res/values-ast/phrases.xml       | 2 +-
 OsmAnd/res/values-b+sr+Latn/phrases.xml | 2 +-
 OsmAnd/res/values-be/phrases.xml        | 2 +-
 OsmAnd/res/values-ca/phrases.xml        | 2 +-
 OsmAnd/res/values-cs/phrases.xml        | 2 +-
 OsmAnd/res/values-cy/phrases.xml        | 2 +-
 OsmAnd/res/values-da/phrases.xml        | 2 +-
 OsmAnd/res/values-de/phrases.xml        | 2 +-
 OsmAnd/res/values-el/phrases.xml        | 2 +-
 OsmAnd/res/values-eo/phrases.xml        | 2 +-
 OsmAnd/res/values-es-rAR/phrases.xml    | 2 +-
 OsmAnd/res/values-es-rUS/phrases.xml    | 2 +-
 OsmAnd/res/values-es/phrases.xml        | 2 +-
 OsmAnd/res/values-et/phrases.xml        | 2 +-
 OsmAnd/res/values-eu/phrases.xml        | 2 +-
 OsmAnd/res/values-fa/phrases.xml        | 2 +-
 OsmAnd/res/values-fi/phrases.xml        | 2 +-
 OsmAnd/res/values-fr/phrases.xml        | 2 +-
 OsmAnd/res/values-gl/phrases.xml        | 2 +-
 OsmAnd/res/values-hr/phrases.xml        | 2 +-
 OsmAnd/res/values-hu/phrases.xml        | 2 +-
 OsmAnd/res/values-in/phrases.xml        | 2 +-
 OsmAnd/res/values-is/phrases.xml        | 2 +-
 OsmAnd/res/values-it/phrases.xml        | 2 +-
 OsmAnd/res/values-iw/phrases.xml        | 2 +-
 OsmAnd/res/values-ja/phrases.xml        | 2 +-
 OsmAnd/res/values-ko/phrases.xml        | 2 +-
 OsmAnd/res/values-lv/phrases.xml        | 2 +-
 OsmAnd/res/values-mk/phrases.xml        | 2 +-
 OsmAnd/res/values-ml/phrases.xml        | 2 +-
 OsmAnd/res/values-nl/phrases.xml        | 2 +-
 OsmAnd/res/values-oc/phrases.xml        | 2 +-
 OsmAnd/res/values-pl/phrases.xml        | 2 +-
 OsmAnd/res/values-pt-rBR/phrases.xml    | 2 +-
 OsmAnd/res/values-pt/phrases.xml        | 2 +-
 OsmAnd/res/values-ro/phrases.xml        | 2 +-
 OsmAnd/res/values-ru/phrases.xml        | 2 +-
 OsmAnd/res/values-sc/phrases.xml        | 2 +-
 OsmAnd/res/values-sk/phrases.xml        | 2 +-
 OsmAnd/res/values-sl/phrases.xml        | 2 +-
 OsmAnd/res/values-sr/phrases.xml        | 2 +-
 OsmAnd/res/values-sv/phrases.xml        | 2 +-
 OsmAnd/res/values-tr/phrases.xml        | 2 +-
 OsmAnd/res/values-uk/phrases.xml        | 2 +-
 OsmAnd/res/values-zh-rCN/phrases.xml    | 2 +-
 OsmAnd/res/values-zh-rTW/phrases.xml    | 2 +-
 OsmAnd/res/values/phrases.xml           | 2 +-
 49 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/OsmAnd/res/values-ar/phrases.xml b/OsmAnd/res/values-ar/phrases.xml
index 1138349a012..589b193b382 100644
--- a/OsmAnd/res/values-ar/phrases.xml
+++ b/OsmAnd/res/values-ar/phrases.xml
@@ -1395,7 +1395,7 @@
     <string name="poi_aerialway_chair_lift">رافعة بالكرسي</string>
     <string name="poi_aerialway_t_bar">رافعة T</string>
     <string name="poi_aerialway_j_bar">رافعة J</string>
-    <string name="poi_ses_station">محطة SES</string>
+    <string name="poi_disaster_response">محطة SES</string>
     <string name="poi_aerialway_platter">رافعة متزحلقين</string>
     <string name="poi_aerialway_mixed_lift">رافعة مختلطة</string>
     <string name="poi_aerialway_drag_lift">رافعة سحب</string>
diff --git a/OsmAnd/res/values-ars/phrases.xml b/OsmAnd/res/values-ars/phrases.xml
index 3f26b502f5e..efa2d13789b 100644
--- a/OsmAnd/res/values-ars/phrases.xml
+++ b/OsmAnd/res/values-ars/phrases.xml
@@ -3467,7 +3467,7 @@
     <string name="poi_ford_stepping_stones">معبر حجري</string>
     <string name="poi_ford">مخاضة (مجرى الماء فوق الطريق)</string>
     <string name="poi_emergency_access_point">نقطة وصول الطوارئ</string>
-    <string name="poi_ses_station">محطة SES</string>
+    <string name="poi_disaster_response">محطة SES</string>
     <string name="poi_ambulance_station">محطة إسعاف</string>
     <string name="poi_grit_bin">سلة حصى</string>
     <string name="poi_fire_water_pond">احتياطي مياه إطفاء الحرائق</string>
diff --git a/OsmAnd/res/values-ast/phrases.xml b/OsmAnd/res/values-ast/phrases.xml
index 3385a451fa6..1116d5ee355 100644
--- a/OsmAnd/res/values-ast/phrases.xml
+++ b/OsmAnd/res/values-ast/phrases.xml
@@ -3700,7 +3700,7 @@
     <string name="poi_ford_stepping_stones">Step-stone bridge</string>
     <string name="poi_ford">Ford</string>
     <string name="poi_emergency_access_point">Emergency access point</string>
-    <string name="poi_ses_station">SES station</string>
+    <string name="poi_disaster_response">SES station</string>
     <string name="poi_ambulance_station">Ambulance station</string>
     <string name="poi_grit_bin">Grit bin</string>
     <string name="poi_fire_water_pond">Fire water pond</string>
diff --git a/OsmAnd/res/values-b+sr+Latn/phrases.xml b/OsmAnd/res/values-b+sr+Latn/phrases.xml
index 0ef8fa80045..ac643f483af 100644
--- a/OsmAnd/res/values-b+sr+Latn/phrases.xml
+++ b/OsmAnd/res/values-b+sr+Latn/phrases.xml
@@ -205,7 +205,7 @@
     <string name="poi_fire_hydrant">Hidrant</string>
     <string name="poi_fire_hose">Vatrogasno crevo</string>
     <string name="poi_ambulance_station">Ambulanta</string>
-    <string name="poi_ses_station">SES stanica</string>
+    <string name="poi_disaster_response">SES stanica</string>
     <string name="poi_emergency_access_point">Tačka za okupljanje u slučaju nužde</string>
     <string name="poi_ford">Zaliv</string>
     <string name="poi_mountain_pass">Planinski prolaz</string>
diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index b4649edc3a9..1a4f44cc7f8 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -100,7 +100,7 @@
     <string name="poi_fire_water_pond">Пажарны вадаём</string>
     <string name="poi_grit_bin">Скрыня з пяском</string>
     <string name="poi_ambulance_station">Станцыя хуткай дапамогі</string>
-    <string name="poi_ses_station">Санэпідэмстанцыя</string>
+    <string name="poi_disaster_response">Санэпідэмстанцыя</string>
     <string name="poi_emergency_access_point">Таблічка з кодам для службы выратавання</string>
     <string name="poi_ford">Брод</string>
     <string name="poi_mountain_pass">Перавал</string>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index 5b517bd541d..f02b352e6d8 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -84,7 +84,7 @@
     <string name="poi_cosmetics">Cosmètica</string>
     <string name="poi_marketplace">Mercat</string>
     <string name="poi_sewing">Merceria</string>
-    <string name="poi_ses_station">Estació de protecció civil</string>
+    <string name="poi_disaster_response">Estació de protecció civil</string>
     <string name="poi_ford">Gual</string>
     <string name="poi_lift_gate">Tanca llevadissa</string>
     <string name="poi_border_control">Control de fronteres</string>
diff --git a/OsmAnd/res/values-cs/phrases.xml b/OsmAnd/res/values-cs/phrases.xml
index 997185daba2..f95bd4b3695 100644
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@@ -296,7 +296,7 @@
     <string name="poi_atv">Terénní čtyřkolky</string>
     <string name="poi_sewing">Švadlenka</string>
     <string name="poi_grit_bin">Posypový kontejner</string>
-    <string name="poi_ses_station">Stanice civilní ochrany</string>
+    <string name="poi_disaster_response">Stanice civilní ochrany</string>
     <string name="poi_traffic_calming_cushion">Zpomalovací retardér s mezerami</string>
     <string name="poi_traffic_calming_chicane">Šikana</string>
     <string name="poi_traffic_calming_rumble_strip">Hlukové pásy</string>
diff --git a/OsmAnd/res/values-cy/phrases.xml b/OsmAnd/res/values-cy/phrases.xml
index cbcc17cc5b1..45e30ab3767 100644
--- a/OsmAnd/res/values-cy/phrases.xml
+++ b/OsmAnd/res/values-cy/phrases.xml
@@ -3915,7 +3915,7 @@
     <string name="poi_energy">Storfa ynni</string>
     <string name="poi_atv">Siop cwad</string>
     <string name="poi_sewing">Siop nwyddau sych</string>
-    <string name="poi_ses_station">Gorsaf SES</string>
+    <string name="poi_disaster_response">Gorsaf SES</string>
     <string name="poi_ford_stepping_stones">Pont sarn</string>
     <string name="poi_lift_gate">Clwyd lifft</string>
     <string name="poi_traffic_calming_bump">Twmpath Cyflymder</string>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 7b5140ad6ee..d79b88aeab6 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -96,7 +96,7 @@
     <string name="poi_fire_water_pond">Branddam</string>
     <string name="poi_grit_bin">Grusbeholder</string>
     <string name="poi_ambulance_station">Ambulancestation</string>
-    <string name="poi_ses_station">SES station</string>
+    <string name="poi_disaster_response">SES station</string>
     <string name="poi_emergency_access_point">Nødstilfælde punkt</string>
     <string name="poi_ford">Vadested</string>
     <string name="poi_mountain_pass">Bjergpas</string>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index e2a62eadbf8..6109118fbca 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -469,7 +469,7 @@
     <string name="poi_seamark_wreck">Wrack</string>
     <string name="poi_second_hand">Gebrauchtwarenladen</string>
     <string name="poi_service_tyres">Reifenhändler</string>
-    <string name="poi_ses_station">SES-Station</string>
+    <string name="poi_disaster_response">SES-Station</string>
     <string name="poi_sewing">Nähbedarf</string>
     <string name="poi_shelter">Unterstand</string>
     <string name="poi_ship_chandler">Schiffsausrüster</string>
diff --git a/OsmAnd/res/values-el/phrases.xml b/OsmAnd/res/values-el/phrases.xml
index 5b966e7675f..e40888cd79e 100644
--- a/OsmAnd/res/values-el/phrases.xml
+++ b/OsmAnd/res/values-el/phrases.xml
@@ -279,7 +279,7 @@
     <string name="poi_fire_water_pond">Δεξαμενή νερού κατάσβεσης</string>
     <string name="poi_grit_bin">Κάδος αλατιού</string>
     <string name="poi_ambulance_station">Σταθμός ασθενοφόρων</string>
-    <string name="poi_ses_station">Σταθμός SES</string>
+    <string name="poi_disaster_response">Σταθμός SES</string>
     <string name="poi_emergency_access_point">Σημείο επείσουσας πρόσβασης</string>
     <string name="poi_ford">Υδάτινο πέρασμα / Ιρλανδική διάβαση</string>
     <string name="poi_ford_stepping_stones">Πέρασμα με πέτρες</string>
diff --git a/OsmAnd/res/values-eo/phrases.xml b/OsmAnd/res/values-eo/phrases.xml
index db68fae76be..2bd13697363 100644
--- a/OsmAnd/res/values-eo/phrases.xml
+++ b/OsmAnd/res/values-eo/phrases.xml
@@ -251,7 +251,7 @@
     <string name="poi_fire_water_pond">Fajrobrigada akvorezervujo</string>
     <string name="poi_grit_bin">Ujo kun sablo/salo</string>
     <string name="poi_ambulance_station">Ambulanca stacio</string>
-    <string name="poi_ses_station">Stacio de civila defendo</string>
+    <string name="poi_disaster_response">Stacio de civila defendo</string>
     <string name="poi_emergency_access_point">Vivsava rekonebla signo</string>
     <string name="poi_ford">Travadejo</string>
     <string name="poi_ford_stepping_stones">Travadejo ŝtona</string>
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index 88e3d4be363..36b432c9aa1 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -142,7 +142,7 @@
     <string name="poi_fire_water_pond">Estanque de agua contra incendios</string>
     <string name="poi_grit_bin">Contenedor de arena</string>
     <string name="poi_ambulance_station">Estación de ambulancias</string>
-    <string name="poi_ses_station">Defensa civil (SES);Protección civil</string>
+    <string name="poi_disaster_response">Defensa civil (SES);Protección civil</string>
     <string name="poi_emergency_access_point">Punto de acceso de emergencia</string>
     <string name="poi_ford">Vado</string>
     <string name="poi_mountain_pass">Paso de montaña</string>
diff --git a/OsmAnd/res/values-es-rUS/phrases.xml b/OsmAnd/res/values-es-rUS/phrases.xml
index 3ccfadac39c..eb53c4c4610 100644
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@@ -142,7 +142,7 @@
     <string name="poi_fire_water_pond">Estanque de agua contra incendios</string>
     <string name="poi_grit_bin">Contenedor de arena</string>
     <string name="poi_ambulance_station">Estación de ambulancias</string>
-    <string name="poi_ses_station">Defensa civil (SES);Protección civil</string>
+    <string name="poi_disaster_response">Defensa civil (SES);Protección civil</string>
     <string name="poi_emergency_access_point">Punto de acceso de emergencia</string>
     <string name="poi_ford">Vado</string>
     <string name="poi_mountain_pass">Paso de montaña</string>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index eed80bba584..a1480814793 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -103,7 +103,7 @@
     <string name="poi_fire_extinguisher">Extintor de incendios</string>
     <string name="poi_fire_hose">Manguera de incendio</string>
     <string name="poi_ambulance_station">Estación de ambulancias</string>
-    <string name="poi_ses_station">Defensa civil (SES);Protección civil</string>
+    <string name="poi_disaster_response">Defensa civil (SES);Protección civil</string>
     <string name="poi_emergency_access_point">Punto de acceso de emergencia</string>
     <string name="poi_mountain_pass">Paso de montaña</string>
     <string name="poi_gate">Portón</string>
diff --git a/OsmAnd/res/values-et/phrases.xml b/OsmAnd/res/values-et/phrases.xml
index 519f0859ad5..9b4bbee3d9b 100644
--- a/OsmAnd/res/values-et/phrases.xml
+++ b/OsmAnd/res/values-et/phrases.xml
@@ -164,7 +164,7 @@
     <string name="poi_fire_water_pond">Tuletõrjetiik</string>
     <string name="poi_grit_bin">Liivatuskast</string>
     <string name="poi_ambulance_station">Kiirabijaam</string>
-    <string name="poi_ses_station">SES jaam</string>
+    <string name="poi_disaster_response">SES jaam</string>
     <string name="poi_emergency_access_point">Asukohatuvastuspunkt hädaolukorras</string>
     <string name="poi_ford">Koolmekoht</string>
     <string name="poi_bed">Voodipesu pood</string>
diff --git a/OsmAnd/res/values-eu/phrases.xml b/OsmAnd/res/values-eu/phrases.xml
index 22bf4e3b878..0d44df6a0b8 100644
--- a/OsmAnd/res/values-eu/phrases.xml
+++ b/OsmAnd/res/values-eu/phrases.xml
@@ -455,7 +455,7 @@
     <string name="poi_sewing">Oihal denda</string>
     <string name="poi_fire_flapper">Sua jotzekoa</string>
     <string name="poi_grit_bin">Hondar potoa</string>
-    <string name="poi_ses_station">Segurtasun eta babes zibilaren estazioa</string>
+    <string name="poi_disaster_response">Segurtasun eta babes zibilaren estazioa</string>
     <string name="poi_lift_gate">Ate altxagarria</string>
     <string name="poi_traffic_calming_chicane">Txikanea</string>
     <string name="poi_traffic_calming_table">Moteltzeko plataforma</string>
diff --git a/OsmAnd/res/values-fa/phrases.xml b/OsmAnd/res/values-fa/phrases.xml
index d6ba67364de..757fae4bd2d 100644
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@@ -98,7 +98,7 @@
     <string name="poi_fire_water_pond">استخر آب آتش نشانی</string>
     <string name="poi_grit_bin">شن بن</string>
     <string name="poi_ambulance_station">ایستگاه آمبولانس</string>
-    <string name="poi_ses_station">ایستگاه SES</string>
+    <string name="poi_disaster_response">ایستگاه SES</string>
     <string name="poi_emergency_access_point">نقطه دسترسی اضطراری</string>
     <string name="poi_ford">گدار</string>
     <string name="poi_mountain_pass">ایستگاه کوهستانی</string>
diff --git a/OsmAnd/res/values-fi/phrases.xml b/OsmAnd/res/values-fi/phrases.xml
index 2e0bfe6d379..986749cc8e6 100644
--- a/OsmAnd/res/values-fi/phrases.xml
+++ b/OsmAnd/res/values-fi/phrases.xml
@@ -206,7 +206,7 @@
     <string name="poi_fire_station">Paloasema</string>
     <string name="poi_emergency_phone">Hätäpuhelin</string>
     <string name="poi_ambulance_station">Ambulanssiasema</string>
-    <string name="poi_ses_station">SES asema</string>
+    <string name="poi_disaster_response">SES asema</string>
     <string name="poi_ford">Kahluupaikka</string>
     <string name="poi_ford_stepping_stones">Astinkivisilta</string>
     <string name="poi_mountain_pass">Vuoristosola</string>
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index c1c1d5e5ae3..4b6f8510249 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -291,7 +291,7 @@
     <string name="poi_scuba_diving">Plongée sous-marine</string>
     <string name="poi_seafood">Poissonnerie</string>
     <string name="poi_second_hand">Magasin de produits d\'occasion</string>
-    <string name="poi_ses_station">Association australienne d\'aide d\'urgence (SES)</string>
+    <string name="poi_disaster_response">Association australienne d\'aide d\'urgence (SES)</string>
     <string name="poi_shelter">Abri</string>
     <string name="poi_religion_shinto">Shintoïsme</string>
     <string name="poi_craft_shoemaker">Cordonnier</string>
diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index bf641d0f18b..3a6d15dd282 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -1826,7 +1826,7 @@
     <string name="poi_shop_craft">Tenda de materiais de artes e traballos manuais (artesanía)</string>
     <string name="poi_fire_flapper">Cortalumes</string>
     <string name="poi_fire_water_pond">Lagoa de auga para incendios</string>
-    <string name="poi_ses_station">Servizo de emerxencia (SES)</string>
+    <string name="poi_disaster_response">Servizo de emerxencia (SES)</string>
     <string name="poi_traffic_calming_cushion">Coxín berlinés</string>
     <string name="poi_traffic_calming_chicane">Chicana</string>
     <string name="poi_traffic_calming_table">Plataforma elevada</string>
diff --git a/OsmAnd/res/values-hr/phrases.xml b/OsmAnd/res/values-hr/phrases.xml
index 246976e1f85..93c9258b760 100644
--- a/OsmAnd/res/values-hr/phrases.xml
+++ b/OsmAnd/res/values-hr/phrases.xml
@@ -62,7 +62,7 @@
     <string name="poi_police">Policija</string>
     <string name="poi_fire_station">Vatrogasna stanica</string>
     <string name="poi_emergency_phone">Telefon hitne pomoći</string>
-    <string name="poi_ses_station">SES stanica</string>
+    <string name="poi_disaster_response">SES stanica</string>
     <string name="poi_city_wall">Gradske zidine</string>
     <string name="poi_traffic_signals">Semafor</string>
     <string name="poi_car_repair">Popravljanje automobila</string>
diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml
index b0d9bf70b70..6f4226b7290 100644
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@@ -597,7 +597,7 @@
     <string name="poi_scuba_diving_shop">Búvárfelszerelés-bolt</string>
     <string name="poi_stationery">Papírbolt</string>
     <string name="poi_tyres">Autógumibolt</string>
-    <string name="poi_ses_station">State Emergency Service (állami vészhelyzeti szolgálat), AUS</string>
+    <string name="poi_disaster_response">State Emergency Service (állami vészhelyzeti szolgálat), AUS</string>
     <string name="poi_emergency_access_point">Vészhelyzeti elérési pont</string>
     <string name="poi_ford_stepping_stones">Lépőkövek</string>
     <string name="poi_vehicle_inspection">Műszaki vizsgáló állomás</string>
diff --git a/OsmAnd/res/values-in/phrases.xml b/OsmAnd/res/values-in/phrases.xml
index 347a2f62225..58bf1f75def 100644
--- a/OsmAnd/res/values-in/phrases.xml
+++ b/OsmAnd/res/values-in/phrases.xml
@@ -1486,7 +1486,7 @@
     <string name="poi_grit_bin">Tempat pasir</string>
     <string name="poi_emergency_access_point">Titik akses darurat</string>
     <string name="poi_fuel_gtl_diesel">Diesel GTL</string>
-    <string name="poi_ses_station">Stasiun SES</string>
+    <string name="poi_disaster_response">Stasiun SES</string>
     <string name="poi_personal_transport">Transporasi pribadi</string>
     <string name="poi_user_defined_other">Ditentukan pengguna</string>
     <string name="poi_ford_stepping_stones">Jembatan batu pijakan</string>
diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml
index 6345945e036..477cc1d2c65 100644
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@@ -2026,7 +2026,7 @@
     <string name="poi_toilets_no">Án salerna</string>
     <string name="poi_fire_flapper">Slökkviliðskústur</string>
     <string name="poi_fire_water_pond">Slökkviliðsvatnsból</string>
-    <string name="poi_ses_station">SES-neyðarstöð</string>
+    <string name="poi_disaster_response">SES-neyðarstöð</string>
     <string name="poi_commercial">Landnotkun í atvinnuskyni</string>
     <string name="poi_retail">Landnotkun fyrir verslun</string>
     <string name="poi_register_office">Skrifstofa þjóðskrár</string>
diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index 9c1556abea4..46ebe3c8111 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -316,7 +316,7 @@
     <string name="poi_racquet">Racquetball</string>
     <string name="poi_fire_flapper">Pala battifuoco</string>
     <string name="poi_fire_hose">Manichetta antincendio</string>
-    <string name="poi_ses_station">Stazione protezione civile</string>
+    <string name="poi_disaster_response">Stazione protezione civile</string>
     <string name="poi_grit_bin">Cassone di sabbia</string>
     <string name="poi_fire_water_pond">Bacino anti-incendio</string>
     <string name="poi_emergency_access_point">Punto di accesso di emergenza</string>
diff --git a/OsmAnd/res/values-iw/phrases.xml b/OsmAnd/res/values-iw/phrases.xml
index 315002a36ab..da0801a65ba 100644
--- a/OsmAnd/res/values-iw/phrases.xml
+++ b/OsmAnd/res/values-iw/phrases.xml
@@ -363,7 +363,7 @@
     <string name="poi_fire_water_pond">מאגר מים לכיבוי אש</string>
     <string name="poi_grit_bin">תיבת מלח</string>
     <string name="poi_ambulance_station">תחנת אמבולנס</string>
-    <string name="poi_ses_station">תחנת שירות לאסון לאומי</string>
+    <string name="poi_disaster_response">תחנת שירות לאסון לאומי</string>
     <string name="poi_emergency_access_point">נקודת התקשרות בחירום</string>
     <string name="poi_ford_stepping_stones">גשר אבנים</string>
     <string name="poi_mountain_pass">שביל בהר</string>
diff --git a/OsmAnd/res/values-ja/phrases.xml b/OsmAnd/res/values-ja/phrases.xml
index 2ce46923485..6f6d3bd1f4d 100644
--- a/OsmAnd/res/values-ja/phrases.xml
+++ b/OsmAnd/res/values-ja/phrases.xml
@@ -157,7 +157,7 @@
     <string name="poi_fire_water_pond">消火用ため池</string>
     <string name="poi_grit_bin">砂箱／防滑材・融雪剤</string>
     <string name="poi_ambulance_station">救急車待機所</string>
-    <string name="poi_ses_station">SESレスキュー待機所</string>
+    <string name="poi_disaster_response">SESレスキュー待機所</string>
     <string name="poi_emergency_access_point">森林内番地札</string>
     <string name="poi_ford">道路上水没地点</string>
     <string name="poi_mountain_pass">峠</string>
diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml
index 9579d7a188e..86b32bfc066 100644
--- a/OsmAnd/res/values-ko/phrases.xml
+++ b/OsmAnd/res/values-ko/phrases.xml
@@ -372,7 +372,7 @@
     <string name="poi_viewpoint">관점</string>
     <string name="poi_camp_site">캠프 사이트</string>
     <string name="poi_caravan_site">캐러밴 사이트</string>
-    <string name="poi_ses_station">SES 역</string>
+    <string name="poi_disaster_response">SES 역</string>
     <string name="poi_traffic_calming_hump">험프</string>
     <string name="poi_standpipe">스탠드파이프</string>
     <string name="poi_water_works">물 작품</string>
diff --git a/OsmAnd/res/values-lv/phrases.xml b/OsmAnd/res/values-lv/phrases.xml
index 2b339b1899c..7699cb4cf3a 100644
--- a/OsmAnd/res/values-lv/phrases.xml
+++ b/OsmAnd/res/values-lv/phrases.xml
@@ -202,7 +202,7 @@
     <string name="poi_fire_water_pond">Ugunsdzēsības dīķis</string>
     <string name="poi_grit_bin">Smilšu kaste</string>
     <string name="poi_ambulance_station">Ambulance</string>
-    <string name="poi_ses_station">SES stacijas</string>
+    <string name="poi_disaster_response">SES stacijas</string>
     <string name="poi_ford">Brasls</string>
     <string name="poi_ford_stepping_stones">Akmens tilts</string>
     <string name="poi_mountain_pass">Kalnu pāreja</string>
diff --git a/OsmAnd/res/values-mk/phrases.xml b/OsmAnd/res/values-mk/phrases.xml
index e26325a09c7..5b58dbe2e34 100644
--- a/OsmAnd/res/values-mk/phrases.xml
+++ b/OsmAnd/res/values-mk/phrases.xml
@@ -460,7 +460,7 @@
     <string name="poi_religion">Prodavnica za verski proizvodi</string>
     <string name="poi_fire_station">Požarnikarska stanica</string>
     <string name="poi_police">Policija</string>
-    <string name="poi_ses_station">SES stanica</string>
+    <string name="poi_disaster_response">SES stanica</string>
     <string name="poi_border_control">Carinska kontrola</string>
     <string name="poi_service_tyres">Gumi</string>
     <string name="poi_vehicle_inspection">Pregled na voziloto</string>
diff --git a/OsmAnd/res/values-ml/phrases.xml b/OsmAnd/res/values-ml/phrases.xml
index 4b49887c7c7..976149ba92c 100644
--- a/OsmAnd/res/values-ml/phrases.xml
+++ b/OsmAnd/res/values-ml/phrases.xml
@@ -169,7 +169,7 @@
     <string name="poi_fire_water_pond">കുളം (അഗ്നിശമനം)</string>
     <string name="poi_grit_bin">ഉപ്പ് കയം</string>
     <string name="poi_ambulance_station">ആംബുലന്‍സ്</string>
-    <string name="poi_ses_station">ഏസ് ഈ എസ് സ്ടേഷന്‍</string>
+    <string name="poi_disaster_response">ഏസ് ഈ എസ് സ്ടേഷന്‍</string>
     <string name="poi_emergency_access_point">എമെര്‍ജെന്‍സി അക്സെസ് പോയിന്റ്</string>
     <string name="poi_ford">ചപ്പാത്ത്</string>
     <string name="poi_mountain_pass">ചുരം</string>
diff --git a/OsmAnd/res/values-nl/phrases.xml b/OsmAnd/res/values-nl/phrases.xml
index 726dd9f6c7e..a2447f7ecdb 100644
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@@ -100,7 +100,7 @@
     <string name="poi_fire_water_pond">Blusvijver</string>
     <string name="poi_grit_bin">Gritkist</string>
     <string name="poi_ambulance_station">Ambulancepost</string>
-    <string name="poi_ses_station">Nooddiensten</string>
+    <string name="poi_disaster_response">Nooddiensten</string>
     <string name="poi_emergency_access_point">Nood-toegangspunt</string>
     <string name="poi_ford">Doorwaadbare plaats</string>
     <string name="poi_mountain_pass">Bergpas</string>
diff --git a/OsmAnd/res/values-oc/phrases.xml b/OsmAnd/res/values-oc/phrases.xml
index 9f45bf550cc..5c7a53cd2b7 100644
--- a/OsmAnd/res/values-oc/phrases.xml
+++ b/OsmAnd/res/values-oc/phrases.xml
@@ -255,7 +255,7 @@
     <string name="poi_fire_hose">Margue d’incendi</string>
     <string name="poi_grit_bin">Caissa de sabla</string>
     <string name="poi_ambulance_station">Estacion d’ambulàncias</string>
-    <string name="poi_ses_station">Estacion de proteccion civila</string>
+    <string name="poi_disaster_response">Estacion de proteccion civila</string>
     <string name="poi_emergency_access_point">Ponch d’accès d’urgéncia</string>
     <string name="poi_ford">Ga</string>
     <string name="poi_mountain_pass">Còl (pas, pòrt)</string>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index 965fc9dc6ae..937b6130171 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -98,7 +98,7 @@
     <string name="poi_fire_water_pond">Zbiornik przeciwpożarowy</string>
     <string name="poi_grit_bin">Piasek gaśniczy</string>
     <string name="poi_ambulance_station">Stacja karetek pogotowia</string>
-    <string name="poi_ses_station">Powiadamianie kryzysowe</string>
+    <string name="poi_disaster_response">Powiadamianie kryzysowe</string>
     <string name="poi_mountain_pass">Przejście górskie</string>
     <string name="poi_ford">Bród</string>
     <string name="poi_gate">Bramka</string>
diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index f6827f9fdb4..bae98263f41 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -149,7 +149,7 @@
     <string name="poi_fire_water_pond">Reservatório de água contra incêndios</string>
     <string name="poi_grit_bin">Caixa de sal-gema</string>
     <string name="poi_ambulance_station">Posto de ambulância</string>
-    <string name="poi_ses_station">Posto de defesa civil</string>
+    <string name="poi_disaster_response">Posto de defesa civil</string>
     <string name="poi_emergency_access_point">Ponto de resgate emergencial</string>
     <string name="poi_ford">Vau</string>
     <string name="poi_mountain_pass">Passo de montanha</string>
diff --git a/OsmAnd/res/values-pt/phrases.xml b/OsmAnd/res/values-pt/phrases.xml
index 2ececaf67f8..de721fc43cc 100644
--- a/OsmAnd/res/values-pt/phrases.xml
+++ b/OsmAnd/res/values-pt/phrases.xml
@@ -185,7 +185,7 @@
     <string name="poi_fire_water_pond">Reservatório de água contra incêndios</string>
     <string name="poi_grit_bin">Caixa de sal-gema</string>
     <string name="poi_ambulance_station">Posto de ambulância</string>
-    <string name="poi_ses_station">Serviço de emergência</string>
+    <string name="poi_disaster_response">Serviço de emergência</string>
     <string name="poi_emergency_access_point">Ponto de acesso de emergência</string>
     <string name="poi_ford">Vau</string>
     <string name="poi_ford_stepping_stones">Ponte pedonal em pedras separadas</string>
diff --git a/OsmAnd/res/values-ro/phrases.xml b/OsmAnd/res/values-ro/phrases.xml
index a6823cb5b7b..005f72e39b0 100644
--- a/OsmAnd/res/values-ro/phrases.xml
+++ b/OsmAnd/res/values-ro/phrases.xml
@@ -820,7 +820,7 @@
     <string name="poi_ford_stepping_stones">Pod de piatră în trepte</string>
     <string name="poi_ford">Vad</string>
     <string name="poi_emergency_access_point">Punct de acces pentru urgențe</string>
-    <string name="poi_ses_station">Stație SES</string>
+    <string name="poi_disaster_response">Stație SES</string>
     <string name="poi_ambulance_station">Stație de ambulanță</string>
     <string name="poi_grit_bin">Coș cu nisip</string>
     <string name="poi_fire_water_pond">Bazin apă antiincendiu</string>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 695f041cb09..acdb30b5b46 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -121,7 +121,7 @@
     <string name="poi_fire_water_pond">Пожарный водоём</string>
     <string name="poi_grit_bin">Ящик с песком</string>
     <string name="poi_ambulance_station">Станция скорой помощи;Скорая помощь</string>
-    <string name="poi_ses_station">Станция SES</string>
+    <string name="poi_disaster_response">Станция SES</string>
     <string name="poi_emergency_access_point">Табличка с кодом для службы спасения</string>
     <string name="poi_ford">Брод</string>
     <string name="poi_ford_stepping_stones">Рудиментарный мост из камней</string>
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index a71eac5355d..5664236a7fc 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -86,7 +86,7 @@
     <string name="poi_emergency_phone">Telèfonu de emergèntzia</string>
     <string name="poi_fire_hydrant">Idrante</string>
     <string name="poi_fire_extinguisher">Istudadore</string>
-    <string name="poi_ses_station">Istatzione \"protezione civile\"</string>
+    <string name="poi_disaster_response">Istatzione \"protezione civile\"</string>
     <string name="poi_emergency_access_point">Logu de intrada de emergèntzia</string>
     <string name="poi_ford">Badu</string>
     <string name="poi_mountain_pass">Coladòrgiu montanu</string>
diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index ec9209dd0ac..03e944e6ded 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -116,7 +116,7 @@
     <string name="poi_fire_hose">Požiarna hadica</string>
     <string name="poi_fire_water_pond">Požiarna nádrž</string>
     <string name="poi_grit_bin">Kontajner na posypový materiál</string>
-    <string name="poi_ses_station">Stanica civilnej ochrany</string>
+    <string name="poi_disaster_response">Stanica civilnej ochrany</string>
     <string name="poi_emergency_access_point">Bod príchodu záchrany</string>
     <string name="poi_ford">Brod</string>
     <string name="poi_mountain_pass">Horský priesmyk</string>
diff --git a/OsmAnd/res/values-sl/phrases.xml b/OsmAnd/res/values-sl/phrases.xml
index 5b53688bb9b..764b7a0fb9f 100644
--- a/OsmAnd/res/values-sl/phrases.xml
+++ b/OsmAnd/res/values-sl/phrases.xml
@@ -1030,7 +1030,7 @@
     <string name="poi_fire_flapper">Požarna loputa</string>
     <string name="poi_fire_hose">Brizgalna cev</string>
     <string name="poi_grit_bin">Posoda za pesek</string>
-    <string name="poi_ses_station">Državna služba za nujne primere</string>
+    <string name="poi_disaster_response">Državna služba za nujne primere</string>
     <string name="poi_emergency_access_point">Dostopna točka v sili</string>
     <string name="poi_ford">Plitvina</string>
     <string name="poi_ford_stepping_stones">Stopničasti most</string>
diff --git a/OsmAnd/res/values-sr/phrases.xml b/OsmAnd/res/values-sr/phrases.xml
index 8ac03f7d343..75f98ade5bd 100644
--- a/OsmAnd/res/values-sr/phrases.xml
+++ b/OsmAnd/res/values-sr/phrases.xml
@@ -205,7 +205,7 @@
     <string name="poi_fire_hydrant">Хидрант</string>
     <string name="poi_fire_hose">Ватрогасно црево</string>
     <string name="poi_ambulance_station">Амбуланта</string>
-    <string name="poi_ses_station">SES станица</string>
+    <string name="poi_disaster_response">SES станица</string>
     <string name="poi_emergency_access_point">Тачка за окупљање у случају нужде</string>
     <string name="poi_ford">Залив</string>
     <string name="poi_mountain_pass">Планински пролаз</string>
diff --git a/OsmAnd/res/values-sv/phrases.xml b/OsmAnd/res/values-sv/phrases.xml
index 5bea15d5efa..10e9a952b3c 100644
--- a/OsmAnd/res/values-sv/phrases.xml
+++ b/OsmAnd/res/values-sv/phrases.xml
@@ -1163,7 +1163,7 @@
     <string name="poi_swimming_pool_shop">Swimmingpooltillbehör</string>
     <string name="poi_shop_craft">Hobbybutik</string>
     <string name="poi_fire_flapper">Brandpiska</string>
-    <string name="poi_ses_station">SES-station</string>
+    <string name="poi_disaster_response">SES-station</string>
     <string name="poi_emergency_access_point">Nödpunkt</string>
     <string name="poi_ford_stepping_stones">Stenstegsbro</string>
     <string name="poi_aerialway_platter">Knapplift</string>
diff --git a/OsmAnd/res/values-tr/phrases.xml b/OsmAnd/res/values-tr/phrases.xml
index 78c0c3778e6..551acfc246a 100644
--- a/OsmAnd/res/values-tr/phrases.xml
+++ b/OsmAnd/res/values-tr/phrases.xml
@@ -168,7 +168,7 @@
     <string name="poi_fire_water_pond">Yangın su birikintisi</string>
     <string name="poi_grit_bin">Kum kutusu</string>
     <string name="poi_ambulance_station">Ambulans istasyonu</string>
-    <string name="poi_ses_station">SES istasyonu</string>
+    <string name="poi_disaster_response">SES istasyonu</string>
     <string name="poi_emergency_access_point">Acil erişim noktası</string>
     <string name="poi_ford">Geçit</string>
     <string name="poi_mountain_pass">Dağ geçidi</string>
diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
index 97a3c1aed15..4228bbafa3a 100644
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -98,7 +98,7 @@
     <string name="poi_fire_water_pond">Пожежний ставок</string>
     <string name="poi_grit_bin">Ящик з піском</string>
     <string name="poi_ambulance_station">Станція швидкої медичної допомоги</string>
-    <string name="poi_ses_station">Санепідемстанція</string>
+    <string name="poi_disaster_response">Санепідемстанція</string>
     <string name="poi_emergency_access_point">Місце отримання невідкладної допомоги</string>
     <string name="poi_ford">Брід</string>
     <string name="poi_mountain_pass">Перевал</string>
diff --git a/OsmAnd/res/values-zh-rCN/phrases.xml b/OsmAnd/res/values-zh-rCN/phrases.xml
index d8ca6f5503a..58876d9a4fc 100644
--- a/OsmAnd/res/values-zh-rCN/phrases.xml
+++ b/OsmAnd/res/values-zh-rCN/phrases.xml
@@ -931,7 +931,7 @@
     <string name="poi_dairy">乳品店</string>
     <string name="poi_ship_chandler">船舶供给商</string>
     <string name="poi_fire_flapper">灭火拍把</string>
-    <string name="poi_ses_station">（澳洲）国家紧急服务站</string>
+    <string name="poi_disaster_response">（澳洲）国家紧急服务站</string>
     <string name="poi_allotments">市民农园</string>
     <string name="poi_craft_beekeeper">养蜂人</string>
     <string name="poi_animal_shelter_wildlife">野生动物</string>
diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index bf5f337a5b4..553cafdb16c 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -143,7 +143,7 @@
     <string name="poi_beacon">指示標燈</string>
     <string name="poi_atv">四輪機車店</string>
     <string name="poi_ambulance_station">救護站</string>
-    <string name="poi_ses_station">緊急服務站</string>
+    <string name="poi_disaster_response">緊急服務站</string>
     <string name="poi_emergency_access_point">森林緊急利用點</string>
     <string name="poi_ford">低窪路段</string>
     <string name="poi_mountain_pass">隘口</string>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index c1a8b28b0ab..ed163dc1c13 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -376,7 +376,7 @@
 	<string name="poi_fire_water_pond">Fire water pond</string>
 	<string name="poi_grit_bin">Grit bin</string>
 	<string name="poi_ambulance_station">Ambulance station</string>
-	<string name="poi_ses_station">SES station</string>
+	<string name="poi_disaster_response">SES station</string>
 	<string name="poi_emergency_access_point">Emergency access point</string>
 
 	<string name="poi_ford">Ford</string>