From c8aa8102ce058c0ab0c1729adc5804cef9cb772e Mon Sep 17 00:00:00 2001
From: Viktar Palstsiuk <vipals@gmail.com>
Date: Wed, 23 Sep 2015 16:46:30 +0200
Subject: [PATCH 01/25] Translated using Weblate (Belarusian)

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

diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index b26489d595..a2b8400d2b 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2096,4 +2096,7 @@
 <string name="address_unknown">Адрас пакуль невядомы</string>
     <string name="are_you_sure">Вы ўпэўненыя?</string>
 	<string name="unsaved_changes_will_be_lost">Усе незахаваныя зьмены будуць страчаны. Працягваць?</string>
+<string name="simulate_your_location_stop_descr">Спыніць эмуляцыю свайго становішча</string>
+    <string name="simulate_your_location_descr">Эмуляваць, выкарыстоўваючы запісаны GPX або разьлічаны маршрут</string>
+    <string name="downloads_left_template">%1$s сьцягваньняў засталося</string>
 </resources>

From 939779bfa92b2d3b76135dafea417dd0756e92a9 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Wed, 23 Sep 2015 18:24:28 +0300
Subject: [PATCH 02/25] Edit POI design fix.

---
 OsmAnd/res/layout/fragment_edit_poi.xml       |  2 +-
 OsmAnd/res/values/attrs.xml                   |  4 +++-
 OsmAnd/res/values/styles.xml                  | 20 +++++++------------
 .../plus/osmedit/BasicDataFragment.java       |  8 +++++++-
 .../osmand/plus/osmedit/EditPoiFragment.java  |  4 ++--
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml
index cebdb8705c..f4dd600277 100644
--- a/OsmAnd/res/layout/fragment_edit_poi.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi.xml
@@ -117,7 +117,7 @@
         android:id="@+id/buttonDivider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?attr/dashboard_divider"/>
+        android:background="?attr/divider_color"/>
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index b744ac77db..7626b8c638 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -14,7 +14,7 @@
         <attr name="bg_map_context_menu" format="reference" />
         <attr name="ctx_menu_info_view_bg" format="reference" />
 
-		<attr name="dashboard_divider" format="reference" />
+        <attr name="dashboard_divider" format="reference" />
 		<attr name="dashboard_button" format="reference" />
 		
 		
@@ -39,6 +39,8 @@
         <attr name="appbar_layout_theme" format="reference"/>
         <attr name="toolbar_theme" format="reference"/>
         <attr name="new_app_theme" format="reference"/>
+
+        <attr name="divider_color" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="PagerSlidingTabStrip">
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 67045b3555..2b1c39dc13 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -68,6 +68,7 @@
         <item name="bg_card">@drawable/bg_card_light</item>
         <item name="bg_map_context_menu">@drawable/bg_map_context_menu_light</item>
         <item name="dashboard_divider">@color/dashboard_divider_light</item>
+        <item name="divider_color">@color/divider_color</item>
         <item name="dashboard_button">@drawable/dashboard_button_light</item>
         <item name="ctx_menu_info_view_bg">@color/ctx_menu_info_view_bg_light</item>
         <item name="search_background">@color/search_background_dark</item>
@@ -110,6 +111,7 @@
         <item name="appbar_layout_theme">@style/OsmandLightTheme.DarkActionbar</item>
         <item name="toolbar_theme">@style/OsmandLightTheme.Toolbar</item>
         <item name="new_app_theme">@style/OsmandLightTheme.NewAppTheme</item>
+        <item name="android:textColorSecondary">@color/icon_color</item>
     </style>
 
     <style name="OsmandLightTheme.DarkActionbar">
@@ -128,21 +130,10 @@
 
     <style name="OsmandLightTheme.NewAppTheme">
         <item name="colorAccent">@color/osmand_orange</item>
-        <item name="android:textColorSecondary">@color/divider_color</item>
     </style>
 
     <style name="OsmandDarkTheme.DarkActionbar">
         <item name="colorAccent">@color/color_white</item>
-        <item name="android:textColorSecondary">@color/dash_search_icon_dark</item>
-    </style>
-
-    <style name="OsmandDarkTheme.Toolbar">
-        <item name="android:textColorSecondary">@color/dash_search_icon_dark</item>
-    </style>
-
-    <style name="OsmandDarkTheme.NewAppTheme">
-        <item name="android:textColorSecondary">@color/dash_search_icon_dark</item>
-        <item name="colorAccent">@color/osmand_orange</item>
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
@@ -161,6 +152,7 @@
         <item name="bg_card">@drawable/bg_card_dark</item>
         <item name="bg_map_context_menu">@drawable/bg_map_context_menu_dark</item>
         <item name="dashboard_divider">@color/dashboard_divider_dark</item>
+        <item name="divider_color">@color/dashboard_divider_dark</item>
         <item name="dashboard_button">@drawable/dashboard_button_dark</item>
         <item name="ctx_menu_info_view_bg">@color/ctx_menu_info_view_bg_dark</item>
         <item name="search_background">@color/color_white</item>
@@ -190,8 +182,9 @@
 
         <item name="dialog_inactive_text_color">@color/dialog_inactive_text_color_dark</item>
         <item name="appbar_layout_theme">@style/OsmandDarkTheme.DarkActionbar</item>
-        <item name="toolbar_theme">@style/OsmandDarkTheme.Toolbar</item>
-        <item name="new_app_theme">@style/OsmandDarkTheme.NewAppTheme</item>
+        <item name="toolbar_theme">@style/OsmandDarkTheme</item>
+        <item name="new_app_theme">@style/OsmandDarkTheme</item>
+        <item name="android:textColorSecondary">@color/dash_search_icon_dark</item>
     </style>
 
 
@@ -272,6 +265,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
         <item name="android:textColor">?android:textColorPrimary</item>
+        <item name="android:textColorHint">?android:textColorSecondary</item>
     </style>
 
     <style name="edit_poi_imageview_style">
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/BasicDataFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/BasicDataFragment.java
index f9a9212d56..de4c8e6554 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/BasicDataFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/BasicDataFragment.java
@@ -1,5 +1,6 @@
 package net.osmand.plus.osmedit;
 
+import android.content.res.Resources;
 import android.graphics.Point;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -8,6 +9,7 @@ import android.support.v4.app.Fragment;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.TypedValue;
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -62,8 +64,12 @@ public class BasicDataFragment extends Fragment {
 		int height = size.y;
 		view.findViewById(R.id.screenFiller).setMinimumHeight(height);
 
+		TypedValue typedValue = new TypedValue();
+		Resources.Theme theme = getActivity().getTheme();
+		theme.resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);
+		int iconColor = typedValue.data;
+
 		IconsCache iconsCache = getMyApplication().getIconsCache();
-		int iconColor = getResources().getColor(R.color.dash_search_icon_dark);
 
 		ImageView streetImageView = (ImageView) view.findViewById(R.id.streetImageView);
 		streetImageView.setImageDrawable(
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java
index 68fb2486a6..b61e143202 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java
@@ -204,8 +204,8 @@ public class EditPoiFragment extends DialogFragment {
 				getMyApplication().getIconsCache()
 						.getPaintedContentIcon(R.drawable.ic_action_help,
 								getResources().getColor(
-										isLightTheme ? R.color.dash_search_icon_dark
-												: R.color.inactive_item_orange)));
+										isLightTheme ? R.color.inactive_item_orange
+												: R.color.dash_search_icon_dark)));
 		final ImageButton poiTypeButton = (ImageButton) view.findViewById(R.id.poiTypeButton);
 		poiTypeButton.setOnClickListener(new View.OnClickListener() {
 			@Override

From 5cc95e8857c89086e3b2f9c86a86d6a994ba4f26 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Wed, 23 Sep 2015 17:10:37 +0200
Subject: [PATCH 03/25] Translated using Weblate (Danish)

Currently translated at 100.0% (1779 of 1779 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 13f5666328..884683994a 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2136,5 +2136,5 @@
 <string name="are_you_sure">Sikker?</string>
 	<string name="simulate_your_location_stop_descr">Stop simulering af position</string>
     <string name="simulate_your_location_descr">Simuler ved brug af indspillet GPX eller beregnet rute</string>
-    <string name="downloads_left_template">%1$s downloads tilbage</string>
+    <string name="downloads_left_template">%1$s filhentninger tilbage</string>
 </resources>

From 6df56b98b72b15daec9d8c0ddbcdb1dd1cf2faf2 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Wed, 23 Sep 2015 16:55:01 +0200
Subject: [PATCH 04/25] Translated using Weblate (Italian)

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

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index d4eb1e7ffe..d62cc3a50c 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1474,7 +1474,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	\n\t* Impostazioni della velocità della vocalizzazione
     </string>
     <string name="calculate_osmand_route_without_internet">Calcola un tratto di percorso OsmAnd senza l\'utilizzo di Internet</string>
-    <string name="gpx_option_calculate_first_last_segment">Calcola una percorso OsmAnd per il primo e l\'ultimo tratto del percorso</string>
+    <string name="gpx_option_calculate_first_last_segment">Portami con un percorso OsmAnd fino all\'inizio del GPX</string>
     
     <string name="lang_en">Inglese</string>
 	<string name="lang_af">Afrikaans</string>

From 8c0a540f5592ff707a7f5dbf9b0f234ca0247d74 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Wed, 23 Sep 2015 17:05:18 +0200
Subject: [PATCH 05/25] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index f7e16e1734..c2768123cb 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -974,7 +974,7 @@
 	<string name="poi_animal_shelter_bird">Fugleinternat</string>
 
 <string name="poi_shower">Bruser</string>
-	<string name="poi_recycling_centre">Type: genanvendelse centre</string>
+	<string name="poi_recycling_centre">Type: genbrugsplads</string>
 	<string name="poi_recycling_container">Type: container</string>
 	<string name="poi_recycling_glass">Glas</string>
 	<string name="poi_recycling_paper">Papir</string>

From 69a0e8b5e5a4c7d2cac24d7db5ce43971efb8e01 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Wed, 23 Sep 2015 19:09:26 +0300
Subject: [PATCH 06/25] Context menu - remove black box menu from
 AvoidSpecificRoads feature

---
 .../plus/helpers/AvoidSpecificRoads.java      |  2 +-
 .../plus/mapcontextmenu/MapContextMenu.java   |  8 ++++-
 .../osmand/plus/views/ContextMenuLayer.java   | 31 ++++++++++++++-----
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
index 6cc114bdf1..da54ebe465 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
@@ -186,7 +186,7 @@ public class AvoidSpecificRoads {
 		} else {
 			thread.startMoving(lat, lon, fZoom, true);
 		}
-		ctx.getMapLayers().getContextMenuLayer().setLocation(new LatLon(lat, lon), name);
+		ctx.getMapLayers().getContextMenuLayer().showMapContextMenu(new LatLon(lat, lon), name);
 		dialog.dismiss();
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
index 958a907842..371f701f0f 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
@@ -63,6 +63,10 @@ public class MapContextMenu {
 		settings = app.getSettings();
 	}
 
+	public void show() {
+		MapContextMenuFragment.showInstance(mapActivity);
+	}
+
 	public void show(PointDescription pointDescription, Object object) {
 
 		if (isMenuVisible()) {
@@ -82,7 +86,9 @@ public class MapContextMenu {
 
 		acquireLeftIcon();
 		acquireNameAndType();
-		acquireStreetName(new LatLon(pointDescription.getLat(), pointDescription.getLon()));
+		if (object != null || Algorithms.isEmpty(pointDescription.getName())) {
+			acquireStreetName(new LatLon(pointDescription.getLat(), pointDescription.getLon()));
+		}
 
 		MapContextMenuFragment.showInstance(mapActivity);
 
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index eaf4685894..cfa9e1a297 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -22,7 +22,6 @@ import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.data.RotatedTileBox;
 import net.osmand.plus.ContextMenuAdapter;
-import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 
@@ -186,6 +185,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 	
 	
 	public void setSelectOnMap(CallbackWithObject<LatLon> selectOnMap) {
+		hideMapContextMenuMarker();
 		this.selectOnMap = selectOnMap;
 	}
 	
@@ -209,6 +209,14 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		view.refreshMap();
 	}
 
+	public void showMapContextMenuMarker(LatLon latLon) {
+		activity.getContextMenu().hide();
+		this.latLon = latLon;
+		selectedObj = null;
+		contextObject = null;
+		showMapContextMenuMarker();
+	}
+
 	public void hideMapContextMenuMarker() {
 		if (showContextMarker) {
 			showContextMarker = false;
@@ -283,10 +291,6 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		return showContextMenu(new PointF(x, y), activity.getMapView().getCurrentRotatedTileBox(), showUnknownLocation);
 	}
 
-	public boolean showContextMenu(PointF point, boolean showUnknownLocation) {
-		return showContextMenu(point, activity.getMapView().getCurrentRotatedTileBox(), showUnknownLocation);
-	}
-
 	public boolean showContextMenu(PointF point, RotatedTileBox tileBox, boolean showUnknownLocation) {
 		LatLon latLon = selectObjectsForContextMenu(tileBox, point);
 		if (latLon != null) {
@@ -447,7 +451,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 	@Override
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
 		if (pressedContextMarker(tileBox, point.x, point.y)) {
-			showMapContextMenu(latLon);
+			showMapContextMenu();
 			return true;
 		}
 
@@ -458,7 +462,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 			CallbackWithObject<LatLon> cb = selectOnMap;
 			selectOnMap = null;
 			cb.processResult(latlon);
-			setLocation(latlon, null);
+			showMapContextMenuMarker(latlon);
 			return true;
 		}
 		if (val == 2) {
@@ -512,7 +516,15 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		}
 	}
 
-	private void showMapContextMenu(LatLon latLon) {
+	public void showMapContextMenu() {
+		activity.getContextMenu().show();
+	}
+
+	public void showMapContextMenu(LatLon latLon) {
+		showMapContextMenu(latLon, null);
+	}
+
+	public void showMapContextMenu(LatLon latLon, String title) {
 		PointDescription pointDescription;
 		if (selectedObj != null && contextObject != null) {
 			pointDescription = contextObject.getObjectName(selectedObj);
@@ -521,6 +533,9 @@ public class ContextMenuLayer extends OsmandMapLayer {
 			pointDescription.setLon(objLocation.getLongitude());
 		} else {
 			pointDescription = new PointDescription(latLon.getLatitude(), latLon.getLongitude());
+			if (title != null) {
+				pointDescription.setName(title);
+			}
 		}
 		this.latLon = new LatLon(pointDescription.getLat(), pointDescription.getLon());
 

From 282dda83e631c032cbda0581faa7057645177430 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Wed, 23 Sep 2015 21:22:36 +0300
Subject: [PATCH 07/25] Update phrases

---
 OsmAnd/res/values-ru/phrases.xml | 14 ++++++++++++++
 OsmAnd/res/values/phrases.xml    | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index dca40eca25..73a2016965 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -1186,4 +1186,18 @@
 
 	<string name="poi_rtsa_scale">Категория сложности перевала</string>
 
+	<string name="poi_piste_difficulty_easy">Сложность трассы: низкая</string>
+	<string name="poi_piste_difficulty_intermediate">Сложность трассы: средняя</string>
+	<string name="poi_piste_difficulty_advanced">Сложность трассы: высокая</string>
+	<string name="poi_piste_difficulty_novice">Сложность трассы: простейшая</string>
+	<string name="poi_piste_difficulty_expert">Сложность трассы: эксперт</string>
+	<string name="poi_piste_difficulty_freeride">Сложность трассы: фрирайд</string>
+	<string name="poi_piste_grooming_classic">Обслуживание трассы: классика</string>
+	<string name="poi_piste_grooming_classic_skating">Обслуживание трассы: классика+конёк</string>
+	<string name="poi_piste_grooming_backcountry">Обслуживание трассы: кросс-кантри</string>
+	<string name="poi_piste_grooming_scooter">Обслуживание трассы: снежный скутер</string>
+	<string name="poi_piste_grooming_skating">Обслуживание трассы: конёк</string>
+	<string name="poi_piste_grooming_no">Обслуживание трассы: не обслуживаемая</string>
+	<string name="poi_piste_grooming_mogul">Обслуживание трассы: могул</string>
+
 	</resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 2181ce02bd..fbdc114b01 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -1331,4 +1331,18 @@
 	<string name="poi_level">Level</string>
 	<string name="poi_rtsa_scale">Difficulty of mountain pass</string>
 
+	<string name="poi_piste_difficulty_easy">Piste difficulty: easy</string>
+	<string name="poi_piste_difficulty_intermediate">Piste difficulty: intermediate</string>
+	<string name="poi_piste_difficulty_advanced">Piste difficulty: advanced</string>
+	<string name="poi_piste_difficulty_novice">Piste difficulty: novice</string>
+	<string name="poi_piste_difficulty_expert">Piste difficulty: expert</string>
+	<string name="poi_piste_difficulty_freeride">Piste difficulty: freeride</string>
+	<string name="poi_piste_grooming_classic">Piste grooming: classic</string>
+	<string name="poi_piste_grooming_classic_skating">Piste grooming: classic+skating</string>
+	<string name="poi_piste_grooming_backcountry">Piste grooming: backcountry</string>
+	<string name="poi_piste_grooming_scooter">Piste grooming: scooter</string>
+	<string name="poi_piste_grooming_skating">Piste grooming: skating</string>
+	<string name="poi_piste_grooming_no">Piste grooming: no</string>
+	<string name="poi_piste_grooming_mogul">Piste grooming: mogul</string>
+
 </resources>

From c8f790ae6af9f6ce467df911b11907371aabb014 Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Wed, 23 Sep 2015 18:12:44 +0200
Subject: [PATCH 08/25] Translated using Weblate (Argentinean Spanish)

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

diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 8d9b1b27e2..18793ec9d9 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2057,4 +2057,6 @@
 	<string name="address_unknown">Dirección desconocida</string>
     <string name="are_you_sure">¿Está seguro?</string>
 	<string name="unsaved_changes_will_be_lost">Se perderán los cambios no guardados. ¿Continuar?</string>
-</resources>
+<string name="simulate_your_location_stop_descr">Parar simulación de ubicación</string>
+    <string name="simulate_your_location_descr">Simular usando grabación GPX o ruta calculada</string>
+    </resources>

From 51422fa73e010864e2f8eb5565d426cd5b55eb15 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Wed, 23 Sep 2015 19:09:40 +0200
Subject: [PATCH 09/25] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 884683994a..e2f742c82c 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -866,7 +866,7 @@
 
     <string name="transport_search_again">Nulstil transportsøgning</string>
 
-    <string name="voice">Indspillet stemme</string>
+    <string name="voice">Optaget stemme</string>
     <string name="no_vector_map_loaded">Vektorkort blev ikke indlæst</string>
     <string name="map_route_by_gpx">Naviger med GPX</string>
     <string name="gpx_files_not_found">Ingen GPX-filer blev fundet i \'/tracks\' mappen</string>
@@ -1125,7 +1125,7 @@
     <string name="save_current_track_descr">Gem aktuelle spor til SD-kort nu</string>
     <string name="save_current_track">Gem aktuelle GPX-spor</string>
     <string name="save_track_interval">Logningsinterval under navigation</string>
-    <string name="save_track_interval_descr">Vælg logningsinterval for sporregistrering under navigation</string>
+    <string name="save_track_interval_descr">Vælg logningsinterval for optagelse af spor under navigation</string>
     <string name="save_track_to_gpx_descrp">Spor bliver gemt i \'/track\' mappen under navigation</string>
     <string name="save_track_to_gpx">Log spor til GPX-fil under navigation</string>
     <string name="update_tile">Opdater kort</string>
@@ -1713,7 +1713,7 @@
     <string name="duration">Varighed</string>
     <string name="int_hour">t</string>
     <string name="record_plugin_name">Optag ture</string>
-    <string name="record_plugin_description">"Udvidelsen aktiverer funktionalitet til at registrere og gemme spor ved at klikke på GPX logning modul på kortskærmen, eller også for automatisk at logge alle navigationsruter til en GPX-fil.\n\nOptagede spor kan deles med venner eller anvendes til OSM bidrag. Sportsfolk kan bruge indspillede spor at monitere træninger. Nogle grundlæggende spor analyse kan udføres direkte i OsmAnd, såsom omgangstider, gennemsnitshastighed mv, og spor kan selvfølgelig også senere analyseres i særlige 3. parts analyseværktøjer. "</string>
+    <string name="record_plugin_description">"Udvidelsen aktiverer funktionalitet til at optage og gemme spor ved at klikke på GPX logning modul på kortskærmen, eller også for automatisk at logge alle navigationsruter til en GPX-fil.\n\nOptagede spor kan deles med venner eller anvendes til OSM bidrag. Sportsfolk kan bruge optagede spor til at monitere træning. Nogle grundlæggende spor analyse kan udføres direkte i OsmAnd, såsom omgangstider, gennemsnitshastighed mv, og spor kan selvfølgelig også senere analyseres i særlige 3. parts analyseværktøjer. "</string>
     <string name="rendering_attr_publicTransportMode_name">Bus-, trolleybus-, shuttlebusruter</string>
     <string name="save_track_to_gpx_globally">Log spor til GPX-fil</string>
     <string name="save_track_interval_globally">Logningsinterval</string>
@@ -2135,6 +2135,6 @@
     <string name="unsaved_changes_will_be_lost">Eventuelle ikke-gemte ændringer vil gå tabt. Fortsæt?</string>
 <string name="are_you_sure">Sikker?</string>
 	<string name="simulate_your_location_stop_descr">Stop simulering af position</string>
-    <string name="simulate_your_location_descr">Simuler ved brug af indspillet GPX eller beregnet rute</string>
+    <string name="simulate_your_location_descr">Simuler ved brug af optaget GPX eller beregnet rute</string>
     <string name="downloads_left_template">%1$s filhentninger tilbage</string>
 </resources>

From bc60e77d24f07558c802d7262844d08b472533a7 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Wed, 23 Sep 2015 19:41:45 +0200
Subject: [PATCH 10/25] Translated using Weblate (Italian)

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

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index d62cc3a50c..e673cb3df4 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1474,7 +1474,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	\n\t* Impostazioni della velocità della vocalizzazione
     </string>
     <string name="calculate_osmand_route_without_internet">Calcola un tratto di percorso OsmAnd senza l\'utilizzo di Internet</string>
-    <string name="gpx_option_calculate_first_last_segment">Portami con un percorso OsmAnd fino all\'inizio del GPX</string>
+    <string name="gpx_option_calculate_first_last_segment">Calcola un percorso OsmAnd per i tratti prima e dopo il GPX</string>
     
     <string name="lang_en">Inglese</string>
 	<string name="lang_af">Afrikaans</string>

From 76c00b1bfa7c2d7f85de2bcb100e4380888d9c9b Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Wed, 23 Sep 2015 18:24:56 +0200
Subject: [PATCH 11/25] Translated using Weblate (Spanish)

Currently translated at 99.7% (1775 of 1779 strings)
---
 OsmAnd/res/values-es/strings.xml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index d8abe68341..140b148607 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -87,7 +87,7 @@
   <string name="user_password">Su clave OSM</string>
   <string name="user_password_descr">Necesario para envíos a openstreetmap.org</string>
   <string name="osmand_service">Modo reposo</string>
-  <string name="osmand_service_descr">Para ejecutar OsmAnd mientras la pantalla está apagada</string>
+  <string name="osmand_service_descr">OsmAnd se ejecuta en segundo plano mientras la pantalla está apagada</string>
   <string name="tip_rotation_switching">Rotación del mapa</string>
   
   <string name="switch_to_raster_map_to_see">No hay ningún mapa vectorial fuera de línea presente para esta ubicación. Puede descargar uno en Ajustes (Gestionar mapas), o cambiar al mapa en línea (para esto active el complemento mapas en línea).</string>
@@ -478,20 +478,20 @@
   <string name="use_trackball">Utilizar la bola de desplazamiento</string>
   <string name="background_service_wait_int_descr">Fijar el tiempo de espera máximo para determinar la posición en cada lectura del servicio de fondo</string>
   <string name="background_service_wait_int">Máx. espera para posicionamiento</string>
-  <string name="service_stop_background_service">Apagar el servicio de navegación en modo reposo de OsmAnd</string>
+  <string name="service_stop_background_service">Apagar el servicio de navegación de fondo de OsmAnd</string>
   <string name="where_am_i">¿Dónde estoy?</string>
   <string name="process_navigation_service">Servicio de navegación OsmAnd</string>
   <string name="network_provider">Red</string>
   <string name="gps_provider">GPS</string>
   <string name="int_seconds">segundos</string>
   <string name="int_min">min.</string>
-  <string name="background_service_int_descr">Establece el intervalo de activación utilizado por el servicio de modo reposo</string>
+  <string name="background_service_int_descr">Establece el intervalo de activación utilizado por el servicio de fondo</string>
   <string name="background_service_int">Intervalo de activación GPS</string>
-  <string name="background_service_provider_descr">Elige el proveedor de ubicación utilizado por el servicio de modo reposo</string>
+  <string name="background_service_provider_descr">Elige el proveedor de ubicación utilizado por el servicio de fondo</string>
   <string name="background_service_provider">Proveedor de ubicación</string>
   <string name="background_router_service_descr">Ejecuta OsmAnd de fondo para trazar su posición con la pantalla apagada</string>
-  <string name="background_router_service">Ejecutar en modo reposo</string>
-  <string name="off_router_service_no_gps_available">El servicio de navegación en modo reposo necesita un proveedor de ubicación para estar encendido.</string>
+  <string name="background_router_service">Ejecutar OsmAnd en segundo plano</string>
+  <string name="off_router_service_no_gps_available">El servicio de navegación de fondo requiere un proveedor de ubicación para activarse.</string>
   <string name="hide_poi_filter">Ocultar filtro</string>
   <string name="show_poi_filter">Mostrar filtro</string>
   <string name="search_poi_filter">Filtro</string>
@@ -787,7 +787,7 @@
   <string name="osmand_rastermaps_plugin_description">"Con este complemento puede acceder a muchos tipos de mapas en línea (llamados de teselas o ráster), desde teselas de OpenStreetMap predefinidas (como Mapnik) a imágenes de satélite y capas de propósito especial como mapas del tiempo, mapas del clima, mapas geológicos, capas de sombreado, etc.
 \n\nCualquiera de estos mapas se puede utilizado como el mapa (base) principal que se mostrará en la pantalla del mapa de OsmAnd, o como una superposición o subyacente de otro mapa base (como los mapas normales de OsmAnd en línea). Para hacer cualquier mapa subyacente más visible, ciertos elementos de los mapas vectoriales OsmAnd se pueden ocultar fácilmente a través del menú \'Configurar mapa\' cuando desee.
 \n\nLas teselas de mapas se pueden obtener directamente a través de fuentes en línea, o se pueden preparar para su uso fuera de línea (y copiar manualmente en la carpeta de datos OsmAnd) como una base de datos sqlite que puede ser producida por una variedad de herramientas de preparación de mapas de terceros. "</string>
-  <string name="osmand_background_plugin_description">Muestra los ajustes para habilitar el seguimiento y la navegación en modo suspensión (pantalla apagada) activando periódicamente el dispositivo GPS.</string>
+  <string name="osmand_background_plugin_description">Muestra los ajustes para habilitar el seguimiento y la navegación en segundo plano (pantalla apagada) activando periódicamente el dispositivo GPS.</string>
   <string name="osmand_accessibility_description">Este complemento habilita las características de accesibilidad del dispositivo directamente en OsmAnd. Facilita, por ejemplo, el ajuste de la velocidad de la voz para voces TTS, la configuración de navegación de pantalla con el panel direccional, utilizando la bola de desplazamiento para el control de acercamiento, o el uso de comentarios de conversión de texto a voz, o para el anuncio automático de su posición.</string>
   
   
@@ -986,8 +986,8 @@
   <string name="bg_service_interval">Fija el intervalo de activación:</string>
   <string name="screen_is_locked">Para desbloquear la pantalla presiona el icono del candado</string>
   <string name="bg_service_screen_unlock">Desbloquear pantalla</string>
-  <string name="bg_service_sleep_mode_off">Activar\n modo reposo</string>
-  <string name="bg_service_sleep_mode_on">Parar\n modo reposo</string>
+  <string name="bg_service_sleep_mode_off">Ejecutar\n aplicación en segundo plano</string>
+  <string name="bg_service_sleep_mode_on">Parar\n ejecución en segundo plano</string>
 <string name="gps_wakeup_interval">Intervalo de activación del GPS: %s</string>
 <string name="int_continuosly">Continuamente</string>
 <string name="email">correo electrónico</string>
@@ -1043,7 +1043,7 @@
 \n\t* Corrección de errores "</string>
 <string name="snap_to_road_descr">Ajusta la posición a las carreteras durante la navegación</string>
 <string name="snap_to_road">Ajustar a carreteras</string>
-<string name="tip_recent_changes_0_8_4_t">"Cambios en 0.8.4 :\n\t* Algunos fallos arreglados\n\t* El mapa no pierde el bloqueo de posición después de interrupciones\n\t* Activa el servicio de modo reposo durante la navegación "</string>
+<string name="tip_recent_changes_0_8_4_t">"Cambios en 0.8.4 :\n\t* Algunos fallos arreglados\n\t* El mapa no pierde el bloqueo de posición después de interrupciones\n\t* Activa el servicio de fondo durante la navegación "</string>
     <string name="context_menu_item_first_intermediate_point">Añadir como primer punto de ruta</string>
     <string name="context_menu_item_last_intermediate_point">Añadir como último punto de ruta</string>
     <string name="add_as_last_destination_point">Añadir como último punto de ruta</string>
@@ -1078,8 +1078,8 @@
 	<string name="rendering_attr_roadColors_name">Esquema de color de carreteras</string>
     <string name="zxing_barcode_scanner_not_found">La aplicación ZXing Barcode Scanner no está instalada. ¿Buscar en el tienda de aplicaciones?</string>
 	<string name="close_changeset">Cerrar conjunto de cambios</string>
-	<string name="background_service_is_enabled_question">El servicio de modo reposo de OsmAnd aún está funcionando. ¿También quiere interrumpirlo?</string>
-    <string name="tip_recent_changes_1_0_0_t">"Cambios en 1.0:\n\t* Mejorado la navegación: más rápido y más preciso (hasta 250 km)\n\t* Introduce mapas sólo de carreteras\n\t* El mapa no pierde el bloqueo de posición después de interrupciones\n\t* Activa el servicio de modo reposo durante la navegación "</string>
+	<string name="background_service_is_enabled_question">El servicio de fondo de OsmAnd aún está funcionando. ¿También quiere interrumpirlo?</string>
+    <string name="tip_recent_changes_1_0_0_t">"Cambios en 1.0:\n\t* Mejorado la navegación: más rápido y más preciso (hasta 250 km)\n\t* Introduce mapas sólo de carreteras\n\t* El mapa no pierde el bloqueo de posición después de interrupciones\n\t* Activa el servicio de fondo durante la navegación "</string>
     <string name="safe_mode_description">Ejecuta la aplicación en modo seguro (utilizando código Android más lento en lugar del nativo).</string>
     <string name="safe_mode">Modo seguro</string>
     <string name="native_library_not_running">La aplicación se está ejecutando en modo seguro (desactívelo en Ajustes).</string>
@@ -2085,7 +2085,7 @@
 	<string name="download_wikipedia_maps">Wikipedia</string>
     <string name="gps_network_not_enabled">El servicio de ubicación no está activado. ¿Quiere activarlo?</string>
     <string name="disable_recording_once_app_killed">Evita el registro autónomo</string>
-    <string name="disable_recording_once_app_killed_descrp">Se pausará el registro GPX cuando se cierre la aplicación (a través de aplicaciones recientes). (Las indicación del modo reposo de OsmAnd desaparecerá de la barra de notificaciones de Android.)</string>
+    <string name="disable_recording_once_app_killed_descrp">Se pausará el registro GPX cuando se cierre la aplicación (a través de aplicaciones recientes). (La indicación de fondo de OsmAnd desaparecerá de la barra de notificaciones de Android.)</string>
 	<string name="light_theme">Luminoso</string>
     <string name="dark_theme">Oscuro</string>
     <string name="lang_pms">Piamontés</string>
@@ -2194,4 +2194,6 @@
 	<string name="address_unknown">Dirección desconocida</string>
     <string name="are_you_sure">¿Está seguro?</string>
 	<string name="unsaved_changes_will_be_lost">Se perderán los cambios no guardados. ¿Continuar?</string>
-</resources>
+<string name="simulate_your_location_stop_descr">Parar simulación de posición</string>
+    <string name="simulate_your_location_descr">Simular utilizando grabación GPX o ruta calculada</string>
+    </resources>

From 3f8f6256026bfd83f3eb48614e566dbc3c702b00 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Wed, 23 Sep 2015 20:26:02 +0200
Subject: [PATCH 12/25] Translated using Weblate (Italian)

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

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index e673cb3df4..1abfb4d82e 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1474,7 +1474,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	\n\t* Impostazioni della velocità della vocalizzazione
     </string>
     <string name="calculate_osmand_route_without_internet">Calcola un tratto di percorso OsmAnd senza l\'utilizzo di Internet</string>
-    <string name="gpx_option_calculate_first_last_segment">Calcola un percorso OsmAnd per i tratti prima e dopo il GPX</string>
+    <string name="gpx_option_calculate_first_last_segment">Calcola percorso OsmAnd per i tratti prima e dopo il GPX</string>
     
     <string name="lang_en">Inglese</string>
 	<string name="lang_af">Afrikaans</string>

From c0be4699c8f3c3252a28e7ea3396a3e47bf20bf7 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Wed, 23 Sep 2015 20:32:51 +0200
Subject: [PATCH 13/25] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index c2768123cb..4101792aeb 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -1370,4 +1370,18 @@
 
 <string name="poi_pump">Pumpe</string>
 
-	</resources>
+	<string name="poi_piste_difficulty_easy">Piste sværhedsgrad: let</string>
+	<string name="poi_piste_difficulty_intermediate">Piste sværhedsgrad: mellemliggende</string>
+	<string name="poi_piste_difficulty_advanced">Piste sværhedsgrad: avanceret</string>
+	<string name="poi_piste_difficulty_novice">Piste sværhedsgrad: nybegynder</string>
+	<string name="poi_piste_difficulty_expert">Piste sværhedsgrad: ekspert</string>
+	<string name="poi_piste_difficulty_freeride">Piste sværhedsgrad: freeride</string>
+	<string name="poi_piste_grooming_classic">Pistepreparering: klassisk</string>
+	<string name="poi_piste_grooming_classic_skating">Pistepreparering: klassisk+skating</string>
+	<string name="poi_piste_grooming_backcountry">Pistepreparering:backcountry</string>
+	<string name="poi_piste_grooming_scooter">Pistepreparering: scooter</string>
+	<string name="poi_piste_grooming_skating">Pistepreparering:skøjteløb</string>
+	<string name="poi_piste_grooming_no">Pistepreparering: ingen</string>
+	<string name="poi_piste_grooming_mogul">Pistepreparering: mogul</string>
+
+</resources>

From 837c98825f187ebec8efb3f01f8bd73ca437f7d7 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Wed, 23 Sep 2015 22:40:44 +0300
Subject: [PATCH 14/25] Context menu Fix

---
 .../plus/mapcontextmenu/MapContextMenu.java   | 21 ++++----
 .../sections/AmenityInfoMenuBuilder.java      | 23 ++++-----
 .../osmand/plus/views/ContextMenuLayer.java   | 42 +++++++++-------
 .../net/osmand/plus/views/POIMapLayer.java    | 48 -------------------
 4 files changed, 47 insertions(+), 87 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
index 371f701f0f..888be6eb28 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
@@ -63,17 +63,12 @@ public class MapContextMenu {
 		settings = app.getSettings();
 	}
 
-	public void show() {
-		MapContextMenuFragment.showInstance(mapActivity);
-	}
-
-	public void show(PointDescription pointDescription, Object object) {
-
+	public boolean init(PointDescription pointDescription, Object object) {
 		if (isMenuVisible()) {
 			if (this.object == null || !this.object.equals(object)) {
 				hide();
 			} else {
-				return;
+				return false;
 			}
 		}
 
@@ -89,9 +84,19 @@ public class MapContextMenu {
 		if (object != null || Algorithms.isEmpty(pointDescription.getName())) {
 			acquireStreetName(new LatLon(pointDescription.getLat(), pointDescription.getLon()));
 		}
+		return true;
+	}
 
-		MapContextMenuFragment.showInstance(mapActivity);
+	public void show() {
+		if (!isMenuVisible()) {
+			MapContextMenuFragment.showInstance(mapActivity);
+		}
+	}
 
+	public void show(PointDescription pointDescription, Object object) {
+		if (init(pointDescription, object)) {
+			MapContextMenuFragment.showInstance(mapActivity);
+		}
 	}
 
 	public void hide() {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java
index a661ac2247..fc6d559ff7 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/sections/AmenityInfoMenuBuilder.java
@@ -37,11 +37,11 @@ public class AmenityInfoMenuBuilder extends MenuBuilder {
 		this.amenity = amenity;
 	}
 
-	private void buildRow(View view, int iconId, String text, int textColor, boolean isDescription) {
-		buildRow(view, getRowIcon(iconId), text, textColor, isDescription);
+	private void buildRow(View view, int iconId, String text, int textColor, boolean isWiki) {
+		buildRow(view, getRowIcon(iconId), text, textColor, isWiki);
 	}
 
-	private void buildRow(final View view, Drawable icon, String text, int textColor, final boolean isDescription) {
+	private void buildRow(final View view, Drawable icon, String text, int textColor, final boolean isWiki) {
 		boolean light = app.getSettings().isLightContent();
 
 		LinearLayout ll = new LinearLayout(view.getContext());
@@ -80,7 +80,7 @@ public class AmenityInfoMenuBuilder extends MenuBuilder {
 
 		textView.setAutoLinkMask(Linkify.ALL);
 		textView.setLinksClickable(true);
-		if (isDescription) {
+		if (isWiki) {
 			textView.setMinLines(1);
 			textView.setMaxLines(5);
 		}
@@ -88,13 +88,11 @@ public class AmenityInfoMenuBuilder extends MenuBuilder {
 		if (textColor > 0) {
 			textView.setTextColor(view.getResources().getColor(textColor));
 		}
-		if (isDescription) {
+		if (isWiki) {
 			textView.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					if (isDescription) {
-						POIMapLayer.showDescriptionDialog(view.getContext(), app, amenity);
-					}
+					POIMapLayer.showDescriptionDialog(view.getContext(), app, amenity);
 				}
 			});
 		}
@@ -143,7 +141,7 @@ public class AmenityInfoMenuBuilder extends MenuBuilder {
 			int iconId = 0;
 			Drawable icon = null;
 			int textColor = 0;
-			boolean isDescription = false;
+			boolean isWiki = false;
 			String key = e.getKey();
 			String vl = e.getValue();
 
@@ -166,7 +164,7 @@ public class AmenityInfoMenuBuilder extends MenuBuilder {
 						vl = vl.substring(0, 300);
 					}
 					hasWiki = true;
-					isDescription = true;
+					isWiki = true;
 				} else {
 					continue;
 				}
@@ -195,7 +193,6 @@ public class AmenityInfoMenuBuilder extends MenuBuilder {
 			} else {
 				if (Amenity.DESCRIPTION.equals(key)) {
 					iconId = R.drawable.ic_action_note_dark;
-					isDescription = true;
 				} else {
 					iconId = R.drawable.ic_action_info_dark;
 				}
@@ -217,9 +214,9 @@ public class AmenityInfoMenuBuilder extends MenuBuilder {
 			}
 
 			if (icon != null) {
-				buildRow(view, icon, vl, textColor, isDescription);
+				buildRow(view, icon, vl, textColor, isWiki);
 			} else {
-				buildRow(view, iconId, vl, textColor, isDescription);
+				buildRow(view, iconId, vl, textColor, isWiki);
 			}
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index cfa9e1a297..32dba13952 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -63,8 +63,6 @@ public class ContextMenuLayer extends OsmandMapLayer {
 	private LatLon latLon;
 	private String description;
 	private Map<Object, IContextMenuProvider> selectedObjects = new ConcurrentHashMap<Object, IContextMenuProvider>();
-	private Object selectedObj;
-	private IContextMenuProvider contextObject;
 
 	private TextView textView;
 	private ImageView closeButton;
@@ -212,8 +210,6 @@ public class ContextMenuLayer extends OsmandMapLayer {
 	public void showMapContextMenuMarker(LatLon latLon) {
 		activity.getContextMenu().hide();
 		this.latLon = latLon;
-		selectedObj = null;
-		contextObject = null;
 		showMapContextMenuMarker();
 	}
 
@@ -296,9 +292,9 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		if (latLon != null) {
 			if (selectedObjects.size() == 1) {
 				setLocation(null, "");
-				selectedObj = selectedObjects.keySet().iterator().next();
-				contextObject = selectedObjects.get(selectedObj);
-				showMapContextMenu(latLon);
+				Object selectedObj = selectedObjects.keySet().iterator().next();
+				IContextMenuProvider contextObject = selectedObjects.get(selectedObj);
+				showMapContextMenu(latLon, selectedObj, contextObject);
 				return true;
 			} else if (selectedObjects.size() > 1) {
 				showContextMenuForSelectedObjects(latLon);
@@ -308,8 +304,6 @@ public class ContextMenuLayer extends OsmandMapLayer {
 			setLocation(null, "");
 			final double lat = tileBox.getLatFromPixel((int) point.x, (int) point.y);
 			final double lon = tileBox.getLonFromPixel((int) point.x, (int) point.y);
-			selectedObj = null;
-			contextObject = null;
 			showMapContextMenu(new LatLon(lat, lon));
 			return true;
 		}
@@ -460,9 +454,9 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		if(selectOnMap != null) {
 			LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y);
 			CallbackWithObject<LatLon> cb = selectOnMap;
-			selectOnMap = null;
 			cb.processResult(latlon);
-			showMapContextMenuMarker(latlon);
+			showMapContextMenu(latlon);
+			selectOnMap = null;
 			return true;
 		}
 		if (val == 2) {
@@ -503,16 +497,16 @@ public class ContextMenuLayer extends OsmandMapLayer {
 			builder.setItems(d, new OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
-					selectedObj = s.get(which);
-					contextObject = selectedObjects.get(selectedObj);
-					showMapContextMenu(l);
+					Object selectedObj = s.get(which);
+					IContextMenuProvider contextObject = selectedObjects.get(selectedObj);
+					showMapContextMenu(l, selectedObj, contextObject);
 				}
 			});
 			builder.show();
 		} else {
-			selectedObj = selectedObjects.keySet().iterator().next();
-			contextObject = selectedObjects.get(selectedObj);
-			showMapContextMenu(l);
+			Object selectedObj = selectedObjects.keySet().iterator().next();
+			IContextMenuProvider contextObject = selectedObjects.get(selectedObj);
+			showMapContextMenu(l, selectedObj, contextObject);
 		}
 	}
 
@@ -525,6 +519,14 @@ public class ContextMenuLayer extends OsmandMapLayer {
 	}
 
 	public void showMapContextMenu(LatLon latLon, String title) {
+		showMapContextMenu(latLon, title, null, null);
+	}
+
+	public void showMapContextMenu(LatLon latLon, Object selectedObj, IContextMenuProvider contextObject) {
+		showMapContextMenu(latLon, null, selectedObj, contextObject);
+	}
+
+	public void showMapContextMenu(LatLon latLon, String title, Object selectedObj, IContextMenuProvider contextObject) {
 		PointDescription pointDescription;
 		if (selectedObj != null && contextObject != null) {
 			pointDescription = contextObject.getObjectName(selectedObj);
@@ -540,7 +542,11 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		this.latLon = new LatLon(pointDescription.getLat(), pointDescription.getLon());
 
 		showMapContextMenuMarker();
-		activity.getContextMenu().show(pointDescription, selectedObj);
+		if (selectOnMap != null) {
+			activity.getContextMenu().init(pointDescription, selectedObj);
+		} else {
+			activity.getContextMenu().show(pointDescription, selectedObj);
+		}
 	}
 
 
diff --git a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
index 0d7dc4d1d5..cf84b58e68 100644
--- a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
@@ -335,54 +335,6 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
 		return true;
 	}
 
-	@Override
-	public void populateObjectContextMenu(Object o, ContextMenuAdapter adapter) {
-		if (o instanceof Amenity) {
-			final Amenity a = (Amenity) o;
-			OnContextMenuClick listener = new ContextMenuAdapter.OnContextMenuClick() {
-				@Override
-				public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
-					if (itemId == R.string.poi_context_menu_call) {
-						try {
-							Intent intent = new Intent(Intent.ACTION_VIEW);
-							intent.setData(Uri.parse("tel:" + a.getPhone())); //$NON-NLS-1$
-							view.getContext().startActivity(intent);
-						} catch (RuntimeException e) {
-							log.error("Failed to invoke call", e); //$NON-NLS-1$
-							AccessibleToast.makeText(view.getContext(), e.getMessage(), Toast.LENGTH_SHORT).show();
-						}
-					} else if (itemId == R.string.poi_context_menu_website) {
-						try {
-							Intent intent = new Intent(Intent.ACTION_VIEW);
-							intent.setData(Uri.parse(a.getSite()));
-							view.getContext().startActivity(intent);
-						} catch (RuntimeException e) {
-							log.error("Failed to invoke call", e); //$NON-NLS-1$
-							AccessibleToast.makeText(view.getContext(), e.getMessage(), Toast.LENGTH_SHORT).show();
-						}
-					} else if (itemId == R.string.poi_context_menu_showdescription) {
-						showDescriptionDialog(view.getContext(), app, a);
-					}
-					return true;
-				}
-			};
-			if (OsmAndFormatter.getAmenityDescriptionContent(view.getApplication(), a, false).length() > 0 || 
-					a.getType().isWiki()) {
-				adapter.item(R.string.poi_context_menu_showdescription)
-						.iconColor(R.drawable.ic_action_note_dark).listen(listener).reg();
-			}
-			if (a.getPhone() != null) {
-				adapter.item(R.string.poi_context_menu_call)
-						.iconColor(R.drawable.ic_action_call_dark).listen(listener).reg();
-			}
-			if (a.getSite() != null) {
-				adapter.item(R.string.poi_context_menu_website)
-						.iconColor(R.drawable.ic_world_globe_dark).listen(listener)
-						.reg();
-			}
-		}
-	}
-
 	public static void showDescriptionDialog(Context ctx, OsmandApplication app, Amenity a) {
 		String lang = app.getSettings().MAP_PREFERRED_LOCALE.get();
 		if (a.getType().isWiki()) {

From e9e2d887fe03b91ec029d990ab69974f7184eb8c Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Wed, 23 Sep 2015 21:35:07 +0200
Subject: [PATCH 15/25] Translated using Weblate (Swedish)

Currently translated at 99.1% (1764 of 1779 strings)
---
 OsmAnd/res/values-sv/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 9f5e7369db..3cc2db8a89 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1999,4 +1999,6 @@
 	<string name="address_unknown">Adressen är inte känd än</string>
     <string name="are_you_sure">Är du säker?</string>
 	<string name="unsaved_changes_will_be_lost">Alla osparade ändringar kommer att förloras. Fortsätta ändå?</string>
-</resources>
+<string name="simulate_your_location_stop_descr">Sluta simulera din plats</string>
+    <string name="simulate_your_location_descr">Simulera med inspelad GPX eller beräknad rutt</string>
+    </resources>

From 47a8a0d2c4c7aef957d0c54130fdc8ba815ad90d Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Wed, 23 Sep 2015 20:54:07 +0200
Subject: [PATCH 16/25] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 4101792aeb..f43346343f 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -1378,10 +1378,10 @@
 	<string name="poi_piste_difficulty_freeride">Piste sværhedsgrad: freeride</string>
 	<string name="poi_piste_grooming_classic">Pistepreparering: klassisk</string>
 	<string name="poi_piste_grooming_classic_skating">Pistepreparering: klassisk+skating</string>
-	<string name="poi_piste_grooming_backcountry">Pistepreparering:backcountry</string>
+	<string name="poi_piste_grooming_backcountry">Pistepreparering: offpiste</string>
 	<string name="poi_piste_grooming_scooter">Pistepreparering: scooter</string>
-	<string name="poi_piste_grooming_skating">Pistepreparering:skøjteløb</string>
+	<string name="poi_piste_grooming_skating">Pistepreparering: skøjteløb</string>
 	<string name="poi_piste_grooming_no">Pistepreparering: ingen</string>
-	<string name="poi_piste_grooming_mogul">Pistepreparering: mogul</string>
+	<string name="poi_piste_grooming_mogul">Pistepreparering: pukkelpist</string>
 
 </resources>

From 14fa680c436bb8102dee2af2a97d5ede618690ec Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Wed, 23 Sep 2015 22:05:18 +0200
Subject: [PATCH 17/25] fix end detection

---
 OsmAnd/src/net/osmand/plus/GPXUtilities.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
index e6fbdb9bf8..6bf748db93 100644
--- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java
@@ -299,8 +299,9 @@ public class GPXUtilities {
 							channelBase = channelBottom;
 							channelTop = point.ele;
 							climb = true;
+						}
 						// End detection without breakout
-						} else if (j == numberOfPoints -1) {
+						if (j == (numberOfPoints -1)) {
 							if ((channelTop - channelBase) >= channelThres) {
 								diffElevationUp += channelTop - channelBase;
 							}

From 9518ef6b75ddef1ad982d54a9108bcadffc37729 Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Wed, 23 Sep 2015 22:32:13 +0200
Subject: [PATCH 18/25] Translated using Weblate (Slovak)

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

diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index b3f8635291..c981199046 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2289,4 +2289,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 	<string name="address_unknown">Adresa ešte nie je známa</string>
     <string name="are_you_sure">Ste si istí?</string>
 	<string name="unsaved_changes_will_be_lost">Všetky neuložené zmeny budú stratené. Pokračovať?</string>
+<string name="simulate_your_location_stop_descr">Skončiť simuláciu polohy</string>
+    <string name="simulate_your_location_descr">Simulovať pomocou zaznamenaného GPX alebo vypočítanej trasy</string>
+    <string name="downloads_left_template">%1$s sťahovaní zostáva</string>
 </resources>

From ddb72f0df96944a52ce9c4dd1a18db0c0496d7b4 Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Thu, 24 Sep 2015 03:41:14 +0200
Subject: [PATCH 19/25] Translated using Weblate (Argentinean Spanish)

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

diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 18793ec9d9..91d7c55711 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2059,4 +2059,5 @@
 	<string name="unsaved_changes_will_be_lost">Se perderán los cambios no guardados. ¿Continuar?</string>
 <string name="simulate_your_location_stop_descr">Parar simulación de ubicación</string>
     <string name="simulate_your_location_descr">Simular usando grabación GPX o ruta calculada</string>
-    </resources>
+    <string name="downloads_left_template">Quedan %1$s descargas</string>
+</resources>

From 3e111571a3775f0a7210dd3f1027ad7a5a522a8a Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Thu, 24 Sep 2015 06:26:33 +0200
Subject: [PATCH 20/25] Translated using Weblate (Chinese (Taiwan))

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

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 80727cc923..6ac9c7200c 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2113,4 +2113,7 @@
 	<string name="address_unknown">還不知道地址</string>
     <string name="are_you_sure">您確定嗎？</string>
 	<string name="unsaved_changes_will_be_lost">任何未儲存的變更將會失去。要繼續嗎?</string>
+<string name="simulate_your_location_stop_descr">停止模擬您的位置</string>
+    <string name="simulate_your_location_descr">模擬使用記錄的 GPX 或計算的路線</string>
+    <string name="downloads_left_template">離開下載的 %1$s</string>
 </resources>

From 1d4074e3ff21900cca7f4aadd2069b2104b69358 Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Thu, 24 Sep 2015 07:02:52 +0200
Subject: [PATCH 21/25] Translated using Weblate (Chinese (Taiwan))

Currently translated at 100.0% (1260 of 1260 strings)
---
 OsmAnd/res/values-zh-rTW/phrases.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index 2b5bc3f242..03b2c1ea8f 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -1349,4 +1349,18 @@
 
 <string name="poi_pump">泵浦</string>
 
-	</resources>
+	<string name="poi_piste_difficulty_easy">滑雪道難度：容易</string>
+	<string name="poi_piste_difficulty_intermediate">滑雪道難度：中等</string>
+	<string name="poi_piste_difficulty_advanced">滑雪道難度：高級</string>
+	<string name="poi_piste_difficulty_novice">滑雪道難度：初學者</string>
+	<string name="poi_piste_difficulty_expert">滑雪道難度： 熟練者</string>
+	<string name="poi_piste_difficulty_freeride">滑雪道難度：隨意的</string>
+	<string name="poi_piste_grooming_classic">滑雪道修整：最優秀</string>
+	<string name="poi_piste_grooming_classic_skating">滑雪道修整：最優秀+滑冰</string>
+	<string name="poi_piste_grooming_backcountry">滑雪道修整：偏僻的</string>
+	<string name="poi_piste_grooming_scooter">滑雪道修整：滑橇車</string>
+	<string name="poi_piste_grooming_skating">滑雪道修整：滑冰</string>
+	<string name="poi_piste_grooming_no">滑雪道修整：無</string>
+	<string name="poi_piste_grooming_mogul">滑雪道修整：障礙</string>
+
+</resources>

From f0bd560454f8a5d445feeb068eabe2e9ebb15e63 Mon Sep 17 00:00:00 2001
From: Evgenii Martynenko <deathstallker@yandex.ru>
Date: Wed, 23 Sep 2015 23:56:43 +0200
Subject: [PATCH 22/25] Translated using Weblate (Russian)

Currently translated at 98.0% (1744 of 1779 strings)
---
 OsmAnd/res/values-ru/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index fe26d5835f..df4a6570f7 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -2097,4 +2097,6 @@
 	<string name="count_of_lines">Количество строк</string>
 <string name="show_on_start">Показывать при запуске</string>
 	<string name="address_unknown">Адрес неизвестен</string>
-    </resources>
+    <string name="are_you_sure">Вы уверены?</string>
+	<string name="unsaved_changes_will_be_lost">Все несохраненные изменения будут потеряны. Продолжить?</string>
+	</resources>

From 5f41edc11159fbacd2d69e54ba6b65f224d84d10 Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Thu, 24 Sep 2015 03:37:54 +0200
Subject: [PATCH 23/25] Translated using Weblate (Argentinean Spanish)

Currently translated at 99.8% (1258 of 1260 strings)
---
 OsmAnd/res/values-es-rAR/phrases.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index dd36646739..6093cc6964 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -1347,4 +1347,20 @@
 	<string name="poi_windfall">Fruto caído</string>
 	<string name="poi_rtsa_scale">Dificultad del paso de montaña</string>
 
+<string name="poi_pump">Bomba</string>
+
+	<string name="poi_piste_difficulty_easy">Dificultad de la pista: fácil</string>
+	<string name="poi_piste_difficulty_intermediate">Dificultad de la pista: intermedia</string>
+	<string name="poi_piste_difficulty_advanced">Dificultad de la pista: avanzada</string>
+	<string name="poi_piste_difficulty_novice">Dificultad de la pista: novato</string>
+	<string name="poi_piste_difficulty_expert">Dificultad de la pista: experto</string>
+	<string name="poi_piste_difficulty_freeride">Dificultad de la pista: estilo libre</string>
+	<string name="poi_piste_grooming_classic">Pista de entrenamiento: clásico</string>
+	<string name="poi_piste_grooming_classic_skating">Pista de entrenamiento: patinaje clásico</string>
+	<string name="poi_piste_grooming_backcountry">Pista de entrenamiento: fuera de pista</string>
+	<string name="poi_piste_grooming_scooter">Pista de entrenamiento: scooter</string>
+	<string name="poi_piste_grooming_skating">Pista de entrenamiento: patinaje</string>
+	<string name="poi_piste_grooming_no">Sin preparación de la pista</string>
+	<string name="poi_piste_grooming_mogul">Pista de entrenamiento: magnate</string>
+
 </resources>

From ca2be8af42674897248966049d198a30dff5a35f Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Wed, 23 Sep 2015 22:38:24 +0200
Subject: [PATCH 24/25] Translated using Weblate (Slovak)

Currently translated at 95.7% (1206 of 1260 strings)
---
 OsmAnd/res/values-sk/phrases.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index 9dabf20663..fbf73325e3 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -1300,4 +1300,18 @@
 	<string name="poi_bicycle_parking_anchors">Držiaky</string>
 	<string name="poi_rtsa_scale">Náročnosť horského priesmyku</string>
 
+<string name="poi_piste_difficulty_easy">Obtiažnosť zjazdovky: ľahká</string>
+	<string name="poi_piste_difficulty_intermediate">Obtiažnosť zjazdovky: stredná</string>
+	<string name="poi_piste_difficulty_advanced">Obtiažnosť zjazdovky: pokročilí</string>
+	<string name="poi_piste_difficulty_novice">Obtiažnosť zjazdovky: pre začiatočníkov</string>
+	<string name="poi_piste_difficulty_expert">Obtiažnosť zjazdovky: pre skúsených</string>
+	<string name="poi_piste_difficulty_freeride">Obtiažnosť zjazdovky: voľný zjazd</string>
+	<string name="poi_piste_grooming_classic">Úprava trate: klasická</string>
+	<string name="poi_piste_grooming_classic_skating">Úprava trate: klasická+korčuľovanie na lyžiach</string>
+	<string name="poi_piste_grooming_backcountry">Úprava trate: cez krajinu</string>
+	<string name="poi_piste_grooming_scooter">Úprava trate: snežným skútrom</string>
+	<string name="poi_piste_grooming_skating">Úprava trate: korčuľovanie na lyžiach</string>
+	<string name="poi_piste_grooming_no">Úprava trate: žiadna</string>
+	<string name="poi_piste_grooming_mogul">Úprava trate: bubny</string>
+
 </resources>

From 8d63fa1cebf5395cb42aa19812f9295860cd111f Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Thu, 24 Sep 2015 03:36:51 +0200
Subject: [PATCH 25/25] Translated using Weblate (Spanish)

Currently translated at 99.8% (1258 of 1260 strings)
---
 OsmAnd/res/values-es/phrases.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index a1a74ef9ac..6bd1fff680 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -1351,4 +1351,20 @@
 	<string name="poi_windfall">Fruto caído</string>
 	<string name="poi_rtsa_scale">Dificultad del paso de montaña</string>
 
+<string name="poi_pump">Bomba</string>
+
+	<string name="poi_piste_difficulty_easy">Dificultad de la pista: fácil</string>
+	<string name="poi_piste_difficulty_intermediate">Dificultad de la pista: intermedio</string>
+	<string name="poi_piste_difficulty_advanced">Dificultad de la pista: avanzado</string>
+	<string name="poi_piste_difficulty_novice">Dificultad de la pista: novato</string>
+	<string name="poi_piste_difficulty_expert">Dificultad de la pista: experto</string>
+	<string name="poi_piste_difficulty_freeride">Dificultad de la pista: estilo libre</string>
+	<string name="poi_piste_grooming_classic">Pista de entrenamiento: clásico</string>
+	<string name="poi_piste_grooming_classic_skating">Pista de entrenamiento: clásico + patinaje</string>
+	<string name="poi_piste_grooming_backcountry">Pista de entrenamiento: fuera de pista</string>
+	<string name="poi_piste_grooming_scooter">Pista de entrenamiento: scooter</string>
+	<string name="poi_piste_grooming_skating">Pista de entrenamiento: patinaje</string>
+	<string name="poi_piste_grooming_no">Sin pista de entrenamiento</string>
+	<string name="poi_piste_grooming_mogul">Pista de entrenamiento: magnate</string>
+
 </resources>