From 7262fa21321b098d021d36345737a1572f9b5698 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Tue, 29 Sep 2015 00:02:48 +0200
Subject: [PATCH 01/40] Translated using Weblate (Italian)

Currently translated at 99.8% (1741 of 1744 strings)
---
 OsmAnd/res/values-it/strings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 508e6474be..e8bfc77c91 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2187,4 +2187,15 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 <string name="shared_string_trip_recording">Registrazione viaggio</string>
     <string name="shared_string_navigation">Navigazione</string>
     <string name="osmand_running_in_background">Avviato in backgroung</string>
+    <string name="default_speed_system_descr">Definsci l\'unità di misura della velocità</string>
+    <string name="default_speed_system">Misurazione della velocità</string>
+    <string name="nm">nm</string>
+    <string name="si_nm">Miglia nautiche</string>
+    <string name="si_kmh">Chilometri all\'ora</string>
+    <string name="si_mph">Miglia per ora</string>
+    <string name="si_m_s">Metri al secondo</string>
+    <string name="si_min_km">Minuti al chilometro</string>
+    <string name="si_min_m">Minuti per miglia</string>
+    <string name="si_nm_h">Miglia nautiche per ora (knot)</string>
+    <string name="nm_h">nmh</string>
     </resources>

From 1ef9d1814a0b6fcfa043f361b46b643767798788 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Tue, 29 Sep 2015 00:03:36 +0200
Subject: [PATCH 02/40] Translated using Weblate (Italian)

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

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index e8bfc77c91..bc8a13af56 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2198,4 +2198,8 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="si_min_m">Minuti per miglia</string>
     <string name="si_nm_h">Miglia nautiche per ora (knot)</string>
     <string name="nm_h">nmh</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="m_s">m/s</string>
+    
     </resources>

From fa3f0bcab00ca4eb9f0214d24827131f4fdabe56 Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Tue, 29 Sep 2015 04:33:17 +0200
Subject: [PATCH 03/40] Translated using Weblate (Spanish)

Currently translated at 100.0% (1744 of 1744 strings)
---
 OsmAnd/res/values-es/strings.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 20c867ec2d..9cc0441375 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -2197,4 +2197,25 @@
 <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>
     <string name="downloads_left_template">Quedan %$1s descargas</string>
+<string name="default_speed_system_descr">Define el sistema de medición de velocidad</string>
+    <string name="default_speed_system">Medición de la velocidad</string>
+    <string name="nm">nm</string>
+    <string name="si_nm">Millas náuticas</string>
+    <string name="si_kmh">Kilómetros por hora</string>
+    <string name="si_mph">Millas por hora</string>
+    <string name="si_m_s">Metros por segundo</string>
+    <string name="si_min_km">Minutos por kilómetro</string>
+    <string name="si_min_m">Minutos por milla</string>
+    <string name="si_nm_h">Millas náuticas por hora (nudos)</string>
+    <string name="nm_h">nmh</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="m_s">m/s</string>
+    
+    <string name="shared_string_trip_recording">Grabación de viaje</string>
+    <string name="shared_string_navigation">Navegación</string>
+    <string name="osmand_running_in_background">Ejecutando en segundo plano</string>
+    <string name="favourites_edit_dialog_title">Información del favorito</string>
+    <string name="favourites_context_menu_add">Añadir favorito</string>
+	<string name="roads">Carreteras</string>
 </resources>

From aa955a280480a62b3b292c75ec2a6a21ac61d1aa Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Tue, 29 Sep 2015 04:35:22 +0200
Subject: [PATCH 04/40] Translated using Weblate (Argentinean Spanish)

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

diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 98e0060242..6d778e55b8 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2066,4 +2066,19 @@
     <string name="favourites_edit_dialog_title">Información del favorito</string>
     <string name="favourites_context_menu_add">Añadir favorito</string>
 	<string name="roads">Caminos</string>
-</resources>
+<string name="default_speed_system_descr">Define el sistema de medición de velocidad</string>
+    <string name="default_speed_system">Medición de la velocidad</string>
+    <string name="nm">nm</string>
+    <string name="si_nm">Millas náuticas</string>
+    <string name="si_kmh">Kilómetros por hora</string>
+    <string name="si_mph">Millas por hora</string>
+    <string name="si_m_s">Metros por segundo</string>
+    <string name="si_min_km">Minutos por kilómetro</string>
+    <string name="si_min_m">Minutos por milla</string>
+    <string name="si_nm_h">Millas náuticas por hora (nudos)</string>
+    <string name="nm_h">nmh</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="m_s">m/s</string>
+    
+    </resources>

From bbe3c98ac7b2a1a23f01b9bacbc274981f0fa26a Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Tue, 29 Sep 2015 04:36:56 +0200
Subject: [PATCH 05/40] Translated using Weblate (Chinese (Taiwan))

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

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index ad6bfbedc5..f77385f833 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2122,4 +2122,19 @@
 <string name="shared_string_trip_recording">旅程錄製</string>
     <string name="shared_string_navigation">導航</string>
     <string name="osmand_running_in_background">在背景執行</string>
+    <string name="default_speed_system_descr">定義速度測定系統</string>
+    <string name="default_speed_system">測定速度</string>
+    <string name="si_nm">海浬</string>
+    <string name="nm">浬</string>
+    <string name="si_kmh">公里每小時</string>
+    <string name="si_mph">英里每小時</string>
+    <string name="si_m_s">公尺每秒</string>
+    <string name="si_min_km">分鐘每公里</string>
+    <string name="si_min_m">分鐘每英里</string>
+    <string name="si_nm_h">海浬每小時 (節)</string>
+    <string name="min_mile">分/公尺</string>
+    <string name="min_km">分/公里</string>
+    <string name="m_s">秒/公尺</string>
+    
+    <string name="nm_h">浬時</string>
     </resources>

From ff881803a9a66267c564cd8bcbfb5d929cc25310 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 05:20:05 +0200
Subject: [PATCH 06/40] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index e42411059f..d25ffb40f4 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2143,4 +2143,19 @@
 	<string name="shared_string_trip_recording">Optag ture</string>
     <string name="shared_string_navigation">Navigation</string>
     <string name="osmand_running_in_background">Kører i baggrunden</string>
+    <string name="default_speed_system">Hastighedsmåling</string>
+    <string name="nm">nm</string>
+    <string name="si_nm">Sømil</string>
+    <string name="si_kmh">Kilometer i timen</string>
+    <string name="si_mph">Mil i timen</string>
+    <string name="si_m_s">Meter i sekundet</string>
+    <string name="si_min_km">Minutter pr. kilometer</string>
+    <string name="si_min_m">Minutter per mil</string>
+    <string name="si_nm_h">Sømil i timen (knob)</string>
+    <string name="nm_h">nmh</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="m_s">m/s</string>
+    
+    <string name="default_speed_system_descr">Definer hastighedsmålesystem</string>
     </resources>

From 24d09342541de2fbb24480da0d93b4fd3336060c Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Tue, 29 Sep 2015 11:53:08 +0300
Subject: [PATCH 07/40] Context menu - edit favorites in progress

---
 .../res/layout/favorite_categories_dialog.xml | 18 ++++
 .../layout/favorite_category_dialog_item.xml  | 30 ++++++
 OsmAnd/res/layout/point_editor_fragment.xml   |  5 +-
 OsmAnd/res/values/strings.xml                 |  2 +
 .../net/osmand/plus/FavouritesDbHelper.java   |  8 ++
 .../IndexItemCategoryWithSubcat.java          |  2 +-
 .../details/AmenityMenuBuilder.java           |  4 +-
 .../editors/FavoritePointEditorFragment.java  | 42 +++++---
 .../editors/PointEditorFragment.java          | 67 ++++++++-----
 .../editors/dialogs/CategoryDialogs.java      |  5 -
 .../dialogs/SelectCategoryDialogFragment.java | 95 +++++++++++++++++++
 11 files changed, 234 insertions(+), 44 deletions(-)
 create mode 100644 OsmAnd/res/layout/favorite_categories_dialog.xml
 create mode 100644 OsmAnd/res/layout/favorite_category_dialog_item.xml
 delete mode 100644 OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/CategoryDialogs.java
 create mode 100644 OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/SelectCategoryDialogFragment.java

diff --git a/OsmAnd/res/layout/favorite_categories_dialog.xml b/OsmAnd/res/layout/favorite_categories_dialog.xml
new file mode 100644
index 0000000000..cbe0b3625f
--- /dev/null
+++ b/OsmAnd/res/layout/favorite_categories_dialog.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/dialog_content_bottom_margin"
+            android:paddingLeft="@dimen/dialog_content_margin"
+            android:paddingRight="@dimen/dialog_content_margin"
+            android:paddingTop="@dimen/dialog_content_bottom_margin">
+
+    <LinearLayout
+        android:id="@+id/list_container"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OsmAnd/res/layout/favorite_category_dialog_item.xml b/OsmAnd/res/layout/favorite_category_dialog_item.xml
new file mode 100644
index 0000000000..f8fdc8fd67
--- /dev/null
+++ b/OsmAnd/res/layout/favorite_category_dialog_item.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="horizontal">
+
+    <LinearLayout
+        android:layout_width="44dp"
+        android:layout_height="50dp">
+
+        <ImageView
+            android:id="@+id/image_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:scaleType="center"
+            android:src="@drawable/ic_action_folder"/>
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_transparent"
+        android:text="Restaurant"
+        android:gravity="left|center_vertical"
+        android:textSize="@dimen/default_list_text_size"
+        android:textAllCaps="false"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/point_editor_fragment.xml b/OsmAnd/res/layout/point_editor_fragment.xml
index 4a4a49050f..12a7cef4c2 100644
--- a/OsmAnd/res/layout/point_editor_fragment.xml
+++ b/OsmAnd/res/layout/point_editor_fragment.xml
@@ -114,6 +114,7 @@
                         android:layout_marginLeft="8dp"
                         android:textColor="?android:textColorPrimary"
                         android:textColorHint="?android:textColorSecondary"
+                        android:text="Name"
                         android:inputType="text"/>
 
 
@@ -167,7 +168,9 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         android:layout_marginRight="16dp"
-                        android:layout_marginLeft="8dp"/>
+                        android:layout_marginLeft="8dp"
+                        android:completionThreshold="1"
+                        android:drawableRight="@drawable/ic_action_arrow_drop_down"/>
 
                 </LinearLayout>
 
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 092d47e26d..6cde5e04fd 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,8 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="favorite_category_add_new">Add new</string>
+    <string name="favorite_category_select">Select category</string>
     <string name="shared_string_trip_recording">Trip recording</string>
     <string name="shared_string_navigation">Navigation</string>
     <string name="osmand_running_in_background">Running in background</string>
diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
index 7f1e176208..4c66a33753 100644
--- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
+++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
@@ -435,6 +435,14 @@ public class FavouritesDbHelper {
 		}
 	}
 
+	public FavoriteGroup getGroup(String name) {
+		if (flatGroups.containsKey(name)) {
+			return flatGroups.get(name);
+		} else {
+			return null;
+		}
+	}
+
 	private FavouritePoint findFavoriteByAllProperties(String category, String name, double lat, double lon){
 		if (flatGroups.containsKey(category)) {
 			FavoriteGroup fg = flatGroups.get(category);
diff --git a/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java b/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java
index 1b7610fd34..1b9fbd5586 100644
--- a/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java
+++ b/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java
@@ -59,7 +59,7 @@ public class IndexItemCategoryWithSubcat implements Comparable<IndexItemCategory
 
 	public static List<IndexItemCategoryWithSubcat> categorizeIndexItems(final OsmandApplication ctx,
 																		 Collection<IndexItem> indexItems) {
-		boolean skipWiki = Version.isFreeVersion(ctx);
+		boolean skipWiki = Version.isFreeVersion(ctx);NewLocalIndexesFragment
 		final Map<String, IndexItemCategoryWithSubcat> cats = new TreeMap<>();
 		ArrayList<IndexItemCategoryWithSubcat> mainList = new ArrayList<>();
 		for (IndexItem i : indexItems) {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/details/AmenityMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/details/AmenityMenuBuilder.java
index a0a992e825..53a2430db5 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/details/AmenityMenuBuilder.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/details/AmenityMenuBuilder.java
@@ -3,6 +3,7 @@ package net.osmand.plus.mapcontextmenu.details;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.text.Html;
+import android.text.TextUtils;
 import android.text.util.Linkify;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -79,9 +80,10 @@ public class AmenityMenuBuilder extends MenuBuilder {
 
 		textView.setAutoLinkMask(Linkify.ALL);
 		textView.setLinksClickable(true);
+		textView.setEllipsize(TextUtils.TruncateAt.END);
 		if (isWiki) {
 			textView.setMinLines(1);
-			textView.setMaxLines(5);
+			textView.setMaxLines(15);
 		}
 		textView.setText(text);
 		if (textColor > 0) {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java
index 8cab303e8f..a2ec16bd13 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java
@@ -3,7 +3,6 @@ package net.osmand.plus.mapcontextmenu.editors;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
-import android.content.res.Resources;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -11,6 +10,7 @@ import android.os.Bundle;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.FavouritesDbHelper;
+import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
@@ -21,9 +21,11 @@ public class FavoritePointEditorFragment extends PointEditorFragment {
 
 	private FavoritePointEditor editor;
 	private FavouritePoint favorite;
+	private FavoriteGroup group;
 	FavouritesDbHelper helper;
 
 	private boolean saved;
+	private int defaultColor;
 
 	@Override
 	public void onAttach(Activity activity) {
@@ -35,7 +37,12 @@ public class FavoritePointEditorFragment extends PointEditorFragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+
+		boolean light = getMyApplication().getSettings().isLightContent();
+		defaultColor = light ? R.color.icon_color : R.color.icon_color_light;
+
 		favorite = editor.getFavorite();
+		group = helper.getGroup(favorite);
 	}
 
 	@Override
@@ -52,6 +59,12 @@ public class FavoritePointEditorFragment extends PointEditorFragment {
 		}
 	}
 
+	@Override
+	public void setCategory(String name) {
+		group = helper.getGroup(name);
+		super.setCategory(name);
+	}
+
 	public static void showInstance(final MapActivity mapActivity) {
 		FavoritePointEditor editor = mapActivity.getFavoritePointEditor();
 		//int slideInAnim = editor.getSlideInAnimation();
@@ -71,8 +84,8 @@ public class FavoritePointEditorFragment extends PointEditorFragment {
 
 	@Override
 	protected void save(final boolean needDismiss) {
-		final FavouritePoint point = new FavouritePoint(favorite.getLatitude(), favorite.getLongitude(), getName(), getCategory());
-		point.setDescription(getDescription());
+		final FavouritePoint point = new FavouritePoint(favorite.getLatitude(), favorite.getLongitude(), getNameTextValue(), getCategoryTextValue());
+		point.setDescription(getDescriptionTextValue());
 		AlertDialog.Builder builder = FavouritesDbHelper.checkDuplicates(point, helper, getMapActivity());
 
 		if (favorite.getName().equals(point.getName()) &&
@@ -125,7 +138,6 @@ public class FavoritePointEditorFragment extends PointEditorFragment {
 
 	@Override
 	protected void delete(final boolean needDismiss) {
-		final Resources resources = this.getResources();
 		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 		builder.setMessage(getString(R.string.favourites_remove_dialog_msg, favorite.getName()));
 		builder.setNegativeButton(R.string.shared_string_no, null);
@@ -143,39 +155,41 @@ public class FavoritePointEditorFragment extends PointEditorFragment {
 	}
 
 	@Override
-	public String getHeaderText() {
+	public String getHeaderCaption() {
 		return getMapActivity().getResources().getString(R.string.favourites_edit_dialog_title);
 	}
 
 	@Override
-	public String getNameValue() {
+	public String getNameInitValue() {
 		return favorite.getName();
 	}
 
 	@Override
-	public String getCategoryValue() {
+	public String getCategoryInitValue() {
 		return favorite.getCategory();
 	}
 
 	@Override
-	public String getDescriptionValue() {
+	public String getDescriptionInitValue() {
 		return favorite.getDescription();
 	}
 
 	@Override
 	public Drawable getNameIcon() {
-		return FavoriteImageDrawable.getOrCreate(getMapActivity(), favorite.getColor(), getMapActivity().getMapView().getCurrentRotatedTileBox().getDensity());
+		int color = defaultColor;
+		if (group != null) {
+			color = group.color;
+		}
+		return FavoriteImageDrawable.getOrCreate(getMapActivity(), color, getMapActivity().getMapView().getCurrentRotatedTileBox().getDensity());
 	}
 
 	@Override
 	public Drawable getCategoryIcon() {
-		FavouritesDbHelper helper = getMyApplication().getFavorites();
-		FavouritesDbHelper.FavoriteGroup group = helper.getGroup(favorite);
+		int color = defaultColor;
 		if (group != null) {
-			return getIcon(R.drawable.ic_action_folder_stroke, group.color);
-		} else {
-			return null;
+			color = group.color;
 		}
+		return getIcon(R.drawable.ic_action_folder_stroke, color);
 	}
 
 	public Drawable getIcon(int resId, int color) {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
index 6c1ecee87b..129922fcf4 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
@@ -1,27 +1,25 @@
 package net.osmand.plus.mapcontextmenu.editors;
 
 import android.annotation.TargetApi;
-import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.Toolbar;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
 import android.widget.TextView;
 
 import net.osmand.plus.FavouritesDbHelper;
@@ -29,7 +27,7 @@ import net.osmand.plus.IconsCache;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.mapcontextmenu.editors.dialogs.SelectCategoryDialogFragment;
 import net.osmand.plus.widgets.AutoCompleteTextViewEx;
 import net.osmand.util.Algorithms;
 
@@ -99,16 +97,16 @@ public abstract class PointEditorFragment extends Fragment {
 		}
 
 		TextView headerCaption = (TextView) view.findViewById(R.id.header_caption);
-		headerCaption.setText(getHeaderText());
+		headerCaption.setText(getHeaderCaption());
 		TextView nameCaption = (TextView) view.findViewById(R.id.name_caption);
-		nameCaption.setText(getNameText());
+		nameCaption.setText(getNameCaption());
 		TextView categoryCaption = (TextView) view.findViewById(R.id.category_caption);
-		categoryCaption.setText(getCategoryText());
+		categoryCaption.setText(getCategoryCaption());
 
 		EditText nameEdit = (EditText) view.findViewById(R.id.name_edit);
-		nameEdit.setText(getNameValue());
+		nameEdit.setText(getNameInitValue());
 		AutoCompleteTextViewEx categoryEdit = (AutoCompleteTextViewEx) view.findViewById(R.id.category_edit);
-		categoryEdit.setText(getCategoryValue());
+		categoryEdit.setText(getCategoryInitValue());
 		categoryEdit.setThreshold(1);
 		final FavouritesDbHelper helper = getMyApplication().getFavorites();
 		List<FavouritesDbHelper.FavoriteGroup> gs = helper.getFavoriteGroups();
@@ -117,10 +115,29 @@ public abstract class PointEditorFragment extends Fragment {
 			list[i] =gs.get(i).name;
 		}
 		categoryEdit.setAdapter(new ArrayAdapter<>(getMapActivity(), R.layout.list_textview, list));
+		categoryEdit.setOnTouchListener(new View.OnTouchListener() {
+			@Override
+			public boolean onTouch(final View v, MotionEvent event) {
+				final EditText editText = (EditText) v;
+				final int DRAWABLE_RIGHT = 2;
+				if (event.getAction() == MotionEvent.ACTION_UP) {
+					if (event.getX() >= (editText.getRight()
+							- editText.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width()
+							- editText.getPaddingRight())) {
+
+						DialogFragment dialogFragment =
+								SelectCategoryDialogFragment.createInstance();
+						dialogFragment.show(getChildFragmentManager(), "SelectCategoryDialogFragment");
+						return true;
+					}
+				}
+				return false;
+			}
+		});
 
 		EditText descriptionEdit = (EditText) view.findViewById(R.id.description_edit);
-		if (getDescriptionValue() != null) {
-			descriptionEdit.setText(getDescriptionValue());
+		if (getDescriptionInitValue() != null) {
+			descriptionEdit.setText(getDescriptionInitValue());
 		}
 
 		ImageView nameImage = (ImageView) view.findViewById(R.id.name_image);
@@ -172,9 +189,15 @@ public abstract class PointEditorFragment extends Fragment {
 	}
 
 	public abstract PointEditor getEditor();
-
 	public abstract String getToolbarTitle();
 
+	public void setCategory(String name) {
+		AutoCompleteTextViewEx categoryEdit = (AutoCompleteTextViewEx) getView().findViewById(R.id.category_edit);
+		categoryEdit.setText(name);
+		ImageView categoryImage = (ImageView) getView().findViewById(R.id.category_image);
+		categoryImage.setImageDrawable(getCategoryIcon());
+	}
+
 	protected MapActivity getMapActivity() {
 		return (MapActivity)getActivity();
 	}
@@ -201,33 +224,33 @@ public abstract class PointEditorFragment extends Fragment {
 		}
 	}
 
-	public abstract String getHeaderText();
+	public abstract String getHeaderCaption();
 
-	public String getNameText() {
+	public String getNameCaption() {
 		return getMapActivity().getResources().getString(R.string.favourites_edit_dialog_name);
 	}
-	public String getCategoryText() {
+	public String getCategoryCaption() {
 		return getMapActivity().getResources().getString(R.string.favourites_edit_dialog_category);
 	}
 
-	public abstract String getNameValue();
-	public abstract String getCategoryValue();
-	public abstract String getDescriptionValue();
+	public abstract String getNameInitValue();
+	public abstract String getCategoryInitValue();
+	public abstract String getDescriptionInitValue();
 
 	public abstract Drawable getNameIcon();
 	public abstract Drawable getCategoryIcon();
 
-	public String getName() {
+	public String getNameTextValue() {
 		EditText nameEdit = (EditText) getView().findViewById(R.id.name_edit);
 		return nameEdit.getText().toString().trim();
 	}
 
-	public String getCategory() {
+	public String getCategoryTextValue() {
 		AutoCompleteTextViewEx categoryEdit = (AutoCompleteTextViewEx) getView().findViewById(R.id.category_edit);
 		return categoryEdit.getText().toString().trim();
 	}
 
-	public String getDescription() {
+	public String getDescriptionTextValue() {
 		EditText descriptionEdit = (EditText) getView().findViewById(R.id.description_edit);
 		String res = descriptionEdit.getText().toString().trim();
 		return Algorithms.isEmpty(res) ? null : res;
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/CategoryDialogs.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/CategoryDialogs.java
deleted file mode 100644
index 0f4c8ad517..0000000000
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/CategoryDialogs.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package net.osmand.plus.mapcontextmenu.editors.dialogs;
-
-public class CategoryDialogs {
-	
-}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/SelectCategoryDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/SelectCategoryDialogFragment.java
new file mode 100644
index 0000000000..e5622c5fa3
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/SelectCategoryDialogFragment.java
@@ -0,0 +1,95 @@
+package net.osmand.plus.mapcontextmenu.editors.dialogs;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.DialogFragment;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import net.osmand.plus.FavouritesDbHelper;
+import net.osmand.plus.IconsCache;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.mapcontextmenu.editors.PointEditorFragment;
+
+import java.util.List;
+
+public class SelectCategoryDialogFragment extends DialogFragment {
+
+	@NonNull
+	@Override
+	public Dialog onCreateDialog(Bundle savedInstanceState) {
+		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+		builder.setTitle(R.string.favorite_category_select);
+		final View v = getActivity().getLayoutInflater().inflate(R.layout.favorite_categories_dialog, null, false);
+
+		LinearLayout ll = (LinearLayout) v.findViewById(R.id.list_container);
+
+		final FavouritesDbHelper helper = ((OsmandApplication) getActivity().getApplication()).getFavorites();
+		List<FavouritesDbHelper.FavoriteGroup> gs = helper.getFavoriteGroups();
+		for (final FavouritesDbHelper.FavoriteGroup category : gs) {
+			View itemView = getActivity().getLayoutInflater().inflate(R.layout.favorite_category_dialog_item, null);
+			ImageView icon = (ImageView)itemView.findViewById(R.id.image_view);
+			if (category.color != 0) {
+				icon.setImageDrawable(getIcon(getActivity(), R.drawable.ic_action_folder, category.color));
+			} else {
+				icon.setImageDrawable(getIcon(getActivity(), R.drawable.ic_action_folder));
+			}
+			Button button = (Button)itemView.findViewById(R.id.button);
+			button.setText(category.name);
+			button.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					((PointEditorFragment) getParentFragment()).setCategory(category.name);
+					dismiss();
+				}
+			});
+			ll.addView(itemView);
+		}
+		View itemView = getActivity().getLayoutInflater().inflate(R.layout.favorite_category_dialog_item, null);
+		ImageView icon = (ImageView)itemView.findViewById(R.id.image_view);
+		icon.setImageDrawable(getIcon(getActivity(), R.drawable.map_zoom_in));
+		Button button = (Button)itemView.findViewById(R.id.button);
+		button.setText(getActivity().getResources().getText(R.string.favorite_category_add_new));
+		button.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				//((PointEditorFragment) getParentFragment()).setCategory(null);
+				//dismiss();
+			}
+		});
+		ll.addView(itemView);
+
+		builder.setView(v);
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
+
+		return builder.create();
+	}
+
+	public static SelectCategoryDialogFragment createInstance() {
+		return new SelectCategoryDialogFragment();
+	}
+
+	private static Drawable getIcon(final Activity activity, int iconId) {
+		OsmandApplication app = (OsmandApplication)activity.getApplication();
+		IconsCache iconsCache = app.getIconsCache();
+		boolean light = app.getSettings().isLightContent();
+		return iconsCache.getIcon(iconId,
+				light ? R.color.icon_color : R.color.icon_color_light);
+	}
+
+	private static Drawable getIcon(final Activity activity, int resId, int color) {
+		OsmandApplication app = (OsmandApplication)activity.getApplication();
+		Drawable d = app.getResources().getDrawable(resId).mutate();
+		d.clearColorFilter();
+		d.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+		return d;
+	}
+}

From 09f842832f462cf507bbda5ebf3ccafb7fa028da Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Tue, 29 Sep 2015 04:35:26 +0200
Subject: [PATCH 08/40] Translated using Weblate (Argentinean Spanish)

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

diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 6d778e55b8..43e99edefa 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2060,7 +2060,7 @@
 <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>
     <string name="downloads_left_template">Quedan %1$s descargas</string>
-<string name="shared_string_trip_recording">Grabando viaje</string>
+<string name="shared_string_trip_recording">Grabación de viaje</string>
     <string name="shared_string_navigation">Navegación</string>
     <string name="osmand_running_in_background">Ejecutando en segundo plano</string>
     <string name="favourites_edit_dialog_title">Información del favorito</string>

From bea15c446a2b878719f5c2b7745998e1a8bb3ec0 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 07:38:39 +0200
Subject: [PATCH 09/40] Translated using Weblate (Danish)

Currently translated at 100.0% (1744 of 1744 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 d25ffb40f4..30a4c04ca8 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -758,7 +758,7 @@
     <string name="si_km_m">Kilometer/meter</string>
     <string name="yard">yd</string>
     <string name="foot">fod</string>
-    <string name="mile_per_hour">mi/t</string>
+    <string name="mile_per_hour">mph</string>
     <string name="mile">mil</string>
     <string name="send_location_way_choose_title">Del placering ved hjælp af</string>
 	<string name="send_location_sms_pattern">Placering: %1$s
@@ -2150,12 +2150,12 @@
     <string name="si_mph">Mil i timen</string>
     <string name="si_m_s">Meter i sekundet</string>
     <string name="si_min_km">Minutter pr. kilometer</string>
-    <string name="si_min_m">Minutter per mil</string>
+    <string name="si_min_m">Minutter pr. mil</string>
     <string name="si_nm_h">Sømil i timen (knob)</string>
     <string name="nm_h">nmh</string>
-    <string name="min_mile">min/m</string>
+    <string name="min_mile">min/mil</string>
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>
     
-    <string name="default_speed_system_descr">Definer hastighedsmålesystem</string>
+    <string name="default_speed_system_descr">Vælg enheder</string>
     </resources>

From 608b9cef193277ef8b9141b8dd85cddcc8f522b4 Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Tue, 29 Sep 2015 05:43:22 +0200
Subject: [PATCH 10/40] Translated using Weblate (Swedish)

Currently translated at 99.1% (1730 of 1744 strings)
---
 OsmAnd/res/values-sv/strings.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index f8834fdb8f..55d94ba509 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -2005,4 +2005,16 @@
 <string name="favourites_edit_dialog_title">Information om favoriter</string>
     <string name="roads">Vägar</string>
 <string name="favourites_context_menu_add">Lägg till favorit</string>
-	</resources>
+	<string name="default_speed_system_descr">Ange system för hastighetsmätning</string>
+    <string name="default_speed_system">Hastighetsmätning</string>
+    <string name="si_nm">Sjömil</string>
+    <string name="si_kmh">Kilometer i timmen</string>
+    <string name="si_mph">Engelska mil i timmen</string>
+    <string name="si_m_s">Meter i sekunden</string>
+    <string name="si_min_km">Minuter per kilometer</string>
+    <string name="si_min_m">Minuter per engelsk mil</string>
+    <string name="si_nm_h">Sjömil i timmen (knop)</string>
+    <string name="shared_string_trip_recording">Trippinspelning</string>
+    <string name="shared_string_navigation">Navigering</string>
+    <string name="osmand_running_in_background">Körs i bakgrunden</string>
+    </resources>

From 5b95f1e1751cc2a366701ba18f242a82a7182c72 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Tue, 29 Sep 2015 12:06:50 +0300
Subject: [PATCH 11/40] Removed strings.xml.orig

---
 OsmAnd/res/values/strings.xml.orig | 2002 ----------------------------
 1 file changed, 2002 deletions(-)
 delete mode 100644 OsmAnd/res/values/strings.xml.orig

diff --git a/OsmAnd/res/values/strings.xml.orig b/OsmAnd/res/values/strings.xml.orig
deleted file mode 100644
index 70f9fd929c..0000000000
--- a/OsmAnd/res/values/strings.xml.orig
+++ /dev/null
@@ -1,2002 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <!--
-    	 Disclaimer:
-         If you are going to translate strings, please make sure:
-         1. There is no duplicate strings by name
-         2. Every apostrophe (quote) is preceded by a backslash (see others).
-         If you are making/correcting English translations make sure:
-         3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
-    PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
-    -->
-<<<<<<< HEAD
-    <string name="favorite_category_add_new">Add new</string>
-    <string name="favorite_category_select">Select category</string>
-=======
-    <string name="default_speed_system_descr">Define speed measurement system</string>
-    <string name="default_speed_system">Speed measurement</string>
-    <string name="nm">nm</string>
-    <string name="si_nm">Nautical miles</string>
-    <string name="si_kmh">Kilometers per hour</string>
-    <string name="si_mph">Miles per hour</string>
-    <string name="si_m_s">Meters per second</string>
-    <string name="si_min_km">Minutes per kilometer</string>
-    <string name="si_min_m">Minutes per mile</string>
-    <string name="si_nm_h">Nautical miles per hour (knot)</string>
-    <string name="nm_h">nmh</string>
-    <string name="min_mile">min/m</string>
-    <string name="min_km">min/km</string>
-    <string name="m_s">m/s</string>
-    
->>>>>>> ff881803a9a66267c564cd8bcbfb5d929cc25310
-    <string name="shared_string_trip_recording">Trip recording</string>
-    <string name="shared_string_navigation">Navigation</string>
-    <string name="osmand_running_in_background">Running in background</string>
-    <string name="gps_wake_up_timer">GPS wake-up interval</string>
-	<string name="favourites_edit_dialog_title">Favorite information</string>
-    <string name="simulate_your_location_stop_descr">Stop simulating your position</string>
-    <string name="simulate_your_location_descr">Simulate using recorded GPX or calculated route</string>
-    <string name="address_unknown">Address is not known yet</string>
-    <string name="av_locations_descr">GPX file with note locations</string>
-    <string name="av_locations">Locations</string>
-    <string name="plugin_settings">Plugins</string>
-	<string name="routing_attr_avoid_shuttle_train_name">Avoid shuttle train</string>
-	<string name="routing_attr_avoid_shuttle_train_description">Avoid shuttle train</string>
-    <string name="traffic_warning_hazard">Hazard</string>
-    <string name="rendering_value_boldOutline_name">Bold outline</string>
-    <string name="no_updates_available">No updates available</string>
-    <string name="download_live_updates">Live updates</string>
-	<string name="rendering_value_default13_name">Default (13)</string>
-	<string name="rendering_value_defaultTranslucentCyan_name">Default (translucent cyan)</string>
-    <string name="rendering_attr_currentTrackColor_name">GPX color</string>
-    <string name="rendering_attr_currentTrackWidth_name">GPX width</string>
-    <string name="rendering_value_red_name">Red</string>
-    <string name="rendering_value_translucent_red_name">Translucent red</string>
-    <string name="rendering_value_orange_name">Orange</string>
-    <string name="rendering_value_translucent_orange_name">Translucent orange</string>
-    <string name="rendering_value_yellow_name">Yellow</string>
-    <string name="rendering_value_translucent_yellow_name">Translucent yellow</string>
-    <string name="rendering_value_lightgreen_name">Light green</string>
-    <string name="rendering_value_translucent_lightgreen_name">Translucent light green</string>
-    <string name="rendering_value_green_name">Green</string>
-    <string name="rendering_value_translucent_green_name">Translucent green</string>
-    <string name="rendering_value_lightblue_name">Light blue</string>
-    <string name="rendering_value_translucent_lightblue_name">Translucent light blue</string>
-    <string name="rendering_value_blue_name">Blue</string>
-    <string name="rendering_value_translucent_blue_name">Translucent blue</string>
-    <string name="rendering_value_purple_name">Purple</string>
-    <string name="rendering_value_translucent_purple_name">Translucent purple</string>
-    <string name="restart_is_required">In order to fully apply the changes, a manual application restart is required.</string>
-    <string name="light_theme">Light</string>
-    <string name="dark_theme">Dark</string>
-    <string name="lang_pms">Piedmontese</string>
-    <string name="lang_bn">Bengali</string>
-    <string name="lang_tl">Tagalog</string>
-    <string name="lang_sh">Serbo-Croatian</string>
-    <string name="lang_az">Azeri</string>
-    <string name="lang_br">Breton</string>
-    <string name="lang_sq">Albanian</string>
-    <string name="lang_is">Icelandic</string>
-    <string name="lang_bpy">Bishnupriya</string>
-    <string name="lang_nv">Navajo</string>
-    <string name="lang_ga">Irish</string>
-    <string name="lang_la">Latin</string>
-    <string name="lang_ku">Kurdish</string>
-    <string name="lang_ta">Tamil</string>
-    <string name="lang_ml">Malayalam</string>
-    <string name="lang_lb">Luxembourgish</string>
-    <string name="lang_os">Ossetian</string>
-    <string name="lang_eo">Esperanto</string>
-    <string name="lang_es_ar">Argentinean Spanish</string>
-    <string name="lang_nb">Norwegian Bokmål</string>
-    <string name="lang_vo">Volapuk</string>
-    <string name="lang_th">Thai</string>
-    <string name="lang_te">Telugu</string>
-    <string name="lang_nn">Norwegian (Nynorsk)</string>
-    <string name="lang_new">Newar / Nepal Bhasa</string>
-    <string name="lang_ms">Malaysian</string>
-    <string name="lang_ht">Haitian</string>
-    <string name="lang_gl">Galician</string>
-    <string name="lang_et">Estonian</string>
-    <string name="lang_ceb">Cebuano</string>
-    <string name="archive_wikipedia_data">You have old incompatible Wikipedia data downloaded. Do you want to archive it?</string>
-    <string name="download_wikipedia_files">Do you want to download additional Wikipedia data (%1$s MB) ?</string>
-    <string name="gps_network_not_enabled">Location service is not enabled. Do you want to turn it on?</string>
-    <string name="disable_recording_once_app_killed">Prevent standalone logging</string>
-    <string name="disable_recording_once_app_killed_descrp">Will pause GPX logging when the app is killed (via recent apps). (OsmAnd background indication disappears from the Android notification bar.)</string>
-    <string name="shared_string_import2osmand">Import to OsmAnd</string>
-    <string name="read_full_article">Read full article (online)</string>
-    <string name="shared_string_wikipedia">Wikipedia</string>
-    <string name="local_indexes_cat_wiki">Wikipedia</string>
-    <string name="shared_string_show_details">Show details</string>
-    <string name="osm_edit_context_menu_delete">Delete OSM Edit</string>
-    <string name="rendering_value_disabled_name">Disabled</string>
-    <string name="rendering_value_walkingRoutesScopeOSMC_name">Coloring according to route scope</string>
-    <string name="rendering_value_walkingRoutesOSMC_name">Coloring according to OSMC</string>
-    <string name="osmo_share_my_location">Share my location</string>
-    <string name="shared_string_logoff">Log Off</string>
-    <string name="rendering_attr_hideHouseNumbers_name">Hide house numbers</string>
-    <string name="application_dir_change_warning3">Do you want OsmAnd to also copy its data files to the new destination?</string>
-    <string name="specified_directiory_not_writeable">Maps could not be created in specified directory</string>
-    <string name="copying_osmand_file_failed">Copying files failed</string>
-    <string name="storage_directory_external">External storage</string>
-    <string name="storage_directory_multiuser">Multiuser storage</string>
-    <string name="storage_directory_internal_app">Internal application memory</string>
-    <string name="storage_directory_manual">Manually specified</string>
-    <string name="storage_directory_default">Internal memory</string>
-    <string name="application_dir">Data storage folder</string>
-    <string name="storage_directory">Map Storage</string>
-    <string name="shared_string_copy">Copy</string>
-    <string name="filter_poi_hint">Filter by name</string>
-    <string name="search_poi_category_hint">Type to search all</string>
-    <string name="shared_string_open">Open</string>
-    <string name="rendering_attr_OSMMapperAssistant_name">OSM mapper assistant</string>
-	<string name="agps_info">A-GPS info</string>
-	<string name="shared_string_manage">Manage</string>
-	<string name="shared_string_edit">Edit</string>
-	<string name="shared_string_places">Places</string>
-	<string name="shared_string_search">Search</string>
-	<string name="shared_string_show_description">Show description</string>
-	<string name="shared_string_message">Message</string>
-	<string name="agps_data_last_downloaded">A-GPS data last downloaded: %1$s</string>
-    <string name="confirm_usage_speed_cameras">In many countries (Germany, France, Italy, and others) the use of speed camera warnings is not permitted by law. OsmAnd does not assume any liability if you violate the law. Please click yes only if you are eligible to use this feature.</string>
-	<string name="welmode_download_maps">Download maps</string>
-	<string name="welcome_select_region">To correctly reflect your traffic signs and regulations, please select your driving region:</string>
-	<string name="welcome_text">OsmAnd provides global offline map browsing, and global offline navigation!</string>
-	<string name="welcome_header">Welcome</string>
-    <string name="current_route">Current route</string>
-    <string name="osm_changes_added_to_local_edits">OSM changes added to local changeset</string>
-   	<string name="mark_to_delete">Mark to delete</string>
-	<string name="osmo_grop_name_length_alert">Group name should be at least 3 characters long!</string>
-	<string name="local_recordings_delete_all_confirm">You are going to delete %1$d notes. Are you sure?</string>
-	<string name="local_osm_changes_upload_all_confirm">You are going to upload %1$d changes to OSM. Are you sure?</string>
-    <string name="confirmation_to_clear_history">Do you want to clear the history?</string>
-    <string name="delay_to_start_navigation_descr">Specify wait time to remain on the route planning screen</string>
-    <string name="delay_to_start_navigation">Start turn-by-turn navigation after…</string>
-    <string name="shared_string_go">Go</string>
-	<string name="osmand_parking_overdue">overdue</string>
-	<string name="action_create">Action create</string>
-	<string name="action_modify">Action modify</string>
-	<string name="action_delete">Action delete</string>
-	<string name="osm_edits">OSM edits</string>
-	<!-- means first letter of word *hour* -->
-	<string name="osmand_parking_hour">h</string>
-	<!-- means first letter of word *minute*-->
-	<string name="osmand_parking_minute">min</string>
-	<string name="parking_place_limited">Parking time limited to</string>
-	<!-- used to describe time left, not left direction -->
-	<string name="osmand_parking_time_left">left</string>
-	<string name="your_edits">Your edits</string>
-    <string name="waypoint_visit_after">Visit after</string>
-    <string name="waypoint_visit_before">Visit before</string>
-    <string name="simulate_your_location">Simulate your position</string>
-    <string name="drawer">Flat list</string>
-    <string name="short_location_on_map">Lat %1$s\n Lon %2$s</string>
-    <string name="tips_and_tricks_descr">Frequently asked questions, recent changes, and others</string>
-    <string name="routing_settings_2">Navigation settings</string>
-    <string name="general_settings_2">General settings</string>
-	<string name="shared_string_ellipsis">…</string>
-	<string name="shared_string_ok">OK</string>
-	<string name="shared_string_cancel">Cancel</string>
-	<string name="shared_string_dismiss">Dismiss</string>
-	<string name="shared_string_yes">Yes</string>
-	<string name="shared_string_do_not_use">Do not use</string>
-	<string name="shared_string_no">No</string>
-	<string name="shared_string_on">On</string>
-	<string name="shared_string_off">Off</string>
-	<string name="shared_string_previous">Previous</string>
-	<string name="shared_string_next">Next</string>
-	<string name="shared_string_enable">Enable</string>
-	<string name="shared_string_disable">Disable</string>
-	<string name="shared_string_enabled">Enabled</string>
-	<string name="shared_string_disabled">Disabled</string>
-	<string name="shared_string_selected">Selected</string>
-	<string name="shared_string_selected_lowercase">selected</string>
-	<string name="shared_string_never">Never</string>
-	<string name="shared_string_none">None</string>
-	<string name="shared_string_and">and</string>
-	<string name="shared_string_or">or</string>
-	<string name="shared_string_help">Help</string>
-	<string name="shared_string_settings">Settings</string>
-	<string name="shared_string_history">History</string>
-	<string name="shared_string_select_on_map">Select on map</string>
-	<string name="shared_string_select_all">Select all</string>
-	<string name="shared_string_deselect">Deselect</string>
-	<string name="shared_string_deselect_all">Deselect all</string>
-	<string name="shared_string_clear">Clear</string>
-	<string name="shared_string_clear_all">Clear all</string>
-	<string name="shared_string_save">Save</string>
-	<string name="shared_string_save_as_gpx">Save as GPX track</string>
-	<string name="shared_string_rename">Rename</string>
-	<string name="shared_string_delete">Delete</string>
-	<string name="shared_string_delete_all">Delete all</string>
-	<string name="shared_string_share">Share</string>
-	<string name="shared_string_apply">Apply</string>
-	<string name="shared_string_control_start">Start</string>
-	<string name="shared_string_control_stop">Stop</string>
-	<string name="shared_string_import">Import</string>
-	<string name="shared_string_export">Export</string>
-	<string name="shared_string_more">More…</string>
-	<string name="shared_string_more_actions">More actions</string>
-	<string name="shared_string_do_not_show_again">Do not show again</string>
-	<string name="shared_string_remember_my_choice">Remember my choice</string>
-	<string name="shared_string_refresh">Refresh</string>
-	<string name="shared_string_download">Download</string>
-	<string name="shared_string_downloading">Downloading</string>
-	<string name="shared_string_download_successful">Download successful</string>
-	<string name="shared_string_io_error">I/O error occurred</string>
-	<string name="shared_string_unexpected_error">Unexpected error occurred</string>
-	<string name="shared_string_action_template">Action {0}</string>
-	<string name="shared_string_close">Close</string>
-	<string name="shared_string_exit">Exit</string>
-	<string name="shared_string_show">Show</string>
-	<string name="shared_string_show_all">Show all</string>
-	<string name="shared_string_collapse">Collapse</string>
-	<string name="shared_string_show_on_map">Show on map</string>
-	<string name="shared_string_map">Map</string>
-	<string name="shared_string_favorite">Favorite</string>
-	<string name="shared_string_favorites">Favorites</string>
-	<string name="shared_string_address">Address</string>
-	<string name="shared_string_add">Add</string>
-	<string name="shared_string_add_to_favorites">Add to Favorites</string>
-	<string name="shared_string_my_location">My Location</string>
-	<string name="shared_string_my_places">My Places</string>
-	<string name="shared_string_my_favorites">My Favorites</string>
-	<string name="shared_string_my_tracks">My Tracks</string>
-	<string name="shared_string_currently_recording_track">Currently recording track</string>
-	<string name="shared_string_audio">Audio</string>
-	<string name="shared_string_video">Video</string>
-	<string name="shared_string_photo">Photo</string>
-	<string name="route_points">Route points</string>
-	<string name="track_segments">Track segments</string>
-	<string name="track_points">Track points</string>
-	<string name="online_map_settings">Online maps</string>
-	<string name="osmand_rastermaps_plugin_description">With this plugin you can access many types of online (so called tile or raster) maps, from predefined Openstreetmap tiles (like Mapnik) to satellite images and special purpose layers like weather maps, climate maps, geological maps, hillshade layers, etc.
-		\n\nAny of these maps can either be used as the main (base) map to be displayed on the OsmAnd map screen, or as an overlay or underlay to another base map (like OsmAnd\'s regular offline maps). In order to make any underlay map more visible, certain elements of the OsmAnd vector maps can easily be hidden via the \'Configure map\' menu as desired.
-		\n\nTile maps can be obtained directly via online sources, or can be prepared for offline use (and manually copied to OsmAnd\'s data folder) as an sqlite database which can be produced by a variety of 3rd party map preparation tools.
-	</string>
-	<string name="record_plugin_name">Trip recording</string>
-	<string name="record_plugin_description">This plugin activates the functionality to record and save your tracks by manually touching the GPX logging widget on the map screen, or also to automatically log all of your navigation routes to a GPX file.
-		\n\nRecorded tracks can be shared with your friends or be used for OSM contributions. Athletes can use recorded tracks to monitor their trainings. Some basic track analysis can be performed directly in OsmAnd, like lap times, average speed etc., and tracks can of course also later be analyzed in special 3rd party analysis tools.
-	</string>
-	<string name="osmo_plugin_name">OsMo (OSM Monitoring)</string>
-	<string name="osmo_plugin_description">This Plugin provides the functionality of the so-called OsMo advanced live monitoring, see http://osmo.mobi.
-		\n\nYou can track all devices of a participating group in real time, and communicate with each other. Comes with various options for session tracking or permanent tracking.
-		\n\nAnonymous groups can be created spontaneously for a specified number of days and are limited to defined features, i.e. there is no remote control and no group administrator.
-		Fully functional groups, on the other hand, can be created on the website and only registered users have access to them.
-	</string>
-	<string name="srtm_paid_version_title">Contour lines plugin</string>
-	<string name="osmand_srtm_short_description_80_chars">OsmAnd plugin for offline contour lines</string>
-	<string name="osmand_srtm_long_description_1000_chars">This plugin provides both a contour line overlay and a (relief) hillshade layer to be displayed on top of OsmAnd\'s offline maps. This functionality will be much appreciated by athletes, hikers, trekkers, and anybody interested in the relief structure of a landscape.
-		\n\nThe global data (between 70 degrees north and 70 degrees south) is based on measurements by SRTM (Shuttle Radar Topography Mission) and ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), an imaging instrument onboard Terra, the flagship satellite of NASA\'s Earth Observing System. ASTER is a cooperative effort between NASA, Japan\'s Ministry of Economy, Trade and Industry (METI), and Japan Space Systems (J-spacesystems).
-	</string>
-	<string name="srtm_plugin_name">Contour Lines</string>
-	<string name="srtm_plugin_description">This plugin provides both a contour line overlay and a (relief) hillshade layer to be displayed on top of OsmAnd\'s offline maps. This functionality will be much appreciated by athletes, hikers, trekkers, and anybody interested in the relief structure of a landscape.
-		\n\nThe global data (between 70 degrees north and 70 degrees south) is based on measurements by SRTM (Shuttle Radar Topography Mission) and ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), an imaging instrument onboard Terra, the flagship satellite of NASA\'s Earth Observing System. ASTER is a cooperative effort between NASA, Japan\'s Ministry of Economy, Trade and Industry (METI), and Japan Space Systems (J-spacesystems).
-	</string>
-	<string name="plugin_touringview_name">Touring map view</string>
-	<string name="plugin_touringview_descr">Activating this view changes OsmAnd\'s map style to \'Touring view\', this is a special high-detail view for travelers and professional drivers.
-		\n\nThis view provides, at any given map zoom, the maximum amount of travel details available in the map data (particularly roads, tracks, paths, and orientation marks).
-		\n\nIt also clearly depicts all types of roads unambiguously by color coding, which is useful when e.g. driving large vehicles.
-		\n\nAnd it provides special touring options like showing bicycle routes or Alpine mountain routes.
-		\n\nA special map download is not needed, the view is created from our standard maps.
-		\n\nThis view can be reverted by either de-activating it again here, or by changing the \'Map style\' under \'Configure map\' as desired.
-	</string>
-	<string name="plugin_nautical_name">Nautical map view</string>
-	<string name="plugin_nautical_descr">This plugin enriches the OsmAnd map and navigation app to also produce nautical maps for boating, sailing, and other types of watersports.
-		\n\nA special map add-on for OsmAnd will provide all nautical navigation marks and chart symbols, for inland  as well as for nearshore navigation. The description of each navigation mark provides the details needed to identify them and their meaning (category, shape, color, sequence, reference, etc.).
-		\n\nTo return to one of OsmAnd\'s conventional map styles, simply either de-activate this plugin again, or change the \'Map style\' under \'Configure map\' as desired.
-	</string>
-	<string name="plugin_ski_name">Ski map view</string>
-	<string name="plugin_ski_descr">This plugin for OsmAnd puts at your fingertips details of global downhill ski slopes, cross country ski runs, Alpine ski routes, cable cars and ski lifts. Routes and pistes are shown color-coded by difficulty, and depicted in a special \'Winter\' map style which assimilates a snow-colored winter landscape.
-		\n\nActivating this view changes the map style to \'Winter and ski\', showing all landscape features under wintry conditions. This view can be reverted by either de-activating it again here, or by changing the \'Map style\' under \'Configure map\' as desired.
-	</string>
-	<string name="audionotes_plugin_name">Audio/video notes</string>
-	<string name="audionotes_plugin_description">The Audio/video notes plugin provides the functionality to take audio/photography/video notes during a trip, using either a button on the map screen, or directly the context menu for any position on the map.</string>
-	<string name="osmand_parking_plugin_name">Parking Position</string>
-	<string name="osmand_parking_plugin_description">The parking position plugin lets you memorize when your car is parked and how much parking time is left (if there is a time limit).
-	\nBoth the location and time are visible on the OsmAnd dashboard as well as in widget on the map screen. An alarm can be added to the Android calendar as a reminder.</string>
-	<string name="osmand_distance_planning_plugin_name">Distance calculator &amp; planning tool</string>
-	<string name="osmand_distance_planning_plugin_description">This plugin provides a map screen widget allowing to create paths by tapping on the map, or use or modify existing GPX files, to plan a trip and measure the distance between points. The results can be saved as a GPX file, which can later be used for guidance.</string>
-	<string name="accessibility_preferences">Accessibility</string>
-	<string name="osmand_accessibility_description">This plugin makes the device\'s accessibility features available directly in OsmAnd. It facilitates e.g. adjusting the speech rate for TTS voices, configuring directional-pad screen navigation, using a trackball for zoom control, or using text-to-speech feedback, like for auto announcing your position.</string>
-	<string name="osm_settings">OSM editing</string>
-	<string name="osm_editing_plugin_description">Via this plugin OsmAnd can be used to make OSM contributions like creating or modifying OSM POI objects, opening or commenting OSM bugs, and contributing recorded GPX files. OSM is a community driven, global public domain mapping project. For details please refer to http://openstreetmap.org. Active participation is appreciated, and contributions can be made directly from OsmAnd, if you specify your personal OSM credentials in the app.</string>
-	<string name="osmand_development_plugin_description">This plugin displays settings for development and debugging features like to test or simulate routing, the screen rendering performance, or voice prompting. These settings are intended for developers and are not needed for the general user.</string>
-	<string name="debugging_and_development">OsmAnd development</string>
-	<string name="rename_failed">Rename failed.</string>
-	<string name="days_behind">days behind</string>
-	<string name="back_to_map">Back to map</string>
-	<string name="share_note">Share note</string>
-    <string name="location_on_map">Location:\n Lat %1$s\n Lon %2$s</string>
-	<string name="watch">Watch</string>
-	<string name="notes">Notes</string>
-	<string name="online_map">Online map</string>
-	<string name="roads_only">Roads only</string>
-    <string name="rendering_attr_pisteRoutes_name">Ski slopes</string>
-	<string name="free">Free %1$s </string>
-	<string name="device_memory">Device memory</string>
-    <string name="rendering_attr_pisteGrooming_name">Piste grooming</string>
-    <string name="world_ski_missing">In order to display ski maps, the special offline map needs to be downloaded</string>
-    <string name="nautical_maps_missing">In order to display nautical maps, the special offline map needs to be downloaded</string>
-	<string name="edit_group">Edit group</string>
-    <string name="parking_place">Parking place</string>
-    <string name="remove_the_tag">REMOVE THE TAG</string>
-    <string name="gps_status">GPS status</string>
-    <string name="version_settings_descr">Download nightly builds</string>
-    <string name="version_settings">Builds</string>
-    <string name="rendering_attr_streetLighting_name">Street lighting</string>
-    <string name="proxy_pref_title">Proxy</string>
-    <string name="proxy_pref_descr">Setup a proxy internet communication</string>
-    <string name="settings_privacy">Privacy</string>
-    <string name="points">Points</string>
-	<string name="navigation_over_track">Start navigation along track?</string>
-	<string name="avoid_roads_msg">You can trigger an alternative route by selecting roads to avoid</string>
-	<string name="speak_pedestrian">Pedestrian crosswalks</string>
-    <string name="rendering_attr_roadStyle_name">Road style</string>
-    <string name="rendering_value__name">Default</string>
-    <string name="rendering_value_default_name">Default</string>
-    <string name="rendering_value_germanRoadAtlas_name">German road atlas</string>
-    <string name="rendering_value_highContrastRoads_name">High contrast roads</string>
-	<string name="traffic_warning_railways">Railroad crossing</string>
-	<string name="traffic_warning_pedestrian">Pedestrian crosswalk</string>
-	<string name="show_railway_warnings">Show railroad crossings</string>
-	<string name="show_pedestrian_warnings">Show pedestrian crosswalks</string>
-    <string name="rendering_value_americanRoadAtlas_name">American road atlas</string>
-    <string name="routing_attr_no_new_routing_name">No v1.9 routing rules</string>
-    <string name="routing_attr_no_new_routing_description">Do not use routing rules introduced in v1.9</string>
-    <string name="dash_download_msg_none">Do you want to download offline maps?</string>
-    <string name="dash_download_msg">You have downloaded %1$s maps</string>
-    <string name="dash_download_new_one">Download new map</string>
-    <string name="dash_download_manage">Manage</string>
-    <string name="map_locale">Map language</string>
-    <string name="rendering_attr_transportStops_name">Transport stops</string>
-
-    <string name="navigate_point_zone">Zone</string>
-    <string name="navigate_point_northing">Northing</string>
-    <string name="navigate_point_easting">Easting</string>
-    <string name="download_tab_downloads">All Downloads</string>
-    <string name="download_tab_updates">Updates</string>
-    <string name="download_tab_local">Local</string>
-	<string name="no_internet_connection">Downloading not possible, please check your Internet connection.</string>
-    <string name="everything_up_to_date">All files up to date</string>
-    <string name="use_opengl_render">Use OpenGL rendering</string>
-    <string name="use_opengl_render_descr">Use hardware accelerated OpenGL rendering (may not work on some devices)</string>
-    <string name="error_avoid_specific_road">No bypass found</string>
-    <string name="home_button">Home</string>
-    <string name="osmo_use_https_descr">Use secure connection to server</string>
-    <string name="osmo_use_https">Use HTTPS</string>
-	<string name="map_update">Updates available for %1$s maps</string>
-	<string name="search_for">Search for</string>
-	<string name="coordinates">Coordinates</string>
-	<string name="rendering_attr_publicTransportMode_name">Bus, trolleybus, shuttle routes</string>
-	<string name="rendering_attr_tramTrainRoutes_name">Tram and train routes</string>
-	<string name="rendering_attr_subwayMode_name">Subway routes</string>
-    <string name="lock_screen_request_explanation">%1$s needs this permission to turn off the screen for the power saving feature.</string>
-    <string name="wake_on_voice">Turn screen on</string>
-    <string name="wake_on_voice_descr">Turn on device screen (if off) when approaching a turn</string>
-    <string name="impassable_road">Avoid roads…</string>
-    <string name="rendering_attr_trainLightrailRoutes_name">Train routes</string>
-    <string name="rendering_attr_tramRoutes_name">Tram routes</string>
-    <string name="rendering_attr_shareTaxiRoutes_name">Share taxi routes</string>
-    <string name="rendering_attr_trolleybusRoutes_name">Trolleybus routes</string>
-    <string name="rendering_attr_busRoutes_name">Bus routes</string>
-    <string name="rendering_category_hide">Hide</string>
-    <string name="rendering_category_routes">Routes</string>
-    <string name="rendering_category_details">Details</string>
-    <string name="rendering_category_transport">Transport</string>
-    <string name="rendering_category_others">Other map attributes</string>
-    <string name="map_widget_appearance_rem">Remaining elements</string>
-    <string name="map_widget_vector_attributes">Rendering attributes</string>
-    <string name="map_widget_top">Status bar</string>
-	<string name="map_widget_right">Right panel</string>
-	<string name="map_widget_left">Left panel</string>
-	<string name="configure_map">Configure map</string>
-    <string name="search_radius_proximity">In proximity of</string>
-    <string name="osmo_device_not_found">Device not found</string>
-    <string name="osmo_no_connection_msg">OsMo service is not available:\n- check the connection;\n- check the settings;\n- check out our Twitter: https://twitter.com/OsMomobi</string>
-    <string name="anonymous_user_hint">An anonymous user can not:\n- create groups;\n- synchronize groups and devices with the server;\n- manage groups and devices in a private office.</string>
-    <string name="anonymous_user">Anonymous user</string>
-    <string name="logged_as">Logged in as %1$s</string>
-	<string name="speed_limit_exceed">Speed limit tolerance</string>
-	<string name="speed_limit_exceed_message">Select speed limit tolerance margin, above which you will receive a voice warning.</string>
-	<string name="fav_point_emoticons_message">The favorite point name has been modified to %1$s to facilitate properly saving the string with emoticons to a file.</string>
-    <string name="print_route">Print route</string>
-    <string name="fav_point_dublicate">Favorite point name duplicate</string>
-    <string name="fav_point_dublicate_message">Specified favorite name already in use, was changed to %1$s to avoid duplication.</string>
-    <string name="text_size_descr">Set the text size on the map.</string>
-    <string name="text_size">Text size</string>
-    <string name="traffic_warning_speed_limit">Speed limit</string>
-    <string name="traffic_warning_border_control">Border control</string>
-    <string name="traffic_warning_payment">Toll booth</string>
-    <string name="traffic_warning_stop">Stop sign</string>
-    <string name="traffic_warning_calming">Traffic calming</string>
-    <string name="traffic_warning_speed_camera">Speed camera</string>
-    <string name="traffic_warning">Traffic warning</string>
-	<string name="speak_favorites">Nearby Favorites</string>
-	<string name="speak_poi">Nearby POI</string>
-	<string name="way_alarms">Traffic warnings</string>
-	<string name="background_service_is_enabled_question">OsmAnd background service is still running. Do you want to interrupt it, too?</string>
-	<string name="sleep_mode_stop_dialog">Interrupt GPS background mode?</string>
-	<string name="stop_navigation_service">Interrupt</string>
-	<string name="confirm_every_run">Always ask</string>
-	<string name="save_global_track_interval_descr">Choose logging interval for the general track recording (enabled via the GPX logging widget on the map)</string>
-	<string name="save_global_track_interval">General logging interval</string>
-	<string name="background_service_int">GPS Wake-up interval</string>
-	<string name="enable_sleep_mode">Enable GPS background mode</string>
-	<string name="save_track_to_gpx_globally">Log track to GPX file</string>
-	<string name="save_track_to_gpx_globally_headline">On demand track logging</string>
-	<string name="save_track_to_gpx_globally_descr">General position logging to a GPX file can be turned on or off using the GPX logging widget on the map screen</string>
-	<string name="save_current_track_descr">Save current track to SD now</string>
-	<string name="save_current_track">Save current GPX track</string>
-	<string name="save_track_to_gpx">Log track to GPX file during navigation</string>
-	<string name="save_track_to_gpx_descrp">Tracks will be saved to the tracks folder during navigation</string>
-	<string name="save_track_interval_globally">Logging interval</string>
-	<string name="save_track_interval">Logging interval during navigation</string>
-	<string name="save_track_interval_descr">Choose logging interval for track recording during navigation</string>
-	<string name="voice_provider_descr">Select voice guidance for navigation</string>
-	<string name="voice_provider">Voice guidance</string>
-
-	<string name="enable_proxy_title">Enable HTTP Proxy</string>
-	<string name="enable_proxy_descr">Configure HTTP Proxy for all network requests</string>
-	<string name="proxy_host_title">Proxy Host</string>
-	<string name="proxy_host_descr">Configure your proxy\'s hostname (e.g. 127.0.0.1)</string>
-	<string name="proxy_port_title">Proxy Port</string>
-	<string name="proxy_port_descr">Configure your proxy\'s port number (e.g. 8118)</string>
-    <string name="monitoring_settings">Trip recording</string>
-    <string name="monitoring_settings_descr">Configure how to record your trips</string>
-    <string name="int_hour">h</string>
-    <string name="duration">Duration</string>
-    <string name="distance">Distance</string>
-    <string name="index_tours">Tours</string>
-    <string name="shared_string_all">All</string>
-    <string name="waypoints">Waypoints</string>
-    <string name="targets">Destinations</string>
-    <string name="announce_gpx_waypoints">GPX waypoints</string>
-    <string name="download_additional_maps">Download missing maps %1$s (%2$d MB)?</string>
-    <string name="rendering_value_browse_map_name">Browse map</string>
-    <string name="rendering_value_car_name">Car</string>
-    <string name="rendering_value_bicycle_name">Bicycle</string>
-    <string name="rendering_value_pedestrian_name">Pedestrian</string>
-    <string name="rendering_attr_coloredBuildings_name">Color-code buildings by type</string>
-    <string name="osmo_invite">Invite…</string>
-    <string name="osmo_leave_confirmation_msg">Do you want to leave group %1$s?</string>
-    <string name="osmo_specify_tracker_id">Please specify id</string>
-    <string name="continue_navigation">Continue Navigation</string>
-    <string name="pause_navigation">Pause Navigation</string>
- 	<string name="keep_navigation_service">Keep</string>
-	<string name="map_preferred_locale_descr">Preferred language for labels on the map (if it is not available will switch to English or to local names)</string>
-    <string name="map_preferred_locale">Map preferred language</string>
-    <string name="local_map_names">Local names</string>
-    <string name="lang_sw">Swahili</string>
-    <string name="lang_he">Hebrew</string>
-    <string name="forward">Forward</string>
-    <string name="home">Dashboard</string>
-    <string name="live_monitoring_m_descr">Send tracking data to a specified web service if GPX logging is enabled.</string>
-	<string name="live_monitoring_m">Online tracking (GPX required)</string>
-    <string name="live_monitoring_start">Start online tracking</string>
-	<string name="live_monitoring_stop">Stop online tracking</string>
-	<string name="gpx_monitoring_start">Start GPX logging</string>
-	<string name="gpx_monitoring_stop">Stop GPX logging</string>
-    <string name="gpx_start_new_segment">Start new segment</string>
-    <string name="rendering_attr_hideBuildings_name">Hide buildings</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Hide non-vehicle highways</string>
-    <string name="rendering_attr_hideText_name">Hide text</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Hide wood and scrubs</string>
-    <string name="rendering_attr_buildings15zoom_name">Buildings on zoom 15</string>
-    <string name="rendering_attr_moreDetailed_name">More details</string>
-    <string name="rendering_attr_lessDetailed_name">Fewer details</string>
-    <string name="rendering_attr_hideAccess_name">Hide access restrictions</string>
-    <string name="rendering_attr_showAccess_name">Show access restrictions</string>
-    <string name="rendering_attr_showSurfaceGrade_name">Show road quality</string>
-    <string name="rendering_attr_showSurfaces_name">Show road surface</string>
-    <string name="rendering_attr_showCycleRoutes_name">Show cycle routes</string>
-    <string name="osmo_auth_error_short">Authorization failed</string>
-    <string name="osmo_auth_error">OsMo authorization error encountered : %1$s.\n
-        It could be a temporary service down or your registration expired.\n
-        Do you want to proceed with new registration?</string>
-    <string name="osmo_group_by_invite">Enter by invite</string>
-    <string name="osmo_group_information_desc">
-        - All created groups are public! If you want to be anonymous, connect devices directly via Tracker ids.\n
-        - Private groups are limited to 8 persons \n
-        - In case of inactivity or only 1 person activity for 2 weeks, group will be deleted.\n
-        - You can restrict group entrance, as only by invite, but to control group you need to go to admin console.\n
-        - If you need to create a group, but with other conditions please contact http://osmo.mobi</string>
-    <string name="osmo_group_information">Please read before creating a group!</string>
-    <string name="osmo_not_signed_in">OsMo login failed</string>
-    <string name="osmo_gpx_points_downloaded">OsMo points %1$s downloaded.</string>
-    <string name="osmo_auto_connect_descr">Automatically connect to the service after application startup</string>
-    <string name="osmo_auto_connect">Auto-connect</string>
-    <string name="osmo_start_service">OsMo service</string>
-    <string name="osmo_gpx_track_downloaded">OsMo track %1$s downloaded.</string>
-    <string name="no_index_file_to_download">Downloads not found, please check your Internet connection.</string>
-    <string name="select_index_file_to_download">Nothing was found. If you can\'t find your region, you can make it yourself (see http://osmand.net).</string>
-    <string name="none_selected_gpx">No GPX files selected. In order to select press and hold on available track.</string>
-    <string name="local_index_select_gpx_file">Select to show</string>
-    <string name="gpx_split_interval">Split interval</string>
-    <string name="sort_by_distance">Sort by distance</string>
-    <string name="sort_by_name">Sort by name</string>
-    <string name="show_zoom_buttons_navigation_descr">Show zoom buttons during navigation</string>
-    <string name="show_zoom_buttons_navigation">Show zoom buttons</string>
-    <string name="save_as_favorites_points">Save as group of favorites</string>
-    <string name="select_destination_and_intermediate_points">Select waypoints</string>
-    <string name="layer_amenity_label">Point labels</string>
-    <string name="loading_smth">Loading %1$s…</string>
-    <string name="map_widget_plain_time">Current time</string>
-    <string name="gpx_wpt">Waypoint</string>
-    <string name="selected_gpx_info_show">\n\nPress and hold to see on map</string>
-    <string name="delay_navigation_start">Start turn-by-turn guidance automatically</string>
-    <string name="local_index_gpx_info_show">\n\nPress and hold for options</string>
-	<string name="gpx_info_subtracks">Subtracks: %1$s </string>
-	<string name="gpx_info_waypoints">Waypoints: %1$s </string>
-	<string name="gpx_info_distance">Distance: %1$s (%2$s points) </string>
-	<string name="gpx_info_start_time">Start time: %1$tF,  %1$tT </string>
-	<string name="gpx_info_end_time">End time: %1$tF,  %1$tT </string>
-	<string name="gpx_info_average_speed">Average speed: %1$s </string>
-	<string name="gpx_info_maximum_speed">Maximum speed: %1$s </string>
-	<string name="gpx_info_avg_altitude">Average altitude: %1$s</string>
-	<string name="gpx_info_diff_altitude">Altitude range: %1$s</string>
-	<string name="gpx_info_asc_altitude">Descent/ascent: %1$s</string>
-    <string name="gpx_timespan">Time span: %1$s</string>
-	<string name="gpx_timemoving">Time moving: %1$s</string>
-    <string name="gpx_selection_segment_title">Segment</string>
-    <string name="gpx_selection_number_of_points"> %1$s points</string>
-    <string name="gpx_selection_point">Point %1$s</string>
-    <!-- string name="gpx_selection_current_track">recording</string -->
-    <string name="gpx_selection_route_points">%1$s \nRoute points %2$s</string>
-    <string name="gpx_selection_points">%1$s \nPoints</string>
-    <string name="gpx_selection_track">%1$s \nTrack %2$s</string>
-    <string name="gpx_file_is_empty">GPX track is empty</string>
-    <string name="osmo_user_joined">User %1$s joined group %2$s</string>
-    <string name="osmo_user_left">User %1$s left group %2$s</string>
-    <string name="osmo_show_group_notifications">Show group notifications</string>
-    <string name="osmo_show_group_notifications_descr">Show toast messages when user joins or leaves the group</string>
-    <string name="osmo_follow">Follow</string>
-    <string name="osmo_sign_in">Sign in</string>
-    <string name="osmo_create_groups_confirm">In order to create groups you need to be a registered user of OsMo.</string>
-    <string name="osmo_credentials_not_valid">Your OsMo credentials are not valid.</string>
-    <string name="osmo_regenerate_login_ids_confirm">Are you sure about regenerating personal ids? All devices, connected to you, won\'t be able to track you any more.</string>
-    <string name="osmo_regenerate_login_ids">Regenerate user id</string>
-    <string name="osmo_cancel_moving_target">Cancel moving target</string>
-    <string name="osmo_center_location">Center on the screen</string>
-    <string name="osmo_set_moving_target">Set as moving target</string>
-    <string name="osmo_use_server_name">Registered name</string>
-    <string name="osmo_connect_to_my_nickname">My nickname</string>
-    <string name="osmo_user_name">User</string>
-	<string name="color_red">red</string>
-	<string name="color_pink">pink</string>
-	<string name="color_orange">orange</string>
-	<string name="color_brown">brown</string>
-	<string name="color_yellow">yellow</string>
-	<string name="color_lightblue">light blue</string>
-	<string name="color_blue">blue</string>
-	<string name="color_green">green</string>
-
-    <string name="osmo_edit_device">Change user properties</string>
-    <string name="osmo_edit_color">Display color</string>
-    <string name="osmo_group_info">Info</string>
-    <string name="osmo_group">OsMo group</string>
-    <string name="osmo_group_share">In order to Connect to the group %2$s, specify group id (%1$s) or click %3$s.</string>
-    <string name="osmo_share_connect_device">Let permanently follow this device</string>
-    <string name="osmo_share_current_session">Share current session in browser</string>
-    <string name="osmo_session_not_available">Session not available, please check that \'Send locations\' is on.</string>
-    <string name="osmo_share_session">Share session</string>
-    <string name="osmo_session_id_share">Session url to track device (%1$s)</string>
-    <string name="osmo_tracker_id_share">In order to Connect to the target device %2$s, click on the link %3$s or specify tracker id (%1$s)</string>
-    <string name="osmo_track_interval">Logging interval</string>
-	<string name="osmo_track_interval_descr">Choose time interval to send location</string>
-    <string name="int_days">days</string>
-    <string name="osmo_connect_menu">Connect</string>
-    <string name="osmo_expire_group">Expires in</string>
-    <string name="osmo_group_description">Description</string>
-    <string name="osmo_group_policy">Policy</string>
-    <string name="osmo_connect_to_device_tracker_id">Tracker id</string>
-    <string name="osmo_connect_to_device_name">User name</string>
-    <string name="osmo_connect_to_group_id">Group id</string>
-    <string name="osmo_group_name">Group name</string>
-    <string name="osmo_connect_to_device">Link with device</string>
-    <string name="osmo_connect_to_group">Link with group</string>
-    <string name="osmo_connect">Connect to</string>
-    <string name="osmo_create_group">Create group</string>
-    <string name="osmo_server_operation_failed">OsMo Server operation failed</string>
-    <string name="osmo_activity">OpenStreetMap Monitoring</string>
-    <string name="osmo_enable_tracker">Send my locations</string>
-    <string name="osmo_control">OsMo quick access</string>
-    <string name="hours_ago">hours ago</string>
-    <string name="minutes_ago">min ago</string>
-    <string name="seconds_ago">sec ago</string>
-    <string name="osmo_connected_devices">Connected devices</string>
-    <string name="osmo_groups">OsMo Groups/Devices</string>
-    <string name="osmo_auto_send_locations_descr">Automatically start tracker session and send locations after application startup</string>
-    <string name="osmo_auto_send_locations">Automatically start tracker session</string>
-    <string name="osmo_tracker_id">Personal tracker id</string>
-    <string name="osmo_tracker_id_descr">Click to view or share tracker id.
-        Using tracker id connected devices will be able to monitor all movements of this device! To disconnect select Regenerate option.</string>
-    <string name="osmo_session_token">Session token: %1$s</string>
-    <string name="osmo_auth_pending">Waiting for authorization…</string>
-    <string name="osmo_locations_sent">Locations sent %1$d (in buffer %2$d) </string>
-    <string name="osmo_conn_successfull">Connection established: %1$s </string>
-    <string name="osmo_io_error">OsMo connection problem: </string>
-    <string name="osmo_settings_uuid">Unique device id</string>
-    <string name="use_points_as_intermediates">Calculate route between points</string>
-    <string name="osmo_mode_restart">Restart OsMo session</string>
-    <string name="osmo_mode_on">Stop OsMo session</string>
-    <string name="osmo_mode_off">Start OsMo session</string>
-    <string name="osmo_settings_debug">Debug information</string>
-    <string name="osmo_settings_descr">Configure monitoring settings and setup personal monitoring channel</string>
-    <string name="osmo_settings">OsMo</string>
-   	<string name="always_center_position_on_map">Display position always in center</string>
-    <string name="voice_pref_title">Voice</string>
-    <string name="misc_pref_title">Miscellaneous</string>
-    <string name="localization_pref_title">Localization</string>
-    <string name="index_item_nation_addresses">addresses nationwide</string>
-	<string name="index_item_world_altitude_correction">World altitude correction</string>
-	<string name="index_item_world_seamarks">World seamarks</string>
-	<string name="index_item_world_bitcoin_payments">World bitcoin payments</string>
-	<string name="index_item_world_basemap">World overview map</string>
-    <string name="index_item_world_ski">World ski map</string>
-    <string name="lang_zh">Chinese</string>
-    <string name="lang_pt_br">Portuguese (Brazil)</string>
-    <string name="lang_en">English</string>
-	<string name="lang_af">Afrikaans</string>
-	<string name="lang_al">Albanian</string>
-	<string name="lang_ar">Arabic</string>
-	<string name="lang_hy">Armenian</string>
-	<string name="lang_eu">Basque</string>
-	<string name="lang_be">Belarusian</string>
-	<string name="lang_bs">Bosnian</string>
-	<string name="lang_bg">Bulgarian</string>
-	<string name="lang_ca">Catalan</string>
-	<string name="lang_hr">Croatian</string>
-	<string name="lang_cs">Czech</string>
-	<string name="lang_da">Danish</string>
-	<string name="lang_nl">Dutch</string>
-	<string name="lang_fi">Finnish</string>
-	<string name="lang_fr">French</string>
-	<string name="lang_ka">Georgian</string>
-	<string name="lang_de">German</string>
-	<string name="lang_el">Greek</string>
-	<string name="lang_iw">Hebrew</string>
-	<string name="lang_hi">Hindi</string>
-	<string name="lang_hu">Hungarian</string>
-	<string name="lang_id">Indonesian</string>
-	<string name="lang_it">Italian</string>
-	<string name="lang_ja">Japanese</string>
-	<string name="lang_ko">Korean</string>
-	<string name="lang_lv">Latvian</string>
-	<string name="lang_lt">Lithuanian</string>
-	<string name="lang_mr">Marathi</string>
-	<string name="lang_no">Norwegian</string>
-	<string name="lang_fa">Persian</string>
-	<string name="lang_pl">Polish</string>
-	<string name="lang_pt">Portuguese</string>
-	<string name="lang_ro">Romanian</string>
-	<string name="lang_ru">Russian</string>
-	<string name="lang_sc">Sardinian</string>
-	<string name="lang_sr">Serbian</string>
-	<string name="lang_zh_CN">Simplified Chinese</string>
-	<string name="lang_sk">Slovak</string>
-	<string name="lang_sl">Slovenian</string>
-	<string name="lang_es">Spanish</string>
-	<string name="lang_sv">Swedish</string>
-	<string name="lang_zh_TW">Traditional Chinese</string>
-	<string name="lang_tr">Turkish</string>
-	<string name="lang_uk">Ukrainian</string>
-	<string name="lang_vi">Vietnamese</string>
-	<string name="lang_cy">Welsh</string>
-	<string name="index_name_canada">North America - Canada</string>
-    <string name="index_name_italy">Europe - Italy</string>
-    <string name="index_name_gb">Europe - Great Britain</string>
-    <string name="calculate_osmand_route_without_internet">Calculate OsmAnd route segment without Internet</string>
-    <string name="gpx_option_calculate_first_last_segment">Calculate OsmAnd route for first and last route segment</string>
-    <string name="use_displayed_track_for_navigation">Do you want to use displayed track for navigation?</string>
-    <string name="keep_and_add_destination_point">Add as destination point</string>
-    <string name="select_gpx">Select GPX…</string>
-    <string name="route_descr_select_destination">Select Destination</string>
-    <string name="route_preferences">Route preferences</string>
-    <string name="route_info">Route information</string>
-    <string name="routing_attr_prefer_motorway_name">Prefer motorways</string>
-	<string name="routing_attr_prefer_motorway_description">Prefer motorways</string>
-	<string name="routing_attr_short_way_name">Shortest way</string>
-	<string name="routing_attr_short_way_description">Use shortest way</string>
-	<string name="routing_attr_avoid_toll_name">Avoid toll roads</string>
-	<string name="routing_attr_avoid_toll_description">Avoid toll roads</string>
-	<string name="routing_attr_avoid_unpaved_name">Avoid unpaved roads</string>
-	<string name="routing_attr_avoid_unpaved_description">Avoid unpaved roads</string>
-	<string name="routing_attr_avoid_ferries_name">Avoid ferries</string>
-	<string name="routing_attr_avoid_ferries_description">Avoid ferries</string>
-	<string name="routing_attr_avoid_motorway_name">Avoid motorways</string>
-	<string name="routing_attr_avoid_motorway_description">Avoid motorways</string>
-	<string name="routing_attr_avoid_borders_name">Avoid border crossing</string>
-	<string name="routing_attr_avoid_borders_description">Avoid crossing a border into another country</string>
-	<string name="routing_attr_weight_name">Weight limit</string>
-	<string name="routing_attr_weight_description">Specify vehicle weight to be permitted on routes</string>
-	<string name="routing_attr_height_name">Height limit</string>
-	<string name="routing_attr_height_description">Specify vehicle height to be permitted on routes</string>
-    <string name="android_19_location_disabled">Since Android version 4.4 (KitKat) you cannot download and update maps to the previous storage folder (%s). Do you want to change to the permitted storage location and copy all OsmAnd files there?
-        \n Note 1: Your old files will remain untouched (but can be deleted manually).
-        \n Note 2: In the new storage location it will not be possible to share files between OsmAnd and OsmAnd+.</string>
-    <string name="copying_osmand_one_file_descr">Copying file (%s) to the new destination…</string>
-    <string name="copying_osmand_files_descr">Copying OsmAnd data files to the new destination (%s)…</string>
-    <string name="copying_osmand_files">Copying OsmAnd data files…</string>
-    <string name="calculate_osmand_route_gpx">Calculate OsmAnd offline route</string>
-    <string name="app_mode_truck">Truck</string>
-    <string name="guidance_preferences_descr">Navigation preferences</string>
-    <string name="routing_preferences_descr">Routing preferences</string>
-    <string name="speech_rate_descr">Specify speech rate for TTS</string>
-    <string name="speech_rate">Speech Rate</string>
-    <string name="complex_route_calculation_failed">Fast route calculation failed (%s), fallback to slow calculation.</string>
-    <string name="disable_complex_routing_descr">Disable 2-phase routing for car navigation</string>
-    <string name="disable_complex_routing">Disable complex routing</string>
-    <string name="amenity_type_seamark">Seamark</string>
-    <string name="app_modes_choose_descr">Choose use profiles visible in application</string>
-    <string name="app_modes_choose">Application Profiles</string>
-	<string name="map_widget_map_rendering">Map rendering</string>
-    <string name="app_mode_hiking">Hiking</string>
-    <string name="app_mode_motorcycle">Motorcycle</string>
-    <string name="app_mode_boat">Boat</string>
-    <string name="app_mode_aircraft">Aircraft</string>
-    <string name="local_osm_changes_delete_all_confirm">You are going to delete %1$d OSM changes. Are you sure?</string>
-    <string name="animate_routing_route_not_calculated">Please calculate the route first</string>
-    <string name="animate_routing_route">Simulate using calculated route </string>
-    <string name="animate_routing_gpx">Simulate using GPX track</string>
-	<string name="route_is_too_long">OsmAnd offline routing may take very long (or sometimes not work) for points more than 200km apart. You may want to add intermediate waypoints for better performance.</string>
-	<string name="auto_zoom_none">No auto zoom</string>
-	<string name="auto_zoom_close">To close-up</string>
-	<string name="auto_zoom_far">To mid-range</string>
-	<string name="auto_zoom_farthest">To long-range</string>
-	<string name="map_magnifier">Map magnifier</string>
-	<string name="base_world_map">World basemap</string>
-    <string name="about_version">Version :</string>
-    <string name="about_settings">About</string>
-    <string name="about_settings_descr">Version info, licenses, project members</string>
-    <string name="local_index_tile_data_zooms">Zooms downloaded: %1$s</string>
-    <string name="local_index_tile_data_expire">Expire (minutes): %1$s</string>
-    <string name="local_index_tile_data_downloadable">Downloadable: %1$s</string>
-    <string name="local_index_tile_data_maxzoom">Maximum zoom: %1$s</string>
-    <string name="local_index_tile_data_minzoom">Minimum zoom: %1$s</string>
-    <string name="local_index_tile_data_name">Tile data: %1$s</string>
-    <string name="edit_tilesource_successfully">Tilesource %1$s is successfully saved</string>
-    <string name="edit_tilesource_elliptic_tile">Elliptic mercator</string>
-    <string name="edit_tilesource_maxzoom">Max zoom</string>
-    <string name="edit_tilesource_expiration_time">Expire (minutes)</string>
-    <string name="edit_tilesource_minzoom">Min zoom</string>
-    <string name="edit_tilesource_url_to_load">URL</string>
-    <string name="edit_tilesource_choose_existing">Choose existing…</string>
-    <string name="edit_tilesource_name">Name</string>
-    <string name="maps_define_edit">Define/Edit…</string>
-	<string name="map_widget_fps_info">FPS debug info</string>
-	<string name="driving_region_descr">Select driving region: US, Europe, UK, Asia, and Others</string>
-	<string name="driving_region">Driving region</string>
-	<string name="driving_region_japan">Japan</string>
-	<string name="driving_region_us">United States</string>
-	<string name="driving_region_canada">Canada</string>
-	<string name="driving_region_europe_asia">Europe &amp; Asia</string>
-	<string name="driving_region_uk">UK, India, Australia &amp; Others</string>
-    <string name="speak_title">Announce…</string>
-	<string name="speak_descr">Configure to announce street names, traffic warnings (forced stops, speed bumps), speed camera warnings, speed limits</string>
-	<string name="speak_street_names">Street names (TTS)</string>
-    <string name="speak_speed_limit">Speed limit</string>
-    <string name="speak_cameras">Speed cameras</string>
-	<string name="speak_traffic_warnings">Traffic warnings</string>
-    <string name="osb_author_or_password_not_specified">Please specify OSM user and password in Settings</string>
-    <string name="clear_intermediate_points">Clear intermediate points</string>
-    <string name="keep_intermediate_points">Keep intermediate points</string>
-    <string name="new_directions_point_dialog">You already have intermediate points set.</string>
-    <string name="context_menu_item_directions_to">Directions to</string>
-    <string name="context_menu_item_directions_from">Directions from</string>
-    <string name="route_descr_map_location">Map: </string>
-    <string name="route_descr_lat_lon">Lat %1$.3f, lon %2$.3f</string>
-    <string name="route_descr_current_location">Current position</string>
-    <string name="route_descr_destination">Destination</string>
-    <string name="route_to">To:</string>
-    <string name="route_via">Via:</string>
-    <string name="route_from">From:</string>
-
-	<string name="app_mode_default">Browse map</string>
-	<string name="settings_preset">Default profile</string>
-	<string name="settings_preset_descr">Map view and navigation settings are remembered per use profile. Set your default profile here.</string>
-    <string name="destination_point">Destination %1$s</string>
-    <string name="context_menu_item_destination_point">Set as destination</string>
-    <string name="please_select_address">Select city or street first</string>
-    <string name="search_street_in_neighborhood_cities">Search street in neighborhood cities</string>
-    <string name="intermediate_items_sort_return">Intermediate waypoints resorted to optimize their order on the way from current location to the destination.</string>
-    <string name="intermediate_items_sort_by_distance">Sort (door-to-door)</string>
-    <string name="local_osm_changes_backup_successful">OSM change file successfully generated %1$s</string>
-    <string name="local_osm_changes_backup_failed">Backup OSM changes failed</string>
-    <string name="local_osm_changes_backup">Backup as OSM change</string>
-    <string name="delete_point">Delete Point</string>
-    <string name="plugin_distance_point_time">time</string>
-    <string name="plugin_distance_point_hdop">precision</string>
-    <string name="plugin_distance_point_speed">speed</string>
-    <string name="plugin_distance_point_ele">elevation</string>
-    <string name="plugin_distance_point">Point</string>
-    <string name="gpx_file_name">GPX file name</string>
-    <string name="gpx_saved_sucessfully">GPX file successfully saved to {0}</string>
-    <string name="use_distance_measurement_help">* Tap to mark a point.\n
-        * Press and hold on the map to delete previous point.\n
-        * Press and hold on point to view and attach description.\n
-        * Click on measurement widget to see more actions.</string>
-    <string name="distance_measurement_start_editing">Start editing</string>
-    <string name="distance_measurement_finish_editing">Finish editing</string>
-    <string name="distance_measurement_finish_subtrack">Begin a new subtrack</string>
-    <string name="distance_measurement_clear_route">Clear all points</string>
-    <string name="distance_measurement_load_gpx">Open existing GPX</string>
-    <string name="wait_current_task_finished">Please wait until current task is finished</string>
-    <string name="use_kalman_filter_compass_descr">Reduces noise in compass readings but adds inertia</string>
-    <string name="use_kalman_filter_compass">Use Kalman filter</string>
-    <string name="access_mark_final_location_first">Accessibility mode: please select destination first</string>
-    <string name="use_magnetic_sensor_descr">Use magnetic sensor to determine compass value instead of orientation sensor</string>
-    <string name="use_magnetic_sensor">Use magnetic sensor</string>
-    <string name="other_location">Other</string>
-    <string name="files_limit">%1$d files left</string>
-    <string name="available_downloads_left">Available %1$d files to download</string>
-    <string name="install_paid">Full version</string>
-    <string name="cancel_route">Dismiss route</string>
-    <string name="cancel_navigation">Stop navigation</string>
-    <string name="clear_destination">Clear destination</string>
-    <string name="download_using_mobile_internet">Wi-Fi is currently not connected. Do you want to use the current Internet connection for downloading?</string>
-    <string name="street_name">Street name</string>
-	<string name="hno">House number</string>
-    <string name="website">Web site</string>
-	<string name="phone">Phone</string>
-    <string name="osmand_background_plugin_description">Shows the settings to enable tracking and navigation in background (screen off) mode via periodically waking up the GPS device.</string>
-    <string name="contribution_activity">Install version</string>
-    <string name="choose_osmand_theme_descr">Choose application theme</string>
-    <string name="choose_osmand_theme">App theme</string>
-    <string name="accessibility_options">Accessibility options</string>
-    <string name="select_address_activity">Select address</string>
-    <string name="favourites_list_activity">Select favorite</string>
-    <string name="local_openstreetmap_act_title">OSM modifications</string>
-    <string name="layer_hillshade">Hillshade layer</string>
-    <string name="map_widget_gps_info">GPS info</string>
-    <string name="access_arrival_time">Arrival time</string>
-    <string name="item_checked">checked</string>
-    <string name="item_unchecked">unchecked</string>
-    <string name="prefer_motorways">Prefer motorways</string>
-	<string name="prefer_in_routing_title">Prefer…</string>
-	<string name="prefer_in_routing_descr">Prefer motorways</string>
-    <string name="max_speed_none">none</string>
-    <string name="index_name_openmaps">OpenMaps EU</string>
-    <string name="download_hillshade_item">Hillshade</string>
-    <string name="download_wikipedia_maps">Wikipedia</string>
-    <string name="download_hillshade_maps">Hillshade overlays</string>
-    <string name="local_indexes_cat_srtm">Contour lines data</string>
-    <string name="local_indexes_cat_av">Audio/Video data</string>
-    <string name="stop_routing_confirm">Are you sure you want to stop the navigation?</string>
-    <string name="clear_dest_confirm">Are you sure you want to clear your destination point (and waypoints)?</string>
-    <string name="precise_routing_mode_descr">Enable to calculate precise routes without glitches. Still distance-limited and slow.</string>
-    <string name="precise_routing_mode">Precise routing (alpha)</string>
-    <string name="recording_context_menu_show">Show</string>
-    <string name="recording_photo_description">Photo %1$s %2$s</string>
-    <string name="av_def_action_picture">Take a photo</string>
-    <string name="recording_context_menu_precord">Take a photo</string>
-    <string name="dropbox_plugin_description">Dropbox plugin allows to synchronize tracks and audio/video notes with your dropbox account.</string>
-    <string name="dropbox_plugin_name">Dropbox plugin</string>
-    <string name="intermediate_points_change_order">Change order</string>
-    <string name="srtm_paid_version_msg">Please consider to buy the Contour lines plugin in the Market to support further development.</string>
-    <string name="av_def_action_choose">Select on request</string>
-    <string name="av_def_action_video">Record video</string>
-    <string name="av_def_action_audio">Record audio</string>
-    <string name="av_widget_action_descr">Select default widget action</string>
-    <string name="av_widget_action">Default widget action</string>
-    <string name="av_video_format_descr">Select video output format</string>
-    <string name="av_video_format">Video output format</string>
-    <string name="av_use_external_recorder_descr">Use system recorder for video</string>
-    <string name="av_use_external_recorder">Use system recorder</string>
-    <string name="av_use_external_camera_descr">Use system application for photo</string>
-    <string name="av_use_external_camera">Use camera app</string>
-    <string name="av_settings_descr">Configure audio and video settings</string>
-    <string name="av_settings">Audio/video settings </string>
-    <string name="recording_error">Error occurred while recording </string>
-    <string name="recording_camera_not_available">Camera is not available</string>
-    <string name="recording_is_recorded">Audio/video is being recorded. To stop it press the AV widget.</string>
-    <string name="recording_playing">An audio from the specified recording is being played.\n%1$s</string>
-    <string name="recording_open_external_player">Open external player</string>
-    <string name="recording_delete_confirm">Do you want to remove this recording?</string>
-    <string name="recording_unavailable">unavailable</string>
-    <string name="recording_context_menu_arecord">Take an audio note</string>
-    <string name="recording_context_menu_vrecord">Take a video note</string>
-    <string name="layer_recordings">Recording layer</string>
-    <string name="recording_can_not_be_played">Recording can not be played</string>
-    <string name="recording_context_menu_delete">Delete recording</string>
-    <string name="recording_context_menu_play">Play</string>
-    <string name="recording_description">Recording %1$s %3$s %2$s</string>
-    <string name="recording_default_name">Recording</string>
-    <string name="map_widget_av_notes">Audio/video notes</string>
-    <string name="map_widget_distancemeasurement">Distance measurement</string>
-    <string name="audionotes_location_not_defined">Location to associate with the note is not defined yet. \"Use location …\" to assign a note to the specified location</string>
-    <string name="map_widget_audionotes">Audio notes</string>
-    <string name="index_srtm_parts">parts</string>
-    <string name="index_srtm_ele">Contour lines</string>
-    <string name="download_select_map_types">Other maps</string>
-    <string name="download_roads_only_item">Roads only</string>
-    <string name="download_srtm_maps">Contour lines</string>
-    <string name="download_regular_maps">Regular maps</string>
-    <string name="download_roads_only_maps">Roads-only maps</string>
-    <string name="rendering_attr_alpineHiking_name">Alpine hiking scale (SAC)</string>
-    <string name="rendering_attr_alpineHiking_description">Render paths according to SAC scale</string>
-    <string name="rendering_attr_hikingRoutesOSMC_name">Hiking symbol overlay</string>
-    <string name="rendering_attr_hikingRoutesOSMC_description">Render paths according to OSMC traces</string>
-
-	<string name="rendering_attr_noAdminboundaries_name">Hide boundaries</string>
-	<string name="rendering_attr_noAdminboundaries_description">Suppress display of regional boundaries (admin levels 5-9)</string>
-    <string name="map_widget_max_speed">Speed limit</string>
-    <string name="monitoring_control_start">GPX</string>
-    <string name="no_buildings_found">No buildings found.</string>
-    <string name="incremental_search_city">Search city incrementally</string>
-    <string name="search_villages_and_postcodes">Search more villages/postcode</string>
-	<string name="rendering_attr_showRoadMaps_description">Select when to display roads-only maps:</string>
-	<string name="rendering_attr_showRoadMaps_name">Roads-only maps</string>
-    <string name="safe_mode_description">Run the application in safe mode (using slower Android instead of native code).</string>
-    <string name="safe_mode">Safe mode</string>
-    <string name="native_library_not_running">The application is running in safe mode (disable it in the Settings).</string>
-    <string name="close_changeset">Close changeset</string>
-	<string name="zxing_barcode_scanner_not_found">ZXing Barcode Scanner application not installed. Search in Market?</string>
-	<string name="rendering_attr_roadColors_description">Select a road color scheme:</string>
-	<string name="rendering_attr_roadColors_name">Road color scheme</string>
-    <string name="map_widget_show_destination_arrow">Show destination direction</string>
-    <string name="enable_plugin_monitoring_services">Enable the Trip recording plugin to use position logging services (GPX logging, online tracking)</string>
-    <string name="non_optimal_route_calculation">Calculate possibly non-optimal route over long distances</string>
-	<string name="gps_not_available">Please enable GPS in the settings</string>
-	<string name="map_widget_monitoring_services">Logging services</string>
-	<string name="no_route">No route</string>
-	<string name="delete_target_point">Remove waypoint</string>
-	<string name="target_point">Waypoint %1$s</string>
-    <string name="intermediate_point">Waypoint %1$s</string>
-    <string name="context_menu_item_last_intermediate_point">Add as last waypoint</string>
-    <string name="context_menu_item_first_intermediate_point">Add as first waypoint</string>
-    <string name="add_as_last_destination_point">Add as last waypoint</string>
-    <string name="add_as_first_destination_point">Add as first waypoint</string>
-
-    <string name="replace_destination_point">Replace destination point</string>
-    <string name="new_destination_point_dialog">You already have the destination point set.</string>
-    <string name="target_points">Waypoints</string>
-    <string name="intermediate_point_too_far">Waypoint %1$s too far from nearest road.</string>
-    <string name="arrived_at_intermediate_point">You have arrived at your waypoint</string>
-    <string name="context_menu_item_intermediate_point">Add as waypoint</string>
-    <string name="map_widget_intermediate_distance">Waypoint</string>
-    <string name="ending_point_too_far">Ending point too far from nearest road.</string>
-    <string name="add_tag">Add Tag</string>
-    <string name="btn_advanced_mode">Advanced Mode…</string>
-    <string name="poi_filter_parking">Parking</string>
-    <string name="poi_filter_emergency">Emergency</string>
-    <string name="poi_filter_public_transport">Public transport</string>
-    <string name="poi_filter_entertainment">Entertainment</string>
-    <string name="poi_filter_accomodation">Accommodation</string>
-    <string name="poi_filter_restaurants">Restaurants</string>
-    <string name="poi_filter_sightseeing">Sightseeing</string>
-    <string name="poi_filter_car_aid">Car aid</string>
-	<string name="poi_filter_food_shop">Food shop</string>
-	<string name="poi_filter_for_tourists">For tourists</string>
-	<string name="poi_filter_fuel">Fuel</string>
-	<string name="show_warnings_title">Show alarms…</string>
-	<string name="show_warnings_descr">Configure traffic warnings (speed limits, forced stops, speed bumps), speed camera warnings, and lane information</string>
-	<string name="use_compass_navigation_descr">Use the compass when no heading is detected otherwise</string>
-	<string name="use_compass_navigation">Use compass</string>
-	<string name="avoid_motorway">Avoid motorways</string>
-	<string name="auto_zoom_map_descr">Auto zoom map according to your speed (while map is synchronized with current position)</string>
-	<string name="auto_zoom_map">Auto zoom map</string>
-	<string name="snap_to_road_descr">Snap position to roads during navigation</string>
-	<string name="snap_to_road">Snap to road</string>
-	<string name="interrupt_music_descr">Interrupt music when making announcement</string>
-	<string name="interrupt_music">Interrupt music</string>
-	<string name="osmand_play_title_30_chars">OsmAnd Maps &amp; Navigation</string>
-	<string name="osmand_short_description_80_chars">Global Mobile Map Viewing &amp; Navigation for Offline and Online OSM Maps</string>
-	<string name="osmand_long_description_1000_chars">
-		OsmAnd (OSM Automated Navigation Directions)
-
-		OsmAnd is an open source navigation application with access to a wide variety of global OpenStreetMap (OSM) data. All map data (vector or tile maps) can be stored on the phone memory card for offline usage. OsmAnd also offers offline and online routing functionality including turn-by-turn voice guidance.
-
-		Some of the core features:
-		- Complete offline functionality (store downloaded vector or tile maps in the device storage)
-		- Compact offline vector maps for the whole world available
-		- Download of country or region maps directly from the app
-		- Overlay of several map layers possible, like GPX or navigation tracks, Points of Interest, favorites, contour lines, public transport stops, additional maps with customizable transparency
-		- Offline search for addresses and places (POIs)
-		- Offline routing for short distances (experimental)
-		- Car, bicycle, and pedestrian modes with:
-		-  optional automated day/night view switching
-		-  optional speed-dependent map zooming
-		-  optional map alignment according to compass or direction of motion
-		-  optional lane guidance, speed limit display, recorded and TTS voices
-
-		Limitations of this free version of OsmAnd:
-		- Number of map downloads limited
-		- No access to Wikipedia offline POIs
-
-		OsmAnd is actively being developed and our project and its further progress relies on financial contributions to fund the development and testdriving new functionality. Please consider buying OsmAnd+, or funding specific new features or making a general donation on osmand.net.
-	</string>
-	<string name="osmand_extended_description_4000_chars">
-OsmAnd (OSM Automated Navigation Directions) is a map and navigation application with access to the free, worldwide, and high-quality OpenStreetMap (OSM) data. All map data can be stored on your device\'s memory card for offline use. Via your device\'s GPS, OsmAnd offers routing, with optical and voice guidance, for car, bike, and pedestrian. All the main functionalities work both online and offline (no Internet needed).
-
-Some of the main features:
-
-Navigation
- - Works online (fast) or offline (no roaming charges when you are abroad)
- - Turn-by-turn voice guidance (recorded and synthesized voices)
- - Optional lane guidance, street name display, and estimated time of arrival
- - Supports intermediate points on your itinerary
- - Automatic re-routing whenever you deviate from the route
- - Search for places by address, by type (e.g.: restaurant, hotel, gas station, museum), or by geographical coordinates
-
-Map Viewing
- - Display your position and orientation on the map
- - Optionally align the map according to compass or your direction of motion
- - Save your most important places as Favorites
- - Display POIs (point of interests) around you
- - Can display specialized online tile maps
- - Can display satellite view (from Bing)
- - Can display different overlays like touring/navigation GPX tracks and additional maps with customizable transparency
- - Optionally display place names in English, local, or phonetic spelling
-
-Use OpenStreetMap and Wikipedia Data:
- - High quality information from the best collaborative projects of the world
- - Global maps from OpenStreetMap, available per country or region
- - Wikipedia POIs, great for sightseeing (not available in free version)
- - Unlimited free download, directly from the app (download limit 16 map files in free version)
- - Always up-to-date maps (updated at least once a month)
- - Compact offline vector maps
- - Select between complete map data and just road network (Example: All of Japan is 700 MB, or 200 MB for the road network only)
- - Also supports online or cached tile maps
-
-Safety Features
- - Optional automated day/night view switching
- - Optional speed limit display, with reminder if you exceed it
- - Optional speed-dependent map zooming
- - Share your location so that your friends can find you
-
-Bicycle and Pedestrian Features
- - The maps include foot, hiking, and bike paths, great for outdoor activities
- - Special routing and display modes for bike and pedestrian
- - Optional public transport stops (bus, tram, train) including line names
- - Optional trip recording to local GPX file or online service
- - Optional speed and altitude display
- - Display of contour lines and hill-shading (via additional plugin)
-
-Directly Contribute to OpenStreetMap
- - Report map bugs
- - Upload GPX tracks to OSM directly from the app
- - Add POIs and directly upload them to OSM (or later if offline)
- - Optional trip recording also in background mode (while device is in sleep mode)
-
-OsmAnd is open source and actively being developed. Everyone can contribute to the application by reporting bugs, improving translations, or coding new features. The project is in a lively state of continuous improvement by all these forms of developer and user interaction. The project progress also relies on financial contributions to fund the development, coding, and testing of new functionalities. By buying OsmAnd+ you help the application to be even more awesome! It is also possible to fund specific new features, or to make a general donation on osmand.net.
-
-
-Approximate map coverage and quality:
- - Western Europe: ****
- - Eastern Europe: ***
- - Russia: ***
- - North America: ***
- - South America: **
- - Asia: **
- - Japan &amp; Korea: ***
- - Middle East: **
- - Africa: **
- - Antarctica: *
-
-List of countries supported (basically world wide!):
-Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, Argentina, Armenia, Aruba, Australia, Austria, Azerbaijan, Bahamas, Bahrain, Bangladesh, Barbados, Belarus, Belgium, Belize, Benin, Bermuda, Bhutan, Bolivia, Bonaire, Bosnia and Herzegovina, Botswana, Brazil, British Virgin Islands, Brunei, Bulgaria, Burkina Faso, Burundi, Cambodia, Cameroon, Canada, Cape Verde, Central African Republic, Chad, Chile, China, Colombia, Comoros, Congo, Costa Rica, Ivory Coast, Croatia, Cuba, Curaçao, Cyprus, Czech Republic, Denmark, Djibouti, Dominica, Dominican Republic, Ecuador, Egypt, El Salvador, Equatorial Guinea, Eritrea, Estonia, Ethiopia, Fiji, Finland, France, French Guiana, French Polynesia, Gabon, Gambia, Georgia, Germany, Ghana, Gibraltar, Greece, Greenland, Grenada, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Vatican, Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Iran, Iraq, Ireland, Isle of Man, Israel, Italy, Jamaica, Japan, Jersey, Jordan, Kazakhstan, Kenya, Kiribati, North Korea and South Korea, Kuwait, Kyrgyzstan, Laos, Latvia, Lebanon, Lesotho, Liberia, Libya, Liechtenstein, Lithuania, Luxembourg, Macao, Macedonia, Madagascar, Malawi, Malaysia, Maldives, Mali, Malta, Martinique, Mauritania, Mauritius, Mayotte, Mexico, Micronesia, Moldova, Monaco, Mongolia, Montenegro, Montserrat, Morocco, Mozambique, Myanmar, Namibia, Nauru, Nepal, Netherlands, Netherlands Antilles, New Caledonia, New Zealand, Nicaragua, Niger, Nigeria, Norway, Oman, Pakistan, Palau, Palestinian Territory, Panama, Papua New Guinea, Paraguay, Peru, Philippines, Poland, Portugal, Puerto Rico, Qatar, Romania, Russia, Rwanda, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin, Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Saudi Arabia, Senegal, Serbia, Seychelles, Sierra Leone, Singapore, Slovakia, Slovenia, Somalia, South Africa, South Georgia, South Sudan, Spain, Sri Lanka, Sudan, Suriname, Swaziland, Sweden, Switzerland, Syria, Taiwan, Tajikistan, Tanzania, Thailand, Timor-Leste, Togo, Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Tuvalu, Uganda, Ukraine, United Arab Emirates, United Kingdom (UK), United States of America (USA), Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Zimbabwe.
-	</string>
-	<string name="osmand_plus_play_title_30_chars">OsmAnd+ Maps &amp; Navigation</string>
-	<string name="osmand_plus_short_description_80_chars">Global Mobile Map Viewing &amp; Navigation for Offline and Online OSM Maps</string>
-	<string name="osmand_plus_long_description_1000_chars">
-		OsmAnd+ (OSM Automated Navigation Directions)
-
-		OsmAnd+ is an open source navigation application with access to a wide variety of global OpenStreetMap (OSM) data. All map data (vector or tile maps) can be stored on the phone memory card for offline usage. OsmAnd also offers offline and online routing functionality including turn-by-turn voice guidance.
-
-		OsmAnd+ is the paid application version, by buying it you support the project, fund the development of new features, and receive the latest updates.
-
-		Some of the core features:
-		- Complete offline functionality (store downloaded vector or tile maps in the device storage)
-		- Compact offline vector maps for the whole world available
-		- Unlimited downloading of country or region maps directly from the app
-		- Offline Wikipedia feature (download Wikipedia POIs), great for sightseeing
-		- Overlay of several map layers possible, like GPX or navigation tracks, Points of Interest, favorites, contour lines, public transport stops, additional maps with customizable transparency
-		- Offline search for addresses and places (POIs)
-		- Offline routing for short distances (experimental)
-		- Car, bicycle, and pedestrian modes with:
-		-  optional automated day/night view switching
-		-  optional speed-dependent map zooming
-		-  optional map alignment according to compass or direction of motion
-		-  optional lane guidance, speed limit display, recorded and TTS voices
-	</string>
-	<string name="osmand_plus_extended_description_4000_chars">
-OsmAnd (OSM Automated Navigation Directions) is a map and navigation application with access to the free, worldwide, and high-quality OpenStreetMap (OSM) data. All map data can be stored on your device\'s memory card for offline use. Via your device\'s GPS, OsmAnd offers routing, with optical and voice guidance, for car, bike, and pedestrian. All the main functionalities work both online and offline (no Internet needed).
-
-OsmAnd+ is the paid application version. By buying it you support the project, fund the development of new features, and receive the latest updates. You can test the application before buying by installing the free version called OsmAnd.
-
-Some of the main features:
-
-Navigation
- - Works online (fast) or offline (no roaming charges when you are abroad)
- - Turn-by-turn voice guidance (recorded and synthesized voices)
- - Optional lane guidance, street name display, and estimated time of arrival
- - Supports intermediate points on your itinerary
- - Automatic re-routing whenever you deviate from the route
- - Search for places by address, by type (e.g.: restaurant, hotel, gas station, museum), or by geographical coordinates
-
-Map Viewing
- - Display your position and orientation on the map
- - Optionally align the map according to compass or your direction of motion
- - Save your most important places as Favorites
- - Display POIs (point of interests) around you
- - Can display specialized online tile maps
- - Can display satellite view (from Bing)
- - Can display different overlays like touring/navigation GPX tracks and additional maps with customizable transparency
- - Optionally display place names in English, local, or phonetic spelling
-
-Use OpenStreetMap and Wikipedia Data:
- - High quality information from the best collaborative projects of the world
- - Global maps from OpenStreetMap, available per country or region
- - Wikipedia POIs, great for sightseeing
- - Unlimited free download, directly from the app
- - Always up-to-date maps (updated at least once a month)
- - Compact offline vector maps
- - Select between complete map data and just road network (Example: All of Japan is 700 MB, or 200 MB for the road network only)
- - Also supports online or cached tile maps
-
-Safety Features
- - Optional automated day/night view switching
- - Optional speed limit display, with reminder if you exceed it
- - Optional speed-dependent map zooming
- - Share your location so that your friends can find you
-
-Bicycle and Pedestrian Features
- - The maps include foot, hiking, and bike paths, great for outdoor activities
- - Special routing and display modes for bike and pedestrian
- - Optional public transport stops (bus, tram, train) including line names
- - Optional trip recording to local GPX file or online service
- - Optional speed and altitude display
- - Display of contour lines and hill-shading (via additional plugin)
-
-Directly Contribute to OpenStreetMap
- - Report map bugs
- - Upload GPX tracks to OSM directly from the app
- - Add POIs and directly upload them to OSM (or later if offline)
- - Optional trip recording also in background mode (while device is in sleep mode)
-
-OsmAnd is open source and actively being developed. Everyone can contribute to the application by reporting bugs, improving translations, or coding new features. The project is in a lively state of continuous improvement by all these forms of developer and user interaction. The project progress also relies on financial contributions to fund the development, coding, and testing of new functionalities. By buying OsmAnd+ you help the application to be even more awesome! It is also possible to fund specific new features, or to make a general donation on osmand.net.
-
-
-Approximate map coverage and quality:
- - Western Europe: ****
- - Eastern Europe: ***
- - Russia: ***
- - North America: ***
- - South America: **
- - Asia: **
- - Japan &amp; Korea: ***
- - Middle East: **
- - Africa: **
- - Antarctica: *
-
-List of countries supported (basically world wide!):
-Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, Argentina, Armenia, Aruba, Australia, Austria, Azerbaijan, Bahamas, Bahrain, Bangladesh, Barbados, Belarus, Belgium, Belize, Benin, Bermuda, Bhutan, Bolivia, Bonaire, Bosnia and Herzegovina, Botswana, Brazil, British Virgin Islands, Brunei, Bulgaria, Burkina Faso, Burundi, Cambodia, Cameroon, Canada, Cape Verde, Central African Republic, Chad, Chile, China, Colombia, Comoros, Congo, Costa Rica, Ivory Coast, Croatia, Cuba, Curaçao, Cyprus, Czech Republic, Denmark, Djibouti, Dominica, Dominican Republic, Ecuador, Egypt, El Salvador, Equatorial Guinea, Eritrea, Estonia, Ethiopia, Fiji, Finland, France, French Guiana, French Polynesia, Gabon, Gambia, Georgia, Germany, Ghana, Gibraltar, Greece, Greenland, Grenada, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Vatican, Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Iran, Iraq, Ireland, Isle of Man, Israel, Italy, Jamaica, Japan, Jersey, Jordan, Kazakhstan, Kenya, Kiribati, North Korea and South Korea, Kuwait, Kyrgyzstan, Laos, Latvia, Lebanon, Lesotho, Liberia, Libya, Liechtenstein, Lithuania, Luxembourg, Macao, Macedonia, Madagascar, Malawi, Malaysia, Maldives, Mali, Malta, Martinique, Mauritania, Mauritius, Mayotte, Mexico, Micronesia, Moldova, Monaco, Mongolia, Montenegro, Montserrat, Morocco, Mozambique, Myanmar, Namibia, Nauru, Nepal, Netherlands, Netherlands Antilles, New Caledonia, New Zealand, Nicaragua, Niger, Nigeria, Norway, Oman, Pakistan, Palau, Palestinian Territory, Panama, Papua New Guinea, Paraguay, Peru, Philippines, Poland, Portugal, Puerto Rico, Qatar, Romania, Russia, Rwanda, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin, Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Saudi Arabia, Senegal, Serbia, Seychelles, Sierra Leone, Singapore, Slovakia, Slovenia, Somalia, South Africa, South Georgia, South Sudan, Spain, Sri Lanka, Sudan, Suriname, Swaziland, Sweden, Switzerland, Syria, Taiwan, Tajikistan, Tanzania, Thailand, Timor-Leste, Togo, Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Tuvalu, Uganda, Ukraine, United Arab Emirates, United Kingdom (UK), United States of America (USA), Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Zimbabwe.
-	</string>
-	<string name="filterpoi_activity">Create POI filter</string>
-	<string name="recalculate_route_to_your_location">Transport mode:</string>
-	<string name="select_navigation_mode">Select transport mode</string>
-	<string name="day_night_info_description">Sunrise: %1$s \nSunset: %2$s</string>
-	<string name="day_night_info">Day/night info</string>
-	<string name="map_widget_day_night">Day/night map</string>
-	<string name="map_widget_renderer">Map style</string>
-	<string name="layer_map_appearance">Configure screen</string>
-	<string name="show_lanes">Show lanes</string>
-	<string name="avoid_unpaved">Avoid unpaved roads</string>
-	<string name="avoid_ferries">Avoid ferries</string>
-	<string name="avoid_in_routing_title">Avoid…</string>
-	<string name="avoid_in_routing_descr">Avoid toll roads, unpaved, ferries</string>
-	<string name="map_widget_fluorescent">Fluorescent routes</string>
-	<string name="map_widget_show_ruler">Ruler</string>
-	<string name="map_widget_view_direction">Viewing direction</string>
-	<string name="map_widget_transparent">Transparent skin</string>
-	<string name="bg_service_sleep_mode_off">Run\n app in background</string>
-	<string name="bg_service_sleep_mode_on">Stop\n running in background</string>
-	<string name="gps_wakeup_interval">GPS wake-up interval: %s</string>
-	<string name="int_continuosly">Continuous</string>
-	<string name="screen_is_locked">To unlock screen press lock icon</string>
-	<string name="map_widget_top_text">Street name</string>
-	<string name="map_widget_config">Configure screen</string>
-	<string name="map_widget_back_to_loc">Where am I</string>
-	<string name="map_widget_lock_screen">Lock screen</string>
-	<string name="map_widget_compass">Compass</string>
-	<string name="map_widget_reset">Reset to default</string>
-	<string name="map_widget_parking">Parking</string>
-	<string name="map_widget_monitoring">GPX logging</string>
-	<string name="map_widget_speed">Speed</string>
-	<string name="map_widget_distance">Destination</string>
-	<string name="map_widget_altitude">Altitude</string>
-	<string name="map_widget_time">Time to go</string>
-	<string name="map_widget_next_turn">Next turn</string>
-	<string name="map_widget_next_turn_small">Next turn (small)</string>
-	<string name="map_widget_next_next_turn">Second next turn</string>
-	<string name="map_widget_mini_route">Mini route map</string>
-	<string name="bg_service_screen_lock">Lock screen</string>
-	<string name="bg_service_screen_unlock">Unlock screen</string>
-	<string name="bg_service_screen_lock_toast">The screen is locked</string>
-	<string name="bg_service_interval">Set wake-up interval:</string>
-	<string name="show_cameras">Show speed cameras</string>
-	<string name="show_traffic_warnings">Show traffic warnings</string>
-	<string name="avoid_toll_roads">Avoid toll roads</string>
-	<string name="continue_follow_previous_route_auto">Previous navigation was unfinished. Continue following it? (%1$s seconds)</string>
-	<string name="route_updated_loc_found">Route will be calculated once position is found</string>
-	<string name="osmand_parking_hours">Hours</string>
-	<string name="osmand_parking_minutes">Minutes</string>
-	<string name="osmand_parking_position_description_add_time">The car was parked at:</string>
-	<string name="select_animate_speedup">Select speed of route simulation</string>
-    	<string name="global_app_allocated_memory_descr">Allocated memory %1$s MB (Android limit %2$s MB, Dalvik %3$s MB).</string>
-	<string name="global_app_allocated_memory">Allocated memory</string>
-	<string name="native_app_allocated_memory_descr">Total native memory allocated by app %1$s MB (Dalvik %2$s MB, other %3$s MB).
-		Proportional memory %4$s MB (Android limit %5$s MB, Dalvik %6$s MB).</string>
-	<string name="native_app_allocated_memory">Total native memory</string>
-	<string name="starting_point_too_far">Starting point too far from nearest road.</string>
-	<string name="shared_location">Shared location</string>
-	<string name="osmand_parking_event">Pick up the car from parking</string>
-	<string name="osmand_parking_warning">Warning</string>
-	<string name="osmand_parking_warning_text">Notification to pick up your car was previously added to your Calendar. It will remain there until you will delete it manually.</string>
-	<string name="osmand_parking_time_limit_title">Set the time limit of parking</string>
-	<string name="osmand_parking_delete_confirm">Do you want to remove the location of the parked car?</string>
-	<string name="osmand_parking_delete">Delete a parking marker</string>
-	<string name="osmand_parking_choose_type">Choose the type of parking</string>
-	<string name="osmand_parking_lim_text">Time-limited</string>
-	<string name="osmand_parking_no_lim_text">Time-unlimited</string>
-	<string name="osmand_parking_add_event">Add a notification to Calendar application</string>
-	<string name="osmand_parking_time_limit">Time-limited parking</string>
-	<string name="osmand_parking_time_no_limit">Time-unlimited parking</string>
-	<string name="osmand_parking_position_description">The position of your parked car. %1$s</string>
-	<string name="osmand_parking_position_description_add">To pick up the car at:</string>
-	<string name="osmand_parking_pm">PM</string>
-	<string name="osmand_parking_am">AM</string>
-	<string name="osmand_parking_position_name">Parking point</string>
-	<string name="context_menu_item_add_parking_point">Mark as a parking position</string>
-	<string name="context_menu_item_delete_parking_point">Delete a parking marker</string>
-	<string name="gpxup_public">Public</string>
-	<string name="gpxup_identifiable">Identifiable</string>
-	<string name="gpxup_trackable">Trackable</string>
-	<string name="gpxup_private">Private</string>
-	<string name="asap">ASAP</string>
-	<string name="share_route_as_gpx">Share route as GPX file</string>
-	<string name="share_route_subject">Route shared via OsmAnd</string>
-	<string name="route_roundabout">Roundabout: take %1$d exit and go</string>
-	<string name="route_kl">Keep left and go</string>
-	<string name="route_kr">Keep right and go</string>
-	<string name="rendering_attr_noPolygons_description">Make all areal land features on map transparent</string>
-	<string name="rendering_attr_noPolygons_name">Hide polygons</string>
-	<string name="rendering_attr_appMode_name">Rendering mode</string>
-	<string name="rendering_attr_appMode_description">Optimize map for</string>
-	<!-- string name="rendering_attr_contourLines_description">Select minimum zoom level to display in map if available. Separate contour data needed.</string -->
-	<string name="rendering_attr_contourLines_description">Display from zoom level (requires contour data):</string>
-	<string name="rendering_attr_contourLines_name">Show contour lines</string>
-	<string name="rendering_attr_hmRendered_description">Increase amount of map detail shown</string>
-	<string name="rendering_attr_hmRendered_name">Show more map detail</string>
-	<string name="local_index_routing_data">Routing data</string>
-	<string name="navigate_point_format">Format</string>
-	<string name="poi_search_desc">POI (Point of interest) search</string>
-	<string name="address_search_desc">Address search</string>
-	<string name="navpoint_search_desc">Coordinates</string>
-	<string name="transport_search_desc">Public transport search</string>
-	<string name="favourites_search_desc">Favorites search</string>
-	<string name="offline_navigation_not_available">OsmAnd offline navigation is temporarily not available.</string>
-	<string name="left_side_navigation">Left-hand driving</string>
-	<string name="left_side_navigation_descr">Select for countries with left-hand traffic</string>
-	<string name="local_index_description">Click any existing item to see more details, press and hold to deactivate or delete. Current data on device (%1$s free):</string>
-	<string name="unknown_from_location">Starting point is not yet determined</string>
-	<string name="unknown_location">Position not yet known</string>
-	<string name="modify_transparency">Modify transparency (0 - transparent, 255 - opaque)</string>
-	<string name="confirm_interrupt_download">Do you want to interrupt file downloading?</string>
-	<string name="first_time_msg">Thank you for using OsmAnd. For many features of this application you need some regional offline data which you can download via \'Settings\' →  \'Manage map files\'. Afterwards you will be able to view maps, locate addresses, look up POIs, and find public transport.</string>
-	<string name="basemap_was_selected_to_download">Basemap is required for proper application functioning and was selected to download.</string>
-	<string name="local_indexes_cat_tile">Online and tile maps</string>
-	<string name="local_indexes_cat_map">Offline maps (vector)</string>
-	<string name="index_settings_descr">Download and manage offline map files stored on your device</string>
-	<string name="map_online_plugin_is_not_installed">Enable the Online maps plugin to select different map sources</string>
-	<string name="map_online_data">Online and tile maps</string>
-	<string name="map_online_data_descr">Use online maps (download and cache tiles on SD card)</string>
-	<string name="online_map_settings_descr">Configure online or cached tile map sources</string>
-	<string name="plugins_screen">Plugins</string>
-	<string name="prefs_plugins_descr">Plugins activate advanced settings and additional functionality</string>
-	<string name="prefs_plugins">Plugins</string>
-	<string name="vector_maps_may_display_faster_on_some_devices">Vector maps likely display faster. May not work well on some devices.</string>
-	<string name="play_commands_of_currently_selected_voice">Play commands of selected voice</string>
-	<string name="native_rendering">Native rendering</string>
-	<string name="test_voice_prompts">Test voice prompts</string>
-	<string name="switch_to_raster_map_to_see">No offline vector map present for this location. You can download one in Settings (Manage map files), or switch to online maps (enable online maps plugin for this).</string>
-	<string name="send_files_to_osm">Send GPX files to OSM?</string>
-	<string name="gpx_visibility_txt">Visibility</string>
-	<string name="gpx_tags_txt">Tags</string>
-	<string name="gpx_description_txt">Description</string>
-	<string name="validate_gpx_upload_name_pwd">Please specify OSM user name and password to upload GPX files.</string>
-    	<string name="default_buttons_support">Support</string>
-	<string name="support_new_features">Support new features</string>
-	<string name="support_new_features_descr">Donate to see new features implemented in the application</string>
-	<string name="show_ruler_level">Display ruler</string>
-	<string name="info_button">Info</string>
-	<string name="back_to_location">Back to position</string>
-
-	<string name="accessibility_extensions_descr">Accessibility extensions for old Android versions</string>
-	<string name="accessibility_extensions">Accessibility extensions</string>
-	<string name="accessibility_mode">Accessibility mode</string>
-	<string name="accessibility_mode_descr">Turns on the accessibility features</string>
-	<string name="accessibility_default">According to the global system setting</string>
-	<string name="backToMenu">Back To Menu</string>
-	<string name="zoomOut">Zoom out</string>
-	<string name="zoomIn">Zoom in</string>
-	<string name="zoomIs">Zoom level is</string>
-	<string name="north">north</string>
-	<string name="north_north_east">north-north-east</string>
-	<string name="north_east">north-east</string>
-	<string name="east_north_east">east-north-east</string>
-	<string name="east">east</string>
-	<string name="east_south_east">east-south-east</string>
-	<string name="south_east">south-east</string>
-	<string name="south_south_east">south-south-east</string>
-	<string name="south">south</string>
-	<string name="south_south_west">south-south-west</string>
-	<string name="south_west">south-west</string>
-	<string name="west_south_west">west-south-west</string>
-	<string name="west">west</string>
-	<string name="west_north_west">west-north-west</string>
-	<string name="north_west">north-west</string>
-	<string name="north_north_west">north-north-west</string>
-	<string name="front">forward</string>
-	<string name="front_right">right-forward</string>
-	<string name="right">to the right</string>
-	<string name="back_right">right-backward</string>
-	<string name="back">backward</string>
-	<string name="back_left">left-backward</string>
-	<string name="left">to the left</string>
-	<string name="front_left">left-forward</string>
-	<string name="oclock">o\'clock</string>
-	<string name="towards">towards</string>
-	<string name="accuracy">Accuracy</string>
-	<string name="altitude">Altitude</string>
-	<string name="no_info">No info</string>
-	<string name="direction_style_sidewise">Sidewise (8 sectors)</string>
-	<string name="direction_style_clockwise">Clockwise (12 sectors)</string>
-	<string name="settings_direction_style">Direction style</string>
-	<string name="settings_direction_style_descr">Choose style to express relative directions while moving</string>
-	<string name="auto_announce_on">Start auto announcing</string>
-	<string name="auto_announce_off">Stop auto announcing</string>
-	<string name="scroll_map_by_gestures_descr">Scroll map by gestures on the touchscreen</string>
-	<string name="scroll_map_by_gestures">Natural map scrolling</string>
-	<string name="i_am_here">I am here</string>
-	<string name="zoom_by_trackball_descr">Change map zooming by horizontal trackball moves</string>
-	<string name="zoom_by_trackball">Use trackball for zoom control</string>
-	<string name="use_short_object_names_descr">Use short object names in touch exploration mode</string>
-	<string name="use_short_object_names">Use object names</string>
-	<string name="accessibility_preferences_descr">Accessibility related preferences</string>
-    <string name="arrival_distance_factor_early">Early</string>
-    <string name="arrival_distance_factor_normally">Normal</string>
-    <string name="arrival_distance_factor_late">Late</string>
-    <string name="arrival_distance_factor_at_last">In the last meters</string>
-    <string name="arrival_distance">Arrival announcement</string>
-    <string name="arrival_distance_descr">How soon do you want the arrival announcement?</string>
-    <string name="rendering_out_of_memory">Not enough process memory to display selected area</string>
-	<string name="use_fluorescent_overlays">Fluorescent overlays</string>
-	<string name="use_fluorescent_overlays_descr">Use fluorescent colors to display tracks and routes</string>
-	<string name="offline_edition">Offline editing</string>
-	<string name="offline_edition_descr">Always use offline editing</string>
-	<string name="update_poi_does_not_change_indexes">POI changes inside application do not affect downloaded map files, changes are saved to local file instead.</string>
-	<string name="local_openstreetmap_uploading">Uploading …</string>
-	<string name="local_openstreetmap_were_uploaded">{0} POI/Notes were uploaded</string>
-	<string name="local_openstreetmap_uploadall">Upload all</string>
-	<string name="local_openstreetmap_upload">Upload modification to OSM</string>
-	<string name="local_openstreetmap_delete">Delete modification</string>
-	<string name="local_openstreetmap_descr_title">Asynchronous OSM editing:</string>
-	<string name="local_openstreetmap_settings">Locally saved OSM POIs/Notes</string>
-	<string name="local_openstreetmap_settings_descr">Show and manage OSM POIs/Notes noted in local database</string>
-	<string name="live_monitoring_interval_descr">Specify online tracking interval</string>
-	<string name="live_monitoring_interval">Online tracking interval</string>
-	<string name="live_monitoring_url_descr">Specify the web address with parameter syntax: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
-	<string name="live_monitoring_url">Online tracking web address</string>
-	<string name="gpx_monitoring_disabled_warn">Log track using GPX widget or via \'Trip recording\' settings.</string>
-	<string name="show_current_gpx_title">Show current track</string>
-	<string name="free_version_message">This free OsmAnd version is limited to %1$s downloads and does not support offline Wikipedia articles.</string>
-	<string name="free_version_title">Free version</string>
-	<string name="poi_context_menu_showdescription">Show POI description</string>
-	<string name="index_name_north_america">North America</string>
-	<string name="index_name_netherlands">Europe - Netherlands</string>
-	<string name="index_name_us">North America - United States</string>
-	<string name="index_name_central_america">Central America</string>
-	<string name="index_name_south_america">South America</string>
-	<string name="index_name_europe">Europe</string>
-	<string name="index_name_france">Europe - France</string>
-	<string name="index_name_germany">Europe - Germany</string>
-	<string name="index_name_russia">Europe/Asia - Russia</string>
-	<string name="index_name_africa">Africa</string>
-	<string name="index_name_asia">Asia</string>
-	<string name="index_name_oceania">Oceania</string>
-	<string name="index_name_other">Worldwide and topic maps</string>
-	<string name="index_name_wiki">Worldwide Wikipedia POIs</string>
-	<string name="index_name_voice">Voice prompts (recorded, limited features)</string>
-	<string name="index_name_tts_voice">Voice prompts (TTS-synthesized, prefer)</string>
-	<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
-	<string name="amenity_type_user_defined">User defined</string>
-	<string name="fav_export_confirmation">File with previously exported favorites already exists. Do you want to replace it?</string>
-	<string name="profile_settings">Profile Specific Settings</string>
-	<string name="routing_settings">Navigation</string>
-	<string name="routing_settings_descr">Specify options for the navigation</string>
-	<string name="global_settings">Global Settings</string>
-	<string name="index_settings">Manage map files</string>
-	<string name="general_settings">General</string>
-	<string name="general_settings_descr">Configure display and common settings for the application</string>
-	<string name="global_app_settings">Global app settings</string>
-	<string name="user_name">Your OSM user name</string>
-	<string name="user_name_descr">Needed for openstreetmap.org submissions</string>
-	<string name="user_password">Your OSM password</string>
-	<string name="user_password_descr">Needed for openstreetmap.org submissions</string>
-	<string name="osmand_service">Background mode</string>
-	<string name="osmand_service_descr">OsmAnd runs in background while screen is off</string>
-	<string name="download_files_not_enough_space">There is not enough free space to download %1$s MB (free: %2$s).</string>
-	<string name="download_files_question_space">Free space now {2} MB! Download {0} file(s) ({1} MB)?</string>
-	<string name="use_transparent_map_theme">Transparent theme</string>
-	<string name="native_library_not_supported">Native library is not supported on this device.</string>
-	<string name="init_native_library">Initializing native library…</string>
-	<string name="choose_auto_follow_route">Auto-center map view</string>
-	<string name="choose_auto_follow_route_descr">Time until map view synchronizes with current position</string>
-	<string name="auto_follow_route_never">Never (tap \'Go\' to start guidance manually)</string>
-	<string name="keep_informing_never">Only manually (tap arrow)</string>
-    <string name="keep_informing_descr">Re-announce navigation instructions at regular intervals</string>
-    <string name="keep_informing">Repeat navigation instructions</string>
-	<string name="auto_follow_route_navigation">Auto-center nav only</string>
-	<string name="auto_follow_route_navigation_descr">Auto-center map view only while navigating.</string>
-	<string name="auto_follow_location_enabled">Auto-center map view in use.</string>
-	<string name="pref_vector_rendering">Vector renderer specific options</string>
-	<string name="pref_overlay">Overlay / underlay</string>
-	<string name="pref_raster_map">Map source settings</string>
-	<string name="pref_vector_map">Vector map settings</string>
-	<string name="delete_confirmation_msg">Delete %1$s?</string>
-	<string name="city_type_suburb">Suburb</string>
-	<string name="city_type_hamlet">Hamlet</string>
-	<string name="city_type_village">Village</string>
-	<string name="city_type_town">Town</string>
-	<string name="city_type_city">City</string>
-
-	<string name="animate_route_off">Stop simulation</string>
-	<string name="animate_route">Start simulation</string>
-	<string name="file_can_not_be_renamed">File can not be renamed.</string>
-	<string name="file_with_name_already_exists">File with that name already exists.</string>
-	<string name="gpx_navigation">GPX route</string>
-	<string name="poi_query_by_name_matches_categories">Several POI categories found matching the query:</string>
-	<string name="data_to_search_poi_not_available">Local data to search POI is not present.</string>
-	<string name="poi_filter_by_name">Search by name</string>
-	<string name="old_poi_file_should_be_deleted">The POI data file \'%1$s\' is redundant and can be deleted.</string>
-	<string name="update_poi_file_not_found">Local file to maintain POI changes not found and could not be created.</string>
-	<string name="button_upgrade_osmandplus">Upgrade OsmAnd+</string>
-	<string name="map_version_changed_info">Server contains map files not compatible with your current version of the application. To download and use them, please upgrade the application to newer version.</string>
-	<string name="poi_filter_nominatim">Online Nominatim</string>
-	<string name="search_position_current_location_search">Searching position…</string>
-	<string name="search_position_current_location_found">Position (found)</string>
-	<string name="search_position_address">Address…</string>
-	<string name="search_position_favorites">Favorites…</string>
-	<string name="search_position_undefined">Undefined</string>
-	<string name="search_position_current_location">Current position…</string>
-	<string name="search_position_map_view">Current map center</string>
-	<string name="select_search_position">Origin:</string>
-	<string name="context_menu_item_search">Search near here</string>
-	<string name="route_successfully_saved_at">Route successfully saved as \'%1$s\'.</string>
-	<string name="filename_input">File name: </string>
-	<string name="file_with_name_already_exist">File with same name already exists.</string>
-	<string name="local_index_upload_gpx_description">Upload GPX files to OSM community. They will be used to improve maps.</string>
-	<string name="local_index_items_uploaded">%1$d of %2$d item(s) successfully uploaded.</string>
-	<string name="local_index_mi_upload_gpx">Send to OSM</string>
-	<string name="show_more_map_detail">Show more map detail</string>
-	<string name="show_more_map_detail_descr">Show some vector map detail (roads etc.) at lower zooms already</string>
-	<string name="favourites_delete_multiple_succesful">Favorite point(s) deleted successfully.</string>
-	<string name="favorite_delete_multiple">You are going to delete %1$d favorite(s) and %2$d favorite group(s). Are you sure?</string>
-	<string name="favorite_home_category">Home</string>
-	<string name="favorite_friends_category">Friends</string>
-	<string name="favorite_places_category">Places</string>
-	<string name="shared_string_others">Others</string>
-	<string name="favourites_edit_dialog_name">Name</string>
-	<string name="favourites_edit_dialog_category">Category</string>
-	<string name="shared_string_no_thanks">No, thanks</string>
-	<string name="basemap_missing">Base world map (covering the whole world at small zooms) is missing. Please consider downloading World_basemap_x.obf for a complete environment.</string>
-	<string name="vector_data_missing">On board (\'offline\') data is missing on SD card. Please consider to download it in order to use maps offline.</string>
-	<string name="shared_string_release">Released</string>
-	<string name="local_index_installed">Local version</string>
-	<string name="local_index_items_backuped">%1$d of %2$d item(s) successfully deactivated.</string>
-	<string name="local_index_items_deleted">%1$d of %2$d item(s) successfully deleted.</string>
-	<string name="local_index_items_restored">%1$d of %2$d item(s) successfully activated.</string>
-	<string name="local_index_no_items_to_do">No items to %1$s</string>
-	<string name="local_index_action_do">You are about to %1$s %2$s item(s). Continue?</string>
-	<string name="local_index_descr_title">Manage map files</string>
-	<string name="local_index_mi_restore">Activate</string>
-	<string name="local_index_mi_backup">Deactivate</string>
-	<string name="local_index_mi_reload">Reload from sdcard</string>
-	<string name="local_index_poi_data">POI data</string>
-	<string name="local_index_address_data">Address data</string>
-	<string name="local_index_transport_data">Public transport data</string>
-	<string name="local_index_map_data">Map data</string>
-	<string name="local_indexes_cat_backup">Deactivated</string>
-	<string name="local_indexes_cat_tts">Voice data (TTS)</string>
-	<string name="local_indexes_cat_voice">Voice data (recorded)</string>
-	<!-- string name="local_indexes_cat_gpx">GPX data</string -->
-	<string name="local_indexes_cat_poi">POI data</string>
-	<string name="ttsvoice">TTS voice</string>
-	<string name="search_offline_clear_search">New Search</string>
-	<string name="map_text_size_descr">Select text size for names on the map</string>
-	<string name="map_text_size">Map font size</string>
-	<string name="trace_rendering">Rendering debug info</string>
-	<string name="trace_rendering_descr">Display rendering performance</string>
-	<string name="installing_new_resources">Unpacking new data…</string>
-	<string name="internet_connection_required_for_online_route">An online navigation service is selected but no Internet connection is available.</string>
-	<string name="tts_language_not_supported_title">Language not supported</string>
-	<string name="tts_language_not_supported">The selected language is not supported by the installed Android TTS (text-to-speech) engine. Do you want to look for another TTS engine in Market? Otherwise the preset TTS language will be used.</string>
-	<string name="tts_missing_language_data_title">Missing data</string>
-	<string name="tts_missing_language_data">No data for the selected language is installed. Do you want to go to Market to install?</string>
-	<string name="gpx_option_reverse_route">Reverse GPX direction</string>
-	<string name="gpx_option_destination_point">Use current destination</string>
-	<string name="gpx_option_from_start_point">Pass along entire track</string>
-	<string name="switch_to_vector_map_to_see">Offline vector map present for this location. \n\t\n\tTo use activate \'Menu\' → \'Configure map\' → \'Map Source…\' → \'Offline vector maps\'.</string>
-	<string name="choose_audio_stream">Voice guidance output</string>
-	<string name="choose_audio_stream_descr">Choose channel to play voice guidance (system-dependent)</string>
-	<string name="voice_stream_voice_call">Voice call audio</string>
-	<string name="voice_stream_notification">Notification audio</string>
-	<string name="voice_stream_music">Media/music audio</string>
-	<string name="warning_tile_layer_not_downloadable">Application cannot download map layer %1$s, please try to reinstall it.</string>
-	<string name="overlay_transparency_descr">Modify overlay transparency</string>
-	<string name="overlay_transparency">Overlay transparency</string>
-	<string name="map_transparency_descr">Modify base map transparency</string>
-	<string name="map_transparency">Base map transparency</string>
-	<string name="layer_underlay">Underlay map…</string>
-	<string name="map_underlay">Underlay map</string>
-	<string name="map_underlay_descr">Choose underlay map</string>
-	<string name="layer_overlay">Overlay map…</string>
-	<string name="map_overlay">Overlay map</string>
-	<string name="map_overlay_descr">Choose overlay map</string>
-	<string name="tile_source_already_installed">Map is already installed, settings will be updated</string>
-	<string name="select_tile_source_to_install">Select (tile) maps to install or update</string>
-	<string name="internet_not_available">An Internet connection is required for this operation but is not available</string>
-	<string name="install_more">Install more…</string>
-	<string name="level_to_switch_vector_raster_descr">Minimum zoom level to use vector maps</string>
-	<string name="level_to_switch_vector_raster">Min. vector zoom level</string>
-	<string name="create_poi_link_to_osm_doc"><u>Online OSM</u> map classification with images</string>
-	<string name="error_doing_search">Error occurred in offline search</string>
-	<string name="search_offline_geo_error">Could not parse geo intent \'%s\'</string>
-	<string name="search_osm_offline">Search geo location</string>
-	<string name="system_locale">System</string>
-	<string name="preferred_locale_descr">Select display language (please restart OsmAnd after changing)</string>
-	<string name="preferred_locale">Display language</string>
-	<string name="incomplete_locale">incomplete</string>
-	<string name="unit_of_length_descr">Change units of length and speed</string>
-	<string name="unit_of_length">Unit of measure</string>
-	<string name="si_mi_foots">Miles/feet</string>
-	<string name="si_mi_yard">Miles/yards</string>
-	<string name="si_km_m">Kilometers/meters</string>
-	<string name="yard">yd</string>
-	<string name="foot">ft</string>
-	<string name="mile_per_hour">mph</string>
-	<string name="mile">mi</string>
-	<string name="send_location_way_choose_title">Share location using</string>
-	<string name="send_location_sms_pattern">Location: %1$s\n%2$s</string>
-	<string name="send_location_email_pattern">To see location follow the web browser link %1$s or android intent link %2$s</string>
-	<string name="send_location">Send location</string>
-	<string name="context_menu_item_share_location">Share location</string>
-	<string name="add_waypoint_dialog_added">GPX Waypoint \'\'{0}\'\' was successfully added</string>
-	<string name="add_waypoint_dialog_title">Add waypoint to recorded GPX track</string>
-	<string name="context_menu_item_add_waypoint">Add GPX waypoint</string>
-	<string name="amenity_type_administrative">Administrative</string>
-	<string name="amenity_type_barrier">Barrier</string>
-	<string name="amenity_type_education">Education</string>
-	<string name="amenity_type_emergency">Emergency</string>
-	<string name="amenity_type_entertainment">Entertainment</string>
-	<string name="amenity_type_finance">Finance</string>
-	<string name="amenity_type_geocache">Geocache</string>
-	<string name="amenity_type_healthcare">Healthcare</string>
-	<string name="amenity_type_historic">Historic</string>
-	<string name="amenity_type_landuse">Landuse</string>
-	<string name="amenity_type_leisure">Leisure</string>
-	<string name="amenity_type_man_made">Man made</string>
-	<string name="amenity_type_military">Military</string>
-	<string name="amenity_type_natural">Natural</string>
-	<string name="amenity_type_office">Office</string>
-	<string name="amenity_type_other">Other</string>
-	<string name="amenity_type_shop">Shop</string>
-	<string name="amenity_type_sport">Sport</string>
-	<string name="amenity_type_sustenance">Sustenance</string>
-	<string name="amenity_type_tourism">Tourism</string>
-	<string name="amenity_type_transportation">Transport</string>
-	<string name="indexing_address">Indexing address…</string>
-	<string name="indexing_map">Indexing map…</string>
-	<string name="indexing_poi">Indexing POI…</string>
-	<string name="indexing_transport">Indexing transport…</string>
-	<string name="km">km</string>
-	<string name="km_h">km/h</string>
-	<string name="m">m</string>
-	<string name="old_map_index_is_not_supported">Deprecated map data format \'\'{0}\'\' is not supported</string>
-	<string name="poi_filter_closest_poi">Nearest POIs</string>
-	<string name="poi_filter_custom_filter">Custom filter</string>
-	<string name="poi_filter_namefinder">Online NameFinder</string>
-	<string name="reading_cached_tiles">Reading cached tiles…</string>
-	<string name="version_index_is_big_for_memory">The index \'\'{0}\'\' did not fit into memory</string>
-	<string name="version_index_is_not_supported">The version of index \'\'{0}\'\' is not supported</string>
-	<string name="use_osmand_routing_service">OsmAnd navigation &gt;20km</string>
-	<string name="use_osmand_routing_service_descr">Use OsmAnd offline navigation applies only to routes &gt; 20 km (experimental)</string>
-	<string name="osmand_routing_experimental">OsmAnd offline navigation is an experimental feature and it does not work for distances of more than about 20 km.\n\nNavigation service is temporarily switched to online CloudMade.</string>
-	<string name="specified_dir_doesnt_exist">Can not find the specified folder.</string>
-
-
-	<string name="osmand_net_previously_installed">A previous OsmAnd version is installed. All offline data will be supported by the new application. But Favorite points should be exported in the old application and later imported by the new one.</string>
-	<string name="build_installed">Build {0} successfully installed ({1}).</string>
-	<string name="downloading_build">Downloading build…</string>
-	<string name="install_selected_build">Do you want to install OsmAnd - {0} from {1} {2} MB ?</string>
-	<string name="loading_builds_failed">Retrieving the list of OsmAnd builds failed</string>
-	<string name="loading_builds">Loading OsmAnd builds…</string>
-	<string name="select_build_to_install">Select an OsmAnd build to install</string>
-	<string name="gps_status_app_not_found">GPS status application not installed. Search in Market?</string>
-	<string name="voice_is_not_available_msg">No voice guidance available, please go to \'Settings\' → \'General\' → \'Voice guidance\' and select or download a voice prompt package.</string>
-	<string name="voice_is_not_available_title">No voice guidance selected</string>
-	<string name="daynight_mode_day">Day</string>
-	<string name="daynight_mode_night">Night</string>
-	<string name="daynight_mode_auto">Sunrise/sunset</string>
-	<string name="daynight_mode_sensor">Light sensor</string>
-	<string name="daynight_descr">Choose day/night mode switching rule</string>
-	<string name="daynight">Day/night mode</string>
-	<string name="download_files_question">Download {0} file(s) ({1} MB)?</string>
-	<string name="items_were_selected">{0} item(s) selected</string>
-	<string name="filter_existing_indexes">Downloaded</string>
-	<string name="fast_route_mode">Fastest route</string>
-	<string name="fast_route_mode_descr">Enable to calculate fastest route or disable for shortest route </string>
-	<string name="tiles_to_download_estimated_size">At zoom {0} download {1} tiles ({2} MB)</string>
-	<string name="shared_string_download_map">Download map</string>
-	<string name="select_max_zoom_preload_area">Select maximum zoom to preload</string>
-	<string name="maps_could_not_be_downloaded">This map could not be downloaded</string>
-	<string name="continuous_rendering">Continuous rendering</string>
-	<string name="continuous_rendering_descr">Display continuous rendering instead of image-at-once</string>
-	<string name="rendering_exception">Error occurred while rendering selected area</string>
-	<string name="show_point_options">Use location …</string>
-	<string name="renderer_load_sucess">Renderer successfully loaded</string>
-	<string name="renderer_load_exception">Exception occurred: renderer was not loaded</string>
-	<string name="renderers">Vector renderer</string>
-	<string name="renderers_descr">Choose rendering appearance</string>
-	<string name="poi_context_menu_website">Show POI website</string>
-	<string name="poi_context_menu_call">Show POI phone</string>
-	<string name="download_type_to_filter">type to filter</string>
-	<string name="use_high_res_maps">High resolution display</string>
-	<string name="use_high_res_maps_descr">Do not stretch (and blur) map tiles on high density displays</string>
-	<string name="context_menu_item_search_transport">Search public transport</string>
-	<string name="transport_searching_transport">Transport results (no destination):</string>
-	<string name="transport_searching_route">Transport results ({0} to destination):</string>
-	<string name="transport_search_again">Reset transport search</string>
-	<string name="voice">Recorded voice</string>
-	<string name="voices">Voice prompts</string>
-	<string name="no_vector_map_loaded">Vector maps were not loaded</string>
-	<string name="map_route_by_gpx">Navigate using GPX</string>
-	<string name="gpx_files_not_found">No GPX files found in the tracks folder</string>
-	<string name="layer_gpx_layer">GPX track…</string>
-	<string name="error_reading_gpx">Error reading GPX data</string>
-	<string name="vector_data">Offline vector maps</string>
-	<string name="transport_context_menu">Search transport at stop</string>
-	<string name="osb_bug_name">Bug</string>
-	<string name="poi_context_menu_modify">Modify POI</string>
-	<string name="poi_context_menu_delete">Delete POI</string>
-	<string name="rotate_map_compass_opt">To compass</string>
-	<string name="rotate_map_bearing_opt">To direction of movement</string>
-	<string name="rotate_map_none_opt">Don\'t rotate (north is up)</string>
-	<string name="rotate_map_to_bearing_descr">Select map screen alignment</string>
-	<string name="rotate_map_to_bearing">Map orientation</string>
-	<string name="show_route">Route details</string>
-	<string name="fav_imported_sucessfully">Favorites successfully imported</string>
-	<string name="import_file_favourites">Save points as GPX file or import them into favorites?</string>
-	<string name="fav_file_to_load_not_found">GPX file containing favorites is not found at {0}</string>
-	<string name="fav_saved_sucessfully">Favorites successfully saved to {0}</string>
-	<string name="no_fav_to_save">No favorite points to save</string>
-	<string name="share_fav_subject">Favorites shared via OsmAnd</string>
-	<string name="error_occurred_loading_gpx">Error occurred while loading GPX</string>
-	<string name="send_report">Send report</string>
-	<string name="none_region_found">No offline data for regions found on SD card. Download regions from the Internet.</string>
-	<string name="poi_namefinder_query_empty">Input search query to find POI</string>
-	<string name="any_poi">Any</string>
-	<string name="layer_transport_route">Transport route</string>
-	<string name="thanks_yandex_traffic">Thanks to Yandex for traffic information.</string>
-	<string name="layer_yandex_traffic">Yandex traffic</string>
-	<string name="layer_route">Route</string>
-	<string name="layer_osm_bugs">OSM Notes (online)</string>
-	<string name="layer_transport">Transport stops</string>
-	<string name="layer_poi">POI…</string>
-	<string name="layer_map">Map source…</string>
-	<string name="menu_layers">Map layers</string>
-	<string name="context_menu_item_search_poi">Search POI</string>
-	<string name="use_trackball_descr">Use trackball to move map</string>
-	<string name="use_trackball">Use trackball</string>
-	<string name="background_service_wait_int_descr">Set maximum waiting time for each background position fix</string>
-	<string name="background_service_wait_int">Maximum wait for fix</string>
-	<string name="where_am_i">Where am I?</string>
-	<string name="process_navigation_service">OsmAnd navigation service</string>
-	<string name="network_provider">Network</string>
-	<string name="gps_provider">GPS</string>
-	<string name="int_seconds">seconds</string>
-	<string name="int_min">min.</string>
-	<string name="background_service_int_descr">Set wake-up interval used by background service</string>
-	<string name="background_service_provider_descr">Choose location provider used by background service</string>
-	<string name="background_service_provider">Location provider</string>
-	<string name="background_router_service_descr">Runs OsmAnd in the background to track your position while screen is off</string>
-	<string name="background_router_service">Run OsmAnd in background</string>
-	<string name="off_router_service_no_gps_available">The background navigation service requires a location provider to be turned on.</string>
-	<string name="hide_poi_filter">Hide filter</string>
-	<string name="show_poi_filter">Show filter</string>
-	<string name="search_poi_filter">Filter</string>
-	<string name="menu_mute_off">Sound is on</string>
-	<string name="menu_mute_on">Sound is off</string>
-	<string name="voice_data_initializing">Initializing voice data…</string>
-	<string name="voice_data_not_supported">Unsupported version of voice data</string>
-	<string name="voice_data_corrupted">Specified voice data is corrupted</string>
-	<string name="voice_data_unavailable">Selected voice data is not available</string>
-	<string name="sd_unmounted">SD card is not accessible.\nYou won\'t be able to see maps or find things.</string>
-	<string name="sd_mounted_ro">SD card is read-only.\nYou can only see the preloaded map and can\'t download from the Internet.</string>
-	<string name="unzipping_file">Unzipping file…</string>
-	<string name="route_tr">Turn right and go</string>
-	<string name="route_tshr">Turn sharply right and go</string>
-	<string name="route_tslr">Turn slightly right and go</string>
-	<string name="route_tl">Turn left and go</string>
-	<string name="route_tshl">Turn sharply left and go</string>
-	<string name="route_tsll">Turn slightly left and go</string>
-	<string name="route_tu">Make U-turn and go</string>
-	<string name="route_head">Head</string>
-	<string name="first_time_continue">Later</string>
-	<string name="first_time_download">Download regions</string>
-	<string name="search_poi_location">Searching for signal…</string>
-	<string name="search_near_map">Search near current map center</string>
-	<string name="search_nearby">Search nearby</string>
-	<string name="map_orientation_default">Same as device</string>
-	<string name="map_orientation_portrait">Portrait</string>
-	<string name="map_orientation_landscape">Landscape</string>
-	<string name="map_screen_orientation">Screen orientation</string>
-	<string name="map_screen_orientation_descr">Portrait, landscape, or device</string>
-	<string name="opening_hours_not_supported">Opening hours format is not supported for editing</string>
-	<string name="add_new_rule">Add new rule</string>
-	<string name="transport_Routes">Routes</string>
-	<string name="transport_Stop">Stop</string>
-	<string name="transport_stops">stops</string>
-	<string name="transport_search_after">Subsequent itinerary</string>
-	<string name="transport_search_before">Prior itinerary</string>
-	<string name="transport_finish_search">Finish search</string>
-	<string name="transport_stop_to_go_out">Choose stop to get off</string>
-	<string name="transport_to_go_after">prior distance</string>
-	<string name="transport_to_go_before">subsequent distance</string>
-	<string name="transport_stops_to_pass">stops to pass</string>
-	<string name="transport_route_distance">Itinerary distance</string>
-	<string name="transport">Transport</string>
-	<string name="show_transport_over_map_description">Show public transport stops on map</string>
-	<string name="show_transport_over_map">Show transport stops</string>
-	<string name="hello">Navigation application OsmAnd</string>
-	<string name="update_poi_success">POI data was updated successfully ({0} were loaded)</string>
-	<string name="update_poi_error_local">Error updating local POI list</string>
-	<string name="update_poi_error_loading">Error while loading data from server</string>
-	<string name="update_poi_no_offline_poi_index">No offline POI data available for this area</string>
-	<string name="update_poi_is_not_available_for_zoom">Updating POIs is not available for small zoom levels</string>
-	<string name="context_menu_item_update_poi">Update POI</string>
-	<string name="context_menu_item_update_map_confirm">Update local data via Internet?</string>
-	<string name="search_history_city">City: {0}</string>
-	<string name="search_history_street">Street: {0}, {1}</string>
-	<string name="search_history_int_streets">Intersection: {0} x {1} in {2}</string>
-	<string name="search_history_building">Building: {0}, {1}, {2}</string>
-	<string name="favorite">Favorite</string>
-	<string name="uploading_data">Uploading data…</string>
-	<string name="uploading">Uploading…</string>
-	<string name="search_nothing_found">Nothing found</string>
-	<string name="searching">Searching…</string>
-	<string name="searching_address">Searching address…</string>
-	<string name="search_osm_nominatim">Online search using OSM Nominatim</string>
-	<string name="hint_search_online">Online search: House number, street, city</string>
-	<string name="search_offline_address">Offline search</string>
-	<string name="search_online_address">Online search</string>
-	<string name="max_level_download_tile">Max. online zoom</string>
-	<string name="max_level_download_tile_descr">Choose maximum zoom level to download for online map tiles</string>
-	<string name="route_general_information">Total distance %1$s, travelling time %2$d h %3$d m.</string>
-	<string name="router_service_descr">Choose an online or offline navigation service</string>
-	<string name="router_service">Navigation service</string>
-	<string name="sd_dir_not_accessible">The data storage folder on the SD card is not accessible!</string>
-	<string name="download_question">Download {0} - {1} ?</string>
-	<string name="download_question_exist">Offline data for {0} already exists ({1}). Do you want to update it ({2}) ?</string>
-	<string name="address">Address</string>
-	<string name="downloading_list_indexes">Downloading list of available regions…</string>
-	<string name="list_index_files_was_not_loaded">The list of regions was not retrieved from osmand.net.</string>
-	<string name="fav_points_edited">Favorite point was edited</string>
-	<string name="fav_points_not_exist">No favorite points exist</string>
-	<string name="update_existing">Replace</string>
-	<string name="only_show">Display route</string>
-	<string name="follow">Start navigation</string>
-	<string name="mark_final_location_first">Please select destination first</string>
-	<string name="get_directions">Directions</string>
-	<string name="opening_hours">Opening hours</string>
-	<string name="opening_changeset">Opening changeset…</string>
-	<string name="closing_changeset">Closing changeset…</string>
-	<string name="commiting_node">Committing node…</string>
-	<string name="loading_poi_obj">Loading POI…</string>
-	<string name="auth_failed">Authorization failed</string>
-	<string name="failed_op">failed</string>
-	<string name="converting_names">Converting native/English names…</string>
-	<string name="loading_streets_buildings">Loading streets/buildings…</string>
-	<string name="loading_postcodes">Loading postcodes…</string>
-	<string name="loading_streets">Loading streets…</string>
-	<string name="loading_cities">Loading cities…</string>
-	<string name="poi">POI</string>
-	<string name="error_occurred_saving_gpx">Error while saving GPX</string>
-	<string name="error_calculating_route">Error calculating route</string>
-	<string name="error_calculating_route_occured">Error occurred while calculating route</string>
-	<string name="empty_route_calculated">Error: Calculated route is empty</string>
-	<string name="new_route_calculated_dist">New route calculated, distance</string>
-	<string name="arrived_at_destination">You have arrived at your destination</string>
-	<string name="invalid_locations">Coordinates are invalid!</string>
-	<string name="go_back_to_osmand">Go back to OsmAnd map</string>
-	<string name="loading_data">Loading data…</string>
-	<string name="reading_indexes">Reading local data…</string>
-	<string name="previous_run_crashed">Last OsmAnd run crashed. Log file is at {0}. Please report the issue and attach the log file.</string>
-	<string name="saving_gpx_tracks">Saving GPX tracks to SD…</string>
-	<string name="finished_task">Finished</string>
-	<string name="use_online_routing_descr">Use Internet to calculate route</string>
-	<string name="use_online_routing">Use online navigation</string>
-	<string name="osm_settings_descr">Specify Openstreetmap.org (OSM) settings needed for OSM submissions</string>
-	<string name="data_settings_descr">Specify language, download/reload data</string>
-	<string name="data_settings">Data</string>
-	<string name="additional_settings">Additional settings</string>
-	<string name="update_tile">Update map</string>
-	<string name="reload_tile">Reload tile</string>
-	<string name="mark_point">Target</string>
-	<string name="use_english_names_descr">Select between native and English names</string>
-	<string name="use_english_names">Use English names in maps</string>
-	<string name="app_settings">Application settings</string>
-	<string name="search_address">Search address</string>
-	<string name="choose_building">Choose building</string>
-	<string name="choose_street">Choose street</string>
-	<string name="choose_city">Choose city</string>
-	<string name="ChooseCountry">Choose country</string>
-	<string name="show_view_angle">Display viewing direction</string>
-	<string name="map_view_3d_descr">Enable 3D view of the map</string>
-	<string name="map_view_3d">Map View 3D</string>
-	<string name="show_poi_over_map_description">Show POI over map (use last chosen filter)</string>
-	<string name="show_poi_over_map">Show POI</string>
-	<string name="map_tile_source_descr">Choose the source of online or cached map tiles</string>
-	<string name="map_tile_source">Tile map source</string>
-	<string name="map_source">Map source</string>
-	<string name="use_internet">Use Internet</string>
-	<string name="show_location">Show your position</string>
-	<string name="show_gps_coordinates_text">Show GPS coordinates on map</string>
-	<string name="use_internet_to_download_tile">Use Internet to download missing map tiles</string>
-	<string name="app_description">Navigation application</string>
-	<string name="search_button">Search</string>
-	<string name="search_activity">Search</string>
-	<string name="searchpoi_activity">Choose POI</string>
-	<string name="search_POI_level_btn">Find more</string>
-	<string name="incremental_search_street">Search street incrementally</string>
-	<string name="incremental_search_building">Search building incrementally</string>
-	<string name="choose_available_region">Choose region from list</string>
-	<string name="choose_intersected_street">Choose intersecting street</string>
-	<string name="Closest_Amenities">Closest amenities</string>
-	<string name="app_mode_car">Car</string>
-	<string name="app_mode_bicycle">Bicycle</string>
-	<string name="app_mode_pedestrian">Pedestrian</string>
-	<string name="position_on_map_center">Center</string>
-	<string name="position_on_map_bottom">Bottom</string>
-	<string name="navigate_point_top_text">Input latitude &amp; longitude in the selected format (D - degrees, M - minutes, S - seconds)</string>
-	<string name="navigate_point_latitude">Latitude</string>
-	<string name="navigate_point_longitude">Longitude</string>
-	<string name="navigate_point_format_D">DDD.DD</string>
-	<string name="navigate_point_format_DM">DDD MM.MM</string>
-	<string name="navigate_point_format_DMS">DDD MM SS.SS</string>
-	<string name="search_address_top_text">Select address</string>
-	<string name="search_address_region">Region</string>
-	<string name="search_address_city">City</string>
-	<string name="search_address_street">Street</string>
-	<string name="search_address_building">Building</string>
-	<string name="search_address_building_option">Building</string>
-	<string name="search_address_street_option">Intersecting street</string>
-	<string name="search_tabs_location">Location</string>
-	<string name="context_menu_item_update_map">Update map</string>
-	<string name="context_menu_item_open_bug">Open OSM bug</string>
-	<string name="context_menu_item_create_poi">Create POI</string>
-	<string name="add_favorite_dialog_top_text">Enter favorite name</string>
-	<string name="add_favorite_dialog_default_favourite_name">Favorite</string>
-	<string name="add_favorite_dialog_favourite_added_template">Favorite point \'\'{0}\'\' was added successfully.</string>
-	<string name="favourites_context_menu_add">Add favorite</string>
-	<string name="favourites_context_menu_edit">Edit favorite</string>
-	<string name="favourites_context_menu_delete">Delete favorite</string>
-	<string name="favourites_remove_dialog_msg">Remove favorite point \'%s\'?</string>
-	<string name="favourites_remove_dialog_success">Favorite point {0} was successfully deleted.</string>
-	<string name="osb_add_dialog_title">Enter bug text</string>
-	<string name="osb_add_dialog_success">Bug successfully created</string>
-	<string name="osb_add_dialog_error">Exception occurred: bug was not created</string>
-	<string name="osb_author_dialog_password">OSM password (optional)</string>
-	<string name="osb_comment_menu_item">Add comment</string>
-	<string name="osb_comment_dialog_message">Message</string>
-	<string name="osb_comment_dialog_author">Author name</string>
-	<string name="osb_comment_dialog_title">Adding comment to bug</string>
-	<string name="osb_comment_dialog_add_button">Add comment</string>
-	<string name="osb_comment_dialog_success">Comment was successfully added</string>
-	<string name="osb_comment_dialog_error">Exception occurred: comment was not added</string>
-	<string name="osb_close_menu_item">Close bug</string>
-	<string name="osb_close_dialog_title">Closing bug</string>
-	<string name="osb_close_dialog_close_button">Close bug</string>
-	<string name="osb_close_dialog_success">Bug was successfully closed</string>
-	<string name="osb_close_dialog_error">Exception occurred: bug was not closed</string>
-	<string name="poi_edit_title">Edit POI</string>
-	<string name="poi_create_title">Create POI</string>
-	<string name="poi_error_poi_not_found">Node cannot be found or amenity is not a single node</string>
-	<string name="poi_remove_confirm_template">Delete {0} (enter comment)?</string>
-	<string name="poi_remove_title">Delete POI</string>
-	<string name="poi_remove_success">POI was successfully deleted</string>
-	<string name="poi_action_add">add</string>
-	<string name="poi_action_change">change</string>
-	<string name="poi_action_delete">delete</string>
-	<string name="poi_action_succeded_template">Action {0} completed successfully.</string>
-	<string name="poi_error_unexpected_template">Unexpected error occurred while performing action {0}.</string>
-	<string name="poi_error_io_error_template">I/O error occurred while performing action {0}.</string>
-	<string name="poi_error_info_not_loaded">Info about node was not loaded</string>
-	<string name="poi_dialog_name">Name</string>
-	<string name="poi_dialog_opening_hours">Open</string>
-	<string name="poi_dialog_comment">Comment</string>
-	<string name="poi_dialog_comment_default">POI changing</string>
-	<string name="poi_dialog_other_tags_message">All other tags are preserved</string>
-	<string name="default_buttons_commit">Commit</string>
-	<string name="filter_current_poiButton">Filter</string>
-	<string name="edit_filter_save_as_menu_item">Save As</string>
-	<string name="edit_filter_delete_dialog_title">Delete selected filter?</string>
-	<string name="edit_filter_delete_message">Filter {0} has been deleted</string>
-	<string name="edit_filter_create_message">Filter {0} has been created</string>
-	<string name="email">email</string>
-	<string name="av_camera_focus">Camera focus type</string>
-	<string name="av_camera_focus_descr">Select internal camera focus type</string>
-	<string name="av_camera_focus_auto">Auto focus</string>
-	<string name="av_camera_focus_hiperfocal">Hyperfocal focus</string>
-	<string name="av_camera_focus_edof">Extended depth of field (EDOF)</string>
-	<string name="av_camera_focus_infinity">Focus is set at infinity</string>
-	<string name="av_camera_focus_macro">Macro (close-up) focus mode</string>
-	<string name="av_camera_focus_continuous">The camera continuously tries to focus</string>
-	<string name="av_photo_play_sound">Play sound on photo shot</string>
-	<string name="av_photo_play_sound_descr">Choose whether to play a sound when shooting photos</string>
-	<string name="av_camera_pic_size">Camera Picture Size</string>
-	<string name="av_camera_pic_size_descr">Select internal camera Picture Size</string>
-    <string name="navigation_intent_invalid">Invalid format: %s</string>
-	<string name="plugin_description_title">Description</string>
-	<string name="plugin_install_needs_network">You need an Internet connection to install this plugin.</string>
-	<string name="get_plugin">Get</string>
-	<string name="use_fast_recalculation">Smart route recalculation</string>
-	<string name="use_fast_recalculation_desc">Recalculate only initial part of the route for long trips</string>
-	<string name="do_you_like_osmand">Do you like OsmAnd?</string>
-	<string name="we_really_care_about_your_opinion">We care much about your opinion and it is important for us to hear you back.</string>
-	<string name="rate_this_app">Rate this app</string>
-	<string name="rate_this_app_long">Please give OsmAnd a score on Google Play</string>
-	<string name="user_hates_app_get_feedback">Tell us why.</string>
-	<string name="user_hates_app_get_feedback_long">Please tell us what would you want to change in this app.</string>
-	<string name="failed_to_upload">Failed to upload</string>
-	<string name="delete_change">Delete change</string>
-	<string name="successfully_uploaded_pattern">Successfully uploaded {0}/{1}</string>
-	<string name="try_again">Try again</string>
-	<string name="error_message_pattern">Error: {0}</string>
-	<string name="dahboard_options_dialog_title">Configure dashboard</string>
-	<string name="show_on_start">Show on start</string>
-	<string name="shared_string_card_was_hidden">Card was hidden</string>
-	<string name="shared_string_undo">UNDO</string>
-	<string name="shared_string_skip">Skip</string>
-	<string name="app_name_osmand">OsmAnd</string>
-	<string name="offline_maps_and_navigation"><![CDATA[Offline Maps\n& Navigation]]></string>
-	<string name="commit_poi">Commit POI</string>
-	<string name="tab_title_basic">Basic</string>
-	<string name="tab_title_advanced">Advanced</string>
-	<string name="building_number">Building Number</string>
-	<string name="next_proceed">Next</string>
-	<string name="opening_at">Opening at</string>
-	<string name="closing_at">Closing at</string>
-	<string name="tag_poi_name">name</string>
-	<string name="tag_poi_amenity">amenity</string>
-	<string name="contact_info">Contact info</string>
-	<string name="description">Description</string>
-	<string name="add_opening_hours">Add opening hours</string>
-	<string name="poi_dialog_poi_type">POI Type</string>
-	<string name="number_of_rows_in_dash">Number of rows in dash %1$s</string>
-	<string name="please_specify_poi_type">Please specify POI type.</string>
-	<string name="working_days">Working days</string>
-	<string name="recent_places">Recent places</string>
-	<string name="favourites">Favorites</string>
-	<string name="saved_at_time">Successfully saved at: %1$s</string>
-	<string name="poi_deleted_localy">POI will be deleted once you upload your changes</string>
-	<string name="show_gpx">Show GPX</string>
-	<string name="count_of_lines">Count of lines</string>
-	<string name="are_you_sure">Are you sure?</string>
-	<string name="unsaved_changes_will_be_lost">Any unsaved changes will be lost. Continue?</string>
-	<string name="downloads_left_template">%1$s downloads left</string>
-	<string name="roads">Roads</string>
-</resources>

From 010b42214e801ec969b02106080776b360e660c9 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 11:11:32 +0200
Subject: [PATCH 12/40] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 30a4c04ca8..b50e40cc0c 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2158,4 +2158,6 @@
     <string name="m_s">m/s</string>
     
     <string name="default_speed_system_descr">Vælg enheder</string>
+    <string name="favorite_category_add_new">Tilføj ny</string>
+    <string name="favorite_category_select">Vælg kategori</string>
     </resources>

From ceddebce3fc9eb786aa522f9361397764412f0f2 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Tue, 29 Sep 2015 12:44:03 +0300
Subject: [PATCH 13/40] Fix typo

---
 .../download/newimplementation/IndexItemCategoryWithSubcat.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java b/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java
index d0e95d0c25..66851bfa55 100644
--- a/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java
+++ b/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java
@@ -59,7 +59,7 @@ public class IndexItemCategoryWithSubcat implements Comparable<IndexItemCategory
 
 	public static List<IndexItemCategoryWithSubcat> categorizeIndexItems(final OsmandApplication ctx,
 																		 Collection<IndexItem> indexItems) {
-		boolean skipWiki = Version.isFreeVersion(ctx);NewLocalIndexesFragment
+		boolean skipWiki = Version.isFreeVersion(ctx);
 		final Map<String, IndexItemCategoryWithSubcat> cats = new TreeMap<>();
 		ArrayList<IndexItemCategoryWithSubcat> mainList = new ArrayList<>();
 		for (IndexItem i : indexItems) {

From 1010e77a3f423b47bbcf3c743be7a78a4636bc7c Mon Sep 17 00:00:00 2001
From: Matej U <mateju@svn.gnome.org>
Date: Tue, 29 Sep 2015 12:35:32 +0200
Subject: [PATCH 14/40] Translated using Weblate (Slovenian)

Currently translated at 100.0% (1746 of 1746 strings)
---
 OsmAnd/res/values-sl/strings.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 047fbf9b17..a4f90d6815 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -1995,4 +1995,21 @@
     <string name="osmand_running_in_background">Delovanje v ozadju</string>
     <string name="favourites_edit_dialog_title">Podrobnosti o točki</string>
     <string name="favourites_context_menu_add">Dodaj priljubljeno</string>
-	</resources>
+	<string name="favorite_category_add_new">Dodaj novo</string>
+    <string name="favorite_category_select">Izberi kategorijo</string>
+    <string name="default_speed_system_descr">Določi sistem merjenja hitrosti</string>
+    <string name="default_speed_system">Merjenje hitrosti</string>
+    <string name="nm">nmi</string>
+    <string name="si_nm">Morske milje</string>
+    <string name="si_kmh">Kilometri na uro</string>
+    <string name="si_mph">Milje na uro</string>
+    <string name="si_m_s">Metri na sekundo</string>
+    <string name="si_min_km">Minute na kilometer</string>
+    <string name="si_min_m">Minute na miljo</string>
+    <string name="si_nm_h">Morske milje na uro (vozli)</string>
+    <string name="nm_h">nmi/h</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="m_s">m/s</string>
+    
+    </resources>

From f4d5de8f55561540cfe81659d5c99d667cf4d117 Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Tue, 29 Sep 2015 14:15:45 +0200
Subject: [PATCH 15/40] Translated using Weblate (Chinese (Taiwan))

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

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index f77385f833..2e34022fcf 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2137,4 +2137,6 @@
     <string name="m_s">秒/公尺</string>
     
     <string name="nm_h">浬時</string>
+    <string name="favorite_category_add_new">增加新的</string>
+    <string name="favorite_category_select">選擇類別</string>
     </resources>

From 1b7a75d72a9d07cb7a1ab1d6a34384fdad86ec69 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Tue, 29 Sep 2015 16:02:21 +0300
Subject: [PATCH 16/40] Now loading of map categories happening after activity
 start. Fragment saves its state now.

---
 .../osmand/plus/activities/TabActivity.java   |  8 +-
 .../plus/download/BaseDownloadActivity.java   |  6 +-
 .../plus/download/DownloadActivity.java       | 73 +++++++++++--------
 .../plus/download/DownloadIndexFragment.java  | 25 ++++---
 .../plus/download/DownloadIndexesThread.java  |  2 +-
 .../NewLocalIndexesFragment.java              | 31 +++++++-
 .../SubcategoriesFragment.java                |  4 -
 7 files changed, 94 insertions(+), 55 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/TabActivity.java b/OsmAnd/src/net/osmand/plus/activities/TabActivity.java
index 5ac931fb5d..f806a96433 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TabActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TabActivity.java
@@ -1,12 +1,12 @@
 package net.osmand.plus.activities;
 
-import java.util.List;
-
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.view.ViewPager;
 
+import java.util.List;
+
 /**
  * Created by Denis
  * on 26.01.2015.
@@ -34,7 +34,7 @@ public class TabActivity extends ActionBarProgressActivity {
 		pager.setAdapter(new OsmandFragmentPagerAdapter(getSupportFragmentManager(), items));
 	}
 
-	public static class OsmandFragmentPagerAdapter extends FragmentPagerAdapter {
+	public static class OsmandFragmentPagerAdapter extends FragmentStatePagerAdapter {
 
 		private List<TabItem> mTabs;
 
diff --git a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
index 8a08b95ab8..10339c58c7 100644
--- a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
@@ -21,9 +21,11 @@ import net.osmand.plus.download.newimplementation.IndexItemCategoryWithSubcat;
 import java.lang.ref.WeakReference;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Created by Denis
@@ -33,7 +35,7 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 	protected DownloadActivityType type = DownloadActivityType.NORMAL_FILE;
 	protected OsmandSettings settings;
 	public static DownloadIndexesThread downloadListIndexThread;
-	protected List<WeakReference<Fragment>> fragList = new ArrayList<>();
+	protected Set<WeakReference<Fragment>> fragSet = new HashSet<>();
 	protected List<IndexItem> downloadQueue = new ArrayList<>();
 
 	public static final int MAXIMUM_AVAILABLE_FREE_DOWNLOADS = 10;
@@ -217,7 +219,7 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 
 	@Override
 	public void onAttachFragment(Fragment fragment) {
-		fragList.add(new WeakReference<Fragment>(fragment));
+		fragSet.add(new WeakReference<Fragment>(fragment));
 	}
 
 	public void makeSureUserCancelDownload() {
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index f607aff73d..b1f6285b32 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -75,6 +75,7 @@ public class DownloadActivity extends BaseDownloadActivity {
 	public static final String UPDATES_TAB = "updates";
 	public static final String SINGLE_TAB = "SINGLE_TAB";
 	private List<DownloadActivityType> downloadTypes = new ArrayList<DownloadActivityType>();
+	private List<IndexItemCategoryWithSubcat> cats;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -164,13 +165,13 @@ public class DownloadActivity extends BaseDownloadActivity {
 			public void onClick(View v) {
 				getEntriesToDownload().clear();
 				updateDownloadButton();
-				for (WeakReference<Fragment> ref : fragList) {
+				for (WeakReference<Fragment> ref : fragSet) {
 					Fragment f = ref.get();
 					if (f instanceof OsmAndListFragment) {
-						if (!f.isDetached() && ((OsmAndListFragment) f).getListAdapter() instanceof ArrayAdapter) {
+						if (f.isAdded() && ((OsmAndListFragment) f).getListAdapter() instanceof ArrayAdapter) {
 							((ArrayAdapter) ((OsmAndListFragment) f).getListAdapter()).notifyDataSetChanged();
 						}
-					} else if (!f.isDetached() && f instanceof OsmandExpandableListFragment &&
+					} else if (f.isAdded() && f instanceof OsmandExpandableListFragment &&
 							((OsmandExpandableListFragment) f).getAdapter() instanceof BaseExpandableListAdapter) {
 						((BaseExpandableListAdapter) ((OsmandExpandableListFragment) f).getAdapter()).notifyDataSetChanged();
 					}
@@ -283,10 +284,10 @@ public class DownloadActivity extends BaseDownloadActivity {
 
 	@Override
 	public void updateDownloadList(List<IndexItem> list) {
-		for (WeakReference<Fragment> ref : fragList) {
+		for (WeakReference<Fragment> ref : fragSet) {
 			Fragment f = ref.get();
 			if (f instanceof UpdatesIndexFragment) {
-				if (!f.isDetached()) {
+				if (f.isAdded()) {
 					((UpdatesIndexFragment) f).updateItemsList(list);
 				}
 			}
@@ -295,10 +296,10 @@ public class DownloadActivity extends BaseDownloadActivity {
 
 	@Override
 	public void categorizationFinished(List<IndexItem> filtered, List<IndexItemCategory> cats) {
-		for (WeakReference<Fragment> ref : fragList) {
+		for (WeakReference<Fragment> ref : fragSet) {
 			Fragment f = ref.get();
 			if (f instanceof DownloadIndexFragment) {
-				if (!f.isDetached()) {
+				if (f.isAdded()) {
 					((DownloadIndexFragment) f).categorizationFinished(filtered, cats);
 				}
 			}
@@ -308,22 +309,28 @@ public class DownloadActivity extends BaseDownloadActivity {
 	@Override
 	public void onCategorizationFinished(List<IndexItem> filtered,
 										 List<IndexItemCategoryWithSubcat> cats) {
-		for (WeakReference<Fragment> ref : fragList) {
+		boolean isPushed = false;
+		for (WeakReference<Fragment> ref : fragSet) {
 			Fragment f = ref.get();
 			if (f instanceof NewLocalIndexesFragment) {
-				if (!f.isDetached()) {
+				if (f.isAdded()) {
+					isPushed = true;
 					((NewLocalIndexesFragment) f).onCategorizationFinished(filtered, cats);
 				}
 			}
 		}
+		if (!isPushed) {
+			this.cats = cats;
+		}
 	}
 
 	public void downloadListUpdated() {
-		for (WeakReference<Fragment> ref : fragList) {
+		for (WeakReference<Fragment> ref : fragSet) {
 			Fragment f = ref.get();
 			if (f instanceof DownloadIndexFragment) {
-				if (!f.isDetached()) {
-					((DownloadIndexAdapter) ((DownloadIndexFragment) f).getExpandableListAdapter()).notifyDataSetInvalidated();
+				if (f.isAdded()) {
+					((DownloadIndexAdapter) ((DownloadIndexFragment) f).getExpandableListAdapter())
+							.notifyDataSetInvalidated();
 				}
 			}
 		}
@@ -331,15 +338,16 @@ public class DownloadActivity extends BaseDownloadActivity {
 
 	@Override
 	public void downloadedIndexes() {
-		for (WeakReference<Fragment> ref : fragList) {
+		for (WeakReference<Fragment> ref : fragSet) {
 			Fragment f = ref.get();
 			if (f instanceof LocalIndexesFragment) {
-				if (!f.isDetached()) {
+				if (f.isAdded()) {
 					((LocalIndexesFragment) f).reloadData();
 				}
 			} else if (f instanceof DownloadIndexFragment) {
-				if (!f.isDetached()) {
-					DownloadIndexAdapter adapter = ((DownloadIndexAdapter) ((DownloadIndexFragment) f).getExpandableListAdapter());
+				if (f.isAdded()) {
+					DownloadIndexAdapter adapter = ((DownloadIndexAdapter)
+							((DownloadIndexFragment) f).getExpandableListAdapter());
 					if (adapter != null) {
 						adapter.setLoadedFiles(getIndexActivatedFileNames(), getIndexFileNames());
 
@@ -446,22 +454,23 @@ public class DownloadActivity extends BaseDownloadActivity {
 			findViewById(R.id.wikiButton).setVisibility(wikipediaItems.size() == 0 ? View.GONE : View.VISIBLE);
 		}
 
-		for (WeakReference<Fragment> ref : fragList) {
+		for (WeakReference<Fragment> ref : fragSet) {
 			Fragment f = ref.get();
-			if (!f.isDetached()) {
-				if (f instanceof OsmandExpandableListFragment) {
-					ExpandableListAdapter ad = ((OsmandExpandableListFragment) f).getExpandableListView()
-							.getExpandableListAdapter();
-					if (ad instanceof OsmandBaseExpandableListAdapter) {
-						((OsmandBaseExpandableListAdapter) ad).notifyDataSetChanged();
-					}
-				} else if (f instanceof ListFragment) {
-					ListAdapter la = ((ListFragment) f).getListAdapter();
-					if (la instanceof BaseAdapter) {
-						((BaseAdapter) la).notifyDataSetChanged();
+			if (f != null)
+				if (f.isAdded()) {
+					if (f instanceof OsmandExpandableListFragment) {
+						ExpandableListAdapter ad = ((OsmandExpandableListFragment) f).getExpandableListView()
+								.getExpandableListAdapter();
+						if (ad instanceof OsmandBaseExpandableListAdapter) {
+							((OsmandBaseExpandableListAdapter) ad).notifyDataSetChanged();
+						}
+					} else if (f instanceof ListFragment) {
+						ListAdapter la = ((ListFragment) f).getListAdapter();
+						if (la instanceof BaseAdapter) {
+							((BaseAdapter) la).notifyDataSetChanged();
+						}
 					}
 				}
-			}
 		}
 //		if (scroll) {
 //			getExpandableListView().scrollTo(x, y);
@@ -533,6 +542,12 @@ public class DownloadActivity extends BaseDownloadActivity {
 		return downloadListIndexThread != null ? downloadListIndexThread.getIndexFileNames() : null;
 	}
 
+	public List<IndexItemCategoryWithSubcat> getCats() {
+		List<IndexItemCategoryWithSubcat> toReturn = cats;
+		cats = null;
+		return toReturn;
+	}
+
 	public void showDialogToDownloadMaps(Collection<String> maps) {
 		int count = 0;
 		int sz = 0;
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
index ebb9ebceb4..0802692936 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
@@ -1,17 +1,6 @@
 package net.osmand.plus.download;
 
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import net.osmand.access.AccessibleToast;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.OsmandExpandableListFragment;
-import net.osmand.plus.base.BasicProgressAsyncTask;
 import android.os.Bundle;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBar;
@@ -31,9 +20,21 @@ import android.widget.ExpandableListAdapter;
 import android.widget.ExpandableListView;
 import android.widget.Toast;
 
+import net.osmand.access.AccessibleToast;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.OsmandExpandableListFragment;
+import net.osmand.plus.base.BasicProgressAsyncTask;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 
 public class DownloadIndexFragment extends OsmandExpandableListFragment {
-	
+
 	/** menus **/
 	private static boolean SHOW_ONLY_RELOAD = true;
 	public static final int MORE_ID = 10;
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
index bf24764d7d..b9bf648950 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
@@ -430,7 +430,7 @@ public class DownloadIndexesThread {
 							AccessibleToast.makeText(uiActivity, R.string.basemap_was_selected_to_download,
 									Toast.LENGTH_LONG).show();
 							if (uiActivity instanceof DownloadActivity) {
-								((DownloadActivity) uiActivity).updateDownloadButton();
+								uiActivity.updateDownloadButton();
 							}
 						}
 					}
diff --git a/OsmAnd/src/net/osmand/plus/download/newimplementation/NewLocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/newimplementation/NewLocalIndexesFragment.java
index c3fc75c01f..3ffdf5ae58 100644
--- a/OsmAnd/src/net/osmand/plus/download/newimplementation/NewLocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/newimplementation/NewLocalIndexesFragment.java
@@ -30,12 +30,14 @@ import org.apache.commons.logging.Log;
 
 import java.io.File;
 import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
 
 public class NewLocalIndexesFragment extends OsmAndListFragment {
 	private static final Log LOG = PlatformUtil.getLog(NewLocalIndexesFragment.class);
+	public static final String CATEGORIES = "categories";
 	private static final MessageFormat formatGb = new MessageFormat("{0, number,<b>#.##</b>} GB", Locale.US);
 
 	public static final int RELOAD_ID = 0;
@@ -55,6 +57,16 @@ public class NewLocalIndexesFragment extends OsmAndListFragment {
 		mAdapter = new CategoriesAdapter(getActivity(), getMyApplication());
 		listView.setAdapter(mAdapter);
 
+		List<IndexItemCategoryWithSubcat> cats = ((DownloadActivity) getActivity()).getCats();
+		if (cats != null) {
+			onCategorizationFinished(null, cats);
+		}
+		if (savedInstanceState != null) {
+			List<IndexItemCategoryWithSubcat> savedCats =
+					savedInstanceState.getParcelableArrayList(CATEGORIES);
+			onCategorizationFinished(null, savedCats);
+		}
+
 		View header = inflater.inflate(R.layout.local_index_fragment_header, listView, false);
 		initMemoryConsumedCard(header);
 		DownloadsUiInitHelper.initFreeVersionBanner(header, getMyApplication().getSettings(),
@@ -102,11 +114,22 @@ public class NewLocalIndexesFragment extends OsmAndListFragment {
 		return super.onOptionsItemSelected(item);
 	}
 
+	@Override
+	public void onSaveInstanceState(Bundle outState) {
+		LOG.debug("onSaveInstanceState()");
+		ArrayList<IndexItemCategoryWithSubcat> items = new ArrayList<>(mAdapter.getCount());
+		for (int i = 0; i < mAdapter.getCount(); i++) {
+			items.add(mAdapter.getItem(i));
+		}
+		outState.putParcelableArrayList(CATEGORIES, items);
+		super.onSaveInstanceState(outState);
+	}
+
 	@Override
 	public void onListItemClick(ListView l, View v, int position, long id) {
 		FragmentTransaction fragmentTransaction = getChildFragmentManager().beginTransaction();
 		fragmentTransaction.addToBackStack(null);
-		MapsInCategoryFragment.createInstance(mAdapter.getItem(position-1))
+		MapsInCategoryFragment.createInstance(mAdapter.getItem(position - 1))
 				.show(fragmentTransaction, MapsInCategoryFragment.TAG);
 	}
 
@@ -115,8 +138,10 @@ public class NewLocalIndexesFragment extends OsmAndListFragment {
 	}
 
 	public void onCategorizationFinished(List<IndexItem> filtered, List<IndexItemCategoryWithSubcat> cats) {
-		mAdapter.clear();
-		mAdapter.addAll(cats);
+		if (mAdapter != null) {
+			mAdapter.clear();
+			mAdapter.addAll(cats);
+		}
 	}
 
 	private static class CategoriesAdapter extends ArrayAdapter<IndexItemCategoryWithSubcat> {
diff --git a/OsmAnd/src/net/osmand/plus/download/newimplementation/SubcategoriesFragment.java b/OsmAnd/src/net/osmand/plus/download/newimplementation/SubcategoriesFragment.java
index 84a326305d..59909a433d 100644
--- a/OsmAnd/src/net/osmand/plus/download/newimplementation/SubcategoriesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/newimplementation/SubcategoriesFragment.java
@@ -15,7 +15,6 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
@@ -24,10 +23,7 @@ import net.osmand.plus.download.DownloadActivityType;
 import net.osmand.plus.download.IndexItem;
 import net.osmand.plus.helpers.HasName;
 
-import org.apache.commons.logging.Log;
-
 public class SubcategoriesFragment extends Fragment {
-	private static final Log LOG = PlatformUtil.getLog(SubcategoriesFragment.class);
 	private static final String CATEGORY = "category";
 
 	@Nullable

From 10fce077aacbc66a0bc994aaaae958d39d81c4ce Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 14:47:34 +0200
Subject: [PATCH 17/40] Translated using Weblate (Danish)

Currently translated at 100.0% (1746 of 1746 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 b50e40cc0c..3b60892f5f 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2144,7 +2144,7 @@
     <string name="shared_string_navigation">Navigation</string>
     <string name="osmand_running_in_background">Kører i baggrunden</string>
     <string name="default_speed_system">Hastighedsmåling</string>
-    <string name="nm">nm</string>
+    <string name="nm">nmi</string>
     <string name="si_nm">Sømil</string>
     <string name="si_kmh">Kilometer i timen</string>
     <string name="si_mph">Mil i timen</string>
@@ -2152,7 +2152,7 @@
     <string name="si_min_km">Minutter pr. kilometer</string>
     <string name="si_min_m">Minutter pr. mil</string>
     <string name="si_nm_h">Sømil i timen (knob)</string>
-    <string name="nm_h">nmh</string>
+    <string name="nm_h">nmi/t</string>
     <string name="min_mile">min/mil</string>
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>

From e098eefd1144f27191e3b2b6a1029dc5e7e0d584 Mon Sep 17 00:00:00 2001
From: Matej U <mateju@svn.gnome.org>
Date: Tue, 29 Sep 2015 12:39:20 +0200
Subject: [PATCH 18/40] Translated using Weblate (Slovenian)

Currently translated at 29.6% (389 of 1313 strings)
---
 OsmAnd/res/values-sl/phrases.xml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/res/values-sl/phrases.xml b/OsmAnd/res/values-sl/phrases.xml
index 2c07c4afde..ba1f8854e9 100644
--- a/OsmAnd/res/values-sl/phrases.xml
+++ b/OsmAnd/res/values-sl/phrases.xml
@@ -364,14 +364,14 @@
 	<string name="poi_hunting_lodge">Lovska koča</string>
 
 	<string name="poi_place_of_worship">Svetišče</string>
-	<string name="poi_religion_christian">Svetišče: krščansko</string>
-	<string name="poi_religion_jewish">Svetišče: židovsko</string>
-	<string name="poi_religion_muslim">Svetišče: muslimansko</string>
-	<string name="poi_religion_sikh">Svetišče: sikhovsko</string>
-	<string name="poi_religion_buddhist">Svetišče: budistično</string>
-	<string name="poi_religion_hindu">Svetišče: hindujsko</string>
-	<string name="poi_religion_shinto">Svetišče: sintsko</string>
-	<string name="poi_religion_taoist">Svetišče: taoistično</string>
+	<string name="poi_religion_christian">Krščansko svetišče</string>
+	<string name="poi_religion_jewish">Židovsko svetišče</string>
+	<string name="poi_religion_muslim">Muslimansko svetišče</string>
+	<string name="poi_religion_sikh">Sikhovsko svetišče</string>
+	<string name="poi_religion_buddhist">Budistično svetišče</string>
+	<string name="poi_religion_hindu">Hindujsko svetišče</string>
+	<string name="poi_religion_shinto">Sintsko svetišče</string>
+	<string name="poi_religion_taoist">Taoistično svetišče</string>
 
 	<string name="poi_internet_access_wlan">Internetni dostop: wlan</string>
 	<string name="poi_internet_access_terminal">Internetni dostop: terminalski</string>
@@ -413,4 +413,5 @@
 	<string name="poi_barrier_entrance">Vhod</string>
 	<string name="poi_entrance_main">Glavni vhod</string>
 	<string name="poi_entrance">Vhod</string>
-	</resources>
+	<string name="poi_hiking_routes">Pohodniške poti</string>
+		</resources>

From a4666c2c1346cfaab3beda2c96d94efcd5a1d1d0 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Tue, 29 Sep 2015 17:18:23 +0300
Subject: [PATCH 19/40] EditPoi fix. Fix #1674 and #1699

---
 OsmAnd/res/layout/fragment_edit_poi.xml       |   4 +
 .../osmand/plus/osmedit/EditPoiFragment.java  | 189 ++++++++++--------
 .../dialogs/PoiTypeDialogFragment.java        |   9 +-
 3 files changed, 120 insertions(+), 82 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml
index f4dd600277..1e7b216d3f 100644
--- a/OsmAnd/res/layout/fragment_edit_poi.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi.xml
@@ -47,6 +47,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/poi_dialog_name"
+                        android:imeOptions="actionSend"
+                        android:inputType="text"
                         tools:text="@string/lorem_ipsum"/>
 
                 </android.support.design.widget.TextInputLayout>
@@ -80,6 +82,8 @@
                         android:completionThreshold="1"
                         android:drawableRight="@drawable/ic_action_arrow_drop_down"
                         android:hint="@string/poi_dialog_poi_type"
+                        android:imeOptions="actionSend"
+                        android:inputType="text"
                         tools:text="@string/lorem_ipsum"/>
 
                 </android.support.design.widget.TextInputLayout>
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java
index 910f1f1a72..2d54895697 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java
@@ -30,12 +30,15 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import net.osmand.PlatformUtil;
@@ -76,7 +79,6 @@ public class EditPoiFragment extends DialogFragment {
 	private ViewPager viewPager;
 	private boolean isLocalEdit;
 	private boolean mIsUserInput = true;
-	private EditText poiNameEditText;
 	private EditPoiData.TagsChangedListener mTagsChangedListener;
 	private AutoCompleteTextView poiTypeEditText;
 	private Node node;
@@ -112,6 +114,8 @@ public class EditPoiFragment extends DialogFragment {
 				.getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME;
 		int themeId = isLightTheme ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme;
 		setStyle(STYLE_NO_FRAME, themeId);
+		getActivity().getWindow()
+				.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 	}
 
 	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
@@ -214,7 +218,7 @@ public class EditPoiFragment extends DialogFragment {
 			}
 		});
 
-		poiNameEditText = (EditText) view.findViewById(R.id.poiNameEditText);
+		EditText poiNameEditText = (EditText) view.findViewById(R.id.poiNameEditText);
 		poiNameEditText.addTextChangedListener(new TextWatcher() {
 			@Override
 			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -256,27 +260,8 @@ public class EditPoiFragment extends DialogFragment {
 				}
 			}
 		});
-		poiTypeEditText.setOnTouchListener(new View.OnTouchListener() {
-			@Override
-			public boolean onTouch(final View v, MotionEvent event) {
-				final EditText editText = (EditText) v;
-				final int DRAWABLE_RIGHT = 2;
-				if (event.getAction() == MotionEvent.ACTION_UP) {
-					if (event.getX() >= (editText.getRight()
-							- editText.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width()
-							- editText.getPaddingRight())) {
-						if (editPoiData.amenity.getType() != null) {
-							DialogFragment dialogFragment =
-									PoiSubTypeDialogFragment.createInstance(editPoiData.amenity);
-							dialogFragment.show(getChildFragmentManager(), "PoiSubTypeDialogFragment");
-						}
-
-						return true;
-					}
-				}
-				return false;
-			}
-		});
+		poiNameEditText.setOnEditorActionListener(mOnEditorActionListener);
+		poiTypeEditText.setOnEditorActionListener(mOnEditorActionListener);
 
 		Button saveButton = (Button) view.findViewById(R.id.saveButton);
 		int saveButtonTextId = isLocalEdit ? R.string.shared_string_save :
@@ -285,61 +270,7 @@ public class EditPoiFragment extends DialogFragment {
 		saveButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				if (TextUtils.isEmpty(poiTypeEditText.getText())) {
-					poiTypeEditText.setError(getResources().getString(R.string.please_specify_poi_type));
-					return;
-				}
-				OsmPoint.Action action = node.getId() == -1 ? OsmPoint.Action.CREATE : OsmPoint.Action.MODIFY;
-				for (Tag tag : editPoiData.tags) {
-					if (tag.tag.equals(POI_TYPE_TAG)) {
-						final PoiType poiType = allTranslatedSubTypes.get(tag.value.trim().toLowerCase());
-						if (poiType != null) {
-							node.putTag(poiType.getOsmTag(), poiType.getOsmValue());
-							if (poiType.getOsmTag2() != null) {
-								node.putTag(poiType.getOsmTag2(), poiType.getOsmValue2());
-							}
-						} else {
-							node.putTag(editPoiData.amenity.getType().getDefaultTag(), tag.value);
-						}
-//					} else if (tag.tag.equals(OSMSettings.OSMTagKey.DESCRIPTION.getValue())) {
-//						description = tag.value;
-					} else {
-						if (tag.value.length() > 0) {
-							node.putTag(tag.tag, tag.value);
-						} else {
-							node.removeTag(tag.tag);
-						}
-					}
-				}
-				commitNode(action, node, mOpenstreetmapUtil.getEntityInfo(),
-						"",
-						false,//closeChange.isSelected(),
-						new Runnable() {
-							@Override
-							public void run() {
-								if (isLocalEdit) {
-									AccessibleToast.makeText(
-											getActivity(),
-											R.string.osm_changes_added_to_local_edits,
-											Toast.LENGTH_LONG).show();
-								} else {
-									final String message = node.getId() == -1 ?
-											getResources().getString(R.string.poi_action_add)
-											: getResources().getString(R.string.poi_action_change);
-
-									AccessibleToast.makeText(
-											getActivity(),
-											MessageFormat.format(
-													getResources().getString(
-															R.string.poi_action_succeded_template), message),
-											Toast.LENGTH_LONG).show();
-								}
-								if (getActivity() instanceof MapActivity) {
-									((MapActivity) getActivity()).getMapView().refreshMap(true);
-								}
-								dismiss();
-							}
-						}, getActivity(), mOpenstreetmapUtil);
+				save();
 
 			}
 		});
@@ -352,11 +283,69 @@ public class EditPoiFragment extends DialogFragment {
 				fragmentManager.popBackStack();
 			}
 		});
-		updateType(editPoiData.amenity);
+		setAdapterForPoiTypeEditText();
 		setCancelable(false);
 		return view;
 	}
 
+	private void save() {
+		if (TextUtils.isEmpty(poiTypeEditText.getText())) {
+			poiTypeEditText.setError(getResources().getString(R.string.please_specify_poi_type));
+			return;
+		}
+		OsmPoint.Action action = node.getId() == -1 ? OsmPoint.Action.CREATE : OsmPoint.Action.MODIFY;
+		for (Tag tag : editPoiData.tags) {
+			if (tag.tag.equals(POI_TYPE_TAG)) {
+				final PoiType poiType = allTranslatedSubTypes.get(tag.value.trim().toLowerCase());
+				if (poiType != null) {
+					node.putTag(poiType.getOsmTag(), poiType.getOsmValue());
+					if (poiType.getOsmTag2() != null) {
+						node.putTag(poiType.getOsmTag2(), poiType.getOsmValue2());
+					}
+				} else {
+					node.putTag(editPoiData.amenity.getType().getDefaultTag(), tag.value);
+				}
+//					} else if (tag.tag.equals(OSMSettings.OSMTagKey.DESCRIPTION.getValue())) {
+//						description = tag.value;
+			} else {
+				if (tag.value.length() > 0) {
+					node.putTag(tag.tag, tag.value);
+				} else {
+					node.removeTag(tag.tag);
+				}
+			}
+		}
+		commitNode(action, node, mOpenstreetmapUtil.getEntityInfo(),
+				"",
+				false,//closeChange.isSelected(),
+				new Runnable() {
+					@Override
+					public void run() {
+						if (isLocalEdit) {
+							AccessibleToast.makeText(
+									getActivity(),
+									R.string.osm_changes_added_to_local_edits,
+									Toast.LENGTH_LONG).show();
+						} else {
+							final String message = node.getId() == -1 ?
+									getResources().getString(R.string.poi_action_add)
+									: getResources().getString(R.string.poi_action_change);
+
+							AccessibleToast.makeText(
+									getActivity(),
+									MessageFormat.format(
+											getResources().getString(
+													R.string.poi_action_succeded_template), message),
+									Toast.LENGTH_LONG).show();
+						}
+						if (getActivity() instanceof MapActivity) {
+							((MapActivity) getActivity()).getMapView().refreshMap(true);
+						}
+						dismiss();
+					}
+				}, getActivity(), mOpenstreetmapUtil);
+	}
+
 	@Override
 	public void onResume() {
 		super.onResume();
@@ -462,13 +451,38 @@ public class EditPoiFragment extends DialogFragment {
 		mIsUserInput = true;
 		poiTypeTextInputLayout.setHint(amenity.getType().getTranslation());
 
+		setAdapterForPoiTypeEditText();
+
+		poiTypeEditText.setOnTouchListener(new View.OnTouchListener() {
+			@Override
+			public boolean onTouch(final View v, MotionEvent event) {
+				final EditText editText = (EditText) v;
+				final int DRAWABLE_RIGHT = 2;
+				if (event.getAction() == MotionEvent.ACTION_UP) {
+					if (event.getX() >= (editText.getRight()
+							- editText.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width()
+							- editText.getPaddingRight())) {
+						if (editPoiData.amenity.getType() != null) {
+							DialogFragment dialogFragment =
+									PoiSubTypeDialogFragment.createInstance(editPoiData.amenity);
+							dialogFragment.show(getChildFragmentManager(), "PoiSubTypeDialogFragment");
+						}
+
+						return true;
+					}
+				}
+				return false;
+			}
+		});
+	}
+
+	private void setAdapterForPoiTypeEditText() {
 		final Map<String, PoiType> subCategories = new LinkedHashMap<>();
 		for (Map.Entry<String, PoiType> s : allTranslatedSubTypes.entrySet()) {
 			if (!subCategories.containsKey(s.getKey())) {
 				subCategories.put(Algorithms.capitalizeFirstLetterAndLowercase(s.getKey()), s.getValue());
 			}
 		}
-
 		final ArrayAdapter<Object> adapter = new ArrayAdapter<>(getActivity(),
 				R.layout.list_textview, subCategories.keySet().toArray());
 		poiTypeEditText.setAdapter(adapter);
@@ -477,6 +491,7 @@ public class EditPoiFragment extends DialogFragment {
 			@Override
 			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
 				Object item = parent.getAdapter().getItem(position);
+				LOG.debug("item=" + item);
 				if (subCategories.containsKey(item)) {
 					String keyName = subCategories.get(item).getKeyName();
 					poiTypeEditText.setText(keyName);
@@ -487,6 +502,7 @@ public class EditPoiFragment extends DialogFragment {
 			public void onNothingSelected(AdapterView<?> parent) {
 			}
 		});
+
 	}
 
 	private OsmandApplication getMyApplication() {
@@ -614,4 +630,17 @@ public class EditPoiFragment extends DialogFragment {
 			return builder.create();
 		}
 	}
+
+	private TextView.OnEditorActionListener mOnEditorActionListener =
+			new TextView.OnEditorActionListener() {
+				@Override
+				public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+					boolean handled = false;
+					if (actionId == EditorInfo.IME_ACTION_SEND) {
+						save();
+						handled = true;
+					}
+					return handled;
+				}
+			};
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/PoiTypeDialogFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/PoiTypeDialogFragment.java
index 49921ce806..077329c2c3 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/PoiTypeDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/PoiTypeDialogFragment.java
@@ -27,12 +27,17 @@ public class PoiTypeDialogFragment extends DialogFragment {
 		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 		final List<PoiCategory> categories = poiTypes.getCategories(false);
 		ArrayList<String> vals = new ArrayList<>(categories.size());
+		ArrayList<PoiCategory> toDelete = new ArrayList<>();
 		// TODO replace with constants
 		for (PoiCategory category : categories) {
 			if (category.getKeyName().equals("user_defined_other")
-					|| category.getKeyName().equals("osmwiki")) continue;
-			vals.add(category.getTranslation());
+					|| category.getKeyName().equals("osmwiki")) {
+				toDelete.add(category);
+			} else {
+				vals.add(category.getTranslation());
+			}
 		}
+		categories.removeAll(toDelete);
 		builder.setItems(vals.toArray(new String[vals.size()]), new Dialog.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {

From f8b3453b91098d13b228d1aded45d792d9421968 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Tue, 29 Sep 2015 19:10:12 +0300
Subject: [PATCH 20/40] Update license

---
 LICENSE | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/LICENSE b/LICENSE
index acb12f2ee5..a739fdd6b9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -44,6 +44,25 @@
     * Map icons are taken from sjjb and some are drawn and distributed under Public Domain (except icons8)
         - https://github.com/osmandapp/OsmAnd-resources/tree/master/icons/svg
 
+    * Subway icons
+	- Moscow: Art Lebedev Studio (http://www.artlebedev.ru/everything/metro/logo/) [Public domain], undefined
+	- Samara: «Metro-logo» (Altoing) - Own work. Under Public domain Commons licensefrom the site - https://commons.wikimedia.org/wiki/File:Metro-logo.svg#/media/File:Metro-logo.svg
+	- Budapest: «BKV metro» (Plexipajzs) - hu:Fájl:BKV metro.svg. Under license Public domain Commons licensefrom the site - https://commons.wikimedia.org/wiki/File:BKV_metro.svg#/media/File:BKV_metro.svg
+	- Saint-Petersburg: «Spb metro logo» (Orange-kun) (vector version) - Vectorised version made with Adobe Illustrator. Under license Public domain Commons licensefrom the site - https://commons.wikimedia.org/wiki/File:Spb_metro_logo.svg#/media/File:Spb_metro_logo.svg
+	- Germany: «U-Bahn» (3247) - own work. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:U-Bahn.svg#/media/File:U-Bahn.svg
+	- Wien: «U-Bahn Wien» (Siegele Roland) - Logo der U-Bahn Wien. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:U-Bahn_Wien.svg#/media/File:U-Bahn_Wien.svg
+	- Kazan: «Kazan-metro-Logo» (Россиянин) - own work. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:Kazan-metro-Logo.svg#/media/File:Kazan-metro-Logo.svg
+	- Tbilisi: «Metro Tbilisi logo» (Carnby) - own work. Under CC BY-SA 3.0 license from site - https://commons.wikimedia.org/wiki/File:Metro_Tbilisi_logo.svg#/media/File:Metro_Tbilisi_logo.svg
+	- Minsk: «Minsk metro logo» (Skip405) - own work. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:Minsk_metro_logo.svg#/media/File:Minsk_metro_logo.svg
+	- Nizhny Novgorod: «NNMetro» (AlexTref871) - own work. This vector image includes elements borrowed from another image:  Coat of arms of Nizhny Novgorod Region.svg.. Under Public domain Commons licensefrom the site - https://commons.wikimedia.org/wiki/File:NNMetro.svg#/media/File:NNMetro.svg
+	- Novosibirsk: «Logo-Nsk-Metro» (AlexTref871) - own work. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:Logo-Nsk-Metro.svg#/media/File:Logo-Nsk-Metro.svg
+	- Yekaterinburg: «Ekt-metro-logo-01» (AlexTref871) - own work. Under CC BY-SA 4.0 license from site - https://commons.wikimedia.org/wiki/File:Ekt-metro-logo-01.svg#/media/File:Ekt-metro-logo-01.svg
+	- New York: «MTA New York City Subway logo» (Metropolitan Transportation Authority) - http://mta.info/. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:MTA_New_York_City_Subway_logo.svg#/media/File:MTA_New_York_City_Subway_logo.svg
+	- Paris: «Metro-M» (Pb 2001) - own work. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:Metro-M.svg#/media/File:Metro-M.svg
+	- Madrid: «MetroMadridLogo» (Przemysław Sakrajda) - own work based on (na podstawie) www.metromadrid.es. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:MetroMadridLogo.svg#/media/File:MetroMadridLogo.svg
+	- London: «Underground» (Dream out loud) - own work. Under Public domain Commons license from the site - https://commons.wikimedia.org/wiki/File:Underground.svg#/media/File:Underground.svg
+	- Barcelona: «Logometrobcn» (Javitomad) - own work. Under GFDL license - https://commons.wikimedia.org/wiki/File:Logometrobcn.svg#/media/File:Logometrobcn.svg
+
     * Integration with Qt library in (https://github.com/osmandapp/Osmand-core/) - dynamic linking
         - LGPL (http://www.qt.io/qt-licensing-terms/)
 

From b1d8e3ff231837bf9c0df49b3739f250f6288e58 Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Tue, 29 Sep 2015 19:37:13 +0200
Subject: [PATCH 21/40] Translated using Weblate (Argentinean Spanish)

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

diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 43e99edefa..93ba90c8c5 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2081,4 +2081,6 @@
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>
     
+    <string name="favorite_category_add_new">Añadir nuevo</string>
+    <string name="favorite_category_select">Elegir categoría</string>
     </resources>

From 89625754381ad12abbbf61dd0f21f7e35fb3b268 Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Tue, 29 Sep 2015 19:38:30 +0200
Subject: [PATCH 22/40] Translated using Weblate (Slovak)

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

diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 2fcb8c752c..1fb0ab3436 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2295,4 +2295,24 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 <string name="favourites_edit_dialog_title">Informácie o obľúbenom bode</string>
     <string name="favourites_context_menu_add">Pridať obľúbený bod</string>
 	<string name="roads">Cesty</string>
-</resources>
+<string name="favorite_category_add_new">Pridať nový</string>
+    <string name="favorite_category_select">Zvoľte kategóriu</string>
+    <string name="default_speed_system_descr">Zvoľte spôsob merania rýchlosti</string>
+    <string name="default_speed_system">Meranie rýchlosti</string>
+    <string name="nm">nm</string>
+    <string name="si_nm">Námorné míle</string>
+    <string name="si_kmh">Kilometre za hodinu</string>
+    <string name="si_mph">Míle za hodinu</string>
+    <string name="si_m_s">Metre za sekundu</string>
+    <string name="si_min_km">Minúty za kilometer</string>
+    <string name="si_min_m">Minúty za míľu</string>
+    <string name="si_nm_h">Námorné míle za hodinu (uzly)</string>
+    <string name="nm_h">nm/h</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="m_s">m/s</string>
+    
+    <string name="shared_string_trip_recording">Nahrávanie výletu</string>
+    <string name="shared_string_navigation">Navigácia</string>
+    <string name="osmand_running_in_background">Beh v pozadí</string>
+    </resources>

From 00944b8e9b8d8d090fcf31a66b30ff2792c9b105 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Tue, 29 Sep 2015 21:50:49 +0300
Subject: [PATCH 23/40] Introduced WorldRegion

---
 .../src/net/osmand/map/OsmandRegions.java     |  27 +-
 .../src/net/osmand/plus/AppInitializer.java   |   4 +
 .../net/osmand/plus/OsmandApplication.java    |   8 +-
 OsmAnd/src/net/osmand/plus/WorldRegion.java   | 278 ++++++++++++++++++
 4 files changed, 313 insertions(+), 4 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/WorldRegion.java

diff --git a/OsmAnd-java/src/net/osmand/map/OsmandRegions.java b/OsmAnd-java/src/net/osmand/map/OsmandRegions.java
index f3561ea035..7ba6a10c16 100644
--- a/OsmAnd-java/src/net/osmand/map/OsmandRegions.java
+++ b/OsmAnd-java/src/net/osmand/map/OsmandRegions.java
@@ -44,8 +44,13 @@ public class OsmandRegions {
 	Map<String, String> fullMapNamesToDownloadNames = new HashMap<String, String>();
 	Map<String, String> downloadNamesToFullNames = new HashMap<String, String>();
 	Map<String, String> fullNamesToLowercaseIndex = new HashMap<String, String>();
+	Map<String, String> fullNamesToParentFullNames = new HashMap<String, String>();
+	Map<String, String> fullNamesToDownloadNames = new HashMap<String, String>();
 	QuadTree<String> quadTree = null ;
 
+	public Map<String, String> getFullNamesToLowercaseCopy() {
+		return new HashMap<>(fullNamesToLowercaseIndex);
+	}
 
 	Integer parentFullName = null;
 	Integer fullNameType = null;
@@ -86,7 +91,15 @@ public class OsmandRegions {
 		}
 		return downloadName.replace('_', ' ');
 	}
-	
+
+	public String getLocaleNameByFullName(String fullName) {
+		if (fullNamesToLocaleNames.containsKey(fullName)) {
+			return fullNamesToLocaleNames.get(fullName);
+		} else {
+			return fullName.replace('_', ' ');
+		}
+	}
+
 	public String getDownloadNameIndexLowercase(String downloadName) {
 		if(downloadName == null) {
 			return null;
@@ -304,7 +317,15 @@ public class OsmandRegions {
 	public String getMapDownloadType(String fullname) {
 		return fullMapNamesToDownloadNames.get(fullname);
 	}
-	
+
+	public String getDownloadName(String fullname) {
+		return fullNamesToDownloadNames.get(fullname);
+	}
+
+	public String getParentFullName(String fullname) {
+		return fullNamesToParentFullNames.get(fullname);
+	}
+
 	public void initLocaleNames() throws IOException {
 //		final Collator clt = OsmAndCollator.primaryCollator();
 		final Map<String, String> parentRelations = new LinkedHashMap<String, String>();
@@ -323,6 +344,7 @@ public class OsmandRegions {
 				String parentFullName = getParentFullName(object);
 				String fullName = getFullName(object);
 				if(!Algorithms.isEmpty(parentFullName)) {
+					fullNamesToParentFullNames.put(fullName, parentFullName);
 					parentRelations.put(fullName, parentFullName);
 				}				
 				String locName = getLocaleName(object);
@@ -350,6 +372,7 @@ public class OsmandRegions {
 				fullNamesToLowercaseIndex.put(fullName, ind.toString());
 				String downloadName = getDownloadName(object);
 				if(downloadName != null) {
+					fullNamesToDownloadNames.put(fullName, downloadName);
 					downloadNamesToFullNames.put(downloadName, fullName);
 					if(isDownloadOfType(object, MAP_TYPE)) {
 						fullMapNamesToDownloadNames.put(fullName, downloadName);
diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java
index 8d28fcb06e..1e54201f87 100644
--- a/OsmAnd/src/net/osmand/plus/AppInitializer.java
+++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java
@@ -211,6 +211,7 @@ public class AppInitializer implements IProgress {
 							new FileOutputStream(file));
 				}
 				app.regions.prepareFile(file.getAbsolutePath());
+				loadWorldRegions();
 			}
 		} catch (Exception e) {
 			warnings.add(e.getMessage());
@@ -218,6 +219,9 @@ public class AppInitializer implements IProgress {
 		}
 	}
 
+	private void loadWorldRegions() {
+		app.worldRegion = WorldRegion.loadWorldRegions(app);
+	}
 	
 	private void initPoiTypes() {
 		if(app.getAppPath("poi_types.xml").exists()) {
diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
index 57cb57aa1a..1a505fe83b 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
@@ -96,7 +96,8 @@ public class OsmandApplication extends Application {
 	AvoidSpecificRoads avoidSpecificRoads;
 	BRouterServiceConnection bRouterServiceConnection;
 	OsmandRegions regions;
-	
+	WorldRegion worldRegion;
+
 
 	RoutingConfiguration.Builder defaultRoutingConfig;
 	private Locale preferredLocale = null;
@@ -653,7 +654,10 @@ public class OsmandApplication extends Application {
 	public OsmandRegions getRegions() {
 		return regions;
 	}
-	
+	public WorldRegion getWorldRegion() {
+		return worldRegion;
+	}
+
 	public boolean accessibilityExtensions() {
 		return (Build.VERSION.SDK_INT < 14) ? getSettings().ACCESSIBILITY_EXTENSIONS.get() : false;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/WorldRegion.java b/OsmAnd/src/net/osmand/plus/WorldRegion.java
new file mode 100644
index 0000000000..5eeceb5077
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/WorldRegion.java
@@ -0,0 +1,278 @@
+package net.osmand.plus;
+
+import android.content.res.Resources;
+
+import net.osmand.PlatformUtil;
+import net.osmand.data.LatLon;
+import net.osmand.map.OsmandRegions;
+import net.osmand.plus.download.DownloadActivityType;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public class WorldRegion {
+
+	public static final String AFRICA_REGION_ID = "africa";
+	public static final String ASIA_REGION_ID = "asia";
+	public static final String AUSTRALIA_AND_OCEANIA_REGION_ID = "australia-oceania";
+	public static final String CENTRAL_AMERICA_REGION_ID = "centralamerica";
+	public static final String EUROPE_REGION_ID = "europe";
+	public static final String NORTH_AMERICA_REGION_ID = "northamerica";
+	public static final String RUSSIA_REGION_ID = "russia";
+	public static final String SOUTH_AMERICA_REGION_ID = "southamerica";
+
+	private static final org.apache.commons.logging.Log LOG = PlatformUtil.getLog(WorldRegion.class);
+
+	// Region data
+	private String regionId;
+	private String downloadsIdPrefix;
+	private String name;
+
+	private LatLon bboxTopLeft;
+	private LatLon bboxBottomRight;
+
+	private LinkedList<DownloadActivityType> resourceTypes;
+
+	// Hierarchy
+	private WorldRegion superregion;
+	private LinkedList<WorldRegion> subregions;
+	private LinkedList<WorldRegion> flattenedSubregions;
+
+	private boolean purchased;
+	private boolean isInPurchasedArea;
+
+	public String getRegionId() {
+		return regionId;
+	}
+
+	public String getDownloadsIdPrefix() {
+		return downloadsIdPrefix;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public LatLon getBboxTopLeft() {
+		return bboxTopLeft;
+	}
+
+	public LatLon getBboxBottomRight() {
+		return bboxBottomRight;
+	}
+
+	public LinkedList<DownloadActivityType> getResourceTypes() {
+		return resourceTypes;
+	}
+
+	public WorldRegion getSuperregion() {
+		return superregion;
+	}
+
+	public LinkedList<WorldRegion> getSubregions() {
+		return subregions;
+	}
+
+	public LinkedList<WorldRegion> getFlattenedSubregions() {
+		return flattenedSubregions;
+	}
+
+	public boolean isPurchased() {
+		return purchased;
+	}
+
+	public boolean isInPurchasedArea() {
+		return isInPurchasedArea;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		WorldRegion that = (WorldRegion) o;
+
+		return !(name != null ? !name.toLowerCase().equals(that.name.toLowerCase()) : that.name != null);
+	}
+
+	@Override
+	public int hashCode() {
+		return name != null ? name.hashCode() : 0;
+	}
+
+	private WorldRegion() {
+		superregion = null;
+		subregions = new LinkedList<>();
+		flattenedSubregions = new LinkedList<>();
+	}
+
+	private WorldRegion initWorld() {
+		regionId = null;
+		downloadsIdPrefix = "world_";
+		name = null;
+		superregion = null;
+
+		return this;
+	}
+
+	private WorldRegion init(String regionId, OsmandRegions osmandRegions, String name) {
+		this.regionId = regionId;
+		String downloadName = osmandRegions.getDownloadName(regionId);
+		if (downloadName != null) {
+			downloadsIdPrefix = downloadName + ".";
+			if (name != null) {
+				this.name = name;
+			} else {
+				this.name = osmandRegions.getLocaleName(downloadName);
+			}
+		} else {
+			this.downloadsIdPrefix = regionId + ".";
+			this.name = name;
+		}
+		return this;
+	}
+
+	private WorldRegion init(String regionId, OsmandRegions osmandRegions) {
+		this.regionId = regionId;
+		String downloadName = osmandRegions.getDownloadName(regionId);
+		if (downloadName != null) {
+			downloadsIdPrefix = downloadName + ".";
+			this.name = osmandRegions.getLocaleName(regionId);
+		} else {
+			this.downloadsIdPrefix = regionId + ".";
+			this.name = regionId;
+		}
+		return this;
+	}
+
+	private WorldRegion init(String regionId, String name) {
+		this.regionId = regionId;
+		this.downloadsIdPrefix = regionId + ".";
+		this.name = name;
+		return this;
+	}
+
+	private void addSubregion(WorldRegion subregion) {
+		subregion.superregion = this;
+		subregions.add(subregion);
+		propagateSubregionToFlattenedHierarchy(subregion);
+	}
+
+	private void propagateSubregionToFlattenedHierarchy(WorldRegion subregion) {
+		flattenedSubregions.add(subregion);
+		if (superregion != null) {
+			superregion.propagateSubregionToFlattenedHierarchy(subregion);
+		}
+	}
+
+	public static WorldRegion loadWorldRegions(OsmandApplication app) {
+		OsmandRegions osmandRegions = app.getRegions();
+
+		Map<String, String> loadedItems = osmandRegions.getFullNamesToLowercaseCopy();
+		if (loadedItems.size() == 0) {
+			return null;
+		}
+
+		HashMap<String, WorldRegion> regionsLookupTable = new HashMap<>(loadedItems.size());
+
+		// Create root region
+		WorldRegion entireWorld = new WorldRegion().initWorld();
+
+		// Create main regions
+		Resources res = app.getResources();
+
+		WorldRegion africaRegion = createRegionAs(AFRICA_REGION_ID,
+				loadedItems, osmandRegions, res.getString(R.string.index_name_africa));
+		entireWorld.addSubregion(africaRegion);
+		regionsLookupTable.put(africaRegion.regionId, africaRegion);
+
+		WorldRegion asiaRegion = createRegionAs(ASIA_REGION_ID,
+				loadedItems, osmandRegions, res.getString(R.string.index_name_asia));
+		entireWorld.addSubregion(asiaRegion);
+		regionsLookupTable.put(asiaRegion.regionId, asiaRegion);
+
+		WorldRegion australiaAndOceaniaRegion = createRegionAs(AUSTRALIA_AND_OCEANIA_REGION_ID,
+				loadedItems, osmandRegions, res.getString(R.string.index_name_oceania));
+		entireWorld.addSubregion(australiaAndOceaniaRegion);
+		regionsLookupTable.put(australiaAndOceaniaRegion.regionId, australiaAndOceaniaRegion);
+
+		WorldRegion centralAmericaRegion = createRegionAs(CENTRAL_AMERICA_REGION_ID,
+				loadedItems, osmandRegions, res.getString(R.string.index_name_central_america));
+		entireWorld.addSubregion(centralAmericaRegion);
+		regionsLookupTable.put(centralAmericaRegion.regionId, centralAmericaRegion);
+
+		WorldRegion europeRegion = createRegionAs(EUROPE_REGION_ID,
+				loadedItems, osmandRegions, res.getString(R.string.index_name_europe));
+		entireWorld.addSubregion(europeRegion);
+		regionsLookupTable.put(europeRegion.regionId, europeRegion);
+
+		WorldRegion northAmericaRegion = createRegionAs(NORTH_AMERICA_REGION_ID,
+				loadedItems, osmandRegions, res.getString(R.string.index_name_north_america));
+		entireWorld.addSubregion(northAmericaRegion);
+		regionsLookupTable.put(northAmericaRegion.regionId, northAmericaRegion);
+
+		WorldRegion russiaRegion = createRegionAs(RUSSIA_REGION_ID,
+				loadedItems, osmandRegions, res.getString(R.string.index_name_russia));
+		entireWorld.addSubregion(russiaRegion);
+		regionsLookupTable.put(russiaRegion.regionId, russiaRegion);
+
+		WorldRegion southAmericaRegion = createRegionAs(SOUTH_AMERICA_REGION_ID,
+				loadedItems, osmandRegions, res.getString(R.string.index_name_south_america));
+		entireWorld.addSubregion(southAmericaRegion);
+		regionsLookupTable.put(southAmericaRegion.regionId, southAmericaRegion);
+
+		// Process remaining regions
+		for (;;) {
+			int processedRegions = 0;
+
+			Iterator<Entry<String, String>> iterator = loadedItems.entrySet().iterator();
+			while (iterator.hasNext()) {
+				String regionId = iterator.next().getKey();
+				String parentRegionId = osmandRegions.getParentFullName(regionId);
+				if (parentRegionId == null) {
+					continue;
+				}
+
+				// Try to find parent of this region
+				WorldRegion parentRegion = regionsLookupTable.get(parentRegionId);
+				if (parentRegion == null) {
+					continue;
+				}
+
+				WorldRegion newRegion = new WorldRegion().init(regionId, osmandRegions);
+				parentRegion.addSubregion(newRegion);
+				regionsLookupTable.put(newRegion.regionId, newRegion);
+
+				// Remove
+				processedRegions++;
+				iterator.remove();
+			}
+
+			// If all remaining are orphans, that's all
+			if (processedRegions == 0)
+				break;
+		}
+
+		LOG.warn("Found orphaned regions: " + loadedItems.size());
+		for (String regionId : loadedItems.keySet()) {
+			LOG.warn("FullName = " + regionId + " parent=" + osmandRegions.getParentFullName(regionId));
+		}
+
+		return entireWorld;
+	}
+
+	private static WorldRegion createRegionAs(String regionId, Map<String, String> loadedItems, OsmandRegions osmandRegions, String localizedName) {
+		WorldRegion worldRegion;
+		boolean hasRegion = loadedItems.containsKey(regionId);
+		if (hasRegion) {
+			worldRegion = new WorldRegion().init(regionId, osmandRegions, localizedName);
+			loadedItems.remove(regionId);
+		} else {
+			worldRegion = new WorldRegion().init(regionId, localizedName);
+		}
+		return worldRegion;
+	}
+}
\ No newline at end of file

From 197013afc135b24e8b5fb95278bb7d0035d543eb Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Tue, 29 Sep 2015 18:58:14 +0200
Subject: [PATCH 24/40] Translated using Weblate (Swedish)

Currently translated at 99.1% (1732 of 1746 strings)
---
 OsmAnd/res/values-sv/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 55d94ba509..a95b638034 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -2017,4 +2017,6 @@
     <string name="shared_string_trip_recording">Trippinspelning</string>
     <string name="shared_string_navigation">Navigering</string>
     <string name="osmand_running_in_background">Körs i bakgrunden</string>
+    <string name="favorite_category_add_new">Lägg till ny</string>
+    <string name="favorite_category_select">Välj kategori</string>
     </resources>

From 6d9770440808490cb3e1611cab8e9016e783abb2 Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Tue, 29 Sep 2015 21:52:59 +0200
Subject: [PATCH 25/40] Translated using Weblate (French)

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

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 5d91d811f0..d6be2d3046 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -2181,4 +2181,6 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>
     
+    <string name="favorite_category_add_new">Ajouter une catégorie</string>
+    <string name="favorite_category_select">Sélectionner une catégorie</string>
     </resources>

From a483c9aaa20977a19a592597c93bc9f1e4b2c3c8 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Tue, 29 Sep 2015 23:19:17 +0300
Subject: [PATCH 26/40] Update phrases (payment)

---
 OsmAnd/res/values-ru/phrases.xml | 148 ++++++++++++++++++++++++++++++-
 OsmAnd/res/values/phrases.xml    | 144 ++++++++++++++++++++++++++++++
 2 files changed, 289 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 5b459e026b..5b5122599d 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources> 
 	<string name="poi_bakery">Булочная</string>
 	<string name="poi_alcohol">Винно-водочный магазин</string>
@@ -1199,7 +1199,7 @@
 	<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_no">Обслуживание трассы: необслуживаемая</string>
 	<string name="poi_piste_grooming_mogul">Обслуживание трассы: могул</string>
 
 	<string name="poi_garden_type_community">Тип сада: общественный</string>
@@ -1257,4 +1257,146 @@
 
 	<string name="poi_love_hotel">Love-отель</string>
 
-	</resources>
+	<string name="poi_payment_coins_yes">Принимаются монеты</string>
+	<string name="poi_payment_coins_no">Монеты не принимаются</string>
+	<string name="poi_payment_coins_0.5">Принимаются монеты по $0.5</string>
+	<string name="poi_payment_coins_50c12">Принимаются монеты по 50c, 1€ и 2€</string>
+	<string name="poi_payment_telephone_cards_yes">Принимаются телефонные карты</string>
+	<string name="poi_payment_telephone_cards_no">Телефонные карты не принимаются</string>
+	<string name="poi_payment_credit_cards_yes">Принимаются кредитные карты</string>
+	<string name="poi_payment_credit_cards_no">Кредитные карты не принимаются</string>
+	<string name="poi_payment_notes_yes">Принимаются банкноты</string>
+	<string name="poi_payment_notes_no">Банкноты не принимаются</string>
+	<string name="poi_payment_electronic_purses_yes">Принимаются электронные кошельки</string>
+	<string name="poi_payment_electronic_purses_no">Электронные кошельки не принимаются</string>
+	<string name="poi_payment_cash_yes">Принимаются наличные</string>
+	<string name="poi_payment_cash_no">Наличные не принимаются</string>
+	<string name="poi_payment_debit_cards_yes">Принимаются дебетовые карты</string>
+	<string name="poi_payment_debit_cards_no">Дбетовые карты не принимаются</string>
+	<string name="poi_payment_bitcoin_yes">Принимаются биткоины</string>
+	<string name="poi_payment_bitcoin_no">Биткоины не принимаются</string>
+	<string name="poi_payment_visa_yes">Принимаются карты Visa</string>
+	<string name="poi_payment_visa_no">Карты Visa не принимаются</string>
+	<string name="poi_payment_mastercard_yes">Принимаются карты MasterCard</string>
+	<string name="poi_payment_mastercard_no">Карты MasterCard не принимаются</string>
+	<string name="poi_payment_none">Бесплатно</string>
+	<string name="poi_payment_maestro_yes">Принимаются карты Maestro</string>
+	<string name="poi_payment_maestro_no">Карты Maestro не принимаются</string>
+	<string name="poi_payment_american_express_yes">Принимаются карты American Express (AMEX)</string>
+	<string name="poi_payment_american_express_no">Карты American Express (AMEX) не принимаются</string>
+	<string name="poi_payment_diners_club_yes">Принимаются карты Diners Club</string>
+	<string name="poi_payment_diners_club_no">Карты Diners Club не принимаются</string>
+	<string name="poi_payment_dkv_yes">Принимаются DKV</string>
+	<string name="poi_payment_dkv_no">DKV не принимаются</string>
+	<string name="poi_payment_uta_yes">Принимаются карты UTA</string>
+	<string name="poi_payment_uta_no">Карты UTA не принимаются</string>
+	<string name="poi_payment_efectivo_yes">Принимаются Efectivo</string>
+	<string name="poi_payment_efectivo_no">Efectivo не принимаются</string>
+	<string name="poi_payment_girocard_yes">Принимаются Girocard</string>
+	<string name="poi_payment_girocard_no">Girocard не принимаются</string>
+	<string name="poi_payment_discover_card_yes">Принимаются Discover Card</string>
+	<string name="poi_payment_discover_card_no">Discover Card не принимаются</string>
+	<string name="poi_payment_visa_electron_yes">Принимаются карты Visa Electron</string>
+	<string name="poi_payment_visa_electron_no">Карты Visa Electron не принимаются</string>
+	<string name="poi_payment_litecoin_yes">Принимаются Litecoins</string>
+	<string name="poi_payment_litecoin_no">Litecoins не принимаются</string>
+	<string name="poi_payment_cheque_yes">Принимаются чеки</string>
+	<string name="poi_payment_cheque_no">Чеки не принимаются</string>
+	<string name="poi_payment_pikepass_yes">Принимается PIKEPASS</string>
+	<string name="poi_payment_pikepass_no">PIKEPASS не принимается</string>
+	<string name="poi_payment_pikepass_designated">Только для оплаты через PIKEPASS</string>
+	<string name="poi_payment_visa_debit_yes">Принимаются дебетовые карты Visa</string>
+	<string name="poi_payment_visa_debit_no">Дебетовые карты Visa не принимаются</string>
+	<string name="poi_payment_cryptocurrencies_no">Криптовалюты не принимаются</string>
+	<string name="poi_payment_others_yes">Принимаются другие методы оплаты</string>
+	<string name="poi_payment_others_no">Другие методы оплаты не принимаются</string>
+	<string name="poi_payment_routex_yes">Принимаются топливные карты Routex</string>
+	<string name="poi_payment_routex_no">Топливные карты Routex не принимаются</string>
+	<string name="poi_payment_bancomat_yes">Принимается Bancomat</string>
+	<string name="poi_payment_bancomat_no">Bancomat не принимается</string>
+	<string name="poi_payment_icsf_yes">Принимаются карты IC Stored Fare</string>
+	<string name="poi_payment_icsf_no">Карты IC Stored Fare не принимаются</string>
+	<string name="poi_payment_prepaid_ticket_yes">Принимаются prepaid tickets</string>
+	<string name="poi_payment_jcb_yes">Принимаются карты JCB</string>
+	<string name="poi_payment_jcb_no">Карты JCB не принимаются</string>
+	<string name="poi_payment_laser_yes">Принимаются карты Laser</string>
+	<string name="poi_payment_laser_no">Карты Laser не принимаются</string>
+	<string name="poi_payment_ep_quick_yes">Принимаются карты Quick</string>
+	<string name="poi_payment_ep_quick_no">Карты Quick не принимаются</string>
+	<string name="poi_payment_eurowag_yes">Принимаются карты Eurowag</string>
+	<string name="poi_payment_eurowag_no">Карты Eurowag не принимаются</string>
+	<string name="poi_payment_e_zpass_yes">Принимается E‑ZPass</string>
+	<string name="poi_payment_e_zpass_no">E‑ZPass не принимается</string>
+	<string name="poi_payment_euroshell_yes">Принимаются топливные карты Euroshell</string>
+	<string name="poi_payment_euroshell_no">Топливные карты Euroshell не принимаются</string>
+	<string name="poi_payment_kitcard_yes">Принимается KITCard</string>
+	<string name="poi_payment_kitcard_no">KITCard не принимается</string>
+	<string name="poi_payment_westfalen_card_yes">Принимаются карты Westfalen</string>
+	<string name="poi_payment_westfalen_card_no">Карты Westfalen не принимаются</string>
+	<string name="poi_payment_v_pay_yes">Принимаются карты V PAY</string>
+	<string name="poi_payment_v_pay_no">Карты V PAY не принимаются</string>
+	<string name="poi_payment_dogecoin_yes">Принимаются Dogecoin</string>
+	<string name="poi_payment_dogecoin_no">Dogecoin не принимаются</string>
+	<string name="poi_payment_cibus_yes">Принимаются карты Cibus</string>
+	<string name="poi_payment_cibus_no">Карты Cibus не принимаются</string>
+	<string name="poi_payment_wire_transfer_yes">Принимаются денежные переводы</string>
+	<string name="poi_payment_wire_transfer_no">Денежные переводы не принимаются</string>
+	<string name="poi_payment_ep_cash_yes">Принимаются Cash (Geldkarte)</string>
+	<string name="poi_payment_ep_cash_no">Cash (Geldkarte) не принимаются</string>
+	<string name="poi_payment_ep_proton_yes">Принимаются карты Proton</string>
+	<string name="poi_payment_ep_proton_no">Карты Proton не принимаются</string>
+	<string name="poi_payment_ep_avant_yes">Принимаются AvantCard</string>
+	<string name="poi_payment_ep_avant_no">AvantCard не принимаются</string>
+	<string name="poi_payment_ep_mep_yes">Принимается MEP</string>
+	<string name="poi_payment_ep_mep_no">MEP не принимется</string>
+	<string name="poi_payment_ep_minipay_yes">Принимается Minipay</string>
+	<string name="poi_payment_ep_minipay_no">Minipay не принимается</string>
+	<string name="poi_payment_ep_minicash_yes">Принимается miniCash</string>
+	<string name="poi_payment_ep_minicash_no">miniCash не принимается</string>
+	<string name="poi_payment_ep_moneo_yes">Принимается Moneo</string>
+	<string name="poi_payment_ep_moneo_no">Moneo не принимается</string>
+	<string name="poi_payment_ep_monedero4b_yes">Принимается Monedero 4B</string>
+	<string name="poi_payment_ep_monedero4b_no">Monedero 4B не принимается</string>
+	<string name="poi_payment_ep_monedero_yes">Принимается Monedero</string>
+	<string name="poi_payment_ep_monedero_no">Monedero не принимается</string>
+	<string name="poi_payment_bankaxess_yes">Принимается BankAxess</string>
+	<string name="poi_payment_bankaxess_no">BankAxess не принимается</string>
+	<string name="poi_payment_coinkite_yes">Принимается оплата через Coinkite</string>
+	<string name="poi_payment_coinkite_no">Оплата через Coinkite не принимается</string>
+	<string name="poi_payment_roadrunner_yes">Принимаются карты Roadrunner</string>
+	<string name="poi_payment_roadrunner_no">Roadrunner карты не принимаются</string>
+	<string name="poi_payment_svg_yes">Принимаются SVG</string>
+	<string name="poi_payment_svg_no">SVG не принимаются</string>
+	<string name="poi_payment_sms_yes">Принимаются СМС-платежи</string>
+	<string name="poi_payment_sms_no">СМС-платежи не принимаются</string>
+	<string name="poi_payment_OV-Chipkaart_yes">Принимаются OV-Chipkaart</string>
+	<string name="poi_payment_OV-Chipkaart_no">OV-Chipkaart не принимаются</string>
+	<string name="poi_payment_oyster_yes">Принимаются карты Oyster</string>
+	<string name="poi_payment_oyster_no">Карты Oyster не принимаются</string>
+	<string name="poi_payment_sube_yes">Принимаются карты SUBE</string>
+	<string name="poi_payment_sube_no">Карты SUBE не принимаются</string>
+	<string name="poi_payment_via_verde_yes">Принимается Via Verde</string>
+	<string name="poi_payment_via_verde_no">Via Verde не принимается</string>
+	<string name="poi_payment_meal_voucher_yes">Принимаются талоны на питание</string>
+	<string name="poi_payment_meal_voucher_no">Талоны на питание не принимаются</string>
+	<string name="poi_payment_paypal_yes">Принимается оплата через PayPal</string>
+	<string name="poi_payment_paypal_no">Оплата через PayPal не принимается</string>
+	<string name="poi_payment_u_key_yes">Принимаются U-Key</string>
+	<string name="poi_payment_u_key_no">U-Key не принимаются</string>
+	<string name="poi_payment_token_yes">Принимаются жетоны</string>
+	<string name="poi_payment_token_no">Жетоны не принимаются</string>
+	<string name="poi_payment_gift_card_yes">Принимаются подарочные карты</string>
+	<string name="poi_payment_gift_card_no">Подарочные карты не принимаются</string>
+	<string name="poi_payment_golden_crown_yes">Принимаются карты Золотая Корона</string>
+	<string name="poi_payment_golden_crown_no">Карты Золотая Корона не принимаются</string>
+	<string name="poi_payment_pro100_yes">Принимаются карты ПРО100</string>
+	<string name="poi_payment_pro100_no">Карты ПРО100 не принимаются</string>
+	<string name="poi_payment_union_card_yes">Принимаются карты Union Card</string>
+	<string name="poi_payment_union_card_no">Карты Union Card не принимаются</string>
+	<string name="poi_payment_mtsmoney_yes">Принимается оплата через MТС-Деньги</string>
+	<string name="poi_payment_mtsmoney_no">Оплата через MТС-Деньги не принимается</string>
+	<string name="poi_payment_yandexmoney_yes">Принимается оплата через Яндекс.Деньги</string>
+	<string name="poi_payment_yandexmoney_no">Оплата через Яндекс.Деньги не принимается</string>
+	<string name="poi_description_payment">Описание способа оплаты</string>
+
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 7c1855fa6d..2ecf2f11ad 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -1404,4 +1404,148 @@
 
 	<string name="poi_love_hotel">Love hotel</string>
 
+	<string name="poi_payment_coins_yes">Accept coins</string>
+	<string name="poi_payment_coins_no">Don't accept coins</string>
+	<string name="poi_payment_coins_0.5">Accept $0.5 coins</string>
+	<string name="poi_payment_coins_50c12">Accept 50c, 1€ and 2€ coins</string>
+	<string name="poi_payment_telephone_cards_yes">Accept telephone cards</string>
+	<string name="poi_payment_telephone_cards_no">Don't accept telephone cards</string>
+	<string name="poi_payment_credit_cards_yes">Accept credit cards</string>
+	<string name="poi_payment_credit_cards_no">Don't accept credit cards</string>
+	<string name="poi_payment_notes_yes">Accept paper money</string>
+	<string name="poi_payment_notes_no">Don't accept paper money</string>
+	<string name="poi_payment_electronic_purses_yes">Accept electronic purses</string>
+	<string name="poi_payment_electronic_purses_no">Don't accept electronic purses</string>
+	<string name="poi_payment_cash_yes">Accept cash</string>
+	<string name="poi_payment_cash_no">Don't accept cash</string>
+	<string name="poi_payment_debit_cards_yes">Accept debit cards</string>
+	<string name="poi_payment_debit_cards_no">Don't accept debit cards</string>
+	<string name="poi_payment_bitcoin_yes">Accept Bitcoins</string>
+	<string name="poi_payment_bitcoin_no">Don't accept Bitcoins</string>
+	<string name="poi_payment_visa_yes">Accept Visa cards</string>
+	<string name="poi_payment_visa_no">Don't accept Visa cards</string>
+	<string name="poi_payment_mastercard_yes">Accept MasterCard</string>
+	<string name="poi_payment_mastercard_no">Don't accept MasterCard</string>
+	<string name="poi_payment_none">Free of charge</string>
+	<string name="poi_payment_account_cards_yes">Accept account cards</string>
+	<string name="poi_payment_account_cards_no">Don't accept account cards</string>
+	<string name="poi_payment_maestro_yes">Accept Maestro cards</string>
+	<string name="poi_payment_maestro_no">Don't accept Maestro cards</string>
+	<string name="poi_payment_american_express_yes">Accept American Express (AMEX) cards</string>
+	<string name="poi_payment_american_express_no">Don't accept American Express (AMEX) cards</string>
+	<string name="poi_payment_diners_club_yes">Accept Diners Club cards</string>
+	<string name="poi_payment_diners_club_no">Don't accept Diners Club cards</string>
+	<string name="poi_payment_dkv_yes">Accept DKV</string>
+	<string name="poi_payment_dkv_no">Don't accept DKV</string>
+	<string name="poi_payment_uta_yes">Accept UTA cards</string>
+	<string name="poi_payment_uta_no">Don't accept UTA cards</string>
+	<string name="poi_payment_efectivo_yes">Accept Efectivo</string>
+	<string name="poi_payment_efectivo_no">Don't accept Efectivo</string>
+	<string name="poi_payment_girocard_yes">Accept Girocard</string>
+	<string name="poi_payment_girocard_no">Don't accept Girocard</string>
+	<string name="poi_payment_discover_card_yes">Accept Discover Card</string>
+	<string name="poi_payment_discover_card_no">Don't accept Discover Card</string>
+	<string name="poi_payment_visa_electron_yes">Accept Visa Electron cards</string>
+	<string name="poi_payment_visa_electron_no">Don't accept Visa Electron cards</string>
+	<string name="poi_payment_litecoin_yes">Accept Litecoins</string>
+	<string name="poi_payment_litecoin_no">Don't accept Litecoins</string>
+	<string name="poi_payment_cheque_yes">Accept cheques</string>
+	<string name="poi_payment_cheque_no">Don't accept cheques</string>
+	<string name="poi_payment_pikepass_yes">Accept PIKEPASS</string>
+	<string name="poi_payment_pikepass_no">Don't accept PIKEPASS</string>
+	<string name="poi_payment_pikepass_designated">Accept PIKEPASS (designated)</string>
+	<string name="poi_payment_visa_debit_yes">Accept Visa Debit cards</string>
+	<string name="poi_payment_visa_debit_no">Don't accept Visa Debit cards</string>
+	<string name="poi_payment_cryptocurrencies_no">Don't accept cryptocurrencies</string>
+	<string name="poi_payment_others_yes">Accept other payment methods</string>
+	<string name="poi_payment_others_no">Don't accept other payment methods</string>
+	<string name="poi_payment_routex_yes">Accept Routex fuel cards</string>
+	<string name="poi_payment_routex_no">Don't accept Routex fuel cards</string>
+	<string name="poi_payment_bancomat_yes">Accept Bancomat</string>
+	<string name="poi_payment_bancomat_no">Don't accept Bancomat</string>
+	<string name="poi_payment_icsf_yes">Accept IC Stored Fare cards</string>
+	<string name="poi_payment_icsf_no">Don't accept IC Stored Fare cards</string>
+	<string name="poi_payment_prepaid_ticket_yes">Accept prepaid tickets</string>
+	<string name="poi_payment_jcb_yes">Accept JCB cards</string>
+	<string name="poi_payment_jcb_no">Don't accept JCB cards</string>
+	<string name="poi_payment_laser_yes">Accept Laser cards</string>
+	<string name="poi_payment_laser_no">Don't accept Laser cards</string>
+	<string name="poi_payment_ep_quick_yes">Accept Quick cards</string>
+	<string name="poi_payment_ep_quick_no">Don't accept Quick cards</string>
+	<string name="poi_payment_eurowag_yes">Accept Eurowag cards</string>
+	<string name="poi_payment_eurowag_no">Don't accept Eurowag cards</string>
+	<string name="poi_payment_e_zpass_yes">Accept E‑ZPass</string>
+	<string name="poi_payment_e_zpass_no">Don't accept E‑ZPass</string>
+	<string name="poi_payment_euroshell_yes">Accept Euroshell fuel cards</string>
+	<string name="poi_payment_euroshell_no">Don't accept Euroshell fuel cards</string>
+	<string name="poi_payment_kitcard_yes">Accept KITCard</string>
+	<string name="poi_payment_kitcard_no">Don't accept KITCard</string>
+	<string name="poi_payment_westfalen_card_yes">Accept Westfalen cards</string>
+	<string name="poi_payment_westfalen_card_no">Don't accept Westfalen cards</string>
+	<string name="poi_payment_v_pay_yes">Accept V PAY cards</string>
+	<string name="poi_payment_v_pay_no">Don't accept V PAY cards</string>
+	<string name="poi_payment_dogecoin_yes">Accept Dogecoin</string>
+	<string name="poi_payment_dogecoin_no">Don't accept Dogecoin</string>
+	<string name="poi_payment_cibus_yes">Accept Cibus cards</string>
+	<string name="poi_payment_cibus_no">Don't accept Cibus cards</string>
+	<string name="poi_payment_wire_transfer_yes">Accept wire transfers</string>
+	<string name="poi_payment_wire_transfer_no">Don't accept wire transfers</string>
+	<string name="poi_payment_ep_cash_yes">Accept Cash (Geldkarte)</string>
+	<string name="poi_payment_ep_cash_no">Don't accept Cash (Geldkarte)</string>
+	<string name="poi_payment_ep_proton_yes">Accept Proton cards</string>
+	<string name="poi_payment_ep_proton_no">Don't accept Proton cards</string>
+	<string name="poi_payment_ep_avant_yes">Accept AvantCard</string>
+	<string name="poi_payment_ep_avant_no">Don't accept AvantCard</string>
+	<string name="poi_payment_ep_mep_yes">Accept MEP</string>
+	<string name="poi_payment_ep_mep_no">Don't accept MEP</string>
+	<string name="poi_payment_ep_minipay_yes">Accept Minipay</string>
+	<string name="poi_payment_ep_minipay_no">Don't accept Minipay</string>
+	<string name="poi_payment_ep_minicash_yes">Accept miniCash</string>
+	<string name="poi_payment_ep_minicash_no">Don't accept miniCash</string>
+	<string name="poi_payment_ep_moneo_yes">Accept Moneo</string>
+	<string name="poi_payment_ep_moneo_no">Don't accept Moneo</string>
+	<string name="poi_payment_ep_monedero4b_yes">Accept Monedero 4B</string>
+	<string name="poi_payment_ep_monedero4b_no">Don't accept Monedero 4B</string>
+	<string name="poi_payment_ep_monedero_yes">Accept Monedero</string>
+	<string name="poi_payment_ep_monedero_no">Don't accept Monedero</string>
+	<string name="poi_payment_bankaxess_yes">Accept BankAxess</string>
+	<string name="poi_payment_bankaxess_no">Don't accept BankAxess</string>
+	<string name="poi_payment_coinkite_yes">Accept Coinkite</string>
+	<string name="poi_payment_coinkite_no">Don't accept Coinkite</string>
+	<string name="poi_payment_roadrunner_yes">Accept Roadrunner cards</string>
+	<string name="poi_payment_roadrunner_no">Don't accept Roadrunner cards</string>
+	<string name="poi_payment_svg_yes">Accept SVG</string>
+	<string name="poi_payment_svg_no">Don't accept SVG</string>
+	<string name="poi_payment_sms_yes">Accept SMS payments</string>
+	<string name="poi_payment_sms_no">Don't accept SMS payments</string>
+	<string name="poi_payment_OV-Chipkaart_yes">Accept OV-Chipkaart</string>
+	<string name="poi_payment_OV-Chipkaart_no">Don't accept OV-Chipkaart</string>
+	<string name="poi_payment_oyster_yes">Accept Oyster cards</string>
+	<string name="poi_payment_oyster_no">Don't accept Oyster cards</string>
+	<string name="poi_payment_sube_yes">Accept SUBE cards</string>
+	<string name="poi_payment_sube_no">Don't accept SUBE cards</string>
+	<string name="poi_payment_via_verde_yes">Accept Via Verde</string>
+	<string name="poi_payment_via_verde_no">Don't accept Via Verde</string>
+	<string name="poi_payment_meal_voucher_yes">Accept meal vouchers</string>
+	<string name="poi_payment_meal_voucher_no">Don't accept meal vouchers</string>
+	<string name="poi_payment_paypal_yes">Accept PayPal</string>
+	<string name="poi_payment_paypal_no">Don't accept PayPal</string>
+	<string name="poi_payment_u_key_yes">Accept U-Key</string>
+	<string name="poi_payment_u_key_no">Don't accept U-Key</string>
+	<string name="poi_payment_token_yes">Accept tokens</string>
+	<string name="poi_payment_token_no">Don't accept tokens</string>
+	<string name="poi_payment_gift_card_yes">Accept gift cards</string>
+	<string name="poi_payment_gift_card_no">Don't accept gift cards</string>
+	<string name="poi_payment_golden_crown_yes">Accept Golden Crown cards</string>
+	<string name="poi_payment_golden_crown_no">Don't accept Golden Crown cards</string>
+	<string name="poi_payment_pro100_yes">Accept PRO100 cards</string>
+	<string name="poi_payment_pro100_no">Don't accept PRO100 cards</string>
+	<string name="poi_payment_union_card_yes">Accept Union Card</string>
+	<string name="poi_payment_union_card_no">Don't accept Union Card</string>
+	<string name="poi_payment_mtsmoney_yes">Accept MTS-Money</string>
+	<string name="poi_payment_mtsmoney_no">Don't accept MTS-Money</string>
+	<string name="poi_payment_yandexmoney_yes">Accept Yandex.Money</string>
+	<string name="poi_payment_yandexmoney_no">Don't accept Yandex.Money</string>
+	<string name="poi_description_payment">Payment description</string>
+
 </resources>

From c3fcff07bd3ac11ea7e88b42de7aee78cb26593e Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 22:03:22 +0200
Subject: [PATCH 27/40] Translated using Weblate (Danish)

Currently translated at 100.0% (1313 of 1313 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 99f9a95ab9..dd696ca799 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -117,7 +117,7 @@
         <string name="poi_traffic_calming_rumble_strip">Rumlestriber</string>
         <string name="poi_traffic_calming_table">Plateau bumb</string>
         <string name="poi_traffic_calming_choker">Indsnævring</string>
-        <string name="poi_traffic_signals">Trafiklys</string>
+        <string name="poi_traffic_signals">Lyskurv</string>
 
         <string name="poi_car_repair">Autoværksted</string>
         <string name="poi_service_tyres">Dækservice</string>

From 56d7d64a317625dcb2e0263d9f2bd09899686f76 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Wed, 30 Sep 2015 00:03:11 +0300
Subject: [PATCH 28/40] Fix phrases

---
 OsmAnd/res/values/phrases.xml | 138 +++++++++++++++++-----------------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 2ecf2f11ad..3c2f6a9e41 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -1405,147 +1405,147 @@
 	<string name="poi_love_hotel">Love hotel</string>
 
 	<string name="poi_payment_coins_yes">Accept coins</string>
-	<string name="poi_payment_coins_no">Don't accept coins</string>
+	<string name="poi_payment_coins_no">Don\'t accept coins</string>
 	<string name="poi_payment_coins_0.5">Accept $0.5 coins</string>
 	<string name="poi_payment_coins_50c12">Accept 50c, 1€ and 2€ coins</string>
 	<string name="poi_payment_telephone_cards_yes">Accept telephone cards</string>
-	<string name="poi_payment_telephone_cards_no">Don't accept telephone cards</string>
+	<string name="poi_payment_telephone_cards_no">Don\'t accept telephone cards</string>
 	<string name="poi_payment_credit_cards_yes">Accept credit cards</string>
-	<string name="poi_payment_credit_cards_no">Don't accept credit cards</string>
+	<string name="poi_payment_credit_cards_no">Don\'t accept credit cards</string>
 	<string name="poi_payment_notes_yes">Accept paper money</string>
-	<string name="poi_payment_notes_no">Don't accept paper money</string>
+	<string name="poi_payment_notes_no">Don\'t accept paper money</string>
 	<string name="poi_payment_electronic_purses_yes">Accept electronic purses</string>
-	<string name="poi_payment_electronic_purses_no">Don't accept electronic purses</string>
+	<string name="poi_payment_electronic_purses_no">Don\'t accept electronic purses</string>
 	<string name="poi_payment_cash_yes">Accept cash</string>
-	<string name="poi_payment_cash_no">Don't accept cash</string>
+	<string name="poi_payment_cash_no">Don\'t accept cash</string>
 	<string name="poi_payment_debit_cards_yes">Accept debit cards</string>
-	<string name="poi_payment_debit_cards_no">Don't accept debit cards</string>
+	<string name="poi_payment_debit_cards_no">Don\'t accept debit cards</string>
 	<string name="poi_payment_bitcoin_yes">Accept Bitcoins</string>
-	<string name="poi_payment_bitcoin_no">Don't accept Bitcoins</string>
+	<string name="poi_payment_bitcoin_no">Don\'t accept Bitcoins</string>
 	<string name="poi_payment_visa_yes">Accept Visa cards</string>
-	<string name="poi_payment_visa_no">Don't accept Visa cards</string>
+	<string name="poi_payment_visa_no">Don\'t accept Visa cards</string>
 	<string name="poi_payment_mastercard_yes">Accept MasterCard</string>
-	<string name="poi_payment_mastercard_no">Don't accept MasterCard</string>
+	<string name="poi_payment_mastercard_no">Don\'t accept MasterCard</string>
 	<string name="poi_payment_none">Free of charge</string>
 	<string name="poi_payment_account_cards_yes">Accept account cards</string>
-	<string name="poi_payment_account_cards_no">Don't accept account cards</string>
+	<string name="poi_payment_account_cards_no">Don\'t accept account cards</string>
 	<string name="poi_payment_maestro_yes">Accept Maestro cards</string>
-	<string name="poi_payment_maestro_no">Don't accept Maestro cards</string>
+	<string name="poi_payment_maestro_no">Don\'t accept Maestro cards</string>
 	<string name="poi_payment_american_express_yes">Accept American Express (AMEX) cards</string>
-	<string name="poi_payment_american_express_no">Don't accept American Express (AMEX) cards</string>
+	<string name="poi_payment_american_express_no">Don\'t accept American Express (AMEX) cards</string>
 	<string name="poi_payment_diners_club_yes">Accept Diners Club cards</string>
-	<string name="poi_payment_diners_club_no">Don't accept Diners Club cards</string>
+	<string name="poi_payment_diners_club_no">Don\'t accept Diners Club cards</string>
 	<string name="poi_payment_dkv_yes">Accept DKV</string>
-	<string name="poi_payment_dkv_no">Don't accept DKV</string>
+	<string name="poi_payment_dkv_no">Don\'t accept DKV</string>
 	<string name="poi_payment_uta_yes">Accept UTA cards</string>
-	<string name="poi_payment_uta_no">Don't accept UTA cards</string>
+	<string name="poi_payment_uta_no">Don\'t accept UTA cards</string>
 	<string name="poi_payment_efectivo_yes">Accept Efectivo</string>
-	<string name="poi_payment_efectivo_no">Don't accept Efectivo</string>
+	<string name="poi_payment_efectivo_no">Don\'t accept Efectivo</string>
 	<string name="poi_payment_girocard_yes">Accept Girocard</string>
-	<string name="poi_payment_girocard_no">Don't accept Girocard</string>
+	<string name="poi_payment_girocard_no">Don\'t accept Girocard</string>
 	<string name="poi_payment_discover_card_yes">Accept Discover Card</string>
-	<string name="poi_payment_discover_card_no">Don't accept Discover Card</string>
+	<string name="poi_payment_discover_card_no">Don\'t accept Discover Card</string>
 	<string name="poi_payment_visa_electron_yes">Accept Visa Electron cards</string>
-	<string name="poi_payment_visa_electron_no">Don't accept Visa Electron cards</string>
+	<string name="poi_payment_visa_electron_no">Don\'t accept Visa Electron cards</string>
 	<string name="poi_payment_litecoin_yes">Accept Litecoins</string>
-	<string name="poi_payment_litecoin_no">Don't accept Litecoins</string>
+	<string name="poi_payment_litecoin_no">Don\'t accept Litecoins</string>
 	<string name="poi_payment_cheque_yes">Accept cheques</string>
-	<string name="poi_payment_cheque_no">Don't accept cheques</string>
+	<string name="poi_payment_cheque_no">Don\'t accept cheques</string>
 	<string name="poi_payment_pikepass_yes">Accept PIKEPASS</string>
-	<string name="poi_payment_pikepass_no">Don't accept PIKEPASS</string>
+	<string name="poi_payment_pikepass_no">Don\'t accept PIKEPASS</string>
 	<string name="poi_payment_pikepass_designated">Accept PIKEPASS (designated)</string>
 	<string name="poi_payment_visa_debit_yes">Accept Visa Debit cards</string>
-	<string name="poi_payment_visa_debit_no">Don't accept Visa Debit cards</string>
-	<string name="poi_payment_cryptocurrencies_no">Don't accept cryptocurrencies</string>
+	<string name="poi_payment_visa_debit_no">Don\'t accept Visa Debit cards</string>
+	<string name="poi_payment_cryptocurrencies_no">Don\'t accept cryptocurrencies</string>
 	<string name="poi_payment_others_yes">Accept other payment methods</string>
-	<string name="poi_payment_others_no">Don't accept other payment methods</string>
+	<string name="poi_payment_others_no">Don\'t accept other payment methods</string>
 	<string name="poi_payment_routex_yes">Accept Routex fuel cards</string>
-	<string name="poi_payment_routex_no">Don't accept Routex fuel cards</string>
+	<string name="poi_payment_routex_no">Don\'t accept Routex fuel cards</string>
 	<string name="poi_payment_bancomat_yes">Accept Bancomat</string>
-	<string name="poi_payment_bancomat_no">Don't accept Bancomat</string>
+	<string name="poi_payment_bancomat_no">Don\'t accept Bancomat</string>
 	<string name="poi_payment_icsf_yes">Accept IC Stored Fare cards</string>
-	<string name="poi_payment_icsf_no">Don't accept IC Stored Fare cards</string>
+	<string name="poi_payment_icsf_no">Don\'t accept IC Stored Fare cards</string>
 	<string name="poi_payment_prepaid_ticket_yes">Accept prepaid tickets</string>
 	<string name="poi_payment_jcb_yes">Accept JCB cards</string>
-	<string name="poi_payment_jcb_no">Don't accept JCB cards</string>
+	<string name="poi_payment_jcb_no">Don\'t accept JCB cards</string>
 	<string name="poi_payment_laser_yes">Accept Laser cards</string>
-	<string name="poi_payment_laser_no">Don't accept Laser cards</string>
+	<string name="poi_payment_laser_no">Don\'t accept Laser cards</string>
 	<string name="poi_payment_ep_quick_yes">Accept Quick cards</string>
-	<string name="poi_payment_ep_quick_no">Don't accept Quick cards</string>
+	<string name="poi_payment_ep_quick_no">Don\'t accept Quick cards</string>
 	<string name="poi_payment_eurowag_yes">Accept Eurowag cards</string>
-	<string name="poi_payment_eurowag_no">Don't accept Eurowag cards</string>
+	<string name="poi_payment_eurowag_no">Don\'t accept Eurowag cards</string>
 	<string name="poi_payment_e_zpass_yes">Accept E‑ZPass</string>
-	<string name="poi_payment_e_zpass_no">Don't accept E‑ZPass</string>
+	<string name="poi_payment_e_zpass_no">Don\'t accept E‑ZPass</string>
 	<string name="poi_payment_euroshell_yes">Accept Euroshell fuel cards</string>
-	<string name="poi_payment_euroshell_no">Don't accept Euroshell fuel cards</string>
+	<string name="poi_payment_euroshell_no">Don\'t accept Euroshell fuel cards</string>
 	<string name="poi_payment_kitcard_yes">Accept KITCard</string>
-	<string name="poi_payment_kitcard_no">Don't accept KITCard</string>
+	<string name="poi_payment_kitcard_no">Don\'t accept KITCard</string>
 	<string name="poi_payment_westfalen_card_yes">Accept Westfalen cards</string>
-	<string name="poi_payment_westfalen_card_no">Don't accept Westfalen cards</string>
+	<string name="poi_payment_westfalen_card_no">Don\'t accept Westfalen cards</string>
 	<string name="poi_payment_v_pay_yes">Accept V PAY cards</string>
-	<string name="poi_payment_v_pay_no">Don't accept V PAY cards</string>
+	<string name="poi_payment_v_pay_no">Don\'t accept V PAY cards</string>
 	<string name="poi_payment_dogecoin_yes">Accept Dogecoin</string>
-	<string name="poi_payment_dogecoin_no">Don't accept Dogecoin</string>
+	<string name="poi_payment_dogecoin_no">Don\'t accept Dogecoin</string>
 	<string name="poi_payment_cibus_yes">Accept Cibus cards</string>
-	<string name="poi_payment_cibus_no">Don't accept Cibus cards</string>
+	<string name="poi_payment_cibus_no">Don\'t accept Cibus cards</string>
 	<string name="poi_payment_wire_transfer_yes">Accept wire transfers</string>
-	<string name="poi_payment_wire_transfer_no">Don't accept wire transfers</string>
+	<string name="poi_payment_wire_transfer_no">Don\'t accept wire transfers</string>
 	<string name="poi_payment_ep_cash_yes">Accept Cash (Geldkarte)</string>
-	<string name="poi_payment_ep_cash_no">Don't accept Cash (Geldkarte)</string>
+	<string name="poi_payment_ep_cash_no">Don\'t accept Cash (Geldkarte)</string>
 	<string name="poi_payment_ep_proton_yes">Accept Proton cards</string>
-	<string name="poi_payment_ep_proton_no">Don't accept Proton cards</string>
+	<string name="poi_payment_ep_proton_no">Don\'t accept Proton cards</string>
 	<string name="poi_payment_ep_avant_yes">Accept AvantCard</string>
-	<string name="poi_payment_ep_avant_no">Don't accept AvantCard</string>
+	<string name="poi_payment_ep_avant_no">Don\'t accept AvantCard</string>
 	<string name="poi_payment_ep_mep_yes">Accept MEP</string>
-	<string name="poi_payment_ep_mep_no">Don't accept MEP</string>
+	<string name="poi_payment_ep_mep_no">Don\'t accept MEP</string>
 	<string name="poi_payment_ep_minipay_yes">Accept Minipay</string>
-	<string name="poi_payment_ep_minipay_no">Don't accept Minipay</string>
+	<string name="poi_payment_ep_minipay_no">Don\'t accept Minipay</string>
 	<string name="poi_payment_ep_minicash_yes">Accept miniCash</string>
-	<string name="poi_payment_ep_minicash_no">Don't accept miniCash</string>
+	<string name="poi_payment_ep_minicash_no">Don\'t accept miniCash</string>
 	<string name="poi_payment_ep_moneo_yes">Accept Moneo</string>
-	<string name="poi_payment_ep_moneo_no">Don't accept Moneo</string>
+	<string name="poi_payment_ep_moneo_no">Don\'t accept Moneo</string>
 	<string name="poi_payment_ep_monedero4b_yes">Accept Monedero 4B</string>
-	<string name="poi_payment_ep_monedero4b_no">Don't accept Monedero 4B</string>
+	<string name="poi_payment_ep_monedero4b_no">Don\'t accept Monedero 4B</string>
 	<string name="poi_payment_ep_monedero_yes">Accept Monedero</string>
-	<string name="poi_payment_ep_monedero_no">Don't accept Monedero</string>
+	<string name="poi_payment_ep_monedero_no">Don\'t accept Monedero</string>
 	<string name="poi_payment_bankaxess_yes">Accept BankAxess</string>
-	<string name="poi_payment_bankaxess_no">Don't accept BankAxess</string>
+	<string name="poi_payment_bankaxess_no">Don\'t accept BankAxess</string>
 	<string name="poi_payment_coinkite_yes">Accept Coinkite</string>
-	<string name="poi_payment_coinkite_no">Don't accept Coinkite</string>
+	<string name="poi_payment_coinkite_no">Don\'t accept Coinkite</string>
 	<string name="poi_payment_roadrunner_yes">Accept Roadrunner cards</string>
-	<string name="poi_payment_roadrunner_no">Don't accept Roadrunner cards</string>
+	<string name="poi_payment_roadrunner_no">Don\'t accept Roadrunner cards</string>
 	<string name="poi_payment_svg_yes">Accept SVG</string>
-	<string name="poi_payment_svg_no">Don't accept SVG</string>
+	<string name="poi_payment_svg_no">Don\'t accept SVG</string>
 	<string name="poi_payment_sms_yes">Accept SMS payments</string>
-	<string name="poi_payment_sms_no">Don't accept SMS payments</string>
+	<string name="poi_payment_sms_no">Don\'t accept SMS payments</string>
 	<string name="poi_payment_OV-Chipkaart_yes">Accept OV-Chipkaart</string>
-	<string name="poi_payment_OV-Chipkaart_no">Don't accept OV-Chipkaart</string>
+	<string name="poi_payment_OV-Chipkaart_no">Don\'t accept OV-Chipkaart</string>
 	<string name="poi_payment_oyster_yes">Accept Oyster cards</string>
-	<string name="poi_payment_oyster_no">Don't accept Oyster cards</string>
+	<string name="poi_payment_oyster_no">Don\'t accept Oyster cards</string>
 	<string name="poi_payment_sube_yes">Accept SUBE cards</string>
-	<string name="poi_payment_sube_no">Don't accept SUBE cards</string>
+	<string name="poi_payment_sube_no">Don\'t accept SUBE cards</string>
 	<string name="poi_payment_via_verde_yes">Accept Via Verde</string>
-	<string name="poi_payment_via_verde_no">Don't accept Via Verde</string>
+	<string name="poi_payment_via_verde_no">Don\'t accept Via Verde</string>
 	<string name="poi_payment_meal_voucher_yes">Accept meal vouchers</string>
-	<string name="poi_payment_meal_voucher_no">Don't accept meal vouchers</string>
+	<string name="poi_payment_meal_voucher_no">Don\'t accept meal vouchers</string>
 	<string name="poi_payment_paypal_yes">Accept PayPal</string>
-	<string name="poi_payment_paypal_no">Don't accept PayPal</string>
+	<string name="poi_payment_paypal_no">Don\'t accept PayPal</string>
 	<string name="poi_payment_u_key_yes">Accept U-Key</string>
-	<string name="poi_payment_u_key_no">Don't accept U-Key</string>
+	<string name="poi_payment_u_key_no">Don\'t accept U-Key</string>
 	<string name="poi_payment_token_yes">Accept tokens</string>
-	<string name="poi_payment_token_no">Don't accept tokens</string>
+	<string name="poi_payment_token_no">Don\'t accept tokens</string>
 	<string name="poi_payment_gift_card_yes">Accept gift cards</string>
-	<string name="poi_payment_gift_card_no">Don't accept gift cards</string>
+	<string name="poi_payment_gift_card_no">Don\'t accept gift cards</string>
 	<string name="poi_payment_golden_crown_yes">Accept Golden Crown cards</string>
-	<string name="poi_payment_golden_crown_no">Don't accept Golden Crown cards</string>
+	<string name="poi_payment_golden_crown_no">Don\'t accept Golden Crown cards</string>
 	<string name="poi_payment_pro100_yes">Accept PRO100 cards</string>
-	<string name="poi_payment_pro100_no">Don't accept PRO100 cards</string>
+	<string name="poi_payment_pro100_no">Don\'t accept PRO100 cards</string>
 	<string name="poi_payment_union_card_yes">Accept Union Card</string>
-	<string name="poi_payment_union_card_no">Don't accept Union Card</string>
+	<string name="poi_payment_union_card_no">Don\'t accept Union Card</string>
 	<string name="poi_payment_mtsmoney_yes">Accept MTS-Money</string>
-	<string name="poi_payment_mtsmoney_no">Don't accept MTS-Money</string>
+	<string name="poi_payment_mtsmoney_no">Don\'t accept MTS-Money</string>
 	<string name="poi_payment_yandexmoney_yes">Accept Yandex.Money</string>
-	<string name="poi_payment_yandexmoney_no">Don't accept Yandex.Money</string>
+	<string name="poi_payment_yandexmoney_no">Don\'t accept Yandex.Money</string>
 	<string name="poi_description_payment">Payment description</string>
 
 </resources>

From 0e107f5c76fb69301a7e1b17ff1a1d37e825324b Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 23:03:25 +0200
Subject: [PATCH 29/40] Translated using Weblate (Danish)

Currently translated at 95.3% (1388 of 1456 strings)
---
 OsmAnd/res/values-da/phrases.xml | 77 +++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index dd696ca799..935a81bcee 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -1443,4 +1443,79 @@
 
 	<string name="poi_love_hotel">Kærlighedshotel</string>
 
-</resources>
+<string name="poi_payment_coins_yes">Acceptere mønter</string>
+	<string name="poi_payment_coins_no">Acceptere ikke mønter</string>
+	<string name="poi_payment_coins_0.5">Acceptere $0,5 mønter</string>
+	<string name="poi_payment_coins_50c12">Acceptere 50c, 1€ og 2€ mønter</string>
+	<string name="poi_payment_telephone_cards_yes">Acceptere telefonkort</string>
+	<string name="poi_payment_telephone_cards_no">Acceptere ikke telefonkort</string>
+	<string name="poi_payment_credit_cards_yes">Acceptere kreditkort</string>
+	<string name="poi_payment_credit_cards_no">Acceptere ikke kreditkort</string>
+	<string name="poi_payment_notes_yes">Acceptere papirpenge</string>
+	<string name="poi_payment_notes_no">Acceptere ikke papirpenge</string>
+	<string name="poi_payment_electronic_purses_yes">Accepter elektroniske punge</string>
+	<string name="poi_payment_electronic_purses_no">Accepter ikke elektroniske punge</string>
+	<string name="poi_payment_cash_yes">Acceptere kontanter</string>
+	<string name="poi_payment_cash_no">Accepter ikke kontanter</string>
+	<string name="poi_payment_debit_cards_yes">Accepter betalingskort</string>
+	<string name="poi_payment_debit_cards_no">Accepter ikke betalingskort</string>
+	<string name="poi_payment_bitcoin_yes">Acceptere Bitcoins</string>
+	<string name="poi_payment_bitcoin_no">Acceptere ikke Bitcoins</string>
+	<string name="poi_payment_visa_yes">Acceptere Visakort</string>
+	<string name="poi_payment_visa_no">Acceptere ikke Visakort</string>
+	<string name="poi_payment_mastercard_yes">Accepter MasterCard</string>
+	<string name="poi_payment_mastercard_no">Acceptere ikke MasterCard</string>
+	<string name="poi_payment_none">Gratis</string>
+	<string name="poi_payment_account_cards_yes">Acceptere kontokort</string>
+	<string name="poi_payment_account_cards_no">Acceptere ikke kontokort</string>
+	<string name="poi_payment_maestro_yes">Accepter Maestro-kort</string>
+	<string name="poi_payment_maestro_no">Accepter ikke Maestro-kort</string>
+	<string name="poi_payment_american_express_yes">Accepter American Express (AMEX) kort</string>
+	<string name="poi_payment_american_express_no">Accepter ikke American Express (AMEX) kort</string>
+	<string name="poi_payment_diners_club_yes">Accepter Diners Club-kort</string>
+	<string name="poi_payment_diners_club_no">Accepter ikke Diners Club-kort</string>
+	<string name="poi_payment_dkv_yes">Accepter DKV</string>
+	<string name="poi_payment_dkv_no">"Accepter ikke  DKV"</string>
+	<string name="poi_payment_uta_yes">Accepter UTA kort</string>
+	<string name="poi_payment_uta_no">Accepter ikke UTA kort</string>
+	<string name="poi_payment_efectivo_yes">Accepter Efectivo</string>
+	<string name="poi_payment_efectivo_no">Accepter ikke Efectivo</string>
+	<string name="poi_payment_girocard_yes">Accepter girokort</string>
+	<string name="poi_payment_girocard_no">Accepter ikke girokort</string>
+	<string name="poi_payment_discover_card_yes">Acceptere Discover kort</string>
+	<string name="poi_payment_discover_card_no">Acceptere ikke Discover Card</string>
+	<string name="poi_payment_visa_electron_yes">Accepter Visa Electron-kort</string>
+	<string name="poi_payment_visa_electron_no">Accepter ikke Visa Electron-kort</string>
+	<string name="poi_payment_litecoin_yes">Accepter Litecoins</string>
+	<string name="poi_payment_litecoin_no">Accepter ikke Litecoins</string>
+	<string name="poi_payment_cheque_yes">Accepter checks</string>
+	<string name="poi_payment_cheque_no">Accepter ikke checks</string>
+	<string name="poi_payment_pikepass_yes">Accepter PIKEPASS</string>
+	<string name="poi_payment_pikepass_no">Accepter ikke PIKEPASS</string>
+	<string name="poi_payment_pikepass_designated">Acceptere PIKEPASS (udpeget)</string>
+	<string name="poi_payment_visa_debit_yes">Accepter Visa betalingskort</string>
+	<string name="poi_payment_visa_debit_no">Accepter ikke Visa betalingskort</string>
+	<string name="poi_payment_cryptocurrencies_no">Accepter ikke kryptovalutaer</string>
+	<string name="poi_payment_others_yes">Accepter andre betalingsformer</string>
+	<string name="poi_payment_others_no">Accepter ikke andre betalingsformer</string>
+	<string name="poi_payment_routex_yes">Accepter Routex brændstof kort</string>
+	<string name="poi_payment_routex_no">Accepter ikke Routex brændstof kort</string>
+	<string name="poi_payment_bancomat_yes">Accepter Bancomat</string>
+	<string name="poi_payment_bancomat_no">Accepter ikke Bancomat</string>
+	<string name="poi_payment_icsf_yes">Acceptere IC lagret billetpris kort</string>
+	<string name="poi_payment_icsf_no">Acceptere ikke IC lagret billetpris kort</string>
+	<string name="poi_payment_prepaid_ticket_yes">Accepter forudbetalte billetter</string>
+	<string name="poi_payment_jcb_yes">Accepter JCB kort</string>
+	<string name="poi_payment_jcb_no">Accepter ikke JCB kort</string>
+	<string name="poi_payment_laser_yes">Accepter Laser-kort</string>
+	<string name="poi_payment_laser_no">Accepter ikke Laser-kort</string>
+	<string name="poi_payment_ep_quick_yes">Accepter Quick kort</string>
+	<string name="poi_payment_ep_quick_no">Accepter ikke Quick kort</string>
+	<string name="poi_payment_eurowag_yes">Accepter Eurowag kort</string>
+	<string name="poi_payment_eurowag_no">Accepter ikke Eurowag kort</string>
+	<string name="poi_payment_e_zpass_yes">Accepter E‑ZPass</string>
+	<string name="poi_payment_e_zpass_no">Accepter ikke E‑ZPass</string>
+	<string name="poi_payment_euroshell_yes">Acceptere Euroshell brændstof kort</string>
+	<string name="poi_payment_euroshell_no">Accepter ikke Euroshell brændstof kort</string>
+	<string name="poi_payment_kitcard_yes">Accepter KITCard</string>
+	</resources>

From 8ec1b82be59f23a119be835a30bdd82f4e26f531 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 23:04:13 +0200
Subject: [PATCH 30/40] Translated using Weblate (Danish)

Currently translated at 95.3% (1389 of 1456 strings)
---
 OsmAnd/res/values-da/phrases.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 935a81bcee..4f7b422168 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -1518,4 +1518,5 @@
 	<string name="poi_payment_euroshell_yes">Acceptere Euroshell brændstof kort</string>
 	<string name="poi_payment_euroshell_no">Accepter ikke Euroshell brændstof kort</string>
 	<string name="poi_payment_kitcard_yes">Accepter KITCard</string>
+	<string name="poi_payment_kitcard_no">Accepter ikke KITCard</string>
 	</resources>

From 02e740ab217a1a7c58198dd986d41c9f22f4b48f Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 23:04:24 +0200
Subject: [PATCH 31/40] Translated using Weblate (Danish)

Currently translated at 95.4% (1390 of 1456 strings)
---
 OsmAnd/res/values-da/phrases.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 4f7b422168..c9fb0ecedd 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -1519,4 +1519,5 @@
 	<string name="poi_payment_euroshell_no">Accepter ikke Euroshell brændstof kort</string>
 	<string name="poi_payment_kitcard_yes">Accepter KITCard</string>
 	<string name="poi_payment_kitcard_no">Accepter ikke KITCard</string>
+	<string name="poi_payment_westfalen_card_yes">Acceptere Westfalen kort</string>
 	</resources>

From a9c5b7543dd8153c2f750d0c95422cae68769efd Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Wed, 30 Sep 2015 00:07:56 +0300
Subject: [PATCH 32/40] FIx phrases

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

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 5b5122599d..28ff61f980 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -1369,8 +1369,8 @@
 	<string name="poi_payment_svg_no">SVG не принимаются</string>
 	<string name="poi_payment_sms_yes">Принимаются СМС-платежи</string>
 	<string name="poi_payment_sms_no">СМС-платежи не принимаются</string>
-	<string name="poi_payment_OV-Chipkaart_yes">Принимаются OV-Chipkaart</string>
-	<string name="poi_payment_OV-Chipkaart_no">OV-Chipkaart не принимаются</string>
+	<string name="poi_payment_ov_chipkaart_yes">Принимаются OV-Chipkaart</string>
+	<string name="poi_payment_ov_chipkaart_no">OV-Chipkaart не принимаются</string>
 	<string name="poi_payment_oyster_yes">Принимаются карты Oyster</string>
 	<string name="poi_payment_oyster_no">Карты Oyster не принимаются</string>
 	<string name="poi_payment_sube_yes">Принимаются карты SUBE</string>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 3c2f6a9e41..f6b05b042e 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -1518,8 +1518,8 @@
 	<string name="poi_payment_svg_no">Don\'t accept SVG</string>
 	<string name="poi_payment_sms_yes">Accept SMS payments</string>
 	<string name="poi_payment_sms_no">Don\'t accept SMS payments</string>
-	<string name="poi_payment_OV-Chipkaart_yes">Accept OV-Chipkaart</string>
-	<string name="poi_payment_OV-Chipkaart_no">Don\'t accept OV-Chipkaart</string>
+	<string name="poi_payment_ov_chipkaart_yes">Accept OV-Chipkaart</string>
+	<string name="poi_payment_ov_chipkaart_no">Don\'t accept OV-Chipkaart</string>
 	<string name="poi_payment_oyster_yes">Accept Oyster cards</string>
 	<string name="poi_payment_oyster_no">Don\'t accept Oyster cards</string>
 	<string name="poi_payment_sube_yes">Accept SUBE cards</string>

From ed9657b9c81ad504f442a0b0e75e08cc319c2cf3 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 23:08:47 +0200
Subject: [PATCH 33/40] Translated using Weblate (Danish)

Currently translated at 96.4% (1404 of 1456 strings)
---
 OsmAnd/res/values-da/phrases.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index c9fb0ecedd..b75763dcb8 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -1520,4 +1520,18 @@
 	<string name="poi_payment_kitcard_yes">Accepter KITCard</string>
 	<string name="poi_payment_kitcard_no">Accepter ikke KITCard</string>
 	<string name="poi_payment_westfalen_card_yes">Acceptere Westfalen kort</string>
+	<string name="poi_payment_westfalen_card_no">Accepter ikke Westfalen kort</string>
+	<string name="poi_payment_v_pay_yes">Accepter V PAY kort</string>
+	<string name="poi_payment_v_pay_no">Accepter ikke V PAY kort</string>
+	<string name="poi_payment_dogecoin_yes">Accepter Dogecoin</string>
+	<string name="poi_payment_dogecoin_no">Accepter ikke Dogecoin</string>
+	<string name="poi_payment_cibus_yes">Accepter Cibus kort</string>
+	<string name="poi_payment_cibus_no">Acceptere ikke Cibus kort</string>
+	<string name="poi_payment_wire_transfer_yes">Acceptere bankoverførsler</string>
+	<string name="poi_payment_wire_transfer_no">Accepter ikke bankoverførsler</string>
+	<string name="poi_payment_ep_cash_yes">Acceptere kontanter (Geldkarte)</string>
+	<string name="poi_payment_ep_cash_no">Accepter ikke kontanter (Geldkarte)</string>
+	<string name="poi_payment_ep_proton_yes">Acceptere Proton kort</string>
+	<string name="poi_payment_ep_proton_no">Accepter ikke Proton kort</string>
+	<string name="poi_payment_ep_avant_yes">Accepter AvantCard</string>
 	</resources>

From 579659065aebca325a96ab74be63bf351e1056d4 Mon Sep 17 00:00:00 2001
From: vshcherb <victor.shcherb@gmail.com>
Date: Tue, 29 Sep 2015 23:14:05 +0200
Subject: [PATCH 34/40] Update OsmandRegions.java

---
 OsmAnd-java/src/net/osmand/map/OsmandRegions.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd-java/src/net/osmand/map/OsmandRegions.java b/OsmAnd-java/src/net/osmand/map/OsmandRegions.java
index 7ba6a10c16..cd764b4f2b 100644
--- a/OsmAnd-java/src/net/osmand/map/OsmandRegions.java
+++ b/OsmAnd-java/src/net/osmand/map/OsmandRegions.java
@@ -49,7 +49,7 @@ public class OsmandRegions {
 	QuadTree<String> quadTree = null ;
 
 	public Map<String, String> getFullNamesToLowercaseCopy() {
-		return new HashMap<>(fullNamesToLowercaseIndex);
+		return new HashMap<String, String>(fullNamesToLowercaseIndex);
 	}
 
 	Integer parentFullName = null;

From 943dece0b5b1c476e38ec73e5503c881c046a758 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 23:14:14 +0200
Subject: [PATCH 35/40] Translated using Weblate (Danish)

Currently translated at 97.5% (1421 of 1456 strings)
---
 OsmAnd/res/values-da/phrases.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index b75763dcb8..d43523d3b6 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -1534,4 +1534,21 @@
 	<string name="poi_payment_ep_proton_yes">Acceptere Proton kort</string>
 	<string name="poi_payment_ep_proton_no">Accepter ikke Proton kort</string>
 	<string name="poi_payment_ep_avant_yes">Accepter AvantCard</string>
+	<string name="poi_payment_ep_avant_no">Accepter ikke AvantCard</string>
+	<string name="poi_payment_ep_mep_yes">Acceptere MEP</string>
+	<string name="poi_payment_ep_mep_no">Accepter ikke MEP</string>
+	<string name="poi_payment_ep_minipay_yes">Accepter Minipay</string>
+	<string name="poi_payment_ep_minipay_no">Accepter ikke Minipay</string>
+	<string name="poi_payment_ep_minicash_yes">Accepter miniCash</string>
+	<string name="poi_payment_ep_minicash_no">Accepter ikke miniCash</string>
+	<string name="poi_payment_ep_moneo_yes">Acceptere Moneo</string>
+	<string name="poi_payment_ep_moneo_no">Accepter ikke Moneo</string>
+	<string name="poi_payment_ep_monedero4b_yes">Acceptere Monedero 4B</string>
+	<string name="poi_payment_ep_monedero4b_no">Áccepter ikke Monedero 4B</string>
+	<string name="poi_payment_ep_monedero_yes">Accepter Monedero</string>
+	<string name="poi_payment_ep_monedero_no">Accepter ikke Monedero</string>
+	<string name="poi_payment_bankaxess_yes">Accepter BankAxess</string>
+	<string name="poi_payment_bankaxess_no">Acceptere ikke BankAxess</string>
+	<string name="poi_payment_coinkite_yes">Accepter Coinkite</string>
+	<string name="poi_payment_coinkite_no">Accepter ikke Coinkite</string>
 	</resources>

From 986fa4608da93c41ca93c973e8668b4b065562f3 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 23:14:24 +0200
Subject: [PATCH 36/40] Translated using Weblate (Danish)

Currently translated at 97.6% (1422 of 1456 strings)
---
 OsmAnd/res/values-da/phrases.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index d43523d3b6..148dc0aa35 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -1551,4 +1551,5 @@
 	<string name="poi_payment_bankaxess_no">Acceptere ikke BankAxess</string>
 	<string name="poi_payment_coinkite_yes">Accepter Coinkite</string>
 	<string name="poi_payment_coinkite_no">Accepter ikke Coinkite</string>
+	<string name="poi_payment_roadrunner_yes">Acceptere Roadrunner kort</string>
 	</resources>

From 40876ca3addae170c43ff1c5dcb85c01605864ea Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 23:14:47 +0200
Subject: [PATCH 37/40] Translated using Weblate (Danish)

Currently translated at 97.7% (1423 of 1456 strings)
---
 OsmAnd/res/values-da/phrases.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 148dc0aa35..c6323ea1de 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -1552,4 +1552,5 @@
 	<string name="poi_payment_coinkite_yes">Accepter Coinkite</string>
 	<string name="poi_payment_coinkite_no">Accepter ikke Coinkite</string>
 	<string name="poi_payment_roadrunner_yes">Acceptere Roadrunner kort</string>
+	<string name="poi_payment_roadrunner_no">Accepter ikke Roadrunner kort</string>
 	</resources>

From b2f19692fc2182647e1634a187ab9cde5c8e3510 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 23:14:56 +0200
Subject: [PATCH 38/40] Translated using Weblate (Danish)

Currently translated at 97.8% (1424 of 1456 strings)
---
 OsmAnd/res/values-da/phrases.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index c6323ea1de..14da068af3 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -1553,4 +1553,5 @@
 	<string name="poi_payment_coinkite_no">Accepter ikke Coinkite</string>
 	<string name="poi_payment_roadrunner_yes">Acceptere Roadrunner kort</string>
 	<string name="poi_payment_roadrunner_no">Accepter ikke Roadrunner kort</string>
+	<string name="poi_payment_svg_yes">Acceptere SVG</string>
 	</resources>

From 4e2936df5d1778823b860197902d9b025f93070a Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 23:14:56 +0200
Subject: [PATCH 39/40] Translated using Weblate (Danish)

Currently translated at 97.8% (1424 of 1456 strings)
---
 OsmAnd/res/values-da/phrases.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 14da068af3..fca3171010 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -1554,4 +1554,5 @@
 	<string name="poi_payment_roadrunner_yes">Acceptere Roadrunner kort</string>
 	<string name="poi_payment_roadrunner_no">Accepter ikke Roadrunner kort</string>
 	<string name="poi_payment_svg_yes">Acceptere SVG</string>
+	<string name="poi_payment_svg_no">Accepter ikke SVG</string>
 	</resources>

From 3e35ed2ff39708b88e104c9c78e385140e389089 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 29 Sep 2015 23:27:15 +0200
Subject: [PATCH 40/40] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index fca3171010..bb19c439a8 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -1555,4 +1555,36 @@
 	<string name="poi_payment_roadrunner_no">Accepter ikke Roadrunner kort</string>
 	<string name="poi_payment_svg_yes">Acceptere SVG</string>
 	<string name="poi_payment_svg_no">Accepter ikke SVG</string>
-	</resources>
+	<string name="poi_payment_sms_yes">Accepter SMS betalinger</string>
+	<string name="poi_payment_sms_no">Accepter ikke SMS betalinger</string>
+	<string name="poi_payment_ov_chipkaart_yes">Acceptere OV-Chipkaart</string>
+	<string name="poi_payment_ov_chipkaart_no">Accepter ikke OV-Chipkaart</string>
+	<string name="poi_payment_oyster_yes">Accepter Oyster kort</string>
+	<string name="poi_payment_oyster_no">Accepter ikke Oyster kort</string>
+	<string name="poi_payment_sube_yes">Accepter SUBE kort</string>
+	<string name="poi_payment_sube_no">Accepter ikke SUBE kort</string>
+	<string name="poi_payment_via_verde_yes">Acceptere Via Verde</string>
+	<string name="poi_payment_via_verde_no">Accepter ikke Via Verde</string>
+	<string name="poi_payment_meal_voucher_yes">Acceptere spisebilletter</string>
+	<string name="poi_payment_meal_voucher_no">Accepter ikke spisebilletter</string>
+	<string name="poi_payment_paypal_yes">Acceptere PayPal</string>
+	<string name="poi_payment_paypal_no">Accepter ikke PayPal</string>
+	<string name="poi_payment_u_key_yes">Accepter U-Key</string>
+	<string name="poi_payment_u_key_no">Accepter ikke U-Key</string>
+	<string name="poi_payment_token_yes">Acceptere poletter</string>
+	<string name="poi_payment_token_no">Accepter ikke poletter</string>
+	<string name="poi_payment_gift_card_yes">Accepter gavekort</string>
+	<string name="poi_payment_gift_card_no">Accepter ikke gavekort</string>
+	<string name="poi_payment_golden_crown_yes">Accepter Golden Crown kort</string>
+	<string name="poi_payment_golden_crown_no">Accepter Golden Crown kort</string>
+	<string name="poi_payment_pro100_yes">Acceptere PRO100 kort</string>
+	<string name="poi_payment_pro100_no">Accepter ikke PRO100 kort</string>
+	<string name="poi_payment_union_card_yes">Accepter Union kort</string>
+	<string name="poi_payment_union_card_no">Accepter ikke Union kort</string>
+	<string name="poi_payment_mtsmoney_yes">Acceptere MTS-penge</string>
+	<string name="poi_payment_mtsmoney_no">Accepter ike MTS-penge</string>
+	<string name="poi_payment_yandexmoney_yes">Acceptere Yandex.Money</string>
+	<string name="poi_payment_yandexmoney_no">Accepter ikke Yandex.Money</string>
+	<string name="poi_description_payment">Betalingsbeskrivelse</string>
+
+</resources>