Merge branch 'osmandapp:master' into hardy_Afa

OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxFile.kt

@@ -492,13 +492,16 @@ class GpxFile : GpxExtensions {
 		val tpoints = mutableListOf<TrkSegment>()
 		for (track in tracks) {
 			val trackColor = track.getColor(getColor(null))
+			val trackWidth = track.getWidth(null)
 			for (segment in track.segments) {
 				val segmentColor = segment.getColor(trackColor)
+				val segmentWidth = segment.getWidth(trackWidth)
 				if (!segment.generalSegment && segment.points.isNotEmpty()) {
 					val ts = TrkSegment()
 					tpoints.add(ts)
-					ts.points.addAll(segment.points)
 					ts.setColor(segmentColor)
+					ts.setWidth(segmentWidth)
+					ts.points.addAll(segment.points)
 				}
 			}
 		}
@@ -618,14 +621,6 @@ class GpxFile : GpxExtensions {
 		getExtensionsToWrite()["split_interval"] = splitInterval.toString()
 	}
 
-	fun getWidth(defWidth: String?): String? {
-		return extensions?.get("width") ?: defWidth
-	}
-
-	fun setWidth(width: String) {
-		getExtensionsToWrite()["width"] = width
-	}
-
 	fun isShowArrowsSet(): Boolean {
 		return extensions?.containsKey("show_arrows") ?: false
 	}

OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxUtilities.kt

@@ -50,6 +50,7 @@ object GpxUtilities {
 	const val ICON_NAME_EXTENSION = "icon"
 	const val BACKGROUND_TYPE_EXTENSION = "background"
 	const val COLOR_NAME_EXTENSION = "color"
+	const val LINE_WIDTH_EXTENSION = "width"
 	const val PROFILE_TYPE_EXTENSION = "profile"
 	const val ADDRESS_EXTENSION = "address"
 	const val HIDDEN_EXTENSION = "hidden"

OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/primitives/GpxExtensions.kt

@@ -87,4 +87,12 @@ open class GpxExtensions {
 	fun removeColor() {
 		getExtensionsToWrite().remove(GpxUtilities.COLOR_NAME_EXTENSION)
 	}
+
+	fun getWidth(defaultWidth: String?) = this.extensions?.get(GpxUtilities.LINE_WIDTH_EXTENSION) ?: defaultWidth
+
+	fun setWidth(width: String?) {
+		width?.let {
+			getExtensionsToWrite()[GpxUtilities.LINE_WIDTH_EXTENSION] = it
+		}
+	}
 }

OsmAnd-shared/src/commonTest/kotlin/net/osmand/shared/OBDTest.kt

@@ -11,7 +11,7 @@ import kotlin.test.assertTrue
 
 class OBDTest {
 
-	@Test
+//	@Test
 	fun testOBDComputer() = runBlocking {
 		val widget = OBDDataComputer.registerWidget(OBDDataComputer.OBDTypeWidget.FUEL_CONSUMPTION_RATE_PERCENT_HOUR, 15)
 		val coef = 0.05
@@ -21,7 +21,7 @@ class OBDTest {
 		var time: Long = currentTimeMillis()
 		for (i in 0 .. 600) {
 			val map = HashMap<OBDCommand, OBDDataField<Any>>()
-			map[OBDCommand.OBD_FUEL_LEVEL_COMMAND] = OBDDataField(fuelLevel.toString())
+			map[OBDCommand.OBD_FUEL_LEVEL_COMMAND] = OBDDataField(fuelLevel)
 			OBDDataComputer.acceptValue(map)
 			val now = currentTimeMillis()
 			fuelLevel = fuelLevelStart - coef / (1000 / delay) * i

OsmAnd-telegram/res/values-da/strings.xml

@@ -246,7 +246,7 @@
     <string name="shared_string_end">Slut</string>
     <string name="shared_string_start">Start</string>
     <string name="shared_string_apply">Anvend</string>
-    <string name="set_time_timeline_descr">Vælg tid at vise</string>
+    <string name="set_time_timeline_descr">Vælg vist tid</string>
     <string name="start_end_date">Start — slutdato</string>
     <string name="saved_messages">Gemte beskeder</string>
     <string name="time_zone_descr">Vælg tidszone, der skal vises i placeringsbeskeder.</string>
@@ -259,7 +259,7 @@
     <string name="buffer_time">Buffer udløbstid</string>
     <string name="unit_of_length_descr">Ændr enhed for afstand.</string>
     <string name="shared_string_suggested">Foreslået</string>
-    <string name="status_widget_title">OsmAnd Tracker-status</string>
+    <string name="status_widget_title">OsmAnd Tracker status</string>
     <string name="back_to_osmand">Tilbage til OsmAnd</string>
     <string name="last_update_from_telegram_date">Sidste opdatering fra Telegram: %1$s</string>
     <string name="last_response_date">Sidste svar: %1$s</string>

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

@@ -3807,7 +3807,7 @@
     <string name="contact_support">Obrati se podršci</string>
     <string name="troubleshooting">Rešavanje problema</string>
     <string name="troubleshooting_description">Prati ovaj link ako imaš ikakvih problema sa kupovinom.</string>
-    <string name="osmand_live">OsmAnd Live</string>
+    <string name="osmand_live">OsmAnd Lajv</string>
     <string name="annual_subscription">Godišnja pretplata</string>
     <string name="monthly_subscription">Mesečna pretplata</string>
     <string name="three_months_subscription">Tromesečna članarina</string>
@@ -4840,7 +4840,7 @@
     <string name="shared_string_close_the_dialog">Zatvori prozor</string>
     <string name="delete_track_folder_dialog_message">Ovo će izbrisati folder \"%1$s\" i sve %2$s sadržane trase.</string>
     <string name="delete_folder_question">Da li brišeš folder?</string>
-    <string name="cloud_sync_progress">Sinhronizacija…%1$s</string>
+    <string name="cloud_sync_progress">Sinhronizacija… %1$s</string>
     <string name="check_for_updates">Proveri osveženja</string>
     <string name="download_cloud_version">Preuzmi izdanje iz Cloud-a</string>
     <string name="shared_string_do_not_exist">Ne postoji</string>

OsmAnd/res/values-bg/strings.xml

@@ -3219,7 +3219,7 @@
     <string name="select_waypoints_category_description">Добавете всички отправни точки от трасето или изберете отделни категории.</string>
     <string name="waypoints_removed_from_map_markers">Премахнати са отправни точки от</string>
     <string name="add_group_descr">Внасяне на групи от избрани или отправни точки на GPX.</string>
-    <string name="cloud_sync_progress">Синхронизиране…%1$s</string>
+    <string name="cloud_sync_progress">Синхронизиране… %1$s</string>
     <string name="external_device_connected">Свързано</string>
     <string name="external_device_disconnected">Несвързано</string>
     <string name="make_round_trip_descr">Добавя копие на изходната точка в качеството на местоназначение.</string>

OsmAnd/res/values-cs/strings.xml

@@ -4268,7 +4268,7 @@
     <string name="upload_change">Nahrát změnu</string>
     <string name="cloud_version_will_be_removed">Cloudová verze bude odstraněna</string>
     <string name="choose_what_to_sync">Vyberte, co synchronizovat</string>
-    <string name="cloud_sync_progress">Synchronizace...%1$s</string>
+    <string name="cloud_sync_progress">Synchronizace... %1$s</string>
     <string name="checking_progress">Kontroluje se…</string>
     <string name="shared_string_modified">Upraveno</string>
     <string name="res_unknown">Neznámý</string>

OsmAnd/res/values-da/phrases.xml

@@ -4113,4 +4113,11 @@
     <string name="poi_roundtrip_yes">Rundtur: ja</string>
     <string name="poi_recycling_glass_bottles_colour">Farvede glasflasker</string>
     <string name="poi_roundtrip_no">Rundtur: nej</string>
+    <string name="poi_vending_machine_fuel_filter">Automatisk brændstofdispenser; Brændstofsautomat</string>
+    <string name="poi_cemt">CEMT</string>
+    <string name="poi_climbing_grade_filter">Klatringssværhedsgrad</string>
+    <string name="poi_climbing_bolt">Klatrebolt</string>
+    <string name="poi_climbing_bolts_filter">Klatrebolte</string>
+    <string name="poi_climbing_quality">Klatre kvalitet</string>
+    <string name="poi_second_hand_filter">Brugte varer</string>
 </resources>

OsmAnd/res/values-da/strings.xml

@@ -4709,7 +4709,7 @@
     <string name="cloud_all_changes_uploaded_descr">Alle ændringer foretaget på denne enhed er synkroniseret med OsmAnd Cloud.</string>
     <string name="cloud_no_conflicts">Der er ingen konflikter.</string>
     <string name="download_cloud_version">Download cloud-version</string>
-    <string name="cloud_sync_progress">Synkroniserer...%1$s</string>
+    <string name="cloud_sync_progress">Synkroniserer… %1$s</string>
     <string name="backup_error_failed_to_fetch_remote_items">Fillisten kunne ikke hentes fra serveren.</string>
     <string name="import_export">Import/eksport</string>
     <string name="modified_file">Ændret fil</string>

OsmAnd/res/values-fr/strings.xml

@@ -4655,7 +4655,7 @@
     <string name="release_4_3">• Moteur de rendu plus rapide (OpenGL version 2) avec vue 2.5D \n \n• Animations lisses des textes et des points d\'intérêts lors du déplacement de la carte \n \n• Nouveaux widgets indiquant les coordonnées du centre de la carte ainsi que l\'altitude \n \n• Ajout d\'options sur la taille du texte pour le mode \"Distance par appui\" \n \n• Ajout d\'une option permettant de modifier le comportement du clic en mode \"Marques\" \n \n• Correction de l\'option \"Emplacement de la position\" \n \n• Ajout du support des tags \"link\", \"cmt\", \"desc\" et de toutes les extensions personnalisées pour les traces GPX \n \n• Réorganisation de la liste des cartes marines \n \n• Ajout de la prise en charge des capteurs ANT+ \n \n• Ajout d\'une option permettant de désactiver l\'UUID de téléchargement \n \n• Prévision ajustable du temps de trajet pour les itinéraires dépendants de l\'altitude \n \n• Correction de la sortie sonore et du comportement de la barre de volume</string>
     <string name="shared_string_purchased_on">Acheté le</string>
     <string name="shared_string_expires">Expire</string>
-    <string name="cloud_sync_progress">Synchronisation…%1$s</string>
+    <string name="cloud_sync_progress">Synchro…%1$s</string>
     <string name="checking_progress">Vérification…</string>
     <string name="choose_what_to_sync">Sélectionner quoi synchroniser</string>
     <string name="res_unknown">Inconnu</string>

OsmAnd/res/values-ga/strings.xml

@@ -5462,4 +5462,6 @@
     <string name="calculate_size">Ríomh méid</string>
     <string name="rendering_attr_showClimbingRoutes_name">Bealaí dreapadóireachta</string>
     <string name="rendering_attr_showClimbingRoutes_description">Taispeáin bealaí dreapadóireachta</string>
+    <string name="display_distance_to_first_intermediate_summary">Taispeánann sé am agus fad don chéad stad eile ar dtús. Múch chun sonraí an chinn scríbe a thaispeáint i gcónaí.</string>
+    <string name="display_distance_to_first_intermediate">Taispeáin sonraí bealaigh don chéad stad eile</string>
 </resources>

OsmAnd/res/values-hu/strings.xml

@@ -4653,7 +4653,7 @@
     <string name="sync_now">Szinkronizálás most</string>
     <string name="local_changes_will_be_dismissed">A helyi változások el lesznek vetve</string>
     <string name="cloud_all_changes_uploaded_descr">Az eszközön végrehajtott összes módosítás szinkronizálva van az OsmAnd felhőszolgáltatással.</string>
-    <string name="cloud_sync_progress">Szinkronizálás...%1$s</string>
+    <string name="cloud_sync_progress">Szinkronizálás... %1$s</string>
     <string name="si_nm_ft">Tengeri mérföld/láb</string>
     <string name="av_audio_format_bottom_sheet_descr">Válasszon hangkimeneti formátumot. A hang fájltípus-tároló formátuma 3GPP (.3gp).</string>
     <string name="si_nm_mt">Tengeri mérföld/méter</string>

OsmAnd/res/values-in/strings.xml

@@ -4981,7 +4981,7 @@
     <string name="export_to_file">Ekspor ke berkas</string>
     <string name="shared_string_modified">Diubah</string>
     <string name="choose_what_to_sync">Pilih apa yang disinkron</string>
-    <string name="cloud_sync_progress">Menyinkronkan…%1$s</string>
+    <string name="cloud_sync_progress">Menyinkronkan… %1$s</string>
     <string name="changes">Perubahan %1$s</string>
     <string name="local_changes_will_be_dismissed">Perubahan lokal akan diabaikan</string>
     <string name="import_export">Impor/ekspor</string>
@@ -6060,4 +6060,6 @@
     <string name="rendering_attr_showClimbingRoutes_description">Tampilkan rute pendakian</string>
     <string name="calculating_indication_message">Menghitung…</string>
     <string name="calculate_size">Hitung ukuran</string>
+    <string name="display_distance_to_first_intermediate_summary">Menampilkan waktu dan jarak untuk perhentian pertama terlebih dahulu. Matikan untuk selalu menampilkan detail tujuan.</string>
+    <string name="display_distance_to_first_intermediate">Tampilkan detail rute until perhentian berikutnya</string>
 </resources>

OsmAnd/res/values-sr/strings.xml

@@ -4624,7 +4624,7 @@
     <string name="si_nm_ft">Наутичке миље/стопе</string>
     <string name="av_audio_format_bottom_sheet_descr">Означите облик звучног записа. Врста звучне датотеке је 3ГПП (.3gp).</string>
     <string name="choose_what_to_sync">Одредите шта ће се усклађивати</string>
-    <string name="cloud_sync_progress">Усклади…%1$s</string>
+    <string name="cloud_sync_progress">Усклади… %1$s</string>
     <string name="check_for_updates">Провери освежења</string>
     <string name="shared_string_cloud">Облак</string>
     <string name="new_file">Нова датотека</string>

OsmAnd/res/values-uk/strings.xml

@@ -5678,5 +5678,6 @@
     <string name="calculate_size">Розрахувати розмір</string>
     <string name="rendering_attr_showClimbingRoutes_description">Показати маршрути сходження</string>
     <string name="rendering_attr_showClimbingRoutes_name">Скелелазні маршрути</string>
-    <string name="display_distance_to_first_intermediate">Показати деталі маршруту для наступної зупинки</string>
+    <string name="display_distance_to_first_intermediate">Показати деталі маршруту до наступної зупинки</string>
+    <string name="display_distance_to_first_intermediate_summary">Спочатку показує час і відстань до наступної зупинки. Вимкніть, щоб завжди показувати деталі до кінцевої точки.</string>
 </resources>