Merge branch 'master' of ssh://github.com/osmandapp/Osmand into ProfileSettingsImprovements

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -243,4 +243,10 @@
     <string name="min_logging_speed_descr">Filtra: nessuna registrazione al di sotto della velocità selezionata</string>
     <string name="gpx_settings">Impostazioni GPX</string>
     <string name="shared_string_apply">Applica</string>
+    <string name="timeline_no_data_descr">Non abbiamo raccolto dati per il giorno selezionato</string>
+    <string name="timeline_no_data">Nessun dato</string>
+    <string name="shared_string_end">Fine</string>
+    <string name="shared_string_start">Avvia</string>
+    <string name="set_time_timeline_descr">Seleziona l\'ora da visualizzare</string>
+    <string name="start_end_date">Inizio - Data di fine</string>
 </resources>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -188,4 +188,13 @@
     <string name="type_contact_or_group_name">Vnesite ime stika ali skupine</string>
     <string name="bearing">Smer</string>
     <string name="timeline_no_data_descr">Za izbrani dan nimamo zbranih podatkov</string>
+    <string name="background_work">Delovanje v ozadju</string>
+    <string name="sharing_in_background">Izmenjava podatkov v ozadju</string>
+    <string name="last_update_from_telegram">Zadnja posodobitev s programa Telegram</string>
+    <string name="monitoring_is_enabled">Sledenje je omogočeno</string>
+    <string name="monitoring_is_disabled">Sledenje je onemogočeno</string>
+    <string name="points_size">%1$d točk</string>
+    <string name="disable_monitoring">Onemogoči spremljanje</string>
+    <string name="min_logging_accuracy_descr">Filter: brez beleženja, če določena natančnost ni dosežena</string>
+    <string name="min_logging_speed_descr">Filter: brez beleženja pod določeno hitrostjo</string>
 </resources>

OsmAnd/.gitignore

@@ -13,6 +13,11 @@ libs/it.unibo.alice.tuprolog-tuprolog-3.2.1.jar
 libs/commons-codec-commons-codec-1.11.jar
 libs/OsmAndCore_android-0.1-SNAPSHOT.jar
 
+libs/huawei-*.jar
+huaweidrmlib/
+HwDRM_SDK_*
+drm_strings.xml
+
 valgrind/
 bin/
 dist/

OsmAnd/AndroidManifest-huawei.xml

@@ -1,25 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.huawei.android.sdk.drm"
+	xmlns:tools="http://schemas.android.com/tools">
-    android:versionCode="2"
-    android:versionName="2.0.0" >
 
-    <uses-sdk
+	<application>
-        android:minSdkVersion="14"
+		<activity android:name="com.huawei.android.sdk.drm.DrmDialogActivity"
-        android:targetSdkVersion="21" />
+			android:configChanges="screenSize|orientation|keyboardHidden"
+			android:exported="false"
+			android:theme="@android:style/Theme.Translucent">
+			<meta-data
+				android:name="hwc-theme"
+				android:value="androidhwext:style/Theme.Emui.Translucent" />
+		</activity>
 
-    <application
+		<provider
-        android:allowBackup="true"
+			android:name="android.support.v4.content.FileProvider"
-        android:icon="@drawable/ic_launcher"
+			android:authorities="net.osmand.plus.huawei.fileprovider"
-        android:theme="@style/AppTheme" >
+			tools:replace="android:authorities" />
-        <activity
+		<service
-            android:name="com.huawei.android.sdk.drm.DrmDialogActivity"
+			android:name="net.osmand.plus.NavigationService"
-            android:configChanges="screenSize|orientation|keyboardHidden"
+			android:process="net.osmand.plus.huawei"
-            android:exported="false"
+			tools:replace="android:process" />
-            android:theme="@android:style/Theme.Translucent" >
+	</application>
-            <meta-data
-                android:name="hwc-theme"
-                android:value="androidhwext:style/Theme.Emui.Translucent" />
-        </activity>
-    </application>
 
 </manifest>

OsmAnd/AndroidManifest.xml

@@ -846,6 +846,7 @@
 		</activity>
 
 		<activity android:name="net.osmand.plus.development.TestVoiceActivity" />
+		<activity android:name="net.osmand.plus.development.LogcatActivity" />
 		<activity android:name="net.osmand.plus.download.DownloadActivity" android:label="" />
 
 		<!-- keep android:process on a separate line !! -->

OsmAnd/build.gradle

@@ -17,9 +17,6 @@ apply plugin: 'com.android.application'
 //        </unzip>
 // Less important
 
-
-def huawei = (System.getenv("APP_FEATURES") && System.getenv("APP_FEATURES").contains("+huawei"))
-
 task printc {
 	configurations.each { if(it.isCanBeResolved())  println it.name }
 }
@@ -114,6 +111,9 @@ android {
 		freecustom {
 			manifest.srcFile "AndroidManifest-freecustom.xml"
 		}
+		huawei {
+			manifest.srcFile "AndroidManifest-huawei.xml"
+		}
 
 		legacy {
 			jniLibs.srcDirs = ["libc++"]
@@ -177,6 +177,10 @@ android {
             resConfig "en"
             //resConfigs "xxhdpi", "nodpi"
         }
+		huawei {
+			dimension "version"
+			applicationId "net.osmand.plus.huawei"
+		}
 
 		// CoreVersion
 		legacy {
@@ -253,15 +257,46 @@ task downloadWorldMiniBasemap {
 	}
 }
 
-task downloadHuaweiDrm {
+task downloadHuaweiDrmZip {
 	doLast {
-		if (huawei) {
+		ant.get(src: 'https://obs.cn-north-2.myhwclouds.com/hms-ds-wf/sdk/HwDRM_SDK_2.5.2.300_ADT.zip', dest: 'HwDRM_SDK_2.5.2.300_ADT.zip', skipexisting: 'true')
-			ant.get(src: 'https://obs.cn-north-2.myhwclouds.com/hms-ds-wf/sdk/HwDRM_SDK_2.5.2.300_ADT.zip', dest: 'HwDRM_SDK_2.5.2.300_ADT.zip', skipexisting: 'true')
+		ant.unzip(src: 'HwDRM_SDK_2.5.2.300_ADT.zip', dest: 'huaweidrmlib/')
-			ant.unzip(src: 'HwDRM_SDK_2.5.2.300_ADT.zip', dest: 'libs/')
-		}
 	}
 }
 
+task copyHuaweiDrmLibs(type: Copy) {
+	dependsOn downloadHuaweiDrmZip
+	from "huaweidrmlib/HwDRM_SDK_2.5.2.300_ADT/libs"
+	into "libs"
+}
+
+task copyHuaweiDrmValues(type: Copy) {
+	dependsOn downloadHuaweiDrmZip
+	from "huaweidrmlib/HwDRM_SDK_2.5.2.300_ADT/res"
+	into "res"
+}
+
+task downloadPrebuiltHuaweiDrm {
+	dependsOn copyHuaweiDrmLibs, copyHuaweiDrmValues
+}
+
+task cleanHuaweiDrmLibs(type: Delete) {
+	delete "huaweidrmlib"
+	delete fileTree("libs").matching {
+		include "**/huawei-*.jar"
+	}
+}
+
+task cleanHuaweiDrmValues(type: Delete) {
+	delete fileTree("res").matching {
+		include "**/drm_strings.xml"
+	}
+}
+
+task cleanPrebuiltHuaweiDrm {
+	dependsOn cleanHuaweiDrmLibs, cleanHuaweiDrmValues
+}
+
 task collectVoiceAssets(type: Sync) {
 	from "../../resources/voice"
 	into "assets/voice"
@@ -327,8 +362,16 @@ task collectExternalResources {
 			updateNoTranslate,
 			validateTranslate,
 			copyWidgetIcons,
-			downloadWorldMiniBasemap,
+			downloadWorldMiniBasemap
-			downloadHuaweiDrm
+
+	Gradle gradle = getGradle()
+	String tskReqStr = gradle.getStartParameter().getTaskRequests().toString().toLowerCase()
+	// Use Drm SDK only for huawei build
+	if (tskReqStr.contains("huawei")) {
+		dependsOn downloadPrebuiltHuaweiDrm
+	} else {
+		dependsOn cleanPrebuiltHuaweiDrm
+	}
 }
 
 // Legacy core build
@@ -375,9 +418,9 @@ task cleanupDuplicatesInCore() {
 	}
 }
 afterEvaluate {
-  android.applicationVariants.all { variant ->
+	android.applicationVariants.all { variant ->
-    variant.javaCompiler.dependsOn(collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore)
+		variant.javaCompiler.dependsOn(collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore)
-  }
+	}
 }
 
 task appStart(type: Exec) {
@@ -435,7 +478,5 @@ dependencies {
 		exclude group: 'com.android.support'
 	}
 
-    if (huawei) {
+	huaweiImplementation files('libs/huawei-android-drm_v2.5.2.300.jar')
-        implementation files('libs/huawei-android-drm_v2.5.2.300.jar')
-    }
 }

OsmAnd/res/layout/recyclerview.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recycler_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/bg_color"

OsmAnd/res/values-b+kab/strings.xml

@@ -254,7 +254,7 @@
     <string name="add_favorite_dialog_default_favourite_name">Menyif</string>
     <string name="favourites_context_menu_add">Rnu d amenyaf</string>
     <string name="favourites">Imenyafen</string>
-    <string name="empty_state_favourites">Rnu γer imenyafen</string>
+    <string name="empty_state_favourites">Rnu ɣer imenyafen</string>
     <string name="wrong_input">Yir anekcam</string>
     <string name="shared_string_options">Iγewwaṛen</string>
     <string name="mapillary_menu_title_username">Isem n useqdac</string>
@@ -657,4 +657,15 @@
     <string name="parked_at">Sers deg</string>
     <string name="without_time_limit">Ulac tilist deg wakud</string>
     <string name="group_deleted">Agraw ittwakes</string>
+    <string name="shared_string_example">Amedya</string>
+    <string name="change_default_settings">Beddl iɣewwaṛen imezwar</string>
+    <string name="discard_changes">Suref i usnifel</string>
+    <string name="apply_to_current_profile">"Snes i umaɣnu amiran  %1$s"</string>
+    <string name="apply_to_all_profiles">Snes i imavnuyen meṛṛa</string>
+    <string name="start_up_message_pref">Izen n usenker</string>
+    <string name="appearance">Arwes</string>
+    <string name="configure_profile">Sbadu amaɣnu</string>
+    <string name="switch_profile">Beddel amaɣnu</string>
+    <string name="application_profile_changed">Amaɣnu n usnas ittwabddel ɣer \"%s\"</string>
+    <string name="rendering_value_black_name">Aberkan</string>
 </resources>

OsmAnd/res/values-ca/strings.xml

@@ -3257,4 +3257,9 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="get_discount_second_part">després %1$s</string>
     <string name="cancel_subscription">Cancel·la la subscripció</string>
     <string name="price_and_discount">%1$s • Estalvieu %2$s</string>
+    <string name="shared_string_example">Exemple</string>
+    <string name="navigate_point_format_utm">UTM Estàndard</string>
+    <string name="navigate_point_format_olc">Codi obert d\'ubicació</string>
+    <string name="configure_profile">Configura el perfil</string>
+    <string name="switch_profile">Canvia de perfil</string>
 </resources>

OsmAnd/res/values-da/phrases.xml

@@ -3609,7 +3609,7 @@
     <string name="poi_changing_table_fee_yes">Puslebordsgebyr: ja</string>
     <string name="poi_changing_table_fee_no">Puslebordsgebyr: nej</string>
     <string name="poi_charcoal_pile">Trækulsbunke</string>
-    <string name="poi_historic_tank">Historisk kampvogn</string>
+    <string name="poi_historic_tank">Historisk tank</string>
     <string name="poi_hookah_lounge">Vandpibe bar</string>
     <string name="poi_source_biomass">Energikilde: biomasse</string>
     <string name="poi_snowmobile_filter">Snescooter adgang</string>

OsmAnd/res/values-da/strings.xml

@@ -3290,4 +3290,7 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="screen_alerts">Alarmer på skærmen</string>
     <string name="route_parameters_descr">Konfiguration af ruteparametre</string>
     <string name="route_parameters">Ruteparametre</string>
+    <string name="configure_profile_info">Alle indstillinger nedenfor påvirker kun den valgte profil.</string>
+    <string name="analytics_pref_title">Analyser</string>
+    <string name="application_profile_changed">Programprofil ændret til \"%s\"</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -3282,4 +3282,15 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="vehicle_parameters_descr">Gewicht, Höhe, Geschwindigkeit</string>
     <string name="vehicle_parameters">Fahrzeuggrößen</string>
     <string name="route_parameters">Routenparameter</string>
+    <string name="navigate_point_format_olc">Standortkodierung öffnen</string>
+    <string name="start_up_message_pref">Begrüßungsnachricht</string>
+    <string name="screen_alerts_descr">Warnungen werden während der Navigation in der linken, unteren Bildschirmecke angezeigt.</string>
+    <string name="map_during_navigation">Karte während Navigation</string>
+    <string name="shared_string_other">Weitere</string>
+    <string name="voice_announces_info">Sprachansagen werden nur während der Navigation abgespielt.</string>
+    <string name="voice_announces_descr">Navigationsanweisungen und -ansagen</string>
+    <string name="voice_announces">Sprachansagen</string>
+    <string name="screen_alerts">Bildschirmwarnungen</string>
+    <string name="route_parameters_descr">Routenparameter konfigurieren</string>
+    <string name="application_profile_changed">Anwendungsprofilwechsel auf „%s“</string>
 </resources>

OsmAnd/res/values-el/phrases.xml

@@ -3550,4 +3550,10 @@
     <string name="poi_access_hgv">Πρόσβαση σε όχημα μεταφοράς βαρέων φορτίων</string>
     <string name="poi_access_goods">Πρόσβαση σε οχήματα ελαφρών αγαθών</string>
     <string name="poi_access_disabled">Πρόσβαση σε ΑΜΕΑ</string>
+    <string name="poi_toll_gantry">Καμπίνα διοδίων</string>
+    <string name="poi_childcare">Φροντίδα παιδιών</string>
+    <string name="poi_denotation_natural_monument">Φυσικό μνημείο</string>
+    <string name="poi_denotation_landmark">Διακριτό σημείο</string>
+    <string name="poi_park_ride_yes">Ναι</string>
+    <string name="poi_park_ride_train">Τρένο</string>
 </resources>

OsmAnd/res/values-el/strings.xml

@@ -3237,4 +3237,49 @@
     <string name="routing_attr_difficulty_preference_description">Προτιμήστε διαδρομές αυτής της δυσκολίας, αν και η διαδρομή σε πιο δύσκολες ή εύκολες πίστες είναι ακόμα εφικτές, εάν είναι πιο σύντομες.</string>
     <string name="routing_attr_freeride_policy_name">Εκτός πίστας</string>
     <string name="routing_attr_freeride_policy_description">Ελεύθερες καθώς και εκτός πίστας διαδρομές είναι ανεπίσημες και περάσματα. Συνήθως ακαθάριστες, ασυντήρητες από τους υπεύθυνους και μη ελεγμένες το πρωί. Μπαίνετε με δικό σας κίνδυνο.</string>
+    <string name="configure_profile_info">Όλες οι παρακάτω ρυθμίσεις επηρεάζουν μόνο το επιλεγμένο προφίλ.</string>
+    <string name="utm_format_descr">Το OsmAnd χρησιμοποιεί το πρότυπο UTM, το οποίο είναι παρόμοιο αλλά όχι ίδιο με το UTM NATO πρότυπο.</string>
+    <string name="shared_string_example">Παράδειγμα</string>
+    <string name="navigate_point_format_utm">Πρότυπο UTM</string>
+    <string name="navigate_point_format_olc">Άνοιγμα κωδικού θέσης</string>
+    <string name="coordinates_format_info">Το επιλεγμένο πρότυπο θα εφαρμοστεί σε όλες τις τοποθεσίες στην εφαρμογή.</string>
+    <string name="pref_selected_by_default_for_profiles">Η ρύθμιση αυτή επιλέγεται από προεπιλογή για προφίλ: %s</string>
+    <string name="change_default_settings">Αλλαγή προεπιλεγμένων ρυθμίσεων</string>
+    <string name="discard_changes">Απόρριψη αλλαγών</string>
+    <string name="apply_to_current_profile">Εφαρμογή στο τρέχον %1$s προφίλ</string>
+    <string name="apply_to_all_profiles">Εφαρμογή σε όλα τα προφίλ</string>
+    <string name="start_up_message_pref">Εκκίνηση μηνύματος</string>
+    <string name="analytics_pref_title">Αναλυτικά στοιχεία</string>
+    <string name="turn_screen_on_info">Εμφάνιση χάρτη κατά την πλοήγηση πάνω από την οθόνη κλειδώματος.</string>
+    <string name="route_parameters_info">Αυτές οι ρυθμίσεις επηρεάζουν την δημιουργία της διαδρομής. Θα εφαρμοστεί μόνο στο επιλεγμένο προφίλ: %1$s.</string>
+    <string name="wake_time">Ώρα αφύπνισης</string>
+    <string name="units_and_formats">Μονάδες μέτρησης και φορμά</string>
+    <string name="appearance">Εμφάνιση</string>
+    <string name="map_look_descr">εικονίδια, widgets</string>
+    <string name="map_look">Εμφάνιση χάρτη</string>
+    <string name="list_of_installed_plugins">Λίστα εγκατεστημένων πρόσθετων</string>
+    <string name="configure_navigation">Ρυθμίσεις πλοήγησης</string>
+    <string name="general_settings_profile_descr">Θέμα εφαρμογής, μονάδες, περιοχή</string>
+    <string name="configure_profile">Ρυθμίστε το προφίλ</string>
+    <string name="screen_alerts_descr">Οι προειδοποιήσεις θα εμφανίζονται στην αριστερή κάτω γωνία της οθόνης κατά τη διάρκεια της πλοήγησης.</string>
+    <string name="switch_profile">Εναλλαγή προφίλ</string>
+    <string name="language_and_output">Γλώσσα και έξοδος</string>
+    <string name="reset_to_default">Επαναφορά προεπιλογών</string>
+    <string name="manage_profiles_descr">Δημιουργία, εισαγωγή, επεξεργασία προφίλ</string>
+    <string name="manage_profiles">Διαχείριση προφίλ εφαρμογής…</string>
+    <string name="osmand_settings_descr">Επηρεάζει όλη την εφαρμογή</string>
+    <string name="osmand_settings">Ρυθμίσεις OsmAnd</string>
+    <string name="copy_from_other_profile">Αντιγραφή από άλλο προφίλ</string>
+    <string name="turn_screen_on">Ενεργοποίηση οθόνης</string>
+    <string name="map_during_navigation_info">Χάρτης κατά τη διάρκεια της πλοήγησης</string>
+    <string name="map_during_navigation">Χάρτης κατά τη διάρκεια της πλοήγησης</string>
+    <string name="shared_string_other">Άλλα</string>
+    <string name="vehicle_parameters_descr">Βάρος, ύψος, ταχύτητα</string>
+    <string name="vehicle_parameters">Παράμετροι οχήματος</string>
+    <string name="voice_announces_info">Οι φωνητικές κλήσεις αναπαράγονται μόνο κατά τη διάρκεια της πλοήγησης.</string>
+    <string name="voice_announces_descr">Οδηγίες πλοήγησης και ανακοινώσεις</string>
+    <string name="voice_announces">Η φωνή ανακοινώνει</string>
+    <string name="screen_alerts">Προειδοποιήσεις οθόνης</string>
+    <string name="route_parameters_descr">Ρύθμιση παραμέτρων διαδρομής</string>
+    <string name="route_parameters">Παράμετροι διαδρομής</string>
 </resources>

OsmAnd/res/values-eo/strings.xml

@@ -3030,7 +3030,7 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="press_again_to_change_the_map_orientation">Frapetu ree por ŝanĝi map‑orientiĝon</string>
     <string name="rate_dialog_descr">Bonvolu dediĉi 30 sekundojn por kunhavigi vian opinion kaj taksi nian laboron ĉe Google Play.</string>
     <string name="button_rate">Taksi</string>
-    <string name="shared_string_privacy_policy">Privateca politiko</string>
+    <string name="shared_string_privacy_policy">privatecan politikon</string>
     <string name="help_us_make_osmand_better">Helpu al ni igi OsmAnd pli bona!</string>
     <string name="make_osmand_better_descr">Bonvolu permesi al OsmAnd kolekti kaj pritrakti anonimajn datumojn pri uzado de la aplikaĵo. Ni ne kolektos kaj konservos datumojn pri via pozicio aŭ pri foliumataj lokoj sur la mapo.
 \n 
@@ -3247,4 +3247,26 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="configure_navigation">Alĝustigi navigadon</string>
     <string name="general_settings_profile_descr">Etoso, unuoj, regiono</string>
     <string name="configure_profile">Agordi profilon</string>
+    <string name="screen_alerts_descr">Avertoj montriĝos ĉe maldekstra suba angulo de la ekrano dum navigado.</string>
+    <string name="switch_profile">Ŝanĝi profilon</string>
+    <string name="language_and_output">Lingvo kaj eligo</string>
+    <string name="reset_to_default">Restarigi implicitajn</string>
+    <string name="manage_profiles_descr">Krei, enporti kaj redakti profilojn</string>
+    <string name="manage_profiles">Administri profilojn de aplikaĵo…</string>
+    <string name="osmand_settings_descr">Influas al la tuta aplikaĵo</string>
+    <string name="osmand_settings">Ĝeneralaj agordoj</string>
+    <string name="copy_from_other_profile">Kopii el alia profilo</string>
+    <string name="turn_screen_on">Teni ekranon ŝaltita</string>
+    <string name="map_during_navigation_info">Mapo dum navigi</string>
+    <string name="map_during_navigation">Mapo dum navigi</string>
+    <string name="shared_string_other">Aliaj</string>
+    <string name="vehicle_parameters_descr">Pezo, alto, rapido</string>
+    <string name="vehicle_parameters">Parametroj de veturilo</string>
+    <string name="voice_announces_info">Voĉaj anoncoj estas ludataj nur dum navigi.</string>
+    <string name="voice_announces_descr">Navigaj gvidiloj kaj anoncoj</string>
+    <string name="voice_announces">Voĉaj anoncoj</string>
+    <string name="screen_alerts">Ekranaj avertoj</string>
+    <string name="route_parameters_descr">Agordi parametroj de navigo</string>
+    <string name="route_parameters">Parametroj de navigo</string>
+    <string name="application_profile_changed">Profilo de aplikaĵo ŝanĝita al “%s”</string>
 </resources>

OsmAnd/res/values-es/strings.xml

@@ -3261,4 +3261,50 @@
     <string name="get_discount_second_part">a continuación, %1$s</string>
     <string name="cancel_subscription">Cancelar la suscripción</string>
     <string name="price_and_discount">%1$s • Ahorra %2$s</string>
+    <string name="configure_profile_info">Todas las opciones que figuran a continuación afectan únicamente al perfil seleccionado.</string>
+    <string name="utm_format_descr">OsmAnd utiliza el formato UTM Estándar que es similar pero no idéntico al formato UTM Nato.</string>
+    <string name="shared_string_example">Ejemplo</string>
+    <string name="navigate_point_format_utm">UTM Estándar</string>
+    <string name="navigate_point_format_olc">Código de ubicación abierto</string>
+    <string name="coordinates_format_info">"El formato seleccionado será aplicado a todos los  sitios en la aplicación."</string>
+    <string name="pref_selected_by_default_for_profiles">Esta opción está seleccionada por defecto para los perfiles: %s</string>
+    <string name="change_default_settings">Cambiar la configuración predeterminada</string>
+    <string name="discard_changes">Descartar cambios</string>
+    <string name="apply_to_current_profile">Aplicar al perfil %1$s actual</string>
+    <string name="apply_to_all_profiles">Aplicar a todos los perfiles</string>
+    <string name="start_up_message_pref">Mensaje de inicio</string>
+    <string name="analytics_pref_title">Analítica</string>
+    <string name="turn_screen_on_info">Mostrar mapa durante la navegación por encima de la pantalla de bloqueo.</string>
+    <string name="route_parameters_info">Estos ajustes afectan a la construcción de la ruta. Se aplicará solo al perfil seleccionado: %1$s.</string>
+    <string name="wake_time">Hora de despertar</string>
+    <string name="units_and_formats">Unidades y formatos</string>
+    <string name="appearance">Apariencia</string>
+    <string name="map_look_descr">iconos, controles</string>
+    <string name="map_look">Vista del mapa</string>
+    <string name="list_of_installed_plugins">Lista de complementos instalados</string>
+    <string name="configure_navigation">Configurar la navegación</string>
+    <string name="general_settings_profile_descr">Tema de la aplicación, unidades, región</string>
+    <string name="configure_profile">Configurar perfil</string>
+    <string name="screen_alerts_descr">Las alertas se mostrarán en la esquina inferior izquierda de la pantalla durante la navegación.</string>
+    <string name="switch_profile">Cambiar de perfil</string>
+    <string name="language_and_output">Idioma y salida</string>
+    <string name="reset_to_default">Restaurar valores predefinidos</string>
+    <string name="manage_profiles_descr">Crear, importar, editar perfiles</string>
+    <string name="manage_profiles">Gestionar perfiles de aplicación…</string>
+    <string name="osmand_settings_descr">Afecta a toda la aplicación</string>
+    <string name="osmand_settings">Ajustes de OsmAnd</string>
+    <string name="copy_from_other_profile">Copiar de otro perfil</string>
+    <string name="turn_screen_on">Encender pantalla</string>
+    <string name="map_during_navigation_info">Mapa durante la navegación</string>
+    <string name="map_during_navigation">Mapa durante la navegación</string>
+    <string name="shared_string_other">Otro</string>
+    <string name="vehicle_parameters_descr">Peso, altura, velocidad</string>
+    <string name="vehicle_parameters">Parámetros del vehículo</string>
+    <string name="voice_announces_info">Los anuncios de voz sólo se reproducen durante la navegación.</string>
+    <string name="voice_announces_descr">Instrucciones de navegación y anuncios</string>
+    <string name="voice_announces">Anuncios de voz</string>
+    <string name="screen_alerts">Alertas en pantalla</string>
+    <string name="route_parameters_descr">Configura los parámetros de ruta</string>
+    <string name="route_parameters">Parámetros de ruta</string>
+    <string name="application_profile_changed">Perfil de aplicación cambiado a \"%s\"</string>
 </resources>

OsmAnd/res/values-fa/strings.xml

@@ -310,7 +310,7 @@
     <string name="shared_string_next">بعدی</string>
     <string name="shared_string_previous">قبلی</string>
     <string name="unit_of_length_descr">واحدهای طولی را تغییر دهید.</string>
-    <string name="unit_of_length">واحدهای طولی</string>
+    <string name="unit_of_length">یکاهای طول</string>
     <string name="local_index_descr_title">مدیریت فایل‌های نقشه</string>
     <string name="local_index_mi_restore">فعال‌کردن</string>
     <string name="local_index_mi_backup">غیرفعال‌کردن</string>
@@ -617,7 +617,7 @@
     <string name="bg_service_sleep_mode_on">پایان‌دادن 
 \n به اجرا در پس‌زمینه</string>
     <string name="gps_wakeup_interval">بازهٔ بیدارباش GPS:‏ %s</string>
-    <string name="screen_is_locked">برای بازکردن قفل صفحه روی آیکون قفل بزنید</string>
+    <string name="screen_is_locked">برای بازکردن قفل صفحه روی نماد قفل بزنید</string>
     <string name="map_widget_lock_screen">قفل صفحه</string>
     <string name="bg_service_screen_lock">قفل صفحه</string>
     <string name="bg_service_screen_unlock">بازکردن صفحه</string>
@@ -1946,7 +1946,7 @@
     <string name="road_blocked">جاده مسدود است</string>
     <string name="shared_string_select">انتخاب</string>
     <string name="switch_start_finish">تعویض مبدأ و مقصد</string>
-    <string name="rendering_attr_hideIcons_name">آیکون POIها</string>
+    <string name="rendering_attr_hideIcons_name">نماد POIها</string>
     <string name="item_removed">حذف شد</string>
     <string name="n_items_removed">حذف شدند</string>
     <string name="starting_point">مبدأ</string>
@@ -2004,8 +2004,8 @@
     <string name="world_maps">نقشه‌های جهانی</string>
     <string name="favorite_category_add_new">افزودن</string>
     <string name="favorite_category_select">انتخاب دسته</string>
-    <string name="default_speed_system_descr">واحد سرعت را تعریف کنید.</string>
+    <string name="default_speed_system_descr">یکای سرعت را تعریف کنید.</string>
-    <string name="default_speed_system">واحد سرعت</string>
+    <string name="default_speed_system">یکای سرعت</string>
     <string name="si_nm">مایل دریایی</string>
     <string name="si_kmh">کیلومتر بر ساعت</string>
     <string name="si_mph">مایل بر ساعت</string>
@@ -3044,7 +3044,7 @@
     <string name="routing_attr_avoid_sett_description">از کفپوش‌های cobblestone (کفپوش سنگی) و sett (سنگفرش کوبیک) پرهیز شود</string>
     <string name="shared_string_degrees">درجه</string>
     <string name="shared_string_milliradians">میلی‌رادیان</string>
-    <string name="angular_measeurement">واحد‌ زاویه</string>
+    <string name="angular_measeurement">یکای زاویه</string>
     <string name="angular_measeurement_descr">واحد اندازه‌گیری سمت (azimuth) را مشخص کنید.</string>
     <string name="routing_attr_avoid_tram_name">پرهیز از تراموا</string>
     <string name="routing_attr_avoid_tram_description">از تراموا پرهیز شود</string>
@@ -3120,7 +3120,7 @@
     <string name="profile_alert_delete_title">حذف پروفایل</string>
     <string name="profile_alert_delete_msg">آیا از حذف پروفایل %s اطمینان دارید</string>
     <string name="select_base_profile_dialog_title">یک پروفایل پایه انتخاب کنید</string>
-    <string name="select_base_profile_dialog_message">پروفایل سفارشی خود را بر پایهٔ یکی از پروفایل‌های برنامه بسازید. با این کار برخی چیزهای ابتدایی مانند نمایانی ابزارک‌ها و واحد سرعت و مسافت تنظیم می‌شود. 
+    <string name="select_base_profile_dialog_message">پروفایل سفارشی خود را بر پایهٔ یکی از پروفایل‌های برنامه بسازید. با این کار برخی چیزهای ابتدایی مانند نمایانی ابزارک‌ها و یکای سرعت و مسافت تنظیم می‌شود. 
 \nپروفایل‌های پیشفرض برنامه و چند نمونه پروفایل سفارشی که بر پایهٔ آن‌ها ساخته شده، در زیر آمده:</string>
     <string name="select_nav_profile_dialog_title">انتخاب نوع ناوبری</string>
     <string name="base_profile_descr_car">خودرو، کامیون، موتورسیکلت</string>
@@ -3196,7 +3196,7 @@
     <string name="routing_attr_allow_skating_only_name">فقط مسیرهای اسکیت مجاز باشد</string>
     <string name="routing_attr_allow_classic_only_name">فقط مسیرهای کلاسیک مجاز باشد</string>
     <string name="routing_attr_freeride_policy_name">آزاد (بیرون پیست)</string>
-    <string name="routing_attr_freeride_policy_description">مسیرهای آزادرانی و بیرون پیست مسیرهای غیررسمی هستند. معمولاً به‌طور رسمی آماده‌سازی و نگهداری نمی‌شوند و پس از تعطیلی وارسی نمی‌شوند. با مسئولیت خودتان وارد شوید.</string>
+    <string name="routing_attr_freeride_policy_description">مسیرهای آزادرانی و مسیرهای بیرون پیست غیررسمی هستند. معمولاً به‌طور رسمی آماده‌سازی و نگهداری نمی‌شوند و پس از تعطیلی وارسی نمی‌شوند. با مسئولیت خودتان وارد شوید.</string>
     <string name="press_again_to_change_the_map_orientation">دوباره بزنید تا جهت نقشه را عوض کنید</string>
     <string name="precision_hdop_and_vdop">"دقت افقی:  %1$s، عمودی:  %2$s"</string>
     <string name="precision_hdop">دقت افقی: %s</string>
@@ -3231,8 +3231,8 @@
     <string name="rendering_attr_showLez_description">محدوده‌های کم‌آلاینده (LEZ) را روی نقشه نشان بده. بر مسیریابی تأثیر ندارد.</string>
     <string name="rendering_attr_showLez_name">نمایش محدوده‌های کم‌آلاینده</string>
     <string name="temporary_conditional_routing">در نظر گرفتن محدودیت‌های موقت در مسیریابی</string>
-    <string name="routing_attr_piste_type_downhill_name">اسکی آلپاین</string>
+    <string name="routing_attr_piste_type_downhill_name">اسکی آلپاین/دان‌هیل</string>
-    <string name="routing_attr_piste_type_downhill_description">سراشیبی‌های اسکی آلپاین و دسترسی به بالابرهای اسکی.</string>
+    <string name="routing_attr_piste_type_downhill_description">سراشیبی‌های اسکی آلپاین یا دان‌هیل و دسترسی به بالابرهای اسکی.</string>
     <string name="routing_attr_piste_type_nordic_name">اسکی کراس/نوردیک</string>
     <string name="routing_attr_piste_type_nordic_description">مسیرهای اسکی کراس یا نوردیک.</string>
     <string name="shared_string_crash">از کار افتادن</string>
@@ -3283,7 +3283,7 @@
     <string name="switch_profile">تعویض پروفایل</string>
     <string name="language_and_output">زبان و خروجی</string>
     <string name="reset_to_default">بازنشانی به پیشفرض</string>
-    <string name="manage_profiles_descr">ساخت، واردات و ویرایش پروفایل‌ها</string>
+    <string name="manage_profiles_descr">ساخت، درون‌برد و ویرایش پروفایل‌ها</string>
     <string name="manage_profiles">مدیریت پروفایل‌های برنامه…</string>
     <string name="osmand_settings_descr">روی کل برنامه اثرگذار است</string>
     <string name="osmand_settings">تنظیمات OsmAnd</string>
@@ -3293,4 +3293,20 @@
     <string name="vehicle_parameters">پارامترهای وسیله نقلیه</string>
     <string name="route_parameters_descr">پیکربندی پارامترهای مسیر</string>
     <string name="route_parameters">پارامترهای مسیر</string>
+    <string name="routing_attr_piste_type_sled_name">سورتمه</string>
+    <string name="routing_attr_piste_type_sled_description">سراشیبی برای سورتمه‌سواری.</string>
+    <string name="routing_attr_allow_skating_only_description">مسیرهای آماده‌شده برای سبک آزاد یا فقط اسکیت. بدون مسیرهای کلاسیک.</string>
+    <string name="routing_attr_allow_classic_only_description">"مسیرهایی که فقط برای سبک کلاسیک آماده شده  و مسیر اسکیت ندارند. مسیرهای سُست‌تر آماده‌شده با برف‌روهای کوچک‌تر و مسیرهای دست‌ساز اسکی‌بازان را نیز شامل می‌شود."</string>
+    <string name="external_input_device_descr">یک دستگاه مانند صفحه‌کلید معمولی یا WunderLINQ را برای کنترل خارجی انتخاب کنید.</string>
+    <string name="utm_format_descr">‏OsmAnd از قالب UTM Standard استفاده می‌کند که مشابه (اما نه یکسان) با قالب UTM Nato است.</string>
+    <string name="apply_to_current_profile">به‌کارگیری برای پروفایل %1$s کنونی</string>
+    <string name="apply_to_all_profiles">به‌کارگیری برای همهٔ پروفایل‌ها</string>
+    <string name="map_look_descr">نمادها، ابزارک‌ها</string>
+    <string name="general_settings_profile_descr">پوستهٔ برنامه، یکاها، منطقه</string>
+    <string name="configure_profile">پیکربندی پروفایل</string>
+    <string name="voice_announces_info">پیام‌های گفتاری فقط در هنگام ناوبری پخش می‌شود.</string>
+    <string name="voice_announces_descr">راهنما و پیام‌های ناوبری</string>
+    <string name="voice_announces">پیام‌های گفتاری</string>
+    <string name="screen_alerts">هشدارهای نمایشگر</string>
+    <string name="application_profile_changed">پروفایل برنامه به «%s» تغییر کرد</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -1814,7 +1814,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="impassable_road_desc">Sélectionnez les routes à éviter</string>
     <string name="shared_string_sound">Son</string>
     <string name="select_voice_provider">Sélectionnez la voix de guidage</string>
-    <string name="select_voice_provider_descr">Sélectionnez ou téléchargez la voix de guidage dans votre langue</string>
+    <string name="select_voice_provider_descr">Sélectionnez ou téléchargez la voix de guidage de votre langue</string>
     <string name="live_updates">Mises à jour en temps réel</string>
     <string name="available_maps">Cartes disponibles</string>
     <string name="last_update">Dernière mise à jour : %s</string>
@@ -3205,8 +3205,8 @@ représentant la zone : %1$s x %2$s</string>
     <string name="get_free_trial_title">Démarrer votre %1$d %2$s essai gratuit.</string>
     <string name="get_discount_second_part">puis %1$s</string>
     <string name="cancel_subscription">Annuler l\'abonnement</string>
-    <string name="get_discount_first_part">%1$s pour %2$s</string>
+    <string name="get_discount_first_part">%1$s pour le premier %2$s</string>
-    <string name="get_discount_first_few_part">%1$s pour %2$s</string>
+    <string name="get_discount_first_few_part">%1$s pour le premier %2$s</string>
     <string name="price_and_discount">%1$s • Économisez %2$s</string>
     <string name="shared_string_example">Exemple</string>
     <string name="navigate_point_format_utm">UTM Standard</string>
@@ -3239,4 +3239,19 @@ représentant la zone : %1$s x %2$s</string>
     <string name="voice_announces_info">Les annonces vocales ne sont faites que pendant la navigation.</string>
     <string name="voice_announces_descr">Instructions de navigation et annonces</string>
     <string name="voice_announces">Annonces vocales</string>
+    <string name="configure_profile_info">Tous les paramètres ci-dessous ne s\'appliquent qu\'au profil sélectionné.</string>
+    <string name="utm_format_descr">OsmAnd utilise le format Standard UTM qui est comparable mais pas identique au format UTM de l\'OTAN.</string>
+    <string name="navigate_point_format_olc">Ouvrir le code de lieu</string>
+    <string name="analytics_pref_title">Analyses</string>
+    <string name="turn_screen_on_info">Afficher la carte sur l\'écran de verrouillage pendant la navigation.</string>
+    <string name="route_parameters_info">Ces paramètres influencent le calcul de l\'itinéraire et s\'appliqueront au profil : %1$s.</string>
+    <string name="wake_time">Heure de réveil</string>
+    <string name="map_look_descr">icônes, gadgets</string>
+    <string name="map_look">Apparence de la carte</string>
+    <string name="general_settings_profile_descr">Thème de l\'application, unités, région</string>
+    <string name="reset_to_default">Restaurer les valeurs par défaut</string>
+    <string name="screen_alerts">Alertes visuelles</string>
+    <string name="route_parameters_descr">Définir les paramètres de l\'itinéraire</string>
+    <string name="route_parameters">Paramètres de l\'itinéraire</string>
+    <string name="application_profile_changed">Profil de l\'application basculé à \"%s\"</string>
 </resources>

OsmAnd/res/values-he/strings.xml

@@ -3254,4 +3254,5 @@
     <string name="screen_alerts">התראות מסך</string>
     <string name="route_parameters_descr">הגדרת מאפייני מסלול</string>
     <string name="route_parameters">מאפייני מסלול</string>
+    <string name="application_profile_changed">פרופיל היישומון השתנה לכדי „%s”</string>
 </resources>

OsmAnd/res/values-it/strings.xml

@@ -946,7 +946,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="files_limit">hai ancora %1$d file</string>
     <string name="available_downloads_left">Ancora %1$d file da scaricare</string>
     <string name="install_paid">Versione completa</string>
-    <string name="use_magnetic_sensor_descr">Per utilizzare il valore della bussola invece del sensore di orientamento, utilizza il utilizza il sensore magnetico.</string>
+    <string name="use_magnetic_sensor_descr">Per utilizzare il valore della bussola invece del sensore di orientamento, utilizza il sensore magnetico.</string>
     <string name="use_magnetic_sensor">Utilizza il sensore magnetico (bussola)</string>
     <string name="local_indexes_cat_srtm">Linee isoipse</string>
     <string name="use_kalman_filter_compass_descr">Riduce il rumore delle letture della bussola ma introduce dell\'inerzia.</string>
@@ -1411,7 +1411,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="shared_string_ellipsis">…</string>
     <string name="shared_string_ok">OK</string>
     <string name="shared_string_cancel">Annulla</string>
-    <string name="shared_string_dismiss">Elimina</string>
+    <string name="shared_string_dismiss">Annulla</string>
     <string name="shared_string_yes">Sì</string>
     <string name="shared_string_no">No</string>
     <string name="shared_string_on">Acceso</string>
@@ -2707,7 +2707,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="delete_search_history">Cancella la cronologia di ricerca</string>
     <string name="shared_string_restart">Riavvia l\'app</string>
     <string name="download_images">Scarica immagini</string>
-    <string name="download_maps_travel">Guide di turistiche</string>
+    <string name="download_maps_travel">Guide di viaggio</string>
     <string name="shared_string_wikivoyage">Wikivoyage</string>
     <string name="article_removed">Articolo rimosso</string>
     <string name="wikivoyage_search_hint">Cerca: nazione, città, provincia</string>
@@ -2750,7 +2750,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="download_all">Scarica tutto</string>
     <string name="shared_string_bookmark">Segnalibro</string>
     <string name="off_road_render_descr">Adatto all’uso durante la guida fuoristrada. Adatto all’uso con immagini satellitari come sfondo. Caratteristiche principali: Larghezza delle strade principali ridotta, larghezza di sentieri, carrarecce, piste ciclabili ed altri percorsi aumentata. Basato sullo stile ‘Topo’.</string>
-    <string name="touring_view_render_descr">Stile molto dettagliato per le necessità turistiche. Include tutte le opzioni di configurazioni dello stile predefinito e in più: mostra più dettagli possibili, in particolare, tutte le strade, i sentieri, e altri itinerari per chi viaggia. Distinzione chiara dei vari tipi di strada, come avviene negli atlanti per turisti. Schema dei colori ad alto contrasto per l’uso all’esterno, modalità diurna e notturna.</string>
+    <string name="touring_view_render_descr">Stile molto dettagliato per le necessità turistiche. Include tutte le opzioni di configurazioni dello stile predefinito e in più: mostra più dettagli possibili, in particolare, tutte le strade, i sentieri, e altri itinerari per chi viaggia. Distinzione chiara dei vari tipi di strada, come avviene negli atlanti per turisti. Schema dei colori ad alto contrasto per l\'uso all\'esterno, modalità diurna e notturna.</string>
     <string name="osmand_plus_extended_description_part3">Visualizzazione della mappa 
 \n • Mostra la tua posizione e l’orientamento 
 \n • Scegli se orientare la mappa in base alla bussola oppure nella direzione del tuo movimento 
@@ -3175,7 +3175,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="routing_attr_allow_expert_description">Percorsi estremamente difficili, con ostacoli e contesto pericolosi.</string>
     <string name="routing_attr_allow_skating_only_name">Permetti percorsi dedicati al pattinaggio</string>
     <string name="routing_attr_difficulty_preference_description">Preferisci percorsi di questa difficoltà, benché percorsi di maggiore o minore difficoltà sono ancora possibili se più brevi.</string>
-    <string name="turn_screen_on_router">Accendi alla svolta</string>
+    <string name="turn_screen_on_router">Accendi lo schermo in prossimità della svolta</string>
     <string name="turn_screen_on_time_descr">Imposta il tempo di accensione dello schermo.</string>
     <string name="turn_screen_on_sensor">Usa il sensore di prossimità</string>
     <string name="turn_screen_on_sensor_descr">Passa la mano davanti il display per accendere lo schermo durante la navigazione.</string>
@@ -3203,16 +3203,16 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="shared_string_file_is_saved">%s è salvato</string>
     <string name="shared_string_open_track">Apri traccia</string>
     <string name="shared_string_track_is_saved">Traccia %s salvata</string>
-    <string name="turn_on_profile_desc">Prego attiva almeno un profilo dell\'applicazione per utilizzare questa impostazione.</string>
+    <string name="turn_on_profile_desc">Per favore attiva almeno un profilo dell\'applicazione per utilizzare questa impostazione.</string>
     <string name="gpx_join_gaps">Unisci le lacune</string>
     <string name="app_mode_campervan">Camper</string>
-    <string name="rendering_attr_showLez_description">Mostra sulla mappa le zone a Basse Emissioni. Non influisce sul calcolo del percorso.</string>
+    <string name="rendering_attr_showLez_description">Mostra le zone a Basse Emissioni sulla mappa. Non influisce sul calcolo del percorso.</string>
     <string name="rendering_attr_showLez_name">Mostra le zone a Basse Emissioni</string>
     <string name="temporary_conditional_routing">Tieni conto delle limitazioni temporanee</string>
     <string name="app_mode_camper">Camper</string>
     <string name="shared_string_default">Predefinita</string>
-    <string name="app_mode_wagon">Carrozza</string>
+    <string name="app_mode_wagon">Familiare</string>
-    <string name="app_mode_pickup_truck">Fuoristrada pickup</string>
+    <string name="app_mode_pickup_truck">Pickup</string>
     <string name="weeks_5">Settimane</string>
     <string name="month">Mese</string>
     <string name="months_2_4">Mesi</string>
@@ -3238,4 +3238,50 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="days_5">Giorni</string>
     <string name="week">Settimana</string>
     <string name="weeks_2_4">Settimane</string>
+    <string name="configure_profile_info">Tutte le impostazioni seguenti riguardano solo il profilo selezionato.</string>
+    <string name="utm_format_descr">OsmAnd utilizza il formato UTM Standard che è simile ma non identico al formato UTM Nato.</string>
+    <string name="shared_string_example">Esempio</string>
+    <string name="navigate_point_format_utm">UTM Standard</string>
+    <string name="navigate_point_format_olc">Open Location Code</string>
+    <string name="coordinates_format_info">Il formato selezionato sarà applicato nell\'applicazione a tutti i luoghi.</string>
+    <string name="pref_selected_by_default_for_profiles">Questa impostazione è selezionata di default per i profili: %s</string>
+    <string name="change_default_settings">Cambia le impostazioni preimpostate</string>
+    <string name="discard_changes">Annulla i cambiamenti</string>
+    <string name="apply_to_current_profile">Applica al profilo %1$s corrente</string>
+    <string name="apply_to_all_profiles">Applica a tutti i profili</string>
+    <string name="start_up_message_pref">Messaggio di avvio</string>
+    <string name="analytics_pref_title">Statistiche</string>
+    <string name="turn_screen_on_info">Mostra la mappa durante la navigazione sopra al salvaschermo</string>
+    <string name="route_parameters_info">Queste impostazioni riguardano il calcolo del percorso. Verranno applicate solo al profilo: %1$s.</string>
+    <string name="wake_time">Ora di risveglio</string>
+    <string name="units_and_formats">Unità e formati</string>
+    <string name="appearance">Aspetto</string>
+    <string name="map_look_descr">Icone, widget</string>
+    <string name="map_look">Aspetto della mappa</string>
+    <string name="list_of_installed_plugins">Lista dei componenti aggiuntivi intallati</string>
+    <string name="configure_navigation">Configura la navigazione</string>
+    <string name="general_settings_profile_descr">Tema dell\'app, unità di misura, regione</string>
+    <string name="configure_profile">Configura il profilo</string>
+    <string name="switch_profile">Cambia profilo</string>
+    <string name="manage_profiles">Gestisci i profili dell\'applicazione…</string>
+    <string name="osmand_settings">Impostazioni OsmAnd</string>
+    <string name="application_profile_changed">Profilo dell\'applicazione cambiato in \"%s\"</string>
+    <string name="screen_alerts_descr">Le notifiche verranno mostrate nell\'angolo in basso a sinistra dello schermo durante la navigazione.</string>
+    <string name="language_and_output">Lingua e output</string>
+    <string name="reset_to_default">Reimposta i valori predefiniti</string>
+    <string name="manage_profiles_descr">Crea, importa, modifica profili</string>
+    <string name="osmand_settings_descr">Ha effetto sull\'intera applicazione</string>
+    <string name="copy_from_other_profile">Copia da un altro profilo</string>
+    <string name="turn_screen_on">Accendi lo schermo</string>
+    <string name="map_during_navigation_info">Mappa durante la navigazione</string>
+    <string name="map_during_navigation">Mappa durante la navigazione</string>
+    <string name="shared_string_other">Altro</string>
+    <string name="vehicle_parameters_descr">Peso, altezza, velocità</string>
+    <string name="vehicle_parameters">Parametri del veicolo</string>
+    <string name="voice_announces_info">Gli annunci vocali vengono riprodotti solo durante la navigazione.</string>
+    <string name="voice_announces_descr">Istruzioni di navigazione e annunci</string>
+    <string name="voice_announces">Annunci vocali</string>
+    <string name="screen_alerts">Avvisi sullo schermo</string>
+    <string name="route_parameters_descr">Configura i parametri del percorso</string>
+    <string name="route_parameters">Parametri del percorso</string>
 </resources>

OsmAnd/res/values-ko/strings.xml

@@ -1721,4 +1721,5 @@
     <string name="no_map_markers_found"/>
     <string name="no_waypoints_found"/>
     <string name="turn_on_profile_desc">이 설정을 사용하려면 응용 프로그램 프로파일을 하나 이상 켜 주십시오.</string>
+    <string name="switch_profile">프로필 전환</string>
 </resources>

OsmAnd/res/values-lt/strings.xml

@@ -2665,4 +2665,43 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="intermediate_waypoint">Tarpinis taškas</string>
     <string name="on_foot">Pėsčiomis</string>
     <string name="route_way">Kelias</string>
+    <string name="app_mode_camper">Kemperis</string>
+    <string name="rendering_attr_showLez_description">Rodyti mažos taršos zonas. Tai neturi įtakos maršrutizavimui.</string>
+    <string name="rendering_attr_showLez_name">Rodyti mažos taršos zonas</string>
+    <string name="temporary_conditional_routing">Įvertinti laikinus apribojimus</string>
+    <string name="shared_string_default">Numatytasis</string>
+    <string name="app_mode_wagon">Vagonas</string>
+    <string name="app_mode_pickup_truck">Pikapas</string>
+    <string name="day">Diena</string>
+    <string name="days_2_4">Dienos</string>
+    <string name="days_5">Dienų</string>
+    <string name="week">Savaitė</string>
+    <string name="weeks_2_4">Savaitės</string>
+    <string name="weeks_5">Savaitės</string>
+    <string name="month">Mėnuo</string>
+    <string name="months_2_4">Mėnesiai</string>
+    <string name="months_5">Mėnesių</string>
+    <string name="year">Metai</string>
+    <string name="years_2_4">Metai</string>
+    <string name="years_5">Metai</string>
+    <string name="months_3">Trys mėnesiai</string>
+    <string name="price_free">Nemokama</string>
+    <string name="get_discount_title">Gaukite %1$d %2$s su %3$s nuolaida.</string>
+    <string name="cancel_subscription">Nutraukti prenumeratą</string>
+    <string name="shared_string_example">Pavyzdys</string>
+    <string name="navigate_point_format_utm">"UTM  Standartas"</string>
+    <string name="change_default_settings">Pakeisti numatytuosius nustatymus</string>
+    <string name="language_and_output">Kalba ir išvestis</string>
+    <string name="reset_to_default">Atstatyti numatytąsias reikšmes</string>
+    <string name="manage_profiles_descr">Kurti, importuoti, redaguoti profilius</string>
+    <string name="osmand_settings">„OsmAnd“ nustatymai</string>
+    <string name="copy_from_other_profile">Kopijuoti iš kito profilio</string>
+    <string name="turn_screen_on">Įjungti ekraną</string>
+    <string name="shared_string_other">Kita</string>
+    <string name="vehicle_parameters_descr">Svoris, aukštis, greitis</string>
+    <string name="vehicle_parameters">Transporto priemonės parametrai</string>
+    <string name="voice_announces_descr">Navigacijos instrukcijos ir pranešimai</string>
+    <string name="voice_announces">Balso pranešimai</string>
+    <string name="screen_alerts">Ekrano įspėjimai</string>
+    <string name="route_parameters">Maršruto parametrai</string>
 </resources>

OsmAnd/res/values-nb/strings.xml

@@ -3197,4 +3197,12 @@
     <string name="years_5">År</string>
     <string name="months_3">Tre måneder</string>
     <string name="price_free">Gratis</string>
+    <string name="shared_string_example">Eksempel</string>
+    <string name="navigate_point_format_utm">UTM-standard</string>
+    <string name="change_default_settings">Endre forvalgte innstillinger</string>
+    <string name="discard_changes">Forkast endringer</string>
+    <string name="start_up_message_pref">Oppstartsmelding</string>
+    <string name="configure_profile">Sett opp profil</string>
+    <string name="switch_profile">Bytt profil</string>
+    <string name="application_profile_changed">Programprofil endret til \"%s\"</string>
 </resources>

OsmAnd/res/values-pl/strings.xml

@@ -3243,4 +3243,13 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="years_2_4">Lat</string>
     <string name="years_5">Lata</string>
     <string name="price_free">Darmowy</string>
+    <string name="configure_profile_info">Wszystkie poniższe ustawienia dotyczą tylko wybranego profilu.</string>
+    <string name="utm_format_descr">OsmAnd używa formatu UTM Standard, który jest podobny, ale nie taki sam, jak format UTM Nato.</string>
+    <string name="shared_string_example">Przykład</string>
+    <string name="navigate_point_format_utm">UTM Standard</string>
+    <string name="coordinates_format_info">Wybrany format będzie używany do wszystkich miejsc w aplikacji.</string>
+    <string name="start_up_message_pref">Komunikat początkowy</string>
+    <string name="configure_profile">Skonfiguruj profil</string>
+    <string name="switch_profile">Przełącz profil</string>
+    <string name="application_profile_changed">Zmieniono profil aplikacji na „%s”</string>
 </resources>

OsmAnd/res/values-pt-rBR/strings.xml

@@ -3233,4 +3233,44 @@ Pôr do Sol: %2$s</string>
     <string name="vehicle_parameters_descr">Peso, altura, velocidade</string>
     <string name="vehicle_parameters">Parâmetros do veículo</string>
     <string name="screen_alerts">Alertas de tela</string>
+    <string name="configure_profile_info">Todas as configurações abaixo são afetadas apenas no perfil selecionado.</string>
+    <string name="utm_format_descr">OsmAnd usa o formato padrão UTM, que é semelhante, mas não idêntico, ao formato UTM Nato.</string>
+    <string name="navigate_point_format_utm">Padrão UTM</string>
+    <string name="navigate_point_format_olc">Abrir código de localização</string>
+    <string name="coordinates_format_info">O formato selecionado será aplicado a todos os locais no aplicativo.</string>
+    <string name="pref_selected_by_default_for_profiles">Essa configuração é selecionada por padrão para perfis: %s</string>
+    <string name="apply_to_current_profile">Aplicar ao perfil atual de %1$s</string>
+    <string name="apply_to_all_profiles">Aplicar a todos os perfis</string>
+    <string name="start_up_message_pref">Mensagem de inicialização</string>
+    <string name="analytics_pref_title">Análises</string>
+    <string name="turn_screen_on_info">Mostrar mapa durante a navegação acima da tela de bloqueio.</string>
+    <string name="route_parameters_info">Essas configurações afetam a construção da rota. Será aplicado apenas ao perfil selecionado: %1$s.</string>
+    <string name="wake_time">Tempo de despertar</string>
+    <string name="units_and_formats">Unidades e formatos</string>
+    <string name="appearance">Aparência</string>
+    <string name="map_look_descr">Ícones, widgets</string>
+    <string name="map_look">Aparência do mapa</string>
+    <string name="list_of_installed_plugins">Lista de plugins instalados</string>
+    <string name="configure_navigation">Configurar navegação</string>
+    <string name="general_settings_profile_descr">Tema do app, unidades, região</string>
+    <string name="configure_profile">Configurar perfil</string>
+    <string name="screen_alerts_descr">Os alertas serão mostrados no canto inferior esquerdo da tela durante a navegação.</string>
+    <string name="switch_profile">Mudar perfil</string>
+    <string name="language_and_output">Idioma e saída</string>
+    <string name="reset_to_default">Restaurar para o padrão</string>
+    <string name="manage_profiles_descr">Criar, importar, editar perfis</string>
+    <string name="manage_profiles">Gerenciar perfis de aplicativos…</string>
+    <string name="osmand_settings_descr">Afeta o aplicativo inteiro</string>
+    <string name="osmand_settings">Configurações do OsmAnd</string>
+    <string name="copy_from_other_profile">Copiar de outro perfil</string>
+    <string name="turn_screen_on">Ativar tela</string>
+    <string name="map_during_navigation_info">Mapa durante a navegação</string>
+    <string name="map_during_navigation">Mapa durante a navegação</string>
+    <string name="shared_string_other">Outros</string>
+    <string name="voice_announces_info">Os anúncios por voz são reproduzidos apenas durante a navegação.</string>
+    <string name="voice_announces_descr">Instrução de navegação e anuncia</string>
+    <string name="voice_announces">Anúncios de voz</string>
+    <string name="route_parameters_descr">Configurar parâmetros de rota</string>
+    <string name="route_parameters">Parâmetros de rota</string>
+    <string name="application_profile_changed">Perfil do aplicativo alterado para \"%s\"</string>
 </resources>

OsmAnd/res/values-pt/strings.xml

@@ -829,8 +829,8 @@
     <string name="intermediate_point">Destino intermediário %1$s</string>
     <string name="context_menu_item_last_intermediate_point">Adicionar como último destino intermediário</string>
     <string name="context_menu_item_first_intermediate_point">Adicionar como último destino intermediário</string>
-    <string name="add_as_last_destination_point">Adicionar como último ponto de passagem</string>
+    <string name="add_as_last_destination_point">Adicionar como último destino intermediário</string>
-    <string name="add_as_first_destination_point">Adicionar como primeiro ponto de passagem</string>
+    <string name="add_as_first_destination_point">Adicionar como primeiro destino intermediário</string>
     <string name="replace_destination_point">Substituir o ponto de destino</string>
     <string name="new_destination_point_dialog">Já existe um ponto de destino definido:</string>
     <string name="shared_string_target_points">Destinos</string>
@@ -1280,7 +1280,7 @@
     <string name="proxy_pref_title">Proxy</string>
     <string name="settings_privacy">Privacidade</string>
     <string name="shared_string_gpx_points">Pontos</string>
-    <string name="shared_string_my_location">Minha localização</string>
+    <string name="shared_string_my_location">A minha posição</string>
     <string name="avoid_roads_msg">Inciar rotas alternativas selecionando estradas a serem evitadas</string>
     <string name="speak_pedestrian">Passadeiras</string>
     <string name="rendering_attr_roadStyle_name">Estilo das vias</string>
@@ -2433,7 +2433,7 @@
     <string name="city_type_neighbourhood">Vizinhança</string>
     <string name="map_widget_search">Procurar</string>
     <string name="shared_string_is_open_24_7">Aberto todos dias por 24 horas</string>
-    <string name="coords_format">Formato de coordenada</string>
+    <string name="coords_format">Formato de coordenadas</string>
     <string name="coords_format_descr">Formato para as coordenadas geográficas.</string>
     <string name="app_mode_bus">Autocarro</string>
     <string name="app_mode_train">Comboio</string>
@@ -3237,4 +3237,50 @@
     <string name="get_discount_first_part">%1$s para o primeiro %2$s</string>
     <string name="get_discount_first_few_part">%1$s para o primeiro %2$s</string>
     <string name="gpx_join_gaps">Mesclar espaços</string>
+    <string name="configure_profile_info">Todas as configurações abaixo são afetadas apenas pelo perfil selecionado.</string>
+    <string name="utm_format_descr">OsmAnd usa o formato UTM Standard que é similar, mas não idêntico ao formato UTM Nato.</string>
+    <string name="shared_string_example">Exemplo</string>
+    <string name="navigate_point_format_utm">UTM Standard</string>
+    <string name="navigate_point_format_olc">Open Location Code</string>
+    <string name="coordinates_format_info">O formato selecionado será aplicado a todos os locais da aplicação.</string>
+    <string name="pref_selected_by_default_for_profiles">Esta configuração é selecionada por padrão para os perfis: %s</string>
+    <string name="change_default_settings">Alterar as configurações padrão</string>
+    <string name="discard_changes">Descartar alterações</string>
+    <string name="apply_to_current_profile">Aplicar ao perfil atual %1$s</string>
+    <string name="apply_to_all_profiles">Aplicar a todos os perfis</string>
+    <string name="start_up_message_pref">Mensagem de inicialização</string>
+    <string name="analytics_pref_title">Análises</string>
+    <string name="turn_screen_on_info">Mostrar mapa durante a navegação acima do ecrã de bloqueio.</string>
+    <string name="route_parameters_info">Estas definições afetam a construção da rota. Será aplicado somente ao perfil selecionado: %1$s.</string>
+    <string name="wake_time">Tempo de despertar</string>
+    <string name="units_and_formats">Unidades e formatos</string>
+    <string name="appearance">Aspeto</string>
+    <string name="map_look_descr">Ícones, widgets</string>
+    <string name="map_look">Aspeto do mapa</string>
+    <string name="list_of_installed_plugins">Lista de plugins instalados</string>
+    <string name="configure_navigation">Configurar a navegação</string>
+    <string name="general_settings_profile_descr">Tema do app, unidades, região</string>
+    <string name="configure_profile">Configurar o perfil</string>
+    <string name="screen_alerts_descr">Os alertas serão mostrados no canto inferior esquerdo do ecrã durante a navegação.</string>
+    <string name="switch_profile">Mudar de perfil</string>
+    <string name="language_and_output">Idioma e saída</string>
+    <string name="reset_to_default">Redefinir para o padrão</string>
+    <string name="manage_profiles_descr">Criar, importar, editar perfis</string>
+    <string name="manage_profiles">Gerir perfis de aplicação…</string>
+    <string name="osmand_settings_descr">Afetar toda a aplicação</string>
+    <string name="osmand_settings">Configurações do OsmAnd</string>
+    <string name="copy_from_other_profile">Copiar de outro perfil</string>
+    <string name="turn_screen_on">Ativar o ecrã</string>
+    <string name="map_during_navigation_info">Mapa durante a navegação</string>
+    <string name="map_during_navigation">Mapa durante a navegação</string>
+    <string name="shared_string_other">Outros</string>
+    <string name="vehicle_parameters_descr">Peso, altura, velocidade</string>
+    <string name="vehicle_parameters">Parâmetros do veículo</string>
+    <string name="voice_announces_info">Os avisos de voz são reproduzidos apenas durante a navegação.</string>
+    <string name="voice_announces_descr">Instruções e anúncios de navegação</string>
+    <string name="voice_announces">Anúncios de voz</string>
+    <string name="screen_alerts">Alertas de ecrã</string>
+    <string name="route_parameters_descr">Configurar os parâmetros da rota</string>
+    <string name="route_parameters">Parâmetros de rota</string>
+    <string name="application_profile_changed">Perfil de aplicação modificado para \"%s\"</string>
 </resources>

OsmAnd/res/values-ru/strings.xml

@@ -1639,7 +1639,7 @@
     <string name="download_tab_local">Локальные</string>
     <string name="navigate_point_zone">Зона</string>
     <string name="rendering_attr_transportStops_name">Остановки транспорта</string>
-    <string name="shared_string_dismiss">Закрыть</string>
+    <string name="shared_string_dismiss">Остановить</string>
     <string name="dash_download_msg_none">Загрузить оффлайн карты?</string>
     <string name="dash_download_msg">Загружено карт: %1$s</string>
     <string name="dash_download_new_one">Загрузить новую карту</string>
@@ -3212,4 +3212,22 @@
     <string name="shared_string_default">По умолчанию</string>
     <string name="lang_oc">Окситанский</string>
     <string name="app_mode_pickup_truck">Пикап</string>
+    <string name="shared_string_example">Пример</string>
+    <string name="change_default_settings">Изменить настройки по умолчанию</string>
+    <string name="discard_changes">Отменить изменения</string>
+    <string name="apply_to_current_profile">Применить к текущему профилю: %1$s</string>
+    <string name="apply_to_all_profiles">Применить ко всем профилям</string>
+    <string name="start_up_message_pref">Сообщение при запуске</string>
+    <string name="analytics_pref_title">Аналитика</string>
+    <string name="turn_screen_on_info">Показывать карту на экране блокировки при навигации</string>
+    <string name="configure_profile">Настроить профиль</string>
+    <string name="switch_profile">Переключить профиль</string>
+    <string name="application_profile_changed">Профиль изменён на\"%s\"</string>
+    <string name="configure_profile_info">Все приведенные ниже настройки относятся только к выбранному профилю.</string>
+    <string name="units_and_formats">Единицы измерения и форматы</string>
+    <string name="map_look_descr">иконки, виджеты</string>
+    <string name="list_of_installed_plugins">Список установленных плагинов</string>
+    <string name="general_settings_profile_descr">Тема приложения, единицы измерения, регион</string>
+    <string name="manage_profiles_descr">Создание, импорт и редактирование профилей</string>
+    <string name="manage_profiles">Управление профилями приложения…</string>
 </resources>

OsmAnd/res/values-sl/strings.xml

@@ -13,7 +13,7 @@
     <string name="app_mode_car">Navigacija v avtomobilu</string>
     <string name="app_mode_bicycle">Kolesarska navigacija</string>
     <string name="app_mode_pedestrian">Navigacija za pohodnike</string>
-    <string name="app_mode_default">Iskanje na zemljevidu</string>
+    <string name="app_mode_default">Brskalnik zemljevida</string>
     <string name="position_on_map_center">Sredina</string>
     <string name="position_on_map_bottom">Dno</string>
     <string name="navigate_point_top_text">Vnesi zemljepisno širino in dolžino v izbrani obliki (D – stopinje, M – minute, S – sekunde)</string>
@@ -1611,8 +1611,8 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
     <string name="rendering_value_translucent_lightblue_name">Prosojna svetlo modra</string>
     <string name="rendering_value_blue_name">Modra</string>
     <string name="rendering_value_translucent_blue_name">Prosojna modra</string>
-    <string name="rendering_value_purple_name">Škrlatna</string>
+    <string name="rendering_value_purple_name">Vijolična</string>
-    <string name="rendering_value_translucent_purple_name">Prosojna škrlatna</string>
+    <string name="rendering_value_translucent_purple_name">Prosojna vijolična</string>
     <string name="restart_is_required">Za uveljavitev sprememb je treba ponovno zagnati program.</string>
     <string name="rendering_value_green_name">Zelena</string>
     <string name="rendering_value_default13_name">Privzeto (13)</string>
@@ -2778,7 +2778,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="osm_live_payment_renews_quarterly">Četrtletna obnovitev</string>
     <string name="osm_live_payment_renews_annually">Letna obnovitev</string>
     <string name="default_price_currency_format">%1$.2f %2$s</string>
-    <string name="osm_live_payment_header">Izberite obdobje plačila, ki vam najbolj ustreza:</string>
+    <string name="osm_live_payment_header">Izbor obdobja plačila, ki vam najbolj ustreza:</string>
     <string name="osm_live_payment_contribute_descr">Del prihodkov je namenjen sodelavcem OpenStreetMap.</string>
     <string name="keep_passed_markers_descr">Označbe, dodane kot skupina priljubljenih točk oziroma točk GPX, ki so bile opredeljene kot prevožene, bodo ostale vidne na zemljevidu. Če skupina oziroma točke niso označene kot dejavne, bodo odstranjene.</string>
     <string name="keep_passed_markers">Ohrani prevožene označbe na zemljevidu</string>
@@ -2873,7 +2873,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="avoid_roads_descr">Izberite cesto, ki se ji želite izogniti med navigacijo, na zemljevidu oziroma iz spodnjega seznama:</string>
     <string name="show_along_the_route">Pokaži vzdolž poti</string>
     <string name="simulate_navigation">Izvedi navidezno navigacijo</string>
-    <string name="choose_track_file_to_follow">Izberite datoteko poti za sledenje</string>
+    <string name="choose_track_file_to_follow">Izbor datoteke poti za sledenje</string>
     <string name="voice_announcements">Glasovne najave</string>
     <string name="intermediate_destinations">Vmesni cilji</string>
     <string name="arrive_at_time">Prihod ob %1$s</string>
@@ -3029,54 +3029,54 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="coordinates_widget">Gradnik za določevanje koordinat</string>
     <string name="shared_string_privacy_policy">Politika zasebnosti</string>
     <string name="help_us_make_osmand_better">Pomagajte nam izboljšati OsmAnd!</string>
-    <string name="choose_data_to_share">Izberite katere vrste podatkov želite deliti:</string>
+    <string name="choose_data_to_share">Katere podatke nam dovolite zbirati:</string>
-    <string name="downloaded_maps">Prenešeni zemljevidi</string>
+    <string name="downloaded_maps">Prejete zemljevide</string>
-    <string name="visited_screens">Uporabljeni ekrani</string>
+    <string name="visited_screens">Uporabo zaslona</string>
-    <string name="collected_data_descr">Določite katere podatke lahko program OsmAnd deli.</string>
+    <string name="collected_data_descr">Določite, katere podatke lahko program OsmAnd pošilja razvijalcem.</string>
-    <string name="downloaded_maps_collect_descr">Pomagajte nam razumeti kakšni zemljevidi katerih področij so najbolj uporabljeni.</string>
+    <string name="downloaded_maps_collect_descr">"Pomagate nam razumeti, kakšne zemljevide uporabljate in katera področja so za vas najbolj  zanimiva."</string>
-    <string name="visited_screens_collect_descr">Pomagajte nam razumeti katere možnosti programa so najbolj uporabljene.</string>
+    <string name="visited_screens_collect_descr">Pomagate nam razumeti, katere možnosti programa so za vas najbolj uporabne.</string>
-    <string name="privacy_and_security_change_descr">S pritiskom na \"Dovoli\" se strinjate z našim %1$s</string>
+    <string name="privacy_and_security_change_descr">S potrditvijo dovoljenja se strinjate s pravili, ki jih določa %1$s</string>
     <string name="settings_privacy_and_security">Zasebnost in varnost</string>
-    <string name="settings_privacy_and_security_desc">Izberite katere podatke delite z nami</string>
+    <string name="settings_privacy_and_security_desc">Izbor podatkov za pošiljanje razvijalcem</string>
-    <string name="shared_string_no_thank_you">Hvala, ne</string>
+    <string name="shared_string_no_thank_you">Ne, hvala</string>
-    <string name="shared_string_allow">Dovoli</string>
+    <string name="shared_string_allow">Da, dovolim</string>
     <string name="profile_name_hint">Ime profila</string>
     <string name="nav_type_hint">Vrsta navigacije</string>
-    <string name="app_mode_taxi">Taxi</string>
+    <string name="app_mode_taxi">Prevoz s taksijem</string>
-    <string name="app_mode_horse">Konj</string>
+    <string name="app_mode_horse">Treking s konji</string>
-    <string name="app_mode_helicopter">Helikopter</string>
+    <string name="app_mode_helicopter">Prevoz s helikopterjem</string>
-    <string name="osmand_routing_promo">"Svojo spremenjeno verzijo lahko dodate v datoteki  routing.xml v ..osmand/routing"</string>
+    <string name="osmand_routing_promo">Spremenjene različice je mogoče dodati v datoteko routing.xml v ..osmand/routing</string>
     <string name="app_mode_skiing">Smučanje</string>
-    <string name="base_profile_descr_ski">Smučanje</string>
+    <string name="base_profile_descr_ski">Za smučanje, deskanje, sankanje ...</string>
-    <string name="select_icon_profile_dialog_title">Izberite ikono</string>
+    <string name="select_icon_profile_dialog_title">Izbor ikone</string>
     <string name="settings_routing_mode_string">Način: %s</string>
     <string name="settings_derived_routing_mode_string">Uporabniški način, izpeljan iz: %s</string>
     <string name="routing_profile_ski">Smučanje</string>
     <string name="profile_type_descr_string">Vrsta: %s</string>
     <string name="profile_type_base_string">Osnovni profil</string>
-    <string name="profile_alert_need_routing_type_title">Izberite vrsto navigacije</string>
+    <string name="profile_alert_need_routing_type_title">Izbor vrste navigacije</string>
-    <string name="profile_alert_need_routing_type_msg">Izberite vrsto navigacije za nov profil</string>
+    <string name="profile_alert_need_routing_type_msg">Izbor vrste navigacije za nov profil</string>
     <string name="profile_alert_need_profile_name_title">Vpišite ime profila</string>
     <string name="profile_alert_need_profile_name_msg">Ime profila ne sme biti prazno!</string>
     <string name="profile_alert_duplicate_name_title">Podvojeno ime</string>
     <string name="profile_alert_duplicate_name_msg">Profil s tem imenom že obstaja</string>
     <string name="profile_alert_cant_delete_base">Osnovnega profila OsmAnd ni mogoče izbrisati</string>
     <string name="profile_alert_need_save_title">Shrani spremembe</string>
-    <string name="profile_alert_need_save_msg">Pred nadaljevanjem morate shraniti spremembe profila</string>
+    <string name="profile_alert_need_save_msg">Pred nadaljevanjem je treba shraniti spremembe profila</string>
     <string name="profile_alert_delete_title">Izbriši profil</string>
     <string name="profile_alert_delete_msg">Ali ste prepričani, da želite izbrisati profil %s</string>
-    <string name="select_base_profile_dialog_title">Izberite osnovni profil</string>
+    <string name="select_base_profile_dialog_title">Izbor osnovnega profila</string>
-    <string name="select_base_profile_dialog_message">Vaše lastne profile zasnujte na enem od osnovnih aplikacijskih profilov, ki določijo osnovne nastavitve kot so privzet nabor gradnike, enote za hitrost in razdaljo. To so osnovni profili aplikacije, skupaj s primeri prilagojenih profilov, ki jih lahko naredite z njimi:</string>
+    <string name="select_base_profile_dialog_message">Profil zasnujte na podlagi enega izmed osnovnih profilov, s katerimi so določene osnovne nastavitve, na primer privzet nabor gradnikov, enoti za hitrost in razdalje. Osnovni profili, ki so privzeto na voljo so:</string>
-    <string name="select_nav_profile_dialog_title">Izberite vrsto navigacije</string>
+    <string name="select_nav_profile_dialog_title">Izbor vrste navigacije</string>
-    <string name="base_profile_descr_car">Avto, tovornjak, motor</string>
+    <string name="base_profile_descr_car">Za osebne avtomobile, motorje, tovornjake ...</string>
-    <string name="base_profile_descr_bicycle">Gorsko kolo, kolo z motorjem, konj</string>
+    <string name="base_profile_descr_bicycle">"Za gorska kolesa,  kolesa z motorjem, ježo s konji ..."</string>
-    <string name="base_profile_descr_pedestrian">Hoja, pohodništvo, tek</string>
+    <string name="base_profile_descr_pedestrian">Za hojo, pohodništvo, tek ...</string>
-    <string name="base_profile_descr_public_transport">Ves javni prevoz</string>
+    <string name="base_profile_descr_public_transport">Uporaba vseh vrst javnega prevoza ...</string>
-    <string name="base_profile_descr_boat">Ladja, veslanje, jadranje</string>
+    <string name="base_profile_descr_boat">Za potovanje z ladjo, jadranje, veslanje ...</string>
-    <string name="base_profile_descr_aircraft">Letalo, jadralno padalo</string>
+    <string name="base_profile_descr_aircraft">Za letala, jadralna padala ...</string>
-    <string name="routing_profile_straightline">Ravna črta</string>
+    <string name="routing_profile_straightline">Hoja po azimutu</string>
     <string name="routing_profile_broutrer">BRouter (brez povezave)</string>
-    <string name="osmand_default_routing">OsmAnd usmerjanje</string>
+    <string name="osmand_default_routing">Usmerjanje poti OsmAnd</string>
     <string name="shared_string_icon">Ikona</string>
     <string name="collected_data">Zbrani podatki</string>
     <string name="shared_string_min_speed">Min. hitrost</string>
@@ -3087,34 +3087,34 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="default_speed_dialog_msg">To se uporabi med izračunom pričakovanega časa prihoda med usmerjanjem</string>
     <string name="new_profile">Nov profil</string>
     <string name="last_launch_crashed">Med zadnjo uporabo programa OsmAnd je prišlo do napake. Pomagajte nam izboljšati OsmAnd tako, da nam posredujete sporočilo o napaki.</string>
-    <string name="app_mode_ufo">NLP</string>
+    <string name="app_mode_ufo">Štopanje NLP (brisača obvezna)</string>
-    <string name="release_3_4">• Profili: ustvariti je mogoče osebni profil z izbrano ikono in barvo
+    <string name="release_3_4">• Profili: ustvariti je mogoče osebni profil z izbrano ikono in barvo 
-\n• Mogoče je nastaviti določila prednostne hitrosti za vsak profil
+\n• Mogoče je nastaviti določila prednostne hitrosti za vsak profil 
-\n• Dodan je gradnik za prikaz trenutnih koordinat
+\n• Dodan je gradnik za prikaz trenutnih koordinat 
-\n• Dodana je možnost za prikaz kompasa in krožnega merila na zemljevidu 
+\n• Dodana je možnost za prikaz kompasa in krožnega merila
-\n• Popravljeno je delovanje beleženja poti v ozadju
+\n• Popravljeno je delovanje beleženja poti v ozadju 
-\n• Izboljšan je način prejemanja zemljevidov v ozadju
+\n• Izboljšan je način prejemanja zemljevidov v ozadju 
 \n• Ponovno je omogočena možnost »Ohrani prikaz na zaslonu« 
-\n• Popravljena je možnost izbora jezika na Wikipediji
+\n• Popravljena je možnost izbora jezika na Wikipediji 
 \n• Popravljeno je delovanje gumba kompasa med navigacijo 
 \n• Dodane so številne druge posodobitve
 \n
 \n</string>
-    <string name="app_mode_monowheel">Monocikel</string>
+    <string name="app_mode_monowheel">Prevoz z monociklom</string>
     <string name="precision_hdop_and_vdop">Horizontalna natančnost: %1$s, vertikalna: %2$s</string>
     <string name="precision_hdop">Horizontalna natančnost: %s</string>
     <string name="app_mode_offroad">Terensko (Offroad)</string>
     <string name="edit_profile_setup_title">Nastavitev profila</string>
     <string name="edit_profile_setup_subtitle">Profil ohrani lastne nastavitve</string>
-    <string name="edit_profile_setup_map_subtitle">Izberite privzete možnosti zemljevida za profil</string>
+    <string name="edit_profile_setup_map_subtitle">Izbor privzetih možnosti zemljevida za profil</string>
-    <string name="edit_profile_screen_options_subtitle">Izberite privzete možnosti ekrana za profil</string>
+    <string name="edit_profile_screen_options_subtitle">Izbor privzetih možnosti delovanja zaslona za profil</string>
-    <string name="edit_profile_nav_settings_subtitle">Izberite privzete možnosti navigacije za profil</string>
+    <string name="edit_profile_nav_settings_subtitle">Izbor privzetih možnosti navigacije za profil</string>
     <string name="routing_attr_max_num_changes_description">Določite največje število sprememb</string>
     <string name="routing_attr_max_num_changes_name">Število sprememb</string>
     <string name="turn_screen_on_router">Zbudi za zavoj</string>
-    <string name="turn_screen_on_time_descr">Izberite za koliko časa naj se vklopi ekran.</string>
+    <string name="turn_screen_on_time_descr">Izbor časa, ko naj se zaslon vklopi.</string>
     <string name="turn_screen_on_sensor">Uporabi senzor bližine</string>
-    <string name="turn_screen_on_sensor_descr">Za vklop ekrana med navigacijo z roko pomagajte pred ekranom.</string>
+    <string name="turn_screen_on_sensor_descr">Zaslon je mogoče med navigacijo vklopiti z gibom roke prek vrha zaslona.</string>
     <string name="turn_on_profile_desc">Za uporabo te nastavitve je treba omogočiti vsaj en profil.</string>
     <string name="rendering_attr_winter_road_name">Zimska cesta</string>
     <string name="rendering_attr_ice_road_name">Ledena cesta</string>
@@ -3127,18 +3127,18 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="routeInfo_tracktype_name">Trdnost površine</string>
     <string name="shared_string_file_is_saved">%s je shranjena</string>
     <string name="gpx_join_gaps">Združi prekinjene sledi</string>
-    <string name="app_mode_camper">Avtodom</string>
+    <string name="app_mode_camper">Potovanje s prikolico</string>
-    <string name="app_mode_campervan">Avtodom (kombi)</string>
+    <string name="app_mode_campervan">Potovanje z avtodomom</string>
     <string name="rendering_attr_showLez_description">Prikaži področja z omejitvijo izpustov. Določilo ne vpliva na usmerjanje.</string>
     <string name="rendering_attr_showLez_name">Prikaži področja z omejitvijo izpustov</string>
     <string name="temporary_conditional_routing">Upoštevaj začasne omejitve</string>
     <string name="shared_string_default">Privzeto</string>
     <string name="button_rate">Ocena</string>
-    <string name="app_mode_subway">Podzemna železnica</string>
+    <string name="app_mode_subway">Prevoz s podzemno železnico</string>
     <string name="show_compass_ruler">Pokaži kompas</string>
     <string name="hide_compass_ruler">Skrij kompas</string>
-    <string name="app_mode_personal_transporter">Osebni prevoznik</string>
+    <string name="app_mode_personal_transporter">Osebni transporter</string>
-    <string name="app_mode_scooter">Skuter</string>
+    <string name="app_mode_scooter">Prevoz s skuterjem</string>
     <string name="external_input_device">Zunanja vhodna naprava</string>
     <string name="sett_no_ext_input">Brez</string>
     <string name="sett_generic_ext_input">Privzeta tipkovnica</string>
@@ -3172,10 +3172,10 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="cancel_subscription">Prekliči naročnino</string>
     <string name="price_and_discount">%1$s • Prihranite %2$s</string>
     <string name="rate_dialog_descr">Vzemite si čas in objavite mnenje in oceno našega dela na Google Play.</string>
-    <string name="make_osmand_better_descr">Dovoli zbiranje in obdelavo anonimnih podatkov uporabe programa. Podatki o gibanju, iskanju in pregledovanju zemljevida se ne zbirajo in ne shranjujejo.
+    <string name="make_osmand_better_descr">Dovolite nam zbirati in obdelovati anonimne podatke uporabe programa. Podatki o vašem gibanju, iskanjih in pregledovanju zemljevida se ne zbirajo in ne shranjujejo. 
 \n
-\nIzbiro je mogoče kadarkoli spremeniti med Nastavitvami &gt; Zasebnost in varnost.</string>
+\nTo izbiro je mogoče kadarkoli spremeniti med Nastavitvami &gt; Zasebnost in varnost.</string>
-    <string name="app_mode_shuttle_bus">Avtobus</string>
+    <string name="app_mode_shuttle_bus">Prevoz z minibusom</string>
     <string name="routing_profile_geocoding">Geokodiranje</string>
     <string name="custom_routing">Profil poti po meri</string>
     <string name="special_routing_type">Posebno določanje poti</string>
@@ -3192,7 +3192,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="routing_attr_difficulty_preference_name">Prednostna raven zahtevnosti</string>
     <string name="routing_attr_freeride_policy_name">Izven urejenih smučišč</string>
     <string name="process_downloading_service">Storitev prejemanja posodobitev OsmAnd</string>
-    <string name="shared_string_color_magenta">Sinje modra</string>
+    <string name="shared_string_color_magenta">Temno rdeča</string>
     <string name="press_again_to_change_the_map_orientation">Pritisnite znova, da spremenite usmerjenost zemljevida.</string>
     <string name="shared_string_crash">Program se je sesul!</string>
     <string name="rendering_attr_highway_class_track_grade1_name">Ocena 1</string>
@@ -3204,6 +3204,48 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="shared_string_open_track">Odprta sled</string>
     <string name="new_route_calculated_dist_dbg">Pot: razdalja %s, čas %s 
 \nPreračun: %.1f sek, %d poti, %d ploščic)</string>
-    <string name="app_mode_pickup_truck">Poltovornjak</string>
+    <string name="app_mode_pickup_truck">Dostave s poltovornjakom</string>
     <string name="routing_attr_freeride_policy_description">Turno in izven urejenih smušišč so neuradne poti in prehodi. Običajno niso teptani in uradno ne vzdrževani in jih ob koncu dneva ne preverja nihče. Vstop na lastno odgovornost.</string>
+    <string name="app_mode_wagon">Dostave s kombijem</string>
+    <string name="configure_profile_info">Spodnje nastavitve prilagajajo le izbrani profil.</string>
+    <string name="utm_format_descr">Program OsmAnd uporablja standard UTM, ki je podoben, vendar ne enak zapisu UTM Nato.</string>
+    <string name="shared_string_example">Primer</string>
+    <string name="navigate_point_format_utm">Standard UTM</string>
+    <string name="navigate_point_format_olc">Koda Open Location</string>
+    <string name="coordinates_format_info">Izbran zapis bo uporabljen na vseh mestih v programu.</string>
+    <string name="change_default_settings">Spremeni privzete nastavitve</string>
+    <string name="discard_changes">Zavrzi spremembe</string>
+    <string name="apply_to_current_profile">Uveljavi za trenutni profil %1$s</string>
+    <string name="apply_to_all_profiles">Uveljavi za vse profile</string>
+    <string name="start_up_message_pref">Začetno sporočilo</string>
+    <string name="analytics_pref_title">Programska analitika</string>
+    <string name="units_and_formats">Enote in zapisi</string>
+    <string name="appearance">Videz</string>
+    <string name="map_look_descr">ikone, gradniki</string>
+    <string name="map_look">Videz zemljevida</string>
+    <string name="list_of_installed_plugins">Seznam nameščenih vstavkov</string>
+    <string name="configure_navigation">Nastavitev navigacije</string>
+    <string name="general_settings_profile_descr">Tema programa, enote, območje</string>
+    <string name="configure_profile">Nastavi profil</string>
+    <string name="switch_profile">Preklopi profil</string>
+    <string name="language_and_output">Jezik in odvodi</string>
+    <string name="reset_to_default">Ponastavi na privzeto</string>
+    <string name="manage_profiles_descr">Ustvarjanje, uvažanje in urejanje profilov</string>
+    <string name="manage_profiles">Upravljanje s profili programa …</string>
+    <string name="osmand_settings_descr">Vpliva na delovanje celotnega programa</string>
+    <string name="osmand_settings">Nastavitve OsmAnd</string>
+    <string name="copy_from_other_profile">Kopiraj iz drugega profila</string>
+    <string name="turn_screen_on">Prižgi zaslon</string>
+    <string name="map_during_navigation_info">Zemljevid med navigacijo</string>
+    <string name="map_during_navigation">Zemljevid med navigacijo</string>
+    <string name="shared_string_other">Drugo</string>
+    <string name="vehicle_parameters_descr">Masa, višina, hitrost</string>
+    <string name="vehicle_parameters">Parametri vozila</string>
+    <string name="voice_announces_info">"Glasovne najave se predvajajo le med  navigacijo."</string>
+    <string name="voice_announces_descr">Navodila nvigacije in najave</string>
+    <string name="voice_announces">Glasovne najave</string>
+    <string name="screen_alerts">Zaslonska opozorila</string>
+    <string name="route_parameters_descr">Nastavitev parametrov poti</string>
+    <string name="route_parameters">Parametri poti</string>
+    <string name="application_profile_changed">Profil je spremenjen na »%s«</string>
 </resources>

OsmAnd/res/values-sr/phrases.xml

@@ -118,7 +118,7 @@
     <string name="poi_alcohol">Подрум пића</string>
     <string name="poi_cheese">Продавница сира</string>
     <string name="poi_chocolate">Продавница чоколаде</string>
-    <string name="poi_coffee">Кафић</string>
+    <string name="poi_coffee">Продаје кафе</string>
     <string name="poi_mall">Тржни центар</string>
     <string name="poi_beverages">Продавница пића</string>
     <string name="poi_butcher">Месна пијаца</string>
@@ -718,7 +718,7 @@
     <string name="poi_biergarten">Пивска башта</string>
     <string name="poi_restaurant">Ресторан</string>
     <string name="poi_fast_food">Брза храна</string>
-    <string name="poi_bar">Кафић</string>
+    <string name="poi_bar">Бар</string>
     <string name="poi_pub">Паб</string>
     <string name="poi_drinking_water">Вода за пиће</string>
     <string name="poi_barbecue">Роштиљ</string>
@@ -2496,4 +2496,7 @@
     <string name="poi_cuisine_jewish">Јеврејска</string>
     <string name="poi_cuisine_bulgarian">Бугарска</string>
     <string name="poi_cuisine_tibetan">Тибетанска</string>
+    <string name="poi_barometer_yes">Барометар</string>
+    <string name="poi_barometer_no">Барометар: не</string>
+    <string name="poi_barbecue_grill">Роштиљ: да</string>
 </resources>

OsmAnd/res/values-tr/strings.xml

@@ -2481,14 +2481,14 @@
     <string name="shared_string_color_magenta">Eflatun</string>
     <string name="shared_string_icon">Simge</string>
     <string name="collected_data">Toplanmış Veri</string>
-    <string name="press_again_to_change_the_map_orientation">Harita yönünü değiştirmek için tekrar basın</string>
+    <string name="press_again_to_change_the_map_orientation">Harita yönünü değiştirmek için tekrar dokunun</string>
     <string name="shared_string_min_speed">En düşük hız</string>
     <string name="shared_string_max_speed">En yüksek hız</string>
     <string name="default_speed_setting_title">Öntanımlı hız</string>
     <string name="default_speed_setting_descr">Öntanımlı hız ayarlarını değiştir</string>
     <string name="minmax_speed_dialog_title">En düşük/en yüksek hız ayarı</string>
     <string name="default_speed_dialog_msg">Yönlendirme sırasında beklenen varış zamanının hesaplanmasında kullanılır</string>
-    <string name="new_profile">Yeni Profil</string>
+    <string name="new_profile">Yeni profil</string>
     <string name="shared_string_crash">Çökme</string>
     <string name="app_mode_personal_transporter">Kişisel taşıyıcı</string>
     <string name="app_mode_scooter">Scooter</string>

OsmAnd/res/values/strings.xml

@@ -12,6 +12,7 @@
 
 -->
 
+    <string name="logcat_buffer">Logcat buffer</string>
     <string name="application_profile_changed">Application profile changed to \"%s\"</string>
     <string name="switch_profile">Switch profile</string>
     <string name="configure_profile">Configure profile</string>

OsmAnd/src/net/osmand/plus/HuaweiDrmHelper.java

@@ -1,39 +1,66 @@
 package net.osmand.plus;
 
 import android.app.Activity;
+import android.util.Log;
 
-//import com.huawei.android.sdk.drm.Drm;
+import java.lang.ref.WeakReference;
-//import com.huawei.android.sdk.drm.DrmCheckCallback;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 public class HuaweiDrmHelper {
-	private Activity activity;
+	private static final String TAG = HuaweiDrmHelper.class.getSimpleName();
-	//private DrmCheckCallback callback;
-	
-	//Copyright protection id
-	private static final String DRM_ID = "101048021";
-	//Copyright protection public key
-	private static final String DRM_PUBLIC_KEY = "e0a6c798fddfd0927bd509dfeafcef4b61c4408d7ea0ca9dfb4b7766b964f801";
-	
-	public HuaweiDrmHelper(final Activity activity) {
-		this.activity = activity;
-		/*
-		callback = new DrmCheckCallback() {
-			@Override
-			public void onCheckSuccess() { }
 
-			@Override
+	//Copyright protection id
-			public void onCheckFailed() {
+	private static final String DRM_ID = "101117397";
-				activity.finish();
+	//Copyright protection public key
-			}
+	private static final String DRM_PUBLIC_KEY = "9d6f861e7d46be167809a6a62302749a6753b3c1bd02c9729efb3973e268091d";
-		};
+
-		 */
+	public static void check(Activity activity) {
+		boolean succeed = false;
+		try {
+			final WeakReference<Activity> activityRef = new WeakReference<>(activity);
+			Class<?> drmCheckCallbackClass = Class.forName("com.huawei.android.sdk.drm.DrmCheckCallback");
+			Object callback = java.lang.reflect.Proxy.newProxyInstance(
+					drmCheckCallbackClass.getClassLoader(),
+					new java.lang.Class[]{drmCheckCallbackClass},
+					new java.lang.reflect.InvocationHandler() {
+
+						@Override
+						public Object invoke(Object proxy, java.lang.reflect.Method method, Object[] args) {
+							Activity a = activityRef.get();
+							if (a != null && !a.isFinishing()) {
+								String method_name = method.getName();
+								if (method_name.equals("onCheckSuccess")) {
+									// skip now
+								} else if (method_name.equals("onCheckFailed")) {
+									closeApplication(a);
+								}
+							}
+							return null;
+						}
+					});
+
+			Class<?> drmClass = Class.forName("com.huawei.android.sdk.drm.Drm");
+			Class[] partypes = new Class[]{Activity.class, String.class, String.class, String.class, drmCheckCallbackClass};
+			Method check = drmClass.getMethod("check", partypes);
+			check.invoke(null, activity, activity.getPackageName(), DRM_ID, DRM_PUBLIC_KEY, callback);
+			succeed = true;
+
+		} catch (ClassNotFoundException e) {
+			Log.e(TAG, "check: ", e);
+		} catch (NoSuchMethodException e) {
+			Log.e(TAG, "check: ", e);
+		} catch (IllegalAccessException e) {
+			Log.e(TAG, "check: ", e);
+		} catch (InvocationTargetException e) {
+			Log.e(TAG, "check: ", e);
+		}
+		if (!succeed) {
+			closeApplication(activity);
+		}
 	}
-	
+
-	public void check() {
+	private static void closeApplication(Activity activity) {
-		//Drm.check(getActivity(), getActivity().getPackageName(), DRM_ID, DRM_PUBLIC_KEY, callback);
+		((OsmandApplication) activity.getApplication()).closeApplicationAnywayImpl(activity, true);
-	}
-	
-	public Activity getActivity() {
-		return this.activity;
 	}
 }

OsmAnd/src/net/osmand/plus/Version.java

@@ -26,7 +26,7 @@ public class Version {
 	}
 	
 	public static boolean isHuawei(OsmandApplication ctx) {
-		return ctx.getString(R.string.versionFeatures).contains("+huawei");
+		return ctx.getPackageName().endsWith(".huawei");
 	}
 	
 	public static boolean isMarketEnabled(OsmandApplication ctx) {

OsmAnd/src/net/osmand/plus/activities/MapActivity.java

@@ -253,7 +253,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		super.onCreate(savedInstanceState);
 		
 		if (Version.isHuawei(getMyApplication())) {
-			new HuaweiDrmHelper(this).check();
+			HuaweiDrmHelper.check(this);
 		}
 		// Full screen is not used here
 		// getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
@@ -825,9 +825,9 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 
 		app.getDownloadThread().setUiActivity(this);
 
-		if (mapViewTrackingUtilities.getShowRouteFinishDialog()) {
+		boolean routeWasFinished = routingHelper.isRouteWasFinished();
+		if (routeWasFinished && !DestinationReachedMenu.wasShown()) {
 			DestinationReachedMenu.show(this);
-			mapViewTrackingUtilities.setShowRouteFinishDialog(false);
 		}
 
 		routingHelper.addListener(this);
@@ -1388,6 +1388,9 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 	}
 
 	private void onPauseActivity() {
+		if (!app.getRoutingHelper().isRouteWasFinished()) {
+			DestinationReachedMenu.resetShownState();
+		}
 		pendingPause = false;
 		mapView.setOnDrawMapListener(null);
 		cancelSplashScreenTimer();
@@ -1977,7 +1980,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		if (mapRouteInfoMenu.isSelectFromMapTouch()) {
 			return;
 		}
-
 		RoutingHelper rh = app.getRoutingHelper();
 		if (newRoute && rh.isRoutePlanningMode() && mapView != null) {
 			Location lt = rh.getLastProjection();

OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java

@@ -7,7 +7,6 @@ import android.view.WindowManager;
 
 import net.osmand.Location;
 import net.osmand.StateChangedListener;
-import net.osmand.ValueHolder;
 import net.osmand.binary.BinaryMapDataObject;
 import net.osmand.data.LatLon;
 import net.osmand.data.RotatedTileBox;
@@ -25,7 +24,6 @@ import net.osmand.plus.R;
 import net.osmand.plus.dashboard.DashboardOnMap;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.routing.IRouteInformationListener;
 import net.osmand.plus.views.AnimateDraggingMapThread;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.util.MapUtils;
@@ -33,7 +31,7 @@ import net.osmand.util.MapUtils;
 import java.io.IOException;
 
 public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLocationListener,
-		OsmAndCompassListener, IRouteInformationListener, MapMarkerChangedListener {
+		OsmAndCompassListener, MapMarkerChangedListener {
 	private static final int AUTO_FOLLOW_MSG_ID = OsmAndConstants.UI_HANDLER_LOCATION_SERVICE + 4;
 
 	private long lastTimeAutoZooming = 0;
@@ -49,7 +47,6 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 	private boolean showViewAngle = false;
 	private boolean isUserZoomed = false;
 	private String locationProvider;
-	private boolean showRouteFinishDialog = false;
 	private Location myLocation;
 	private Float heading;
 	private boolean drivingRegionUpdated = false;
@@ -63,7 +60,6 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 		app.getLocationProvider().addCompassListener(this);
 		addTargetPointListener(app);
 		addMapMarkersListener(app);
-		app.getRoutingHelper().addListener(this);
 	}
 
 	public void resetDrivingRegionUpdate() {
@@ -435,27 +431,6 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 		return mapView.getRotate();
 	}
 
-	@Override
-	public void newRouteIsCalculated(boolean newRoute, ValueHolder<Boolean> showToast) {
-	}
-
-	@Override
-	public void routeWasCancelled() {
-	}
-
-	@Override
-	public void routeWasFinished() {
-		showRouteFinishDialog = (mapView == null);
-	}
-
-	public boolean getShowRouteFinishDialog() {
-		return showRouteFinishDialog;
-	}
-
-	public void setShowRouteFinishDialog(boolean showRouteFinishDialog) {
-		this.showRouteFinishDialog = showRouteFinishDialog;
-	}
-
 	public void setZoomTime(long time) {
 		lastTimeAutoZooming = time;
 		isUserZoomed = true;

OsmAnd/src/net/osmand/plus/development/LogcatActivity.java

@@ -0,0 +1,234 @@
+package net.osmand.plus.development;
+
+import android.graphics.drawable.ColorDrawable;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import net.osmand.AndroidUtils;
+import net.osmand.PlatformUtil;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.OsmandActionBarActivity;
+
+import org.apache.commons.logging.Log;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class LogcatActivity extends OsmandActionBarActivity {
+
+	public static int MAX_BUFFER_LOG = 1000;
+
+	private static final Log log = PlatformUtil.getLog(LogcatActivity.class);
+
+	private LogcatAsyncTask logcatAsyncTask;
+	private Map<Integer, String> logsMap;
+	private LogcatAdapter adapter;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		OsmandApplication app = (OsmandApplication) getApplication();
+		app.applyTheme(this);
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.recyclerview);
+
+		ActionBar supportActionBar = getSupportActionBar();
+		if (supportActionBar != null) {
+			supportActionBar.setTitle(R.string.logcat_buffer);
+			supportActionBar.setElevation(5.0f);
+		}
+
+		logsMap = new LinkedHashMap<Integer, String>() {
+			@Override
+			protected boolean removeEldestEntry(Entry<Integer, String> eldest) {
+				return size() > MAX_BUFFER_LOG;
+			}
+		};
+
+		adapter = new LogcatAdapter();
+
+		RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+		recyclerView.setLayoutManager(new LinearLayoutManager(this));
+		recyclerView.setAdapter(adapter);
+
+		int colorResId = AndroidUtils.resolveAttribute(app, R.attr.divider_color_basic);
+		if (colorResId != 0) {
+			DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this, DividerItemDecoration.VERTICAL);
+			dividerItemDecoration.setDrawable(new ColorDrawable(ContextCompat.getColor(app, colorResId)));
+
+			recyclerView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
+		}
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		startLogcatAsyncTask();
+	}
+
+	@Override
+	protected void onPause() {
+		super.onPause();
+		stopLogcatAsyncTask();
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		int itemId = item.getItemId();
+		switch (itemId) {
+			case android.R.id.home:
+				finish();
+				return true;
+
+		}
+		return false;
+	}
+
+	private void onNewLogEntry(int index, String logEntry) {
+		logsMap.put(index, logEntry);
+
+		runOnUiThread(new Runnable() {
+			@Override
+			public void run() {
+				adapter.setLogs(logsMap.values());
+			}
+		});
+	}
+
+	public void startLogcatAsyncTask() {
+		logcatAsyncTask = new LogcatAsyncTask(this, "*:E");
+		logcatAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+	}
+
+	public void stopLogcatAsyncTask() {
+		if (logcatAsyncTask != null && logcatAsyncTask.getStatus() == AsyncTask.Status.RUNNING) {
+			logcatAsyncTask.cancel(false);
+			logcatAsyncTask.stopLogging();
+		}
+	}
+
+	private class LogcatAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+		private List<String> logs = new ArrayList<>();
+
+		@NonNull
+		@Override
+		public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
+			LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
+			View itemView = inflater.inflate(R.layout.bottom_sheet_item_description_long, viewGroup, false);
+
+			return new LogViewHolder(itemView);
+		}
+
+		@Override
+		public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+			if (holder instanceof LogViewHolder) {
+				LogViewHolder logViewHolder = (LogViewHolder) holder;
+				String log = getLog(position);
+
+				logViewHolder.logTextView.setText(log);
+			}
+		}
+
+		@Override
+		public int getItemCount() {
+			return logs.size();
+		}
+
+		private String getLog(int position) {
+			return logs.get(position);
+		}
+
+		public void setLogs(Collection<String> logs) {
+			this.logs.clear();
+			if (logs != null && !logs.isEmpty()) {
+				this.logs.addAll(logs);
+			}
+			notifyDataSetChanged();
+		}
+
+		private class LogViewHolder extends RecyclerView.ViewHolder {
+
+			final TextView logTextView;
+
+			public LogViewHolder(View itemView) {
+				super(itemView);
+				this.logTextView = itemView.findViewById(R.id.description);
+			}
+		}
+	}
+
+	public static class LogcatAsyncTask extends AsyncTask<Void, String, Void> {
+
+		private Process processLogcat;
+		private WeakReference<LogcatActivity> logcatActivity;
+		private String filterLevel;
+		private int index = 0;
+
+		LogcatAsyncTask(LogcatActivity logcatActivity, String filterLevel) {
+			this.logcatActivity = new WeakReference<>(logcatActivity);
+			this.filterLevel = filterLevel;
+		}
+
+		@Override
+		protected Void doInBackground(Void... voids) {
+			try {
+				String filter = String.valueOf(android.os.Process.myPid());
+				String[] command = {"logcat", filterLevel, " | grep " + filter, "-T", String.valueOf(MAX_BUFFER_LOG)};
+				processLogcat = Runtime.getRuntime().exec(command);
+
+				BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(processLogcat.getInputStream()));
+
+				String line;
+				while ((line = bufferedReader.readLine()) != null) {
+					if (isCancelled()) {
+						break;
+					}
+					publishProgress(line);
+				}
+				stopLogging();
+			} catch (IOException e) {
+				// ignore
+			} catch (Exception e) {
+				log.error(e);
+			}
+
+			return null;
+		}
+
+		@Override
+		protected void onProgressUpdate(String... values) {
+			if (values.length > 0 && !isCancelled()) {
+				LogcatActivity activity = logcatActivity.get();
+				if (activity != null) {
+					activity.onNewLogEntry(index, values[0]);
+					index++;
+				}
+			}
+		}
+
+		private void stopLogging() {
+			if (processLogcat != null) {
+				processLogcat.destroy();
+			}
+		}
+	}
+}

OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java

@@ -11,25 +11,15 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
-import android.support.v7.app.AlertDialog;
-import android.view.View;
 
-import net.osmand.PlatformUtil;
-import net.osmand.StateChangedListener;
-import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmAndLocationSimulation;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.SettingsBaseActivity;
-import net.osmand.plus.activities.actions.AppModeDialog;
-import net.osmand.plus.profiles.SettingsProfileFragment;
 import net.osmand.util.SunriseSunset;
 
 import java.text.SimpleDateFormat;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
 
 //import net.osmand.plus.development.OsmandDevelopmentPlugin;
 
@@ -139,6 +129,18 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
 		});
 		cat.addPreference(pref);
 
+		pref = new Preference(this);
+		pref.setTitle(R.string.logcat_buffer);
+		pref.setKey("logcat_buffer");
+		pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+			@Override
+			public boolean onPreferenceClick(Preference preference) {
+				startActivity(new Intent(SettingsDevelopmentActivity.this, LogcatActivity.class));
+				return true;
+			}
+		});
+		cat.addPreference(pref);
+
 		PreferenceCategory info = new PreferenceCategory(this);
 		info.setTitle(R.string.info_button);
 		cat.addPreference(info);

OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenu.java

@@ -7,12 +7,23 @@ import net.osmand.plus.mapcontextmenu.BaseMenuController;
 
 public class DestinationReachedMenu extends BaseMenuController {
 
-	public DestinationReachedMenu(MapActivity mapActivity) {
+	private static boolean shown = false;
+
+	public static boolean wasShown() {
+		return shown;
+	}
+
+	public static void resetShownState() {
+		DestinationReachedMenu.shown = false;
+	}
+
+	DestinationReachedMenu(MapActivity mapActivity) {
 		super(mapActivity);
 	}
 
 	public static void show(MapActivity mapActivity) {
 		if (!DestinationReachedMenuFragment.isExists()) {
+			shown = true;
 			DestinationReachedMenu menu = new DestinationReachedMenu(mapActivity);
 			DestinationReachedMenuFragment.showInstance(menu);
 		}

OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java

@@ -52,7 +52,7 @@ public class DestinationReachedMenuFragment extends Fragment {
 		view.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				dismissMenu();
+				finishNavigation();
 			}
 		});
 
@@ -63,7 +63,7 @@ public class DestinationReachedMenuFragment extends Fragment {
 		closeImageButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				dismissMenu();
+				finishNavigation();
 			}
 		});
 
@@ -73,19 +73,7 @@ public class DestinationReachedMenuFragment extends Fragment {
 		removeDestButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				getMapActivity().getMyApplication().getTargetPointsHelper().removeWayPoint(true, -1);
+				finishNavigation();
-				Object contextMenuObj = getMapActivity().getContextMenu().getObject();
-				if (getMapActivity().getContextMenu().isActive()
-						&& contextMenuObj instanceof TargetPoint) {
-					TargetPoint targetPoint = (TargetPoint) contextMenuObj;
-					if (!targetPoint.start && !targetPoint.intermediate) {
-						getMapActivity().getContextMenu().close();
-					}
-				}
-				OsmandSettings settings = getMapActivity().getMyApplication().getSettings();
-				settings.APPLICATION_MODE.set(settings.DEFAULT_APPLICATION_MODE.get());
-				getMapActivity().getMapActions().stopNavigationWithoutConfirm();
-				dismissMenu();
 			}
 		});
 
@@ -161,6 +149,22 @@ public class DestinationReachedMenuFragment extends Fragment {
 		exists = false;
 	}
 
+	private void finishNavigation() {
+		getMapActivity().getMyApplication().getTargetPointsHelper().removeWayPoint(true, -1);
+		Object contextMenuObj = getMapActivity().getContextMenu().getObject();
+		if (getMapActivity().getContextMenu().isActive()
+				&& contextMenuObj instanceof TargetPoint) {
+			TargetPoint targetPoint = (TargetPoint) contextMenuObj;
+			if (!targetPoint.start && !targetPoint.intermediate) {
+				getMapActivity().getContextMenu().close();
+			}
+		}
+		OsmandSettings settings = getMapActivity().getMyApplication().getSettings();
+		settings.APPLICATION_MODE.set(settings.DEFAULT_APPLICATION_MODE.get());
+		getMapActivity().getMapActions().stopNavigationWithoutConfirm();
+		dismissMenu();
+	}
+
 	public static boolean isExists() {
 		return exists;
 	}

OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java

@@ -966,10 +966,10 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
 				color2 = color1;
 			}
 		} else {
-			color1 = nightMode ? R.color.active_buttons_and_links_text_disabled_dark : R.color.active_buttons_and_links_text_light;
+			color1 = nightMode ? R.color.active_buttons_and_links_text_dark : R.color.active_buttons_and_links_text_light;
 			if (routeCalculated) {
 				AndroidUtils.setBackground(app, startButton, nightMode, R.color.active_color_primary_light, R.color.active_color_primary_dark);
-				color2 = nightMode ? R.color.active_buttons_and_links_text_dark : R.color.active_buttons_and_links_text_light;
+				color2 = color1;
 			} else {
 				AndroidUtils.setBackground(app, startButton, nightMode, R.color.activity_background_light, R.color.activity_background_dark);
 				color2 = R.color.description_font_and_bottom_sheet_icons;

OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java

@@ -404,10 +404,10 @@ public class MapRouteInfoMenuFragment extends ContextMenuFragment {
 		}
 		ProgressBar progressBarButton = (ProgressBar) view.findViewById(R.id.progress_bar_button);
 		if (progressBarButton != null) {
-			progressBarButton.setProgress(isPublicTransportMode() ? 0 : 100);
+			progressBarButton.setProgress(0);
 		}
 		TextViewExProgress textViewExProgress = (TextViewExProgress) view.findViewById(R.id.start_button_descr);
-		textViewExProgress.percent = isPublicTransportMode() ? 0 : 1;
+		textViewExProgress.percent = 0;
 	}
 
 	public void show(MapActivity mapActivity) {

OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java

@@ -66,6 +66,7 @@ public class RoutingHelper {
 	private long recalculateCountInInterval = 0;
 	private int evalWaitInterval = 0;
 	private boolean waitingNextJob;
+	private boolean routeWasFinished;
 
 	private ApplicationMode mode;
 	private OsmandSettings settings;
@@ -87,6 +88,10 @@ public class RoutingHelper {
 		return isDeviatedFromRoute;
 	}
 
+	public boolean isRouteWasFinished() {
+		return routeWasFinished;
+	}
+
 	public RoutingHelper(OsmandApplication context){
 		this.app = context;
 		settings = context.getSettings();
@@ -201,6 +206,7 @@ public class RoutingHelper {
 	}
 
 	private synchronized void finishCurrentRoute() {
+		routeWasFinished = true;
 		app.runInUIThread(new Runnable() {
 			@Override
 			public void run() {
@@ -917,6 +923,7 @@ public class RoutingHelper {
 		@Override
 		public void run() {
 			synchronized (RoutingHelper.this) {
+				routeWasFinished = false;
 				currentRunningJob = this;
 				waitingNextJob = prevRunningJob != null;
 			}