From ded8948d483dd131d436ff2431087bd30320f9d0 Mon Sep 17 00:00:00 2001
From: Franco <fulanodetal.github1@openaliasbox.org>
Date: Sat, 7 Nov 2015 23:05:28 +0100
Subject: [PATCH 1/4] Translated using Weblate (Argentinean Spanish)

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

diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index c4dc0598fe..4ef786853f 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -431,7 +431,7 @@
     <string name="lang_mr">Marathi</string>
     <string name="osmand_srtm_short_description_80_chars">Complemento OsmAnd para curvas de nivel sin conexión</string>
     <string name="srtm_plugin_name">Curvas de nivel</string>
-    <string name="osmand_distance_planning_plugin_name">Calculador de distancias y herramienta de planificación</string>
+    <string name="osmand_distance_planning_plugin_name">Distancias y planificación</string>
     <string name="rename_failed">Falló el renombrado.</string>
     <string name="days_behind">días atrás</string>
     <string name="free">"Libre %1$s "</string>

From ee6fe013c16f906b40103ffa32c8c1dcb8ad696d Mon Sep 17 00:00:00 2001
From: josep constanti <jconstanti@yahoo.es>
Date: Sat, 7 Nov 2015 23:01:54 +0100
Subject: [PATCH 2/4] Translated using Weblate (Catalan)

Currently translated at 67.1% (1472 of 2192 strings)
---
 OsmAnd/res/values-ca/phrases.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index 475aabfa54..9eea0a8fb6 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -1596,4 +1596,14 @@
 	<string name="poi_payment_mastercard_yes">S\'accepta Mastercard</string>
 	<string name="poi_payment_mastercard_no">No s\'accepta Mastercard</string>
 	<string name="poi_payment_none">Sense cost</string>
+	<string name="poi_payment_maestro_yes">S\'accepta tarja Maestro</string>
+	<string name="poi_payment_maestro_no">No s\'accepta tarja Maestro</string>
+	<string name="poi_payment_american_express_yes">S\'accepta tarja American Express (AMEX)</string>
+	<string name="poi_payment_american_express_no">No s\'accepta tarja American Express (AMEX)</string>
+	<string name="poi_payment_diners_club_yes">S\'accepta tarja Dinners Club</string>
+	<string name="poi_payment_diners_club_no">No s\'accepta tarja Dinners Club</string>
+	<string name="poi_payment_dkv_yes">Accepta DKV</string>
+	<string name="poi_payment_dkv_no">No s\'accepta DKV</string>
+	<string name="poi_payment_uta_yes">S\'accepten targes UTA</string>
+	<string name="poi_payment_uta_no">No s\'accepten targes UTA</string>
 	</resources>

From ccf932e982d41b0fed2d91716ddcd1a2da8affbe Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Sun, 8 Nov 2015 00:05:56 +0100
Subject: [PATCH 3/4] fix issues

---
 OsmAnd/res/values/strings.xml                           | 2 +-
 OsmAnd/src/net/osmand/plus/activities/HelpActivity.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index a92a1bd33f..65625aa2b7 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2047,7 +2047,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="navigation_item_description">Setup navigation</string>
     <string name="planning_trip_item">Planning a trip</string>
     <string name="faq_item">FAQ</string>
-    <string name="faq_item_description">How to use plugins</string>
+    <string name="faq_item_description">Frequently asked questions</string>
     <string name="map_viewing_item">Map viewing</string>
     <string name="search_on_the_map_item">Map searching</string>
     <string name="instalation_troubleshooting_item">Installation and troubleshooting</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
index 1427dca878..416a4c81d6 100644
--- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
@@ -180,7 +180,7 @@ public class HelpActivity extends OsmandActionBarActivity {
 			}
 			String version = Version.getFullVersion(getOsmandApplication()) + " " + releasedate;
 			ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener(
-					"feature_articles/about.html", getActivity(), name);
+					"feature_articles/about.html", getActivity(), version);
 
 			arrayList.add(new HelpMenuItem(getActivity().getString(R.string.shared_string_about), version, listener));
 			return arrayList;

From 1f31ccf4cbb5a89f91c72cacbe8e1b517a2fe70c Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Sun, 8 Nov 2015 00:07:33 +0100
Subject: [PATCH 4/4] not needed

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

diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
index 416a4c81d6..3ddd1b8d28 100644
--- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
@@ -166,7 +166,7 @@ public class HelpActivity extends OsmandActionBarActivity {
 
 		private List<HelpMenuItem> createOtherItems() {
 			ArrayList<HelpMenuItem> arrayList = new ArrayList<>();
-			String name = getActivity().getString(R.string.instalation_troubleshooting_item);
+			//String name = getActivity().getString(R.string.instalation_troubleshooting_item);
 			arrayList.add(new HelpMenuItem(R.string.instalation_troubleshooting_item, -1, -1, 
 					"feature_articles/installation-and-troubleshooting.html", getActivity()));
 			arrayList.add(new HelpMenuItem(R.string.techical_articles_item, -1, -1,