From 95b712620ef322fa8a627687ed549d4bf586d2f1 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 28 Jul 2017 14:52:04 +0300
Subject: [PATCH 01/33] Change search to page in google play

---
 OsmAnd/src/net/osmand/plus/Version.java                         | 2 +-
 OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java  | 2 +-
 OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java       | 2 +-
 .../core/samples/android/sample1/InstallOsmandAppDialog.java    | 2 +-
 .../src/net/osmand/nautical/NauticalActivity.java               | 2 +-
 .../src/net/osmand/parkingPlugin/ParkingPluginActivity.java     | 2 +-
 .../src/net/osmand/srtmPlugin/SRTMPluginActivity.java           | 2 +-
 .../Osmand-Skimaps/src/net/osmand/skimaps/SkiMapsActivity.java  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/Version.java b/OsmAnd/src/net/osmand/plus/Version.java
index b7408d5f5a..adfc89ce78 100644
--- a/OsmAnd/src/net/osmand/plus/Version.java
+++ b/OsmAnd/src/net/osmand/plus/Version.java
@@ -31,7 +31,7 @@ public class Version {
 		if (isAmazonEnabled(ctx)) {
 			return "amzn://apps/android?p=";
 		} else if (isGooglePlayEnabled(ctx)) {
-			return "market://search?q=pname:";
+			return "market://details?id=";
 		} 
 		return "https://osmand.net/apps?id=";
 	}
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
index 4e2c3013a0..9c428db783 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
@@ -381,7 +381,7 @@ public class DownloadIndexesThread {
 			builder.setPositiveButton(R.string.button_upgrade_osmandplus, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
-					Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:net.osmand.plus"));
+					Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=net.osmand.plus"));
 					try {
 						ctx.startActivity(intent);
 					} catch (ActivityNotFoundException e) {
diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
index 1eb7d18913..e65ccaf8d2 100644
--- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
@@ -236,7 +236,7 @@ public class MapillaryPlugin extends OsmandPlugin {
 	}
 
 	public static boolean installMapillary(OsmandApplication app) {
-		boolean success = execInstall(app, "market://search?q=pname:" + MAPILLARY_PACKAGE_ID);
+		boolean success = execInstall(app, "market://details?id=" + MAPILLARY_PACKAGE_ID);
 		if (!success) {
 			success = execInstall(app, "https://play.google.com/store/apps/details?id=" + MAPILLARY_PACKAGE_ID);
 		}
diff --git a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/InstallOsmandAppDialog.java b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/InstallOsmandAppDialog.java
index 8081f1c0a4..f45c263a13 100644
--- a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/InstallOsmandAppDialog.java
+++ b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/InstallOsmandAppDialog.java
@@ -39,7 +39,7 @@ public class InstallOsmandAppDialog extends AppCompatDialogFragment {
 		view.findViewById(R.id.install_osmand_btn).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				boolean success = execOsmAndInstall("market://search?q=pname:");
+				boolean success = execOsmAndInstall("market://details?id=");
 				if (!success) {
 					success = execOsmAndInstall("https://play.google.com/store/apps/details?id=");
 				}
diff --git a/plugins/Osmand-Nautical/src/net/osmand/nautical/NauticalActivity.java b/plugins/Osmand-Nautical/src/net/osmand/nautical/NauticalActivity.java
index ed01e7efee..c89c7fca37 100644
--- a/plugins/Osmand-Nautical/src/net/osmand/nautical/NauticalActivity.java
+++ b/plugins/Osmand-Nautical/src/net/osmand/nautical/NauticalActivity.java
@@ -57,7 +57,7 @@ public class NauticalActivity extends Activity {
 					public void onClick(View v) {
 						String appName = OSMAND_COMPONENT;
 						logEvent(NauticalActivity.this, "open_play_store_" + appName);
-						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + appName));
+						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appName));
 						try {
 							//stopService(intent);
 							startActivity(intent);
diff --git a/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java b/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
index e83c802fda..7748a9f5ce 100644
--- a/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
+++ b/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
@@ -56,7 +56,7 @@ public class ParkingPluginActivity extends Activity {
 					public void onClick(View v) {
 						String appName = OSMAND_COMPONENT;
 						logEvent(ParkingPluginActivity.this, "open_play_store_" + appName);
-						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + appName));
+						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appName));
 						try {
 							//stopService(intent);
 							startActivity(intent);
diff --git a/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java b/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java
index 92421706d1..9b4bec7bf6 100644
--- a/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java
+++ b/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java
@@ -58,7 +58,7 @@ public class SRTMPluginActivity extends Activity {
 					public void onClick(View v) {
 						String appName = OSMAND_COMPONENT;
 						logEvent(SRTMPluginActivity.this, "open_play_store_" + appName);
-						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + appName));
+						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appName));
 						try {
 							//stopService(intent);
 							startActivity(intent);
diff --git a/plugins/Osmand-Skimaps/src/net/osmand/skimaps/SkiMapsActivity.java b/plugins/Osmand-Skimaps/src/net/osmand/skimaps/SkiMapsActivity.java
index 1f8f3d5b13..30b849d59d 100644
--- a/plugins/Osmand-Skimaps/src/net/osmand/skimaps/SkiMapsActivity.java
+++ b/plugins/Osmand-Skimaps/src/net/osmand/skimaps/SkiMapsActivity.java
@@ -59,7 +59,7 @@ public class SkiMapsActivity extends Activity {
 					public void onClick(View v) {
 						String appName = OSMAND_COMPONENT;
 						logEvent(SkiMapsActivity.this, "open_play_store_" + appName);
-						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + appName));
+						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appName));
 						try {
 							//stopService(intent);
 							startActivity(intent);

From 4842c871b6dba10cdec026c84bd65845f7df4315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D3=98mrah=20N=D3=99biyev?= <emrah.nebiyev@gmail.com>
Date: Fri, 28 Jul 2017 12:26:01 +0000
Subject: [PATCH 02/33] Translated using Weblate (Azerbaijani)

Currently translated at 69.1% (1636 of 2367 strings)
---
 OsmAnd/res/values-az/strings.xml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values-az/strings.xml b/OsmAnd/res/values-az/strings.xml
index 4d0a86fac1..639f760254 100644
--- a/OsmAnd/res/values-az/strings.xml
+++ b/OsmAnd/res/values-az/strings.xml
@@ -983,7 +983,7 @@
     <string name="routing_attr_relief_smoothness_factor_hills_name">Dağlıq</string>
     <string name="routing_attr_relief_smoothness_factor_plains_name">Az dağlıq</string>
     <string name="routing_attr_relief_smoothness_factor_more_plains_name">Düzənlik</string>
-    <string name="routing_attr_driving_style_safety_name">Təhlükəsiz</string>
+    <string name="routing_attr_driving_style_safety_name">Yolları üstün tut</string>
     <string name="relief_smoothness_factor_descr">Üstün tutulan relyef: düzənlik və ya dağlıq</string>
     <string name="shared_string_slope">Yamac</string>
     <string name="points_delete_multiple_succesful">Nöqtə(lər) uğurla silindi.</string>
@@ -1641,7 +1641,21 @@
     <string name="old_poi_file_should_be_deleted">POI məlumat faylı “%1$s” lazımsızdır və silinə bilər.</string>
     <string name="favorite_delete_multiple">%1$d favoriti və %2$d favorit qrupu silmək üzrəsiniz. Əminsiniz?</string>
     <string name="downloads_left_template">%1$s endirmə qalıb</string>
-    <string name="quick_action_resume_pause_navigation">Naviqasiyaya Davam et/Fasilə ver</string>
-    <string name="quick_action_resume_pause_navigation_descr"/>
-    <string name="quick_action_show_navigation_finish_dialog"/>
+    <string name="quick_action_resume_pause_navigation">Naviqasiyaya davam/fasilə</string>
+    <string name="quick_action_resume_pause_navigation_descr">Naviqasiyaya fasilə vermək üçün və ya fasilə verilibsə, davam etmək üçün bu düyməni basın.</string>
+    <string name="quick_action_show_navigation_finish_dialog">Naviqasiyanın bitmə dialoqunu göstər</string>
+    <string name="quick_action_start_stop_navigation">Naviqasiyanı başlat/bitir</string>
+    <string name="quick_action_start_stop_navigation_descr">Naviqasiyanı başlatmaq üçün və ya artıq başladılıbsa, dayandırmaq üçün bu düyməni basın.</string>
+    <string name="mappilary_no_internet_desc">Mapillary-dən şəkillərə baxmaq üçün internetiniz olmalıdır</string>
+    <string name="retry">Təkrar cəhd</string>
+<string name="osm_edit_modified_poi">Dəyişdirilmiş OSM POI</string>
+    <string name="osm_edit_deleted_poi">Silinmiş OSM POI</string>
+    <string name="osm_edit_reopened_note">Yenidən açılmış OSM qeydi</string>
+    <string name="osm_edit_commented_note">Rəy yazılmış OSM qeydi</string>
+    <string name="osm_edit_removed_note">Silinmiş OSM qeydi</string>
+    <string name="osm_edit_created_note">Yaradılmış OSM qeydi</string>
+    <string name="shared_string_commit">Təsdiq et</string>
+    <string name="osm_edit_created_poi">Yaradılmış OSM POI</string>
+    <string name="rendering_value_translucent_pink_name">Şəffaf çəhrayı</string>
+    <string name="confirm_usage_speed_cameras">Bir çox ölkələrdə (Almaniya, Fransa, İtaliya və s.) sürət kamerası xəbərdarlıqlarının istifadə edilməsinə qanunla icazə verilmir. Qanunu pozarsanız, OsmAnd heç bir məsuliyyət daşımır. Yalnız bu xüsusiyyətdən istifadəyə icazə varsa, Bəli düyməsinə toxunun.</string>
     </resources>

From 950805eed88855546603a4d18b8371542a37576c Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Fri, 28 Jul 2017 14:20:03 +0000
Subject: [PATCH 03/33] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index b37924bfe8..a8f2d79cf4 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2757,7 +2757,7 @@ Tidligere destination bliver sidste mellemliggende punkt.</string>
     <string name="mapillary_descr">Online fotos for alle på gadenivea. Oplev steder, samarbejd, indfang verden.</string>
     <string name="shared_string_add_photos">Tilføj fotos</string>
     <string name="mapillary_action_descr">Bidrag med visninger af placeringen på gadeniveau via Mapillary.</string>
-    <string name="plugin_mapillary_descr">Billeder på gadeniveau for alle. Opdag steder, samarbejd, indfang verden.</string>
+    <string name="plugin_mapillary_descr">Fotos på gadeniveau for alle. Opdag steder, samarbejd, indfang verden.</string>
     <string name="online_photos">Online fotos</string>
     <string name="no_photos_descr">Ingen fotos til denne placering</string>
     <string name="shared_string_install">Installer</string>
@@ -2813,5 +2813,5 @@ Tidligere destination bliver sidste mellemliggende punkt.</string>
     <string name="live_monitoring_max_interval_to_send">Tidsbuffer til online sporing</string>
     <string name="live_monitoring_max_interval_to_send_desrc">Angiv en tidsbuffer til at opbevare steder, når der ingen forbindelse er</string>
     <string name="retry">Prøv igen</string>
-<string name="mappilary_no_internet_desc">Du skal have internet adgang, for at se fotos fra Mapillary</string>
+<string name="mappilary_no_internet_desc">Internetforbindelse er nødvendig for at se fotos fra Mapillary</string>
     </resources>

From 2ee0088f59472e984f14015658d0713c0a44bb6c Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Fri, 28 Jul 2017 09:50:42 +0000
Subject: [PATCH 04/33] Translated using Weblate (French)

Currently translated at 98.4% (2331 of 2367 strings)
---
 OsmAnd/res/values-fr/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index b451b0791c..6a6b057230 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -2854,4 +2854,6 @@ Fonctionnalités principales :
     <string name="quick_action_show_navigation_finish_dialog">Afficher la fenêtre de fin de navigation</string>
     <string name="quick_action_start_stop_navigation">Démarrer / Arrêter la Navigation</string>
     <string name="quick_action_start_stop_navigation_descr">Appuyez sur ce bouton pour démarrer la navigation ou l\'arrêter lorsqu\'elle est en cours.</string>
-    </resources>
+    <string name="mappilary_no_internet_desc">Vous devez être connecté à Internet pour afficher les photos Mapillary</string>
+    <string name="retry">Essayer à nouveau</string>
+</resources>

From 939b1021296a7d64e4f45e490c6fbac13495bcf9 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Fri, 28 Jul 2017 13:15:02 +0000
Subject: [PATCH 05/33] Translated using Weblate (Russian)

Currently translated at 94.5% (2237 of 2367 strings)
---
 OsmAnd/res/values-ru/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index d0c3df9a94..7d8e4d12c3 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -12,7 +12,7 @@
     <string name="quick_action_showhide_osmbugs_descr">Нажатие на кнопку действия отобразит/скроет заметки OSM с карты.</string>
     <string name="sorted_by_distance">Отсортировано по расстоянию</string>
     <string name="search_favorites">Поиск в избранном</string>
-    <string name="hillshade_menu_download_descr">Для того, чтобы отобразить затенение рельефа, вам нужно загрузить специальную карту для этой области</string>
+    <string name="hillshade_menu_download_descr">Для того, чтобы отобразить затенение рельефа, вам нужно загрузить специальную карту для этой области.</string>
     <string name="hillshade_purchase_header">Для того, чтобы отобразить затенение рельефа, вам нужно купить и установить плагин</string>
     <string name="srtm_menu_download_descr">Для того, чтобы отобразить линии контуров рельефа, вам нужно загрузить специальную карту для этой области.</string>
     <string name="shared_string_plugin">Плагин</string>
@@ -33,7 +33,7 @@
     <string name="shared_string_in_name">в %1$s</string>
     <string name="type_address">Введите адрес</string>
     <string name="type_city_town">Введите город</string>
-    <string name="type_postcode">Введите почтовый код</string>
+    <string name="type_postcode">Введите почтовый индекс</string>
     <string name="nearest_cities">Ближайшие города</string>
     <string name="select_city">Выберите город</string>
     <string name="select_postcode">Выберите почтовый код</string>

From 033f881bfa47966b34a33a6469926cf7d4adaa1e Mon Sep 17 00:00:00 2001
From: Softmap <skdhd5@gmail.com>
Date: Fri, 28 Jul 2017 19:40:33 +0000
Subject: [PATCH 06/33] Translated using Weblate (Arabic)

Currently translated at 100.0% (2367 of 2367 strings)
---
 OsmAnd/res/values-ar/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index 905638e4e8..e1df476f37 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -2716,4 +2716,6 @@
     <string name="quick_action_start_stop_navigation_descr">اضغط على هذا الزر لبدء الملاحة، أو لوقفها إذا ما كانت قد بدأت مسبقا.</string>
     <string name="live_monitoring_max_interval_to_send">الوقت الإضافي المخزن المؤقت للتتبع على الإنترنت</string>
     <string name="live_monitoring_max_interval_to_send_desrc">تحديد الوقت الإضافي المخزن للحفاظ على المواقع وإرسالها دون اتصال</string>
-    </resources>
+    <string name="mappilary_no_internet_desc">أنت بحاجة إلى إنترنت لعرض الصور من Mapillary</string>
+    <string name="retry">اعد المحاولة</string>
+</resources>

From 423459082bf7c0c8406d940a2ec79919721f7656 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Thu, 27 Jul 2017 19:04:11 +0300
Subject: [PATCH 07/33] Fix crash

(cherry picked from commit 3eb8e9d)
---
 OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java
index 5a39560aeb..a6cc716c92 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java
@@ -591,7 +591,7 @@ public class SplitSegmentFragment extends OsmAndListFragment {
                         minMaxSpeedPaint.getTextBounds(maxMinSpeed, 0, maxMinSpeed.length(), minMaxSpeedTextBounds);
                         int minMaxStringWidth = minMaxSpeedTextBounds.width();
 
-                        if (minSpeed.substring(0, minSpeed.indexOf(" ")).equals("0") || minSpeed.substring(0, minSpeed.indexOf(" ")).equals("0.0")) {
+                        if (analysis.minSpeed == 0) {
                             (convertView.findViewById(R.id.max_speed_value))
                                     .setVisibility(View.VISIBLE);
                             (convertView.findViewById(R.id.min_speed_value))

From 964c4e0a3df17747d9de209734dff983d0a46a5f Mon Sep 17 00:00:00 2001
From: Boyuan Yang <073plan@gmail.com>
Date: Sat, 29 Jul 2017 08:00:11 +0000
Subject: [PATCH 08/33] Translated using Weblate (Chinese (Simplified))

Currently translated at 98.3% (2327 of 2367 strings)
---
 OsmAnd/res/values-zh-rCN/strings.xml | 32 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index e0b6a19278..e84c261517 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -1099,7 +1099,7 @@
     <string name="gps_wake_up_timer">GPS 唤醒间隔</string>
     <string name="favourites_edit_dialog_title">我的最爱信息</string>
     <string name="simulate_your_location_stop_descr">停止模拟您的位置</string>
-    <string name="simulate_your_location_descr">使用模拟计算一个路线或记录为 GPX</string>
+    <string name="simulate_your_location_descr">使用计算得到的路线或者一条 GPX 记录模拟您的位置</string>
     <string name="looking_up_address">查询地址</string>
     <string name="av_locations_descr">GPS 文件附位置注解</string>
     <string name="av_locations">位置</string>
@@ -1540,9 +1540,9 @@
     <string name="routing_attr_relief_smoothness_factor_hills_name">丘陵</string>
     <string name="routing_attr_relief_smoothness_factor_plains_name">低丘陵</string>
     <string name="routing_attr_relief_smoothness_factor_more_plains_name">平地</string>
-    <string name="routing_attr_driving_style_speed_name">速度</string>
+    <string name="routing_attr_driving_style_speed_name">更短的路径</string>
     <string name="routing_attr_driving_style_balance_name">平衡</string>
-    <string name="routing_attr_driving_style_safety_name">安全</string>
+    <string name="routing_attr_driving_style_safety_name">偏好背街小路</string>
     <string name="relief_smoothness_factor_descr">首选的地形︰ 平坦或丘陵</string>
     <string name="shared_string_slope">坡度</string>
     <string name="add_new_folder">添加新文件夹</string>
@@ -1587,7 +1587,7 @@
     <string name="shared_string_recorded">已录制</string>
     <string name="shared_string_record">记录</string>
     <string name="rendering_attr_contourColorScheme_description">等高线的色彩调配</string>
-    <string name="save_track_min_distance">记录运动检测</string>
+    <string name="save_track_min_distance">最低位移记录阈值</string>
     <string name="save_track_min_distance_descr">过滤器：从最后位置的一个点设置最短距离用以记录</string>
     <string name="save_track_precision">记录最小的精确度</string>
     <string name="save_track_precision_descr">过滤器：设置记录一个点的最小精度</string>
@@ -1671,9 +1671,9 @@
     <string name="map_widget_magnetic_bearing">磁方位</string>
     <string name="map_widget_bearing">相对方位</string>
     <string name="access_disable_offroute_recalc">当您离开道路时不重新计算路线</string>
-    <string name="access_disable_offroute_recalc_descr">当您离正确的道路很远，阻止自动路线重新估算</string>
-    <string name="access_disable_wrong_direction_recalc">不要改变错误方向的路线</string>
-    <string name="access_disable_wrong_direction_recalc_descr">当你正朝着错误的方向行进，防止自动路线重新计算</string>
+    <string name="access_disable_offroute_recalc_descr">当您偏离预设路线时，阻止自动路线重新估算</string>
+    <string name="access_disable_wrong_direction_recalc">向反方向行驶时不要重新计算路线</string>
+    <string name="access_disable_wrong_direction_recalc_descr">当你朝着反方向行驶时，防止自动路线重新计算</string>
     <string name="access_smart_autoannounce">智能自动播报</string>
     <string name="access_smart_autoannounce_descr">只在指引到目标点已被改变了才通知</string>
     <string name="access_autoannounce_period">自动播报周期</string>
@@ -1888,7 +1888,7 @@
     <string name="watch">观看</string>
     <string name="notes">注解</string>
     <string name="rendering_attr_pisteRoutes_name">滑雪场</string>
-    <string name="free">"%1$s 可用 "</string>
+    <string name="free">%1$s 可用</string>
     <string name="rendering_attr_pisteGrooming_name">滑雪道修整</string>
     <string name="world_ski_missing">为了显示滑雪地图，需要下载特别的离线地图</string>
     <string name="nautical_maps_missing">为了显示航海地图，需要下载特别的离线地图</string>
@@ -2036,13 +2036,13 @@
 \n
 \n长按在地图上查看"</string>
     <string name="delay_navigation_start">自动启动转弯指引</string>
-    <string name="gpx_info_subtracks">"子轨迹：%1$s "</string>
-    <string name="gpx_info_waypoints">"路标：%1$s "</string>
-    <string name="gpx_info_distance">"距离：%1$s（%2$s 个点） "</string>
-    <string name="gpx_info_start_time">"开始时间：%1$tF，%1$tT "</string>
-    <string name="gpx_info_end_time">"结束时间：%1$tF，%1$tT "</string>
-    <string name="gpx_info_average_speed">"平均速度：%1$s "</string>
-    <string name="gpx_info_maximum_speed">"最大速度：%1$s "</string>
+    <string name="gpx_info_subtracks">子轨迹：%1$s</string>
+    <string name="gpx_info_waypoints">航点：%1$s</string>
+    <string name="gpx_info_distance">距离：%1$s（%2$s 个点）</string>
+    <string name="gpx_info_start_time">开始时间：%1$tF，%1$tT</string>
+    <string name="gpx_info_end_time">结束时间：%1$tF，%1$tT</string>
+    <string name="gpx_info_average_speed">平均速度：%1$s</string>
+    <string name="gpx_info_maximum_speed">最大速度：%1$s</string>
     <string name="gpx_info_avg_altitude">平均海拔高度：%1$s</string>
     <string name="gpx_info_diff_altitude">高度范围：%1$s</string>
     <string name="gpx_info_asc_altitude">下坡/上坡：%1$s</string>
@@ -2620,7 +2620,7 @@
     <string name="mapillary_menu_title_dates">日期</string>
     <string name="mapillary_menu_descr_username">查看特定用户添加的图像。</string>
     <string name="mapillary_menu_descr_dates">查看特定时期内添加的图像。</string>
-    <string name="mapillary_menu_filter_description">您可以根据用户名或日期过滤图像。</string>
+    <string name="mapillary_menu_filter_description">您可以根据提交者或日期过滤图像。过滤器仅在高比例尺放大时产生作用。</string>
     <string name="shared_string_reload">重新载入</string>
     <string name="shared_string_reset">重置</string>
     <string name="store_tracks_in_monthly_directories">按月将记录的轨迹存放在文件夹中</string>

From 162cf2cfc559b56fe1d4392ff575a1ddc004379d Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Fri, 28 Jul 2017 15:11:24 +0000
Subject: [PATCH 09/33] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index a8f2d79cf4..5e1f283fae 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -705,7 +705,7 @@ OSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt.
 
     <string name="amenity_type_landuse">Arealanvendelse</string>
     <string name="amenity_type_sustenance">Mad og drikke</string>
-    <string name="voice_is_not_available_msg">Talevejledning er ikke tilgængelig. Gå til \'Indstillinger\' → \'Generelt\' → \'Talevejledning\' og vælg eller hent en talevejledning.</string>
+    <string name="voice_is_not_available_msg">Talevejledning er ikke tilgængelig. Gå til \'Indstillinger\' → \'Navigation\' → \'Talevejledning\' og vælg eller hent en talevejledning.</string>
     <string name="items_were_selected">{0} emner valgt</string>
     <string name="filter_existing_indexes">Hentet</string>
     <string name="fast_route_mode">Hurtigste rute</string>

From cfe8fd102c1f9d3d07d56a3abe0b2b9281a7b30e Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 28 Jul 2017 11:21:32 +0300
Subject: [PATCH 10/33] Fix substring in speed

(cherry picked from commit 5590efd)
---
 .../src/net/osmand/plus/myplaces/SplitSegmentFragment.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java
index a6cc716c92..0bd5e6da6a 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java
@@ -576,7 +576,12 @@ public class SplitSegmentFragment extends OsmAndListFragment {
 
                         String maxSpeed = OsmAndFormatter.getFormattedSpeed(analysis.maxSpeed, app);
                         String minSpeed = OsmAndFormatter.getFormattedSpeed(analysis.minSpeed, app);
-                        String maxMinSpeed = maxSpeed.substring(0, maxSpeed.indexOf(" ")).concat("/").concat(minSpeed);
+                        String maxMinSpeed;
+                        if (maxSpeed.contains(" ")) {
+                            maxMinSpeed = maxSpeed.substring(0, maxSpeed.indexOf(" ")).concat("/").concat(minSpeed);
+                        } else {
+                            maxMinSpeed = maxSpeed.substring(0, maxSpeed.indexOf("-")).concat("/").concat(minSpeed);
+                        }
 
                         if (minMaxSpeedLayoutWidth == 0) {
                             DisplayMetrics metrics = new DisplayMetrics();

From 1660422a415c27f2dd793d160ac00d90c0d09431 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sat, 29 Jul 2017 12:20:32 +0300
Subject: [PATCH 11/33] Fix crash

---
 OsmAnd/src/net/osmand/plus/activities/MapActivity.java      | 6 +++++-
 .../cards/dialogs/ContextMenuCardDialogFragment.java        | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 5fd14c9016..5d4d1cf404 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -752,7 +752,11 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 	}
 
 	public void dismissCardDialog() {
-		getSupportFragmentManager().popBackStack(ContextMenuCardDialogFragment.TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+		try {
+			getSupportFragmentManager().popBackStack(ContextMenuCardDialogFragment.TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/dialogs/ContextMenuCardDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/dialogs/ContextMenuCardDialogFragment.java
index e9a674bc75..259e680f9c 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/dialogs/ContextMenuCardDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/dialogs/ContextMenuCardDialogFragment.java
@@ -109,7 +109,7 @@ public class ContextMenuCardDialogFragment extends Fragment {
 		fragment.dialog = menu;
 		menu.getMapActivity().getSupportFragmentManager().beginTransaction()
 				.replace(R.id.topFragmentContainer, fragment, TAG)
-				.addToBackStack(TAG).commit();
+				.addToBackStack(TAG).commitAllowingStateLoss();
 	}
 
 	public void dismiss() {

From 2a237a07d4565c13d1158dd88bab0d4f6891ae96 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sat, 29 Jul 2017 12:44:57 +0300
Subject: [PATCH 12/33] Fix build.gradle for core sample

---
 OsmAndCore-sample/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAndCore-sample/build.gradle b/OsmAndCore-sample/build.gradle
index 95b9cd9c66..80d8b9f02f 100644
--- a/OsmAndCore-sample/build.gradle
+++ b/OsmAndCore-sample/build.gradle
@@ -110,8 +110,8 @@ repositories {
 
 dependencies {
     compile project(path: ':OsmAnd-java', configuration: 'android')
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile 'com.android.support:design:23.3.0'
+    compile 'com.android.support:appcompat-v7:25.+'
+    compile 'com.android.support:design:25.+'
     compile fileTree(dir: "libs", include: ["*.jar"])
     compile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
     debugCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"

From b1eab484e1d2f4beb547dbd731027dc88e9e057a Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sat, 29 Jul 2017 13:09:37 +0300
Subject: [PATCH 13/33] Fix back arrow

---
 .../res/drawable-hdpi/ic_arrow_back.png          | Bin 0 -> 1212 bytes
 .../res/drawable-mdpi/ic_arrow_back.png          | Bin 0 -> 1127 bytes
 .../res/drawable-xhdpi/ic_arrow_back.png         | Bin 0 -> 1294 bytes
 .../res/drawable-xxhdpi/ic_arrow_back.png        | Bin 0 -> 1385 bytes
 .../mapcontextmenu/ContextMenuHelper.java        |   4 ++--
 .../search/QuickSearchDialogFragment.java        |   2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 OsmAndCore-sample/res/drawable-hdpi/ic_arrow_back.png
 create mode 100644 OsmAndCore-sample/res/drawable-mdpi/ic_arrow_back.png
 create mode 100644 OsmAndCore-sample/res/drawable-xhdpi/ic_arrow_back.png
 create mode 100644 OsmAndCore-sample/res/drawable-xxhdpi/ic_arrow_back.png

diff --git a/OsmAndCore-sample/res/drawable-hdpi/ic_arrow_back.png b/OsmAndCore-sample/res/drawable-hdpi/ic_arrow_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a975df6138c61c9a61a4c183f90447dd992acd6
GIT binary patch
literal 1212
zcmbVMTWB0r7@iQ*N=zxWsI3<`PK!3dx$ew%cbaLsnb~a?+;rV6b_s}{nR6x?leu)}
zq&u6S(4ay=gklSQ5sMFfGLotwC^Vo&qs1$+RPjO4mx?u7?VEyUlHKS-=!3(|oOAy9
zzW@Hu$?E9gZN2yQG7Ph=JYv@9x;K4p-$LI%FlW!wWj84{$XMWzCX6ssK!Jrp*@F|f
zh9PPl`xp;0O!ur?Z;(diQOyoK9;O&R@j}XGn8BeWg!U9Bz`_%*ud}P~EwR8wI(t;D
zh?UU5lkUiDgvVw_>-OxFok#4@K`@wTRDp*H1c^88$6BJZYkD=hPsIWY)*xg`XV;x-
zRI0!TA`DbM%h^&!2K)28q~_(E@(7ScDJzJIAmuqJqtROtLHlB<wFo&{%`CNT(UZ<j
z5)x{H&}=sOW`+-<3Chjq1yL4cnWG3UZutZzoFDJ$XfSbXM{Y>mzz3;DXazGwXQ`*_
zA$Vb>vZ2_I+litn6A~B-5-$p#m&Ub*j!6yw>&B+&xZVn}P{VOB6WO#L&YljL=I+*p
zQXut4I}*9HC~(>g>=_UHq-^Re{lX&`X>w+N9wIDpNXcb5EGw9^Y)j@82O%+M%g`2a
zN6%*bqLM3!;;?Cmk|;^V>~OK57#S&}7IP(~BpV%W*^deIZQQZ#Qrm5=aZ9ddL>Q7F
zst3Vzrwgi+0SV&CAOwbyR$b*)u&)Ab*H6X$X{pvDH*w@1$EXwq9$3q@=5FE#lya7m
z&(el+atfy?qRl}SXE{gBIvGb45q4Cz%}4(?hXQp<NE_xq4b&0Qu1vQZ<3JA^1BHD$
zMG+mB>%SiRl#bffvRSAn-~Mv-iQW%DAM?G|Tzm!L1C2uP=G;Pjs`49r`$J_&>~1Z7
zabw5IbMK!13iXe^d|}tQrQ2G|J<&n)^pV{U>S*NEWcag7tEUF)1M$L@dlq`XKGVNr
z>GSek^7GfaE?A4;c;A-2^KQ>cIDTkJJaNZcTkrhnCvx8()r)`nFM5~Z+&7oU<C_E5
zpPkrVyr!>2pS*Tv?EL)u->tCwrUm=(O)~d*eRc5C3tD9Ljqm*N?x(-J|Hjef1L*ZD
y+kY-T^U%d7t35lHA87vd_pWnY)=Td&-OP!u-%Afac4%w*KPeYS%{PXhn*Rrvu$7en

literal 0
HcmV?d00001

diff --git a/OsmAndCore-sample/res/drawable-mdpi/ic_arrow_back.png b/OsmAndCore-sample/res/drawable-mdpi/ic_arrow_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..c14541d3d78fd2aaececa62031a3c6a364b73d3f
GIT binary patch
literal 1127
zcmbVL&r1|h9G}e$5e!QZEuzPGsHFM1Gwbf;y1BEvxzO6SF0>LsZ)V=Cqs|X!p6%)(
z`T<gQiRh28ps21LI@lp2f^OnTs6){~f({0Oz0qCkARZcK=DqiQ-_Q5==YDbYLPz_t
zc8a1p@*|lNS$o2-?GX8|*OHrL>BZR!9&=4xgFd2$4Oc@TZ^J4oA!y9ate`=PYMHmn
z6<jG?RCL#7VW`8_ZI7TSYA{vzpgx5#&`{NKlJv&wH#D$}Bz;9L@C8pr6V}MQkH+Rl
z%liD3o-pXt5E!g0#DI-31a*7b36y%0-nOfdeJJK=u&siplJrhcl|m7yu8)As#u#0Q
zieMnY3UWe>OJ{+|3o(wDI3d9ZQH8t`4;l|my!nQylrp)7FLFxK6Bv66$JJ^zwiabw
zze=!)1jmb<C^AHY3FaIO>x>ihH7#UNp!=4GE!P2|MX0&6I7yR8cT%vuLSfgi6Eq4%
zO2*Zp#|bRY*>;%MwswF^=x-Q%Y6s;x4{;?FxU;@a`eF7p!K8NkI|>y^G|DC4B29tQ
z8CRdRk%RM@Bu#Eu!!i^xI*@<{5*R~@M;Rnah|zRSWF*rt__!`YokvYOd*QQcE~g4<
zQRM|*5VEm!c34uQLR8Mib5c%Jo7lV)VCd+m>DwZ{8(3jqtfKk|V%IOb?sRhsiW4q&
zg9+CIsv34(W@T`?0Cmd=#b?4+?PQ)ozI6i`Ip4LxcC8g_k2s(Z*Q7*@43rs{7)j!F
z2FfVLm~zaFnmlhHQ>Ghu<9}<&k)XJ6VE!4Prie^sxZR}#IqVV&IfO+%p-YPSP$g8m
zo6iiF>ucKYt*ulG6ZyQ<dNA_t0R58h+=yuE(VzT7ZS&Vw=Zgnx-Qf7m?t86ItVnjD
z>(wo7`Nud&cP!70pO=@1d#(<xw!HoL_zPnk?rM1!xeXN6>O9i5Qe8T+vij&-@8qem
vr{n3#%QFjW+16|A=N1>gf9em`8LEw^(kJ`BzAe62L+a<VqnYRF>v#SD3!!KM

literal 0
HcmV?d00001

diff --git a/OsmAndCore-sample/res/drawable-xhdpi/ic_arrow_back.png b/OsmAndCore-sample/res/drawable-xhdpi/ic_arrow_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..e212ab8f5c75f728e2ea60183688bedd7c31eb2f
GIT binary patch
literal 1294
zcmbVMeP|nH7{4T?n=u`9)3Fb6=hcmx^*(c#=FY~_=F%nIl9e>DAfmn8z1Lim++FXk
zO<GVA!L<b$$V8b;HkH9xhv3JCSY>kxV=@s`M7p9VY<~^1Km5d@zSkzzKg#~_xV!gx
zpZoou=XsxxTNp_n=<x6IBM8!wOo$n{Qtq?49lnov|CoczPA8soMh(@eNESc_6eADN
zWLX*q86YV$lh;5Wg7{{&Y|hE04hgbRCL|X_RLdr0BS>F=)s*BSaL_y$*YqgXSh|Fv
zni9p1a49Nf#y~+!%vxY{Hl3Aci!!fZ{ZF8MRRJ0(14lxu<&tg-)hM=VSAepsCNXps
z;uNFUT2Q&v2pTgifO13_m+26L_VNVH@l1s6K^ck;lN3wRJWhuMc(WARyfEm^QdA)$
z4mEwjT@))gjwz62rBWd(A;Pf6A(!V#iXj;WhX~xB(H*IZ>vmVmf(UHc(o9D)bkwyd
z<&7yPior<Nj!-sJsddA;-Aoir8CjJ~k|rp!Tz1d3ing5$_&1CV(ROym1Y`!-#*`()
zdZ=A3GR)n*9l1aljd0k~U{R!!XvkA#pgT!1ioq|0qA3Cs>g6Q`(73`zLO5Vpfam2r
zgR`olP!XAtWD2zGY{ZYVkpYSt<YE*}(R4gK7$0C`Av(mxBSY*E6Kipky6s513|hW5
z=)1{f@5vQn7LXjn${I$g)deF3!!hiFVWP2^TXl}$(C(BZYr3m`%q`X0$wgpk(?A)r
zj54~KYeCx}4vCKBSw0LKN{z5M%Th8faUhJVTv!dM6r})_!<u~M|K^Z{L6L65{HK9h
zD%h2-xIPYWvp!Hjhf`$1aXB_22N1*)Oo{{9>hkRq^p-1BAb$K@v@LXg<%Kr_=p^61
z<H-*Ky{GT5bZ5-A#Mz0xuYGsHck$;}w%qLBb!K|vb$j2<&ky}{#v45C4c=Mu@@Cs`
z#`ibYg>DM|c7A*J!gE(g<|=!(?)TSAZvxv#eD&(c5B-fr&n+l?()sYg8s2vlDgK`G
z{CbD>Vprz;^Y`t+(BR#iXY$9Zo96?Kcb+*p{J`b<M~e>;yKkf$J3oEvx-a}oUEOpt
zv%OINq9*!!o<6+be}8(pAx?dnc2d&r2lsa_56{0euiX+8pI!X=_SPM~j>Wcb6W8|D
z`ETA!jD7!N-23Oz;|Ir1UH|yTu@CKM+j~ZZ6<nBGDxTZ>@-}YauVktIxY-_jS37WN
l+hWasw&uTk;c~3zK~^4_IrY?|E1m8iDj83UZx4<={||+~uZI8t

literal 0
HcmV?d00001

diff --git a/OsmAndCore-sample/res/drawable-xxhdpi/ic_arrow_back.png b/OsmAndCore-sample/res/drawable-xxhdpi/ic_arrow_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..1766bbc0ef7fcac789bc58efde50d55e789c359f
GIT binary patch
literal 1385
zcmbVMeN5bB81Dw$07cn?PN#uV(6C9bAJ@Cxo!kcZ#hrS19*4VOvaHv>g%hqVZSf9b
zG!$iuGLRXv=rZSqAB(W%#KakyQxplr%q)vbre^*z-NbEKqD!2a8s7qk{z3MKP22Z<
zpFY3m<M%vIUko?Y7Zq+OL=dDX81P2m8Ze%G6MQ#anW%@$-I_0^HA;e(VikbY@lqV1
z!6e%PB7o()I%Yu)g5-23qA@KNdc?^|Ni%EcnA1raq7kHKYg%TxHlU$#(2@{c*wv3u
zU}%DOVcV=BG9-IIYa-CCfX42IDA(P_Ie2XA7PKbqga(p8W6^Z7T~wWE7q(#63HOGW
zz|aL1t<8lk1{Dj1QIDhm)M~cj9A%-=%?>kVb<lRE8l_3fMvx3aIdID2gf~N?OBV*c
zDZJo}c>PPh;K_xxYMSgMh*T<NPFc*7(gLv#2SL&VP2*4lSGz=wP2-|kk+t9jDyJl5
zEg^}hVUdkXotg`SkuIi?ltZCq!=k!G6r_wuvob-MNg|mv@><YVwFvk(j1{%jXqOC#
z2vDU?g@g4FDzae6-OU{tiZB}Iqe=o6g>CmrTxSx9TF~pl;1@HW;GMK(vxDUUh4YNv
zf&-cXc$|yVI3w^pY3FE`BSF^AN_fWNC*5wV&F%No6y>wIeRYh-LRqXnyPxsXo-8&f
zsv0YDAnQ8;eJ^3HH^n+V3Sc!!iAqv?whO|ok|wFGl8kyhM%ArmD_Rv|xrAtlHyWi{
z%-jo<#8ZIxD^e0&;M$p3Ar6+Z#~FtWHk4pzaE2i{oV5ZQE?8}XMIcEY2v%$f&;MTz
z2^bV%G|Yb*C@X?pX>6Cr0UnkI3W#uu6gV!|pWRcAAgi7adh4R;Z!dqJ5vOWzHSHW;
zyQ9B<{D3$aD0^-_>j7hPjhVg&=S_Wm%|EsO`Q3^8ZV$fw^g}0G9+)FTr**2Vq9EUk
zu3q~>Z7x>ab5|}FZa)BK)!Cw+3mxYk-d|Hbuv<Qpnh}TmE%sZaz#-4R8<*bL-t+g=
z;f{?TeVt!9eRgD0$kC@VCjIkFuKq=4wLYCe^e<1D^qEt+g*}JzN=)@R0sXgL{q#M7
z{t3@#^93dA-dP`x?JKQ)vtxf=;b0?o{o<PFx_dwTeeAE?^7DHq<1^Lvk@LHwwKvXe
zDsH|1$avGS;-9-ln=fn|SJJ@=Ye2vD_^<CZee&u{T6(m!shWu#rOWO-d~r)vW#sC>
z!IJrx_0i0p5p?{qp%0n|$iQpIWBHX=ggZ)S55B(3|Ne&5r`YzBz33}rYXmuPbZ?cr
z{P>eUZt^*WykYd4OS`_R9US`QkHO&|&h|XxQF<FW`C3~)ctX8xhdjCJt;^E}U(_;b
c;kjc4By#TEekl-8%8Z|1(AVHS;@+wM12|^kasU7T

literal 0
HcmV?d00001

diff --git a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/ContextMenuHelper.java b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/ContextMenuHelper.java
index 734dccc9e9..7af901bdca 100644
--- a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/ContextMenuHelper.java
+++ b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/ContextMenuHelper.java
@@ -62,7 +62,7 @@ public class ContextMenuHelper {
 
 		final Toolbar topBar = new Toolbar(ctx);
 		topBar.setClickable(true);
-		Drawable back = app.getIconsCache().getIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha);
+		Drawable back = app.getIconsCache().getIcon(R.drawable.ic_arrow_back);
 		topBar.setNavigationIcon(back);
 		topBar.setNavigationContentDescription(app.getString("access_shared_string_navigate_up"));
 		topBar.setTitle(title);
@@ -220,7 +220,7 @@ public class ContextMenuHelper {
 
 		final Toolbar topBar = new Toolbar(ctx);
 		topBar.setClickable(true);
-		Drawable back = app.getIconsCache().getIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha);
+		Drawable back = app.getIconsCache().getIcon(R.drawable.ic_arrow_back);
 		topBar.setNavigationIcon(back);
 		topBar.setNavigationContentDescription(app.getString("access_shared_string_navigate_up"));
 		topBar.setTitle(title);
diff --git a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchDialogFragment.java b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchDialogFragment.java
index 1a5deb3c6e..2d4752b087 100644
--- a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchDialogFragment.java
+++ b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchDialogFragment.java
@@ -203,7 +203,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements SampleC
 		);
 
 		toolbar = (Toolbar) view.findViewById(R.id.toolbar);
-		toolbar.setNavigationIcon(app.getIconsCache().getThemedIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha));
+		toolbar.setNavigationIcon(app.getIconsCache().getThemedIcon(R.drawable.ic_arrow_back));
 		toolbar.setNavigationContentDescription(app.getString("access_shared_string_navigate_up"));
 		toolbar.setNavigationOnClickListener(
 				new OnClickListener() {

From fc6fd5445c7109b4031b4745815a6b98c78faf02 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sat, 29 Jul 2017 18:01:00 +0300
Subject: [PATCH 14/33] Fix region detection

---
 .../plus/base/MapViewTrackingUtilities.java   | 50 +++++++++++++------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
index bd14cffd7a..78cfa17da5 100644
--- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
@@ -1,6 +1,7 @@
 package net.osmand.plus.base;
 
 import android.content.Context;
+import android.os.AsyncTask;
 import android.support.v4.util.Pair;
 import android.view.WindowManager;
 
@@ -150,28 +151,45 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 		return movingToMyLocation;
 	}
 
+	private void detectDrivingRegion(final LatLon latLon) {
+
+		new AsyncTask<LatLon, Void, BinaryMapDataObject>() {
+
+			@Override
+			protected BinaryMapDataObject doInBackground(LatLon... latLons) {
+				try {
+					if (latLons != null && latLons.length > 0) {
+						return app.getRegions().findBinaryMapDataObject(latLons[0]);
+					}
+				} catch (IOException e) {
+					// ignore
+				}
+				return null;
+			}
+
+			@Override
+			protected void onPostExecute(BinaryMapDataObject o) {
+				if (o != null) {
+					String fullName = app.getRegions().getFullName(o);
+					WorldRegion worldRegion = app.getRegions().getRegionData(fullName);
+					if (worldRegion != null) {
+						app.setupDrivingRegion(worldRegion);
+					}
+				}
+			}
+
+		}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, latLon);
+	}
+
 	@Override
 	public void updateLocation(Location location) {
 		myLocation = location;
 		showViewAngle = false;
 		if (location != null) {
 			locationProvider = location.getProvider();
-			if (settings.DRIVING_REGION_AUTOMATIC.get() && !drivingRegionUpdated) {
-				try {
-					BinaryMapDataObject o = app.getRegions().findBinaryMapDataObject(
-							new LatLon(location.getLatitude(), location.getLongitude()));
-					if (o != null) {
-						String fullName = app.getRegions().getFullName(o);
-						WorldRegion worldRegion = app.getRegions().getRegionData(fullName);
-						if (worldRegion != null) {
-							app.setupDrivingRegion(worldRegion);
-						}
-					}
-					drivingRegionUpdated = true;
-
-				} catch (IOException e) {
-					// ignore
-				}
+			if (settings.DRIVING_REGION_AUTOMATIC.get() && !drivingRegionUpdated && !app.isApplicationInitializing()) {
+				drivingRegionUpdated = true;
+				detectDrivingRegion(new LatLon(location.getLatitude(), location.getLongitude()));
 			}
 		}
 		if (mapView != null) {

From e886096dfb50562a5efdc3fc4ed2131d8706c11f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D3=98mrah=20N=D3=99biyev?= <emrah.nebiyev@gmail.com>
Date: Sat, 29 Jul 2017 13:10:25 +0000
Subject: [PATCH 15/33] Translated using Weblate (Azerbaijani)

Currently translated at 69.8% (1653 of 2367 strings)
---
 OsmAnd/res/values-az/strings.xml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-az/strings.xml b/OsmAnd/res/values-az/strings.xml
index 639f760254..7e711bf032 100644
--- a/OsmAnd/res/values-az/strings.xml
+++ b/OsmAnd/res/values-az/strings.xml
@@ -922,10 +922,10 @@
     <string name="lang_en_gb">İngiliscə (Birləşmiş Krallıq)</string>
     <string name="lang_af">Afrikanca</string>
     <string name="lang_al">Albanca</string>
-    <string name="lang_eu">Bask dili</string>
+    <string name="lang_eu">Baskca</string>
     <string name="lang_hu_formal">Macarca (rəsmi)</string>
-    <string name="lang_id">İndoneziya dili</string>
-    <string name="lang_ko">Koreya dili</string>
+    <string name="lang_id">İndonezcə</string>
+    <string name="lang_ko">Koreyaca</string>
     <string name="route_descr_select_destination">Təyinat nöqtəsi seçin</string>
     <string name="routing_attr_avoid_toll_description">Pullu yollardan yayın</string>
     <string name="routing_attr_avoid_unpaved_name">Asfaltsız yollardan yayın</string>
@@ -1658,4 +1658,21 @@
     <string name="osm_edit_created_poi">Yaradılmış OSM POI</string>
     <string name="rendering_value_translucent_pink_name">Şəffaf çəhrayı</string>
     <string name="confirm_usage_speed_cameras">Bir çox ölkələrdə (Almaniya, Fransa, İtaliya və s.) sürət kamerası xəbərdarlıqlarının istifadə edilməsinə qanunla icazə verilmir. Qanunu pozarsanız, OsmAnd heç bir məsuliyyət daşımır. Yalnız bu xüsusiyyətdən istifadəyə icazə varsa, Bəli düyməsinə toxunun.</string>
+    <string name="lang_ml">Malayalamca</string>
+    <string name="lang_sw">Suahilicə</string>
+    <string name="lang_bs">Boşnakca</string>
+    <string name="lang_bg">Bolqarca</string>
+    <string name="lang_ca">Katalanca</string>
+    <string name="lang_hr">Xorvatca</string>
+    <string name="lang_da">Danimarkaca</string>
+    <string name="lang_kn">Kannadaca</string>
+    <string name="lang_lv">Latışca</string>
+    <string name="lang_lt">Litvaca</string>
+    <string name="lang_mr">Marathicə</string>
+    <string name="lang_no">Norveçcə</string>
+    <string name="lang_pl">Polyakca</string>
+    <string name="lang_sr">Serbcə</string>
+    <string name="lang_sr_latn">Serbcə (Latın)</string>
+    <string name="lang_sk">Slovakca</string>
+    <string name="lang_sl">Slovencə</string>
     </resources>

From 09132aeff4a291f886a174f23bb410bfa3c1590e Mon Sep 17 00:00:00 2001
From: Guntis Ozols <jkrumings@gmail.com>
Date: Sat, 29 Jul 2017 12:33:35 +0000
Subject: [PATCH 16/33] Translated using Weblate (Latvian)

Currently translated at 95.3% (2257 of 2367 strings)
---
 OsmAnd/res/values-lv/strings.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index 5d9e86ed8f..f05748152f 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="plugins_screen">Spraudņu pārvaldnieks</string>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="plugins_screen">Spraudņu pārvaldnieks</string>
   
   <string name="prefs_plugins_descr">Spraudņi papildina aplikācijas iespējas un piešķir tai papildus funkcionalitāti</string>
   <string name="prefs_plugins">Spraudņi</string>
@@ -2399,13 +2400,13 @@ failu(s)?
     <string name="skip_map_downloading_desc">Jums nav instalētas nevienas bezsaistes kartes. Izvēlieties kartes no saraksta vai lejuielādējiet tās caur izvēlni - %1$s.</string>
     <string name="search_another_country">Izvēlieties citu reģionu</string>
     <string name="search_map">Meklē karti…</string>
-    <string name="first_usage_wizard_desc">Nosakot jūsu atrašanās vietu, OsmAnd piedāvā sekojošas kartes lejupielādei.</string>
+    <string name="first_usage_wizard_desc">OsmAnd noteiks jūsu atrašanos un piedāvās lejupielādēt šī reģiona karti.</string>
     <string name="location_not_found">Atrašanās vieta nav zināma</string>
     <string name="no_inet_connection">Nav interneta savienojuma</string>
     <string name="no_inet_connection_desc_map">Nepieciešams lejupielādēt kartes.</string>
     <string name="search_location">Meklē atrašanās vietu…</string>
     <string name="storage_free_space">Brīvā vieta</string>
-    <string name="storage_place_description">OsmAnd datu glabātuve (kartēm, trekiem, u.t.t.): %1$s.</string>
+    <string name="storage_place_description">OsmAnd datu uzglabāšanas vieta (kartēm, maršrutiem u.c.): %1$s.</string>
     <string name="give_permission">Dot atļauju</string>
     <string name="allow_access_location">Atļaut noteikt vietu</string>
     <string name="first_usage_greeting">Veidojiet maršrutus un atklājiet jaunas vietas bez interneta savienojuma</string>
@@ -2958,4 +2959,4 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="mapillary_image">Mapillary bilde</string>
     <string name="import_gpx_failed_descr">OsmAnd nevar importēt failu. Pārliecinieties vai OsmAnd ir atļauja nolasīt failu dotajā mapē.</string>
     <string name="shared_string_permissions">Atļaujas</string>
-    </resources>
\ No newline at end of file
+    </resources>

From 9f942ccf3c759dc3c1a3783ecddf8fbc6c43754d Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Sat, 29 Jul 2017 12:13:52 +0000
Subject: [PATCH 17/33] Translated using Weblate (Spanish (American))

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

diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index c72c9b9353..5a2474ba38 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -2696,7 +2696,7 @@ Proporciona un código completo</string>
     <string name="quick_action_start_stop_navigation">Iniciar/Parar navegación</string>
     <string name="quick_action_start_stop_navigation_descr">Pulsa este botón para iniciar la navegación, o para finalizarla si ya se había iniciado.</string>
     <string name="live_monitoring_max_interval_to_send">Tiempo del búfer para el seguimiento en línea</string>
-    <string name="live_monitoring_max_interval_to_send_desrc">Especifica el tiempo del búfer para mantener lugares para enviar sin conexión</string>
+    <string name="live_monitoring_max_interval_to_send_desrc">Especifica el tiempo que el búfer mantendrá los lugares para enviar sin conexión</string>
     <string name="mappilary_no_internet_desc">Debes tener conexión a Internet para ver fotos de Mapillary</string>
     <string name="retry">Reintentar</string>
 </resources>

From f9497491a4ddbd714a23f8e8434ab6e94cd0a622 Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Sat, 29 Jul 2017 12:13:22 +0000
Subject: [PATCH 18/33] Translated using Weblate (Spanish (Argentina))

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

diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index d0f51d5cfd..aec8e8e55c 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2694,8 +2694,8 @@ Proporciona un código completo</string>
     <string name="quick_action_show_navigation_finish_dialog">Mostrar diálogo de Finalizar navegación</string>
     <string name="quick_action_start_stop_navigation">Iniciar/Parar navegación</string>
     <string name="quick_action_start_stop_navigation_descr">Pulsa este botón para iniciar la navegación, o para finalizarla si ya se había iniciado.</string>
-    <string name="live_monitoring_max_interval_to_send">Tiempo del búfer para la seguimiento en línea</string>
-    <string name="live_monitoring_max_interval_to_send_desrc">Especifica el tiempo del búfer para mantener lugares para enviar sin conexión</string>
+    <string name="live_monitoring_max_interval_to_send">Tiempo del búfer para el seguimiento en línea</string>
+    <string name="live_monitoring_max_interval_to_send_desrc">Especifica el tiempo que el búfer mantendrá los lugares para enviar sin conexión</string>
     <string name="mappilary_no_internet_desc">Debes tener conexión a Internet para ver fotos de Mapillary</string>
     <string name="retry">Reintentar</string>
 </resources>

From e10c87b01adbad5eec3d699801e462c9501e8065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D1=96=D0=B9=20=D0=94=D1=83=D0=B1?=
 =?UTF-8?q?=D0=B8=D0=BA?= <serhijdubyk@gmail.com>
Date: Sat, 29 Jul 2017 18:43:22 +0000
Subject: [PATCH 19/33] Translated using Weblate (Ukrainian)

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

diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index fa2ff70842..f70dd19a4d 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -44,9 +44,9 @@
   
   
   <string name="osmand_rastermaps_plugin_description">"Цей втулок надає можливість отримати доступ до багатьох типів онлайн (так званих растрових) мап, від попередньо створених квадратів OpenStreetMap (на кшталт стилю Mapnik) до супутникових знімків та спеціальних шарів, таких як погодні, кліматичні та геологічні мапи, шари рельєфу й т.і. 
-\n 
-\nБудь яка з цих мап може використовуватись як основна мапа в OsmAnd, або як покриття чи підкладка до іншої основної мапи (наприклад стандартна оффлайнова мапа OsmAnd). Для того, щоб зробити більш помітною будь-яку мапу-підкладку, певні елементи векторної мапи OsmAnd можна легко сховати через меню \'Налаштування Мапи\'. 
-\n 
+\n
+\nБудь яка з цих мап може використовуватись як основна мапа в OsmAnd, або як покриття чи підкладка до іншої основної мапи (наприклад стандартна оффлайнова мапа OsmAnd). Для того, щоб зробити більш помітною будь-яку мапу-підкладку, певні елементи векторної мапи OsmAnd можна легко сховати через меню „Налаштування Мапи“. 
+\n
 \nКвадрати мап можна отримувати безпосередньо з онлайн-джерел або підготувати їх для оффлайнового використання (та вручну скопіювати в теку даних  OsmAnd) у вигляді бази даних SQLite, яку можна створити за допомогою різноманітних сторонніх інструментів підготовки мап."</string>
   <string name="osmand_background_plugin_description">Показує налаштування для активації навігації та запису маршрутів в фоновому режимі (екран вимкнено), періодично активуючи GPS.</string>
   <string name="osmand_accessibility_description">Втулок містить налаштування допоміжних можливостей. Він дозволяє налаштувати швидкість відтворення голосових підказок, налаштування спрямовування екрану під час навігації, використання трекболу для масштабування, або використання перетворення тексту в голос, скажімо, для сповіщення про ваше поточне місцезнаходження.</string>
@@ -665,7 +665,7 @@
   <string name="shared_string_close">Закрити</string>
   <string name="loading_data">Дані завантажуються…</string>
   <string name="reading_indexes">Зчитування даних…</string>
-  <string name="previous_run_crashed">Помилка у роботі програми. Лог-файл знаходиться тут {0}. Будь ласка, напишіть розробнику про помилку (з вкладеним лог-файлом).</string>
+  <string name="previous_run_crashed">Помилка у роботі програми. Файл журналу знаходиться тут {0}. Будь ласка, напишіть розробнику про помилку (з вкладеним журнальним файлом).</string>
   <string name="saving_gpx_tracks">Збереження GPX треків на SD…</string>
   <string name="finished_task">Закінчено</string>
   
@@ -2934,12 +2934,12 @@
     <string name="max_min">Макс./мін.</string>
     
     <string name="min_max">Мін/макс</string>
-    <string name="release_2_7">\\022 Втулок Mapillary з вуличними зображеннями
-\n
-\n • Віджет-лінійка для вимірювання дистанцій
-\n
-\n • Розділені GPX-інтервали з докладною інформацією про Ваш трек
-\n
+    <string name="release_2_7">• Втулок Mapillary з вуличними зображеннями 
+\n 
+\n • Віджет-лінійка для вимірювання дистанцій 
+\n 
+\n • Розділені GPX-інтервали з докладною інформацією про Ваш трек 
+\n 
 \n • Інші поліпшення й виправлення помилок
 \n
 \n</string>
@@ -2951,4 +2951,6 @@
     <string name="quick_action_start_stop_navigation_descr">Натисніть цю кнопку, щоб запустити навігацію або зупинити її, якщо вона вже була запущена.</string>
     <string name="live_monitoring_max_interval_to_send">Час буферизації для онлайн-стеження</string>
     <string name="live_monitoring_max_interval_to_send_desrc">Задає час буферизації для збереження місць для відправки в автономному режимі</string>
-    </resources>
+    <string name="mappilary_no_internet_desc">Вам потрібен Інтернет для перегляду фотографій від Mapillary</string>
+    <string name="retry">Повторити</string>
+</resources>

From e8529c56f9f5f7c66d80364ee95be9d953ce4048 Mon Sep 17 00:00:00 2001
From: Hardy <hm.gglmail@gmail.com>
Date: Sat, 29 Jul 2017 23:18:04 +0200
Subject: [PATCH 20/33] Fix #4232

---
 OsmAnd/res/values-nl/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 97ed42fb4e..631f6f5353 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -2234,7 +2234,7 @@ Lengtegraad:\t\t%2$s</string>
     <string name="clear_updates_proposition_message">Je kan gedownloade updates verwijderen en terugkeren naar de originele kaart</string>
     <string name="add_time_span">Periode toevoegen</string>
     <string name="road_blocked">Weg geblokkeerd</string>
-    <string name="shared_string_select">Selekteer</string>
+    <string name="shared_string_select">Selecteer</string>
     <string name="reports_for">Verslag voor:</string>
 <string name="data_is_not_available">Gegevens niet beschikbaar</string>
     <string name="rendering_attr_hideUnderground_name">Ondergrondse objecten</string>
@@ -2863,4 +2863,4 @@ Van bijna alle landen is een kaart te downloaden: van Afghanistan tot Zimbabwe,
     <string name="mapillary_menu_title_dates">Data</string>
     <string name="mapillary_menu_edit_text_hint">Geef gebruikersnaam</string>
     <string name="mapillary_menu_title_username">Gebruikersnaam</string>
-    </resources>
\ No newline at end of file
+    </resources>

From 3aa0fb82d4b5489894f2ac5022d3ef909a6af524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D3=98mrah=20N=D3=99biyev?= <emrah.nebiyev@gmail.com>
Date: Sat, 29 Jul 2017 19:32:45 +0000
Subject: [PATCH 21/33] Translated using Weblate (Azerbaijani)

Currently translated at 70.6% (1672 of 2367 strings)
---
 OsmAnd/res/values-az/strings.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/OsmAnd/res/values-az/strings.xml b/OsmAnd/res/values-az/strings.xml
index 7e711bf032..76f4eca535 100644
--- a/OsmAnd/res/values-az/strings.xml
+++ b/OsmAnd/res/values-az/strings.xml
@@ -1675,4 +1675,23 @@
     <string name="lang_sr_latn">Serbcə (Latın)</string>
     <string name="lang_sk">Slovakca</string>
     <string name="lang_sl">Slovencə</string>
+    <string name="use_high_res_maps">Yüksək dəqiqlikli ekran</string>
+    <string name="transport_searching_transport">Nəqliyyat nəticələri (təyinat nöqtəsi yoxdur):</string>
+    <string name="transport_searching_route">Nəqliyyat nəticələri (təyinat nöqtəsinə {0}):</string>
+    <string name="transport_search_again">Nəqliyyat axtarışını sıfırla</string>
+    <string name="voice">Qeyd edilən səs</string>
+    <string name="no_vector_map_loaded">Vektor xəritələr yüklənməyib</string>
+    <string name="vector_data">Offlayn vektor xəritələr</string>
+    <string name="transport_context_menu">Dayanacaqda nəqliyyat axtar</string>
+    <string name="show_route">Marşrut detalları</string>
+    <string name="no_fav_to_save">Yadda saxlanacaq favorit nöqtələr yoxdur</string>
+    <string name="share_fav_subject">Favoritlər OsmAnd ilə paylaşılıb</string>
+    <string name="error_occurred_loading_gpx">GPX yüklənərkən səhv baş verdi</string>
+    <string name="thanks_yandex_traffic">Trafik məlumatları üçün Yandex-ə təşəkkürlər.</string>
+    <string name="layer_yandex_traffic">Yandex trafik</string>
+    <string name="layer_route">Marşrut</string>
+    <string name="layer_osm_bugs">OSM qeydlər (onlayn)</string>
+    <string name="search_near_map">Hazırki xəritə mərkəzinin yaxınında axtar</string>
+    <string name="transport_Routes">Marşrutlar</string>
+    <string name="transport_Stop">Dayanacaq</string>
     </resources>

From 5a8a47728973599c4594c8ffe85f400a4c8e05be Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Sat, 29 Jul 2017 18:48:41 +0000
Subject: [PATCH 22/33] Translated using Weblate (Slovak)

Currently translated at 99.0% (2345 of 2367 strings)
---
 OsmAnd/res/values-sk/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index bd5cf1fc02..a14989f25c 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2815,4 +2815,6 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="min_max">Min/Max</string>
     <string name="live_monitoring_max_interval_to_send">Časový zásobník pre online sledovanie</string>
     <string name="live_monitoring_max_interval_to_send_desrc">Zadajte čas pokiaľ budú udržované pozície na odoslanie kým nie je pripojenie</string>
-    </resources>
+    <string name="mappilary_no_internet_desc">Na zobrazovanie fotografií z Mapillary potrebujete pripojenie na Internet</string>
+    <string name="retry">Skúsiť znova</string>
+</resources>

From cad5940f927fd0a0109bf3e33d1821ec368834dd Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Sun, 30 Jul 2017 00:27:48 +0000
Subject: [PATCH 23/33] Translated using Weblate (Chinese (Traditional))

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

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 35f81f6605..a9cb3892f5 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2804,4 +2804,6 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="quick_action_start_stop_navigation_descr">按此按鈕開始導航如果已經開始，則停止導航。</string>
     <string name="live_monitoring_max_interval_to_send">用於線上追蹤的緩衝時間</string>
     <string name="live_monitoring_max_interval_to_send_desrc">指定一段緩衝時間以保持位置，而無需連接發送</string>
-    </resources>
+    <string name="mappilary_no_internet_desc">您需要網際網路才能從 Mapillary 檢視照片</string>
+    <string name="retry">重試</string>
+</resources>

From 9f6952388e68753330ce7a33c2a6ff2ed116b677 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sun, 30 Jul 2017 13:33:17 +0000
Subject: [PATCH 24/33] Translated using Weblate (Basque)

Currently translated at 100.0% (2367 of 2367 strings)
---
 OsmAnd/res/values-eu/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 18dec8ae9e..1ec9435053 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -2746,4 +2746,6 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="quick_action_start_stop_navigation_descr">Sakatu boti hau nabigazioa hasteko, edo gelditzeko hasita bazegoen.</string>
     <string name="live_monitoring_max_interval_to_send">Lineako jarraipenaren denbora-bufferra</string>
     <string name="live_monitoring_max_interval_to_send_desrc">Zehaztu bidaltzeke dauden kokalekuak gordetzeko denbora-buffer bat</string>
-    </resources>
+    <string name="mappilary_no_internet_desc">Internet behar duzu Mapillary-ko argazkiak ikusteko</string>
+    <string name="retry">Saiatu berriro</string>
+</resources>

From 94f8c339b7e9d09fb75cc15d6586fbb1cd18656b Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sun, 30 Jul 2017 13:35:14 +0000
Subject: [PATCH 25/33] Translated using Weblate (Basque)

Currently translated at 62.9% (1978 of 3141 strings)
---
 OsmAnd/res/values-eu/phrases.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/res/values-eu/phrases.xml b/OsmAnd/res/values-eu/phrases.xml
index a6e37ce697..e9afbf0b18 100644
--- a/OsmAnd/res/values-eu/phrases.xml
+++ b/OsmAnd/res/values-eu/phrases.xml
@@ -2198,4 +2198,6 @@
 	<string name="poi_lock_basin">Esklusako atea</string>
 	<string name="poi_notice">Itsas oharra</string>
 	<string name="poi_pile">Pilote</string>
+	<string name="poi_wiki_lang_bs">Wikia bosnieraz</string>
+	<string name="poi_bicycle_parking_wall_loops">Hormako begiztak</string>
 	</resources>

From 07af87298757d96ab4f1b3dba0d34a68a677ea14 Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Sun, 30 Jul 2017 01:30:11 +0000
Subject: [PATCH 26/33] Translated using Weblate (Chinese (Traditional))

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

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index a9cb3892f5..194da21f92 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -1494,7 +1494,7 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
 
     <string name="rendering_attr_showCycleRoutes_name">顯示自行車路線</string>
     <string name="map_preferred_locale">地圖上優先的語言</string>
-    <string name="local_map_names">本地名稱</string>
+    <string name="local_map_names">當地的名稱</string>
     <string name="lang_sw">斯瓦希里</string>
     <string name="lang_he">希伯來</string>
     <string name="forward">往前</string>
@@ -1506,7 +1506,7 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="gpx_monitoring_stop">停止 GPX 記錄</string>
     <string name="gpx_start_new_segment">開始新區段</string>
     <string name="lang_fa">波斯</string>
-    <string name="map_preferred_locale_descr">在地圖標簽上優先的語言(如果優先的語言無法使用，將會切換成英文或本地名稱)</string>
+    <string name="map_preferred_locale_descr">在地圖標簽上優先的語言(如果優先的語言無法使用，將會切換成英文或當地名稱)</string>
     <string name="live_monitoring_m_descr">如果已啟用了 GPX 記錄，傳送軌跡資料到指定的 web 服務。</string>
     <string name="keep_navigation_service">保持</string>
     <string name="stop_navigation_service">中止</string>

From 375dc2b83c6ea8be86336939362ca176d2b2ed26 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 31 Jul 2017 10:45:27 +0300
Subject: [PATCH 27/33] Fix NPE

---
 OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java b/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
index c4134a7f69..58b53cb878 100644
--- a/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
+++ b/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
@@ -578,14 +578,19 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
 
 	private void putAllAcceptedTypes(Map<PoiCategory, LinkedHashSet<String>> types) {
 		for (PoiCategory category : types.keySet()) {
+			LinkedHashSet<String> typesSet = types.get(category);
 			if (acceptedTypes.containsKey(category)) {
-				if (acceptedTypes.get(category) != null && types.get(category) != null) {
-					acceptedTypes.get(category).addAll(types.get(category));
+				if (acceptedTypes.get(category) != null && typesSet != null) {
+					acceptedTypes.get(category).addAll(typesSet);
 				} else {
 					acceptedTypes.put(category, null);
 				}
 			} else {
-				acceptedTypes.put(category, new LinkedHashSet<>(types.get(category)));
+				if (typesSet != null) {
+					acceptedTypes.put(category, new LinkedHashSet<>(typesSet));
+				} else {
+					acceptedTypes.put(category, null);
+				}
 			}
 		}
 	}

From 77b3a4bac14ea1e479dbb50cdf2cf94e50189134 Mon Sep 17 00:00:00 2001
From: Boyuan Yang <073plan@gmail.com>
Date: Mon, 31 Jul 2017 03:06:46 +0000
Subject: [PATCH 28/33] Translated using Weblate (Chinese (Simplified))

Currently translated at 98.8% (2340 of 2367 strings)
---
 OsmAnd/res/values-zh-rCN/strings.xml | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index e84c261517..2edc103915 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -2049,7 +2049,7 @@
     <string name="gpx_timespan">时间跨度：%1$s</string>
     <string name="gpx_timemoving">时间移动：%1$s</string>
     <string name="gpx_selection_segment_title">区段</string>
-    <string name="gpx_selection_number_of_points">" %1$s 的标点"</string>
+    <string name="gpx_selection_number_of_points">%1$s 的标点</string>
     <string name="gpx_selection_point">标点 %1$s</string>
     <string name="gpx_selection_route_points">%1$s 
 \n路线标点 %2$s</string>
@@ -2105,9 +2105,9 @@
     <string name="osmo_connected_devices">已连接的设备</string>
     <string name="osmo_session_token">会话令牌: %1$s</string>
     <string name="osmo_auth_pending">正在等待授权…</string>
-    <string name="osmo_locations_sent">"位置已发送 %1$d（缓冲区 %2$d） "</string>
-    <string name="osmo_conn_successfull">"建立的连接: %1$s "</string>
-    <string name="osmo_io_error">"OsMo 连接问题： "</string>
+    <string name="osmo_locations_sent">位置已发送 %1$d（缓冲区 %2$d）</string>
+    <string name="osmo_conn_successfull">连接已建立: %1$s</string>
+    <string name="osmo_io_error">OsMo 连接问题：</string>
     <string name="osmo_settings_uuid">独特的设备 id</string>
     <string name="use_points_as_intermediates">计算两点之间的路线</string>
     <string name="osmo_mode_restart">重新启动 OsMo 会话</string>
@@ -2212,7 +2212,7 @@
     <string name="app_mode_aircraft">航空器</string>
     <string name="local_osm_changes_delete_all_confirm">要删除 %1$d 个 OSM 更新。是否确定？</string>
     <string name="animate_routing_route_not_calculated">请先计算路线</string>
-    <string name="animate_routing_route">"模拟使用计算的路线 "</string>
+    <string name="animate_routing_route">使用计算的路线进行模拟</string>
     <string name="animate_routing_gpx">模拟使用 GPX 轨迹</string>
     <string name="route_is_too_long_v2">这条路线可能太长，无法推算。如果在10分钟内没有结果，请添加中继节点。</string>
     <string name="auto_zoom_none">不自动缩放</string>
@@ -2633,4 +2633,19 @@
     <string name="of">%2$d 中的 %1$d</string>
     <string name="moving_time">移动时间</string>
     <string name="min_max">最小/最大</string>
+    <string name="quick_action_resume_pause_navigation">继续/暂停导航</string>
+    <string name="quick_action_resume_pause_navigation_descr">点击该按钮以暂停导航，或者在已暂停时恢复导航。</string>
+    <string name="quick_action_show_navigation_finish_dialog">显示导航完成对话框</string>
+    <string name="quick_action_start_stop_navigation">开始/结束导航</string>
+    <string name="quick_action_start_stop_navigation_descr">点击该按钮以开始导航，或者在导航已经开始的情况下结束导航。</string>
+    <string name="release_2_7">\\022 带有街道等级图像的 Mapillary 插件
+\n
+\n• 用于距离测量的量尺小部件
+\n
+\n • GPX 切分间隔，带有您的路径的详细信息
+\n
+\n • 其它改进和问题修复
+\n
+\n</string>
+    <string name="rendering_value_translucent_pink_name">半透明粉红色</string>
     </resources>

From 72960f515e1bf86f5145acb9ccf949305524c526 Mon Sep 17 00:00:00 2001
From: elPresidento <ludek.m@gmail.com>
Date: Sun, 30 Jul 2017 14:45:11 +0000
Subject: [PATCH 29/33] Translated using Weblate (Czech)

Currently translated at 99.1% (2347 of 2367 strings)
---
 OsmAnd/res/values-cs/strings.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 90e4aba12d..616fad3067 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -2554,7 +2554,7 @@ Pokud potřebujete pomoci s aplikací OsmAnd, prosím kontaktujte naši podporu
     <string name="routing_attr_relief_smoothness_factor_hills_name">Kopcovitý</string>
     <string name="routing_attr_relief_smoothness_factor_plains_name">Méně kopcovitý</string>
     <string name="routing_attr_relief_smoothness_factor_more_plains_name">Rovinatý</string>
-    <string name="routing_attr_driving_style_speed_name">Preferovat hlavní silnice</string>
+    <string name="routing_attr_driving_style_speed_name">Kratší trasy</string>
     <string name="routing_attr_driving_style_balance_name">Vyvážený</string>
     <string name="routing_attr_driving_style_safety_name">Preferovat vedlejší silnice</string>
     <string name="relief_smoothness_factor_descr">Priorita terénu: rovinatý nebo kopcovitý</string>
@@ -2676,4 +2676,19 @@ Pokud potřebujete pomoci s aplikací OsmAnd, prosím kontaktujte naši podporu
     <string name="max_min">Max/Min</string>
     
     <string name="min_max">Min/Max</string>
+    <string name="quick_action_resume_pause_navigation">Pokračovat/Pozastavit navigaci</string>
+    <string name="quick_action_resume_pause_navigation_descr">Stiskněte toto tlačítko na pozastavení navigace, nebo pokračování pokud je pozastavená.</string>
+    <string name="quick_action_show_navigation_finish_dialog">Zobrazit zprávu o ukončení navigace</string>
+    <string name="quick_action_start_stop_navigation">Spustit/Ukončit navigaci</string>
+    <string name="quick_action_start_stop_navigation_descr">Stiskněte toto tlačítko pro spuštění navigace, nebo zastavení, pokud již byla spuštěna.</string>
+    <string name="release_2_7">"\\022 Modul Mapillary se snímky ulic
+\n
+\n • Pravítko pro měření vzdálenosti
+\n
+\n • Intervaly rozdělení GPX  s detailními informacemi o trase
+\n
+\n • další vylepšení a opravy chyb
+\n
+\n"</string>
+    <string name="rendering_value_translucent_pink_name">Průhledná růžová</string>
     </resources>

From 5400215de941d86fb11a6f3a8f813b4b7ced8d0e Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Sun, 30 Jul 2017 16:29:34 +0000
Subject: [PATCH 30/33] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 5e1f283fae..5a543162f6 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2449,7 +2449,7 @@ Hvis du  ønsker at støtte OsmAnd og OSM, er dette en god måde at gøre det p
     <string name="christmas_desc_q">Vis jule-interessepunkter (IP)?</string>
     <string name="save_track_min_speed">Minimumshastighed for logning</string>
     <string name="save_track_min_speed_descr">Filter: Angiv minimumshastighed før et punkt logges</string>
-    <string name="save_track_min_distance">Logning ved minimum bevægelse</string>
+    <string name="save_track_min_distance">Logning ved minimum forskydning</string>
     <string name="save_track_min_distance_descr">Filter: Indstil minimumsafstand fra sidste position før et punkt logges</string>
     <string name="save_track_precision">Mindste nøjagtighed for logning</string>
     <string name="save_track_precision_descr">Filter: Indstil minimum nøjagtighed før et punkt logges</string>
@@ -2779,7 +2779,7 @@ Tidligere destination bliver sidste mellemliggende punkt.</string>
     <string name="mapillary_menu_edit_text_hint">Indtast brugernavn</string>
     <string name="mapillary_menu_descr_username">Se billeder tilføjet af en bestemt bruger.</string>
     <string name="mapillary_menu_title_username">Brugernavn</string>
-    <string name="mapillary_menu_filter_description">Filtrer billeder efter indsender eller dato. Filter gælder kun for højere zoom.</string>
+    <string name="mapillary_menu_filter_description">Filtrer billeder efter indsender eller dato. Filter gælder kun for højere zoomniveauer.</string>
     <string name="mapillary_menu_descr_dates">Se billeder tilføjet i en bestemt periode.</string>
     <string name="shared_string_reload">Genindlæs</string>
     <string name="mapillary_menu_descr_tile_cache">Genindlæs kortbrikker for at se opdaterede data.</string>

From e13013e876efb905f5d7ddae44d80bcf19b21b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xos=C3=A9=20Calvo?= <xosecalvo@gmail.com>
Date: Sun, 30 Jul 2017 21:51:13 +0000
Subject: [PATCH 31/33] Translated using Weblate (Galician)

Currently translated at 90.7% (2148 of 2367 strings)
---
 OsmAnd/res/values-gl/strings.xml | 52 +++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index e52d171814..24d9ae896e 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="fav_point_dublicate_message">O nome do punto favorito xa está usado; foi cambiado a %1$s para evitar os duplicados.</string>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="fav_point_dublicate_message">O nome do punto favorito xa está usado; foi cambiado a %1$s para evitar os duplicados.</string>
     <string name="text_size_descr">Configurar o tamaño da letra no mapa.</string>
     <string name="text_size">Tamaño da letra</string>
     <string name="traffic_warning_speed_limit">Límite de velocidade</string>
@@ -2494,7 +2495,7 @@ Pódese pechar esta vista desactivándoa aquí ou cambiando o «Estilo de mapa»
     <string name="total_distance">Distancia total</string>
     <string name="routing_attr_height_obstacles_name">Empregar datos de elevación</string>
     <string name="shared_string_plugin">Engadido</string>
-    <string name="srtm_purchase_header">Para ver as liñas de nivel no mapa hai que comprar e instalar un engadido</string>
+    <string name="srtm_purchase_header">Para ver as liñas de nivel no mapa hai que comprar e instalar o engadido Liñas de Nivel</string>
     <string name="srtm_color_scheme">Esquema de cores</string>
     <string name="routing_attr_allow_private_name">Permitir acceso privado</string>
     <string name="routing_attr_allow_private_description">Permitir acceso a zonas privadas</string>
@@ -2505,10 +2506,45 @@ Pódese pechar esta vista desactivándoa aquí ou cambiando o «Estilo de mapa»
     <string name="lang_ber">Bérber</string>
     <string name="lang_kn">Kannada</string>
     <string name="shared_string_install">Instalar</string>
-    <string name="improve_coverage_mapillary">Mellorar a cobertura con Mapillary</string>
+    <string name="improve_coverage_mapillary">Mellorar a cobertura de fotos con Mapillary</string>
     <string name="open_mapillary">Abrir Mapillary</string>
-    <string name="improve_coverage_install_mapillary_desc">Podes facer as túas propias fotos ou serie de fotos e engadilas a esta localización do mapa.
-\n
-\nPara facer isto, tes que instalar a aplicación Mapillary dende Google Play.</string>
-    <string name="online_photos">Fotos en liña</string>
-    </resources>
\ No newline at end of file
+    <string name="improve_coverage_install_mapillary_desc">Podes facer as túas propias fotos ou serie de fotos e engadilas a este lugar do mapa. 
+\n 
+\nPara facer isto, hai que instalar a aplicación Mapillary dende Google Play.</string>
+    <string name="online_photos">Fotos da rede</string>
+    <string name="quick_action_resume_pause_navigation">Retomar/Deter a navegación</string>
+    <string name="quick_action_resume_pause_navigation_descr">Prema neste botón para deter a navegación, ou para retomala se xa estaba detida.</string>
+    <string name="quick_action_start_stop_navigation">Iniciar/Rematar a navegación</string>
+    <string name="quick_action_start_stop_navigation_descr">Prema neste botón para iniciar a navegación, ou para detela se xa estaba iniciada.</string>
+    <string name="store_tracks_in_monthly_directories">Almacenar as pistas gravadas en cartafoles mensuais</string>
+    <string name="store_tracks_in_monthly_directories_descrp">Almacenar as pistas gravadas en sub-cartafoles segundo o mes de gravación (como 2017-01).</string>
+    <string name="shared_string_reset">Restaurar</string>
+    <string name="shared_string_reload">Recargar</string>
+    <string name="mapillary_menu_descr_tile_cache">Recargar as teselas para ver datos actualizados.</string>
+    <string name="mapillary_menu_title_tile_cache">Caché de teselas</string>
+    <string name="wrong_user_name">O nome de usuario é incorrecto!</string>
+    <string name="shared_string_to">A</string>
+    <string name="mapillary_menu_date_from">Desde</string>
+    <string name="mapillary_menu_descr_dates">Ver as imaxes engadidas nun período determinado.</string>
+    <string name="mapillary_menu_title_dates">Datas</string>
+    <string name="mapillary_menu_edit_text_hint">Escriba o nome de usuario</string>
+    <string name="mapillary_menu_descr_username">Ver as imaxes engadidas por un usuario determinado.</string>
+    <string name="mapillary_menu_title_username">Nome de usuario</string>
+    <string name="mapillary_menu_filter_description">Pode filtrar as imaxes por quen as enviou ou pola data. Os filtros só se aplican na ampliación próxima.</string>
+    <string name="shared_string_permissions">Permisos</string>
+    <string name="import_gpx_failed_descr">O OsmAnd non pode importar o ficheiro. Comprobe se o OsmAnd ten permiso para ler o ficheiro neste sitio.</string>
+    <string name="distance_moving">Distancia corrixida</string>
+    <string name="mapillary_image">Imaxe de Mapillary</string>
+    <string name="shared_string_add_photos">Engadir fotos</string>
+    <string name="no_photos_descr">Non dispomos de fotos deste lugar</string>
+    <string name="mapillary_widget">Trebello de Mapillary</string>
+    <string name="mapillary">Mapillary</string>
+    <string name="restart_search">Reiniciar a busca</string>
+    <string name="increase_search_radius">Aumentar o radio de busca</string>
+    <string name="nothing_found">Non se atopou nada :(</string>
+    <string name="quick_action_showhide_osmbugs_title">Mostrar/Agochar as notas de OSM</string>
+    <string name="quick_action_osmbugs_show">Mostrar as notas de OSM</string>
+    <string name="quick_action_osmbugs_hide">Agochar as notas de OSM</string>
+    <string name="sorted_by_distance">Ordenado por distancia</string>
+    <string name="search_favorites">Buscar nos favoritos</string>
+    </resources>

From 887706eab7d007e38e44ca5054c4a4f7a0469bb9 Mon Sep 17 00:00:00 2001
From: Txopi <txopi@ikusimakusi.eus>
Date: Sun, 30 Jul 2017 13:35:31 +0000
Subject: [PATCH 32/33] Translated using Weblate (Basque)

Currently translated at 63.0% (1979 of 3141 strings)
---
 OsmAnd/res/values-eu/phrases.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-eu/phrases.xml b/OsmAnd/res/values-eu/phrases.xml
index e9afbf0b18..421f84a7e4 100644
--- a/OsmAnd/res/values-eu/phrases.xml
+++ b/OsmAnd/res/values-eu/phrases.xml
@@ -2200,4 +2200,5 @@
 	<string name="poi_pile">Pilote</string>
 	<string name="poi_wiki_lang_bs">Wikia bosnieraz</string>
 	<string name="poi_bicycle_parking_wall_loops">Hormako begiztak</string>
+	<string name="poi_capacity">Ahalmena</string>
 	</resources>

From 88f42bb18a7fa013361276257cf44a713d57202e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xos=C3=A9=20Calvo?= <xosecalvo@gmail.com>
Date: Sun, 30 Jul 2017 21:55:16 +0000
Subject: [PATCH 33/33] Translated using Weblate (Galician)

Currently translated at 38.8% (1220 of 3141 strings)
---
 OsmAnd/res/values-gl/phrases.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index 986c772c83..ac40f618c0 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -1428,4 +1428,6 @@
 	<string name="poi_payment_sms_yes">Pagamentos por SMS</string>
 	<string name="poi_payment_sms_no">Non acepta pagamentos por SMS</string>
 	<string name="poi_payment_ov_chipkaart_yes">OV-Chipkaart</string>
+	<string name="poi_cafeteria">Cafetaría</string>
+	<string name="poi_zoo_type">Tipo</string>
 	</resources>