From d9a0025c73401826082b53b5ac93b4304675e198 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Sun, 9 Jul 2017 22:38:31 +0300
Subject: [PATCH 01/12] Add phrase

---
 OsmAnd/res/values-ru/phrases.xml | 2 +-
 OsmAnd/res/values/phrases.xml    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 8cc26e1da2..dbfa637335 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -3426,6 +3426,6 @@
 	<string name="poi_motorcycle_type_dualsport">Двойного назначения</string>
 	<string name="poi_motorcycle_type_standard">Классика</string>
 
-
+	<string name="poi_generator_output_electricity_no">Не вырабатывает электричество</string>
 
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 58ffcbece5..67998ad01b 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -3395,4 +3395,6 @@
 	<string name="poi_motorcycle_type_dualsport">Dualsport</string>
 	<string name="poi_motorcycle_type_standard">Standard</string>
 
+	<string name="poi_generator_output_electricity_no">Output (electricity): no</string>
+
 </resources>

From 3cd70dbb4a3b72218e368f2844230e1583ed491b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D3=98mrah=20N=D3=99biyev?= <emrah.nebiyev@gmail.com>
Date: Sun, 9 Jul 2017 15:53:05 +0000
Subject: [PATCH 02/12] Translated using Weblate (Azerbaijani)

Currently translated at 68.2% (1609 of 2357 strings)
---
 OsmAnd/res/values-az/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-az/strings.xml b/OsmAnd/res/values-az/strings.xml
index 93ed866e06..2d98ac11c4 100644
--- a/OsmAnd/res/values-az/strings.xml
+++ b/OsmAnd/res/values-az/strings.xml
@@ -1628,4 +1628,5 @@
     <string name="number_of_edits">Düzəlişlərin sayı</string>
     <string name="reports_for">Hesabat:</string>
     <string name="file_name_containes_illegal_char">Fayl adında dəstəklənməyən simvol var</string>
+    <string name="store_tracks_in_monthly_directories">Qeyd edilən izləri aylıq qovluqlarda saxla</string>
     </resources>

From 1ff57d7ca02f4d27d650db3047a6779017f493c4 Mon Sep 17 00:00:00 2001
From: Ajeje Brazorf <lmelonimamo@yahoo.it>
Date: Sun, 9 Jul 2017 18:11:52 +0000
Subject: [PATCH 03/12] Translated using Weblate (Sardinian)

Currently translated at 99.8% (2353 of 2357 strings)
---
 OsmAnd/res/values-sc/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 1d522e110a..3fa9897ef2 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -1673,7 +1673,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
     <string name="traffic_warning_speed_limit">Limite de lestresa</string>
     <string name="traffic_warning_payment">Casellu</string>
     <string name="traffic_warning_stop">Cartellu de Stop</string>
-    <string name="traffic_warning_border_control">Controllu doganale</string>
+    <string name="traffic_warning_border_control">Puntu de controllu</string>
     <string name="traffic_warning_calming">Minimadore de lestresa</string>
     <string name="traffic_warning_speed_camera">Autovelox</string>
     <string name="traffic_warning">Avisu de tràficu</string>

From f4c59649a5b94d6507dc03010025f07de75d1a1a Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Thu, 6 Jul 2017 15:16:40 +0000
Subject: [PATCH 04/12] Translated using Weblate (Spanish (Argentina))

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

diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index 83530a34ef..83b8a04dec 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -3456,4 +3456,6 @@
 	<string name="poi_motorcycle_type_standard">Estándar</string>
 
 <string name="poi_lock_basin">Compuerta de cuenca</string>
-	</resources>
+	<string name="poi_generator_output_electricity_no">Salida (electricidad): No</string>
+
+</resources>

From b5db9cb0649d10f0a9c0b7f7817e76c800799ba1 Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Thu, 6 Jul 2017 15:18:03 +0000
Subject: [PATCH 05/12] Translated using Weblate (Spanish (American))

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

diff --git a/OsmAnd/res/values-es-rUS/phrases.xml b/OsmAnd/res/values-es-rUS/phrases.xml
index a711383223..6ab33cd79d 100644
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@@ -3218,4 +3218,6 @@
 	<string name="poi_motorcycle_type_standard">Estándar</string>
 
 <string name="poi_lock_basin">Compuerta de cuenca</string>
-	</resources>
+	<string name="poi_generator_output_electricity_no">Salida (electricidad): No</string>
+
+</resources>

From dd6b8ff25f32652907ea2a822fab9a0eb54b01de Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Thu, 6 Jul 2017 16:56:06 +0000
Subject: [PATCH 06/12] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 804896cfb2..fb917d53b6 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -3490,4 +3490,6 @@
 	<string name="poi_motorcycle_type_standard">Standard</string>
 
 <string name="poi_lock_basin">Slusebassin</string>
-	</resources>
+	<string name="poi_generator_output_electricity_no">Output (el): nej</string>
+
+</resources>

From ae4757361cde76d51e269b278d231bc65a9f023b Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 10 Jul 2017 01:26:18 +0200
Subject: [PATCH 07/12] Update gradle to 4 and gradle compile plugin

---
 OsmAnd/.gitignore              | 4 ++++
 OsmAnd/build.gradle            | 8 ++++----
 OsmAnd/project.properties      | 2 +-
 OsmAndCore-sample/build.gradle | 2 +-
 build.gradle                   | 6 +++++-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/.gitignore b/OsmAnd/.gitignore
index 44d8d7654f..a80b324b3d 100644
--- a/OsmAnd/.gitignore
+++ b/OsmAnd/.gitignore
@@ -1,3 +1,7 @@
+gradle
+gradlew
+gradlew.bat
+ 
 valgrind/
 bin/
 dist/
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index f6ba50073e..63fb2c965e 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -385,10 +385,10 @@ dependencies {
 	// compile project(':eclipse-compile:design')
 	// compile project(':eclipse-compile:cardview')
 	// compile project(':eclipse-compile:gridlayout')
-	compile 'com.android.support:gridlayout-v7:25.3.1'
-	compile 'com.android.support:cardview-v7:25.3.1'
-	compile 'com.android.support:appcompat-v7:25.3.1'
-	compile 'com.android.support:design:25.3.1'
+	compile 'com.android.support:gridlayout-v7:26.+'
+	compile 'com.android.support:cardview-v7:26.+'
+	compile 'com.android.support:appcompat-v7:26.+'
+	compile 'com.android.support:design:26.+'
 	compile fileTree(include: ['*.jar'], exclude: ['QtAndroid-bundled.jar', 'QtAndroidAccessibility-bundled.jar', 'OsmAndCore_android.jar', 'OsmAndCore_wrapper.jar', 'android-support-multidex.jar'], dir: 'libs')
 	legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
 	qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
diff --git a/OsmAnd/project.properties b/OsmAnd/project.properties
index 888b636da6..8fd374a9b4 100644
--- a/OsmAnd/project.properties
+++ b/OsmAnd/project.properties
@@ -10,7 +10,7 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-23
+target=android-26
 dex.force.jumbo=true
 android.library.reference.1=../eclipse-compile/appcompat
 android.library.reference.2=../eclipse-compile/design
diff --git a/OsmAndCore-sample/build.gradle b/OsmAndCore-sample/build.gradle
index 6bfbe775b0..1060834a76 100644
--- a/OsmAndCore-sample/build.gradle
+++ b/OsmAndCore-sample/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    buildToolsVersion "25.0.0"
 
     dexOptions {
         jumboMode true
diff --git a/build.gradle b/build.gradle
index 73a0b2433f..5cad9d08ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,13 @@
 buildscript {
     repositories {
+	maven {
+            // Google Maven Repository
+            url 'https://maven.google.com'
+        }
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.+'
         classpath 'com.google.gms:google-services:3.0.0'
     }
 }

From 881a6748087882f85fa0865649198745e646e292 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 10 Jul 2017 01:38:52 +0200
Subject: [PATCH 08/12] Add extra test

---
 OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java b/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java
index 8f472ce0a0..ca351448c2 100644
--- a/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java
+++ b/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java
@@ -368,6 +368,12 @@ public class GeoPointParserUtil {
 		System.out.println("url: " + url);
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
+		
+		// https://maps.google.com/maps?q=loc:-21.8835112,-47.7838932 (Name)
+		url = "https://maps.google.com/maps?q=loc:" + dlat + "," + dlon + " (Name)" ;
+		System.out.println("url: " + url);
+		actual = GeoPointParserUtil.parse(url);
+		assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon));
 
 		// http://maps.google.com/maps/ll=34.99393,-106.61568,z=11
 		url = "http://maps.google.com/maps/ll=" + dlat + "," + dlon + ",z=" + z;

From 7bd84af1218a5fc50978bd3c9d3ed543a72538ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claus=20R=C3=BCdinger?= <Mail-an-CR@web.de>
Date: Sun, 9 Jul 2017 22:29:59 +0000
Subject: [PATCH 09/12] Translated using Weblate (German)

Currently translated at 97.7% (2305 of 2357 strings)
---
 OsmAnd/res/values-de/strings.xml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 97db72c7e3..942338dbaf 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -447,7 +447,7 @@ Einige der Kernfunktionen:
 	<string name="context_menu_item_search">In der Nähe suchen</string>
 	<string name="shared_string_save_as_gpx">Route als GPX-Track speichern</string>
 	<string name="route_successfully_saved_at">Route erfolgreich gespeichert als \'%1$s\'.</string>
-	<string name="filename_input">"Dateiname: "</string>
+	<string name="filename_input">Dateiname:</string>
 	<string name="file_with_name_already_exist">Datei mit gleichem Namen besteht bereits.</string>
 	<string name="shared_string_save">Speichern</string>
 	
@@ -634,7 +634,7 @@ Einige der Kernfunktionen:
 	<string name="shared_string_select_all">Alle markieren</string>
 	<string name="shared_string_refresh">Aktualisieren</string>
 	<string name="fast_route_mode">Schnellste Route</string>
-	<string name="fast_route_mode_descr">"Zur Berechnung der schnellsten Route aktivieren , für eine kraftstoffsparende Route deaktivieren "</string>
+	<string name="fast_route_mode_descr">Zur Berechnung der schnellsten Route aktivieren, für eine kraftstoffsparende Route deaktivieren</string>
 	<string name="tiles_to_download_estimated_size">Bei Zoomlevel {0} lade {1} Kacheln\n ({2} MB)</string>
 	<string name="shared_string_download_map">Karte herunterladen</string>
 	<string name="select_max_zoom_preload_area">Größte zu ladende Vergrößerung wählen</string>
@@ -2110,7 +2110,7 @@ Lon %2$s</string>
 	<string name="are_you_sure">Sicher?</string>
 	<string name="unsaved_changes_will_be_lost">Alle ungesicherten Änderungen gehen verloren. Fortfahren?</string>
 	<string name="roads">Straßen</string>
-    <string name="show_free_version_banner_description">Auch bei OsmAnd+ das Banner der kostenlosen Version anzeigen</string>
+    <string name="show_free_version_banner_description">Auch in OsmAnd+ das Banner der kostenlosen Version anzeigen</string>
 <string name="rendering_attr_hideProposed_name">Geplante Objekte</string>
     <string name="shared_string_update">Aktualisieren</string>
 
@@ -2497,10 +2497,10 @@ Wenn Sie OsmAnd und OSM lieben und unterstützen wollen, so ist dies die perfekt
     <string name="give_permission">Berechtigung erteilen</string>
     <string name="allow_access_location">Standortbestimmung zulassen</string>
     <string name="first_usage_greeting">Erhalten Sie Wegbeschreibungen und entdecken Sie neue Orte ohne Internetverbindung</string>
-    <string name="search_my_location">Meinen Standort suchen</string>
+    <string name="search_my_location">Meinen Standort bestimmen</string>
     <string name="no_update_info">Keine Aktualisierungen anzeigen</string>
     <string name="skip_map_downloading">Herunterladen der Karten überspringen</string>
-    <string name="no_update_info_desc">Keine aktuellen Meldungen zu neuen Versionen, Angeboten von OsmAnd abfragen</string>
+    <string name="no_update_info_desc">Keine Versionsaktualisierungen oder OsmAnd-Angebote abfragen</string>
     <string name="si_mi_meters">Meilen/Meter</string>
     <string name="osm_live_banner_desc">Unbegrenzt Karten herunterladen und sie nicht nur einmal pro Monat, sondern wöchentlich, täglich oder stündlich aktualisieren.</string>
     <string name="osmand_plus_banner_desc">Vollversion von OsmAnd mit unbegrenzten Karten-Downloads und monatlichen Kartenaktualisierungen.</string>
@@ -2870,4 +2870,10 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="max_min">max/min</string>
     <string name="shared_string_reset">Zurücksetzen</string>
     <string name="ascent_descent">Aufstieg/Abstieg</string>
+    <string name="store_tracks_in_monthly_directories">Aufgezeichnete Tracks in Monatsordnern speichern</string>
+    <string name="store_tracks_in_monthly_directories_descrp">Aufgezeichnete Tracks in nach Aufzeichnungsmonat benannten Unterordnern speichern (z. B. 2017-01).</string>
+    <string name="map_widget_ruler_control_first_mode">Lineal</string>
+    <string name="map_widget_ruler_control_second_mode">Zirkel</string>
+    <string name="of">%1$d von %2$d</string>
+    <string name="moving_time">Zeit in Bewegung</string>
     </resources>

From 0328f7d7d4951fa5ee0db20912dbc0c11dba19f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claus=20R=C3=BCdinger?= <Mail-an-CR@web.de>
Date: Sun, 9 Jul 2017 21:48:18 +0000
Subject: [PATCH 10/12] Translated using Weblate (German)

Currently translated at 99.6% (3092 of 3104 strings)
---
 OsmAnd/res/values-de/phrases.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 386d8dbc74..db4a5b8a22 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -1868,7 +1868,7 @@
 	<string name="poi_payment_gift_card_no">Geschenkkarte nicht akzeptiert</string>
 	<string name="poi_payment_golden_crown_yes">Golden Crown</string>
 	<string name="poi_payment_golden_crown_no">Golden Crown Karte nicht akzeptiert</string>
-	<string name="poi_payment_pro100_yes">"PRO100 "</string>
+	<string name="poi_payment_pro100_yes">PRO100</string>
 	<string name="poi_payment_pro100_no">PRO100 Karte nicht akzeptiert</string>
 	<string name="poi_payment_union_card_yes">Union Karte</string>
 	<string name="poi_payment_union_card_no">Union Karte nicht akzeptiert</string>
@@ -2273,7 +2273,7 @@
 	<string name="poi_tents_no">Zelten nicht gestattet</string>
 	<string name="poi_backcountry_yes">Ja</string>
 	<string name="poi_backcountry_no">Nein</string>
-	<string name="poi_scout_yes">Pfadfinderlager: ja</string>
+	<string name="poi_scout_yes">Ja</string>
 	<string name="poi_scout_no">Pfadfinderlager: nein</string>
 	<string name="poi_group_only_yes">Nur Gruppen: ja</string>
 	<string name="poi_group_only_no">Nur Gruppen: nein</string>
@@ -3016,8 +3016,8 @@
 <string name="poi_fuel_type">Typ</string>
 	<string name="poi_payment_type">Zahlungsart</string>
 	<string name="poi_additional_type">Zusätzlich</string>
-<string name="poi_service_bicycle_charging_yes">Fahrrad laden: ja</string>
-	<string name="poi_service_bicycle_charging_no">Fahrrad laden: nein</string>
+<string name="poi_service_bicycle_charging_yes">Ladestation: ja</string>
+	<string name="poi_service_bicycle_charging_no">Ladestation: nein</string>
 
 <string name="poi_shop_craft">Geschäft für Kunsthandwerksbedarf</string>
 

From 0ec2a5170b37b12417a7a835437b589b98666c58 Mon Sep 17 00:00:00 2001
From: vshcherb <victor.shcherb@gmail.com>
Date: Mon, 10 Jul 2017 01:42:36 +0200
Subject: [PATCH 11/12] Update gradle-wrapper.properties

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fc0a0f1d16..b12618a3f9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip

From 064e68014d11d9686e7f4db34681a65c2f218c9e Mon Sep 17 00:00:00 2001
From: vshcherb <victor.shcherb@gmail.com>
Date: Mon, 10 Jul 2017 01:45:21 +0200
Subject: [PATCH 12/12] Update build.gradle

---
 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 1060834a76..95b9cd9c66 100644
--- a/OsmAndCore-sample/build.gradle
+++ b/OsmAndCore-sample/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.0"
 
     dexOptions {
         jumboMode true