Merge branch 'master' into imp_exp_osm_note

2020-10-21 15:56:41 +03:00 · 2020-10-21 15:56:41 +03:00 · 3bee12f626
commit 3bee12f626
parent d89d48474a 7670733f38
30 changed files with 295 additions and 104 deletions
--- a/OsmAnd-java/src/main/java/net/osmand/IProgress.java
+++ b/OsmAnd-java/src/main/java/net/osmand/IProgress.java
@ -45,7 +45,7 @@ public interface IProgress {
 		public boolean isInterrupted() {return false;}
 		
 		@Override
-		public boolean isIndeterminate() {return false;}
+		public boolean isIndeterminate() {return true;}
 		
 		@Override
 		public void finishTask() {}
--- a/OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java
+++ b/OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java
@ -823,7 +823,7 @@ public class MapPoiTypes {
 		}
 		String name = keyName;
 		name = name.replace('_', ' ');
-		return Algorithms.capitalizeFirstLetterAndLowercase(name);
+		return Algorithms.capitalizeFirstLetter(name);
 	}

 	public boolean isRegisteredType(PoiCategory t) {
--- a/OsmAnd-java/src/main/java/net/osmand/render/RenderingRule.java
+++ b/OsmAnd-java/src/main/java/net/osmand/render/RenderingRule.java
@ -41,7 +41,7 @@ public class RenderingRule {
 	public void init(Map<String, String> attributes) {
 		ArrayList<RenderingRuleProperty> props = new ArrayList<RenderingRuleProperty>(attributes.size());
 		intProperties = new int[attributes.size()];
-		floatProperties = null;
+		floatProperties = new float[attributes.size()];
 		attributesRef = null;
 		int i = 0;
 		Iterator<Entry<String, String>> it = attributes.entrySet().iterator();
@ -58,14 +58,13 @@ public class RenderingRule {
 					attributesRef[i] = storage.getRenderingAttributeRule(vl.substring(1));
 				} else if (property.isString()) {
 					intProperties[i] = storage.getDictionaryValue(vl);
-				} else if (property.isFloat()) {
-					if (floatProperties == null) {
-						// lazy creates
-						floatProperties = new float[attributes.size()];
-					}
-					floatProperties[i] = property.parseFloatValue(vl);
-					intProperties[i] = property.parseIntValue(vl);
 				} else {
+					float floatVal = property.parseFloatValue(vl);
+//					if (floatProperties == null && floatVal != 0) {
+//						// lazy creates
+//						floatProperties = new float[attributes.size()];
+						floatProperties[i] = floatVal;
+//					}
 					intProperties[i] = property.parseIntValue(vl);
 				}
 				i++;
@ -95,7 +94,7 @@ public class RenderingRule {
 	
 	public float getFloatPropertyValue(String property) {
 		int i = getPropertyIndex(property);
-		if(i >= 0 && floatProperties != null){
+		if (i >= 0) {
 			return floatProperties[i];
 		}
 		return 0;
--- a/OsmAnd-java/src/main/java/net/osmand/render/RenderingRuleProperty.java
+++ b/OsmAnd-java/src/main/java/net/osmand/render/RenderingRuleProperty.java
@ -155,12 +155,7 @@ public class RenderingRuleProperty {
 			try {
 				int colon = value.indexOf(':');
 				if(colon != -1) {
-					int c  = 0;
-					if(colon > 0) {
-						c += (int) Float.parseFloat(value.substring(0, colon));
-					}
-					c += (int) Float.parseFloat(value.substring(colon + 1));
-					return c;
+					return (int) Float.parseFloat(value.substring(colon + 1));
 				}
 				return (int) Float.parseFloat(value);
 			} catch (NumberFormatException e) {
@ -190,30 +185,35 @@ public class RenderingRuleProperty {
 			} catch (NumberFormatException e) {
 				log.error("Rendering parse " + value + " in " + attrName);
 			}
-			return -1;
+			return 0;
 		} else {
 			return -1;
 		}
 	}
 	
-	public float parseFloatValue(String value){
-		if(type == FLOAT_TYPE){
-			try {
+	public float parseFloatValue(String value) {
+		try {
+			if (type == FLOAT_TYPE) {
 				int colon = value.indexOf(':');
-				if(colon != -1) {
-					if(colon > 0) {
+				if (colon != -1) {
+					if (colon > 0) {
 						return Float.parseFloat(value.substring(0, colon));
-					} 
+					}
 					return 0;
 				}
 				return Float.parseFloat(value);
-			} catch (NumberFormatException e) {
-				log.error("Rendering parse " + value + " in " + attrName);
+
+			} else if (type == INT_TYPE) {
+				int colon = value.indexOf(':');
+				if (colon != -1 && colon > 0) {
+					return Float.parseFloat(value.substring(0, colon));
+				}
+				return 0;
 			}
-			return -1;
-		} else {
-			return -1;
+		} catch (NumberFormatException e) {
+			log.error("Rendering parse " + value + " in " + attrName);
 		}
+		return 0;
 	}
 	
 	
--- a/OsmAnd-java/src/main/java/net/osmand/render/RenderingRuleStorageProperties.java
+++ b/OsmAnd-java/src/main/java/net/osmand/render/RenderingRuleStorageProperties.java
@ -244,8 +244,6 @@ public class RenderingRuleStorageProperties {
 		R_TEXT_HALO_COLOR = registerRuleInternal(RenderingRuleProperty.createOutputColorProperty(TEXT_HALO_COLOR));
 		R_TEXT_SIZE = registerRuleInternal(RenderingRuleProperty.createOutputFloatProperty(TEXT_SIZE));
 		R_TEXT_ORDER = registerRuleInternal(RenderingRuleProperty.createOutputIntProperty(TEXT_ORDER));
-		R_ICON_ORDER = registerRuleInternal(RenderingRuleProperty.createOutputIntProperty(ICON_ORDER));
-		R_ICON_VISIBLE_SIZE = registerRuleInternal(RenderingRuleProperty.createOutputFloatProperty(ICON_VISIBLE_SIZE));
 		R_TEXT_MIN_DISTANCE = registerRuleInternal(RenderingRuleProperty.createOutputFloatProperty(TEXT_MIN_DISTANCE));
 		R_TEXT_SHIELD = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty(TEXT_SHIELD));
 		
@ -265,7 +263,9 @@ public class RenderingRuleStorageProperties {
 		R_ICON_3 = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty("icon_3"));
 		R_ICON_4 = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty("icon_4"));
 		R_ICON_5 = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty("icon_5"));
+		R_ICON_ORDER = registerRuleInternal(RenderingRuleProperty.createOutputIntProperty(ICON_ORDER));
 		R_SHIELD = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty(SHIELD));
+		R_ICON_VISIBLE_SIZE = registerRuleInternal(RenderingRuleProperty.createOutputFloatProperty(ICON_VISIBLE_SIZE));

 		// polygon/way
 		R_COLOR = registerRuleInternal(RenderingRuleProperty.createOutputColorProperty(COLOR));
--- a/OsmAnd-telegram/res/values-da/strings.xml
+++ b/OsmAnd-telegram/res/values-da/strings.xml
@ -269,4 +269,8 @@
    <string name="last_response_duration">Sidste svar: %1$s siden</string>
    <string name="duration_ago">%1$s siden</string>
    <string name="shared_string_error_short">ERR</string>
+    <string name="shared_string_export">Eksporter</string>
+    <string name="logcat_buffer">Logcat-buffer</string>
+    <string name="logcat_buffer_descr">Kontroller og del detaljerede logfiler for programmet</string>
+    <string name="send_report">Send rapport</string>
 </resources>
--- a/OsmAnd-telegram/res/values-tr/strings.xml
+++ b/OsmAnd-telegram/res/values-tr/strings.xml
@ -233,7 +233,7 @@
    <string name="osmand_service_descr">OsmAnd Tracker, ekran kapalıyken arka planda çalışır.</string>
    <string name="share_location">Konumu paylaş</string>
    <string name="sharing_location">Konum paylaşılıyor</string>
-    <string name="process_service">OsmAnd Tracker servisi</string>
+    <string name="process_service">OsmAnd Tracker hizmeti</string>
    <string name="osmand_logo">OsmAnd logosu</string>
    <string name="install_osmand_dialog_message">Önce OsmAnd\'ın ücretsiz veya ücretli sürümünü yüklemeniz gerekmektedir</string>
    <string name="install_osmand">OsmAnd\'ı yükle</string>
--- a/OsmAnd/res/layout/poi_tag_list_item.xml
+++ b/OsmAnd/res/layout/poi_tag_list_item.xml
@ -17,13 +17,12 @@
        android:layout_marginEnd="@dimen/content_padding">

        <com.google.android.material.textfield.MaterialAutoCompleteTextView
+            style="@style/Widget.MaterialComponents.AutoCompleteTextView.FilledBox"
            android:id="@+id/tagEditText"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:minHeight="@dimen/wpt_list_item_height"
            android:hint="@string/hint_tag"
-            android:gravity="bottom"
-            android:paddingBottom="@dimen/text_margin_small"
            tools:text="Tag text"/>

    </com.google.android.material.textfield.TextInputLayout>
@ -34,12 +33,11 @@
        android:layout_weight="1">

        <com.google.android.material.textfield.MaterialAutoCompleteTextView
+            style="@style/Widget.MaterialComponents.AutoCompleteTextView.FilledBox"
            android:id="@+id/valueEditText"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:minHeight="@dimen/wpt_list_item_height"
-            android:gravity="bottom"
-            android:paddingBottom="@dimen/text_margin_small"
            android:hint="@string/hint_value"
            tools:text="Value text"/>

--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@ -3915,4 +3915,9 @@
    <string name="osm_edit_logout_success">تسجيل الخروج بنجاح</string>
    <string name="file_already_imported">تم استيراد الملف بالفعل في أوسماند</string>
    <string name="use_two_phase_routing">استخدام خوارزمية توجيه من مرحلتين A*</string>
+    <string name="message_need_calculate_route_before_show_graph">%1$s البيانات المتوفرة فقط على الطرق ، تحتاج إلى حساب طريق باستخدام \"الطريق بين النقاط\" للحصول عليها.</string>
+    <string name="message_graph_will_be_available_after_recalculation">في انتظار إعادة حساب الطريق
+\nسيتوفر الرسم البياني بعد إعادة الحساب.</string>
+    <string name="snowmobile_render_descr">للقيادة على الجليد مع طرق ومسارات مخصصة.</string>
+    <string name="shared_string_graph">رسم بياني</string>
 </resources>
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -3925,4 +3925,8 @@
    <string name="complex_routing_descr">Zwei-Phasen-Routenberechnung für die Autonavigation.</string>
    <string name="use_native_pt">Native ÖPNV Entwicklung</string>
    <string name="use_native_pt_desc">Wechseln zu Java (sicher) Berechnung des ÖPNV-Routings</string>
+    <string name="osm_edit_logout_success">Abmeldung erfolgreich</string>
+    <string name="file_already_imported">Datei wurde bereits in OsmAnd importiert</string>
+    <string name="perform_oauth_authorization">Anmelden über OAuth</string>
+    <string name="clear_osm_token">OpenStreetMap OAuth-Token löschen</string>
 </resources>
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@ -73,7 +73,7 @@
    <string name="lang_vo">Volapuko</string>
    <string name="osmand_play_title_30_chars">OsmAnd Mapoj kaj Navigado</string>
    <string name="shared_string_reverse_order">Inversa ordigo</string>
-    <string name="switch_start_finish">Anstataŭigi komencpunkton per finpunkto</string>
+    <string name="switch_start_finish">Anstataŭigi komencpunkton per celo</string>
    <string name="rendering_attr_hideIcons_name">Emblemoj de interesejoj</string>
    <string name="item_removed">Elemento forigita</string>
    <string name="n_items_removed">elementoj forigitaj</string>
@ -742,7 +742,7 @@
    <string name="osmo_edit_color">Vidiga koloro</string>
    <string name="int_days">tagoj</string>
    <string name="osmo_connect_menu">Konekti</string>
-    <string name="use_points_as_intermediates">Prikalkuli kurson inter punktojn</string>
+    <string name="use_points_as_intermediates">Kalkuli kurson inter punktoj</string>
    <string name="always_center_position_on_map">Ĉiam montri centrigitan pozicion</string>
    <string name="localization_pref_title">Loko</string>
    <string name="index_item_nation_addresses">adresoj tutmondaj</string>
@ -3357,7 +3357,7 @@
    <string name="file_import_error">Eraro dum enporti %1$s: %2$s</string>
    <string name="file_imported_successfully">%1$s enportita.</string>
    <string name="rendering_value_white_name">Blanka</string>
-    <string name="swap_two_places">Anstataŭigi %1$s per %2$s</string>
+    <string name="swap_two_places">Anstataŭigi: %1$s ⇄ %2$s</string>
    <string name="route_start_point">Komencpunkto</string>
    <string name="swap_start_and_destination">Anstataŭigi komencpunkton per celo</string>
    <string name="simulate_your_location_gpx_descr">Simuli vian pozicion uzante registritan GPX‑kurson.</string>
@ -3925,4 +3925,11 @@
    <string name="perform_oauth_authorization">Ensaluti per OAuth</string>
    <string name="clear_osm_token">Forigi ĵetonon OpenStreetMap OAuth</string>
    <string name="osm_edit_logout_success">Sukcese elsalutinta</string>
+    <string name="snowmobile_render_descr">Por veturi per motorsledo sur dediĉitaj vojoj.</string>
+    <string name="file_already_imported">Dosiero jam estas enportita al OsmAnd</string>
+    <string name="use_two_phase_routing">Uzi 2-fazan A* algoritmon de navigo</string>
+    <string name="shared_string_graph">Diagramo</string>
+    <string name="message_need_calculate_route_before_show_graph">Datumoj de %1$s estas disponeblaj nur por vojoj, vi devas kalkuli la kurson uzante “kalkuli kurson inter punktoj” por akiri ĝin.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Atendado ĝis la kurso estos rekalkulita.
+\nDiagramo estos videbla post rekalkulado.</string>
 </resources>
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@ -3568,8 +3568,8 @@
    <string name="poi_health_specialty_radiotheraphy_yes">Radioterapia</string>
    <string name="poi_hazard">Advertencia de peligro</string>
    <string name="poi_rtsa_scale_filter">Categoría de dificultad</string>
-    <string name="poi_rtsa_scale_nc">н/к (sin categoría)</string>
-    <string name="poi_rtsa_scale_nc_asterisk">н/к* (sin categoría, posible peligro)</string>
+    <string name="poi_rtsa_scale_nc">s/c (sin categoría)</string>
+    <string name="poi_rtsa_scale_nc_asterisk">s/c* (sin categoría, posible peligro)</string>
    <string name="poi_rtsa_scale_1a">1A</string>
    <string name="poi_rtsa_scale_1a_asterisk">1A*</string>
    <string name="poi_rtsa_scale_1b">1B</string>
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@ -3929,4 +3929,11 @@
    <string name="perform_oauth_authorization">Ingresar a través de OAuth</string>
    <string name="clear_osm_token">Vaciar llave OAuth de OpenStreetMap</string>
    <string name="osm_edit_logout_success">Sesión finalizada</string>
+    <string name="snowmobile_render_descr">Para caminos y senderos exclusivos de motos de nieve.</string>
+    <string name="file_already_imported">El archivo ya fue importado en OsmAnd</string>
+    <string name="use_two_phase_routing">Usar el algoritmo de enrutamiento A* de 2 fases</string>
+    <string name="shared_string_graph">Gráfico</string>
+    <string name="message_need_calculate_route_before_show_graph">%1$s datos disponibles sólo en los caminos, necesitas calcular una ruta usando «Ruta entre puntos» para obtenerla.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Espera el recálculo de la ruta.
+\nEl gráfico estará disponible después del recálculo.</string>
 </resources>
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@ -3902,4 +3902,14 @@
    <string name="osm_edit_logout_success">Déconnexion réussie</string>
    <string name="file_already_imported">Le fichier est déjà importé dans OsmAnd</string>
    <string name="use_two_phase_routing">Utiliser un algorithme de routage A* à 2 phases</string>
+    <string name="osm_live_payment_subscription_management_hw">Le paiement sera débité de votre compte AppGallery dès confirmation de l\'achat.
+\n
+\nA moins qu\'il ne soit annulé avant sa date de renouvellement, l\'abonnement sera automatiquement débité à chaque échéance (mensuelle / trimestrielle / annuelle).
+\n
+\nVous pouvez gérer et annuler vos abonnements dans vos paramètres AppGallery.</string>
+    <string name="message_need_calculate_route_before_show_graph">Seulement %1$s données disponibles sur les routes. Vous devez calculer l\'itinéraire via \"Itinéraire entre 2 points\".</string>
+    <string name="message_graph_will_be_available_after_recalculation">Recalcul de l\'itinéraire en cours.
+\nLe graphique sera disponible à l\'issue du calcul.</string>
+    <string name="snowmobile_render_descr">Pour la conduite en motoneige avec des routes et des pistes dédiées.</string>
+    <string name="shared_string_graph">Graphique</string>
 </resources>
--- a/OsmAnd/res/values-iw/strings.xml
+++ b/OsmAnd/res/values-iw/strings.xml
@ -3933,4 +3933,9 @@
    <string name="osm_edit_logout_success">היציאה הצליחה</string>
    <string name="file_already_imported">הקובץ כבר ייובא אל OsmAnd</string>
    <string name="use_two_phase_routing">להשתמש באלגוריתם חישוב מסלול דו־שלבי A*‎</string>
+    <string name="snowmobile_render_descr">לנהיגה ברכבי שלג עם דרכים ומסלולים יעודיים.</string>
+    <string name="message_need_calculate_route_before_show_graph">הנתונים של %1$s זמינים בדרכים בלבד, עליך לחשב מסלול באמצעות „מסלול בין נקודות” כדי לקבל אותם.</string>
+    <string name="shared_string_graph">תרשים</string>
+    <string name="message_graph_will_be_available_after_recalculation">נא להמתין לחישוב המסלול מחדש.
+\nהתרשים יהיה זמין לאחר החישוב מחדש.</string>
 </resources>
--- a/OsmAnd/res/values-ja/phrases.xml
+++ b/OsmAnd/res/values-ja/phrases.xml
@ -50,8 +50,8 @@
    <string name="poi_internet_access">インターネット有り</string>
    <string name="poi_entertainment">レジャー</string>
    <string name="poi_club">クラブ</string>
-    <string name="poi_sustenance">食堂</string>
-    <string name="poi_cafe_and_restaurant">軽食</string>
+    <string name="poi_sustenance">飲食店</string>
+    <string name="poi_cafe_and_restaurant">カフェ・レストラン</string>
    <string name="poi_service">サービス</string>
    <string name="poi_craft">工芸</string>
    <string name="poi_finance">金融機関</string>
@ -568,9 +568,9 @@
    <string name="poi_park">公園</string>
    <string name="poi_recreation_ground">レクリエーション広場</string>
    <string name="poi_village_green">共有地</string>
-    <string name="poi_cafe">喫茶店・カフェ</string>
+    <string name="poi_cafe">カフェ</string>
    <string name="poi_biergarten">ビアガーデン</string>
-    <string name="poi_restaurant">レストラン・食堂</string>
+    <string name="poi_restaurant">レストラン</string>
    <string name="poi_fast_food">ファーストフード</string>
    <string name="poi_bar">バー・立ち呑み屋</string>
    <string name="poi_food_court">フードコート</string>
@ -1012,7 +1012,7 @@
    <string name="poi_entrance_main">正面玄関</string>
    <string name="poi_entrance">入り口</string>
    <string name="poi_entrance_exit">出口</string>
-    <string name="poi_highway_crossing">高速道路の横断歩道</string>
+    <string name="poi_highway_crossing">横断歩道</string>
    <string name="poi_opening_hours">営業時間</string>
    <string name="poi_collection_times">収集時間</string>
    <string name="poi_description">詳細</string>
@ -3834,4 +3834,5 @@
    <string name="poi_borough">行政区</string>
    <string name="poi_give_box">ギブボックス(提供品置場)</string>
    <string name="poi_fire_hydrant_type_pipe">簡易給水栓</string>
+    <string name="poi_fuel_lng">液化天然ガス</string>
 </resources>
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@ -927,10 +927,10 @@ POIの更新は利用できません</string>
    <string name="free_version_message">このOsmAnd 無料版はダウンロード数が%1$s個に制限されており、オフラインでのWikipedia記事利用もサポートしていません。</string>
    <string name="free_version_title">無料版</string>
    <string name="poi_context_menu_showdescription">POIの説明文を表示</string>
-    <string name="index_name_north_america">北米</string>
+    <string name="index_name_north_america">北アメリカ</string>
    <string name="index_name_us">アメリカ合衆国</string>
-    <string name="index_name_central_america">中米</string>
-    <string name="index_name_south_america">南米</string>
+    <string name="index_name_central_america">中央アメリカ</string>
+    <string name="index_name_south_america">南アメリカ</string>
    <string name="index_name_europe">ヨーロッパ</string>
    <string name="index_name_france">ヨーロッパ - フランス</string>
    <string name="index_name_germany">ヨーロッパ - ドイツ</string>
@ -1936,7 +1936,7 @@ POIの更新は利用できません</string>
    <string name="app_mode_bus">バス</string>
    <string name="app_mode_train">鉄道</string>
    <string name="current_track">現在の経路</string>
-    <string name="map_widget_battery">バッテリーレベル</string>
+    <string name="map_widget_battery">バッテリー残量</string>
    <string name="change_markers_position">マーカーの位置を変更</string>
    <string name="move_marker_bottom_sheet_title">マップ画面のドラッグでマーカー位置を調整できます</string>
    <!-- string name="lat_lon_pattern">"緯度:%1$.5f  経度:%2$.5f"</string -->
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@ -3923,4 +3923,9 @@
    <string name="osm_edit_logout_success">Saída bem sucedida</string>
    <string name="file_already_imported">O arquivo já foi importado para OsmAnd</string>
    <string name="use_two_phase_routing">Use o algoritmo de roteamento 2-phase A *</string>
+    <string name="snowmobile_render_descr">Para dirigir em motos de neve com estradas e trilhas exclusivas.</string>
+    <string name="shared_string_graph">Gráfico</string>
+    <string name="message_need_calculate_route_before_show_graph">Dados de %1$s disponíveis apenas nas estradas, você precisa calcular uma rota usando “Rota entre pontos” para obtê-la.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Aguarde o recálculo da rota.
+\nO gráfico estará disponível após o recálculo.</string>
 </resources>
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@ -3930,4 +3930,9 @@
    <string name="osm_edit_logout_success">Logout bem sucedido</string>
    <string name="file_already_imported">O ficheiro já é importado em OsmAnd</string>
    <string name="use_two_phase_routing">Usar algoritmo de roteamento de 2 fases A*</string>
+    <string name="snowmobile_render_descr">Para a condução de motos de neve com estradas e pistas dedicadas.</string>
+    <string name="shared_string_graph">Gráfico</string>
+    <string name="message_need_calculate_route_before_show_graph">%1$s dados disponíveis apenas nas estradas, precisa calcular uma rota a usar \"Rota entre pontos\" para obtê-la.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Espere pelo recalculo da rota.
+\nO gráfico estará disponível após o recalculo.</string>
 </resources>
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@ -1737,7 +1737,7 @@
    <string name="poi_animal_boarding_cat">Тип приюта: для кошек</string>
    <string name="poi_animal_boarding_dog_cat">Тип приюта: для собак и кошек</string>
    <string name="poi_animal_boarding_horse">Тип приюта: для лошадей</string>
-    <string name="poi_historic_aircraft">Исторический самолёт</string>
+    <string name="poi_historic_aircraft">Историческое воздушное судно</string>
    <string name="poi_honey">Мёд</string>
    <string name="poi_elevator_yes">С лифтом</string>
    <string name="poi_elevator_no">Без лифта</string>
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@ -1336,7 +1336,7 @@
    <string name="local_index_tile_data_name">Данные о тайлах: %1$s</string>
    <string name="base_world_map">Обзорная карта мира</string>
    <string name="edit_tilesource_expiration_time">Время действия (в минутах)</string>
-    <string name="app_mode_aircraft">Самолёт</string>
+    <string name="app_mode_aircraft">Воздушное судно</string>
    <string name="app_mode_boat">Лодка</string>
    <string name="app_mode_hiking">Пеший туризм</string>
    <string name="app_mode_motorcycle">Мотоцикл</string>
@ -3242,8 +3242,8 @@
    <string name="logcat_buffer">Буфер Logcat</string>
    <string name="plugins_settings">Настройки плагинов</string>
    <string name="language_and_output">Язык и вывод</string>
-    <string name="change_data_storage_full_description">Переместить файлы данных OsmAnd в новое место назначения\? 
-\n%1$s &gt; %2$s</string>
+    <string name="change_data_storage_full_description">Переместить файлы данных OsmAnd в новое место назначения\?
+\n%1$s → %2$s</string>
    <string name="shared_string_by_default">По умолчанию</string>
    <string name="data_storage_preference_summary">%1$s • %2$s</string>
    <string name="data_storage_space_description">%1$s ГБ свободно (из %2$s ГБ)</string>
@ -3349,7 +3349,7 @@
    <string name="select_color">Выберите цвет</string>
    <string name="edit_profiles_descr">Вы не можете удалить стандартные профили OsmAnd, но вы можете отключить их на предыдущем экране или переместить вниз.</string>
    <string name="edit_profiles">Редактировать профили</string>
-    <string name="select_nav_profile_dialog_message">Режим навигации определяет правила расчета маршрутов.</string>
+    <string name="select_nav_profile_dialog_message">Режим навигации определяет правила расчёта маршрутов.</string>
    <string name="profile_appearance">Внешний вид профиля</string>
    <string name="choose_icon_color_name">Значок, цвет и имя</string>
    <string name="reorder_profiles">Редактировать список профилей</string>
@ -3922,4 +3922,6 @@
    <string name="osm_edit_logout_success">Выход выполнен</string>
    <string name="shared_string_graph">График</string>
    <string name="file_already_imported">Файл уже импортирован</string>
+    <string name="message_graph_will_be_available_after_recalculation">Дождитесь пересчёта маршрута.
+\nГрафик будет доступен после пересчёта.</string>
 </resources>
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@ -89,7 +89,7 @@
    <string name="routing_preferences_descr">Preferèntzias de càrculu de s’àndala</string>
    <string name="speech_rate_descr">Imposta sa lestresa de sa boghe de sintetizatzione vocale (TTS).</string>
    <string name="speech_rate">Lestresa de sa boghe</string>
-    <string name="complex_route_calculation_failed">Càrculu lestru de s’àndala fallidu (%s), rinviu a su càlculu lentu.</string>
+    <string name="complex_route_calculation_failed">Càrculu lestru de s’àndala fallidu (%s), rinviu a su càrculu lentu.</string>
    <string name="disable_complex_routing_descr">Istuda su carculu de s’àndala in duas fases pro s’impreu in màchina.</string>
    <string name="disable_complex_routing">Istuta su carculu cumplessu de s’àndala</string>
    <string name="amenity_type_seamark">Pidagnu</string>
@ -1540,7 +1540,7 @@
    <string name="routing_attr_height_description">Dislinda s’artària de su veìculu permìtida pro sos caminos.</string>
    <string name="routing_attr_avoid_borders_description">Non faghet rugrare sas fronteras intre sos istados</string>
    <string name="use_fast_recalculation">Recàrculu intelligente de s’àndala</string>
-    <string name="use_fast_recalculation_desc">Pro biàgios longos, torra a carculare petzi su cantu initziale de s’àndala.</string>
+    <string name="use_fast_recalculation_desc">Torra a carculare petzi su cantu initziale de s’àndala. Podet èssere impreadu pro biàgios longos.</string>
    <string name="rendering_value_disabled_name">Disabilitadu</string>
    <string name="shared_string_logoff">Essi</string>
    <string name="rendering_value_walkingRoutesScopeOSMC_name">Coloratzione a segunda de sa casta (afiliatzione) de àndala</string>
@ -3824,8 +3824,8 @@
    <string name="overwrite_track">Subraiscrie sa rasta</string>
    <string name="save_as_new_track">Sarva comente una rasta noa</string>
    <string name="reverse_route">Fùrria s\'àndala</string>
-    <string name="route_between_points_whole_track_button_desc">Sa rasta intrea at a èssere torrada a calculare impreende su profilu ischertadu.</string>
-    <string name="route_between_points_next_segment_button_desc">Petzi su segmentu imbeniente at a èssere torradu a calculare impreende su profilu ischertadu.</string>
+    <string name="route_between_points_whole_track_button_desc">Sa rasta intrea at a èssere torrada a carculare impreende su profilu ischertadu.</string>
+    <string name="route_between_points_next_segment_button_desc">Petzi su segmentu imbeniente at a èssere torradu a carculare impreende su profilu ischertadu.</string>
    <string name="route_between_points_desc">Ischerta comente connètere sos puntos: cun una lìnia reta o calculende un\'àndala intre issos comente dislindadu inoghe in suta.</string>
    <string name="whole_track">Rasta intrea</string>
    <string name="next_segment">Segmentu imbeniente</string>
@ -3926,4 +3926,9 @@
    <string name="osm_edit_logout_success">Essida fata chene problemas</string>
    <string name="file_already_imported">Su documentu est giai importadu in OsmAnd</string>
    <string name="use_two_phase_routing">Imprea un\'algoritmu de càrculu de s\'àndala A* a duas fases</string>
+    <string name="snowmobile_render_descr">Pro sa ghia de motoislitas cun caminos e rastas dedicados.</string>
+    <string name="message_need_calculate_route_before_show_graph">Datos %1$s a disponimentu in sos caminos ebbia. Depes carculare un\'àndala impreende \"Àndala intre puntos\" pro los otènnere.</string>
+    <string name="shared_string_graph">Gràficu</string>
+    <string name="message_graph_will_be_available_after_recalculation">Iseta su càrculu nou de s\'àndala.
+\nSu gràficu at a èssere a disponimentu a pustis de su càrculu.</string>
 </resources>
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@ -3926,4 +3926,11 @@
    <string name="perform_oauth_authorization">Prihlásiť pomocou OAuth</string>
    <string name="clear_osm_token">Vymazať token OpenStreetMap OAuth</string>
    <string name="osm_edit_logout_success">Odhlásenie úspešné</string>
+    <string name="snowmobile_render_descr">Pre jazdu na snežnom vozidle po na to určených cestách.</string>
+    <string name="file_already_imported">Súbor je už importovaný v OsmAnd</string>
+    <string name="use_two_phase_routing">Použiť dvojfázový algoritmus A* na výpočet trasy</string>
+    <string name="shared_string_graph">Graf</string>
+    <string name="message_need_calculate_route_before_show_graph">Údaje %1$s sú dostupné len na cestách, pre ich získanie musíte vypočítať trasu pomocou “Trasa medzi bodmi”.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Počkajte na prepočet trasy.
+\nGraf bude dostupný po prepočte.</string>
 </resources>
--- a/OsmAnd/res/values-tr/phrases.xml
+++ b/OsmAnd/res/values-tr/phrases.xml
@ -269,7 +269,7 @@
    <string name="poi_motorway_junction">Otoyol kavşağı</string>
    <string name="poi_junction">Birleşim</string>
    <string name="poi_rest_area">Dinlenme alanı</string>
-    <string name="poi_water_well">Su kaynağı</string>
+    <string name="poi_water_well">Su kuyusu</string>
    <string name="poi_standpipe">Yangın musluğu</string>
    <string name="poi_water_works">Su işleri</string>
    <string name="poi_boatyard">Tersane</string>
@ -841,7 +841,7 @@
    <string name="poi_sinkhole">Düden</string>
    <string name="poi_waterfall">Şelale</string>
    <string name="poi_river">Irmak</string>
-    <string name="poi_stream">Akış</string>
+    <string name="poi_stream">Dere</string>
    <string name="poi_rapids">Nehrin akıntılı yeri</string>
    <string name="poi_stone">Değerli taş</string>
    <string name="poi_cape">Pelerin</string>
@ -1068,7 +1068,7 @@
    <string name="poi_takeaway">Paket servisi</string>
    <string name="poi_cocktails">Kokteyller</string>
    <string name="poi_microbrewery">Mikro bira imalathanesi</string>
-    <string name="poi_beauty_salon_service">Servis</string>
+    <string name="poi_beauty_salon_service">Hizmet</string>
    <string name="poi_recycling_accepted_waste">Kabul edilen atık</string>
    <string name="poi_fireplace">Şömine</string>
    <string name="poi_seasonal">Mevsimlik</string>
@ -1184,7 +1184,7 @@
    <string name="poi_climbing_crag_filter">Tırmanma kayalığı</string>
    <string name="poi_climbing_crag">Evet</string>
    <string name="poi_historic_tank">Tarihi tank</string>
-    <string name="poi_snowmobile_filter">Kar aracı erişimi</string>
+    <string name="poi_snowmobile_filter">Kar arabası erişimi</string>
    <string name="poi_access_bus">Otobüs erişimi</string>
    <string name="poi_access_caravan">Karavan erişimi</string>
    <string name="poi_access_motorhome">Motokaravan erişimi</string>
@ -3047,4 +3047,87 @@
    <string name="poi_counselling_type_child_guidance_yes">Danışma (çocuk rehberliği): evet</string>
    <string name="poi_counselling_type_antenatal_yes">Danışma (doğum öncesi): evet</string>
    <string name="poi_counselling_type_antenatal_no">Danışma (doğum öncesi): hayır</string>
+    <string name="poi_spaceport">Uzay üssü</string>
+    <string name="poi_animal_shelter_purpose_release_no">Doğaya salma: hayır</string>
+    <string name="poi_animal_shelter_purpose_release_yes">Doğaya salma: evet</string>
+    <string name="poi_animal_shelter_purpose_adoption_no">Sahiplenme: hayır</string>
+    <string name="poi_animal_shelter_purpose_adoption_yes">Sahiplenme: evet</string>
+    <string name="poi_owner">Sahibi</string>
+    <string name="poi_resort_kids_camp">Çocuk kampı</string>
+    <string name="poi_photo_studio">Fotoğraf stüdyosu</string>
+    <string name="poi_nutrition_supplements">Beslenme takviyeleri</string>
+    <string name="poi_feeding_place">Hayvan besleme yeri</string>
+    <string name="poi_support_tower">Destek: kule</string>
+    <string name="poi_support_roof">Destek: çatı</string>
+    <string name="poi_support_suspended">Destek: askıda</string>
+    <string name="poi_support_ceiling">Destek: tavan</string>
+    <string name="poi_support_billboard">Destek: reklam panosu</string>
+    <string name="poi_support_ground">Destek: zemin</string>
+    <string name="poi_support_pedestal">Destek: kaide</string>
+    <string name="poi_support_tree">Destek: ağaç</string>
+    <string name="poi_support_wall_mounted">Destek: duvar</string>
+    <string name="poi_support_pole">Destek: direk</string>
+    <string name="poi_date_no">Tarih ekranı: hayır</string>
+    <string name="poi_date_yes">Tarih ekranı</string>
+    <string name="poi_pumping_station">Pompa istasyonu</string>
+    <string name="poi_generator_output_biogas_yes">Çıkış: biyogaz</string>
+    <string name="poi_generator_output_biogas">Biyogazın çıkış gücü</string>
+    <string name="poi_generator_output_vacuum_yes">Çıkış: vakum</string>
+    <string name="poi_generator_output_compressed_air_yes">Çıkış: basınçlı hava</string>
+    <string name="poi_generator_output_compressed_air">Basınçlı havanın çıkış gücü</string>
+    <string name="poi_generator_output_cold_water_yes">Çıkış: soğuk su</string>
+    <string name="poi_generator_output_hot_air_yes">Çıkış: sıcak hava</string>
+    <string name="poi_generator_output_steam_yes">Çıkış: buhar</string>
+    <string name="poi_generator_output_hot_water_yes">Çıkış: sıcak su</string>
+    <string name="poi_generator_output_hot_water">Sıcak suyun çıkış gücü</string>
+    <string name="poi_generator_output_electricity_no">Çıkış (elektrik): hayır</string>
+    <string name="poi_generator_output_electricity_yes">Çıkış: elektrik</string>
+    <string name="poi_generator_output_electricity">Çıkış gücü</string>
+    <string name="poi_voltage">Gerilim</string>
+    <string name="poi_greenhouse_horticulture">Sera bahçeciliği</string>
+    <string name="poi_observatory_type_gravitational">Yer çekimi</string>
+    <string name="poi_observatory_type_meteorological">Meteorolojik</string>
+    <string name="poi_health_amenity_type_scales">Kamu kullanımı için ölçekler</string>
+    <string name="poi_free_flying_guest_guidelines_no">Konuk yönergeleri: hayır</string>
+    <string name="poi_free_flying_guest_guidelines_yes">Konuk yönergeleri: evet</string>
+    <string name="poi_free_flying_no_flight_time">Uçuşa yasak zaman (serbest uçuş)</string>
+    <string name="poi_free_flying_site_orientation_nw">Serbest uçuş alanı yönlendirmesi: KB</string>
+    <string name="poi_free_flying_site_orientation_w">Serbest uçuş alanı yönlendirmesi: B</string>
+    <string name="poi_free_flying_site_orientation_sw">Serbest uçuş alanı yönlendirmesi: GB</string>
+    <string name="poi_free_flying_site_orientation_s">Serbest uçuş alanı yönlendirmesi: G</string>
+    <string name="poi_free_flying_site_orientation_se">Serbest uçuş alanı yönlendirmesi: GD</string>
+    <string name="poi_free_flying_site_orientation_e">Serbest uçuş alanı yönlendirmesi: D</string>
+    <string name="poi_free_flying_site_orientation_ne">Serbest uçuş alanı yönlendirmesi: KD</string>
+    <string name="poi_free_flying_site_orientation_n">Serbest uçuş alanı yönlendirmesi: K</string>
+    <string name="poi_water_place_access_multifamilies">Birden çok aile</string>
+    <string name="poi_water_place_access_family">Aile</string>
+    <string name="poi_water_place_access_community">Topluluk</string>
+    <string name="poi_water_supply_bottled_water">Şişelenmiş su</string>
+    <string name="poi_water_supply_water_tank">Su deposu</string>
+    <string name="poi_water_supply_water_trucking">Su tankeri</string>
+    <string name="poi_water_supply_borehole">Sondaj</string>
+    <string name="poi_water_supply_pump">Pompa</string>
+    <string name="poi_water_supply_running_water">Akan su</string>
+    <string name="poi_water_supply_pipeline">Boru hattı</string>
+    <string name="poi_water_supply_water_well">Su kuyusu</string>
+    <string name="poi_water_purification_aquatabs">Su arıtma tabletleri</string>
+    <string name="poi_water_purification_reverse_osmosis">Ters osmoz</string>
+    <string name="poi_water_purification_chlorine">Klor</string>
+    <string name="poi_visibility_area">Görünürlük: alan</string>
+    <string name="poi_surface_tartan">Tartan</string>
+    <string name="poi_government_social_services">Sosyal hizmetler</string>
+    <string name="poi_government_social_security">Sosyal güvenlik</string>
+    <string name="poi_electronics_repair_appliance">Elektronik tamir: alet</string>
+    <string name="poi_display_sundial_yes">Güneş saati</string>
+    <string name="poi_display_digital_yes">Dijital ekran</string>
+    <string name="poi_display_analog_yes">Analog ekran</string>
+    <string name="poi_display_no">Ekran: hayır</string>
+    <string name="poi_display_yes">Ekran: evet</string>
+    <string name="poi_dispensing_yes">Evet</string>
+    <string name="poi_fire_hydrant_style_water_source_cistern">Su deposu</string>
+    <string name="poi_fire_hydrant_style_water_source_stream">Dere</string>
+    <string name="poi_fire_hydrant_type_dry_barrel">Kuru varil</string>
+    <string name="poi_fire_hydrant_type_pillar">Sütun</string>
+    <string name="poi_fire_hydrant_type_pond">Gölet</string>
+    <string name="poi_fire_hydrant_style_water_source_pond">Gölet</string>
 </resources>
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@ -8,7 +8,7 @@
    <string name="enable_plugin_monitoring_services">Konum günlüğü hizmetlerini kullanmak için \"Yolculuk kaydı\" eklentisini etkinleştirin (GPX günlüğü, çevrim içi izleme)</string>
    <string name="non_optimal_route_calculation">Uzak hedefler için tahmini rotayı hesapla</string>
    <string name="gps_not_available">Lütfen GPS\'yi ayarlardan açık konuma getirin</string>
-    <string name="map_widget_monitoring_services">Log servisi</string>
+    <string name="map_widget_monitoring_services">Günlük kayıt hizmetleri</string>
    <string name="no_route">Rota yok</string>
    <string name="delete_target_point">Varış Noktasını kaldır</string>
    <string name="target_point">Varış noktası %1$s</string>
@ -78,7 +78,7 @@
    <string name="safe_mode_description">Uygulamayı güvenli modda çalıştırın (yerel kod yerine daha yavaş Android kullanarak).</string>
    <string name="safe_mode">Güvenli kip</string>
    <string name="native_library_not_running">Uygulama güvenli modda çalışıyor (\'Ayarlar\'dan kapatın).</string>
-    <string name="background_service_is_enabled_question">OsmAnd arka plan hizmeti hala çalışıyor. Onu da durdur\?</string>
+    <string name="background_service_is_enabled_question">OsmAnd arka plan hizmeti hala çalışıyor. O da durdurulsun mu\?</string>
    <string name="local_indexes_cat_av">Ses/Video verisi</string>
    <string name="stop_routing_confirm">Navigasyonu durdurmak istediğinizden emin misiniz\?</string>
    <string name="clear_dest_confirm">Hedefi (ve ara hedefleri) temizlemek istediğinizden emin misiniz\?</string>
@ -837,7 +837,7 @@
    <string name="background_service_provider">Konum sağlayıcı</string>
    <string name="background_router_service_descr">Ekran kapalıyken konumunuzu izler.</string>
    <string name="background_router_service">Arka planda Osmand başlat</string>
-    <string name="off_router_service_no_gps_available">Arka plan navigasyon hizmeti açık olması bir konum sağlayıcı gerektirir.</string>
+    <string name="off_router_service_no_gps_available">Arka plan navigasyon hizmeti, bir konum sağlayıcının açık olmasını gerektirir.</string>
    <string name="hide_poi_filter">Süzgeci gizle</string>
    <string name="show_poi_filter">Süzgeci göster</string>
    <string name="search_poi_filter">Süzgeç</string>
@ -881,7 +881,7 @@
    <string name="hint_search_online">Çevrim içi arama: Ev numarası, sokak, şehir</string>
    <string name="search_offline_address">Çevrim dışı arama</string>
    <string name="route_general_information">Toplam uzaklık %1$s, seyahat süresi %2$d s %3$d dak.</string>
-    <string name="router_service_descr">Çevrim içi veya çevrim dışı navigasyon servisi.</string>
+    <string name="router_service_descr">Çevrim içi veya çevrim dışı navigasyon hizmeti.</string>
    <string name="sd_dir_not_accessible">Bellek kartındaki depolama klasörüne erişilemiyor!</string>
    <string name="download_question">{0} - {1} indir ?</string>
    <string name="download_question_exist">{0} için çevrim dışı veri zaten var ({1}). ({2}) güncellensin mi\?</string>
@ -1065,7 +1065,7 @@
    <string name="try_again">Tekrar deneyin</string>
    <string name="archive_wikipedia_data">Eski uyumsuz Wikipedia verileriniz var. Arşivle\?</string>
    <string name="download_wikipedia_files">Ekstra Wikipedia verilerini indir (%1$s MB)\?</string>
-    <string name="gps_network_not_enabled">Konum servisi kapalı. Aç\?</string>
+    <string name="gps_network_not_enabled">Konum hizmeti kapalı. Açılsın mı\?</string>
    <string name="shared_string_show_details">Ayrıntıları göster</string>
    <string name="rendering_value_disabled_name">Devre dışı</string>
    <string name="rendering_attr_hideHouseNumbers_name">Ev kapı numaraları</string>
@ -1457,8 +1457,8 @@
    <string name="layer_osm_bugs">OSM notları (çevrim içi)</string>
    <string name="use_trackball_descr">Haritayı hareket ettirmek için bir izleme topu aygıtı kullanın.</string>
    <string name="use_trackball">İzleme topu kullan</string>
-    <string name="background_service_int_descr">Arka plan servisi tarafından kullanılan uyanma aralığı:</string>
-    <string name="background_service_provider_descr">Arka plan servisi tarafından kullanılan konum yöntemi:</string>
+    <string name="background_service_int_descr">Arka plan hizmeti tarafından kullanılan uyanma aralığı:</string>
+    <string name="background_service_provider_descr">Arka plan hizmeti tarafından kullanılan konum yöntemi:</string>
    <string name="route_head">Düz gidin</string>
    <string name="map_screen_orientation">Ekran yönlendirme</string>
    <string name="no_address_found">Hiçbir adres belirlenmedi</string>
@ -1466,9 +1466,9 @@
    <string name="transport_context_menu">Durakta ulaşım aracı ara</string>
    <string name="rotate_map_to_bearing">Harita yönlendirme</string>
    <string name="version_index_is_not_supported">\'\'{0}\'\' indeks sürümü desteklenmemektedir</string>
-    <string name="osmand_routing_experimental">OsmAnd çevrim dışı navigasyon deneysel bir özelliktir ve yaklaşık 20 km\'den daha uzun mesafelerde çalışmaz. 
-\n 
-\nNavigasyon geçici olarak çevrim içi CloudMade servisine geçti.</string>
+    <string name="osmand_routing_experimental">OsmAnd çevrim dışı navigasyon deneysel bir özelliktir ve yaklaşık 20 km\'den daha uzun mesafelerde çalışmaz.
+\n
+\nNavigasyon geçici olarak çevrim içi CloudMade hizmetine geçti.</string>
    <string name="install_selected_build">OsmAnd Yükle - {1} {2} üzerinden {0} MB \?</string>
    <string name="tiles_to_download_estimated_size">Yakınlaştırma {0} indirmek {1} fayans ({2} MB)</string>
    <string name="select_max_zoom_preload_area">Önceden yükleme için en fazla yakınlaştırma</string>
@ -1595,7 +1595,7 @@
    <string name="lang_eu">Baskça</string>
    <string name="lang_be">Belarusça</string>
    <string name="lang_bs">Boşnakça</string>
-    <string name="use_points_as_intermediates">Noktalar arasındaki rotayı hesaplamak</string>
+    <string name="use_points_as_intermediates">Noktalar arasındaki güzergahı hesapla</string>
    <string name="always_center_position_on_map">Konumu sürekli ortada tut</string>
    <string name="voice_pref_title">Ses</string>
    <string name="misc_pref_title">Çeşitli</string>
@ -1791,7 +1791,7 @@
    <string name="lang_sw">Svahili dili</string>
    <string name="lang_he">İbranice</string>
    <string name="forward">İleri</string>
-    <string name="live_monitoring_m_descr">GPX kaydı açıksa, izleme verilerini belirtilen bir web servisine gönder.</string>
+    <string name="live_monitoring_m_descr">GPX kaydı açıksa, izleme verilerini belirtilen bir web hizmetine gönder.</string>
    <string name="live_monitoring_m">Online izleme (GPX gerekli)</string>
    <string name="live_monitoring_start">Online izleme başlat</string>
    <string name="live_monitoring_stop">Online izleme durdurun</string>
@ -2282,7 +2282,7 @@
    <string name="show_passed">Geçilmiş-olanı göster</string>
    <string name="hide_passed">Geçilmiş-olanı gizle</string>
    <string name="marker_show_distance_descr">Haritada harita işaretleyicilerine olan uzaklık ve yönün nasıl belirtileceğini seçin:</string>
-    <string name="map_orientation_change_in_accordance_with_speed">Harita oryantasyon eşiği</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Harita yönlendirme eşiği</string>
    <string name="map_orientation_change_in_accordance_with_speed_descr">Harita yönünün \'Hareket yönü\'nden \'Pusula yönü\'ne geçiş hızını aşağıdan seçin.</string>
    <string name="save_as_route_point">Rota noktaları olarak kaydet</string>
    <string name="add_point_before">Öncesinde nokta ekle</string>
@ -2362,7 +2362,7 @@
    <string name="shared_string_explore">Gezin</string>
    <string name="shared_string_contents">İçerikler</string>
    <string name="shared_string_result">Sonuç</string>
-    <string name="shared_string_travel_guides">Seyehat</string>
+    <string name="shared_string_travel_guides">Seyahat rehberleri</string>
    <string name="shared_string_total">Toplam</string>
    <string name="clear_all_intermediates">Tüm başlangıç noktalarını temizle</string>
    <string name="group_deleted">Grup silindi</string>
@ -3883,4 +3883,9 @@
    <string name="osm_edit_logout_success">Oturum kapatma başarılı</string>
    <string name="file_already_imported">Dosya zaten OsmAnd\'da içe aktarıldı</string>
    <string name="use_two_phase_routing">2 aşamalı A* yönlendirme algoritması kullan</string>
+    <string name="snowmobile_render_descr">Ayrılmış yollar ve parkurlarla kar arabası sürüşü için.</string>
+    <string name="shared_string_graph">Grafik</string>
+    <string name="message_need_calculate_route_before_show_graph">%1$s verileri yalnızca yollarda kullanılabilir, elde etmek için “Noktalar arasındaki güzergah” kullanarak bir rota hesaplamanız gerekir.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Güzergahın yeniden hesaplanmasını bekleyin.
+\nGrafik yeniden hesaplandıktan sonra kullanılabilir olacak.</string>
 </resources>
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@ -1147,7 +1147,7 @@
    <string name="gpx_selection_track">%1$s
 \nТрек %2$s</string>
    <string name="osmo_connect_menu">З’єднатись</string>
-    <string name="use_points_as_intermediates">Розрахувати маршрут між точками</string>
+    <string name="use_points_as_intermediates">Обчислити маршрут між точками</string>
    <string name="always_center_position_on_map">Відображати позицію завжди в центрі</string>
    <string name="voice_pref_title">Голос</string>
    <string name="misc_pref_title">Різне</string>
@ -2293,17 +2293,17 @@
    <string name="osmand_extended_description_part1">OsmAnd (OSM Automated Navigation Directions) — застосунок для мап і навігації з доступом до безкоштовних глобальних високоякісних даних OpenStreetMap (OSM). 
 \n 
 \nНасолоджуйтесь голосовою та візуальною навігацією, переглядом цікавих точок (англ. POI), створенням та керуванням GPX-треками, використовуючи відображення горизонталей та даних про висоту (за допомогою зовнішнього втулка), вибором між режимами автомобіліста, велосипедиста й пішохода, редагуванням OSM та ще багато чим іншим.</string>
-    <string name="osmand_extended_description_part2">GPS навігація 
-\n • Вибір між автономним режимом (без зборів за роумінг за кордоном) або через Інтернет (швидше) 
-\n • Покрокові голосові підказки доставить Вас до місця призначення (записані чи синтезовані голоси) 
-\n • Повторна маршрутизація кожен раз після відхилення від маршруту 
-\n • Смуги руху, назви вулиць і приблизний час прибуття допоможуть Вам на шляху 
-\n • Для того, щоб зробити Вашу подорож безпечнішою, режим дня/ночі автоматично перемикається 
-\n • Відображення обмежень швидкості та попередження про її перевищення 
-\n • Мапа масштабується відповідно до Вашої швидкості 
-\n • Шукати місця за адресою, типом (наприклад, паркування, ресторан, готель, заправна станція, музей) чи географічними координатами 
-\n • Підтримка проміжних точок на Вашому маршруті 
-\n • Запис свого власного GPX-треку чи вивантаження готового і слідування за ним 
+    <string name="osmand_extended_description_part2">GPS навігація
+\n • Вибір між автономним режимом (без зборів за роумінг за кордоном) або через Інтернет (швидше)
+\n • Покрокові голосові підказки доставить Вас до місця призначення (записані чи синтезовані голоси)
+\n • Повторна маршрутизація кожен раз після відхилення від маршруту
+\n • Смуги руху, назви вулиць і приблизний час прибуття допоможуть Вам на шляху
+\n • Для того, щоб зробити Вашу подорож безпечнішою, режим дня/ночі автоматично перемикається
+\n • Показ обмежень швидкості та попередження про її перевищення
+\n • Мапа масштабується відповідно до Вашої швидкості
+\n • Шукати місця за адресою, типом (наприклад, паркування, ресторан, готель, заправна станція, музей) чи географічними координатами
+\n • Підтримка проміжних точок на Вашому маршруті
+\n • Запис свого власного GPX-треку чи вивантаження готового і слідування за ним
 \n</string>
    <string name="osmand_extended_description_part3">Мапа 
 \n• Відображає POI (цікаві точки) навколо вас 
@ -3924,4 +3924,9 @@
    <string name="development">Розробка</string>
    <string name="file_already_imported">Файл уже імпортовано до OsmAnd</string>
    <string name="use_two_phase_routing">Використання 2-фазного A* алгоритму маршрутизації</string>
+    <string name="snowmobile_render_descr">Для їзди на снігоходах із відведеними дорогами та трасами.</string>
+    <string name="shared_string_graph">Графік</string>
+    <string name="message_need_calculate_route_before_show_graph">%1$s дані доступні лише для доріг, вам потрібно обчислити маршрут за допомогою «Маршрут між точками», щоб отримати його.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Дочекайтеся переобчислення маршруту.
+\nГрафік буде доступний після переобчислення.</string>
 </resources>
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@ -3561,20 +3561,20 @@
    <string name="poi_hazard">危險</string>
    <string name="poi_rtsa_scale_filter">難度分類</string>
    <string name="poi_health_specialty_radiotherapy_yes">放射治療</string>
-    <string name="poi_rtsa_scale_nc">н/к</string>
-    <string name="poi_rtsa_scale_nc_asterisk">н/к*</string>
-    <string name="poi_rtsa_scale_1a">1А</string>
-    <string name="poi_rtsa_scale_1a_asterisk">1А*</string>
-    <string name="poi_rtsa_scale_1b">1Б</string>
-    <string name="poi_rtsa_scale_1b_asterisk">1Б*</string>
-    <string name="poi_rtsa_scale_2a">2А</string>
-    <string name="poi_rtsa_scale_2a_asterisk">2А*</string>
-    <string name="poi_rtsa_scale_2b">2Б</string>
-    <string name="poi_rtsa_scale_2b_asterisk">2Б*</string>
-    <string name="poi_rtsa_scale_3a">3А</string>
-    <string name="poi_rtsa_scale_3a_asterisk">3А*</string>
-    <string name="poi_rtsa_scale_3b">3Б</string>
-    <string name="poi_rtsa_scale_3b_asterisk">3Б*</string>
+    <string name="poi_rtsa_scale_nc">n/c</string>
+    <string name="poi_rtsa_scale_nc_asterisk">n/c*</string>
+    <string name="poi_rtsa_scale_1a">1A</string>
+    <string name="poi_rtsa_scale_1a_asterisk">1A*</string>
+    <string name="poi_rtsa_scale_1b">1B</string>
+    <string name="poi_rtsa_scale_1b_asterisk">1B*</string>
+    <string name="poi_rtsa_scale_2a">2A</string>
+    <string name="poi_rtsa_scale_2a_asterisk">2A*</string>
+    <string name="poi_rtsa_scale_2b">2B</string>
+    <string name="poi_rtsa_scale_2b_asterisk">2B*</string>
+    <string name="poi_rtsa_scale_3a">3A</string>
+    <string name="poi_rtsa_scale_3a_asterisk">3A*</string>
+    <string name="poi_rtsa_scale_3b">3B</string>
+    <string name="poi_rtsa_scale_3b_asterisk">3B*</string>
    <string name="poi_flare">燃燒塔</string>
    <string name="poi_change_delete">已刪除的物件</string>
    <string name="poi_climbing_crag_filter">攀岩</string>
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@ -3921,4 +3921,11 @@
    <string name="perform_oauth_authorization">透過 OAuth 登入</string>
    <string name="clear_osm_token">清除 OpenStreetMap OAuth 權杖</string>
    <string name="osm_edit_logout_success">成功登出</string>
+    <string name="snowmobile_render_descr">適用於有專用道路與軌道的雪地摩托車駕駛。</string>
+    <string name="file_already_imported">檔案已在 OsmAnd 匯入</string>
+    <string name="use_two_phase_routing">使用 2 相的 A* 路線演算法</string>
+    <string name="shared_string_graph">圖表</string>
+    <string name="message_need_calculate_route_before_show_graph">%1$s 資料僅供道路使用，您需要使用「兩點間的路線」來計算路線。</string>
+    <string name="message_graph_will_be_available_after_recalculation">等待路線重新計算。
+\n重新計算後即可使用圖表。</string>
 </resources>
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@ -4206,7 +4206,7 @@
 	<string name="poi_video_yes">Yes</string>
 	<string name="poi_video_no">No</string>

-	<string name="poi_internet_access_fee_customers">Signal to find the pole</string>
+	<string name="poi_internet_access_fee_customers">Internet access: customers</string>
 	<string name="poi_traffic_signals_sound_locate">Only when walking is allowed</string>
 	<string name="poi_tactile_paving_contrasted">Contrasted</string>
 	<string name="poi_tactile_paving_primitive">Primitive</string>
@ -4259,5 +4259,10 @@

 	<string name="poi_fuel_lng">LNG</string>

+	<string name="poi_gpx_point">GPX point</string>
+
+	<string name="poi_parking_rooftop">Rooftop</string>
+	<string name="poi_parking_sheds">Sheds</string>
+	<string name="poi_parking_layby">Layby</string>

 </resources>
--- a/OsmAnd/src/net/osmand/plus/importfiles/FavoritesImportTask.java
+++ b/OsmAnd/src/net/osmand/plus/importfiles/FavoritesImportTask.java
@ -34,6 +34,7 @@ class FavoritesImportTask extends BaseImportAsyncTask<Void, Void, GPXFile> {
 	protected GPXFile doInBackground(Void... nothing) {
 		List<FavouritePoint> favourites = asFavourites(app, gpxFile.getPoints(), fileName, forceImportFavourites);
 		FavouritesDbHelper favoritesHelper = app.getFavorites();
+		checkDuplicateNames(favourites);
 		for (FavouritePoint favourite : favourites) {
 			favoritesHelper.deleteFavourite(favourite, false);
 			favoritesHelper.addFavourite(favourite, false);
@ -43,6 +44,27 @@ class FavoritesImportTask extends BaseImportAsyncTask<Void, Void, GPXFile> {
 		return null;
 	}

+	public void checkDuplicateNames(List<FavouritePoint> favourites) {
+		for (FavouritePoint fp : favourites) {
+			int number = 1;
+			String index;
+			String name = fp.getName();
+			boolean duplicatesFound = false;
+			for (FavouritePoint fp2 : favourites) {
+				if (name.equals(fp2.getName()) && fp.getCategory().equals(fp2.getCategory()) && !fp.equals(fp2)) {
+					if (!duplicatesFound) {
+						index = " (" + number + ")";
+						fp.setName(name + index);
+					}
+					duplicatesFound = true;
+					number++;
+					index = " (" + number + ")";
+					fp2.setName(fp2.getName() + index);
+				}
+			}
+		}
+	}
+
 	@Override
 	protected void onPostExecute(GPXFile result) {
 		hideProgress();