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

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

@@ -251,4 +251,9 @@
     <string name="shared_string_apply">Anwenden</string>
     <string name="set_time_timeline_descr">Dauer der Anzeige auswählen</string>
     <string name="saved_messages">Gespeicherte Nachrichten</string>
+    <string name="time_zone">Zeitzone</string>
+    <string name="units_and_formats">Einheiten &amp; Formate</string>
+    <string name="unit_of_length">Längeneinheiten</string>
+    <string name="unit_of_speed_system_descr">Geschwindigkeitseinheit festlegen.</string>
+    <string name="unit_of_speed_system">Geschwindigkeitseinheit</string>
 </resources>

OsmAnd/AndroidManifest-freehuawei.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools">
+
+	<application>
+		<activity android:name="com.huawei.android.sdk.drm.DrmDialogActivity"
+			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>
+
+		<provider
+			android:name="android.support.v4.content.FileProvider"
+			android:authorities="net.osmand.huawei.fileprovider"
+			tools:replace="android:authorities" />
+		<service
+			android:name="net.osmand.plus.NavigationService"
+			android:process="net.osmand.huawei"
+			tools:replace="android:process" />
+	</application>
+
+</manifest>

OsmAnd/build.gradle

@@ -189,6 +189,10 @@ android {
 			dimension "version"
 			applicationId "net.osmand.plus.huawei"
 		}
+		freehuawei {
+			dimension "version"
+			applicationId "net.osmand.huawei"
+		}
 
 		// CoreVersion
 		legacy {

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

@@ -696,8 +696,8 @@
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s/mes</string>
     <string name="osm_live_payment_current_subscription">La soscripción actual</string>
     <string name="default_price_currency_format">%1$.2f %2$s</string>
-    <string name="osm_live_payment_header">Esbilla\'l periodu de pagu más afayadizu pa ti:</string>
+    <string name="osm_live_payment_header">Intervalu de pagu:</string>
-    <string name="osm_live_payment_contribute_descr">Parte de los ingresos van pa los collaboradores d\'OpenStreetMap.</string>
+    <string name="osm_live_payment_contribute_descr">Les donaciones ayuden a financiar la cartografía d\'OpenStreetMap</string>
     <string name="markers_remove_dialog_msg">¿Desaniciar el marcador «%s» del mapa\?</string>
     <string name="third_party_application">Aplicación de terceros</string>
     <string name="error_notification_desc">Unvia una captura d\'esti avisu a support@osmand.net, por favor</string>
@@ -1394,4 +1394,6 @@
     <string name="configure_profile_info">Tolos axustes qu\'apaecen darréu afeuten únicamente al perfil escoyíu.</string>
     <string name="shared_string_example">Exemplu</string>
     <string name="wake_time">Hora d\'activamientu</string>
+    <string name="descendingly">Z-A</string>
+    <string name="ascendingly">A-Z</string>
 </resources>

OsmAnd/res/values-ca/strings.xml

@@ -3397,4 +3397,10 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="clear_confirmation_msg">Voleu netejar %1$s\?</string>
     <string name="dialogs_and_notifications_title">Diàlegs i notificacions</string>
     <string name="dialogs_and_notifications_descr">Emergents de control, diàlegs i notificacions que surten a OsmAnd mentre s\'utilitza.</string>
+    <string name="join_segments">Uneix segments</string>
+    <string name="add_new_profile_q">Voleu afegir el perfil nou \'%1$s\'\?</string>
+    <string name="distance_and_address">%1$s • %2$s</string>
+    <string name="street_city">%1$s, %2$s</string>
+    <string name="personal_category_name">Personal</string>
+    <string name="shared_string_downloading_formatted">S\'està baixant %s</string>
 </resources>

OsmAnd/res/values-de/phrases.xml

@@ -1337,7 +1337,7 @@
     <string name="poi_rescue_station">Rettungsstation</string>
     <string name="poi_mini_roundabout">Mini-Kreisverkehr</string>
     <string name="poi_railway_crossing">Bahnübergang</string>
-    <string name="poi_bird_hide">Vögelbeobachtungspunkt</string>
+    <string name="poi_bird_hide">Vogelbeobachtungspunkt</string>
     <string name="poi_garden">Garten</string>
     <string name="poi_heath">Heide</string>
     <string name="poi_grass">Gras</string>

OsmAnd/res/values-de/strings.xml

@@ -3251,7 +3251,7 @@ Lon %2$s</string>
     <string name="turn_screen_on_info">Karte während der Navigation auf Sperrbildschirm anzeigen.</string>
     <string name="route_parameters_info">Einstellungen für die Routenplanung des gewählten Profils „%1$s“.</string>
     <string name="wake_time">Aufwachzeit</string>
-    <string name="units_and_formats">Einheiten und Formate</string>
+    <string name="units_and_formats">Einheiten &amp; Formate</string>
     <string name="appearance">Aussehen</string>
     <string name="map_look_descr">Kartendarstellung</string>
     <string name="map_look">Kartendarstellung</string>
@@ -3402,6 +3402,10 @@ Lon %2$s</string>
     <string name="suggested_maps_descr">Diese Karten sind für die Verwendung mit dem Plugin erforderlich</string>
     <string name="join_segments">Segmente verbinden</string>
     <string name="add_new_profile_q">Neues Profil \'%1$s\' hinzufügen\?</string>
-    <string name="save_heading">Überschrift einbeziehen</string>
+    <string name="save_heading">Richtung einbeziehen</string>
-    <string name="save_heading_descr">Überschrift zu jedem Trackpoint während der Aufnahme speichern.</string>
+    <string name="save_heading_descr">Richtung zu jedem Trackpunkt während der Aufnahme speichern.</string>
+    <string name="distance_and_address">%1$s • %2$s</string>
+    <string name="street_city">%1$s, %2$s</string>
+    <string name="personal_category_name">Persönlich</string>
+    <string name="shared_string_downloading_formatted">%s herunterladen</string>
 </resources>

OsmAnd/res/values-en-rGB/strings.xml

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
     <!--
 		Our app defaults to American English with default strings in res/values
 		This file is manually maintained in res/values-en-rGB and should ONLY contain strings where a different spelling should be used for English as used in the United Kingdom
 	-->
-
     <string name="rendering_attr_currentTrackColor_name">GPX colour</string>
     <string name="rendering_attr_currentTrackColor_description">GPX colour</string>
     <string name="shared_string_color">Colour</string>
@@ -66,7 +66,6 @@
     <string name="favourites_remove_dialog_msg">Delete favourite point \'%s\'?</string>
     <string name="favourites_remove_dialog_success">Favourite point {0} was successfully deleted.</string>
     <string name="replace_favorite_confirmation">Are you sure you want to replace favourite %1$s?</string>
-	
     <string name="always_center_position_on_map">Display position always in centre</string>
     <string name="choose_auto_follow_route">Auto-centre map view</string>
     <string name="auto_follow_route_navigation">Auto-centre nav only</string>
@@ -91,5 +90,6 @@
     <string name="quick_action_favorites_hide">Hide Favourites</string>
     <string name="quick_action_category_descr">Select the category to save the favourite in.</string>
     <string name="analyze_on_map">Analyse on map</string>
-<string name="purchase_cancelled_dialog_title">You have cancelled your OsmAnd Live subscription</string>
+    <string name="purchase_cancelled_dialog_title">You have cancelled your OsmAnd Live subscription</string>
-    </resources>
+    <string name="show_transparency_seekbar">Show transparency slider</string>
+</resources>

OsmAnd/res/values-fr/phrases.xml

@@ -3690,4 +3690,6 @@
     <string name="poi_bath_type_lake">Lac</string>
     <string name="poi_horse_forestry">Accès à cheval : forestiers seuls</string>
     <string name="poi_foot_destination">Accès piétonnier : riverains</string>
+    <string name="poi_trailer_no">Accès aux remorques : non</string>
+    <string name="poi_psv_yes">Accès aux transports publics ou taxis : oui</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -1882,7 +1882,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="osm_live_thanks">Merci pour votre soutien à OsmAnd !
 \nPour activer toutes les nouvelles fonctionnalités, merci de redémarrer OsmAnd.</string>
     <string name="osm_live_subscription_settings">Paramétrage de l\'abonnement</string>
-    <string name="show_transparency_seekbar">Afficher la barre de recherche transparente</string>
+    <string name="show_transparency_seekbar">Afficher curseur de réglage de la transparence</string>
     <string name="recalculate_route">Recalculer l\'itinéraire</string>
     <string name="storage_directory_shared">Mémoire partagée</string>
     <string name="shared_string_topbar">Barre supérieure</string>
@@ -3370,4 +3370,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="add_new_profile_q">Ajouter le profil \'%1$s\' \?</string>
     <string name="save_heading">Inclure l\'entête</string>
     <string name="save_heading_descr">Enregistrer l\'entête avec chaque point lors de l\'enregistrement d\'une trace.</string>
+    <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Montre des itinéraires cyclables de réseau de nœud</string>
+    <string name="rendering_value_walkingRoutesOSMCNodes_name">Réseaux de nœud</string>
+    <string name="personal_category_name">Personnel</string>
 </resources>

OsmAnd/res/values-hu/strings.xml

@@ -3234,4 +3234,9 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="dialogs_and_notifications_title">Párbeszédablakok és értesítések</string>
     <string name="dialogs_and_notifications_descr">OsmAnd használata közben megjelenő felugró üzenetek, párbeszédablakok és értesítések beállításai.</string>
     <string name="suggested_maps">Javasolt térképek</string>
+    <string name="add_new_profile_q">Hozzáadod az új \'%1$s\' profilt\?</string>
+    <string name="distance_and_address">%1$s • %2$s</string>
+    <string name="street_city">%1$s, %2$s</string>
+    <string name="personal_category_name">Személyes</string>
+    <string name="shared_string_downloading_formatted">%s letöltése</string>
 </resources>

OsmAnd/res/values-ia/strings.xml

@@ -1,2 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="add_new_profile_q">Adder nove profilo \'%1$s\'\?</string>
+    <string name="shared_string_downloading_formatted">Discargante %s</string>
+</resources>

OsmAnd/res/values-sk/strings.xml

@@ -3388,4 +3388,7 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="add_new_profile_q">Pridať nový profil \'%1$s\'\?</string>
     <string name="save_heading">Pridať nadpis</string>
     <string name="save_heading_descr">Pridať nadpis ku každému bodu trasy pri zázname.</string>
+    <string name="distance_and_address">%1$s • %2$s</string>
+    <string name="street_city">%1$s, %2$s</string>
+    <string name="personal_category_name">Osobné</string>
 </resources>

OsmAnd/res/values-tr/strings.xml

@@ -3350,4 +3350,7 @@
     <string name="add_new_profile_q">\'%1$s\' yeni profil ekle\?</string>
     <string name="save_heading">Başlığı dahil et</string>
     <string name="save_heading_descr">Kayıt sırasında her bir izleme noktasının başlığını kaydet.</string>
+    <string name="distance_and_address">%1$s • %2$s</string>
+    <string name="street_city">%1$s, %2$s</string>
+    <string name="personal_category_name">Kişisel</string>
 </resources>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -3386,4 +3386,8 @@
     <string name="add_new_profile_q">新增新的設定檔「%1$s」？</string>
     <string name="save_heading">包含標題</string>
     <string name="save_heading_descr">在錄製時將標題儲存到每個追蹤點。</string>
+    <string name="distance_and_address">%1$s • %2$s</string>
+    <string name="street_city">%1$s, %2$s</string>
+    <string name="personal_category_name">個人</string>
+    <string name="shared_string_downloading_formatted">正在下載 %s</string>
 </resources>

OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java

@@ -80,7 +80,7 @@ public class DiscountHelper {
 	public static void checkAndDisplay(final MapActivity mapActivity) {
 		OsmandApplication app = mapActivity.getMyApplication();
 		OsmandSettings settings = app.getSettings();
-		if (settings.DO_NOT_SHOW_STARTUP_MESSAGES.get() || !settings.INAPPS_READ.get()) {
+		if (settings.DO_NOT_SHOW_STARTUP_MESSAGES.get() || !settings.INAPPS_READ.get() || Version.isHuawei(app)) {
 			return;
 		}
 		if (mBannerVisible) {