From 5fbaac1c8dabc578e05f1d4f067b19d367da3690 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jb.holcroft@gmail.com>
Date: Sun, 24 Jan 2016 21:17:40 +0100
Subject: [PATCH 01/72] Translated using Weblate (French)

Currently translated at 99.9% (1889 of 1890 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 e3ecad96ed..14f55700f2 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -2122,4 +2122,6 @@
     <string name="road_blocked">Route barrée</string>
     <string name="add_time_span">Ajouter un laps de temps</string>
     <string name="data_is_not_available">Donnée indisponible</string>
+    <string name="rendering_attr_hideUnderground_name">Cacher les objets souterrains</string>
+    <string name="shared_string_read_more">Lire la suite</string>
     </resources>

From a1a730749ff22c5f04d0027d0ddbde0b4793a740 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Sat, 23 Jan 2016 18:21:59 +0100
Subject: [PATCH 02/72] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 045be3af07..fcbcada676 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2237,4 +2237,5 @@
     <string name="shared_string_remove">Fjern</string>
     <string name="data_is_not_available">Data er ikke tilgængelig</string>
     <string name="rendering_attr_hideUnderground_name">Skjul underjordiske objekter</string>
+    <string name="shared_string_read_more">Læs mere</string>
     </resources>

From 26f5699a27d940dc7318bfc90c841cc6ebed0e9e Mon Sep 17 00:00:00 2001
From: P <plamen_mbx@yahoo.com>
Date: Sun, 24 Jan 2016 21:49:01 +0100
Subject: [PATCH 03/72] Translated using Weblate (Bulgarian)

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

diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index c934d38ad1..06cccc8173 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -2057,4 +2057,6 @@
     <string name="clear_updates_proposition_message">Можете да премахнете свалените актуализации и да възстановите оригиналната карта</string>
     <string name="add_time_span">Добавете времеви интервал</string>
     <string name="shared_string_remove">Премахване</string>
+    <string name="rendering_attr_hideUnderground_name">Скрий подземните обекти</string>
+    <string name="shared_string_read_more">Прочети още</string>
     </resources>

From 7ab983a94c3a72f3bc45c0aa675f2e7a340edde9 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Mon, 25 Jan 2016 00:09:54 +0300
Subject: [PATCH 04/72] InApp fixes

---
 OsmAnd/res/layout/subscription_fragment.xml   | 329 +++++++++---------
 .../net/osmand/plus/inapp/InAppHelper.java    |  11 +
 .../liveupdates/SubscriptionFragment.java     |  15 +-
 3 files changed, 195 insertions(+), 160 deletions(-)

diff --git a/OsmAnd/res/layout/subscription_fragment.xml b/OsmAnd/res/layout/subscription_fragment.xml
index 8f1674e814..8f21cff1db 100644
--- a/OsmAnd/res/layout/subscription_fragment.xml
+++ b/OsmAnd/res/layout/subscription_fragment.xml
@@ -33,192 +33,203 @@
     </LinearLayout>
 
     <include layout="@layout/shadow_bottom"/>
-    
-    
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="56dp"
-            android:orientation="horizontal">
 
-            <ImageView
-                android:id="@+id/emailIcon"
-                android:layout_width="56dp"
-                android:layout_height="48dp"
-                android:scaleType="center"
-                android:src="@drawable/ic_action_message"/>
-
-            <EditText
-                android:id="@+id/emailEdit"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:hint="E-mail address"
-                android:inputType="textEmailAddress"/>
-
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="72dp"
-            android:layout_marginRight="16dp"
-            android:text="We need it to provide you information about contributions"
-            android:textColor="?android:attr/textColorSecondary"/>
-
-    
-
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="56dp"
-            android:orientation="horizontal">
+            android:orientation="vertical">
 
-            <ImageView
-                android:id="@+id/userNameIcon"
-                android:layout_width="56dp"
-                android:layout_height="48dp"
-                android:scaleType="center"
-                android:src="@drawable/ic_person"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="56dp"
+                android:orientation="horizontal">
 
-            <EditText
-                android:id="@+id/userNameEdit"
+                <ImageView
+                    android:id="@+id/emailIcon"
+                    android:layout_width="56dp"
+                    android:layout_height="48dp"
+                    android:scaleType="center"
+                    android:src="@drawable/ic_action_message"/>
+
+                <EditText
+                    android:id="@+id/emailEdit"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:hint="E-mail address"
+                    android:inputType="textEmailAddress"/>
+
+            </LinearLayout>
+
+            <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="16dp"
+                android:layout_marginLeft="72dp"
                 android:layout_marginRight="16dp"
-                android:hint="Public Name"
-                android:inputType="text"/>
+                android:text="We need it to provide you information about contributions"
+                android:textColor="?android:attr/textColorSecondary"/>
 
-            
-        </LinearLayout>
-        <CheckBox
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="12dp"
-            android:layout_marginLeft="72dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginTop="8dp"
-            android:text="Don't show my name in reports"
-            android:textColor="?android:attr/textColorPrimary"/>
-        
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="56dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="8dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/countryIcon"
-                android:layout_width="56dp"
-                android:layout_height="48dp"
-                android:scaleType="center"
-                android:src="@drawable/ic_world_globe_dark"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="56dp"
+                    android:orientation="horizontal">
 
-                <net.osmand.plus.widgets.AutoCompleteTextViewEx
-                    android:id="@+id/selectCountryEdit"
-                    android:layout_width="fill_parent"
+                    <ImageView
+                        android:id="@+id/userNameIcon"
+                        android:layout_width="56dp"
+                        android:layout_height="48dp"
+                        android:scaleType="center"
+                        android:src="@drawable/ic_person"/>
+
+                    <EditText
+                        android:id="@+id/userNameEdit"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginRight="16dp"
+                        android:hint="Public Name"
+                        android:inputType="text"/>
+
+
+                </LinearLayout>
+
+                <CheckBox
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="12dp"
+                    android:layout_marginLeft="72dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginTop="8dp"
+                    android:text="Don't show my name in reports"
+                    android:textColor="?android:attr/textColorPrimary"/>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="4dp"
+                    android:minHeight="56dp"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/countryIcon"
+                        android:layout_width="56dp"
+                        android:layout_height="48dp"
+                        android:scaleType="center"
+                        android:src="@drawable/ic_world_globe_dark"/>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+
+                        <net.osmand.plus.widgets.AutoCompleteTextViewEx
+                            android:id="@+id/selectCountryEdit"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="16dp"
+                            android:layout_marginRight="16dp"
+                            android:layout_marginTop="4dp"
+                            android:drawableRight="@drawable/ic_action_arrow_drop_down"
+                            android:editable="false"
+                            android:hint="Support region"/>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:background="?attr/bg_card"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:orientation="horizontal">
+
+                    <net.osmand.plus.widgets.TextViewEx
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="Month cost"
+                        android:textColor="?android:attr/textColorPrimary"
+                        android:textSize="@dimen/default_list_text_size_large"
+                        android:textStyle="bold"
+                        app:typeface="@string/font_roboto_regular"/>
+
+                    <net.osmand.plus.widgets.TextViewEx
+                        android:id="@+id/priceTextView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="right"
+                        android:text="@string/osm_live_default_price"
+                        android:textColor="?attr/color_dialog_buttons"
+                        android:textSize="@dimen/default_list_text_size_large"
+                        android:textStyle="bold"
+                        app:typeface="@string/font_roboto_regular"/>
+
+                </LinearLayout>
+
+                <net.osmand.plus.widgets.TextViewEx
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="16dp"
                     android:layout_marginRight="16dp"
-                    android:layout_marginTop="4dp"
-                    android:hint="Support region"
-                    android:drawableRight="@drawable/ic_action_arrow_drop_down"
-                    android:editable="false"/>
+                    android:text="Monthly payment"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:textSize="@dimen/default_desc_text_size"
+                    app:typeface="@string/font_roboto_regular"/>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="10dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginTop="10dp"
+                    android:background="?attr/divider_color"/>
+
+                <Button
+                    android:id="@+id/subscribeButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right"
+                    android:layout_marginBottom="10dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="6dp"
+                    android:background="?attr/selectableItemBackground"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:text="Subscribe"
+                    android:textColor="?attr/color_dialog_buttons"/>
 
             </LinearLayout>
 
         </LinearLayout>
 
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:background="?attr/bg_card"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="16dp"
-            android:orientation="horizontal">
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="Month cost"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_list_text_size_large"
-                android:textStyle="bold"
-                app:typeface="@string/font_roboto_regular"/>
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/priceTextView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="right"
-                android:text="@string/osm_live_default_price"
-                android:textColor="?attr/color_dialog_buttons"
-                android:textSize="@dimen/default_list_text_size_large"
-                android:textStyle="bold"
-                app:typeface="@string/font_roboto_regular"/>
-
-        </LinearLayout>
-
-        <net.osmand.plus.widgets.TextViewEx
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:text="Monthly payment"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="@dimen/default_desc_text_size"
-            app:typeface="@string/font_roboto_regular"/>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginTop="10dp"
-            android:background="?attr/divider_color"/>
-
-        <Button
-            android:id="@+id/subscribeButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right"
-            android:layout_marginBottom="10dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="6dp"
-            android:background="?attr/selectableItemBackground"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:text="Subscribe"
-            android:textColor="?attr/color_dialog_buttons"/>
-
-    </LinearLayout>
-
+    </ScrollView>
 
 </LinearLayout>
diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
index 00bafe3325..28b25cf139 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
@@ -13,6 +13,7 @@ import net.osmand.plus.inapp.util.IabHelper;
 import net.osmand.plus.inapp.util.IabResult;
 import net.osmand.plus.inapp.util.Inventory;
 import net.osmand.plus.inapp.util.Purchase;
+import net.osmand.plus.inapp.util.SkuDetails;
 import net.osmand.util.Algorithms;
 
 import org.json.JSONException;
@@ -31,6 +32,7 @@ public class InAppHelper {
 	static final String TAG = "InAppHelper";
 
 	private static boolean mSubscribedToLiveUpdates = false;
+	private static String mLiveUpdatesPrice;
 
 	public static final String SKU_LIVE_UPDATES = "osm_live_subscription_1";
 
@@ -63,6 +65,10 @@ public class InAppHelper {
 		return mSubscribedToLiveUpdates;
 	}
 
+	public static String getLiveUpdatesPrice() {
+		return mLiveUpdatesPrice;
+	}
+
 	public InAppHelper(OsmandApplication ctx, InAppCallbacks callbacks) {
 		this.ctx = ctx;
 		this.callbacks = callbacks;
@@ -159,6 +165,11 @@ public class InAppHelper {
 			Log.d(TAG, "User " + (mSubscribedToLiveUpdates ? "HAS" : "DOES NOT HAVE")
 					+ " live updates purchased.");
 
+			if (inventory.hasDetails(SKU_LIVE_UPDATES)) {
+				SkuDetails liveUpdatesDetails = inventory.getSkuDetails(SKU_LIVE_UPDATES);
+				mLiveUpdatesPrice = liveUpdatesDetails.getPrice();
+			}
+
 			if (callbacks != null) {
 				callbacks.showHideProgress(false);
 				callbacks.onGetItems();
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
index b8bd648219..4276fda139 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
@@ -13,6 +13,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import net.osmand.AndroidUtils;
 import net.osmand.map.WorldRegion;
@@ -104,6 +105,8 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 			}
 		});
 
+		updatePrice();
+
 		Button subscribeButton = (Button) view.findViewById(R.id.subscribeButton);
 		subscribeButton.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -166,7 +169,7 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 
 	@Override
 	public void onGetItems() {
-
+		updatePrice();
 	}
 
 	@Override
@@ -202,6 +205,16 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 		}
 	}
 
+	private void updatePrice() {
+		View view = getView();
+		if (view != null) {
+			TextView priceTextView = (TextView) view.findViewById(R.id.priceTextView);
+			if (InAppHelper.getLiveUpdatesPrice() != null) {
+				priceTextView.setText(InAppHelper.getLiveUpdatesPrice());
+			}
+		}
+	}
+
 	private void initCountries() {
 		final WorldRegion root = getMyApplication().getRegions().getWorldRegion();
 		ArrayList<WorldRegion> groups = new ArrayList<>();

From b0a5cd54b1263843861c8116fd38a17a56449c8b Mon Sep 17 00:00:00 2001
From: Adriano Rosa <adrianojbr@gmail.com>
Date: Sat, 23 Jan 2016 19:53:49 +0100
Subject: [PATCH 05/72] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1890 of 1890 strings)
---
 OsmAnd/res/values-pt-rBR/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 394ef1d17a..9efa5c31de 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -2003,4 +2003,5 @@
     <string name="shared_string_select">Selecionar</string>
     <string name="data_is_not_available">Dados indisponíveis</string>
     <string name="rendering_attr_hideUnderground_name">Ocultar objetos subterrâneos</string>
+    <string name="shared_string_read_more">Leia mais</string>
     </resources>

From 3ef7b18ba7ba4d503e4ca02cafbe610e94c8c27d Mon Sep 17 00:00:00 2001
From: Adriano Rosa <adrianojbr@gmail.com>
Date: Mon, 25 Jan 2016 00:50:16 +0100
Subject: [PATCH 06/72] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2430 of 2430 strings)
---
 OsmAnd/res/values-pt-rBR/phrases.xml | 40 ++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index 2628ee72cd..2fc8a3a399 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -2626,4 +2626,44 @@
 	<string name="poi_protection_object_habitat">Objeto de proteção: habitat</string>
 	<string name="poi_protection_object_water">Objeto de proteção: água</string>
 
+<string name="poi_nuclear_explosion_country">Explosão: país</string>
+	<string name="poi_nuclear_explosion_site">Explosão: local</string>
+	<string name="poi_nuclear_explosion_type_underground_shaft">Tipo de explosão: subterrânea, escavação</string>
+	<string name="poi_nuclear_explosion_type_underground_tunnel">Tipo de explosão: subterrânea, túnel</string>
+	<string name="poi_nuclear_explosion_type_atmospheric">Tipo de explosão: atmosférica</string>
+	<string name="poi_nuclear_explosion_type_atmospheric_airdrop">Tipo de explosão: atmosférica, lançamento aéreo</string>
+	<string name="poi_nuclear_explosion_type_atmospheric_surface_tower">Tipo de explosão: atmosférica, superfície, torre</string>
+	<string name="poi_nuclear_explosion_type_atmospheric_balloon">Tipo de explosão: atmosférica, balão</string>
+	<string name="poi_nuclear_explosion_type_atmospheric_atmospheric_surface">Tipo de explosão: atmosférica, superfície</string>
+	<string name="poi_nuclear_explosion_type_atmospheric_water_surface_barge">Tipo de explosão: atmosférica, superfície d\'água, barca</string>
+	<string name="poi_nuclear_explosion_type_underground">Tipo de explosão: subterrânea</string>
+	<string name="poi_nuclear_explosion_type_cratering_burst">Tipo de explosão: erupção de cratera (subsolo raso)</string>
+	<string name="poi_nuclear_explosion_type_atmospheric_rocket_or_missile">Tipo de explosão: atmosférica, foguete ou míssil</string>
+	<string name="poi_nuclear_explosion_type_space">Tipo de explosão: espacial (mais de 80 km de altitude)</string>
+	<string name="poi_nuclear_explosion_type_underwater">Tipo de explosão: subaquática</string>
+	<string name="poi_nuclear_explosion_date_utc">Data da explosão (UTC)</string>
+	<string name="poi_nuclear_explosion_shot_name_en">Nome do disparo (en)</string>
+	<string name="poi_nuclear_explosion_series">Série de explosões</string>
+	<string name="poi_nuclear_explosion_purpose_nuclear_weapons_related">Propósito da explosão: relacionado com armas nucleares</string>
+	<string name="poi_nuclear_explosion_purpose_weapons_effects">Propósito da explosão: efeito das armas</string>
+	<string name="poi_nuclear_explosion_purpose_safety_experiment">Propósito da explosão: experimento de segurança</string>
+	<string name="poi_nuclear_explosion_purpose_research_for_peaceful_applications">Propósito da explosão: investigação para aplicações pacíficas</string>
+	<string name="poi_nuclear_explosion_purpose_fundamental_science">Propósito da explosão: ciência básica</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_cavity_excavation">Propósito da explosão: aplicação industrial, escavação de cavidade</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_seismic_sounding">Propósito da explosão: aplicação industrial, sondagem sísmica</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_oil_stimulation">Propósito da explosão: aplicação industrial, estimulação de petróleo</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application">Propósito da explosão: aplicação industrial</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_earth_moving">Propósito da explosão: aplicação industrial, movimentação de terra</string>
+	<string name="poi_nuclear_explosion_time_utc">Hora da explosão (UTC)</string>
+	<string name="poi_nuclear_explosion_yield">Produto da explosão</string>
+	<string name="poi_nuclear_explosion_hole">Buraco da explosão</string>
+	<string name="poi_nuclear_explosion_height_of_burst">Altura da erupção</string>
+	<string name="poi_nuclear_explosion_ground_zero_altitude">Altitude do marco zero</string>
+	<string name="poi_nuclear_explosion_body_wave_magnitude">Magnitude da conda do corpo</string>
+	<string name="poi_nuclear_explosion_salvo_first_detonation">Salva de explosão: primeira detonação de um teste de salva</string>
+	<string name="poi_nuclear_explosion_salvo_second_or_later_detonation">Salva de explosão: segunda ou posterior detonação de um teste de salva</string>
+	<string name="poi_nuclear_explosion_crater_diameter">Explosão: diâmetro de cratera</string>
+	<string name="poi_nuclear_explosion_warhead">Explosão: ogiva</string>
+	<string name="poi_nuclear_explosion_device">Explosão: dispositivo</string>
+
 </resources>

From 9f2e226076a80845e396f2cff65250f0644a5aae Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Sun, 24 Jan 2016 09:19:19 +0100
Subject: [PATCH 07/72] Translated using Weblate (Chinese (Taiwan))

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

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 5e7f50dee6..cb8709b8a9 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2083,4 +2083,5 @@
     <string name="road_blocked">道路堵塞</string>
     <string name="data_is_not_available">無法獲得資料</string>
     <string name="rendering_attr_hideUnderground_name">隱藏地面下的物件</string>
+    <string name="shared_string_read_more">讀取更多</string>
     </resources>

From 1aeb9477aa629943e55ff5e90c2ce158cd4e8b6f Mon Sep 17 00:00:00 2001
From: jf-simon <simon@t-tischer.de>
Date: Sat, 23 Jan 2016 17:37:06 +0100
Subject: [PATCH 08/72] Translated using Weblate (German)

Currently translated at 100.0% (1890 of 1890 strings)
---
 OsmAnd/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 96633c84c6..d68be15c8e 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -2010,4 +2010,5 @@
     <string name="clear_updates_proposition_message">Kartenaktualisierungen können gelöscht werden um zur orginal Karte zurückzukehren</string>
     <string name="data_is_not_available">Daten nicht verfügbar</string>
     <string name="rendering_attr_hideUnderground_name">Unterirdische Objekt verbergen</string>
+    <string name="shared_string_read_more">Mehr lesen</string>
     </resources>

From 794c1fa3a1f43200abfc53214907d288cce812de Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Mon, 25 Jan 2016 12:52:38 +0200
Subject: [PATCH 09/72] Add new description.

---
 OsmAnd/res/values/strings.xml | 47 +++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index c71598da1b..4f6707ac68 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1287,6 +1287,53 @@ Approximate map coverage and quality:
 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_extended_description_4000_chars_v2">
+OsmAnd Maps &amp; Navigation - make routes and find locations on the map without an internet connection. Download a map of a country before you go on a trip to find places and routes in an unfamiliar area.
+
+Basic options:
+• Detailed maps of 200 countries
+• Offline navigator with voice prompts
+• Address search in offline mode
+• Info about locations on the map: places of interest, cafes, parking lots, shops
+• Adding locations to favorites
+• Driving, cycling and pedestrian navigation
+
+Additional options: 
+• Ability to view and record GPX tracks
+• Wikipedia description of POI
+• Adding photo, audio, and video notes to the map
+• Day and Night map modes for more convenient driving
+• Information about public transport routes and stops
+• Bicycle paths and  footpaths
+• Walking trails for tourism all over the world
+• Online maps from numerous sources
+• Info about road pavement quality and street lighting
+• Adding, editing and deleting POI (for OpenStreetMap.org users)
+• OsMo - live monitoring of other devices
+
+Get a reliable navigator in your country - be it France, Germany, Mexico, United Kingdom, Spain, the Netherlands, USA, Russia, Brazil or any other state.
+
+Plugins:
+• Contour maps and terrain shading https://goo.gl/7mojP8
+  Contour lines data and terrain visualization added to the basic OsmAnd map.
+
+• Ski maps https://goo.gl/pX6DxJ
+  The info about ski pistes, cross-country skiing tracks, cable railways and ski lifts.
+
+• Nautical map https://goo.gl/0hEdxm
+  Special map style for viewing nautical navigation signs for arterial and nearshore marine navigation.
+
+• Parking position https://goo.gl/6JxQXF
+  Helps you mark the location of your parked vehicle and see how much time left if the parking is time-limited.
+
+Stay tuned!
+
+Twitter: https://twitter.com/osmandapp
+Facebook: https://www.facebook.com/osmandapp
+Site: http://osmand.net
+
+If you need help with OsmAnd application, please contact our support team: support@osmand.net.        
+    </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>

From 5b6135567a7f0d7a25bd75fb2bb7f83bc0fc0371 Mon Sep 17 00:00:00 2001
From: CJTmmr <keesjantimmer@gmail.com>
Date: Sun, 24 Jan 2016 23:03:07 +0100
Subject: [PATCH 10/72] Translated using Weblate (Dutch)

Currently translated at 100.0% (1890 of 1890 strings)
---
 OsmAnd/res/values-nl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index f4fd7b01aa..3c6e1962a3 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -2175,4 +2175,5 @@
     <string name="reports_for">Verslag voor:</string>
 <string name="data_is_not_available">Gegevens niet beschikbaar</string>
     <string name="rendering_attr_hideUnderground_name">Verberg ondergrondse objecten</string>
+    <string name="shared_string_read_more">Lees meer...</string>
     </resources>

From cde42e43379dc88013ab849aed4e0d485b963679 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Sun, 24 Jan 2016 23:53:45 +0100
Subject: [PATCH 11/72] Translated using Weblate (Italian)

Currently translated at 99.8% (1887 of 1890 strings)
---
 OsmAnd/res/values-it/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 381ea6e233..7abdee957b 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2143,10 +2143,11 @@
     <string name="number_of_edits">Numero di modifiche</string>
     <string name="number_of_contributors">Numero di contributori</string>
     <string name="shared_string_select">Scegli</string>
-    <string name="reports_for">Rapporto per:</string>
+    <string name="reports_for">Rapporto per</string>
 <string name="shared_string_remove">Rimuovi</string>
     <string name="clear_updates_proposition_message">Puoi eliminare gli aggiornamenti scaricati e avere la mappa originale</string>
     <string name="road_blocked">Strada bloccata</string>
     <string name="add_time_span">Aggiungi durata</string>
     <string name="data_is_not_available">Il dato non è disponibile</string>
+    <string name="rendering_attr_hideUnderground_name">Nascondi gli oggetti sotterranei</string>
     </resources>

From d15ce26a63e024bf3f660df923b9764b4236642a Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Mon, 25 Jan 2016 08:21:59 +0100
Subject: [PATCH 12/72] Translated using Weblate (Swedish)

Currently translated at 99.2% (1875 of 1890 strings)
---
 OsmAnd/res/values-sv/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index eb18134640..25e3e814fa 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -2076,4 +2076,5 @@
     <string name="road_blocked">Blockerad väg</string>
     <string name="data_is_not_available">Inga data tillgängliga</string>
     <string name="rendering_attr_hideUnderground_name">Dölj underjordiska objekt</string>
+    <string name="shared_string_read_more">Läs mer</string>
     </resources>

From e9e38acdb618b970dbce3cdd20c1aac17bd47e97 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Sun, 24 Jan 2016 21:35:26 +0100
Subject: [PATCH 13/72] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index fcbcada676..2908c9545f 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2238,4 +2238,32 @@
     <string name="data_is_not_available">Data er ikke tilgængelig</string>
     <string name="rendering_attr_hideUnderground_name">Skjul underjordiske objekter</string>
     <string name="shared_string_read_more">Læs mere</string>
+    <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Maps &amp; Navigation - lav ruter og find steder på kortet uden en internetforbindelse. Hent et kort for et land, før du går på en tur til at finde steder og ruter i et ukendt område.
+\n\nGrundlæggende indstillinger:
+\n• detaljerede kort over 200 lande
+\n• Offline navigator med stemme beder
+\n• adressesøgning i offline mode
+\n• Info om steder på kortet: steder af interesse, caféer, parkeringspladser, butikker
+\n• tilføj steder til foretrukne
+\n• kørsel, cykling og fodgængernavigation
+\n\nyderligere indstillinger:
+\n• evne til at se og optage GPX sporer
+\n• Wikipedia beskrivelse af IP\n• tilføj foto, audio, og video noter til kort
+\n• dag og nat kort tilstande for mere praktisk kørsel
+\n• oplysninger om offentlige transportruter og stopper
+\n• cykelstier og gangstier
+\n• Walking stier for turisme over hele verden
+\n• Online kort fra adskillige kilder
+\n• Info om road fortovet kvalitet og gadebelysning
+\n• tilføjelse, redigering og sletning af IP (for OpenStreetMap.org brugere)
+\n• OsMo - live overvågning af andre enheder
+\n\nFå en pålidelig navigator i dit land - enten det er Frankrig, Tyskland, Mexico, Storbritannien, Spanien, Holland, USA, Rusland, Brasilien eller nogen anden stat.
+\n\nPlugins:
+\n• kontur kort og terræn skygge https://goo.gl/7mojP8 højdekurver data og terræn visualisering tilføjet til grundlæggende OsmAnd kortet.
+\n• Ski kort info om ski pister, langrend spor, kabel jernbaner og skilifterne-https://goo.gl/pX6DxJ.
+\n• Af nautiske kort https://goo.gl/0hEdxm særlige kort stil til visning af nautiske navigation tegn for arteriel og offshore marine navigation.
+\n• Parkering position, https://goo.gl/6JxQXF hjælper dig med at markere placeringen af din parkerede bil og se hvor meget tid tilbage, hvis parkeringspladsen er gang-indskrænket.
+\n\nStay tuned!
+\nTwitter:, https://twitter.com/osmandapp
+\nFacebook: https://www.facebook.com/osmandapp\nHjemmeside: http://osmand.net hvis du har brug for hjælp med OsmAnd, bedes du kontakte vores supportteam: support@osmand.net. "</string>
     </resources>

From 6c9dc7591ae33b65e0461d0c8ed39b517e855a7c Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Mon, 25 Jan 2016 11:01:33 +0200
Subject: [PATCH 14/72] Gray background and wider click area.

---
 OsmAnd/res/layout/fragment_reports.xml         | 2 +-
 OsmAnd/res/layout/reports_for_spinner_item.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_reports.xml b/OsmAnd/res/layout/fragment_reports.xml
index 8feb5e81ad..ef70be617d 100644
--- a/OsmAnd/res/layout/fragment_reports.xml
+++ b/OsmAnd/res/layout/fragment_reports.xml
@@ -62,7 +62,7 @@
                 layout="@layout/reports_for_spinner_item"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
+                android:layout_gravity="fill_vertical"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="56dp"/>
 
diff --git a/OsmAnd/res/layout/reports_for_spinner_item.xml b/OsmAnd/res/layout/reports_for_spinner_item.xml
index ecb2a6c63d..2efef0901f 100644
--- a/OsmAnd/res/layout/reports_for_spinner_item.xml
+++ b/OsmAnd/res/layout/reports_for_spinner_item.xml
@@ -5,7 +5,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:gravity="center"
-              android:background="@android:drawable/list_selector_background">
+              android:background="?attr/expandable_list_item_background">
 
     <TextView
         android:text="@string/reports_for"

From 0409a057ad06ebb2e44f6f38a1c7fbb5312cac00 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Mon, 25 Jan 2016 11:03:20 +0200
Subject: [PATCH 15/72] Removed unnecessary logs.

---
 OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index 29a9287456..0a0bdf1101 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -929,7 +929,6 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 			final LatLon r = calc.getLatLonFromPixel(cp.x + dx, cp.y + dy);
 			setLatLon(r.getLatitude(), r.getLongitude());
 			int baseZoom = initialViewport.getZoom();
-			LOG.debug("baseZoom=" + baseZoom);
 			while (initialViewport.getZoomFloatPart() + dz > 1) {
 				dz--;
 				if (baseZoom < mainLayer.getMaximumShownMapZoom()) {
@@ -942,7 +941,6 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 					baseZoom--;
 				}
 			}
-			LOG.debug("baseZoom=" + baseZoom);
 			zoomToAnimate(baseZoom, dz, true);
 			rotateToAnimate(calcRotate);
 		}

From 16fc9a481af61624129a973495bbbb2b4e5e370c Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Mon, 25 Jan 2016 16:11:34 +0200
Subject: [PATCH 16/72] Fixed URL processing in OsMo

---
 .../src/net/osmand/plus/osmo/OsMoGroups.java  | 35 +++++++++----------
 OsmAnd/src/net/osmand/plus/osmo/Protocol.java | 17 +++++++++
 2 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/osmo/Protocol.java

diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
index 66402ace73..2e124581ab 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
@@ -1,13 +1,6 @@
 package net.osmand.plus.osmo;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.google.gson.Gson;
 
 import net.osmand.Location;
 import net.osmand.plus.GPXUtilities.WptPt;
@@ -24,6 +17,15 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 	
 	private static final String GROUP_NAME = "name";
@@ -47,6 +49,8 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 	private ArrayList<OsMoGroupsUIListener> uiListeners = new ArrayList<>();
 	private OsMoPlugin plugin;
 	private OsmandApplication app;
+
+	private Gson gson = new Gson();
 	
 	public interface OsMoGroupsUIListener {
 		
@@ -423,17 +427,10 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 	
 	
 	public String createGroup(String groupName, boolean onlyByInvite, String description, String policy) {
-		JSONObject obj = new JSONObject();
-		try {
-			obj.put("name", groupName);
-			obj.put("onlyByInvite", onlyByInvite);
-			obj.put("description", description);
-			obj.put("policy", policy);
-			service.pushCommand("GROUP_CREATE|" + obj.toString());
-			return "GROUP_CREATE";
-		} catch (JSONException e) {
-			throw new RuntimeException(e);
-		}
+		Protocol.CreateGroupData obj = new Protocol.CreateGroupData(groupName,
+				onlyByInvite, description, policy);
+		service.pushCommand("GROUP_CREATE|" + gson.toJson(obj));
+		return "GROUP_CREATE";
 	}
 	
 	
diff --git a/OsmAnd/src/net/osmand/plus/osmo/Protocol.java b/OsmAnd/src/net/osmand/plus/osmo/Protocol.java
new file mode 100644
index 0000000000..a079617c5c
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/osmo/Protocol.java
@@ -0,0 +1,17 @@
+package net.osmand.plus.osmo;
+
+public class Protocol {
+	public static class CreateGroupData {
+		public final String name;
+		public final boolean onlyByInvite;
+		public final String description;
+		public final String policy;
+
+		public CreateGroupData(String name, boolean onlyByInvite, String description, String policy) {
+			this.name = name;
+			this.onlyByInvite = onlyByInvite;
+			this.description = description;
+			this.policy = policy;
+		}
+	}
+}

From 7ea1955b8cf912f85251948ec261cf0722eef4d2 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Mon, 25 Jan 2016 16:12:33 +0200
Subject: [PATCH 17/72] Fixed formatting OsMoGroups.

---
 .../src/net/osmand/plus/osmo/OsMoGroups.java  | 151 +++++++++---------
 1 file changed, 75 insertions(+), 76 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
index 2e124581ab..2427766839 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.Set;
 
 public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
-	
+
 	private static final String GROUP_NAME = "name";
 	private static final String ACTIVE = "active";
 	private static final String GROUP_ID = "group_id";
@@ -42,7 +42,7 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 	private static final String LAST_ONLINE = "last_online";
 	private static final String TRACK = "track";
 	private static final String POINT = "point";
-	
+
 	private OsMoTracker tracker;
 	private OsMoService service;
 	private OsMoGroupsStorage storage;
@@ -51,11 +51,11 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 	private OsmandApplication app;
 
 	private Gson gson = new Gson();
-	
+
 	public interface OsMoGroupsUIListener {
-		
+
 		public void groupsListChange(String operation, OsMoGroup group);
-		
+
 		public void deviceLocationChanged(OsMoDevice device);
 	}
 
@@ -71,9 +71,9 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 			storage.load();
 		}
 	}
-	
+
 	public void addUiListeners(OsMoGroupsUIListener uiListener) {
-		if (!uiListeners.contains(uiListener)){
+		if (!uiListeners.contains(uiListener)) {
 			uiListeners.add(uiListener);
 		}
 	}
@@ -81,18 +81,18 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 	public void removeUiListener(OsMoGroupsUIListener uiListener) {
 		uiListeners.remove(uiListener);
 	}
-	
+
 	private void connectDeviceImpl(OsMoDevice d) {
-		d.enabled =  true;
+		d.enabled = true;
 		d.active = true;
 		String mid = service.getMyTrackerId();
 		String mgid = service.getMyGroupTrackerId();
 		if ((mid == null || !mid.equals(d.getTrackerId()))
-			 && (mgid == null || !mgid.equals(d.getTrackerId()))) {
+				&& (mgid == null || !mgid.equals(d.getTrackerId()))) {
 			tracker.startTrackingId(d);
 		}
 	}
-	
+
 	@Override
 	public void onConnected() {
 		if (service.isLoggedIn()) {
@@ -116,29 +116,29 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 		storage.save();
 		return op;
 	}
-	
+
 	public String disconnectGroup(OsMoGroup model) {
 		model.enabled = false;
-		String operation = "GROUP_DISCONNECT:"+model.groupId;
+		String operation = "GROUP_DISCONNECT:" + model.groupId;
 		service.pushCommand(operation);
-		for(OsMoDevice d : model.getGroupUsers(null)) {
+		for (OsMoDevice d : model.getGroupUsers(null)) {
 			tracker.stopTrackingId(d);
 		}
 		storage.save();
 		return operation;
 	}
-	
+
 
 	private void disconnectImpl(OsMoDevice model) {
 		model.active = false;
 		tracker.stopTrackingId(model);
 	}
 
-		
+
 	public Collection<OsMoGroup> getGroups() {
 		return storage.getGroups();
 	}
-	
+
 	public void showErrorMessage(String message) {
 		service.showErrorMessage(message);
 	}
@@ -148,7 +148,7 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 		for (OsMoGroup g : getGroups()) {
 			OsMoDevice d = g.updateLastLocation(trackerId, location);
 			if (d != null && uiListeners != null) {
-				for(OsMoGroupsUIListener listener : uiListeners) {
+				for (OsMoGroupsUIListener listener : uiListeners) {
 					listener.deviceLocationChanged(d);
 				}
 			}
@@ -161,47 +161,47 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 		boolean processed = false;
 		String operation = command + ":" + gid;
 		OsMoGroup group = null;
-		if(command.equalsIgnoreCase("GP")) {
+		if (command.equalsIgnoreCase("GP")) {
 			group = storage.getGroup(gid);
-			if(group != null && gid.length() > 0) {
+			if (group != null && gid.length() > 0) {
 				List<OsMoDevice> delta = mergeGroup(group, obj, false);
 				String mygid = service.getMyGroupTrackerId();
 				StringBuilder b = new StringBuilder();
-				for(OsMoDevice d : delta) {
-					if(d.getDeletedTimestamp() != 0 && d.isEnabled()) {
-						if(group.name != null && !d.getTrackerId().equals(mygid)) {
+				for (OsMoDevice d : delta) {
+					if (d.getDeletedTimestamp() != 0 && d.isEnabled()) {
+						if (group.name != null && !d.getTrackerId().equals(mygid)) {
 							b.append(app.getString(R.string.osmo_user_left, d.getVisibleName(), group.getVisibleName(app))).append("\n");
 						}
 						disconnectImpl(d);
-					} else if(!d.isActive()) {
-						if(group.name != null && !d.getTrackerId().equals(mygid)) {
+					} else if (!d.isActive()) {
+						if (group.name != null && !d.getTrackerId().equals(mygid)) {
 							b.append(app.getString(R.string.osmo_user_joined, d.getVisibleName(), group.getVisibleName(app))).append("\n");
 						}
 						connectDeviceImpl(d);
 					}
 				}
-				if(b.length() > 0 && app.getSettings().OSMO_SHOW_GROUP_NOTIFICATIONS.get()){
+				if (b.length() > 0 && app.getSettings().OSMO_SHOW_GROUP_NOTIFICATIONS.get()) {
 					app.showToastMessage(b.toString().trim());
 				}
 				storage.save();
 			}
 			processed = true;
-		} else if(command.equalsIgnoreCase("GROUP_DISCONNECT")) {
+		} else if (command.equalsIgnoreCase("GROUP_DISCONNECT")) {
 			group = storage.getGroup(gid);
-			if(group != null) {
+			if (group != null) {
 				disconnectAllGroupUsers(group);
 				disableGroupTracks(group, group.groupTracks);
 				disableGroupTracks(group, Collections.singleton(group.name + " points.gpx"));
 			}
 			processed = true;
-		} else if(command.equalsIgnoreCase("GROUP_CONNECT")) {
+		} else if (command.equalsIgnoreCase("GROUP_CONNECT")) {
 			group = storage.getGroup(gid);
-			if(group != null) {
+			if (group != null) {
 				mergeGroup(group, obj, true);
 				group.active = true;
 				// connect to enabled devices in group
-				for(OsMoDevice d : group.getGroupUsers(null)) {
-					if(d.isEnabled()) {
+				for (OsMoDevice d : group.getGroupUsers(null)) {
+					if (d.isEnabled()) {
 						d.active = false;
 						connectDeviceImpl(d);
 					}
@@ -209,8 +209,8 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 				storage.save();
 			}
 			processed = true;
-		} else if(command.equalsIgnoreCase("GROUP_CREATE") || command.equalsIgnoreCase("GROUP_JOIN") ) {
-			if(command.equalsIgnoreCase("GROUP_CREATE")) {
+		} else if (command.equalsIgnoreCase("GROUP_CREATE") || command.equalsIgnoreCase("GROUP_JOIN")) {
+			if (command.equalsIgnoreCase("GROUP_CREATE")) {
 				operation = command;
 				try {
 					gid = obj.getString(GROUP_ID);
@@ -221,7 +221,7 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 				}
 			}
 			group = storage.getGroup(gid);
-			if(group == null) {
+			if (group == null) {
 				group = new OsMoGroup();
 				group.groupId = gid;
 				storage.addGroup(group);
@@ -229,9 +229,9 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 			connectGroupImpl(group);
 			storage.save();
 			processed = true;
-		} else if(command.equals("GROUP_LEAVE")) {
+		} else if (command.equals("GROUP_LEAVE")) {
 			group = storage.getGroup(gid);
-			if(group != null) {
+			if (group != null) {
 				storage.deleteGroup(group);
 			}
 			storage.save();
@@ -247,13 +247,13 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 						OsMoGroup parsedGroup = parseGroup(o);
 						receivedGroups.put(parsedGroup.getGroupId(), parsedGroup);
 					}
-					
+
 					storage.mergeGroups(receivedGroups);
 					storage.save();
 				}
 				processed = true;
-				for(OsMoGroup g : storage.getGroups()) {
-					if(!g.isMainGroup() && g.isEnabled()) {
+				for (OsMoGroup g : storage.getGroups()) {
+					if (!g.isMainGroup() && g.isEnabled()) {
 						connectGroupImpl(g);
 					}
 				}
@@ -263,8 +263,8 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 				return processed;
 			}
 		}
-		if(processed && uiListeners != null) {
-			for(OsMoGroupsUIListener listener : uiListeners){
+		if (processed && uiListeners != null) {
+			for (OsMoGroupsUIListener listener : uiListeners) {
 				listener.groupsListChange(operation, group);
 			}
 
@@ -273,21 +273,21 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 	}
 
 	private void disableGroupTracks(OsMoGroup group, Collection<String> tracks) {
-		if(!tracks.isEmpty()) {
+		if (!tracks.isEmpty()) {
 			GpxSelectionHelper helper = app.getSelectedGpxHelper();
-			for(String t : tracks) {
-				SelectedGpxFile sg = helper.getSelectedFileByName("osmo/"+t);
-				if(sg != null && sg.getGpxFile() != null) {
+			for (String t : tracks) {
+				SelectedGpxFile sg = helper.getSelectedFileByName("osmo/" + t);
+				if (sg != null && sg.getGpxFile() != null) {
 					helper.selectGpxFile(sg.getGpxFile(), false, false);
 				}
 			}
 		}
-		
+
 	}
 
 	private OsMoGroup parseGroup(JSONObject obj) throws JSONException {
 		OsMoGroup groupe = new OsMoGroup();
-		groupe.enabled = !(obj.has(ACTIVE) && ("0".equals(obj.getString(ACTIVE)) || 
+		groupe.enabled = !(obj.has(ACTIVE) && ("0".equals(obj.getString(ACTIVE)) ||
 				"false".equals(obj.getString(ACTIVE))));
 		groupe.name = obj.optString(GROUP_NAME);
 		groupe.groupId = obj.getString(GROUP_ID);
@@ -296,40 +296,40 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 		return groupe;
 	}
 
-	
+
 	private void parseGroup(JSONObject obj, OsMoGroup gr) {
 		try {
-			if(obj.has(GROUP_NAME)) {
+			if (obj.has(GROUP_NAME)) {
 				gr.name = obj.getString(GROUP_NAME);
 			}
-			if(obj.has(DESCRIPTION)) {
+			if (obj.has(DESCRIPTION)) {
 				gr.description = obj.getString(DESCRIPTION);
 			}
-			if(obj.has(POLICY)) {
+			if (obj.has(POLICY)) {
 				gr.policy = obj.getString(POLICY);
 			}
-			if(obj.has(EXPIRE_TIME)) {
+			if (obj.has(EXPIRE_TIME)) {
 				gr.expireTime = obj.getLong(EXPIRE_TIME);
 			}
 		} catch (JSONException e) {
 			e.printStackTrace();
 			service.showErrorMessage(e.getMessage());
 		}
-		
+
 	}
 
 	private void disconnectAllGroupUsers(OsMoGroup gr) {
 		gr.active = false;
-		for(OsMoDevice d : gr.getGroupUsers(null)) {
+		for (OsMoDevice d : gr.getGroupUsers(null)) {
 			disconnectImpl(d);
 		}
 	}
 
-	
+
 	private List<OsMoDevice> mergeGroup(OsMoGroup gr, JSONObject obj, boolean deleteUsers) {
 		List<OsMoDevice> delta = new ArrayList<OsMoDevice>();
 		try {
-			if(obj.has("group")) {
+			if (obj.has("group")) {
 				parseGroup(obj.getJSONObject("group"), gr);
 			}
 			Map<String, OsMoDevice> toDelete = new HashMap<String, OsMoDevice>(gr.users);
@@ -364,7 +364,7 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 					delta.add(device);
 				}
 			}
-			
+
 			if (obj.has(TRACK)) {
 				JSONArray ar = obj.getJSONArray(TRACK);
 				JSONObject[] a = new JSONObject[ar.length()];
@@ -379,7 +379,7 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 				plugin.getDownloadGpxTask(true).execute(a);
 				disableGroupTracks(gr, toDeleteT);
 			}
-			
+
 			if (obj.has(POINT)) {
 				JSONArray ar = obj.getJSONArray(POINT);
 				ArrayList<WptPt> points = new ArrayList<WptPt>();
@@ -408,12 +408,12 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 					}
 					points.add(pt);
 				}
-				if(points.size() > 0) {
+				if (points.size() > 0) {
 					plugin.getSaveGpxTask(gr.name + " points", modify, false).execute(points.toArray(new WptPt[points.size()]));
 				}
 			}
-			if(deleteUsers) {
-				for(OsMoDevice s : toDelete.values()) {
+			if (deleteUsers) {
+				for (OsMoDevice s : toDelete.values()) {
 					s.deleted = System.currentTimeMillis();
 					delta.add(s);
 				}
@@ -424,40 +424,40 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 		}
 		return delta;
 	}
-	
-	
+
+
 	public String createGroup(String groupName, boolean onlyByInvite, String description, String policy) {
 		Protocol.CreateGroupData obj = new Protocol.CreateGroupData(groupName,
 				onlyByInvite, description, policy);
 		service.pushCommand("GROUP_CREATE|" + gson.toJson(obj));
 		return "GROUP_CREATE";
 	}
-	
-	
+
+
 	public void setGenColor(OsMoDevice device, int genColor) {
 		device.genColor = genColor;
 		storage.save();
 	}
-	
+
 	public String joinGroup(String groupId, String userName, String nick) {
-		final String op = "GROUP_JOIN:"+groupId+"|"+nick;
+		final String op = "GROUP_JOIN:" + groupId + "|" + nick;
 		OsMoGroup g = storage.getGroup(groupId);
-		if(g == null){
+		if (g == null) {
 			g = new OsMoGroup();
 			g.groupId = groupId;
 			storage.addGroup(g);
 		}
-		g.userName = userName;		
+		g.userName = userName;
 		service.pushCommand(op);
-		return "GROUP_JOIN:"+groupId; 
+		return "GROUP_JOIN:" + groupId;
 	}
-	
+
 	public String leaveGroup(OsMoGroup group) {
-		final String op = "GROUP_LEAVE:"+group.groupId;
+		final String op = "GROUP_LEAVE:" + group.groupId;
 		storage.deleteGroup(group);
 		storage.save();
 		service.pushCommand(op);
-		if(group.isEnabled()) {
+		if (group.isEnabled()) {
 			group.enabled = false;
 			disconnectAllGroupUsers(group);
 		}
@@ -480,5 +480,4 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 		storage.clearGroups();
 		storage.save();
 	}
-
-}
+}
\ No newline at end of file

From bf6a62d69a09b56f95e4ee0900ab83d747b184d0 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Mon, 25 Jan 2016 18:23:09 +0300
Subject: [PATCH 18/72] Update phrases

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

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 93d7c98a62..7fbf2241b5 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -2640,4 +2640,6 @@
 	<string name="poi_nuclear_explosion_warhead">Боеголовка</string>
 	<string name="poi_nuclear_explosion_device">Устройство</string>
 
+	<string name="poi_addr_housename">Название дома</string>
+
 </resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index c2016193bf..fd9e10be55 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -2641,4 +2641,6 @@
 	<string name="poi_nuclear_explosion_warhead">Explosion: warhead</string>
 	<string name="poi_nuclear_explosion_device">Explosion: device</string>
 
+	<string name="poi_addr_housename">House name</string>
+
 </resources>

From c103c00d5f8b17f70af2c2a0c7cc7618a3184155 Mon Sep 17 00:00:00 2001
From: josep constanti <jconstanti@yahoo.es>
Date: Mon, 25 Jan 2016 15:30:22 +0100
Subject: [PATCH 19/72] Translated using Weblate (Catalan)

Currently translated at 99.7% (1887 of 1891 strings)
---
 OsmAnd/res/values-ca/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index b4b968519d..444b506597 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1917,9 +1917,12 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="select_month_and_country">Seleccioneu el mes i el país</string>
     <string name="number_of_contributors">Nombre de col·laboradors</string>
     <string name="number_of_edits">Nombre d\'edicions</string>
-    <string name="reports_for">Informe per:</string>
+    <string name="reports_for">Informe per</string>
 <string name="shared_string_select">Selecciona</string>
     <string name="shared_string_remove">Esborra</string>
     <string name="clear_updates_proposition_message">Podeu esborrar les actualitzacions baixades i tornar a l\'edició original del mapa</string>
     <string name="road_blocked">Via tallada</string>
+    <string name="rendering_attr_hideUnderground_name">Amaga elements soterrats</string>
+    <string name="data_is_not_available">No es disposa de dades</string>
+    <string name="shared_string_read_more">Llegeix més</string>
     </resources>

From 38c9137e032601addbe47ce80a572f9bf7797c7f Mon Sep 17 00:00:00 2001
From: josep constanti <jconstanti@yahoo.es>
Date: Mon, 25 Jan 2016 15:33:21 +0100
Subject: [PATCH 20/72] Translated using Weblate (Catalan)

Currently translated at 78.8% (1915 of 2430 strings)
---
 OsmAnd/res/values-ca/phrases.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index 209cec4b3a..3b8ce3ffcd 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -2092,4 +2092,7 @@
 <string name="poi_protected_area">Àrea protegida</string>
 	<string name="poi_fair_trade_no">Comerç just: no</string>
 	<string name="poi_fair_trade_yes">Comerç just: sí</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_earth_moving">Motiu de l\'explosió: aplicació industrial, moviment de terres</string>
+	<string name="poi_nuclear_explosion_time_utc">Hora de la explosió (UTC)</string>
+	<string name="poi_nuclear_explosion_hole">Cràter de l\'explosió</string>
 	</resources>

From ebaf4e53c53415c786267f25e80c9ec9b59265a5 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Mon, 25 Jan 2016 17:53:14 +0200
Subject: [PATCH 21/72] Fixed #2198. And irrelevant changes int
 OsMoGroupActivity.

---
 .../plus/liveupdates/PerformLiveUpdateAsyncTask.java      | 2 +-
 OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/PerformLiveUpdateAsyncTask.java b/OsmAnd/src/net/osmand/plus/liveupdates/PerformLiveUpdateAsyncTask.java
index c2e6e78142..16cd021ff3 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/PerformLiveUpdateAsyncTask.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/PerformLiveUpdateAsyncTask.java
@@ -80,7 +80,7 @@ public class PerformLiveUpdateAsyncTask
 		} else {
 			settings.LIVE_UPDATES_RETRIES.resetToDefault();
 			List<IncrementalChangesManager.IncrementalUpdate> ll = result.getItemsForUpdate();
-			if (!ll.isEmpty()) {
+			if (ll != null && !ll.isEmpty()) {
 				ArrayList<IndexItem> itemsToDownload = new ArrayList<>(ll.size());
 				for (IncrementalChangesManager.IncrementalUpdate iu : ll) {
 					IndexItem indexItem = new IndexItem(iu.fileName, "Incremental update",
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
index 0d74a9b47c..5d066fa968 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
@@ -617,9 +617,9 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 		if (!checkOperationIsNotRunning()) {
 			return;
 		}
-		String operation = osMoPlugin.getGroups().leaveGroup((OsMoGroup) selectedObject);
+		String operation = osMoPlugin.getGroups().leaveGroup(selectedObject);
 		startLongRunningOperation(operation);
-		adapter.update((OsMoGroup) selectedObject);
+		adapter.update(selectedObject);
 		adapter.notifyDataSetChanged();
 
 	}
@@ -1037,7 +1037,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 	}
 
 	public void hideProgressBar() {
-		OsMoGroupsActivity.this.operation = null;
+		this.operation = null;
 		setSupportProgressBarIndeterminateVisibility(false);
 	}
 	
@@ -1210,7 +1210,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 			} else {
 				label.setTypeface(Typeface.DEFAULT, Typeface.ITALIC);
 			}
-			View v = (View) row.findViewById(R.id.settings);
+			View v = row.findViewById(R.id.settings);
 			if(model.isMainGroup()) {
 				v.setVisibility(View.GONE);
 			} else {

From 0e980d230890876af191702cee004de6c81f2255 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Fri, 22 Jan 2016 20:47:20 +0100
Subject: [PATCH 22/72] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index ac1961b34e..e9083bcb8a 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -2699,4 +2699,6 @@
 	<string name="poi_nuclear_explosion_warhead">Eksplosion: sprænghoved</string>
 	<string name="poi_nuclear_explosion_device">Eksplosion: enhed</string>
 
+<string name="poi_addr_housename">Huset navn</string>
+
 </resources>

From 762b0b51d342267d719835e760e6386f2ab03ffb Mon Sep 17 00:00:00 2001
From: Adriano Rosa <adrianojbr@gmail.com>
Date: Mon, 25 Jan 2016 00:50:24 +0100
Subject: [PATCH 23/72] Translated using Weblate (Portuguese (Brazil))

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

diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index 2fc8a3a399..29af9a837e 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -2666,4 +2666,6 @@
 	<string name="poi_nuclear_explosion_warhead">Explosão: ogiva</string>
 	<string name="poi_nuclear_explosion_device">Explosão: dispositivo</string>
 
+<string name="poi_addr_housename">Complemento</string>
+
 </resources>

From 434856b468f4d4a73a784edfcf95b7cf21af2514 Mon Sep 17 00:00:00 2001
From: Adriano Rosa <adrianojbr@gmail.com>
Date: Mon, 25 Jan 2016 00:22:55 +0100
Subject: [PATCH 24/72] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1891 of 1891 strings)
---
 OsmAnd/res/values-pt-rBR/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 9efa5c31de..855d81ad06 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -2004,4 +2004,5 @@
     <string name="data_is_not_available">Dados indisponíveis</string>
     <string name="rendering_attr_hideUnderground_name">Ocultar objetos subterrâneos</string>
     <string name="shared_string_read_more">Leia mais</string>
+    <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Mapas &amp; Navigação - fazer rotas e encontrar locais no mapa sem uma conexão com a Internet. Baixe um mapa de um país antes de você ir em uma viagem para encontrar lugares e rotas em uma área desconhecida. Opções básicas: • Mapas detalhados de 200 países • Navegador offline com instruções de voz • Pesquisa por endereço no modo offline • Informação sobre locais no mapa: locais de interesse, cafeterias, estacionamentos, lojas • Inclusão de locais favoritos • Navegação para motoristas, ciclistas e pedestres Opções adicionais: • Capacidade de exibir e gravar trilhas GPX • Descrição da Wikipédia descrição de POIs • Adição de notas no mapa com foto, áudio e vídeo • Modos dia e noite para condução mais conveniente • Informação sobre rotas de transportes públicos e paradas • Ciclovias e caminhos para pedestres • Trilhas de caminhada para turismo em todo o mundo • Mapas online de numerosas fontes • Informação sobre a qualidade do pavimento da estrada e iluminação da rua • Adição, edição e exclusão de POIs (para usuários OpenStreetMap.org) • OsMo - acompanhamento ao vivo de outros usuários Obter um navegador confiável no seu país - seja ele, França, Alemanha, México, Reino Unido, Espanha, Holanda, EUA, Rússia, Brasil ou qualquer outro país. Plugins: • Mapas de contorno e sombreamento https://goo.gl/7mojP8 Visualização das curvas de nível e do relevo adicionados ao mapa básico do OsmAnd. • Mapas de esqui https://goo.gl/pX6DxJ Informação sobre as pistas de esqui, trilhas de esqui e teleféricos. • Mapa náutico https://goo.gl/0hEdxm Estilo de mapa especial para a visualização de sinais de navegação náutica para navegação fluvial e marítima. • Posição de estacionamento https://goo.gl/6JxQXF Ajuda a marcar a localização de seu veículo estacionado e ver quanto tempo resta, se o estacionamento tiver limitação de tempo. Fique ligado! Twitter: o https://twitter.com/osmandapp Facebook: https://www.facebook.com/osmandapp Site: http://osmand.net Se precisar de ajuda com o aplicativo OsmAnd, por favor, entre em contato com nossa equipe de suporte: support@osmand.net. "</string>
     </resources>

From 098f2b53cbde4fb7e6578176ae8fb2b830ff2c14 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Mon, 25 Jan 2016 21:58:19 +0300
Subject: [PATCH 25/72] InApp fixes

---
 .../net/osmand/plus/inapp/InAppHelper.java    | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
index 28b25cf139..a8be913348 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
@@ -25,7 +25,10 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.URLEncoder;
 import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 public class InAppHelper {
 	// Debug tag, for logging
@@ -125,7 +128,9 @@ public class InAppHelper {
 
 				// IAB is fully set up. Now, let's get an inventory of stuff we own.
 				Log.d(TAG, "Setup successful. Querying inventory.");
-				mHelper.queryInventoryAsync(mGotInventoryListener);
+				List<String> skus = new ArrayList<>();
+				skus.add(SKU_LIVE_UPDATES);
+				mHelper.queryInventoryAsync(true, skus, mGotInventoryListener);
 			}
 		});
 	}
@@ -207,10 +212,15 @@ public class InAppHelper {
 			protected String doInBackground(Void... params) {
 				userId = ctx.getSettings().BILLING_USER_ID.get();
 				if (Algorithms.isEmpty(userId)) {
-					return sendRequest("http://download.osmand.net/subscription/register?email=" + email
-									+ "&visibleName=" + userName + "&preferredCountry=" + country
-									+ (Algorithms.isEmpty(userId) ? "&status=new" : ""),
-							"POST", "Requesting userId...");
+					try {
+						return sendRequest("http://download.osmand.net/subscription/register?email=" + URLEncoder.encode(email, "UTF-8")
+										+ "&visibleName=" + URLEncoder.encode(userName, "UTF-8") + "&preferredCountry=" + URLEncoder.encode(country, "UTF-8")
+										+ (Algorithms.isEmpty(userId) ? "&status=new" : ""),
+								"POST", "Requesting userId...");
+					} catch (Exception e) {
+						Log.e(TAG, e.getMessage());
+						return null;
+					}
 				} else {
 					return null;
 				}
@@ -349,7 +359,17 @@ public class InAppHelper {
 			Log.d(TAG, "Purchase successful.");
 
 			if (purchase.getSku().equals(SKU_LIVE_UPDATES)) {
-				// bought the infinite gas subscription
+				// bought live updates
+				String userId = ctx.getSettings().BILLING_USER_ID.get();
+				try {
+					sendRequest("http://download.osmand.net/subscription/purchased?userid=" + URLEncoder.encode(userId, "UTF-8")
+									+ "&sku=" + URLEncoder.encode(SKU_LIVE_UPDATES, "UTF-8")
+									+ "&purchaseToken=" + URLEncoder.encode(purchase.getToken(), "UTF-8"),
+							"POST", "Sending purchase info...");
+				} catch (Exception e) {
+					Log.e(TAG, e.getMessage());
+				}
+
 				Log.d(TAG, "Live updates subscription purchased.");
 				showToast("Thank you for subscribing to live updates!");
 				mSubscribedToLiveUpdates = true;

From 859a18ea0d0a55896743b94a5327480f03cc8b0e Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Mon, 25 Jan 2016 19:43:41 +0100
Subject: [PATCH 26/72] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 2908c9545f..1c255e5855 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2240,29 +2240,28 @@
     <string name="shared_string_read_more">Læs mere</string>
     <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Maps &amp; Navigation - lav ruter og find steder på kortet uden en internetforbindelse. Hent et kort for et land, før du går på en tur til at finde steder og ruter i et ukendt område.
 \n\nGrundlæggende indstillinger:
-\n• detaljerede kort over 200 lande
+\n• Detaljerede kort over 200 lande
 \n• Offline navigator med stemme beder
-\n• adressesøgning i offline mode
+\n• Adressesøgning i offline mode
 \n• Info om steder på kortet: steder af interesse, caféer, parkeringspladser, butikker
-\n• tilføj steder til foretrukne
-\n• kørsel, cykling og fodgængernavigation
-\n\nyderligere indstillinger:
+\n• Tlføj steder til foretrukne
+\n• kørsel-, cykling- og fodgængernavigation
+\n\nYderligere indstillinger:
 \n• evne til at se og optage GPX sporer
-\n• Wikipedia beskrivelse af IP\n• tilføj foto, audio, og video noter til kort
-\n• dag og nat kort tilstande for mere praktisk kørsel
-\n• oplysninger om offentlige transportruter og stopper
-\n• cykelstier og gangstier
+\n• Wikipedia beskrivelse af IP\n• Tilføj foto-, audio-, og videonoter til kort
+\n• Dag og nat kort tilstande for mere praktisk kørsel
+\n• Oplysninger om offentlige transportruter og stoppesteder\n• Cykel- og gangstier
 \n• Walking stier for turisme over hele verden
 \n• Online kort fra adskillige kilder
-\n• Info om road fortovet kvalitet og gadebelysning
-\n• tilføjelse, redigering og sletning af IP (for OpenStreetMap.org brugere)
+\n• Info om vej fortovet kvalitet og gadebelysning
+\n• Tilføj, rediger og sletning af IP (for OpenStreetMap.org brugere)
 \n• OsMo - live overvågning af andre enheder
 \n\nFå en pålidelig navigator i dit land - enten det er Frankrig, Tyskland, Mexico, Storbritannien, Spanien, Holland, USA, Rusland, Brasilien eller nogen anden stat.
-\n\nPlugins:
+\n\nUdvidelser:
 \n• kontur kort og terræn skygge https://goo.gl/7mojP8 højdekurver data og terræn visualisering tilføjet til grundlæggende OsmAnd kortet.
-\n• Ski kort info om ski pister, langrend spor, kabel jernbaner og skilifterne-https://goo.gl/pX6DxJ.
-\n• Af nautiske kort https://goo.gl/0hEdxm særlige kort stil til visning af nautiske navigation tegn for arteriel og offshore marine navigation.
-\n• Parkering position, https://goo.gl/6JxQXF hjælper dig med at markere placeringen af din parkerede bil og se hvor meget tid tilbage, hvis parkeringspladsen er gang-indskrænket.
+\n• Skikort info om ski pister, langrend spor, kabel jernbaner og skilifterne-https://goo.gl/pX6DxJ.
+\n• Søkort https://goo.gl/0hEdxm særlige kortstil til visning af nautiske navigation tegn for arteriel og offshore marine navigation.
+\n• Parkering position, https://goo.gl/6JxQXF hjælper dig med at markere placeringen af din parkerede bil og se hvor meget tid tilbage, hvis parkering er tidsbegrænset.
 \n\nStay tuned!
 \nTwitter:, https://twitter.com/osmandapp
 \nFacebook: https://www.facebook.com/osmandapp\nHjemmeside: http://osmand.net hvis du har brug for hjælp med OsmAnd, bedes du kontakte vores supportteam: support@osmand.net. "</string>

From c18243ca3a82d506b3b8af873e07ed54a9d67f23 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Mon, 25 Jan 2016 17:23:07 +0100
Subject: [PATCH 27/72] Translated using Weblate (Italian)

Currently translated at 99.8% (1888 of 1891 strings)
---
 OsmAnd/res/values-it/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 7abdee957b..360778110f 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2150,4 +2150,5 @@
     <string name="add_time_span">Aggiungi durata</string>
     <string name="data_is_not_available">Il dato non è disponibile</string>
     <string name="rendering_attr_hideUnderground_name">Nascondi gli oggetti sotterranei</string>
+    <string name="shared_string_read_more">Approfondisci</string>
     </resources>

From 6718c75de05d58ffb995584715242a28bf62cf0b Mon Sep 17 00:00:00 2001
From: Adriano Rosa <adrianojbr@gmail.com>
Date: Mon, 25 Jan 2016 19:29:57 +0100
Subject: [PATCH 28/72] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1891 of 1891 strings)
---
 OsmAnd/res/values-pt-rBR/strings.xml | 73 ++++++++++++++--------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 855d81ad06..48c6a4becd 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -97,7 +97,7 @@
 	<string name="shared_string_clear">Limpar</string>
 	<string name="shared_string_clear_all">Limpar tudo</string>
 	<string name="shared_string_save">Salvar</string>
-	<string name="shared_string_save_as_gpx">Salvar como trajeto GPX</string>
+	<string name="shared_string_save_as_gpx">Salvar como trilha GPX</string>
 	<string name="shared_string_rename">Renomear</string>
 	<string name="shared_string_delete">Apagar</string>
 	<string name="shared_string_delete_all">Apagar tudo</string>
@@ -132,18 +132,18 @@
 	<string name="shared_string_add_to_favorites">Adicionar aos favoritos</string>
 	<string name="shared_string_my_location">Minha posição</string>
 	<string name="shared_string_my_favorites">Meus favoritos</string>
-	<string name="shared_string_my_tracks">Meus trajetos</string>
-	<string name="shared_string_currently_recording_track">Gravando trajeto</string>
+	<string name="shared_string_my_tracks">Minhas trilhas</string>
+	<string name="shared_string_currently_recording_track">Gravando trilha</string>
 	<string name="shared_string_audio">Áudio</string>
 	<string name="shared_string_video">Vídeo</string>
 	<string name="shared_string_photo">Foto</string>
 	<string name="route_points">Pontos da rota</string>
-	<string name="track_segments">Segmentos do trajeto</string>
+	<string name="track_segments">Segmentos da trilha</string>
 	<string name="shared_string_online_maps">Mapas on-line</string>
 	<string name="osmand_rastermaps_plugin_description">"Com este complemento você pode acessar muitos tipos de mapas online (chamados de quadrícula ou ladrilho), tais como quadrículas predefinidas do OpenStreetMap (como Mapnik) para imagens de satélite e camadas especiais como mapas aquáticos, climáticos, geológicos, camadas de sombra de relevo, etc.\n\nQuaisquer desses mapas podem ser usados como mapa principal (base) para ser mostrado no OsmAnd ou como uma sobreposição ou subcamada para outro mapa base (como o mapa offline padrão do OsmAnd). A fim de fazer qualquer subcamada do mapa mais visível, certos elementos do mapa vetorial do OsmAnd podem facilmente ser ocultados através do menu \'Configurar mapa\' conforme desejado.\n\nQuadrículas de mapas podem ser obtidas diretamente através de fontes online ou podem ser preparados para uso offline (e copiadas manualmente para o diretório de dados do OsmAnd) como um banco de dados sqlite, que pode ser produzido por uma variedade de ferramentas de terceiros para preparação de mapas. "</string>
 	<string name="record_plugin_name">Gravação de viagem</string>
-	<string name="record_plugin_description">"Este complemento ativa a funcionalidade para gravar e salvar seus trajetos manualmente tocando o widget de registro de GPX na tela do mapa ou também fazendo automaticamente o registro de todas as suas rotas de navegação para um arquivo GPX.
-\n\nTrajetos gravados podem ser compartilhadas com seus amigos ou serem usados para contribuições ao OSM. Atletas podem usar trajetos gravados para monitorar seus treinos. Algumas análises básicas do trajeto podem ser feitas diretamente no OsmAnd, como tempos de volta, velocidade média, etc. E, claro, trajetos também podem ser analisados mais tarde em ferramentas de terceiros. "</string>
+	<string name="record_plugin_description">"Este complemento ativa a funcionalidade para gravar e salvar suas trilhas manualmente tocando o widget de registro de GPX na tela do mapa ou também fazendo automaticamente o registro de todas as suas rotas de navegação para um arquivo GPX.
+\n\nTrilhas gravadas podem ser compartilhadas com seus amigos ou serem usadas para contribuições ao OSM. Atletas podem usar trilhas gravadas para monitorar seus treinos. Algumas análises básicas da trilha podem ser feitas diretamente no OsmAnd, como tempos de percurso, velocidade média, etc. E, claro, trilhas também podem ser analisadas mais tarde em ferramentas de terceiros. "</string>
 	<string name="osmo_plugin_name">OsMo (Rastreamento OSM)</string>
 	<string name="osmo_plugin_description">"Este complemento fornece a funcionalidade de rastreamento avançado ao vivo OsMo. Veja mais em http://osmo.mobi.\n\nVocê pode rastrear, em tempo real, todos os dispositivos participantes de um grupo, os quais podem se comunicar entre si. Vem com várias opções para rastreamento permanente ou por sessão.\n\nGrupos anônimos podem ser criados espontaneamente para um número específico de dias e são limitados a recursos definidos, ou seja, não há nenhum controle remoto e nenhum administrador de grupo. Grupos totalmente funcionais, por outro lado, podem ser criados no site e só usuários cadastrados têm acesso a eles. "</string>
 	<string name="srtm_paid_version_title">Complemento de curvas de nível</string>
@@ -192,7 +192,7 @@
     <string name="version_settings">Compilações</string>
     <string name="rendering_attr_streetLighting_name">Iluminação pública</string>
     <string name="proxy_pref_title">Proxy</string>
-    <string name="track_points">Pontos de trajeto</string>
+    <string name="track_points">Pontos da trilha</string>
 	<string name="osmand_srtm_long_description_1000_chars">"Este complemento fornece curva de nível e camada de sombra de colinas (relevo) por cima do mapa padrão do OsmAnd. Esta funcionalidade será muito apreciada por atletas, viajantes e alguém interessado na estrutura de relevo da paisagem.\n\nOs dados globais (entre as latitudes 70º norte e 70º sul) são baseados em medições do SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), um instrumento de imagens da Terra, o principal satélite do Sistema de Observação da Terra da NASA. ASTER é um esforço conjunto da NASA, do Ministério Japonês da Economia, Comércio e Indústria (METI) e do Sistema Espacial Japonês (J-spacesystems). "</string>
 	<string name="srtm_plugin_description">"Este complemento fornece camadas de curvas de nível e de sombras das colinas (relevo) por cima do mapa padrão do OsmAnd. Esta funcionalidade será muito apreciada por atletas, viajantes e alguém interessado na estrutura de relevo da paisagem.\n\nOs dados globais (entre as latitudes 70º norte e 70º sul) são baseados em medições do SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), um instrumento de imagens da Terra, o principal satélite do Sistema de Observação da Terra da NASA. ASTER é um esforço conjunto da NASA, do Ministério Japonês da Economia, Comércio e Indústria (METI) e do Sistema Espacial Japonês (J-spacesystems). "</string>
 	<string name="osmand_parking_plugin_description">O complemento de posição de estacionamento memoriza facilmente onde seu carro está estacionado e quanto tempo resta (se o estacionamento for de tempo limitado).\nVocê pode encontrar o seu lugar e tempo de estacionamento no painel de instrumentos e no widget do mapa. Pode ser adicionado um evento no calendário, se você quiser um lembrete.</string>
@@ -201,7 +201,7 @@
 	<string name="proxy_pref_descr">Configurar proxy</string>
     <string name="settings_privacy">Privacidade</string>
     <string name="points">Pontos</string>
-	<string name="navigation_over_track">Iniciar a navegação pelo trajeto?</string>
+	<string name="navigation_over_track">Iniciar a navegação pela trilha?</string>
 	<string name="speak_pedestrian">Travessias de pedestre</string>
     <string name="rendering_attr_roadStyle_name">Estilo das vias</string>
     <string name="avoid_roads_msg">Você pode obter uma rota alternativa, selecionando quais vias evitar</string>
@@ -303,20 +303,20 @@
 	<string name="sleep_mode_stop_dialog">Interromper o modo em segundo plano do GPS?</string>
 	<string name="stop_navigation_service">Interrupção</string>
 	<string name="confirm_every_run">Sempre perguntar</string>
-	<string name="save_global_track_interval_descr">Escolher o intervalo de registro para a gravação do trajeto geral (habilitado através do widget de registro de GPX no mapa)</string>
+	<string name="save_global_track_interval_descr">Escolher o intervalo geral de registro para a gravação de trilha (habilitado através do widget de registro de GPX no mapa)</string>
 	<string name="save_global_track_interval">Intervalo de registro geral</string>
 	<string name="background_service_int">Intervalo de ativação do GPS</string>
 	<string name="enable_sleep_mode">Ativar o modo de GPS em segundo plano</string>
-	<string name="save_track_to_gpx_globally">Salvar trajetos em arquivo GPX</string>
-	<string name="save_track_to_gpx_globally_headline">Registro de trajeto sob demanda</string>
+	<string name="save_track_to_gpx_globally">Registrar trilha em arquivo GPX</string>
+	<string name="save_track_to_gpx_globally_headline">Registro de trilha sob demanda</string>
 	<string name="save_track_to_gpx_globally_descr">Posição geral de registro para um arquivo GPX pode ser ativada ou desativada usando o widget de registro de GPX na tela do mapa</string>
-	<string name="save_current_track_descr">Salvar o trajeto atual no SD agora</string>
-	<string name="save_current_track">Salvar o trajeto GPX atual</string>
-	<string name="save_track_to_gpx">Registrar o trajeto para arquivo GPX durante a navegação</string>
-	<string name="save_track_to_gpx_descrp">Trajetos serão salvos no diretório de trajetos durante a navegação</string>
+	<string name="save_current_track_descr">Salvar a trilha atual no SD agora</string>
+	<string name="save_current_track">Salvar a trilha GPX atual</string>
+	<string name="save_track_to_gpx">Registrar a trilha para arquivo GPX durante a navegação</string>
+	<string name="save_track_to_gpx_descrp">trilha serão salvas no diretório de trilhas durante a navegação</string>
 	<string name="save_track_interval_globally">Intervalo de registro</string>
 	<string name="save_track_interval">Intervalo de registro durante a navegação</string>
-	<string name="save_track_interval_descr">Escolher o intervalo de registro para a gravação de trajeto durante a navegação</string>
+	<string name="save_track_interval_descr">Escolher o intervalo de registro para a gravação de trilha durante a navegação</string>
 	<string name="voice_provider_descr">Selecione a voz para instruções de navegação</string>
 	<string name="voice_provider">Instruções por voz</string>
 	
@@ -407,10 +407,10 @@
     <string name="osmo_auto_connect_descr">Conectar automaticamente ao serviço após o início do aplicativo</string>
     <string name="osmo_auto_connect">Conexão automática</string>
     <string name="osmo_start_service">Serviço OsMo</string>
-    <string name="osmo_gpx_track_downloaded">%1$s trajeto OsMo baixado.</string>
+    <string name="osmo_gpx_track_downloaded">%1$s trilha OsMo baixada.</string>
     <string name="no_index_file_to_download">Transferência não encontrada, por favor, verifique sua conexão com a Internet.</string>
     <string name="select_index_file_to_download">Nada foi encontrado. Se você não encontrar a sua região, você pode criá-la (veja http://osmand.net).</string>
-    <string name="none_selected_gpx">Não há arquivos GPX selecionados. Para selecionar toque e segure o trajeto disponível.</string>
+    <string name="none_selected_gpx">Não há arquivos GPX selecionados. Para selecionar toque e segure a trilha disponível.</string>
     <string name="local_index_select_gpx_file">Selecione para mostrar</string>
     <string name="gpx_split_interval">Intervalo de divisão</string>
     <string name="sort_by_distance">Ordenar por distância</string>
@@ -425,7 +425,7 @@
     <string name="selected_gpx_info_show">\n\nToque e segure para ver no mapa</string>
     <string name="delay_navigation_start">Iniciar automaticamente instruções curva a curva</string>
     <string name="local_index_gpx_info_show">\n\nToque e segure para opções</string>
-	<string name="gpx_info_subtracks">"Subtrajetos: %1$s "</string>
+	<string name="gpx_info_subtracks">"Subtrilhas: %1$s "</string>
 	<string name="gpx_info_waypoints">"Marco de trajeto: %1$s "</string>
 	<string name="gpx_info_distance">"Distância: %1$s (%2$s pontos) "</string>
 	<string name="gpx_info_start_time">"Hora de início: %1$tF, %1$tT "</string>
@@ -442,8 +442,8 @@
     <string name="gpx_selection_route_points">%1$s ↵\nPontos de Rota %2$s</string>
     <string name="gpx_selection_points">%1$s↵\nPontos</string>
     <string name="gpx_selection_track">%1$s
-\nTrajeto %2$s</string>
-    <string name="gpx_file_is_empty">O trajeto GPX está vazio</string>
+\nTrilha %2$s</string>
+    <string name="gpx_file_is_empty">A trilha GPX está vazia</string>
     <string name="osmo_user_joined">Usuário %1$s ingressou no grupo %2$s</string>
     <string name="osmo_user_left">O usuário %1$s deixou o grupo %2$s</string>
     <string name="gpx_wpt">Marco de trajeto</string>
@@ -613,7 +613,7 @@
     <string name="local_osm_changes_delete_all_confirm">Você vai apagar %1$d de alterações no OSM. Tem certeza?</string>
     <string name="animate_routing_route_not_calculated">Por favor, calcular a rota primeiro</string>
     <string name="animate_routing_route">"Simular usando a rota calculada "</string>
-    <string name="animate_routing_gpx">Simular usando trajeto GPX</string>
+    <string name="animate_routing_gpx">Simular usando trilha GPX</string>
 	<string name="route_is_too_long">A rota é, possivelmente, muito longa para ser calculada pelo roteador offline OsmAnd. Em média, a rota offline apenas é possível para distâncias de até 200 km. Por favor adicione um ou mais destinos intermediários para calcular a rota.</string>
 	<string name="auto_zoom_none">Sem zoom automático</string>
 	<string name="auto_zoom_close">Aproximar</string>
@@ -674,7 +674,7 @@
     <string name="snap_to_road_descr">Ajustar posição das vias durante a navegação</string>
 	<string name="snap_to_road">Ajustar à via</string>
 	<string name="osmand_short_description_80_chars">OsmAnd é um aplicativo de navegação de código aberto para mapas off-line e on-line</string>
-	<string name="osmand_long_description_1000_chars">" OsmAnd (Direções de Navegação Automatizada para OSM)\nOsmAnd é um aplicativo de navegação de código aberto com acesso a uma ampla variedade de dados globais do OpenStreetMap (OSM). Todos os dados de mapas (mapas vetoriais ou quadrículas) podem ser armazenados na memória do aparelho para uso off-line. OsmAnd também oferece funcionalidade de roteamento online e offline, incluindo orientação por voz curva a curva.\n\nAlgumas das principais características:\n - Completa funcionalidade offline (armazenar mapas vetoriais ou quadrículas no armazenamento do aparelho)\n - Mapas vetoriais offline compactos para todo o mundo disponível\n - Baixar mapas de país ou região diretamente do app\n - Sobreposição de várias camadas do mapa, como trajetos GPX ou navegação, pontos de interesse, favoritos, linhas de contorno, paradas de transporte público, mapas adicionais com transparência personalizável - Pesquisa off-line de endereços e lugares (POIs)\n - Roteamento off-line para distâncias curtas (experimental)\n - Modos para carro, bicicleta e pedestres com: mudança automatizada de visão dia/noite; opcional zoom dependente da velocidade; alinhamento de mapa de acordo com a bússola ou a direção do movimento; opcional orientação de faixas, exibição de limite de velocidade, gravação e vozes TTS\n\nLimitações nesta versão gratuita do OsmAnd:\n - número limitado de transferências de mapas\n - sem acesso off-line a POIs da Wikipédia\n\nOsmAnd é ativamente desenvolvido e nosso projeto e seus progressos se baseiam em contribuir economicamente para financiar o desenvolvimento e testar novas funcionalidades. Por favor, considere comprar OsmAnd+, financiar específicos recursos novos ou fazer uma doação geral em osmand.net. "</string>
+	<string name="osmand_long_description_1000_chars">" OsmAnd (Direções de Navegação Automatizada para OSM)\nOsmAnd é um aplicativo de navegação de código aberto com acesso a uma ampla variedade de dados globais do OpenStreetMap (OSM). Todos os dados de mapas (mapas vetoriais ou quadrículas) podem ser armazenados na memória do aparelho para uso off-line. OsmAnd também oferece funcionalidade de roteamento online e offline, incluindo orientação por voz curva a curva.\n\nAlgumas das principais características:\n - Completa funcionalidade offline (armazenar mapas vetoriais ou quadrículas no armazenamento do aparelho)\n - Mapas vetoriais offline compactos para todo o mundo disponível\n - Baixar mapas de país ou região diretamente do app\n - Sobreposição de várias camadas do mapa, como trilhas GPX ou navegação, pontos de interesse, favoritos, linhas de contorno, paradas de transporte público, mapas adicionais com transparência personalizável - Pesquisa off-line de endereços e lugares (POIs)\n - Roteamento off-line para distâncias curtas (experimental)\n - Modos para carro, bicicleta e pedestres com: mudança automatizada de visão dia/noite; opcional zoom dependente da velocidade; alinhamento de mapa de acordo com a bússola ou a direção do movimento; opcional orientação de faixas, exibição de limite de velocidade, gravação e vozes TTS\n\nLimitações nesta versão gratuita do OsmAnd:\n - número limitado de transferências de mapas\n - sem acesso off-line a POIs da Wikipédia\n\nOsmAnd é ativamente desenvolvido e nosso projeto e seus progressos se baseiam em contribuir economicamente para financiar o desenvolvimento e testar novas funcionalidades. Por favor, considere comprar OsmAnd+, financiar específicos recursos novos ou fazer uma doação geral em osmand.net. "</string>
 	<string name="day_night_info_description">Nascer do Sol: %1$s ↵\nPôr do Sol: %2$s</string>
 	<string name="avoid_unpaved">Vias não-pavimentadas</string>
 	<string name="avoid_in_routing_descr">Evitar vias com pedágio, não-pavimentadas, balsas</string>
@@ -702,7 +702,7 @@
     <string name="use_distance_measurement_help">* Toque para marcar um ponto.\n * Toque e segure no mapa para apagar pontos anteriores.\n * Toque e segure no ponto para ver e anexar descrição.\n * Toque no widget de medição para ver mais ações.</string>
     <string name="distance_measurement_start_editing">Começar a edição</string>
     <string name="distance_measurement_finish_editing">Finalizar a edição</string>
-    <string name="distance_measurement_finish_subtrack">Começar um novo subtrajeto</string>
+    <string name="distance_measurement_finish_subtrack">Começar um novo subtrilha</string>
     <string name="distance_measurement_clear_route">Apagar todos os pontos</string>
     <string name="distance_measurement_load_gpx">Abrir GPX</string>
     <string name="wait_current_task_finished">Aguarde até que a tarefa seja concluída</string>
@@ -754,7 +754,7 @@
     <string name="recording_photo_description">Foto %1$s %2$s</string>
     <string name="av_def_action_picture">Tirar uma foto</string>
     <string name="recording_context_menu_precord">Tirar uma foto</string>
-    <string name="dropbox_plugin_description">O complemento do Dropbox permite sincronizar trajetos e notas de áudio/vídeo com a sua conta.</string>
+    <string name="dropbox_plugin_description">O complemento do Dropbox permite sincronizar trilhas e notas de áudio/vídeo com a sua conta.</string>
     <string name="dropbox_plugin_name">Complemento Dropbox</string>
     <string name="intermediate_points_change_order">Alterar ordem</string>
     <string name="srtm_paid_version_msg">Por favor, considere comprar o complemento Curvas de nível na loja de apps para apoiar o desenvolvimento.</string>
@@ -813,7 +813,7 @@
 	<string name="interrupt_music">Interromper música</string>
 	
 	<string name="osmand_play_title_30_chars">OsmAnd Mapas &amp; Navegação</string>
-	<string name="osmand_extended_description_4000_chars">" OsmAnd (Direções de Navegação Automatizada para OSM) é um mapa e aplicativo de navegação com acesso aos dados mundias gratuitos e de alta qualidade do OpenStreetMap (OSM). Todos os dados de mapa podem ser armazenados na memória do seu aparelho para uso offline. Através do GPS do seu aparelho, OsmAnd oferece roteamento, com orientação visual e por voz, para carro, bicicleta e pedestre. Todas as funcionalidades principais funcionam tanto online quanto offline (sem necessidade de Internet).\n\nAlgumas das principais características:\n* Navegação\n- funciona online (rápido) ou offline (sem encargos de roaming quando você estiver no exterior)\n- orientação por voz curva a curva (vozes gravadas e sintetizadas)\n- opcional orientação de faixa, exibição do nome da rua e hora estimada de chegada\n- suporta destinos intermediários no seu itinerário\n- recálculo automático sempre que você se desviar da rota\n- pesquisa de lugares por endereço, por tipo (p. ex.: restaurante, hotel, posto de combustível, museu), ou por coordenadas geográficas\n\n*Visualização de mapa\n- exibir sua posição e orientação no mapa\n- opcionalmente, alinhar o mapa de acordo com a bússola ou o seu sentido de movimento\n- salvar seus lugares mais importantes como favoritos\n- exibir POI (ponto de interesse) próximos a você\n- pode exibir mapas especiais online\n- pode exibir a imagem de satélite (do Bing)\n- pode exibir diferentes sobreposições como trajetos de turismo/navegação GPX e mapas adicionais com transparência personalizável\n- opcionalmente exibir nomes de lugar em inglês, idioma local ou pronúncia fonética\n\n*Uso de dados do OpenStreetMap e da Wikipédia:\n- informações de alta qualidade dos melhores projetos colaborativos do mundo\n- mapas globais do OpenStreetMap, disponíveis por país ou região\n- POIs da Wikipédia, ótimo para passeios (não disponível na versão gratuita)\n- transferência ilimitada e gratuita, diretamente do aplicativo (limite de 16 transferências na versão gratuita)\n- mapas vetoriais compactos offline\n- mapas sempre atualizados (pelo menos uma vez por mês)\n- selecione entre dados de mapa completo ou apenas rede rodoviária (exemplo: todo o Japão é 700 MB ou 200 MB para a rede rodoviária apenas)\n- também suporta mapas online ou em cache de quadrículas\n\n*Características de segurança\n- opcional mudança automática do modo dia/noite\n- mostrar opcionalmente limite de velocidade, com alerta se você ultrapassá-lo\n- opcional zoom dinâmico de acordo com a velocidade\n- compartilhe a sua posição para que seus amigos possam encontrá-lo\n\n*Características para bicicletas e pedestres\n- os mapas incluem caminhos a pé e ciclovias, ótimos para atividades ao ar livre\n- modos especiais de roteamento e de visualização para ciclistas e pedestres\n- paradas de transporte público (ônibus, bonde e trem) incluindo nomes de linha\n- gravação opcional de viagem para um arquivo GPX local ou serviço online\n- opcional exibição de velocidade e altitude\n- exibição de curvas de nível e sombras de relevo (via complemento adicional)\n\n*Contribuição direta para o OpenStreetMap\n- relatar notas no mapa\n- enviar trajetos GPX para o OSM diretamente do app\n- adicionar POIs e enviá-los diretamente para OSM (ou mais tarde se offline)\n- opcional gravação de viagem também em segundo plano (enquanto o aparelho está bloqueado)\n\nOsmAnd é um programa de código aberto e está sendo desenvolvido ativamente. Todos podem contribuir para o aplicativo relatando notas, melhorando as traduções ou codificando novos recursos. O projeto está em um estado animado de melhoria contínua, por todas estas formas de interação do desenvolvedor e o usuário. O progresso do projeto também depende de contribuições econômicas para financiar o desenvolvimento, codificação e teste de novas funcionalidades. Comprando OsmAnd+ você ajuda o aplicativo a ser ainda mais incrível! Também é possível financiar novas características específicas ou fazer uma doação geral em osmand.net.\n\nCobertura e qualidade aproximada do mapa:\n-Europa Ocidental: * * *\n-Europa Oriental: * * *\n-Rússia: * * *\n-América do Norte: * * *\n-América do Sul: * *\n-Ásia: * *\n-Japão e Coréia: * * *\n-Oriente Médio: * *\n-África: * *\n-Antártida: *\n\nLista de países suportados (praticamento o mundo todo!): Afeganistão, Albânia, Argélia, Andorra, Angola, Anguila, Antígua e Barbuda, Argentina, Armênia, Aruba, Austrália, Áustria, Azerbaijão, Bahamas, Bahrein, Bangladesh, Barbados, Belarus, Bélgica, Belize, Benim, Bermuda, Butão, Bolívia, Bonaire, Bósnia e Herzegóvina, Botsuana, Brasil, Ilhas Virgens Britânicas , Brunei, Bulgária, Burquina Faso, Burundi, Camboja, Camarões, Canadá, Cabo Verde, República Centro-Africana, Chade, Chile, China, Colômbia, Comores, Congo, Costa Rica, Costa do Marfim, Croácia, Cuba, Curaçao, Chipre, República Checa, Dinamarca, Djibuti, Dominica, República Dominicana, Equador, Egito, El Salvador, Guiné Equatorial, Eritreia, Estônia, Etiópia, Fiji, Finlândia, França, Guiana francesa, Polinésia francesa, Gabão, Gâmbia, Geórgia, Alemanha, Gana, Gibraltar, Grécia, Gronelândia, Granada, Guadalupe, Guam , Guatemala, Guernsey, Guiné, Guiné-Bissau, Guiana, Haiti, Vaticano, Honduras, Hong Kong, Hungria, Islândia, Índia, Indonésia, Irã, Iraque, Irlanda, ilha de Man, Israel, Itália, Jamaica, Japão, Jersey, Jordânia, Cazaquistão, Quênia, Kiribati, Coréia do Norte e Coréia do Sul, Kuwait, Quirguistão, Laos, Letônia, Líbano, Lesoto, Libéria, Líbia, Liechtenstein, Lituânia, Luxemburgo, Macau, Macedônia, Madagáscar, Malawi, Malásia, Maldivas, Mali, Malta, Martinica, Mauritânia, Maurício, Mayotte, México, Micronésia, Moldávia, Mônaco, Mongólia, Montenegro, Montserrat, Marrocos, Moçambique, Myanmar, Namíbia, Nauru, Nepal, Países Baixos, Antilhas Holandesas, Nova Caledônia, Nova Zelândia, Nicarágua, Níger, Nigéria, Noruega, Omã, Paquistão, Palau, território palestino, Panamá, Papua Nova Guiné, Paraguai, Peru, Filipinas, Polônia, Portugal, Porto Rico, Qatar, Romênia, Rússia, Ruanda, São Bartolomeu, Santa Helena, São Cristóvão e Névis, Santa Lúcia, São Martinho, São Pedro e Miquelon, São Vicente e Granadinas, Samoa, San Marino, Arábia Saudita, Senegal, Sérvia, Seychelles, Serra Leoa, Singapura, Eslováquia, Eslovênia, Somália, África do Sul, Geórgia do Sul, Sudão do Sul, Espanha, Sri Lanka, Sudão, Suriname, Suazilândia, Suécia, Suíça, Síria, Taiwan, Tadjiquistão, Tanzânia, Tailândia, Timor-Leste, Togo, Tokelau, Tonga, Trinidad e Tobago, Tunísia, Turquia, Turquemenistão, Tuvalu, Uganda, Ucrânia, Emirados Árabes Unidos, Reino Unido (UK), Estados Unidos da América (EUA) , Uruguai, Uzbequistão, Vanuatu, Venezuela, Vietnã, Wallis e Futuna, Saara Ocidental, Iêmen, Zâmbia, Zimbábue. "</string>
+	<string name="osmand_extended_description_4000_chars">" OsmAnd (Direções de Navegação Automatizada para OSM) é um mapa e aplicativo de navegação com acesso aos dados mundias gratuitos e de alta qualidade do OpenStreetMap (OSM). Todos os dados de mapa podem ser armazenados na memória do seu aparelho para uso offline. Através do GPS do seu aparelho, OsmAnd oferece roteamento, com orientação visual e por voz, para carro, bicicleta e pedestre. Todas as funcionalidades principais funcionam tanto online quanto offline (sem necessidade de Internet).\n\nAlgumas das principais características:\n* Navegação\n- funciona online (rápido) ou offline (sem encargos de roaming quando você estiver no exterior)\n- orientação por voz curva a curva (vozes gravadas e sintetizadas)\n- opcional orientação de faixa, exibição do nome da rua e hora estimada de chegada\n- suporta destinos intermediários no seu itinerário\n- recálculo automático sempre que você se desviar da rota\n- pesquisa de lugares por endereço, por tipo (p. ex.: restaurante, hotel, posto de combustível, museu), ou por coordenadas geográficas\n\n*Visualização de mapa\n- exibir sua posição e orientação no mapa\n- opcionalmente, alinhar o mapa de acordo com a bússola ou o seu sentido de movimento\n- salvar seus lugares mais importantes como favoritos\n- exibir POI (ponto de interesse) próximos a você\n- pode exibir mapas especiais online\n- pode exibir a imagem de satélite (do Bing)\n- pode exibir diferentes sobreposições como turismo/navegação por trilhas GPX e mapas adicionais com transparência personalizável\n- opcionalmente exibir nomes de lugar em inglês, idioma local ou pronúncia fonética\n\n*Uso de dados do OpenStreetMap e da Wikipédia:\n- informações de alta qualidade dos melhores projetos colaborativos do mundo\n- mapas globais do OpenStreetMap, disponíveis por país ou região\n- POIs da Wikipédia, ótimo para passeios (não disponível na versão gratuita)\n- transferência ilimitada e gratuita, diretamente do aplicativo (limite de 16 transferências na versão gratuita)\n- mapas vetoriais compactos offline\n- mapas sempre atualizados (pelo menos uma vez por mês)\n- selecione entre dados de mapa completo ou apenas rede rodoviária (exemplo: todo o Japão é 700 MB ou 200 MB para a rede rodoviária apenas)\n- também suporta mapas online ou em cache de quadrículas\n\n*Características de segurança\n- opcional mudança automática do modo dia/noite\n- mostrar opcionalmente limite de velocidade, com alerta se você ultrapassá-lo\n- opcional zoom dinâmico de acordo com a velocidade\n- compartilhe a sua posição para que seus amigos possam encontrá-lo\n\n*Características para bicicletas e pedestres\n- os mapas incluem caminhos a pé e ciclovias, ótimos para atividades ao ar livre\n- modos especiais de roteamento e de visualização para ciclistas e pedestres\n- paradas de transporte público (ônibus, bonde e trem) incluindo nomes de linha\n- gravação opcional de viagem para um arquivo GPX local ou serviço online\n- opcional exibição de velocidade e altitude\n- exibição de curvas de nível e sombras de relevo (via complemento adicional)\n\n*Contribuição direta para o OpenStreetMap\n- relatar notas no mapa\n- enviar trilhas GPX para o OSM diretamente do app\n- adicionar POIs e enviá-los diretamente para OSM (ou mais tarde se offline)\n- opcional gravação de viagem também em segundo plano (enquanto o aparelho está bloqueado)\n\nOsmAnd é um programa de código aberto e está sendo desenvolvido ativamente. Todos podem contribuir para o aplicativo relatando notas, melhorando as traduções ou codificando novos recursos. O projeto está em um estado animado de melhoria contínua, por todas estas formas de interação do desenvolvedor e o usuário. O progresso do projeto também depende de contribuições econômicas para financiar o desenvolvimento, codificação e teste de novas funcionalidades. Comprando OsmAnd+ você ajuda o aplicativo a ser ainda mais incrível! Também é possível financiar novas características específicas ou fazer uma doação geral em osmand.net.\n\nCobertura e qualidade aproximada do mapa:\n-Europa Ocidental: * * *\n-Europa Oriental: * * *\n-Rússia: * * *\n-América do Norte: * * *\n-América do Sul: * *\n-Ásia: * *\n-Japão e Coréia: * * *\n-Oriente Médio: * *\n-África: * *\n-Antártida: *\n\nLista de países suportados (praticamento o mundo todo!): Afeganistão, Albânia, Argélia, Andorra, Angola, Anguila, Antígua e Barbuda, Argentina, Armênia, Aruba, Austrália, Áustria, Azerbaijão, Bahamas, Bahrein, Bangladesh, Barbados, Belarus, Bélgica, Belize, Benim, Bermuda, Butão, Bolívia, Bonaire, Bósnia e Herzegóvina, Botsuana, Brasil, Ilhas Virgens Britânicas , Brunei, Bulgária, Burquina Faso, Burundi, Camboja, Camarões, Canadá, Cabo Verde, República Centro-Africana, Chade, Chile, China, Colômbia, Comores, Congo, Costa Rica, Costa do Marfim, Croácia, Cuba, Curaçao, Chipre, República Checa, Dinamarca, Djibuti, Dominica, República Dominicana, Equador, Egito, El Salvador, Guiné Equatorial, Eritreia, Estônia, Etiópia, Fiji, Finlândia, França, Guiana francesa, Polinésia francesa, Gabão, Gâmbia, Geórgia, Alemanha, Gana, Gibraltar, Grécia, Gronelândia, Granada, Guadalupe, Guam , Guatemala, Guernsey, Guiné, Guiné-Bissau, Guiana, Haiti, Vaticano, Honduras, Hong Kong, Hungria, Islândia, Índia, Indonésia, Irã, Iraque, Irlanda, ilha de Man, Israel, Itália, Jamaica, Japão, Jersey, Jordânia, Cazaquistão, Quênia, Kiribati, Coréia do Norte e Coréia do Sul, Kuwait, Quirguistão, Laos, Letônia, Líbano, Lesoto, Libéria, Líbia, Liechtenstein, Lituânia, Luxemburgo, Macau, Macedônia, Madagáscar, Malawi, Malásia, Maldivas, Mali, Malta, Martinica, Mauritânia, Maurício, Mayotte, México, Micronésia, Moldávia, Mônaco, Mongólia, Montenegro, Montserrat, Marrocos, Moçambique, Myanmar, Namíbia, Nauru, Nepal, Países Baixos, Antilhas Holandesas, Nova Caledônia, Nova Zelândia, Nicarágua, Níger, Nigéria, Noruega, Omã, Paquistão, Palau, território palestino, Panamá, Papua Nova Guiné, Paraguai, Peru, Filipinas, Polônia, Portugal, Porto Rico, Qatar, Romênia, Rússia, Ruanda, São Bartolomeu, Santa Helena, São Cristóvão e Névis, Santa Lúcia, São Martinho, São Pedro e Miquelon, São Vicente e Granadinas, Samoa, San Marino, Arábia Saudita, Senegal, Sérvia, Seychelles, Serra Leoa, Singapura, Eslováquia, Eslovênia, Somália, África do Sul, Geórgia do Sul, Sudão do Sul, Espanha, Sri Lanka, Sudão, Suriname, Suazilândia, Suécia, Suíça, Síria, Taiwan, Tadjiquistão, Tanzânia, Tailândia, Timor-Leste, Togo, Tokelau, Tonga, Trinidad e Tobago, Tunísia, Turquia, Turquemenistão, Tuvalu, Uganda, Ucrânia, Emirados Árabes Unidos, Reino Unido (UK), Estados Unidos da América (EUA) , Uruguai, Uzbequistão, Vanuatu, Venezuela, Vietnã, Wallis e Futuna, Saara Ocidental, Iêmen, Zâmbia, Zimbábue. "</string>
 	<string name="osmand_plus_play_title_30_chars">OsmAnd+ Mapas &amp; Navegação</string>
 	<string name="osmand_plus_short_description_80_chars">Visualizador Móvel de Mapa Global &amp; Navegação Off-line e On-line para Mapas OSM</string>
 	
@@ -1077,7 +1077,7 @@
     <string name="arrival_distance_descr">Em quanto tempo você quer o anúncio da chegada?</string>
     <string name="rendering_out_of_memory">Não há memória suficiente para exibir a área selecionada</string>
 	<string name="use_fluorescent_overlays">Sobreposições fluorescentes</string>
-	<string name="use_fluorescent_overlays_descr">Usar cores fluorescentes para exibir os trajetos e rotas</string>
+	<string name="use_fluorescent_overlays_descr">Usar cores fluorescentes para exibir as trilhas e rotas</string>
 	<string name="offline_edition">Edição off-line</string>
 	<string name="offline_edition_descr">Sempre usar edição off-line</string>
 	<string name="update_poi_does_not_change_indexes">As alterações de POIs dentro do aplicativo não tem efeito imediato nos mapas baixados, pois são salvas em arquivo local.</string>
@@ -1090,8 +1090,8 @@
 	<string name="live_monitoring_interval">Intervalo de rastreamento on-line</string>
 	<string name="live_monitoring_url_descr">Especificar o endereço web com a sintaxe de parâmetros: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
 	<string name="live_monitoring_url">Endereço web de rastreamento on-line</string>
-	<string name="gpx_monitoring_disabled_warn">Registro de trajeto usando o widget do GPX ou através das configurações de \'Gravação de viagem\'.</string>
-	<string name="show_current_gpx_title">Mostrar trajeto atual</string>
+	<string name="gpx_monitoring_disabled_warn">Registro de trilha usando o widget do GPX ou através das configurações de \'Gravação de viagem\'.</string>
+	<string name="show_current_gpx_title">Mostrar trilha atual</string>
 	<string name="free_version_message">Esta versão gratuita do OsmAnd é limitada a %1$s transferências e não suporta artigos off-line da Wikipédia.</string>
 	<string name="free_version_title">Versão gratuita</string>
 	<string name="poi_context_menu_showdescription">Mostrar descrição do POI</string>
@@ -1131,9 +1131,8 @@
 	
 	
 	<string name="arrival_distance_factor_late">Atrasado</string>
-    <string name="osmand_plus_extended_description_4000_chars">" OsmAnd (Direções de Navegação Automatizada para OSM) é um mapa e aplicativo de navegação com acesso aos dados mundias gratuitos e de alta qualidade do OpenStreetMap (OSM). Todos os dados de mapa podem ser armazenados na memória do seu aparelho para uso offline. Através do GPS do seu aparelho, OsmAnd oferece roteamento, com orientação visual e por voz, para carro, bicicleta e pedestre. Todas as funcionalidades principais trabalham tanto online quanto offline (sem necessidade de Internet). OsmAnd+ é a versão paga do aplicativo. Ao comprá-lo você ajuda o projeto, financiando o desenvolvimento de novas funcionalidades e recebe as últimas atualizações. Você pode testar o aplicativo antes de comprar, instalando a versão gratuita chamada OsmAnd.\n\nAlgumas das principais características:\n* Navegação\n- funciona online (rápido) ou offline (sem encargos de roaming quando você estiver no exterior)\n- orientação por voz curva a curva (vozes gravadas e sintetizadas)\n- opcional orientação de faixa, exibição do nome da rua e hora estimada de chegada\n- suporta destino intermediário no seu itinerário\n- recálculo automático sempre que você se desviar da rota\n- pesquisa de lugares por endereço, por tipo (p. ex.: restaurante, hotel, posto de combustível, museu) ou por coordenadas geográficas\n\n*Visualização de mapa\n- exibir sua posição e orientação no mapa\n- opcionalmente, alinhar o mapa de acordo com a bússola ou o seu sentido de movimento\n- salvar seus lugares mais importantes como favoritos\n- exibir POI (ponto de interesse) próximos a você\n- pode exibir mapas especiais on-line\n- pode exibir a imagem de satélite (do Bing)\n- pode exibir diferentes sobreposições como trajetos de turismo/navegação GPX e mapas adicionais com transparência personalizável\n- opcionalmente exibir nomes de lugar em inglês, idioma local ou pronúncia fonética\n\n*Uso de dados do OpenStreetMap e da Wikipédia:\n- informações de alta qualidade dos melhores projetos colaborativos do mundo\n- mapas globais do OpenStreetMap, disponíveis por país ou região\n- POIs da Wikipédia, ótimo para passeios (não disponível na versão gratuita)\n- transferência ilimitada e gratuita, diretamente do aplicativo\n- mapas vetoriais compactos offline\n- mapas sempre atualizados (pelo menos uma vez por mês)\n- selecione entre dados de mapa completo ou apenas rede rodoviária (exemplo: todo o Japão é 700 MB ou 200 MB para a rede rodoviária apenas)\n- também suporta mapas online ou em cache de quadrículas\n\n*Características de segurança\n- opcional mudança automática do modo dia/noite\n- mostrar opcionalmente limite de velocidade, com alerta se você ultrapassá-lo\n- opcional zoom dinâmico de acordo com a velocidade\n- compartilhe a sua posição para que seus amigos possam encontrá-lo\n\n*Características para bicicletas e pedestres\n- os mapas incluem caminhos a pé e ciclovias, ótimos para atividades ao ar livre\n- modos especiais de roteamento e de visualização para ciclistas e pedestres\n- paradas de transporte público (ônibus, bonde e trem) incluindo nomes de linha\n- gravação opcional de viagem para um arquivo GPX local ou serviço on-line\n- opcional exibição de velocidade e altitude\n- exibição de curvas de nível e sombras de relevo (via complemento adicional)\n\n*Contribuição direta para o OpenStreetMap\n- relatar erros no mapa\n- enviar trajetos GPX para o OSM diretamente do app\n- adicionar POIs e enviá-los diretamente para OSM (ou mais tarde se off-line)\n- opcional gravação de viagem também em segundo plano (enquanto o aparelho está bloqueado)\n\nOsmAnd é um programa de código aberto e está sendo desenvolvido ativamente. Todos podem contribuir para o aplicativo relatando erros, melhorando as traduções ou codificando novos recursos. O projeto está em um estado animado de melhoria contínua, por todas estas formas de interação do desenvolvedor e o usuário. O progresso do projeto também depende de contribuições econômicas para financiar o desenvolvimento, codificação e teste de novas funcionalidades. Comprando OsmAnd+ você ajuda o aplicativo a ser ainda mais incrível! Também é possível financiar novas características específicas ou fazer uma doação geral em osmand.net.\n\nCobertura e qualidade aproximada do mapa:\n-Europa Ocidental: * * *\n-Europa Oriental: * * *\n-Rússia: * * *\n-América do Norte: * * *\n-América do Sul: * *\n-Ásia: * *\n-Japão e Coréia: * * *\n-Oriente Médio: * *\n-África: * *\n-Antártida: *\n\nLista de países suportados (praticamento o mundo todo!): Afeganistão, Albânia, Argélia, Andorra, Angola, Anguila, Antígua e Barbuda, Argentina, Armênia, Aruba, Austrália, Áustria, Azerbaijão, Bahamas, Bahrein, Bangladesh, Barbados, Belarus, Bélgica, Belize, Benim, Bermuda, Butão, Bolívia, Bonaire, Bósnia e Herzegóvina, Botsuana, Brasil, Ilhas Virgens Britânicas , Brunei, Bulgária, Burquina Faso, Burundi, Camboja, Camarões, Canadá, Cabo Verde, República Centro-Africana, Chade, Chile, China, Colômbia, Comores, Congo, Costa Rica, Costa do Marfim, Croácia, Cuba, Curaçao, Chipre, República Checa, Dinamarca, Djibuti, Dominica, República Dominicana, Equador, Egito, El Salvador, Guiné Equatorial, Eritreia, Estônia, Etiópia, Fiji, Finlândia, França, Guiana francesa, Polinésia francesa, Gabão, Gâmbia, Geórgia, Alemanha, Gana, Gibraltar, Grécia, Gronelândia, Granada, Guadalupe, Guam , Guatemala, Guernsey, Guiné, Guiné-Bissau, Guiana, Haiti, Vaticano, Honduras, Hong Kong, Hungria, Islândia, Índia, Indonésia, Irã, Iraque, Irlanda, ilha de Man, Israel, Itália, Jamaica, Japão, Jersey, Jordânia, Cazaquistão, Quênia, Kiribati, Coréia do Norte e Coréia do Sul, Kuwait, Quirguistão, Laos, Letônia, Líbano, Lesoto, Libéria, Líbia, Liechtenstein, Lituânia, Luxemburgo, Macau, Macedônia, Madagáscar, Malawi, Malásia, Maldivas, Mali, Malta, Martinica, Mauritânia, Maurício, Mayotte, México, Micronésia, Moldávia, Mônaco, Mongólia, Montenegro, Montserrat, Marrocos, Moçambique, Myanmar, Namíbia, Nauru, Nepal, Países Baixos, Antilhas Holandesas, Nova Caledônia, Nova Zelândia, Nicarágua, Níger, Nigéria, Noruega, Omã, Paquistão, Palau, território palestino, Panamá, Papua Nova Guiné, Paraguai, Peru, Filipinas, Polônia, Portugal, Porto Rico, Qatar, Romênia, Rússia, Ruanda, São Bartolomeu, Santa Helena, São Cristóvão e Névis, Santa Lúcia, São Martinho, São Pedro e Miquelon, São Vicente e Granadinas, Samoa, San Marino, Arábia Saudita, Senegal, Sérvia, Seychelles, Serra Leoa, Singapura, Eslováquia, Eslovênia, Somália, África do Sul, Geórgia do Sul, Sudão do Sul, Espanha, Sri Lanka, Sudão, Suriname, Suazilândia, Suécia, Suíça, Síria, Taiwan, Tadjiquistão, Tanzânia, Tailândia, Timor-Leste, Togo, Tokelau, Tonga, Trinidad e Tobago, Tunísia, Turquia, Turquemenistão, Tuvalu, Uganda, Ucrânia, Emirados Árabes Unidos, Reino Unido (UK), Estados Unidos da América (EUA) , Uruguai, Uzbequistão, Vanuatu, Venezuela, Vietnã, Wallis e Futuna, Saara Ocidental, Iêmen, Zâmbia, Zimbábue. "</string>
-	<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (Direções de Navegação Automatizada para OSM)\n OsmAnd+ é aplicativo de navegação de código aberto com acesso a uma ampla variedade de dados globais do OpenStreetMap (OSM). Todos os dados de mapa (vetores ou quadrículas) podem ser armazenados na memória do seu aparelho para uso off-line. OsmAnd também oferece a funcionalidade de roteamento on-line e off-line, incluindo orientação por voz curva a curva. OsmAnd+ é a versão paga do aplicativo, ao comprá-lo você ajuda o projeto, financiando o desenvolvimento de novas funcionalidades e recebe as últimas atualizações.\n\nAlgumas das principais características:\n- completa funcionalidade offline (armazena mapas vetorizados baixados ou quadrículas no armazenamento do aparelho)\n- mapas vetoriais off-line compactos e disponíveis para o mundo inteiro\n- transferência ilimitada de mapas por país ou região diretamente do app\n- recurso Wikipédia off-line (transferir POIs da Wikipédia), ótimo para passeios turísticos\n- possível sobreposição de várias camadas de mapa, como trajetos GPX ou navegação, pontos de interesse, favoritos, curvas de nível e mapas adicionais com transparência personalizável\n- pesquisa off-line de endereços e lugares (POIs)\n- roteamento off-line para distâncias curtas (experimental)\n- modos carro, bicicleta e a pé com:\n- opcional mudança automática do modo dia/noite\n- opcional zoom dinâmico de acordo com a velocidade\n- opcional, alinhar o mapa de acordo com a bússola ou o seu sentido de movimento\n- opcional orientação de faixa, exibição do limite de velocidade, vozes gravadas e TTS
-\n\n"</string>
+    <string name="osmand_plus_extended_description_4000_chars">" OsmAnd (Direções de Navegação Automatizada para OSM) é um mapa e aplicativo de navegação com acesso aos dados mundias gratuitos e de alta qualidade do OpenStreetMap (OSM). Todos os dados de mapa podem ser armazenados na memória do seu aparelho para uso offline. Através do GPS do seu aparelho, OsmAnd oferece roteamento, com orientação visual e por voz, para carro, bicicleta e pedestre. Todas as funcionalidades principais trabalham tanto online quanto offline (sem necessidade de Internet). OsmAnd+ é a versão paga do aplicativo. Ao comprá-lo você ajuda o projeto, financiando o desenvolvimento de novas funcionalidades e recebe as últimas atualizações. Você pode testar o aplicativo antes de comprar, instalando a versão gratuita chamada OsmAnd.\n\nAlgumas das principais características:\n* Navegação\n- funciona online (rápido) ou offline (sem encargos de roaming quando você estiver no exterior)\n- orientação por voz curva a curva (vozes gravadas e sintetizadas)\n- opcional orientação de faixa, exibição do nome da rua e hora estimada de chegada\n- suporta destino intermediário no seu itinerário\n- recálculo automático sempre que você se desviar da rota\n- pesquisa de lugares por endereço, por tipo (p. ex.: restaurante, hotel, posto de combustível, museu) ou por coordenadas geográficas\n\n*Visualização de mapa\n- exibir sua posição e orientação no mapa\n- opcionalmente, alinhar o mapa de acordo com a bússola ou o seu sentido de movimento\n- salvar seus lugares mais importantes como favoritos\n- exibir POI (ponto de interesse) próximos a você\n- pode exibir mapas especiais on-line\n- pode exibir a imagem de satélite (do Bing)\n- pode exibir diferentes sobreposições como turismo/navegação por trilhas GPX e mapas adicionais com transparência personalizável\n- opcionalmente exibir nomes de lugar em inglês, idioma local ou pronúncia fonética\n\n*Uso de dados do OpenStreetMap e da Wikipédia:\n- informações de alta qualidade dos melhores projetos colaborativos do mundo\n- mapas globais do OpenStreetMap, disponíveis por país ou região\n- POIs da Wikipédia, ótimo para passeios (não disponível na versão gratuita)\n- transferência ilimitada e gratuita, diretamente do aplicativo\n- mapas vetoriais compactos offline\n- mapas sempre atualizados (pelo menos uma vez por mês)\n- selecione entre dados de mapa completo ou apenas rede rodoviária (exemplo: todo o Japão é 700 MB ou 200 MB para a rede rodoviária apenas)\n- também suporta mapas online ou em cache de quadrículas\n\n*Características de segurança\n- opcional mudança automática do modo dia/noite\n- mostrar opcionalmente limite de velocidade, com alerta se você ultrapassá-lo\n- opcional zoom dinâmico de acordo com a velocidade\n- compartilhe a sua posição para que seus amigos possam encontrá-lo\n\n*Características para bicicletas e pedestres\n- os mapas incluem caminhos a pé e ciclovias, ótimos para atividades ao ar livre\n- modos especiais de roteamento e de visualização para ciclistas e pedestres\n- paradas de transporte público (ônibus, bonde e trem) incluindo nomes de linha\n- gravação opcional de viagem para um arquivo GPX local ou serviço on-line\n- opcional exibição de velocidade e altitude\n- exibição de curvas de nível e sombras de relevo (via complemento adicional)\n\n*Contribuição direta para o OpenStreetMap\n- relatar erros no mapa\n- enviar trilhas GPX para o OSM diretamente do app\n- adicionar POIs e enviá-los diretamente para OSM (ou mais tarde se off-line)\n- opcional gravação de viagem também em segundo plano (enquanto o aparelho está bloqueado)\n\nOsmAnd é um programa de código aberto e está sendo desenvolvido ativamente. Todos podem contribuir para o aplicativo relatando erros, melhorando as traduções ou codificando novos recursos. O projeto está em um estado animado de melhoria contínua, por todas estas formas de interação do desenvolvedor e o usuário. O progresso do projeto também depende de contribuições econômicas para financiar o desenvolvimento, codificação e teste de novas funcionalidades. Comprando OsmAnd+ você ajuda o aplicativo a ser ainda mais incrível! Também é possível financiar novas características específicas ou fazer uma doação geral em osmand.net.\n\nCobertura e qualidade aproximada do mapa:\n-Europa Ocidental: * * *\n-Europa Oriental: * * *\n-Rússia: * * *\n-América do Norte: * * *\n-América do Sul: * *\n-Ásia: * *\n-Japão e Coréia: * * *\n-Oriente Médio: * *\n-África: * *\n-Antártida: *\n\nLista de países suportados (praticamento o mundo todo!): Afeganistão, Albânia, Argélia, Andorra, Angola, Anguila, Antígua e Barbuda, Argentina, Armênia, Aruba, Austrália, Áustria, Azerbaijão, Bahamas, Bahrein, Bangladesh, Barbados, Belarus, Bélgica, Belize, Benim, Bermuda, Butão, Bolívia, Bonaire, Bósnia e Herzegóvina, Botsuana, Brasil, Ilhas Virgens Britânicas , Brunei, Bulgária, Burquina Faso, Burundi, Camboja, Camarões, Canadá, Cabo Verde, República Centro-Africana, Chade, Chile, China, Colômbia, Comores, Congo, Costa Rica, Costa do Marfim, Croácia, Cuba, Curaçao, Chipre, República Checa, Dinamarca, Djibuti, Dominica, República Dominicana, Equador, Egito, El Salvador, Guiné Equatorial, Eritreia, Estônia, Etiópia, Fiji, Finlândia, França, Guiana francesa, Polinésia francesa, Gabão, Gâmbia, Geórgia, Alemanha, Gana, Gibraltar, Grécia, Gronelândia, Granada, Guadalupe, Guam , Guatemala, Guernsey, Guiné, Guiné-Bissau, Guiana, Haiti, Vaticano, Honduras, Hong Kong, Hungria, Islândia, Índia, Indonésia, Irã, Iraque, Irlanda, ilha de Man, Israel, Itália, Jamaica, Japão, Jersey, Jordânia, Cazaquistão, Quênia, Kiribati, Coréia do Norte e Coréia do Sul, Kuwait, Quirguistão, Laos, Letônia, Líbano, Lesoto, Libéria, Líbia, Liechtenstein, Lituânia, Luxemburgo, Macau, Macedônia, Madagáscar, Malawi, Malásia, Maldivas, Mali, Malta, Martinica, Mauritânia, Maurício, Mayotte, México, Micronésia, Moldávia, Mônaco, Mongólia, Montenegro, Montserrat, Marrocos, Moçambique, Myanmar, Namíbia, Nauru, Nepal, Países Baixos, Antilhas Holandesas, Nova Caledônia, Nova Zelândia, Nicarágua, Níger, Nigéria, Noruega, Omã, Paquistão, Palau, território palestino, Panamá, Papua Nova Guiné, Paraguai, Peru, Filipinas, Polônia, Portugal, Porto Rico, Qatar, Romênia, Rússia, Ruanda, São Bartolomeu, Santa Helena, São Cristóvão e Névis, Santa Lúcia, São Martinho, São Pedro e Miquelon, São Vicente e Granadinas, Samoa, San Marino, Arábia Saudita, Senegal, Sérvia, Seychelles, Serra Leoa, Singapura, Eslováquia, Eslovênia, Somália, África do Sul, Geórgia do Sul, Sudão do Sul, Espanha, Sri Lanka, Sudão, Suriname, Suazilândia, Suécia, Suíça, Síria, Taiwan, Tadjiquistão, Tanzânia, Tailândia, Timor-Leste, Togo, Tokelau, Tonga, Trinidad e Tobago, Tunísia, Turquia, Turquemenistão, Tuvalu, Uganda, Ucrânia, Emirados Árabes Unidos, Reino Unido (UK), Estados Unidos da América (EUA) , Uruguai, Uzbequistão, Vanuatu, Venezuela, Vietnã, Wallis e Futuna, Saara Ocidental, Iêmen, Zâmbia, Zimbábue. "</string>
+	<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (Direções de Navegação Automatizada para OSM)\n OsmAnd+ é aplicativo de navegação de código aberto com acesso a uma ampla variedade de dados globais do OpenStreetMap (OSM). Todos os dados de mapa (vetores ou quadrículas) podem ser armazenados na memória do seu aparelho para uso off-line. OsmAnd também oferece a funcionalidade de roteamento on-line e off-line, incluindo orientação por voz curva a curva. OsmAnd+ é a versão paga do aplicativo, ao comprá-lo você ajuda o projeto, financiando o desenvolvimento de novas funcionalidades e recebe as últimas atualizações.\n\nAlgumas das principais características:\n- completa funcionalidade offline (armazena mapas vetorizados baixados ou quadrículas no armazenamento do aparelho)\n- mapas vetoriais off-line compactos e disponíveis para o mundo inteiro\n- transferência ilimitada de mapas por país ou região diretamente do app\n- recurso Wikipédia off-line (transferir POIs da Wikipédia), ótimo para passeios turísticos\n- possível sobreposição de várias camadas de mapa, como trilhas GPX, pontos de interesse, favoritos, curvas de nível e mapas adicionais com transparência personalizável\n- pesquisa off-line de endereços e lugares (POIs)\n- roteamento off-line para distâncias curtas (experimental)\n- modos carro, bicicleta e a pé com:\n- opcional mudança automática do modo dia/noite\n- opcional zoom dinâmico de acordo com a velocidade\n- opcional, alinhar o mapa de acordo com a bússola ou o seu sentido de movimento\n- opcional orientação de faixa, exibição do limite de velocidade, vozes gravadas e TTS "</string>
 	<string name="init_native_library">Iniciando a biblioteca nativa…</string>
 	
     
@@ -1281,7 +1280,7 @@
 	<string name="tts_missing_language_data">Nenhum dado para o idioma selecionado está instalado. Você quer ir para a loja de apps?</string>
 	<string name="gpx_option_reverse_route">Inverter direção GPX</string>
 	<string name="gpx_option_destination_point">Usar destino atual</string>
-	<string name="gpx_option_from_start_point">Percorrer todo o trajeto</string>
+	<string name="gpx_option_from_start_point">Percorrer toda a trilha</string>
 	<string name="switch_to_vector_map_to_see">Mapa vetorial off-line presente para esse local.
 \n\t\n\tPara usá-lo, ative em \'Menu\' → \'Configurar mapa\' → \'Fonte de mapas…\' → \'Mapas vetoriais off-line\'.</string>
 	<string name="choose_audio_stream">Saída para orientação por voz</string>
@@ -1332,7 +1331,7 @@
 	<string name="send_location_sms_pattern">Posição: %1$s\n%2$s</string>
 	<string name="context_menu_item_share_location">Compartilhar posição</string>
 	<string name="add_waypoint_dialog_added">Marco de trajeto GPX \'\'{0}\'\' foi adicionado</string>
-	<string name="add_waypoint_dialog_title">Adicionar parada ao trajeto GPX gravado</string>
+	<string name="add_waypoint_dialog_title">Adicionar parada à trilha GPX gravada</string>
 	<string name="context_menu_item_add_waypoint">Adicionar marco de trajeto GPX</string>
 	<string name="amenity_type_administrative">Administrativo</string>
 	<string name="amenity_type_barrier">Barreira</string>
@@ -1416,8 +1415,8 @@
 	<string name="voices">Instruções de voz</string>
 	<string name="no_vector_map_loaded">Nenhum mapa vetorial foi carregado</string>
 	<string name="map_route_by_gpx">Navegar usando GPX</string>
-	<string name="gpx_files_not_found">Nenhum arquivo GPX encontrado no diretório de trajetos</string>
-	<string name="layer_gpx_layer">Trajeto GPX…</string>
+	<string name="gpx_files_not_found">Nenhum arquivo GPX encontrado no diretório de trilhas</string>
+	<string name="layer_gpx_layer">Trilha GPX…</string>
 	<string name="error_reading_gpx">Erro na leitura de dados GPX</string>
 	<string name="vector_data">Mapas vetoriais off-line</string>
 	<string name="transport_context_menu">Pesquisar transporte na parada</string>
@@ -1548,7 +1547,7 @@
 	<string name="loading_data">Carregando dados…</string>
 	<string name="reading_indexes">Lendo dados locais…</string>
 	<string name="previous_run_crashed">A última execução do OsmAnd falhou. O arquivo de log está em {0}. Por favor, informe o problema e inclua o arquivo de log.</string>
-	<string name="saving_gpx_tracks">Salvando trajetos GPX no cartão SD…</string>
+	<string name="saving_gpx_tracks">Salvando trilhas GPX no cartão SD…</string>
 	<string name="finished_task">Concluído</string>
 	<string name="use_online_routing_descr">Usar a Internet para calcular a rota</string>
 	<string name="use_online_routing">Usar a navegação on-line</string>

From 9ab242e0591a177ca64a30795408889956e29ec7 Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Mon, 25 Jan 2016 19:21:14 +0100
Subject: [PATCH 29/72] Translated using Weblate (Swedish)

Currently translated at 99.2% (1876 of 1891 strings)
---
 OsmAnd/res/values-sv/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 25e3e814fa..efd27731ff 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -2077,4 +2077,5 @@
     <string name="data_is_not_available">Inga data tillgängliga</string>
     <string name="rendering_attr_hideUnderground_name">Dölj underjordiska objekt</string>
     <string name="shared_string_read_more">Läs mer</string>
+    <string name="rec_split_storage_size">Lagringsutrymme</string>
     </resources>

From 55b91006b0489279f9f317beb559c083607b645e Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Mon, 25 Jan 2016 19:55:00 +0100
Subject: [PATCH 30/72] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index e9083bcb8a..cdd8927552 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -2678,7 +2678,7 @@
 	<string name="poi_nuclear_explosion_shot_name_en">Shot navnet (en)</string>
 	<string name="poi_nuclear_explosion_series">Eksplosionsserie</string>
 	<string name="poi_nuclear_explosion_purpose_nuclear_weapons_related">Eksplosionsformål: atomvåben relateret</string>
-	<string name="poi_nuclear_explosion_purpose_weapons_effects">Eksplosionsformål: våben effekt</string>
+	<string name="poi_nuclear_explosion_purpose_weapons_effects">Eksplosionsformål: våbeneffekt</string>
 	<string name="poi_nuclear_explosion_purpose_safety_experiment">Eksplosionsformål: sikkerhedseksperiment</string>
 	<string name="poi_nuclear_explosion_purpose_research_for_peaceful_applications">Eksplosionsformål: forskning for fredelige anvendelser</string>
 	<string name="poi_nuclear_explosion_purpose_fundamental_science">Eksplosionsformål: grundlæggende videnskab</string>
@@ -2690,7 +2690,7 @@
 	<string name="poi_nuclear_explosion_time_utc">Eksplosionstidpunkt (UTC)</string>
 	<string name="poi_nuclear_explosion_yield">Eksplosion udbytte</string>
 	<string name="poi_nuclear_explosion_hole">Eksplosion hul</string>
-	<string name="poi_nuclear_explosion_height_of_burst">Højden af eksplosionen</string>
+	<string name="poi_nuclear_explosion_height_of_burst">Højde af eksplosionen</string>
 	<string name="poi_nuclear_explosion_ground_zero_altitude">Jordoverfladenshøjde</string>
 	<string name="poi_nuclear_explosion_body_wave_magnitude">bølge størrelsesorden</string>
 	<string name="poi_nuclear_explosion_salvo_first_detonation">Eksplosionssalve: første detonation af en salvetest</string>

From fb4540e923d8702f1b88ef00780963282548e131 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Mon, 25 Jan 2016 19:10:40 +0300
Subject: [PATCH 31/72] Update phrases

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

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 7fbf2241b5..2fbdb13062 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -2641,5 +2641,6 @@
 	<string name="poi_nuclear_explosion_device">Устройство</string>
 
 	<string name="poi_addr_housename">Название дома</string>
+	<string name="poi_religion">Религиозный магазин</string>
 
 </resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index fd9e10be55..51543156a6 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -2642,5 +2642,6 @@
 	<string name="poi_nuclear_explosion_device">Explosion: device</string>
 
 	<string name="poi_addr_housename">House name</string>
+	<string name="poi_religion">Religious goods</string>
 
 </resources>

From f1a5384b59d7f466b26a9ac46be5abbb0f67b65a Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Mon, 25 Jan 2016 22:26:37 +0100
Subject: [PATCH 32/72] Translated using Weblate (Danish)

Currently translated at 100.0% (1891 of 1891 strings)
---
 OsmAnd/res/values-da/strings.xml | 33 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 1c255e5855..c1eebe8c83 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2238,31 +2238,30 @@
     <string name="data_is_not_available">Data er ikke tilgængelig</string>
     <string name="rendering_attr_hideUnderground_name">Skjul underjordiske objekter</string>
     <string name="shared_string_read_more">Læs mere</string>
-    <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Maps &amp; Navigation - lav ruter og find steder på kortet uden en internetforbindelse. Hent et kort for et land, før du går på en tur til at finde steder og ruter i et ukendt område.
+    <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Maps &amp; Navigation - lav ruter og find steder på kortet uden en internetforbindelse. Hent et kort for et land, før du går på en rejse til at finde steder og ruter i et ukendt område.
 \n\nGrundlæggende indstillinger:
 \n• Detaljerede kort over 200 lande
-\n• Offline navigator med stemme beder
-\n• Adressesøgning i offline mode
+\n• Offline navigator med stemmevejledning\n• Adressesøgning i offline mode
 \n• Info om steder på kortet: steder af interesse, caféer, parkeringspladser, butikker
 \n• Tlføj steder til foretrukne
-\n• kørsel-, cykling- og fodgængernavigation
+\n• Kørsel-, cykling- og fodgængernavigation
 \n\nYderligere indstillinger:
-\n• evne til at se og optage GPX sporer
-\n• Wikipedia beskrivelse af IP\n• Tilføj foto-, audio-, og videonoter til kort
-\n• Dag og nat kort tilstande for mere praktisk kørsel
-\n• Oplysninger om offentlige transportruter og stoppesteder\n• Cykel- og gangstier
-\n• Walking stier for turisme over hele verden
+\n• Mulighed for at vise og optage GPX spor\n• Wikipedia beskrivelse af IP\n• Tilføj foto-, audio-, og videonoter til kort
+\n• Dag- og natkort tilstand for mere praktisk kørsel
+\n• Oplysninger om offentlig transport og stoppesteder\n• Cykel- og gangstier
+\n• Vandreruter for turisme over hele verden
 \n• Online kort fra adskillige kilder
-\n• Info om vej fortovet kvalitet og gadebelysning
+\n• Info om vej- og fortovskvalitet og gadebelysning
 \n• Tilføj, rediger og sletning af IP (for OpenStreetMap.org brugere)
 \n• OsMo - live overvågning af andre enheder
-\n\nFå en pålidelig navigator i dit land - enten det er Frankrig, Tyskland, Mexico, Storbritannien, Spanien, Holland, USA, Rusland, Brasilien eller nogen anden stat.
+\n\nFå pålidelig navigation i dit land - enten det er Frankrig, Tyskland, Mexico, Storbritannien, Spanien, Holland, USA, Rusland, Brasilien eller et andet land.
 \n\nUdvidelser:
 \n• kontur kort og terræn skygge https://goo.gl/7mojP8 højdekurver data og terræn visualisering tilføjet til grundlæggende OsmAnd kortet.
-\n• Skikort info om ski pister, langrend spor, kabel jernbaner og skilifterne-https://goo.gl/pX6DxJ.
-\n• Søkort https://goo.gl/0hEdxm særlige kortstil til visning af nautiske navigation tegn for arteriel og offshore marine navigation.
-\n• Parkering position, https://goo.gl/6JxQXF hjælper dig med at markere placeringen af din parkerede bil og se hvor meget tid tilbage, hvis parkering er tidsbegrænset.
-\n\nStay tuned!
-\nTwitter:, https://twitter.com/osmandapp
-\nFacebook: https://www.facebook.com/osmandapp\nHjemmeside: http://osmand.net hvis du har brug for hjælp med OsmAnd, bedes du kontakte vores supportteam: support@osmand.net. "</string>
+\n• Skikort info om skipister, langrendsløjper, tovbaner og skilifterne-https://goo.gl/pX6DxJ.
+\n• Søkort https://goo.gl/0hEdxm særlig kortstil til visning af nautiske navigation tegn for arteriel og offshore marine navigation.
+\n• Parkeringposition https://goo.gl/6JxQXF hjælper dig med at markere placeringen af din parkerede bil og se hvor meget tid tilbage, hvis parkering er tidsbegrænset.
+\n\nFølg med på!
+\nTwitter: https://twitter.com/osmandapp
+\nFacebook: https://www.facebook.com/osmandapp\nHjemmeside: http://osmand.net
+\n\nEr der brug for hjælp med OsmAnd, kontakt da supportteamet: support@osmand.net. "</string>
     </resources>

From 30aa654127e054ae15b398467925b7128fd8c0b3 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Tue, 26 Jan 2016 01:15:55 +0300
Subject: [PATCH 33/72] Inapp fixes

---
 .../src/net/osmand/plus/OsmandSettings.java   | 605 +++++++++---------
 .../net/osmand/plus/inapp/InAppHelper.java    | 105 ++-
 .../liveupdates/SubscriptionFragment.java     |  24 +-
 3 files changed, 394 insertions(+), 340 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 0bc48cca5d..b03f79e30e 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -51,29 +51,29 @@ public class OsmandSettings {
 	
 	public interface OsmandPreference<T>  {
 		T get();
-		
+
 		boolean set(T obj);
-		
+
 		boolean setModeValue(ApplicationMode m, T obj);
-		
+
 		T getModeValue(ApplicationMode m);
-		
+
 		String getId();
-		
+
 		void resetToDefault();
-		
+
 		void overrideDefaultValue(T newDefaultValue);
-		
+
 		void addListener(StateChangedListener<T> listener);
-		
+
 		void removeListener(StateChangedListener<T> listener);
-		
+
 		boolean isSet();
 	}
-	
+
 	private abstract class PreferenceWithListener<T> implements OsmandPreference<T> {
 		private List<WeakReference<StateChangedListener<T>>> l = null;
-		
+
 		@Override
 		public void addListener(StateChangedListener<T> listener) {
 			if(l == null) {
@@ -97,7 +97,7 @@ public class OsmandSettings {
 				}
 			}
 		}
-		
+
 		@Override
 		public void removeListener(StateChangedListener<T> listener) {
 			if(l != null) {
@@ -111,11 +111,11 @@ public class OsmandSettings {
 			}
 		}
 	}
-	
+
 	// These settings are stored in SharedPreferences
 	private static final String SHARED_PREFERENCES_NAME = "net.osmand.settings"; //$NON-NLS-1$
 
-	
+
 	/// Settings variables
 	private final OsmandApplication ctx;
 	private SettingsAPI settingsAPI;
@@ -123,14 +123,14 @@ public class OsmandSettings {
 	private Object defaultProfilePreferences;
 	private Object profilePreferences;
 	private ApplicationMode currentMode;
-	private Map<String, OsmandPreference<?>> registeredPreferences = 
+	private Map<String, OsmandPreference<?>> registeredPreferences =
 			new LinkedHashMap<String, OsmandSettings.OsmandPreference<?>>();
-	
+
 	// cache variables
 	private long lastTimeInternetConnectionChecked = 0;
 	private boolean internetConnectionAvailable = true;
-	
-	
+
+
 	protected OsmandSettings(OsmandApplication clientContext, SettingsAPI settinsAPI) {
 		ctx = clientContext;
 		this.settingsAPI = settinsAPI;
@@ -143,20 +143,20 @@ public class OsmandSettings {
 		currentMode = readApplicationMode();
 		profilePreferences = getProfilePreferences(currentMode);
 	}
-	
+
 	public OsmandApplication getContext() {
 		return ctx;
 	}
-	
+
 	public void setSettingsAPI(SettingsAPI settingsAPI) {
 		this.settingsAPI = settingsAPI;
 		initPrefs();
 	}
-	
+
 	public SettingsAPI getSettingsAPI() {
 		return settingsAPI;
 	}
-	
+
 	public static String getSharedPreferencesName(ApplicationMode mode){
 		if(mode == null){
 			return SHARED_PREFERENCES_NAME;
@@ -164,30 +164,30 @@ public class OsmandSettings {
 			return SHARED_PREFERENCES_NAME + "." + mode.getStringKey().toLowerCase();
 		}
 	}
-	
+
 	public Object getProfilePreferences(ApplicationMode mode){
 		return settingsAPI.getPreferenceObject(getSharedPreferencesName(mode));
 	}
-	
+
 	public ApplicationMode LAST_ROUTING_APPLICATION_MODE = null;
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<ApplicationMode> APPLICATION_MODE = new PreferenceWithListener<ApplicationMode>(){
 		@Override
 		public String getId() {
 			return "application_mode";
 		};
-		
+
 		@Override
 		public ApplicationMode get() {
 			return currentMode;
 		}
-		
+
 		@Override
 		public void overrideDefaultValue(ApplicationMode newDefaultValue) {
 			throw new UnsupportedOperationException();
 		}
-		
+
 		@Override
 		public void resetToDefault() {
 			set(ApplicationMode.DEFAULT);
@@ -197,7 +197,7 @@ public class OsmandSettings {
 		public boolean isSet() {
 			return true;
 		};
-		
+
 		@Override
 		public boolean set(ApplicationMode val) {
 			ApplicationMode oldMode = currentMode;
@@ -219,12 +219,12 @@ public class OsmandSettings {
 		public boolean setModeValue(ApplicationMode m, ApplicationMode obj) {
 			throw new UnsupportedOperationException();
 		}
-	}; 
-	
+	};
+
 	public ApplicationMode getApplicationMode(){
 		return APPLICATION_MODE.get();
 	}
-	
+
 	protected ApplicationMode readApplicationMode() {
 		String s = settingsAPI.getString(globalPreferences, APPLICATION_MODE.getId(), ApplicationMode.DEFAULT.getStringKey());
 		return ApplicationMode.valueOfStringKey(s, ApplicationMode.DEFAULT);
@@ -242,13 +242,13 @@ public class OsmandSettings {
 		}
 		return internetConnectionAvailable;
 	}
-	
+
 	public boolean isWifiConnected() {
 		ConnectivityManager mgr =  (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
 		NetworkInfo ni = mgr.getActiveNetworkInfo();
 		return ni != null && ni.getType() == ConnectivityManager.TYPE_WIFI;
 	}
-	
+
 	private boolean isInternetConnected() {
 		ConnectivityManager mgr = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
 		NetworkInfo active = mgr.getActiveNetworkInfo();
@@ -262,7 +262,7 @@ public class OsmandSettings {
 
 
 	/////////////// PREFERENCES classes ////////////////
-	
+
 	public abstract class CommonPreference<T> extends PreferenceWithListener<T> {
 		private final String id;
 		private boolean global;
@@ -271,39 +271,39 @@ public class OsmandSettings {
 		private boolean cache;
 		private Map<ApplicationMode, T> defaultValues;
 		private T defaultValue;
-		
-		
+
+
 		public CommonPreference(String id, T defaultValue){
 			this.id = id;
-			this.defaultValue = defaultValue; 
+			this.defaultValue = defaultValue;
 		}
-		
+
 		public CommonPreference<T> makeGlobal(){
 			global = true;
 			return this;
 		}
-		
+
 		public CommonPreference<T> cache(){
 			cache = true;
 			return this;
 		}
-		
+
 		public CommonPreference<T> makeProfile(){
 			global = false;
 			return this;
 		}
-		
+
 		protected Object getPreferences(){
 			return global ? globalPreferences : profilePreferences;
 		}
-		
+
 		public void setModeDefaultValue(ApplicationMode mode, T defValue){
 			if(defaultValues == null){
 				defaultValues = new LinkedHashMap<ApplicationMode, T>();
 			}
 			defaultValues.put(mode, defValue);
 		}
-		
+
 		@Override
 		public boolean setModeValue(ApplicationMode mode, T obj){
 			if(global) {
@@ -313,7 +313,7 @@ public class OsmandSettings {
 			fireEvent(obj);
 			return ch;
 		}
-		
+
 		public T getProfileDefaultValue(ApplicationMode mode){
 			if(global){
 				return defaultValue;
@@ -331,21 +331,21 @@ public class OsmandSettings {
 				return defaultValue;
 			}
 		}
-		
+
 		protected T getDefaultValue(){
 			return getProfileDefaultValue(currentMode);
 		}
-		
+
 		@Override
 		public void overrideDefaultValue(T newDefaultValue) {
 			this.defaultValue = newDefaultValue;
 		}
-		
+
 		protected abstract T getValue(Object prefs, T defaultValue);
-		
-		
+
+
 		protected abstract boolean setValue(Object prefs, T val);
-		
+
 		@Override
 		public T getModeValue(ApplicationMode mode) {
 			if(global) {
@@ -369,10 +369,10 @@ public class OsmandSettings {
 		public String getId() {
 			return id;
 		}
-		
+
 		@Override
 		public void resetToDefault(){
-			T o = getProfileDefaultValue(currentMode); 
+			T o = getProfileDefaultValue(currentMode);
 			set(o);
 		}
 
@@ -391,16 +391,16 @@ public class OsmandSettings {
 		public boolean isSet() {
 			return settingsAPI.contains(getPreferences(), getId());
 		}
-		
+
 	}
-	
+
 	private class BooleanPreference extends CommonPreference<Boolean> {
 
-		
+
 		private BooleanPreference(String id, boolean defaultValue) {
 			super(id, defaultValue);
 		}
-		
+
 		@Override
 		protected Boolean getValue(Object prefs, Boolean defaultValue) {
 			return settingsAPI.getBoolean(prefs, getId(), defaultValue);
@@ -411,13 +411,13 @@ public class OsmandSettings {
 			return settingsAPI.edit( prefs).putBoolean(getId(), val).commit();
 		}
 	}
-	
+
 	private class BooleanAccessibilityPreference extends BooleanPreference {
 
 		private BooleanAccessibilityPreference(String id, boolean defaultValue) {
 			super(id, defaultValue);
 		}
-		
+
 		@Override
 		protected Boolean getValue(Object prefs, Boolean defaultValue) {
 			return ctx.accessibilityEnabled() ?
@@ -439,7 +439,7 @@ public class OsmandSettings {
 		private IntPreference(String id, int defaultValue) {
 			super(id, defaultValue);
 		}
-		
+
 		@Override
 		protected Integer getValue(Object prefs, Integer defaultValue) {
 			return settingsAPI.getInt(prefs, getId(), defaultValue);
@@ -451,14 +451,14 @@ public class OsmandSettings {
 		}
 
 	}
-	
+
 	private class LongPreference extends CommonPreference<Long> {
 
 
 		private LongPreference(String id, long defaultValue) {
 			super(id, defaultValue);
 		}
-		
+
 		@Override
 		protected Long getValue(Object prefs, Long defaultValue) {
 			return settingsAPI.getLong(prefs, getId(), defaultValue);
@@ -470,14 +470,14 @@ public class OsmandSettings {
 		}
 
 	}
-	
+
 	private class FloatPreference extends CommonPreference<Float> {
 
 
 		private FloatPreference(String id, float defaultValue) {
 			super(id, defaultValue);
 		}
-		
+
 		@Override
 		protected Float getValue(Object prefs, Float defaultValue) {
 			return settingsAPI.getFloat(prefs,getId(), defaultValue);
@@ -489,7 +489,7 @@ public class OsmandSettings {
 		}
 
 	}
-	
+
 	private class StringPreference extends CommonPreference<String> {
 
 		private StringPreference(String id, String defaultValue) {
@@ -507,7 +507,7 @@ public class OsmandSettings {
 		}
 
 	}
-	
+
 	private class EnumIntPreference<E extends Enum<E>> extends CommonPreference<E> {
 
 		private final E[] values;
@@ -516,7 +516,7 @@ public class OsmandSettings {
 			super(id, defaultValue);
 			this.values = values;
 		}
-		
+
 
 		@Override
 		protected E getValue(Object prefs, E defaultValue) {
@@ -530,7 +530,7 @@ public class OsmandSettings {
 			}
 			return defaultValue;
 		}
-		
+
 		@Override
 		protected boolean setValue(Object prefs,E val) {
 			return settingsAPI.edit( prefs).putInt(getId(), val.ordinal()).commit();
@@ -538,10 +538,10 @@ public class OsmandSettings {
 
 	}
 	///////////// PREFERENCES classes ////////////////
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	private final OsmandPreference<String> PLUGINS = new StringPreference("enabled_plugins", "").makeGlobal();
-	
+
 	public Set<String> getEnabledPlugins(){
 		String plugs = PLUGINS.get();
 		StringTokenizer toks = new StringTokenizer(plugs, ",");
@@ -554,7 +554,7 @@ public class OsmandSettings {
 		}
 		return res;
 	}
-	
+
 	public Set<String> getPlugins(){
 		String plugs = PLUGINS.get();
 		StringTokenizer toks = new StringTokenizer(plugs, ",");
@@ -564,7 +564,7 @@ public class OsmandSettings {
 		}
 		return res;
 	}
-	
+
 	public void enablePlugin(String pluginId, boolean enable){
 		Set<String> set = getPlugins();
 		if (enable) {
@@ -586,7 +586,7 @@ public class OsmandSettings {
 			PLUGINS.set(serialization.toString());
 		}
 	}
-	
+
 
 	@SuppressWarnings("unchecked")
 	public CommonPreference<Boolean> registerBooleanPreference(String id, boolean defValue) {
@@ -597,7 +597,7 @@ public class OsmandSettings {
 		registeredPreferences.put(id, p);
 		return p;
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	public CommonPreference<String> registerStringPreference(String id, String defValue) {
 		if(registeredPreferences.containsKey(id)) {
@@ -607,7 +607,7 @@ public class OsmandSettings {
 		registeredPreferences.put(id, p);
 		return p;
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	public CommonPreference<Integer> registerIntPreference(String id, int defValue) {
 		if(registeredPreferences.containsKey(id)) {
@@ -617,7 +617,7 @@ public class OsmandSettings {
 		registeredPreferences.put(id, p);
 		return p;
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	public CommonPreference<Long> registerLongPreference(String id, long defValue) {
 		if(registeredPreferences.containsKey(id)) {
@@ -627,7 +627,7 @@ public class OsmandSettings {
 		registeredPreferences.put(id, p);
 		return p;
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	public CommonPreference<Float> registerFloatPreference(String id, float defValue) {
 		if(registeredPreferences.containsKey(id)) {
@@ -638,19 +638,19 @@ public class OsmandSettings {
 		return p;
 	}
 	public final CommonPreference<Boolean> USE_FAST_RECALCULATION = new BooleanPreference("use_fast_recalculation", true).makeGlobal().cache();
-	
+
 	public final CommonPreference<Boolean> SHOW_CARD_TO_CHOOSE_DRAWER = new BooleanPreference("show_card_to_choose_drawer", false).makeGlobal();
 	public final CommonPreference<Boolean> SHOW_DASHBOARD_ON_START = new BooleanPreference("should_show_dashboard_on_start", false).makeGlobal();
 	public final CommonPreference<Boolean> SHOW_DASHBOARD_ON_MAP_SCREEN = new BooleanPreference("show_dashboard_on_map_screen", false).makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final CommonPreference<Boolean> USE_INTERNET_TO_DOWNLOAD_TILES = new BooleanPreference("use_internet_to_download_tiles", true).makeGlobal().cache();
-	
+
 	public final OsmandPreference<String> AVAILABLE_APP_MODES =  new StringPreference("available_application_modes", "car,bicycle,pedestrian,").makeGlobal().cache();
-	
+
 	public final OsmandPreference<String> LAST_FAV_CATEGORY_ENTERED =  new StringPreference("last_fav_category", "").makeGlobal();
-	
-	
+
+
 	public final OsmandPreference<ApplicationMode> DEFAULT_APPLICATION_MODE = new CommonPreference<ApplicationMode>("default_application_mode_string", ApplicationMode.DEFAULT) {
 		{
 			makeGlobal();
@@ -661,16 +661,16 @@ public class OsmandSettings {
 			String key = settingsAPI.getString(prefs, getId(), defaultValue.getStringKey());
 			return ApplicationMode.valueOfStringKey(key, defaultValue);
 		}
-		
+
 		@Override
 		protected boolean setValue(Object prefs, ApplicationMode val) {
 			return settingsAPI.edit( prefs).putString(getId(), val.getStringKey()).commit();
 		}
-	}; 
-	
+	};
+
 	public final OsmandPreference<Boolean> FIRST_MAP_IS_DOWNLOADED = new BooleanPreference(
 			"first_map_is_downloaded", false) ;
-	
+
 	public final OsmandPreference<DrivingRegion> DRIVING_REGION = new EnumIntPreference<DrivingRegion>(
 			"default_driving_region", DrivingRegion.EUROPE_ASIA, DrivingRegion.values()) {
 		protected boolean setValue(Object prefs, DrivingRegion val) {
@@ -679,7 +679,7 @@ public class OsmandSettings {
 			}
 			return super.setValue(prefs, val);
 		};
-		
+
 		protected DrivingRegion getDefaultValue() {
 			Locale df = Locale.getDefault();
 			if(df == null) {
@@ -698,7 +698,7 @@ public class OsmandSettings {
 			return DrivingRegion.EUROPE_ASIA;
 		};
 	}.makeGlobal().cache();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	// cache of metrics constants as they are used very often
 	public final OsmandPreference<MetricsConstants> METRIC_SYSTEM = new EnumIntPreference<MetricsConstants>(
@@ -707,11 +707,11 @@ public class OsmandSettings {
 			return DRIVING_REGION.get().defMetrics;
 		};
 	}.makeGlobal().cache();
-	
-	
+
+
 	public final OsmandPreference<SpeedConstants> SPEED_SYSTEM = new EnumIntPreference<SpeedConstants>(
 			"default_speed_system", SpeedConstants.KILOMETERS_PER_HOUR, SpeedConstants.values()) {
-		
+
 		@Override
 		public SpeedConstants getProfileDefaultValue(ApplicationMode mode) {
 			MetricsConstants mc = METRIC_SYSTEM.get();
@@ -720,7 +720,7 @@ public class OsmandSettings {
 					return SpeedConstants.MINUTES_PER_KILOMETER;
 				} else {
 					return SpeedConstants.MILES_PER_HOUR;
-				}	
+				}
 			}
 			if(mode.isDerivedRoutingFrom(ApplicationMode.BOAT)) {
 				return SpeedConstants.NAUTICALMILES_PER_HOUR;
@@ -733,24 +733,24 @@ public class OsmandSettings {
 				return SpeedConstants.MILES_PER_HOUR;
 			}
 		};
-		
+
 	}.makeProfile().cache();
-	
-	
+
+
 	// this value string is synchronized with settings_pref.xml preference name
 	// cache of metrics constants as they are used very often
 	public final OsmandPreference<RelativeDirectionStyle> DIRECTION_STYLE = new EnumIntPreference<RelativeDirectionStyle>(
 			"direction_style", RelativeDirectionStyle.SIDEWISE, RelativeDirectionStyle.values()).makeGlobal().cache();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	// cache of metrics constants as they are used very often
 	public final OsmandPreference<AccessibilityMode> ACCESSIBILITY_MODE = new EnumIntPreference<AccessibilityMode>(
 			"accessibility_mode", AccessibilityMode.DEFAULT, AccessibilityMode.values()).makeGlobal().cache();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Float> SPEECH_RATE =
 		new FloatPreference("speech_rate", 1f).makeGlobal();
-	
+
 	public final OsmandPreference<Float> ARRIVAL_DISTANCE_FACTOR =
 		new FloatPreference("arrival_distance_factor", 1f).makeProfile();
 
@@ -760,50 +760,50 @@ public class OsmandSettings {
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> USE_TRACKBALL_FOR_MOVEMENTS =
 		new BooleanPreference("use_trackball_for_movements", true).makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> ZOOM_BY_TRACKBALL =
 		new BooleanAccessibilityPreference("zoom_by_trackball", false).makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> SCROLL_MAP_BY_GESTURES =
 		new BooleanAccessibilityPreference("scroll_map_by_gestures", true).makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> USE_SHORT_OBJECT_NAMES =
 		new BooleanAccessibilityPreference("use_short_object_names", false).makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> ACCESSIBILITY_EXTENSIONS =
 		new BooleanAccessibilityPreference("accessibility_extensions", false).makeGlobal();
-		
-	
+
+
 	// magnetic field doesn'torkmost of the time on some phones
 	public final OsmandPreference<Boolean> USE_MAGNETIC_FIELD_SENSOR_COMPASS = new BooleanPreference("use_magnetic_field_sensor_compass", false).makeGlobal().cache();
 	public final OsmandPreference<Boolean> USE_KALMAN_FILTER_FOR_COMPASS = new BooleanPreference("use_kalman_filter_compass", true).makeGlobal().cache();
 
-	
+
 	public final CommonPreference<Float> TEXT_SCALE = new FloatPreference("text_scale", 1f).makeProfile().cache();
 	{
 		TEXT_SCALE.setModeDefaultValue(ApplicationMode.CAR, 1.25f);
 	}
-	
+
 	public final CommonPreference<Float> MAP_DENSITY = new FloatPreference("map_density_n", 1f).makeProfile().cache();
 	{
 		MAP_DENSITY.setModeDefaultValue(ApplicationMode.CAR, 1.5f);
 	}
-	
-	
+
+
 
 	public final OsmandPreference<Boolean> SHOW_POI_LABEL = new BooleanPreference("show_poi_label", false).makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<String> PREFERRED_LOCALE =  new StringPreference("preferred_locale", "").makeGlobal();
-	
+
 	public static final String TRANSPORT_STOPS_OVER_MAP = "transportStops";
-	
+
 	public final OsmandPreference<String> MAP_PREFERRED_LOCALE =  new StringPreference("map_preferred_locale", "").makeGlobal().cache();
-	
+
 	public boolean usingEnglishNames() {
 		return MAP_PREFERRED_LOCALE.get().equals("en");
 	}
@@ -815,20 +815,21 @@ public class OsmandSettings {
 	public final OsmandPreference<String> BILLING_USER_NAME = new StringPreference("billing_user_name", "").makeGlobal();
 	public final OsmandPreference<String> BILLING_USER_EMAIL = new StringPreference("billing_user_email", "").makeGlobal();
 	public final OsmandPreference<String> BILLING_USER_COUNTRY = new StringPreference("billing_user_country", "").makeGlobal();
+	public final OsmandPreference<Boolean> BILLING_PURCHASE_TOKEN_SENT = new BooleanPreference("billing_purchase_token_sent", false).makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<String> USER_OSM_BUG_NAME = 
+	public final OsmandPreference<String> USER_OSM_BUG_NAME =
 		new StringPreference("user_osm_bug_name", "NoName/OsmAnd").makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<String> USER_PASSWORD = 
+	public final OsmandPreference<String> USER_PASSWORD =
 		new StringPreference("user_password", "").makeGlobal();
 
 	// this value boolean is synchronized with settings_pref.xml preference offline POI/Bugs edition
 	public final OsmandPreference<Boolean> OFFLINE_EDITION = new BooleanPreference("offline_osm_editing", true).makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<DayNightMode> DAYNIGHT_MODE = 
+	public final CommonPreference<DayNightMode> DAYNIGHT_MODE =
 		new EnumIntPreference<DayNightMode>("daynight_mode", DayNightMode.DAY, DayNightMode.values());
 	{
 		DAYNIGHT_MODE.makeProfile().cache();
@@ -836,12 +837,12 @@ public class OsmandSettings {
 		DAYNIGHT_MODE.setModeDefaultValue(ApplicationMode.BICYCLE, DayNightMode.AUTO);
 		DAYNIGHT_MODE.setModeDefaultValue(ApplicationMode.PEDESTRIAN, DayNightMode.DAY);
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<RouteService> ROUTER_SERVICE = 
-			new EnumIntPreference<RouteService>("router_service", RouteService.OSMAND, 
-					RouteService.values()).makeProfile();	
-	
+	public final OsmandPreference<RouteService> ROUTER_SERVICE =
+			new EnumIntPreference<RouteService>("router_service", RouteService.OSMAND,
+					RouteService.values()).makeProfile();
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final CommonPreference<AutoZoomMap> AUTO_ZOOM_MAP =
 		new EnumIntPreference<AutoZoomMap>("auto_zoom_map_new", AutoZoomMap.NONE,
@@ -851,9 +852,9 @@ public class OsmandSettings {
 		AUTO_ZOOM_MAP.setModeDefaultValue(ApplicationMode.BICYCLE, AutoZoomMap.NONE);
 		AUTO_ZOOM_MAP.setModeDefaultValue(ApplicationMode.PEDESTRIAN, AutoZoomMap.NONE);
 	}
-	
+
 	public final CommonPreference<Integer> DELAY_TO_START_NAVIGATION = new IntPreference("delay_to_start_navigation", -1) {
-		
+
 		protected Integer getDefaultValue() {
 			if(DEFAULT_APPLICATION_MODE.get().isDerivedRoutingFrom(ApplicationMode.CAR)) {
 				return 10;
@@ -861,13 +862,13 @@ public class OsmandSettings {
 			return -1;
 		};
 	}.makeGlobal().cache();
-	
+
 	public final CommonPreference<Boolean> SNAP_TO_ROAD = new BooleanPreference("snap_to_road", false).makeProfile().cache();
 	{
 		SNAP_TO_ROAD.setModeDefaultValue(ApplicationMode.CAR, true);
 		SNAP_TO_ROAD.setModeDefaultValue(ApplicationMode.BICYCLE, true);
 	}
-	
+
 	public final CommonPreference<Boolean> INTERRUPT_MUSIC = new BooleanPreference("interrupt_music", false).makeGlobal();
 
 	public final CommonPreference<String> PROXY_HOST = new StringPreference("proxy_host", "127.0.0.1").makeGlobal();
@@ -886,9 +887,9 @@ public class OsmandSettings {
 		SAVE_TRACK_TO_GPX.setModeDefaultValue(ApplicationMode.BICYCLE, false);
 		SAVE_TRACK_TO_GPX.setModeDefaultValue(ApplicationMode.PEDESTRIAN, false);
 	}
-	
+
 	public final CommonPreference<Boolean> DISABLE_RECORDING_ONCE_APP_KILLED = new BooleanPreference("disable_recording_once_app_killed", false).makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> FAST_ROUTE_MODE = new BooleanPreference("fast_route_mode", true).makeProfile();
 	// temporarily for new version
@@ -920,7 +921,7 @@ public class OsmandSettings {
 	public final OsmandPreference<Boolean> ANNOUNCE_WPT = new BooleanPreference("announce_wpt", true).makeGlobal().cache();
 	public final OsmandPreference<Boolean> ANNOUNCE_NEARBY_FAVORITES = new BooleanPreference("announce_nearby_favorites", false).makeProfile().cache();
 	public final OsmandPreference<Boolean> ANNOUNCE_NEARBY_POI = new BooleanPreference("announce_nearby_poi", false).makeProfile().cache();
-	
+
 	public final OsmandPreference<Boolean> GPX_ROUTE_CALC_OSMAND_PARTS = new BooleanPreference("gpx_routing_calculate_osmand_route", true).makeGlobal().cache();
 	public final OsmandPreference<Boolean> GPX_CALCULATE_RTEPT = new BooleanPreference("gpx_routing_calculate_rtept", true).makeGlobal().cache();
 	public final OsmandPreference<Boolean> GPX_ROUTE_CALC = new BooleanPreference("calc_gpx_route", false).makeGlobal().cache();
@@ -929,7 +930,7 @@ public class OsmandSettings {
 	public final OsmandPreference<Boolean> AVOID_MOTORWAY = new BooleanPreference("avoid_motorway", false).makeProfile().cache();
 	public final OsmandPreference<Boolean> AVOID_UNPAVED_ROADS = new BooleanPreference("avoid_unpaved_roads", false).makeProfile().cache();
 	public final OsmandPreference<Boolean> AVOID_FERRIES = new BooleanPreference("avoid_ferries", false).makeProfile().cache();
-	
+
 	public final OsmandPreference<Boolean> PREFER_MOTORWAYS = new BooleanPreference("prefer_motorways", false).makeProfile().cache();
 
 	public final OsmandPreference<Long> LAST_UPDATES_CARD_REFRESH = new LongPreference("last_updates_card_refresh", 0).makeGlobal();
@@ -941,63 +942,63 @@ public class OsmandSettings {
 		SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.BICYCLE, 7000);
 		SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 10000);
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final CommonPreference<Boolean> LIVE_MONITORING = new BooleanPreference("live_monitoring", false).makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final CommonPreference<Integer> LIVE_MONITORING_INTERVAL = new IntPreference("live_monitoring_interval", 5000).makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<String> LIVE_MONITORING_URL = new StringPreference("live_monitoring_url", 
+	public final CommonPreference<String> LIVE_MONITORING_URL = new StringPreference("live_monitoring_url",
 			"http://example.com?lat={0}&lon={1}&timestamp={2}&hdop={3}&altitude={4}&speed={5}").makeGlobal();
-	
+
 	public final CommonPreference<String> GPS_STATUS_APP = new StringPreference("gps_status_app", "").makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> SHOW_OSM_BUGS = new BooleanPreference("show_osm_bugs", false).makeGlobal();
-	
+
 	public final OsmandPreference<String> MAP_INFO_CONTROLS = new StringPreference("map_info_controls", "").makeProfile();
-	
+
 	public final OsmandPreference<String> OSMO_DEVICE_KEY = new StringPreference("osmo_device_token", "").makeGlobal();
-	
+
 	public final OsmandPreference<String> OSMO_USER_NAME = new StringPreference("osmo_user_name", "").makeGlobal();
-	
+
 	public final OsmandPreference<String> OSMO_USER_PWD = new StringPreference("osmo_user_pwd", null).makeGlobal();
-	
+
 	public final OsmandPreference<Boolean> OSMO_AUTO_CONNECT = new BooleanPreference("osmo_automatically_connect", false).makeGlobal();
-	
-	public final CommonPreference<Boolean> OSMO_USE_HTTPS = new BooleanPreference("osmo_use_https", 
+
+	public final CommonPreference<Boolean> OSMO_USE_HTTPS = new BooleanPreference("osmo_use_https",
 			Build.VERSION.SDK_INT < 14/*Build.VERSION_CODES.ICE_CREAM_SANDWICH*/? false : true).makeGlobal();
-	
+
 	public final OsmandPreference<Long> OSMO_LAST_PING = new LongPreference("osmo_last_ping", 0).makeGlobal().cache();
-	
+
 	public final OsmandPreference<Boolean> OSMO_SEND_LOCATIONS_STATE = new BooleanPreference("osmo_send_locations", false).cache().makeGlobal();
-	
+
 	public final OsmandPreference<Boolean> OSMO_SHOW_GROUP_NOTIFICATIONS = new BooleanPreference("osmo_show_toast_notifications", true).makeGlobal();
-	
+
 	public final CommonPreference<Integer> OSMO_SAVE_TRACK_INTERVAL = new IntPreference("osmo_save_track_interval", 5000).makeGlobal().cache();
-	
+
 	public final OsmandPreference<String> OSMO_GROUPS = new StringPreference("osmo_groups", "{}").makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> DEBUG_RENDERING_INFO = new BooleanPreference("debug_rendering", false).makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> SHOW_FAVORITES = new BooleanPreference("show_favorites", true).makeGlobal().cache();
-	
+
 	public final CommonPreference<Boolean> SHOW_ZOOM_BUTTONS_NAVIGATION = new BooleanPreference("show_zoom_buttons_navigation", false).makeProfile().cache();
 	{
 		SHOW_ZOOM_BUTTONS_NAVIGATION.setModeDefaultValue(ApplicationMode.PEDESTRIAN, true);
 	}
-	
-	// Json 
+
+	// Json
 	public final OsmandPreference<String> SELECTED_GPX = new StringPreference("selected_gpx", "").makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<Integer> MAP_SCREEN_ORIENTATION = 
+	public final OsmandPreference<Integer> MAP_SCREEN_ORIENTATION =
 		new IntPreference("map_screen_orientation", -1/*ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED*/).makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 //	public final CommonPreference<Boolean> SHOW_VIEW_ANGLE = new BooleanPreference("show_view_angle", false).makeProfile().cache();
 //	{
@@ -1005,16 +1006,16 @@ public class OsmandSettings {
 //		SHOW_VIEW_ANGLE.setModeDefaultValue(ApplicationMode.BICYCLE, true);
 //		SHOW_VIEW_ANGLE.setModeDefaultValue(ApplicationMode.PEDESTRIAN, true);
 //	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
-	// seconds to auto_follow 
+	// seconds to auto_follow
 	public final CommonPreference<Integer> AUTO_FOLLOW_ROUTE = new IntPreference("auto_follow_route", 0).makeProfile();
 	{
 		AUTO_FOLLOW_ROUTE.setModeDefaultValue(ApplicationMode.CAR, 15);
 		AUTO_FOLLOW_ROUTE.setModeDefaultValue(ApplicationMode.BICYCLE, 15);
 		AUTO_FOLLOW_ROUTE.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 0);
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	// seconds to auto_follow
 	public final CommonPreference<Integer> KEEP_INFORMING = new IntPreference("keep_informing", 0).makeProfile();
@@ -1024,7 +1025,7 @@ public class OsmandSettings {
         KEEP_INFORMING.setModeDefaultValue(ApplicationMode.BICYCLE, 0);
         KEEP_INFORMING.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 0);
 	}
-	
+
 	// screen power save
 	public final CommonPreference<Integer> WAKE_ON_VOICE_INT = new IntPreference("wake_on_voice_int", 0).makeProfile();
 	{
@@ -1042,7 +1043,7 @@ public class OsmandSettings {
 	public static final int ROTATE_MAP_NONE = 0;
 	public static final int ROTATE_MAP_BEARING = 1;
 	public static final int ROTATE_MAP_COMPASS = 2;
-	public final CommonPreference<Integer> ROTATE_MAP = 
+	public final CommonPreference<Integer> ROTATE_MAP =
 			new IntPreference("rotate_map", ROTATE_MAP_NONE).makeProfile().cache();
 	{
 		ROTATE_MAP.setModeDefaultValue(ApplicationMode.CAR, ROTATE_MAP_BEARING);
@@ -1054,10 +1055,10 @@ public class OsmandSettings {
 	public static final int CENTER_CONSTANT = 0;
 	public static final int BOTTOM_CONSTANT = 1;
 	public final CommonPreference<Boolean> CENTER_POSITION_ON_MAP = new BooleanPreference("center_position_on_map", false).makeProfile();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Integer> MAX_LEVEL_TO_DOWNLOAD_TILE = new IntPreference("max_level_download_tile", 20).makeProfile().cache();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Integer> LEVEL_TO_SWITCH_VECTOR_RASTER = new IntPreference("level_to_switch_vector_raster", 1).makeGlobal().cache();
 
@@ -1073,26 +1074,26 @@ public class OsmandSettings {
 	{
 		SHOW_DESTINATION_ARROW.setModeDefaultValue(ApplicationMode.PEDESTRIAN, true);
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final CommonPreference<String> MAP_OVERLAY = new StringPreference("map_overlay", null).makeGlobal().cache();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final CommonPreference<String> MAP_UNDERLAY = new StringPreference("map_underlay", null).makeGlobal().cache();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final CommonPreference<Integer> MAP_OVERLAY_TRANSPARENCY = new IntPreference("overlay_transparency",
 			100).makeGlobal().cache();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final CommonPreference<Integer> MAP_TRANSPARENCY = new IntPreference("map_transparency",
 			255).makeGlobal().cache();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final CommonPreference<String> MAP_TILE_SOURCES = new StringPreference("map_tile_sources",
 			TileSourceManager.getMapnikSource().getName()).makeGlobal();
-	
-	
+
+
 	public CommonPreference<String> PREVIOUS_INSTALLED_VERSION = new StringPreference("previous_installed_version", "").makeGlobal();
 
 	public final OsmandPreference<Boolean> SHOULD_SHOW_FREE_VERSION_BANNER = new BooleanPreference("should_show_free_version_banner", false).makeGlobal().cache();
@@ -1107,7 +1108,7 @@ public class OsmandSettings {
 		}
 		return TileSourceManager.getMapnikSource();
 	}
-	
+
 	private TileSourceTemplate checkAmongAvailableTileSources(File dir, List<TileSourceTemplate> list){
 		if (list != null) {
 			for (TileSourceTemplate l : list) {
@@ -1119,13 +1120,13 @@ public class OsmandSettings {
 					}
 					return l;
 				}
-				
+
 			}
 		}
 		return null;
 	}
-		
-	
+
+
 
 	public ITileSource getTileSourceByName(String tileName, boolean warnWhenSelected) {
 		if(tileName == null || tileName.length() == 0){
@@ -1153,7 +1154,7 @@ public class OsmandSettings {
 		}
 		return null;
 	}
-	
+
 	public boolean installTileSource(TileSourceTemplate toInstall){
 		File tPath = ctx.getAppPath(IndexConstants.TILES_INDEX_DIR);
 		File dir = new File(tPath, toInstall.getName());
@@ -1167,12 +1168,12 @@ public class OsmandSettings {
 		}
 		return true;
 	}
-	
+
 	public Map<String, String> getTileSourceEntries(){
 		return getTileSourceEntries(true);
-		
+
     }
-	
+
 	public Map<String, String> getTileSourceEntries(boolean sqlite){
 		Map<String, String> map = new LinkedHashMap<String, String>();
 		File dir = ctx.getAppPath(IndexConstants.TILES_INDEX_DIR);
@@ -1188,7 +1189,7 @@ public class OsmandSettings {
 					}
 					return 1;
 				}
-				
+
 			});
 			if (files != null ) {
 				for (File f : files) {
@@ -1208,24 +1209,24 @@ public class OsmandSettings {
 			map.put(l.getName(), l.getName());
 		}
 		return map;
-		
+
     }
 
 	public static final String EXTERNAL_STORAGE_DIR = "external_storage_dir"; //$NON-NLS-1$
-	
+
 	public static final String EXTERNAL_STORAGE_DIR_V19 = "external_storage_dir_V19"; //$NON-NLS-1$
 	public static final String EXTERNAL_STORAGE_DIR_TYPE_V19 = "external_storage_dir_type_V19"; //$NON-NLS-1$
 	public static final int EXTERNAL_STORAGE_TYPE_DEFAULT = 0; // Environment.getExternalStorageDirectory()
 	public static final int EXTERNAL_STORAGE_TYPE_EXTERNAL_FILE = 1; // ctx.getExternalFilesDirs(null)
 	public static final int EXTERNAL_STORAGE_TYPE_INTERNAL_FILE = 2; // ctx.getFilesDir()
 	public static final int EXTERNAL_STORAGE_TYPE_OBB = 3; // ctx.getObbDirs
-	public static final int EXTERNAL_STORAGE_TYPE_SPECIFIED = 4; 
+	public static final int EXTERNAL_STORAGE_TYPE_SPECIFIED = 4;
+
 
-	
 	public File getExternalStorageDirectory() {
 		return getExternalStorageDirectory(null);
 	}
-	
+
 	public File getExternalStorageDirectory(ValueHolder<Integer> type) {
 		if(Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
 			return getExternalStorageDirectoryPre19();
@@ -1233,7 +1234,7 @@ public class OsmandSettings {
 			return getExternalStorageDirectoryV19(type);
 		}
 	}
-	
+
 	@TargetApi(19)
 	public File getInternalAppPath() {
 		if(Build.VERSION.SDK_INT >= 21) {
@@ -1244,7 +1245,7 @@ public class OsmandSettings {
 		}
 		return ctx.getFilesDir();
 	}
-	
+
 	@TargetApi(21)
 	private File getNoBackupPath() {
 		return ctx.getNoBackupFilesDir();
@@ -1292,7 +1293,7 @@ public class OsmandSettings {
 				getExternalStorageDirectoryPre19().getAbsolutePath());
 		return new File(location);
 	}
-	
+
 
 	public static boolean isWritable(File dirToTest) {
 		boolean isWriteable = false;
@@ -1306,18 +1307,18 @@ public class OsmandSettings {
 		}
 		return isWriteable;
 	}
-	
+
 	public boolean isExternalStorageDirectorySpecifiedV19() {
 		return settingsAPI.contains(globalPreferences, EXTERNAL_STORAGE_DIR_TYPE_V19);
 	}
-	
+
 	public int getExternalStorageDirectoryTypeV19() {
 		return settingsAPI.getInt(globalPreferences, EXTERNAL_STORAGE_DIR_TYPE_V19, -1);
 	}
-	
+
 	public File getExternalStorageDirectoryPre19() {
 		String defaultLocation = Environment.getExternalStorageDirectory().getAbsolutePath();
-		File rootFolder = new File(settingsAPI.getString(globalPreferences, EXTERNAL_STORAGE_DIR, 
+		File rootFolder = new File(settingsAPI.getString(globalPreferences, EXTERNAL_STORAGE_DIR,
 				defaultLocation));
 		return new File(rootFolder, IndexConstants.APP_DIR);
 	}
@@ -1325,7 +1326,7 @@ public class OsmandSettings {
 	public File getDefaultInternalStorage() {
 		return new File(Environment.getExternalStorageDirectory(), IndexConstants.APP_DIR);
 	}
-	
+
 	public boolean setExternalStorageDirectoryV19(int type, String externalStorageDir) {
 		return settingsAPI.edit(globalPreferences).
 				putInt(EXTERNAL_STORAGE_DIR_TYPE_V19, type).
@@ -1347,29 +1348,29 @@ public class OsmandSettings {
 		}
 		return null;
 	}
-	
+
 	public void setExternalStorageDirectory(int type, String directory) {
 		if(Build.VERSION.SDK_INT < 19) {
 			setExternalStorageDirectoryPre19(directory);
 		} else {
 			setExternalStorageDirectoryV19(type, directory);
 		}
-		
+
 	}
-	
+
 	public boolean isExternalStorageDirectorySpecifiedPre19() {
 		return settingsAPI.contains(globalPreferences, EXTERNAL_STORAGE_DIR);
 	}
-	
+
 	public boolean setExternalStorageDirectoryPre19(String externalStorageDir) {
 		return settingsAPI.edit(globalPreferences).putString(EXTERNAL_STORAGE_DIR, externalStorageDir).commit();
 	}
-	
+
 	public Object getGlobalPreferences() {
 		return globalPreferences;
 	}
-	
-	
+
+
 	// This value is a key for saving last known location shown on the map
 	public static final String LAST_KNOWN_MAP_LAT = "last_known_map_lat"; //$NON-NLS-1$
 	public static final String LAST_KNOWN_MAP_LON = "last_known_map_lon"; //$NON-NLS-1$
@@ -1385,12 +1386,12 @@ public class OsmandSettings {
 		float lon = settingsAPI.getFloat(globalPreferences,LAST_KNOWN_MAP_LON, 0);
 		return new LatLon(lat, lon);
 	}
-	
+
 	public boolean isLastKnownMapLocation(){
 		return settingsAPI.contains(globalPreferences,LAST_KNOWN_MAP_LAT);
 	}
 
-		
+
 	public LatLon getAndClearMapLocationToShow(){
 		if(!settingsAPI.contains(globalPreferences,MAP_LAT_TO_SHOW)){
 			return null;
@@ -1400,24 +1401,24 @@ public class OsmandSettings {
 		settingsAPI.edit(globalPreferences).remove(MAP_LAT_TO_SHOW).commit();
 		return new LatLon(lat, lon);
 	}
-	
+
 	public PointDescription getAndClearMapLabelToShow(LatLon l){
 		String label = settingsAPI.getString(globalPreferences,MAP_LABEL_TO_SHOW, null);
 		settingsAPI.edit(globalPreferences).remove(MAP_LABEL_TO_SHOW).commit();
 		return PointDescription.deserializeFromString(label, l);
 	}
-	
+
 	private Object objectToShow;
 	public Object getAndClearObjectToShow(){
 		Object objectToShow = this.objectToShow;
 		this.objectToShow = null;
 		return objectToShow;
 	}
-	
+
 	public int getMapZoomToShow() {
 		return settingsAPI.getInt(globalPreferences,MAP_ZOOM_TO_SHOW, 5);
 	}
-	
+
 	public void setMapLocationToShow(double latitude, double longitude, int zoom, PointDescription pointDescription,
 			boolean addToHistory, Object toShow) {
 		SettingsEditor edit = settingsAPI.edit(globalPreferences);
@@ -1435,7 +1436,7 @@ public class OsmandSettings {
 			SearchHistoryHelper.getInstance(ctx).addNewItemToHistory(latitude, longitude, pointDescription);
 		}
 	}
-	
+
 	public void setMapLocationToShow(double latitude, double longitude, int zoom) {
 		setMapLocationToShow(latitude, longitude, zoom,  null, false, null);
 	}
@@ -1479,8 +1480,8 @@ public class OsmandSettings {
 		}
 		return new LatLon(lat, lon);
 	}
-	
-	
+
+
 	public LatLon getPointToStart() {
 		float lat = settingsAPI.getFloat(globalPreferences,START_POINT_LAT, 0);
 		float lon = settingsAPI.getFloat(globalPreferences,START_POINT_LON, 0);
@@ -1489,18 +1490,18 @@ public class OsmandSettings {
 		}
 		return new LatLon(lat, lon);
 	}
-	
+
 	public PointDescription getStartPointDescription() {
-		return 
+		return
 				PointDescription.deserializeFromString(settingsAPI.getString(globalPreferences, START_POINT_DESCRIPTION, ""), getPointToStart());
 	}
-	
+
 	public PointDescription getPointNavigateDescription() {
-		return 
+		return
 				PointDescription.deserializeFromString(settingsAPI.getString(globalPreferences, POINT_NAVIGATE_DESCRIPTION, ""), getPointToNavigate());
 	}
-	
-	
+
+
 	public int isRouteToPointNavigateAndClear() {
 		int vl = settingsAPI.getInt(globalPreferences, POINT_NAVIGATE_ROUTE, 0);
 		if(vl != 0) {
@@ -1508,15 +1509,15 @@ public class OsmandSettings {
 		}
 		return vl;
 	}
-	
-	
+
+
 	public boolean clearIntermediatePoints() {
 		return settingsAPI.edit(globalPreferences).remove(INTERMEDIATE_POINTS).remove(INTERMEDIATE_POINTS_DESCRIPTION).commit();
 	}
-	
-	public final CommonPreference<Boolean> USE_INTERMEDIATE_POINTS_NAVIGATION = 
+
+	public final CommonPreference<Boolean> USE_INTERMEDIATE_POINTS_NAVIGATION =
 			new BooleanPreference("use_intermediate_points_navigation", false).makeGlobal().cache();
-	
+
 	public List<String> getIntermediatePointDescriptions(int sz) {
 		List<String> list = new ArrayList<String>();
 		String ip = settingsAPI.getString(globalPreferences,INTERMEDIATE_POINTS_DESCRIPTION, "");
@@ -1531,7 +1532,7 @@ public class OsmandSettings {
 		}
 		return list;
 	}
-	
+
 	public List<LatLon> getIntermediatePoints() {
 		List<LatLon> list = new ArrayList<LatLon>();
 		String ip = settingsAPI.getString(globalPreferences,INTERMEDIATE_POINTS, "");
@@ -1548,7 +1549,7 @@ public class OsmandSettings {
 		}
 		return list;
 	}
-	
+
 	public boolean insertIntermediatePoint(double latitude, double longitude, PointDescription historyDescription, int index) {
 		List<LatLon> ps = getIntermediatePoints();
 		List<String> ds = getIntermediatePointDescriptions(ps.size());
@@ -1602,17 +1603,17 @@ public class OsmandSettings {
 				putString(INTERMEDIATE_POINTS_DESCRIPTION, tb.toString()).
 				commit();
 	}
-	
+
 	public boolean clearPointToNavigate() {
 		return settingsAPI.edit(globalPreferences).remove(POINT_NAVIGATE_LAT).remove(POINT_NAVIGATE_LON).
 				remove(POINT_NAVIGATE_DESCRIPTION).commit();
 	}
-	
+
 	public boolean clearPointToStart() {
 		return settingsAPI.edit(globalPreferences).remove(START_POINT_LAT).remove(START_POINT_LON).
 				remove(START_POINT_DESCRIPTION).commit();
 	}
-	
+
 	public boolean setPointToNavigate(double latitude, double longitude, PointDescription p) {
 		boolean add = settingsAPI.edit(globalPreferences).putFloat(POINT_NAVIGATE_LAT, (float) latitude).putFloat(POINT_NAVIGATE_LON, (float) longitude).commit();
 		settingsAPI.edit(globalPreferences).putString(POINT_NAVIGATE_DESCRIPTION, PointDescription.serializeToString(p)).commit();
@@ -1623,22 +1624,22 @@ public class OsmandSettings {
 		}
 		return add;
 	}
-	
+
 	public boolean setPointToStart(double latitude, double longitude, PointDescription p) {
 		boolean add = settingsAPI.edit(globalPreferences).putFloat(START_POINT_LAT, (float) latitude).putFloat(START_POINT_LON, (float) longitude).commit();
 		settingsAPI.edit(globalPreferences).putString(START_POINT_DESCRIPTION, PointDescription.serializeToString(p)).commit();
 		return add;
 	}
-	
+
 	public boolean navigateDialog() {
 		return settingsAPI.edit(globalPreferences).putInt(POINT_NAVIGATE_ROUTE, NAVIGATE).commit();
 	}
-	
+
 
 	/**
 	 * the location of a parked car
 	 */
-		
+
 	public static final String LAST_SEARCHED_REGION = "last_searched_region"; //$NON-NLS-1$
 	public static final String LAST_SEARCHED_CITY = "last_searched_city"; //$NON-NLS-1$
 	public static final String LAST_SEARCHED_CITY_NAME = "last_searched_city_name"; //$NON-NLS-1$
@@ -1648,15 +1649,15 @@ public class OsmandSettings {
 	public static final String LAST_SEARCHED_INTERSECTED_STREET = "last_searched_intersected_street"; //$NON-NLS-1$
 	public static final String LAST_SEARCHED_LAT = "last_searched_lat"; //$NON-NLS-1$
 	public static final String LAST_SEARCHED_LON = "last_searched_lon"; //$NON-NLS-1$
-	
+
 	public LatLon getLastSearchedPoint(){
 		if(settingsAPI.contains(globalPreferences,LAST_SEARCHED_LAT) && settingsAPI.contains(globalPreferences,LAST_SEARCHED_LON)){
-			return new LatLon(settingsAPI.getFloat(globalPreferences,LAST_SEARCHED_LAT, 0), 
+			return new LatLon(settingsAPI.getFloat(globalPreferences,LAST_SEARCHED_LAT, 0),
 					settingsAPI.getFloat(globalPreferences,LAST_SEARCHED_LON, 0));
 		}
 		return null;
 	}
-	
+
 	public boolean setLastSearchedPoint(LatLon l){
 		if(l == null){
 			return settingsAPI.edit(globalPreferences).remove(LAST_SEARCHED_LAT).remove(LAST_SEARCHED_LON).commit();
@@ -1664,7 +1665,7 @@ public class OsmandSettings {
 			return setLastSearchedPoint(l.getLatitude(), l.getLongitude());
 		}
 	}
-	
+
 	public boolean setLastSearchedPoint(double lat, double lon){
 		return settingsAPI.edit(globalPreferences).putFloat(LAST_SEARCHED_LAT, (float) lat).
 			putFloat(LAST_SEARCHED_LON, (float) lon).commit();
@@ -1685,11 +1686,11 @@ public class OsmandSettings {
 		setLastSearchedPoint(l);
 		return res;
 	}
-	
+
 	public String getLastSearchedPostcode(){
 		return settingsAPI.getString(globalPreferences, LAST_SEARCHED_POSTCODE, null);
 	}
-	
+
 	public boolean setLastSearchedPostcode(String postcode, LatLon point){
 		SettingsEditor edit = settingsAPI.edit(globalPreferences).putLong(LAST_SEARCHED_CITY, -1).putString(LAST_SEARCHED_STREET, "") //$NON-NLS-1$
 				.putString(LAST_SEARCHED_BUILDING, "").putString(LAST_SEARCHED_POSTCODE, postcode); //$NON-NLS-1$
@@ -1704,7 +1705,7 @@ public class OsmandSettings {
 	public Long getLastSearchedCity() {
 		return settingsAPI.getLong(globalPreferences,LAST_SEARCHED_CITY, -1);
 	}
-	
+
 	public String getLastSearchedCityName() {
 		return settingsAPI.getString(globalPreferences,LAST_SEARCHED_CITY_NAME, "");
 	}
@@ -1761,7 +1762,7 @@ public class OsmandSettings {
 	public final OsmandPreference<String> SELECTED_POI_FILTER_FOR_MAP = new StringPreference("selected_poi_filter_for_map", null).makeGlobal().cache();
 
 	public static final String VOICE_PROVIDER_NOT_USE = "VOICE_PROVIDER_NOT_USE";
-	
+
 	public static final String[] TTS_AVAILABLE_VOICES = new String[] {
 		"de", "en",  "es", "fr", "it", "ja", "nl", "pl", "pt", "ru", "zh"
 	};
@@ -1778,7 +1779,7 @@ public class OsmandSettings {
 			return "en-tts";
 		};
 	}.makeGlobal();
-	
+
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final CommonPreference<String> RENDERER = new StringPreference("renderer", RendererRegistry.DEFAULT_RENDER) {
@@ -1798,8 +1799,8 @@ public class OsmandSettings {
 			return false;
 		};
 	};
-	
-	
+
+
 	Map<String, CommonPreference<String>> customRendersProps = new LinkedHashMap<String, OsmandSettings.CommonPreference<String>>();
 	public CommonPreference<String> getCustomRenderProperty(String attrName){
 		if(!customRendersProps.containsKey(attrName)){
@@ -1813,7 +1814,7 @@ public class OsmandSettings {
 		pref.setModeDefaultValue(ApplicationMode.PEDESTRIAN, "pedestrian");
 		pref.setModeDefaultValue(ApplicationMode.BICYCLE, "bicycle");
 	}
-	
+
 	Map<String, CommonPreference<Boolean>> customBooleanRendersProps = new LinkedHashMap<String, OsmandSettings.CommonPreference<Boolean>>();
 	public CommonPreference<Boolean> getCustomRenderBooleanProperty(String attrName){
 		if(!customBooleanRendersProps.containsKey(attrName)){
@@ -1821,7 +1822,7 @@ public class OsmandSettings {
 		}
 		return customBooleanRendersProps.get(attrName);
 	}
-	
+
 	Map<String, CommonPreference<String>> customRoutingProps = new LinkedHashMap<String, OsmandSettings.CommonPreference<String>>();
 	public CommonPreference<String> getCustomRoutingProperty(String attrName, String defValue){
 		if(!customRoutingProps.containsKey(attrName)){
@@ -1833,7 +1834,7 @@ public class OsmandSettings {
 //		CommonPreference<String> pref = getCustomRoutingProperty("appMode");
 //		pref.setModeDefaultValue(ApplicationMode.CAR, "car");
 	}
-	
+
 	Map<String, CommonPreference<Boolean>> customBooleanRoutingProps = new LinkedHashMap<String, OsmandSettings.CommonPreference<Boolean>>();
 	public CommonPreference<Boolean> getCustomRoutingBooleanProperty(String attrName){
 		if(!customBooleanRoutingProps.containsKey(attrName)){
@@ -1841,44 +1842,44 @@ public class OsmandSettings {
 		}
 		return customBooleanRoutingProps.get(attrName);
 	}
-	
+
 	public final OsmandPreference<Boolean> VOICE_MUTE = new BooleanPreference("voice_mute", false).makeGlobal();
-	
+
 	// for background service
 	public final OsmandPreference<Boolean> MAP_ACTIVITY_ENABLED = new BooleanPreference("map_activity_enabled", false).makeGlobal();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> SAFE_MODE = new BooleanPreference("safe_mode", false).makeGlobal();
-	
+
 	public final OsmandPreference<Boolean> NATIVE_RENDERING_FAILED = new BooleanPreference("native_rendering_failed_init", false).makeGlobal();
-	
-	public final OsmandPreference<Boolean> USE_OPENGL_RENDER = new BooleanPreference("use_opengl_render", 
+
+	public final OsmandPreference<Boolean> USE_OPENGL_RENDER = new BooleanPreference("use_opengl_render",
 			false /*Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH*/
 			).makeGlobal().cache();
 
 	public final OsmandPreference<Boolean> OPENGL_RENDER_FAILED = new BooleanPreference("opengl_render_failed", false).makeGlobal().cache();
-	
-	
+
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String SERVICE_OFF_ENABLED = "service_off_enabled"; //$NON-NLS-1$
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<Integer> SERVICE_OFF_INTERVAL = new IntPreference("service_off_interval", 
+	public final OsmandPreference<Integer> SERVICE_OFF_INTERVAL = new IntPreference("service_off_interval",
 			0).makeGlobal();
-	
-	
+
+
 	public final OsmandPreference<String> CONTRIBUTION_INSTALL_APP_DATE = new StringPreference("CONTRIBUTION_INSTALL_APP_DATE", null).makeGlobal();
-	
-	
+
+
 	public final OsmandPreference<Integer> COORDINATES_FORMAT = new IntPreference("coordinates_format", PointDescription.FORMAT_DEGREES).makeGlobal();
-	
+
 	public final OsmandPreference<Boolean> FOLLOW_THE_ROUTE = new BooleanPreference("follow_to_route", false).makeGlobal();
 	public final OsmandPreference<String> FOLLOW_THE_GPX_ROUTE = new StringPreference("follow_gpx", null).makeGlobal();
-	
-	public final OsmandPreference<Boolean> SHOW_ARRIVAL_TIME_OTHERWISE_EXPECTED_TIME = 
+
+	public final OsmandPreference<Boolean> SHOW_ARRIVAL_TIME_OTHERWISE_EXPECTED_TIME =
 		new BooleanPreference("show_arrival_time", true).makeGlobal();
-	
-	public final OsmandPreference<Long> AGPS_DATA_LAST_TIME_DOWNLOADED  = 
+
+	public final OsmandPreference<Long> AGPS_DATA_LAST_TIME_DOWNLOADED  =
 			new LongPreference("agps_data_downloaded", 0).makeGlobal();
 
 	// Live Updates
@@ -1888,66 +1889,66 @@ public class OsmandSettings {
 			new IntPreference("live_updates_retryes", 2).makeGlobal();
 
 	// UI boxes
-	public final CommonPreference<Boolean> TRANSPARENT_MAP_THEME = 
+	public final CommonPreference<Boolean> TRANSPARENT_MAP_THEME =
 			new BooleanPreference("transparent_map_theme", true).makeProfile();
 	{
 		TRANSPARENT_MAP_THEME.setModeDefaultValue(ApplicationMode.CAR, false);
 		TRANSPARENT_MAP_THEME.setModeDefaultValue(ApplicationMode.BICYCLE, false);
 		TRANSPARENT_MAP_THEME.setModeDefaultValue(ApplicationMode.PEDESTRIAN, true);
 	}
-	
-	public final CommonPreference<Boolean> SHOW_STREET_NAME = 
+
+	public final CommonPreference<Boolean> SHOW_STREET_NAME =
 			new BooleanPreference("show_street_name", false).makeProfile();
 	{
 		SHOW_STREET_NAME.setModeDefaultValue(ApplicationMode.CAR, true);
 		SHOW_STREET_NAME.setModeDefaultValue(ApplicationMode.BICYCLE, false);
 		SHOW_STREET_NAME.setModeDefaultValue(ApplicationMode.PEDESTRIAN, false);
 	}
-	
+
 	public static final int OSMAND_DARK_THEME = 0;
 	public static final int OSMAND_LIGHT_THEME = 1;
 
 
-	public final CommonPreference<Integer> SEARCH_TAB = 
+	public final CommonPreference<Integer> SEARCH_TAB =
 			new IntPreference("SEARCH_TAB", 0).makeGlobal().cache();
-	
-	public final CommonPreference<Integer> FAVORITES_TAB = 
+
+	public final CommonPreference<Integer> FAVORITES_TAB =
 			new IntPreference("FAVORITES_TAB", 0).makeGlobal().cache();
-	
-	public final CommonPreference<Integer> OSMAND_THEME = 
+
+	public final CommonPreference<Integer> OSMAND_THEME =
 			new IntPreference("osmand_theme", OSMAND_LIGHT_THEME).makeGlobal().cache();
-	
+
 	public boolean isLightActionBar(){
 		return true;
 	}
-	
+
 
 	public boolean isLightContent(){
 		return OSMAND_THEME.get() != OSMAND_DARK_THEME ;
 	}
 
-	
-	public final CommonPreference<Boolean> FLUORESCENT_OVERLAYS = 
+
+	public final CommonPreference<Boolean> FLUORESCENT_OVERLAYS =
 			new BooleanPreference("fluorescent_overlays", false).makeGlobal().cache();
 
-	
-	public final CommonPreference<Boolean> SHOW_RULER = 
+
+	public final CommonPreference<Boolean> SHOW_RULER =
 			new BooleanPreference("show_ruler", true).makeProfile().cache();
 
 //	public final OsmandPreference<Integer> NUMBER_OF_FREE_DOWNLOADS_V2 = new IntPreference("free_downloads_v2", 0).makeGlobal();
-	
+
 	public final OsmandPreference<Integer> NUMBER_OF_FREE_DOWNLOADS = new IntPreference("free_downloads_v3", 0).makeGlobal();
 
 	// For DashRateUsFragment
 	public final OsmandPreference<Long> LAST_DISPLAY_TIME =
             new LongPreference("last_display_time", 0).makeGlobal().cache();
-	
+
 	public final OsmandPreference<Long> LAST_CHECKED_UPDATES =
             new LongPreference("last_checked_updates", 0).makeGlobal();
-	
+
 	public final OsmandPreference<Integer> NUMBER_OF_APPLICATION_STARTS =
 			new IntPreference("number_of_app_starts", 0).makeGlobal().cache();
-	
+
 	public final OsmandPreference<RateUsBottomSheetDialog.RateUsState> RATE_US_STATE =
             new EnumIntPreference<>("rate_us_state",
 					RateUsBottomSheetDialog.RateUsState.INITIAL_STATE, RateUsBottomSheetDialog.RateUsState.values())
@@ -1955,17 +1956,17 @@ public class OsmandSettings {
 
 
 	public enum DayNightMode {
-		AUTO(R.string.daynight_mode_auto), 
-		DAY(R.string.daynight_mode_day), 
+		AUTO(R.string.daynight_mode_auto),
+		DAY(R.string.daynight_mode_day),
 		NIGHT(R.string.daynight_mode_night),
 		SENSOR(R.string.daynight_mode_sensor);
 
 		private final int key;
-		
+
 		DayNightMode(int key) {
 			this.key = key;
 		}
-		
+
 		public  String toHumanString(Context ctx){
 			return ctx.getString(key);
 		}
@@ -1985,9 +1986,9 @@ public class OsmandSettings {
 		public boolean isNight() {
 			return this == NIGHT;
 		}
-		
+
 		public static DayNightMode[] possibleValues(Context context) {
-			SensorManager mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);         
+			SensorManager mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
 		    Sensor mLight = mSensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);
 			boolean isLightSensorEnabled = mLight != null;
 	         if (isLightSensorEnabled) {
@@ -1998,8 +1999,8 @@ public class OsmandSettings {
 		}
 
 	}
-	
-	
+
+
 	public enum SpeedConstants {
 	    KILOMETERS_PER_HOUR(R.string.km_h, R.string.si_kmh),
 		MILES_PER_HOUR(R.string.mile_per_hour, R.string.si_mph),
@@ -2007,7 +2008,7 @@ public class OsmandSettings {
 		MINUTES_PER_MILE(R.string.min_mile, R.string.si_min_m),
 		MINUTES_PER_KILOMETER(R.string.min_km, R.string.si_min_km),
 		NAUTICALMILES_PER_HOUR(R.string.nm_h, R.string.si_nm_h);
-		
+
 		private final int key;
 		private int descr;
 
@@ -2015,24 +2016,24 @@ public class OsmandSettings {
 			this.key = key;
 			this.descr = descr;
 		}
-		
+
 		public String toHumanString(Context ctx){
 			return ctx.getString(descr);
 		}
-		
+
 		public String toShortString(Context ctx){
 			return ctx.getString(key);
 		}
-		
-		
+
+
 	}
-	
+
 	public enum MetricsConstants {
 	    KILOMETERS_AND_METERS(R.string.si_km_m,"km-m"),
 		MILES_AND_FOOTS(R.string.si_mi_foots,"mi-f"),
 		NAUTICAL_MILES(R.string.si_nm,"nm"),
 		MILES_AND_YARDS(R.string.si_mi_yard,"mi-y");
-		
+
 		private final int key;
 		private final String ttsString;
 
@@ -2040,17 +2041,17 @@ public class OsmandSettings {
 			this.key = key;
 			this.ttsString = ttsString;
 		}
-		
+
 		public String toHumanString(Context ctx){
 			return ctx.getString(key);
 		}
-		
+
 		public String toTTSString(){
 			return ttsString;
 		}
-		
+
 	}
-	
+
 	public enum AutoZoomMap {
 		NONE(R.string.auto_zoom_none, 0f, 18),
 		FARTHEST(R.string.auto_zoom_farthest, 1f, 15.5f),
@@ -2064,16 +2065,16 @@ public class OsmandSettings {
 			this.name = name;
 			this.coefficient = coefficient;
 			this.maxZoom = maxZoom;
-			
+
 		}
 	}
-	
+
 	/**
 	 * Class represents specific for driving region
 	 * Signs, leftHandDriving
 	 */
 	public enum DrivingRegion {
-		
+
 		EUROPE_ASIA(R.string.driving_region_europe_asia, MetricsConstants.KILOMETERS_AND_METERS, false, false),
 		US(R.string.driving_region_us, MetricsConstants.MILES_AND_FOOTS, false, true),
 		CANADA(R.string.driving_region_canada, MetricsConstants.KILOMETERS_AND_METERS, false, true),
@@ -2094,5 +2095,5 @@ public class OsmandSettings {
 		}
 
 	}
-	
+
 }
diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
index a8be913348..3d916a5a73 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
@@ -61,7 +61,8 @@ public class InAppHelper {
 		void onGetItems();
 		void onItemPurchased(String sku);
 
-		void showHideProgress(boolean show);
+		void showProgress();
+		void dismissProgress();
 	}
 
 	public static boolean isSubscribedToLiveUpdates() {
@@ -175,8 +176,12 @@ public class InAppHelper {
 				mLiveUpdatesPrice = liveUpdatesDetails.getPrice();
 			}
 
+			if (liveUpdatesPurchase != null && !ctx.getSettings().BILLING_PURCHASE_TOKEN_SENT.get()) {
+				sendToken(liveUpdatesPurchase.getToken());
+			}
+
 			if (callbacks != null) {
-				callbacks.showHideProgress(false);
+				callbacks.dismissProgress();
 				callbacks.onGetItems();
 			}
 			if (stopAfterResult) {
@@ -201,7 +206,7 @@ public class InAppHelper {
 		}
 
 		if (callbacks != null) {
-			callbacks.showHideProgress(true);
+			callbacks.showProgress();
 		}
 
 		new AsyncTask<Void, Void, String>() {
@@ -214,11 +219,11 @@ public class InAppHelper {
 				if (Algorithms.isEmpty(userId)) {
 					try {
 						return sendRequest("http://download.osmand.net/subscription/register?email=" + URLEncoder.encode(email, "UTF-8")
-										+ "&visibleName=" + URLEncoder.encode(userName, "UTF-8") + "&preferredCountry=" + URLEncoder.encode(country, "UTF-8")
+										+ "&visibleName=" + URLEncoder.encode(userName, "UTF-8")
+										+ "&preferredCountry=" + URLEncoder.encode(country, "UTF-8")
 										+ (Algorithms.isEmpty(userId) ? "&status=new" : ""),
 								"POST", "Requesting userId...");
 					} catch (Exception e) {
-						Log.e(TAG, e.getMessage());
 						return null;
 					}
 				} else {
@@ -232,7 +237,7 @@ public class InAppHelper {
 					Log.d(TAG, "Response=" + response);
 					if (response == null) {
 						if (callbacks != null) {
-							callbacks.showHideProgress(false);
+							callbacks.dismissProgress();
 							callbacks.onError("Cannot retrieve userId from server.");
 						}
 						if (stopAfterResult) {
@@ -248,8 +253,9 @@ public class InAppHelper {
 							Log.d(TAG, "UserId=" + userId);
 						} catch (JSONException e) {
 							if (callbacks != null) {
-								callbacks.showHideProgress(false);
-								callbacks.onError("JSON parsing error: " + e.getMessage());
+								callbacks.dismissProgress();
+								callbacks.onError("JSON parsing error: "
+										+ (e.getMessage() == null ? "unknown" : e.getMessage()));
 							}
 							if (stopAfterResult) {
 								stop();
@@ -258,15 +264,19 @@ public class InAppHelper {
 					}
 				}
 
+				if (callbacks != null) {
+					callbacks.dismissProgress();
+				}
 				if (!Algorithms.isEmpty(userId)) {
 					Log.d(TAG, "Launching purchase flow for live updates subscription for userId=" + userId);
 					String payload = userId;
-					mHelper.launchPurchaseFlow(activity,
-							SKU_LIVE_UPDATES, IabHelper.ITEM_TYPE_SUBS,
-							RC_REQUEST, mPurchaseFinishedListener, payload);
+					if (mHelper != null) {
+						mHelper.launchPurchaseFlow(activity,
+								SKU_LIVE_UPDATES, IabHelper.ITEM_TYPE_SUBS,
+								RC_REQUEST, mPurchaseFinishedListener, payload);
+					}
 				} else {
 					if (callbacks != null) {
-						callbacks.showHideProgress(false);
 						callbacks.onError("Empty userId");
 					}
 					if (stopAfterResult) {
@@ -288,8 +298,7 @@ public class InAppHelper {
 			// billing...
 			//super.onActivityResult(requestCode, resultCode, data);
 			return false;
-		}
-		else {
+		} else {
 			Log.d(TAG, "onActivityResult handled by IABUtil.");
 			return true;
 		}
@@ -336,7 +345,7 @@ public class InAppHelper {
 			if (result.isFailure()) {
 				complain("Error purchasing: " + result);
 				if (callbacks != null) {
-					callbacks.showHideProgress(false);
+					callbacks.dismissProgress();
 					callbacks.onError("Error purchasing: " + result);
 				}
 				if (stopAfterResult) {
@@ -347,7 +356,7 @@ public class InAppHelper {
 			if (!verifyDeveloperPayload(purchase)) {
 				complain("Error purchasing. Authenticity verification failed.");
 				if (callbacks != null) {
-					callbacks.showHideProgress(false);
+					callbacks.dismissProgress();
 					callbacks.onError("Error purchasing. Authenticity verification failed.");
 				}
 				if (stopAfterResult) {
@@ -360,21 +369,13 @@ public class InAppHelper {
 
 			if (purchase.getSku().equals(SKU_LIVE_UPDATES)) {
 				// bought live updates
-				String userId = ctx.getSettings().BILLING_USER_ID.get();
-				try {
-					sendRequest("http://download.osmand.net/subscription/purchased?userid=" + URLEncoder.encode(userId, "UTF-8")
-									+ "&sku=" + URLEncoder.encode(SKU_LIVE_UPDATES, "UTF-8")
-									+ "&purchaseToken=" + URLEncoder.encode(purchase.getToken(), "UTF-8"),
-							"POST", "Sending purchase info...");
-				} catch (Exception e) {
-					Log.e(TAG, e.getMessage());
-				}
+				sendToken(purchase.getToken());
 
 				Log.d(TAG, "Live updates subscription purchased.");
 				showToast("Thank you for subscribing to live updates!");
 				mSubscribedToLiveUpdates = true;
 				if (callbacks != null) {
-					callbacks.showHideProgress(false);
+					callbacks.dismissProgress();
 					callbacks.onItemPurchased(SKU_LIVE_UPDATES);
 				}
 				if (stopAfterResult) {
@@ -393,12 +394,32 @@ public class InAppHelper {
 		}
 	}
 
-	void complain(String message) {
+	private void sendToken(String token) {
+		String userId = ctx.getSettings().BILLING_USER_ID.get();
+		String email = ctx.getSettings().BILLING_USER_EMAIL.get();
+		try {
+			sendRequestAsync("http://download.osmand.net/subscription/purchased?userid=" + URLEncoder.encode(userId, "UTF-8")
+							+ "&sku=" + URLEncoder.encode(SKU_LIVE_UPDATES, "UTF-8")
+							+ "&purchaseToken=" + URLEncoder.encode(token, "UTF-8")
+							+ "&email=" + URLEncoder.encode(email, "UTF-8"),
+					"POST", "Sending purchase info...", new OnRequestResultListener() {
+						@Override
+						public void onResult(String result) {
+							if (result != null && result.trim().toLowerCase().equals("ok")) {
+								ctx.getSettings().BILLING_PURCHASE_TOKEN_SENT.set(true);
+							}
+						}
+					});
+		} catch (Exception e) {
+		}
+	}
+
+	private void complain(String message) {
 		Log.e(TAG, "**** InAppHelper Error: " + message);
 		showToast("Error: " + message);
 	}
 
-	void showToast(final String message) {
+	private void showToast(final String message) {
 		ctx.showToastMessage(message);
 	}
 
@@ -438,7 +459,6 @@ public class InAppHelper {
 						in.close();
 						i.close();
 					} catch (Exception e) {
-						Log.d(TAG, e.getMessage());
 					}
 				}
 				return responseBody.toString();
@@ -461,4 +481,31 @@ public class InAppHelper {
 
 		return null;
 	}
+
+	private void sendRequestAsync(final String url, final String requestMethod, final String userOperation, final OnRequestResultListener listener) {
+
+		new AsyncTask<Void, Void, String>() {
+
+			@Override
+			protected String doInBackground(Void... params) {
+				try {
+					return sendRequest(url, requestMethod, userOperation);
+				} catch (Exception e) {
+					return null;
+				}
+			}
+
+			@Override
+			protected void onPostExecute(String response) {
+				if (listener != null) {
+					listener.onResult(response);
+				}
+			}
+
+		}.execute((Void) null);
+	}
+
+	private interface OnRequestResultListener {
+		void onResult(String result);
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
index 4276fda139..aa05014a73 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
@@ -143,10 +143,6 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 		selectCountryEdit.setCompoundDrawablesWithIntrinsicBounds(
 				null, null, getContentIcon(R.drawable.ic_action_arrow_drop_down), null);
 
-		dlg = new ProgressDialog(getActivity());
-		dlg.setTitle("");
-		dlg.setMessage(getString(R.string.wait_current_task_finished));
-
 		return view;
 	}
 
@@ -186,11 +182,21 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 	}
 
 	@Override
-	public void showHideProgress(boolean show) {
-		if (show) {
-			dlg.show();
-		} else {
-			dlg.hide();
+	public void showProgress() {
+		if (dlg != null) {
+			dlg.dismiss();
+		}
+		dlg = new ProgressDialog(getActivity());
+		dlg.setTitle("");
+		dlg.setMessage(getString(R.string.wait_current_task_finished));
+		dlg.show();
+	}
+
+	@Override
+	public void dismissProgress() {
+		if (dlg != null) {
+			dlg.dismiss();
+			dlg = null;
 		}
 	}
 

From 15a4f22d640ad47aac304ebaaecc37ac82f47db3 Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Mon, 25 Jan 2016 23:34:28 +0100
Subject: [PATCH 34/72] Translated using Weblate (Spanish (Argentina))

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

diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 1239e835bd..b3a5c11327 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2057,4 +2057,23 @@
     <string name="shared_string_remove">Quitar</string>
     <string name="data_is_not_available">Datos no disponibles</string>
     <string name="rendering_attr_hideUnderground_name">Ocultar objetos subterráneos</string>
+    <string name="shared_string_read_more">Leer más</string>
+    <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Maps &amp; Navigation (mapas y navegación de OsmAnd), crea rutas y encuentra ubicaciones en el mapa sin conectar con Internet. Descarga el mapa de un país antes de viajar para encontrar lugares y rutas en áreas desconocidas.\n\nOpciones básicas:\n• Mapas detallados en 200 países\n• Navegación sin conexión con avisos de voz\n• Búsqueda de direcciones en modo sin conexión\n• Información sobre ubicaciones en el mapa: lugares de interés, cafés, estacionamientos, tiendas\n• Añada sus ubicaciones a los favoritos\n• Navegación en automóvil, bicicleta y caminando\n\nOpciones adicionales:\n• Capacidad para ver y grabar trazas GPX\n• Descripción de Wikipedia en PDI
+\n• Añada notas de fotos, audios y videos en el mapa
+\n• Modo de mapa Día y Noche para una conducción más cómoda\n• Información sobre rutas y paradas de transporte público 
+\n• Rutas de ciclovías y senderos
+\n• Rutas de senderos para el turismo en todo el mundo\n• Mapas en línea de numerosas fuentes
+\n• Información sobre la calidad del pavimento y el alumbrado público
+\n• Añada, edite y quite PDI (para usuarios de OpenStreetMap.org)
+\n• OsMo - monitorice en vivo otros dispositivos.
+\n• Obtén un navegador confiable en su país - ya sea Francia, Alemania, México, Reino Unido, España, los Países Bajos, EUA, Rusia, Brasil o cualquier otro estado.
+\n\nComplementos:
+\n• Mapas de curvas de nivel y sombreado del terreno: https://goo.gl/7mojP8 Datos de curvas de nivel y visualización del terreno se agrega al mapa básico de OsmAnd.
+\n• Mapa invernal: https://goo.gl/pX6DxJ Información sobre pistas de esquí, pistas de esquí de fondo, teleféricos y telesillas.
+\n• Mapa náutico: https://goo.gl/0hEdxm Estilo especial del mapa para la visualización de señales de navegación náutica y costera.
+\n• Estacionamiento: https://goo.gl/6JxQXF Ayuda a marcar la ubicación de su vehículo estacionado y ver cuánto tiempo falta si el estacionamiento es limitado.
+\n\n¡Manténgase al tanto!\nTwitter: https://twitter.com/osmandapp
+\nFacebook: https://www.facebook.com/osmandapp
+\nSitio web: http://osmand.net
+\nSi necesita ayuda con la aplicación OsmAnd, contacte con nuestro equipo de soporte: support@osmand.net. "</string>
     </resources>

From ca84657f539939582f13e61f69fa3cff97400f1e Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Tue, 26 Jan 2016 00:17:10 +0100
Subject: [PATCH 35/72] Translated using Weblate (Spanish (Argentina))

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

diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index 1ff123b054..bb43457304 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -2671,4 +2671,7 @@
 	<string name="poi_nuclear_explosion_yield">Rendimiento de la explosión</string>
 	<string name="poi_nuclear_explosion_salvo_first_detonation">Explosión de salva: Primera detonación de prueba</string>
 	<string name="poi_nuclear_explosion_salvo_second_or_later_detonation">Explosión de salva: Segunda o posterior detonación de prueba</string>
-	</resources>
+	<string name="poi_addr_housename">Nombre de casa</string>
+	<string name="poi_religion">Artículos religiosos</string>
+
+</resources>

From a5a21d49f65eaf3ba7ad842ab6d75637701b4f08 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Mon, 25 Jan 2016 19:55:00 +0100
Subject: [PATCH 36/72] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index cdd8927552..5d4a5ad2bc 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -2701,4 +2701,6 @@
 
 <string name="poi_addr_housename">Huset navn</string>
 
+<string name="poi_religion">Religiøse varer</string>
+
 </resources>

From 6177d9c363369533a8b6fe40272d0dcfb8da8063 Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Tue, 26 Jan 2016 12:29:13 +0200
Subject: [PATCH 37/72] Add new icon for Waypoint and Startpoint for Waypoints
 menu.

---
 .../res/drawable-hdpi/ic_action_startpoint.png   | Bin 0 -> 1068 bytes
 OsmAnd/res/drawable-hdpi/ic_action_waypoint.png  | Bin 0 -> 1154 bytes
 .../res/drawable-mdpi/ic_action_startpoint.png   | Bin 0 -> 1043 bytes
 OsmAnd/res/drawable-mdpi/ic_action_waypoint.png  | Bin 0 -> 1091 bytes
 .../res/drawable-xhdpi/ic_action_startpoint.png  | Bin 0 -> 1081 bytes
 OsmAnd/res/drawable-xhdpi/ic_action_waypoint.png | Bin 0 -> 1227 bytes
 .../res/drawable-xxhdpi/ic_action_startpoint.png | Bin 0 -> 1131 bytes
 .../res/drawable-xxhdpi/ic_action_waypoint.png   | Bin 0 -> 1403 bytes
 8 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_startpoint.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_waypoint.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_startpoint.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_waypoint.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_startpoint.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_waypoint.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_startpoint.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_waypoint.png

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_startpoint.png b/OsmAnd/res/drawable-hdpi/ic_action_startpoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..c277930be8ff36775d5ff1e82189feb5b458ee9e
GIT binary patch
literal 1068
zcmbVL&1=*^6pyr&Qt2O{hccuJ3eCslW3vfO>o(cim2NHD#qLFLHks{)Hkp`AyV(^l
z-U_`cJ=Tjy|A7jMc&JeDA|AYX6a+8gMNuc)-RhzA;6O6-X5R0;-}~BKUAZ|qae0E{
zxXH?rTVwl`{2L!*|4-chKHDzQa)Yjs7VV$}b0wcNF{p%S1J^L}yZ7JXS&kdo3F-~n
zs4iO`2}P9ah*=mjG{?=(XEE|NF$GP$5kxls_3$MR0^jD>^{QNr9o!C<dI?_Zt<=5V
zrf2&6{2Z9gEM_3Y6oD+<ic%}H`MzC?o%3sn2YnT~Y4azf8r4<ckOTu=EC?Qi5E!Ni
z^`ffiGeD7{F3F|@WkH4(lr2RDgT*s%iQlqn?&81~lWe|CX>3VSr_&KTsz{Oz37V!U
z$%>>X0@D!EZbVTgMCtU<f{Rlx31S+M2;>$~lWbF)XG~8*2;*w?)Nqsz62(#`Whj=Q
zC`)0O$JN(PX$}9Sai(@!@5WfF;goDA9;-)ddI)B@JKs^R$k<r7lYkWkZMnqT4sk>)
zuFbO-(GPs91+fZ|js&dhhR}kVDww$G3%H>9a?z7@tms2KXW<oBbJb#L!O@@rVVPCJ
za9q_Xlnk|8U@t>#B}yrZJUsLrFy8}g>0GSkBp6YW)Ct)dcEM_!P?EMu3>>Flb#QGx
zh<wsXujgetiQ2_Uu!H@@goL1<XDc{^gRII0Su<LKk4#O_O|2jx)ldYCnhJy-)C>>v
z1HAvg`I8taDQ}j4nrC>$Ix;_=jsg=-hY3e)f)X|=;nC*<HfGBew^YwQe)&+E;K2Ck
ztG!>p@sCn>mv6nB8oTr6==giB_h9D6;oj@x-K!TLUl^>1-{6xuyD#2-@&2iDP=3aZ
Xa8tKNt3qM_XFk7`@{0R>;ohS^W#LU}

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_waypoint.png b/OsmAnd/res/drawable-hdpi/ic_action_waypoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..517713557e45a13ea1ed9c8afd9226c5dc248244
GIT binary patch
literal 1154
zcmbVMO=uKX93NdtBqTPr^^jm-I;mp8*_k&VyP0X$Z8Ec)tYnjPv&0<pcIIs|Br|WE
zdC6{q2kExjLQyCRId~BDkdtV85u}t*D3o66QR&6Cg&;`k!Hf9yX0sc62sw0M=KbG$
zzu*7+Ki^G`k92kPb}$Unl^Zn+bp14X54O?oV`goQE<GeOL#A+<RA7LZAsd$vn{(kD
zDj;aDoc$dQGE8jQDbA3Y{FrWGHx46Ayz2Ut%`k)Mst>INMA#CVbG#I{b^jNRb?g*(
zM$L<P-$3)u=xTtbR>zCh>Vl=&T>2C{Sk<Wl7ZJ!--9<0dt0}IbSEq7xEO2ZCLKafo
zwo^0tN!GvtV%2zpw*UZaQi}t1K$g^#tRw<e5H$gaya;q4>XOJdAC6iJ?6O`kvrSuc
zm*VCL@pVC{R4Va`9LK?&05nY#L`je&o+9{g#UrrFdtrY|gNZ^baD3umkBv0K5?&%H
zj(WNsg6rq=JBq!qnJAhvp$dHg#6`h%qqrLAkQC5+H+Dsb#T6e31r*|?z@qgi_qWJ2
zcY7O(fYcj(B5-I?;G&7GB^P-lXQnuM6So~(F9Re4s6rm8YLYJlMdmeBvU!wHY;nL6
zRV1k`J-hKGQ!(X%p{${RBmfy&iKJo5Mq(%_XA<<L#m#vkfu4n0wjFA_$<6G^)r|l_
zf`cN)i>)r0oW}%*^Vnw%qfvGC#2Lr4aV7jLD${n<CJLNoWM>2HvW-0J&MrQPvX~H+
zWSO_2rtqq!BzPz%B_6?&1b_vUq=mR9-~PY(6R1-{)GYsLp4JiV$Vl871-jW8Cgjlx
z3h1bO?)99fV|F8F4i&49O0V9&P5(N(f2_0C`Mv&a@1d6y=-jzG-%O@Y<+5DRqyF@`
zpPg>2r)$T)KK>-^{Mp$2sQZuD^NSllTqqw7I#b5x2g<X--jo0Qsh5r#6YVc9Pxl@8
z;*+}_Ba1i6`|5vfd^}wHarW<6{Ypa$uEy%uH>M9A`SA4XTg-0{5--+k**@jz^)K5W
n^mI=Z<V)Fy>$QKG^GuA{S}^K2uibkS{S|VVar5@@>{ssqqVaV6

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_startpoint.png b/OsmAnd/res/drawable-mdpi/ic_action_startpoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..04303dc0ad221e153585240a5836287e01af1a20
GIT binary patch
literal 1043
zcmbVL%WKp?9FCTXRC^MNiiaV+D41j>$!wa?*vF=i1$Qmm1y{W|o6L4&n@mim-LxkW
z6qH{48+xgT#k&XV(W4g+q9FJOc<n)`lkINxP<k+s%p>3Tdw(yMY73(yS4SjC8m%mP
zb+KM9-t*_g_ea+~5X%)l*W}Br&ATL}(oDcw6jUOzLhF<Sn~y)yNl6;o2pdh_tloBf
z7OAAbsCkqKwj@nX<q7duDF-dO62`9l>-`5Agn=vH#Z_2M%Cr+MZl!d2tJd(hR((5=
zr*47C+z|#M$_dD$wK#KfSMJ$$#J;%JWYB}~RaZU=s##qEWtLKa)so^Pgn(tM2u~O~
zz6o@Qum)`nK?NcQK}Uz6|H#5y8nm6dH{bUqPOjYHJaIIw+wH1dLuKiThHTr`pswk<
zA`nWp8FP{=aW+1%;L*%a!-R({28Bh^V(Z+MMWjb5L`k)JY&g#Pg%Tyxa*}9Bg<2F9
zdG*j4uhYL_oQTdEn+etGG-K<jFZ$6QACN`uPIpuQMKsQxG!#uCYaa90BO3FH=gQ)b
z8iaw<M$|wA6NO@IDQ#pLicMRALQ7@<Cwz#hjt6#5;v3jNCEK1Yo5(_F4$oo>c{;XA
z^T<PnT^?{NamGpP(}C|$`0jIOPUSk~loHO;24ic3DOl<-&aw_mK)KxOI=Fr}j04uq
zZWL`g%G#r8xIu&YltrLdXD2)%257(%G_AH05ZhF+ZI%>bSh_+<OGn5@rsY$)&kz2$
zewqkMD~9Et;Tc?si7d9qQV@q@G0|8kC>2t<bg+FWWM)*nnMVG#_51K}YDhWrbNb%&
z-rMb+vF-ct(Z}6k^WBqIU!Hy69o`wc*t+n%_U0_umtO8a`220*^|eB#mARU?H~aAE
E9}F=^ga7~l

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_waypoint.png b/OsmAnd/res/drawable-mdpi/ic_action_waypoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..30389a6d36bbcf2dcbd09d8a7780078c78af6c5d
GIT binary patch
literal 1091
zcmbVLO=#0l98VeQnDnHF=|N%!qF_E=(lkq0H@2pA1zSf~Tu~8Ulh-wF$&1O`+6{#{
z*ulf}Fc9?O&3PIK#ft|oA`H~aZo6zC9z2O2R79LFT{}ID9SkJzBfsDO`*&}wa3S7v
zvWH=qcy81z(zQ2wyARXvc0KijE+<H)OvZ7Q)M0>_VH;Nvn{(kLDk5ml-C9Qj4AV91
zl**)>zi3$46<~xB8m>>-3^Op)@S!z@2wOpuj+f#-zkJ29j-BEr)V!4U)2QZ*&If3G
zzEHB}r!3v(h6dSzhCvOuh(NaCPJ5xzNO3K@2Hi*3BFDBMWGcn&235|Fv1uG2Ruz)G
z1pr_*T>xsoBCF?FSpupk=^~JL2^c^!WQlD*9Q791RikKT+rH>2#nlM$4N<Ju>q1=-
za4;zXUDriP7G;^I2tJ(i2yF0P*w?XOqR<K)pE%fKBa5(tXGn^pk?yA8`uY5xVJ~bK
zik3`lKwkucB)V>tR|_4IBKjM~zUZ(t=OeL*LOc^#v>(;J4w=^OU`G*<Mq^wG9NH8(
zZDMQ2MIOnSDUSXTY{xdL04V^fkVmSj@l}vecpX)29wigD)Ne^DlGTo#{rHNifTXTx
z(+QvfkWoie4Vbd3C9}W;ik|Lpb6!ZGXQ7U7hx%@FGY4{wbbuhiK?&pO&J>K*Fu`FB
z`)oSh>N<ON!trce56?wy+RfTTfisKjY=B+1RcFK5Ck9E8l2Sse@;1~Hys9UXJXAE9
zN3bFTV1a~YA+F80|F?c34N8oL<)7i{T+xY)wtG^bhdnVNk18mjQpsGuy+vha<;>wy
zW3%#WXJ@F3j~(k;jtNJ9uiX8<v3X><+1zH1Z@gX1UdetPzP7gd@KC&2c)H`bv3Ga2
znb+T%@7Lqa7tE^o?9s~epNmTiXWpE?`uP48>1OQ9!qVkWPrN~<TVj%@dOtq+u+@xY
Noy!!=wUHZ(e*ll0U$_7O

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_startpoint.png b/OsmAnd/res/drawable-xhdpi/ic_action_startpoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8a4c79de53162528fa01c14c4404d06fb8ccb7c
GIT binary patch
literal 1081
zcmbVLPiWIn7>_z+PKKgh^z_UaD40JlO`0aO&MxU(!OqbYR!{CVd0oSryexTLvz<f`
z5xjX4ZyrSko;)aQCqdXj5fr?Of&&kpy!p~KbBD2mfxJK8`+nc|`~E$epSw9ec4>^`
zxbf<&U1z(T{-Y<^x_JE0L$+O{l_p&vZQ4f>=E^Q<VNmtaGOlCfuCKnwMUFeM<~5qM
zS-WLA#1~PjBPM>x&>UBsN<!qUU<z7z*$YbiuQyvf@Z1u=sMX|JXyJ}GyAk1qjk$)i
zvEmpmKXn}x6O$S6F-0KpyFqLwC4OMnWam^Y@nE1rS4#XIsb*~+SR}$g6Z3)tAq2W1
zLamTfv}-_-p(e?O1Z6>nCX`J@2E&hM-Xgbc*6o?0FLo>O9ZEw}lKTC=*w2Y1T9%+;
z7?P|=iXt!#AzlwCN`xSu$Sl}6b|NpN9tl8d5w%E<mUzZ=F9biV)%Fbs@i0*=Wm1Ad
z35v4h`)OPQ?U>f_KN^Q>$Bp$6OLZKRUgWTPv?nq!%iYnAQboqbyd8P0D5z@_r|08<
zR_zkcUPRY(%{Ih2h%_W%P1A)oRC9uXTdsifsw)>9S;LB!**OfaXtruVXjm%LA*^U+
zy_~a^N=2E`wP~wR$gtHQrYLZ5=G$YwhuFfASksCyq9ke%(#^VHzC$R9J0t{_HK;nc
zvgida>Bm>oGVMie<H%dX?o32{Fvzp%9l}A*$$44T+k%S>RnQDIFQA;R2pF{#2py>E
z4(5k=_kZ&zF;Y_6EC-q=6S0m=kNcy*F8jlT12#bs8<lTgeonG6yHmBxjpXa@=U3w#
z7#+C*cej+yrS66JuC;pX-18SR-*-M1xz|sg_4G57FV7A}^T4v*zgOHneLj=?_`UPs
d6vw@NI=Rg~{xpK$tzQ0+zEvx8_U81`{l7dPOe_EZ

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_waypoint.png b/OsmAnd/res/drawable-xhdpi/ic_action_waypoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..11635e77747a98da1fecd681fa228e086cccdcfc
GIT binary patch
literal 1227
zcmbVMZ-^9S7@xb#l%q4hNSc?ujwMOXpLb?wXJ@!c_jdMlwLOo$rCaFGW@p~ro$lt(
z&AjXG-KRy0inuT$O9-hCDo9A+Dfq84A~YlFLq`aH2`s^rG!QwF?47;cs}F}C8kqNe
z-glng^ZcHF^Ul!V_MYyiyD5t5$?VW`Wap!I#p7fh>70LyY-@44fQP*jt{DNMl9pFQ
zAmbQiltYF!IdK{FQB>DHJ72(s?8~a@Ijj-suyw~LXo~9FTK5fe3}H}2W!u&0KhJ$d
z1KZN*5h=@O{S>O$JEj6OJT;g%r^ZahqPM;T`syk%;2>;(x-;&EYF(q7c2y!r*BlL+
zDtJtz7f2PdLm=e^2uN(4F(HINR#+${L_yjD1RhEpuW*oOc&I{N6?o8kXyPrfN@`9Y
zX!#;1jjmwqs~lIW)!3TIdO?|kilT75zzG6FG?;MG#YUZR!;NhVIttCe_Ob1`AhKu_
zy(-pd!gL`7$IoUL4ZC40Q6yzt-S9cc@|@#DaW%C=oJ0T8SW-L8Px^?<q0p-aCaFhh
zV;f9z_h?6vB4MNM4s22sV_f&ls)Jmd(KVWUVJ+KIOAv|BkPHS%lFXD~Ok@;Pv=|hR
zS$x9eB_v2~J4@jONslQI>Zur%Axuk2IVtKwIxP&yQhzFuXk#;Ohz-|7ZQnNW-NL3G
ziB(epGO!oqJ#W0-1w$1Ndtt@%K`Pa(I(T8kb}g?KZjQ>d5Vej1dmpj}0?z@>JgfE+
z9C(qB^D()^ScVc~BqbJS3{e&sWE2GmO&F6+M7QwP|IHsqNO4iK{HJ-^SEM5&ad8yL
zVR4v{OC~5FqY_`1J5I*zW=2ou>sRM~)mC;S*L-*9&~(MF?woi^UiHkW18<9~dK>Sp
zn_D}2arMmWZ{8UcE+oHs@WCJ1!|usLdw;)q?e2!hwx9U^;x4KiJlI^m|HS8)8t)$2
z)OGsc^40#S-pj{+`Y|}x=^oVP*C(FSUzz`5&yA6u;nDcDndJvWf2w@@NXKvQpV@G)
zzk2rk7Y*scx*q)X{*`MA_pNQcS3dbW9iPFM8b{H<!%gd7y=rZ{B7FAn!;g<%e`DFV
z(|vT;sG56G`1B)I-U4R-`lW07$-Q&C&VKpx^9`zV1&Eg0>Fe=uk4R)RJKX4?W+$}9
Tvy^=+`n_b*gZhd7*Y^JdPXn0n

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_startpoint.png b/OsmAnd/res/drawable-xxhdpi/ic_action_startpoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e379955d664628b4f6c00f76fc7421593faa28d
GIT binary patch
literal 1131
zcmbVLO=#3W6i(|>+G?SC5yiuhf+(6~CcD`*q1(Dm+U|;5%etjKsk6y!8{1@JGVN}A
zD&9o#CV24RRS$xA6s*vbASfRE13^4nJzFnM_NR)J9t`BoyqWKN@6G$UIWs*q(0{yN
z5QKqZ!7lT)ko>(pT+VJko#M+eHZjjG(Hg7chzNO?RtYHjc!87&cGs@IBqM@wVAZS4
zv-#2m)1khM6O7#OL(Ue2k+DXIoh8CRl`MEcPW<s~Qv{xy6X&!NEQJ<X^a|?{xwJlA
zan_d{!xhIy!AQg827JOWX!y%PY&LRY)2_+)$+04WCWI~J#8y!Ar5Rw+hyYE_N)AE@
z=!T56;k2rq1u8_E0u2R02_h3gQ-z@YiQHS{*37a!+4jY?oVdtXXevs*UYF}>nMMl=
zG7Lk3s-mhAM@aEnz;Htf;-QWOo5W7!h0LP?NG#$iU12$qN7{OVAC^kHhJ(1BD4sH<
zfkOq!Q1SibT}^b%%H&TNd!pmYT1b>KiRnt@@OspSI%J-^{T(Gh9*uc1@_143vQ3>8
zp9HLE=R|%ZyPj*-5J@AfVTov(F4a&bEg7WhN+g?c;jjZWqG}yGd-0L3YZ=|rtqjr;
zn$V0qwDZVLj~n?kwCrq$TMS}`1BY~cd)#-Mo86adS`opFMiokzJ6$ldNEwY6X$UN<
zS#@w~&I?>xk54CMYQ5Sfk+(|R$%y)(nP=16BL<j;S(wpll8cRuq#2p4gwwhz5nNRf
za!^Khh}h=4|C>LB2c;y<@>lb8j(A5V+uc#%%I+|cfKO1wN9ED^pAY$%-74DoO5@YF
z4^R38a7f4xecz1kzZka*U!K4JS{S_j>V&Bu7P?ctGoRmWeZ2Gf$~|zVr*{yX+ekH~
z(AAwPY$P&KTav3sI6&yS_GTws;DnQj@-O1Sugjy`TdBUpmM|L}gaX}3-97qNwvzEL
MPE6a6$FJV_4bP@ncK`qY

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_waypoint.png b/OsmAnd/res/drawable-xxhdpi/ic_action_waypoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..249b5aa13d01e2b8a3b0989fbf84266d012b1513
GIT binary patch
literal 1403
zcmbVMZA=?=7{6s3610q{LAEeFZ)RbE>)o}zmb+2N(K6^p0lPA~m_@I5|I!nBce}gN
zg3e^HNzm!$0>11e)P+np(P4-t%Q6w;GGu57@MX*52g#N>FiY@*>4?sM3q?PWeejZd
z{xA3Zo|oVAJlES;Ut`MIl7k?K$y4k0!L>H^W@ka!^!rE+Ts9lk0b{QcGGe?25KdHr
z0QE%p7T^QC*m3YjP>vw$+a-U%2zcvQL5Z08l#V$bQ6U;Z$}8h4FSG&!4T2U)c47~%
zjAE!HI<aQjOL|oo2urn{8ra)e?-x2-1xCawE70;d3k^ho!K3j=o2;{OCziI$!hPzR
zz|gdc(dxvOg9>;XQJ10tls4OOfubnX!I&w!%xa-aQ42}Y1j!H-iIWsdk*tM8R~`&{
z)5H+#bMIR51y4>aY#1s_5V2Uy9J87gt%aZ%h9O7`VX@#)1J^rbgOB5~zAa<H4Rk@1
zR6|l^G-Z(wDpA9U!AO@=h^Sugs$p4QAqrAP#CesV%p?(sr1DB@>xK{f8^)U2y1zpO
zgb(OSR1;u5LfbN6$lc=|r4(T_Y=b7jqVR2QMTka#Y<S#G41O_-lE{WAV5NAP#{o?{
z@DOFQ;tU9iII!D9vP>XpV4*X1*1}T`2W@k>s$4e8K~dE-!;x-|a$Bny&Pux6_6*h|
z>jp0iAmdwtzE`l^W3jAD1H7SVenn}^bU|ZSF%&(lsHn@8t~y%WEXkr0(|4rGw4AjY
zXi_^6cWFulP4mo3Ys5fWNjqtCgm95(Y&gx>>^N_ASa84xEfghCHirPP6}<R=`6FOZ
zM5<Z-(>$3g*paF2>L|d&>M#KrPLKviMdC^Uf~-63adZCot%Xy>o(){#TP=6G#)8)5
zrbmalyzb}6+P*0;ZRf@s)S?gTLL;wyCw~<lF36o7%s!V;bAEkjZas5)cxTD$qlb#(
zbGbM42S5KbDW5!lp?mCD0^zc&^19k`cK4J%XDhC|GG6WJjZTqxLhkFw{=D6n6@B~f
zgf~2O)pF?#>l4Y}^806wWI0P_b`L~P49r=yA;-M~ANzj^c$SzQCD*m?Z~HdidH?E1
z12YBMko{iGet+k}-M`LUJ1Kn4eLfN0`rgj_;~jNO{>H7>il(NwwO<&zUNr0LzSZ>9
zYo5kU9G`o!V0OB&?`*QPIA$Af*mLt!j<4vy8CW9UnNPd~j%OWBs!3}8Nz<bB{K9mC
zyfo2w<M;vTM9)FclXbM?;Zn`~3|jfjgx!?$M`H5w)5^XtM$0C*-^aH+dw1Xd_9S0n
zS{xp1gUIHIQ*-Mt9u^hW9{=I{!u-phHI2Rd;s-;EXKh`1N6-x~WT%)x(=vUr4$8!%
obCaJOs_I^5EzjTb=Eee~cW~hLNdB>xQ@=w`b-nw`s#m-I0qjogKmY&$

literal 0
HcmV?d00001


From c5e091aa17ab7de593390b13ce2dc74bc0701632 Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Tue, 26 Jan 2016 03:51:12 +0100
Subject: [PATCH 38/72] Translated using Weblate (Chinese (Taiwan))

Currently translated at 99.9% (1890 of 1891 strings)
---
 OsmAnd/res/values-zh-rTW/strings.xml | 36 ++++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index cb8709b8a9..87cc182fde 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -48,9 +48,9 @@
     <string name="snap_to_road_descr">導航過程中對齊道路位置</string>
     <string name="snap_to_road">對齊道路</string>
     <string name="osmand_short_description_80_chars">將離線與線上的 OSM 地圖，用在全球行動地圖檢視和導航</string>
-    <string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd 是開放程式碼的導航應用程式，存取各式各樣的全球性 OpenStreetMap (簡稱 OSM 開放街道地圖) 資料。所有圖資(向量圖或地圖圖磚)可存放於手機的記憶卡上，可作離線與線上圖資導航，包含轉向建議(turn by turn)語音導航。 主要功能： - 完整的離線功能(存放下載的向量圖或地圖圖磚於裝置存儲器) - 提供細致的全球離線向量圖資 - 直接從應用程式下載各國或區域圖資 - 可疊加不同的多種地圖層於自訂的透明度，如 GPX 或導航軌跡、興趣點、我的最愛、公共運輸站 - 離線查尋地址、場所(POI) - 短距離的離線使用路線(實驗性) - 汽車、自行車、步行模式有下列選項： - 可選的自動日夜模式切換 - 可選的依據速度自動地圖比例尺縮放 - 可選的地圖正北朝上或行進方向朝上 - 可選的車道引導、速限顯示、使用真人語音或 TTS 語音 OsmAnd 免費版限制: - 地圖下載數量 - 無法使用離線維基百科的 POI OsmAnd 正在積極開發我們的專案，並且它的更進一步發展依賴於提供資金的捐助，用以資助發展和新功能的駕駛測試。請考慮購買 OsmAnd +，或資助特定的新功能或在 osmand.net 網站上一般捐贈。 "</string>
+    <string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd 是開放程式碼的導航應用程式，存取各式各樣的全球性 OpenStreetMap (簡稱 OSM 開放街道地圖) 資料。所有圖資(向量圖或地圖圖磚)可存放於手機的記憶卡上，可作離線與線上圖資導航，包含轉向建議(turn by turn)語音導航。 主要功能： - 完整的離線功能(存放下載的向量圖或地圖圖磚於裝置存儲器) - 提供細致的全球離線向量圖資 - 直接從應用程式下載各國或區域圖資 - 可疊加不同的多種地圖層於自訂的透明度，如 GPX 或導航軌跡、興趣點、我的收藏、公共運輸站 - 離線查尋地址、場所(POI) - 短距離的離線使用路線(實驗性) - 汽車、自行車、步行模式有下列選項： - 可選的自動日夜模式切換 - 可選的依據速度自動地圖比例尺縮放 - 可選的地圖正北朝上或行進方向朝上 - 可選的車道引導、速限顯示、使用真人語音或 TTS 語音 OsmAnd 免費版限制: - 地圖下載數量 - 無法使用離線維基百科的 POI OsmAnd 正在積極開發我們的專案，並且它的更進一步發展依賴於提供資金的捐助，用以資助發展和新功能的駕駛測試。請考慮購買 OsmAnd +，或資助特定的新功能或在 osmand.net 網站上一般捐贈。 "</string>
     <string name="osmand_plus_short_description_80_chars">將離線與線上的 OSM 地圖，用在全球行動地圖檢視和導航</string>
-    <string name="osmand_plus_long_description_1000_chars">" OsmAnd+ OsmAnd (OSM Automated Navigation Directions) OsmAnd 是開放源碼導航應用程式，可以使用各式各樣的全球性 OpenStreetMap (簡稱 OSM 開放街道地圖) 資料。所有圖資(向量圖或地圖圖磚)可存放於裝置的記憶卡上，可作離線與線上圖資導航，包含轉向建議(turn by turn)語音導航。 主要功能： - 完整離線功能 (存放下載的向量圖或地圖圖磚於裝置存儲器) - 全球離線向量圖資 - 直接由手機下載各國或區域圖資 - 可疊加不同的多種地圖層於自訂的透明度，如 GPX 或導航軌跡、興趣點、我的最愛、等高線、大眾運輸停靠站 - 離線查尋地址、場所(POI) - 離線尋找導航路線 - 汽車、自行車、步行模式有下列選項： - 自動日/夜模式切換選項 - 取決於速度的地圖縮放選項 - 地圖正北朝上或行進方向朝上選項 - 車道引導、速限顯示、使用真人語音或 TTS 語音選項 "</string>
+    <string name="osmand_plus_long_description_1000_chars">" OsmAnd+ OsmAnd (OSM Automated Navigation Directions) OsmAnd 是開放源碼導航應用程式，可以使用各式各樣的全球性 OpenStreetMap (簡稱 OSM 開放街道地圖) 資料。所有圖資(向量圖或地圖圖磚)可存放於裝置的記憶卡上，可作離線與線上圖資導航，包含轉向建議(turn by turn)語音導航。 主要功能： - 完整離線功能 (存放下載的向量圖或地圖圖磚於裝置存儲器) - 全球離線向量圖資 - 直接由手機下載各國或區域圖資 - 可疊加不同的多種地圖層於自訂的透明度，如 GPX 或導航軌跡、興趣點、我的收藏、等高線、大眾運輸停靠站 - 離線查尋地址、場所(POI) - 離線尋找導航路線 - 汽車、自行車、步行模式有下列選項： - 自動日/夜模式切換選項 - 取決於速度的地圖縮放選項 - 地圖正北朝上或行進方向朝上選項 - 車道引導、速限顯示、使用真人語音或 TTS 語音選項 "</string>
 
 
     <string name="filterpoi_activity">建立興趣點篩選</string>
@@ -165,7 +165,7 @@
     <string name="address_search_desc">地址查尋</string>
     <string name="navpoint_search_desc">座標查尋</string>
     <string name="transport_search_desc">公共交通查尋</string>
-    <string name="favourites_search_desc">我的最愛查尋</string>
+    <string name="favourites_search_desc">我的收藏查尋</string>
 
     <string name="offline_navigation_not_available">OsmAnd 離線導航，暫時不能使用。</string>
     <string name="left_side_navigation">左駕</string>
@@ -316,7 +316,7 @@
     <string name="index_name_tts_voice">提示語音 (TTS-合成語音，優先)</string>
     <string name="amenity_type_osmwiki">維基百科 (離線)</string>
     <string name="amenity_type_user_defined">使用者定義</string>
-    <string name="fav_export_confirmation">我的最愛已有上次匯出的檔，要取代它嗎？</string>
+    <string name="fav_export_confirmation">我的收藏已有上次匯出的檔，要取代它嗎？</string>
     <string name="profile_settings">配置個別設定</string>
     <string name="settings_preset">預置設定檔</string>
     <string name="settings_preset_descr">檢視地圖和導航設定，記住每個使用設定檔。在這裡設定您的預置設定檔。</string>
@@ -375,7 +375,7 @@
     <string name="search_position_current_location_search">位置查尋中…</string>
     <string name="search_position_current_location_found">我的位置 (找到)</string>
     <string name="search_position_address">地址…</string>
-    <string name="search_position_favorites">我的最愛…</string>
+    <string name="search_position_favorites">我的收藏…</string>
     <string name="search_position_undefined">未定義</string>
 
     
@@ -602,9 +602,9 @@
     <string name="rotate_map_to_bearing_descr">選擇地圖畫面對準方式</string>
     <string name="rotate_map_to_bearing">地圖方位</string>
     <string name="show_route">導航路線資訊</string>
-    <string name="fav_imported_sucessfully">我的最愛匯入成功</string>
-    <string name="fav_file_to_load_not_found">在 {0} 裡未找到含有我的最愛的 GPX 檔案</string>
-    <string name="fav_saved_sucessfully">我的最愛存到{0}</string>
+    <string name="fav_imported_sucessfully">我的收藏匯入成功</string>
+    <string name="fav_file_to_load_not_found">在 {0} 裡未找到含有我的收藏的 GPX 檔案</string>
+    <string name="fav_saved_sucessfully">我的收藏成功的存到 {0}</string>
     <string name="no_fav_to_save">沒有我的最愛標點要儲存</string>
     <string name="error_occurred_loading_gpx">在載入 GPX 時發生錯誤</string>
     <string name="send_report">傳送報告</string>
@@ -1037,8 +1037,8 @@
     <string name="support_new_features_descr">捐贈後可在應用程式裡看到新的功能實現</string>
     <string name="local_index_no_items_to_do">沒有項目在 %1$s</string>
     <string name="incomplete_locale">未完成</string>
-    <string name="osmand_extended_description_4000_chars">" OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式且免費，有世界各地和高品質的OpenStreetMap（簡稱 OSM 開放街道地圖）資料。所有地圖資料都可以存儲在您裝置的儲存卡上離線使用。透過您裝置的 GPS，OsmAnd 為汽車、自行車和行人，提供了路線、視覺和語音導航。所有的主要功能，工作於線上和離線這兩方面（無需網路連線）。 一些主要功能： 導航 - 工作在線上(快速)或是離線（當您在國外無需國際漫遊費用） - 轉向建議(turn by turn)語音導航（真人語音和合成音） - 可選的車道導引、街道名稱顯示和預計抵達時間 - 支援您的行程安排上的中途標點 - 每當您偏離了行駛路線，自動重新改道規劃 - 查尋地點按照地址，類型（例如：餐廳、飯店、加油站、博物館），或以地圖地理位置坐標查看 地圖顯示 - 在地圖上顯示您的位置和方向 - 可以選擇地圖正北朝上或您的或行進方向朝上 - 儲存您最重要的地方，作為我的最愛 - 顯示您周遭的POI（興趣點） - 能顯示專用的線上地圖圖磚 - 可以顯示衛星視圖（來自 Bing) - 可顯示使用自訂不同透明度疊加的多種地圖層如遊覽/導航 GPX 軌跡 - 可選擇顯示地名於英文、裝置端或拼音拼法 使用 OpenStreetMap 和維基百科的資料： - 世界性最好的合作專案所得的高品質資訊 - 全球性的地圖 OpenStreetMap，可用在每個國家或地區 - 維基百科觀光景點，非常適合觀光旅遊（免費版本不提供） - 直接從應用程式，無限制的免費下載（在免費版下載限制 16 個地圖檔） - 始終保持最新的地圖（每月至少更新一次） - 簡潔細致的離線向量地圖 - 可在完整地圖資料還是只有公路網之間選擇（例如：全日本有700 MB或200 MB的公路網） - 還支援線上或快取地圖圖磚 安全功能 - 自動日/夜檢視切換選項 - 速限顯示功能選項，如果您超速了它會提醒 - 可選擇取決於速度的地圖縮放 - 分享您所在的位置的功能，這樣您的朋友能找到您 自行車和步行 - 地圖包括步行，徒步旅行，自行車道，非常適合戶外活動 - 特殊的自行車和行人的路線和顯示模式 - 大眾運輸工具選項 (公共汽車、 電車、火車）包括線路名稱 - 可選的錄製旅程在裝置端 GPX 檔案或線上服務 - 速度和高度顯示選項 - 顯示等高線和地形陰影（經由附加的外掛元件） 直接提供給 OpenStreetMap - 記述地圖注解 - 直接從該應用程式上傳 GPX 軌跡到 OSM - 增加興趣點並直接上傳給 OSM（如果離線或在之後上傳） - 可選旅程錄製而且在背景模式（當裝置處於休眠模式下） OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從記述注解、改進翻譯或編寫新的功能，每個人都可以作出貢獻。透過所有的這些形成開發人員和使用者交互的作用下，讓該專案處於不斷改善的活絡狀態。專案的開發進度、編寫程式碼和測試新的功能，還是要依靠提供資金捐款資助。藉由您幫忙購買 OsmAnd +，或者在 osmand.net 上做一般捐贈，應用程式的道路會更平坦、更棒！但也有可能資助特定的新功能。 大概的地圖覆蓋區域和品質： -西歐： * * * -東歐： * * * -俄羅斯： * * * -北美： * * * -南美洲： * * -亞洲： * * -日本 &amp; 韓國： * * * -中東： * * -非洲： * * -南極洲： * 支援的國家的名單 (基本上世界範圍內!）： 阿富汗、阿爾巴尼亞、阿爾及利亞、安道爾、安哥拉、安圭拉、安地卡及巴布達、阿根廷、亞美尼亞、阿路巴、澳大利亞、奧地利、亞塞拜然、巴哈馬、巴林、孟加拉國、巴巴多斯、白俄羅斯、比利時、貝里斯、貝寧、百慕達、不丹、玻利維亞、博內爾、波士尼亞和黑塞哥維那、博茨瓦納、巴西、英屬維爾京群島、汶萊、保加利亞、布吉納法索、蒲隆地、柬埔寨、喀麥隆、加拿大、維德角、中非共和國、查德、智利、中國、哥倫比亞、科摩羅、剛果、哥斯大黎加、象牙海岸、克羅地亞、古巴、庫拉索、賽普勒斯、捷克共和國、丹麥、吉布地、多米尼克、多明尼加共和國、厄瓜多爾、埃及、薩爾瓦多、赤道幾內亞、厄立特里亞、愛沙尼亞、埃塞俄比亞、斐濟、芬蘭、法國、法屬圭亞那、法屬玻里尼西亞、加蓬、岡比亞、格魯吉亞、德國、加納、直布羅陀、希臘、格陵蘭島、格瑞那達、哥德洛普島、關島、瓜地馬拉、根西島、幾內亞、幾內亞比索、蓋亞納、海地、梵蒂岡、宏都拉斯、香港、匈牙利、冰島、印度、印尼、伊朗、伊拉克、愛爾蘭、曼城島、以色列、義大利、牙買加、日本、澤西島、約旦、哈薩克斯坦、肯雅、吉里巴斯、朝鮮和韓國、科威特、吉爾吉斯斯坦、老撾、拉脫維亞、黎巴嫩、賴索托、賴比瑞亞、利比亞、列支敦斯登、立陶宛、盧森堡、澳門、馬其頓、馬達加斯加、馬拉威、馬來西亞、馬爾地夫、馬里、馬爾他、馬丁尼克島、茅利塔尼亞、模里西斯、馬約特、墨西哥、密克羅尼西亞聯邦、摩爾多瓦、摩納哥、蒙古、黑山、蒙特塞拉特、摩洛哥、莫三比克、緬甸、納米比亞、瑙魯、尼泊爾、荷蘭、荷屬安地列斯群島、新赫里多尼亞、紐西蘭、尼加拉瓜、尼日爾、奈及利亞、挪威、阿曼、巴基斯坦、帕勞、巴勒斯坦領土、巴拿馬、巴布亞紐幾內亞、巴拉圭、秘魯、菲律賓、波蘭、葡萄牙、波多黎各、卡塔爾、羅馬尼亞、俄羅斯、盧安達、聖巴泰勒米、聖海倫娜、聖基茨和尼維斯、聖露西亞、聖馬丁島、聖匹島、聖文森及格瑞那丁、薩摩亞、聖馬利諾、沙烏地阿拉伯、塞內加爾、塞爾維亞、塞席爾、塞拉里昂、新加坡、斯洛伐克、斯洛維尼亞、索馬里、南非、格魯吉亞的南、南蘇丹、西班牙、斯里蘭卡、蘇丹、蘇利南、史瓦濟蘭、瑞典、瑞士、敘利亞、臺灣、塔吉克斯坦、坦尚尼亞、泰國、東帝汶、多哥、托克勞、湯加、特立尼達和多巴哥、突尼斯、土耳其、土庫曼斯坦、吐瓦魯、烏干達、烏克蘭、阿拉伯聯合大公國、英國、美國、烏拉圭、烏茲別克斯坦、瓦努阿圖、委內瑞拉、越南、瓦利斯群島和富圖納群島、西撒哈拉、葉門、尚比亞、辛巴威。 "</string>
-    <string name="osmand_plus_extended_description_4000_chars">" OsmAnd + 是付費應用程式版本。經由您的購買來支援專案，資金用在開發新的功能和接收最新的更新。您可以在購買前，先安裝名稱為 OsmAnd 的免費版本去試用該應用程式。 一些主要功能： 導航 - 工作在線上(快速)或是離線（當您在國外無需國際漫遊費用） - 轉向建議(turn by turn)語音導航（真人語音和合成音） - 可選擇車道導引、街道名稱顯示和預計抵達時間 - 支援您的行程安排上的中途標點 - 每當您偏離了行駛路線，自動重新改道規劃 - 查尋地點按照地址，類型（例如：餐廳、飯店、加油站、博物館），或以地圖地理位置坐標查看 地圖顯示 - 在地圖上顯示您的位置和方向 - 可以選擇地圖正北朝上或您的或行進方向朝上 - 儲存您最重要的地方，作為我的最愛 - 顯示您周遭的 POI（興趣點） - 能顯示專用的線上地圖圖磚 - 可以顯示衛星視圖（來自 Bing） - 可顯示使用自訂不同透明度疊加的多種地圖層如遊覽/導航 GPX 軌跡 - 可選擇顯示地名於英文、裝置端或拼音拼法 使用 OpenStreetMap 和維基百科的資料： - 世界性最好的合作專案所得的高品質資訊 - 全球性的地圖 OpenStreetMap，可用在每個國家或地區 - 維基百科觀光景點，非常適合觀光旅遊 - 直接從應用程式，無限制的免費下載 - 始終保持最新的地圖（每月至少更新一次） - 簡潔細致的離線向量地圖 - 可在完整地圖資料還是只有公路網之間選擇（例如：全日本有700 MB或200 MB的公路網） - 還支援線上或快取地圖圖磚 安全功能 - 自動日/夜檢視切換選項 - 速限顯示功能選項，如果您超速了它會提醒 - 取決於速度的地圖縮放選項 - 分享您所在的位置的功能，這樣您的朋友能找到您 自行車和步行 - 地圖包括步行，徒步旅行，自行車道，非常適合戶外活動 - 特殊的自行車和行人的路線和顯示模式 - 大眾運輸工具選項 (公共汽車、 電車、火車）包括線路名稱 - 可選擇旅程錄製到裝置端 GPX 檔案或線上服務 - 可選的速度和高度顯示 - 顯示等高線和地形陰影（經由附加的外掛元件） 直接提供給 OpenStreetMap - 報告地圖錯誤 - 直接從該應用程式上傳 GPX 軌跡到 OSM - 增加興趣點並直接上傳給 OSM （如果離線或在之後上傳） - 可選旅程錄製而且在背景模式（當裝置處於休眠模式下） OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告錯誤、改進翻譯或編寫新的功能，每個人都可以作出貢獻。透過所有的這些形成開發人員和使用者交互的作用下，讓該專案處於不斷改善的活絡狀態。專案的開發進度、編寫程式碼和測試新的功能，還是要依靠提供資金捐款資助。藉由您幫忙購買 OsmAnd +，或者在 osmand.net 上做一般捐贈，應用程式的道路會更平坦、更棒！但也有可能資助特定的新功能。 大概的地圖覆蓋區域和品質： -西歐： * * * -東歐： * * * -俄羅斯： * * * -北美： * * * -南美洲： * * -亞洲： * * -日本 &amp; 韓國： * * * -中東： * * -非洲： * * -南極洲： * 支援的國家的名單 (基本上世界範圍內!）： 阿富汗、阿爾巴尼亞、阿爾及利亞、安道爾、安哥拉、安圭拉、安地卡及巴布達、阿根廷、亞美尼亞、阿路巴、澳大利亞、奧地利、亞塞拜然、巴哈馬、巴林、孟加拉國、巴巴多斯、白俄羅斯、比利時、貝里斯、貝寧、百慕達、不丹、玻利維亞、博內爾、波士尼亞和黑塞哥維那、博茨瓦納、巴西、英屬維爾京群島、汶萊、保加利亞、布吉納法索、蒲隆地、柬埔寨、喀麥隆、加拿大、維德角、中非共和國、查德、智利、中國、哥倫比亞、科摩羅、剛果、哥斯大黎加、象牙海岸、克羅地亞、古巴、庫拉索、賽普勒斯、捷克共和國、丹麥、吉布地、多米尼克、多明尼加共和國、厄瓜多爾、埃及、薩爾瓦多、赤道幾內亞、厄立特里亞、愛沙尼亞、埃塞俄比亞、斐濟、芬蘭、法國、法屬圭亞那、法屬玻里尼西亞、加蓬、岡比亞、格魯吉亞、德國、加納、直布羅陀、希臘、格陵蘭島、格瑞那達、哥德洛普島、關島、瓜地馬拉、根西島、幾內亞、幾內亞比索、蓋亞納、海地、梵蒂岡、宏都拉斯、香港、匈牙利、冰島、印度、印尼、伊朗、伊拉克、愛爾蘭、曼城島、以色列、義大利、牙買加、日本、澤西島、約旦、哈薩克斯坦、肯雅、吉里巴斯、朝鮮和韓國、科威特、吉爾吉斯斯坦、老撾、拉脫維亞、黎巴嫩、賴索托、賴比瑞亞、利比亞、列支敦斯登、立陶宛、盧森堡、澳門、馬其頓、馬達加斯加、馬拉威、馬來西亞、馬爾地夫、馬里、馬爾他、馬丁尼克島、茅利塔尼亞、模里西斯、馬約特、墨西哥、密克羅尼西亞聯邦、摩爾多瓦、摩納哥、蒙古、黑山、蒙特塞拉特、摩洛哥、莫三比克、緬甸、納米比亞、瑙魯、尼泊爾、荷蘭、荷屬安地列斯群島、新赫里多尼亞、紐西蘭、尼加拉瓜、尼日爾、奈及利亞、挪威、阿曼、巴基斯坦、帕勞、巴勒斯坦領土、巴拿馬、巴布亞紐幾內亞、巴拉圭、秘魯、菲律賓、波蘭、葡萄牙、波多黎各、卡塔爾、羅馬尼亞、俄羅斯、盧安達、聖巴泰勒米、聖海倫娜、聖基茨和尼維斯、聖露西亞、聖馬丁島、聖匹島、聖文森及格瑞那丁、薩摩亞、聖馬利諾、沙烏地阿拉伯、塞內加爾、塞爾維亞、塞席爾、塞拉里昂、新加坡、斯洛伐克、斯洛維尼亞、索馬里、南非、格魯吉亞的南、南蘇丹、西班牙、斯里蘭卡、蘇丹、蘇利南、史瓦濟蘭、瑞典、瑞士、敘利亞、臺灣、塔吉克斯坦、坦尚尼亞、泰國、東帝汶、多哥、托克勞、湯加、特立尼達和多巴哥、突尼斯、土耳其、土庫曼斯坦、吐瓦魯、烏干達、烏克蘭、阿拉伯聯合大公國、英國、美國、烏拉圭、烏茲別克斯坦、瓦努阿圖、委內瑞拉、越南、瓦利斯群島和富圖納群島、西撒哈拉、葉門、尚比亞、辛巴威。 "</string>
+    <string name="osmand_extended_description_4000_chars">" OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式且免費，有世界各地和高品質的OpenStreetMap（簡稱 OSM 開放街道地圖）資料。所有地圖資料都可以存儲在您裝置的儲存卡上離線使用。透過您裝置的 GPS，OsmAnd 為汽車、自行車和行人，提供了路線、視覺和語音導航。所有的主要功能，工作於線上和離線這兩方面（無需網路連線）。 一些主要功能： 導航 - 工作在線上(快速)或是離線（當您在國外無需國際漫遊費用） - 轉向建議(turn by turn)語音導航（真人語音和合成音） - 可選的車道導引、街道名稱顯示和預計抵達時間 - 支援您的行程安排上的中途標點 - 每當您偏離了行駛路線，自動重新改道規劃 - 查尋地點按照地址，類型（例如：餐廳、飯店、加油站、博物館），或以地圖地理位置坐標查看 地圖顯示 - 在地圖上顯示您的位置和方向 - 可以選擇地圖正北朝上或您的或行進方向朝上 - 儲存您最重要的地方，作為我的收藏 - 顯示您周遭的POI（興趣點） - 能顯示專用的線上地圖圖磚 - 可以顯示衛星視圖（來自 Bing) - 可顯示使用自訂不同透明度疊加的多種地圖層如遊覽/導航 GPX 軌跡 - 可選擇顯示地名於英文、裝置端或拼音拼法 使用 OpenStreetMap 和維基百科的資料： - 世界性最好的合作專案所得的高品質資訊 - 全球性的地圖 OpenStreetMap，可用在每個國家或地區 - 維基百科觀光景點，非常適合觀光旅遊（免費版本不提供） - 直接從應用程式，無限制的免費下載（在免費版下載限制 16 個地圖檔） - 始終保持最新的地圖（每月至少更新一次） - 簡潔細致的離線向量地圖 - 可在完整地圖資料還是只有公路網之間選擇（例如：全日本有700 MB或200 MB的公路網） - 還支援線上或快取地圖圖磚 安全功能 - 自動日/夜檢視切換選項 - 速限顯示功能選項，如果您超速了它會提醒 - 可選擇取決於速度的地圖縮放 - 分享您所在的位置的功能，這樣您的朋友能找到您 自行車和步行 - 地圖包括步行，徒步旅行，自行車道，非常適合戶外活動 - 特殊的自行車和行人的路線和顯示模式 - 大眾運輸工具選項 (公共汽車、 電車、火車）包括線路名稱 - 可選的錄製旅程在裝置端 GPX 檔案或線上服務 - 速度和高度顯示選項 - 顯示等高線和地形陰影（經由附加的外掛元件） 直接提供給 OpenStreetMap - 記述地圖注解 - 直接從該應用程式上傳 GPX 軌跡到 OSM - 增加興趣點並直接上傳給 OSM（如果離線或在之後上傳） - 可選旅程錄製而且在背景模式（當裝置處於休眠模式下） OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從記述注解、改進翻譯或編寫新的功能，每個人都可以作出貢獻。透過所有的這些形成開發人員和使用者交互的作用下，讓該專案處於不斷改善的活絡狀態。專案的開發進度、編寫程式碼和測試新的功能，還是要依靠提供資金捐款資助。藉由您幫忙購買 OsmAnd +，或者在 osmand.net 上做一般捐贈，應用程式的道路會更平坦、更棒！但也有可能資助特定的新功能。 大概的地圖覆蓋區域和品質： -西歐： * * * -東歐： * * * -俄羅斯： * * * -北美： * * * -南美洲： * * -亞洲： * * -日本 &amp; 韓國： * * * -中東： * * -非洲： * * -南極洲： * 支援的國家的名單 (基本上世界範圍內!）： 阿富汗、阿爾巴尼亞、阿爾及利亞、安道爾、安哥拉、安圭拉、安地卡及巴布達、阿根廷、亞美尼亞、阿路巴、澳大利亞、奧地利、亞塞拜然、巴哈馬、巴林、孟加拉國、巴巴多斯、白俄羅斯、比利時、貝里斯、貝寧、百慕達、不丹、玻利維亞、博內爾、波士尼亞和黑塞哥維那、博茨瓦納、巴西、英屬維爾京群島、汶萊、保加利亞、布吉納法索、蒲隆地、柬埔寨、喀麥隆、加拿大、維德角、中非共和國、查德、智利、中國、哥倫比亞、科摩羅、剛果、哥斯大黎加、象牙海岸、克羅地亞、古巴、庫拉索、賽普勒斯、捷克共和國、丹麥、吉布地、多米尼克、多明尼加共和國、厄瓜多爾、埃及、薩爾瓦多、赤道幾內亞、厄立特里亞、愛沙尼亞、埃塞俄比亞、斐濟、芬蘭、法國、法屬圭亞那、法屬玻里尼西亞、加蓬、岡比亞、格魯吉亞、德國、加納、直布羅陀、希臘、格陵蘭島、格瑞那達、哥德洛普島、關島、瓜地馬拉、根西島、幾內亞、幾內亞比索、蓋亞納、海地、梵蒂岡、宏都拉斯、香港、匈牙利、冰島、印度、印尼、伊朗、伊拉克、愛爾蘭、曼城島、以色列、義大利、牙買加、日本、澤西島、約旦、哈薩克斯坦、肯雅、吉里巴斯、朝鮮和韓國、科威特、吉爾吉斯斯坦、老撾、拉脫維亞、黎巴嫩、賴索托、賴比瑞亞、利比亞、列支敦斯登、立陶宛、盧森堡、澳門、馬其頓、馬達加斯加、馬拉威、馬來西亞、馬爾地夫、馬里、馬爾他、馬丁尼克島、茅利塔尼亞、模里西斯、馬約特、墨西哥、密克羅尼西亞聯邦、摩爾多瓦、摩納哥、蒙古、黑山、蒙特塞拉特、摩洛哥、莫三比克、緬甸、納米比亞、瑙魯、尼泊爾、荷蘭、荷屬安地列斯群島、新赫里多尼亞、紐西蘭、尼加拉瓜、尼日爾、奈及利亞、挪威、阿曼、巴基斯坦、帕勞、巴勒斯坦領土、巴拿馬、巴布亞紐幾內亞、巴拉圭、秘魯、菲律賓、波蘭、葡萄牙、波多黎各、卡塔爾、羅馬尼亞、俄羅斯、盧安達、聖巴泰勒米、聖海倫娜、聖基茨和尼維斯、聖露西亞、聖馬丁島、聖匹島、聖文森及格瑞那丁、薩摩亞、聖馬利諾、沙烏地阿拉伯、塞內加爾、塞爾維亞、塞席爾、塞拉里昂、新加坡、斯洛伐克、斯洛維尼亞、索馬里、南非、格魯吉亞的南、南蘇丹、西班牙、斯里蘭卡、蘇丹、蘇利南、史瓦濟蘭、瑞典、瑞士、敘利亞、臺灣、塔吉克斯坦、坦尚尼亞、泰國、東帝汶、多哥、托克勞、湯加、特立尼達和多巴哥、突尼斯、土耳其、土庫曼斯坦、吐瓦魯、烏干達、烏克蘭、阿拉伯聯合大公國、英國、美國、烏拉圭、烏茲別克斯坦、瓦努阿圖、委內瑞拉、越南、瓦利斯群島和富圖納群島、西撒哈拉、葉門、尚比亞、辛巴威。 "</string>
+    <string name="osmand_plus_extended_description_4000_chars">" OsmAnd + 是付費應用程式版本。經由您的購買來支援專案，資金用在開發新的功能和接收最新的更新。您可以在購買前，先安裝名稱為 OsmAnd 的免費版本去試用該應用程式。 一些主要功能： 導航 - 工作在線上(快速)或是離線（當您在國外無需國際漫遊費用） - 轉向建議(turn by turn)語音導航（真人語音和合成音） - 可選擇車道導引、街道名稱顯示和預計抵達時間 - 支援您的行程安排上的中途標點 - 每當您偏離了行駛路線，自動重新改道規劃 - 查尋地點按照地址，類型（例如：餐廳、飯店、加油站、博物館），或以地圖地理位置坐標查看 地圖顯示 - 在地圖上顯示您的位置和方向 - 可以選擇地圖正北朝上或您的或行進方向朝上 - 儲存您最重要的地方，作為我的收藏 - 顯示您周遭的 POI（興趣點） - 能顯示專用的線上地圖圖磚 - 可以顯示衛星視圖（來自 Bing） - 可顯示使用自訂不同透明度疊加的多種地圖層如遊覽/導航 GPX 軌跡 - 可選擇顯示地名於英文、裝置端或拼音拼法 使用 OpenStreetMap 和維基百科的資料： - 世界性最好的合作專案所得的高品質資訊 - 全球性的地圖 OpenStreetMap，可用在每個國家或地區 - 維基百科觀光景點，非常適合觀光旅遊 - 直接從應用程式，無限制的免費下載 - 始終保持最新的地圖（每月至少更新一次） - 簡潔細致的離線向量地圖 - 可在完整地圖資料還是只有公路網之間選擇（例如：全日本有700 MB或200 MB的公路網） - 還支援線上或快取地圖圖磚 安全功能 - 自動日/夜檢視切換選項 - 速限顯示功能選項，如果您超速了它會提醒 - 取決於速度的地圖縮放選項 - 分享您所在的位置的功能，這樣您的朋友能找到您 自行車和步行 - 地圖包括步行，徒步旅行，自行車道，非常適合戶外活動 - 特殊的自行車和行人的路線和顯示模式 - 大眾運輸工具選項 (公共汽車、 電車、火車）包括線路名稱 - 可選擇旅程錄製到裝置端 GPX 檔案或線上服務 - 可選的速度和高度顯示 - 顯示等高線和地形陰影（經由附加的外掛元件） 直接提供給 OpenStreetMap - 報告地圖錯誤 - 直接從該應用程式上傳 GPX 軌跡到 OSM - 增加興趣點並直接上傳給 OSM （如果離線或在之後上傳） - 可選旅程錄製而且在背景模式（當裝置處於休眠模式下） OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告錯誤、改進翻譯或編寫新的功能，每個人都可以作出貢獻。透過所有的這些形成開發人員和使用者交互的作用下，讓該專案處於不斷改善的活絡狀態。專案的開發進度、編寫程式碼和測試新的功能，還是要依靠提供資金捐款資助。藉由您幫忙購買 OsmAnd +，或者在 osmand.net 上做一般捐贈，應用程式的道路會更平坦、更棒！但也有可能資助特定的新功能。 大概的地圖覆蓋區域和品質： -西歐： * * * -東歐： * * * -俄羅斯： * * * -北美： * * * -南美洲： * * -亞洲： * * -日本 &amp; 韓國： * * * -中東： * * -非洲： * * -南極洲： * 支援的國家的名單 (基本上世界範圍內!）： 阿富汗、阿爾巴尼亞、阿爾及利亞、安道爾、安哥拉、安圭拉、安地卡及巴布達、阿根廷、亞美尼亞、阿路巴、澳大利亞、奧地利、亞塞拜然、巴哈馬、巴林、孟加拉國、巴巴多斯、白俄羅斯、比利時、貝里斯、貝寧、百慕達、不丹、玻利維亞、博內爾、波士尼亞和黑塞哥維那、博茨瓦納、巴西、英屬維爾京群島、汶萊、保加利亞、布吉納法索、蒲隆地、柬埔寨、喀麥隆、加拿大、維德角、中非共和國、查德、智利、中國、哥倫比亞、科摩羅、剛果、哥斯大黎加、象牙海岸、克羅地亞、古巴、庫拉索、賽普勒斯、捷克共和國、丹麥、吉布地、多米尼克、多明尼加共和國、厄瓜多爾、埃及、薩爾瓦多、赤道幾內亞、厄立特里亞、愛沙尼亞、埃塞俄比亞、斐濟、芬蘭、法國、法屬圭亞那、法屬玻里尼西亞、加蓬、岡比亞、格魯吉亞、德國、加納、直布羅陀、希臘、格陵蘭島、格瑞那達、哥德洛普島、關島、瓜地馬拉、根西島、幾內亞、幾內亞比索、蓋亞納、海地、梵蒂岡、宏都拉斯、香港、匈牙利、冰島、印度、印尼、伊朗、伊拉克、愛爾蘭、曼城島、以色列、義大利、牙買加、日本、澤西島、約旦、哈薩克斯坦、肯雅、吉里巴斯、朝鮮和韓國、科威特、吉爾吉斯斯坦、老撾、拉脫維亞、黎巴嫩、賴索托、賴比瑞亞、利比亞、列支敦斯登、立陶宛、盧森堡、澳門、馬其頓、馬達加斯加、馬拉威、馬來西亞、馬爾地夫、馬里、馬爾他、馬丁尼克島、茅利塔尼亞、模里西斯、馬約特、墨西哥、密克羅尼西亞聯邦、摩爾多瓦、摩納哥、蒙古、黑山、蒙特塞拉特、摩洛哥、莫三比克、緬甸、納米比亞、瑙魯、尼泊爾、荷蘭、荷屬安地列斯群島、新赫里多尼亞、紐西蘭、尼加拉瓜、尼日爾、奈及利亞、挪威、阿曼、巴基斯坦、帕勞、巴勒斯坦領土、巴拿馬、巴布亞紐幾內亞、巴拉圭、秘魯、菲律賓、波蘭、葡萄牙、波多黎各、卡塔爾、羅馬尼亞、俄羅斯、盧安達、聖巴泰勒米、聖海倫娜、聖基茨和尼維斯、聖露西亞、聖馬丁島、聖匹島、聖文森及格瑞那丁、薩摩亞、聖馬利諾、沙烏地阿拉伯、塞內加爾、塞爾維亞、塞席爾、塞拉里昂、新加坡、斯洛伐克、斯洛維尼亞、索馬里、南非、格魯吉亞的南、南蘇丹、西班牙、斯里蘭卡、蘇丹、蘇利南、史瓦濟蘭、瑞典、瑞士、敘利亞、臺灣、塔吉克斯坦、坦尚尼亞、泰國、東帝汶、多哥、托克勞、湯加、特立尼達和多巴哥、突尼斯、土耳其、土庫曼斯坦、吐瓦魯、烏干達、烏克蘭、阿拉伯聯合大公國、英國、美國、烏拉圭、烏茲別克斯坦、瓦努阿圖、委內瑞拉、越南、瓦利斯群島和富圖納群島、西撒哈拉、葉門、尚比亞、辛巴威。 "</string>
     <string name="delete_point">刪除標點</string>
     <string name="plugin_distance_point">標點</string>
     <string name="distance_measurement_clear_route">清除所有的標點</string>
@@ -1261,7 +1261,7 @@
     <string name="osmo_io_error">OsMo 連線問題： </string>
     <string name="osmo_mode_on">停止 OsMo 連線階段</string>
     <string name="osmo_mode_off">啟動 OsMo 連線階段</string>
-    <string name="share_fav_subject">經由 OsmAnd 分享我的最愛</string>
+    <string name="share_fav_subject">經由 OsmAnd 分享我的收藏</string>
     <string name="use_points_as_intermediates">預估兩點之間的路線</string>
 
     <string name="osmo_auto_send_locations_descr">自動開始追蹤連線階段和發送位置之後啟動應用程式</string>
@@ -1310,7 +1310,7 @@
     <string name="osmo_enable_tracker">發送我的位置</string>
     <string name="osmo_control">OsMo 快速進入</string>
 
-    <string name="import_file_favourites">儲存標點為 GPX 檔案或把它匯入到我的最愛？</string>
+    <string name="import_file_favourites">儲存標點為 GPX 檔案或把它匯入到我的收藏？</string>
 
     
     <string name="rendering_value_pink_name">粉紅色</string>
@@ -1368,7 +1368,7 @@
     <string name="gpx_info_diff_altitude">海拔高度範圍：%1$s</string>
     <string name="gpx_wpt">航點</string>
     <string name="gpx_info_waypoints">"航點：%1$s "</string>
-    <string name="save_as_favorites_points">另存為我的最愛群組</string>
+    <string name="save_as_favorites_points">另存群組為我的收藏</string>
     <string name="select_destination_and_intermediate_points">選擇目的地</string>
     <string name="layer_amenity_label">標點標籤</string>
     <string name="show_zoom_buttons_navigation_descr">在導航期間顯示縮放按鈕</string>
@@ -1461,7 +1461,7 @@
     <string name="waypoints">航點</string>
     <string name="targets">目的地</string>
     <string name="way_alarms">交通狀況提醒</string>
-    <string name="speak_favorites">附近我的最愛</string>
+    <string name="speak_favorites">附近的收藏</string>
     <string name="speak_poi">附近的興趣點</string>
     <string name="shared_string_all">全部</string>
     <string name="index_tours">旅遊</string>
@@ -1666,11 +1666,11 @@
     <string name="shared_string_show_on_map">在地圖上顯示</string>
     <string name="shared_string_more_actions">更多的行動</string>
     <string name="shared_string_map">地圖</string>
-    <string name="shared_string_favorites">我的最愛</string>
-    <string name="shared_string_add_to_favorites">加到我的最愛</string>
+    <string name="shared_string_favorites">我的收藏</string>
+    <string name="shared_string_add_to_favorites">加到我的收藏</string>
     <string name="shared_string_my_location">我的位置</string>
     <string name="shared_string_my_places">我的地點</string>
-    <string name="shared_string_my_favorites">我的最愛</string>
+    <string name="shared_string_my_favorites">我的收藏</string>
     <string name="shared_string_my_tracks">我的軌跡</string>
     <string name="shared_string_currently_recording_track">錄製軌跡</string>
     <string name="shared_string_audio">音訊</string>
@@ -1861,7 +1861,7 @@
     <string name="poi_action_delete">删除</string>
     <string name="working_days">工作日</string>
     <string name="recent_places">最近的地點</string>
-    <string name="favourites">我的最愛</string>
+    <string name="favourites">我的收藏</string>
     <string name="saved_at_time">已順利的儲存於：%1$s</string>
     <string name="poi_deleted_localy">一旦您上傳您的變更，興趣點會被刪除</string>
     <string name="show_gpx">顯示 GPX</string>

From d22e14cef0545ace4b85ee2303d236724435e28e Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Tue, 26 Jan 2016 03:51:12 +0100
Subject: [PATCH 39/72] Translated using Weblate (Chinese (Taiwan))

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

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 87cc182fde..422f7b5291 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2084,4 +2084,5 @@
     <string name="data_is_not_available">無法獲得資料</string>
     <string name="rendering_attr_hideUnderground_name">隱藏地面下的物件</string>
     <string name="shared_string_read_more">讀取更多</string>
+    <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd 地圖與導航 - 無須網路連線即可在地圖上製作路線和尋找地點。在去一個陌生的地方旅行前，下載一個國家的地圖，找到地點和路線。基本選項： • 200個國家的詳細地圖 • 離線導航附帶語音提示 • 在離線模式下的地址查尋 • 在地圖上關於所在地的資訊：感興趣的地方、咖啡廳、停車場、商店 • 增加場所到我的收藏 • 開車，騎自行車和行人導航附加選項：• 有能力去查看和記錄 GPX 軌跡 • 維基百科的 POI 介紹 • 加入照片，音訊，視訊和註釋到地圖 • 更方便駕駛的白天和夜晚地圖模式 • 相關的大眾運輸路線和停靠站資訊 • 自行車道和人行道 • 旅遊全世界各地的步行小徑 • 從眾多來源的線上地圖 • 有關道路鋪設品質及街道照明的資訊 • 增加、編輯和刪除 POI (對 OpenStreetMap.org 使用者) • OsMo - 在您的國家即時監控其它裝置獲得可靠的導航 - 無論是法國、德國、墨西哥、英國、西班牙、荷蘭、美國、俄羅斯、巴西或任何其他國家。外掛元件：• 等高線地圖和山體陰影，https://goo.gl/7mojP8 等高線資料和地形顯現增加到基本的 OsmAnd 地圖上。 • 滑雪地圖 https://goo.gl/pX6DxJ 有關滑雪道、越野滑雪道、纜車和滑雪索道的資訊。 • 航海地圖 https://goo.gl/0hEdxm 專用的地圖式樣，用在幹線和近岸航海導引來查看海上導航標誌。 • 停車位置 https://goo.gl/6JxQXF 幫助您標記您停放車輛的位置，如果有停車場有時限，可查看還剩多少時間。持續關注！Twitter：https://twitter.com/osmandapp Facebook：https://www.facebook.com/osmandapp 網站：http://osmand.net 如果您需要 OsmAnd 應用程式相關的幫助，請聯絡我們的支援團隊：support@osmand.net "</string>
     </resources>

From 6420bdb22a42247e7057fa32f220eba19e64ed69 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Wed, 27 Jan 2016 00:11:13 +0300
Subject: [PATCH 40/72] Inapp fixes

---
 OsmAnd/no_translate.xml                       |  10 +-
 OsmAnd/res/layout/live_updates_header.xml     |  54 +----
 OsmAnd/res/layout/subscription_fragment.xml   |  29 ++-
 OsmAnd/res/values/strings.xml                 |   1 +
 .../src/net/osmand/plus/OsmandSettings.java   |   2 +
 .../net/osmand/plus/inapp/InAppHelper.java    | 160 ++++++------
 .../liveupdates/CountrySelectionFragment.java | 229 ++++++++++++++++++
 .../plus/liveupdates/LiveUpdatesFragment.java |  24 ++
 .../plus/liveupdates/ReportsFragment.java     | 112 +--------
 .../liveupdates/SearchSelectionFragment.java  | 126 ----------
 .../liveupdates/SubscriptionFragment.java     | 155 ++++--------
 11 files changed, 432 insertions(+), 470 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/liveupdates/CountrySelectionFragment.java
 delete mode 100644 OsmAnd/src/net/osmand/plus/liveupdates/SearchSelectionFragment.java

diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml
index 74fcf0776c..a10a00c824 100644
--- a/OsmAnd/no_translate.xml
+++ b/OsmAnd/no_translate.xml
@@ -30,7 +30,15 @@
     <string name="osm_live_subscription">OSM Live subscription</string>
     <string name="osm_live_subscribe_btn">Subscribe</string>
     <string name="osm_live_default_price">€1,49</string>
-    
+    <string name="osm_live_email_desc">We need it to provide you information about contributions</string>
+    <string name="osm_live_user_public_name">Public Name</string>
+    <string name="osm_live_hide_user_name">Don\'t show my name in reports</string>
+    <string name="osm_live_support_region">Support region</string>
+    <string name="osm_live_month_cost">Month cost</string>
+    <string name="osm_live_month_cost_desc">Monthly payment</string>
+    <string name="osm_live_active">Active</string>
+    <string name="osm_live_not_active">Inactive</string>
+
     <string name="osm_live_header">This subscription enables hourly updates for all maps around the world.
         Major part of the income goes back to OSM community and is paid out per each OSM contribution. 
         In case you love OsmAnd and OSM and want to support it, this is a perfect way to do it.</string>
diff --git a/OsmAnd/res/layout/live_updates_header.xml b/OsmAnd/res/layout/live_updates_header.xml
index 7032c37748..673ef3052a 100644
--- a/OsmAnd/res/layout/live_updates_header.xml
+++ b/OsmAnd/res/layout/live_updates_header.xml
@@ -99,13 +99,15 @@
                 app:typeface="@string/font_roboto_regular"/>
 
             <net.osmand.plus.widgets.TextViewEx
+                android:id="@+id/statusTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
                 android:layout_marginTop="4dp"
-                android:text="Active"
+                android:gravity="right"
+                android:text="@string/osm_live_active"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="@dimen/default_desc_text_size"
                 app:textAllCapsCompat="true"
@@ -129,18 +131,20 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
-                android:text="Support country"
+                android:text="@string/osm_live_support_region"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="@dimen/default_desc_text_size"
                 app:typeface="@string/font_roboto_regular"/>
 
             <net.osmand.plus.widgets.TextViewEx
+                android:id="@+id/regionTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
                 android:layout_marginTop="4dp"
+                android:gravity="right"
                 android:text="World"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="@dimen/default_desc_text_size"
@@ -165,18 +169,20 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
-                android:text="Email"
+                android:text="@string/shared_string_email_address"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="@dimen/default_desc_text_size"
                 app:typeface="@string/font_roboto_regular"/>
 
             <net.osmand.plus.widgets.TextViewEx
+                android:id="@+id/emailTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
                 android:layout_marginTop="4dp"
+                android:gravity="right"
                 android:text="my@email.com"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="@dimen/default_desc_text_size"
@@ -201,18 +207,20 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
-                android:text="Visible Name"
+                android:text="@string/osm_live_user_public_name"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="@dimen/default_desc_text_size"
                 app:typeface="@string/font_roboto_regular"/>
 
             <net.osmand.plus.widgets.TextViewEx
+                android:id="@+id/userNameTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
                 android:layout_marginTop="4dp"
+                android:gravity="right"
                 android:text="None"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="@dimen/default_desc_text_size"
@@ -220,44 +228,6 @@
 
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dashboard_divider"/>
-        
-        
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:minHeight="44dp">
-
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:layout_width="120dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:text="Last pay"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
-                app:typeface="@string/font_roboto_regular"/>
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="4dp"
-                android:text="25 Nov 2015"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
-                app:typeface="@string/font_roboto_medium"/>
-
-        </LinearLayout>
-
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/subscription_fragment.xml b/OsmAnd/res/layout/subscription_fragment.xml
index 8f21cff1db..a2f7195c49 100644
--- a/OsmAnd/res/layout/subscription_fragment.xml
+++ b/OsmAnd/res/layout/subscription_fragment.xml
@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
-            android:text="Subscription form"
+            android:text="@string/osm_live_subscription"
             android:textColor="@color/color_white"
             android:textSize="@dimen/default_list_text_size_large"
             android:textStyle="bold"
@@ -63,7 +63,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="16dp"
                     android:layout_marginRight="16dp"
-                    android:hint="E-mail address"
+                    android:hint="@string/shared_string_email_address"
                     android:inputType="textEmailAddress"/>
 
             </LinearLayout>
@@ -74,7 +74,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginLeft="72dp"
                 android:layout_marginRight="16dp"
-                android:text="We need it to provide you information about contributions"
+                android:text="@string/osm_live_email_desc"
                 android:textColor="?android:attr/textColorSecondary"/>
 
 
@@ -103,20 +103,21 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
-                        android:hint="Public Name"
+                        android:hint="@string/osm_live_user_public_name"
                         android:inputType="text"/>
 
 
                 </LinearLayout>
 
                 <CheckBox
+                    android:id="@+id/hideUserNameCheckbox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="12dp"
                     android:layout_marginLeft="72dp"
                     android:layout_marginRight="16dp"
                     android:layout_marginTop="8dp"
-                    android:text="Don't show my name in reports"
+                    android:text="@string/osm_live_hide_user_name"
                     android:textColor="?android:attr/textColorPrimary"/>
 
                 <LinearLayout
@@ -149,7 +150,7 @@
                             android:layout_marginTop="4dp"
                             android:drawableRight="@drawable/ic_action_arrow_drop_down"
                             android:editable="false"
-                            android:hint="Support region"/>
+                            android:hint="@string/osm_live_support_region"/>
 
                     </LinearLayout>
 
@@ -174,22 +175,21 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="Month cost"
+                        android:text="@string/osm_live_month_cost"
                         android:textColor="?android:attr/textColorPrimary"
                         android:textSize="@dimen/default_list_text_size_large"
-                        android:textStyle="bold"
-                        app:typeface="@string/font_roboto_regular"/>
+                        android:textStyle="bold"/>
 
                     <net.osmand.plus.widgets.TextViewEx
                         android:id="@+id/priceTextView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="16dp"
                         android:gravity="right"
                         android:text="@string/osm_live_default_price"
                         android:textColor="?attr/color_dialog_buttons"
                         android:textSize="@dimen/default_list_text_size_large"
-                        android:textStyle="bold"
-                        app:typeface="@string/font_roboto_regular"/>
+                        android:textStyle="bold"/>
 
                 </LinearLayout>
 
@@ -198,10 +198,9 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="16dp"
                     android:layout_marginRight="16dp"
-                    android:text="Monthly payment"
+                    android:text="@string/osm_live_month_cost_desc"
                     android:textColor="?android:attr/textColorSecondary"
-                    android:textSize="@dimen/default_desc_text_size"
-                    app:typeface="@string/font_roboto_regular"/>
+                    android:textSize="@dimen/default_desc_text_size"/>
 
                 <View
                     android:layout_width="match_parent"
@@ -223,7 +222,7 @@
                     android:background="?attr/selectableItemBackground"
                     android:paddingLeft="10dp"
                     android:paddingRight="10dp"
-                    android:text="Subscribe"
+                    android:text="@string/osm_live_subscribe_btn"
                     android:textColor="?attr/color_dialog_buttons"/>
 
             </LinearLayout>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 4f6707ac68..b7d8d2f042 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,7 @@
          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="shared_string_email_address">E-mail address</string>
     <string name="rendering_attr_hideUnderground_name">Hide underground objects</string>
     <string name="data_is_not_available">Data is not available</string>
     <string name="shared_string_remove">Remove</string>
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index b03f79e30e..ae0035daa5 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -815,6 +815,8 @@ public class OsmandSettings {
 	public final OsmandPreference<String> BILLING_USER_NAME = new StringPreference("billing_user_name", "").makeGlobal();
 	public final OsmandPreference<String> BILLING_USER_EMAIL = new StringPreference("billing_user_email", "").makeGlobal();
 	public final OsmandPreference<String> BILLING_USER_COUNTRY = new StringPreference("billing_user_country", "").makeGlobal();
+	public final OsmandPreference<String> BILLING_USER_COUNTRY_DOWNLOAD_NAME = new StringPreference("billing_user_country_download_name", "").makeGlobal();
+	public final OsmandPreference<Boolean> BILLING_HIDE_USER_NAME = new BooleanPreference("billing_hide_user_name", false).makeGlobal();
 	public final OsmandPreference<Boolean> BILLING_PURCHASE_TOKEN_SENT = new BooleanPreference("billing_purchase_token_sent", false).makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
index 3d916a5a73..9237a22a1c 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
@@ -19,16 +19,20 @@ import net.osmand.util.Algorithms;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URLEncoder;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class InAppHelper {
 	// Debug tag, for logging
@@ -58,10 +62,13 @@ public class InAppHelper {
 
 	public interface InAppCallbacks {
 		void onError(String error);
+
 		void onGetItems();
+
 		void onItemPurchased(String sku);
 
 		void showProgress();
+
 		void dismissProgress();
 	}
 
@@ -80,8 +87,8 @@ public class InAppHelper {
 
 	public void start(final boolean stopAfterResult) {
 		this.stopAfterResult = stopAfterResult;
-        /* base64EncodedPublicKey should be YOUR APPLICATION'S PUBLIC KEY
-         * (that you got from the Google Play developer console). This is not your
+		/* base64EncodedPublicKey should be YOUR APPLICATION'S PUBLIC KEY
+		 * (that you got from the Google Play developer console). This is not your
          * developer public key, it's the *app-specific* public key.
          *
          * Instead of just storing the entire literal string here embedded in the
@@ -159,15 +166,14 @@ public class InAppHelper {
 			Log.d(TAG, "Query inventory was successful.");
 
             /*
-             * Check for items we own. Notice that for each purchase, we check
+			 * Check for items we own. Notice that for each purchase, we check
              * the developer payload to see if it's correct! See
              * verifyDeveloperPayload().
              */
 
 			// Do we have the live updates?
 			Purchase liveUpdatesPurchase = inventory.getPurchase(SKU_LIVE_UPDATES);
-			mSubscribedToLiveUpdates = (liveUpdatesPurchase != null &&
-					verifyDeveloperPayload(liveUpdatesPurchase));
+			mSubscribedToLiveUpdates = (liveUpdatesPurchase != null);
 			Log.d(TAG, "User " + (mSubscribedToLiveUpdates ? "HAS" : "DOES NOT HAVE")
 					+ " live updates purchased.");
 
@@ -193,7 +199,7 @@ public class InAppHelper {
 	};
 
 	public void purchaseLiveUpdates(final Activity activity, final String email, final String userName,
-									final String country) {
+									final String countryDownloadName) {
 		if (!mHelper.subscriptionsSupported()) {
 			complain("Subscriptions not supported on your device yet. Sorry!");
 			if (callbacks != null) {
@@ -218,12 +224,17 @@ public class InAppHelper {
 				userId = ctx.getSettings().BILLING_USER_ID.get();
 				if (Algorithms.isEmpty(userId)) {
 					try {
-						return sendRequest("http://download.osmand.net/subscription/register?email=" + URLEncoder.encode(email, "UTF-8")
-										+ "&visibleName=" + URLEncoder.encode(userName, "UTF-8")
-										+ "&preferredCountry=" + URLEncoder.encode(country, "UTF-8")
-										+ (Algorithms.isEmpty(userId) ? "&status=new" : ""),
-								"POST", "Requesting userId...");
+						Map<String, String> parameters = new HashMap<>();
+						parameters.put("visibleName", userName);
+						parameters.put("preferredCountry", countryDownloadName);
+						parameters.put("email", email);
+						parameters.put("status", "new");
+
+						return sendRequest("http://download.osmand.net/subscription/register.php",
+								parameters, "Requesting userId...");
+
 					} catch (Exception e) {
+						Log.e(TAG, "sendRequest Error", e);
 						return null;
 					}
 				} else {
@@ -236,6 +247,7 @@ public class InAppHelper {
 				if (Algorithms.isEmpty(userId)) {
 					Log.d(TAG, "Response=" + response);
 					if (response == null) {
+						complain("Cannot retrieve userId from server.");
 						if (callbacks != null) {
 							callbacks.dismissProgress();
 							callbacks.onError("Cannot retrieve userId from server.");
@@ -252,10 +264,12 @@ public class InAppHelper {
 							ctx.getSettings().BILLING_USER_ID.set(userId);
 							Log.d(TAG, "UserId=" + userId);
 						} catch (JSONException e) {
+							String message = "JSON parsing error: "
+									+ (e.getMessage() == null ? "unknown" : e.getMessage());
+							complain(message);
 							if (callbacks != null) {
 								callbacks.dismissProgress();
-								callbacks.onError("JSON parsing error: "
-										+ (e.getMessage() == null ? "unknown" : e.getMessage()));
+								callbacks.onError(message);
 							}
 							if (stopAfterResult) {
 								stop();
@@ -304,36 +318,6 @@ public class InAppHelper {
 		}
 	}
 
-	/** Verifies the developer payload of a purchase. */
-	private boolean verifyDeveloperPayload(Purchase p) {
-		String payload = p.getDeveloperPayload();
-
-        /*
-         * TODO: verify that the developer payload of the purchase is correct. It will be
-         * the same one that you sent when initiating the purchase.
-         *
-         * WARNING: Locally generating a random string when starting a purchase and
-         * verifying it here might seem like a good approach, but this will fail in the
-         * case where the user purchases an item on one device and then uses your app on
-         * a different device, because on the other device you will not have access to the
-         * random string you originally generated.
-         *
-         * So a good developer payload has these characteristics:
-         *
-         * 1. If two different users purchase an item, the payload is different between them,
-         *    so that one user's purchase can't be replayed to another user.
-         *
-         * 2. The payload must be such that you can verify it even when the app wasn't the
-         *    one who initiated the purchase flow (so that items purchased by the user on
-         *    one device work on other devices owned by the user).
-         *
-         * Using your own server to store and verify developer payloads across app
-         * installations is recommended.
-         */
-
-		return true;
-	}
-
 	// Callback for when a purchase is finished
 	private IabHelper.OnIabPurchaseFinishedListener mPurchaseFinishedListener = new IabHelper.OnIabPurchaseFinishedListener() {
 		public void onIabPurchaseFinished(IabResult result, Purchase purchase) {
@@ -353,17 +337,6 @@ public class InAppHelper {
 				}
 				return;
 			}
-			if (!verifyDeveloperPayload(purchase)) {
-				complain("Error purchasing. Authenticity verification failed.");
-				if (callbacks != null) {
-					callbacks.dismissProgress();
-					callbacks.onError("Error purchasing. Authenticity verification failed.");
-				}
-				if (stopAfterResult) {
-					stop();
-				}
-				return;
-			}
 
 			Log.d(TAG, "Purchase successful.");
 
@@ -398,11 +371,14 @@ public class InAppHelper {
 		String userId = ctx.getSettings().BILLING_USER_ID.get();
 		String email = ctx.getSettings().BILLING_USER_EMAIL.get();
 		try {
-			sendRequestAsync("http://download.osmand.net/subscription/purchased?userid=" + URLEncoder.encode(userId, "UTF-8")
-							+ "&sku=" + URLEncoder.encode(SKU_LIVE_UPDATES, "UTF-8")
-							+ "&purchaseToken=" + URLEncoder.encode(token, "UTF-8")
-							+ "&email=" + URLEncoder.encode(email, "UTF-8"),
-					"POST", "Sending purchase info...", new OnRequestResultListener() {
+			Map<String, String> parameters = new HashMap<>();
+			parameters.put("userId", userId);
+			parameters.put("sku", SKU_LIVE_UPDATES);
+			parameters.put("purchaseToken", token);
+			parameters.put("email", email);
+
+			sendRequestAsync("http://download.osmand.net/subscription/purchased.php",
+					parameters, "Sending purchase info...", new OnRequestResultListener() {
 						@Override
 						public void onResult(String result) {
 							if (result != null && result.trim().toLowerCase().equals("ok")) {
@@ -411,6 +387,7 @@ public class InAppHelper {
 						}
 					});
 		} catch (Exception e) {
+			Log.e(TAG, "sendToken Error", e);
 		}
 	}
 
@@ -423,33 +400,63 @@ public class InAppHelper {
 		ctx.showToastMessage(message);
 	}
 
-	private String sendRequest(String url, String requestMethod, String userOperation) {
+	private String sendRequest(String url, Map<String, String> parameters, String userOperation) {
 		Log.d(TAG, "Sending request " + url); //$NON-NLS-1$
+		HttpURLConnection connection = null;
 		try {
-			HttpURLConnection connection = NetworkUtils.getHttpURLConnection(url);
+			connection = NetworkUtils.getHttpURLConnection(url);
 
+			connection.setRequestProperty("Accept-Charset", "UTF-8");
+			connection.setRequestProperty("User-Agent", Version.getFullVersion(ctx));
 			connection.setConnectTimeout(15000);
-			connection.setRequestMethod(requestMethod);
-			connection.setRequestProperty("User-Agent", Version.getFullVersion(ctx)); //$NON-NLS-1$
-			StringBuilder responseBody = new StringBuilder();
-			connection.connect();
+
+			if (parameters != null && parameters.size() > 0) {
+				StringBuilder sb = new StringBuilder();
+				for (Map.Entry<String, String> entry : parameters.entrySet()) {
+					if (sb.length() > 0) {
+						sb.append("&");
+					}
+					sb.append(entry.getKey()).append("=").append(URLEncoder.encode(entry.getValue(), "UTF-8"));
+				}
+				String params = sb.toString();
+
+				connection.setDoInput(true);
+				connection.setDoOutput(true);
+				connection.setUseCaches(false);
+				connection.setRequestMethod("POST");
+
+				connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
+				connection.setRequestProperty("Content-Length", String.valueOf(params.getBytes("UTF-8").length));
+				connection.setFixedLengthStreamingMode(params.getBytes("UTF-8").length);
+
+				OutputStream output = new BufferedOutputStream(connection.getOutputStream());
+				output.write(params.getBytes("UTF-8"));
+				output.flush();
+				output.close();
+
+			} else {
+				connection.setRequestMethod("GET");
+				connection.connect();
+			}
+
 			if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
 				String msg = userOperation
-						+ " " + ctx.getString(R.string.failed_op) + " : " + connection.getResponseMessage(); //$NON-NLS-1$//$NON-NLS-2$
+						+ " " + ctx.getString(R.string.failed_op) + " : " + connection.getResponseMessage();
 				Log.e(TAG, msg);
 				showToast(msg);
 			} else {
-				Log.d(TAG, "Response : " + connection.getResponseMessage()); //$NON-NLS-1$
+				Log.d(TAG, "Response : " + connection.getResponseMessage());
 				// populate return fields.
+				StringBuilder responseBody = new StringBuilder();
 				responseBody.setLength(0);
 				InputStream i = connection.getInputStream();
 				if (i != null) {
-					BufferedReader in = new BufferedReader(new InputStreamReader(i, "UTF-8"), 256); //$NON-NLS-1$
+					BufferedReader in = new BufferedReader(new InputStreamReader(i, "UTF-8"), 256);
 					String s;
 					boolean f = true;
 					while ((s = in.readLine()) != null) {
 						if (!f) {
-							responseBody.append("\n"); //$NON-NLS-1$
+							responseBody.append("\n");
 						} else {
 							f = false;
 						}
@@ -459,37 +466,42 @@ public class InAppHelper {
 						in.close();
 						i.close();
 					} catch (Exception e) {
+						Log.e(TAG, "sendRequest", e);
 					}
 				}
 				return responseBody.toString();
 			}
-			connection.disconnect();
+
 		} catch (NullPointerException e) {
 			// that's tricky case why NPE is thrown to fix that problem httpClient could be used
 			String msg = ctx.getString(R.string.auth_failed);
 			Log.e(TAG, msg, e);
 			showToast(msg);
 		} catch (MalformedURLException e) {
-			Log.e(TAG, userOperation + " " + ctx.getString(R.string.failed_op), e); //$NON-NLS-1$
+			Log.e(TAG, userOperation + " " + ctx.getString(R.string.failed_op), e);
 			showToast(MessageFormat.format(ctx.getResources().getString(R.string.shared_string_action_template)
 					+ ": " + ctx.getResources().getString(R.string.shared_string_unexpected_error), userOperation));
 		} catch (IOException e) {
-			Log.e(TAG, userOperation + " " + ctx.getString(R.string.failed_op), e); //$NON-NLS-1$
+			Log.e(TAG, userOperation + " " + ctx.getString(R.string.failed_op), e);
 			showToast(MessageFormat.format(ctx.getResources().getString(R.string.shared_string_action_template)
 					+ ": " + ctx.getResources().getString(R.string.shared_string_io_error), userOperation));
+		} finally {
+			if (connection != null) {
+				connection.disconnect();
+			}
 		}
 
 		return null;
 	}
 
-	private void sendRequestAsync(final String url, final String requestMethod, final String userOperation, final OnRequestResultListener listener) {
+	private void sendRequestAsync(final String url, final Map<String, String> parameters, final String userOperation, final OnRequestResultListener listener) {
 
 		new AsyncTask<Void, Void, String>() {
 
 			@Override
 			protected String doInBackground(Void... params) {
 				try {
-					return sendRequest(url, requestMethod, userOperation);
+					return sendRequest(url, parameters, userOperation);
 				} catch (Exception e) {
 					return null;
 				}
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/CountrySelectionFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/CountrySelectionFragment.java
new file mode 100644
index 0000000000..88c7cc7c69
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/CountrySelectionFragment.java
@@ -0,0 +1,229 @@
+package net.osmand.plus.liveupdates;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.annotation.DrawableRes;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import net.osmand.map.WorldRegion;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.base.BaseOsmAndDialogFragment;
+import net.osmand.util.Algorithms;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class CountrySelectionFragment extends BaseOsmAndDialogFragment {
+
+	private List<CountryItem> countryItems = new ArrayList<>();
+	private OnFragmentInteractionListener mListener;
+
+	public List<CountryItem> getCountryItems() {
+		return countryItems;
+	}
+
+	public CountryItem getCountryItem(String downloadName) {
+		if (!Algorithms.isEmpty(downloadName)) {
+			for (CountryItem item : countryItems) {
+				if (downloadName.equals(item.downloadName)) {
+					return item;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+							 Bundle savedInstanceState) {
+		if (countryItems.size() == 0) {
+			initCountries(getMyApplication());
+		}
+
+		View view = inflater.inflate(R.layout.fragment_search_list, container, false);
+		ListView listView = (ListView) view.findViewById(android.R.id.list);
+		final ArrayAdapter<CountryItem> adapter = new ListAdapter(getListItemIcon());
+		if (countryItems.size() > 0) {
+			adapter.addAll(countryItems);
+		}
+		listView.setAdapter(adapter);
+		listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+			@Override
+			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+				mListener.onSearchResult(adapter.getItem(position));
+				dismiss();
+			}
+		});
+		final EditText searchEditText = (EditText) view.findViewById(R.id.searchEditText);
+		searchEditText.addTextChangedListener(new TextWatcher() {
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+			}
+
+			@Override
+			public void onTextChanged(CharSequence s, int start, int before, int count) {
+			}
+
+			@Override
+			public void afterTextChanged(Editable s) {
+				adapter.getFilter().filter(s);
+			}
+		});
+		ImageButton clearButton = (ImageButton) view.findViewById(R.id.clearButton);
+		setThemedDrawable(clearButton, R.drawable.ic_action_remove_dark);
+		clearButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				dismiss();
+			}
+		});
+		return view;
+	}
+
+	@Override
+	public void onAttach(Context context) {
+		super.onAttach(context);
+		if (context instanceof OnFragmentInteractionListener) {
+			mListener = (OnFragmentInteractionListener) context;
+		} else if (getParentFragment() instanceof OnFragmentInteractionListener) {
+			mListener = (OnFragmentInteractionListener) getParentFragment();
+		} else {
+			throw new RuntimeException(context.toString()
+					+ " must implement OnFragmentInteractionListener");
+		}
+	}
+
+	@DrawableRes
+	protected int getListItemIcon() {
+		return R.drawable.ic_map;
+	}
+
+	@Override
+	public void onDetach() {
+		super.onDetach();
+		mListener = null;
+	}
+
+	public interface OnFragmentInteractionListener {
+		void onSearchResult(CountryItem name);
+	}
+
+
+	public void initCountries(OsmandApplication app) {
+		final WorldRegion root = app.getRegions().getWorldRegion();
+		ArrayList<WorldRegion> groups = new ArrayList<>();
+		groups.add(root);
+		processGroup(root, groups);
+		Collections.sort(groups, new Comparator<WorldRegion>() {
+			@Override
+			public int compare(WorldRegion lhs, WorldRegion rhs) {
+				if (lhs == root) {
+					return -1;
+				}
+				if (rhs == root) {
+					return 1;
+				}
+				return getHumanReadableName(lhs).compareTo(getHumanReadableName(rhs));
+			}
+		});
+		for (WorldRegion group : groups) {
+			String name = getHumanReadableName(group);
+			countryItems.add(new CountryItem(name, group.getRegionDownloadName()));
+		}
+	}
+
+	private static void processGroup(WorldRegion group,
+									 List<WorldRegion> nameList) {
+		if (group.isRegionMapDownload()) {
+			nameList.add(group);
+		}
+
+		if (group.getSubregions() != null) {
+			for (WorldRegion g : group.getSubregions()) {
+				processGroup(g, nameList);
+			}
+		}
+	}
+
+	private static String getHumanReadableName(WorldRegion group) {
+		String name;
+		if (group.getLevel() > 2 || (group.getLevel() == 2
+				&& group.getSuperregion().getRegionId().equals(WorldRegion.RUSSIA_REGION_ID))) {
+			WorldRegion parent = group.getSuperregion();
+			WorldRegion parentsParent = group.getSuperregion().getSuperregion();
+			if (group.getLevel() == 3) {
+				if (parentsParent.getRegionId().equals(WorldRegion.RUSSIA_REGION_ID)) {
+					name = parentsParent.getLocaleName() + " " + group.getLocaleName();
+				} else if (!parent.getRegionId().equals(WorldRegion.UNITED_KINGDOM_REGION_ID)) {
+					name = parent.getLocaleName() + " " + group.getLocaleName();
+				} else {
+					name = group.getLocaleName();
+				}
+			} else {
+				name = parent.getLocaleName() + " " + group.getLocaleName();
+			}
+		} else {
+			name = group.getLocaleName();
+		}
+		if (name == null) {
+			name = "";
+		}
+		return name;
+	}
+
+	public static class CountryItem {
+		private String localName;
+		private String downloadName;
+
+		public CountryItem(String localName, String downloadName) {
+			this.localName = localName;
+			this.downloadName = downloadName;
+		}
+
+		public String getLocalName() {
+			return localName;
+		}
+
+		public String getDownloadName() {
+			return downloadName;
+		}
+
+		@Override
+		public String toString() {
+			return localName;
+		}
+	}
+
+	private class ListAdapter extends ArrayAdapter<CountryItem> {
+		private final Drawable drawableLeft;
+
+		public ListAdapter(@DrawableRes int drawableLeftId) {
+			super(getMyActivity(), android.R.layout.simple_list_item_1);
+			this.drawableLeft = drawableLeftId == -1 ? null : getContentIcon(drawableLeftId);
+		}
+
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+			CountryItem item = getItem(position);
+			TextView view = (TextView) super.getView(position, convertView, parent);
+			view.setText(item.localName);
+			view.setCompoundDrawablesWithIntrinsicBounds(drawableLeft, null, null, null);
+			view.setCompoundDrawablePadding(getResources().getDimensionPixelSize(R.dimen.list_content_padding));
+			return view;
+		}
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
index aa1222747a..81f561ad28 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
@@ -22,6 +22,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import net.osmand.map.WorldRegion;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
@@ -106,6 +107,29 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
 			}
 		});
 		if (InAppHelper.isSubscribedToLiveUpdates()) {
+			TextView statusTextView = (TextView) subscriptionHeader.findViewById(R.id.statusTextView);
+			TextView regionNameTextView = (TextView) subscriptionHeader.findViewById(R.id.regionTextView);
+			TextView emailTextView = (TextView) subscriptionHeader.findViewById(R.id.emailTextView);
+			TextView userNameTextView = (TextView) subscriptionHeader.findViewById(R.id.userNameTextView);
+
+			if (InAppHelper.isSubscribedToLiveUpdates()) {
+				statusTextView.setText(getString(R.string.osm_live_active));
+			} else {
+				statusTextView.setText(getString(R.string.osm_live_not_active));
+			}
+
+			OsmandSettings settings = getMyApplication().getSettings();
+
+			String countryName = settings.BILLING_USER_COUNTRY.get();
+			if (Algorithms.isEmpty(countryName)) {
+				WorldRegion world = getMyApplication().getRegions().getWorldRegion();
+				countryName = world.getLocaleName();
+			}
+			regionNameTextView.setText(countryName);
+
+			emailTextView.setText(settings.BILLING_USER_EMAIL.get());
+			userNameTextView.setText(settings.BILLING_USER_NAME.get());
+
 			subscriptionBanner.setVisibility(View.GONE);
 			subscriptionInfo.setVisibility(View.VISIBLE);
 		} else {
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java
index 389e6fc5a1..380f3a4fdc 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java
@@ -22,23 +22,19 @@ import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 
 import net.osmand.PlatformUtil;
-import net.osmand.map.WorldRegion;
 import net.osmand.osm.io.NetworkUtils;
 import net.osmand.plus.R;
 import net.osmand.plus.base.BaseOsmAndFragment;
+import net.osmand.plus.liveupdates.CountrySelectionFragment.CountryItem;
 
 import org.apache.commons.logging.Log;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Locale;
 
-public class ReportsFragment extends BaseOsmAndFragment implements SearchSelectionFragment.OnFragmentInteractionListener {
+public class ReportsFragment extends BaseOsmAndFragment implements CountrySelectionFragment.OnFragmentInteractionListener {
 	public static final String TITLE = "Report";
 	public static final String TOTAL_CHANGES_BY_MONTH_URL_PATTERN = "http://download.osmand.net/" +
 			"reports/query_report.php?report=total_changes_by_month&month=%s&region=%s";
@@ -50,11 +46,9 @@ public class ReportsFragment extends BaseOsmAndFragment implements SearchSelecti
 	private Spinner montReportsSpinner;
 	private MonthsForReportsAdapter monthsForReportsAdapter;
 
-	CountrySearchSelectionFragment searchSelectionFragment = new CountrySearchSelectionFragment();
+	private CountrySelectionFragment countrySelectionFragment = new CountrySelectionFragment();
 	private TextView countryNameTextView;
-
-	HashMap<String, String> queryRegionNames = new HashMap<>();
-	ArrayList<String> regionNames = new ArrayList<>();
+	private CountryItem selectedCountryItem;
 
 	private ImageView numberOfContributorsIcon;
 	private ImageView numberOfEditsIcon;
@@ -69,7 +63,6 @@ public class ReportsFragment extends BaseOsmAndFragment implements SearchSelecti
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 							 Bundle savedInstanceState) {
-		initCountries();
 		View view = inflater.inflate(R.layout.fragment_reports, container, false);
 		montReportsSpinner = (Spinner) view.findViewById(R.id.montReportsSpinner);
 		monthsForReportsAdapter = new MonthsForReportsAdapter(getActivity());
@@ -79,15 +72,15 @@ public class ReportsFragment extends BaseOsmAndFragment implements SearchSelecti
 		regionReportsButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				SearchSelectionFragment countrySearchSelectionFragment =
-						searchSelectionFragment;
-				countrySearchSelectionFragment
-						.show(getChildFragmentManager(), "CountriesSearchSelectionFragment");
+				countrySelectionFragment.show(getChildFragmentManager(), "CountriesSearchSelectionFragment");
 			}
 		});
 
+		countrySelectionFragment.initCountries(getMyApplication());
+		selectedCountryItem = countrySelectionFragment.getCountryItems().get(0);
+
 		countryNameTextView = (TextView) regionReportsButton.findViewById(android.R.id.text1);
-		countryNameTextView.setText(regionNames.get(0));
+		countryNameTextView.setText(selectedCountryItem.getLocalName());
 
 		setThemedDrawable(view, R.id.calendarImageView, R.drawable.ic_action_data);
 		setThemedDrawable(view, R.id.regionIconImageView, R.drawable.ic_world_globe_dark);
@@ -127,7 +120,7 @@ public class ReportsFragment extends BaseOsmAndFragment implements SearchSelecti
 	public void requestAndUpdateUi() {
 		int monthItemPosition = montReportsSpinner.getSelectedItemPosition();
 		String monthUrlString = monthsForReportsAdapter.getQueryString(monthItemPosition);
-		String countryUrlString = queryRegionNames.get(countryNameTextView.getText().toString());
+		String countryUrlString = selectedCountryItem.getDownloadName();
 
 		tryUpdateData(monthUrlString, countryUrlString);
 	}
@@ -171,79 +164,12 @@ public class ReportsFragment extends BaseOsmAndFragment implements SearchSelecti
 	}
 
 	@Override
-	public void onSearchResult(String name) {
-		countryNameTextView.setText(name);
+	public void onSearchResult(CountryItem item) {
+		selectedCountryItem = item;
+		countryNameTextView.setText(item.getLocalName());
 		requestAndUpdateUi();
 	}
 
-	private void initCountries() {
-		final WorldRegion root = getMyApplication().getRegions().getWorldRegion();
-		ArrayList<WorldRegion> groups = new ArrayList<>();
-		groups.add(root);
-		processGroup(root, groups, getActivity());
-		Collections.sort(groups, new Comparator<WorldRegion>() {
-			@Override
-			public int compare(WorldRegion lhs, WorldRegion rhs) {
-				if (lhs == root) {
-					return -1;
-				}
-				if (rhs == root) {
-					return 1;
-				}
-				return getHumanReadableName(lhs).compareTo(getHumanReadableName(rhs));
-			}
-		});
-		for (WorldRegion group : groups) {
-			String name = getHumanReadableName(group);
-			regionNames.add(name);
-			queryRegionNames.put(name, group == root ? "" : group.getRegionDownloadName());
-		}
-	}
-
-	private static String getHumanReadableName(WorldRegion group) {
-		String name;
-		if (group.getLevel() > 2 || (group.getLevel() == 2
-				&& group.getSuperregion().getRegionId().equals(WorldRegion.RUSSIA_REGION_ID))) {
-			WorldRegion parent = group.getSuperregion();
-			WorldRegion parentsParent = group.getSuperregion().getSuperregion();
-			if (group.getLevel() == 3) {
-				if (parentsParent.getRegionId().equals(WorldRegion.RUSSIA_REGION_ID)) {
-					name = parentsParent.getLocaleName() + " " + group.getLocaleName();
-				} else if (!parent.getRegionId().equals(WorldRegion.UNITED_KINGDOM_REGION_ID)) {
-					name = parent.getLocaleName() + " " + group.getLocaleName();
-				} else {
-					name = group.getLocaleName();
-				}
-			} else {
-				name = parent.getLocaleName() + " " + group.getLocaleName();
-			}
-		} else {
-			name = group.getLocaleName();
-		}
-		if (name == null) {
-			name = "";
-		}
-		return name;
-	}
-
-	public String getQueryString(int position) {
-		return queryRegionNames.get(position);
-	}
-
-	private static void processGroup(WorldRegion group,
-									 List<WorldRegion> nameList,
-									 Context context) {
-		if (group.isRegionMapDownload()) {
-			nameList.add(group);
-		}
-
-		if (group.getSubregions() != null) {
-			for (WorldRegion g : group.getSubregions()) {
-				processGroup(g, nameList, context);
-			}
-		}
-	}
-
 	private static class MonthsForReportsAdapter extends ArrayAdapter<String> {
 		private static final SimpleDateFormat queryFormat = new SimpleDateFormat("yyyy-MM", Locale.US);
 		@SuppressLint("SimpleDateFormat")
@@ -325,18 +251,6 @@ public class ReportsFragment extends BaseOsmAndFragment implements SearchSelecti
 		}
 	}
 
-	public static class CountrySearchSelectionFragment extends SearchSelectionFragment {
-		@Override
-		protected ArrayList<String> getList() {
-			return ((ReportsFragment) getParentFragment()).regionNames;
-		}
-
-		@Override
-		protected int getListItemIcon() {
-			return R.drawable.ic_map;
-		}
-	}
-
 	private void enableProgress() {
 		numberOfContributorsIcon.setImageDrawable(getPaintedContentIcon(R.drawable.ic_group, inactiveColor));
 		numberOfEditsIcon.setImageDrawable(getPaintedContentIcon(R.drawable.ic_map, inactiveColor));
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/SearchSelectionFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/SearchSelectionFragment.java
deleted file mode 100644
index b46dd10022..0000000000
--- a/OsmAnd/src/net/osmand/plus/liveupdates/SearchSelectionFragment.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package net.osmand.plus.liveupdates;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.annotation.DrawableRes;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import net.osmand.plus.R;
-import net.osmand.plus.base.BaseOsmAndDialogFragment;
-
-import java.util.ArrayList;
-
-public abstract class SearchSelectionFragment extends BaseOsmAndDialogFragment {
-	private OnFragmentInteractionListener mListener;
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-							 Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_search_list, container, false);
-		ListView listView = (ListView) view.findViewById(android.R.id.list);
-		final ArrayAdapter<String> adapter = new ListAdapter(getActivity(), getListItemIcon());
-		if (getArray() != null) {
-			adapter.addAll(getArray());
-		} else if (getList() != null) {
-			adapter.addAll(getList());
-		} else {
-			throw new RuntimeException("Either getArray() or getList() must return non null value.");
-		}
-		listView.setAdapter(adapter);
-		listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-				mListener.onSearchResult(adapter.getItem(position));
-				dismiss();
-			}
-		});
-		final EditText searchEditText = (EditText) view.findViewById(R.id.searchEditText);
-		searchEditText.addTextChangedListener(new TextWatcher() {
-			@Override
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-			}
-
-			@Override
-			public void onTextChanged(CharSequence s, int start, int before, int count) {
-			}
-
-			@Override
-			public void afterTextChanged(Editable s) {
-				adapter.getFilter().filter(s);
-			}
-		});
-		ImageButton clearButton = (ImageButton) view.findViewById(R.id.clearButton);
-		setThemedDrawable(clearButton, R.drawable.ic_action_remove_dark);
-		clearButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				dismiss();
-			}
-		});
-		return view;
-	}
-
-	@Override
-	public void onAttach(Context context) {
-		super.onAttach(context);
-		if (context instanceof OnFragmentInteractionListener) {
-			mListener = (OnFragmentInteractionListener) context;
-		} else if (getParentFragment() instanceof OnFragmentInteractionListener) {
-			mListener = (OnFragmentInteractionListener) getParentFragment();
-		} else {
-			throw new RuntimeException(context.toString()
-					+ " must implement OnFragmentInteractionListener");
-		}
-	}
-
-	protected String[] getArray() {
-		return null;
-	}
-
-	protected ArrayList<String> getList() {
-		return null;
-	}
-
-	@DrawableRes
-	protected int getListItemIcon() {
-		return -1;
-	}
-
-	@Override
-	public void onDetach() {
-		super.onDetach();
-		mListener = null;
-	}
-
-	public interface OnFragmentInteractionListener {
-		void onSearchResult(String name);
-	}
-
-	private class ListAdapter extends ArrayAdapter<String> {
-		private final Drawable drawableLeft;
-
-		public ListAdapter(Context context, @DrawableRes int drawableLeftId) {
-			super(getMyActivity(), android.R.layout.simple_list_item_1);
-			this.drawableLeft = drawableLeftId == -1 ? null : getContentIcon(drawableLeftId);
-		}
-
-		@Override
-		public View getView(int position, View convertView, ViewGroup parent) {
-			TextView view = (TextView) super.getView(position, convertView, parent);
-			view.setCompoundDrawablesWithIntrinsicBounds(drawableLeft, null, null, null);
-			view.setCompoundDrawablePadding(getResources().getDimensionPixelSize(R.dimen.list_content_padding));
-			return view;
-		}
-	}
-}
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
index aa05014a73..03201a876e 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
@@ -2,7 +2,6 @@ package net.osmand.plus.liveupdates;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
-import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
@@ -10,27 +9,23 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import net.osmand.AndroidUtils;
-import net.osmand.map.WorldRegion;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.base.BaseOsmAndDialogFragment;
 import net.osmand.plus.inapp.InAppHelper;
 import net.osmand.plus.inapp.InAppHelper.InAppCallbacks;
-import net.osmand.plus.liveupdates.SearchSelectionFragment.OnFragmentInteractionListener;
+import net.osmand.plus.liveupdates.CountrySelectionFragment.CountryItem;
+import net.osmand.plus.liveupdates.CountrySelectionFragment.OnFragmentInteractionListener;
 import net.osmand.util.Algorithms;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-public class SubscriptionFragment extends BaseOsmAndDialogFragment implements InAppCallbacks, OnFragmentInteractionListener{
+public class SubscriptionFragment extends BaseOsmAndDialogFragment implements InAppCallbacks, OnFragmentInteractionListener {
 
 	public static final String TAG = "SubscriptionFragment";
 
@@ -40,11 +35,9 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 
 	private String userName;
 	private String email;
-	private String country;
+	private CountryItem selectedCountryItem;
 
-	ArrayList<String> regionNames = new ArrayList<>();
-	private CountrySearchSelectionFragment searchSelectionFragment
-			= new CountrySearchSelectionFragment();
+	private CountrySelectionFragment countrySelectionFragment = new CountrySelectionFragment();
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -73,8 +66,6 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 			}
 		});
 
-		initCountries();
-
 		userName = settings.BILLING_USER_NAME.get();
 		final EditText userNameEdit = (EditText) view.findViewById(R.id.userNameEdit);
 		if (!Algorithms.isEmpty(userName)) {
@@ -87,52 +78,62 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 			emailEdit.setText(email);
 		}
 
-		country = settings.BILLING_USER_COUNTRY.get();
+		countrySelectionFragment.initCountries(getMyApplication());
+		String countryDownloadName = settings.BILLING_USER_COUNTRY_DOWNLOAD_NAME.get();
+		if (Algorithms.isEmpty(countryDownloadName)) {
+			selectedCountryItem = countrySelectionFragment.getCountryItems().get(0);
+		} else {
+			selectedCountryItem = countrySelectionFragment.getCountryItem(countryDownloadName);
+		}
+
 		final EditText selectCountryEdit = (EditText) view.findViewById(R.id.selectCountryEdit);
-		if (!Algorithms.isEmpty(country)) {
-			selectCountryEdit.setText(country);
+		if (selectedCountryItem != null) {
+			selectCountryEdit.setText(selectedCountryItem.getLocalName());
 		}
 		selectCountryEdit.setOnTouchListener(new View.OnTouchListener() {
 			@Override
 			public boolean onTouch(View v, MotionEvent event) {
 				if (event.getAction() == MotionEvent.ACTION_UP) {
-					SearchSelectionFragment countrySearchSelectionFragment =
-							searchSelectionFragment;
-					countrySearchSelectionFragment
+					CountrySelectionFragment countryCountrySelectionFragment =
+							countrySelectionFragment;
+					countryCountrySelectionFragment
 							.show(getChildFragmentManager(), "CountriesSearchSelectionFragment");
 				}
 				return false;
 			}
 		});
 
-		updatePrice();
+		updatePrice(view);
 
-		Button subscribeButton = (Button) view.findViewById(R.id.subscribeButton);
+		final Button subscribeButton = (Button) view.findViewById(R.id.subscribeButton);
+		final CheckBox hideUserNameCheckbox = (CheckBox) view.findViewById(R.id.hideUserNameCheckbox);
+		boolean hideUserName = settings.BILLING_HIDE_USER_NAME.get();
+		hideUserNameCheckbox.setChecked(hideUserName);
 		subscribeButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				if (inAppHelper != null) {
 					userName = userNameEdit.getText().toString().trim();
 					email = emailEdit.getText().toString().trim();
-					country = selectCountryEdit.getText().toString().trim();
+					String countryName = selectedCountryItem != null ? selectedCountryItem.getLocalName() : "";
+					String countryDownloadName = selectedCountryItem != null ? selectedCountryItem.getDownloadName() : "";
 
-					if (Algorithms.isEmpty(userName)) {
-						getMyApplication().showToastMessage("Please enter visible name");
-						return;
-					}
 					if (Algorithms.isEmpty(email) || !AndroidUtils.isValidEmail(email)) {
 						getMyApplication().showToastMessage("Please enter valid E-mail address");
 						return;
 					}
+					if (Algorithms.isEmpty(userName) && !hideUserNameCheckbox.isChecked()) {
+						getMyApplication().showToastMessage("Please enter Public Name");
+						return;
+					}
 
 					settings.BILLING_USER_NAME.set(userName);
 					settings.BILLING_USER_EMAIL.set(email);
-					settings.BILLING_USER_COUNTRY.set(country);
+					settings.BILLING_USER_COUNTRY.set(countryName);
+					settings.BILLING_USER_COUNTRY_DOWNLOAD_NAME.set(countryDownloadName);
+					settings.BILLING_HIDE_USER_NAME.set(hideUserNameCheckbox.isChecked());
 
-					final WorldRegion world = getMyApplication().getRegions().getWorldRegion();
-					String countryParam = country.equals(world.getLocaleName()) ? "" : country;
-
-					inAppHelper.purchaseLiveUpdates(getActivity(), email, userName, countryParam);
+					inAppHelper.purchaseLiveUpdates(getActivity(), email, userName, countryDownloadName);
 				}
 			}
 		});
@@ -165,7 +166,7 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 
 	@Override
 	public void onGetItems() {
-		updatePrice();
+		updatePrice(getView());
 	}
 
 	@Override
@@ -201,18 +202,21 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 	}
 
 	@Override
-	public void onSearchResult(String name) {
+	public void onSearchResult(CountryItem item) {
+		selectedCountryItem = item;
 		View view = getView();
 		if (view != null) {
 			EditText selectCountryEdit = (EditText) view.findViewById(R.id.selectCountryEdit);
 			if (selectCountryEdit != null) {
-				selectCountryEdit.setText(name);
+				selectCountryEdit.setText(item.getLocalName());
 			}
 		}
 	}
 
-	private void updatePrice() {
-		View view = getView();
+	private void updatePrice(View view) {
+		if (view == null) {
+			view = getView();
+		}
 		if (view != null) {
 			TextView priceTextView = (TextView) view.findViewById(R.id.priceTextView);
 			if (InAppHelper.getLiveUpdatesPrice() != null) {
@@ -220,79 +224,4 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 			}
 		}
 	}
-
-	private void initCountries() {
-		final WorldRegion root = getMyApplication().getRegions().getWorldRegion();
-		ArrayList<WorldRegion> groups = new ArrayList<>();
-		groups.add(root);
-		processGroup(root, groups, getActivity());
-		Collections.sort(groups, new Comparator<WorldRegion>() {
-			@Override
-			public int compare(WorldRegion lhs, WorldRegion rhs) {
-				if (lhs == root) {
-					return -1;
-				}
-				if (rhs == root) {
-					return 1;
-				}
-				return getHumanReadableName(lhs).compareTo(getHumanReadableName(rhs));
-			}
-		});
-		for (WorldRegion group : groups) {
-			String name = getHumanReadableName(group);
-			regionNames.add(name);
-		}
-	}
-
-	private static void processGroup(WorldRegion group,
-									 List<WorldRegion> nameList,
-									 Context context) {
-		if (group.isRegionMapDownload()) {
-			nameList.add(group);
-		}
-
-		if (group.getSubregions() != null) {
-			for (WorldRegion g : group.getSubregions()) {
-				processGroup(g, nameList, context);
-			}
-		}
-	}
-
-	private static String getHumanReadableName(WorldRegion group) {
-		String name;
-		if (group.getLevel() > 2 || (group.getLevel() == 2
-				&& group.getSuperregion().getRegionId().equals(WorldRegion.RUSSIA_REGION_ID))) {
-			WorldRegion parent = group.getSuperregion();
-			WorldRegion parentsParent = group.getSuperregion().getSuperregion();
-			if (group.getLevel() == 3) {
-				if (parentsParent.getRegionId().equals(WorldRegion.RUSSIA_REGION_ID)) {
-					name = parentsParent.getLocaleName() + " " + group.getLocaleName();
-				} else if (!parent.getRegionId().equals(WorldRegion.UNITED_KINGDOM_REGION_ID)) {
-					name = parent.getLocaleName() + " " + group.getLocaleName();
-				} else {
-					name = group.getLocaleName();
-				}
-			} else {
-				name = parent.getLocaleName() + " " + group.getLocaleName();
-			}
-		} else {
-			name = group.getLocaleName();
-		}
-		if (name == null) {
-			name = "";
-		}
-		return name;
-	}
-
-	public static class CountrySearchSelectionFragment extends SearchSelectionFragment {
-		@Override
-		protected ArrayList<String> getList() {
-			return ((SubscriptionFragment) getParentFragment()).regionNames;
-		}
-
-		@Override
-		protected int getListItemIcon() {
-			return R.drawable.ic_map;
-		}
-	}
 }

From a438110571dd0d881db5ada7c515b47ea8ae0c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Sok=C3=B3=C5=82?= <psokol@jabster.pl>
Date: Tue, 26 Jan 2016 11:59:53 +0100
Subject: [PATCH 41/72] Translated using Weblate (Polish)

Currently translated at 99.2% (1877 of 1891 strings)
---
 OsmAnd/res/values-pl/strings.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 6f3f5f15d6..fed23a28c9 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -303,7 +303,7 @@
 
     <string name="error_occurred_loading_gpx">Wystąpił błąd podczas wczytywania GPX</string>
     <string name="send_report">Wyślij zgłoszenie</string>
-    <string name="none_region_found">Brak danych offline na karcie SD. Pobierz je z Internetu.</string>
+    <string name="none_region_found">Brak danych offline na karcie SD. Proszę pobrać je z sieci.</string>
     <string name="poi_namefinder_query_empty">Wprowadź zapytanie by znaleźć POI</string>
     <string name="any_poi">Jakiekolwiek</string>
     <string name="layer_transport_route">Trasa transportu publicznego</string>
@@ -2069,7 +2069,7 @@
     <string name="updates_size">Aktualizacje: %s</string>
     <string name="last_map_change">Ostatnia zmiana mapy: %s</string>
     <string name="rec_split_clip_length">Długość nagrania</string>
-    <string name="shared_string_not_selected">Nie wybrane</string>
+    <string name="shared_string_not_selected">Nie wybrany</string>
 <string name="item_removed">Pozycja usunięta</string>
     <string name="n_items_removed">Pozycje usunięta</string>
     <string name="shared_string_undo_all">COFNIJ WSZYSTKO</string>
@@ -2090,4 +2090,6 @@
     <string name="number_of_edits">Liczba edycji</string>
     <string name="reports_for">Raport dla</string>
 <string name="number_of_contributors">Liczba współtwórców</string>
+    <string name="shared_string_read_more">Przeczytaj więcej</string>
+    <string name="rendering_attr_hideUnderground_name">Ukrycie podziemnych obiektów</string>
     </resources>

From e988679f7ef384d7f34320b8e6486dfaba0bb1b6 Mon Sep 17 00:00:00 2001
From: Ajeje Brazorf <lmelonimamo@yahoo.it>
Date: Tue, 26 Jan 2016 15:07:22 +0100
Subject: [PATCH 42/72] Translated using Weblate (Sardinian)

Currently translated at 99.9% (1890 of 1891 strings)
---
 OsmAnd/res/values-sc/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 9e0ffea71a..b750b97e6c 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -714,7 +714,7 @@
     <string name="left_side_navigation">Ghia a manca</string>
     <string name="left_side_navigation_descr">Abìlita in sos istados in ue si ghiat mantenende sa manca</string>
     <string name="unknown_from_location">Sa positzione de tzucada no est istada galu determinata</string>
-    <string name="unknown_location">Positzione calu non connota</string>
+    <string name="unknown_location">Positzione galu disconnota</string>
     <string name="modify_transparency">Muda sa trasparèntzia (0 - trasparente, 255 - annapau)</string>
     <string name="confirm_interrupt_download">Boles firmare s’isgarrigamentu de sos documentos?</string>
     <string name="local_indexes_cat_tile">Mapas in lìnia e in cache a tasseddos</string>
@@ -2094,4 +2094,5 @@
     <string name="road_blocked">Àndala blocada</string>
     <string name="shared_string_select">Ischerta</string>
     <string name="rendering_attr_hideUnderground_name">Cua ogetos suta de terra</string>
+    <string name="shared_string_read_more">Leghe àteru</string>
     </resources>

From c5dfb07225b00ab9babdd577f3216cd955983c12 Mon Sep 17 00:00:00 2001
From: Roberto GEB <robertogeb@gmail.com>
Date: Tue, 26 Jan 2016 19:21:15 +0100
Subject: [PATCH 43/72] Translated using Weblate (Spanish)

Currently translated at 99.9% (1890 of 1891 strings)
---
 OsmAnd/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 527f600ce4..9360e6564e 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -2056,4 +2056,5 @@
     <string name="reports_for">Informe para</string>
 <string name="rendering_attr_hideUnderground_name">Ocultar objetos subterráneos</string>
     <string name="data_is_not_available">No hay datos disponibles</string>
+    <string name="shared_string_read_more">Leer más</string>
     </resources>

From afdef2446d9d41f379400fcaba0158c3d7b8418f Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 26 Jan 2016 12:02:00 +0100
Subject: [PATCH 44/72] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 5d4a5ad2bc..8ffe299ea5 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -2682,15 +2682,15 @@
 	<string name="poi_nuclear_explosion_purpose_safety_experiment">Eksplosionsformål: sikkerhedseksperiment</string>
 	<string name="poi_nuclear_explosion_purpose_research_for_peaceful_applications">Eksplosionsformål: forskning for fredelige anvendelser</string>
 	<string name="poi_nuclear_explosion_purpose_fundamental_science">Eksplosionsformål: grundlæggende videnskab</string>
-	<string name="poi_nuclear_explosion_purpose_industrial_application_cavity_excavation">Eksplosionsformål: industriel anvendelse, hulrum udgravning</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_cavity_excavation">Eksplosionsformål: industriel anvendelse, udgravning af hulrum</string>
 	<string name="poi_nuclear_explosion_purpose_industrial_application_seismic_sounding">Eksplosionsformål: industriel anvendelse, seismiske pejlinger</string>
-	<string name="poi_nuclear_explosion_purpose_industrial_application_oil_stimulation">Eksplosionsformål: industriel anvendelse, olie stimulation</string>
+	<string name="poi_nuclear_explosion_purpose_industrial_application_oil_stimulation">Eksplosionsformål: industriel anvendelse, oliestimulering</string>
 	<string name="poi_nuclear_explosion_purpose_industrial_application">Eksplosionsformål: industriel anvendelse</string>
 	<string name="poi_nuclear_explosion_purpose_industrial_application_earth_moving">Eksplosionsformål: industriel anvendelse, jordflytning</string>
 	<string name="poi_nuclear_explosion_time_utc">Eksplosionstidpunkt (UTC)</string>
 	<string name="poi_nuclear_explosion_yield">Eksplosion udbytte</string>
-	<string name="poi_nuclear_explosion_hole">Eksplosion hul</string>
-	<string name="poi_nuclear_explosion_height_of_burst">Højde af eksplosionen</string>
+	<string name="poi_nuclear_explosion_hole">Eksplosionshul</string>
+	<string name="poi_nuclear_explosion_height_of_burst">Eksplosionenshøjde</string>
 	<string name="poi_nuclear_explosion_ground_zero_altitude">Jordoverfladenshøjde</string>
 	<string name="poi_nuclear_explosion_body_wave_magnitude">bølge størrelsesorden</string>
 	<string name="poi_nuclear_explosion_salvo_first_detonation">Eksplosionssalve: første detonation af en salvetest</string>

From b0901bec07850922a42ea69baf0d5835e86261c9 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Mon, 25 Jan 2016 22:26:37 +0100
Subject: [PATCH 45/72] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index c1eebe8c83..1396524d6e 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2264,4 +2264,5 @@
 \nTwitter: https://twitter.com/osmandapp
 \nFacebook: https://www.facebook.com/osmandapp\nHjemmeside: http://osmand.net
 \n\nEr der brug for hjælp med OsmAnd, kontakt da supportteamet: support@osmand.net. "</string>
+    <string name="shared_string_email_address">Email adresse</string>
     </resources>

From 904a9fadbcec5a6ae8e6376e840525bea26c0e1e Mon Sep 17 00:00:00 2001
From: Adriano Rosa <adrianojbr@gmail.com>
Date: Mon, 25 Jan 2016 19:29:57 +0100
Subject: [PATCH 46/72] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1892 of 1892 strings)
---
 OsmAnd/res/values-pt-rBR/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 48c6a4becd..0ebf2f2d7f 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -2004,4 +2004,5 @@
     <string name="rendering_attr_hideUnderground_name">Ocultar objetos subterrâneos</string>
     <string name="shared_string_read_more">Leia mais</string>
     <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Mapas &amp; Navigação - fazer rotas e encontrar locais no mapa sem uma conexão com a Internet. Baixe um mapa de um país antes de você ir em uma viagem para encontrar lugares e rotas em uma área desconhecida. Opções básicas: • Mapas detalhados de 200 países • Navegador offline com instruções de voz • Pesquisa por endereço no modo offline • Informação sobre locais no mapa: locais de interesse, cafeterias, estacionamentos, lojas • Inclusão de locais favoritos • Navegação para motoristas, ciclistas e pedestres Opções adicionais: • Capacidade de exibir e gravar trilhas GPX • Descrição da Wikipédia descrição de POIs • Adição de notas no mapa com foto, áudio e vídeo • Modos dia e noite para condução mais conveniente • Informação sobre rotas de transportes públicos e paradas • Ciclovias e caminhos para pedestres • Trilhas de caminhada para turismo em todo o mundo • Mapas online de numerosas fontes • Informação sobre a qualidade do pavimento da estrada e iluminação da rua • Adição, edição e exclusão de POIs (para usuários OpenStreetMap.org) • OsMo - acompanhamento ao vivo de outros usuários Obter um navegador confiável no seu país - seja ele, França, Alemanha, México, Reino Unido, Espanha, Holanda, EUA, Rússia, Brasil ou qualquer outro país. Plugins: • Mapas de contorno e sombreamento https://goo.gl/7mojP8 Visualização das curvas de nível e do relevo adicionados ao mapa básico do OsmAnd. • Mapas de esqui https://goo.gl/pX6DxJ Informação sobre as pistas de esqui, trilhas de esqui e teleféricos. • Mapa náutico https://goo.gl/0hEdxm Estilo de mapa especial para a visualização de sinais de navegação náutica para navegação fluvial e marítima. • Posição de estacionamento https://goo.gl/6JxQXF Ajuda a marcar a localização de seu veículo estacionado e ver quanto tempo resta, se o estacionamento tiver limitação de tempo. Fique ligado! Twitter: o https://twitter.com/osmandapp Facebook: https://www.facebook.com/osmandapp Site: http://osmand.net Se precisar de ajuda com o aplicativo OsmAnd, por favor, entre em contato com nossa equipe de suporte: support@osmand.net. "</string>
+    <string name="shared_string_email_address">Endereço de email</string>
     </resources>

From d40097854e009a13d738351919b3b89e364fc59c Mon Sep 17 00:00:00 2001
From: Adriano Rosa <adrianojbr@gmail.com>
Date: Mon, 25 Jan 2016 18:20:35 +0100
Subject: [PATCH 47/72] Translated using Weblate (Portuguese (Brazil))

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

diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index 29af9a837e..898ff1577e 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -2668,4 +2668,6 @@
 
 <string name="poi_addr_housename">Complemento</string>
 
+<string name="poi_religion">Bens religiosos</string>
+
 </resources>

From 401af68e02907cdeb455ade740a1cec722fd4ab9 Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Tue, 26 Jan 2016 13:19:46 +0100
Subject: [PATCH 48/72] Translated using Weblate (Chinese (Taiwan))

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

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 422f7b5291..dd2a8b3542 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2085,4 +2085,5 @@
     <string name="rendering_attr_hideUnderground_name">隱藏地面下的物件</string>
     <string name="shared_string_read_more">讀取更多</string>
     <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd 地圖與導航 - 無須網路連線即可在地圖上製作路線和尋找地點。在去一個陌生的地方旅行前，下載一個國家的地圖，找到地點和路線。基本選項： • 200個國家的詳細地圖 • 離線導航附帶語音提示 • 在離線模式下的地址查尋 • 在地圖上關於所在地的資訊：感興趣的地方、咖啡廳、停車場、商店 • 增加場所到我的收藏 • 開車，騎自行車和行人導航附加選項：• 有能力去查看和記錄 GPX 軌跡 • 維基百科的 POI 介紹 • 加入照片，音訊，視訊和註釋到地圖 • 更方便駕駛的白天和夜晚地圖模式 • 相關的大眾運輸路線和停靠站資訊 • 自行車道和人行道 • 旅遊全世界各地的步行小徑 • 從眾多來源的線上地圖 • 有關道路鋪設品質及街道照明的資訊 • 增加、編輯和刪除 POI (對 OpenStreetMap.org 使用者) • OsMo - 在您的國家即時監控其它裝置獲得可靠的導航 - 無論是法國、德國、墨西哥、英國、西班牙、荷蘭、美國、俄羅斯、巴西或任何其他國家。外掛元件：• 等高線地圖和山體陰影，https://goo.gl/7mojP8 等高線資料和地形顯現增加到基本的 OsmAnd 地圖上。 • 滑雪地圖 https://goo.gl/pX6DxJ 有關滑雪道、越野滑雪道、纜車和滑雪索道的資訊。 • 航海地圖 https://goo.gl/0hEdxm 專用的地圖式樣，用在幹線和近岸航海導引來查看海上導航標誌。 • 停車位置 https://goo.gl/6JxQXF 幫助您標記您停放車輛的位置，如果有停車場有時限，可查看還剩多少時間。持續關注！Twitter：https://twitter.com/osmandapp Facebook：https://www.facebook.com/osmandapp 網站：http://osmand.net 如果您需要 OsmAnd 應用程式相關的幫助，請聯絡我們的支援團隊：support@osmand.net "</string>
+    <string name="shared_string_email_address">E-mail 地址</string>
     </resources>

From 1cfd4dafc3802bc2a731d89089a6d14f56b98eb4 Mon Sep 17 00:00:00 2001
From: Roberto GEB <robertogeb@gmail.com>
Date: Wed, 27 Jan 2016 01:17:29 +0100
Subject: [PATCH 49/72] Translated using Weblate (Spanish)

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

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 9360e6564e..58fd5b89fd 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -2057,4 +2057,6 @@
 <string name="rendering_attr_hideUnderground_name">Ocultar objetos subterráneos</string>
     <string name="data_is_not_available">No hay datos disponibles</string>
     <string name="shared_string_read_more">Leer más</string>
+    <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Mapas y Navegación - prepara rutas y encuentra ubicaciones en el mapa sin una conexión a Internet. Descarga un mapa de un país antes de que viajes para encontrar sitios y rutas en un área que no te sea familiar. Opciones básicas: • Mapas detallados de 200 países • Navegador fuera de línea con avisos de voz • Búsqueda de direcciones en modo sin conexión • Información sobre ubicaciones en el mapa: sitios de interés, cafeterías, aparcamientos, tiendas • Añadir ubicaciones a tus favoritos • Opciones adicionales de navegación en modos Conducción, Ciclismo y Pedestre : • Capacidad de ver y grabar trazas GPX • Descripciones de Wikipedia de los PDI • Añadir notas de foto, audio y vídeo al mapa • Modos de mapa Día y Noche  para una conducción más conveniente • Información sobre rutas y paradas de transporte público • Vías ciclistas y caminos • Vías de senderismo para hacer turismo en todo el mundo • Mapas en línea de numerosas fuentes • Información sobre calidad del pavimento e iluminación de las y las calles • Añadir, editar y eliminar PDI (para usuarios deOpenstreetmap.org) • OsMo - monitorización de directo de otros dispositivos Consigue un explorador fiable en tu país - ya sea Francia, Alemania, México, Reino Unido, España, Holanda, EE.UU., Rusia, Brasil o cualquiera otro estado. Extras: • Mapas de contorno y sombreado del terreno https://goo.gl/7mojP8 Datos de curvas de nivel y visualización de terreno añadidos al mapa básico OsmAnd . • Mapas de esquí https://goo.gl/pX6DxJ La información sobre pistas de esquí, pistas de esquí de fondo, telecabinas y ascensores de esquí. • Mapa náutico https://goo.gl/0hEdxm Estilo de mapa especial para ver señales de navegación náutica para arteriales y navegación costera. • Posición de aparcamiento https://goo.gl/6jxQXF Te ayuda a marcar la ubicación de tu vehículo aparcado y ver cuánto tiempo queda si el aparcamiento es por tiempo limitado. ¡Mantente informado! Twitter: https://twitter.com/osmandapp Facebook: https://www.facebook.com/osmandapp Sitio: http://osmand.net Si necesitas ayuda con la aplicación OsmAnd, por favor contacta con nuestro equipo de soporte: support@osmand.net. "</string>
+    <string name="shared_string_email_address">Dirección de correo electrónico</string>
     </resources>

From b6e5b5a01efa8dbc0eddf1763c8bf0d4d209945c Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Wed, 27 Jan 2016 10:28:22 +0300
Subject: [PATCH 50/72] Added free and full inapp for live updates

---
 .../net/osmand/plus/inapp/InAppHelper.java    | 26 ++++++++++++-------
 .../plus/liveupdates/LiveUpdatesFragment.java |  1 -
 .../liveupdates/SubscriptionFragment.java     |  3 ++-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
index 9237a22a1c..0b489fd85c 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
@@ -41,14 +41,9 @@ public class InAppHelper {
 	private static boolean mSubscribedToLiveUpdates = false;
 	private static String mLiveUpdatesPrice;
 
-	public static final String SKU_LIVE_UPDATES = "osm_live_subscription_1";
-
-	// Static test
-	//public static final String SKU_LIVE_UPDATES = "android.test.purchased";
-	//public static final String SKU_LIVE_UPDATES = "android.test.canceled";
-	//public static final String SKU_LIVE_UPDATES = "android.test.refunded";
-	//public static final String SKU_LIVE_UPDATES = "android.test.item_unavailable";
-
+	private static final String SKU_LIVE_UPDATES_FULL = "osm_live_subscription_2";
+	private static final String SKU_LIVE_UPDATES_FREE = "osm_free_live_subscription_2";
+	private static String SKU_LIVE_UPDATES;
 
 	// (arbitrary) request code for the purchase flow
 	private static final int RC_REQUEST = 10001;
@@ -80,9 +75,20 @@ public class InAppHelper {
 		return mLiveUpdatesPrice;
 	}
 
+	public static String getSkuLiveUpdates() {
+		return SKU_LIVE_UPDATES;
+	}
+
 	public InAppHelper(OsmandApplication ctx, InAppCallbacks callbacks) {
 		this.ctx = ctx;
 		this.callbacks = callbacks;
+		if (SKU_LIVE_UPDATES == null) {
+			if (Version.isFreeVersion(ctx)) {
+				SKU_LIVE_UPDATES = SKU_LIVE_UPDATES_FREE;
+			} else {
+				SKU_LIVE_UPDATES = SKU_LIVE_UPDATES_FULL;
+			}
+		}
 	}
 
 	public void start(final boolean stopAfterResult) {
@@ -110,7 +116,7 @@ public class InAppHelper {
 		mHelper = new IabHelper(ctx, base64EncodedPublicKey);
 
 		// enable debug logging (for a production application, you should set this to false).
-		mHelper.enableDebugLogging(true);
+		mHelper.enableDebugLogging(false);
 
 		// Start setup. This is asynchronous and the specified listener
 		// will be called once setup completes.
@@ -401,7 +407,7 @@ public class InAppHelper {
 	}
 
 	private String sendRequest(String url, Map<String, String> parameters, String userOperation) {
-		Log.d(TAG, "Sending request " + url); //$NON-NLS-1$
+		Log.d(TAG, "Sending request " + url);
 		HttpURLConnection connection = null;
 		try {
 			connection = NetworkUtils.getHttpURLConnection(url);
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
index 81f561ad28..eb9d47de7f 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
@@ -78,7 +78,6 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
 							 Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.fragment_live_updates, container, false);
 		listView = (ExpandableListView) view.findViewById(android.R.id.list);
-//		View header = inflater.inflate(R.layout.live_updates_header, listView, false);
 
 		View bottomShadowView = inflater.inflate(R.layout.shadow_bottom, listView, false);
 		listView.addFooterView(bottomShadowView);
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
index 03201a876e..fe895a1e4a 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
@@ -172,7 +172,7 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 	@Override
 	public void onItemPurchased(String sku) {
 
-		if (InAppHelper.SKU_LIVE_UPDATES.equals(sku)) {
+		if (InAppHelper.getSkuLiveUpdates().equals(sku)) {
 			Fragment parentFragment = getParentFragment();
 			if (parentFragment instanceof LiveUpdatesFragment) {
 				((LiveUpdatesFragment) parentFragment).updateSubscriptionBanner();
@@ -190,6 +190,7 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 		dlg = new ProgressDialog(getActivity());
 		dlg.setTitle("");
 		dlg.setMessage(getString(R.string.wait_current_task_finished));
+		dlg.setCancelable(false);
 		dlg.show();
 	}
 

From b56665b2b150523a90df65888d865a2259aea544 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Wed, 27 Jan 2016 10:56:39 +0300
Subject: [PATCH 51/72] Subscription UI fixes

---
 OsmAnd/res/drawable/bg_card_orange.xml      | 14 ++++++++++++++
 OsmAnd/res/drawable/btn_round_shade.xml     | 13 +++++++++++++
 OsmAnd/res/layout/live_updates_header.xml   |  6 +++---
 OsmAnd/res/layout/subscription_fragment.xml |  6 ++++++
 4 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 OsmAnd/res/drawable/bg_card_orange.xml
 create mode 100644 OsmAnd/res/drawable/btn_round_shade.xml

diff --git a/OsmAnd/res/drawable/bg_card_orange.xml b/OsmAnd/res/drawable/bg_card_orange.xml
new file mode 100644
index 0000000000..1eac7a0dfe
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_card_orange.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_card_shadow" />
+    </item>
+    <item>
+        <shape>
+            <solid
+                android:color="@color/osmand_orange" />
+            <corners
+                android:radius="2dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_round_shade.xml b/OsmAnd/res/drawable/btn_round_shade.xml
new file mode 100644
index 0000000000..24d01d3f77
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_round_shade.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+        <solid android:color="@color/map_widget_dark_pressed" />
+        <corners android:radius="@dimen/map_button_rect_rad" />
+    </shape></item>
+    <item><shape android:shape="rectangle">
+        <solid android:color="@color/fab_color_pressed" />
+        <corners android:radius="@dimen/map_button_rect_rad" />
+    </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/live_updates_header.xml b/OsmAnd/res/layout/live_updates_header.xml
index 673ef3052a..89423ff74c 100644
--- a/OsmAnd/res/layout/live_updates_header.xml
+++ b/OsmAnd/res/layout/live_updates_header.xml
@@ -13,7 +13,7 @@
         android:id="@+id/subscription_banner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/osmand_orange"
+        android:background="@drawable/bg_card_orange"
         android:orientation="vertical"
         android:paddingBottom="8dp"
         android:paddingLeft="24dp"
@@ -60,7 +60,7 @@
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
 	            android:textColor="@color/color_white"
-	            android:background="@drawable/btn_round_transparent"
+	            android:background="@drawable/btn_round_shade"
 	            android:text="@string/shared_string_read_more"/>
 	        
 	        <Button
@@ -69,7 +69,7 @@
 	            android:layout_height="wrap_content"
 				android:layout_marginLeft="32dp"
 	            android:textColor="@color/color_white"
-	            android:background="@drawable/btn_round_transparent"
+	            android:background="@drawable/btn_round_shade"
 	            android:text="@string/osm_live_subscribe_btn"/>
 		</LinearLayout>
     </LinearLayout>
diff --git a/OsmAnd/res/layout/subscription_fragment.xml b/OsmAnd/res/layout/subscription_fragment.xml
index a2f7195c49..778c7314fc 100644
--- a/OsmAnd/res/layout/subscription_fragment.xml
+++ b/OsmAnd/res/layout/subscription_fragment.xml
@@ -63,6 +63,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="16dp"
                     android:layout_marginRight="16dp"
+                    android:paddingLeft="2dp"
                     android:hint="@string/shared_string_email_address"
                     android:inputType="textEmailAddress"/>
 
@@ -72,6 +73,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
+                android:paddingLeft="2dp"
                 android:layout_marginLeft="72dp"
                 android:layout_marginRight="16dp"
                 android:text="@string/osm_live_email_desc"
@@ -103,6 +105,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
+                        android:paddingLeft="2dp"
                         android:hint="@string/osm_live_user_public_name"
                         android:inputType="text"/>
 
@@ -117,6 +120,7 @@
                     android:layout_marginLeft="72dp"
                     android:layout_marginRight="16dp"
                     android:layout_marginTop="8dp"
+                    android:paddingLeft="2dp"
                     android:text="@string/osm_live_hide_user_name"
                     android:textColor="?android:attr/textColorPrimary"/>
 
@@ -148,6 +152,8 @@
                             android:layout_marginLeft="16dp"
                             android:layout_marginRight="16dp"
                             android:layout_marginTop="4dp"
+                            android:paddingLeft="2dp"
+                            android:paddingRight="0dp"
                             android:drawableRight="@drawable/ic_action_arrow_drop_down"
                             android:editable="false"
                             android:hint="@string/osm_live_support_region"/>

From ce334f1b7c770b722cc1e2b9ff80940709e5d2eb Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Wed, 27 Jan 2016 12:02:58 +0300
Subject: [PATCH 52/72] Fix https://github.com/osmandapp/Osmand/issues/2078

---
 .../mapcontextmenu/MapContextMenuFragment.java  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index 3a295e79de..d6aea8dd3f 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -76,6 +76,8 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 	private int menuBottomViewHeight;
 	private int menuFullHeight;
 	private int menuFullHeightMax;
+	private int menuTopViewHeightExcludingTitle;
+	private int menuTitleTopBottomPadding;
 
 	private int screenHeight;
 	private int viewHeight;
@@ -717,8 +719,19 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 				menuFullHeight = view.findViewById(R.id.context_menu_main).getHeight();
 
 				int dy = 0;
-				if (!menu.isLandscapeLayout() && menuTopViewHeight != 0) {
-					dy = Math.max(0, newMenuTopViewHeight - menuTopViewHeight - (newMenuTopShadowAllHeight - menuTopShadowAllHeight));
+				if (!menu.isLandscapeLayout()) {
+					TextView line1 = (TextView) view.findViewById(R.id.context_menu_line1);
+					if (menuTopViewHeight != 0) {
+						int titleHeight = line1.getLineCount() * line1.getLineHeight() + menuTitleTopBottomPadding;
+						if (titleHeight < line1.getMeasuredHeight()) {
+							titleHeight = line1.getMeasuredHeight();
+						}
+						newMenuTopViewHeight = menuTopViewHeightExcludingTitle + titleHeight;
+						dy = Math.max(0, newMenuTopViewHeight - menuTopViewHeight - (newMenuTopShadowAllHeight - menuTopShadowAllHeight));
+					} else {
+						menuTopViewHeightExcludingTitle = newMenuTopViewHeight - line1.getMeasuredHeight();
+						menuTitleTopBottomPadding = line1.getMeasuredHeight() - line1.getLineCount() * line1.getLineHeight();
+					}
 				}
 				menuTopViewHeight = newMenuTopViewHeight;
 				menuTopShadowAllHeight = newMenuTopShadowAllHeight;

From e58973b0ff73b3a2476b235b389300372fe118d8 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Wed, 27 Jan 2016 10:26:49 +0100
Subject: [PATCH 53/72] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 1396524d6e..e5fca9b725 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1535,7 +1535,7 @@
     <string name="rendering_attr_showAccess_name">Vis adgangsbegrænsninger</string>
     <string name="rendering_attr_showSurfaceGrade_name">Vis vejkvaliteten</string>
     <string name="rendering_attr_showSurfaces_name">Vis vejbelægning</string>
-    <string name="rendering_attr_showCycleRoutes_name">Vis cykelruter</string>
+    <string name="rendering_attr_showCycleRoutes_name">Cykelruter</string>
     <string name="local_map_names">Lokale navne</string>
     <string name="lang_sw">Swahili</string>
     <string name="lang_he">Hebræisk</string>

From b52dbdd3b7a5682060655a834f83d525af3f365e Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Wed, 27 Jan 2016 08:07:51 +0100
Subject: [PATCH 54/72] Translated using Weblate (French)

Currently translated at 99.8% (1890 of 1892 strings)
---
 OsmAnd/res/values-fr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 14f55700f2..75d3f36e51 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -2124,4 +2124,5 @@
     <string name="data_is_not_available">Donnée indisponible</string>
     <string name="rendering_attr_hideUnderground_name">Cacher les objets souterrains</string>
     <string name="shared_string_read_more">Lire la suite</string>
+    <string name="shared_string_email_address">Adresse email</string>
     </resources>

From b8ed2537558ef167ca28f5a86b71b8bfb24b8681 Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Wed, 27 Jan 2016 10:13:02 +0100
Subject: [PATCH 55/72] Translated using Weblate (Swedish)

Currently translated at 99.2% (1877 of 1892 strings)
---
 OsmAnd/res/values-sv/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index efd27731ff..35629eaa4b 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -2078,4 +2078,5 @@
     <string name="rendering_attr_hideUnderground_name">Dölj underjordiska objekt</string>
     <string name="shared_string_read_more">Läs mer</string>
     <string name="rec_split_storage_size">Lagringsutrymme</string>
+    <string name="shared_string_email_address">E-postadress</string>
     </resources>

From c478125d0fe3dbc0349d7062e5ac010209a72293 Mon Sep 17 00:00:00 2001
From: Adriano Rosa <adrianojbr@gmail.com>
Date: Tue, 26 Jan 2016 22:56:43 +0100
Subject: [PATCH 56/72] Translated using Weblate (Portuguese (Brazil))

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

diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index 898ff1577e..378ea11b96 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -2668,6 +2668,6 @@
 
 <string name="poi_addr_housename">Complemento</string>
 
-<string name="poi_religion">Bens religiosos</string>
+<string name="poi_religion">Artigos religiosos</string>
 
 </resources>

From eb51900b908bd41d04658e7c7cc2fb11c13d5954 Mon Sep 17 00:00:00 2001
From: Roberto GEB <robertogeb@gmail.com>
Date: Wed, 27 Jan 2016 01:20:10 +0100
Subject: [PATCH 57/72] Translated using Weblate (Spanish)

Currently translated at 99.6% (2424 of 2432 strings)
---
 OsmAnd/res/values-es/phrases.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index d0a228d2e5..cba6dfc01f 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -2665,4 +2665,7 @@
 	<string name="poi_nuclear_explosion_warhead">Explosión: ojiva</string>
 	<string name="poi_nuclear_explosion_device">Explosión: dispositivo</string>
 
+<string name="poi_addr_housename">Nombre de la casa</string>
+	<string name="poi_religion">Artículos religiosos</string>
+
 </resources>

From 519f56b7e2b49eb9f1641e7ee8ea691c0966a215 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Tue, 26 Jan 2016 14:27:47 +0200
Subject: [PATCH 58/72] Fixed problem with wrong color in list items.

---
 .../res/layout/osmand_simple_list_item_1.xml  |  11 ++
 .../liveupdates/SearchSelectionFragment.java  | 126 ++++++++++++++++++
 2 files changed, 137 insertions(+)
 create mode 100644 OsmAnd/res/layout/osmand_simple_list_item_1.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/liveupdates/SearchSelectionFragment.java

diff --git a/OsmAnd/res/layout/osmand_simple_list_item_1.xml b/OsmAnd/res/layout/osmand_simple_list_item_1.xml
new file mode 100644
index 0000000000..683c93926b
--- /dev/null
+++ b/OsmAnd/res/layout/osmand_simple_list_item_1.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@android:id/text1"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:textAppearance="?android:attr/textAppearanceListItemSmall"
+          android:textColor="?android:textColorPrimary"
+          android:gravity="center_vertical"
+          android:paddingStart="@dimen/list_content_padding"
+          android:paddingEnd="@dimen/list_content_padding"
+          android:minHeight="?android:attr/listPreferredItemHeightSmall" />
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/SearchSelectionFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/SearchSelectionFragment.java
new file mode 100644
index 0000000000..f3bf246081
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/SearchSelectionFragment.java
@@ -0,0 +1,126 @@
+package net.osmand.plus.liveupdates;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.annotation.DrawableRes;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import net.osmand.plus.R;
+import net.osmand.plus.base.BaseOsmAndDialogFragment;
+
+import java.util.ArrayList;
+
+public abstract class SearchSelectionFragment extends BaseOsmAndDialogFragment {
+	private OnFragmentInteractionListener mListener;
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+							 Bundle savedInstanceState) {
+		View view = inflater.inflate(R.layout.fragment_search_list, container, false);
+		ListView listView = (ListView) view.findViewById(android.R.id.list);
+		final ArrayAdapter<String> adapter = new ListAdapter(getActivity(), getListItemIcon());
+		if (getArray() != null) {
+			adapter.addAll(getArray());
+		} else if (getList() != null) {
+			adapter.addAll(getList());
+		} else {
+			throw new RuntimeException("Either getArray() or getList() must return non null value.");
+		}
+		listView.setAdapter(adapter);
+		listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+			@Override
+			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+				mListener.onSearchResult(adapter.getItem(position));
+				dismiss();
+			}
+		});
+		final EditText searchEditText = (EditText) view.findViewById(R.id.searchEditText);
+		searchEditText.addTextChangedListener(new TextWatcher() {
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+			}
+
+			@Override
+			public void onTextChanged(CharSequence s, int start, int before, int count) {
+			}
+
+			@Override
+			public void afterTextChanged(Editable s) {
+				adapter.getFilter().filter(s);
+			}
+		});
+		ImageButton clearButton = (ImageButton) view.findViewById(R.id.clearButton);
+		setThemedDrawable(clearButton, R.drawable.ic_action_remove_dark);
+		clearButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				dismiss();
+			}
+		});
+		return view;
+	}
+
+	@Override
+	public void onAttach(Context context) {
+		super.onAttach(context);
+		if (context instanceof OnFragmentInteractionListener) {
+			mListener = (OnFragmentInteractionListener) context;
+		} else if (getParentFragment() instanceof OnFragmentInteractionListener) {
+			mListener = (OnFragmentInteractionListener) getParentFragment();
+		} else {
+			throw new RuntimeException(context.toString()
+					+ " must implement OnFragmentInteractionListener");
+		}
+	}
+
+	protected String[] getArray() {
+		return null;
+	}
+
+	protected ArrayList<String> getList() {
+		return null;
+	}
+
+	@DrawableRes
+	protected int getListItemIcon() {
+		return -1;
+	}
+
+	@Override
+	public void onDetach() {
+		super.onDetach();
+		mListener = null;
+	}
+
+	public interface OnFragmentInteractionListener {
+		void onSearchResult(String name);
+	}
+
+	private class ListAdapter extends ArrayAdapter<String> {
+		private final Drawable drawableLeft;
+
+		public ListAdapter(Context context, @DrawableRes int drawableLeftId) {
+			super(getMyActivity(), R.layout.osmand_simple_list_item_1);
+			this.drawableLeft = drawableLeftId == -1 ? null : getContentIcon(drawableLeftId);
+		}
+
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+			TextView view = (TextView) super.getView(position, convertView, parent);
+			view.setCompoundDrawablesWithIntrinsicBounds(drawableLeft, null, null, null);
+			view.setCompoundDrawablePadding(getResources().getDimensionPixelSize(R.dimen.list_content_padding));
+			return view;
+		}
+	}
+}

From 93f6c7f00e9a6dfc088dd20851126981212b5fb8 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Tue, 26 Jan 2016 17:28:22 +0200
Subject: [PATCH 59/72] Fixed double tap scaling bug.

---
 .../plus/views/DoubleTapScaleDetector.java    |  8 +++---
 .../osmand/plus/views/MultiTouchSupport.java  | 20 +++++++--------
 .../osmand/plus/views/OsmandMapTileView.java  | 25 ++++++++++++++++++-
 3 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/views/DoubleTapScaleDetector.java b/OsmAnd/src/net/osmand/plus/views/DoubleTapScaleDetector.java
index 0a0064d9ad..728dbdd9f8 100644
--- a/OsmAnd/src/net/osmand/plus/views/DoubleTapScaleDetector.java
+++ b/OsmAnd/src/net/osmand/plus/views/DoubleTapScaleDetector.java
@@ -52,7 +52,7 @@ public class DoubleTapScaleDetector {
 			secondDown = null;
 			if (isDoubleTapping) {
 				isDoubleTapping = false;
-				listener.onZoomEnded(scale, 0);
+				listener.onZoomEnded(scale);
 				return true;
 			} else {
 				firstUp = MotionEvent.obtain(event);
@@ -77,7 +77,7 @@ public class DoubleTapScaleDetector {
 					float delta = convertPxToDp((int) (firstDown.getY() - event.getY()));
 					float scaleDelta = delta / (displayHeightPx / SCALE_PER_SCREEN);
 					scale = 1 - scaleDelta;
-					listener.onZoomingOrRotating(scale, 0);
+					listener.onZooming(scale);
 					return true;
 				}
 			}
@@ -130,9 +130,9 @@ public class DoubleTapScaleDetector {
 	public interface DoubleTapZoomListener {
 		public void onZoomStarted(PointF centerPoint);
 
-		public void onZoomingOrRotating(double relativeToStart, float angle);
+		public void onZooming(double relativeToStart);
 
-		public void onZoomEnded(double relativeToStart, float angleRelative);
+		public void onZoomEnded(double relativeToStart);
 
 		public void onGestureInit(float x1, float y1, float x2, float y2);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java b/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java
index 0858795e53..c91c4d5869 100644
--- a/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java
+++ b/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java
@@ -1,16 +1,16 @@
 package net.osmand.plus.views;
 
-import java.lang.reflect.Method;
-
-import net.osmand.PlatformUtil;
-
-import net.osmand.util.MapUtils;
-import org.apache.commons.logging.Log;
-
 import android.content.Context;
 import android.graphics.PointF;
 import android.view.MotionEvent;
 
+import net.osmand.PlatformUtil;
+import net.osmand.util.MapUtils;
+
+import org.apache.commons.logging.Log;
+
+import java.lang.reflect.Method;
+
 
 public class MultiTouchSupport {
 
@@ -29,7 +29,7 @@ public class MultiTouchSupport {
     	
     	public void onZoomingOrRotating(double relativeToStart, float angle);
     	
-    	public void onZoomEnded(double relativeToStart, float angleRelative);
+    	public void onZoomOrRotationEnded(double relativeToStart, float angleRelative);
     	
     	public void onGestureInit(float x1, float y1, float x2, float y2);
     	
@@ -87,7 +87,7 @@ public class MultiTouchSupport {
 			Integer pointCount = (Integer) getPointerCount.invoke(event);
 			if(pointCount < 2){
 				if(inZoomMode){
-					listener.onZoomEnded(zoomRelative, angleRelative);
+					listener.onZoomOrRotationEnded(zoomRelative, angleRelative);
 				}
 				return false;
 			}
@@ -112,7 +112,7 @@ public class MultiTouchSupport {
 				return true;
 			} else if(actionCode == ACTION_POINTER_UP){
 				if(inZoomMode){
-					listener.onZoomEnded(zoomRelative, angleRelative);
+					listener.onZoomOrRotationEnded(zoomRelative, angleRelative);
 					inZoomMode = false;
 				}
 				return true;
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index 0a0bdf1101..438e1642ab 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -859,7 +859,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		private static final float ANGLE_THRESHOLD = 15;
 
 		@Override
-		public void onZoomEnded(double relativeToStart, float angleRelative) {
+		public void onZoomOrRotationEnded(double relativeToStart, float angleRelative) {
 			// 1.5 works better even on dm.density=1 devices
 			float dz = (float) (Math.log(relativeToStart) / Math.log(2)) * 1.5f;
 			setIntZoom(Math.round(dz) + initialViewport.getZoom());
@@ -880,6 +880,24 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 			}
 		}
 
+		@Override
+		public void onZoomEnded(double relativeToStart) {
+			// 1.5 works better even on dm.density=1 devices
+			float dz = (float) ((relativeToStart - 1) * DoubleTapScaleDetector.SCALE_PER_SCREEN);
+			setIntZoom(Math.round(dz) + initialViewport.getZoom());
+			final int newZoom = getZoom();
+			if (application.accessibilityEnabled()) {
+				if (newZoom != initialViewport.getZoom()) {
+					showMessage(application.getString(R.string.zoomIs) + " " + newZoom); //$NON-NLS-1$
+				} else {
+					final LatLon p1 = initialViewport.getLatLonFromPixel(x1, y1);
+					final LatLon p2 = initialViewport.getLatLonFromPixel(x2, y2);
+					showMessage(OsmAndFormatter.getFormattedDistance((float) MapUtils.getDistance(p1.getLatitude(), p1.getLongitude(), p2.getLatitude(), p2.getLongitude()), application));
+				}
+			}
+		}
+
+
 		@Override
 		public void onGestureInit(float x1, float y1, float x2, float y2) {
 			this.x1 = x1;
@@ -912,7 +930,12 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 			if (dz != 0 || relAngle != 0) {
 				changeZoomPosition((float) dz, relAngle);
 			}
+		}
 
+		@Override
+		public void onZooming(double relativeToStart) {
+			double dz = (relativeToStart - 1) * DoubleTapScaleDetector.SCALE_PER_SCREEN;
+			changeZoomPosition((float) dz, 0);
 		}
 
 		private void changeZoomPosition(float dz, float angle) {

From a56535ee99ba9046f469e152881a9e63d999cdc8 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Wed, 27 Jan 2016 16:40:22 +0200
Subject: [PATCH 60/72] Improvement of doubletap scale gesture.

---
 .../osmand/plus/views/OsmandMapTileView.java  | 66 +++++++++++++------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index 438e1642ab..658ce37989 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -73,6 +73,9 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 	private OsmandApplication application;
 	protected OsmandSettings settings = null;
 
+	private int maxZoom;
+	private int minZoom;
+
 	private class FPSMeasurement {
 		int fpsMeasureCount = 0;
 		int fpsMeasureMs = 0;
@@ -167,7 +170,9 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		@Override
 		public void onTwoFingerTap() {
 			afterTwoFingerTap = true;
-			getAnimatedDraggingThread().startZooming(getZoom() - 1, currentViewport.getZoomFloatPart(), true);
+			if (isZoomingAllowed(getZoom(), -1)) {
+				getAnimatedDraggingThread().startZooming(getZoom() - 1, currentViewport.getZoomFloatPart(), true);
+			}
 		}
 	};
 
@@ -301,7 +306,9 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 
 	// ///////////////////////// NON UI PART (could be extracted in common) /////////////////////////////
 	public void setIntZoom(int zoom) {
-		if (mainLayer != null && zoom <= mainLayer.getMaximumShownMapZoom() && zoom >= mainLayer.getMinimumShownMapZoom()) {
+		zoom = zoom > maxZoom ? maxZoom : zoom;
+		zoom = zoom < minZoom ? minZoom : zoom;
+		if (mainLayer != null) {
 			animatedDraggingThread.stopAnimating();
 			currentViewport.setZoomAndAnimation(zoom, 0, 0);
 			currentViewport.setRotate(zoom > LOWEST_ZOOM_TO_ROTATE ? rotate : 0);
@@ -310,7 +317,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 	}
 
 	public void setComplexZoom(int zoom, double mapDensity) {
-		if (mainLayer != null && zoom <= mainLayer.getMaximumShownMapZoom() && zoom >= mainLayer.getMinimumShownMapZoom()) {
+		if (mainLayer != null && zoom <= maxZoom && zoom >= minZoom) {
 			animatedDraggingThread.stopAnimating();
 			currentViewport.setZoomAndAnimation(zoom, 0);
 			currentViewport.setMapDensity(mapDensity);
@@ -396,11 +403,13 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 	public void setMainLayer(BaseMapLayer mainLayer) {
 		this.mainLayer = mainLayer;
 		int zoom = currentViewport.getZoom();
-		if (mainLayer.getMaximumShownMapZoom() < zoom) {
-			zoom = mainLayer.getMaximumShownMapZoom();
+		maxZoom = mainLayer.getMaximumShownMapZoom() - 1;
+		minZoom = mainLayer.getMinimumShownMapZoom() + 1;
+		if (maxZoom < zoom) {
+			zoom = maxZoom;
 		}
-		if (mainLayer.getMinimumShownMapZoom() > zoom) {
-			zoom = mainLayer.getMinimumShownMapZoom();
+		if (minZoom > zoom) {
+			zoom = minZoom;
 		}
 		currentViewport.setZoomAndAnimation(zoom, 0, 0);
 		refreshMap();
@@ -736,7 +745,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 
 	// for internal usage
 	protected void zoomToAnimate(int zoom, double zoomToAnimate, boolean notify) {
-		if (mainLayer != null && mainLayer.getMaximumShownMapZoom() >= zoom && mainLayer.getMinimumShownMapZoom() <= zoom) {
+		if (mainLayer != null && maxZoom >= zoom && minZoom <= zoom) {
 			currentViewport.setZoomAndAnimation(zoom, zoomToAnimate);
 			currentViewport.setRotate(zoom > LOWEST_ZOOM_TO_ROTATE ? rotate : 0);
 			refreshMap();
@@ -952,17 +961,16 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 			final LatLon r = calc.getLatLonFromPixel(cp.x + dx, cp.y + dy);
 			setLatLon(r.getLatitude(), r.getLongitude());
 			int baseZoom = initialViewport.getZoom();
-			while (initialViewport.getZoomFloatPart() + dz > 1) {
+			while (initialViewport.getZoomFloatPart() + dz > 1 && isZoomingAllowed(baseZoom, dz)) {
 				dz--;
-				if (baseZoom < mainLayer.getMaximumShownMapZoom()) {
-					baseZoom++;
-				}
+				baseZoom++;
 			}
-			while (initialViewport.getZoomFloatPart() + dz < 0) {
+			while (initialViewport.getZoomFloatPart() + dz < 0 && isZoomingAllowed(baseZoom, dz)) {
 				dz++;
-				if (baseZoom > mainLayer.getMinimumShownMapZoom()) {
-					baseZoom--;
-				}
+				baseZoom--;
+			}
+			if (!isZoomingAllowed(baseZoom, dz)) {
+				dz = 0;
 			}
 			zoomToAnimate(baseZoom, dz, true);
 			rotateToAnimate(calcRotate);
@@ -970,6 +978,22 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 
 	}
 
+	private boolean isZoomingAllowed(int baseZoom, float dz) {
+		if (baseZoom > maxZoom) {
+			return false;
+		}
+		if (baseZoom == maxZoom - 2 && dz > 1) {
+			return false;
+		}
+		if (baseZoom < minZoom) {
+			return false;
+		}
+		if (baseZoom == minZoom + 2 && dz < -1) {
+			return false;
+		}
+		return true;
+	}
+
 	private class MapTileViewOnGestureListener extends SimpleOnGestureListener {
 		@Override
 		public boolean onDown(MotionEvent e) {
@@ -1040,10 +1064,12 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 
 		@Override
 		public boolean onDoubleTap(MotionEvent e) {
-			final RotatedTileBox tb = getCurrentRotatedTileBox();
-			final double lat = tb.getLatFromPixel(e.getX(), e.getY());
-			final double lon = tb.getLonFromPixel(e.getX(), e.getY());
-			getAnimatedDraggingThread().startMoving(lat, lon, getZoom() + 1, true);
+			if (isZoomingAllowed(getZoom(), 1)) {
+				final RotatedTileBox tb = getCurrentRotatedTileBox();
+				final double lat = tb.getLatFromPixel(e.getX(), e.getY());
+				final double lon = tb.getLonFromPixel(e.getX(), e.getY());
+				getAnimatedDraggingThread().startMoving(lat, lon, getZoom() + 1, true);
+			}
 			return true;
 		}
 	}

From 9272397bf708fedddc043824f4217aedf5091064 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Wed, 27 Jan 2016 17:46:38 +0200
Subject: [PATCH 61/72] Replaced invalidateDataset with notifyDatasetChanged.

---
 OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
index 5d066fa968..800eb21e12 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
@@ -1383,7 +1383,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 			Message msg = Message.obtain(uiHandler, new Runnable() {
 				@Override
 				public void run() {
-					adapter.notifyDataSetInvalidated();
+					adapter.notifyDataSetChanged();
 					updateStatus();
 				}
 			});

From b978c3273fe5ff2c2f091afca0f1d9f191378a94 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Wed, 27 Jan 2016 15:19:25 +0100
Subject: [PATCH 62/72] Translated using Weblate (Italian)

Currently translated at 99.8% (1889 of 1892 strings)
---
 OsmAnd/res/values-it/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 360778110f..23a72abceb 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2151,4 +2151,5 @@
     <string name="data_is_not_available">Il dato non è disponibile</string>
     <string name="rendering_attr_hideUnderground_name">Nascondi gli oggetti sotterranei</string>
     <string name="shared_string_read_more">Approfondisci</string>
+    <string name="shared_string_email_address">Indirizzo email</string>
     </resources>

From 45590093e44680b7dd9042476d46216301eb7d3c Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Wed, 27 Jan 2016 21:49:30 +0300
Subject: [PATCH 63/72] InApp fixes

---
 OsmAnd/no_translate.xml                       |   5 +
 OsmAnd/res/drawable/btn_round_blue.xml        |  13 +
 OsmAnd/res/layout/live_updates_header.xml     | 231 +++++++-------
 OsmAnd/res/layout/subscription_fragment.xml   |  54 +++-
 OsmAnd/res/values/strings.xml                 |   2 +
 .../src/net/osmand/AndroidNetworkUtils.java   | 147 +++++++++
 .../src/net/osmand/plus/OsmandSettings.java   |   1 +
 .../net/osmand/plus/inapp/InAppHelper.java    | 288 ++++++------------
 .../liveupdates/CountrySelectionFragment.java |   3 +-
 .../plus/liveupdates/LiveUpdatesFragment.java | 102 +++++--
 .../liveupdates/SubscriptionFragment.java     | 237 +++++++++++---
 11 files changed, 690 insertions(+), 393 deletions(-)
 create mode 100644 OsmAnd/res/drawable/btn_round_blue.xml
 create mode 100644 OsmAnd/src/net/osmand/AndroidNetworkUtils.java

diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml
index a10a00c824..dce32232f1 100644
--- a/OsmAnd/no_translate.xml
+++ b/OsmAnd/no_translate.xml
@@ -38,6 +38,11 @@
     <string name="osm_live_month_cost_desc">Monthly payment</string>
     <string name="osm_live_active">Active</string>
     <string name="osm_live_not_active">Inactive</string>
+    <string name="osm_live_enter_email">Please enter valid E-mail address</string>
+    <string name="osm_live_enter_user_name">Please enter Public Name</string>
+    <string name="osm_live_thanks">Thank you for subscribing to live updates!</string>
+    <string name="osm_live_region_desc">Part your donation will be sent to OSM users who submit changes to the map in that region</string>
+    <string name="osm_live_subscription_settings">Subscription settings</string>
 
     <string name="osm_live_header">This subscription enables hourly updates for all maps around the world.
         Major part of the income goes back to OSM community and is paid out per each OSM contribution. 
diff --git a/OsmAnd/res/drawable/btn_round_blue.xml b/OsmAnd/res/drawable/btn_round_blue.xml
new file mode 100644
index 0000000000..43eef3f782
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_round_blue.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+        <solid android:color="@color/map_widget_blue_pressed" />
+        <corners android:radius="@dimen/map_button_rect_rad" />
+    </shape></item>
+    <item><shape android:shape="rectangle">
+        <solid android:color="@color/map_widget_blue" />
+        <corners android:radius="@dimen/map_button_rect_rad" />
+    </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/live_updates_header.xml b/OsmAnd/res/layout/live_updates_header.xml
index 89423ff74c..e7dcb77ded 100644
--- a/OsmAnd/res/layout/live_updates_header.xml
+++ b/OsmAnd/res/layout/live_updates_header.xml
@@ -4,10 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
-    android:paddingTop="8dp"
-    android:orientation="vertical">
+    android:paddingTop="8dp">
 
     <LinearLayout
         android:id="@+id/subscription_banner"
@@ -20,26 +20,28 @@
         android:paddingRight="8dp"
         android:paddingTop="16dp">
 
-        <LinearLayout 
+        <LinearLayout
             android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <ImageView
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_action_osm_live"/>
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_action_osm_live"/>
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:text="@string/osm_live_subscription"
+                android:textColor="@color/color_white"
+                android:textSize="@dimen/default_list_text_size"
+                android:textStyle="bold"
+                app:typeface="@string/font_roboto_regular"/>
+        </LinearLayout>
 
-        <net.osmand.plus.widgets.TextViewEx
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/osm_live_subscription"
-            android:layout_gravity="center"
-            android:layout_marginLeft="10dp"
-            android:textColor="@color/color_white"
-            android:textSize="@dimen/default_list_text_size"
-            android:textStyle="bold"
-            app:typeface="@string/font_roboto_regular"/>
-	</LinearLayout>
         <net.osmand.plus.widgets.TextViewEx
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -51,27 +53,28 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-	        android:layout_height="wrap_content" 
+            android:layout_height="wrap_content"
             android:layout_gravity="bottom|right"
-            android:gravity="right"
-            android:layout_marginTop="16dp">
-	        <Button
-	            android:id="@+id/read_more_button"
-	            android:layout_width="wrap_content"
-	            android:layout_height="wrap_content"
-	            android:textColor="@color/color_white"
-	            android:background="@drawable/btn_round_shade"
-	            android:text="@string/shared_string_read_more"/>
-	        
-	        <Button
-	            android:id="@+id/subscription_button"
-	            android:layout_width="wrap_content"
-	            android:layout_height="wrap_content"
-				android:layout_marginLeft="32dp"
-	            android:textColor="@color/color_white"
-	            android:background="@drawable/btn_round_shade"
-	            android:text="@string/osm_live_subscribe_btn"/>
-		</LinearLayout>
+            android:layout_marginTop="16dp"
+            android:gravity="right">
+
+            <Button
+                android:id="@+id/read_more_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/btn_round_shade"
+                android:text="@string/shared_string_read_more"
+                android:textColor="@color/color_white"/>
+
+            <Button
+                android:id="@+id/subscription_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:background="@drawable/btn_round_shade"
+                android:text="@string/osm_live_subscribe_btn"
+                android:textColor="@color/color_white"/>
+        </LinearLayout>
     </LinearLayout>
 
     <LinearLayout
@@ -85,33 +88,54 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:minHeight="44dp">
+            android:gravity="center_vertical"
+            android:minHeight="64dp"
+            android:orientation="horizontal">
 
-            <net.osmand.plus.widgets.TextViewEx
-                android:layout_width="120dp"
+            <LinearLayout
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:text="@string/osm_live_subscription"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
-                app:typeface="@string/font_roboto_regular"/>
+                android:orientation="vertical">
 
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/statusTextView"
+                <net.osmand.plus.widgets.TextViewEx
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:text="@string/shared_string_status"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:textSize="@dimen/default_desc_text_size"
+                    app:typeface="@string/font_roboto_regular"/>
+
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/statusTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="4dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginTop="4dp"
+                    android:text="@string/osm_live_active"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textSize="@dimen/default_list_text_size_large"
+                    app:typeface="@string/font_roboto_medium"/>
+
+            </LinearLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="4dp"
-                android:gravity="right"
-                android:text="@string/osm_live_active"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
-                app:textAllCapsCompat="true"
-                app:typeface="@string/font_roboto_medium"/>
+                android:layout_height="match_parent"
+                android:gravity="right|center_vertical"
+                android:layout_marginRight="16dp">
+
+                <ImageView
+                    android:id="@+id/statusIcon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_action_done"/>
+
+            </LinearLayout>
+
         </LinearLayout>
 
         <View
@@ -123,7 +147,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:minHeight="44dp">
+            android:minHeight="48dp">
 
 
             <net.osmand.plus.widgets.TextViewEx
@@ -133,7 +157,7 @@
                 android:layout_marginRight="16dp"
                 android:text="@string/osm_live_support_region"
                 android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
+                android:textSize="@dimen/default_list_text_size"
                 app:typeface="@string/font_roboto_regular"/>
 
             <net.osmand.plus.widgets.TextViewEx
@@ -147,12 +171,12 @@
                 android:gravity="right"
                 android:text="World"
                 android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
+                android:textSize="@dimen/default_list_text_size"
                 app:typeface="@string/font_roboto_medium"/>
 
         </LinearLayout>
-        
-         <View
+
+        <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:background="?attr/dashboard_divider"/>
@@ -160,71 +184,20 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:minHeight="44dp">
+            android:gravity="right|center_vertical"
+            android:minHeight="48dp">
 
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:layout_width="120dp"
+            <Button
+                android:id="@+id/subscribeButton"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:text="@string/shared_string_email_address"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
-                app:typeface="@string/font_roboto_regular"/>
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/emailTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="4dp"
-                android:gravity="right"
-                android:text="my@email.com"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
-                app:typeface="@string/font_roboto_medium"/>
-
-        </LinearLayout>
-        
-         <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dashboard_divider"/>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:minHeight="44dp">
-
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:layout_width="120dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:text="@string/osm_live_user_public_name"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
-                app:typeface="@string/font_roboto_regular"/>
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/userNameTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="4dp"
-                android:gravity="right"
-                android:text="None"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
-                app:typeface="@string/font_roboto_medium"/>
+                android:layout_marginRight="6dp"
+                android:background="?attr/selectableItemBackground"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/osm_live_subscribe_btn"
+                android:textColor="?attr/color_dialog_buttons"/>
 
         </LinearLayout>
 
diff --git a/OsmAnd/res/layout/subscription_fragment.xml b/OsmAnd/res/layout/subscription_fragment.xml
index 778c7314fc..3e521ec22c 100644
--- a/OsmAnd/res/layout/subscription_fragment.xml
+++ b/OsmAnd/res/layout/subscription_fragment.xml
@@ -16,11 +16,12 @@
         <ImageButton
             android:id="@+id/closeButton"
             style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
             android:src="@drawable/ic_action_remove_dark"/>
 
         <net.osmand.plus.widgets.TextViewEx
+            android:id="@+id/titleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
@@ -142,21 +143,36 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="16dp"
+                        android:layout_marginRight="16dp"
+                        android:layout_marginTop="8dp"
                         android:orientation="vertical">
 
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:paddingLeft="2dp"
+                            android:textColor="?android:attr/textColorSecondary"
+                            android:text="@string/osm_live_support_region"/>
 
                         <net.osmand.plus.widgets.AutoCompleteTextViewEx
                             android:id="@+id/selectCountryEdit"
                             android:layout_width="fill_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="16dp"
-                            android:layout_marginRight="16dp"
-                            android:layout_marginTop="4dp"
                             android:paddingLeft="2dp"
                             android:paddingRight="0dp"
                             android:drawableRight="@drawable/ic_action_arrow_drop_down"
                             android:editable="false"
-                            android:hint="@string/osm_live_support_region"/>
+                            android:text="Ukraine"/>
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:paddingLeft="2dp"
+                            android:layout_marginTop="8dp"
+                            android:textColor="?android:attr/textColorSecondary"
+                            android:text="@string/osm_live_region_desc"/>
+
 
                     </LinearLayout>
 
@@ -165,11 +181,35 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/editModeBottomView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:visibility="gone">
+
+                <Button
+                    android:id="@+id/saveChangesButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="72dp"
+                    android:layout_marginRight="16dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:textColor="@color/color_white"
+                    android:background="@drawable/btn_round_blue"
+                    android:text="@string/shared_string_save_changes"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/purchaseCard"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"
                 android:background="?attr/bg_card"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="visible">
 
                 <LinearLayout
                     android:layout_width="match_parent"
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index b7d8d2f042..871b31d398 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="shared_string_status">Status</string>
+    <string name="shared_string_save_changes">Save changes</string>
     <string name="shared_string_email_address">E-mail address</string>
     <string name="rendering_attr_hideUnderground_name">Hide underground objects</string>
     <string name="data_is_not_available">Data is not available</string>
diff --git a/OsmAnd/src/net/osmand/AndroidNetworkUtils.java b/OsmAnd/src/net/osmand/AndroidNetworkUtils.java
new file mode 100644
index 0000000000..116585cffd
--- /dev/null
+++ b/OsmAnd/src/net/osmand/AndroidNetworkUtils.java
@@ -0,0 +1,147 @@
+package net.osmand;
+
+import android.os.AsyncTask;
+
+import net.osmand.osm.io.NetworkUtils;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.Version;
+
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URLEncoder;
+import java.text.MessageFormat;
+import java.util.Map;
+
+public class AndroidNetworkUtils {
+
+	public interface OnRequestResultListener {
+		void onResult(String result);
+	}
+
+	public static void sendRequestAsync(final OsmandApplication ctx,
+										final String url,
+										final Map<String, String> parameters,
+										final String userOperation,
+										final OnRequestResultListener listener) {
+
+		new AsyncTask<Void, Void, String>() {
+
+			@Override
+			protected String doInBackground(Void... params) {
+				try {
+					return sendRequest(ctx, url, parameters, userOperation);
+				} catch (Exception e) {
+					return null;
+				}
+			}
+
+			@Override
+			protected void onPostExecute(String response) {
+				if (listener != null) {
+					listener.onResult(response);
+				}
+			}
+
+		}.execute((Void) null);
+	}
+
+
+	public static String sendRequest(OsmandApplication ctx, String url, Map<String, String> parameters, String userOperation) {
+		HttpURLConnection connection = null;
+		try {
+			connection = NetworkUtils.getHttpURLConnection(url);
+
+			connection.setRequestProperty("Accept-Charset", "UTF-8");
+			connection.setRequestProperty("User-Agent", Version.getFullVersion(ctx));
+			connection.setConnectTimeout(15000);
+
+			if (parameters != null && parameters.size() > 0) {
+				StringBuilder sb = new StringBuilder();
+				for (Map.Entry<String, String> entry : parameters.entrySet()) {
+					if (sb.length() > 0) {
+						sb.append("&");
+					}
+					sb.append(entry.getKey()).append("=").append(URLEncoder.encode(entry.getValue(), "UTF-8"));
+				}
+				String params = sb.toString();
+
+				connection.setDoInput(true);
+				connection.setDoOutput(true);
+				connection.setUseCaches(false);
+				connection.setRequestMethod("POST");
+
+				connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
+				connection.setRequestProperty("Content-Length", String.valueOf(params.getBytes("UTF-8").length));
+				connection.setFixedLengthStreamingMode(params.getBytes("UTF-8").length);
+
+				OutputStream output = new BufferedOutputStream(connection.getOutputStream());
+				output.write(params.getBytes("UTF-8"));
+				output.flush();
+				output.close();
+
+			} else {
+				connection.setRequestMethod("GET");
+				connection.connect();
+			}
+
+			if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
+				String msg = userOperation
+						+ " " + ctx.getString(R.string.failed_op) + " : " + connection.getResponseMessage();
+				showToast(ctx, msg);
+			} else {
+				StringBuilder responseBody = new StringBuilder();
+				responseBody.setLength(0);
+				InputStream i = connection.getInputStream();
+				if (i != null) {
+					BufferedReader in = new BufferedReader(new InputStreamReader(i, "UTF-8"), 256);
+					String s;
+					boolean f = true;
+					while ((s = in.readLine()) != null) {
+						if (!f) {
+							responseBody.append("\n");
+						} else {
+							f = false;
+						}
+						responseBody.append(s);
+					}
+					try {
+						in.close();
+						i.close();
+					} catch (Exception e) {
+						// ignore exception
+					}
+				}
+				return responseBody.toString();
+			}
+
+		} catch (NullPointerException e) {
+			// that's tricky case why NPE is thrown to fix that problem httpClient could be used
+			String msg = ctx.getString(R.string.auth_failed);
+			showToast(ctx, msg);
+		} catch (MalformedURLException e) {
+			showToast(ctx, MessageFormat.format(ctx.getResources().getString(R.string.shared_string_action_template)
+					+ ": " + ctx.getResources().getString(R.string.shared_string_unexpected_error), userOperation));
+		} catch (IOException e) {
+			showToast(ctx, MessageFormat.format(ctx.getResources().getString(R.string.shared_string_action_template)
+					+ ": " + ctx.getResources().getString(R.string.shared_string_io_error), userOperation));
+		} finally {
+			if (connection != null) {
+				connection.disconnect();
+			}
+		}
+
+		return null;
+	}
+
+	private static void showToast(OsmandApplication ctx, String message) {
+		ctx.showToastMessage(message);
+	}
+
+}
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index ae0035daa5..b0924b5cbf 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -818,6 +818,7 @@ public class OsmandSettings {
 	public final OsmandPreference<String> BILLING_USER_COUNTRY_DOWNLOAD_NAME = new StringPreference("billing_user_country_download_name", "").makeGlobal();
 	public final OsmandPreference<Boolean> BILLING_HIDE_USER_NAME = new BooleanPreference("billing_hide_user_name", false).makeGlobal();
 	public final OsmandPreference<Boolean> BILLING_PURCHASE_TOKEN_SENT = new BooleanPreference("billing_purchase_token_sent", false).makeGlobal();
+	public final OsmandPreference<Boolean> LIVE_UPDATES_PURCHASED = new BooleanPreference("billing_live_updates_purchased", false).makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<String> USER_OSM_BUG_NAME =
diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
index 0b489fd85c..068da001e8 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
@@ -5,7 +5,8 @@ import android.content.Intent;
 import android.os.AsyncTask;
 import android.util.Log;
 
-import net.osmand.osm.io.NetworkUtils;
+import net.osmand.AndroidNetworkUtils;
+import net.osmand.AndroidNetworkUtils.OnRequestResultListener;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
@@ -19,16 +20,6 @@ import net.osmand.util.Algorithms;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URLEncoder;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -37,6 +28,7 @@ import java.util.Map;
 public class InAppHelper {
 	// Debug tag, for logging
 	static final String TAG = "InAppHelper";
+	boolean mDebugLog = false;
 
 	private static boolean mSubscribedToLiveUpdates = false;
 	private static String mLiveUpdatesPrice;
@@ -112,7 +104,7 @@ public class InAppHelper {
 				"YTjh1H/ZgqIHy5ZluahINuDE76qdLYMXrDMQIDAQAB";
 
 		// Create the helper, passing it our context and the public key to verify signatures with
-		Log.d(TAG, "Creating InAppHelper.");
+		logDebug("Creating InAppHelper.");
 		mHelper = new IabHelper(ctx, base64EncodedPublicKey);
 
 		// enable debug logging (for a production application, you should set this to false).
@@ -120,10 +112,10 @@ public class InAppHelper {
 
 		// Start setup. This is asynchronous and the specified listener
 		// will be called once setup completes.
-		Log.d(TAG, "Starting setup.");
+		logDebug("Starting setup.");
 		mHelper.startSetup(new IabHelper.OnIabSetupFinishedListener() {
 			public void onIabSetupFinished(IabResult result) {
-				Log.d(TAG, "Setup finished.");
+				logDebug("Setup finished.");
 
 				if (!result.isSuccess()) {
 					// Oh noes, there was a problem.
@@ -141,7 +133,7 @@ public class InAppHelper {
 				if (mHelper == null) return;
 
 				// IAB is fully set up. Now, let's get an inventory of stuff we own.
-				Log.d(TAG, "Setup successful. Querying inventory.");
+				logDebug("Setup successful. Querying inventory.");
 				List<String> skus = new ArrayList<>();
 				skus.add(SKU_LIVE_UPDATES);
 				mHelper.queryInventoryAsync(true, skus, mGotInventoryListener);
@@ -152,7 +144,7 @@ public class InAppHelper {
 	// Listener that's called when we finish querying the items and subscriptions we own
 	private IabHelper.QueryInventoryFinishedListener mGotInventoryListener = new IabHelper.QueryInventoryFinishedListener() {
 		public void onQueryInventoryFinished(IabResult result, Inventory inventory) {
-			Log.d(TAG, "Query inventory finished.");
+			logDebug("Query inventory finished.");
 
 			// Have we been disposed of in the meantime? If so, quit.
 			if (mHelper == null) return;
@@ -169,7 +161,7 @@ public class InAppHelper {
 				return;
 			}
 
-			Log.d(TAG, "Query inventory was successful.");
+			logDebug("Query inventory was successful.");
 
             /*
 			 * Check for items we own. Notice that for each purchase, we check
@@ -180,7 +172,7 @@ public class InAppHelper {
 			// Do we have the live updates?
 			Purchase liveUpdatesPurchase = inventory.getPurchase(SKU_LIVE_UPDATES);
 			mSubscribedToLiveUpdates = (liveUpdatesPurchase != null);
-			Log.d(TAG, "User " + (mSubscribedToLiveUpdates ? "HAS" : "DOES NOT HAVE")
+			logDebug("User " + (mSubscribedToLiveUpdates ? "HAS" : "DOES NOT HAVE")
 					+ " live updates purchased.");
 
 			if (inventory.hasDetails(SKU_LIVE_UPDATES)) {
@@ -200,12 +192,12 @@ public class InAppHelper {
 				stop();
 			}
 
-			Log.d(TAG, "Initial inapp query finished");
+			logDebug("Initial inapp query finished");
 		}
 	};
 
 	public void purchaseLiveUpdates(final Activity activity, final String email, final String userName,
-									final String countryDownloadName) {
+									final String countryDownloadName, final boolean hideUserName) {
 		if (!mHelper.subscriptionsSupported()) {
 			complain("Subscriptions not supported on your device yet. Sorry!");
 			if (callbacks != null) {
@@ -228,59 +220,56 @@ public class InAppHelper {
 			@Override
 			protected String doInBackground(Void... params) {
 				userId = ctx.getSettings().BILLING_USER_ID.get();
-				if (Algorithms.isEmpty(userId)) {
-					try {
-						Map<String, String> parameters = new HashMap<>();
-						parameters.put("visibleName", userName);
-						parameters.put("preferredCountry", countryDownloadName);
-						parameters.put("email", email);
+				try {
+					Map<String, String> parameters = new HashMap<>();
+					parameters.put("visibleName", hideUserName ? "" : userName);
+					parameters.put("preferredCountry", countryDownloadName);
+					parameters.put("email", email);
+					if (Algorithms.isEmpty(userId)) {
 						parameters.put("status", "new");
-
-						return sendRequest("http://download.osmand.net/subscription/register.php",
-								parameters, "Requesting userId...");
-
-					} catch (Exception e) {
-						Log.e(TAG, "sendRequest Error", e);
-						return null;
 					}
-				} else {
+
+					return AndroidNetworkUtils.sendRequest(ctx,
+							"http://download.osmand.net/subscription/register.php",
+							parameters, "Requesting userId...");
+
+				} catch (Exception e) {
+					logError("sendRequest Error", e);
 					return null;
 				}
 			}
 
 			@Override
 			protected void onPostExecute(String response) {
-				if (Algorithms.isEmpty(userId)) {
-					Log.d(TAG, "Response=" + response);
-					if (response == null) {
-						complain("Cannot retrieve userId from server.");
+				logDebug("Response=" + response);
+				if (response == null) {
+					complain("Cannot retrieve userId from server.");
+					if (callbacks != null) {
+						callbacks.dismissProgress();
+						callbacks.onError("Cannot retrieve userId from server.");
+					}
+					if (stopAfterResult) {
+						stop();
+					}
+					return;
+
+				} else {
+					try {
+						JSONObject obj = new JSONObject(response);
+						userId = obj.getString("userid");
+						ctx.getSettings().BILLING_USER_ID.set(userId);
+						logDebug("UserId=" + userId);
+					} catch (JSONException e) {
+						String message = "JSON parsing error: "
+								+ (e.getMessage() == null ? "unknown" : e.getMessage());
+						complain(message);
 						if (callbacks != null) {
 							callbacks.dismissProgress();
-							callbacks.onError("Cannot retrieve userId from server.");
+							callbacks.onError(message);
 						}
 						if (stopAfterResult) {
 							stop();
 						}
-						return;
-
-					} else {
-						try {
-							JSONObject obj = new JSONObject(response);
-							userId = obj.getString("userid");
-							ctx.getSettings().BILLING_USER_ID.set(userId);
-							Log.d(TAG, "UserId=" + userId);
-						} catch (JSONException e) {
-							String message = "JSON parsing error: "
-									+ (e.getMessage() == null ? "unknown" : e.getMessage());
-							complain(message);
-							if (callbacks != null) {
-								callbacks.dismissProgress();
-								callbacks.onError(message);
-							}
-							if (stopAfterResult) {
-								stop();
-							}
-						}
 					}
 				}
 
@@ -288,7 +277,7 @@ public class InAppHelper {
 					callbacks.dismissProgress();
 				}
 				if (!Algorithms.isEmpty(userId)) {
-					Log.d(TAG, "Launching purchase flow for live updates subscription for userId=" + userId);
+					logDebug("Launching purchase flow for live updates subscription for userId=" + userId);
 					String payload = userId;
 					if (mHelper != null) {
 						mHelper.launchPurchaseFlow(activity,
@@ -308,26 +297,31 @@ public class InAppHelper {
 	}
 
 	public boolean onActivityResultHandled(int requestCode, int resultCode, Intent data) {
-		Log.d(TAG, "onActivityResult(" + requestCode + "," + resultCode + "," + data);
+		logDebug("onActivityResult(" + requestCode + "," + resultCode + "," + data);
 		if (mHelper == null) return false;
 
-		// Pass on the activity result to the helper for handling
-		if (!mHelper.handleActivityResult(requestCode, resultCode, data)) {
-			// not handled, so handle it ourselves (here's where you'd
-			// perform any handling of activity results not related to in-app
-			// billing...
-			//super.onActivityResult(requestCode, resultCode, data);
+		try {
+			// Pass on the activity result to the helper for handling
+			if (!mHelper.handleActivityResult(requestCode, resultCode, data)) {
+				// not handled, so handle it ourselves (here's where you'd
+				// perform any handling of activity results not related to in-app
+				// billing...
+				//super.onActivityResult(requestCode, resultCode, data);
+				return false;
+			} else {
+				logDebug("onActivityResult handled by IABUtil.");
+				return true;
+			}
+		} catch (Exception e) {
+			logError("onActivityResultHandled", e);
 			return false;
-		} else {
-			Log.d(TAG, "onActivityResult handled by IABUtil.");
-			return true;
 		}
 	}
 
 	// Callback for when a purchase is finished
 	private IabHelper.OnIabPurchaseFinishedListener mPurchaseFinishedListener = new IabHelper.OnIabPurchaseFinishedListener() {
 		public void onIabPurchaseFinished(IabResult result, Purchase purchase) {
-			Log.d(TAG, "Purchase finished: " + result + ", purchase: " + purchase);
+			logDebug("Purchase finished: " + result + ", purchase: " + purchase);
 
 			// if we were disposed of in the meantime, quit.
 			if (mHelper == null) return;
@@ -344,15 +338,17 @@ public class InAppHelper {
 				return;
 			}
 
-			Log.d(TAG, "Purchase successful.");
+			logDebug("Purchase successful.");
 
 			if (purchase.getSku().equals(SKU_LIVE_UPDATES)) {
 				// bought live updates
 				sendToken(purchase.getToken());
 
-				Log.d(TAG, "Live updates subscription purchased.");
-				showToast("Thank you for subscribing to live updates!");
+				logDebug("Live updates subscription purchased.");
+				showToast(ctx.getString(R.string.osm_live_thanks));
 				mSubscribedToLiveUpdates = true;
+				ctx.getSettings().LIVE_UPDATES_PURCHASED.set(true);
+
 				if (callbacks != null) {
 					callbacks.dismissProgress();
 					callbacks.onItemPurchased(SKU_LIVE_UPDATES);
@@ -366,7 +362,7 @@ public class InAppHelper {
 
 	// Do not forget call stop() when helper is not needed anymore
 	public void stop() {
-		Log.d(TAG, "Destroying helper.");
+		logDebug("Destroying helper.");
 		if (mHelper != null) {
 			mHelper.dispose();
 			mHelper = null;
@@ -378,27 +374,35 @@ public class InAppHelper {
 		String email = ctx.getSettings().BILLING_USER_EMAIL.get();
 		try {
 			Map<String, String> parameters = new HashMap<>();
-			parameters.put("userId", userId);
+			parameters.put("userid", userId);
 			parameters.put("sku", SKU_LIVE_UPDATES);
 			parameters.put("purchaseToken", token);
 			parameters.put("email", email);
 
-			sendRequestAsync("http://download.osmand.net/subscription/purchased.php",
+			AndroidNetworkUtils.sendRequestAsync(ctx,
+					"http://download.osmand.net/subscription/purchased.php",
 					parameters, "Sending purchase info...", new OnRequestResultListener() {
 						@Override
 						public void onResult(String result) {
-							if (result != null && result.trim().toLowerCase().equals("ok")) {
-								ctx.getSettings().BILLING_PURCHASE_TOKEN_SENT.set(true);
+							if (result != null) {
+								try {
+									JSONObject obj = new JSONObject(result);
+									if (!obj.has("error")) {
+										ctx.getSettings().BILLING_PURCHASE_TOKEN_SENT.set(true);
+									}
+								} catch (JSONException e) {
+									logError("sendToken", e);
+								}
 							}
 						}
 					});
 		} catch (Exception e) {
-			Log.e(TAG, "sendToken Error", e);
+			logError("sendToken Error", e);
 		}
 	}
 
 	private void complain(String message) {
-		Log.e(TAG, "**** InAppHelper Error: " + message);
+		logError("**** InAppHelper Error: " + message);
 		showToast("Error: " + message);
 	}
 
@@ -406,124 +410,16 @@ public class InAppHelper {
 		ctx.showToastMessage(message);
 	}
 
-	private String sendRequest(String url, Map<String, String> parameters, String userOperation) {
-		Log.d(TAG, "Sending request " + url);
-		HttpURLConnection connection = null;
-		try {
-			connection = NetworkUtils.getHttpURLConnection(url);
-
-			connection.setRequestProperty("Accept-Charset", "UTF-8");
-			connection.setRequestProperty("User-Agent", Version.getFullVersion(ctx));
-			connection.setConnectTimeout(15000);
-
-			if (parameters != null && parameters.size() > 0) {
-				StringBuilder sb = new StringBuilder();
-				for (Map.Entry<String, String> entry : parameters.entrySet()) {
-					if (sb.length() > 0) {
-						sb.append("&");
-					}
-					sb.append(entry.getKey()).append("=").append(URLEncoder.encode(entry.getValue(), "UTF-8"));
-				}
-				String params = sb.toString();
-
-				connection.setDoInput(true);
-				connection.setDoOutput(true);
-				connection.setUseCaches(false);
-				connection.setRequestMethod("POST");
-
-				connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
-				connection.setRequestProperty("Content-Length", String.valueOf(params.getBytes("UTF-8").length));
-				connection.setFixedLengthStreamingMode(params.getBytes("UTF-8").length);
-
-				OutputStream output = new BufferedOutputStream(connection.getOutputStream());
-				output.write(params.getBytes("UTF-8"));
-				output.flush();
-				output.close();
-
-			} else {
-				connection.setRequestMethod("GET");
-				connection.connect();
-			}
-
-			if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
-				String msg = userOperation
-						+ " " + ctx.getString(R.string.failed_op) + " : " + connection.getResponseMessage();
-				Log.e(TAG, msg);
-				showToast(msg);
-			} else {
-				Log.d(TAG, "Response : " + connection.getResponseMessage());
-				// populate return fields.
-				StringBuilder responseBody = new StringBuilder();
-				responseBody.setLength(0);
-				InputStream i = connection.getInputStream();
-				if (i != null) {
-					BufferedReader in = new BufferedReader(new InputStreamReader(i, "UTF-8"), 256);
-					String s;
-					boolean f = true;
-					while ((s = in.readLine()) != null) {
-						if (!f) {
-							responseBody.append("\n");
-						} else {
-							f = false;
-						}
-						responseBody.append(s);
-					}
-					try {
-						in.close();
-						i.close();
-					} catch (Exception e) {
-						Log.e(TAG, "sendRequest", e);
-					}
-				}
-				return responseBody.toString();
-			}
-
-		} catch (NullPointerException e) {
-			// that's tricky case why NPE is thrown to fix that problem httpClient could be used
-			String msg = ctx.getString(R.string.auth_failed);
-			Log.e(TAG, msg, e);
-			showToast(msg);
-		} catch (MalformedURLException e) {
-			Log.e(TAG, userOperation + " " + ctx.getString(R.string.failed_op), e);
-			showToast(MessageFormat.format(ctx.getResources().getString(R.string.shared_string_action_template)
-					+ ": " + ctx.getResources().getString(R.string.shared_string_unexpected_error), userOperation));
-		} catch (IOException e) {
-			Log.e(TAG, userOperation + " " + ctx.getString(R.string.failed_op), e);
-			showToast(MessageFormat.format(ctx.getResources().getString(R.string.shared_string_action_template)
-					+ ": " + ctx.getResources().getString(R.string.shared_string_io_error), userOperation));
-		} finally {
-			if (connection != null) {
-				connection.disconnect();
-			}
-		}
-
-		return null;
+	void logDebug(String msg) {
+		if (mDebugLog) Log.d(TAG, msg);
 	}
 
-	private void sendRequestAsync(final String url, final Map<String, String> parameters, final String userOperation, final OnRequestResultListener listener) {
-
-		new AsyncTask<Void, Void, String>() {
-
-			@Override
-			protected String doInBackground(Void... params) {
-				try {
-					return sendRequest(url, parameters, userOperation);
-				} catch (Exception e) {
-					return null;
-				}
-			}
-
-			@Override
-			protected void onPostExecute(String response) {
-				if (listener != null) {
-					listener.onResult(response);
-				}
-			}
-
-		}.execute((Void) null);
+	void logError(String msg) {
+		Log.e(TAG, "Error: " + msg);
 	}
 
-	private interface OnRequestResultListener {
-		void onResult(String result);
+	void logError(String msg, Throwable e) {
+		Log.e(TAG, "Error: " + msg, e);
 	}
+
 }
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/CountrySelectionFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/CountrySelectionFragment.java
index 88c7cc7c69..cda352b0bd 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/CountrySelectionFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/CountrySelectionFragment.java
@@ -22,6 +22,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.base.BaseOsmAndDialogFragment;
 import net.osmand.util.Algorithms;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -185,7 +186,7 @@ public class CountrySelectionFragment extends BaseOsmAndDialogFragment {
 		return name;
 	}
 
-	public static class CountryItem {
+	public static class CountryItem implements Serializable {
 		private String localName;
 		private String downloadName;
 
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
index eb9d47de7f..c3c3afc91a 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
@@ -3,15 +3,23 @@ package net.osmand.plus.liveupdates;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
+import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.DrawableRes;
 import android.support.v4.app.FragmentManager;
+import android.support.v4.view.MenuItemCompat;
+import android.support.v7.app.ActionBar;
 import android.support.v7.widget.SwitchCompat;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AbsListView;
@@ -57,6 +65,7 @@ import static net.osmand.plus.liveupdates.LiveUpdatesHelper.setAlarmForPendingIn
 
 public class LiveUpdatesFragment extends BaseOsmAndFragment {
 	public static final String TITLE = "Live Updates";
+	private static final int SUBSCRIPTION_SETTINGS = 5;
 	public static final Comparator<LocalIndexInfo> LOCAL_INDEX_INFO_COMPARATOR = new Comparator<LocalIndexInfo>() {
 		@Override
 		public int compare(LocalIndexInfo lhs, LocalIndexInfo rhs) {
@@ -71,6 +80,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		setHasOptionsMenu(true);
 	}
 
 	@Override
@@ -94,27 +104,32 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
 			}
 		});
 
+		//test
+		//getSettings().LIVE_UPDATES_PURCHASED.set(true);
+
 		subscriptionHeader = inflater.inflate(R.layout.live_updates_header, listView, false);
+		updateHeader();
+
+		listView.addHeaderView(subscriptionHeader);
+
+		loadLocalIndexesTask = new LoadLocalIndexTask(adapter, this).execute();
+		return view;
+	}
+
+	public void updateHeader() {
 		View subscriptionBanner = subscriptionHeader.findViewById(R.id.subscription_banner);
 		View subscriptionInfo = subscriptionHeader.findViewById(R.id.subscription_info);
-		Button subscriptionButton = (Button) subscriptionHeader.findViewById(R.id.subscription_button);
-		subscriptionButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				SubscriptionFragment subscriptionFragment = new SubscriptionFragment();
-				subscriptionFragment.show(getChildFragmentManager(), SubscriptionFragment.TAG);
-			}
-		});
-		if (InAppHelper.isSubscribedToLiveUpdates()) {
+		if (getSettings().LIVE_UPDATES_PURCHASED.get()) {
+			ImageView statusIcon = (ImageView) subscriptionHeader.findViewById(R.id.statusIcon);
 			TextView statusTextView = (TextView) subscriptionHeader.findViewById(R.id.statusTextView);
 			TextView regionNameTextView = (TextView) subscriptionHeader.findViewById(R.id.regionTextView);
-			TextView emailTextView = (TextView) subscriptionHeader.findViewById(R.id.emailTextView);
-			TextView userNameTextView = (TextView) subscriptionHeader.findViewById(R.id.userNameTextView);
 
 			if (InAppHelper.isSubscribedToLiveUpdates()) {
 				statusTextView.setText(getString(R.string.osm_live_active));
+				statusIcon.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_done));
 			} else {
 				statusTextView.setText(getString(R.string.osm_live_not_active));
+				statusIcon.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_remove_dark));
 			}
 
 			OsmandSettings settings = getMyApplication().getSettings();
@@ -126,19 +141,39 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
 			}
 			regionNameTextView.setText(countryName);
 
-			emailTextView.setText(settings.BILLING_USER_EMAIL.get());
-			userNameTextView.setText(settings.BILLING_USER_NAME.get());
+			Button subscribeButton = (Button) subscriptionHeader.findViewById(R.id.subscribeButton);
+			subscribeButton.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					SubscriptionFragment subscriptionFragment = new SubscriptionFragment();
+					subscriptionFragment.show(getChildFragmentManager(), SubscriptionFragment.TAG);
+				}
+			});
 
 			subscriptionBanner.setVisibility(View.GONE);
 			subscriptionInfo.setVisibility(View.VISIBLE);
 		} else {
+			Button readMoreBtn = (Button) subscriptionHeader.findViewById(R.id.read_more_button);
+			readMoreBtn.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					Uri uri = Uri.parse("http://osmand.net/osm_live.php");
+					Intent goToOsmLive = new Intent(Intent.ACTION_VIEW, uri);
+					startActivity(goToOsmLive);
+				}
+			});
+			Button subscriptionButton = (Button) subscriptionHeader.findViewById(R.id.subscription_button);
+			subscriptionButton.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					SubscriptionFragment subscriptionFragment = new SubscriptionFragment();
+					subscriptionFragment.show(getChildFragmentManager(), SubscriptionFragment.TAG);
+				}
+			});
+
 			subscriptionBanner.setVisibility(View.VISIBLE);
 			subscriptionInfo.setVisibility(View.GONE);
 		}
-		listView.addHeaderView(subscriptionHeader);
-
-		loadLocalIndexesTask = new LoadLocalIndexTask(adapter, this).execute();
-		return view;
 	}
 
 	public void updateSubscriptionBanner() {
@@ -165,6 +200,34 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
 		}
 	}
 
+	@SuppressWarnings("deprecation")
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+		if (getSettings().LIVE_UPDATES_PURCHASED.get()) {
+			ActionBar actionBar = getMyActivity().getSupportActionBar();
+			if (actionBar != null) {
+				actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
+			}
+
+			SubMenu split = menu.addSubMenu(R.string.shared_string_more_actions);
+			split.setIcon(R.drawable.ic_overflow_menu_white);
+			MenuItemCompat.setShowAsAction(split.getItem(), MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+			MenuItem item = split.add(0, SUBSCRIPTION_SETTINGS, 0, R.string.osm_live_subscription_settings);
+			MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		}
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == SUBSCRIPTION_SETTINGS) {
+			SubscriptionFragment subscriptionFragment = new SubscriptionFragment();
+			subscriptionFragment.setEditMode(true);
+			subscriptionFragment.show(getChildFragmentManager(), SubscriptionFragment.TAG);
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
 	protected class LocalIndexesAdapter extends OsmandBaseExpandableListAdapter {
 		public static final int SHOULD_UPDATE_GROUP_POSITION = 0;
 		public static final int SHOULD_NOT_UPDATE_GROUP_POSITION = 1;
@@ -382,6 +445,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
 			divider = view.findViewById(R.id.divider);
 		}
 
+		@SuppressWarnings("deprecation")
 		public void bindLocalIndexInfo(final LocalIndexInfo item, boolean isLastChild) {
 			OsmandApplication context = fragment.getMyActivity().getMyApplication();
 			final OsmandSettings.CommonPreference<Boolean> shouldUpdatePreference =
@@ -448,7 +512,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
 			extends AsyncTask<Void, LocalIndexInfo, List<LocalIndexInfo>>
 			implements AbstractLoadLocalIndexTask {
 
-		private List<LocalIndexInfo> result;
+		//private List<LocalIndexInfo> result;
 		private LocalIndexesAdapter adapter;
 		private LiveUpdatesFragment fragment;
 		private LocalIndexHelper helper;
@@ -484,7 +548,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
 
 		@Override
 		protected void onPostExecute(List<LocalIndexInfo> result) {
-			this.result = result;
+			//this.result = result;
 			adapter.sort();
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
index fe895a1e4a..8457878349 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -15,7 +16,9 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import net.osmand.AndroidNetworkUtils;
 import net.osmand.AndroidUtils;
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.base.BaseOsmAndDialogFragment;
@@ -25,40 +28,104 @@ import net.osmand.plus.liveupdates.CountrySelectionFragment.CountryItem;
 import net.osmand.plus.liveupdates.CountrySelectionFragment.OnFragmentInteractionListener;
 import net.osmand.util.Algorithms;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Map;
+
 public class SubscriptionFragment extends BaseOsmAndDialogFragment implements InAppCallbacks, OnFragmentInteractionListener {
 
 	public static final String TAG = "SubscriptionFragment";
+	private static final String EDIT_MODE_ID = "edit_mode_id";
+	private static final String USER_NAME_ID = "user_name_id";
+	private static final String EMAIL_ID = "email_id";
+	private static final String COUNTRY_ITEM_ID = "country_id";
+	private static final String HIDE_USER_NAME_ID = "hide_user_name_id";
 
 	private InAppHelper inAppHelper;
 	private OsmandSettings settings;
 	private ProgressDialog dlg;
+	private boolean editMode;
 
-	private String userName;
-	private String email;
+	private String prevEmail;
 	private CountryItem selectedCountryItem;
 
 	private CountrySelectionFragment countrySelectionFragment = new CountrySelectionFragment();
 
+	public void setEditMode(boolean editMode) {
+		this.editMode = editMode;
+	}
+
+	@Override
+	public void onSaveInstanceState(Bundle outState) {
+		outState.putBoolean(EDIT_MODE_ID, editMode);
+
+		View view = getView();
+		if (view != null) {
+			EditText userNameEdit = (EditText) view.findViewById(R.id.userNameEdit);
+			outState.putString(USER_NAME_ID, userNameEdit.getText().toString());
+			EditText emailEdit = (EditText) view.findViewById(R.id.emailEdit);
+			outState.putString(EMAIL_ID, emailEdit.getText().toString());
+			CheckBox hideUserNameCheckbox = (CheckBox) view.findViewById(R.id.hideUserNameCheckbox);
+			outState.putBoolean(HIDE_USER_NAME_ID, hideUserNameCheckbox.isChecked());
+			if (selectedCountryItem != null) {
+				outState.putSerializable(COUNTRY_ITEM_ID, selectedCountryItem);
+			}
+		}
+
+		super.onSaveInstanceState(outState);
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-		settings = getMyApplication().getSettings();
-		inAppHelper = new InAppHelper(getMyApplication(), this);
-		Activity activity = getActivity();
-		if (activity instanceof OsmLiveActivity) {
-			((OsmLiveActivity) activity).setInAppHelper(inAppHelper);
+		if (savedInstanceState != null) {
+			editMode = savedInstanceState.getBoolean(EDIT_MODE_ID);
 		}
 
-		inAppHelper.start(false);
+		settings = getMyApplication().getSettings();
+		prevEmail = settings.BILLING_USER_EMAIL.get();
+		if (!editMode) {
+			inAppHelper = new InAppHelper(getMyApplication(), this);
+			Activity activity = getActivity();
+			if (activity instanceof OsmLiveActivity) {
+				((OsmLiveActivity) activity).setInAppHelper(inAppHelper);
+			}
+			inAppHelper.start(false);
+		}
 	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 							 Bundle savedInstanceState) {
 
+		String userName = settings.BILLING_USER_NAME.get();
+		String email = settings.BILLING_USER_EMAIL.get();
+		String countryDownloadName = settings.BILLING_USER_COUNTRY_DOWNLOAD_NAME.get();
+		boolean hideUserName = settings.BILLING_HIDE_USER_NAME.get();
+
+		if (savedInstanceState != null) {
+			userName = savedInstanceState.getString(USER_NAME_ID);
+			email = savedInstanceState.getString(EMAIL_ID);
+			hideUserName = savedInstanceState.getBoolean(HIDE_USER_NAME_ID);
+			Object obj = savedInstanceState.getSerializable(COUNTRY_ITEM_ID);
+			if (obj instanceof CountryItem) {
+				selectedCountryItem = (CountryItem) obj;
+				countryDownloadName = selectedCountryItem.getDownloadName();
+			} else {
+				countryDownloadName = "";
+			}
+		}
+
 		View view = inflater.inflate(R.layout.subscription_fragment, container, false);
 		ImageButton closeButton = (ImageButton) view.findViewById(R.id.closeButton);
+		if (editMode) {
+			closeButton.setImageDrawable(getMyApplication().getIconsCache().getIcon(R.drawable.ic_action_mode_back));
+		} else {
+			closeButton.setImageDrawable(getMyApplication().getIconsCache().getIcon(R.drawable.ic_action_remove_dark));
+		}
 		closeButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -66,20 +133,24 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 			}
 		});
 
-		userName = settings.BILLING_USER_NAME.get();
+		TextView title = (TextView) view.findViewById(R.id.titleTextView);
+		if (editMode) {
+			title.setText(getString(R.string.osm_live_subscription_settings));
+		} else {
+			title.setText(getString(R.string.osm_live_subscription));
+		}
+
 		final EditText userNameEdit = (EditText) view.findViewById(R.id.userNameEdit);
 		if (!Algorithms.isEmpty(userName)) {
 			userNameEdit.setText(userName);
 		}
 
-		email = settings.BILLING_USER_EMAIL.get();
 		final EditText emailEdit = (EditText) view.findViewById(R.id.emailEdit);
 		if (!Algorithms.isEmpty(email)) {
 			emailEdit.setText(email);
 		}
 
 		countrySelectionFragment.initCountries(getMyApplication());
-		String countryDownloadName = settings.BILLING_USER_COUNTRY_DOWNLOAD_NAME.get();
 		if (Algorithms.isEmpty(countryDownloadName)) {
 			selectedCountryItem = countrySelectionFragment.getCountryItems().get(0);
 		} else {
@@ -103,40 +174,100 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 			}
 		});
 
-		updatePrice(view);
-
-		final Button subscribeButton = (Button) view.findViewById(R.id.subscribeButton);
 		final CheckBox hideUserNameCheckbox = (CheckBox) view.findViewById(R.id.hideUserNameCheckbox);
-		boolean hideUserName = settings.BILLING_HIDE_USER_NAME.get();
 		hideUserNameCheckbox.setChecked(hideUserName);
-		subscribeButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (inAppHelper != null) {
-					userName = userNameEdit.getText().toString().trim();
-					email = emailEdit.getText().toString().trim();
-					String countryName = selectedCountryItem != null ? selectedCountryItem.getLocalName() : "";
-					String countryDownloadName = selectedCountryItem != null ? selectedCountryItem.getDownloadName() : "";
 
-					if (Algorithms.isEmpty(email) || !AndroidUtils.isValidEmail(email)) {
-						getMyApplication().showToastMessage("Please enter valid E-mail address");
-						return;
+		View editModeBottomView = view.findViewById(R.id.editModeBottomView);
+		View purchaseCard = view.findViewById(R.id.purchaseCard);
+		if (editMode) {
+			editModeBottomView.setVisibility(View.VISIBLE);
+			purchaseCard.setVisibility(View.GONE);
+
+			Button saveChangesButton = (Button) view.findViewById(R.id.saveChangesButton);
+			saveChangesButton.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					if (applySettings(userNameEdit.getText().toString().trim(),
+							emailEdit.getText().toString().trim(), hideUserNameCheckbox.isChecked())) {
+
+						final Map<String, String> parameters = new HashMap<>();
+						parameters.put("visibleName", settings.BILLING_HIDE_USER_NAME.get() ? "" : settings.BILLING_USER_NAME.get());
+						parameters.put("preferredCountry", settings.BILLING_USER_COUNTRY_DOWNLOAD_NAME.get());
+						parameters.put("email", settings.BILLING_USER_EMAIL.get());
+						parameters.put("cemail", prevEmail);
+						parameters.put("userid", settings.BILLING_USER_ID.get());
+
+						showProgress();
+
+						AndroidNetworkUtils.sendRequestAsync(getMyApplication(),
+								"http://download.osmand.net/subscription/update.php",
+								parameters, "Sending data...", new AndroidNetworkUtils.OnRequestResultListener() {
+									@Override
+									public void onResult(String result) {
+										dismissProgress();
+										OsmandApplication app = getMyApplication();
+										if (result != null) {
+											try {
+												JSONObject obj = new JSONObject(result);
+												if (!obj.has("error")) {
+													String userId = obj.getString("userid");
+													app.getSettings().BILLING_USER_ID.set(userId);
+													String email = obj.getString("email");
+													app.getSettings().BILLING_USER_EMAIL.set(email);
+													String visibleName = obj.getString("visibleName");
+													if (!Algorithms.isEmpty(visibleName)) {
+														app.getSettings().BILLING_USER_NAME.set(visibleName);
+														app.getSettings().BILLING_HIDE_USER_NAME.set(false);
+													} else {
+														app.getSettings().BILLING_HIDE_USER_NAME.set(true);
+													}
+													String preferredCountry = obj.getString("preferredCountry");
+													app.getSettings().BILLING_USER_COUNTRY_DOWNLOAD_NAME.set(preferredCountry);
+
+													Fragment parent = getParentFragment();
+													if (parent != null && parent instanceof LiveUpdatesFragment) {
+														((LiveUpdatesFragment) parent).updateHeader();
+													}
+
+													dismiss();
+												} else {
+													app.showToastMessage("Error: " + obj.getString("error"));
+												}
+											} catch (JSONException e) {
+												app.showToastMessage(getString(R.string.shared_string_io_error));
+											}
+										} else {
+											app.showToastMessage(getString(R.string.shared_string_io_error));
+										}
+									}
+								});
 					}
-					if (Algorithms.isEmpty(userName) && !hideUserNameCheckbox.isChecked()) {
-						getMyApplication().showToastMessage("Please enter Public Name");
-						return;
-					}
-
-					settings.BILLING_USER_NAME.set(userName);
-					settings.BILLING_USER_EMAIL.set(email);
-					settings.BILLING_USER_COUNTRY.set(countryName);
-					settings.BILLING_USER_COUNTRY_DOWNLOAD_NAME.set(countryDownloadName);
-					settings.BILLING_HIDE_USER_NAME.set(hideUserNameCheckbox.isChecked());
-
-					inAppHelper.purchaseLiveUpdates(getActivity(), email, userName, countryDownloadName);
 				}
-			}
-		});
+			});
+
+		} else {
+			editModeBottomView.setVisibility(View.GONE);
+			purchaseCard.setVisibility(View.VISIBLE);
+
+			updatePrice(view);
+			final Button subscribeButton = (Button) view.findViewById(R.id.subscribeButton);
+			subscribeButton.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					if (inAppHelper != null) {
+						if (applySettings(userNameEdit.getText().toString().trim(),
+								emailEdit.getText().toString().trim(), hideUserNameCheckbox.isChecked())) {
+
+							inAppHelper.purchaseLiveUpdates(getActivity(),
+									settings.BILLING_USER_EMAIL.get(),
+									settings.BILLING_USER_NAME.get(),
+									settings.BILLING_USER_COUNTRY_DOWNLOAD_NAME.get(),
+									settings.BILLING_HIDE_USER_NAME.get());
+						}
+					}
+				}
+			});
+		}
 
 		setThemedDrawable((ImageView) view.findViewById(R.id.userNameIcon), R.drawable.ic_person);
 		setThemedDrawable((ImageView) view.findViewById(R.id.emailIcon), R.drawable.ic_action_message);
@@ -150,7 +281,9 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 	@Override
 	public void onDestroy() {
 		super.onDestroy();
-		inAppHelper.stop();
+		if (inAppHelper != null) {
+			inAppHelper.stop();
+		}
 		if (dlg != null && dlg.isShowing()) {
 			dlg.hide();
 		}
@@ -160,6 +293,28 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 		}
 	}
 
+	private boolean applySettings(String userName, String email, boolean hideUserName) {
+		String countryName = selectedCountryItem != null ? selectedCountryItem.getLocalName() : "";
+		String countryDownloadName = selectedCountryItem != null ? selectedCountryItem.getDownloadName() : "";
+
+		if (Algorithms.isEmpty(email) || !AndroidUtils.isValidEmail(email)) {
+			getMyApplication().showToastMessage(getString(R.string.osm_live_enter_email));
+			return false;
+		}
+		if (Algorithms.isEmpty(userName) && !hideUserName) {
+			getMyApplication().showToastMessage(getString(R.string.osm_live_enter_user_name));
+			return false;
+		}
+
+		settings.BILLING_USER_NAME.set(userName);
+		settings.BILLING_USER_EMAIL.set(email);
+		settings.BILLING_USER_COUNTRY.set(countryName);
+		settings.BILLING_USER_COUNTRY_DOWNLOAD_NAME.set(countryDownloadName);
+		settings.BILLING_HIDE_USER_NAME.set(hideUserName);
+
+		return true;
+	}
+
 	@Override
 	public void onError(String error) {
 	}

From 7b0195c060652ab0deb8ee25143bc97acdae3526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Slav=C3=AD=C4=8Dek=20Petr?= <pslavicek@seznam.cz>
Date: Wed, 27 Jan 2016 16:54:03 +0100
Subject: [PATCH 64/72] Translated using Weblate (Czech)

Currently translated at 99.8% (1890 of 1892 strings)
---
 OsmAnd/res/values-cs/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 795851d9ff..ec500ff4a5 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -1925,4 +1925,5 @@
     <string name="number_of_edits">Počet úprav</string>
     <string name="reports_for">Report za</string>
 <string name="rendering_attr_hideUnderground_name">Skrýt objekty v pozadí</string>
+    <string name="shared_string_email_address">Email</string>
     </resources>

From e404e492b7ab3533350d8d7f995dfcc93aaaf0ef Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Wed, 27 Jan 2016 21:56:44 +0300
Subject: [PATCH 65/72] InApp small fix

---
 .../plus/liveupdates/LiveUpdatesFragment.java    | 16 ++--------------
 .../plus/liveupdates/SubscriptionFragment.java   |  5 ++---
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
index c3c3afc91a..66914d8d44 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
@@ -108,7 +108,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
 		//getSettings().LIVE_UPDATES_PURCHASED.set(true);
 
 		subscriptionHeader = inflater.inflate(R.layout.live_updates_header, listView, false);
-		updateHeader();
+		updateSubscriptionHeader();
 
 		listView.addHeaderView(subscriptionHeader);
 
@@ -116,7 +116,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
 		return view;
 	}
 
-	public void updateHeader() {
+	public void updateSubscriptionHeader() {
 		View subscriptionBanner = subscriptionHeader.findViewById(R.id.subscription_banner);
 		View subscriptionInfo = subscriptionHeader.findViewById(R.id.subscription_info);
 		if (getSettings().LIVE_UPDATES_PURCHASED.get()) {
@@ -176,18 +176,6 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
 		}
 	}
 
-	public void updateSubscriptionBanner() {
-		View subscriptionBanner = subscriptionHeader.findViewById(R.id.subscription_banner);
-		View subscriptionInfo = subscriptionHeader.findViewById(R.id.subscription_info);
-		if (InAppHelper.isSubscribedToLiveUpdates()) {
-			subscriptionBanner.setVisibility(View.GONE);
-			subscriptionInfo.setVisibility(View.VISIBLE);
-		} else {
-			subscriptionBanner.setVisibility(View.VISIBLE);
-			subscriptionInfo.setVisibility(View.GONE);
-		}
-	}
-
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
index 8457878349..c8cb879200 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -226,7 +225,7 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 
 													Fragment parent = getParentFragment();
 													if (parent != null && parent instanceof LiveUpdatesFragment) {
-														((LiveUpdatesFragment) parent).updateHeader();
+														((LiveUpdatesFragment) parent).updateSubscriptionHeader();
 													}
 
 													dismiss();
@@ -330,7 +329,7 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 		if (InAppHelper.getSkuLiveUpdates().equals(sku)) {
 			Fragment parentFragment = getParentFragment();
 			if (parentFragment instanceof LiveUpdatesFragment) {
-				((LiveUpdatesFragment) parentFragment).updateSubscriptionBanner();
+				((LiveUpdatesFragment) parentFragment).updateSubscriptionHeader();
 			}
 		}
 

From 8a7894d2160f75f1ca33844be96427d0ec923fad Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Wed, 27 Jan 2016 22:12:06 +0300
Subject: [PATCH 66/72] Fix

---
 OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
index 068da001e8..be3280d663 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
@@ -172,6 +172,9 @@ public class InAppHelper {
 			// Do we have the live updates?
 			Purchase liveUpdatesPurchase = inventory.getPurchase(SKU_LIVE_UPDATES);
 			mSubscribedToLiveUpdates = (liveUpdatesPurchase != null);
+			if (mSubscribedToLiveUpdates) {
+				ctx.getSettings().LIVE_UPDATES_PURCHASED.set(true);
+			}
 			logDebug("User " + (mSubscribedToLiveUpdates ? "HAS" : "DOES NOT HAVE")
 					+ " live updates purchased.");
 

From ebe7976b4c138a8f4a1e456378f0971c9be5de9b Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Wed, 27 Jan 2016 22:21:22 +0300
Subject: [PATCH 67/72] Fix

---
 OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
index be3280d663..271ed26d95 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/InAppHelper.java
@@ -392,9 +392,12 @@ public class InAppHelper {
 									JSONObject obj = new JSONObject(result);
 									if (!obj.has("error")) {
 										ctx.getSettings().BILLING_PURCHASE_TOKEN_SENT.set(true);
+									} else {
+										complain("SendToken Error: " + obj.getString("error"));
 									}
 								} catch (JSONException e) {
 									logError("sendToken", e);
+									complain("SendToken Error: " + (e.getMessage() != null ? e.getMessage() : "JSONException"));
 								}
 							}
 						}

From 545d514f1005e4948fb8a6e18fbe41ba677af163 Mon Sep 17 00:00:00 2001
From: Adriano Rosa <adrianojbr@gmail.com>
Date: Wed, 27 Jan 2016 20:27:02 +0100
Subject: [PATCH 68/72] Translated using Weblate (Portuguese (Brazil))

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

diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 0ebf2f2d7f..eef86a846a 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -2005,4 +2005,6 @@
     <string name="shared_string_read_more">Leia mais</string>
     <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Mapas &amp; Navigação - fazer rotas e encontrar locais no mapa sem uma conexão com a Internet. Baixe um mapa de um país antes de você ir em uma viagem para encontrar lugares e rotas em uma área desconhecida. Opções básicas: • Mapas detalhados de 200 países • Navegador offline com instruções de voz • Pesquisa por endereço no modo offline • Informação sobre locais no mapa: locais de interesse, cafeterias, estacionamentos, lojas • Inclusão de locais favoritos • Navegação para motoristas, ciclistas e pedestres Opções adicionais: • Capacidade de exibir e gravar trilhas GPX • Descrição da Wikipédia descrição de POIs • Adição de notas no mapa com foto, áudio e vídeo • Modos dia e noite para condução mais conveniente • Informação sobre rotas de transportes públicos e paradas • Ciclovias e caminhos para pedestres • Trilhas de caminhada para turismo em todo o mundo • Mapas online de numerosas fontes • Informação sobre a qualidade do pavimento da estrada e iluminação da rua • Adição, edição e exclusão de POIs (para usuários OpenStreetMap.org) • OsMo - acompanhamento ao vivo de outros usuários Obter um navegador confiável no seu país - seja ele, França, Alemanha, México, Reino Unido, Espanha, Holanda, EUA, Rússia, Brasil ou qualquer outro país. Plugins: • Mapas de contorno e sombreamento https://goo.gl/7mojP8 Visualização das curvas de nível e do relevo adicionados ao mapa básico do OsmAnd. • Mapas de esqui https://goo.gl/pX6DxJ Informação sobre as pistas de esqui, trilhas de esqui e teleféricos. • Mapa náutico https://goo.gl/0hEdxm Estilo de mapa especial para a visualização de sinais de navegação náutica para navegação fluvial e marítima. • Posição de estacionamento https://goo.gl/6JxQXF Ajuda a marcar a localização de seu veículo estacionado e ver quanto tempo resta, se o estacionamento tiver limitação de tempo. Fique ligado! Twitter: o https://twitter.com/osmandapp Facebook: https://www.facebook.com/osmandapp Site: http://osmand.net Se precisar de ajuda com o aplicativo OsmAnd, por favor, entre em contato com nossa equipe de suporte: support@osmand.net. "</string>
     <string name="shared_string_email_address">Endereço de email</string>
+    <string name="shared_string_status">Estado</string>
+    <string name="shared_string_save_changes">Salvar alterações</string>
     </resources>

From a86e14e5d1bb16e882f87226aa1ca55308d9a729 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Wed, 27 Jan 2016 23:42:07 +0300
Subject: [PATCH 69/72] Fix World for reports/subscription

---
 .../osmand/plus/liveupdates/CountrySelectionFragment.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/CountrySelectionFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/CountrySelectionFragment.java
index cda352b0bd..c564cf843e 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/CountrySelectionFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/CountrySelectionFragment.java
@@ -143,7 +143,11 @@ public class CountrySelectionFragment extends BaseOsmAndDialogFragment {
 		});
 		for (WorldRegion group : groups) {
 			String name = getHumanReadableName(group);
-			countryItems.add(new CountryItem(name, group.getRegionDownloadName()));
+			if (group == root) {
+				countryItems.add(new CountryItem(name, ""));
+			} else {
+				countryItems.add(new CountryItem(name, group.getRegionDownloadName()));
+			}
 		}
 	}
 

From 6046b0cbdf33c0cccb1b17ff127753c75da3477c Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Wed, 27 Jan 2016 21:10:33 +0100
Subject: [PATCH 70/72] Translated using Weblate (French)

Currently translated at 99.8% (1892 of 1894 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 75d3f36e51..cd0b65f72a 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -2125,4 +2125,6 @@
     <string name="rendering_attr_hideUnderground_name">Cacher les objets souterrains</string>
     <string name="shared_string_read_more">Lire la suite</string>
     <string name="shared_string_email_address">Adresse email</string>
+    <string name="shared_string_status">Statut</string>
+    <string name="shared_string_save_changes">Enregistrer les modifications</string>
     </resources>

From b23eda1da2848d60d2f054c38db662b6980ade02 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Wed, 27 Jan 2016 23:51:17 +0300
Subject: [PATCH 71/72] Add onewaysArrowColor attribute

---
 .../src/net/osmand/render/RenderingRuleStorageProperties.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java b/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java
index b37f0e1197..d20563d622 100644
--- a/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java
+++ b/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java
@@ -29,6 +29,7 @@ public class RenderingRuleStorageProperties {
 	public static final String SHIELD = "shield";
 	public static final String SHADOW_RADIUS = "shadowRadius";
 	public static final String SHADOW_COLOR = "shadowColor";
+	public static final String ONEWAY_ARROWS_COLOR = "onewayArrowsColor";
 	public static final String SHADER = "shader";
 	public static final String CAP_5 = "cap_5";
 	public static final String CAP_4 = "cap_4";
@@ -103,6 +104,7 @@ public class RenderingRuleStorageProperties {
 	public RenderingRuleProperty R_SHADOW_RADIUS;
 	public RenderingRuleProperty R_SHADOW_COLOR;
 	public RenderingRuleProperty R_SHADER;
+	public RenderingRuleProperty R_ONEWAY_ARROWS_COLOR;
 	public RenderingRuleProperty R_CAP_5;
 	public RenderingRuleProperty R_CAP_4;
 	public RenderingRuleProperty R_CAP_3;
@@ -288,6 +290,8 @@ public class RenderingRuleStorageProperties {
 
 		R_SHADOW_COLOR = registerRuleInternal(RenderingRuleProperty.createOutputColorProperty(SHADOW_COLOR));
 		R_SHADOW_RADIUS = registerRuleInternal(RenderingRuleProperty.createOutputFloatProperty(SHADOW_RADIUS));
+
+		R_ONEWAY_ARROWS_COLOR = registerRuleInternal(RenderingRuleProperty.createOutputColorProperty(ONEWAY_ARROWS_COLOR));
 	}
 
 	public RenderingRuleProperty get(String name) {

From ba006a9708cf4a8487a7388a317d992944f92e27 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Wed, 27 Jan 2016 22:00:14 +0100
Subject: [PATCH 72/72] Translated using Weblate (Danish)

Currently translated at 100.0% (1894 of 1894 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 e5fca9b725..380c99ee96 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2265,4 +2265,6 @@
 \nFacebook: https://www.facebook.com/osmandapp\nHjemmeside: http://osmand.net
 \n\nEr der brug for hjælp med OsmAnd, kontakt da supportteamet: support@osmand.net. "</string>
     <string name="shared_string_email_address">Email adresse</string>
+    <string name="shared_string_status">Status</string>
+    <string name="shared_string_save_changes">Gem ændringer</string>
     </resources>